Merge "Set jvm-default=all for Room runtime libraries." into androidx-main
diff --git a/TEXT_OWNERS b/TEXT_OWNERS
index 2ff6357..d96ccec 100644
--- a/TEXT_OWNERS
+++ b/TEXT_OWNERS
@@ -1,5 +1,8 @@
+halilibo@google.com
haoyuchang@google.com
+justinghan@google.com
klippenstein@google.com
nona@google.com
seanmcq@google.com
-siyamed@google.com
\ No newline at end of file
+siyamed@google.com
+soboleva@google.com
\ No newline at end of file
diff --git a/activity/activity-ktx/build.gradle b/activity/activity-ktx/build.gradle
index 21e4e1a..57e4406 100644
--- a/activity/activity-ktx/build.gradle
+++ b/activity/activity-ktx/build.gradle
@@ -24,6 +24,11 @@
}
dependencies {
+ // Atomic group
+ constraints {
+ implementation(project(":activity:activity"))
+ }
+
api(project(":activity:activity"))
api("androidx.core:core-ktx:1.1.0") {
because "Mirror activity dependency graph for -ktx artifacts"
diff --git a/activity/activity/build.gradle b/activity/activity/build.gradle
index 91a8e4d..4075143 100644
--- a/activity/activity/build.gradle
+++ b/activity/activity/build.gradle
@@ -15,6 +15,11 @@
}
dependencies {
+ // Atomic group
+ constraints {
+ implementation(project(":activity:activity-ktx"))
+ }
+
api("androidx.annotation:annotation:1.1.0")
implementation("androidx.collection:collection:1.0.0")
api("androidx.core:core:1.8.0-rc01")
diff --git a/activity/activity/src/androidTest/AndroidManifest.xml b/activity/activity/src/androidTest/AndroidManifest.xml
index 9ab3727..243115d 100644
--- a/activity/activity/src/androidTest/AndroidManifest.xml
+++ b/activity/activity/src/androidTest/AndroidManifest.xml
@@ -73,6 +73,9 @@
<activity
android:name="androidx.activity.FinishActivity"
android:exported="true" />
+ <activity
+ android:name="androidx.activity.ContextMenuComponentActivity"
+ android:exported="true" />
</application>
</manifest>
diff --git a/activity/activity/src/androidTest/java/androidx/activity/ComponentActivityMenuTest.kt b/activity/activity/src/androidTest/java/androidx/activity/ComponentActivityMenuTest.kt
index e49ff07..1a5bf0e 100644
--- a/activity/activity/src/androidTest/java/androidx/activity/ComponentActivityMenuTest.kt
+++ b/activity/activity/src/androidTest/java/androidx/activity/ComponentActivityMenuTest.kt
@@ -17,15 +17,21 @@
package androidx.activity
import android.os.Build
+import android.os.Bundle
+import android.view.ContextMenu
import android.view.Menu
import android.view.MenuInflater
import android.view.MenuItem
+import android.view.View
+import android.widget.TextView
import androidx.activity.test.R
import androidx.core.view.MenuProvider
import androidx.test.core.app.ActivityScenario
import androidx.test.espresso.Espresso.onView
import androidx.test.espresso.Espresso.openActionBarOverflowOrOptionsMenu
+import androidx.test.espresso.Espresso.pressBack
import androidx.test.espresso.action.ViewActions.click
+import androidx.test.espresso.action.ViewActions.longClick
import androidx.test.espresso.assertion.ViewAssertions.matches
import androidx.test.espresso.matcher.ViewMatchers.isDisplayed
import androidx.test.espresso.matcher.ViewMatchers.withText
@@ -34,6 +40,9 @@
import androidx.test.filters.SdkSuppress
import androidx.testutils.withActivity
import com.google.common.truth.Truth.assertThat
+import com.google.common.truth.Truth.assertWithMessage
+import java.util.concurrent.CountDownLatch
+import java.util.concurrent.TimeUnit
import org.junit.Test
import org.junit.runner.RunWith
@@ -176,4 +185,46 @@
assertThat(menuClosed).isTrue()
}
}
+
+ @Test
+ fun onPanelClosed() {
+ with(ActivityScenario.launch(ContextMenuComponentActivity::class.java)) {
+ onView(withText("Context Menu")).perform(longClick())
+ onView(withText("Item1")).check(matches(isDisplayed()))
+ onView(withText("Item2")).check(matches(isDisplayed()))
+
+ pressBack()
+ val countDownLatch = withActivity { this.contextMenuClosedCountDownLatch }
+ assertWithMessage("onPanelClosed was not called")
+ .that(countDownLatch.await(1000, TimeUnit.MILLISECONDS))
+ .isTrue()
+ }
+ }
+}
+
+class ContextMenuComponentActivity : ComponentActivity() {
+
+ val contextMenuClosedCountDownLatch = CountDownLatch(1)
+
+ override fun onCreate(savedInstanceState: Bundle?) {
+ super.onCreate(savedInstanceState)
+ setContentView(R.layout.context_menu)
+ val contextMenuTextView = findViewById<TextView>(R.id.context_menu_tv)
+ registerForContextMenu(contextMenuTextView)
+ }
+
+ override fun onCreateContextMenu(
+ menu: ContextMenu,
+ v: View,
+ menuInfo: ContextMenu.ContextMenuInfo?
+ ) {
+ super.onCreateContextMenu(menu, v, menuInfo)
+ val inflater: MenuInflater = menuInflater
+ inflater.inflate(R.menu.example_menu, menu)
+ }
+
+ override fun onContextMenuClosed(menu: Menu) {
+ contextMenuClosedCountDownLatch.countDown()
+ super.onContextMenuClosed(menu)
+ }
}
diff --git a/activity/activity/src/androidTest/res/layout/context_menu.xml b/activity/activity/src/androidTest/res/layout/context_menu.xml
new file mode 100644
index 0000000..3069f8d
--- /dev/null
+++ b/activity/activity/src/androidTest/res/layout/context_menu.xml
@@ -0,0 +1,29 @@
+<?xml version="1.0" encoding="utf-8"?><!--
+ Copyright 2022 The Android Open Source Project
+
+ Licensed under the Apache License, Version 2.0 (the "License");
+ you may not use this file except in compliance with the License.
+ You may obtain a copy of the License at
+
+ http://www.apache.org/licenses/LICENSE-2.0
+
+ Unless required by applicable law or agreed to in writing, software
+ distributed under the License is distributed on an "AS IS" BASIS,
+ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ See the License for the specific language governing permissions and
+ limitations under the License.
+ -->
+
+<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+ android:orientation="vertical"
+ android:layout_width="match_parent"
+ android:layout_height="match_parent">
+
+ <TextView
+ android:id="@+id/context_menu_tv"
+ android:layout_width="match_parent"
+ android:layout_height="wrap_content"
+ android:padding="16dp"
+ android:text="Context Menu"/>
+
+</LinearLayout>
\ No newline at end of file
diff --git a/appcompat/appcompat/api/current.txt b/appcompat/appcompat/api/current.txt
index 26a352f..e36516b 100644
--- a/appcompat/appcompat/api/current.txt
+++ b/appcompat/appcompat/api/current.txt
@@ -905,6 +905,7 @@
method public boolean isEmojiCompatEnabled();
method public void onMeasure(int, int);
method public void setEmojiCompatEnabled(boolean);
+ method protected final void setEnforceSwitchWidth(boolean);
method public void setShowText(boolean);
method public void setSplitTrack(boolean);
method public void setSwitchMinWidth(int);
diff --git a/appcompat/appcompat/api/public_plus_experimental_current.txt b/appcompat/appcompat/api/public_plus_experimental_current.txt
index 26a352f..e36516b 100644
--- a/appcompat/appcompat/api/public_plus_experimental_current.txt
+++ b/appcompat/appcompat/api/public_plus_experimental_current.txt
@@ -905,6 +905,7 @@
method public boolean isEmojiCompatEnabled();
method public void onMeasure(int, int);
method public void setEmojiCompatEnabled(boolean);
+ method protected final void setEnforceSwitchWidth(boolean);
method public void setShowText(boolean);
method public void setSplitTrack(boolean);
method public void setSwitchMinWidth(int);
diff --git a/appcompat/appcompat/api/restricted_current.txt b/appcompat/appcompat/api/restricted_current.txt
index d5a987e..6287496 100644
--- a/appcompat/appcompat/api/restricted_current.txt
+++ b/appcompat/appcompat/api/restricted_current.txt
@@ -1997,6 +1997,7 @@
method public boolean isEmojiCompatEnabled();
method public void onMeasure(int, int);
method public void setEmojiCompatEnabled(boolean);
+ method protected final void setEnforceSwitchWidth(boolean);
method public void setShowText(boolean);
method public void setSplitTrack(boolean);
method public void setSwitchMinWidth(int);
diff --git a/appcompat/appcompat/src/main/java/androidx/appcompat/widget/SwitchCompat.java b/appcompat/appcompat/src/main/java/androidx/appcompat/widget/SwitchCompat.java
index 6a8757b..1c6f8fb 100644
--- a/appcompat/appcompat/src/main/java/androidx/appcompat/widget/SwitchCompat.java
+++ b/appcompat/appcompat/src/main/java/androidx/appcompat/widget/SwitchCompat.java
@@ -197,6 +197,8 @@
/** Bottom bound for drawing the switch track and thumb. */
private int mSwitchBottom;
+ private boolean mEnforceSwitchWidth = true;
+
private final TextPaint mTextPaint;
private ColorStateList mTextColors;
private Layout mOnLayout;
@@ -956,8 +958,10 @@
paddingRight = Math.max(paddingRight, inset.right);
}
- final int switchWidth = Math.max(mSwitchMinWidth,
- 2 * mThumbWidth + paddingLeft + paddingRight);
+ final int switchWidth =
+ mEnforceSwitchWidth
+ ? Math.max(mSwitchMinWidth, 2 * mThumbWidth + paddingLeft + paddingRight)
+ : mSwitchMinWidth;
final int switchHeight = Math.max(trackHeight, thumbHeight);
mSwitchWidth = switchWidth;
mSwitchHeight = switchHeight;
@@ -1550,6 +1554,17 @@
}
/**
+ * Sets {@code true} to enforce the switch width being at least twice of the thumb width.
+ * Otherwise the switch width will be the value set by {@link #setSwitchMinWidth(int)}.
+ *
+ * The default value is {@code true}.
+ */
+ protected final void setEnforceSwitchWidth(boolean enforceSwitchWidth) {
+ mEnforceSwitchWidth = enforceSwitchWidth;
+ invalidate();
+ }
+
+ /**
* Taken from android.util.MathUtils
*/
private static float constrain(float amount, float low, float high) {
diff --git a/appsearch/appsearch-builtin-types/api/current.txt b/appsearch/appsearch-builtin-types/api/current.txt
index 80bb6b1..d971fde 100644
--- a/appsearch/appsearch-builtin-types/api/current.txt
+++ b/appsearch/appsearch-builtin-types/api/current.txt
@@ -81,8 +81,8 @@
@androidx.appsearch.annotation.Document(name="builtin:Stopwatch") public final class Stopwatch {
method @RequiresApi(api=android.os.Build.VERSION_CODES.JELLY_BEAN_MR1) public long calculateBaseTimeMillis(android.content.Context);
- method @RequiresApi(api=android.os.Build.VERSION_CODES.JELLY_BEAN_MR1) public long calculateCurrentAccumulatedTimeMillis(android.content.Context);
- method public long getAccumulatedTimeMillis();
+ method @RequiresApi(api=android.os.Build.VERSION_CODES.JELLY_BEAN_MR1) public long calculateCurrentAccumulatedDurationMillis(android.content.Context);
+ method public long getAccumulatedDurationMillis();
method public long getBaseTimeMillis();
method public long getBaseTimeMillisInElapsedRealtime();
method public int getBootCount();
@@ -104,7 +104,7 @@
ctor public Stopwatch.Builder(String, String);
ctor public Stopwatch.Builder(androidx.appsearch.builtintypes.Stopwatch);
method public androidx.appsearch.builtintypes.Stopwatch build();
- method public androidx.appsearch.builtintypes.Stopwatch.Builder setAccumulatedTimeMillis(long);
+ method public androidx.appsearch.builtintypes.Stopwatch.Builder setAccumulatedDurationMillis(long);
method public androidx.appsearch.builtintypes.Stopwatch.Builder setBaseTimeMillis(long, long, int);
method @RequiresApi(api=android.os.Build.VERSION_CODES.JELLY_BEAN_MR1) public androidx.appsearch.builtintypes.Stopwatch.Builder setBaseTimeMillis(android.content.Context, long, long);
method public androidx.appsearch.builtintypes.Stopwatch.Builder setCreationTimestampMillis(long);
@@ -116,13 +116,13 @@
}
@androidx.appsearch.annotation.Document(name="builtin:StopwatchLap") public class StopwatchLap {
- method public long getAccumulatedLapTimeMillis();
+ method public long getAccumulatedLapDurationMillis();
method public long getCreationTimestampMillis();
method public int getDocumentScore();
method public long getDocumentTtlMillis();
method public String getId();
+ method public long getLapDurationMillis();
method public int getLapNumber();
- method public long getLapTimeMillis();
method public String getNamespace();
}
@@ -130,17 +130,17 @@
ctor public StopwatchLap.Builder(String, String);
ctor public StopwatchLap.Builder(androidx.appsearch.builtintypes.StopwatchLap);
method public androidx.appsearch.builtintypes.StopwatchLap build();
- method public androidx.appsearch.builtintypes.StopwatchLap.Builder setAccumulatedLapTimeMillis(long);
+ method public androidx.appsearch.builtintypes.StopwatchLap.Builder setAccumulatedLapDurationMillis(long);
method public androidx.appsearch.builtintypes.StopwatchLap.Builder setCreationTimestampMillis(long);
method public androidx.appsearch.builtintypes.StopwatchLap.Builder setDocumentScore(int);
method public androidx.appsearch.builtintypes.StopwatchLap.Builder setDocumentTtlMillis(long);
+ method public androidx.appsearch.builtintypes.StopwatchLap.Builder setLapDurationMillis(long);
method public androidx.appsearch.builtintypes.StopwatchLap.Builder setLapNumber(int);
- method public androidx.appsearch.builtintypes.StopwatchLap.Builder setLapTimeMillis(long);
}
@androidx.appsearch.annotation.Document(name="builtin:Timer") public final class Timer {
method @RequiresApi(api=android.os.Build.VERSION_CODES.JELLY_BEAN_MR1) public long calculateBaseTimeMillis(android.content.Context);
- method @RequiresApi(api=android.os.Build.VERSION_CODES.JELLY_BEAN_MR1) public long calculateCurrentRemainingTimeMillis(android.content.Context);
+ method @RequiresApi(api=android.os.Build.VERSION_CODES.JELLY_BEAN_MR1) public long calculateCurrentRemainingDurationMillis(android.content.Context);
method @RequiresApi(api=android.os.Build.VERSION_CODES.JELLY_BEAN_MR1) public long calculateExpirationTimeMillis(android.content.Context);
method public long getBaseTimeMillis();
method public long getBaseTimeMillisInElapsedRealtime();
@@ -153,7 +153,7 @@
method public String? getName();
method public String getNamespace();
method public long getOriginalDurationMillis();
- method public long getRemainingTimeMillis();
+ method public long getRemainingDurationMillis();
method public String? getRingtone();
method public long getStartTimeMillis();
method public int getStatus();
@@ -178,7 +178,7 @@
method public androidx.appsearch.builtintypes.Timer.Builder setDurationMillis(long);
method public androidx.appsearch.builtintypes.Timer.Builder setName(String?);
method public androidx.appsearch.builtintypes.Timer.Builder setOriginalDurationMillis(long);
- method public androidx.appsearch.builtintypes.Timer.Builder setRemainingTimeMillis(long);
+ method public androidx.appsearch.builtintypes.Timer.Builder setRemainingDurationMillis(long);
method public androidx.appsearch.builtintypes.Timer.Builder setRingtone(String?);
method public androidx.appsearch.builtintypes.Timer.Builder setShouldVibrate(boolean);
method public androidx.appsearch.builtintypes.Timer.Builder setStartTimeMillis(long);
diff --git a/appsearch/appsearch-builtin-types/api/public_plus_experimental_current.txt b/appsearch/appsearch-builtin-types/api/public_plus_experimental_current.txt
index 80bb6b1..d971fde 100644
--- a/appsearch/appsearch-builtin-types/api/public_plus_experimental_current.txt
+++ b/appsearch/appsearch-builtin-types/api/public_plus_experimental_current.txt
@@ -81,8 +81,8 @@
@androidx.appsearch.annotation.Document(name="builtin:Stopwatch") public final class Stopwatch {
method @RequiresApi(api=android.os.Build.VERSION_CODES.JELLY_BEAN_MR1) public long calculateBaseTimeMillis(android.content.Context);
- method @RequiresApi(api=android.os.Build.VERSION_CODES.JELLY_BEAN_MR1) public long calculateCurrentAccumulatedTimeMillis(android.content.Context);
- method public long getAccumulatedTimeMillis();
+ method @RequiresApi(api=android.os.Build.VERSION_CODES.JELLY_BEAN_MR1) public long calculateCurrentAccumulatedDurationMillis(android.content.Context);
+ method public long getAccumulatedDurationMillis();
method public long getBaseTimeMillis();
method public long getBaseTimeMillisInElapsedRealtime();
method public int getBootCount();
@@ -104,7 +104,7 @@
ctor public Stopwatch.Builder(String, String);
ctor public Stopwatch.Builder(androidx.appsearch.builtintypes.Stopwatch);
method public androidx.appsearch.builtintypes.Stopwatch build();
- method public androidx.appsearch.builtintypes.Stopwatch.Builder setAccumulatedTimeMillis(long);
+ method public androidx.appsearch.builtintypes.Stopwatch.Builder setAccumulatedDurationMillis(long);
method public androidx.appsearch.builtintypes.Stopwatch.Builder setBaseTimeMillis(long, long, int);
method @RequiresApi(api=android.os.Build.VERSION_CODES.JELLY_BEAN_MR1) public androidx.appsearch.builtintypes.Stopwatch.Builder setBaseTimeMillis(android.content.Context, long, long);
method public androidx.appsearch.builtintypes.Stopwatch.Builder setCreationTimestampMillis(long);
@@ -116,13 +116,13 @@
}
@androidx.appsearch.annotation.Document(name="builtin:StopwatchLap") public class StopwatchLap {
- method public long getAccumulatedLapTimeMillis();
+ method public long getAccumulatedLapDurationMillis();
method public long getCreationTimestampMillis();
method public int getDocumentScore();
method public long getDocumentTtlMillis();
method public String getId();
+ method public long getLapDurationMillis();
method public int getLapNumber();
- method public long getLapTimeMillis();
method public String getNamespace();
}
@@ -130,17 +130,17 @@
ctor public StopwatchLap.Builder(String, String);
ctor public StopwatchLap.Builder(androidx.appsearch.builtintypes.StopwatchLap);
method public androidx.appsearch.builtintypes.StopwatchLap build();
- method public androidx.appsearch.builtintypes.StopwatchLap.Builder setAccumulatedLapTimeMillis(long);
+ method public androidx.appsearch.builtintypes.StopwatchLap.Builder setAccumulatedLapDurationMillis(long);
method public androidx.appsearch.builtintypes.StopwatchLap.Builder setCreationTimestampMillis(long);
method public androidx.appsearch.builtintypes.StopwatchLap.Builder setDocumentScore(int);
method public androidx.appsearch.builtintypes.StopwatchLap.Builder setDocumentTtlMillis(long);
+ method public androidx.appsearch.builtintypes.StopwatchLap.Builder setLapDurationMillis(long);
method public androidx.appsearch.builtintypes.StopwatchLap.Builder setLapNumber(int);
- method public androidx.appsearch.builtintypes.StopwatchLap.Builder setLapTimeMillis(long);
}
@androidx.appsearch.annotation.Document(name="builtin:Timer") public final class Timer {
method @RequiresApi(api=android.os.Build.VERSION_CODES.JELLY_BEAN_MR1) public long calculateBaseTimeMillis(android.content.Context);
- method @RequiresApi(api=android.os.Build.VERSION_CODES.JELLY_BEAN_MR1) public long calculateCurrentRemainingTimeMillis(android.content.Context);
+ method @RequiresApi(api=android.os.Build.VERSION_CODES.JELLY_BEAN_MR1) public long calculateCurrentRemainingDurationMillis(android.content.Context);
method @RequiresApi(api=android.os.Build.VERSION_CODES.JELLY_BEAN_MR1) public long calculateExpirationTimeMillis(android.content.Context);
method public long getBaseTimeMillis();
method public long getBaseTimeMillisInElapsedRealtime();
@@ -153,7 +153,7 @@
method public String? getName();
method public String getNamespace();
method public long getOriginalDurationMillis();
- method public long getRemainingTimeMillis();
+ method public long getRemainingDurationMillis();
method public String? getRingtone();
method public long getStartTimeMillis();
method public int getStatus();
@@ -178,7 +178,7 @@
method public androidx.appsearch.builtintypes.Timer.Builder setDurationMillis(long);
method public androidx.appsearch.builtintypes.Timer.Builder setName(String?);
method public androidx.appsearch.builtintypes.Timer.Builder setOriginalDurationMillis(long);
- method public androidx.appsearch.builtintypes.Timer.Builder setRemainingTimeMillis(long);
+ method public androidx.appsearch.builtintypes.Timer.Builder setRemainingDurationMillis(long);
method public androidx.appsearch.builtintypes.Timer.Builder setRingtone(String?);
method public androidx.appsearch.builtintypes.Timer.Builder setShouldVibrate(boolean);
method public androidx.appsearch.builtintypes.Timer.Builder setStartTimeMillis(long);
diff --git a/appsearch/appsearch-builtin-types/api/restricted_current.txt b/appsearch/appsearch-builtin-types/api/restricted_current.txt
index 1661d8b..ce72f94 100644
--- a/appsearch/appsearch-builtin-types/api/restricted_current.txt
+++ b/appsearch/appsearch-builtin-types/api/restricted_current.txt
@@ -83,8 +83,8 @@
@androidx.appsearch.annotation.Document(name="builtin:Stopwatch") public final class Stopwatch {
method @RequiresApi(api=android.os.Build.VERSION_CODES.JELLY_BEAN_MR1) public long calculateBaseTimeMillis(android.content.Context);
- method @RequiresApi(api=android.os.Build.VERSION_CODES.JELLY_BEAN_MR1) public long calculateCurrentAccumulatedTimeMillis(android.content.Context);
- method public long getAccumulatedTimeMillis();
+ method @RequiresApi(api=android.os.Build.VERSION_CODES.JELLY_BEAN_MR1) public long calculateCurrentAccumulatedDurationMillis(android.content.Context);
+ method public long getAccumulatedDurationMillis();
method public long getBaseTimeMillis();
method public long getBaseTimeMillisInElapsedRealtime();
method public int getBootCount();
@@ -106,7 +106,7 @@
ctor public Stopwatch.Builder(String, String);
ctor public Stopwatch.Builder(androidx.appsearch.builtintypes.Stopwatch);
method public androidx.appsearch.builtintypes.Stopwatch build();
- method public androidx.appsearch.builtintypes.Stopwatch.Builder setAccumulatedTimeMillis(long);
+ method public androidx.appsearch.builtintypes.Stopwatch.Builder setAccumulatedDurationMillis(long);
method public androidx.appsearch.builtintypes.Stopwatch.Builder setBaseTimeMillis(long, long, int);
method @RequiresApi(api=android.os.Build.VERSION_CODES.JELLY_BEAN_MR1) public androidx.appsearch.builtintypes.Stopwatch.Builder setBaseTimeMillis(android.content.Context, long, long);
method public androidx.appsearch.builtintypes.Stopwatch.Builder setCreationTimestampMillis(long);
@@ -118,13 +118,13 @@
}
@androidx.appsearch.annotation.Document(name="builtin:StopwatchLap") public class StopwatchLap {
- method public long getAccumulatedLapTimeMillis();
+ method public long getAccumulatedLapDurationMillis();
method public long getCreationTimestampMillis();
method public int getDocumentScore();
method public long getDocumentTtlMillis();
method public String getId();
+ method public long getLapDurationMillis();
method public int getLapNumber();
- method public long getLapTimeMillis();
method public String getNamespace();
}
@@ -132,17 +132,17 @@
ctor public StopwatchLap.Builder(String, String);
ctor public StopwatchLap.Builder(androidx.appsearch.builtintypes.StopwatchLap);
method public androidx.appsearch.builtintypes.StopwatchLap build();
- method public androidx.appsearch.builtintypes.StopwatchLap.Builder setAccumulatedLapTimeMillis(long);
+ method public androidx.appsearch.builtintypes.StopwatchLap.Builder setAccumulatedLapDurationMillis(long);
method public androidx.appsearch.builtintypes.StopwatchLap.Builder setCreationTimestampMillis(long);
method public androidx.appsearch.builtintypes.StopwatchLap.Builder setDocumentScore(int);
method public androidx.appsearch.builtintypes.StopwatchLap.Builder setDocumentTtlMillis(long);
+ method public androidx.appsearch.builtintypes.StopwatchLap.Builder setLapDurationMillis(long);
method public androidx.appsearch.builtintypes.StopwatchLap.Builder setLapNumber(int);
- method public androidx.appsearch.builtintypes.StopwatchLap.Builder setLapTimeMillis(long);
}
@androidx.appsearch.annotation.Document(name="builtin:Timer") public final class Timer {
method @RequiresApi(api=android.os.Build.VERSION_CODES.JELLY_BEAN_MR1) public long calculateBaseTimeMillis(android.content.Context);
- method @RequiresApi(api=android.os.Build.VERSION_CODES.JELLY_BEAN_MR1) public long calculateCurrentRemainingTimeMillis(android.content.Context);
+ method @RequiresApi(api=android.os.Build.VERSION_CODES.JELLY_BEAN_MR1) public long calculateCurrentRemainingDurationMillis(android.content.Context);
method @RequiresApi(api=android.os.Build.VERSION_CODES.JELLY_BEAN_MR1) public long calculateExpirationTimeMillis(android.content.Context);
method public long getBaseTimeMillis();
method public long getBaseTimeMillisInElapsedRealtime();
@@ -155,7 +155,7 @@
method public String? getName();
method public String getNamespace();
method public long getOriginalDurationMillis();
- method public long getRemainingTimeMillis();
+ method public long getRemainingDurationMillis();
method public String? getRingtone();
method public long getStartTimeMillis();
method public int getStatus();
@@ -180,7 +180,7 @@
method public androidx.appsearch.builtintypes.Timer.Builder setDurationMillis(long);
method public androidx.appsearch.builtintypes.Timer.Builder setName(String?);
method public androidx.appsearch.builtintypes.Timer.Builder setOriginalDurationMillis(long);
- method public androidx.appsearch.builtintypes.Timer.Builder setRemainingTimeMillis(long);
+ method public androidx.appsearch.builtintypes.Timer.Builder setRemainingDurationMillis(long);
method public androidx.appsearch.builtintypes.Timer.Builder setRingtone(String?);
method public androidx.appsearch.builtintypes.Timer.Builder setShouldVibrate(boolean);
method public androidx.appsearch.builtintypes.Timer.Builder setStartTimeMillis(long);
diff --git a/appsearch/appsearch-builtin-types/src/androidTest/java/androidx/appsearch/app/ShortcutAdapterTest.java b/appsearch/appsearch-builtin-types/src/androidTest/java/androidx/appsearch/app/ShortcutAdapterTest.java
index 036a48d..02027350 100644
--- a/appsearch/appsearch-builtin-types/src/androidTest/java/androidx/appsearch/app/ShortcutAdapterTest.java
+++ b/appsearch/appsearch-builtin-types/src/androidTest/java/androidx/appsearch/app/ShortcutAdapterTest.java
@@ -111,7 +111,7 @@
.setCreationTimestampMillis(100)
.setName(name)
.setDurationMillis(1000)
- .setRemainingTimeMillis(500)
+ .setRemainingDurationMillis(500)
.setRingtone("clock://ringtone/1")
.setStatus(Timer.STATUS_STARTED)
.setShouldVibrate(true)
diff --git a/appsearch/appsearch-builtin-types/src/androidTest/java/androidx/appsearch/builtintypes/StopwatchLapTest.java b/appsearch/appsearch-builtin-types/src/androidTest/java/androidx/appsearch/builtintypes/StopwatchLapTest.java
index 9e7a76a..ba77cd1 100644
--- a/appsearch/appsearch-builtin-types/src/androidTest/java/androidx/appsearch/builtintypes/StopwatchLapTest.java
+++ b/appsearch/appsearch-builtin-types/src/androidTest/java/androidx/appsearch/builtintypes/StopwatchLapTest.java
@@ -30,8 +30,8 @@
.setCreationTimestampMillis(100)
.setDocumentTtlMillis(6000)
.setLapNumber(2)
- .setLapTimeMillis(100)
- .setAccumulatedLapTimeMillis(1100)
+ .setLapDurationMillis(100)
+ .setAccumulatedLapDurationMillis(1100)
.build();
assertThat(stopwatchLap.getNamespace()).isEqualTo("namespace");
@@ -40,8 +40,8 @@
assertThat(stopwatchLap.getCreationTimestampMillis()).isEqualTo(100);
assertThat(stopwatchLap.getDocumentTtlMillis()).isEqualTo(6000);
assertThat(stopwatchLap.getLapNumber()).isEqualTo(2);
- assertThat(stopwatchLap.getLapTimeMillis()).isEqualTo(100);
- assertThat(stopwatchLap.getAccumulatedLapTimeMillis()).isEqualTo(1100);
+ assertThat(stopwatchLap.getLapDurationMillis()).isEqualTo(100);
+ assertThat(stopwatchLap.getAccumulatedLapDurationMillis()).isEqualTo(1100);
}
@Test
@@ -51,8 +51,8 @@
.setCreationTimestampMillis(100)
.setDocumentTtlMillis(6000)
.setLapNumber(2)
- .setLapTimeMillis(100)
- .setAccumulatedLapTimeMillis(1100)
+ .setLapDurationMillis(100)
+ .setAccumulatedLapDurationMillis(1100)
.build();
StopwatchLap stopwatchLap2 = new StopwatchLap.Builder(stopwatchLap1).build();
@@ -64,10 +64,10 @@
assertThat(stopwatchLap1.getDocumentTtlMillis())
.isEqualTo(stopwatchLap2.getDocumentTtlMillis());
assertThat(stopwatchLap1.getLapNumber()).isEqualTo(stopwatchLap2.getLapNumber());
- assertThat(stopwatchLap1.getLapTimeMillis())
- .isEqualTo(stopwatchLap2.getLapTimeMillis());
- assertThat(stopwatchLap1.getAccumulatedLapTimeMillis())
- .isEqualTo(stopwatchLap2.getAccumulatedLapTimeMillis());
+ assertThat(stopwatchLap1.getLapDurationMillis())
+ .isEqualTo(stopwatchLap2.getLapDurationMillis());
+ assertThat(stopwatchLap1.getAccumulatedLapDurationMillis())
+ .isEqualTo(stopwatchLap2.getAccumulatedLapDurationMillis());
}
@Test
@@ -77,8 +77,8 @@
.setCreationTimestampMillis(100)
.setDocumentTtlMillis(6000)
.setLapNumber(2)
- .setLapTimeMillis(100)
- .setAccumulatedLapTimeMillis(1100)
+ .setLapDurationMillis(100)
+ .setAccumulatedLapDurationMillis(1100)
.build();
GenericDocument genericDocument = GenericDocument.fromDocumentClass(stopwatchLap);
@@ -89,8 +89,8 @@
assertThat(genericDocument.getCreationTimestampMillis()).isEqualTo(100);
assertThat(genericDocument.getTtlMillis()).isEqualTo(6000);
assertThat(genericDocument.getPropertyLong("lapNumber")).isEqualTo(2);
- assertThat(genericDocument.getPropertyLong("lapTimeMillis")).isEqualTo(100);
- assertThat(genericDocument.getPropertyLong("accumulatedLapTimeMillis"))
+ assertThat(genericDocument.getPropertyLong("lapDurationMillis")).isEqualTo(100);
+ assertThat(genericDocument.getPropertyLong("accumulatedLapDurationMillis"))
.isEqualTo(1100);
}
}
diff --git a/appsearch/appsearch-builtin-types/src/androidTest/java/androidx/appsearch/builtintypes/StopwatchTest.java b/appsearch/appsearch-builtin-types/src/androidTest/java/androidx/appsearch/builtintypes/StopwatchTest.java
index a98f255f..97e1481 100644
--- a/appsearch/appsearch-builtin-types/src/androidTest/java/androidx/appsearch/builtintypes/StopwatchTest.java
+++ b/appsearch/appsearch-builtin-types/src/androidTest/java/androidx/appsearch/builtintypes/StopwatchTest.java
@@ -29,13 +29,13 @@
public void testBuilder() {
StopwatchLap lap1 = new StopwatchLap.Builder("namespace", "lap1")
.setLapNumber(1)
- .setLapTimeMillis(1000)
- .setAccumulatedLapTimeMillis(1000)
+ .setLapDurationMillis(1000)
+ .setAccumulatedLapDurationMillis(1000)
.build();
StopwatchLap lap2 = new StopwatchLap.Builder("namespace", "lap2")
.setLapNumber(2)
- .setLapTimeMillis(100)
- .setAccumulatedLapTimeMillis(1100)
+ .setLapDurationMillis(100)
+ .setAccumulatedLapDurationMillis(1100)
.build();
Stopwatch stopwatch = new Stopwatch.Builder("namespace", "id")
.setDocumentScore(1)
@@ -47,7 +47,7 @@
/*baseTimeMillisInElapsedRealtime=*/1000,
/*bootCount=*/1)
.setStatus(Stopwatch.STATUS_RUNNING)
- .setAccumulatedTimeMillis(1100)
+ .setAccumulatedDurationMillis(1100)
.setLaps(ImmutableList.of(lap1, lap2))
.build();
@@ -61,7 +61,7 @@
assertThat(stopwatch.getBaseTimeMillisInElapsedRealtime()).isEqualTo(1000);
assertThat(stopwatch.getBootCount()).isEqualTo(1);
assertThat(stopwatch.getStatus()).isEqualTo(Stopwatch.STATUS_RUNNING);
- assertThat(stopwatch.getAccumulatedTimeMillis()).isEqualTo(1100);
+ assertThat(stopwatch.getAccumulatedDurationMillis()).isEqualTo(1100);
assertThat(stopwatch.getLaps()).containsExactly(lap1, lap2).inOrder();
}
@@ -69,13 +69,13 @@
public void testBuilderCopy_allFieldsCopied() {
StopwatchLap lap1 = new StopwatchLap.Builder("namespace", "lap1")
.setLapNumber(1)
- .setLapTimeMillis(1000)
- .setAccumulatedLapTimeMillis(1000)
+ .setLapDurationMillis(1000)
+ .setAccumulatedLapDurationMillis(1000)
.build();
StopwatchLap lap2 = new StopwatchLap.Builder("namespace", "lap2")
.setLapNumber(2)
- .setLapTimeMillis(100)
- .setAccumulatedLapTimeMillis(1100)
+ .setLapDurationMillis(100)
+ .setAccumulatedLapDurationMillis(1100)
.build();
Stopwatch stopwatch1 = new Stopwatch.Builder("namespace", "id")
.setDocumentScore(1)
@@ -87,7 +87,7 @@
/*baseTimeMillisInElapsedRealtime=*/1000,
/*bootCount=*/1)
.setStatus(Stopwatch.STATUS_RUNNING)
- .setAccumulatedTimeMillis(1100)
+ .setAccumulatedDurationMillis(1100)
.setLaps(ImmutableList.of(lap1, lap2))
.build();
Stopwatch stopwatch2 = new Stopwatch.Builder(stopwatch1).build();
@@ -105,8 +105,8 @@
.isEqualTo(stopwatch2.getBaseTimeMillisInElapsedRealtime());
assertThat(stopwatch1.getBootCount()).isEqualTo(stopwatch2.getBootCount());
assertThat(stopwatch1.getStatus()).isEqualTo(stopwatch2.getStatus());
- assertThat(stopwatch1.getAccumulatedTimeMillis())
- .isEqualTo(stopwatch2.getAccumulatedTimeMillis());
+ assertThat(stopwatch1.getAccumulatedDurationMillis())
+ .isEqualTo(stopwatch2.getAccumulatedDurationMillis());
assertThat(stopwatch1.getLaps()).containsExactly(stopwatch2.getLaps().toArray()).inOrder();
}
@@ -115,14 +115,14 @@
StopwatchLap lap1 = new StopwatchLap.Builder("namespace", "lap1")
.setCreationTimestampMillis(100)
.setLapNumber(1)
- .setLapTimeMillis(1000)
- .setAccumulatedLapTimeMillis(1000)
+ .setLapDurationMillis(1000)
+ .setAccumulatedLapDurationMillis(1000)
.build();
StopwatchLap lap2 = new StopwatchLap.Builder("namespace", "lap2")
.setCreationTimestampMillis(100)
.setLapNumber(2)
- .setLapTimeMillis(100)
- .setAccumulatedLapTimeMillis(1100)
+ .setLapDurationMillis(100)
+ .setAccumulatedLapDurationMillis(1100)
.build();
Stopwatch stopwatch = new Stopwatch.Builder("namespace", "id")
.setDocumentScore(1)
@@ -134,7 +134,7 @@
/*baseTimeMillisInElapsedRealtime=*/1000,
/*bootCount=*/1)
.setStatus(Stopwatch.STATUS_RUNNING)
- .setAccumulatedTimeMillis(1100)
+ .setAccumulatedDurationMillis(1100)
.setLaps(ImmutableList.of(lap1, lap2))
.build();
@@ -151,7 +151,7 @@
.isEqualTo(1000);
assertThat(genericDocument.getPropertyLong("bootCount")).isEqualTo(1);
assertThat(genericDocument.getPropertyLong("status")).isEqualTo(Stopwatch.STATUS_RUNNING);
- assertThat(genericDocument.getPropertyLong("accumulatedTimeMillis"))
+ assertThat(genericDocument.getPropertyLong("accumulatedDurationMillis"))
.isEqualTo(1100);
assertThat(genericDocument.getPropertyDocumentArray("laps")).asList().containsExactly(
GenericDocument.fromDocumentClass(lap1), GenericDocument.fromDocumentClass(lap2));
diff --git a/appsearch/appsearch-builtin-types/src/androidTest/java/androidx/appsearch/builtintypes/TimerTest.java b/appsearch/appsearch-builtin-types/src/androidTest/java/androidx/appsearch/builtintypes/TimerTest.java
index 1dba255..d0b6b61 100644
--- a/appsearch/appsearch-builtin-types/src/androidTest/java/androidx/appsearch/builtintypes/TimerTest.java
+++ b/appsearch/appsearch-builtin-types/src/androidTest/java/androidx/appsearch/builtintypes/TimerTest.java
@@ -32,7 +32,7 @@
.setName("my timer")
.setDurationMillis(1000)
.setOriginalDurationMillis(800)
- .setRemainingTimeMillis(500)
+ .setRemainingDurationMillis(500)
.setRingtone("clock://ringtone/1")
.setStatus(Timer.STATUS_STARTED)
.setShouldVibrate(true)
@@ -51,7 +51,7 @@
assertThat(timer.getName()).isEqualTo("my timer");
assertThat(timer.getDurationMillis()).isEqualTo(1000);
assertThat(timer.getOriginalDurationMillis()).isEqualTo(800);
- assertThat(timer.getRemainingTimeMillis()).isEqualTo(500);
+ assertThat(timer.getRemainingDurationMillis()).isEqualTo(500);
assertThat(timer.getRingtone()).isEqualTo("clock://ringtone/1");
assertThat(timer.getStatus()).isEqualTo(Timer.STATUS_STARTED);
assertThat(timer.shouldVibrate()).isEqualTo(true);
@@ -70,7 +70,7 @@
.setName("my timer")
.setDurationMillis(1000)
.setOriginalDurationMillis(800)
- .setRemainingTimeMillis(500)
+ .setRemainingDurationMillis(500)
.setRingtone("clock://ringtone/1")
.setStatus(Timer.STATUS_STARTED)
.setShouldVibrate(true)
@@ -92,7 +92,8 @@
assertThat(timer1.getDurationMillis()).isEqualTo(timer2.getDurationMillis());
assertThat(timer1.getOriginalDurationMillis())
.isEqualTo(timer2.getOriginalDurationMillis());
- assertThat(timer1.getRemainingTimeMillis()).isEqualTo(timer2.getRemainingTimeMillis());
+ assertThat(timer1.getRemainingDurationMillis())
+ .isEqualTo(timer2.getRemainingDurationMillis());
assertThat(timer1.getRingtone()).isEqualTo(timer2.getRingtone());
assertThat(timer1.getStatus()).isEqualTo(timer2.getStatus());
assertThat(timer1.shouldVibrate()).isEqualTo(timer2.shouldVibrate());
@@ -112,7 +113,7 @@
.setName("my timer")
.setDurationMillis(1000)
.setOriginalDurationMillis(800)
- .setRemainingTimeMillis(500)
+ .setRemainingDurationMillis(500)
.setRingtone("clock://ringtone/1")
.setStatus(Timer.STATUS_STARTED)
.setShouldVibrate(true)
@@ -134,7 +135,7 @@
assertThat(genericDocument.getPropertyLong("durationMillis")).isEqualTo(1000);
assertThat(genericDocument.getPropertyLong("originalDurationMillis"))
.isEqualTo(800);
- assertThat(genericDocument.getPropertyLong("remainingTimeMillis"))
+ assertThat(genericDocument.getPropertyLong("remainingDurationMillis"))
.isEqualTo(500);
assertThat(genericDocument.getPropertyString("ringtone")).isEqualTo("clock://ringtone/1");
assertThat(genericDocument.getPropertyLong("status")).isEqualTo(1);
diff --git a/appsearch/appsearch-builtin-types/src/androidTest/java/androidx/appsearch/utils/DateTimeFormatValidatorTest.java b/appsearch/appsearch-builtin-types/src/androidTest/java/androidx/appsearch/utils/DateTimeFormatValidatorTest.java
index df1b190..e64b432 100644
--- a/appsearch/appsearch-builtin-types/src/androidTest/java/androidx/appsearch/utils/DateTimeFormatValidatorTest.java
+++ b/appsearch/appsearch-builtin-types/src/androidTest/java/androidx/appsearch/utils/DateTimeFormatValidatorTest.java
@@ -18,9 +18,26 @@
import static com.google.common.truth.Truth.assertThat;
+import org.junit.After;
+import org.junit.Before;
import org.junit.Test;
+import java.util.Locale;
+
public class DateTimeFormatValidatorTest {
+ private Locale mDefaultLocale;
+
+ @Before
+ public void setUp() {
+ mDefaultLocale = Locale.getDefault();
+ }
+
+ @After
+ public void tearDown() {
+ // revert to default locale
+ Locale.setDefault(mDefaultLocale);
+ }
+
@Test
public void testValidateISO8601Date_validDate_returnsTrue() {
assertThat(DateTimeFormatValidator.validateISO8601Date("2022-01-01")).isTrue();
@@ -60,4 +77,11 @@
assertThat(DateTimeFormatValidator.validateISO8601DateTime("2022-01-01T00:00:00.000"))
.isFalse();
}
+
+ @Test
+ public void testValidateISO8601DateTime_nonArabicNumeralLocale_returnsTrue() {
+ Locale.setDefault(new Locale("ar", "EG"));
+ assertThat(DateTimeFormatValidator.validateISO8601DateTime("2022-01-01T00:00:00"))
+ .isTrue();
+ }
}
diff --git a/appsearch/appsearch-builtin-types/src/main/java/androidx/appsearch/builtintypes/Stopwatch.java b/appsearch/appsearch-builtin-types/src/main/java/androidx/appsearch/builtintypes/Stopwatch.java
index ea6729d..b8c43da 100644
--- a/appsearch/appsearch-builtin-types/src/main/java/androidx/appsearch/builtintypes/Stopwatch.java
+++ b/appsearch/appsearch-builtin-types/src/main/java/androidx/appsearch/builtintypes/Stopwatch.java
@@ -88,7 +88,7 @@
private final int mStatus;
@Document.LongProperty
- private final long mAccumulatedTimeMillis;
+ private final long mAccumulatedDurationMillis;
@Document.DocumentProperty
private final List<StopwatchLap> mLaps;
@@ -97,7 +97,7 @@
long creationTimestampMillis,
long documentTtlMillis, @Nullable String name, long baseTimeMillis,
long baseTimeMillisInElapsedRealtime, int bootCount, int status,
- long accumulatedTimeMillis, @NonNull List<StopwatchLap> laps) {
+ long accumulatedDurationMillis, @NonNull List<StopwatchLap> laps) {
mNamespace = Preconditions.checkNotNull(namespace);
mId = Preconditions.checkNotNull(id);
mDocumentScore = documentScore;
@@ -108,7 +108,7 @@
mBaseTimeMillisInElapsedRealtime = baseTimeMillisInElapsedRealtime;
mBootCount = bootCount;
mStatus = status;
- mAccumulatedTimeMillis = accumulatedTimeMillis;
+ mAccumulatedDurationMillis = accumulatedDurationMillis;
mLaps = Preconditions.checkNotNull(laps);
}
@@ -218,11 +218,11 @@
* Returns the total duration in milliseconds accumulated by the {@link Stopwatch}.
*
* <p>Use this method to get the static accumulated time stored in the document. Use
- * {@link #calculateCurrentAccumulatedTimeMillis(Context)} to calculate the accumulated time
+ * {@link #calculateCurrentAccumulatedDurationMillis(Context)} to calculate the accumulated time
* in real time.
*/
- public long getAccumulatedTimeMillis() {
- return mAccumulatedTimeMillis;
+ public long getAccumulatedDurationMillis() {
+ return mAccumulatedDurationMillis;
}
/** Returns all the {@link StopwatchLap} instances. */
@@ -259,17 +259,17 @@
* Calculates the current accumulated time in milliseconds.
*
* <p>Use this method to calculate the accumulated time in real time. Use
- * {@link #getAccumulatedTimeMillis()} to get the static accumulated time stored in the
+ * {@link #getAccumulatedDurationMillis()} to get the static accumulated time stored in the
* document.
*/
@RequiresApi(api = Build.VERSION_CODES.JELLY_BEAN_MR1)
- public long calculateCurrentAccumulatedTimeMillis(@NonNull Context context) {
+ public long calculateCurrentAccumulatedDurationMillis(@NonNull Context context) {
if (mStatus == STATUS_PAUSED || mStatus == STATUS_RESET) {
- return mAccumulatedTimeMillis;
+ return mAccumulatedDurationMillis;
}
return System.currentTimeMillis() - calculateBaseTimeMillis(context)
- + mAccumulatedTimeMillis;
+ + mAccumulatedDurationMillis;
}
/** Builder for {@link Stopwatch}. */
@@ -279,7 +279,7 @@
private long mBaseTimeMillisInElapsedRealtime;
private int mBootCount;
private int mStatus;
- private long mAccumulatedTimeMillis;
+ private long mAccumulatedDurationMillis;
private List<StopwatchLap> mLaps;
/**
@@ -310,7 +310,7 @@
stopwatch.getBaseTimeMillisInElapsedRealtime();
mBootCount = stopwatch.getBootCount();
mStatus = stopwatch.getStatus();
- mAccumulatedTimeMillis = stopwatch.getAccumulatedTimeMillis();
+ mAccumulatedDurationMillis = stopwatch.getAccumulatedDurationMillis();
mLaps = stopwatch.getLaps();
}
@@ -381,8 +381,8 @@
* Sets the total duration in milliseconds accumulated by the {@link Stopwatch}.
*/
@NonNull
- public Builder setAccumulatedTimeMillis(long accumulatedTimeMillis) {
- mAccumulatedTimeMillis = accumulatedTimeMillis;
+ public Builder setAccumulatedDurationMillis(long accumulatedDurationMillis) {
+ mAccumulatedDurationMillis = accumulatedDurationMillis;
return this;
}
@@ -399,7 +399,7 @@
return new Stopwatch(mNamespace, mId, mDocumentScore,
mCreationTimestampMillis, mDocumentTtlMillis, mName, mBaseTimeMillis,
mBaseTimeMillisInElapsedRealtime, mBootCount, mStatus,
- mAccumulatedTimeMillis, mLaps);
+ mAccumulatedDurationMillis, mLaps);
}
}
}
diff --git a/appsearch/appsearch-builtin-types/src/main/java/androidx/appsearch/builtintypes/StopwatchLap.java b/appsearch/appsearch-builtin-types/src/main/java/androidx/appsearch/builtintypes/StopwatchLap.java
index 9c29740..f747b1b 100644
--- a/appsearch/appsearch-builtin-types/src/main/java/androidx/appsearch/builtintypes/StopwatchLap.java
+++ b/appsearch/appsearch-builtin-types/src/main/java/androidx/appsearch/builtintypes/StopwatchLap.java
@@ -49,22 +49,22 @@
private final int mLapNumber;
@Document.LongProperty
- private final long mLapTimeMillis;
+ private final long mLapDurationMillis;
@Document.LongProperty
- private final long mAccumulatedLapTimeMillis;
+ private final long mAccumulatedLapDurationMillis;
StopwatchLap(@NonNull String namespace, @NonNull String id, int documentScore,
long creationTimestampMillis, long documentTtlMillis, int lapNumber,
- long lapTimeMillis, long accumulatedLapTimeMillis) {
+ long lapDurationMillis, long accumulatedLapDurationMillis) {
mNamespace = Preconditions.checkNotNull(namespace);
mId = Preconditions.checkNotNull(id);
mDocumentScore = documentScore;
mCreationTimestampMillis = creationTimestampMillis;
mDocumentTtlMillis = documentTtlMillis;
mLapNumber = lapNumber;
- mLapTimeMillis = lapTimeMillis;
- mAccumulatedLapTimeMillis = accumulatedLapTimeMillis;
+ mLapDurationMillis = lapDurationMillis;
+ mAccumulatedLapDurationMillis = accumulatedLapDurationMillis;
}
/** Returns the namespace. */
@@ -126,23 +126,23 @@
/**
* Returns the total duration in milliseconds accumulated by the current {@link StopwatchLap}.
*/
- public long getLapTimeMillis() {
- return mLapTimeMillis;
+ public long getLapDurationMillis() {
+ return mLapDurationMillis;
}
/**
* Returns the total duration in milliseconds accumulated by all the {@link StopwatchLap}
* instances up to and including this one.
*/
- public long getAccumulatedLapTimeMillis() {
- return mAccumulatedLapTimeMillis;
+ public long getAccumulatedLapDurationMillis() {
+ return mAccumulatedLapDurationMillis;
}
/** Builder for {@link StopwatchLap}. */
public static final class Builder extends BaseBuiltinTypeBuilder<Builder> {
private int mLapNumber;
- private long mLapTimeMillis;
- private long mAccumulatedLapTimeMillis;
+ private long mLapDurationMillis;
+ private long mAccumulatedLapDurationMillis;
/**
* Constructor for {@link StopwatchLap.Builder}.
@@ -164,9 +164,9 @@
this.mCreationTimestampMillis = stopwatchLap.getCreationTimestampMillis();
this.mDocumentTtlMillis = stopwatchLap.getDocumentTtlMillis();
this.mLapNumber = stopwatchLap.getLapNumber();
- this.mLapTimeMillis = stopwatchLap.getLapTimeMillis();
- this.mAccumulatedLapTimeMillis =
- stopwatchLap.getAccumulatedLapTimeMillis();
+ this.mLapDurationMillis = stopwatchLap.getLapDurationMillis();
+ this.mAccumulatedLapDurationMillis =
+ stopwatchLap.getAccumulatedLapDurationMillis();
}
/** Sets the position of the current {@link StopwatchLap}, starting at 1. */
@@ -181,8 +181,8 @@
* Sets the total duration in milliseconds accumulated by the current {@link StopwatchLap}.
*/
@NonNull
- public Builder setLapTimeMillis(long lapTimeMillis) {
- mLapTimeMillis = lapTimeMillis;
+ public Builder setLapDurationMillis(long lapDurationMillis) {
+ mLapDurationMillis = lapDurationMillis;
return this;
}
@@ -191,8 +191,8 @@
* instances up to and including this one.
*/
@NonNull
- public Builder setAccumulatedLapTimeMillis(long accumulatedLapTimeMillis) {
- mAccumulatedLapTimeMillis = accumulatedLapTimeMillis;
+ public Builder setAccumulatedLapDurationMillis(long accumulatedLapDurationMillis) {
+ mAccumulatedLapDurationMillis = accumulatedLapDurationMillis;
return this;
}
@@ -201,7 +201,7 @@
public StopwatchLap build() {
return new StopwatchLap(mNamespace, mId, mDocumentScore,
mCreationTimestampMillis, mDocumentTtlMillis, mLapNumber,
- mLapTimeMillis, mAccumulatedLapTimeMillis);
+ mLapDurationMillis, mAccumulatedLapDurationMillis);
}
}
}
diff --git a/appsearch/appsearch-builtin-types/src/main/java/androidx/appsearch/builtintypes/Timer.java b/appsearch/appsearch-builtin-types/src/main/java/androidx/appsearch/builtintypes/Timer.java
index d4c1b26..0318d70 100644
--- a/appsearch/appsearch-builtin-types/src/main/java/androidx/appsearch/builtintypes/Timer.java
+++ b/appsearch/appsearch-builtin-types/src/main/java/androidx/appsearch/builtintypes/Timer.java
@@ -95,7 +95,7 @@
private final int mBootCount;
@Document.LongProperty
- private final long mRemainingTimeMillis;
+ private final long mRemainingDurationMillis;
@Document.StringProperty
private final String mRingtone;
@@ -110,7 +110,7 @@
long creationTimestampMillis, long documentTtlMillis, @Nullable String name,
long durationMillis, long originalDurationMillis, long startTimeMillis,
long baseTimeMillis, long baseTimeMillisInElapsedRealtime, int bootCount,
- long remainingTimeMillis, @Nullable String ringtone, int status,
+ long remainingDurationMillis, @Nullable String ringtone, int status,
boolean shouldVibrate) {
mNamespace = Preconditions.checkNotNull(namespace);
mId = Preconditions.checkNotNull(id);
@@ -124,7 +124,7 @@
mBaseTimeMillis = baseTimeMillis;
mBaseTimeMillisInElapsedRealtime = baseTimeMillisInElapsedRealtime;
mBootCount = bootCount;
- mRemainingTimeMillis = remainingTimeMillis;
+ mRemainingDurationMillis = remainingDurationMillis;
mRingtone = ringtone;
mStatus = status;
mShouldVibrate = shouldVibrate;
@@ -221,7 +221,7 @@
/**
* Returns the point in time that the {@link Timer} counts down from, relative to its
- * {@link #getRemainingTimeMillis()}. In milliseconds using the
+ * {@link #getRemainingDurationMillis()}. In milliseconds using the
* {@link System#currentTimeMillis()} time base.
*
* <p>The expire time of the Timer can be calculated using the sum of its base time and
@@ -236,7 +236,7 @@
/**
* Returns the point in time that the {@link Timer} counts down from, relative to its
- * {@link #getRemainingTimeMillis()}. In milliseconds using the
+ * {@link #getRemainingDurationMillis()}. In milliseconds using the
* {@link android.os.SystemClock#elapsedRealtime()} time base.
*
* <p>ElapsedRealtime should only be used if the {@link #getBootCount()} matches the
@@ -273,11 +273,11 @@
* remaining time.
*
* <p>Use this method to get the static remaining time stored in the document. Use
- * {@link #calculateCurrentRemainingTimeMillis(Context)} to calculate the remaining time at
+ * {@link #calculateCurrentRemainingDurationMillis(Context)} to calculate the remaining time at
* runtime.
*/
- public long getRemainingTimeMillis() {
- return mRemainingTimeMillis;
+ public long getRemainingDurationMillis() {
+ return mRemainingDurationMillis;
}
/**
@@ -347,7 +347,7 @@
return Long.MAX_VALUE;
}
- return calculateBaseTimeMillis(context) + mRemainingTimeMillis;
+ return calculateBaseTimeMillis(context) + mRemainingDurationMillis;
}
/**
@@ -357,19 +357,19 @@
* {@link #STATUS_EXPIRED} to indicate it has already fired.
*
* <p>Use this method to calculate the remaining time at runtime. Use
- * {@link #getRemainingTimeMillis()} to get the static remaining time stored in the document.
+ * {@link #getRemainingDurationMillis()} to get the static remaining time stored in the document.
*
* @param context The app context
*/
@RequiresApi(api = Build.VERSION_CODES.JELLY_BEAN_MR1)
- public long calculateCurrentRemainingTimeMillis(@NonNull Context context) {
+ public long calculateCurrentRemainingDurationMillis(@NonNull Context context) {
if (mStatus == STATUS_PAUSED || mStatus == STATUS_RESET) {
// The timer has not started, so the remaining time is the same as the last updated one.
- return mRemainingTimeMillis;
+ return mRemainingDurationMillis;
}
long elapsedTime = System.currentTimeMillis() - calculateBaseTimeMillis(context);
- return mRemainingTimeMillis - elapsedTime;
+ return mRemainingDurationMillis - elapsedTime;
}
/** Builder for {@link Timer}. */
@@ -381,7 +381,7 @@
private long mBaseTimeMillis;
private long mBaseTimeMillisInElapsedRealtime;
private int mBootCount;
- private long mRemainingTimeMillis;
+ private long mRemainingDurationMillis;
private String mRingtone;
private int mStatus;
private boolean mShouldVibrate;
@@ -411,7 +411,7 @@
mBaseTimeMillis = timer.getBaseTimeMillis();
mBaseTimeMillisInElapsedRealtime = timer.getBaseTimeMillisInElapsedRealtime();
mBootCount = timer.getBootCount();
- mRemainingTimeMillis = timer.getRemainingTimeMillis();
+ mRemainingDurationMillis = timer.getRemainingDurationMillis();
mRingtone = timer.getRingtone();
mStatus = timer.getStatus();
mShouldVibrate = timer.shouldVibrate();
@@ -457,7 +457,7 @@
/**
* Sets the point in time that the {@link Timer} counts down from, relative to its
- * {@link #setRemainingTimeMillis(long)}.
+ * {@link #setRemainingDurationMillis(long)}.
*
* <p>The expire time of the Timer can be calculated using the sum of its base time and
* remaining time.
@@ -485,7 +485,7 @@
/**
* Sets the point in time that the {@link Timer} counts down from, relative to its
- * {@link #setRemainingTimeMillis(long)}.
+ * {@link #setRemainingDurationMillis(long)}.
*
* <p>The expire time of the Timer can be calculated using the sum of its base time and
* remaining time.
@@ -514,8 +514,8 @@
* remaining time.
*/
@NonNull
- public Builder setRemainingTimeMillis(long remainingTimeMillis) {
- mRemainingTimeMillis = remainingTimeMillis;
+ public Builder setRemainingDurationMillis(long remainingDurationMillis) {
+ mRemainingDurationMillis = remainingDurationMillis;
return this;
}
@@ -556,7 +556,7 @@
mCreationTimestampMillis, mDocumentTtlMillis, mName, mDurationMillis,
mOriginalDurationMillis, mStartTimeMillis,
mBaseTimeMillis, mBaseTimeMillisInElapsedRealtime, mBootCount,
- mRemainingTimeMillis, mRingtone, mStatus, mShouldVibrate);
+ mRemainingDurationMillis, mRingtone, mStatus, mShouldVibrate);
}
}
}
diff --git a/appsearch/appsearch-builtin-types/src/main/java/androidx/appsearch/utils/DateTimeFormatValidator.java b/appsearch/appsearch-builtin-types/src/main/java/androidx/appsearch/utils/DateTimeFormatValidator.java
index 467f10f..452cde7 100644
--- a/appsearch/appsearch-builtin-types/src/main/java/androidx/appsearch/utils/DateTimeFormatValidator.java
+++ b/appsearch/appsearch-builtin-types/src/main/java/androidx/appsearch/utils/DateTimeFormatValidator.java
@@ -25,6 +25,7 @@
import java.text.ParseException;
import java.text.SimpleDateFormat;
import java.util.Date;
+import java.util.Locale;
/**
* Helper class used to validate date time formats.
@@ -54,7 +55,11 @@
* Returns true if the date string matches the provided format exactly.
*/
public static boolean validateDateFormat(@NonNull String format, @NonNull String dateString) {
- DateFormat dateFormat = new SimpleDateFormat(format);
+ // ISO 8601 DateTime format must be represented using arabic numerals (0-9). en-US is
+ // one of many locales that uses arabic numerals, therefore it is used during formatting.
+ // Even if the user's device is not in the en-US locale, this will still work since ISO
+ // 8601 is an international standard, and does not change based on locales.
+ DateFormat dateFormat = new SimpleDateFormat(format, Locale.US);
dateFormat.setLenient(false);
try {
Date date = dateFormat.parse(dateString);
diff --git a/benchmark/benchmark-common/src/main/java/androidx/benchmark/perfetto/PerfettoConfig.kt b/benchmark/benchmark-common/src/main/java/androidx/benchmark/perfetto/PerfettoConfig.kt
index 093758b..60d54ed 100644
--- a/benchmark/benchmark-common/src/main/java/androidx/benchmark/perfetto/PerfettoConfig.kt
+++ b/benchmark/benchmark-common/src/main/java/androidx/benchmark/perfetto/PerfettoConfig.kt
@@ -170,7 +170,8 @@
PROCESS_STATS_DATASOURCE,
LINUX_SYS_STATS_DATASOURCE,
ANDROID_POWER_DATASOURCE,
- TraceConfig.DataSource(DataSourceConfig("android.surfaceflinger.frametimeline"))
+ TraceConfig.DataSource(DataSourceConfig("android.surfaceflinger.frametimeline")),
+ TraceConfig.DataSource(DataSourceConfig("track_event")) // required by tracing-perfetto
),
// periodically dump to file, so we don't overrun our ring buffer
// buffers are expected to be big enough for 5 seconds, so conservatively set 2.5 dump
diff --git a/benchmark/benchmark-macro/api/restricted_current.txt b/benchmark/benchmark-macro/api/restricted_current.txt
index 9874274..5d42dbb 100644
--- a/benchmark/benchmark-macro/api/restricted_current.txt
+++ b/benchmark/benchmark-macro/api/restricted_current.txt
@@ -47,10 +47,6 @@
method @RestrictTo(androidx.annotation.RestrictTo.Scope.LIBRARY_GROUP_PREFIX) public static boolean isSupportedWithVmSettings(androidx.benchmark.macro.CompilationMode);
}
- @RequiresApi(29) @RestrictTo(androidx.annotation.RestrictTo.Scope.LIBRARY_GROUP_PREFIX) public final class EnergyMetric extends androidx.benchmark.macro.Metric {
- ctor public EnergyMetric();
- }
-
@RestrictTo(androidx.annotation.RestrictTo.Scope.LIBRARY_GROUP_PREFIX) public final class FrameTimingGfxInfoMetric extends androidx.benchmark.macro.Metric {
ctor public FrameTimingGfxInfoMetric();
}
@@ -94,8 +90,38 @@
public final class MetricResultExtensionsKt {
}
+ @RestrictTo(androidx.annotation.RestrictTo.Scope.LIBRARY_GROUP_PREFIX) public enum PowerCategory {
+ enum_constant public static final androidx.benchmark.macro.PowerCategory CPU;
+ enum_constant public static final androidx.benchmark.macro.PowerCategory DISPLAY;
+ enum_constant public static final androidx.benchmark.macro.PowerCategory GPS;
+ enum_constant public static final androidx.benchmark.macro.PowerCategory GPU;
+ enum_constant public static final androidx.benchmark.macro.PowerCategory MACHINE_LEARNING;
+ enum_constant public static final androidx.benchmark.macro.PowerCategory MEMORY;
+ enum_constant public static final androidx.benchmark.macro.PowerCategory NETWORK;
+ enum_constant public static final androidx.benchmark.macro.PowerCategory UNCATEGORIZED;
+ }
+
+ @RestrictTo(androidx.annotation.RestrictTo.Scope.LIBRARY_GROUP_PREFIX) public enum PowerCategoryDisplayLevel {
+ enum_constant public static final androidx.benchmark.macro.PowerCategoryDisplayLevel BREAKDOWN;
+ enum_constant public static final androidx.benchmark.macro.PowerCategoryDisplayLevel TOTAL;
+ }
+
@RequiresApi(29) @RestrictTo(androidx.annotation.RestrictTo.Scope.LIBRARY_GROUP_PREFIX) public final class PowerMetric extends androidx.benchmark.macro.Metric {
- ctor public PowerMetric();
+ ctor public PowerMetric(androidx.benchmark.macro.PowerMetric.Type type);
+ }
+
+ public abstract static sealed class PowerMetric.Type {
+ method public final java.util.Map<androidx.benchmark.macro.PowerCategory,androidx.benchmark.macro.PowerCategoryDisplayLevel> getCategories();
+ method public final void setCategories(java.util.Map<androidx.benchmark.macro.PowerCategory,? extends androidx.benchmark.macro.PowerCategoryDisplayLevel>);
+ property public final java.util.Map<androidx.benchmark.macro.PowerCategory,androidx.benchmark.macro.PowerCategoryDisplayLevel> categories;
+ }
+
+ public static final class PowerMetric.Type.Energy extends androidx.benchmark.macro.PowerMetric.Type {
+ ctor public PowerMetric.Type.Energy(optional java.util.Map<androidx.benchmark.macro.PowerCategory,? extends androidx.benchmark.macro.PowerCategoryDisplayLevel> energyCategories);
+ }
+
+ public static final class PowerMetric.Type.Power extends androidx.benchmark.macro.PowerMetric.Type {
+ ctor public PowerMetric.Type.Power(optional java.util.Map<androidx.benchmark.macro.PowerCategory,? extends androidx.benchmark.macro.PowerCategoryDisplayLevel> powerCategories);
}
@RestrictTo(androidx.annotation.RestrictTo.Scope.LIBRARY_GROUP_PREFIX) public final class PowerRail {
@@ -120,14 +146,6 @@
public final class TagKt {
}
- @RequiresApi(29) @RestrictTo(androidx.annotation.RestrictTo.Scope.LIBRARY_GROUP_PREFIX) public final class TotalEnergyMetric extends androidx.benchmark.macro.Metric {
- ctor public TotalEnergyMetric();
- }
-
- @RequiresApi(29) @RestrictTo(androidx.annotation.RestrictTo.Scope.LIBRARY_GROUP_PREFIX) public final class TotalPowerMetric extends androidx.benchmark.macro.Metric {
- ctor public TotalPowerMetric();
- }
-
}
package androidx.benchmark.macro.perfetto {
diff --git a/benchmark/benchmark-macro/src/androidTest/java/androidx/benchmark/macro/PowerMetricTest.kt b/benchmark/benchmark-macro/src/androidTest/java/androidx/benchmark/macro/PowerMetricTest.kt
new file mode 100644
index 0000000..8f3e6fa
--- /dev/null
+++ b/benchmark/benchmark-macro/src/androidTest/java/androidx/benchmark/macro/PowerMetricTest.kt
@@ -0,0 +1,156 @@
+/*
+ * Copyright 2022 The Android Open Source Project
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT 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.macro
+
+import android.os.Build
+import androidx.annotation.RequiresApi
+import androidx.benchmark.perfetto.PerfettoHelper.Companion.isAbiSupported
+import kotlin.test.assertEquals
+import org.junit.Assume.assumeTrue
+import org.junit.Test
+
+class PowerMetricTest {
+ private val captureInfo = Metric.CaptureInfo(
+ 31,
+ "androidx.benchmark.integration.macrobenchmark.target",
+ "androidx.benchmark.macro",
+ StartupMode.COLD
+ )
+
+ @RequiresApi(Build.VERSION_CODES.Q)
+ @Test
+ fun successfulFixedTraceEnergyBreakdown() {
+ assumeTrue(isAbiSupported())
+
+ val traceFile = createTempFileFromAsset("api32_odpm_rails", ".perfetto-trace")
+ val categories = PowerCategory.values()
+ .associateWith { PowerCategoryDisplayLevel.BREAKDOWN }
+
+ val actualMetrics = PowerMetric(
+ PowerMetric.Type.Energy(categories)
+ ).getMetrics(captureInfo, traceFile.absolutePath)
+
+ assertEquals(
+ IterationResult(
+ singleMetrics = mapOf(
+ "energyRailsCpuBigUws" to 31935.0,
+ "energyRailsCpuLittleUws" to 303264.0,
+ "energyRailsCpuMidUws" to 55179.0,
+ "energyRailsDisplayUws" to 1006934.0,
+ "energyRailsGpuUws" to 66555.0,
+ "energyRailsDdrAUws" to 48458.0,
+ "energyRailsDdrBUws" to 54988.0,
+ "energyRailsDdrCUws" to 100082.0,
+ "energyRailsMemoryInterfaceUws" to 151912.0,
+ "energyRailsTpuUws" to 50775.0,
+ "energyRailsAocLogicUws" to 74972.0,
+ "energyRailsAocMemoryUws" to 19601.0,
+ "energyRailsModemUws" to 8369.0,
+ "energyRailsRadioFrontendUws" to 0.0,
+ "energyRailsWifiBtUws" to 493868.0,
+ "energyRailsSystemFabricUws" to 122766.0,
+ "energyTotalUws" to 2589658.0
+ ),
+ sampledMetrics = emptyMap()
+ ), actualMetrics)
+ }
+
+ @RequiresApi(Build.VERSION_CODES.Q)
+ @Test
+ fun successfulFixedTracePowerTotal() {
+ assumeTrue(isAbiSupported())
+
+ val traceFile = createTempFileFromAsset("api32_odpm_rails", ".perfetto-trace")
+ val categories = PowerCategory.values()
+ .associateWith { PowerCategoryDisplayLevel.TOTAL }
+
+ val actualMetrics = PowerMetric(
+ PowerMetric.Type.Power(categories)
+ ).getMetrics(captureInfo, traceFile.absolutePath)
+
+ assertEquals(
+ IterationResult(
+ singleMetrics = mapOf(
+ "powerCpuUw" to 80.940907,
+ "powerDisplayUw" to 208.777524,
+ "powerGpuUw" to 13.799502,
+ "powerMemoryUw" to 73.69686899999999,
+ "powerMachineLearningUw" to 10.52768,
+ "powerNetworkUw" to 123.74248399999999,
+ "powerUncategorizedUw" to 25.454282,
+ "powerTotalUw" to 536.939248
+ ),
+ sampledMetrics = emptyMap()
+ ), actualMetrics
+ )
+ }
+
+ @RequiresApi(Build.VERSION_CODES.Q)
+ @Test
+ fun successfulFixedTracePowerMix() {
+ assumeTrue(isAbiSupported())
+
+ val traceFile = createTempFileFromAsset("api32_odpm_rails", ".perfetto-trace")
+ val categories = mapOf(
+ PowerCategory.DISPLAY to PowerCategoryDisplayLevel.TOTAL,
+ PowerCategory.MEMORY to PowerCategoryDisplayLevel.TOTAL,
+ PowerCategory.CPU to PowerCategoryDisplayLevel.TOTAL,
+ PowerCategory.NETWORK to PowerCategoryDisplayLevel.TOTAL,
+ PowerCategory.UNCATEGORIZED to PowerCategoryDisplayLevel.BREAKDOWN
+ )
+
+ val actualMetrics = PowerMetric(
+ PowerMetric.Type.Power(categories)
+ ).getMetrics(captureInfo, traceFile.absolutePath)
+
+ assertEquals(
+ IterationResult(
+ singleMetrics = mapOf(
+ "powerCpuUw" to 80.940907,
+ "powerDisplayUw" to 208.777524,
+ "powerMemoryUw" to 73.69686899999999,
+ "powerNetworkUw" to 123.74248399999999,
+ "powerRailsSystemFabricUw" to 25.454282,
+ "powerUnselectedUw" to 24.327182,
+ "powerTotalUw" to 536.939248
+ ),
+ sampledMetrics = emptyMap()
+ ), actualMetrics
+ )
+ }
+
+ @RequiresApi(Build.VERSION_CODES.Q)
+ @Test
+ fun emptyFixedTrace() {
+ assumeTrue(isAbiSupported())
+
+ val traceFile = createTempFileFromAsset("api31_odpm_rails_empty", ".perfetto-trace")
+ val categories = PowerCategory.values()
+ .associateWith { PowerCategoryDisplayLevel.BREAKDOWN }
+
+ val actualMetrics = PowerMetric(
+ PowerMetric.Type.Energy(categories)
+ ).getMetrics(captureInfo, traceFile.absolutePath)
+
+ assertEquals(
+ IterationResult(
+ singleMetrics = emptyMap(),
+ sampledMetrics = emptyMap()
+ ), actualMetrics
+ )
+ }
+}
\ No newline at end of file
diff --git a/benchmark/benchmark-macro/src/androidTest/java/androidx/benchmark/macro/perfetto/EnergyQueryTest.kt b/benchmark/benchmark-macro/src/androidTest/java/androidx/benchmark/macro/perfetto/EnergyQueryTest.kt
deleted file mode 100644
index 17ee91a..0000000
--- a/benchmark/benchmark-macro/src/androidTest/java/androidx/benchmark/macro/perfetto/EnergyQueryTest.kt
+++ /dev/null
@@ -1,114 +0,0 @@
-/*
- * Copyright 2022 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT 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.macro.perfetto
-
-import androidx.benchmark.macro.EnergyMetric.Companion.MEASURE_BLOCK_SECTION_NAME
-import androidx.benchmark.macro.createTempFileFromAsset
-import androidx.benchmark.perfetto.PerfettoHelper.Companion.isAbiSupported
-import androidx.test.ext.junit.runners.AndroidJUnit4
-import androidx.test.filters.SdkSuppress
-import androidx.test.filters.SmallTest
-import org.junit.Assume.assumeTrue
-import org.junit.Test
-import org.junit.runner.RunWith
-import kotlin.test.assertEquals
-
-@SdkSuppress(minSdkVersion = 29)
-@RunWith(AndroidJUnit4::class)
-@SmallTest
-class EnergyQueryTest {
- @Test
- fun successfulFixedTrace() {
- assumeTrue(isAbiSupported())
-
- val traceFile = createTempFileFromAsset("api32_odpm_rails", ".perfetto-trace")
- val slice = PerfettoTraceProcessor.querySlices(
- traceFile.absolutePath, MEASURE_BLOCK_SECTION_NAME
- ).first()
- val actualMetrics = EnergyQuery.getEnergyMetrics(traceFile.absolutePath, slice)
- assertEquals(
- listOf(
- EnergyQuery.EnergyMetrics("RailsAocLogic", 74972.0),
- EnergyQuery.EnergyMetrics("RailsAocMemory", 19601.0),
- EnergyQuery.EnergyMetrics("RailsCpuBig", 31935.0),
- EnergyQuery.EnergyMetrics("RailsCpuLittle", 303264.0),
- EnergyQuery.EnergyMetrics("RailsCpuMid", 55179.0),
- EnergyQuery.EnergyMetrics("RailsDdrA", 48458.0),
- EnergyQuery.EnergyMetrics("RailsDdrB", 54988.0),
- EnergyQuery.EnergyMetrics("RailsDdrC", 100082.0),
- EnergyQuery.EnergyMetrics("RailsDisplay", 1006934.0),
- EnergyQuery.EnergyMetrics("RailsGpu", 66555.0),
- EnergyQuery.EnergyMetrics("RailsMemoryInterface", 151912.0),
- EnergyQuery.EnergyMetrics("RailsModem", 8369.0),
- EnergyQuery.EnergyMetrics("RailsRadioFrontend", 0.0),
- EnergyQuery.EnergyMetrics("RailsSystemFabric", 122766.0),
- EnergyQuery.EnergyMetrics("RailsTpu", 50775.0),
- EnergyQuery.EnergyMetrics("RailsWifiBt", 493868.0),
- ), actualMetrics)
- }
-
- @Test
- fun successfulFixedTraceTotal() {
- assumeTrue(isAbiSupported())
-
- val traceFile = createTempFileFromAsset("api32_odpm_rails", ".perfetto-trace")
- val slice = PerfettoTraceProcessor.querySlices(
- traceFile.absolutePath, MEASURE_BLOCK_SECTION_NAME
- ).first()
- val actualMetrics = EnergyQuery.getTotalEnergyMetrics(traceFile.absolutePath, slice)
- assertEquals(
- listOf(
- EnergyQuery.EnergyMetrics("Aoc", 94573.0),
- EnergyQuery.EnergyMetrics("CpuBig", 31935.0),
- EnergyQuery.EnergyMetrics("CpuLittle", 303264.0),
- EnergyQuery.EnergyMetrics("CpuMid", 55179.0),
- EnergyQuery.EnergyMetrics("Ddr", 203528.0),
- EnergyQuery.EnergyMetrics("Display", 1006934.0),
- EnergyQuery.EnergyMetrics("Gpu", 66555.0),
- EnergyQuery.EnergyMetrics("MemoryInterface", 151912.0),
- EnergyQuery.EnergyMetrics("Modem", 8369.0),
- EnergyQuery.EnergyMetrics("Radio", 0.0),
- EnergyQuery.EnergyMetrics("SystemFabric", 122766.0),
- EnergyQuery.EnergyMetrics("Tpu", 50775.0),
- EnergyQuery.EnergyMetrics("Wifi", 493868.0),
- ), actualMetrics)
- }
-
- @Test
- fun emptyFixedTrace() {
- assumeTrue(isAbiSupported())
-
- val traceFile = createTempFileFromAsset("api31_odpm_rails_empty", ".perfetto-trace")
- val slice = PerfettoTraceProcessor.querySlices(
- traceFile.absolutePath, MEASURE_BLOCK_SECTION_NAME
- ).first()
- val actualMetrics = EnergyQuery.getEnergyMetrics(traceFile.absolutePath, slice)
- assertEquals(emptyList(), actualMetrics)
- }
-
- @Test
- fun emptyFixedTraceTotal() {
- assumeTrue(isAbiSupported())
-
- val traceFile = createTempFileFromAsset("api31_odpm_rails_empty", ".perfetto-trace")
- val slice = PerfettoTraceProcessor.querySlices(
- traceFile.absolutePath, MEASURE_BLOCK_SECTION_NAME
- ).first()
- val actualMetrics = EnergyQuery.getTotalEnergyMetrics(traceFile.absolutePath, slice)
- assertEquals(emptyList(), actualMetrics)
- }
-}
diff --git a/benchmark/benchmark-macro/src/androidTest/java/androidx/benchmark/macro/perfetto/PowerQueryTest.kt b/benchmark/benchmark-macro/src/androidTest/java/androidx/benchmark/macro/perfetto/PowerQueryTest.kt
index 7747c85..d3ffbb7 100644
--- a/benchmark/benchmark-macro/src/androidTest/java/androidx/benchmark/macro/perfetto/PowerQueryTest.kt
+++ b/benchmark/benchmark-macro/src/androidTest/java/androidx/benchmark/macro/perfetto/PowerQueryTest.kt
@@ -16,6 +16,7 @@
package androidx.benchmark.macro.perfetto
+import androidx.benchmark.macro.PowerCategory
import androidx.benchmark.macro.PowerMetric.Companion.MEASURE_BLOCK_SECTION_NAME
import androidx.benchmark.macro.createTempFileFromAsset
import androidx.benchmark.perfetto.PerfettoHelper.Companion.isAbiSupported
@@ -39,52 +40,130 @@
val slice = PerfettoTraceProcessor.querySlices(
traceFile.absolutePath, MEASURE_BLOCK_SECTION_NAME
).first()
+
val actualMetrics = PowerQuery.getPowerMetrics(traceFile.absolutePath, slice)
assertEquals(
- listOf(
- PowerQuery.PowerMetrics("RailsAocLogic", 15.544682),
- PowerQuery.PowerMetrics("RailsAocMemory", 4.064068),
- PowerQuery.PowerMetrics("RailsCpuBig", 6.621397),
- PowerQuery.PowerMetrics("RailsCpuLittle", 62.878706),
- PowerQuery.PowerMetrics("RailsCpuMid", 11.440804),
- PowerQuery.PowerMetrics("RailsDdrA", 10.047273),
- PowerQuery.PowerMetrics("RailsDdrB", 11.401203),
- PowerQuery.PowerMetrics("RailsDdrC", 20.750985),
- PowerQuery.PowerMetrics("RailsDisplay", 208.777524),
- PowerQuery.PowerMetrics("RailsGpu", 13.799502),
- PowerQuery.PowerMetrics("RailsMemoryInterface", 31.497408),
- PowerQuery.PowerMetrics("RailsModem", 1.735227),
- PowerQuery.PowerMetrics("RailsRadioFrontend", 0.0),
- PowerQuery.PowerMetrics("RailsSystemFabric", 25.454282),
- PowerQuery.PowerMetrics("RailsTpu", 10.52768),
- PowerQuery.PowerMetrics("RailsWifiBt", 102.398507),
- ), actualMetrics)
- }
-
- @Test
- fun successfulFixedTraceTotal() {
- assumeTrue(isAbiSupported())
-
- val traceFile = createTempFileFromAsset("api32_odpm_rails", ".perfetto-trace")
- val slice = PerfettoTraceProcessor.querySlices(
- traceFile.absolutePath, MEASURE_BLOCK_SECTION_NAME
- ).first()
- val actualMetrics = PowerQuery.getTotalPowerMetrics(traceFile.absolutePath, slice)
- assertEquals(
- listOf(
- PowerQuery.PowerMetrics("Aoc", 19.60875),
- PowerQuery.PowerMetrics("CpuBig", 6.621397),
- PowerQuery.PowerMetrics("CpuLittle", 62.878706),
- PowerQuery.PowerMetrics("CpuMid", 11.440804),
- PowerQuery.PowerMetrics("Ddr", 42.199461),
- PowerQuery.PowerMetrics("Display", 208.777524),
- PowerQuery.PowerMetrics("Gpu", 13.799502),
- PowerQuery.PowerMetrics("MemoryInterface", 31.497408),
- PowerQuery.PowerMetrics("Modem", 1.735227),
- PowerQuery.PowerMetrics("Radio", 0.0),
- PowerQuery.PowerMetrics("SystemFabric", 25.454282),
- PowerQuery.PowerMetrics("Tpu", 10.52768),
- PowerQuery.PowerMetrics("Wifi", 102.398507),
+ mapOf(
+ PowerCategory.CPU to PowerQuery.CategoryMeasurement(
+ energyUws = 390378.0,
+ powerUw = 80.940907,
+ components = listOf(
+ PowerQuery.ComponentMeasurement(
+ name = "RailsCpuBig",
+ energyUws = 31935.0,
+ powerUw = 6.621397
+ ),
+ PowerQuery.ComponentMeasurement(
+ name = "RailsCpuLittle",
+ energyUws = 303264.0,
+ powerUw = 62.878706
+ ),
+ PowerQuery.ComponentMeasurement(
+ name = "RailsCpuMid",
+ energyUws = 55179.0,
+ powerUw = 11.440804
+ )
+ )
+ ),
+ PowerCategory.DISPLAY to PowerQuery.CategoryMeasurement(
+ energyUws = 1006934.0,
+ powerUw = 208.777524,
+ components = listOf(
+ PowerQuery.ComponentMeasurement(
+ name = "RailsDisplay",
+ energyUws = 1006934.0,
+ powerUw = 208.777524
+ )
+ )
+ ),
+ PowerCategory.GPU to PowerQuery.CategoryMeasurement(
+ energyUws = 66555.0,
+ powerUw = 13.799502,
+ components = listOf(
+ PowerQuery.ComponentMeasurement(
+ name = "RailsGpu",
+ energyUws = 66555.0,
+ powerUw = 13.799502
+ )
+ )
+ ),
+ PowerCategory.MEMORY to PowerQuery.CategoryMeasurement(
+ energyUws = 355440.0,
+ powerUw = 73.69686899999999,
+ components = listOf(
+ PowerQuery.ComponentMeasurement(
+ name = "RailsDdrA",
+ energyUws = 48458.0,
+ powerUw = 10.047273
+ ),
+ PowerQuery.ComponentMeasurement(
+ name = "RailsDdrB",
+ energyUws = 54988.0,
+ powerUw = 11.401203
+ ),
+ PowerQuery.ComponentMeasurement(
+ name = "RailsDdrC",
+ energyUws = 100082.0,
+ powerUw = 20.750985),
+ PowerQuery.ComponentMeasurement(
+ name = "RailsMemoryInterface",
+ energyUws = 151912.0,
+ powerUw = 31.497408
+ ),
+ )
+ ),
+ PowerCategory.MACHINE_LEARNING to PowerQuery.CategoryMeasurement(
+ energyUws = 50775.0,
+ powerUw = 10.52768,
+ components = listOf(
+ PowerQuery.ComponentMeasurement(
+ name = "RailsTpu",
+ energyUws = 50775.0,
+ powerUw = 10.52768
+ )
+ )
+ ),
+ PowerCategory.NETWORK to PowerQuery.CategoryMeasurement(
+ energyUws = 596810.0,
+ powerUw = 123.74248399999999,
+ components = listOf(
+ PowerQuery.ComponentMeasurement(
+ name = "RailsAocLogic",
+ energyUws = 74972.0,
+ powerUw = 15.544682),
+ PowerQuery.ComponentMeasurement(
+ name = "RailsAocMemory",
+ energyUws = 19601.0,
+ powerUw = 4.064068
+ ),
+ PowerQuery.ComponentMeasurement(
+ name = "RailsModem",
+ energyUws = 8369.0,
+ powerUw = 1.735227
+ ),
+ PowerQuery.ComponentMeasurement(
+ name = "RailsRadioFrontend",
+ energyUws = 0.0,
+ powerUw = 0.0
+ ),
+ PowerQuery.ComponentMeasurement(
+ name = "RailsWifiBt",
+ energyUws = 493868.0,
+ powerUw = 102.398507
+ )
+ )
+ ),
+ PowerCategory.UNCATEGORIZED to PowerQuery.CategoryMeasurement(
+ energyUws = 122766.0,
+ powerUw = 25.454282,
+ components = listOf(
+ PowerQuery.ComponentMeasurement(
+ name = "RailsSystemFabric",
+ energyUws = 122766.0,
+ powerUw = 25.454282
+ )
+ )
+ )
), actualMetrics)
}
@@ -96,19 +175,9 @@
val slice = PerfettoTraceProcessor.querySlices(
traceFile.absolutePath, MEASURE_BLOCK_SECTION_NAME
).first()
- val actualMetrics = PowerQuery.getPowerMetrics(traceFile.absolutePath, slice)
- assertEquals(emptyList(), actualMetrics)
- }
-
- @Test
- fun emptyFixedTraceTotal() {
- assumeTrue(isAbiSupported())
-
- val traceFile = createTempFileFromAsset("api31_odpm_rails_empty", ".perfetto-trace")
- val slice = PerfettoTraceProcessor.querySlices(
- traceFile.absolutePath, MEASURE_BLOCK_SECTION_NAME
- ).first()
- val actualMetrics = PowerQuery.getTotalPowerMetrics(traceFile.absolutePath, slice)
- assertEquals(emptyList(), actualMetrics)
+ val actualMetrics = PowerQuery.getPowerMetrics(
+ traceFile.absolutePath, slice
+ )
+ assertEquals(emptyMap(), actualMetrics)
}
}
diff --git a/benchmark/benchmark-macro/src/main/java/androidx/benchmark/macro/CompilationMode.kt b/benchmark/benchmark-macro/src/main/java/androidx/benchmark/macro/CompilationMode.kt
index cc296f4..90ce82a 100644
--- a/benchmark/benchmark-macro/src/main/java/androidx/benchmark/macro/CompilationMode.kt
+++ b/benchmark/benchmark-macro/src/main/java/androidx/benchmark/macro/CompilationMode.kt
@@ -68,11 +68,11 @@
sealed class CompilationMode {
internal fun resetAndCompile(packageName: String, warmupBlock: () -> Unit) {
if (Build.VERSION.SDK_INT >= 24) {
- // Write skip file to stop profile installer from interfering with the benchmark
- writeProfileInstallerSkipFile(packageName)
if (Arguments.enableCompilation) {
Log.d(TAG, "Resetting $packageName")
reinstallPackage(packageName)
+ // Write skip file to stop profile installer from interfering with the benchmark
+ writeProfileInstallerSkipFile(packageName)
compileImpl(packageName, warmupBlock)
} else {
Log.d(TAG, "Compilation is disabled, skipping compilation of $packageName")
diff --git a/benchmark/benchmark-macro/src/main/java/androidx/benchmark/macro/Macrobenchmark.kt b/benchmark/benchmark-macro/src/main/java/androidx/benchmark/macro/Macrobenchmark.kt
index 821fc6c..1c6f48b 100644
--- a/benchmark/benchmark-macro/src/main/java/androidx/benchmark/macro/Macrobenchmark.kt
+++ b/benchmark/benchmark-macro/src/main/java/androidx/benchmark/macro/Macrobenchmark.kt
@@ -310,26 +310,6 @@
setupBlock = {
if (startupMode == StartupMode.COLD) {
killProcess()
- // Clear profile caches when possible.
-
- // Benchmarks get faster over time as ART can create profiles for future
- // optimizations; JIT methods/classes, and persist the compiled code to disk `N`
- // seconds after startup. This information affects subsequent benchmark runs.
-
- // Only Cold startup benchmarks kill the target process, allowing us to reset
- // compilation state; and only `CompilationMode.None` benchmarks can be
- // 'inexpensively' recompiled in this way (i.e. without running warmup, or
- // recompiling, since it's just a compile --reset).
- //
- // Empirically, this is also the scenario most significantly affected by this
- // JIT persistence, so we optimize specifically for measurement correctness in
- // this scenario.
- if (compilationMode is CompilationMode.None) {
- compilationMode.resetAndCompile(packageName = packageName) {
- // This is only compiling for Compilation.None
- throw IllegalStateException("block never used for CompilationMode.None")
- }
- }
// drop app pages from page cache to ensure it is loaded from disk, from scratch
// resetAndCompile uses ProfileInstallReceiver to write a skip file.
diff --git a/benchmark/benchmark-macro/src/main/java/androidx/benchmark/macro/MacrobenchmarkScope.kt b/benchmark/benchmark-macro/src/main/java/androidx/benchmark/macro/MacrobenchmarkScope.kt
index cb832d8..23ac3747 100644
--- a/benchmark/benchmark-macro/src/main/java/androidx/benchmark/macro/MacrobenchmarkScope.kt
+++ b/benchmark/benchmark-macro/src/main/java/androidx/benchmark/macro/MacrobenchmarkScope.kt
@@ -205,8 +205,11 @@
* each iteration.
*/
@JvmOverloads
- public fun pressHome(delayDurationMs: Long = 300) {
+ public fun pressHome(delayDurationMs: Long = 0) {
device.pressHome()
+
+ // This delay is unnecessary, since UiAutomator's pressHome already waits for device idle.
+ // This sleep remains just for API stability.
Thread.sleep(delayDurationMs)
}
diff --git a/benchmark/benchmark-macro/src/main/java/androidx/benchmark/macro/Metric.kt b/benchmark/benchmark-macro/src/main/java/androidx/benchmark/macro/Metric.kt
index 381a95c..7f193841 100644
--- a/benchmark/benchmark-macro/src/main/java/androidx/benchmark/macro/Metric.kt
+++ b/benchmark/benchmark-macro/src/main/java/androidx/benchmark/macro/Metric.kt
@@ -23,19 +23,20 @@
import androidx.benchmark.Shell
import androidx.benchmark.macro.PowerRail.hasMetrics
import androidx.benchmark.macro.perfetto.AudioUnderrunQuery
-import androidx.benchmark.macro.perfetto.EnergyQuery
import androidx.benchmark.macro.perfetto.FrameTimingQuery
import androidx.benchmark.macro.perfetto.FrameTimingQuery.SubMetric
import androidx.benchmark.macro.perfetto.PerfettoResultsParser.parseStartupResult
import androidx.benchmark.macro.perfetto.PerfettoTraceProcessor
import androidx.benchmark.macro.perfetto.PowerQuery
import androidx.benchmark.macro.perfetto.StartupTimingQuery
+import androidx.benchmark.macro.perfetto.camelCase
import androidx.test.platform.app.InstrumentationRegistry
/**
* Metric interface.
*/
public sealed class Metric {
+
internal abstract fun configure(packageName: String)
internal abstract fun start()
@@ -357,134 +358,69 @@
}
}
/**
- * Captures the change of power rails metrics over time for specified duration.
+ * Captures the change of power rails metrics over time for specified duration. A configurable
+ * output of rails and subsystems will be generated. Subsystems outputs will include the sum of
+ * all rails within it. A metric total will also be generated, as well as a metric which is the
+ * sum of all other metrics not displayed.
*
- * This outputs measurements like the following:
+ * @param `type` - Either [Type.Energy] or [Type.Power], which can be configured to show components
+ * of system power usage.
*
+ * The sum of all categories will be displayed as a `Total` metric. The sum of all unrequested
+ * categories will be displayed as an `Unselected` metric. The subsystems that have not been
+ * categorized will be displayed as an `Uncategorized` metric.
+ *
+ * The metrics will be stored in the format `<type><name><unit>`. This outputs measurements like
+ * the following:
+ *
+ * Power metrics example:
* ```
- * odpmEnergyRailsCpuBigUws min 99,545.0, median 110,339.0, max 316,444.0
- * odpmEnergyRailsAocLogicUws min 81,548.0, median 86,211.0, max 87,650.0
+ * powerDisplayUw min 128.2, median 128.7, max 129.8
+ * powerRailsCpuBigUw min 1.9, median 2.9, max 3.4
+ * powerRailsCpuLittleUw min 65.8, median 76.2, max 79.7
+ * powerRailsCpuMidUw min 10.8, median 13.3, max 13.6
+ * powerTotalUw min 362.4, median 395.2, max 400.6
+ * powerUnselectedUw min 155.3, median 170.8, max 177.8
* ```
*
- * * `name` - The name of the subsystem associated with the energy usage in camel case.
- *
- * * `energy` - The change in swpower usage over the course of the power test, measured in uWs.
- *
- * The outputs are stored in the format `odpmEnergy<name>Uws`.
+ * Energy metrics example:
+ * ```
+ * energyDisplayUws min 610,086.0, median 623,183.0, max 627,259.0
+ * energyRailsCpuBigUws min 9,233.0, median 13,566.0, max 16,536.0
+ * energyRailsCpuLittleUws min 318,591.0, median 368,211.0, max 379,106.0
+ * energyRailsCpuMidUws min 52,143.0, median 64,462.0, max 64,893.0
+ * energyTotalUws min 1,755,261.0, median 1,880,687.0, max 1,935,402.0
+ * energyUnselectedUws min 752,111.0, median 813,036.0, max 858,934.0
+ * ```
*
* This measurement is not available prior to API 29.
*/
@RequiresApi(29)
-@Suppress("CanSealedSubClassBeObject")
@RestrictTo(RestrictTo.Scope.LIBRARY_GROUP_PREFIX)
-public class EnergyMetric : Metric() {
+public class PowerMetric(
+ private val type: Type
+) : Metric() {
internal companion object {
internal const val MEASURE_BLOCK_SECTION_NAME = "measureBlock"
}
- internal override fun configure(packageName: String) {
- hasMetrics(throwOnMissingMetrics = true)
- }
-
- internal override fun start() {}
-
- internal override fun stop() {}
-
- internal override fun getMetrics(captureInfo: CaptureInfo, tracePath: String): IterationResult {
- // collect metrics between trace point flags
- val slice = PerfettoTraceProcessor.querySlices(tracePath, MEASURE_BLOCK_SECTION_NAME)
- .firstOrNull()
- ?: return IterationResult.EMPTY
-
- val metrics = EnergyQuery.getEnergyMetrics(tracePath, slice)
- val metricMap = mutableMapOf<String, Double>()
- for (metric in metrics) {
- metricMap["odpmEnergy${metric.name}Uws"] = metric.energyUws
- }
- return IterationResult(
- singleMetrics = metricMap,
- sampledMetrics = emptyMap())
- }
-}
-/**
- * Captures the change of power rails metrics over time for specified duration. All rails under
- * the same subsystem are added together for the total energy consumed in each subsystem.
- *
- * This outputs measurements like the following:
- *
- * ```
- * odpmTotalEnergyDdrUws min 107,087.0, median 133,942.0, max 135,084.0
- * odpmTotalEnergyAocUws min 81,548.0, median 86,211.0, max 87,650.0
- * ```
- *
- * * `name` - The name of the subsystem associated with the energy usage in camel case.
- *
- * * `energy` - The change in swpower usage over the course of the power test, measured in uWs.
- *
- * The outputs are stored in the format `odpmTotalEnergy<name>Uws`.
- *
- * This measurement is not available prior to API 29.
- */
-@RequiresApi(29)
-@Suppress("CanSealedSubClassBeObject")
-@RestrictTo(RestrictTo.Scope.LIBRARY_GROUP_PREFIX)
-public class TotalEnergyMetric : Metric() {
-
- internal companion object {
- internal const val MEASURE_BLOCK_SECTION_NAME = "measureBlock"
- }
-
- internal override fun configure(packageName: String) {
- hasMetrics(throwOnMissingMetrics = true)
- }
-
- internal override fun start() {}
-
- internal override fun stop() {}
-
- internal override fun getMetrics(captureInfo: CaptureInfo, tracePath: String): IterationResult {
- // collect metrics between trace point flags
- val slice = PerfettoTraceProcessor.querySlices(tracePath, MEASURE_BLOCK_SECTION_NAME)
- .firstOrNull()
- ?: return IterationResult.EMPTY
-
- val metrics = EnergyQuery.getTotalEnergyMetrics(tracePath, slice)
- val metricMap = mutableMapOf<String, Double>()
- for (metric in metrics) {
- metricMap["odpmTotalEnergy${metric.name}Uws"] = metric.energyUws
- }
- return IterationResult(
- singleMetrics = metricMap,
- sampledMetrics = emptyMap())
- }
-}
-
-/**
- * Captures the change of power rails metrics over time for specified duration.
- *
- * This outputs measurements like the following:
- *
- * ```
- * odpmPowerRailsCpuBigUw min 22.1, median 22.6, max 67.6
- * odpmPowerRailsAocLogicUw min 17.9, median 18.1, max 18.3
- * ```
- *
- * * `name` - The name of the subsystem associated with the power usage in camel case.
- *
- * * `power` - The energy used divided by the elapsed time, measured in mW.
- *
- * The outputs are stored in the format `odpmPower<name>Uw`.
- *
- * This measurement is not available prior to API 29.
- */
-@RequiresApi(29)
-@Suppress("CanSealedSubClassBeObject")
-@RestrictTo(RestrictTo.Scope.LIBRARY_GROUP_PREFIX)
-public class PowerMetric : Metric() {
-
- internal companion object {
- internal const val MEASURE_BLOCK_SECTION_NAME = "measureBlock"
+ /**
+ * Configures the PowerMetric request.
+ *
+ * @param `categories` - A map which is used to configure which metrics are displayed. The key
+ * is a `PowerCategory` enum, which configures the subsystem category that will be displayed.
+ * The value is a `PowerCategoryDisplayLevel`, which configures whether each subsystem in the
+ * category will have metrics displayed independently or summed for a total metric of the
+ * category.
+ */
+ sealed class Type(var categories: Map<PowerCategory, PowerCategoryDisplayLevel>) {
+ class Power(
+ powerCategories: Map<PowerCategory, PowerCategoryDisplayLevel> = emptyMap()
+ ) : Type(powerCategories)
+ class Energy(
+ energyCategories: Map<PowerCategory, PowerCategoryDisplayLevel> = emptyMap()
+ ) : Type(energyCategories)
}
internal override fun configure(packageName: String) {
@@ -502,65 +438,72 @@
?: return IterationResult.EMPTY
val metrics = PowerQuery.getPowerMetrics(tracePath, slice)
- val metricMap = mutableMapOf<String, Double>()
- for (metric in metrics) {
- metricMap["odpmPower${metric.name}Uw"] = metric.powerUs
+
+ val label = if (type is Type.Power) "power%sUw" else "energy%sUws"
+
+ val metricMap: Map<String, Double> = getSpecifiedMetrics(metrics, label)
+ if (metricMap.isEmpty()) {
+ return IterationResult(
+ singleMetrics = emptyMap(),
+ sampledMetrics = emptyMap())
}
+
+ val extraMetrics: Map<String, Double> = getTotalAndUnselectedMetrics(metrics, label)
+
return IterationResult(
- singleMetrics = metricMap,
+ singleMetrics = metricMap + extraMetrics,
sampledMetrics = emptyMap())
}
-}
-/**
- * Captures the change of power rails metrics over time for specified duration. All rails under
- * the same subsystem are added together for the total power consumed in each subsystem.
- *
- * This outputs measurements like the following:
- *
- * ```
- * odpmTotalPowerDisplayUw min 138.5, median 140.0, max 140.6
- * odpmTotalPowerAocUw min 17.9, median 18.1, max 18.3
- * ```
- *
- * * `name` - The name of the subsystem associated with the power usage in camel case.
- *
- * * `power` - The energy used divided by the elapsed time, measured in mW.
- *
- * The outputs are stored in the format `odpmTotalPower<name>Uw`.
- *
- * This measurement is not available prior to API 29.
- */
-@RequiresApi(29)
-@Suppress("CanSealedSubClassBeObject")
-@RestrictTo(RestrictTo.Scope.LIBRARY_GROUP_PREFIX)
-public class TotalPowerMetric : Metric() {
-
- internal companion object {
- internal const val MEASURE_BLOCK_SECTION_NAME = "measureBlock"
- }
-
- internal override fun configure(packageName: String) {
- hasMetrics(throwOnMissingMetrics = true)
- }
-
- internal override fun start() {}
-
- internal override fun stop() {}
-
- internal override fun getMetrics(captureInfo: CaptureInfo, tracePath: String): IterationResult {
- // collect metrics between trace point flags
- val slice = PerfettoTraceProcessor.querySlices(tracePath, MEASURE_BLOCK_SECTION_NAME)
- .firstOrNull()
- ?: return IterationResult.EMPTY
-
- val metrics = PowerQuery.getTotalPowerMetrics(tracePath, slice)
- val metricMap = mutableMapOf<String, Double>()
- for (metric in metrics) {
- metricMap["odpmTotalPower${metric.name}Uw"] = metric.powerUs
+ private fun getTotalAndUnselectedMetrics(
+ metrics: Map<PowerCategory, PowerQuery.CategoryMeasurement>,
+ label: String
+ ): Map<String, Double> {
+ return mapOf(
+ String.format(
+ label,
+ "Total"
+ ) to metrics.values.fold(0.0) { total, next ->
+ total + next.getValue(type)
+ },
+ String.format(
+ label,
+ "Unselected"
+ ) to metrics.filter { (category, _) ->
+ !type.categories.containsKey(category)
+ }.values.fold(0.0) { total, next ->
+ total + next.getValue(type)
+ }
+ ).filter { (_, measurement) ->
+ measurement != 0.0
}
- return IterationResult(
- singleMetrics = metricMap,
- sampledMetrics = emptyMap())
+ }
+
+ private fun getSpecifiedMetrics(
+ metrics: Map<PowerCategory, PowerQuery.CategoryMeasurement>,
+ label: String
+ ): Map<String, Double> {
+ return metrics.filter { (category, _) ->
+ type.categories.containsKey(category)
+ }.map { (category, measurement) ->
+ when (type.categories[category]) {
+ // if total category specified, create component of sum total of category
+ PowerCategoryDisplayLevel.TOTAL -> listOf(
+ String.format(
+ label,
+ category.toString().camelCase()
+ ) to measurement.components.fold(0.0) { total, next ->
+ total + next.getValue(type)
+ }
+ )
+ // if breakdown, append all ComponentMeasurements metrics from category
+ else -> measurement.components.map { component ->
+ String.format(
+ label,
+ component.name
+ ) to component.getValue(type)
+ }
+ }
+ }.flatten().associate { pair -> Pair(pair.first, pair.second) }
}
}
diff --git a/core/uwb/uwb/src/main/java/androidx/core/uwb/exceptions/UwbBackgroundPolicyException.kt b/benchmark/benchmark-macro/src/main/java/androidx/benchmark/macro/PowerCategory.kt
similarity index 69%
copy from core/uwb/uwb/src/main/java/androidx/core/uwb/exceptions/UwbBackgroundPolicyException.kt
copy to benchmark/benchmark-macro/src/main/java/androidx/benchmark/macro/PowerCategory.kt
index 1d8d7e2..f82567b 100644
--- a/core/uwb/uwb/src/main/java/androidx/core/uwb/exceptions/UwbBackgroundPolicyException.kt
+++ b/benchmark/benchmark-macro/src/main/java/androidx/benchmark/macro/PowerCategory.kt
@@ -14,10 +14,18 @@
* limitations under the License.
*/
-package androidx.core.uwb.exceptions
+package androidx.benchmark.macro
-/**
- * Calls to the UWB service fail for background systems. Only foreground
- * systems can call the UWB service.
- */
-class UwbBackgroundPolicyException(message: String) : UwbApiException(message)
\ No newline at end of file
+import androidx.annotation.RestrictTo
+
+@RestrictTo(RestrictTo.Scope.LIBRARY_GROUP_PREFIX)
+enum class PowerCategory {
+ CPU,
+ DISPLAY,
+ GPU,
+ GPS,
+ MEMORY,
+ MACHINE_LEARNING,
+ NETWORK,
+ UNCATEGORIZED
+}
diff --git a/core/uwb/uwb/src/main/java/androidx/core/uwb/exceptions/UwbBackgroundPolicyException.kt b/benchmark/benchmark-macro/src/main/java/androidx/benchmark/macro/PowerCategoryDisplayLevel.kt
similarity index 71%
rename from core/uwb/uwb/src/main/java/androidx/core/uwb/exceptions/UwbBackgroundPolicyException.kt
rename to benchmark/benchmark-macro/src/main/java/androidx/benchmark/macro/PowerCategoryDisplayLevel.kt
index 1d8d7e2..5655295 100644
--- a/core/uwb/uwb/src/main/java/androidx/core/uwb/exceptions/UwbBackgroundPolicyException.kt
+++ b/benchmark/benchmark-macro/src/main/java/androidx/benchmark/macro/PowerCategoryDisplayLevel.kt
@@ -14,10 +14,12 @@
* limitations under the License.
*/
-package androidx.core.uwb.exceptions
+package androidx.benchmark.macro
-/**
- * Calls to the UWB service fail for background systems. Only foreground
- * systems can call the UWB service.
- */
-class UwbBackgroundPolicyException(message: String) : UwbApiException(message)
\ No newline at end of file
+import androidx.annotation.RestrictTo
+
+@RestrictTo(RestrictTo.Scope.LIBRARY_GROUP_PREFIX)
+enum class PowerCategoryDisplayLevel {
+ BREAKDOWN,
+ TOTAL
+}
\ No newline at end of file
diff --git a/benchmark/benchmark-macro/src/main/java/androidx/benchmark/macro/perfetto/EnergyQuery.kt b/benchmark/benchmark-macro/src/main/java/androidx/benchmark/macro/perfetto/EnergyQuery.kt
deleted file mode 100644
index a92cf76..0000000
--- a/benchmark/benchmark-macro/src/main/java/androidx/benchmark/macro/perfetto/EnergyQuery.kt
+++ /dev/null
@@ -1,89 +0,0 @@
-/*
- * Copyright 2022 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT 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.macro.perfetto
-
-// We want to use android_powrails.sql, but cannot as they do not split into sections with slice
-
-internal object EnergyQuery {
- private fun getFullQuery(slice: Slice) = """
- SELECT
- t.name,
- max(c.value) - min(c.value) AS energyUws
- FROM counter c
- JOIN counter_track t ON c.track_id = t.id
- WHERE t.name GLOB 'power.*'
- AND c.ts >= ${slice.ts} AND c.ts <= ${slice.endTs}
- GROUP BY t.name
- """.trimIndent()
-
- data class EnergyMetrics(
- val name: String,
- var energyUws: Double
- )
-
- fun getTotalEnergyMetrics(
- absoluteTracePath: String,
- slice: Slice
- ): List<EnergyMetrics> {
- val allMetrics = getEnergyMetrics(absoluteTracePath, slice)
- allMetrics.ifEmpty { return emptyList() }
-
- val regex = "Rails(Cpu\\w+|SystemFabric|MemoryInterface|[A-Z][a-z]+)".toRegex()
-
- return allMetrics.map { original ->
- val subsystem = if (regex.containsMatchIn(original.name))
- regex.find(original.name)?.groups?.get(1)?.value.toString()
- else original.name
- EnergyMetrics(
- subsystem,
- allMetrics.filter {
- it.name.contains(subsystem)
- }.fold(0.0) { total, next ->
- total + next.energyUws
- }
- )
- }.distinct()
- }
-
- fun getEnergyMetrics(
- absoluteTracePath: String,
- slice: Slice
- ): List<EnergyMetrics> {
- val queryResult = PerfettoTraceProcessor.rawQuery(
- absoluteTracePath = absoluteTracePath,
- query = getFullQuery(slice)
- )
-
- val resultLines = queryResult.split("\n")
-
- if (resultLines.first() != """"name","energyUws"""") {
- throw IllegalStateException("query failed!\n${getFullQuery(slice)}")
- }
-
- // results are in CSV with a header row, and strings wrapped with quotes
- return resultLines
- .filter { it.isNotBlank() } // drop blank lines
- .drop(1) // drop the header row
- .map {
- val columns = it.split(",")
- EnergyMetrics(
- name = columns[0].unquote().camelCase(),
- energyUws = columns[1].toDouble(),
- )
- }
- }
-}
diff --git a/benchmark/benchmark-macro/src/main/java/androidx/benchmark/macro/perfetto/PowerQuery.kt b/benchmark/benchmark-macro/src/main/java/androidx/benchmark/macro/perfetto/PowerQuery.kt
index 410530c..9a19172 100644
--- a/benchmark/benchmark-macro/src/main/java/androidx/benchmark/macro/perfetto/PowerQuery.kt
+++ b/benchmark/benchmark-macro/src/main/java/androidx/benchmark/macro/perfetto/PowerQuery.kt
@@ -16,12 +16,16 @@
package androidx.benchmark.macro.perfetto
+import androidx.benchmark.macro.PowerCategory
+import androidx.benchmark.macro.PowerMetric
+
// We want to use android_powrails.sql, but cannot as they do not split into sections with slice
internal object PowerQuery {
private fun getFullQuery(slice: Slice) = """
SELECT
t.name,
+ max(c.value) - min(c.value) AS energyUws,
(max(c.value) - min(c.value))/((max(c.ts) - min(c.ts)) / 1000000) AS powerUs
FROM counter c
JOIN counter_track t ON c.track_id = t.id
@@ -30,39 +34,108 @@
GROUP BY t.name
""".trimIndent()
- data class PowerMetrics(
- var name: String,
- var powerUs: Double,
+ private val categoryToSubsystem = mapOf(
+ PowerCategory.CPU to listOf("Cpu"),
+ PowerCategory.DISPLAY to listOf("Display"),
+ PowerCategory.GPU to listOf("Gpu"),
+ PowerCategory.GPS to listOf("Gps"),
+ PowerCategory.MEMORY to listOf("Ddr", "MemoryInterface"),
+ PowerCategory.MACHINE_LEARNING to listOf("Tpu"),
+ PowerCategory.NETWORK to listOf(
+ "Aoc",
+ "Radio",
+ "VsysPwrMmwave",
+ "Wifi",
+ "Modem"
+ ),
+ PowerCategory.UNCATEGORIZED to emptyList()
)
- fun getTotalPowerMetrics(
- absoluteTracePath: String,
- slice: Slice
- ): List<PowerMetrics> {
- val allMetrics = getPowerMetrics(absoluteTracePath, slice)
- allMetrics.ifEmpty { return emptyList() }
-
- val regex = "Rails(Cpu\\w+|SystemFabric|MemoryInterface|[A-Z][a-z]+)".toRegex()
-
- return allMetrics.map { original ->
- val subsystem = if (regex.containsMatchIn(original.name))
- regex.find(original.name)?.groups?.get(1)?.value.toString()
- else original.name
- PowerMetrics(
- subsystem,
- allMetrics.filter {
- it.name.contains(subsystem)
- }.fold(0.0) { total, next ->
- total + next.powerUs
- }
- )
- }.distinct()
+ /**
+ * The ComponentMeasurement object are built with attributes:
+ *
+ * @param `name` - The name of the subsystem associated with the power usage in camel case.
+ *
+ * @param `energyUws` - The energy used during the trace, measured in uWs.
+ *
+ * @param `powerUw` - The energy used divided by the elapsed time, measured in uW.
+ */
+ data class ComponentMeasurement(
+ var name: String,
+ var energyUws: Double,
+ var powerUw: Double,
+ ) {
+ fun getValue(type: PowerMetric.Type): Double {
+ return if (type is PowerMetric.Type.Power) powerUw else energyUws
+ }
}
- fun getPowerMetrics(
+ /**
+ * The CategoryMeasurement object are built with attributes:
+ *
+ * @param `energyUws` - The sum total energy used during the trace of all components in the
+ * category, measured in uWs.
+ *
+ * @param `powerUw` - The sum total energy used divided by the elapsed time of all components in
+ * the category, measured in uW.
+ *
+ * @param `components` - A list of all ComponentMeasurements under the same `PowerCategory`.
+ */
+ data class CategoryMeasurement(
+ var energyUws: Double,
+ var powerUw: Double,
+ var components: List<ComponentMeasurement>
+ ) {
+ fun getValue(type: PowerMetric.Type): Double {
+ return if (type is PowerMetric.Type.Power) powerUw else energyUws
+ }
+ }
+
+ public fun getPowerMetrics(
absoluteTracePath: String,
slice: Slice
- ): List<PowerMetrics> {
+ ): Map<PowerCategory, CategoryMeasurement> {
+ // gather all recorded rails
+ val railMetrics: List<ComponentMeasurement> = getRailMetrics(absoluteTracePath, slice)
+ railMetrics.ifEmpty { return emptyMap() }
+
+ // sort ComponentMeasurements into CategoryMeasurements
+ return sortComponentsByCategories(railMetrics)
+ }
+
+ private fun sortComponentsByCategories(
+ railMetrics: List<ComponentMeasurement>
+ ): Map<PowerCategory, CategoryMeasurement> {
+ // sort all ComponentMeasurements into CategoryMeasurements
+ return PowerCategory.values().associateWith { category ->
+ // combine components under same category
+ val rails: List<ComponentMeasurement> = railMetrics.filter { rail ->
+ railInCategory(category, rail.name)
+ }
+
+ // combine components into category
+ rails.fold(
+ CategoryMeasurement(
+ energyUws = 0.0,
+ powerUw = 0.0,
+ components = rails
+ )
+ ) { total, next ->
+ CategoryMeasurement(
+ energyUws = total.energyUws + next.energyUws,
+ powerUw = total.powerUw + next.powerUw,
+ components = total.components
+ )
+ }
+ }.filter { (_, measurement) ->
+ measurement.components.isNotEmpty()
+ }
+ }
+
+ private fun getRailMetrics(
+ absoluteTracePath: String,
+ slice: Slice
+ ): List<ComponentMeasurement> {
val queryResult = PerfettoTraceProcessor.rawQuery(
absoluteTracePath = absoluteTracePath,
query = getFullQuery(slice)
@@ -70,7 +143,7 @@
val resultLines = queryResult.split("\n")
- if (resultLines.first() != """"name","powerUs"""") {
+ if (resultLines.first() != """"name","energyUws","powerUs"""") {
throw IllegalStateException("query failed!\n${getFullQuery(slice)}")
}
@@ -80,10 +153,55 @@
.drop(1) // drop the header row
.map {
val columns = it.split(",")
- PowerMetrics(
+ ComponentMeasurement(
name = columns[0].unquote().camelCase(),
- powerUs = columns[1].toDouble(),
+ energyUws = columns[1].toDouble(),
+ powerUw = columns[2].toDouble(),
)
}
}
-}
+
+ /**
+ * Checks if category contains rail, or is uncategorized.
+ *
+ * @param `category` - A [PowerCategory] which maps to a list of subsystems.
+ *
+ * @param `railName` - The name of a rail.
+ *
+ */
+ private fun railInCategory(
+ category: PowerCategory,
+ railName: String
+ ): Boolean {
+ if (category == PowerCategory.UNCATEGORIZED) {
+ return !filterRails(categoryToSubsystem.values.flatten(), railName)
+ }
+ return filterRails(categoryToSubsystem[category] ?: emptyList(), railName)
+ }
+
+ /**
+ * Checks if rail name contains subsystem.
+ *
+ * @param `subsystems` - A list of subsystems to check against rail name. If the rail is a
+ * part of the subsystem, the subsystem will be a substring of the rail name.
+ *
+ * @param `railName` - The name of a rail.
+ */
+ private fun filterRails(
+ subsystems: List<String>,
+ railName: String
+ ): Boolean {
+ for (subsystem in subsystems) {
+ if (railName.contains(subsystem)) {
+ return true
+ }
+ }
+ return false
+ }
+
+ init {
+ check(categoryToSubsystem.keys.size == PowerCategory.values().size) {
+ "Missing power categories in categoryToSubsystem"
+ }
+ }
+}
\ No newline at end of file
diff --git a/benchmark/integration-tests/macrobenchmark/src/androidTest/java/androidx/benchmark/integration/macrobenchmark/TrivialPowerBenchmark.kt b/benchmark/integration-tests/macrobenchmark/src/androidTest/java/androidx/benchmark/integration/macrobenchmark/TrivialPowerBenchmark.kt
index 855fb12..a1fb66a 100644
--- a/benchmark/integration-tests/macrobenchmark/src/androidTest/java/androidx/benchmark/integration/macrobenchmark/TrivialPowerBenchmark.kt
+++ b/benchmark/integration-tests/macrobenchmark/src/androidTest/java/androidx/benchmark/integration/macrobenchmark/TrivialPowerBenchmark.kt
@@ -17,14 +17,13 @@
package androidx.benchmark.integration.macrobenchmark
import android.content.Intent
+import androidx.benchmark.macro.PowerCategory
+import androidx.benchmark.macro.PowerCategoryDisplayLevel
import androidx.benchmark.macro.CompilationMode
-import androidx.benchmark.macro.EnergyMetric
import androidx.benchmark.macro.ExperimentalMetricApi
import androidx.benchmark.macro.PowerMetric
import androidx.benchmark.macro.PowerRail
import androidx.benchmark.macro.StartupMode
-import androidx.benchmark.macro.TotalEnergyMetric
-import androidx.benchmark.macro.TotalPowerMetric
import androidx.benchmark.macro.junit4.MacrobenchmarkRule
import androidx.test.ext.junit.runners.AndroidJUnit4
import androidx.test.filters.LargeTest
@@ -48,7 +47,20 @@
assumeTrue(PowerRail.hasMetrics())
benchmarkRule.measureRepeated(
packageName = PACKAGE_NAME,
- metrics = listOf(PowerMetric(), EnergyMetric()),
+ metrics = listOf(
+ PowerMetric(
+ PowerMetric.Type.Power(
+ PowerCategory.values()
+ .associateWith { PowerCategoryDisplayLevel.BREAKDOWN }
+ )
+ ),
+ PowerMetric(
+ PowerMetric.Type.Energy(
+ PowerCategory.values()
+ .associateWith { PowerCategoryDisplayLevel.BREAKDOWN }
+ )
+ ),
+ ),
compilationMode = CompilationMode.None(),
startupMode = StartupMode.COLD,
iterations = 3,
@@ -67,7 +79,20 @@
assumeTrue(PowerRail.hasMetrics())
benchmarkRule.measureRepeated(
packageName = PACKAGE_NAME,
- metrics = listOf(PowerMetric(), EnergyMetric()),
+ metrics = listOf(
+ PowerMetric(
+ PowerMetric.Type.Power(
+ PowerCategory.values()
+ .associateWith { PowerCategoryDisplayLevel.BREAKDOWN }
+ )
+ ),
+ PowerMetric(
+ PowerMetric.Type.Energy(
+ PowerCategory.values()
+ .associateWith { PowerCategoryDisplayLevel.BREAKDOWN }
+ )
+ ),
+ ),
compilationMode = CompilationMode.None(),
startupMode = StartupMode.COLD,
iterations = 3,
@@ -101,7 +126,20 @@
assumeTrue(PowerRail.hasMetrics())
benchmarkRule.measureRepeated(
packageName = PACKAGE_NAME,
- metrics = listOf(TotalEnergyMetric(), TotalPowerMetric()),
+ metrics = listOf(
+ PowerMetric(
+ PowerMetric.Type.Power(
+ PowerCategory.values()
+ .associateWith { PowerCategoryDisplayLevel.TOTAL }
+ )
+ ),
+ PowerMetric(
+ PowerMetric.Type.Energy(
+ PowerCategory.values()
+ .associateWith { PowerCategoryDisplayLevel.TOTAL }
+ )
+ ),
+ ),
compilationMode = CompilationMode.None(),
startupMode = StartupMode.COLD,
iterations = 3,
@@ -120,7 +158,20 @@
assumeTrue(PowerRail.hasMetrics())
benchmarkRule.measureRepeated(
packageName = PACKAGE_NAME,
- metrics = listOf(TotalPowerMetric(), TotalEnergyMetric()),
+ metrics = listOf(
+ PowerMetric(
+ PowerMetric.Type.Power(
+ PowerCategory.values()
+ .associateWith { PowerCategoryDisplayLevel.TOTAL }
+ )
+ ),
+ PowerMetric(
+ PowerMetric.Type.Energy(
+ PowerCategory.values()
+ .associateWith { PowerCategoryDisplayLevel.TOTAL }
+ )
+ ),
+ ),
compilationMode = CompilationMode.None(),
startupMode = StartupMode.COLD,
iterations = 3,
diff --git a/biometric/biometric-ktx/build.gradle b/biometric/biometric-ktx/build.gradle
index ec70a1c..22a6f56 100755
--- a/biometric/biometric-ktx/build.gradle
+++ b/biometric/biometric-ktx/build.gradle
@@ -23,6 +23,11 @@
}
dependencies {
+ // Atomic group
+ constraints {
+ implementation(project(":biometric:biometric-ktx"))
+ }
+
api(libs.kotlinStdlib)
api(libs.kotlinCoroutinesCore)
api(project(":biometric:biometric"))
diff --git a/biometric/biometric/build.gradle b/biometric/biometric/build.gradle
index 1f3a000..9b82c05 100644
--- a/biometric/biometric/build.gradle
+++ b/biometric/biometric/build.gradle
@@ -28,6 +28,11 @@
}
dependencies {
+ // Atomic group
+ constraints {
+ implementation(project(":biometric:biometric-ktx"))
+ }
+
// Public API dependencies
api("androidx.annotation:annotation:1.1.0")
api("androidx.core:core:1.3.2")
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 1dea045..c732b33 100644
--- a/biometric/biometric/src/main/res/values-zh-rHK/strings.xml
+++ b/biometric/biometric/src/main/res/values-zh-rHK/strings.xml
@@ -27,8 +27,8 @@
<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>
- <string name="generic_error_no_device_credential" msgid="3791785319221634505">"未設定 PIN、圖形或密碼。"</string>
- <string name="generic_error_no_keyguard" msgid="1807436368654974044">"這部裝置不支援 PIN、圖形或密碼。"</string>
+ <string name="generic_error_no_device_credential" msgid="3791785319221634505">"未設定 PIN、圖案或密碼。"</string>
+ <string name="generic_error_no_keyguard" msgid="1807436368654974044">"這部裝置不支援 PIN、圖案或密碼。"</string>
<string name="fingerprint_dialog_icon_description" msgid="5462024216548165325">"指紋圖示"</string>
<string name="use_fingerprint_label" msgid="6961788485681412417">"使用指紋"</string>
<string name="use_face_label" msgid="6533512708069459542">"使用面孔"</string>
diff --git a/bluetooth/OWNERS b/bluetooth/OWNERS
new file mode 100644
index 0000000..9b3a924
--- /dev/null
+++ b/bluetooth/OWNERS
@@ -0,0 +1,3 @@
+sungsoo@google.com
+hallstrom@google.com
+
diff --git a/bluetooth/bluetooth/api/current.txt b/bluetooth/bluetooth/api/current.txt
new file mode 100644
index 0000000..e6f50d0
--- /dev/null
+++ b/bluetooth/bluetooth/api/current.txt
@@ -0,0 +1 @@
+// Signature format: 4.0
diff --git a/bluetooth/bluetooth/api/public_plus_experimental_current.txt b/bluetooth/bluetooth/api/public_plus_experimental_current.txt
new file mode 100644
index 0000000..e6f50d0
--- /dev/null
+++ b/bluetooth/bluetooth/api/public_plus_experimental_current.txt
@@ -0,0 +1 @@
+// Signature format: 4.0
diff --git a/bluetooth/bluetooth/api/res-current.txt b/bluetooth/bluetooth/api/res-current.txt
new file mode 100644
index 0000000..e69de29
--- /dev/null
+++ b/bluetooth/bluetooth/api/res-current.txt
diff --git a/bluetooth/bluetooth/api/restricted_current.txt b/bluetooth/bluetooth/api/restricted_current.txt
new file mode 100644
index 0000000..e6f50d0
--- /dev/null
+++ b/bluetooth/bluetooth/api/restricted_current.txt
@@ -0,0 +1 @@
+// Signature format: 4.0
diff --git a/core/uwb/uwb/src/main/java/androidx/core/uwb/exceptions/UwbBackgroundPolicyException.kt b/bluetooth/bluetooth/build.gradle
similarity index 63%
copy from core/uwb/uwb/src/main/java/androidx/core/uwb/exceptions/UwbBackgroundPolicyException.kt
copy to bluetooth/bluetooth/build.gradle
index 1d8d7e2..425f81b 100644
--- a/core/uwb/uwb/src/main/java/androidx/core/uwb/exceptions/UwbBackgroundPolicyException.kt
+++ b/bluetooth/bluetooth/build.gradle
@@ -14,10 +14,18 @@
* limitations under the License.
*/
-package androidx.core.uwb.exceptions
+import androidx.build.LibraryType
-/**
- * Calls to the UWB service fail for background systems. Only foreground
- * systems can call the UWB service.
- */
-class UwbBackgroundPolicyException(message: String) : UwbApiException(message)
\ No newline at end of file
+plugins {
+ id("AndroidXPlugin")
+ id("com.android.library")
+}
+
+androidx {
+ name = "BluetoothX"
+ type = LibraryType.PUBLISHED_LIBRARY
+ mavenGroup = LibraryGroups.BLUETOOTH
+ inceptionYear = "2022"
+ description = "Library for wrapping Android Bluetooth APIs that makes the APIs much easier to use."
+}
+
diff --git a/bluetooth/bluetooth/src/androidTest/AndroidManifest.xml b/bluetooth/bluetooth/src/androidTest/AndroidManifest.xml
new file mode 100644
index 0000000..3332490
--- /dev/null
+++ b/bluetooth/bluetooth/src/androidTest/AndroidManifest.xml
@@ -0,0 +1,17 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--
+ Copyright 2022 The Android Open Source Project
+
+ Licensed under the Apache License, Version 2.0 (the "License");
+ you may not use this file except in compliance with the License.
+ You may obtain a copy of the License at
+
+ http://www.apache.org/licenses/LICENSE-2.0
+
+ Unless required by applicable law or agreed to in writing, software
+ distributed under the License is distributed on an "AS IS" BASIS,
+ WITHOUT 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.blutooth.test" />
diff --git a/bluetooth/bluetooth/src/main/AndroidManifest.xml b/bluetooth/bluetooth/src/main/AndroidManifest.xml
new file mode 100644
index 0000000..eb15476
--- /dev/null
+++ b/bluetooth/bluetooth/src/main/AndroidManifest.xml
@@ -0,0 +1,16 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- Copyright 2022 The Android Open Source Project
+
+ Licensed under the Apache License, Version 2.0 (the "License");
+ you may not use this file except in compliance with the License.
+ You may obtain a copy of the License at
+
+ http://www.apache.org/licenses/LICENSE-2.0
+
+ Unless required by applicable law or agreed to in writing, software
+ distributed under the License is distributed on an "AS IS" BASIS,
+ WITHOUT 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.bluetooth"/>
diff --git a/buildSrc-tests/src/test/kotlin/androidx/build/AndroidXImplPluginTest.kt b/buildSrc-tests/src/test/kotlin/androidx/build/AndroidXImplPluginTest.kt
new file mode 100644
index 0000000..d3b6f57
--- /dev/null
+++ b/buildSrc-tests/src/test/kotlin/androidx/build/AndroidXImplPluginTest.kt
@@ -0,0 +1,89 @@
+/*
+ * Copyright 2022 The Android Open Source Project
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT 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.build
+
+import org.junit.Assert
+import org.junit.Test
+
+class AndroidXImplPluginTest {
+
+ @Test
+ fun testRemoveTargetSdkVersion() {
+ /* ktlint-disable max-line-length */
+ val manifest = """
+<?xml version="1.0" encoding="utf-8"?>
+<!--
+ Copyright (C) 2014 The Android Open Source Project
+
+ Licensed under the Apache License, Version 2.0 (the "License");
+ you may not use this file except in compliance with the License.
+ You may obtain a copy of the License at
+
+ http://www.apache.org/licenses/LICENSE-2.0
+
+ Unless required by applicable law or agreed to in writing, software
+ distributed under the License is distributed on an "AS IS" BASIS,
+ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ See the License for the specific language governing permissions and
+ limitations under the License.
+-->
+<manifest xmlns:android="http://schemas.android.com/apk/res/android"
+ package="androidx.core" >
+
+ <uses-sdk
+ android:minSdkVersion="14"
+ android:targetSdkVersion="31" />
+
+ <application android:appComponentFactory="androidx.core.app.CoreComponentFactory" />
+
+</manifest>
+ """
+
+ // Expect that the android:targetSdkVersion element is removed.
+ val expected = """
+<?xml version="1.0" encoding="utf-8"?>
+<!--
+ Copyright (C) 2014 The Android Open Source Project
+
+ Licensed under the Apache License, Version 2.0 (the "License");
+ you may not use this file except in compliance with the License.
+ You may obtain a copy of the License at
+
+ http://www.apache.org/licenses/LICENSE-2.0
+
+ Unless required by applicable law or agreed to in writing, software
+ distributed under the License is distributed on an "AS IS" BASIS,
+ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ See the License for the specific language governing permissions and
+ limitations under the License.
+-->
+<manifest xmlns:android="http://schemas.android.com/apk/res/android"
+ package="androidx.core" >
+
+ <uses-sdk
+ android:minSdkVersion="14" />
+
+ <application android:appComponentFactory="androidx.core.app.CoreComponentFactory" />
+
+</manifest>
+ """
+ /* ktlint-enable max-line-length */
+
+ val actual = removeTargetSdkVersion(manifest)
+ Assert.assertEquals(expected, actual)
+ }
+}
diff --git a/buildSrc/private/src/main/kotlin/androidx/build/AndroidXImplPlugin.kt b/buildSrc/private/src/main/kotlin/androidx/build/AndroidXImplPlugin.kt
index a7ba97f..05797b5 100644
--- a/buildSrc/private/src/main/kotlin/androidx/build/AndroidXImplPlugin.kt
+++ b/buildSrc/private/src/main/kotlin/androidx/build/AndroidXImplPlugin.kt
@@ -52,6 +52,7 @@
import com.android.build.gradle.TestedExtension
import com.android.build.gradle.internal.tasks.AnalyticsRecordingTask
import com.android.build.gradle.internal.tasks.ListingFileRedirectTask
+import com.android.build.gradle.tasks.BundleAar
import org.gradle.api.GradleException
import org.gradle.api.JavaVersion.VERSION_1_8
import org.gradle.api.Plugin
@@ -79,9 +80,14 @@
import org.jetbrains.kotlin.gradle.plugin.KotlinMultiplatformPluginWrapper
import org.jetbrains.kotlin.gradle.tasks.KotlinCompile
import java.io.File
+import java.nio.file.Files
+import java.nio.file.attribute.FileTime
import java.time.Duration
import java.util.Locale
import java.util.concurrent.ConcurrentHashMap
+import org.apache.tools.zip.ZipEntry
+import org.apache.tools.zip.ZipFile
+import org.apache.tools.zip.ZipOutputStream
import org.gradle.kotlin.dsl.KotlinClosure1
import org.gradle.kotlin.dsl.register
@@ -343,6 +349,26 @@
}
}
+ // Remove the android:targetSdkVersion element from the manifest used for AARs.
+ project.tasks.withType(BundleAar::class.java).configureEach { task ->
+ task.doLast {
+ val aar = task.archiveFile.get().asFile
+ val tempDir = Files.createTempDirectory("${task.name}Unzip").toFile()
+ tempDir.deleteOnExit()
+
+ ZipFile(aar).use { aarFile ->
+ aarFile.unzipTo(tempDir)
+ }
+ aar.delete()
+
+ val manifestFile = File(tempDir, "AndroidManifest.xml")
+ manifestFile.writeText(removeTargetSdkVersion(manifestFile.readText()))
+
+ tempDir.zipTo(aar)
+ tempDir.deleteRecursively()
+ }
+ }
+
project.extensions.getByType<com.android.build.api.dsl.LibraryExtension>().apply {
publishing {
singleVariant(DEFAULT_PUBLISH_CONFIG)
@@ -392,6 +418,54 @@
project.addToProjectMap(androidXExtension)
}
+ private fun ZipFile.unzipTo(tempDir: File) {
+ entries.iterator().forEach { entry ->
+ if (entry.isDirectory) {
+ File(tempDir, entry.name).mkdirs()
+ } else {
+ val file = File(tempDir, entry.name)
+ file.parentFile.mkdirs()
+ getInputStream(entry).use { stream ->
+ file.writeBytes(stream.readBytes())
+ }
+ }
+ }
+ }
+
+ private fun File.zipTo(outZip: File) {
+ ZipOutputStream(outZip.outputStream()).use { stream ->
+ listFiles()!!.forEach { file ->
+ stream.addFileRecursive(null, file)
+ }
+ }
+ }
+
+ private fun ZipOutputStream.addFileRecursive(parentPath: String?, file: File) {
+ val entryPath = if (parentPath != null) "$parentPath/${file.name}" else file.name
+ val entry = ZipEntry(file, entryPath)
+
+ // Reset creation time of entry to make it deterministic.
+ entry.time = 0
+ entry.creationTime = FileTime.fromMillis(0)
+
+ if (file.isFile) {
+ putNextEntry(entry)
+ file.inputStream().use { stream ->
+ stream.copyTo(this)
+ }
+ closeEntry()
+ } else if (file.isDirectory) {
+ val listFiles = file.listFiles()
+ if (!listFiles.isNullOrEmpty()) {
+ putNextEntry(entry)
+ closeEntry()
+ listFiles.forEach { containedFile ->
+ addFileRecursive(entryPath, containedFile)
+ }
+ }
+ }
+ }
+
private fun configureWithJavaPlugin(project: Project, extension: AndroidXExtension) {
project.configureErrorProneForJava()
project.configureSourceJarForJava()
@@ -494,7 +568,6 @@
buildToolsVersion = BUILD_TOOLS_VERSION
defaultConfig.targetSdk = TARGET_SDK_VERSION
ndkVersion = SupportConfig.NDK_VERSION
- ndkPath = project.getNdkPath().absolutePath
defaultConfig.testInstrumentationRunner = INSTRUMENTATION_RUNNER
@@ -986,4 +1059,12 @@
}
}
+/**
+ * Removes the android:targetSdkVersion element from the [manifest].
+ */
+fun removeTargetSdkVersion(manifest: String): String = manifest.replace(
+ "\\s*android:targetSdkVersion=\".+?\"".toRegex(),
+ ""
+)
+
const val PROJECT_OR_ARTIFACT_EXT_NAME = "projectOrArtifact"
diff --git a/buildSrc/public/src/main/kotlin/androidx/build/SdkHelper.kt b/buildSrc/public/src/main/kotlin/androidx/build/SdkHelper.kt
index 8ba49ed..6e6b3ff 100644
--- a/buildSrc/public/src/main/kotlin/androidx/build/SdkHelper.kt
+++ b/buildSrc/public/src/main/kotlin/androidx/build/SdkHelper.kt
@@ -88,17 +88,6 @@
}
/**
- * @return the root project's platform-specific NDK path as a file.
- */
-fun Project.getNdkPath(): File {
- val sdkPath = getSdkPath()
- return getPathFromEnvironmentVariableOrNull("ANDROID_NDK_ROOT")
- // One of the default paths when ndk is installed for the first time via sdkmanager.
- ?: fileIfExistsOrNull(sdkPath, "ndk-bundle")
- ?: File(sdkPath, "ndk")
-}
-
-/**
* @return [File] representing the path stored in [envValue] if it exists, `null` otherwise.
*/
private fun getPathFromEnvironmentVariableOrNull(envVar: String): File? {
diff --git a/buildSrc/remoteBuildCache.gradle b/buildSrc/remoteBuildCache.gradle
index d40ee47..af53e0c 100644
--- a/buildSrc/remoteBuildCache.gradle
+++ b/buildSrc/remoteBuildCache.gradle
@@ -52,6 +52,8 @@
}
}
break
+ case "false":
+ break
default:
def uplinkLinux = new File("/usr/bin/uplink-helper")
def uplinkMac = new File("/usr/local/bin/uplink-helper")
diff --git a/busytown/androidx.sh b/busytown/androidx.sh
index 0639558..c33c5b1 100755
--- a/busytown/androidx.sh
+++ b/busytown/androidx.sh
@@ -5,6 +5,12 @@
cd "$(dirname $0)"
+# This target is for testing that clean builds work correctly
+# We disable the remote cache for this target unless it was already enabled
+if [ "$USE_ANDROIDX_REMOTE_BUILD_CACHE" == ""]; then
+ export USE_ANDROIDX_REMOTE_BUILD_CACHE=false
+fi
+
EXIT_VALUE=0
# Validate translation exports, if present
diff --git a/busytown/androidx_multiplatform.sh b/busytown/androidx_multiplatform.sh
index e51f235..08a8273 100755
--- a/busytown/androidx_multiplatform.sh
+++ b/busytown/androidx_multiplatform.sh
@@ -3,4 +3,7 @@
cd "$(dirname $0)"
+# androidx.sh disables the cache unless explicitly enabled
+export USE_ANDROIDX_REMOTE_BUILD_CACHE=gcp
+
./androidx.sh -Pandroidx.compose.multiplatformEnabled=true compileDebugAndroidTestSources compileDebugSources desktopTestClasses "$@"
diff --git a/busytown/impl/build-metalava-and-androidx.sh b/busytown/impl/build-metalava-and-androidx.sh
index 92bdb80..2fb33a6 100755
--- a/busytown/impl/build-metalava-and-androidx.sh
+++ b/busytown/impl/build-metalava-and-androidx.sh
@@ -21,7 +21,7 @@
export DIST_DIR="$DIST_DIR"
# resolve GRADLE_USER_HOME
-export GRADLE_USER_HOME="$DIST_DIR/gradle"
+export GRADLE_USER_HOME="$OUT_DIR/gradle"
mkdir -p "$GRADLE_USER_HOME"
if [ "$ROOT_DIR" == "" ]; then
diff --git a/busytown/impl/build-studio-and-androidx.sh b/busytown/impl/build-studio-and-androidx.sh
index 4417da6..390f51b 100755
--- a/busytown/impl/build-studio-and-androidx.sh
+++ b/busytown/impl/build-studio-and-androidx.sh
@@ -29,7 +29,7 @@
export DIST_DIR="$DIST_DIR"
# resolve GRADLE_USER_HOME
-export GRADLE_USER_HOME="$DIST_DIR/gradle"
+export GRADLE_USER_HOME="$OUT_DIR/gradle"
mkdir -p "$GRADLE_USER_HOME"
if [ "$STUDIO_DIR" == "" ]; then
diff --git a/busytown/impl/build.sh b/busytown/impl/build.sh
index 3c90eaed..f7cc938 100755
--- a/busytown/impl/build.sh
+++ b/busytown/impl/build.sh
@@ -63,6 +63,11 @@
# export some variables
ANDROID_HOME=../../prebuilts/fullsdk-linux
+# enable remote build cache unless explicitly disabled
+if [ "$USE_ANDROIDX_REMOTE_BUILD_CACHE" == "" ]; then
+ export USE_ANDROIDX_REMOTE_BUILD_CACHE=gcp
+fi
+
# run the build
if run ./gradlew --ci saveSystemStats "$@"; then
echo build passed
diff --git a/camera/camera-camera2-pipe-integration/src/main/java/androidx/camera/camera2/pipe/integration/adapter/CameraControlAdapter.kt b/camera/camera-camera2-pipe-integration/src/main/java/androidx/camera/camera2/pipe/integration/adapter/CameraControlAdapter.kt
index 32c872d..ef7ccc3 100644
--- a/camera/camera-camera2-pipe-integration/src/main/java/androidx/camera/camera2/pipe/integration/adapter/CameraControlAdapter.kt
+++ b/camera/camera-camera2-pipe-integration/src/main/java/androidx/camera/camera2/pipe/integration/adapter/CameraControlAdapter.kt
@@ -156,8 +156,13 @@
evCompControl.updateAsync(exposure).asListenableFuture()
)
- override fun setZslDisabled(disabled: Boolean) {
- // Override if Zero-Shutter Lag needs to be disabled or not.
+ override fun setZslDisabledByUserCaseConfig(disabled: Boolean) {
+ // Override if Zero-Shutter Lag needs to be disabled by user case config.
+ }
+
+ override fun isZslDisabledByByUserCaseConfig(): Boolean {
+ // Override if Zero-Shutter Lag needs to be disabled by user case config.
+ return false
}
override fun addZslConfig(resolution: Size, sessionConfigBuilder: SessionConfig.Builder) {
diff --git a/camera/camera-camera2-pipe-integration/src/main/java/androidx/camera/camera2/pipe/integration/adapter/CameraInfoAdapter.kt b/camera/camera-camera2-pipe-integration/src/main/java/androidx/camera/camera2/pipe/integration/adapter/CameraInfoAdapter.kt
index 407e789..5a7e8f3 100644
--- a/camera/camera-camera2-pipe-integration/src/main/java/androidx/camera/camera2/pipe/integration/adapter/CameraInfoAdapter.kt
+++ b/camera/camera-camera2-pipe-integration/src/main/java/androidx/camera/camera2/pipe/integration/adapter/CameraInfoAdapter.kt
@@ -121,6 +121,11 @@
return false
}
+ override fun isZslSupported(): Boolean {
+ Log.warn { "TODO: isZslSupported are not yet supported." }
+ return false
+ }
+
override fun isYuvReprocessingSupported(): Boolean {
Log.warn { "TODO: isYuvReprocessingSupported are not yet supported." }
return false
diff --git a/camera/camera-camera2-pipe-integration/src/main/java/androidx/camera/camera2/pipe/integration/impl/MeteringRepeating.kt b/camera/camera-camera2-pipe-integration/src/main/java/androidx/camera/camera2/pipe/integration/impl/MeteringRepeating.kt
index 1c09b6f..c72f4d0 100644
--- a/camera/camera-camera2-pipe-integration/src/main/java/androidx/camera/camera2/pipe/integration/impl/MeteringRepeating.kt
+++ b/camera/camera-camera2-pipe-integration/src/main/java/androidx/camera/camera2/pipe/integration/impl/MeteringRepeating.kt
@@ -173,6 +173,8 @@
override fun setCameraSelector(cameraSelector: CameraSelector) = this
+ override fun setZslDisabled(disabled: Boolean) = this
+
override fun build(): MeteringRepeating {
return MeteringRepeating(cameraProperties, useCaseConfig)
}
diff --git a/camera/camera-camera2-pipe/src/androidTest/java/androidx/camera/camera2/pipe/CameraPipeInstrumentationTest.kt b/camera/camera-camera2-pipe/src/androidTest/java/androidx/camera/camera2/pipe/CameraPipeInstrumentationTest.kt
index 0dd3433..8a2e4bc 100644
--- a/camera/camera-camera2-pipe/src/androidTest/java/androidx/camera/camera2/pipe/CameraPipeInstrumentationTest.kt
+++ b/camera/camera-camera2-pipe/src/androidTest/java/androidx/camera/camera2/pipe/CameraPipeInstrumentationTest.kt
@@ -16,9 +16,9 @@
package androidx.camera.camera2.pipe
-import androidx.test.filters.SmallTest
import androidx.test.ext.junit.runners.AndroidJUnit4
import androidx.test.filters.SdkSuppress
+import androidx.test.filters.SmallTest
import org.junit.Test
import org.junit.runner.RunWith
@@ -26,5 +26,7 @@
@RunWith(AndroidJUnit4::class)
@SdkSuppress(minSdkVersion = 21)
class CameraPipeInstrumentationTest {
- @Test fun test() {}
+ @Test
+ fun test() {
+ }
}
\ No newline at end of file
diff --git a/camera/camera-camera2-pipe/src/main/java/androidx/camera/camera2/pipe/CameraPipe.kt b/camera/camera-camera2-pipe/src/main/java/androidx/camera/camera2/pipe/CameraPipe.kt
index 9b97016..a524d23 100644
--- a/camera/camera-camera2-pipe/src/main/java/androidx/camera/camera2/pipe/CameraPipe.kt
+++ b/camera/camera-camera2-pipe/src/main/java/androidx/camera/camera2/pipe/CameraPipe.kt
@@ -31,8 +31,8 @@
import androidx.camera.camera2.pipe.config.ExternalCameraGraphConfigModule
import androidx.camera.camera2.pipe.config.ExternalCameraPipeComponent
import androidx.camera.camera2.pipe.config.ThreadConfigModule
-import kotlinx.atomicfu.atomic
import java.util.concurrent.Executor
+import kotlinx.atomicfu.atomic
internal val cameraPipeIds = atomic(0)
diff --git a/camera/camera-camera2-pipe/src/main/java/androidx/camera/camera2/pipe/Request.kt b/camera/camera-camera2-pipe/src/main/java/androidx/camera/camera2/pipe/Request.kt
index 901f005..037dbec 100644
--- a/camera/camera-camera2-pipe/src/main/java/androidx/camera/camera2/pipe/Request.kt
+++ b/camera/camera-camera2-pipe/src/main/java/androidx/camera/camera2/pipe/Request.kt
@@ -18,10 +18,10 @@
package androidx.camera.camera2.pipe
-import android.hardware.camera2.CaptureFailure
-import android.hardware.camera2.CaptureRequest
import android.hardware.camera2.CameraCaptureSession
import android.hardware.camera2.CameraDevice
+import android.hardware.camera2.CaptureFailure
+import android.hardware.camera2.CaptureRequest
import androidx.annotation.RequiresApi
/**
diff --git a/camera/camera-camera2-pipe/src/main/java/androidx/camera/camera2/pipe/compat/Camera2CameraController.kt b/camera/camera-camera2-pipe/src/main/java/androidx/camera/camera2/pipe/compat/Camera2CameraController.kt
index dd945db..201fd84 100644
--- a/camera/camera-camera2-pipe/src/main/java/androidx/camera/camera2/pipe/compat/Camera2CameraController.kt
+++ b/camera/camera-camera2-pipe/src/main/java/androidx/camera/camera2/pipe/compat/Camera2CameraController.kt
@@ -21,10 +21,9 @@
import androidx.camera.camera2.pipe.config.CameraGraphScope
import androidx.camera.camera2.pipe.config.ForCameraGraph
import androidx.camera.camera2.pipe.graph.GraphListener
-import kotlinx.coroutines.CoroutineScope
-import kotlinx.coroutines.flow.collect
-import kotlinx.coroutines.launch
import javax.inject.Inject
+import kotlinx.coroutines.CoroutineScope
+import kotlinx.coroutines.launch
/**
* This represents the core state loop for a Camera Graph instance.
diff --git a/camera/camera-camera2-pipe/src/main/java/androidx/camera/camera2/pipe/compat/Camera2CameraDevices.kt b/camera/camera-camera2-pipe/src/main/java/androidx/camera/camera2/pipe/compat/Camera2CameraDevices.kt
index 20f04233c..1a8b860 100644
--- a/camera/camera-camera2-pipe/src/main/java/androidx/camera/camera2/pipe/compat/Camera2CameraDevices.kt
+++ b/camera/camera-camera2-pipe/src/main/java/androidx/camera/camera2/pipe/compat/Camera2CameraDevices.kt
@@ -20,9 +20,9 @@
import androidx.camera.camera2.pipe.CameraDevices
import androidx.camera.camera2.pipe.CameraId
import androidx.camera.camera2.pipe.CameraMetadata
-import kotlinx.coroutines.runBlocking
import javax.inject.Inject
import javax.inject.Singleton
+import kotlinx.coroutines.runBlocking
/**
* Provides utilities for querying cameras and accessing metadata about those cameras.
diff --git a/camera/camera-camera2-pipe/src/main/java/androidx/camera/camera2/pipe/compat/Camera2DeviceCache.kt b/camera/camera-camera2-pipe/src/main/java/androidx/camera/camera2/pipe/compat/Camera2DeviceCache.kt
index bed42a5..68c2be7 100644
--- a/camera/camera-camera2-pipe/src/main/java/androidx/camera/camera2/pipe/compat/Camera2DeviceCache.kt
+++ b/camera/camera-camera2-pipe/src/main/java/androidx/camera/camera2/pipe/compat/Camera2DeviceCache.kt
@@ -24,10 +24,10 @@
import androidx.camera.camera2.pipe.core.Debug
import androidx.camera.camera2.pipe.core.Log
import androidx.camera.camera2.pipe.core.Threads
-import kotlinx.coroutines.withContext
import javax.inject.Inject
import javax.inject.Provider
import javax.inject.Singleton
+import kotlinx.coroutines.withContext
@RequiresApi(21) // TODO(b/200306659): Remove and replace with annotation on package-info.java
@Singleton
diff --git a/camera/camera-camera2-pipe/src/main/java/androidx/camera/camera2/pipe/compat/Camera2MetadataCache.kt b/camera/camera-camera2-pipe/src/main/java/androidx/camera/camera2/pipe/compat/Camera2MetadataCache.kt
index ff0b83f..c781ed2 100644
--- a/camera/camera-camera2-pipe/src/main/java/androidx/camera/camera2/pipe/compat/Camera2MetadataCache.kt
+++ b/camera/camera-camera2-pipe/src/main/java/androidx/camera/camera2/pipe/compat/Camera2MetadataCache.kt
@@ -26,14 +26,13 @@
import androidx.camera.camera2.pipe.CameraPipe
import androidx.camera.camera2.pipe.core.Debug
import androidx.camera.camera2.pipe.core.Log
-import androidx.camera.camera2.pipe.core.Timestamps
-import androidx.camera.camera2.pipe.core.Timestamps.formatMs
import androidx.camera.camera2.pipe.core.Permissions
import androidx.camera.camera2.pipe.core.Threads
-import kotlinx.coroutines.withContext
-import java.lang.IllegalStateException
+import androidx.camera.camera2.pipe.core.Timestamps
+import androidx.camera.camera2.pipe.core.Timestamps.formatMs
import javax.inject.Inject
import javax.inject.Singleton
+import kotlinx.coroutines.withContext
/**
* Provides caching and querying of [CameraMetadata] via Camera2.
@@ -92,6 +91,13 @@
val characteristics =
cameraManager.getCameraCharacteristics(cameraId.value)
+ // This technically shouldn't be null per documentation, but we suspect it could be
+ // under certain devices in certain situations.
+ @Suppress("RedundantRequireNotNullCall")
+ checkNotNull(characteristics) {
+ "Failed to get CameraCharacteristics for $cameraId!"
+ }
+
// Merge the camera specific and global cache blocklists together.
// this will prevent these values from being cached after first access.
val cameraBlocklist = cameraMetadataConfig.cameraCacheBlocklist[cameraId]
diff --git a/camera/camera-camera2-pipe/src/main/java/androidx/camera/camera2/pipe/compat/Camera2RequestProcessor.kt b/camera/camera-camera2-pipe/src/main/java/androidx/camera/camera2/pipe/compat/Camera2RequestProcessor.kt
index 8906736..fe1a51e0 100644
--- a/camera/camera-camera2-pipe/src/main/java/androidx/camera/camera2/pipe/compat/Camera2RequestProcessor.kt
+++ b/camera/camera-camera2-pipe/src/main/java/androidx/camera/camera2/pipe/compat/Camera2RequestProcessor.kt
@@ -35,10 +35,10 @@
import androidx.camera.camera2.pipe.core.Log
import androidx.camera.camera2.pipe.core.Threads
import androidx.camera.camera2.pipe.writeParameters
-import kotlinx.atomicfu.atomic
import java.util.Collections.singletonList
import java.util.Collections.singletonMap
import javax.inject.Inject
+import kotlinx.atomicfu.atomic
internal interface Camera2RequestProcessorFactory {
fun create(
diff --git a/camera/camera-camera2-pipe/src/main/java/androidx/camera/camera2/pipe/compat/Camera2StreamGraph.kt b/camera/camera-camera2-pipe/src/main/java/androidx/camera/camera2/pipe/compat/Camera2StreamGraph.kt
index ad4c0d2..baf93af 100644
--- a/camera/camera-camera2-pipe/src/main/java/androidx/camera/camera2/pipe/compat/Camera2StreamGraph.kt
+++ b/camera/camera-camera2-pipe/src/main/java/androidx/camera/camera2/pipe/compat/Camera2StreamGraph.kt
@@ -41,8 +41,8 @@
import androidx.camera.camera2.pipe.StreamId
import androidx.camera.camera2.pipe.config.CameraGraphScope
import androidx.camera.camera2.pipe.core.Log
-import kotlinx.atomicfu.atomic
import javax.inject.Inject
+import kotlinx.atomicfu.atomic
private val streamIds = atomic(0)
internal fun nextStreamId(): StreamId = StreamId(streamIds.incrementAndGet())
diff --git a/camera/camera-camera2-pipe/src/main/java/androidx/camera/camera2/pipe/compat/CaptureSessionFactory.kt b/camera/camera-camera2-pipe/src/main/java/androidx/camera/camera2/pipe/compat/CaptureSessionFactory.kt
index 9c0a430..8328c5e 100644
--- a/camera/camera-camera2-pipe/src/main/java/androidx/camera/camera2/pipe/compat/CaptureSessionFactory.kt
+++ b/camera/camera-camera2-pipe/src/main/java/androidx/camera/camera2/pipe/compat/CaptureSessionFactory.kt
@@ -25,9 +25,9 @@
import androidx.annotation.RequiresApi
import androidx.camera.camera2.pipe.CameraGraph
import androidx.camera.camera2.pipe.StreamId
+import androidx.camera.camera2.pipe.compat.OutputConfigurationWrapper.Companion.SURFACE_GROUP_ID_NONE
import androidx.camera.camera2.pipe.config.CameraGraphScope
import androidx.camera.camera2.pipe.core.Log
-import androidx.camera.camera2.pipe.compat.OutputConfigurationWrapper.Companion.SURFACE_GROUP_ID_NONE
import androidx.camera.camera2.pipe.core.Threads
import dagger.Module
import dagger.Provides
@@ -193,6 +193,10 @@
streamGraph,
surfaces
)
+ if (outputs.all.isEmpty()) {
+ Log.warn { "Failed to create OutputConfigurations for $graphConfig" }
+ return emptyMap()
+ }
try {
if (graphConfig.input == null) {
@@ -247,6 +251,10 @@
streamGraph,
surfaces
)
+ if (outputs.all.isEmpty()) {
+ Log.warn { "Failed to create OutputConfigurations for $graphConfig" }
+ return emptyMap()
+ }
val input = graphConfig.input?.let {
val outputConfig = it.stream.outputs.single()
@@ -322,6 +330,10 @@
null
}
)
+ if (output == null) {
+ Log.warn { "Failed to create AndroidOutputConfiguration for $outputConfig" }
+ continue
+ }
allOutputs.add(output)
for (outputSurface in outputConfig.streamBuilder) {
deferredOutputs[outputSurface.id] = output
@@ -346,6 +358,10 @@
null
}
)
+ if (output == null) {
+ Log.warn { "Failed to create AndroidOutputConfiguration for $outputConfig" }
+ continue
+ }
for (surface in outputSurfaces.drop(1)) {
output.addSurface(surface)
}
diff --git a/camera/camera-camera2-pipe/src/main/java/androidx/camera/camera2/pipe/compat/CaptureSessionWrapper.kt b/camera/camera-camera2-pipe/src/main/java/androidx/camera/camera2/pipe/compat/CaptureSessionWrapper.kt
index 5fe234f..8e663b0 100644
--- a/camera/camera-camera2-pipe/src/main/java/androidx/camera/camera2/pipe/compat/CaptureSessionWrapper.kt
+++ b/camera/camera-camera2-pipe/src/main/java/androidx/camera/camera2/pipe/compat/CaptureSessionWrapper.kt
@@ -27,8 +27,8 @@
import androidx.annotation.RequiresApi
import androidx.camera.camera2.pipe.UnsafeWrapper
import androidx.camera.camera2.pipe.core.Log
-import kotlinx.atomicfu.atomic
import java.io.Closeable
+import kotlinx.atomicfu.atomic
/**
* Interface shim for [CameraCaptureSession] with minor modifications.
diff --git a/camera/camera-camera2-pipe/src/main/java/androidx/camera/camera2/pipe/compat/Configuration.kt b/camera/camera-camera2-pipe/src/main/java/androidx/camera/camera2/pipe/compat/Configuration.kt
index e548d40..c5155c6 100644
--- a/camera/camera-camera2-pipe/src/main/java/androidx/camera/camera2/pipe/compat/Configuration.kt
+++ b/camera/camera-camera2-pipe/src/main/java/androidx/camera/camera2/pipe/compat/Configuration.kt
@@ -29,6 +29,7 @@
import androidx.camera.camera2.pipe.OutputStream.OutputType
import androidx.camera.camera2.pipe.UnsafeWrapper
import androidx.camera.camera2.pipe.compat.OutputConfigurationWrapper.Companion.SURFACE_GROUP_ID_NONE
+import androidx.camera.camera2.pipe.core.Log
import androidx.camera.camera2.pipe.core.checkNOrHigher
import androidx.camera.camera2.pipe.core.checkOOrHigher
import androidx.camera.camera2.pipe.core.checkPOrHigher
@@ -128,7 +129,8 @@
@RequiresApi(24)
companion object {
/**
- * Create and validate an OutputConfiguration for Camera2.
+ * Create and validate an OutputConfiguration for Camera2. null is returned when a
+ * non-exceptional error is encountered when creating the OutputConfiguration.
*/
fun create(
surface: Surface?,
@@ -137,20 +139,29 @@
surfaceSharing: Boolean = false,
surfaceGroupId: Int = SURFACE_GROUP_ID_NONE,
physicalCameraId: CameraId? = null
- ): OutputConfigurationWrapper {
+ ): OutputConfigurationWrapper? {
check(Build.VERSION.SDK_INT >= Build.VERSION_CODES.N)
// Create the OutputConfiguration using the groupId via the constructor (if set)
val configuration: OutputConfiguration
if (outputType == OutputType.SURFACE) {
check(surface != null) {
- "OutputConfigurations defined with ${OutputType.SURFACE} must provide a valid" +
- " surface!"
+ "OutputConfigurations defined with ${OutputType.SURFACE} must provide a"
+ "non-null surface!"
}
- configuration = if (surfaceGroupId != SURFACE_GROUP_ID_NONE) {
- OutputConfiguration(surfaceGroupId, surface)
- } else {
- OutputConfiguration(surface)
+ // OutputConfiguration will, on some OS versions, attempt to read the surface size
+ // from the Surface object. If the Surface has been destroyed, this check will fail.
+ // Because there's no way to cleanly synchronize and check the value, we catch the
+ // exception for these cases.
+ try {
+ configuration = if (surfaceGroupId != SURFACE_GROUP_ID_NONE) {
+ OutputConfiguration(surfaceGroupId, surface)
+ } else {
+ OutputConfiguration(surface)
+ }
+ } catch (e: Throwable) {
+ Log.warn(e) { "Failed to create an OutputConfiguration for $surface!" }
+ return null
}
} else {
if (Build.VERSION.SDK_INT < Build.VERSION_CODES.O) {
diff --git a/camera/camera-camera2-pipe/src/main/java/androidx/camera/camera2/pipe/compat/Exceptions.kt b/camera/camera-camera2-pipe/src/main/java/androidx/camera/camera2/pipe/compat/Exceptions.kt
index df8cf94..059f01a 100644
--- a/camera/camera-camera2-pipe/src/main/java/androidx/camera/camera2/pipe/compat/Exceptions.kt
+++ b/camera/camera-camera2-pipe/src/main/java/androidx/camera/camera2/pipe/compat/Exceptions.kt
@@ -21,7 +21,6 @@
import android.hardware.camera2.CameraAccessException
import androidx.annotation.RequiresApi
import androidx.camera.camera2.pipe.core.Log
-import kotlin.jvm.Throws
/**
* Thrown when an operation cannot be executed because underlying object is closed or in an
diff --git a/camera/camera-camera2-pipe/src/main/java/androidx/camera/camera2/pipe/compat/VirtualCamera.kt b/camera/camera-camera2-pipe/src/main/java/androidx/camera/camera2/pipe/compat/VirtualCamera.kt
index 5d5a0c0..73df044 100644
--- a/camera/camera-camera2-pipe/src/main/java/androidx/camera/camera2/pipe/compat/VirtualCamera.kt
+++ b/camera/camera-camera2-pipe/src/main/java/androidx/camera/camera2/pipe/compat/VirtualCamera.kt
@@ -37,7 +37,6 @@
import kotlinx.coroutines.flow.Flow
import kotlinx.coroutines.flow.MutableStateFlow
import kotlinx.coroutines.flow.StateFlow
-import kotlinx.coroutines.flow.collect
import kotlinx.coroutines.flow.first
import kotlinx.coroutines.launch
diff --git a/camera/camera-camera2-pipe/src/main/java/androidx/camera/camera2/pipe/compat/VirtualCameraManager.kt b/camera/camera-camera2-pipe/src/main/java/androidx/camera/camera2/pipe/compat/VirtualCameraManager.kt
index 5877797..f94abb0 100644
--- a/camera/camera-camera2-pipe/src/main/java/androidx/camera/camera2/pipe/compat/VirtualCameraManager.kt
+++ b/camera/camera-camera2-pipe/src/main/java/androidx/camera/camera2/pipe/compat/VirtualCameraManager.kt
@@ -25,10 +25,13 @@
import androidx.camera.camera2.pipe.CameraId
import androidx.camera.camera2.pipe.core.Debug
import androidx.camera.camera2.pipe.core.Log
-import androidx.camera.camera2.pipe.core.Timestamps
import androidx.camera.camera2.pipe.core.Permissions
import androidx.camera.camera2.pipe.core.Threads
+import androidx.camera.camera2.pipe.core.Timestamps
import androidx.camera.camera2.pipe.core.WakeLock
+import javax.inject.Inject
+import javax.inject.Provider
+import javax.inject.Singleton
import kotlinx.coroutines.CompletableDeferred
import kotlinx.coroutines.CoroutineName
import kotlinx.coroutines.CoroutineScope
@@ -37,13 +40,9 @@
import kotlinx.coroutines.channels.Channel
import kotlinx.coroutines.channels.SendChannel
import kotlinx.coroutines.coroutineScope
-import kotlinx.coroutines.flow.collect
import kotlinx.coroutines.flow.first
import kotlinx.coroutines.launch
import kotlinx.coroutines.withTimeoutOrNull
-import javax.inject.Inject
-import javax.inject.Provider
-import javax.inject.Singleton
internal sealed class CameraRequest
internal data class RequestOpen(
diff --git a/camera/camera-camera2-pipe/src/main/java/androidx/camera/camera2/pipe/compat/VirtualSessionState.kt b/camera/camera-camera2-pipe/src/main/java/androidx/camera/camera2/pipe/compat/VirtualSessionState.kt
index fa32010..5ef34ab 100644
--- a/camera/camera-camera2-pipe/src/main/java/androidx/camera/camera2/pipe/compat/VirtualSessionState.kt
+++ b/camera/camera-camera2-pipe/src/main/java/androidx/camera/camera2/pipe/compat/VirtualSessionState.kt
@@ -29,10 +29,10 @@
import androidx.camera.camera2.pipe.core.Timestamps
import androidx.camera.camera2.pipe.core.Timestamps.formatMs
import androidx.camera.camera2.pipe.graph.GraphListener
+import java.util.Collections.synchronizedMap
import kotlinx.atomicfu.atomic
import kotlinx.coroutines.CoroutineScope
import kotlinx.coroutines.launch
-import java.util.Collections.synchronizedMap
internal val virtualSessionDebugIds = atomic(0)
diff --git a/camera/camera-camera2-pipe/src/main/java/androidx/camera/camera2/pipe/config/CameraGraphComponent.kt b/camera/camera-camera2-pipe/src/main/java/androidx/camera/camera2/pipe/config/CameraGraphComponent.kt
index 85329c7..c329444 100644
--- a/camera/camera-camera2-pipe/src/main/java/androidx/camera/camera2/pipe/config/CameraGraphComponent.kt
+++ b/camera/camera-camera2-pipe/src/main/java/androidx/camera/camera2/pipe/config/CameraGraphComponent.kt
@@ -38,10 +38,10 @@
import dagger.Module
import dagger.Provides
import dagger.Subcomponent
-import kotlinx.coroutines.CoroutineName
-import kotlinx.coroutines.CoroutineScope
import javax.inject.Qualifier
import javax.inject.Scope
+import kotlinx.coroutines.CoroutineName
+import kotlinx.coroutines.CoroutineScope
@Scope
internal annotation class CameraGraphScope
diff --git a/camera/camera-camera2-pipe/src/main/java/androidx/camera/camera2/pipe/config/ThreadConfigModule.kt b/camera/camera-camera2-pipe/src/main/java/androidx/camera/camera2/pipe/config/ThreadConfigModule.kt
index 72cfd75..38c5d6c 100644
--- a/camera/camera-camera2-pipe/src/main/java/androidx/camera/camera2/pipe/config/ThreadConfigModule.kt
+++ b/camera/camera-camera2-pipe/src/main/java/androidx/camera/camera2/pipe/config/ThreadConfigModule.kt
@@ -30,11 +30,11 @@
import androidx.camera.camera2.pipe.core.Threads
import dagger.Module
import dagger.Provides
+import javax.inject.Singleton
import kotlinx.coroutines.CoroutineName
import kotlinx.coroutines.CoroutineScope
import kotlinx.coroutines.SupervisorJob
import kotlinx.coroutines.asCoroutineDispatcher
-import javax.inject.Singleton
/**
* Configure and provide a single [Threads] object to other parts of the library.
diff --git a/camera/camera-camera2-pipe/src/main/java/androidx/camera/camera2/pipe/core/AndroidThreads.kt b/camera/camera-camera2-pipe/src/main/java/androidx/camera/camera2/pipe/core/AndroidThreads.kt
index a38d491..aa8b68c 100644
--- a/camera/camera-camera2-pipe/src/main/java/androidx/camera/camera2/pipe/core/AndroidThreads.kt
+++ b/camera/camera-camera2-pipe/src/main/java/androidx/camera/camera2/pipe/core/AndroidThreads.kt
@@ -18,11 +18,11 @@
import android.os.Process
import androidx.annotation.RequiresApi
-import kotlinx.atomicfu.atomic
import java.util.concurrent.ExecutorService
import java.util.concurrent.Executors
import java.util.concurrent.ScheduledExecutorService
import java.util.concurrent.ThreadFactory
+import kotlinx.atomicfu.atomic
@RequiresApi(21)
internal object AndroidThreads {
diff --git a/camera/camera-camera2-pipe/src/main/java/androidx/camera/camera2/pipe/core/Threads.kt b/camera/camera-camera2-pipe/src/main/java/androidx/camera/camera2/pipe/core/Threads.kt
index ffc6ad0..a2bc9b8 100644
--- a/camera/camera-camera2-pipe/src/main/java/androidx/camera/camera2/pipe/core/Threads.kt
+++ b/camera/camera-camera2-pipe/src/main/java/androidx/camera/camera2/pipe/core/Threads.kt
@@ -18,9 +18,9 @@
import android.os.Handler
import androidx.annotation.RequiresApi
+import java.util.concurrent.Executor
import kotlinx.coroutines.CoroutineDispatcher
import kotlinx.coroutines.CoroutineScope
-import java.util.concurrent.Executor
/**
* This collection pre-configured executors, dispatchers, and scopes that are used throughout this
diff --git a/camera/camera-camera2-pipe/src/main/java/androidx/camera/camera2/pipe/core/TokenLock.kt b/camera/camera-camera2-pipe/src/main/java/androidx/camera/camera2/pipe/core/TokenLock.kt
index bda8e32..574cc10 100644
--- a/camera/camera-camera2-pipe/src/main/java/androidx/camera/camera2/pipe/core/TokenLock.kt
+++ b/camera/camera-camera2-pipe/src/main/java/androidx/camera/camera2/pipe/core/TokenLock.kt
@@ -21,16 +21,16 @@
import androidx.annotation.GuardedBy
import androidx.annotation.RequiresApi
-import kotlinx.coroutines.CancellableContinuation
-import kotlinx.coroutines.CancellationException
-import kotlinx.coroutines.suspendCancellableCoroutine
-import kotlinx.atomicfu.atomic
+import androidx.camera.camera2.pipe.core.TokenLock.Token
import java.io.Closeable
import java.util.ArrayDeque
import kotlin.coroutines.resume
import kotlin.coroutines.resumeWithException
import kotlin.math.min
-import kotlin.io.use
+import kotlinx.atomicfu.atomic
+import kotlinx.coroutines.CancellableContinuation
+import kotlinx.coroutines.CancellationException
+import kotlinx.coroutines.suspendCancellableCoroutine
/**
* Provides fair access to a resources by acquiring and releasing variable sized [Token] objects.
diff --git a/camera/camera-camera2-pipe/src/main/java/androidx/camera/camera2/pipe/graph/CameraGraphImpl.kt b/camera/camera-camera2-pipe/src/main/java/androidx/camera/camera2/pipe/graph/CameraGraphImpl.kt
index be65ab9..845cfb8 100644
--- a/camera/camera-camera2-pipe/src/main/java/androidx/camera/camera2/pipe/graph/CameraGraphImpl.kt
+++ b/camera/camera-camera2-pipe/src/main/java/androidx/camera/camera2/pipe/graph/CameraGraphImpl.kt
@@ -32,8 +32,8 @@
import androidx.camera.camera2.pipe.core.TokenLockImpl
import androidx.camera.camera2.pipe.core.acquire
import androidx.camera.camera2.pipe.core.acquireOrNull
-import kotlinx.atomicfu.atomic
import javax.inject.Inject
+import kotlinx.atomicfu.atomic
internal val cameraGraphIds = atomic(0)
@@ -96,6 +96,9 @@
override fun setSurface(stream: StreamId, surface: Surface?) {
Debug.traceStart { "$stream#setSurface" }
+ check(surface == null || surface.isValid) {
+ "Failed to set $surface to $stream: The surface was not valid."
+ }
streamGraph[stream] = surface
Debug.traceStop()
}
diff --git a/camera/camera-camera2-pipe/src/test/java/androidx/camera/camera2/pipe/RequestTest.kt b/camera/camera-camera2-pipe/src/test/java/androidx/camera/camera2/pipe/RequestTest.kt
index 9152342..a45add3 100644
--- a/camera/camera-camera2-pipe/src/test/java/androidx/camera/camera2/pipe/RequestTest.kt
+++ b/camera/camera-camera2-pipe/src/test/java/androidx/camera/camera2/pipe/RequestTest.kt
@@ -18,8 +18,8 @@
import android.hardware.camera2.CaptureRequest
import android.os.Build
-import androidx.camera.camera2.pipe.testing.RobolectricCameraPipeTestRunner
import androidx.camera.camera2.pipe.testing.FakeMetadata
+import androidx.camera.camera2.pipe.testing.RobolectricCameraPipeTestRunner
import com.google.common.truth.Truth.assertThat
import org.junit.Test
import org.junit.runner.RunWith
diff --git a/camera/camera-camera2-pipe/src/test/java/androidx/camera/camera2/pipe/compat/Camera2MetadataCacheTest.kt b/camera/camera-camera2-pipe/src/test/java/androidx/camera/camera2/pipe/compat/Camera2MetadataCacheTest.kt
index 82aea1f..467a517 100644
--- a/camera/camera-camera2-pipe/src/test/java/androidx/camera/camera2/pipe/compat/Camera2MetadataCacheTest.kt
+++ b/camera/camera-camera2-pipe/src/test/java/androidx/camera/camera2/pipe/compat/Camera2MetadataCacheTest.kt
@@ -20,9 +20,9 @@
import android.os.Build
import androidx.camera.camera2.pipe.CameraPipe
import androidx.camera.camera2.pipe.core.Permissions
+import androidx.camera.camera2.pipe.testing.FakeThreads
import androidx.camera.camera2.pipe.testing.RobolectricCameraPipeTestRunner
import androidx.camera.camera2.pipe.testing.RobolectricCameras
-import androidx.camera.camera2.pipe.testing.FakeThreads
import com.google.common.truth.Truth.assertThat
import org.junit.Test
import org.junit.runner.RunWith
diff --git a/camera/camera-camera2-pipe/src/test/java/androidx/camera/camera2/pipe/compat/Camera2StreamGraphTest.kt b/camera/camera-camera2-pipe/src/test/java/androidx/camera/camera2/pipe/compat/Camera2StreamGraphTest.kt
index 768075a..50cdbec 100644
--- a/camera/camera-camera2-pipe/src/test/java/androidx/camera/camera2/pipe/compat/Camera2StreamGraphTest.kt
+++ b/camera/camera-camera2-pipe/src/test/java/androidx/camera/camera2/pipe/compat/Camera2StreamGraphTest.kt
@@ -28,8 +28,8 @@
import androidx.camera.camera2.pipe.OutputStream
import androidx.camera.camera2.pipe.StreamFormat
import androidx.camera.camera2.pipe.StreamId
-import androidx.camera.camera2.pipe.testing.RobolectricCameraPipeTestRunner
import androidx.camera.camera2.pipe.testing.FakeCameraMetadata
+import androidx.camera.camera2.pipe.testing.RobolectricCameraPipeTestRunner
import com.google.common.truth.Truth.assertThat
import org.junit.Test
import org.junit.runner.RunWith
diff --git a/camera/camera-camera2-pipe/src/test/java/androidx/camera/camera2/pipe/compat/CaptureSessionFactoryTest.kt b/camera/camera-camera2-pipe/src/test/java/androidx/camera/camera2/pipe/compat/CaptureSessionFactoryTest.kt
index afc222b..a6cbe95 100644
--- a/camera/camera-camera2-pipe/src/test/java/androidx/camera/camera2/pipe/compat/CaptureSessionFactoryTest.kt
+++ b/camera/camera-camera2-pipe/src/test/java/androidx/camera/camera2/pipe/compat/CaptureSessionFactoryTest.kt
@@ -33,23 +33,23 @@
import androidx.camera.camera2.pipe.config.CameraGraphModules
import androidx.camera.camera2.pipe.config.CameraGraphScope
import androidx.camera.camera2.pipe.config.ThreadConfigModule
-import androidx.camera.camera2.pipe.testing.RobolectricCameraPipeTestRunner
-import androidx.camera.camera2.pipe.testing.RobolectricCameras
import androidx.camera.camera2.pipe.testing.FakeGraphProcessor
import androidx.camera.camera2.pipe.testing.FakeRequestProcessor
+import androidx.camera.camera2.pipe.testing.RobolectricCameraPipeTestRunner
+import androidx.camera.camera2.pipe.testing.RobolectricCameras
import androidx.test.core.app.ApplicationProvider
import com.google.common.truth.Truth.assertThat
import dagger.Component
import dagger.Module
import dagger.Provides
+import javax.inject.Singleton
import kotlinx.coroutines.ExperimentalCoroutinesApi
+import kotlinx.coroutines.test.runTest
import org.junit.After
import org.junit.Test
import org.junit.runner.RunWith
import org.robolectric.Shadows
import org.robolectric.annotation.Config
-import javax.inject.Singleton
-import kotlinx.coroutines.test.runTest
@RunWith(RobolectricCameraPipeTestRunner::class)
@Config(minSdk = Build.VERSION_CODES.LOLLIPOP)
diff --git a/camera/camera-camera2-pipe/src/test/java/androidx/camera/camera2/pipe/compat/VirtualCameraTest.kt b/camera/camera-camera2-pipe/src/test/java/androidx/camera/camera2/pipe/compat/VirtualCameraTest.kt
index f01d78e..64e6f33 100644
--- a/camera/camera-camera2-pipe/src/test/java/androidx/camera/camera2/pipe/compat/VirtualCameraTest.kt
+++ b/camera/camera-camera2-pipe/src/test/java/androidx/camera/camera2/pipe/compat/VirtualCameraTest.kt
@@ -19,27 +19,26 @@
import android.os.Build
import android.os.Looper.getMainLooper
import androidx.camera.camera2.pipe.core.Timestamps
+import androidx.camera.camera2.pipe.core.Token
import androidx.camera.camera2.pipe.testing.RobolectricCameraPipeTestRunner
import androidx.camera.camera2.pipe.testing.RobolectricCameras
-import androidx.camera.camera2.pipe.core.Token
import com.google.common.truth.Truth.assertThat
+import java.util.concurrent.TimeUnit
import kotlinx.coroutines.CoroutineStart
import kotlinx.coroutines.ExperimentalCoroutinesApi
import kotlinx.coroutines.cancelAndJoin
import kotlinx.coroutines.flow.asFlow
-import kotlinx.coroutines.flow.collect
import kotlinx.coroutines.flow.first
import kotlinx.coroutines.flow.flowOf
import kotlinx.coroutines.launch
+import kotlinx.coroutines.test.UnconfinedTestDispatcher
+import kotlinx.coroutines.test.runBlockingTest
import kotlinx.coroutines.test.runTest
import org.junit.After
import org.junit.Test
import org.junit.runner.RunWith
import org.robolectric.Shadows.shadowOf
import org.robolectric.annotation.Config
-import java.util.concurrent.TimeUnit
-import kotlinx.coroutines.test.UnconfinedTestDispatcher
-import kotlinx.coroutines.test.runBlockingTest
@RunWith(RobolectricCameraPipeTestRunner::class)
@Config(minSdk = Build.VERSION_CODES.LOLLIPOP)
diff --git a/camera/camera-camera2-pipe/src/test/java/androidx/camera/camera2/pipe/graph/Controller3ALock3ATest.kt b/camera/camera-camera2-pipe/src/test/java/androidx/camera/camera2/pipe/graph/Controller3ALock3ATest.kt
index 8ed2556..8812f87 100644
--- a/camera/camera-camera2-pipe/src/test/java/androidx/camera/camera2/pipe/graph/Controller3ALock3ATest.kt
+++ b/camera/camera-camera2-pipe/src/test/java/androidx/camera/camera2/pipe/graph/Controller3ALock3ATest.kt
@@ -35,15 +35,15 @@
import androidx.camera.camera2.pipe.testing.RobolectricCameraPipeTestRunner
import com.google.common.truth.Truth.assertThat
import kotlinx.coroutines.CoroutineScope
-import kotlinx.coroutines.cancel
-import kotlinx.coroutines.test.UnconfinedTestDispatcher
-import kotlinx.coroutines.ExperimentalCoroutinesApi
import kotlinx.coroutines.DelicateCoroutinesApi
+import kotlinx.coroutines.ExperimentalCoroutinesApi
import kotlinx.coroutines.GlobalScope
import kotlinx.coroutines.async
+import kotlinx.coroutines.cancel
import kotlinx.coroutines.delay
import kotlinx.coroutines.launch
import kotlinx.coroutines.runBlocking
+import kotlinx.coroutines.test.UnconfinedTestDispatcher
import org.junit.Test
import org.junit.runner.RunWith
import org.robolectric.annotation.Config
diff --git a/camera/camera-camera2-pipe/src/test/java/androidx/camera/camera2/pipe/graph/CorrectedFrameMetadataTest.kt b/camera/camera-camera2-pipe/src/test/java/androidx/camera/camera2/pipe/graph/CorrectedFrameMetadataTest.kt
index aa9f67c..11de0d0 100644
--- a/camera/camera-camera2-pipe/src/test/java/androidx/camera/camera2/pipe/graph/CorrectedFrameMetadataTest.kt
+++ b/camera/camera-camera2-pipe/src/test/java/androidx/camera/camera2/pipe/graph/CorrectedFrameMetadataTest.kt
@@ -19,9 +19,9 @@
import android.hardware.camera2.CaptureResult
import android.os.Build
import androidx.camera.camera2.pipe.compat.CorrectedFrameMetadata
-import androidx.camera.camera2.pipe.testing.RobolectricCameraPipeTestRunner
import androidx.camera.camera2.pipe.testing.FakeFrameMetadata
import androidx.camera.camera2.pipe.testing.FakeMetadata
+import androidx.camera.camera2.pipe.testing.RobolectricCameraPipeTestRunner
import com.google.common.truth.Truth.assertThat
import org.junit.Test
import org.junit.runner.RunWith
diff --git a/camera/camera-camera2-pipe/src/test/java/androidx/camera/camera2/pipe/graph/GraphProcessorTest.kt b/camera/camera-camera2-pipe/src/test/java/androidx/camera/camera2/pipe/graph/GraphProcessorTest.kt
index 0b10e97..c684827 100644
--- a/camera/camera-camera2-pipe/src/test/java/androidx/camera/camera2/pipe/graph/GraphProcessorTest.kt
+++ b/camera/camera-camera2-pipe/src/test/java/androidx/camera/camera2/pipe/graph/GraphProcessorTest.kt
@@ -30,13 +30,13 @@
import com.google.common.truth.Truth.assertThat
import kotlinx.coroutines.Dispatchers
import kotlinx.coroutines.ExperimentalCoroutinesApi
-import kotlinx.coroutines.launch
-import kotlinx.coroutines.test.runTest
-import kotlinx.coroutines.test.UnconfinedTestDispatcher
import kotlinx.coroutines.delay
import kotlinx.coroutines.flow.first
import kotlinx.coroutines.flow.firstOrNull
+import kotlinx.coroutines.launch
import kotlinx.coroutines.runBlocking
+import kotlinx.coroutines.test.UnconfinedTestDispatcher
+import kotlinx.coroutines.test.runTest
import kotlinx.coroutines.withTimeoutOrNull
import org.junit.Test
import org.junit.runner.RunWith
diff --git a/camera/camera-camera2-pipe/src/test/java/androidx/camera/camera2/pipe/testing/FakeThreads.kt b/camera/camera-camera2-pipe/src/test/java/androidx/camera/camera2/pipe/testing/FakeThreads.kt
index 5c22c04..a5432ae 100644
--- a/camera/camera-camera2-pipe/src/test/java/androidx/camera/camera2/pipe/testing/FakeThreads.kt
+++ b/camera/camera-camera2-pipe/src/test/java/androidx/camera/camera2/pipe/testing/FakeThreads.kt
@@ -18,6 +18,7 @@
import android.os.Handler
import androidx.camera.camera2.pipe.core.Threads
+import java.util.concurrent.Executor
import kotlinx.coroutines.CoroutineDispatcher
import kotlinx.coroutines.CoroutineName
import kotlinx.coroutines.CoroutineScope
@@ -25,7 +26,6 @@
import kotlinx.coroutines.SupervisorJob
import kotlinx.coroutines.asCoroutineDispatcher
import kotlinx.coroutines.asExecutor
-import java.util.concurrent.Executor
internal object FakeThreads {
@Suppress("deprecation")
@@ -48,6 +48,7 @@
fun fromDispatcher(dispatcher: CoroutineDispatcher): Threads {
val executor = dispatcher.asExecutor()
+
@Suppress("deprecation")
val fakeHandler = { Handler() }
diff --git a/camera/camera-camera2/build.gradle b/camera/camera-camera2/build.gradle
index 0ab6d1e..6fea985 100644
--- a/camera/camera-camera2/build.gradle
+++ b/camera/camera-camera2/build.gradle
@@ -43,6 +43,7 @@
testImplementation("androidx.annotation:annotation-experimental:1.1.0")
testImplementation("androidx.concurrent:concurrent-futures-ktx:1.1.0")
testImplementation("androidx.lifecycle:lifecycle-runtime-testing:2.3.1")
+ testImplementation(project(":camera:camera-video"))
testImplementation(project(":camera:camera-testing"))
testImplementation("androidx.arch.core:core-testing:2.1.0")
testImplementation(libs.junit) // Needed for Assert.assertThrows
diff --git a/camera/camera-camera2/src/androidTest/java/androidx/camera/camera2/internal/Camera2CameraControlImplDeviceTest.java b/camera/camera-camera2/src/androidTest/java/androidx/camera/camera2/internal/Camera2CameraControlImplDeviceTest.java
index fe6d5dd..7d4a0c15 100644
--- a/camera/camera-camera2/src/androidTest/java/androidx/camera/camera2/internal/Camera2CameraControlImplDeviceTest.java
+++ b/camera/camera-camera2/src/androidTest/java/androidx/camera/camera2/internal/Camera2CameraControlImplDeviceTest.java
@@ -271,6 +271,7 @@
assertAeMode(camera2Config, CONTROL_AE_MODE_ON_AUTO_FLASH);
assertThat(mCamera2CameraControlImpl.getFlashMode()).isEqualTo(
ImageCapture.FLASH_MODE_AUTO);
+ assertThat(mCamera2CameraControlImpl.getZslControl().isZslDisabledByFlashMode()).isTrue();
}
@Test
@@ -287,6 +288,7 @@
assertAeMode(camera2Config, CONTROL_AE_MODE_ON);
assertThat(mCamera2CameraControlImpl.getFlashMode()).isEqualTo(ImageCapture.FLASH_MODE_OFF);
+ assertThat(mCamera2CameraControlImpl.getZslControl().isZslDisabledByFlashMode()).isFalse();
}
@Test
@@ -303,6 +305,7 @@
assertAeMode(camera2Config, CONTROL_AE_MODE_ON_ALWAYS_FLASH);
assertThat(mCamera2CameraControlImpl.getFlashMode()).isEqualTo(ImageCapture.FLASH_MODE_ON);
+ assertThat(mCamera2CameraControlImpl.getZslControl().isZslDisabledByFlashMode()).isTrue();
}
@Test
diff --git a/camera/camera-camera2/src/androidTest/java/androidx/camera/camera2/internal/CaptureSessionTest.java b/camera/camera-camera2/src/androidTest/java/androidx/camera/camera2/internal/CaptureSessionTest.java
index f3d79dd..e70e083 100644
--- a/camera/camera-camera2/src/androidTest/java/androidx/camera/camera2/internal/CaptureSessionTest.java
+++ b/camera/camera-camera2/src/androidTest/java/androidx/camera/camera2/internal/CaptureSessionTest.java
@@ -21,6 +21,7 @@
import static junit.framework.TestCase.assertTrue;
import static junit.framework.TestCase.fail;
+import static org.junit.Assume.assumeFalse;
import static org.junit.Assume.assumeTrue;
import static org.mockito.ArgumentMatchers.any;
import static org.mockito.Mockito.clearInvocations;
@@ -40,12 +41,14 @@
import android.hardware.camera2.CameraDevice;
import android.hardware.camera2.CaptureRequest;
import android.hardware.camera2.CaptureResult;
+import android.hardware.camera2.TotalCaptureResult;
import android.media.Image;
import android.media.ImageReader;
import android.media.ImageReader.OnImageAvailableListener;
import android.os.Build;
import android.os.Handler;
import android.os.HandlerThread;
+import android.os.Looper;
import android.view.Surface;
import androidx.annotation.NonNull;
@@ -72,6 +75,7 @@
import androidx.camera.core.impl.utils.futures.FutureCallback;
import androidx.camera.core.impl.utils.futures.Futures;
import androidx.camera.testing.CameraUtil;
+import androidx.concurrent.futures.CallbackToFutureAdapter;
import androidx.core.os.HandlerCompat;
import androidx.test.ext.junit.runners.AndroidJUnit4;
import androidx.test.filters.LargeTest;
@@ -239,6 +243,161 @@
.onCaptureCompleted(any(CameraCaptureResult.class));
}
+ // Sharing surface of YUV format is supported since API 28
+ @SdkSuppress(minSdkVersion = 28)
+ @Test
+ public void openCaptureSessionWithSharedSurface()
+ throws InterruptedException, ExecutionException, TimeoutException {
+ // 1. Arrange
+ ImageReader imageReader0 = ImageReader.newInstance(640, 480, ImageFormat.YUV_420_888, 2);
+ assumeTrue(
+ new OutputConfigurationCompat(imageReader0.getSurface()).getMaxSharedSurfaceCount()
+ > 1);
+ DeferrableSurface surface0 = new ImmediateSurface(imageReader0.getSurface());
+ ImageReader imageReader1 = ImageReader.newInstance(640, 480, ImageFormat.YUV_420_888, 2);
+ DeferrableSurface surface1 = new ImmediateSurface(imageReader1.getSurface());
+ SessionConfig.OutputConfig outputConfig0 =
+ SessionConfig.OutputConfig.builder(surface0).setSharedSurfaces(
+ Arrays.asList(surface1)).build();
+ SessionConfig sessionConfig =
+ new SessionConfig.Builder()
+ .addOutputConfig(outputConfig0)
+ .setTemplateType(CameraDevice.TEMPLATE_PREVIEW)
+ .build();
+
+ // 2. Act
+ CaptureSession captureSession = createCaptureSession();
+ captureSession.setSessionConfig(sessionConfig); // set repeating request
+ ListenableFuture<Void> future = captureSession.open(sessionConfig,
+ mCameraDeviceHolder.get(), mCaptureSessionOpenerBuilder.build());
+ future.get(2, TimeUnit.SECONDS);
+
+ // 3. Assert
+ Handler handler = new Handler(Looper.getMainLooper());
+ CountDownLatch latch0 = new CountDownLatch(1);
+ CountDownLatch latch1 = new CountDownLatch(1);
+ imageReader0.setOnImageAvailableListener(reader -> {
+ latch0.countDown();
+ }, handler);
+
+ imageReader1.setOnImageAvailableListener(reader -> {
+ latch1.countDown();
+ }, handler);
+
+ // Ensures main surface and shared share surface have outputs.
+ assertThat(latch0.await(2, TimeUnit.SECONDS)).isTrue();
+ assertThat(latch1.await(2, TimeUnit.SECONDS)).isTrue();
+
+ // clean up
+ surface0.getTerminationFuture().addListener(() -> imageReader0.close(),
+ CameraXExecutors.mainThreadExecutor()
+ );
+ surface1.getTerminationFuture().addListener(() -> imageReader1.close(),
+ CameraXExecutors.mainThreadExecutor());
+ surface0.close();
+ surface1.close();
+ }
+
+ // LOGICAL_MULTI_CAMERA_ACTIVE_PHYSICAL_ID is supported since API 29
+ @SdkSuppress(minSdkVersion = 29)
+ @Test
+ public void openCaptureSessionWithPhysicalCameraId()
+ throws InterruptedException, ExecutionException, TimeoutException {
+ String cameraId = CameraUtil.getBackwardCompatibleCameraIdListOrThrow().get(0);
+ // 1. Arrange
+ List<String> physicalCameraIds = CameraUtil.getPhysicalCameraIds(cameraId);
+ assumeFalse(physicalCameraIds.isEmpty());
+ // get last physical camera id to make it different from default value
+ String physicalCameraId = physicalCameraIds.get(physicalCameraIds.size() - 1);
+
+ ImageReader imageReader0 = ImageReader.newInstance(640, 480, ImageFormat.YUV_420_888, 2);
+ DeferrableSurface surface0 = new ImmediateSurface(imageReader0.getSurface());
+ SessionConfig.OutputConfig outputConfig0 =
+ SessionConfig.OutputConfig.builder(surface0).setPhysicalCameraId(
+ physicalCameraId).build();
+ SessionConfig.Builder sessionConfigBuilder =
+ new SessionConfig.Builder()
+ .addOutputConfig(outputConfig0)
+ .setTemplateType(CameraDevice.TEMPLATE_PREVIEW);
+
+ // future to receive the capture result
+ ListenableFuture<CaptureResult> captureResultFuture =
+ CallbackToFutureAdapter.getFuture(completer -> {
+ CameraCaptureCallback callback =
+ CaptureCallbackContainer.create(
+ new CameraCaptureSession.CaptureCallback() {
+ @Override
+ public void onCaptureCompleted(
+ @NonNull CameraCaptureSession session,
+ @NonNull CaptureRequest request,
+ @NonNull TotalCaptureResult result) {
+ completer.set(result);
+ }
+ }
+ );
+ sessionConfigBuilder.addCameraCaptureCallback(callback);
+ return "capture result completer";
+ });
+ SessionConfig sessionConfig = sessionConfigBuilder.build();
+
+ // 2. Act
+ CaptureSession captureSession = createCaptureSession();
+ captureSession.setSessionConfig(sessionConfig);
+ captureSession.open(sessionConfig,
+ mCameraDeviceHolder.get(), mCaptureSessionOpenerBuilder.build());
+
+ // 3. Assert.
+ CaptureResult captureResult = captureResultFuture.get(3, TimeUnit.SECONDS);
+ assertThat(captureResult.get(CaptureResult.LOGICAL_MULTI_CAMERA_ACTIVE_PHYSICAL_ID))
+ .isEqualTo(physicalCameraId);
+
+ // clean up
+ surface0.getTerminationFuture().addListener(() -> imageReader0.close(),
+ CameraXExecutors.mainThreadExecutor()
+ );
+ surface0.close();
+ }
+
+ @Test
+ public void openCaptureSessionWithDuplicateSurface()
+ throws InterruptedException, ExecutionException, TimeoutException {
+ // 1. Arrange
+ ImageReader imageReader = ImageReader.newInstance(640, 480, ImageFormat.YUV_420_888, 2);
+ // deferrableSurface0 and deferrableSurface1 contain the same Surface.
+ DeferrableSurface deferrableSurface0 = new ImmediateSurface(imageReader.getSurface());
+ DeferrableSurface deferrableSurface1 = new ImmediateSurface(imageReader.getSurface());
+ SessionConfig sessionConfig =
+ new SessionConfig.Builder()
+ .addSurface(deferrableSurface0)
+ .addSurface(deferrableSurface1)
+ .setTemplateType(CameraDevice.TEMPLATE_PREVIEW)
+ .build();
+
+ // 2. Act
+ CaptureSession captureSession = createCaptureSession();
+ captureSession.setSessionConfig(sessionConfig); // set repeating request
+ ListenableFuture<Void> future = captureSession.open(sessionConfig,
+ mCameraDeviceHolder.get(), mCaptureSessionOpenerBuilder.build());
+ future.get(2, TimeUnit.SECONDS);
+
+ // 3. Assert
+ Handler handler = new Handler(Looper.getMainLooper());
+ CountDownLatch latch0 = new CountDownLatch(1);
+ CountDownLatch latch1 = new CountDownLatch(1);
+ imageReader.setOnImageAvailableListener(reader -> {
+ latch0.countDown();
+ }, handler);
+
+ assertThat(latch0.await(2, TimeUnit.SECONDS)).isTrue();
+
+ // clean up
+ deferrableSurface0.getTerminationFuture().addListener(() -> imageReader.close(),
+ CameraXExecutors.mainThreadExecutor()
+ );
+ deferrableSurface0.close();
+ deferrableSurface1.close();
+ }
+
@Test
public void openCaptureSessionWithClosedSurfaceFails() {
CaptureSession captureSession = createCaptureSession();
diff --git a/camera/camera-camera2/src/main/java/androidx/camera/camera2/internal/Camera2CameraControlImpl.java b/camera/camera-camera2/src/main/java/androidx/camera/camera2/internal/Camera2CameraControlImpl.java
index 5eef890f..fb33c76 100644
--- a/camera/camera-camera2/src/main/java/androidx/camera/camera2/internal/Camera2CameraControlImpl.java
+++ b/camera/camera-camera2/src/main/java/androidx/camera/camera2/internal/Camera2CameraControlImpl.java
@@ -379,6 +379,10 @@
// update mFlashMode immediately so that following getFlashMode() returns correct value.
mFlashMode = flashMode;
+ // Disable ZSL when flash mode is ON or AUTO.
+ mZslControl.setZslDisabledByFlashMode(mFlashMode == FLASH_MODE_ON
+ || mFlashMode == FLASH_MODE_AUTO);
+
// On some devices, AE precapture may not work properly if the repeating request to change
// the flash mode is not completed. We need to store the future so that AE precapture can
// wait for it.
@@ -392,8 +396,13 @@
}
@Override
- public void setZslDisabled(boolean disabled) {
- mZslControl.setZslDisabled(disabled);
+ public void setZslDisabledByUserCaseConfig(boolean disabled) {
+ mZslControl.setZslDisabledByUserCaseConfig(disabled);
+ }
+
+ @Override
+ public boolean isZslDisabledByByUserCaseConfig() {
+ return mZslControl.isZslDisabledByUserCaseConfig();
}
/** {@inheritDoc} */
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 61c0b2e..33df129 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
@@ -781,8 +781,6 @@
synchronized (mLock) {
mSessionProcessor = sessionProcessor;
}
-
- getCameraControlInternal().setZslDisabled(cameraConfig.isZslDisabled());
}
@NonNull
diff --git a/camera/camera-camera2/src/main/java/androidx/camera/camera2/internal/Camera2CameraInfoImpl.java b/camera/camera-camera2/src/main/java/androidx/camera/camera2/internal/Camera2CameraInfoImpl.java
index 66ba1a9..2eff338 100644
--- a/camera/camera-camera2/src/main/java/androidx/camera/camera2/internal/Camera2CameraInfoImpl.java
+++ b/camera/camera-camera2/src/main/java/androidx/camera/camera2/internal/Camera2CameraInfoImpl.java
@@ -23,6 +23,7 @@
import android.hardware.camera2.CameraCharacteristics;
import android.hardware.camera2.CameraMetadata;
+import android.os.Build;
import android.util.Pair;
import android.view.Surface;
@@ -354,6 +355,12 @@
}
@Override
+ public boolean isZslSupported() {
+ return Build.VERSION.SDK_INT >= 23
+ && (isYuvReprocessingSupported() || isPrivateReprocessingSupported());
+ }
+
+ @Override
public boolean isYuvReprocessingSupported() {
return isCapabilitySupported(mCameraCharacteristicsCompat,
REQUEST_AVAILABLE_CAPABILITIES_YUV_REPROCESSING);
diff --git a/camera/camera-camera2/src/main/java/androidx/camera/camera2/internal/Camera2CapturePipeline.java b/camera/camera-camera2/src/main/java/androidx/camera/camera2/internal/Camera2CapturePipeline.java
index c7b923a..7a76d02 100644
--- a/camera/camera-camera2/src/main/java/androidx/camera/camera2/internal/Camera2CapturePipeline.java
+++ b/camera/camera-camera2/src/main/java/androidx/camera/camera2/internal/Camera2CapturePipeline.java
@@ -320,7 +320,9 @@
// Dequeue image from buffer and enqueue into image writer for reprocessing. If
// succeeded, retrieve capture result and set into capture config.
CameraCaptureResult cameraCaptureResult = null;
- if (captureConfig.getTemplateType() == CameraDevice.TEMPLATE_ZERO_SHUTTER_LAG) {
+ if (captureConfig.getTemplateType() == CameraDevice.TEMPLATE_ZERO_SHUTTER_LAG
+ && !mCameraControl.getZslControl().isZslDisabledByFlashMode()
+ && !mCameraControl.getZslControl().isZslDisabledByUserCaseConfig()) {
ImageProxy imageProxy =
mCameraControl.getZslControl().dequeueImageFromBuffer();
boolean isSuccess = imageProxy != null
diff --git a/camera/camera-camera2/src/main/java/androidx/camera/camera2/internal/Camera2CaptureRequestBuilder.java b/camera/camera-camera2/src/main/java/androidx/camera/camera2/internal/Camera2CaptureRequestBuilder.java
index d8e2477..c1de113 100644
--- a/camera/camera-camera2/src/main/java/androidx/camera/camera2/internal/Camera2CaptureRequestBuilder.java
+++ b/camera/camera-camera2/src/main/java/androidx/camera/camera2/internal/Camera2CaptureRequestBuilder.java
@@ -48,7 +48,7 @@
private Camera2CaptureRequestBuilder() {
}
- private static final String TAG = "CaptureRequestBuilder";
+ private static final String TAG = "Camera2CaptureRequestBuilder";
/**
* Get the configured Surface from DeferrableSurface list using the Surface map which should be
diff --git a/camera/camera-camera2/src/main/java/androidx/camera/camera2/internal/Camera2UseCaseConfigFactory.java b/camera/camera-camera2/src/main/java/androidx/camera/camera2/internal/Camera2UseCaseConfigFactory.java
index ba673c6..1689d53 100644
--- a/camera/camera-camera2/src/main/java/androidx/camera/camera2/internal/Camera2UseCaseConfigFactory.java
+++ b/camera/camera-camera2/src/main/java/androidx/camera/camera2/internal/Camera2UseCaseConfigFactory.java
@@ -22,6 +22,7 @@
import static androidx.camera.core.impl.UseCaseConfig.OPTION_DEFAULT_CAPTURE_CONFIG;
import static androidx.camera.core.impl.UseCaseConfig.OPTION_DEFAULT_SESSION_CONFIG;
import static androidx.camera.core.impl.UseCaseConfig.OPTION_SESSION_CONFIG_UNPACKER;
+import static androidx.camera.core.impl.UseCaseConfig.OPTION_ZSL_DISABLED;
import android.content.Context;
import android.hardware.camera2.CameraDevice;
@@ -121,6 +122,10 @@
int targetRotation = mDisplayInfoManager.getMaxSizeDisplay().getRotation();
mutableConfig.insertOption(OPTION_TARGET_ROTATION, targetRotation);
+ if (captureType == CaptureType.VIDEO_CAPTURE) {
+ mutableConfig.insertOption(OPTION_ZSL_DISABLED, true);
+ }
+
return OptionsBundle.from(mutableConfig);
}
}
diff --git a/camera/camera-camera2/src/main/java/androidx/camera/camera2/internal/CaptureSession.java b/camera/camera-camera2/src/main/java/androidx/camera/camera2/internal/CaptureSession.java
index 5fbd931..7ab6d0a 100644
--- a/camera/camera-camera2/src/main/java/androidx/camera/camera2/internal/CaptureSession.java
+++ b/camera/camera-camera2/src/main/java/androidx/camera/camera2/internal/CaptureSession.java
@@ -55,15 +55,14 @@
import java.util.ArrayList;
import java.util.Collections;
import java.util.HashMap;
-import java.util.LinkedHashSet;
import java.util.List;
import java.util.Map;
import java.util.Objects;
import java.util.concurrent.CancellationException;
/**
- * A basic implementation of {@link CaptureSessionInterface} for capturing images from the camera
- * which is tied to a specific {@link CameraDevice}.
+ * A basic implementation of {@link CaptureSessionInterface} for capturing images from the camera
+ * which is tied to a specific {@link CameraDevice}.
*/
@RequiresApi(21) // TODO(b/200306659): Remove and replace with annotation on package-info.java
final class CaptureSession implements CaptureSessionInterface {
@@ -205,8 +204,9 @@
mConfiguredDeferrableSurfaces = new ArrayList<>(surfaces);
mSynchronizedCaptureSessionOpener = opener;
ListenableFuture<Void> openFuture = FutureChain.from(
- mSynchronizedCaptureSessionOpener.startWithDeferrableSurface(
- mConfiguredDeferrableSurfaces, TIMEOUT_GET_SURFACE_IN_MS))
+ mSynchronizedCaptureSessionOpener.startWithDeferrableSurface(
+ mConfiguredDeferrableSurfaces,
+ TIMEOUT_GET_SURFACE_IN_MS))
.transformAsync(
surfaceList -> openCaptureSession(surfaceList, sessionConfig,
cameraDevice),
@@ -274,11 +274,6 @@
configuredSurfaces.get(i));
}
- // Some DeferrableSurfaces might actually point to the same Surface. And we
- // need to pass the unique Surface list to createCaptureSession.
- List<Surface> uniqueConfiguredSurface = new ArrayList<>(
- new LinkedHashSet<>(configuredSurfaces));
-
mState = State.OPENING;
Logger.d(TAG, "Opening capture session.");
SynchronizedCaptureSession.StateCallback callbacks =
@@ -308,17 +303,24 @@
}
List<OutputConfigurationCompat> outputConfigList = new ArrayList<>();
- for (Surface surface : uniqueConfiguredSurface) {
+ String physicalCameraIdForAllStreams =
+ camera2Config.getPhysicalCameraId(null);
+ for (SessionConfig.OutputConfig outputConfig :
+ sessionConfig.getOutputConfigs()) {
OutputConfigurationCompat outputConfiguration =
- new OutputConfigurationCompat(surface);
- // Set the desired physical camera ID, or null to use the logical stream.
- // TODO(b/219414502): Configure different streams with different physical
- // camera IDs.
- outputConfiguration.setPhysicalCameraId(
- camera2Config.getPhysicalCameraId(null));
+ getOutputConfigurationCompat(
+ outputConfig,
+ mConfiguredSurfaceMap,
+ physicalCameraIdForAllStreams);
outputConfigList.add(outputConfiguration);
}
+ // Some DeferrableSurfaces might actually point to the same Surface. For
+ // example, a Surface(ImageReader) could be shared between use cases.
+ // Therefore, there might be duplicate surfaces that need to be removed.
+ // We might consider removing this logic if this is no longer necessary.
+ outputConfigList = getUniqueOutputConfigurations(outputConfigList);
+
SessionConfigurationCompat sessionConfigCompat =
mSynchronizedCaptureSessionOpener.createSessionConfigurationCompat(
SessionConfigurationCompat.SESSION_REGULAR, outputConfigList,
@@ -351,6 +353,56 @@
}
}
+ @NonNull
+ private List<OutputConfigurationCompat> getUniqueOutputConfigurations(
+ @NonNull List<OutputConfigurationCompat> outputConfigurations) {
+ List<Surface> addedSurfaces = new ArrayList<>();
+ List<OutputConfigurationCompat> results = new ArrayList<>();
+ for (OutputConfigurationCompat outputConfiguration : outputConfigurations) {
+ if (addedSurfaces.contains(outputConfiguration.getSurface())) {
+ // Surface already added, ignore this outputConfiguration.
+ continue;
+ }
+ addedSurfaces.add(outputConfiguration.getSurface());
+ results.add(outputConfiguration);
+ }
+ return results;
+ }
+
+ @NonNull
+ private OutputConfigurationCompat getOutputConfigurationCompat(
+ @NonNull SessionConfig.OutputConfig outputConfig,
+ @NonNull Map<DeferrableSurface, Surface> configuredSurfaceMap,
+ @Nullable String physicalCameraIdForAllStreams) {
+ Surface surface = configuredSurfaceMap.get(outputConfig.getSurface());
+ Preconditions.checkNotNull(surface,
+ "Surface in OutputConfig not found in configuredSurfaceMap.");
+
+ OutputConfigurationCompat outputConfiguration =
+ new OutputConfigurationCompat(outputConfig.getSurfaceGroupId(),
+ surface);
+ // Set the desired physical camera ID, or null to use the logical stream.
+ // TODO(b/219414502): Configure different streams with different physical
+ // camera IDs.
+ if (physicalCameraIdForAllStreams != null) {
+ outputConfiguration.setPhysicalCameraId(physicalCameraIdForAllStreams);
+ } else {
+ outputConfiguration.setPhysicalCameraId(
+ outputConfig.getPhysicalCameraId());
+ }
+
+ if (!outputConfig.getSharedSurfaces().isEmpty()) {
+ outputConfiguration.enableSurfaceSharing();
+ for (DeferrableSurface sharedDeferSurface : outputConfig.getSharedSurfaces()) {
+ Surface sharedSurface = configuredSurfaceMap.get(sharedDeferSurface);
+ Preconditions.checkNotNull(sharedSurface,
+ "Surface in OutputConfig not found in configuredSurfaceMap.");
+ outputConfiguration.addSurface(sharedSurface);
+ }
+ }
+ return outputConfiguration;
+ }
+
/**
* {@inheritDoc}
*/
@@ -728,7 +780,7 @@
}
/**
- * Discards all captures currently pending and in-progress as fast as possible.
+ * Discards all captures currently pending and in-progress as fast as possible.
*/
void abortCaptures() {
synchronized (mSessionLock) {
diff --git a/camera/camera-camera2/src/main/java/androidx/camera/camera2/internal/ZslControl.java b/camera/camera-camera2/src/main/java/androidx/camera/camera2/internal/ZslControl.java
index ec8c3c8..5d78d06 100644
--- a/camera/camera-camera2/src/main/java/androidx/camera/camera2/internal/ZslControl.java
+++ b/camera/camera-camera2/src/main/java/androidx/camera/camera2/internal/ZslControl.java
@@ -40,14 +40,46 @@
@NonNull SessionConfig.Builder sessionConfigBuilder);
/**
- * Sets zsl disabled or not.
+ * Sets the flag if zero-shutter lag needs to be disabled by user case config.
+ *
+ * <p> Zero-shutter lag will be disabled when any of the following conditions:
+ * <ul>
+ * <li> Extension is ON
+ * <li> VideoCapture is ON
+ * </ul>
*
* @param disabled True if zero-shutter lag should be disabled. Otherwise, should not be
* disabled. However, enabling zero-shutter lag needs other conditions e.g.
* flash mode OFF, so setting to false doesn't guarantee zero-shutter lag to
* be always ON.
*/
- void setZslDisabled(boolean disabled);
+ void setZslDisabledByUserCaseConfig(boolean disabled);
+
+ /**
+ * Checks if zero-shutter lag is disabled by user case config.
+ *
+ * @return True if zero-shutter lag should be disabled. Otherwise, returns false.
+ */
+ boolean isZslDisabledByUserCaseConfig();
+
+ /**
+ * Sets the flag if zero-shutter lag needs to be disabled by flash mode.
+ *
+ * <p> Zero-shutter lag will be disabled when flash mode is not OFF.
+ *
+ * @param disabled True if zero-shutter lag should be disabled. Otherwise, should not be
+ * disabled. However, enabling zero-shutter lag needs other conditions e.g.
+ * Extension is OFF and VideoCapture is OFF, so setting to false doesn't
+ * guarantee zero-shutter lag to be always ON.
+ */
+ void setZslDisabledByFlashMode(boolean disabled);
+
+ /**
+ * Checks if zero-shutter lag is disabled by flash mode.
+ *
+ * @return True if zero-shutter lag should be disabled. Otherwise, returns false.
+ */
+ boolean isZslDisabledByFlashMode();
/**
* Dequeues {@link ImageProxy} from ring buffer.
diff --git a/camera/camera-camera2/src/main/java/androidx/camera/camera2/internal/ZslControlImpl.java b/camera/camera-camera2/src/main/java/androidx/camera/camera2/internal/ZslControlImpl.java
index d568b52..1b57730 100644
--- a/camera/camera-camera2/src/main/java/androidx/camera/camera2/internal/ZslControlImpl.java
+++ b/camera/camera-camera2/src/main/java/androidx/camera/camera2/internal/ZslControlImpl.java
@@ -65,11 +65,13 @@
@VisibleForTesting
static final int MAX_IMAGES = RING_BUFFER_CAPACITY * 3;
+ @VisibleForTesting
@SuppressWarnings("WeakerAccess")
@NonNull
final ZslRingBuffer mImageRingBuffer;
- private boolean mIsZslDisabled = false;
+ private boolean mIsZslDisabledByUseCaseConfig = false;
+ private boolean mIsZslDisabledByFlashMode = false;
private boolean mIsYuvReprocessingSupported = false;
private boolean mIsPrivateReprocessingSupported = false;
@@ -95,15 +97,34 @@
}
@Override
- public void setZslDisabled(boolean disabled) {
- mIsZslDisabled = disabled;
+ public void setZslDisabledByUserCaseConfig(boolean disabled) {
+ mIsZslDisabledByUseCaseConfig = disabled;
+ }
+
+ @Override
+ public boolean isZslDisabledByUserCaseConfig() {
+ return mIsZslDisabledByUseCaseConfig;
+ }
+
+ @Override
+ public void setZslDisabledByFlashMode(boolean disabled) {
+ mIsZslDisabledByFlashMode = disabled;
+ }
+
+ @Override
+ public boolean isZslDisabledByFlashMode() {
+ return mIsZslDisabledByFlashMode;
}
@Override
public void addZslConfig(
@NonNull Size resolution,
@NonNull SessionConfig.Builder sessionConfigBuilder) {
- if (mIsZslDisabled) {
+ cleanup();
+
+ // TODO(b/231160628): need to handle flash mode disabling separately to achieve zsl
+ // on/off seamlessly switching as flash mode changes.
+ if (mIsZslDisabledByUseCaseConfig || mIsZslDisabledByFlashMode) {
return;
}
@@ -111,8 +132,6 @@
return;
}
- cleanup();
-
// Init the reprocessing image reader and enqueue available images into the ring buffer.
// TODO(b/226683183): Decide whether YUV or PRIVATE reprocessing should be the default.
int reprocessingImageFormat = mIsPrivateReprocessingSupported
@@ -225,8 +244,10 @@
reprocessingImageDeferrableSurface.getTerminationFuture().addListener(
reprocessingImageReaderProxy::safeClose,
CameraXExecutors.mainThreadExecutor());
+ mReprocessingImageReader = null;
}
reprocessingImageDeferrableSurface.close();
+ mReprocessingImageDeferrableSurface = null;
}
ImageWriter reprocessingImageWriter = mReprocessingImageWriter;
diff --git a/camera/camera-camera2/src/main/java/androidx/camera/camera2/internal/ZslControlNoOpImpl.java b/camera/camera-camera2/src/main/java/androidx/camera/camera2/internal/ZslControlNoOpImpl.java
index b6d8d8d..715e70a 100644
--- a/camera/camera-camera2/src/main/java/androidx/camera/camera2/internal/ZslControlNoOpImpl.java
+++ b/camera/camera-camera2/src/main/java/androidx/camera/camera2/internal/ZslControlNoOpImpl.java
@@ -33,7 +33,21 @@
}
@Override
- public void setZslDisabled(boolean disabled) {
+ public void setZslDisabledByUserCaseConfig(boolean disabled) {
+ }
+
+ @Override
+ public boolean isZslDisabledByUserCaseConfig() {
+ return false;
+ }
+
+ @Override
+ public void setZslDisabledByFlashMode(boolean disabled) {
+ }
+
+ @Override
+ public boolean isZslDisabledByFlashMode() {
+ return false;
}
@Nullable
diff --git a/camera/camera-camera2/src/main/java/androidx/camera/camera2/internal/compat/params/OutputConfigurationCompat.java b/camera/camera-camera2/src/main/java/androidx/camera/camera2/internal/compat/params/OutputConfigurationCompat.java
index 2afb751..f000325 100644
--- a/camera/camera-camera2/src/main/java/androidx/camera/camera2/internal/compat/params/OutputConfigurationCompat.java
+++ b/camera/camera-camera2/src/main/java/androidx/camera/camera2/internal/compat/params/OutputConfigurationCompat.java
@@ -48,18 +48,21 @@
private final OutputConfigurationCompatImpl mImpl;
public OutputConfigurationCompat(@NonNull Surface surface) {
+ this(SURFACE_GROUP_ID_NONE, surface);
+ }
+
+ public OutputConfigurationCompat(int surfaceGroupId, @NonNull Surface surface) {
if (Build.VERSION.SDK_INT >= 28) {
- mImpl = new OutputConfigurationCompatApi28Impl(surface);
+ mImpl = new OutputConfigurationCompatApi28Impl(surfaceGroupId, surface);
} else if (Build.VERSION.SDK_INT >= 26) {
- mImpl = new OutputConfigurationCompatApi26Impl(surface);
+ mImpl = new OutputConfigurationCompatApi26Impl(surfaceGroupId, surface);
} else if (Build.VERSION.SDK_INT >= 24) {
- mImpl = new OutputConfigurationCompatApi24Impl(surface);
+ mImpl = new OutputConfigurationCompatApi24Impl(surfaceGroupId, surface);
} else {
mImpl = new OutputConfigurationCompatBaseImpl(surface);
}
}
-
/**
* Create a new {@link OutputConfigurationCompat} instance, with desired Surface size and
* Surface source class.
diff --git a/camera/camera-camera2/src/main/java/androidx/camera/camera2/internal/compat/params/OutputConfigurationCompatApi24Impl.java b/camera/camera-camera2/src/main/java/androidx/camera/camera2/internal/compat/params/OutputConfigurationCompatApi24Impl.java
index 7786322..11a46c4 100644
--- a/camera/camera-camera2/src/main/java/androidx/camera/camera2/internal/compat/params/OutputConfigurationCompatApi24Impl.java
+++ b/camera/camera-camera2/src/main/java/androidx/camera/camera2/internal/compat/params/OutputConfigurationCompatApi24Impl.java
@@ -38,6 +38,10 @@
this(new OutputConfigurationParamsApi24(new OutputConfiguration(surface)));
}
+ OutputConfigurationCompatApi24Impl(int surfaceGroupId, @NonNull Surface surface) {
+ this(new OutputConfigurationParamsApi24(new OutputConfiguration(surfaceGroupId, surface)));
+ }
+
OutputConfigurationCompatApi24Impl(@NonNull Object outputConfiguration) {
super(outputConfiguration);
}
diff --git a/camera/camera-camera2/src/main/java/androidx/camera/camera2/internal/compat/params/OutputConfigurationCompatApi26Impl.java b/camera/camera-camera2/src/main/java/androidx/camera/camera2/internal/compat/params/OutputConfigurationCompatApi26Impl.java
index a488a30..804b6a8 100644
--- a/camera/camera-camera2/src/main/java/androidx/camera/camera2/internal/compat/params/OutputConfigurationCompatApi26Impl.java
+++ b/camera/camera-camera2/src/main/java/androidx/camera/camera2/internal/compat/params/OutputConfigurationCompatApi26Impl.java
@@ -43,6 +43,10 @@
this(new OutputConfigurationParamsApi26(new OutputConfiguration(surface)));
}
+ OutputConfigurationCompatApi26Impl(int surfaceGroupId, @NonNull Surface surface) {
+ this(new OutputConfigurationParamsApi26(new OutputConfiguration(surfaceGroupId, surface)));
+ }
+
OutputConfigurationCompatApi26Impl(@NonNull Object outputConfiguration) {
super(outputConfiguration);
}
diff --git a/camera/camera-camera2/src/main/java/androidx/camera/camera2/internal/compat/params/OutputConfigurationCompatApi28Impl.java b/camera/camera-camera2/src/main/java/androidx/camera/camera2/internal/compat/params/OutputConfigurationCompatApi28Impl.java
index 8deae0f..1b3c833 100644
--- a/camera/camera-camera2/src/main/java/androidx/camera/camera2/internal/compat/params/OutputConfigurationCompatApi28Impl.java
+++ b/camera/camera-camera2/src/main/java/androidx/camera/camera2/internal/compat/params/OutputConfigurationCompatApi28Impl.java
@@ -34,6 +34,10 @@
super(new OutputConfiguration(surface));
}
+ OutputConfigurationCompatApi28Impl(int surfaceGroupId, @NonNull Surface surface) {
+ this(new OutputConfiguration(surfaceGroupId, surface));
+ }
+
OutputConfigurationCompatApi28Impl(@NonNull Object outputConfiguration) {
super(outputConfiguration);
}
diff --git a/camera/camera-camera2/src/test/java/androidx/camera/camera2/internal/Camera2CameraInfoImplTest.java b/camera/camera-camera2/src/test/java/androidx/camera/camera2/internal/Camera2CameraInfoImplTest.java
index 2abe2cf..2e4d855 100644
--- a/camera/camera-camera2/src/test/java/androidx/camera/camera2/internal/Camera2CameraInfoImplTest.java
+++ b/camera/camera-camera2/src/test/java/androidx/camera/camera2/internal/Camera2CameraInfoImplTest.java
@@ -16,6 +16,8 @@
package androidx.camera.camera2.internal;
+import static android.hardware.camera2.CameraCharacteristics.REQUEST_AVAILABLE_CAPABILITIES;
+
import static com.google.common.truth.Truth.assertThat;
import static org.mockito.ArgumentMatchers.any;
@@ -51,7 +53,6 @@
import androidx.lifecycle.MutableLiveData;
import androidx.test.core.app.ApplicationProvider;
-import org.junit.Before;
import org.junit.Test;
import org.junit.runner.RunWith;
import org.robolectric.RobolectricTestRunner;
@@ -104,29 +105,10 @@
private FocusMeteringControl mFocusMeteringControl;
private Camera2CameraControlImpl mMockCameraControl;
- @Before
- public void setUp() throws CameraAccessExceptionCompat {
- initCameras();
-
- mCameraManagerCompat =
- CameraManagerCompat.from((Context) ApplicationProvider.getApplicationContext());
- mCameraCharacteristics0 = mCameraManagerCompat.getCameraCharacteristicsCompat(CAMERA0_ID);
- mCameraCharacteristics1 = mCameraManagerCompat.getCameraCharacteristicsCompat(CAMERA1_ID);
-
- mMockZoomControl = mock(ZoomControl.class);
- mMockTorchControl = mock(TorchControl.class);
- mExposureControl = mock(ExposureControl.class);
- mMockCameraControl = mock(Camera2CameraControlImpl.class);
- mFocusMeteringControl = mock(FocusMeteringControl.class);
-
- when(mMockCameraControl.getZoomControl()).thenReturn(mMockZoomControl);
- when(mMockCameraControl.getTorchControl()).thenReturn(mMockTorchControl);
- when(mMockCameraControl.getExposureControl()).thenReturn(mExposureControl);
- when(mMockCameraControl.getFocusMeteringControl()).thenReturn(mFocusMeteringControl);
- }
-
@Test
public void canCreateCameraInfo() throws CameraAccessExceptionCompat {
+ init(/* hasReprocessingCapabilities = */ true);
+
CameraInfoInternal cameraInfoInternal =
new Camera2CameraInfoImpl(CAMERA0_ID, mCameraManagerCompat);
@@ -135,6 +117,8 @@
@Test
public void cameraInfo_canReturnSensorOrientation() throws CameraAccessExceptionCompat {
+ init(/* hasReprocessingCapabilities = */ true);
+
CameraInfoInternal cameraInfoInternal =
new Camera2CameraInfoImpl(CAMERA0_ID, mCameraManagerCompat);
assertThat(cameraInfoInternal.getSensorRotationDegrees()).isEqualTo(
@@ -144,6 +128,8 @@
@Test
public void cameraInfo_canCalculateCorrectRelativeRotation_forBackCamera()
throws CameraAccessExceptionCompat {
+ init(/* hasReprocessingCapabilities = */ true);
+
CameraInfoInternal cameraInfoInternal =
new Camera2CameraInfoImpl(CAMERA0_ID, mCameraManagerCompat);
@@ -161,6 +147,8 @@
@Test
public void cameraInfo_canCalculateCorrectRelativeRotation_forFrontCamera()
throws CameraAccessExceptionCompat {
+ init(/* hasReprocessingCapabilities = */ true);
+
CameraInfoInternal cameraInfoInternal =
new Camera2CameraInfoImpl(CAMERA1_ID, mCameraManagerCompat);
@@ -177,6 +165,8 @@
@Test
public void cameraInfo_canReturnLensFacing() throws CameraAccessExceptionCompat {
+ init(/* hasReprocessingCapabilities = */ true);
+
CameraInfoInternal cameraInfoInternal =
new Camera2CameraInfoImpl(CAMERA0_ID, mCameraManagerCompat);
assertThat(cameraInfoInternal.getLensFacing()).isEqualTo(CAMERA0_LENS_FACING_ENUM);
@@ -185,6 +175,8 @@
@Test
public void cameraInfo_canReturnHasFlashUnit_forBackCamera()
throws CameraAccessExceptionCompat {
+ init(/* hasReprocessingCapabilities = */ true);
+
CameraInfoInternal cameraInfoInternal =
new Camera2CameraInfoImpl(CAMERA0_ID, mCameraManagerCompat);
assertThat(cameraInfoInternal.hasFlashUnit()).isEqualTo(CAMERA0_FLASH_INFO_BOOLEAN);
@@ -193,6 +185,8 @@
@Test
public void cameraInfo_canReturnHasFlashUnit_forFrontCamera()
throws CameraAccessExceptionCompat {
+ init(/* hasReprocessingCapabilities = */ true);
+
CameraInfoInternal cameraInfoInternal =
new Camera2CameraInfoImpl(CAMERA1_ID, mCameraManagerCompat);
assertThat(cameraInfoInternal.hasFlashUnit()).isEqualTo(CAMERA1_FLASH_INFO_BOOLEAN);
@@ -201,6 +195,8 @@
@Test
public void cameraInfoWithoutCameraControl_canReturnDefaultTorchState()
throws CameraAccessExceptionCompat {
+ init(/* hasReprocessingCapabilities = */ true);
+
Camera2CameraInfoImpl camera2CameraInfoImpl =
new Camera2CameraInfoImpl(CAMERA0_ID, mCameraManagerCompat);
assertThat(camera2CameraInfoImpl.getTorchState().getValue())
@@ -210,6 +206,8 @@
@Test
public void cameraInfoWithCameraControl_canReturnTorchState()
throws CameraAccessExceptionCompat {
+ init(/* hasReprocessingCapabilities = */ true);
+
when(mMockTorchControl.getTorchState()).thenReturn(new MutableLiveData<>(TorchState.ON));
Camera2CameraInfoImpl camera2CameraInfoImpl =
new Camera2CameraInfoImpl(CAMERA0_ID, mCameraManagerCompat);
@@ -220,6 +218,8 @@
@Test
public void torchStateLiveData_SameInstanceBeforeAndAfterCameraControlLink()
throws CameraAccessExceptionCompat {
+ init(/* hasReprocessingCapabilities = */ true);
+
Camera2CameraInfoImpl camera2CameraInfoImpl =
new Camera2CameraInfoImpl(CAMERA0_ID, mCameraManagerCompat);
@@ -239,6 +239,8 @@
@Test
public void cameraInfoWithCameraControl_getZoom_valueIsCorrect()
throws CameraAccessExceptionCompat {
+ init(/* hasReprocessingCapabilities = */ true);
+
ZoomState zoomState = ImmutableZoomState.create(3.0f, 8.0f, 1.0f, 0.2f);
when(mMockZoomControl.getZoomState()).thenReturn(new MutableLiveData<>(zoomState));
@@ -252,6 +254,8 @@
@Test
public void cameraInfoWithoutCameraControl_getDetaultZoomState()
throws CameraAccessExceptionCompat {
+ init(/* hasReprocessingCapabilities = */ true);
+
Camera2CameraInfoImpl camera2CameraInfoImpl =
new Camera2CameraInfoImpl(CAMERA0_ID, mCameraManagerCompat);
assertThat(camera2CameraInfoImpl.getZoomState().getValue())
@@ -261,6 +265,8 @@
@Test
public void zoomStateLiveData_SameInstanceBeforeAndAfterCameraControlLink()
throws CameraAccessExceptionCompat {
+ init(/* hasReprocessingCapabilities = */ true);
+
Camera2CameraInfoImpl camera2CameraInfoImpl =
new Camera2CameraInfoImpl(CAMERA0_ID, mCameraManagerCompat);
@@ -279,6 +285,8 @@
@Test
public void cameraInfoWithCameraControl_canReturnExposureState()
throws CameraAccessExceptionCompat {
+ init(/* hasReprocessingCapabilities = */ true);
+
ExposureState exposureState = new ExposureStateImpl(mCameraCharacteristics0, 2);
when(mExposureControl.getExposureState()).thenReturn(exposureState);
@@ -292,6 +300,8 @@
@Test
public void cameraInfoWithoutCameraControl_canReturnDefaultExposureState()
throws CameraAccessExceptionCompat {
+ init(/* hasReprocessingCapabilities = */ true);
+
Camera2CameraInfoImpl camera2CameraInfoImpl =
new Camera2CameraInfoImpl(CAMERA0_ID, mCameraManagerCompat);
@@ -310,6 +320,8 @@
@Test
public void cameraInfo_getImplementationType_legacy() throws CameraAccessExceptionCompat {
+ init(/* hasReprocessingCapabilities = */ true);
+
final CameraInfoInternal cameraInfo =
new Camera2CameraInfoImpl(CAMERA0_ID, mCameraManagerCompat);
assertThat(cameraInfo.getImplementationType()).isEqualTo(
@@ -318,6 +330,8 @@
@Test
public void cameraInfo_getImplementationType_noneLegacy() throws CameraAccessExceptionCompat {
+ init(/* hasReprocessingCapabilities = */ true);
+
final CameraInfoInternal cameraInfo = new Camera2CameraInfoImpl(
CAMERA1_ID, mCameraManagerCompat);
assertThat(cameraInfo.getImplementationType()).isEqualTo(
@@ -327,6 +341,8 @@
@Test
public void addSessionCameraCaptureCallback_isCalledToCameraControl()
throws CameraAccessExceptionCompat {
+ init(/* hasReprocessingCapabilities = */ true);
+
final Camera2CameraInfoImpl cameraInfo = new Camera2CameraInfoImpl(
CAMERA1_ID, mCameraManagerCompat);
cameraInfo.linkWithCameraControl(mMockCameraControl);
@@ -341,6 +357,8 @@
@Test
public void removeSessionCameraCaptureCallback_isCalledToCameraControl()
throws CameraAccessExceptionCompat {
+ init(/* hasReprocessingCapabilities = */ true);
+
final Camera2CameraInfoImpl cameraInfo = new Camera2CameraInfoImpl(
CAMERA1_ID, mCameraManagerCompat);
cameraInfo.linkWithCameraControl(mMockCameraControl);
@@ -354,6 +372,8 @@
@Test
public void addSessionCameraCaptureCallbackWithoutCameraControl_attachedToCameraControlLater()
throws CameraAccessExceptionCompat {
+ init(/* hasReprocessingCapabilities = */ true);
+
final Camera2CameraInfoImpl cameraInfo = new Camera2CameraInfoImpl(
CAMERA1_ID, mCameraManagerCompat);
Executor executor = mock(Executor.class);
@@ -368,6 +388,8 @@
@Test
public void removeSessionCameraCaptureCallbackWithoutCameraControl_callbackIsRemoved()
throws CameraAccessExceptionCompat {
+ init(/* hasReprocessingCapabilities = */ true);
+
final Camera2CameraInfoImpl cameraInfo = new Camera2CameraInfoImpl(
CAMERA1_ID, mCameraManagerCompat);
// Add two callbacks
@@ -390,6 +412,8 @@
@Test
public void cameraInfoWithCameraControl_canReturnIsFocusMeteringSupported()
throws CameraAccessExceptionCompat {
+ init(/* hasReprocessingCapabilities = */ true);
+
final Camera2CameraInfoImpl cameraInfo = new Camera2CameraInfoImpl(
CAMERA0_ID, mCameraManagerCompat);
@@ -410,6 +434,8 @@
@Test
public void canReturnCameraCharacteristicsMapWithPhysicalCameras()
throws CameraAccessExceptionCompat {
+ init(/* hasReprocessingCapabilities = */ true);
+
CameraCharacteristics characteristics0 = mock(CameraCharacteristics.class);
CameraCharacteristics characteristicsPhysical2 = mock(CameraCharacteristics.class);
CameraCharacteristics characteristicsPhysical3 = mock(CameraCharacteristics.class);
@@ -433,6 +459,8 @@
@Test
public void canReturnCameraCharacteristicsMapWithMainCamera()
throws CameraAccessExceptionCompat {
+ init(/* hasReprocessingCapabilities = */ true);
+
Camera2CameraInfoImpl impl = new Camera2CameraInfoImpl("0", mCameraManagerCompat);
Map<String, CameraCharacteristics> map = impl.getCameraCharacteristicsMap();
assertThat(map.size()).isEqualTo(1);
@@ -443,6 +471,8 @@
@Test
public void cameraInfoWithCameraControl_canReturnIsYuvReprocessingSupported()
throws CameraAccessExceptionCompat {
+ init(/* hasReprocessingCapabilities = */ true);
+
final Camera2CameraInfoImpl cameraInfo = new Camera2CameraInfoImpl(
CAMERA0_ID, mCameraManagerCompat);
@@ -452,12 +482,47 @@
@Test
public void cameraInfoWithCameraControl_canReturnIsPrivateReprocessingSupported()
throws CameraAccessExceptionCompat {
+ init(/* hasReprocessingCapabilities = */ true);
+
final Camera2CameraInfoImpl cameraInfo = new Camera2CameraInfoImpl(
CAMERA0_ID, mCameraManagerCompat);
assertThat(cameraInfo.isPrivateReprocessingSupported()).isFalse();
}
+ @Config(minSdk = 23)
+ @Test
+ public void isZslSupported_apiVersionMet_returnTrue() throws CameraAccessExceptionCompat {
+ init(/* hasReprocessingCapabilities = */ true);
+
+ final Camera2CameraInfoImpl cameraInfo = new Camera2CameraInfoImpl(
+ CAMERA0_ID, mCameraManagerCompat);
+
+ assertThat(cameraInfo.isZslSupported()).isTrue();
+ }
+
+ @Config(maxSdk = 22)
+ @Test
+ public void isZslSupported_apiVersionNotMet_returnFalse() throws CameraAccessExceptionCompat {
+ init(/* hasReprocessingCapabilities = */ true);
+
+ final Camera2CameraInfoImpl cameraInfo = new Camera2CameraInfoImpl(
+ CAMERA0_ID, mCameraManagerCompat);
+
+ assertThat(cameraInfo.isZslSupported()).isFalse();
+ }
+
+ @Test
+ public void isZslSupported_noReprocessingCapability_returnFalse()
+ throws CameraAccessExceptionCompat {
+ init(/* hasReprocessingCapabilities = */ false);
+
+ final Camera2CameraInfoImpl cameraInfo = new Camera2CameraInfoImpl(
+ CAMERA0_ID, mCameraManagerCompat);
+
+ assertThat(cameraInfo.isZslSupported()).isFalse();
+ }
+
private CameraManagerCompat initCameraManagerWithPhysicalIds(
List<Pair<String, CameraCharacteristics>> cameraIdsAndCharacteristicsList) {
FakeCameraManagerImpl cameraManagerImpl = new FakeCameraManagerImpl();
@@ -469,9 +534,27 @@
return CameraManagerCompat.from(cameraManagerImpl);
}
+ private void init(boolean hasReprocessingCapabilities) throws CameraAccessExceptionCompat {
+ initCameras(hasReprocessingCapabilities);
+ mCameraManagerCompat =
+ CameraManagerCompat.from((Context) ApplicationProvider.getApplicationContext());
+ mCameraCharacteristics0 = mCameraManagerCompat.getCameraCharacteristicsCompat(CAMERA0_ID);
+ mCameraCharacteristics1 = mCameraManagerCompat.getCameraCharacteristicsCompat(CAMERA1_ID);
- private void initCameras() {
+ mMockZoomControl = mock(ZoomControl.class);
+ mMockTorchControl = mock(TorchControl.class);
+ mExposureControl = mock(ExposureControl.class);
+ mMockCameraControl = mock(Camera2CameraControlImpl.class);
+ mFocusMeteringControl = mock(FocusMeteringControl.class);
+
+ when(mMockCameraControl.getZoomControl()).thenReturn(mMockZoomControl);
+ when(mMockCameraControl.getTorchControl()).thenReturn(mMockTorchControl);
+ when(mMockCameraControl.getExposureControl()).thenReturn(mExposureControl);
+ when(mMockCameraControl.getFocusMeteringControl()).thenReturn(mFocusMeteringControl);
+ }
+
+ private void initCameras(boolean hasReprocessingCapabilities) {
// **** Camera 0 characteristics ****//
CameraCharacteristics characteristics0 =
ShadowCameraCharacteristics.newCameraCharacteristics();
@@ -493,8 +576,10 @@
CameraCharacteristics.FLASH_INFO_AVAILABLE, CAMERA0_FLASH_INFO_BOOLEAN);
// Mock the request capability
- shadowCharacteristics0.set(CameraCharacteristics.REQUEST_AVAILABLE_CAPABILITIES,
- CAMERA0_SUPPORTED_CAPABILITIES);
+ if (hasReprocessingCapabilities) {
+ shadowCharacteristics0.set(REQUEST_AVAILABLE_CAPABILITIES,
+ CAMERA0_SUPPORTED_CAPABILITIES);
+ }
// Add the camera to the camera service
((ShadowCameraManager)
diff --git a/camera/camera-camera2/src/test/java/androidx/camera/camera2/internal/Camera2CapturePipelineTest.kt b/camera/camera-camera2/src/test/java/androidx/camera/camera2/internal/Camera2CapturePipelineTest.kt
index 2473743..5706eea 100644
--- a/camera/camera-camera2/src/test/java/androidx/camera/camera2/internal/Camera2CapturePipelineTest.kt
+++ b/camera/camera-camera2/src/test/java/androidx/camera/camera2/internal/Camera2CapturePipelineTest.kt
@@ -559,27 +559,9 @@
it.build()
}
- val cameraControl = createCameraControl().apply {
- simulateRepeatingResult(initialDelay = 100)
- }
-
- val zslControl = ZslControlImpl(createCameraCharacteristicsCompat(
- hasCapabilities = true,
- isYuvReprocessingSupported = true,
- isPrivateReprocessingSupported = true
- ))
-
- val captureResult = FakeCameraCaptureResult()
- captureResult.afState = AfState.LOCKED_FOCUSED
- captureResult.aeState = AeState.CONVERGED
- captureResult.awbState = AwbState.CONVERGED
- val imageProxy = FakeImageProxy(CameraCaptureResultImageInfo(captureResult))
- imageProxy.image = mock(Image::class.java)
-
- zslControl.mImageRingBuffer.enqueue(imageProxy)
- zslControl.mReprocessingImageWriter = mock(ImageWriter::class.java)
-
- cameraControl.mZslControl = zslControl
+ val cameraControl = initCameraControlWithZsl(
+ isZslDisabledByFlashMode = false, isZslDisabledByUserCaseConfig = false
+ )
// Act.
cameraControl.submitStillCaptureRequests(
@@ -603,30 +585,77 @@
}
@Test
+ fun submitZslCaptureRequests_withZslDisabledByFlashMode_templateStillPictureSent():
+ Unit = runBlocking {
+ // Arrange.
+ val imageCaptureConfig = CaptureConfig.Builder().let {
+ it.addSurface(fakeStillCaptureSurface)
+ it.templateType = CameraDevice.TEMPLATE_ZERO_SHUTTER_LAG
+ it.build()
+ }
+
+ val cameraControl = initCameraControlWithZsl(
+ isZslDisabledByFlashMode = true, isZslDisabledByUserCaseConfig = false
+ )
+
+ // Act.
+ cameraControl.submitStillCaptureRequests(
+ listOf(imageCaptureConfig),
+ ImageCapture.CAPTURE_MODE_ZERO_SHUTTER_LAG,
+ FLASH_MODE_OFF,
+ ).await()
+
+ // Assert.
+ immediateCompleteCapture.verifyRequestResult { captureConfigList ->
+ captureConfigList.filter {
+ it.surfaces.contains(fakeStillCaptureSurface)
+ }.map { captureConfig ->
+ captureConfig.templateType
+ }.contains(CameraDevice.TEMPLATE_STILL_CAPTURE)
+ }
+ }
+
+ @Test
+ fun submitZslCaptureRequests_withZslDisabledByUseCaseConfig_templateStillPictureSent():
+ Unit = runBlocking {
+ // Arrange.
+ val imageCaptureConfig = CaptureConfig.Builder().let {
+ it.addSurface(fakeStillCaptureSurface)
+ it.templateType = CameraDevice.TEMPLATE_ZERO_SHUTTER_LAG
+ it.build()
+ }
+
+ val cameraControl = initCameraControlWithZsl(
+ isZslDisabledByFlashMode = false, isZslDisabledByUserCaseConfig = true
+ )
+
+ // Act.
+ cameraControl.submitStillCaptureRequests(
+ listOf(imageCaptureConfig),
+ ImageCapture.CAPTURE_MODE_ZERO_SHUTTER_LAG,
+ FLASH_MODE_OFF,
+ ).await()
+
+ // Assert.
+ immediateCompleteCapture.verifyRequestResult { captureConfigList ->
+ captureConfigList.filter {
+ it.surfaces.contains(fakeStillCaptureSurface)
+ }.map { captureConfig ->
+ captureConfig.templateType
+ }.contains(CameraDevice.TEMPLATE_STILL_CAPTURE)
+ }
+ }
+
+ @Test
fun submitZslCaptureRequests_withNoTemplate_templateStillPictureSent(): Unit = runBlocking {
// Arrange.
val imageCaptureConfig = CaptureConfig.Builder().let {
it.addSurface(fakeStillCaptureSurface)
it.build()
}
-
- val cameraControl = createCameraControl().apply {
- simulateRepeatingResult(initialDelay = 100)
- }
-
- val zslControl = ZslControlImpl(createCameraCharacteristicsCompat(
- hasCapabilities = true,
- isYuvReprocessingSupported = true,
- isPrivateReprocessingSupported = true
- ))
-
- val captureResult = FakeCameraCaptureResult()
- val imageProxy = FakeImageProxy(CameraCaptureResultImageInfo(captureResult))
- imageProxy.image = mock(Image::class.java)
- zslControl.mImageRingBuffer.enqueue(imageProxy)
- zslControl.mReprocessingImageWriter = mock(ImageWriter::class.java)
-
- cameraControl.mZslControl = zslControl
+ val cameraControl = initCameraControlWithZsl(
+ isZslDisabledByFlashMode = false, isZslDisabledByUserCaseConfig = false
+ )
// Act.
cameraControl.submitStillCaptureRequests(
@@ -1160,4 +1189,38 @@
return CameraCharacteristicsCompat.toCameraCharacteristicsCompat(characteristics)
}
+
+ private fun initCameraControlWithZsl(
+ isZslDisabledByFlashMode: Boolean,
+ isZslDisabledByUserCaseConfig: Boolean
+ ): Camera2CameraControlImpl {
+ val cameraControl = createCameraControl().apply {
+ simulateRepeatingResult(initialDelay = 100)
+ }
+
+ val zslControl = ZslControlImpl(createCameraCharacteristicsCompat(
+ hasCapabilities = true,
+ isYuvReprocessingSupported = true,
+ isPrivateReprocessingSupported = true
+ ))
+
+ // Only need to initialize when not disabled
+ if (!isZslDisabledByFlashMode && !isZslDisabledByUserCaseConfig) {
+ val captureResult = FakeCameraCaptureResult()
+ captureResult.afState = AfState.LOCKED_FOCUSED
+ captureResult.aeState = AeState.CONVERGED
+ captureResult.awbState = AwbState.CONVERGED
+ val imageProxy = FakeImageProxy(CameraCaptureResultImageInfo(captureResult))
+ imageProxy.image = mock(Image::class.java)
+ zslControl.mImageRingBuffer.enqueue(imageProxy)
+ zslControl.mReprocessingImageWriter = mock(ImageWriter::class.java)
+ }
+
+ zslControl.isZslDisabledByFlashMode = isZslDisabledByFlashMode
+ zslControl.isZslDisabledByUserCaseConfig = isZslDisabledByUserCaseConfig
+
+ cameraControl.mZslControl = zslControl
+
+ return cameraControl
+ }
}
\ No newline at end of file
diff --git a/camera/camera-camera2/src/test/java/androidx/camera/camera2/internal/SupportedSurfaceCombinationTest.java b/camera/camera-camera2/src/test/java/androidx/camera/camera2/internal/SupportedSurfaceCombinationTest.java
index d632a57..cbeb084 100644
--- a/camera/camera-camera2/src/test/java/androidx/camera/camera2/internal/SupportedSurfaceCombinationTest.java
+++ b/camera/camera-camera2/src/test/java/androidx/camera/camera2/internal/SupportedSurfaceCombinationTest.java
@@ -40,6 +40,7 @@
import android.view.Surface;
import android.view.WindowManager;
+import androidx.annotation.NonNull;
import androidx.camera.camera2.Camera2Config;
import androidx.camera.camera2.internal.compat.CameraManagerCompat;
import androidx.camera.core.AspectRatio;
@@ -51,10 +52,13 @@
import androidx.camera.core.ImageCapture;
import androidx.camera.core.InitializationException;
import androidx.camera.core.Preview;
+import androidx.camera.core.SurfaceRequest;
import androidx.camera.core.UseCase;
-import androidx.camera.core.VideoCapture;
+import androidx.camera.core.impl.CamcorderProfileProxy;
import androidx.camera.core.impl.CameraDeviceSurfaceManager;
import androidx.camera.core.impl.ImageFormatConstants;
+import androidx.camera.core.impl.MutableStateObservable;
+import androidx.camera.core.impl.Observable;
import androidx.camera.core.impl.SurfaceCombination;
import androidx.camera.core.impl.SurfaceConfig;
import androidx.camera.core.impl.SurfaceConfig.ConfigSize;
@@ -64,14 +68,24 @@
import androidx.camera.core.impl.utils.CompareSizesByArea;
import androidx.camera.core.impl.utils.executor.CameraXExecutors;
import androidx.camera.core.internal.CameraUseCaseAdapter;
+import androidx.camera.testing.CamcorderProfileUtil;
import androidx.camera.testing.CameraUtil;
import androidx.camera.testing.CameraXUtil;
import androidx.camera.testing.Configs;
import androidx.camera.testing.SurfaceTextureProvider;
+import androidx.camera.testing.fakes.FakeCamcorderProfileProvider;
import androidx.camera.testing.fakes.FakeCamera;
import androidx.camera.testing.fakes.FakeCameraFactory;
+import androidx.camera.testing.fakes.FakeCameraInfoInternal;
import androidx.camera.testing.fakes.FakeUseCase;
import androidx.camera.testing.fakes.FakeUseCaseConfig;
+import androidx.camera.video.FallbackStrategy;
+import androidx.camera.video.MediaSpec;
+import androidx.camera.video.Quality;
+import androidx.camera.video.QualitySelector;
+import androidx.camera.video.VideoCapture;
+import androidx.camera.video.VideoOutput;
+import androidx.camera.video.VideoSpec;
import androidx.test.core.app.ApplicationProvider;
import org.apache.maven.artifact.ant.shaded.ReflectionUtils;
@@ -117,12 +131,29 @@
private final Size mPreviewSize = new Size(1280, 720);
private final Size mRecordSize = new Size(3840, 2160);
private final Size mMaximumSize = new Size(4032, 3024);
- private final Size mMaximumVideoSize = new Size(1920, 1080);
+ private final Size mLegacyVideoMaximumVideoSize = new Size(1920, 1080);
private final Size mMod16Size = new Size(960, 544);
private final CamcorderProfileHelper mMockCamcorderProfileHelper =
Mockito.mock(CamcorderProfileHelper.class);
private final CamcorderProfile mMockCamcorderProfile = Mockito.mock(CamcorderProfile.class);
private CameraManagerCompat mCameraManagerCompat;
+ private final CamcorderProfileProxy mProfileUhd =
+ CamcorderProfileUtil.createCamcorderProfileProxy(
+ CamcorderProfile.QUALITY_2160P, mRecordSize.getWidth(), mRecordSize.getHeight()
+ );
+ private final CamcorderProfileProxy mProfileFhd =
+ CamcorderProfileUtil.createCamcorderProfileProxy(
+ CamcorderProfile.QUALITY_1080P, 1920, 1080
+ );
+ private final CamcorderProfileProxy mProfileHd =
+ CamcorderProfileUtil.createCamcorderProfileProxy(
+ CamcorderProfile.QUALITY_720P, mPreviewSize.getWidth(), mPreviewSize.getHeight()
+ );
+ private final CamcorderProfileProxy mProfileSd =
+ CamcorderProfileUtil.createCamcorderProfileProxy(
+ CamcorderProfile.QUALITY_480P, mAnalysisSize.getWidth(),
+ mAnalysisSize.getHeight()
+ );
/**
* Except for ImageFormat.JPEG, ImageFormat.YUV, and ImageFormat.RAW_SENSOR, other image formats
@@ -148,19 +179,19 @@
private final Size[] mSupportedSizes =
new Size[]{
- new Size(4032, 3024),
- new Size(3840, 2160),
- new Size(1920, 1440),
- new Size(1920, 1080),
- new Size(1280, 960),
- new Size(1280, 720),
+ new Size(4032, 3024), // 4:3
+ new Size(3840, 2160), // 16:9
+ new Size(1920, 1440), // 4:3
+ new Size(1920, 1080), // 16:9
+ new Size(1280, 960), // 4:3
+ new Size(1280, 720), // 16:9
new Size(1280, 720), // duplicate the size since Nexus 5X emulator has the case.
new Size(960, 544), // a mod16 version of resolution with 16:9 aspect ratio.
- new Size(800, 450),
- new Size(640, 480),
- new Size(320, 240),
- new Size(320, 180),
- new Size(256, 144) // For checkSmallSizesAreFilteredOut test.
+ new Size(800, 450), // 16:9
+ new Size(640, 480), // 4:3
+ new Size(320, 240), // 4:3
+ new Size(320, 180), // 16:9
+ new Size(256, 144) // 16:9 For checkSmallSizesAreFilteredOut test.
};
private final Context mContext = RuntimeEnvironment.application.getApplicationContext();
@@ -740,7 +771,7 @@
@Test(expected = IllegalArgumentException.class)
- public void suggestedResolutionsForMixedUseCaseNotSupportedInLegacyDevice()
+ public void legacyVideo_suggestedResolutionsForMixedUseCaseNotSupportedInLegacyDevice()
throws CameraUnavailableException {
setupCamera(CameraCharacteristics.INFO_SUPPORTED_HARDWARE_LEVEL_LEGACY);
SupportedSurfaceCombination supportedSurfaceCombination = new SupportedSurfaceCombination(
@@ -749,9 +780,10 @@
ImageCapture imageCapture = new ImageCapture.Builder()
.setTargetAspectRatio(AspectRatio.RATIO_16_9)
.build();
- VideoCapture videoCapture = new VideoCapture.Builder()
- .setTargetAspectRatio(AspectRatio.RATIO_16_9)
- .build();
+ androidx.camera.core.VideoCapture videoCapture =
+ new androidx.camera.core.VideoCapture.Builder()
+ .setTargetAspectRatio(AspectRatio.RATIO_16_9)
+ .build();
Preview preview = new Preview.Builder()
.setTargetAspectRatio(AspectRatio.RATIO_16_9)
.build();
@@ -770,7 +802,35 @@
}
@Test(expected = IllegalArgumentException.class)
- public void suggestedResolutionsForCustomizeResolutionsNotSupportedInLegacyDevice()
+ public void suggestedResolutionsForMixedUseCaseNotSupportedInLegacyDevice()
+ throws CameraUnavailableException {
+ setupCamera(CameraCharacteristics.INFO_SUPPORTED_HARDWARE_LEVEL_LEGACY);
+ SupportedSurfaceCombination supportedSurfaceCombination = new SupportedSurfaceCombination(
+ mContext, CAMERA_ID, mCameraManagerCompat, mMockCamcorderProfileHelper);
+
+ ImageCapture imageCapture = new ImageCapture.Builder()
+ .setTargetAspectRatio(AspectRatio.RATIO_16_9)
+ .build();
+ VideoCapture<TestVideoOutput> videoCapture = createVideoCapture();
+ Preview preview = new Preview.Builder()
+ .setTargetAspectRatio(AspectRatio.RATIO_16_9)
+ .build();
+
+ List<UseCase> useCases = new ArrayList<>();
+ useCases.add(imageCapture);
+ useCases.add(videoCapture);
+ useCases.add(preview);
+ Map<UseCase, UseCaseConfig<?>> useCaseToConfigMap =
+ Configs.useCaseConfigMapWithDefaultSettingsFromUseCaseList(
+ mCameraFactory.getCamera(CAMERA_ID).getCameraInfoInternal(),
+ useCases,
+ mUseCaseConfigFactory);
+ supportedSurfaceCombination.getSuggestedResolutions(Collections.emptyList(),
+ new ArrayList<>(useCaseToConfigMap.values()));
+ }
+
+ @Test(expected = IllegalArgumentException.class)
+ public void legacyVideo_suggestedResolutionsForCustomizeResolutionsNotSupportedInLegacyDevice()
throws CameraUnavailableException {
setupCamera(CameraCharacteristics.INFO_SUPPORTED_HARDWARE_LEVEL_LEGACY);
SupportedSurfaceCombination supportedSurfaceCombination = new SupportedSurfaceCombination(
@@ -782,7 +842,8 @@
List<Pair<Integer, Size[]>> previewResolutionsPairs = Arrays.asList(
Pair.create(ImageFormat.PRIVATE, new Size[]{mPreviewSize}));
- VideoCapture videoCapture = new VideoCapture.Builder()
+ androidx.camera.core.VideoCapture videoCapture =
+ new androidx.camera.core.VideoCapture.Builder()
// Override the default max resolution in VideoCapture
.setMaxResolution(mRecordSize)
.setSupportedResolutions(videoResolutionsPairs)
@@ -803,8 +864,37 @@
new ArrayList<>(useCaseToConfigMap.values()));
}
+ @Test(expected = IllegalArgumentException.class)
+ public void suggestedResolutionsForCustomizeResolutionsNotSupportedInLegacyDevice()
+ throws CameraUnavailableException {
+ setupCamera(CameraCharacteristics.INFO_SUPPORTED_HARDWARE_LEVEL_LEGACY);
+ SupportedSurfaceCombination supportedSurfaceCombination = new SupportedSurfaceCombination(
+ mContext, CAMERA_ID, mCameraManagerCompat, mMockCamcorderProfileHelper);
+
+ // Legacy camera only support (PRIV, PREVIEW) + (PRIV, PREVIEW)
+ Quality quality = Quality.UHD;
+ List<Pair<Integer, Size[]>> previewResolutionsPairs = Arrays.asList(
+ Pair.create(ImageFormat.PRIVATE, new Size[]{mPreviewSize}));
+
+ VideoCapture<TestVideoOutput> videoCapture = createVideoCapture(quality);
+ Preview preview = new Preview.Builder()
+ .setSupportedResolutions(previewResolutionsPairs)
+ .build();
+
+ List<UseCase> useCases = new ArrayList<>();
+ useCases.add(videoCapture);
+ useCases.add(preview);
+ Map<UseCase, UseCaseConfig<?>> useCaseToConfigMap =
+ Configs.useCaseConfigMapWithDefaultSettingsFromUseCaseList(
+ mCameraFactory.getCamera(CAMERA_ID).getCameraInfoInternal(),
+ useCases,
+ mUseCaseConfigFactory);
+ supportedSurfaceCombination.getSuggestedResolutions(Collections.emptyList(),
+ new ArrayList<>(useCaseToConfigMap.values()));
+ }
+
@Test
- public void getSuggestedResolutionsForMixedUseCaseInLimitedDevice()
+ public void legacyVideo_getSuggestedResolutionsForMixedUseCaseInLimitedDevice()
throws CameraUnavailableException {
setupCamera(CameraCharacteristics.INFO_SUPPORTED_HARDWARE_LEVEL_LIMITED);
SupportedSurfaceCombination supportedSurfaceCombination = new SupportedSurfaceCombination(
@@ -813,7 +903,8 @@
ImageCapture imageCapture = new ImageCapture.Builder()
.setTargetAspectRatio(AspectRatio.RATIO_16_9)
.build();
- VideoCapture videoCapture = new VideoCapture.Builder()
+ androidx.camera.core.VideoCapture videoCapture =
+ new androidx.camera.core.VideoCapture.Builder()
.setTargetAspectRatio(AspectRatio.RATIO_16_9)
.build();
Preview preview = new Preview.Builder()
@@ -838,7 +929,132 @@
assertThat(suggestedResolutionMap).containsEntry(useCaseToConfigMap.get(imageCapture),
mRecordSize);
assertThat(suggestedResolutionMap).containsEntry(useCaseToConfigMap.get(videoCapture),
- mMaximumVideoSize);
+ mLegacyVideoMaximumVideoSize);
+ assertThat(suggestedResolutionMap).containsEntry(useCaseToConfigMap.get(preview),
+ mPreviewSize);
+ }
+
+ @Test
+ public void getSuggestedResolutionsForMixedUseCaseInLimitedDevice()
+ throws CameraUnavailableException {
+ setupCamera(CameraCharacteristics.INFO_SUPPORTED_HARDWARE_LEVEL_LIMITED);
+ SupportedSurfaceCombination supportedSurfaceCombination = new SupportedSurfaceCombination(
+ mContext, CAMERA_ID, mCameraManagerCompat, mMockCamcorderProfileHelper);
+
+ ImageCapture imageCapture = new ImageCapture.Builder()
+ .setTargetAspectRatio(AspectRatio.RATIO_16_9)
+ .build();
+ VideoCapture<TestVideoOutput> videoCapture = createVideoCapture(Quality.HIGHEST);
+ Preview preview = new Preview.Builder()
+ .setTargetAspectRatio(AspectRatio.RATIO_16_9)
+ .build();
+
+ List<UseCase> useCases = new ArrayList<>();
+ useCases.add(imageCapture);
+ useCases.add(videoCapture);
+ useCases.add(preview);
+
+ Map<UseCase, UseCaseConfig<?>> useCaseToConfigMap =
+ Configs.useCaseConfigMapWithDefaultSettingsFromUseCaseList(
+ mCameraFactory.getCamera(CAMERA_ID).getCameraInfoInternal(),
+ useCases,
+ mUseCaseConfigFactory);
+ Map<UseCaseConfig<?>, Size> suggestedResolutionMap =
+ supportedSurfaceCombination.getSuggestedResolutions(Collections.emptyList(),
+ new ArrayList<>(useCaseToConfigMap.values()));
+
+ // (PRIV, PREVIEW) + (PRIV, RECORD) + (JPEG, RECORD)
+ assertThat(suggestedResolutionMap).containsEntry(useCaseToConfigMap.get(imageCapture),
+ mRecordSize);
+ assertThat(suggestedResolutionMap).containsEntry(useCaseToConfigMap.get(videoCapture),
+ mRecordSize);
+ assertThat(suggestedResolutionMap).containsEntry(useCaseToConfigMap.get(preview),
+ mPreviewSize);
+ }
+
+ // For the use case in b/230651237,
+ // QualitySelector.from(Quality.UHD, FallbackStrategy.lowerQualityOrHigherThan(Quality.UHD).
+ // VideoCapture should have higher priority to choose size than ImageCapture.
+ @Test
+ public void getSuggestedResolutionsInFullDevice_videoHasHigherPriorityThanImage()
+ throws CameraUnavailableException {
+ setupCamera(CameraCharacteristics.INFO_SUPPORTED_HARDWARE_LEVEL_FULL);
+ SupportedSurfaceCombination supportedSurfaceCombination = new SupportedSurfaceCombination(
+ mContext, CAMERA_ID, mCameraManagerCompat, mMockCamcorderProfileHelper);
+
+ ImageCapture imageCapture = new ImageCapture.Builder()
+ .setTargetAspectRatio(AspectRatio.RATIO_16_9)
+ .build();
+ VideoCapture<TestVideoOutput> videoCapture = createVideoCapture(
+ QualitySelector.from(Quality.UHD,
+ FallbackStrategy.lowerQualityOrHigherThan(Quality.UHD)));
+ Preview preview = new Preview.Builder()
+ .setTargetAspectRatio(AspectRatio.RATIO_16_9)
+ .build();
+
+ List<UseCase> useCases = new ArrayList<>();
+ useCases.add(imageCapture);
+ useCases.add(videoCapture);
+ useCases.add(preview);
+
+ Map<UseCase, UseCaseConfig<?>> useCaseToConfigMap =
+ Configs.useCaseConfigMapWithDefaultSettingsFromUseCaseList(
+ mCameraFactory.getCamera(CAMERA_ID).getCameraInfoInternal(),
+ useCases,
+ mUseCaseConfigFactory);
+ Map<UseCaseConfig<?>, Size> suggestedResolutionMap =
+ supportedSurfaceCombination.getSuggestedResolutions(Collections.emptyList(),
+ new ArrayList<>(useCaseToConfigMap.values()));
+
+ // There are two possible combinations in Full level device
+ // (PRIV, PREVIEW) + (PRIV, RECORD) + (JPEG, RECORD) => should be applied
+ // (PRIV, PREVIEW) + (PRIV, PREVIEW) + (JPEG, MAXIMUM)
+ assertThat(suggestedResolutionMap).containsEntry(useCaseToConfigMap.get(imageCapture),
+ mRecordSize);
+ assertThat(suggestedResolutionMap).containsEntry(useCaseToConfigMap.get(videoCapture),
+ mRecordSize);
+ assertThat(suggestedResolutionMap).containsEntry(useCaseToConfigMap.get(preview),
+ mPreviewSize);
+ }
+
+ @Test
+ public void getSuggestedResolutionsInFullDevice_videoRecordSizeLowPriority_imageCanGetMaxSize()
+ throws CameraUnavailableException {
+ setupCamera(CameraCharacteristics.INFO_SUPPORTED_HARDWARE_LEVEL_FULL);
+ SupportedSurfaceCombination supportedSurfaceCombination = new SupportedSurfaceCombination(
+ mContext, CAMERA_ID, mCameraManagerCompat, mMockCamcorderProfileHelper);
+
+ ImageCapture imageCapture = new ImageCapture.Builder()
+ .setTargetAspectRatio(AspectRatio.RATIO_4_3) // mMaximumSize(4032x3024) is 4:3
+ .build();
+ VideoCapture<TestVideoOutput> videoCapture = createVideoCapture(
+ QualitySelector.fromOrderedList(
+ Arrays.asList(Quality.HD, Quality.FHD, Quality.UHD)));
+ Preview preview = new Preview.Builder()
+ .setTargetAspectRatio(AspectRatio.RATIO_16_9)
+ .build();
+
+ List<UseCase> useCases = new ArrayList<>();
+ useCases.add(imageCapture);
+ useCases.add(videoCapture);
+ useCases.add(preview);
+
+ Map<UseCase, UseCaseConfig<?>> useCaseToConfigMap =
+ Configs.useCaseConfigMapWithDefaultSettingsFromUseCaseList(
+ mCameraFactory.getCamera(CAMERA_ID).getCameraInfoInternal(),
+ useCases,
+ mUseCaseConfigFactory);
+ Map<UseCaseConfig<?>, Size> suggestedResolutionMap =
+ supportedSurfaceCombination.getSuggestedResolutions(Collections.emptyList(),
+ new ArrayList<>(useCaseToConfigMap.values()));
+
+ // There are two possible combinations in Full level device
+ // (PRIV, PREVIEW) + (PRIV, RECORD) + (JPEG, RECORD)
+ // (PRIV, PREVIEW) + (PRIV, PREVIEW) + (JPEG, MAXIMUM) => should be applied
+ assertThat(suggestedResolutionMap).containsEntry(useCaseToConfigMap.get(imageCapture),
+ mMaximumSize);
+ assertThat(suggestedResolutionMap).containsEntry(useCaseToConfigMap.get(videoCapture),
+ mPreviewSize); // Quality.HD
assertThat(suggestedResolutionMap).containsEntry(useCaseToConfigMap.get(preview),
mPreviewSize);
}
@@ -926,8 +1142,7 @@
}
@Test
- public void throwsWhenSetBothTargetResolutionAndAspectRatioForDifferentUseCases()
- throws CameraUnavailableException {
+ public void throwsWhenSetBothTargetResolutionAndAspectRatioForDifferentUseCases() {
setupCamera(CameraCharacteristics.INFO_SUPPORTED_HARDWARE_LEVEL_LEGACY);
boolean previewExceptionHappened = false;
@@ -965,6 +1180,53 @@
}
@Test
+ public void legacyVideo_getSuggestedResolutionsForCustomizedSupportedResolutions()
+ throws CameraUnavailableException {
+ setupCamera(CameraCharacteristics.INFO_SUPPORTED_HARDWARE_LEVEL_LIMITED);
+ SupportedSurfaceCombination supportedSurfaceCombination = new SupportedSurfaceCombination(
+ mContext, CAMERA_ID, mCameraManagerCompat, mMockCamcorderProfileHelper);
+
+ List<Pair<Integer, Size[]>> formatResolutionsPairList = new ArrayList<>();
+ formatResolutionsPairList.add(Pair.create(ImageFormat.JPEG, new Size[]{mAnalysisSize}));
+ formatResolutionsPairList.add(
+ Pair.create(ImageFormat.YUV_420_888, new Size[]{mAnalysisSize}));
+ formatResolutionsPairList.add(Pair.create(ImageFormat.PRIVATE, new Size[]{mAnalysisSize}));
+
+ // Sets use cases customized supported resolutions to 640x480 only.
+ ImageCapture imageCapture = new ImageCapture.Builder()
+ .setSupportedResolutions(formatResolutionsPairList)
+ .build();
+ androidx.camera.core.VideoCapture videoCapture =
+ new androidx.camera.core.VideoCapture.Builder()
+ .setSupportedResolutions(formatResolutionsPairList)
+ .build();
+ Preview preview = new Preview.Builder()
+ .setSupportedResolutions(formatResolutionsPairList)
+ .build();
+
+ List<UseCase> useCases = new ArrayList<>();
+ useCases.add(imageCapture);
+ useCases.add(videoCapture);
+ useCases.add(preview);
+ Map<UseCase, UseCaseConfig<?>> useCaseToConfigMap =
+ Configs.useCaseConfigMapWithDefaultSettingsFromUseCaseList(
+ mCameraFactory.getCamera(CAMERA_ID).getCameraInfoInternal(),
+ useCases,
+ mUseCaseConfigFactory);
+ Map<UseCaseConfig<?>, Size> suggestedResolutionMap =
+ supportedSurfaceCombination.getSuggestedResolutions(Collections.emptyList(),
+ new ArrayList<>(useCaseToConfigMap.values()));
+
+ // Checks all suggested resolutions will become 640x480.
+ assertThat(suggestedResolutionMap).containsEntry(useCaseToConfigMap.get(imageCapture),
+ mAnalysisSize);
+ assertThat(suggestedResolutionMap).containsEntry(useCaseToConfigMap.get(videoCapture),
+ mAnalysisSize);
+ assertThat(suggestedResolutionMap).containsEntry(useCaseToConfigMap.get(preview),
+ mAnalysisSize);
+ }
+
+ @Test
public void getSuggestedResolutionsForCustomizedSupportedResolutions()
throws CameraUnavailableException {
setupCamera(CameraCharacteristics.INFO_SUPPORTED_HARDWARE_LEVEL_LIMITED);
@@ -981,9 +1243,7 @@
ImageCapture imageCapture = new ImageCapture.Builder()
.setSupportedResolutions(formatResolutionsPairList)
.build();
- VideoCapture videoCapture = new VideoCapture.Builder()
- .setSupportedResolutions(formatResolutionsPairList)
- .build();
+ VideoCapture<TestVideoOutput> videoCapture = createVideoCapture(Quality.SD);
Preview preview = new Preview.Builder()
.setSupportedResolutions(formatResolutionsPairList)
.build();
@@ -2134,7 +2394,7 @@
// Checks the determined RECORD size
assertThat(
supportedSurfaceCombination.getSurfaceSizeDefinition().getRecordSize()).isEqualTo(
- mMaximumVideoSize);
+ mLegacyVideoMaximumVideoSize);
}
@Test
@@ -2352,8 +2612,19 @@
mCameraManagerCompat = CameraManagerCompat.from(mContext);
- mCameraFactory.insertCamera(lensFacingEnum, cameraId, () -> new FakeCamera(cameraId, null,
- new Camera2CameraInfoImpl(cameraId, mCameraManagerCompat)));
+ FakeCameraInfoInternal cameraInfo = new FakeCameraInfoInternal(cameraId);
+ cameraInfo.setCamcorderProfileProvider(new FakeCamcorderProfileProvider.Builder()
+ .addProfile(
+ CamcorderProfileUtil.asHighQuality(mProfileUhd),
+ mProfileUhd,
+ mProfileFhd,
+ mProfileHd,
+ mProfileSd,
+ CamcorderProfileUtil.asLowQuality(mProfileSd)
+ ).build());
+
+ mCameraFactory.insertCamera(lensFacingEnum, cameraId,
+ () -> new FakeCamera(cameraId, null, cameraInfo));
initCameraX();
}
@@ -2424,4 +2695,51 @@
return isSupported;
}
+
+ /** Creates a VideoCapture with a default QualitySelector */
+ @NonNull
+ VideoCapture<TestVideoOutput> createVideoCapture() {
+ return createVideoCapture(VideoSpec.QUALITY_SELECTOR_AUTO);
+ }
+
+ /** Creates a VideoCapture with a specific Quality */
+ @NonNull
+ VideoCapture<TestVideoOutput> createVideoCapture(@NonNull Quality quality) {
+ return createVideoCapture(QualitySelector.from(quality));
+ }
+
+ /** Creates a VideoCapture with a customized QualitySelector */
+ @NonNull
+ VideoCapture<TestVideoOutput> createVideoCapture(@NonNull QualitySelector qualitySelector) {
+ MediaSpec.Builder mediaSpecBuilder = MediaSpec.builder();
+ mediaSpecBuilder.configureVideo(builder -> builder.setQualitySelector(qualitySelector));
+ TestVideoOutput videoOutput = new TestVideoOutput();
+ videoOutput.mMediaSpecObservable.setState(mediaSpecBuilder.build());
+ return VideoCapture.withOutput(videoOutput);
+ }
+
+ /** A fake implementation of VideoOutput */
+ private static class TestVideoOutput implements VideoOutput {
+
+ MutableStateObservable<MediaSpec> mMediaSpecObservable =
+ MutableStateObservable.withInitialState(MediaSpec.builder().build());
+ SurfaceRequest mSurfaceRequest;
+ SourceState mSourceState;
+
+ @Override
+ public void onSurfaceRequested(@NonNull SurfaceRequest request) {
+ mSurfaceRequest = request;
+ }
+
+ @NonNull
+ @Override
+ public Observable<MediaSpec> getMediaSpec() {
+ return mMediaSpecObservable;
+ }
+
+ @Override
+ public void onSourceStateChanged(@NonNull SourceState sourceState) {
+ mSourceState = sourceState;
+ }
+ }
}
diff --git a/camera/camera-camera2/src/test/java/androidx/camera/camera2/internal/ZslControlImplTest.kt b/camera/camera-camera2/src/test/java/androidx/camera/camera2/internal/ZslControlImplTest.kt
index 3f8cb7e..8e16cc0 100644
--- a/camera/camera-camera2/src/test/java/androidx/camera/camera2/internal/ZslControlImplTest.kt
+++ b/camera/camera-camera2/src/test/java/androidx/camera/camera2/internal/ZslControlImplTest.kt
@@ -108,6 +108,53 @@
assertThat(zslControl.mReprocessingImageWriter).isNull()
}
+ @Test
+ public fun isZslDisabledByUserCaseConfig_NotAddZslConfig() {
+ zslControl = ZslControlImpl(createCameraCharacteristicsCompat(
+ hasCapabilities = true,
+ isYuvReprocessingSupported = false,
+ isPrivateReprocessingSupported = true
+ ))
+ zslControl.isZslDisabledByUserCaseConfig = true
+
+ zslControl.addZslConfig(RESOLUTION, sessionConfigBuilder)
+
+ assertThat(zslControl.mReprocessingImageReader).isNull()
+ assertThat(zslControl.mReprocessingImageWriter).isNull()
+ }
+
+ @Test
+ public fun isZslDisabledByFlashMode_NotAddZslConfig() {
+ zslControl = ZslControlImpl(createCameraCharacteristicsCompat(
+ hasCapabilities = true,
+ isYuvReprocessingSupported = false,
+ isPrivateReprocessingSupported = false
+ ))
+ zslControl.isZslDisabledByFlashMode = true
+
+ zslControl.addZslConfig(RESOLUTION, sessionConfigBuilder)
+
+ assertThat(zslControl.mReprocessingImageReader).isNull()
+ assertThat(zslControl.mReprocessingImageWriter).isNull()
+ }
+
+ @Test
+ public fun isZslDisabled_clearZslConfig() {
+ zslControl = ZslControlImpl(createCameraCharacteristicsCompat(
+ hasCapabilities = true,
+ isYuvReprocessingSupported = false,
+ isPrivateReprocessingSupported = true
+ ))
+
+ zslControl.addZslConfig(RESOLUTION, sessionConfigBuilder)
+
+ zslControl.isZslDisabledByFlashMode = true
+ zslControl.addZslConfig(RESOLUTION, sessionConfigBuilder)
+
+ assertThat(zslControl.mReprocessingImageReader).isNull()
+ assertThat(zslControl.mReprocessingImageWriter).isNull()
+ }
+
private fun createCameraCharacteristicsCompat(
hasCapabilities: Boolean,
isYuvReprocessingSupported: Boolean,
diff --git a/camera/camera-camera2/src/test/java/androidx/camera/camera2/internal/compat/params/OutputConfigurationCompatTest.java b/camera/camera-camera2/src/test/java/androidx/camera/camera2/internal/compat/params/OutputConfigurationCompatTest.java
index 2cbeced..4c3dead 100644
--- a/camera/camera-camera2/src/test/java/androidx/camera/camera2/internal/compat/params/OutputConfigurationCompatTest.java
+++ b/camera/camera-camera2/src/test/java/androidx/camera/camera2/internal/compat/params/OutputConfigurationCompatTest.java
@@ -69,6 +69,18 @@
OutputConfigurationCompat.SURFACE_GROUP_ID_NONE);
}
+ @Config(minSdk = 24) // surfaceGroupId supported since api level 24
+ @Test
+ public void canSetSurfaceGroupId() {
+ Surface surface = mock(Surface.class);
+ int surfaceGroupId = 1;
+ OutputConfigurationCompat outputConfigCompat =
+ new OutputConfigurationCompat(surfaceGroupId, surface);
+
+ assertThat(outputConfigCompat.getSurfaceGroupId()).isEqualTo(surfaceGroupId);
+ assertThat(outputConfigCompat.getSurface()).isSameInstanceAs(surface);
+ }
+
@Test(expected = IllegalArgumentException.class)
public void addSurfaceThrows_whenAddingMoreThanMax() {
Surface surface = mock(Surface.class);
diff --git a/camera/camera-core/src/androidTest/java/androidx/camera/core/FakeOtherUseCaseConfig.java b/camera/camera-core/src/androidTest/java/androidx/camera/core/FakeOtherUseCaseConfig.java
index 6e221b0..5771cbb 100644
--- a/camera/camera-core/src/androidTest/java/androidx/camera/core/FakeOtherUseCaseConfig.java
+++ b/camera/camera-core/src/androidTest/java/androidx/camera/core/FakeOtherUseCaseConfig.java
@@ -184,5 +184,14 @@
getMutableConfig().insertOption(OPTION_USE_CASE_EVENT_CALLBACK, eventCallback);
return this;
}
+
+ /** @hide */
+ @RestrictTo(RestrictTo.Scope.LIBRARY_GROUP)
+ @NonNull
+ @Override
+ public Builder setZslDisabled(boolean disabled) {
+ getMutableConfig().insertOption(OPTION_ZSL_DISABLED, disabled);
+ return this;
+ }
}
}
diff --git a/camera/camera-core/src/androidTest/java/androidx/camera/core/impl/SessionConfigTest.java b/camera/camera-core/src/androidTest/java/androidx/camera/core/impl/SessionConfigTest.java
index c4f03ee..38b2fd2 100644
--- a/camera/camera-core/src/androidTest/java/androidx/camera/core/impl/SessionConfigTest.java
+++ b/camera/camera-core/src/androidTest/java/androidx/camera/core/impl/SessionConfigTest.java
@@ -16,6 +16,8 @@
package androidx.camera.core.impl;
+import static androidx.camera.core.impl.SessionConfig.OutputConfig.SURFACE_GROUP_ID_NONE;
+
import static com.google.common.truth.Truth.assertThat;
import static org.mockito.Mockito.mock;
@@ -24,6 +26,9 @@
import android.hardware.camera2.CameraDevice;
import android.view.Surface;
+import androidx.camera.core.ImageCapture;
+import androidx.camera.core.Preview;
+import androidx.camera.core.VideoCapture;
import androidx.camera.core.impl.Config.Option;
import androidx.camera.testing.DeferrableSurfacesUtil;
import androidx.camera.testing.fakes.FakeMultiValueSet;
@@ -38,6 +43,7 @@
import org.junit.Test;
import org.junit.runner.RunWith;
+import java.util.Arrays;
import java.util.List;
@MediumTest
@@ -82,9 +88,41 @@
SessionConfig sessionConfig = builder.build();
List<DeferrableSurface> surfaces = sessionConfig.getSurfaces();
+ List<SessionConfig.OutputConfig> outputConfigs = sessionConfig.getOutputConfigs();
assertThat(surfaces).hasSize(1);
assertThat(surfaces).contains(mMockSurface0);
+ assertThat(outputConfigs).hasSize(1);
+ assertThat(outputConfigs.get(0).getSurface()).isEqualTo(mMockSurface0);
+ assertThat(outputConfigs.get(0).getSharedSurfaces()).isEmpty();
+ assertThat(outputConfigs.get(0).getPhysicalCameraId()).isNull();
+ assertThat(outputConfigs.get(0).getSurfaceGroupId()).isEqualTo(SURFACE_GROUP_ID_NONE);
+ }
+
+ @Test
+ public void builderAddOutputConfig() {
+ SessionConfig.Builder builder = new SessionConfig.Builder();
+ DeferrableSurface sharedSurface1 = new ImmediateSurface(mock(Surface.class));
+ DeferrableSurface sharedSurface2 = new ImmediateSurface(mock(Surface.class));
+ SessionConfig.OutputConfig outputConfig = SessionConfig.OutputConfig.builder(mMockSurface0)
+ .setSurfaceGroupId(1)
+ .setSharedSurfaces(Arrays.asList(sharedSurface1, sharedSurface2))
+ .setPhysicalCameraId("4")
+ .build();
+
+ builder.addOutputConfig(outputConfig);
+ SessionConfig sessionConfig = builder.build();
+
+ List<DeferrableSurface> surfaces = sessionConfig.getSurfaces();
+ List<SessionConfig.OutputConfig> outputConfigs = sessionConfig.getOutputConfigs();
+
+ assertThat(surfaces).containsExactly(mMockSurface0, sharedSurface1, sharedSurface2);
+ assertThat(outputConfigs).hasSize(1);
+ assertThat(outputConfigs.get(0).getSurface()).isEqualTo(mMockSurface0);
+ assertThat(outputConfigs.get(0).getSharedSurfaces())
+ .containsExactly(sharedSurface1, sharedSurface2);
+ assertThat(outputConfigs.get(0).getSurfaceGroupId()).isEqualTo(1);
+ assertThat(outputConfigs.get(0).getPhysicalCameraId()).isEqualTo("4");
}
@Test
@@ -95,11 +133,13 @@
SessionConfig sessionConfig = builder.build();
List<DeferrableSurface> surfaces = sessionConfig.getSurfaces();
+ List<SessionConfig.OutputConfig> outputConfigs = sessionConfig.getOutputConfigs();
List<DeferrableSurface> repeatingSurfaces =
sessionConfig.getRepeatingCaptureConfig().getSurfaces();
- assertThat(surfaces).hasSize(1);
- assertThat(surfaces).contains(mMockSurface0);
+ assertThat(surfaces).containsExactly(mMockSurface0);
+ assertThat(outputConfigs).hasSize(1);
+ assertThat(outputConfigs.get(0).getSurface()).isEqualTo(mMockSurface0);
assertThat(repeatingSurfaces).isEmpty();
assertThat(repeatingSurfaces).doesNotContain(mMockSurface0);
}
@@ -125,11 +165,13 @@
SessionConfig.Builder builder = new SessionConfig.Builder();
builder.addSurface(mMockSurface0);
+ builder.addSurface(mMockSurface1);
builder.removeSurface(mMockSurface0);
SessionConfig sessionConfig = builder.build();
- List<Surface> surfaces = DeferrableSurfacesUtil.surfaceList(sessionConfig.getSurfaces());
- assertThat(surfaces).isEmpty();
+ assertThat(sessionConfig.getSurfaces()).containsExactly(mMockSurface1);
+ assertThat(sessionConfig.getOutputConfigs()).hasSize(1);
+ assertThat(sessionConfig.getOutputConfigs().get(0).getSurface()).isEqualTo(mMockSurface1);
}
@Test
@@ -140,8 +182,8 @@
builder.clearSurfaces();
SessionConfig sessionConfig = builder.build();
- List<Surface> surfaces = DeferrableSurfacesUtil.surfaceList(sessionConfig.getSurfaces());
- assertThat(surfaces.size()).isEqualTo(0);
+ assertThat(sessionConfig.getSurfaces()).isEmpty();
+ assertThat(sessionConfig.getOutputConfigs()).isEmpty();
}
@Test
@@ -311,21 +353,59 @@
assertThat(sessionConfig.getTemplateType()).isEqualTo(CameraDevice.TEMPLATE_PREVIEW);
}
+ private DeferrableSurface createSurface(Class<?> containerClass) {
+ DeferrableSurface deferrableSurface = new ImmediateSurface(mock(Surface.class));
+ deferrableSurface.setContainerClass(containerClass);
+ return deferrableSurface;
+ }
+
@Test
public void combineTwoSessionsSurfaces() {
+ DeferrableSurface previewSurface = createSurface(Preview.class);
+ DeferrableSurface videoSurface = createSurface(VideoCapture.class);
+ DeferrableSurface imageCaptureSurface = createSurface(ImageCapture.class);
+
SessionConfig.Builder builder0 = new SessionConfig.Builder();
- builder0.addSurface(mMockSurface0);
+ builder0.addSurface(videoSurface);
builder0.setTemplateType(CameraDevice.TEMPLATE_PREVIEW);
- MutableOptionsBundle options0 = MutableOptionsBundle.create();
- options0.insertOption(OPTION, 1);
- builder0.addImplementationOptions(options0);
SessionConfig.Builder builder1 = new SessionConfig.Builder();
- builder1.addSurface(mMockSurface1);
+ builder1.addSurface(previewSurface);
builder1.setTemplateType(CameraDevice.TEMPLATE_PREVIEW);
- MutableOptionsBundle options1 = MutableOptionsBundle.create();
- options1.insertOption(OPTION_1, "test");
- builder1.addImplementationOptions(options1);
+
+ SessionConfig.Builder builder2 = new SessionConfig.Builder();
+ builder2.addSurface(imageCaptureSurface);
+ builder2.setTemplateType(CameraDevice.TEMPLATE_PREVIEW);
+
+ SessionConfig.ValidatingBuilder validatingBuilder = new SessionConfig.ValidatingBuilder();
+ validatingBuilder.add(builder0.build());
+ validatingBuilder.add(builder1.build());
+ validatingBuilder.add(builder2.build());
+
+ SessionConfig sessionConfig = validatingBuilder.build();
+
+ List<DeferrableSurface> surfaces = sessionConfig.getSurfaces();
+ // Ensures the surfaces are all added and sorted correctly.
+ assertThat(surfaces)
+ .containsExactly(previewSurface, imageCaptureSurface, videoSurface).inOrder();
+ }
+
+ @Test
+ public void combineTwoSessionsOutputConfigs() {
+ DeferrableSurface nonRepeatingSurface = mock(DeferrableSurface.class);
+
+ SessionConfig.Builder builder0 = new SessionConfig.Builder();
+ SessionConfig.OutputConfig outputConfig0 =
+ SessionConfig.OutputConfig.builder(mMockSurface0).build();
+ builder0.addOutputConfig(outputConfig0);
+ builder0.addNonRepeatingSurface(nonRepeatingSurface);
+ builder0.setTemplateType(CameraDevice.TEMPLATE_PREVIEW);
+
+ SessionConfig.Builder builder1 = new SessionConfig.Builder();
+ SessionConfig.OutputConfig outputConfig1 =
+ SessionConfig.OutputConfig.builder(mMockSurface1).build();
+ builder1.addOutputConfig(outputConfig1);
+ builder1.setTemplateType(CameraDevice.TEMPLATE_PREVIEW);
SessionConfig.ValidatingBuilder validatingBuilder = new SessionConfig.ValidatingBuilder();
validatingBuilder.add(builder0.build());
@@ -334,7 +414,15 @@
SessionConfig sessionConfig = validatingBuilder.build();
List<DeferrableSurface> surfaces = sessionConfig.getSurfaces();
- assertThat(surfaces).containsExactly(mMockSurface0, mMockSurface1);
+ assertThat(surfaces).containsExactly(mMockSurface0, mMockSurface1, nonRepeatingSurface);
+ assertThat(sessionConfig.getOutputConfigs()).hasSize(3);
+ assertThat(sessionConfig.getOutputConfigs().get(0)).isEqualTo(outputConfig0);
+ assertThat(sessionConfig.getOutputConfigs().get(1).getSurface())
+ .isEqualTo(nonRepeatingSurface);
+ assertThat(sessionConfig.getOutputConfigs().get(2)).isEqualTo(outputConfig1);
+ // Should not contain the nonRepeatingSurface.
+ assertThat(sessionConfig.getRepeatingCaptureConfig().getSurfaces())
+ .containsExactly(mMockSurface0, mMockSurface1);
}
@Test
diff --git a/camera/camera-core/src/androidTest/java/androidx/camera/core/internal/CameraUseCaseAdapterTest.java b/camera/camera-core/src/androidTest/java/androidx/camera/core/internal/CameraUseCaseAdapterTest.java
index d2cecbf..6404808 100644
--- a/camera/camera-core/src/androidTest/java/androidx/camera/core/internal/CameraUseCaseAdapterTest.java
+++ b/camera/camera-core/src/androidTest/java/androidx/camera/core/internal/CameraUseCaseAdapterTest.java
@@ -43,6 +43,7 @@
import androidx.camera.core.impl.Identifier;
import androidx.camera.core.impl.MutableOptionsBundle;
import androidx.camera.core.impl.OptionsBundle;
+import androidx.camera.core.impl.UseCaseConfig;
import androidx.camera.core.impl.UseCaseConfigFactory;
import androidx.camera.testing.fakes.FakeCamera;
import androidx.camera.testing.fakes.FakeCameraDeviceSurfaceManager;
@@ -596,6 +597,42 @@
assertThat(cameraUseCaseAdapter.getUseCases().size()).isEqualTo(1);
}
+ @Test
+ public void addExistingUseCase_isZslDisabledByExtendedConfig_setZslDisabled()
+ throws CameraUseCaseAdapter.CameraException {
+ // Arrange: set up adapter.
+ CameraUseCaseAdapter cameraUseCaseAdapter = new CameraUseCaseAdapter(mFakeCameraSet,
+ mFakeCameraDeviceSurfaceManager,
+ mUseCaseConfigFactory);
+
+ cameraUseCaseAdapter.setExtendedConfig(new FakeCameraConfig());
+ FakeUseCase fakeUseCase = new FakeUseCase();
+ cameraUseCaseAdapter.addUseCases(Collections.singleton(fakeUseCase));
+
+ assertThat(mFakeCamera.getCameraControlInternal().isZslDisabledByByUserCaseConfig())
+ .isTrue();
+ }
+
+ @Test
+ public void addExistingUseCase_isZslDisabledByCameraConfig_setZslDisabled()
+ throws CameraUseCaseAdapter.CameraException {
+ // Arrange: set up adapter.
+ CameraUseCaseAdapter cameraUseCaseAdapter = new CameraUseCaseAdapter(mFakeCameraSet,
+ mFakeCameraDeviceSurfaceManager,
+ (captureType, captureMode) -> {
+ FakeUseCaseConfig.Builder useCaseBuilder = new FakeUseCaseConfig.Builder();
+ useCaseBuilder.getMutableConfig().insertOption(
+ UseCaseConfig.OPTION_ZSL_DISABLED, true);
+ return useCaseBuilder.getUseCaseConfig();
+ });
+
+ FakeUseCase fakeUseCase = new FakeUseCase();
+ cameraUseCaseAdapter.addUseCases(Collections.singleton(fakeUseCase));
+
+ assertThat(mFakeCamera.getCameraControlInternal().isZslDisabledByByUserCaseConfig())
+ .isTrue();
+ }
+
@NonNull
private CameraConfig createCoexistingRequiredRuleCameraConfig() {
return new CameraConfig() {
@@ -664,7 +701,10 @@
public Config getConfig(
@NonNull CaptureType captureType,
@CaptureMode int captureMode) {
- return null;
+ FakeUseCaseConfig.Builder useCaseBuilder = new FakeUseCaseConfig.Builder();
+ useCaseBuilder.getMutableConfig().insertOption(
+ UseCaseConfig.OPTION_ZSL_DISABLED, true);
+ return useCaseBuilder.getUseCaseConfig();
}
};
diff --git a/camera/camera-core/src/main/java/androidx/camera/core/CameraInfo.java b/camera/camera-core/src/main/java/androidx/camera/core/CameraInfo.java
index 88b7dc2..7f52cb0 100644
--- a/camera/camera-core/src/main/java/androidx/camera/core/CameraInfo.java
+++ b/camera/camera-core/src/main/java/androidx/camera/core/CameraInfo.java
@@ -205,6 +205,25 @@
}
/**
+ * Returns if zsl is supported based on current device information.
+ *
+ * <p> Zsl will be supported when all of the following conditions are met
+ * <ul>
+ * <li> API Level >= 23
+ * <li> {@link ImageFormat#YUV_420_888} or {@link ImageFormat#PRIVATE} reprocessing is
+ * supported
+ * </ul>
+ *
+ * @return True if supported, otherwise false.
+ *
+ * @hide
+ */
+ @RestrictTo(Scope.LIBRARY_GROUP)
+ default boolean isZslSupported() {
+ return false;
+ }
+
+ /**
* Returns if {@link ImageFormat#YUV_420_888} reprocessing is supported on the device.
*
* @return True if supported, otherwise false.
diff --git a/camera/camera-core/src/main/java/androidx/camera/core/ImageAnalysis.java b/camera/camera-core/src/main/java/androidx/camera/core/ImageAnalysis.java
index dbdbafb..26330c8 100644
--- a/camera/camera-core/src/main/java/androidx/camera/core/ImageAnalysis.java
+++ b/camera/camera-core/src/main/java/androidx/camera/core/ImageAnalysis.java
@@ -36,6 +36,7 @@
import static androidx.camera.core.impl.UseCaseConfig.OPTION_TARGET_CLASS;
import static androidx.camera.core.impl.UseCaseConfig.OPTION_TARGET_NAME;
import static androidx.camera.core.impl.UseCaseConfig.OPTION_USE_CASE_EVENT_CALLBACK;
+import static androidx.camera.core.impl.UseCaseConfig.OPTION_ZSL_DISABLED;
import static androidx.camera.core.internal.ThreadConfig.OPTION_BACKGROUND_EXECUTOR;
import android.graphics.ImageFormat;
@@ -1378,5 +1379,14 @@
imageReaderProxyProvider);
return this;
}
+
+ /** @hide */
+ @RestrictTo(Scope.LIBRARY_GROUP)
+ @NonNull
+ @Override
+ public Builder setZslDisabled(boolean disabled) {
+ getMutableConfig().insertOption(OPTION_ZSL_DISABLED, disabled);
+ return this;
+ }
}
}
diff --git a/camera/camera-core/src/main/java/androidx/camera/core/ImageCapture.java b/camera/camera-core/src/main/java/androidx/camera/core/ImageCapture.java
index cddadea..ba945df 100644
--- a/camera/camera-core/src/main/java/androidx/camera/core/ImageCapture.java
+++ b/camera/camera-core/src/main/java/androidx/camera/core/ImageCapture.java
@@ -31,7 +31,6 @@
import static androidx.camera.core.impl.ImageCaptureConfig.OPTION_MAX_CAPTURE_STAGES;
import static androidx.camera.core.impl.ImageCaptureConfig.OPTION_MAX_RESOLUTION;
import static androidx.camera.core.impl.ImageCaptureConfig.OPTION_SESSION_CONFIG_UNPACKER;
-import static androidx.camera.core.impl.ImageCaptureConfig.OPTION_SESSION_PROCESSOR_ENABLED;
import static androidx.camera.core.impl.ImageCaptureConfig.OPTION_SUPPORTED_RESOLUTIONS;
import static androidx.camera.core.impl.ImageCaptureConfig.OPTION_SURFACE_OCCUPANCY_PRIORITY;
import static androidx.camera.core.impl.ImageCaptureConfig.OPTION_TARGET_ASPECT_RATIO;
@@ -43,6 +42,7 @@
import static androidx.camera.core.impl.ImageCaptureConfig.OPTION_USE_SOFTWARE_JPEG_ENCODER;
import static androidx.camera.core.impl.ImageInputConfig.OPTION_INPUT_FORMAT;
import static androidx.camera.core.impl.UseCaseConfig.OPTION_CAMERA_SELECTOR;
+import static androidx.camera.core.impl.UseCaseConfig.OPTION_ZSL_DISABLED;
import android.content.ContentResolver;
import android.content.ContentValues;
@@ -75,6 +75,7 @@
import androidx.annotation.VisibleForTesting;
import androidx.camera.core.ForwardingImageProxy.OnImageCloseListener;
import androidx.camera.core.impl.CameraCaptureCallback;
+import androidx.camera.core.impl.CameraConfig;
import androidx.camera.core.impl.CameraInfoInternal;
import androidx.camera.core.impl.CameraInternal;
import androidx.camera.core.impl.CaptureBundle;
@@ -312,11 +313,6 @@
*/
private boolean mUseSoftwareJpeg = false;
- /**
- * Whether SessionProcessor is enabled.
- */
- private boolean mIsSessionProcessorEnabled = true;
-
////////////////////////////////////////////////////////////////////////////////////////////
// [UseCase attached dynamic] - Can change but is only available when the UseCase is attached.
////////////////////////////////////////////////////////////////////////////////////////////
@@ -390,7 +386,7 @@
resolution.getHeight(), getImageFormat(), MAX_IMAGES, 0));
mMetadataMatchingCaptureCallback = new CameraCaptureCallback() {
};
- } else if (mIsSessionProcessorEnabled) {
+ } else if (isSessionProcessorEnabledInCurrentCamera()) {
ImageReaderProxy imageReader;
if (getImageFormat() == ImageFormat.JPEG) {
imageReader =
@@ -520,8 +516,11 @@
}
mDeferrableSurface = new ImmediateSurface(
- mImageReader.getSurface(), new Size(mImageReader.getWidth(),
- mImageReader.getHeight()), mImageReader.getImageFormat());
+ mImageReader.getSurface(),
+ new Size(mImageReader.getWidth(),
+ mImageReader.getHeight()),
+ /* get the surface image format using getImageFormat */
+ getImageFormat());
mImageReaderCloseFuture =
mProcessingImageReader != null ? mProcessingImageReader.getCloseFuture()
@@ -547,6 +546,14 @@
return sessionConfigBuilder;
}
+ private boolean isSessionProcessorEnabledInCurrentCamera() {
+ if (getCamera() == null) {
+ return false;
+ }
+
+ CameraConfig cameraConfig = getCamera().getExtendedConfig();
+ return cameraConfig == null ? false : cameraConfig.getSessionProcessor(null) != null;
+ }
/**
* Clear the internal pipeline so that the pipeline can be set up again.
*/
@@ -1593,7 +1600,6 @@
// This will only be set to true if software JPEG was requested and
// enforceSoftwareJpegConstraints() hasn't removed the request.
mUseSoftwareJpeg = useCaseConfig.isSoftwareJpegEncoderRequested();
- mIsSessionProcessorEnabled = useCaseConfig.isSessionProcessorEnabled();
CameraInternal camera = getCamera();
Preconditions.checkNotNull(camera, "Attached camera cannot be null");
@@ -2553,17 +2559,6 @@
}
/**
- * Set the flag to indicate whether SessionProcessor is enabled.
- * @hide
- */
- @RestrictTo(Scope.LIBRARY_GROUP)
- @NonNull
- public Builder setSessionProcessorEnabled(boolean enabled) {
- getMutableConfig().insertOption(OPTION_SESSION_PROCESSOR_ENABLED, enabled);
- return this;
- }
-
- /**
* Sets the max number of {@link CaptureStage}.
*
* @param maxCaptureStages The max CaptureStage number.
@@ -2907,5 +2902,17 @@
getMutableConfig().insertOption(OPTION_USE_CASE_EVENT_CALLBACK, useCaseEventCallback);
return this;
}
+ /**
+ * {@inheritDoc}
+ *
+ * @hide
+ */
+ @RestrictTo(Scope.LIBRARY_GROUP)
+ @NonNull
+ @Override
+ public Builder setZslDisabled(boolean disabled) {
+ getMutableConfig().insertOption(OPTION_ZSL_DISABLED, disabled);
+ return this;
+ }
}
}
diff --git a/camera/camera-core/src/main/java/androidx/camera/core/Preview.java b/camera/camera-core/src/main/java/androidx/camera/core/Preview.java
index bf4d35b..e6f2266 100644
--- a/camera/camera-core/src/main/java/androidx/camera/core/Preview.java
+++ b/camera/camera-core/src/main/java/androidx/camera/core/Preview.java
@@ -37,6 +37,7 @@
import static androidx.camera.core.impl.PreviewConfig.OPTION_TARGET_ROTATION;
import static androidx.camera.core.impl.PreviewConfig.OPTION_USE_CASE_EVENT_CALLBACK;
import static androidx.camera.core.impl.UseCaseConfig.OPTION_CAMERA_SELECTOR;
+import static androidx.camera.core.impl.UseCaseConfig.OPTION_ZSL_DISABLED;
import android.graphics.ImageFormat;
import android.graphics.Rect;
@@ -1066,5 +1067,14 @@
getMutableConfig().insertOption(OPTION_PREVIEW_CAPTURE_PROCESSOR, captureProcessor);
return this;
}
+
+ /** @hide */
+ @RestrictTo(Scope.LIBRARY_GROUP)
+ @NonNull
+ @Override
+ public Builder setZslDisabled(boolean disabled) {
+ getMutableConfig().insertOption(OPTION_ZSL_DISABLED, disabled);
+ return this;
+ }
}
}
diff --git a/camera/camera-core/src/main/java/androidx/camera/core/VideoCapture.java b/camera/camera-core/src/main/java/androidx/camera/core/VideoCapture.java
index 50fe507..5533315 100644
--- a/camera/camera-core/src/main/java/androidx/camera/core/VideoCapture.java
+++ b/camera/camera-core/src/main/java/androidx/camera/core/VideoCapture.java
@@ -28,6 +28,7 @@
import static androidx.camera.core.impl.UseCaseConfig.OPTION_DEFAULT_SESSION_CONFIG;
import static androidx.camera.core.impl.UseCaseConfig.OPTION_SESSION_CONFIG_UNPACKER;
import static androidx.camera.core.impl.UseCaseConfig.OPTION_SURFACE_OCCUPANCY_PRIORITY;
+import static androidx.camera.core.impl.UseCaseConfig.OPTION_ZSL_DISABLED;
import static androidx.camera.core.impl.VideoCaptureConfig.OPTION_AUDIO_BIT_RATE;
import static androidx.camera.core.impl.VideoCaptureConfig.OPTION_AUDIO_CHANNEL_COUNT;
import static androidx.camera.core.impl.VideoCaptureConfig.OPTION_AUDIO_MIN_BUFFER_SIZE;
@@ -1836,6 +1837,15 @@
getMutableConfig().insertOption(OPTION_USE_CASE_EVENT_CALLBACK, useCaseEventCallback);
return this;
}
+
+ /** @hide */
+ @RestrictTo(Scope.LIBRARY_GROUP)
+ @NonNull
+ @Override
+ public Builder setZslDisabled(boolean disabled) {
+ getMutableConfig().insertOption(OPTION_ZSL_DISABLED, disabled);
+ return this;
+ }
}
/**
diff --git a/camera/camera-core/src/main/java/androidx/camera/core/impl/CameraConfig.java b/camera/camera-core/src/main/java/androidx/camera/core/impl/CameraConfig.java
index 051552b..a2164e1 100644
--- a/camera/camera-core/src/main/java/androidx/camera/core/impl/CameraConfig.java
+++ b/camera/camera-core/src/main/java/androidx/camera/core/impl/CameraConfig.java
@@ -79,14 +79,6 @@
}
/**
- * Retrieves the status for zsl disabled or not.
- */
- @NonNull
- default Boolean isZslDisabled() {
- return retrieveOption(OPTION_ZSL_DISABLED, Boolean.FALSE);
- }
-
- /**
* Retrieves the compatibility {@link Identifier}.
*
* <p>If camera configs have the same compatibility identifier, they will allow to bind a new
diff --git a/camera/camera-core/src/main/java/androidx/camera/core/impl/CameraControlInternal.java b/camera/camera-core/src/main/java/androidx/camera/core/impl/CameraControlInternal.java
index 8ef5544..36c1f4d 100644
--- a/camera/camera-core/src/main/java/androidx/camera/core/impl/CameraControlInternal.java
+++ b/camera/camera-core/src/main/java/androidx/camera/core/impl/CameraControlInternal.java
@@ -68,14 +68,26 @@
@NonNull SessionConfig.Builder sessionConfigBuilder);
/**
- * Sets zsl disabled or not.
+ * Sets the flag if zero-shutter lag needs to be disabled by user case config.
*
- * @param disabled True if zero-shutter lag should be disabled. Otherwise, should not be
- * disabled. However, enabling zero-shutter lag needs other conditions e.g.
- * flash mode OFF, so setting to false doesn't guarantee zero-shutter lag to
- * be always ON.
+ * <p> Zero-shutter lag will be disabled when any of the following conditions:
+ * <ul>
+ * <li> Extension is ON
+ * <li> VideoCapture is ON
+ * </ul>
+ *
+ * @param disabled True if zero-shutter lag should be disabled. Otherwise returns false.
+ * However, enabling zero-shutter lag needs other conditions e.g. flash mode
+ * OFF, so setting to false doesn't guarantee zero-shutter lag to be always ON.
*/
- void setZslDisabled(boolean disabled);
+ void setZslDisabledByUserCaseConfig(boolean disabled);
+
+ /**
+ * Checks if zero-shutter lag is disabled by user case config.
+ *
+ * @return True if zero-shutter lag should be disabled. Otherwise returns false.
+ */
+ boolean isZslDisabledByByUserCaseConfig();
/**
* Performs still capture requests with the desired capture mode.
@@ -140,7 +152,12 @@
}
@Override
- public void setZslDisabled(boolean disabled) {
+ public void setZslDisabledByUserCaseConfig(boolean disabled) {
+ }
+
+ @Override
+ public boolean isZslDisabledByByUserCaseConfig() {
+ return false;
}
@Override
diff --git a/camera/camera-core/src/main/java/androidx/camera/core/impl/ImageCaptureConfig.java b/camera/camera-core/src/main/java/androidx/camera/core/impl/ImageCaptureConfig.java
index fc37406..a9a7602 100644
--- a/camera/camera-core/src/main/java/androidx/camera/core/impl/ImageCaptureConfig.java
+++ b/camera/camera-core/src/main/java/androidx/camera/core/impl/ImageCaptureConfig.java
@@ -62,9 +62,6 @@
Option.create("camerax.core.imageCapture.flashType", int.class);
public static final Option<Integer> OPTION_JPEG_COMPRESSION_QUALITY =
Option.create("camerax.core.imageCapture.jpegCompressionQuality", int.class);
- public static final Option<Boolean> OPTION_SESSION_PROCESSOR_ENABLED =
- Option.create("camerax.core.imageCapture.sessionProcessorEnabled", boolean.class);
-
// *********************************************************************************************
private final OptionsBundle mConfig;
@@ -290,13 +287,6 @@
return retrieveOption(OPTION_JPEG_COMPRESSION_QUALITY);
}
- /**
- * Returns if the SessionProcessor is enabled.
- */
- public boolean isSessionProcessorEnabled() {
- return retrieveOption(OPTION_SESSION_PROCESSOR_ENABLED, false);
- }
-
// Implementations of IO default methods
/**
diff --git a/camera/camera-core/src/main/java/androidx/camera/core/impl/SessionConfig.java b/camera/camera-core/src/main/java/androidx/camera/core/impl/SessionConfig.java
index 6768250..73747cf 100644
--- a/camera/camera-core/src/main/java/androidx/camera/core/impl/SessionConfig.java
+++ b/camera/camera-core/src/main/java/androidx/camera/core/impl/SessionConfig.java
@@ -21,7 +21,6 @@
import android.hardware.camera2.CameraDevice.StateCallback;
import android.hardware.camera2.CaptureRequest;
import android.hardware.camera2.params.InputConfiguration;
-import android.view.Surface;
import androidx.annotation.NonNull;
import androidx.annotation.Nullable;
@@ -29,6 +28,8 @@
import androidx.camera.core.Logger;
import androidx.camera.core.internal.compat.workaround.SurfaceSorter;
+import com.google.auto.value.AutoValue;
+
import java.util.ArrayList;
import java.util.Arrays;
import java.util.Collection;
@@ -46,9 +47,8 @@
*/
@RequiresApi(21) // TODO(b/200306659): Remove and replace with annotation on package-info.java
public final class SessionConfig {
-
- /** The set of {@link Surface} that data from the camera will be put into. */
- private final List<DeferrableSurface> mSurfaces;
+ /** The set of {@link OutputConfig} that data from the camera will be put into. */
+ private final List<OutputConfig> mOutputConfigs;
/** The state callback for a {@link CameraDevice}. */
private final List<CameraDevice.StateCallback> mDeviceStateCallbacks;
/** The state callback for a {@link CameraCaptureSession}. */
@@ -67,12 +67,107 @@
private InputConfiguration mInputConfiguration;
/**
+ * The output configuration associated with the {@link DeferrableSurface} that will be used to
+ * create the configuration needed to open a camera session. In camera2 this will be used to
+ * create the corresponding {@link android.hardware.camera2.params.OutputConfiguration}.
+ */
+ @SuppressWarnings("AutoValueImmutableFields") // avoid extra dependency for ImmutableList.
+ @AutoValue
+ public abstract static class OutputConfig {
+ public static final int SURFACE_GROUP_ID_NONE = -1;
+
+ /**
+ * Returns the surface associated with the {@link OutputConfig}.
+ */
+ @NonNull
+ public abstract DeferrableSurface getSurface();
+
+ /**
+ * Returns the shared surfaces. If non-empty, surface sharing will be enabled and the
+ * shared surfaces will share the same memory buffer as the main surface returned in
+ * {@link #getSurface()}.
+ */
+ @NonNull
+ public abstract List<DeferrableSurface> getSharedSurfaces();
+
+ /**
+ * Returns the physical camera ID. By default it would be null. For cameras consisting of
+ * multiple physical cameras, this allows output to be redirected to specific physical
+ * camera.
+ */
+ @Nullable
+ public abstract String getPhysicalCameraId();
+
+ /**
+ * Returns the surface group ID. Default value is {@link #SURFACE_GROUP_ID_NONE} meaning
+ * it doesn't belong to any surface group. A surface group ID is used to identify which
+ * surface group this output surface belongs to. Output streams with the same
+ * non-negative group ID won't receive the camera output simultaneously therefore it
+ * could reduce the overall memory footprint.
+ */
+ public abstract int getSurfaceGroupId();
+
+ /**
+ * Creates the {@link Builder} instance with specified {@link DeferrableSurface}.
+ */
+ @NonNull
+ public static Builder builder(@NonNull DeferrableSurface surface) {
+ return new AutoValue_SessionConfig_OutputConfig.Builder()
+ .setSurface(surface)
+ .setSharedSurfaces(Collections.emptyList())
+ .setPhysicalCameraId(null)
+ .setSurfaceGroupId(SURFACE_GROUP_ID_NONE);
+ }
+
+ /**
+ * Builder to create the {@link OutputConfig}
+ */
+ @AutoValue.Builder
+ public abstract static class Builder {
+ /**
+ * Sets the surface associated with the {@link OutputConfig}.
+ */
+ @NonNull
+ public abstract Builder setSurface(@NonNull DeferrableSurface surface);
+
+ /**
+ * Sets the shared surfaces. After being set, surface sharing will be enabled and the
+ * shared surfaces will share the same memory buffer as the main surface returned in
+ * {@link #getSurface()}.
+ */
+ @NonNull
+ public abstract Builder setSharedSurfaces(@NonNull List<DeferrableSurface> surface);
+
+ /**
+ * Sets the physical camera ID. For cameras consisting of multiple physical cameras,
+ * this allows output to be redirected to specific physical camera.
+ */
+ @NonNull
+ public abstract Builder setPhysicalCameraId(@Nullable String cameraId);
+
+ /**
+ * Sets the surface group ID. A surface group ID is used to identify which surface group
+ * this output surface belongs to. Output streams with the same non-negative group ID
+ * won't receive the camera output simultaneously therefore it could be used to reduce
+ * the overall memory footprint.
+ */
+ @NonNull
+ public abstract Builder setSurfaceGroupId(int surfaceGroupId);
+
+ /**
+ * Creates the instance.
+ */
+ @NonNull
+ public abstract OutputConfig build();
+ }
+ }
+ /**
* Private constructor for a SessionConfig.
*
* <p>In practice, the {@link SessionConfig.BaseBuilder} will be used to construct a
* SessionConfig.
*
- * @param surfaces The set of {@link Surface} where data will be put into.
+ * @param outputConfigs The list of {@link OutputConfig} where data will be put into.
* @param deviceStateCallbacks The state callbacks for a {@link CameraDevice}.
* @param sessionStateCallbacks The state callbacks for a {@link CameraCaptureSession}.
* @param repeatingCaptureConfig The configuration for building the {@link CaptureRequest}.
@@ -80,14 +175,14 @@
* session.
*/
SessionConfig(
- List<DeferrableSurface> surfaces,
+ List<OutputConfig> outputConfigs,
List<StateCallback> deviceStateCallbacks,
List<CameraCaptureSession.StateCallback> sessionStateCallbacks,
List<CameraCaptureCallback> singleCameraCaptureCallbacks,
List<ErrorListener> errorListeners,
CaptureConfig repeatingCaptureConfig,
@Nullable InputConfiguration inputConfiguration) {
- mSurfaces = surfaces;
+ mOutputConfigs = outputConfigs;
mDeviceStateCallbacks = Collections.unmodifiableList(deviceStateCallbacks);
mSessionStateCallbacks = Collections.unmodifiableList(sessionStateCallbacks);
mSingleCameraCaptureCallbacks =
@@ -101,13 +196,13 @@
@NonNull
public static SessionConfig defaultEmptySessionConfig() {
return new SessionConfig(
- new ArrayList<DeferrableSurface>(),
+ new ArrayList<OutputConfig>(),
new ArrayList<CameraDevice.StateCallback>(0),
new ArrayList<CameraCaptureSession.StateCallback>(0),
new ArrayList<CameraCaptureCallback>(0),
new ArrayList<>(0),
new CaptureConfig.Builder().build(),
- /* inputConfiguration = */null);
+ /* inputConfiguration */ null);
}
@Nullable
@@ -115,9 +210,26 @@
return mInputConfiguration;
}
+ /**
+ * Returns all {@link DeferrableSurface}s that are used to configure the session. It includes
+ * both the {@link DeferrableSurface} of the all {@link OutputConfig}s and its shared
+ * surfaces.
+ */
@NonNull
public List<DeferrableSurface> getSurfaces() {
- return Collections.unmodifiableList(mSurfaces);
+ List<DeferrableSurface> deferrableSurfaces = new ArrayList<>();
+ for (OutputConfig outputConfig : mOutputConfigs) {
+ deferrableSurfaces.add(outputConfig.getSurface());
+ for (DeferrableSurface sharedSurface : outputConfig.getSharedSurfaces()) {
+ deferrableSurfaces.add(sharedSurface);
+ }
+ }
+ return Collections.unmodifiableList(deferrableSurfaces);
+ }
+
+ @NonNull
+ public List<OutputConfig> getOutputConfigs() {
+ return mOutputConfigs;
}
@NonNull
@@ -210,7 +322,7 @@
*/
static class BaseBuilder {
// Use LinkedHashSet to preserve the adding order for bug fixing and testing.
- final Set<DeferrableSurface> mSurfaces = new LinkedHashSet<>();
+ final Set<OutputConfig> mOutputConfigs = new LinkedHashSet<>();
final CaptureConfig.Builder mCaptureConfigBuilder = new CaptureConfig.Builder();
final List<CameraDevice.StateCallback> mDeviceStateCallbacks = new ArrayList<>();
final List<CameraCaptureSession.StateCallback> mSessionStateCallbacks = new ArrayList<>();
@@ -249,8 +361,10 @@
*
* @param inputConfiguration The input configuration.
*/
- public void setInputConfiguration(@Nullable InputConfiguration inputConfiguration) {
+ @NonNull
+ public Builder setInputConfiguration(@Nullable InputConfiguration inputConfiguration) {
mInputConfiguration = inputConfiguration;
+ return this;
}
/**
@@ -261,77 +375,93 @@
* <p>TODO(b/120949879): This is camera2 implementation detail that
* should be moved
*/
- public void setTemplateType(int templateType) {
+ @NonNull
+ public Builder setTemplateType(int templateType) {
mCaptureConfigBuilder.setTemplateType(templateType);
+ return this;
}
/**
* Adds a tag to the SessionConfig with a key. For tracking the source.
*/
- public void addTag(@NonNull String key, @NonNull Object tag) {
+ @NonNull
+ public Builder addTag(@NonNull String key, @NonNull Object tag) {
mCaptureConfigBuilder.addTag(key, tag);
+ return this;
}
/**
* Adds a {@link CameraDevice.StateCallback} callback.
*/
// TODO(b/120949879): This is camera2 implementation detail that should be moved
- public void addDeviceStateCallback(
+ @NonNull
+ public Builder addDeviceStateCallback(
@NonNull CameraDevice.StateCallback deviceStateCallback) {
if (mDeviceStateCallbacks.contains(deviceStateCallback)) {
- return;
+ return this;
}
mDeviceStateCallbacks.add(deviceStateCallback);
+ return this;
}
/**
* Adds all {@link CameraDevice.StateCallback} callbacks.
*/
- public void addAllDeviceStateCallbacks(@NonNull
+ @NonNull
+ public Builder addAllDeviceStateCallbacks(@NonNull
Collection<CameraDevice.StateCallback> deviceStateCallbacks) {
for (CameraDevice.StateCallback callback : deviceStateCallbacks) {
addDeviceStateCallback(callback);
}
+ return this;
}
/**
* Adds a {@link CameraCaptureSession.StateCallback} callback.
*/
// TODO(b/120949879): This is camera2 implementation detail that should be moved
- public void addSessionStateCallback(@NonNull
+ @NonNull
+ public Builder addSessionStateCallback(@NonNull
CameraCaptureSession.StateCallback sessionStateCallback) {
if (mSessionStateCallbacks.contains(sessionStateCallback)) {
- return;
+ return this;
}
mSessionStateCallbacks.add(sessionStateCallback);
+ return this;
}
/**
* Adds all {@link CameraCaptureSession.StateCallback} callbacks.
*/
- public void addAllSessionStateCallbacks(@NonNull
+ @NonNull
+ public Builder addAllSessionStateCallbacks(@NonNull
List<CameraCaptureSession.StateCallback> sessionStateCallbacks) {
for (CameraCaptureSession.StateCallback callback : sessionStateCallbacks) {
addSessionStateCallback(callback);
}
+ return this;
}
/**
* Adds a {@link CameraCaptureCallback} callback for repeating requests.
* <p>This callback does not call for single requests.
*/
- public void addRepeatingCameraCaptureCallback(
+ @NonNull
+ public Builder addRepeatingCameraCaptureCallback(
@NonNull CameraCaptureCallback cameraCaptureCallback) {
mCaptureConfigBuilder.addCameraCaptureCallback(cameraCaptureCallback);
+ return this;
}
/**
* Adds all {@link CameraCaptureCallback} callbacks.
* <p>These callbacks do not call for single requests.
*/
- public void addAllRepeatingCameraCaptureCallbacks(@NonNull
+ @NonNull
+ public Builder addAllRepeatingCameraCaptureCallbacks(@NonNull
Collection<CameraCaptureCallback> cameraCaptureCallbacks) {
mCaptureConfigBuilder.addAllCameraCaptureCallbacks(cameraCaptureCallbacks);
+ return this;
}
/**
@@ -340,11 +470,14 @@
* {@link #getRepeatingCameraCaptureCallbacks()} and
* {@link #getSingleCameraCaptureCallbacks()} methods.
*/
- public void addCameraCaptureCallback(@NonNull CameraCaptureCallback cameraCaptureCallback) {
+ @NonNull
+ public Builder addCameraCaptureCallback(
+ @NonNull CameraCaptureCallback cameraCaptureCallback) {
mCaptureConfigBuilder.addCameraCaptureCallback(cameraCaptureCallback);
if (!mSingleCameraCaptureCallbacks.contains(cameraCaptureCallback)) {
mSingleCameraCaptureCallbacks.add(cameraCaptureCallback);
}
+ return this;
}
/**
@@ -353,7 +486,8 @@
* {@link #getRepeatingCameraCaptureCallbacks()} and
* {@link #getSingleCameraCaptureCallbacks()} methods.
*/
- public void addAllCameraCaptureCallbacks(@NonNull
+ @NonNull
+ public Builder addAllCameraCaptureCallbacks(@NonNull
Collection<CameraCaptureCallback> cameraCaptureCallbacks) {
for (CameraCaptureCallback c : cameraCaptureCallbacks) {
mCaptureConfigBuilder.addCameraCaptureCallback(c);
@@ -361,6 +495,7 @@
mSingleCameraCaptureCallbacks.add(c);
}
}
+ return this;
}
/**
@@ -388,42 +523,82 @@
/**
* Adds all {@link ErrorListener} listeners repeating requests.
*/
- public void addErrorListener(@NonNull ErrorListener errorListener) {
+ @NonNull
+ public Builder addErrorListener(@NonNull ErrorListener errorListener) {
mErrorListeners.add(errorListener);
+ return this;
}
/** Add a surface to the set that the session repeatedly writes data to. */
- public void addSurface(@NonNull DeferrableSurface surface) {
- mSurfaces.add(surface);
+ @NonNull
+ public Builder addSurface(@NonNull DeferrableSurface surface) {
+ OutputConfig outputConfig = OutputConfig.builder(surface).build();
+ mOutputConfigs.add(outputConfig);
mCaptureConfigBuilder.addSurface(surface);
+ return this;
+ }
+
+ /**
+ * Adds an {@link OutputConfig} to create the capture session with. The surface set in
+ * the {@link OutputConfig} will be added to the repeating request.
+ */
+ @NonNull
+ public Builder addOutputConfig(@NonNull OutputConfig outputConfig) {
+ mOutputConfigs.add(outputConfig);
+ mCaptureConfigBuilder.addSurface(outputConfig.getSurface());
+ for (DeferrableSurface sharedSurface : outputConfig.getSharedSurfaces()) {
+ mCaptureConfigBuilder.addSurface(sharedSurface);
+ }
+ return this;
}
/** Add a surface for the session which only used for single captures. */
- public void addNonRepeatingSurface(@NonNull DeferrableSurface surface) {
- mSurfaces.add(surface);
+ @NonNull
+ public Builder addNonRepeatingSurface(@NonNull DeferrableSurface surface) {
+ OutputConfig outputConfig = OutputConfig.builder(surface).build();
+ mOutputConfigs.add(outputConfig);
+ return this;
}
/** Remove a surface from the set which the session repeatedly writes to. */
- public void removeSurface(@NonNull DeferrableSurface surface) {
- mSurfaces.remove(surface);
+ @NonNull
+ public Builder removeSurface(@NonNull DeferrableSurface surface) {
+ OutputConfig outputConfigToRemove = null;
+ for (OutputConfig config : mOutputConfigs) {
+ if (config.getSurface().equals(surface)) {
+ outputConfigToRemove = config;
+ break;
+ }
+ }
+
+ if (outputConfigToRemove != null) {
+ mOutputConfigs.remove(outputConfigToRemove);
+ }
mCaptureConfigBuilder.removeSurface(surface);
+ return this;
}
/** Clears all surfaces from the set which the session writes to. */
- public void clearSurfaces() {
- mSurfaces.clear();
+ @NonNull
+ public Builder clearSurfaces() {
+ mOutputConfigs.clear();
mCaptureConfigBuilder.clearSurfaces();
+ return this;
}
/** Set the {@link Config} for options that are implementation specific. */
- public void setImplementationOptions(@NonNull Config config) {
+ @NonNull
+ public Builder setImplementationOptions(@NonNull Config config) {
mCaptureConfigBuilder.setImplementationOptions(config);
+ return this;
}
/** Add a set of {@link Config} to the implementation specific options. */
- public void addImplementationOptions(@NonNull Config config) {
+ @NonNull
+ public Builder addImplementationOptions(@NonNull Config config) {
mCaptureConfigBuilder.addImplementationOptions(config);
+ return this;
}
/**
@@ -433,7 +608,7 @@
@NonNull
public SessionConfig build() {
return new SessionConfig(
- new ArrayList<>(mSurfaces),
+ new ArrayList<>(mOutputConfigs),
mDeviceStateCallbacks,
mSessionStateCallbacks,
mSingleCameraCaptureCallbacks,
@@ -502,12 +677,12 @@
}
// Check surfaces
- mSurfaces.addAll(sessionConfig.getSurfaces());
+ mOutputConfigs.addAll(sessionConfig.getOutputConfigs());
// Check capture request surfaces
mCaptureConfigBuilder.getSurfaces().addAll(captureConfig.getSurfaces());
- if (!mSurfaces.containsAll(mCaptureConfigBuilder.getSurfaces())) {
+ if (!getSurfaces().containsAll(mCaptureConfigBuilder.getSurfaces())) {
String errorMessage =
"Invalid configuration due to capture request surfaces are not a subset "
+ "of surfaces";
@@ -521,9 +696,20 @@
captureConfig.getImplementationOptions());
}
+ private List<DeferrableSurface> getSurfaces() {
+ List<DeferrableSurface> surfaces = new ArrayList<>();
+ for (OutputConfig outputConfig : mOutputConfigs) {
+ surfaces.add(outputConfig.getSurface());
+ for (DeferrableSurface sharedSurface : outputConfig.getSharedSurfaces()) {
+ surfaces.add(sharedSurface);
+ }
+ }
+ return surfaces;
+ }
+
/** Clears all surfaces from the set which the session writes to. */
public void clearSurfaces() {
- mSurfaces.clear();
+ mOutputConfigs.clear();
mCaptureConfigBuilder.clearSurfaces();
}
@@ -542,11 +728,11 @@
throw new IllegalArgumentException("Unsupported session configuration combination");
}
- List<DeferrableSurface> surfaces = new ArrayList<>(mSurfaces);
- mSurfaceSorter.sort(surfaces);
+ List<OutputConfig> outputConfigs = new ArrayList<>(mOutputConfigs);
+ mSurfaceSorter.sort(outputConfigs);
return new SessionConfig(
- surfaces,
+ outputConfigs,
mDeviceStateCallbacks,
mSessionStateCallbacks,
mSingleCameraCaptureCallbacks,
diff --git a/camera/camera-core/src/main/java/androidx/camera/core/impl/UseCaseConfig.java b/camera/camera-core/src/main/java/androidx/camera/core/impl/UseCaseConfig.java
index db0e00f..4acaae6 100644
--- a/camera/camera-core/src/main/java/androidx/camera/core/impl/UseCaseConfig.java
+++ b/camera/camera-core/src/main/java/androidx/camera/core/impl/UseCaseConfig.java
@@ -76,13 +76,18 @@
*/
Option<CameraSelector> OPTION_CAMERA_SELECTOR =
Config.Option.create("camerax.core.useCase.cameraSelector", CameraSelector.class);
-
/**
* Option: camerax.core.useCase.targetFramerate
*/
Option<Range<Integer>> OPTION_TARGET_FRAME_RATE =
Config.Option.create("camerax.core.useCase.targetFrameRate", CameraSelector.class);
+ /**
+ * Option: camerax.core.useCase.zslDisabled
+ */
+ Option<Boolean> OPTION_ZSL_DISABLED =
+ Option.create("camerax.core.useCase.zslDisabled", boolean.class);
+
// *********************************************************************************************
@@ -281,6 +286,17 @@
}
/**
+ * Retrieves the flag whether zero-shutter lag is disabled.
+ *
+ * @param valueIfMissing The value to return if this configuration option has not been set.
+ * @return The stored value or <code>valueIfMissing</code> if the value does not exist in
+ * this configuration
+ */
+ default boolean isZslDisabled(boolean valueIfMissing) {
+ return retrieveOption(OPTION_ZSL_DISABLED, valueIfMissing);
+ }
+
+ /**
* Builder for a {@link UseCase}.
*
* @param <T> The type of the object which will be built by {@link #build()}.
@@ -358,6 +374,24 @@
B setCameraSelector(@NonNull CameraSelector cameraSelector);
/**
+ * Sets zsl disabled or not.
+ *
+ * <p> Zsl will be disabled when any of the following conditions:
+ * <ul>
+ * <li> Extension is ON
+ * <li> Flash mode is ON or AUTO
+ * <li> VideoCapture is ON
+ * </ul>
+ *
+ * @param disabled True if zero-shutter lag should be disabled. Otherwise, should not be
+ * disabled. However, enabling zero-shutter lag needs other conditions e.g.
+ * flash mode OFF, so setting to false doesn't guarantee zero-shutter lag to
+ * be always ON.
+ */
+ @NonNull
+ B setZslDisabled(boolean disabled);
+
+ /**
* Retrieves the configuration used by this builder.
*
* @return the configuration used by this builder.
diff --git a/camera/camera-core/src/main/java/androidx/camera/core/internal/CameraUseCaseAdapter.java b/camera/camera-core/src/main/java/androidx/camera/core/internal/CameraUseCaseAdapter.java
index 618660d..e9b23c8 100644
--- a/camera/camera-core/src/main/java/androidx/camera/core/internal/CameraUseCaseAdapter.java
+++ b/camera/camera-core/src/main/java/androidx/camera/core/internal/CameraUseCaseAdapter.java
@@ -171,7 +171,6 @@
public void addUseCases(@NonNull Collection<UseCase> useCases) throws CameraException {
synchronized (mLock) {
List<UseCase> newUseCases = new ArrayList<>();
-
for (UseCase useCase : useCases) {
if (mUseCases.contains(useCase)) {
Logger.d(TAG, "Attempting to attach already attached UseCase");
@@ -231,6 +230,20 @@
// Detaches the unnecessary existing extra use cases
detachUnnecessaryUseCases(removedExtraUseCases);
+ // TODO(b/231905455): move to attachUseCase and reset in detachUseCase to handle use
+ // case bind/rebind.
+ boolean isZslDisabledByCameraConfig = false;
+ boolean isZslDisabledByExtendedConfig = false;
+ for (UseCase useCase : newUseCases) {
+ ConfigPair configPair = configs.get(useCase);
+ isZslDisabledByCameraConfig = configPair.mCameraConfig != null
+ && configPair.mCameraConfig.isZslDisabled(false);
+ isZslDisabledByExtendedConfig = configPair.mExtendedConfig != null
+ && configPair.mExtendedConfig.isZslDisabled(false);
+ }
+ mCameraInternal.getCameraControlInternal().setZslDisabledByUserCaseConfig(
+ isZslDisabledByCameraConfig || isZslDisabledByExtendedConfig);
+
// At this point the binding will succeed since all the calculations are done
// Do all attaching related work
for (UseCase useCase : newUseCases) {
@@ -321,7 +334,6 @@
}
}
-
/**
* When in active resuming mode, it will actively retry opening the camera periodically to
* resume regardless of the camera availability if the camera is interrupted in
diff --git a/camera/camera-core/src/main/java/androidx/camera/core/internal/compat/workaround/SurfaceSorter.java b/camera/camera-core/src/main/java/androidx/camera/core/internal/compat/workaround/SurfaceSorter.java
index 2fac961..16d85be 100644
--- a/camera/camera-core/src/main/java/androidx/camera/core/internal/compat/workaround/SurfaceSorter.java
+++ b/camera/camera-core/src/main/java/androidx/camera/core/internal/compat/workaround/SurfaceSorter.java
@@ -23,6 +23,7 @@
import androidx.camera.core.Preview;
import androidx.camera.core.VideoCapture;
import androidx.camera.core.impl.DeferrableSurface;
+import androidx.camera.core.impl.SessionConfig;
import androidx.camera.core.internal.compat.quirk.DeviceQuirks;
import androidx.camera.core.internal.compat.quirk.SurfaceOrderQuirk;
@@ -47,15 +48,15 @@
/**
* Sorts the list to prevent from the device specific issue.
*
- * @param surfaces the input surface list to sort, must be a mutable list.
+ * @param outputConfigs the input OutputConfig list to sort, must be a mutable list.
*/
- public void sort(@NonNull List<DeferrableSurface> surfaces) {
+ public void sort(@NonNull List<SessionConfig.OutputConfig> outputConfigs) {
if (!mHasQuirk) {
return;
}
- Collections.sort(surfaces, (surface1, surface2) -> {
- int p1 = getSurfacePriority(surface1);
- int p2 = getSurfacePriority(surface2);
+ Collections.sort(outputConfigs, (outputConfig1, outputConfig2) -> {
+ int p1 = getSurfacePriority(outputConfig1.getSurface());
+ int p2 = getSurfacePriority(outputConfig2.getSurface());
return p1 - p2;
});
}
diff --git a/camera/camera-core/src/test/java/androidx/camera/core/ImageCaptureTest.kt b/camera/camera-core/src/test/java/androidx/camera/core/ImageCaptureTest.kt
index d044b6b..55c39da 100644
--- a/camera/camera-core/src/test/java/androidx/camera/core/ImageCaptureTest.kt
+++ b/camera/camera-core/src/test/java/androidx/camera/core/ImageCaptureTest.kt
@@ -82,8 +82,7 @@
@RunWith(RobolectricTestRunner::class)
@DoNotInstrument
@Config(minSdk = Build.VERSION_CODES.LOLLIPOP)
-public class ImageCaptureTest {
-
+class ImageCaptureTest {
private lateinit var callbackHandler: Handler
private lateinit var callbackThread: HandlerThread
private lateinit var executor: Executor
@@ -102,7 +101,7 @@
@Before
@Throws(ExecutionException::class, InterruptedException::class)
- public fun setUp() {
+ fun setUp() {
val cameraInfo = FakeCameraInfoInternal().apply {
isYuvReprocessingSupported = true
isPrivateReprocessingSupported = true
@@ -134,14 +133,14 @@
@After
@Throws(ExecutionException::class, InterruptedException::class)
- public fun tearDown() {
+ fun tearDown() {
CameraXUtil.shutdown().get()
fakeImageReaderProxy = null
callbackThread.quitSafely()
}
@Test
- public fun metadataNotSet_createsNewMetadataInstance() {
+ fun metadataNotSet_createsNewMetadataInstance() {
val options = ImageCapture.OutputFileOptions.Builder(File("fake_path")).build()
options.metadata.isReversedHorizontal = true
@@ -151,7 +150,7 @@
}
@Test
- public fun reverseHorizontalIsSet_flagReturnsTrue() {
+ fun reverseHorizontalIsSet_flagReturnsTrue() {
val metadata = ImageCapture.Metadata()
assertThat(metadata.isReversedHorizontalSet).isFalse()
@@ -160,7 +159,7 @@
}
@Test
- public fun takePictureToImageWithoutBinding_receiveOnError() {
+ fun takePictureToImageWithoutBinding_receiveOnError() {
// Arrange.
val imageCapture = createImageCapture()
val onImageCapturedCallback = mock(ImageCapture.OnImageCapturedCallback::class.java)
@@ -175,7 +174,7 @@
}
@Test
- public fun takePictureToFileWithoutBinding_receiveOnError() {
+ fun takePictureToFileWithoutBinding_receiveOnError() {
// Arrange.
val imageCapture = createImageCapture()
val options = ImageCapture.OutputFileOptions.Builder(File("fake_path")).build()
@@ -191,7 +190,7 @@
}
@Test
- public fun captureImageWithViewPort_isSet() {
+ fun captureImageWithViewPort_isSet() {
// Arrange
val imageCapture = bindImageCapture(
ImageCapture.CAPTURE_MODE_MINIMIZE_LATENCY,
@@ -218,7 +217,7 @@
}
@Test
- public fun capturedImageValidAfterRemoved() {
+ fun capturedImageValidAfterRemoved() {
// Arrange
val imageCapture = bindImageCapture(
ImageCapture.CAPTURE_MODE_MINIMIZE_LATENCY,
@@ -241,7 +240,7 @@
}
@Test
- public fun capturedImageSize_isEqualToSurfaceSize() {
+ fun capturedImageSize_isEqualToSurfaceSize() {
// Act/arrange.
val imageCapture = bindImageCapture(ImageCapture.CAPTURE_MODE_MINIMIZE_LATENCY)
@@ -258,7 +257,7 @@
}
@Test
- public fun imageCaptureRequestProcessor_canSendRequest() {
+ fun imageCaptureRequestProcessor_canSendRequest() {
// Arrange.
val requestProcessor = ImageCaptureRequestProcessor(MAX_IMAGES, createSuccessImageCaptor())
val request = createImageCaptureRequest()
@@ -271,7 +270,7 @@
}
@Test
- public fun imageCaptureRequestProcessor_canSendMultipleRequests() {
+ fun imageCaptureRequestProcessor_canSendMultipleRequests() {
// Arrange.
val requestProcessor = ImageCaptureRequestProcessor(MAX_IMAGES, createSuccessImageCaptor())
for (i in 0 until MAX_IMAGES) {
@@ -286,7 +285,7 @@
}
@Test
- public fun imageCaptureRequestProcessor_onlyAllowOneRequestProcessing() {
+ fun imageCaptureRequestProcessor_onlyAllowOneRequestProcessing() {
// Arrange.
// Create an ImageCaptor that won't complete the future.
val captorFutureRef = AtomicReference<ResolvableFuture<ImageProxy>?>()
@@ -324,7 +323,7 @@
}
@Test
- public fun imageCaptureRequestProcessor_unableToProcessNextWhenOverMaxImages() {
+ fun imageCaptureRequestProcessor_unableToProcessNextWhenOverMaxImages() {
// Arrange.
val requestProcessor = ImageCaptureRequestProcessor(MAX_IMAGES, createSuccessImageCaptor())
@@ -359,7 +358,7 @@
}
@Test
- public fun imageCaptureRequestProcessor_canCancelRequests() {
+ fun imageCaptureRequestProcessor_canCancelRequests() {
// Arrange.
// Create an ImageCaptor that won't complete the future.
val captorFutureRef = AtomicReference<ResolvableFuture<ImageProxy>?>()
@@ -388,7 +387,7 @@
}
@Test
- public fun imageCaptureRequestProcessor_requestFail() {
+ fun imageCaptureRequestProcessor_requestFail() {
// Arrange.
val errorMsg = "Capture failed."
val throwable = RuntimeException(errorMsg)
@@ -403,9 +402,26 @@
verify(request).notifyCallbackError(anyInt(), eq(errorMsg), eq(throwable))
}
+ @Test
+ fun sessionConfigSurfaceFormat_isInputFormat() {
+ // Act/arrange.
+ val imageCapture = bindImageCapture(bufferFormat = ImageFormat.YUV_420_888,
+ imageReaderProxyProvider = { width, height, _, queueDepth, usage ->
+ // Create a JPEG ImageReader that is of different format from buffer/input format.
+ fakeImageReaderProxy = FakeImageReaderProxy.newInstance(
+ width, height, ImageFormat.JPEG, queueDepth, usage
+ )
+ fakeImageReaderProxy!!
+ })
+
+ // Verify.
+ assertThat(imageCapture.sessionConfig.surfaces[0].prescribedStreamFormat)
+ .isEqualTo(ImageFormat.YUV_420_888)
+ }
+
@Config(maxSdk = 22)
@Test
- public fun bindImageCaptureWithZslUnsupportedSdkVersion_notAddZslConfig() {
+ fun bindImageCaptureWithZslUnsupportedSdkVersion_notAddZslConfig() {
bindImageCapture(
ImageCapture.CAPTURE_MODE_ZERO_SHUTTER_LAG,
ViewPort.Builder(Rational(1, 1), Surface.ROTATION_0).build()
@@ -418,7 +434,7 @@
@Config(minSdk = 23)
@Test
- public fun bindImageCaptureInRegularCaptureModeWithZslSupportedSdkVersion_notAddZslConfig() {
+ fun bindImageCaptureInRegularCaptureModeWithZslSupportedSdkVersion_notAddZslConfig() {
bindImageCapture(
ImageCapture.CAPTURE_MODE_MINIMIZE_LATENCY,
ViewPort.Builder(Rational(1, 1), Surface.ROTATION_0).build()
@@ -431,7 +447,7 @@
@Config(minSdk = 23)
@Test
- public fun bindImageCaptureInZslCaptureModeWithZslSupportedSdkVersion_addZslConfig() {
+ fun bindImageCaptureInZslCaptureModeWithZslSupportedSdkVersion_addZslConfig() {
bindImageCapture(
ImageCapture.CAPTURE_MODE_ZERO_SHUTTER_LAG,
ViewPort.Builder(Rational(1, 1), Surface.ROTATION_0).build()
@@ -442,13 +458,15 @@
assertThat(cameraControl.isZslConfigAdded).isTrue()
}
- private fun bindImageCapture(captureMode: Int): ImageCapture {
- return bindImageCapture(captureMode, null)
- }
-
- private fun bindImageCapture(captureMode: Int, viewPort: ViewPort?): ImageCapture {
+ private fun bindImageCapture(
+ captureMode: Int = ImageCapture.CAPTURE_MODE_MINIMIZE_LATENCY,
+ viewPort: ViewPort? = null,
+ // Set non jpg format so it doesn't trigger the exif code path.
+ bufferFormat: Int = ImageFormat.YUV_420_888,
+ imageReaderProxyProvider: ImageReaderProxyProvider? = null
+ ): ImageCapture {
// Arrange.
- val imageCapture = createImageCapture(captureMode)
+ val imageCapture = createImageCapture(captureMode, bufferFormat, imageReaderProxyProvider)
cameraUseCaseAdapter = CameraUtil.createCameraUseCaseAdapter(
ApplicationProvider
@@ -461,17 +479,20 @@
return imageCapture
}
- private fun createImageCapture(captureMode: Int = ImageCapture.CAPTURE_MODE_MINIMIZE_LATENCY) =
- ImageCapture.Builder()
- // Set non jpg format so it doesn't trigger the exif code path.
- .setBufferFormat(ImageFormat.YUV_420_888)
- .setTargetRotation(Surface.ROTATION_0)
- .setCaptureMode(captureMode)
- .setFlashMode(ImageCapture.FLASH_MODE_OFF)
- .setCaptureOptionUnpacker { _: UseCaseConfig<*>?, _: CaptureConfig.Builder? -> }
- .setImageReaderProxyProvider(getImageReaderProxyProvider())
- .setSessionOptionUnpacker { _: UseCaseConfig<*>?, _: SessionConfig.Builder? -> }
- .build()
+ private fun createImageCapture(
+ captureMode: Int = ImageCapture.CAPTURE_MODE_MINIMIZE_LATENCY,
+ // Set non jpg format by default so it doesn't trigger the exif code path.
+ bufferFormat: Int = ImageFormat.YUV_420_888,
+ imageReaderProxyProvider: ImageReaderProxyProvider? = null
+ ) = ImageCapture.Builder()
+ .setBufferFormat(bufferFormat)
+ .setTargetRotation(Surface.ROTATION_0)
+ .setCaptureMode(captureMode)
+ .setFlashMode(ImageCapture.FLASH_MODE_OFF)
+ .setCaptureOptionUnpacker { _: UseCaseConfig<*>?, _: CaptureConfig.Builder? -> }
+ .setImageReaderProxyProvider(imageReaderProxyProvider ?: getImageReaderProxyProvider())
+ .setSessionOptionUnpacker { _: UseCaseConfig<*>?, _: SessionConfig.Builder? -> }
+ .build()
private fun getImageReaderProxyProvider(): ImageReaderProxyProvider {
return ImageReaderProxyProvider { width, height, imageFormat, queueDepth, usage ->
diff --git a/camera/camera-core/src/test/java/androidx/camera/core/impl/UseCaseConfigTest.kt b/camera/camera-core/src/test/java/androidx/camera/core/impl/UseCaseConfigTest.kt
index 0f6df49..e16a21e 100644
--- a/camera/camera-core/src/test/java/androidx/camera/core/impl/UseCaseConfigTest.kt
+++ b/camera/camera-core/src/test/java/androidx/camera/core/impl/UseCaseConfigTest.kt
@@ -38,4 +38,11 @@
useCaseBuilder.mutableConfig.insertOption(UseCaseConfig.OPTION_TARGET_FRAME_RATE, range)
Truth.assertThat(useCaseBuilder.useCaseConfig.targetFramerate).isEqualTo(range)
}
+
+ @Test
+ fun canGetIsZslDisabled() {
+ val useCaseBuilder = FakeUseCaseConfig.Builder()
+ useCaseBuilder.mutableConfig.insertOption(UseCaseConfig.OPTION_ZSL_DISABLED, true)
+ Truth.assertThat(useCaseBuilder.useCaseConfig.isZslDisabled(false)).isTrue()
+ }
}
\ No newline at end of file
diff --git a/camera/camera-core/src/test/java/androidx/camera/core/internal/compat/workaround/SurfaceSorterTest.kt b/camera/camera-core/src/test/java/androidx/camera/core/internal/compat/workaround/SurfaceSorterTest.kt
index f4e7f05..54abd75 100644
--- a/camera/camera-core/src/test/java/androidx/camera/core/internal/compat/workaround/SurfaceSorterTest.kt
+++ b/camera/camera-core/src/test/java/androidx/camera/core/internal/compat/workaround/SurfaceSorterTest.kt
@@ -24,6 +24,7 @@
import androidx.camera.core.VideoCapture
import androidx.camera.core.impl.DeferrableSurface
import androidx.camera.core.impl.ImmediateSurface
+import androidx.camera.core.impl.SessionConfig
import com.google.common.truth.Truth.assertThat
import org.junit.After
import org.junit.Test
@@ -48,81 +49,87 @@
@Test
fun sort_previewSurfaceIsInTheFirstAndMediaCodecSurfaceIsInTheLast() {
// Arrange.
- val videoSurface = createSurface(containerClass = MediaCodec::class.java)
- val previewSurface = createSurface(containerClass = Preview::class.java)
- val imageSurface = createSurface(containerClass = ImageCapture::class.java)
+ val videoOutput = SessionConfig.OutputConfig.builder(
+ createSurface(containerClass = MediaCodec::class.java)).build()
+ val previewOutput = SessionConfig.OutputConfig.builder(
+ createSurface(containerClass = Preview::class.java)).build()
+ val imageOutput = SessionConfig.OutputConfig.builder(
+ createSurface(containerClass = ImageCapture::class.java)).build()
val surfaceSorter = SurfaceSorter()
// All combinations
- val surfaces1 = mutableListOf(previewSurface, videoSurface, imageSurface)
- val surfaces2 = mutableListOf(previewSurface, imageSurface, videoSurface)
- val surfaces3 = mutableListOf(videoSurface, previewSurface, imageSurface)
- val surfaces4 = mutableListOf(videoSurface, imageSurface, previewSurface)
- val surfaces5 = mutableListOf(imageSurface, videoSurface, previewSurface)
- val surfaces6 = mutableListOf(imageSurface, previewSurface, videoSurface)
+ val outputConfigs1 = mutableListOf(previewOutput, videoOutput, imageOutput)
+ val outputConfigs2 = mutableListOf(previewOutput, imageOutput, videoOutput)
+ val outputConfigs3 = mutableListOf(videoOutput, previewOutput, imageOutput)
+ val outputConfigs4 = mutableListOf(videoOutput, imageOutput, previewOutput)
+ val outputConfigs5 = mutableListOf(imageOutput, videoOutput, previewOutput)
+ val outputConfigs6 = mutableListOf(imageOutput, previewOutput, videoOutput)
// Act.
- surfaceSorter.sort(surfaces1)
- surfaceSorter.sort(surfaces2)
- surfaceSorter.sort(surfaces3)
- surfaceSorter.sort(surfaces4)
- surfaceSorter.sort(surfaces5)
- surfaceSorter.sort(surfaces6)
+ surfaceSorter.sort(outputConfigs1)
+ surfaceSorter.sort(outputConfigs2)
+ surfaceSorter.sort(outputConfigs3)
+ surfaceSorter.sort(outputConfigs4)
+ surfaceSorter.sort(outputConfigs5)
+ surfaceSorter.sort(outputConfigs6)
// Assert.
- assertThat(surfaces1.first()).isEqualTo(previewSurface)
- assertThat(surfaces2.first()).isEqualTo(previewSurface)
- assertThat(surfaces3.first()).isEqualTo(previewSurface)
- assertThat(surfaces4.first()).isEqualTo(previewSurface)
- assertThat(surfaces5.first()).isEqualTo(previewSurface)
- assertThat(surfaces6.first()).isEqualTo(previewSurface)
+ assertThat(outputConfigs1.first()).isEqualTo(previewOutput)
+ assertThat(outputConfigs2.first()).isEqualTo(previewOutput)
+ assertThat(outputConfigs3.first()).isEqualTo(previewOutput)
+ assertThat(outputConfigs4.first()).isEqualTo(previewOutput)
+ assertThat(outputConfigs5.first()).isEqualTo(previewOutput)
+ assertThat(outputConfigs6.first()).isEqualTo(previewOutput)
- assertThat(surfaces1.last()).isEqualTo(videoSurface)
- assertThat(surfaces2.last()).isEqualTo(videoSurface)
- assertThat(surfaces3.last()).isEqualTo(videoSurface)
- assertThat(surfaces4.last()).isEqualTo(videoSurface)
- assertThat(surfaces5.last()).isEqualTo(videoSurface)
- assertThat(surfaces6.last()).isEqualTo(videoSurface)
+ assertThat(outputConfigs1.last()).isEqualTo(videoOutput)
+ assertThat(outputConfigs2.last()).isEqualTo(videoOutput)
+ assertThat(outputConfigs3.last()).isEqualTo(videoOutput)
+ assertThat(outputConfigs4.last()).isEqualTo(videoOutput)
+ assertThat(outputConfigs5.last()).isEqualTo(videoOutput)
+ assertThat(outputConfigs6.last()).isEqualTo(videoOutput)
}
@Test
fun sort_previewSurfaceIsInTheFirstAndVideoCaptureSurfaceIsInTheLast() {
// Arrange.
- val videoSurface = createSurface(containerClass = VideoCapture::class.java)
- val previewSurface = createSurface(containerClass = Preview::class.java)
- val imageSurface = createSurface(containerClass = ImageCapture::class.java)
+ val videoOutput = SessionConfig.OutputConfig.builder(
+ createSurface(containerClass = VideoCapture::class.java)).build()
+ val previewOutput = SessionConfig.OutputConfig.builder(
+ createSurface(containerClass = Preview::class.java)).build()
+ val imageOutput = SessionConfig.OutputConfig.builder(
+ createSurface(containerClass = ImageCapture::class.java)).build()
val surfaceSorter = SurfaceSorter()
// All combinations
- val surfaces1 = mutableListOf(previewSurface, videoSurface, imageSurface)
- val surfaces2 = mutableListOf(previewSurface, imageSurface, videoSurface)
- val surfaces3 = mutableListOf(videoSurface, previewSurface, imageSurface)
- val surfaces4 = mutableListOf(videoSurface, imageSurface, previewSurface)
- val surfaces5 = mutableListOf(imageSurface, videoSurface, previewSurface)
- val surfaces6 = mutableListOf(imageSurface, previewSurface, videoSurface)
+ val outputConfigs1 = mutableListOf(previewOutput, videoOutput, imageOutput)
+ val outputConfigs2 = mutableListOf(previewOutput, imageOutput, videoOutput)
+ val outputConfigs3 = mutableListOf(videoOutput, previewOutput, imageOutput)
+ val outputConfigs4 = mutableListOf(videoOutput, imageOutput, previewOutput)
+ val outputConfigs5 = mutableListOf(imageOutput, videoOutput, previewOutput)
+ val outputConfigs6 = mutableListOf(imageOutput, previewOutput, videoOutput)
// Act.
- surfaceSorter.sort(surfaces1)
- surfaceSorter.sort(surfaces2)
- surfaceSorter.sort(surfaces3)
- surfaceSorter.sort(surfaces4)
- surfaceSorter.sort(surfaces5)
- surfaceSorter.sort(surfaces6)
+ surfaceSorter.sort(outputConfigs1)
+ surfaceSorter.sort(outputConfigs2)
+ surfaceSorter.sort(outputConfigs3)
+ surfaceSorter.sort(outputConfigs4)
+ surfaceSorter.sort(outputConfigs5)
+ surfaceSorter.sort(outputConfigs6)
// Assert.
- assertThat(surfaces1.first()).isEqualTo(previewSurface)
- assertThat(surfaces2.first()).isEqualTo(previewSurface)
- assertThat(surfaces3.first()).isEqualTo(previewSurface)
- assertThat(surfaces4.first()).isEqualTo(previewSurface)
- assertThat(surfaces5.first()).isEqualTo(previewSurface)
- assertThat(surfaces6.first()).isEqualTo(previewSurface)
+ assertThat(outputConfigs1.first()).isEqualTo(previewOutput)
+ assertThat(outputConfigs2.first()).isEqualTo(previewOutput)
+ assertThat(outputConfigs3.first()).isEqualTo(previewOutput)
+ assertThat(outputConfigs4.first()).isEqualTo(previewOutput)
+ assertThat(outputConfigs5.first()).isEqualTo(previewOutput)
+ assertThat(outputConfigs6.first()).isEqualTo(previewOutput)
- assertThat(surfaces1.last()).isEqualTo(videoSurface)
- assertThat(surfaces2.last()).isEqualTo(videoSurface)
- assertThat(surfaces3.last()).isEqualTo(videoSurface)
- assertThat(surfaces4.last()).isEqualTo(videoSurface)
- assertThat(surfaces5.last()).isEqualTo(videoSurface)
- assertThat(surfaces6.last()).isEqualTo(videoSurface)
+ assertThat(outputConfigs1.last()).isEqualTo(videoOutput)
+ assertThat(outputConfigs2.last()).isEqualTo(videoOutput)
+ assertThat(outputConfigs3.last()).isEqualTo(videoOutput)
+ assertThat(outputConfigs4.last()).isEqualTo(videoOutput)
+ assertThat(outputConfigs5.last()).isEqualTo(videoOutput)
+ assertThat(outputConfigs6.last()).isEqualTo(videoOutput)
}
private fun createSurface(
diff --git a/camera/camera-extensions-stub/src/main/java/androidx/camera/extensions/impl/advanced/Camera2OutputConfigImplBuilder.java b/camera/camera-extensions-stub/src/main/java/androidx/camera/extensions/impl/advanced/Camera2OutputConfigImplBuilder.java
index 5c2a4aa..a66d3ce 100644
--- a/camera/camera-extensions-stub/src/main/java/androidx/camera/extensions/impl/advanced/Camera2OutputConfigImplBuilder.java
+++ b/camera/camera-extensions-stub/src/main/java/androidx/camera/extensions/impl/advanced/Camera2OutputConfigImplBuilder.java
@@ -17,6 +17,7 @@
package androidx.camera.extensions.impl.advanced;
import android.annotation.SuppressLint;
+import android.hardware.camera2.params.OutputConfiguration;
import android.util.Size;
import android.view.Surface;
@@ -31,7 +32,7 @@
public class Camera2OutputConfigImplBuilder {
static AtomicInteger sLastId = new AtomicInteger(0);
private OutputConfigImplImpl mOutputConfig;
- private int mSurfaceGroupId;
+ private int mSurfaceGroupId = OutputConfiguration.SURFACE_GROUP_ID_NONE;
private String mPhysicalCameraId;
private List<Camera2OutputConfigImpl> mSurfaceSharingConfigs;
diff --git a/camera/camera-extensions/src/androidTest/java/androidx/camera/extensions/internal/AdvancedSessionProcessorTest.kt b/camera/camera-extensions/src/androidTest/java/androidx/camera/extensions/internal/AdvancedSessionProcessorTest.kt
new file mode 100644
index 0000000..e06d3c3
--- /dev/null
+++ b/camera/camera-extensions/src/androidTest/java/androidx/camera/extensions/internal/AdvancedSessionProcessorTest.kt
@@ -0,0 +1,681 @@
+/*
+ * Copyright 2022 The Android Open Source Project
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+/*
+ * Copyright 2022 The Android Open Source Project
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package androidx.camera.extensions.internal
+
+import android.content.Context
+import android.graphics.ImageFormat
+import android.graphics.SurfaceTexture
+import android.hardware.camera2.CameraCharacteristics
+import android.hardware.camera2.CameraDevice
+import android.hardware.camera2.CaptureFailure
+import android.hardware.camera2.CaptureRequest
+import android.hardware.camera2.CaptureResult
+import android.hardware.camera2.TotalCaptureResult
+import android.media.ImageReader
+import android.media.ImageWriter
+import android.os.Build
+import android.util.Size
+import android.view.Surface
+import androidx.annotation.RequiresApi
+import androidx.camera.camera2.Camera2Config
+import androidx.camera.camera2.internal.compat.params.OutputConfigurationCompat
+import androidx.camera.camera2.interop.Camera2CameraInfo
+import androidx.camera.core.CameraFilter
+import androidx.camera.core.CameraInfo
+import androidx.camera.core.CameraSelector
+import androidx.camera.core.ImageAnalysis
+import androidx.camera.core.ImageCapture
+import androidx.camera.core.ImageCapture.OnImageCapturedCallback
+import androidx.camera.core.ImageProxy
+import androidx.camera.core.Preview
+import androidx.camera.core.UseCaseGroup
+import androidx.camera.core.impl.CameraConfig
+import androidx.camera.core.impl.Config
+import androidx.camera.core.impl.ExtendedCameraConfigProviderStore
+import androidx.camera.core.impl.Identifier
+import androidx.camera.core.impl.MutableOptionsBundle
+import androidx.camera.core.impl.SessionProcessor
+import androidx.camera.core.impl.utils.executor.CameraXExecutors
+import androidx.camera.extensions.impl.advanced.Camera2OutputConfigImpl
+import androidx.camera.extensions.impl.advanced.Camera2OutputConfigImplBuilder
+import androidx.camera.extensions.impl.advanced.Camera2SessionConfigImpl
+import androidx.camera.extensions.impl.advanced.Camera2SessionConfigImplBuilder
+import androidx.camera.extensions.impl.advanced.OutputSurfaceImpl
+import androidx.camera.extensions.impl.advanced.RequestProcessorImpl
+import androidx.camera.extensions.impl.advanced.SessionProcessorImpl
+import androidx.camera.extensions.internal.sessionprocessor.AdvancedSessionProcessor
+import androidx.camera.lifecycle.ProcessCameraProvider
+import androidx.camera.testing.CameraUtil
+import androidx.camera.testing.SurfaceTextureProvider
+import androidx.camera.testing.SurfaceTextureProvider.SurfaceTextureCallback
+import androidx.camera.testing.fakes.FakeLifecycleOwner
+import androidx.test.core.app.ApplicationProvider
+import androidx.test.ext.junit.runners.AndroidJUnit4
+import androidx.test.filters.LargeTest
+import androidx.test.filters.SdkSuppress
+import com.google.common.truth.Truth.assertThat
+import java.util.concurrent.CountDownLatch
+import java.util.concurrent.TimeUnit
+import kotlinx.coroutines.CompletableDeferred
+import kotlinx.coroutines.Deferred
+import kotlinx.coroutines.Dispatchers
+import kotlinx.coroutines.runBlocking
+import kotlinx.coroutines.withContext
+import kotlinx.coroutines.withTimeout
+import org.junit.After
+import org.junit.Assume.assumeTrue
+import org.junit.Before
+import org.junit.Rule
+import org.junit.Test
+import org.junit.runner.RunWith
+
+@LargeTest
+@SdkSuppress(minSdkVersion = 26)
+@RunWith(AndroidJUnit4::class)
+class AdvancedSessionProcessorTest {
+ @get:Rule
+ val useCamera = CameraUtil.grantCameraPermissionAndPreTest(
+ CameraUtil.PreTestCameraIdList(Camera2Config.defaultConfig())
+ )
+ private val context = ApplicationProvider.getApplicationContext<Context>()
+ private lateinit var cameraProvider: ProcessCameraProvider
+ private lateinit var fakeLifecycleOwner: FakeLifecycleOwner
+ private val cameraSelector = CameraSelector.DEFAULT_BACK_CAMERA
+
+ @Before
+ fun setUp() = runBlocking {
+ cameraProvider = ProcessCameraProvider.getInstance(context)[10, TimeUnit.SECONDS]
+ withContext(Dispatchers.Main) {
+ fakeLifecycleOwner = FakeLifecycleOwner()
+ fakeLifecycleOwner.startAndResume()
+ }
+ }
+
+ @After
+ fun tearDown() = runBlocking {
+ if (::cameraProvider.isInitialized) {
+ withContext(Dispatchers.Main) {
+ cameraProvider.unbindAll()
+ cameraProvider.shutdown()[10, TimeUnit.SECONDS]
+ }
+ }
+ }
+
+ private fun getCameraSelectorWithSessionProcessor(
+ cameraSelector: CameraSelector,
+ sessionProcessor: SessionProcessor
+ ): CameraSelector {
+ val identifier = Identifier.create("idStr")
+ ExtendedCameraConfigProviderStore.addConfig(identifier) { _, _ ->
+ object : CameraConfig {
+ override fun getConfig(): Config {
+ return MutableOptionsBundle.create()
+ }
+
+ override fun getCompatibilityId(): Identifier {
+ return Identifier.create(0)
+ }
+
+ override fun getSessionProcessor(
+ valueIfMissing: SessionProcessor?
+ ): SessionProcessor? {
+ return sessionProcessor
+ }
+
+ override fun getSessionProcessor(): SessionProcessor {
+ return sessionProcessor
+ }
+ }
+ }
+ val builder = CameraSelector.Builder.fromSelector(cameraSelector)
+ builder.addCameraFilter(object : CameraFilter {
+ override fun filter(cameraInfos: MutableList<CameraInfo>): MutableList<CameraInfo> {
+ val newCameraInfos = mutableListOf<CameraInfo>()
+ newCameraInfos.addAll(cameraInfos)
+ return newCameraInfos
+ }
+
+ override fun getIdentifier(): Identifier {
+ return identifier
+ }
+ })
+ return builder.build()
+ }
+
+ @Test
+ fun useCasesCanWork_directlyUseOutputSurface() = runBlocking {
+ val fakeSessionProcessImpl = FakeSessionProcessImpl(
+ // Directly use output surface
+ previewConfigBlock = { outputSurfaceImpl ->
+ Camera2OutputConfigImplBuilder
+ .newSurfaceConfig(outputSurfaceImpl.surface)
+ .build()
+ },
+ // Directly use output surface
+ captureConfigBlock = { outputSurfaceImpl ->
+ Camera2OutputConfigImplBuilder
+ .newSurfaceConfig(outputSurfaceImpl.surface)
+ .build()
+ },
+ // Directly use output surface
+ analysisConfigBlock = { outputSurfaceImpl ->
+ Camera2OutputConfigImplBuilder
+ .newSurfaceConfig(outputSurfaceImpl.surface)
+ .build()
+ }
+ )
+
+ val preview = Preview.Builder().build()
+ val imageCapture = ImageCapture.Builder().build()
+ val imageAnalysis = ImageAnalysis.Builder().build()
+ verifyUseCasesOutput(fakeSessionProcessImpl, preview, imageCapture, imageAnalysis)
+ }
+
+ @SdkSuppress(minSdkVersion = 29) // YUV to JPEG requires api level >= 29
+ @Test
+ fun useCasesCanWork_captureOutputFormatIsYUV() = runBlocking {
+ var captureOutputSurface: Surface? = null
+ var intermediaConfigId = -1
+ var captureOutputSurfaceFormat = 0
+ val fakeSessionProcessImpl = FakeSessionProcessImpl(
+ // Directly use output surface
+ previewConfigBlock = { outputSurfaceImpl ->
+ Camera2OutputConfigImplBuilder
+ .newSurfaceConfig(outputSurfaceImpl.surface)
+ .build()
+ },
+ // Has intermediate image reader to process YUV.
+ captureConfigBlock = { outputSurfaceImpl ->
+ captureOutputSurfaceFormat = outputSurfaceImpl.imageFormat
+ captureOutputSurface = outputSurfaceImpl.surface
+ Camera2OutputConfigImplBuilder
+ .newImageReaderConfig(outputSurfaceImpl.size, ImageFormat.YUV_420_888, 2)
+ .build()
+ .also {
+ intermediaConfigId = it.id
+ }
+ },
+ onCaptureSessionStarted = {
+ // Emulates the processing, write an image to the output surface.
+ val imageWriter = ImageWriter.newInstance(captureOutputSurface!!, 2)
+ it.setImageProcessor(intermediaConfigId) { _, _, image, _ ->
+ val inputImage = imageWriter.dequeueInputImage()
+ imageWriter.queueInputImage(inputImage)
+ image.decrement()
+ }
+ }
+ )
+
+ val preview = Preview.Builder().build()
+ val imageCapture = ImageCapture.Builder()
+ .setSupportedResolutions(
+ listOf(
+ android.util.Pair(ImageFormat.YUV_420_888, arrayOf(Size(640, 480)))
+ )
+ )
+ .build()
+ verifyUseCasesOutput(fakeSessionProcessImpl, preview, imageCapture)
+ assertThat(captureOutputSurfaceFormat).isEqualTo(ImageFormat.YUV_420_888)
+ }
+
+ private fun assumeAllowsSharedSurface() {
+ val imageReader = ImageReader.newInstance(640, 480, ImageFormat.YUV_420_888, 2)
+ val maxSharedSurfaceCount =
+ OutputConfigurationCompat(imageReader.surface).maxSharedSurfaceCount
+ imageReader.close()
+ assumeTrue(maxSharedSurfaceCount > 1)
+ }
+
+ // Surface sharing of YUV format is supported after API 28.
+ @SdkSuppress(minSdkVersion = 28)
+ @Test
+ fun useCasesCanWork_hasSharedSurfaceOutput() = runBlocking {
+ assumeAllowsSharedSurface()
+ var sharedConfigId = -1
+ val latchSharedSurfaceOutput = CountDownLatch(1)
+ val fakeSessionProcessImpl = FakeSessionProcessImpl(
+ // Directly use output surface
+ previewConfigBlock = { outputSurfaceImpl ->
+ Camera2OutputConfigImplBuilder
+ .newSurfaceConfig(outputSurfaceImpl.surface)
+ .build()
+ },
+ // Directly use output surface
+ captureConfigBlock = { outputSurfaceImpl ->
+ Camera2OutputConfigImplBuilder
+ .newSurfaceConfig(outputSurfaceImpl.surface)
+ .build()
+ },
+ // Directly use output surface with shared ImageReader surface.
+ analysisConfigBlock = { outputSurfaceImpl ->
+ val sharedConfig = Camera2OutputConfigImplBuilder.newImageReaderConfig(
+ outputSurfaceImpl.size, outputSurfaceImpl.imageFormat, 2
+ ).build()
+ sharedConfigId = sharedConfig.id
+
+ Camera2OutputConfigImplBuilder.newSurfaceConfig(outputSurfaceImpl.surface)
+ .addSurfaceSharingOutputConfig(sharedConfig)
+ .build()
+ },
+ onCaptureSessionStarted = {
+ it.setImageProcessor(sharedConfigId) { _, _, imageReference, _ ->
+ imageReference.decrement()
+ latchSharedSurfaceOutput.countDown()
+ }
+ }
+ )
+ val preview = Preview.Builder().build()
+ val imageCapture = ImageCapture.Builder().build()
+ val imageAnalysis = ImageAnalysis.Builder().build()
+
+ verifyUseCasesOutput(fakeSessionProcessImpl, preview, imageCapture, imageAnalysis)
+ assertThat(latchSharedSurfaceOutput.await(3, TimeUnit.SECONDS)).isTrue()
+ }
+
+ private fun getPhysicalCameraId(cameraSelector: CameraSelector): List<String> {
+ val cameraInfos = cameraSelector.filter(cameraProvider.availableCameraInfos)
+ if (cameraInfos.isEmpty()) {
+ return emptyList()
+ }
+ return CameraUtil.getPhysicalCameraIds(
+ Camera2CameraInfo.from(cameraInfos.get(0)).cameraId
+ )
+ }
+
+ // Test if physicalCameraId is set and returned in the image received in the image processor.
+ @Test
+ fun useCasesCanWork_setPhysicalCameraId() = runBlocking {
+ assumeAllowsSharedSurface()
+ val physicalCameraIdList = getPhysicalCameraId(cameraSelector)
+ assumeTrue(physicalCameraIdList.isNotEmpty())
+
+ val physicalCameraId = physicalCameraIdList[0]
+ var captureOutputSurface: Surface? = null
+ var intermediaConfigId = -1
+ var sharedConfigId = -1
+ val deferredImagePhysicalCameraId = CompletableDeferred<String?>()
+ val deferredSharedImagePhysicalCameraId = CompletableDeferred<String?>()
+
+ val fakeSessionProcessImpl = FakeSessionProcessImpl(
+ // Directly use output surface
+ previewConfigBlock = { outputSurfaceImpl ->
+ Camera2OutputConfigImplBuilder
+ .newSurfaceConfig(outputSurfaceImpl.surface)
+ .build()
+ },
+ // Has intermediate image reader to process YUV
+ captureConfigBlock = { outputSurfaceImpl ->
+ captureOutputSurface = outputSurfaceImpl.surface
+ Camera2OutputConfigImplBuilder
+ .newImageReaderConfig(outputSurfaceImpl.size, ImageFormat.YUV_420_888, 2)
+ .setPhysicalCameraId(physicalCameraId)
+ .build()
+ .also {
+ intermediaConfigId = it.id
+ }
+ },
+ // Directly use output surface with shared ImageReader surface.
+ analysisConfigBlock = { outputSurfaceImpl ->
+ val sharedConfig = Camera2OutputConfigImplBuilder.newImageReaderConfig(
+ outputSurfaceImpl.size, outputSurfaceImpl.imageFormat, 2
+ ).setPhysicalCameraId(physicalCameraId).build()
+ sharedConfigId = sharedConfig.id
+
+ Camera2OutputConfigImplBuilder.newSurfaceConfig(outputSurfaceImpl.surface)
+ .addSurfaceSharingOutputConfig(sharedConfig)
+ .setPhysicalCameraId(physicalCameraId)
+ .build()
+ },
+ onCaptureSessionStarted = { requestProcessor ->
+ val imageWriter = ImageWriter.newInstance(captureOutputSurface!!, 2)
+ requestProcessor.setImageProcessor(intermediaConfigId) {
+ _, _, image, physicalCameraIdOfImage ->
+ deferredImagePhysicalCameraId.complete(physicalCameraIdOfImage)
+ val inputImage = imageWriter.dequeueInputImage()
+ imageWriter.queueInputImage(inputImage)
+ image.decrement()
+ }
+ requestProcessor.setImageProcessor(sharedConfigId) {
+ _, _, imageReference, physicalCameraIdOfImage ->
+ imageReference.decrement()
+ deferredSharedImagePhysicalCameraId.complete(physicalCameraIdOfImage)
+ }
+ }
+ )
+
+ val preview = Preview.Builder().build()
+ val imageCapture = ImageCapture.Builder()
+ .setSupportedResolutions(
+ listOf(android.util.Pair(ImageFormat.YUV_420_888, arrayOf(Size(640, 480))))
+ )
+ .build()
+ val imageAnalysis = ImageAnalysis.Builder().build()
+ verifyUseCasesOutput(fakeSessionProcessImpl, preview, imageCapture, imageAnalysis)
+ assertThat(deferredImagePhysicalCameraId.awaitWithTimeout(2000))
+ .isEqualTo(physicalCameraId)
+ assertThat(deferredSharedImagePhysicalCameraId.awaitWithTimeout(2000))
+ .isEqualTo(physicalCameraId)
+ }
+
+ /**
+ * Verify if the given use cases have expected output.
+ * 1) Preview frame is received
+ * 2) imageCapture gets a captured JPEG image
+ * 3) imageAnalysis gets a Image in Analyzer.
+ */
+ private suspend fun verifyUseCasesOutput(
+ fakeSessionProcessImpl: FakeSessionProcessImpl,
+ preview: Preview,
+ imageCapture: ImageCapture,
+ imageAnalysis: ImageAnalysis? = null
+ ) {
+ val advancedSessionProcessor = AdvancedSessionProcessor(fakeSessionProcessImpl, context)
+ val latchPreviewFrame = CountDownLatch(1)
+ val latchAnalysis = CountDownLatch(1)
+ val deferCapturedImage = CompletableDeferred<ImageProxy>()
+
+ withContext(Dispatchers.Main) {
+ preview.setSurfaceProvider(SurfaceTextureProvider.createSurfaceTextureProvider(
+ object : SurfaceTextureCallback {
+ override fun onSurfaceTextureReady(
+ surfaceTexture: SurfaceTexture,
+ resolution: Size
+ ) {
+ surfaceTexture.setOnFrameAvailableListener {
+ latchPreviewFrame.countDown()
+ }
+ }
+
+ override fun onSafeToRelease(surfaceTexture: SurfaceTexture) {
+ surfaceTexture.release()
+ }
+ }
+ ))
+ imageAnalysis?.setAnalyzer(CameraXExecutors.mainThreadExecutor()) {
+ it.close()
+ latchAnalysis.countDown()
+ }
+ val cameraSelector =
+ getCameraSelectorWithSessionProcessor(
+ cameraSelector,
+ advancedSessionProcessor
+ )
+
+ val useCaseGroupBuilder = UseCaseGroup.Builder()
+ useCaseGroupBuilder.addUseCase(preview)
+ useCaseGroupBuilder.addUseCase(imageCapture)
+ imageAnalysis?.let { useCaseGroupBuilder.addUseCase(it) }
+
+ cameraProvider.bindToLifecycle(
+ fakeLifecycleOwner,
+ cameraSelector,
+ useCaseGroupBuilder.build()
+ )
+ }
+
+ imageCapture.takePicture(
+ CameraXExecutors.mainThreadExecutor(),
+ object : OnImageCapturedCallback() {
+ override fun onCaptureSuccess(image: ImageProxy) {
+ deferCapturedImage.complete(image)
+ }
+ })
+
+ assertThat(latchPreviewFrame.await(2, TimeUnit.SECONDS)).isTrue()
+ assertThat(deferCapturedImage.awaitWithTimeout(2000).image!!.format)
+ .isEqualTo(ImageFormat.JPEG)
+ imageAnalysis?.let {
+ assertThat(latchAnalysis.await(2, TimeUnit.SECONDS)).isTrue()
+ }
+ }
+}
+
+private suspend fun <T> Deferred<T>.awaitWithTimeout(timeMillis: Long): T {
+ return withTimeout(timeMillis) {
+ await()
+ }
+}
+
+/**
+ * A fake [SessionProcessorImpl] where preview/imageCapture/imageAnalysis camera2OutputConfigImpl
+ * can be customized via input blocks. onCaptureSessionStarted block can also be provided in order
+ * to allow tests to access the [RequestProcessorImpl] to receive the Image for
+ * [ImageReaderOutputConfigImpl].
+ */
+class FakeSessionProcessImpl(
+ var previewConfigBlock: (OutputSurfaceImpl) -> Camera2OutputConfigImpl,
+ var captureConfigBlock: (OutputSurfaceImpl) -> Camera2OutputConfigImpl,
+ var analysisConfigBlock: ((OutputSurfaceImpl) -> Camera2OutputConfigImpl)? = null,
+ var onCaptureSessionStarted: ((RequestProcessorImpl) -> Unit)? = null
+) : SessionProcessorImpl {
+ private var requestProcessor: RequestProcessorImpl? = null
+ private var nextSequenceId = 0
+ private lateinit var previewOutputConfig: Camera2OutputConfigImpl
+ private lateinit var captureOutputConfig: Camera2OutputConfigImpl
+ private var analysisOutputConfig: Camera2OutputConfigImpl? = null
+ private var sharedOutputConfigList = arrayListOf<Camera2OutputConfigImpl>()
+
+ override fun initSession(
+ cameraId: String?,
+ cameraCharacteristicsMap: MutableMap<String, CameraCharacteristics>?,
+ context: Context?,
+ previewSurfaceConfig: OutputSurfaceImpl?,
+ captureSurfaceConfig: OutputSurfaceImpl?,
+ analysisSurfaceConfig: OutputSurfaceImpl?
+ ): Camera2SessionConfigImpl {
+ captureOutputConfig = captureConfigBlock.invoke(captureSurfaceConfig!!)
+ previewOutputConfig = previewConfigBlock.invoke(previewSurfaceConfig!!)
+ analysisSurfaceConfig?.let {
+ analysisOutputConfig = analysisConfigBlock?.invoke(it)
+ }
+
+ captureOutputConfig.surfaceSharingOutputConfigs?.let { sharedOutputConfigList.addAll(it) }
+ previewOutputConfig.surfaceSharingOutputConfigs?.let { sharedOutputConfigList.addAll(it) }
+ analysisOutputConfig?.surfaceSharingOutputConfigs?.let {
+ sharedOutputConfigList.addAll(it)
+ }
+
+ val sessionBuilder = Camera2SessionConfigImplBuilder().apply {
+ addOutputConfig(previewOutputConfig)
+ addOutputConfig(captureOutputConfig)
+ analysisOutputConfig?.let { addOutputConfig(analysisOutputConfig) }
+ }
+ return sessionBuilder.build()
+ }
+
+ override fun deInitSession() {
+ }
+
+ override fun setParameters(parameters: MutableMap<CaptureRequest.Key<*>, Any>?) {
+ }
+
+ override fun startTrigger(
+ triggers: MutableMap<CaptureRequest.Key<*>, Any>?,
+ callback: SessionProcessorImpl.CaptureCallback?
+ ): Int {
+ return 0
+ }
+
+ override fun onCaptureSessionStart(requestProcessor: RequestProcessorImpl?) {
+ this.requestProcessor = requestProcessor
+ onCaptureSessionStarted?.invoke(requestProcessor!!)
+ }
+
+ override fun onCaptureSessionEnd() {
+ }
+
+ override fun startRepeating(callback: SessionProcessorImpl.CaptureCallback?): Int {
+ val idList = ArrayList<Int>()
+ idList.add(previewOutputConfig.id)
+ analysisOutputConfig?.let { idList.add(it.id) }
+ for (sharedConfig in sharedOutputConfigList) {
+ idList.add(sharedConfig.id)
+ }
+
+ val currentSequenceId = nextSequenceId++
+ val request = RequestProcessorRequest(idList, mapOf(), CameraDevice.TEMPLATE_PREVIEW)
+ requestProcessor!!.setRepeating(request, object : RequestProcessorImpl.Callback {
+ override fun onCaptureStarted(
+ request: RequestProcessorImpl.Request?,
+ frameNumber: Long,
+ timestamp: Long
+ ) {
+ callback?.onCaptureStarted(currentSequenceId, timestamp)
+ }
+
+ override fun onCaptureProgressed(
+ request: RequestProcessorImpl.Request?,
+ partialResult: CaptureResult?
+ ) {
+ }
+
+ @RequiresApi(Build.VERSION_CODES.LOLLIPOP)
+ override fun onCaptureCompleted(
+ request: RequestProcessorImpl.Request?,
+ totalCaptureResult: TotalCaptureResult?
+ ) {
+ callback?.onCaptureProcessStarted(currentSequenceId)
+ callback?.onCaptureCompleted(
+ totalCaptureResult!!.get(CaptureResult.SENSOR_TIMESTAMP)!!,
+ currentSequenceId, mapOf()
+ )
+ callback?.onCaptureSequenceCompleted(currentSequenceId)
+ }
+
+ override fun onCaptureFailed(
+ request: RequestProcessorImpl.Request?,
+ captureFailure: CaptureFailure?
+ ) {
+ callback?.onCaptureFailed(currentSequenceId)
+ callback?.onCaptureSequenceAborted(currentSequenceId)
+ }
+
+ override fun onCaptureBufferLost(
+ request: RequestProcessorImpl.Request?,
+ frameNumber: Long,
+ outputStreamId: Int
+ ) {
+ }
+
+ override fun onCaptureSequenceCompleted(sequenceId: Int, frameNumber: Long) {
+ }
+
+ override fun onCaptureSequenceAborted(sequenceId: Int) {
+ }
+ })
+ return currentSequenceId
+ }
+
+ override fun stopRepeating() {
+ requestProcessor?.stopRepeating()
+ }
+
+ override fun startCapture(callback: SessionProcessorImpl.CaptureCallback?): Int {
+ val idList = ArrayList<Int>()
+ idList.add(captureOutputConfig.id)
+
+ val currentSequenceId = nextSequenceId++
+ val request = RequestProcessorRequest(idList, mapOf(), CameraDevice.TEMPLATE_STILL_CAPTURE)
+ requestProcessor?.submit(request, object : RequestProcessorImpl.Callback {
+ override fun onCaptureStarted(
+ request: RequestProcessorImpl.Request?,
+ frameNumber: Long,
+ timestamp: Long
+ ) {
+ callback?.onCaptureStarted(currentSequenceId, timestamp)
+ }
+
+ override fun onCaptureProgressed(
+ request: RequestProcessorImpl.Request?,
+ partialResult: CaptureResult?
+ ) {
+ }
+
+ @RequiresApi(Build.VERSION_CODES.LOLLIPOP)
+ override fun onCaptureCompleted(
+ request: RequestProcessorImpl.Request?,
+ totalCaptureResult: TotalCaptureResult?
+ ) {
+ callback?.onCaptureCompleted(
+ totalCaptureResult!!.get(CaptureResult.SENSOR_TIMESTAMP)!!, currentSequenceId,
+ mapOf()
+ )
+ }
+
+ override fun onCaptureFailed(
+ request: RequestProcessorImpl.Request?,
+ captureFailure: CaptureFailure?
+ ) {
+ callback?.onCaptureFailed(currentSequenceId)
+ }
+
+ override fun onCaptureBufferLost(
+ request: RequestProcessorImpl.Request?,
+ frameNumber: Long,
+ outputStreamId: Int
+ ) {
+ }
+
+ override fun onCaptureSequenceCompleted(sequenceId: Int, frameNumber: Long) {
+ callback?.onCaptureSequenceCompleted(currentSequenceId)
+ }
+
+ override fun onCaptureSequenceAborted(sequenceId: Int) {
+ callback?.onCaptureSequenceAborted(currentSequenceId)
+ }
+ })
+ return currentSequenceId
+ }
+
+ override fun abortCapture(captureSequenceId: Int) {
+ requestProcessor?.abortCaptures()
+ }
+}
+
+class RequestProcessorRequest(
+ private val targetOutputConfigIds: List<Int>,
+ private val parameters: Map<CaptureRequest.Key<*>, Any>,
+ private val templateId: Int
+) : RequestProcessorImpl.Request {
+ override fun getTargetOutputConfigIds(): List<Int> {
+ return targetOutputConfigIds
+ }
+
+ override fun getParameters(): Map<CaptureRequest.Key<*>, Any> {
+ return parameters
+ }
+
+ override fun getTemplateId(): Int {
+ return templateId
+ }
+}
\ No newline at end of file
diff --git a/camera/camera-extensions/src/main/java/androidx/camera/extensions/internal/ExtensionsUseCaseConfigFactory.java b/camera/camera-extensions/src/main/java/androidx/camera/extensions/internal/ExtensionsUseCaseConfigFactory.java
index 4ce62a3..76bff3f 100644
--- a/camera/camera-extensions/src/main/java/androidx/camera/extensions/internal/ExtensionsUseCaseConfigFactory.java
+++ b/camera/camera-extensions/src/main/java/androidx/camera/extensions/internal/ExtensionsUseCaseConfigFactory.java
@@ -16,6 +16,8 @@
package androidx.camera.extensions.internal;
+import static androidx.camera.core.impl.UseCaseConfig.OPTION_ZSL_DISABLED;
+
import android.content.Context;
import androidx.annotation.NonNull;
@@ -73,6 +75,9 @@
return null;
}
+ // Disable ZSL when Extension is ON.
+ mutableOptionsBundle.insertOption(OPTION_ZSL_DISABLED, true);
+
return OptionsBundle.from(mutableOptionsBundle);
}
}
diff --git a/camera/camera-extensions/src/main/java/androidx/camera/extensions/internal/ImageCaptureConfigProvider.java b/camera/camera-extensions/src/main/java/androidx/camera/extensions/internal/ImageCaptureConfigProvider.java
index a09bf72..c280363 100644
--- a/camera/camera-extensions/src/main/java/androidx/camera/extensions/internal/ImageCaptureConfigProvider.java
+++ b/camera/camera-extensions/src/main/java/androidx/camera/extensions/internal/ImageCaptureConfigProvider.java
@@ -118,8 +118,6 @@
} else {
Logger.e(TAG, "ImageCaptureExtenderImpl is null!");
}
- } else { // Advanced vendor interface
- builder.setSessionProcessorEnabled(true);
}
builder.getMutableConfig().insertOption(OPTION_IMAGE_CAPTURE_CONFIG_PROVIDER_MODE,
diff --git a/camera/camera-extensions/src/main/java/androidx/camera/extensions/internal/sessionprocessor/AdvancedSessionProcessor.java b/camera/camera-extensions/src/main/java/androidx/camera/extensions/internal/sessionprocessor/AdvancedSessionProcessor.java
index ac88af5..9cd5734 100644
--- a/camera/camera-extensions/src/main/java/androidx/camera/extensions/internal/sessionprocessor/AdvancedSessionProcessor.java
+++ b/camera/camera-extensions/src/main/java/androidx/camera/extensions/internal/sessionprocessor/AdvancedSessionProcessor.java
@@ -59,6 +59,7 @@
public class AdvancedSessionProcessor extends SessionProcessorBase {
private final SessionProcessorImpl mImpl;
private final Context mContext;
+
public AdvancedSessionProcessor(@NonNull SessionProcessorImpl impl, @NonNull Context context) {
mImpl = impl;
mContext = context;
@@ -90,9 +91,9 @@
@NonNull Camera2SessionConfigImpl sessionConfigImpl) {
Camera2SessionConfigBuilder camera2SessionConfigBuilder = new Camera2SessionConfigBuilder();
for (Camera2OutputConfigImpl outputConfigImpl : sessionConfigImpl.getOutputConfigs()) {
- Camera2OutputConfigBuilder outputConfigBuilder =
- Camera2OutputConfigBuilder.fromImpl(outputConfigImpl);
- camera2SessionConfigBuilder.addOutputConfig(outputConfigBuilder.build());
+ Camera2OutputConfig outputConfig =
+ Camera2OutputConfigConverter.fromImpl(outputConfigImpl);
+ camera2SessionConfigBuilder.addOutputConfig(outputConfig);
}
for (CaptureRequest.Key<?> key : sessionConfigImpl.getSessionParameters().keySet()) {
@@ -169,6 +170,7 @@
OutputSurfaceImplAdapter(OutputSurface outputSurface) {
mOutputSurface = outputSurface;
}
+
@NonNull
@Override
public Surface getSurface() {
@@ -300,6 +302,7 @@
*/
private static class ImageProcessorAdapter implements ImageProcessor {
private final ImageProcessorImpl mImpl;
+
@SuppressWarnings("WeakerAccess") /* synthetic accessor */
ImageProcessorAdapter(ImageProcessorImpl impl) {
mImpl = impl;
@@ -318,6 +321,7 @@
*/
private static class ImageReferenceImplAdapter implements ImageReferenceImpl {
private final ImageReference mImageReference;
+
@SuppressWarnings("WeakerAccess") /* synthetic accessor */
ImageReferenceImplAdapter(ImageReference imageReference) {
mImageReference = imageReference;
diff --git a/camera/camera-extensions/src/main/java/androidx/camera/extensions/internal/sessionprocessor/Camera2OutputConfig.java b/camera/camera-extensions/src/main/java/androidx/camera/extensions/internal/sessionprocessor/Camera2OutputConfig.java
index 7ffecb8..0a18365 100644
--- a/camera/camera-extensions/src/main/java/androidx/camera/extensions/internal/sessionprocessor/Camera2OutputConfig.java
+++ b/camera/camera-extensions/src/main/java/androidx/camera/extensions/internal/sessionprocessor/Camera2OutputConfig.java
@@ -47,7 +47,7 @@
String getPhysicalCameraId();
/**
- * If non-null, enable surface sharing and add the surfaces constructed by the returned
+ * If non-empty, enable surface sharing and add the surfaces constructed by the returned
* Camera2OutputConfigs.
*/
@NonNull
diff --git a/camera/camera-extensions/src/main/java/androidx/camera/extensions/internal/sessionprocessor/Camera2OutputConfigBuilder.java b/camera/camera-extensions/src/main/java/androidx/camera/extensions/internal/sessionprocessor/Camera2OutputConfigBuilder.java
deleted file mode 100644
index c461f5b..0000000
--- a/camera/camera-extensions/src/main/java/androidx/camera/extensions/internal/sessionprocessor/Camera2OutputConfigBuilder.java
+++ /dev/null
@@ -1,267 +0,0 @@
-/*
- * Copyright 2021 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package androidx.camera.extensions.internal.sessionprocessor;
-
-import android.util.Size;
-import android.view.Surface;
-
-import androidx.annotation.NonNull;
-import androidx.annotation.Nullable;
-import androidx.annotation.RequiresApi;
-import androidx.camera.extensions.impl.advanced.Camera2OutputConfigImpl;
-import androidx.camera.extensions.impl.advanced.ImageReaderOutputConfigImpl;
-import androidx.camera.extensions.impl.advanced.MultiResolutionImageReaderOutputConfigImpl;
-import androidx.camera.extensions.impl.advanced.SurfaceOutputConfigImpl;
-
-import com.google.auto.value.AutoValue;
-
-import java.util.ArrayList;
-import java.util.Collections;
-import java.util.List;
-import java.util.concurrent.atomic.AtomicInteger;
-
-/**
- * A builder for building {@link Camera2OutputConfig}.
- */
-@RequiresApi(21) // TODO(b/200306659): Remove and replace with annotation on package-info.java
-class Camera2OutputConfigBuilder {
- private static AtomicInteger sLastId = new AtomicInteger(0);
- private OutputConfig mOutputConfig;
- private int mSurfaceGroupId;
- private String mPhysicalCameraId;
- private List<Camera2OutputConfig> mSurfaceSharingConfigs;
-
- private Camera2OutputConfigBuilder(OutputConfig outputConfig) {
- mOutputConfig = outputConfig;
- }
-
- private int getNextId() {
- return sLastId.getAndIncrement();
- }
-
- /**
- * Create a {@link Camera2OutputConfig} from the {@link Camera2OutputConfigImpl}.
- */
- @NonNull
- static Camera2OutputConfigBuilder fromImpl(@NonNull Camera2OutputConfigImpl impl) {
- OutputConfig outputConfig = null;
- if (impl instanceof SurfaceOutputConfigImpl) {
- SurfaceOutputConfigImpl surfaceImpl = (SurfaceOutputConfigImpl) impl;
- outputConfig = SurfaceConfig.create(surfaceImpl.getSurface());
- } else if (impl instanceof ImageReaderOutputConfigImpl) {
- ImageReaderOutputConfigImpl imageReaderImpl = (ImageReaderOutputConfigImpl) impl;
- outputConfig = ImageReaderConfig.create(imageReaderImpl.getSize(),
- imageReaderImpl.getImageFormat(), imageReaderImpl.getMaxImages());
- } else if (impl instanceof MultiResolutionImageReaderOutputConfigImpl) {
- MultiResolutionImageReaderOutputConfigImpl multiResolutionImageReaderImpl =
- (MultiResolutionImageReaderOutputConfigImpl) impl;
- outputConfig = MultiResolutionImageReaderConfig.create(
- multiResolutionImageReaderImpl.getImageFormat(),
- multiResolutionImageReaderImpl.getMaxImages());
- }
-
- outputConfig.setPhysicalCameraId(impl.getPhysicalCameraId());
- outputConfig.setSurfaceGroup(impl.getSurfaceGroupId());
- if (impl.getSurfaceSharingOutputConfigs() != null) {
- ArrayList<Camera2OutputConfig> surfaceSharingConfigs = new ArrayList<>();
- for (Camera2OutputConfigImpl surfaceSharingOutputConfig :
- impl.getSurfaceSharingOutputConfigs()) {
- Camera2OutputConfigBuilder subBuilder =
- Camera2OutputConfigBuilder.fromImpl(surfaceSharingOutputConfig);
- surfaceSharingConfigs.add(subBuilder.build());
- }
- outputConfig.setSurfaceSharingConfigs(surfaceSharingConfigs);
- }
-
- return new Camera2OutputConfigBuilder(outputConfig);
- }
-
- /**
- * Creates a {@link Camera2OutputConfig} that represents a {@link android.media.ImageReader}
- * with the given parameters.
- */
- @NonNull
- static Camera2OutputConfigBuilder newImageReaderConfig(
- @NonNull Size size, int imageFormat, int maxImages) {
- return new Camera2OutputConfigBuilder(
- ImageReaderConfig.create(size, imageFormat, maxImages));
- }
-
- /**
- * Creates a {@link Camera2OutputConfig} that represents a MultiResolutionImageReader with the
- * given parameters.
- */
- @NonNull
- static Camera2OutputConfigBuilder newMultiResolutionImageReaderConfig(
- int imageFormat, int maxImages) {
- return new Camera2OutputConfigBuilder(
- MultiResolutionImageReaderConfig.create(imageFormat, maxImages));
- }
-
- /**
- * Creates a {@link Camera2OutputConfig} that contains the Surface directly.
- */
- @NonNull
- static Camera2OutputConfigBuilder newSurfaceConfig(@NonNull Surface surface) {
- return new Camera2OutputConfigBuilder(SurfaceConfig.create(surface));
- }
-
- /**
- * Adds a {@link Camera2SessionConfig} to be shared with current config.
- */
- @NonNull
- Camera2OutputConfigBuilder addSurfaceSharingOutputConfig(
- @NonNull Camera2OutputConfig camera2OutputConfig) {
- if (mSurfaceSharingConfigs == null) {
- mSurfaceSharingConfigs = new ArrayList<>();
- }
-
- mSurfaceSharingConfigs.add(camera2OutputConfig);
- return this;
- }
-
- /**
- * Sets a physical camera id.
- */
- @NonNull
- Camera2OutputConfigBuilder setPhysicalCameraId(@NonNull String physicalCameraId) {
- mPhysicalCameraId = physicalCameraId;
- return this;
- }
-
- /**
- * Sets surface group id.
- */
- @NonNull
- Camera2OutputConfigBuilder setSurfaceGroupId(int surfaceGroupId) {
- mSurfaceGroupId = surfaceGroupId;
- return this;
- }
-
- /**
- * Build a {@link Camera2OutputConfig} instance.
- */
- @NonNull
- Camera2OutputConfig build() {
- mOutputConfig.setId(getNextId());
- mOutputConfig.setPhysicalCameraId(mPhysicalCameraId);
- mOutputConfig.setSurfaceGroup(mSurfaceGroupId);
- if (mSurfaceSharingConfigs != null) {
- mOutputConfig.setSurfaceSharingConfigs(mSurfaceSharingConfigs);
- }
- return mOutputConfig;
- }
-
- private static class OutputConfig implements Camera2OutputConfig {
- private int mId;
- private int mSurfaceGroup;
- private String mPhysicalCameraId;
- private List<Camera2OutputConfig> mSurfaceSharingConfigs;
-
- OutputConfig() {
- mId = -1;
- mSurfaceGroup = 0;
- mPhysicalCameraId = null;
- mSurfaceSharingConfigs = Collections.emptyList();
- }
-
- @Override
- public int getId() {
- return mId;
- }
-
- @Override
- public int getSurfaceGroupId() {
- return mSurfaceGroup;
- }
-
- @Override
- @Nullable
- public String getPhysicalCameraId() {
- return mPhysicalCameraId;
- }
-
- @Override
- @NonNull
- public List<Camera2OutputConfig> getSurfaceSharingOutputConfigs() {
- return mSurfaceSharingConfigs;
- }
-
- public void setId(int id) {
- mId = id;
- }
-
- public void setSurfaceGroup(int surfaceGroup) {
- mSurfaceGroup = surfaceGroup;
- }
-
- public void setPhysicalCameraId(@Nullable String physicalCameraId) {
- mPhysicalCameraId = physicalCameraId;
- }
-
- public void setSurfaceSharingConfigs(
- @NonNull List<Camera2OutputConfig> surfaceSharingConfigs) {
- mSurfaceSharingConfigs = surfaceSharingConfigs;
- }
- }
-
- @AutoValue
- abstract static class SurfaceConfig extends OutputConfig implements SurfaceOutputConfig {
- static SurfaceConfig create(@NonNull Surface surface) {
- return new AutoValue_Camera2OutputConfigBuilder_SurfaceConfig(surface);
- }
-
- @Override
- @NonNull
- public abstract Surface getSurface();
- }
-
- @AutoValue
- abstract static class ImageReaderConfig extends OutputConfig implements
- ImageReaderOutputConfig {
- static ImageReaderConfig create(@NonNull Size size, int imageFormat,
- int maxImages) {
- return new AutoValue_Camera2OutputConfigBuilder_ImageReaderConfig(
- size, imageFormat, maxImages);
- }
-
- @Override
- @NonNull
- public abstract Size getSize();
-
- @Override
- public abstract int getImageFormat();
-
- @Override
- public abstract int getMaxImages();
- }
-
- @AutoValue
- abstract static class MultiResolutionImageReaderConfig extends OutputConfig implements
- MultiResolutionImageReaderOutputConfig {
- static MultiResolutionImageReaderConfig create(int imageFormat, int maxImages) {
- return new AutoValue_Camera2OutputConfigBuilder_MultiResolutionImageReaderConfig(
- imageFormat, maxImages);
- }
-
- @Override
- public abstract int getImageFormat();
-
- @Override
- public abstract int getMaxImages();
- }
-}
diff --git a/camera/camera-extensions/src/main/java/androidx/camera/extensions/internal/sessionprocessor/Camera2OutputConfigConverter.java b/camera/camera-extensions/src/main/java/androidx/camera/extensions/internal/sessionprocessor/Camera2OutputConfigConverter.java
new file mode 100644
index 0000000..24ee1bd
--- /dev/null
+++ b/camera/camera-extensions/src/main/java/androidx/camera/extensions/internal/sessionprocessor/Camera2OutputConfigConverter.java
@@ -0,0 +1,83 @@
+/*
+ * Copyright 2022 The Android Open Source Project
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package androidx.camera.extensions.internal.sessionprocessor;
+
+import androidx.annotation.NonNull;
+import androidx.annotation.RequiresApi;
+import androidx.camera.extensions.impl.advanced.Camera2OutputConfigImpl;
+import androidx.camera.extensions.impl.advanced.ImageReaderOutputConfigImpl;
+import androidx.camera.extensions.impl.advanced.MultiResolutionImageReaderOutputConfigImpl;
+import androidx.camera.extensions.impl.advanced.SurfaceOutputConfigImpl;
+
+import java.util.ArrayList;
+import java.util.List;
+
+/**
+ * For converting a {@link Camera2OutputConfigImpl} to a {@link Camera2OutputConfig}.
+ */
+@RequiresApi(21) // TODO(b/200306659): Remove and replace with annotation on package-info.java
+class Camera2OutputConfigConverter {
+ private Camera2OutputConfigConverter() {
+ }
+
+ /**
+ * Create a {@link Camera2OutputConfig} from the {@link Camera2OutputConfigImpl}.
+ */
+ @NonNull
+ static Camera2OutputConfig fromImpl(@NonNull Camera2OutputConfigImpl impl) {
+ List<Camera2OutputConfig> sharedOutputConfigs = new ArrayList<>();
+ if (impl.getSurfaceSharingOutputConfigs() != null) {
+ for (Camera2OutputConfigImpl surfaceSharingOutputConfig :
+ impl.getSurfaceSharingOutputConfigs()) {
+ Camera2OutputConfig sharedConfig = fromImpl(surfaceSharingOutputConfig);
+ sharedOutputConfigs.add(sharedConfig);
+ }
+ }
+
+ if (impl instanceof SurfaceOutputConfigImpl) {
+ SurfaceOutputConfigImpl surfaceImpl = (SurfaceOutputConfigImpl) impl;
+ return SurfaceOutputConfig.create(
+ surfaceImpl.getId(),
+ surfaceImpl.getSurfaceGroupId(),
+ surfaceImpl.getPhysicalCameraId(),
+ sharedOutputConfigs,
+ surfaceImpl.getSurface());
+ } else if (impl instanceof ImageReaderOutputConfigImpl) {
+ ImageReaderOutputConfigImpl imageReaderImpl = (ImageReaderOutputConfigImpl) impl;
+ return ImageReaderOutputConfig.create(
+ imageReaderImpl.getId(),
+ imageReaderImpl.getSurfaceGroupId(),
+ imageReaderImpl.getPhysicalCameraId(),
+ sharedOutputConfigs,
+ imageReaderImpl.getSize(),
+ imageReaderImpl.getImageFormat(),
+ imageReaderImpl.getMaxImages());
+ } else if (impl instanceof MultiResolutionImageReaderOutputConfigImpl) {
+ MultiResolutionImageReaderOutputConfigImpl multiResolutionImageReaderImpl =
+ (MultiResolutionImageReaderOutputConfigImpl) impl;
+ return MultiResolutionImageReaderOutputConfig.create(
+ multiResolutionImageReaderImpl.getId(),
+ multiResolutionImageReaderImpl.getSurfaceGroupId(),
+ multiResolutionImageReaderImpl.getPhysicalCameraId(),
+ sharedOutputConfigs,
+ multiResolutionImageReaderImpl.getImageFormat(),
+ multiResolutionImageReaderImpl.getMaxImages());
+ }
+ throw new IllegalArgumentException(
+ "Not supported Camera2OutputConfigImpl: " + impl.getClass());
+ }
+}
diff --git a/camera/camera-extensions/src/main/java/androidx/camera/extensions/internal/sessionprocessor/ImageReaderOutputConfig.java b/camera/camera-extensions/src/main/java/androidx/camera/extensions/internal/sessionprocessor/ImageReaderOutputConfig.java
index 79965c9..454e4a0 100644
--- a/camera/camera-extensions/src/main/java/androidx/camera/extensions/internal/sessionprocessor/ImageReaderOutputConfig.java
+++ b/camera/camera-extensions/src/main/java/androidx/camera/extensions/internal/sessionprocessor/ImageReaderOutputConfig.java
@@ -19,26 +19,42 @@
import android.util.Size;
import androidx.annotation.NonNull;
+import androidx.annotation.Nullable;
import androidx.annotation.RequiresApi;
+import com.google.auto.value.AutoValue;
+
+import java.util.List;
+
/**
* Surface will be created by constructing an ImageReader.
*/
@RequiresApi(21) // TODO(b/200306659): Remove and replace with annotation on package-info.java
-public interface ImageReaderOutputConfig extends Camera2OutputConfig {
+@AutoValue
+public abstract class ImageReaderOutputConfig implements Camera2OutputConfig {
+ /**
+ * Creates the {@link ImageReaderOutputConfig} instance.
+ */
+ static ImageReaderOutputConfig create(int id, int surfaceGroupId,
+ @Nullable String physicalCameraId,
+ @NonNull List<Camera2OutputConfig> sharedOutputConfigs,
+ @NonNull Size size, int imageFormat, int maxImages) {
+ return new AutoValue_ImageReaderOutputConfig(id, surfaceGroupId, physicalCameraId,
+ sharedOutputConfigs, size, imageFormat, maxImages);
+ }
/**
* Returns the size of the surface.
*/
@NonNull
- Size getSize();
+ abstract Size getSize();
/**
* Gets the image format of the surface.
*/
- int getImageFormat();
+ abstract int getImageFormat();
/**
* Gets the capacity for the image reader.
*/
- int getMaxImages();
+ abstract int getMaxImages();
}
diff --git a/camera/camera-extensions/src/main/java/androidx/camera/extensions/internal/sessionprocessor/MultiResolutionImageReaderOutputConfig.java b/camera/camera-extensions/src/main/java/androidx/camera/extensions/internal/sessionprocessor/MultiResolutionImageReaderOutputConfig.java
index 7a33619..4fb8bad 100644
--- a/camera/camera-extensions/src/main/java/androidx/camera/extensions/internal/sessionprocessor/MultiResolutionImageReaderOutputConfig.java
+++ b/camera/camera-extensions/src/main/java/androidx/camera/extensions/internal/sessionprocessor/MultiResolutionImageReaderOutputConfig.java
@@ -16,20 +16,39 @@
package androidx.camera.extensions.internal.sessionprocessor;
+import androidx.annotation.NonNull;
+import androidx.annotation.Nullable;
import androidx.annotation.RequiresApi;
+import com.google.auto.value.AutoValue;
+
+import java.util.List;
+
/**
* Surface will be created by constructing a MultiResolutionImageReader.
*/
@RequiresApi(21) // TODO(b/200306659): Remove and replace with annotation on package-info.java
-public interface MultiResolutionImageReaderOutputConfig extends Camera2OutputConfig {
+@AutoValue
+public abstract class MultiResolutionImageReaderOutputConfig implements Camera2OutputConfig {
+ /**
+ * Creates the {@link MultiResolutionImageReaderOutputConfig} instance.
+ */
+ static MultiResolutionImageReaderOutputConfig create(
+ int id, int surfaceGroupId, @Nullable String physicalCameraId,
+ @NonNull List<Camera2OutputConfig> sharedOutputConfigs,
+ int imageFormat, int maxImages) {
+ return new AutoValue_MultiResolutionImageReaderOutputConfig(id, surfaceGroupId,
+ physicalCameraId,
+ sharedOutputConfigs, imageFormat, maxImages);
+ }
+
/**
* Gets the image format of the surface.
*/
- int getImageFormat();
+ abstract int getImageFormat();
/**
* Gets the capacity for the image reader.
*/
- int getMaxImages();
+ abstract int getMaxImages();
}
diff --git a/camera/camera-extensions/src/main/java/androidx/camera/extensions/internal/sessionprocessor/SessionProcessorBase.java b/camera/camera-extensions/src/main/java/androidx/camera/extensions/internal/sessionprocessor/SessionProcessorBase.java
index dc6821c..a10ddcb 100644
--- a/camera/camera-extensions/src/main/java/androidx/camera/extensions/internal/sessionprocessor/SessionProcessorBase.java
+++ b/camera/camera-extensions/src/main/java/androidx/camera/extensions/internal/sessionprocessor/SessionProcessorBase.java
@@ -56,6 +56,9 @@
@NonNull
@GuardedBy("mLock")
private Map<Integer, ImageReader> mImageReaderMap = new HashMap<>();
+ @GuardedBy("mLock")
+ private Map<Integer, Camera2OutputConfig> mOutputConfigMap = new HashMap<>();
+
@Nullable
private HandlerThread mImageReaderHandlerThread;
@GuardedBy("mLock")
@@ -64,6 +67,37 @@
private String mCameraId;
@NonNull
+ private static SessionProcessorSurface createOutputConfigSurface(
+ @NonNull Camera2OutputConfig outputConfig, Map<Integer, ImageReader> imageReaderMap) {
+ if (outputConfig instanceof SurfaceOutputConfig) {
+ SurfaceOutputConfig surfaceOutputConfig = (SurfaceOutputConfig) outputConfig;
+ SessionProcessorSurface surface =
+ new SessionProcessorSurface(surfaceOutputConfig.getSurface(),
+ outputConfig.getId());
+ return surface;
+ } else if (outputConfig instanceof ImageReaderOutputConfig) {
+ ImageReaderOutputConfig imageReaderOutputConfig =
+ (ImageReaderOutputConfig) outputConfig;
+
+ ImageReader imageReader =
+ ImageReader.newInstance(imageReaderOutputConfig.getSize().getWidth(),
+ imageReaderOutputConfig.getSize().getHeight(),
+ imageReaderOutputConfig.getImageFormat(),
+ imageReaderOutputConfig.getMaxImages());
+ imageReaderMap.put(outputConfig.getId(), imageReader);
+ SessionProcessorSurface surface =
+ new SessionProcessorSurface(imageReader.getSurface(),
+ outputConfig.getId());
+ surface.getTerminationFuture().addListener(() -> {
+ imageReader.close();
+ }, CameraXExecutors.directExecutor());
+ return surface;
+ } else if (outputConfig instanceof MultiResolutionImageReaderOutputConfig) {
+ throw new UnsupportedOperationException("MultiResolutionImageReader not supported yet");
+ }
+ throw new UnsupportedOperationException("Unsupported Camera2OutputConfig:" + outputConfig);
+ }
+ @NonNull
@Override
@OptIn(markerClass = ExperimentalCamera2Interop.class)
public final SessionConfig initSession(@NonNull CameraInfo cameraInfo,
@@ -71,52 +105,41 @@
@NonNull OutputSurface imageCaptureSurfaceConfig,
@Nullable OutputSurface imageAnalysisSurfaceConfig) {
Camera2CameraInfo camera2CameraInfo = Camera2CameraInfo.from(cameraInfo);
+ Map<String, CameraCharacteristics> characteristicsMap =
+ camera2CameraInfo.getCameraCharacteristicsMap();
Camera2SessionConfig camera2SessionConfig = initSessionInternal(
camera2CameraInfo.getCameraId(),
- camera2CameraInfo.getCameraCharacteristicsMap(),
+ characteristicsMap,
previewSurfaceConfig,
imageCaptureSurfaceConfig,
imageAnalysisSurfaceConfig
);
- // TODO: Adding support for group id, surface sharing and physicalCameraId in SessionConfig
- synchronized (mLock) {
- for (Camera2OutputConfig outputConfig : camera2SessionConfig.getOutputConfigs()) {
- if (outputConfig instanceof SurfaceOutputConfig) {
- SurfaceOutputConfig surfaceOutputConfig = (SurfaceOutputConfig) outputConfig;
- SessionProcessorSurface surface =
- new SessionProcessorSurface(surfaceOutputConfig.getSurface(),
- outputConfig.getId());
- mSurfacesList.add(surface);
- } else if (outputConfig instanceof ImageReaderOutputConfig) {
- ImageReaderOutputConfig imageReaderOutputConfig =
- (ImageReaderOutputConfig) outputConfig;
-
- ImageReader imageReader =
- ImageReader.newInstance(imageReaderOutputConfig.getSize().getWidth(),
- imageReaderOutputConfig.getSize().getHeight(),
- imageReaderOutputConfig.getImageFormat(),
- imageReaderOutputConfig.getMaxImages());
- mImageReaderMap.put(outputConfig.getId(), imageReader);
- SessionProcessorSurface surface =
- new SessionProcessorSurface(imageReader.getSurface(),
- outputConfig.getId());
- surface.getTerminationFuture().addListener(() -> {
- imageReader.close();
- }, CameraXExecutors.directExecutor());
- mSurfacesList.add(surface);
- } else if (outputConfig instanceof MultiResolutionImageReaderOutputConfig) {
- // TODO: Support MultiResolutionImageReader
- throw new UnsupportedOperationException(
- "MultiResolutionImageReader not supported");
- }
- }
- }
-
SessionConfig.Builder sessionConfigBuilder = new SessionConfig.Builder();
synchronized (mLock) {
- for (DeferrableSurface surface : mSurfacesList) {
- sessionConfigBuilder.addSurface(surface);
+ for (Camera2OutputConfig outputConfig : camera2SessionConfig.getOutputConfigs()) {
+ SessionProcessorSurface sessionProcessorSurface =
+ createOutputConfigSurface(outputConfig, mImageReaderMap);
+ mSurfacesList.add(sessionProcessorSurface);
+ mOutputConfigMap.put(outputConfig.getId(), outputConfig);
+
+ SessionConfig.OutputConfig.Builder outputConfigBuilder =
+ SessionConfig.OutputConfig.builder(sessionProcessorSurface)
+ .setPhysicalCameraId(outputConfig.getPhysicalCameraId())
+ .setSurfaceGroupId(outputConfig.getSurfaceGroupId());
+
+ List<Camera2OutputConfig> sharedOutputs =
+ outputConfig.getSurfaceSharingOutputConfigs();
+ if (sharedOutputs != null && !sharedOutputs.isEmpty()) {
+ List<DeferrableSurface> sharedSurfaces = new ArrayList<>();
+ for (Camera2OutputConfig sharedOutput : sharedOutputs) {
+ mOutputConfigMap.put(sharedOutput.getId(), sharedOutput);
+ sharedSurfaces.add(createOutputConfigSurface(sharedOutput,
+ mImageReaderMap));
+ }
+ outputConfigBuilder.setSharedSurfaces(sharedSurfaces);
+ }
+ sessionConfigBuilder.addOutputConfig(outputConfigBuilder.build());
}
}
@@ -151,8 +174,11 @@
protected void setImageProcessor(int outputConfigId,
@NonNull ImageProcessor imageProcessor) {
ImageReader imageReader;
+ String physicalCameraId;
synchronized (mLock) {
imageReader = mImageReaderMap.get(outputConfigId);
+ Camera2OutputConfig outputConfig = mOutputConfigMap.get(outputConfigId);
+ physicalCameraId = (outputConfig == null ? null : outputConfig.getPhysicalCameraId());
}
if (imageReader != null) {
@@ -161,7 +187,7 @@
Image image = reader.acquireNextImage();
ImageReference imageReference = new ImageRefHolder(image);
imageProcessor.onNextImageAvailable(outputConfigId, image.getTimestamp(),
- imageReference, null);
+ imageReference, physicalCameraId);
} catch (IllegalStateException e) {
Logger.e(TAG, "Failed to acquire next image.", e);
}
@@ -180,8 +206,8 @@
deferrableSurface.close();
}
mSurfacesList.clear();
-
mImageReaderMap.clear();
+ mOutputConfigMap.clear();
}
if (mImageReaderHandlerThread != null) {
diff --git a/camera/camera-extensions/src/main/java/androidx/camera/extensions/internal/sessionprocessor/SurfaceOutputConfig.java b/camera/camera-extensions/src/main/java/androidx/camera/extensions/internal/sessionprocessor/SurfaceOutputConfig.java
index 4881283..31a7144 100644
--- a/camera/camera-extensions/src/main/java/androidx/camera/extensions/internal/sessionprocessor/SurfaceOutputConfig.java
+++ b/camera/camera-extensions/src/main/java/androidx/camera/extensions/internal/sessionprocessor/SurfaceOutputConfig.java
@@ -19,16 +19,34 @@
import android.view.Surface;
import androidx.annotation.NonNull;
+import androidx.annotation.Nullable;
import androidx.annotation.RequiresApi;
+import com.google.auto.value.AutoValue;
+
+import java.util.List;
+
/**
* Use Surface directly to create the OutputConfiguration.
*/
-@RequiresApi(21) // TODO(b/200306659): Remove and replace with annotation on package-info.java
-public interface SurfaceOutputConfig extends Camera2OutputConfig {
+@RequiresApi(21) // T
+// TODO(b/200306659): Remove and replace with annotation on package-info.java
+@AutoValue
+public abstract class SurfaceOutputConfig implements Camera2OutputConfig {
+ /**
+ * Creates the {@link SurfaceOutputConfig} instance.
+ */
+ static SurfaceOutputConfig create(int id, int surfaceGroupId,
+ @Nullable String physicalCameraId,
+ @NonNull List<Camera2OutputConfig> sharedOutputConfigs,
+ @NonNull Surface surface) {
+ return new AutoValue_SurfaceOutputConfig(id, surfaceGroupId, physicalCameraId,
+ sharedOutputConfigs, surface);
+ }
+
/**
* Get the {@link Surface}. It'll return a valid surface only when type is TYPE_SURFACE.
*/
@NonNull
- Surface getSurface();
+ abstract Surface getSurface();
}
diff --git a/camera/camera-extensions/src/test/java/androidx/camera/extensions/internal/sessionprocessor/Camera2OutputConfigBuilderTest.kt b/camera/camera-extensions/src/test/java/androidx/camera/extensions/internal/sessionprocessor/Camera2OutputConfigBuilderTest.kt
deleted file mode 100644
index c574d2a..0000000
--- a/camera/camera-extensions/src/test/java/androidx/camera/extensions/internal/sessionprocessor/Camera2OutputConfigBuilderTest.kt
+++ /dev/null
@@ -1,175 +0,0 @@
-/*
- * Copyright 2021 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package androidx.camera.extensions.internal.sessionprocessor
-
-import android.graphics.ImageFormat
-import android.os.Build
-import android.util.Size
-import android.view.Surface
-import androidx.camera.extensions.impl.advanced.ImageReaderOutputConfigImpl
-import androidx.camera.extensions.impl.advanced.MultiResolutionImageReaderOutputConfigImpl
-import androidx.camera.extensions.impl.advanced.SurfaceOutputConfigImpl
-import com.google.common.truth.Truth.assertThat
-import org.junit.Test
-import org.junit.runner.RunWith
-import org.mockito.Mockito.`when`
-import org.mockito.Mockito.mock
-import org.robolectric.RobolectricTestRunner
-import org.robolectric.annotation.Config
-import org.robolectric.annotation.internal.DoNotInstrument
-
-private const val PHYSICAL_CAMERA_ID = "3"
-private const val SURFACE_GROUP_ID = 1
-private const val IMAGE_FORMAT = ImageFormat.YUV_420_888
-private const val MAX_IMAGES = 2
-private val SIZE = Size(640, 480)
-
-@RunWith(RobolectricTestRunner::class)
-@DoNotInstrument
-@Config(minSdk = Build.VERSION_CODES.LOLLIPOP)
-class Camera2OutputConfigBuilderTest {
- @Test
- fun canBuildFromImpl_imageReaderOutputConfigImpl() {
- // Arrange
- val outConfigImpl = mock(ImageReaderOutputConfigImpl::class.java)
- `when`(outConfigImpl.size).thenReturn(SIZE)
- `when`(outConfigImpl.imageFormat).thenReturn(IMAGE_FORMAT)
- `when`(outConfigImpl.maxImages).thenReturn(MAX_IMAGES)
-
- // Act
- val builder = Camera2OutputConfigBuilder.fromImpl(outConfigImpl)
- builder.setPhysicalCameraId(PHYSICAL_CAMERA_ID)
- builder.setSurfaceGroupId(SURFACE_GROUP_ID)
-
- // Assert
- val camera2OutputConfig = builder.build() as ImageReaderOutputConfig
- assertThat(camera2OutputConfig.physicalCameraId).isEqualTo(PHYSICAL_CAMERA_ID)
- assertThat(camera2OutputConfig.surfaceGroupId).isEqualTo(SURFACE_GROUP_ID)
- assertThat(camera2OutputConfig.size).isEqualTo(SIZE)
- assertThat(camera2OutputConfig.imageFormat).isEqualTo(IMAGE_FORMAT)
- assertThat(camera2OutputConfig.maxImages).isEqualTo(MAX_IMAGES)
- }
-
- @Test
- fun canBuildFromImpl_surfaceOutputConfigImpl() {
- // Arrange
- val outConfigImpl = mock(SurfaceOutputConfigImpl::class.java)
- val surface = mock(Surface::class.java)
- `when`(outConfigImpl.surface).thenReturn(surface)
-
- // Act
- val builder = Camera2OutputConfigBuilder.fromImpl(outConfigImpl)
- builder.setPhysicalCameraId(PHYSICAL_CAMERA_ID)
- builder.setSurfaceGroupId(SURFACE_GROUP_ID)
-
- // Assert
- val camera2OutputConfig = builder.build() as SurfaceOutputConfig
- assertThat(camera2OutputConfig.physicalCameraId).isEqualTo(PHYSICAL_CAMERA_ID)
- assertThat(camera2OutputConfig.surfaceGroupId).isEqualTo(SURFACE_GROUP_ID)
- assertThat(camera2OutputConfig.surface).isEqualTo(surface)
- }
-
- @Test
- fun canBuildFromImpl_MultiResolutionImageReaderOutputConfigImpl() {
- // Arrange
- val outConfigImpl = mock(MultiResolutionImageReaderOutputConfigImpl::class.java)
- `when`(outConfigImpl.imageFormat).thenReturn(IMAGE_FORMAT)
- `when`(outConfigImpl.maxImages).thenReturn(MAX_IMAGES)
-
- // Act
- val builder = Camera2OutputConfigBuilder.fromImpl(outConfigImpl)
- builder.setPhysicalCameraId(PHYSICAL_CAMERA_ID)
- builder.setSurfaceGroupId(SURFACE_GROUP_ID)
-
- // Assert
- val camera2OutputConfig = builder.build() as MultiResolutionImageReaderOutputConfig
- assertThat(camera2OutputConfig.physicalCameraId).isEqualTo(PHYSICAL_CAMERA_ID)
- assertThat(camera2OutputConfig.surfaceGroupId).isEqualTo(SURFACE_GROUP_ID)
- assertThat(camera2OutputConfig.imageFormat).isEqualTo(IMAGE_FORMAT)
- assertThat(camera2OutputConfig.maxImages).isEqualTo(MAX_IMAGES)
- }
-
- @Test
- fun canBuildFromImageReaderOutputConfig() {
- // Act
- val builder = Camera2OutputConfigBuilder
- .newImageReaderConfig(SIZE, IMAGE_FORMAT, MAX_IMAGES)
- builder.setPhysicalCameraId(PHYSICAL_CAMERA_ID)
- builder.setSurfaceGroupId(SURFACE_GROUP_ID)
-
- // Assert
- val camera2OutputConfig = builder.build() as ImageReaderOutputConfig
- assertThat(camera2OutputConfig.physicalCameraId).isEqualTo(PHYSICAL_CAMERA_ID)
- assertThat(camera2OutputConfig.surfaceGroupId).isEqualTo(SURFACE_GROUP_ID)
- assertThat(camera2OutputConfig.size).isEqualTo(SIZE)
- assertThat(camera2OutputConfig.imageFormat).isEqualTo(IMAGE_FORMAT)
- assertThat(camera2OutputConfig.maxImages).isEqualTo(MAX_IMAGES)
- }
-
- @Test
- fun canBuildFromSurfaceOutputConfig() {
- // Arrange
- val surface = mock(Surface::class.java)
-
- // Act
- val builder = Camera2OutputConfigBuilder.newSurfaceConfig(surface)
- builder.setPhysicalCameraId(PHYSICAL_CAMERA_ID)
- builder.setSurfaceGroupId(SURFACE_GROUP_ID)
-
- // Assert
- val camera2OutputConfig = builder.build() as SurfaceOutputConfig
- assertThat(camera2OutputConfig.physicalCameraId).isEqualTo(PHYSICAL_CAMERA_ID)
- assertThat(camera2OutputConfig.surfaceGroupId).isEqualTo(SURFACE_GROUP_ID)
- assertThat(camera2OutputConfig.surface).isEqualTo(surface)
- }
-
- @Test
- fun canBuildFromMultiResolutionImageReaderOutputConfig() {
- // Act
- val builder = Camera2OutputConfigBuilder
- .newMultiResolutionImageReaderConfig(IMAGE_FORMAT, MAX_IMAGES)
- builder.setPhysicalCameraId(PHYSICAL_CAMERA_ID)
- builder.setSurfaceGroupId(SURFACE_GROUP_ID)
-
- // Assert
- val camera2OutputConfig = builder.build() as MultiResolutionImageReaderOutputConfig
- assertThat(camera2OutputConfig.physicalCameraId).isEqualTo(PHYSICAL_CAMERA_ID)
- assertThat(camera2OutputConfig.surfaceGroupId).isEqualTo(SURFACE_GROUP_ID)
- assertThat(camera2OutputConfig.imageFormat).isEqualTo(IMAGE_FORMAT)
- assertThat(camera2OutputConfig.maxImages).isEqualTo(MAX_IMAGES)
- }
-
- @Test
- fun canAddSurfaceSharing() {
- // Arrange
- val surface = mock(Surface::class.java)
- val builder = Camera2OutputConfigBuilder
- .newImageReaderConfig(SIZE, IMAGE_FORMAT, MAX_IMAGES)
- val outputConfig1 = Camera2OutputConfigBuilder.newSurfaceConfig(surface).build()
- val outputConfig2 = Camera2OutputConfigBuilder
- .newImageReaderConfig(SIZE, IMAGE_FORMAT, MAX_IMAGES).build()
-
- // Act
- builder.addSurfaceSharingOutputConfig(outputConfig1)
- builder.addSurfaceSharingOutputConfig(outputConfig2)
- val outputConfig = builder.build()
-
- // Assert
- assertThat(outputConfig.surfaceSharingOutputConfigs)
- .containsExactly(outputConfig1, outputConfig2)
- }
-}
\ No newline at end of file
diff --git a/camera/camera-extensions/src/test/java/androidx/camera/extensions/internal/sessionprocessor/Camera2OutputConfigConverterTest.kt b/camera/camera-extensions/src/test/java/androidx/camera/extensions/internal/sessionprocessor/Camera2OutputConfigConverterTest.kt
new file mode 100644
index 0000000..17d520a
--- /dev/null
+++ b/camera/camera-extensions/src/test/java/androidx/camera/extensions/internal/sessionprocessor/Camera2OutputConfigConverterTest.kt
@@ -0,0 +1,225 @@
+/*
+ * Copyright 2022 The Android Open Source Project
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package androidx.camera.extensions.internal.sessionprocessor
+
+import android.graphics.ImageFormat
+import android.os.Build
+import android.util.Size
+import android.view.Surface
+import androidx.camera.extensions.impl.advanced.Camera2OutputConfigImpl
+import androidx.camera.extensions.impl.advanced.ImageReaderOutputConfigImpl
+import androidx.camera.extensions.impl.advanced.MultiResolutionImageReaderOutputConfigImpl
+import androidx.camera.extensions.impl.advanced.SurfaceOutputConfigImpl
+import com.google.common.truth.Truth.assertThat
+import org.junit.Test
+import org.junit.runner.RunWith
+import org.mockito.Mockito.mock
+import org.robolectric.RobolectricTestRunner
+import org.robolectric.annotation.Config
+import org.robolectric.annotation.internal.DoNotInstrument
+
+private const val PHYSICAL_CAMERA_ID = "3"
+private const val SURFACE_GROUP_ID = 1
+private const val IMAGE_FORMAT = ImageFormat.YUV_420_888
+private const val MAX_IMAGES = 2
+private const val ID = 10
+private val SIZE = Size(640, 480)
+
+@RunWith(RobolectricTestRunner::class)
+@DoNotInstrument
+@Config(minSdk = Build.VERSION_CODES.LOLLIPOP)
+class Camera2OutputConfigConverterTest {
+ private val surface = mock(Surface::class.java)
+ private val sharedConfigImpls = listOf(
+ FakeImageReaderConfigImpl(
+ ID,
+ SURFACE_GROUP_ID,
+ PHYSICAL_CAMERA_ID,
+ emptyList(),
+ SIZE,
+ IMAGE_FORMAT,
+ MAX_IMAGES
+ ),
+ FakeSurfaceConfigImpl(
+ ID,
+ SURFACE_GROUP_ID,
+ PHYSICAL_CAMERA_ID,
+ emptyList(),
+ surface,
+ )
+ )
+
+ @Test
+ fun canConvertFromImpl_imageReaderOutputConfigImpl() {
+ // Arrange
+ val outputConfigImpl = FakeImageReaderConfigImpl(
+ ID,
+ SURFACE_GROUP_ID,
+ PHYSICAL_CAMERA_ID,
+ sharedConfigImpls,
+ SIZE,
+ IMAGE_FORMAT,
+ MAX_IMAGES
+ )
+
+ // Act
+ val outputConfig = Camera2OutputConfigConverter.fromImpl(outputConfigImpl)
+
+ // Assert
+ assertOutputConfigElements(outputConfig, outputConfigImpl)
+ }
+
+ @Test
+ fun canConvertFromImpl_surfaceOutputConfigImpl() {
+ // Arrange
+ val outputConfigImpl = FakeSurfaceConfigImpl(
+ ID,
+ SURFACE_GROUP_ID,
+ PHYSICAL_CAMERA_ID,
+ sharedConfigImpls,
+ surface,
+ )
+
+ // Act
+ val outputConfig = Camera2OutputConfigConverter.fromImpl(outputConfigImpl)
+
+ // Assert
+ assertOutputConfigElements(outputConfig, outputConfigImpl)
+ }
+
+ @Test
+ fun canConvertFromImpl_multiResImageOutputConfigImpl() {
+ // Arrange
+ val outputConfigImpl = FakeMultiResImageReaderConfigImpl(
+ ID,
+ SURFACE_GROUP_ID,
+ PHYSICAL_CAMERA_ID,
+ sharedConfigImpls,
+ IMAGE_FORMAT,
+ MAX_IMAGES
+ )
+
+ // Act
+ val outputConfig = Camera2OutputConfigConverter.fromImpl(outputConfigImpl)
+
+ // Assert
+ assertOutputConfigElements(outputConfig, outputConfigImpl)
+ }
+
+ @Test
+ fun canConvertFromImpl_surfaceSharingConfigsIsNull() {
+ // Arrange
+ val outputConfigImpl = FakeSurfaceConfigImpl(
+ ID,
+ SURFACE_GROUP_ID,
+ PHYSICAL_CAMERA_ID,
+ null,
+ surface,
+ )
+
+ // Act
+ val outputConfig = Camera2OutputConfigConverter.fromImpl(outputConfigImpl)
+
+ // Assert
+ assertOutputConfigElements(outputConfig, outputConfigImpl)
+ }
+
+ private fun assertOutputConfigElements(
+ outputConfig: Camera2OutputConfig,
+ outputConfigImpl: Camera2OutputConfigImpl
+ ) {
+ assertThat(outputConfig.id).isEqualTo(outputConfigImpl.id)
+ assertThat(outputConfig.physicalCameraId).isEqualTo(outputConfigImpl.physicalCameraId)
+ assertThat(outputConfig.surfaceGroupId).isEqualTo(outputConfigImpl.surfaceGroupId)
+
+ assertThat(outputConfig.surfaceSharingOutputConfigs.size)
+ .isEqualTo(outputConfigImpl.surfaceSharingOutputConfigs?.size ?: 0)
+ outputConfig.surfaceSharingOutputConfigs.forEachIndexed { index, sharingConfig ->
+ val sharedConfigImpl = outputConfigImpl.surfaceSharingOutputConfigs[index]
+ assertOutputConfigElements(sharingConfig, sharedConfigImpl)
+ }
+
+ when (outputConfig) {
+ is SurfaceOutputConfig -> {
+ val surfaceOutputConfigImpl = outputConfigImpl as SurfaceOutputConfigImpl
+ assertThat(outputConfig.surface).isEqualTo(surfaceOutputConfigImpl.surface)
+ }
+ is ImageReaderOutputConfig -> {
+ val imageReaderOutputConfigImpl = outputConfigImpl as ImageReaderOutputConfigImpl
+ assertThat(outputConfig.size).isEqualTo(imageReaderOutputConfigImpl.size)
+ assertThat(outputConfig.imageFormat)
+ .isEqualTo(imageReaderOutputConfigImpl.imageFormat)
+ assertThat(outputConfig.maxImages).isEqualTo(imageReaderOutputConfigImpl.maxImages)
+ }
+
+ is MultiResolutionImageReaderOutputConfig -> {
+ val multiResOutputConfigImpl = outputConfigImpl
+ as MultiResolutionImageReaderOutputConfigImpl
+ assertThat(outputConfig.imageFormat).isEqualTo(multiResOutputConfigImpl.imageFormat)
+ assertThat(outputConfig.maxImages).isEqualTo(multiResOutputConfigImpl.maxImages)
+ }
+ }
+ }
+
+ class FakeImageReaderConfigImpl(
+ private val id: Int,
+ private val surfaceGroupId: Int,
+ private val physicalCameraId: String?,
+ private val sharedOutputConfigImpl: List<Camera2OutputConfigImpl>?,
+ private val size: Size,
+ private val format: Int,
+ private val maxImages: Int,
+ ) : ImageReaderOutputConfigImpl {
+ override fun getId() = id
+ override fun getSurfaceGroupId() = surfaceGroupId
+ override fun getPhysicalCameraId() = physicalCameraId
+ override fun getSurfaceSharingOutputConfigs() = sharedOutputConfigImpl
+ override fun getSize() = size
+ override fun getImageFormat() = format
+ override fun getMaxImages() = maxImages
+ }
+
+ class FakeSurfaceConfigImpl(
+ private val id: Int,
+ private val surfaceGroupId: Int,
+ private val physicalCameraId: String?,
+ private val sharedOutputConfigImpl: List<Camera2OutputConfigImpl>?,
+ private val surface: Surface,
+ ) : SurfaceOutputConfigImpl {
+ override fun getId() = id
+ override fun getSurfaceGroupId() = surfaceGroupId
+ override fun getPhysicalCameraId() = physicalCameraId
+ override fun getSurfaceSharingOutputConfigs() = sharedOutputConfigImpl
+ override fun getSurface() = surface
+ }
+
+ class FakeMultiResImageReaderConfigImpl(
+ private val id: Int,
+ private val surfaceGroupId: Int,
+ private val physicalCameraId: String?,
+ private val sharedOutputConfigImpl: List<Camera2OutputConfigImpl>?,
+ private val format: Int,
+ private val maxImages: Int,
+ ) : MultiResolutionImageReaderOutputConfigImpl {
+ override fun getId() = id
+ override fun getSurfaceGroupId() = surfaceGroupId
+ override fun getPhysicalCameraId() = physicalCameraId
+ override fun getSurfaceSharingOutputConfigs() = sharedOutputConfigImpl
+ override fun getImageFormat() = format
+ override fun getMaxImages() = maxImages
+ }
+}
\ No newline at end of file
diff --git a/camera/camera-mlkit-vision/build.gradle b/camera/camera-mlkit-vision/build.gradle
index 20bf42f..e8c3d42 100644
--- a/camera/camera-mlkit-vision/build.gradle
+++ b/camera/camera-mlkit-vision/build.gradle
@@ -59,8 +59,7 @@
androidx {
name = "Jetpack Camera MLKit Vision Library"
- publish = Publish.NONE
- mavenVersion = LibraryVersions.Camera_MLKIT_VISION
+ publish = Publish.SNAPSHOT_AND_RELEASE
mavenGroup = LibraryGroups.CAMERA
inceptionYear = "2022"
runApiTasks = new RunApiTasks.Yes()
diff --git a/camera/camera-testing/src/main/java/androidx/camera/testing/CameraUtil.java b/camera/camera-testing/src/main/java/androidx/camera/testing/CameraUtil.java
index a16c209..94fd1b0 100644
--- a/camera/camera-testing/src/main/java/androidx/camera/testing/CameraUtil.java
+++ b/camera/camera-testing/src/main/java/androidx/camera/testing/CameraUtil.java
@@ -38,6 +38,7 @@
import android.os.HandlerThread;
import android.util.Log;
+import androidx.annotation.DoNotInline;
import androidx.annotation.GuardedBy;
import androidx.annotation.IntDef;
import androidx.annotation.NonNull;
@@ -72,8 +73,10 @@
import java.lang.annotation.RetentionPolicy;
import java.util.ArrayList;
import java.util.Arrays;
+import java.util.Collections;
import java.util.LinkedHashSet;
import java.util.List;
+import java.util.Set;
import java.util.concurrent.ExecutionException;
import java.util.concurrent.TimeUnit;
import java.util.concurrent.TimeoutException;
@@ -147,6 +150,32 @@
}
/**
+ * Returns physical camera ids of the specified camera id.
+ */
+ @NonNull
+ public static List<String> getPhysicalCameraIds(@NonNull String cameraId) {
+ try {
+ if (Build.VERSION.SDK_INT >= 28) {
+ return Collections.unmodifiableList(new ArrayList<>(Api28Impl.getPhysicalCameraId(
+ getCameraManager().getCameraCharacteristics(cameraId))));
+ } else {
+ return Collections.emptyList();
+ }
+
+ } catch (Exception e) {
+ return Collections.emptyList();
+ }
+ }
+
+ @RequiresApi(28)
+ private static class Api28Impl {
+ @DoNotInline
+ static Set<String> getPhysicalCameraId(CameraCharacteristics cameraCharacteristics) {
+ return cameraCharacteristics.getPhysicalCameraIds();
+ }
+ }
+
+ /**
* A container class used to hold a {@link CameraDevice}.
*
* <p>This class should contain a valid {@link CameraDevice} that can be retrieved with
diff --git a/camera/camera-testing/src/main/java/androidx/camera/testing/fakes/FakeCameraControl.java b/camera/camera-testing/src/main/java/androidx/camera/testing/fakes/FakeCameraControl.java
index 944b757..6330c4b 100644
--- a/camera/camera-testing/src/main/java/androidx/camera/testing/fakes/FakeCameraControl.java
+++ b/camera/camera-testing/src/main/java/androidx/camera/testing/fakes/FakeCameraControl.java
@@ -62,7 +62,7 @@
private final ArrayList<CallbackToFutureAdapter.Completer<Void>> mSubmittedCompleterList =
new ArrayList<>();
- private boolean mIsZslDisabled = true;
+ private boolean mIsZslDisabledByUseCaseConfig = false;
private boolean mIsZslConfigAdded = false;
public FakeCameraControl(@NonNull ControlUpdateCallback controlUpdateCallback) {
@@ -131,8 +131,13 @@
}
@Override
- public void setZslDisabled(boolean disabled) {
- mIsZslDisabled = disabled;
+ public void setZslDisabledByUserCaseConfig(boolean disabled) {
+ mIsZslDisabledByUseCaseConfig = disabled;
+ }
+
+ @Override
+ public boolean isZslDisabledByByUserCaseConfig() {
+ return mIsZslDisabledByUseCaseConfig;
}
@Override
@@ -143,14 +148,6 @@
}
/**
- * Checks if Zsl is disabled. Only for testing purpose.
- * @return
- */
- public boolean isZslDisabled() {
- return mIsZslDisabled;
- }
-
- /**
* Checks if {@link FakeCameraControl#addZslConfig(Size, SessionConfig.Builder)} is
* triggered. Only for testing purpose.
* @return
diff --git a/camera/camera-testing/src/main/java/androidx/camera/testing/fakes/FakeCameraInfoInternal.java b/camera/camera-testing/src/main/java/androidx/camera/testing/fakes/FakeCameraInfoInternal.java
index bfb44e5..52bab1d 100644
--- a/camera/camera-testing/src/main/java/androidx/camera/testing/fakes/FakeCameraInfoInternal.java
+++ b/camera/camera-testing/src/main/java/androidx/camera/testing/fakes/FakeCameraInfoInternal.java
@@ -193,6 +193,11 @@
}
@Override
+ public boolean isZslSupported() {
+ return false;
+ }
+
+ @Override
public boolean isYuvReprocessingSupported() {
return mIsYuvReprocessingSupported;
}
diff --git a/camera/camera-testing/src/main/java/androidx/camera/testing/fakes/FakeUseCaseConfig.java b/camera/camera-testing/src/main/java/androidx/camera/testing/fakes/FakeUseCaseConfig.java
index 2393076..ede2bba 100644
--- a/camera/camera-testing/src/main/java/androidx/camera/testing/fakes/FakeUseCaseConfig.java
+++ b/camera/camera-testing/src/main/java/androidx/camera/testing/fakes/FakeUseCaseConfig.java
@@ -221,5 +221,12 @@
getMutableConfig().insertOption(OPTION_INPUT_FORMAT, imageFormat);
return this;
}
+
+ @NonNull
+ @Override
+ public Builder setZslDisabled(boolean disabled) {
+ getMutableConfig().insertOption(OPTION_ZSL_DISABLED, disabled);
+ return this;
+ }
}
}
diff --git a/camera/camera-testlib-extensions/src/main/java/androidx/camera/extensions/impl/AutoImageCaptureExtenderImpl.java b/camera/camera-testlib-extensions/src/main/java/androidx/camera/extensions/impl/AutoImageCaptureExtenderImpl.java
index e1f6033..ceef8d19 100755
--- a/camera/camera-testlib-extensions/src/main/java/androidx/camera/extensions/impl/AutoImageCaptureExtenderImpl.java
+++ b/camera/camera-testlib-extensions/src/main/java/androidx/camera/extensions/impl/AutoImageCaptureExtenderImpl.java
@@ -15,9 +15,11 @@
*/
package androidx.camera.extensions.impl;
+import android.annotation.SuppressLint;
import android.content.Context;
import android.hardware.camera2.CameraCharacteristics;
import android.hardware.camera2.CaptureRequest;
+import android.hardware.camera2.CaptureResult;
import android.hardware.camera2.TotalCaptureResult;
import android.media.Image;
import android.media.ImageWriter;
@@ -36,6 +38,7 @@
import java.util.ArrayList;
import java.util.List;
import java.util.Map;
+import java.util.concurrent.Executor;
/**
* Implementation for auto image capture use case.
@@ -46,6 +49,7 @@
* @since 1.0
*/
@RequiresApi(21) // TODO(b/200306659): Remove and replace with annotation on package-info.java
+@SuppressLint("UnknownNullness")
public final class AutoImageCaptureExtenderImpl implements ImageCaptureExtenderImpl {
private static final String TAG = "AutoICExtender";
private static final int DEFAULT_STAGE_ID = 0;
@@ -204,5 +208,21 @@
public void onImageFormatUpdate(int imageFormat) {
}
+
+ @Override
+ public void process(Map<Integer, Pair<Image, TotalCaptureResult>> results,
+ ProcessResultImpl resultCallback, Executor executor) {
+
+ }
+ }
+
+ @Override
+ public List<CaptureRequest.Key> getAvailableCaptureRequestKeys() {
+ return null;
+ }
+
+ @Override
+ public List<CaptureResult.Key> getAvailableCaptureResultKeys() {
+ return null;
}
}
diff --git a/camera/camera-testlib-extensions/src/main/java/androidx/camera/extensions/impl/BeautyImageCaptureExtenderImpl.java b/camera/camera-testlib-extensions/src/main/java/androidx/camera/extensions/impl/BeautyImageCaptureExtenderImpl.java
index 89871c8..6d44ebe 100755
--- a/camera/camera-testlib-extensions/src/main/java/androidx/camera/extensions/impl/BeautyImageCaptureExtenderImpl.java
+++ b/camera/camera-testlib-extensions/src/main/java/androidx/camera/extensions/impl/BeautyImageCaptureExtenderImpl.java
@@ -15,10 +15,12 @@
*/
package androidx.camera.extensions.impl;
+import android.annotation.SuppressLint;
import android.content.Context;
import android.graphics.ImageFormat;
import android.hardware.camera2.CameraCharacteristics;
import android.hardware.camera2.CaptureRequest;
+import android.hardware.camera2.CaptureResult;
import android.hardware.camera2.TotalCaptureResult;
import android.hardware.camera2.params.StreamConfigurationMap;
import android.media.Image;
@@ -38,6 +40,7 @@
import java.util.ArrayList;
import java.util.List;
import java.util.Map;
+import java.util.concurrent.Executor;
/**
* Implementation for beauty image capture use case.
@@ -48,6 +51,7 @@
* @since 1.0
*/
@RequiresApi(21) // TODO(b/200306659): Remove and replace with annotation on package-info.java
+@SuppressLint("UnknownNullness")
public final class BeautyImageCaptureExtenderImpl implements ImageCaptureExtenderImpl {
private static final String TAG = "BeautyICExtender";
private static final int DEFAULT_STAGE_ID = 0;
@@ -222,6 +226,11 @@
}
@Override
+ public void process(Map<Integer, Pair<Image, TotalCaptureResult>> results,
+ ProcessResultImpl resultCallback, Executor executor) {
+ }
+
+ @Override
public void onResolutionUpdate(Size size) {
}
@@ -231,4 +240,14 @@
}
}
+
+ @Override
+ public List<CaptureRequest.Key> getAvailableCaptureRequestKeys() {
+ return null;
+ }
+
+ @Override
+ public List<CaptureResult.Key> getAvailableCaptureResultKeys() {
+ return null;
+ }
}
diff --git a/camera/camera-testlib-extensions/src/main/java/androidx/camera/extensions/impl/BokehImageCaptureExtenderImpl.java b/camera/camera-testlib-extensions/src/main/java/androidx/camera/extensions/impl/BokehImageCaptureExtenderImpl.java
index df88d11..5bfb538 100644
--- a/camera/camera-testlib-extensions/src/main/java/androidx/camera/extensions/impl/BokehImageCaptureExtenderImpl.java
+++ b/camera/camera-testlib-extensions/src/main/java/androidx/camera/extensions/impl/BokehImageCaptureExtenderImpl.java
@@ -15,9 +15,11 @@
*/
package androidx.camera.extensions.impl;
+import android.annotation.SuppressLint;
import android.content.Context;
import android.hardware.camera2.CameraCharacteristics;
import android.hardware.camera2.CaptureRequest;
+import android.hardware.camera2.CaptureResult;
import android.hardware.camera2.TotalCaptureResult;
import android.media.Image;
import android.media.ImageWriter;
@@ -36,6 +38,7 @@
import java.util.ArrayList;
import java.util.List;
import java.util.Map;
+import java.util.concurrent.Executor;
/**
* Implementation for bokeh image capture use case.
@@ -46,6 +49,7 @@
* @since 1.0
*/
@RequiresApi(21) // TODO(b/200306659): Remove and replace with annotation on package-info.java
+@SuppressLint("UnknownNullness")
public final class BokehImageCaptureExtenderImpl implements ImageCaptureExtenderImpl {
private static final String TAG = "BokehICExtender";
private static final int DEFAULT_STAGE_ID = 0;
@@ -196,6 +200,12 @@
}
@Override
+ public void process(Map<Integer, Pair<Image, TotalCaptureResult>> results,
+ ProcessResultImpl resultCallback, Executor executor) {
+
+ }
+
+ @Override
public void onResolutionUpdate(Size size) {
}
@@ -205,4 +215,14 @@
}
}
+
+ @Override
+ public List<CaptureRequest.Key> getAvailableCaptureRequestKeys() {
+ return null;
+ }
+
+ @Override
+ public List<CaptureResult.Key> getAvailableCaptureResultKeys() {
+ return null;
+ }
}
diff --git a/camera/camera-testlib-extensions/src/main/java/androidx/camera/extensions/impl/CaptureProcessorImpl.java b/camera/camera-testlib-extensions/src/main/java/androidx/camera/extensions/impl/CaptureProcessorImpl.java
index 68731c4..8518283 100644
--- a/camera/camera-testlib-extensions/src/main/java/androidx/camera/extensions/impl/CaptureProcessorImpl.java
+++ b/camera/camera-testlib-extensions/src/main/java/androidx/camera/extensions/impl/CaptureProcessorImpl.java
@@ -16,33 +16,26 @@
package androidx.camera.extensions.impl;
+import android.annotation.SuppressLint;
import android.graphics.ImageFormat;
import android.hardware.camera2.TotalCaptureResult;
import android.media.Image;
import android.util.Pair;
-import android.util.Size;
import android.view.Surface;
import androidx.annotation.RequiresApi;
import java.util.Map;
+import java.util.concurrent.Executor;
/**
* The interface for processing a set of {@link Image}s that have captured.
*
* @since 1.0
*/
+@SuppressLint("UnknownNullness")
@RequiresApi(21) // TODO(b/200306659): Remove and replace with annotation on package-info.java
-public interface CaptureProcessorImpl {
- /**
- * This gets called to update where the CaptureProcessor should write the output of {@link
- * #process(Map)}.
- *
- * @param surface The {@link Surface} that the CaptureProcessor should write data into.
- * @param imageFormat The format of that the surface expects.
- */
- void onOutputSurface(Surface surface, int imageFormat);
-
+public interface CaptureProcessorImpl extends ProcessorImpl {
/**
* Process a set images captured that were requested.
*
@@ -56,20 +49,21 @@
void process(Map<Integer, Pair<Image, TotalCaptureResult>> results);
/**
- * This callback will be invoked when CameraX changes the configured input resolution. After
- * this call, {@link CaptureProcessorImpl} should expect any {@link Image} received as input
- * to be at the specified resolution.
+ * Process a set images captured that were requested.
*
- * @param size for the surface.
- */
- void onResolutionUpdate(Size size);
-
- /**
- * This callback will be invoked when CameraX changes the configured input image format.
- * After this call, {@link CaptureProcessorImpl} should expect any {@link Image} received as
- * input to have the specified image format.
+ * <p> The result of the processing step should be written to the {@link Surface} that was
+ * received by {@link #onOutputSurface(Surface, int)}.
*
- * @param imageFormat for the surface.
+ * @param results The map of {@link ImageFormat#YUV_420_888} format images and metadata
+ * to process. The {@link Image} that are contained within the map will
+ * become invalid after this method completes, so no references to them
+ * should be kept.
+ * @param resultCallback Capture result callback to be called once the capture result
+ * values of the processed image are ready.
+ * @param executor The executor to run the callback on. If null then the callback will
+ * run on any arbitrary executor.
+ * @since 1.3
*/
- void onImageFormatUpdate(int imageFormat);
+ void process(Map<Integer, Pair<Image, TotalCaptureResult>> results,
+ ProcessResultImpl resultCallback, Executor executor);
}
diff --git a/camera/camera-testlib-extensions/src/main/java/androidx/camera/extensions/impl/ExtensionVersionImpl.java b/camera/camera-testlib-extensions/src/main/java/androidx/camera/extensions/impl/ExtensionVersionImpl.java
index a524aea..a438fdc 100644
--- a/camera/camera-testlib-extensions/src/main/java/androidx/camera/extensions/impl/ExtensionVersionImpl.java
+++ b/camera/camera-testlib-extensions/src/main/java/androidx/camera/extensions/impl/ExtensionVersionImpl.java
@@ -63,4 +63,27 @@
Log.d(TAG, "Extension device library version " + VERSION);
return VERSION;
}
+
+ /**
+ * Specify whether or not CameraX should invoke the AdvancedExtenderImpl instead of
+ * PreviewExtenderImpl/ImageCaptureExtenderImpl.
+ *
+ * <p>Starting from version 1.2, a set of alternative interfaces called advanced extender for
+ * implementing extensions are provided to OEMs as another option. OEMs can continue using
+ * previous interfaces (PreviewExtenderImpl/ImageCaptureExtenderImpl, also called basic
+ * extender).
+ *
+ * <p>OEMs should return false here if only basic extender is implemented. When returning true,
+ * CameraX will invoke the AdvancedExtenderImpl implementation in advanced package for all
+ * types of extension modes.
+ *
+ * <p>ExtensionVersionImpl, InitializerImpl will still be called for both basic and advanced
+ * extender implementation paths.
+ *
+ * @return true if AdvancedExtenderImpl is implemented
+ * @since 1.2
+ */
+ public boolean isAdvancedExtenderImplemented() {
+ return false;
+ }
}
diff --git a/camera/camera-testlib-extensions/src/main/java/androidx/camera/extensions/impl/HdrImageCaptureExtenderImpl.java b/camera/camera-testlib-extensions/src/main/java/androidx/camera/extensions/impl/HdrImageCaptureExtenderImpl.java
index 8469b34..fe09802 100644
--- a/camera/camera-testlib-extensions/src/main/java/androidx/camera/extensions/impl/HdrImageCaptureExtenderImpl.java
+++ b/camera/camera-testlib-extensions/src/main/java/androidx/camera/extensions/impl/HdrImageCaptureExtenderImpl.java
@@ -17,9 +17,11 @@
import static android.hardware.camera2.CameraMetadata.CONTROL_AE_MODE_OFF;
+import android.annotation.SuppressLint;
import android.content.Context;
import android.hardware.camera2.CameraCharacteristics;
import android.hardware.camera2.CaptureRequest;
+import android.hardware.camera2.CaptureResult;
import android.hardware.camera2.TotalCaptureResult;
import android.media.Image;
import android.media.ImageWriter;
@@ -38,6 +40,7 @@
import java.util.ArrayList;
import java.util.List;
import java.util.Map;
+import java.util.concurrent.Executor;
import java.util.concurrent.TimeUnit;
/**
@@ -49,6 +52,7 @@
* @since 1.0
*/
@RequiresApi(21) // TODO(b/200306659): Remove and replace with annotation on package-info.java
+@SuppressLint("UnknownNullness")
public final class HdrImageCaptureExtenderImpl implements ImageCaptureExtenderImpl {
private static final String TAG = "HdrImageCaptureExtender";
private static final int UNDER_STAGE_ID = 0;
@@ -293,6 +297,12 @@
}
@Override
+ public void process(Map<Integer, Pair<Image, TotalCaptureResult>> results,
+ ProcessResultImpl resultCallback, Executor executor) {
+
+ }
+
+ @Override
public void onResolutionUpdate(Size size) {
}
@@ -302,4 +312,14 @@
}
}
+
+ @Override
+ public List<CaptureRequest.Key> getAvailableCaptureRequestKeys() {
+ return null;
+ }
+
+ @Override
+ public List<CaptureResult.Key> getAvailableCaptureResultKeys() {
+ return null;
+ }
}
diff --git a/camera/camera-testlib-extensions/src/main/java/androidx/camera/extensions/impl/HdrPreviewExtenderImpl.java b/camera/camera-testlib-extensions/src/main/java/androidx/camera/extensions/impl/HdrPreviewExtenderImpl.java
index eb02fe9..5af32e2 100644
--- a/camera/camera-testlib-extensions/src/main/java/androidx/camera/extensions/impl/HdrPreviewExtenderImpl.java
+++ b/camera/camera-testlib-extensions/src/main/java/androidx/camera/extensions/impl/HdrPreviewExtenderImpl.java
@@ -32,6 +32,7 @@
import java.util.List;
import java.util.concurrent.ExecutionException;
+import java.util.concurrent.Executor;
import java.util.concurrent.FutureTask;
import java.util.concurrent.RunnableFuture;
@@ -160,6 +161,12 @@
}
@Override
+ public void process(Image image, TotalCaptureResult result,
+ ProcessResultImpl resultCallback, Executor executor) {
+
+ }
+
+ @Override
public void onResolutionUpdate(Size size) {
mSize = size;
setWindowSurface();
@@ -206,6 +213,5 @@
// handle exception
}
}
-
}
}
diff --git a/camera/camera-testlib-extensions/src/main/java/androidx/camera/extensions/impl/ImageCaptureExtenderImpl.java b/camera/camera-testlib-extensions/src/main/java/androidx/camera/extensions/impl/ImageCaptureExtenderImpl.java
index f47a1a0..6d0b4f4 100644
--- a/camera/camera-testlib-extensions/src/main/java/androidx/camera/extensions/impl/ImageCaptureExtenderImpl.java
+++ b/camera/camera-testlib-extensions/src/main/java/androidx/camera/extensions/impl/ImageCaptureExtenderImpl.java
@@ -16,13 +16,15 @@
package androidx.camera.extensions.impl;
+import android.annotation.SuppressLint;
import android.graphics.ImageFormat;
import android.hardware.camera2.CameraCharacteristics;
+import android.hardware.camera2.CaptureRequest;
+import android.hardware.camera2.CaptureResult;
import android.util.Pair;
import android.util.Range;
import android.util.Size;
-import androidx.annotation.Nullable;
import androidx.annotation.RequiresApi;
import java.util.List;
@@ -33,6 +35,7 @@
* @since 1.0
*/
@RequiresApi(21) // TODO(b/200306659): Remove and replace with annotation on package-info.java
+@SuppressLint("UnknownNullness")
public interface ImageCaptureExtenderImpl extends ExtenderStateListener {
/**
* Indicates whether the extension is supported on the device.
@@ -78,27 +81,85 @@
* returned list is not null, it will be used to find the best resolutions combination for
* the bound use cases.
*
- * @return the customized supported resolutions.
+ * @return the customized supported resolutions, or null to support all sizes retrieved from
+ * {@link android.hardware.camera2.params.StreamConfigurationMap}.
* @since 1.1
*/
- @Nullable
List<Pair<Integer, Size[]>> getSupportedResolutions();
/**
* Returns the estimated capture latency range in milliseconds for the target capture
* resolution.
*
- * <p> This includes the time spent processing the multi-frame capture request along with any
- * additional time for encoding of the processed buffer in the framework if necessary.
+ * <p>This includes the time spent processing the multi-frame capture request along with any
+ * additional time for encoding of the processed buffer in the framework if necessary.</p>
*
* @param captureOutputSize size of the capture output surface. If it is null or not in the
* supported output sizes, maximum capture output size is used for
* the estimation.
- * @return the range of estimated minimal and maximal capture latency in milliseconds.
- * Returns null if no capture latency info can be provided.
+ * @return the range of estimated minimal and maximal capture latency in milliseconds, or
+ * null if no capture latency info can be provided.
* @since 1.2
*/
- @Nullable
- Range<Long> getEstimatedCaptureLatencyRange(@Nullable Size captureOutputSize);
-}
+ Range<Long> getEstimatedCaptureLatencyRange(Size captureOutputSize);
+ /**
+ * Return a list of orthogonal capture request keys.
+ *
+ * <p>Any keys included in the list will be configurable by clients of the extension and will
+ * affect the extension functionality.</p>
+ *
+ * <p>Do note that the list of keys applies to {@link PreviewExtenderImpl} as well.</p>
+ *
+ * <p>Also note that the keys {@link CaptureRequest#JPEG_QUALITY} and
+ * {@link CaptureRequest#JPEG_ORIENTATION} are always supported regardless being added in the
+ * list or not. To support common camera operations like zoom, tap-to-focus, flash and
+ * exposure compensation, we recommend supporting the following keys if possible.
+ * <pre>
+ * zoom: {@link CaptureRequest#CONTROL_ZOOM_RATIO}
+ * {@link CaptureRequest#SCALER_CROP_REGION}
+ * tap-to-focus:
+ * {@link CaptureRequest#CONTROL_AF_MODE}
+ * {@link CaptureRequest#CONTROL_AF_TRIGGER}
+ * {@link CaptureRequest#CONTROL_AF_REGIONS}
+ * {@link CaptureRequest#CONTROL_AE_REGIONS}
+ * {@link CaptureRequest#CONTROL_AWB_REGIONS}
+ * flash:
+ * {@link CaptureRequest#CONTROL_AE_MODE}
+ * {@link CaptureRequest#CONTROL_AE_PRECAPTURE_TRIGGER}
+ * {@link CaptureRequest#FLASH_MODE}
+ * exposure compensation:
+ * {@link CaptureRequest#CONTROL_AE_EXPOSURE_COMPENSATION}
+ * </pre>
+ * On basic extensions that implement 1.2 or prior version, the above keys are all supported
+ * explicitly. When migrating from 1.2 or prior to 1.3, please note that both CameraX and
+ * Camera2 will honor the returned list and support only the keys contained in it. For
+ * example, if OEM decides to return only {@link CaptureRequest#CONTROL_ZOOM_RATIO} and
+ * {@link CaptureRequest#SCALER_CROP_REGION} in the 1.3 implementation, it means only zoom is
+ * supported for the app while tap-to-focus , flash and exposure compensation are not allowed.
+ *
+ * @return List of supported orthogonal capture keys, or an empty list if no capture settings
+ * are not supported.
+ * @since 1.3
+ */
+ List<CaptureRequest.Key> getAvailableCaptureRequestKeys();
+
+ /**
+ * Return a list of supported capture result keys.
+ *
+ * <p>Any keys included in this list must be available as part of the registered
+ * {@link ProcessResultImpl} callback. In case frame processing is not supported,
+ * then the Camera2/CameraX framework will use the list to filter and notify camera clients
+ * using the respective camera results.</p>
+ *
+ * <p>At the very minimum, it is expected that the result key list is a superset of the
+ * capture request keys.</p>
+ *
+ * <p>Do note that the list of keys applies to {@link PreviewExtenderImpl} as well.</p>
+ *
+ * @return List of supported capture result keys, or an empty list if capture results are not
+ * supported.
+ * @since 1.3
+ */
+ List<CaptureResult.Key> getAvailableCaptureResultKeys();
+}
diff --git a/camera/camera-testlib-extensions/src/main/java/androidx/camera/extensions/impl/NightImageCaptureExtenderImpl.java b/camera/camera-testlib-extensions/src/main/java/androidx/camera/extensions/impl/NightImageCaptureExtenderImpl.java
index 6d84fa0..c106921 100755
--- a/camera/camera-testlib-extensions/src/main/java/androidx/camera/extensions/impl/NightImageCaptureExtenderImpl.java
+++ b/camera/camera-testlib-extensions/src/main/java/androidx/camera/extensions/impl/NightImageCaptureExtenderImpl.java
@@ -15,9 +15,11 @@
*/
package androidx.camera.extensions.impl;
+import android.annotation.SuppressLint;
import android.content.Context;
import android.hardware.camera2.CameraCharacteristics;
import android.hardware.camera2.CaptureRequest;
+import android.hardware.camera2.CaptureResult;
import android.hardware.camera2.TotalCaptureResult;
import android.media.Image;
import android.media.ImageWriter;
@@ -36,6 +38,7 @@
import java.util.ArrayList;
import java.util.List;
import java.util.Map;
+import java.util.concurrent.Executor;
/**
* Implementation for night image capture use case.
@@ -46,6 +49,7 @@
* @since 1.0
*/
@RequiresApi(21) // TODO(b/200306659): Remove and replace with annotation on package-info.java
+@SuppressLint("UnknownNullness")
public final class NightImageCaptureExtenderImpl implements ImageCaptureExtenderImpl {
private static final String TAG = "NightICExtender";
private static final int DEFAULT_STAGE_ID = 0;
@@ -157,8 +161,8 @@
}
@RequiresApi(23)
- static final class NightImageCaptureExtenderCaptureProcessorImpl implements
- CaptureProcessorImpl {
+ static final class NightImageCaptureExtenderCaptureProcessorImpl
+ implements CaptureProcessorImpl {
private ImageWriter mImageWriter;
@Override
@@ -196,13 +200,26 @@
}
@Override
- public void onResolutionUpdate(Size size) {
+ public void process(Map<Integer, Pair<Image, TotalCaptureResult>> results,
+ ProcessResultImpl resultCallback, Executor executor) {
+ }
+ @Override
+ public void onResolutionUpdate(Size size) {
}
@Override
public void onImageFormatUpdate(int imageFormat) {
-
}
}
+
+ @Override
+ public List<CaptureRequest.Key> getAvailableCaptureRequestKeys() {
+ return null;
+ }
+
+ @Override
+ public List<CaptureResult.Key> getAvailableCaptureResultKeys() {
+ return null;
+ }
}
diff --git a/camera/camera-testlib-extensions/src/main/java/androidx/camera/extensions/impl/NoOpCaptureProcessorImpl.java b/camera/camera-testlib-extensions/src/main/java/androidx/camera/extensions/impl/NoOpCaptureProcessorImpl.java
index 9645c43..a84fed7 100644
--- a/camera/camera-testlib-extensions/src/main/java/androidx/camera/extensions/impl/NoOpCaptureProcessorImpl.java
+++ b/camera/camera-testlib-extensions/src/main/java/androidx/camera/extensions/impl/NoOpCaptureProcessorImpl.java
@@ -26,6 +26,7 @@
import androidx.annotation.RequiresApi;
import java.util.Map;
+import java.util.concurrent.Executor;
@RequiresApi(21) // TODO(b/200306659): Remove and replace with annotation on package-info.java
final class NoOpCaptureProcessorImpl implements CaptureProcessorImpl {
@@ -48,4 +49,10 @@
public void onImageFormatUpdate(int imageFormat) {
}
+
+ @Override
+ public void process(Map<Integer, Pair<Image, TotalCaptureResult>> results,
+ ProcessResultImpl resultCallback, Executor executor) {
+
+ }
}
diff --git a/camera/camera-testlib-extensions/src/main/java/androidx/camera/extensions/impl/PreviewImageProcessorImpl.java b/camera/camera-testlib-extensions/src/main/java/androidx/camera/extensions/impl/PreviewImageProcessorImpl.java
index 60d3f77..ff6ed88 100644
--- a/camera/camera-testlib-extensions/src/main/java/androidx/camera/extensions/impl/PreviewImageProcessorImpl.java
+++ b/camera/camera-testlib-extensions/src/main/java/androidx/camera/extensions/impl/PreviewImageProcessorImpl.java
@@ -16,19 +16,23 @@
package androidx.camera.extensions.impl;
+import android.annotation.SuppressLint;
import android.graphics.ImageFormat;
import android.hardware.camera2.TotalCaptureResult;
import android.media.Image;
import androidx.annotation.RequiresApi;
+import java.util.concurrent.Executor;
+
/**
- * Processing a single {@link Image} and {@link TotalCaptureResult} to produce an output to a
+ * Processes a single {@link Image} and {@link TotalCaptureResult} to produce an output to a
* stream.
*
* @since 1.0
*/
@RequiresApi(21) // TODO(b/200306659): Remove and replace with annotation on package-info.java
+@SuppressLint("UnknownNullness")
public interface PreviewImageProcessorImpl extends ProcessorImpl {
/**
* Processes the requested image capture.
@@ -41,5 +45,23 @@
* @param result The metadata associated with the image to process.
*/
void process(Image image, TotalCaptureResult result);
-}
+ /**
+ * Processes the requested image capture.
+ *
+ * <p> The result of the processing step should be written to the {@link android.view.Surface}
+ * that was received by {@link ProcessorImpl#onOutputSurface(android.view.Surface, int)}.
+ *
+ * @param image The {@link ImageFormat#YUV_420_888} format image to process. This will
+ * be invalid after the method completes so no reference to it should be
+ * kept.
+ * @param result The metadata associated with the image to process.
+ * @param resultCallback Capture result callback to be called once the capture result
+ * values of the processed image are ready.
+ * @param executor The executor to run the callback on. If null then the callback will
+ * run on any arbitrary executor.
+ * @since 1.3
+ */
+ void process(Image image, TotalCaptureResult result, ProcessResultImpl resultCallback,
+ Executor executor);
+}
diff --git a/camera/camera-testlib-extensions/src/main/java/androidx/camera/extensions/impl/ProcessResultImpl.java b/camera/camera-testlib-extensions/src/main/java/androidx/camera/extensions/impl/ProcessResultImpl.java
new file mode 100644
index 0000000..d0e3605
--- /dev/null
+++ b/camera/camera-testlib-extensions/src/main/java/androidx/camera/extensions/impl/ProcessResultImpl.java
@@ -0,0 +1,45 @@
+/*
+ * Copyright 2022 The Android Open Source Project
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package androidx.camera.extensions.impl;
+
+import android.annotation.SuppressLint;
+import android.hardware.camera2.CaptureResult;
+import android.util.Pair;
+
+import java.util.List;
+
+/**
+ * Allows clients to receive information about the capture result values of processed frames.
+ *
+ * @since 1.3
+ */
+@SuppressLint("UnknownNullness")
+public interface ProcessResultImpl {
+ /**
+ * Capture result callback that needs to be called when the process capture results are
+ * ready as part of frame post-processing.
+ *
+ * @param shutterTimestamp The shutter time stamp of the processed frame.
+ * @param result Key value pairs for all supported capture results. Do note that
+ * if results 'android.jpeg.quality' and 'android.jpeg.orientation'
+ * are present in the process capture input results, then the values
+ * must also be passed as part of this callback. Both Camera2 and
+ * CameraX guarantee that those two settings and results are always
+ * supported and applied by the corresponding framework.
+ */
+ void onCaptureCompleted(long shutterTimestamp, List<Pair<CaptureResult.Key, Object>> result);
+}
diff --git a/camera/camera-testlib-extensions/src/main/java/androidx/camera/extensions/impl/advanced/AdvancedExtenderImpl.java b/camera/camera-testlib-extensions/src/main/java/androidx/camera/extensions/impl/advanced/AdvancedExtenderImpl.java
new file mode 100644
index 0000000..465bfe8
--- /dev/null
+++ b/camera/camera-testlib-extensions/src/main/java/androidx/camera/extensions/impl/advanced/AdvancedExtenderImpl.java
@@ -0,0 +1,188 @@
+/*
+ * Copyright 2021 The Android Open Source Project
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package androidx.camera.extensions.impl.advanced;
+
+import android.annotation.SuppressLint;
+import android.hardware.camera2.CameraCharacteristics;
+import android.hardware.camera2.CaptureRequest;
+import android.hardware.camera2.CaptureResult;
+import android.util.Range;
+import android.util.Size;
+
+import androidx.camera.extensions.impl.ExtensionVersionImpl;
+
+import java.util.List;
+import java.util.Map;
+
+/**
+ * Advanced OEM contract for implementing Extensions. ImageCapture/Preview Extensions are both
+ * implemented on this interface.
+ *
+ * <p>This advanced OEM contract empowers OEM to gain access to more Camera2 capability. This
+ * includes: (1) Add custom surfaces with specific formats like YUV, RAW, RAW_DEPTH. (2) Access to
+ * the capture request callbacks as well as all the images retrieved of various image formats. (3)
+ * Able to triggers single or repeating request with the capabilities to specify target surfaces,
+ * template id and parameters.
+ *
+ * <p>OEM needs to implement it with class name HdrAdvancedExtenderImpl for HDR,
+ * NightAdvancedExtenderImpl for night mode, BeautyAdvancedExtenderImpl for beauty mode,
+ * BokehAdvancedExtenderImpl for bokeh mode and AutoAdvancedExtenderImpl for auto mode.
+ *
+ * <p>OEMs are required to return true in
+ * {@link ExtensionVersionImpl#isAdvancedExtenderImplemented()} in order to request CameraX to
+ * use advanced extender over basic extender. OEM is okay to implement advanced
+ * extender only Or basic extender only. However the caveat of advanced-only implementation is,
+ * extensions will be unavailable on the apps using interfaces prior to 1.2.
+ *
+ * @since 1.2
+ */
+@SuppressLint("UnknownNullness")
+public interface AdvancedExtenderImpl {
+
+ /**
+ * Indicates whether the extension is supported on the device.
+ *
+ * @param cameraId The camera2 id string of the camera.
+ * @param characteristicsMap A map consisting of the camera ids and the
+ * {@link CameraCharacteristics}s. For every camera, the map
+ * contains at least the CameraCharacteristics for the camera id.
+ * If the camera is logical camera, it will also contain associated
+ * physical camera ids and their CameraCharacteristics.
+ * @return true if the extension is supported, otherwise false
+ */
+ boolean isExtensionAvailable(String cameraId,
+ Map<String, CameraCharacteristics> characteristicsMap);
+
+ /**
+ * Initializes the extender to be used with the specified camera.
+ *
+ * <p>This should be called before any other method on the extender. The exception is {@link
+ * #isExtensionAvailable}.
+ *
+ * @param cameraId The camera2 id string of the camera.
+ * @param characteristicsMap A map consisting of the camera ids and the
+ * {@link CameraCharacteristics}s. For every camera, the map
+ * contains at least the CameraCharacteristics for the camera id.
+ * If the camera is logical camera, it will also contain associated
+ * physical camera ids and their CameraCharacteristics.
+ */
+ void init(String cameraId, Map<String, CameraCharacteristics> characteristicsMap);
+
+ /**
+ * Returns the estimated capture latency range in milliseconds for the
+ * target capture resolution during the calls to
+ * {@link SessionProcessorImpl#startCapture}. This
+ * includes the time spent processing the multi-frame capture request along with any additional
+ * time for encoding of the processed buffer in the framework if necessary.
+ *
+ * @param cameraId the camera id
+ * @param captureOutputSize size of the capture output surface. If it is null or not in the
+ * supported output sizes, maximum capture output size is used for
+ * the estimation.
+ * @param imageFormat the image format of the capture output surface.
+ * @return the range of estimated minimal and maximal capture latency in milliseconds.
+ * Returns null if no capture latency info can be provided.
+ */
+ Range<Long> getEstimatedCaptureLatencyRange(String cameraId,
+ Size captureOutputSize, int imageFormat);
+
+ /**
+ * Returns supported output format/size map for preview. The format could be PRIVATE or
+ * YUV_420_888. OEM must support PRIVATE format at least. CameraX will only use resolutions
+ * for preview from the list.
+ *
+ * <p>The preview surface format in the CameraCaptureSession may not be identical to the
+ * supported preview output format returned here. Like in the basic extender interface, the
+ * preview PRIVATE surface could be added to the CameraCaptureSession and OEM processes it in
+ * the HAL. Alternatively OEM can configure a intermediate YUV surface of the same size and
+ * writes the output to the preview output surface.
+ */
+ Map<Integer, List<Size>> getSupportedPreviewOutputResolutions(String cameraId);
+
+ /**
+ * Returns supported output format/size map for image capture. OEM is required to support
+ * both JPEG and YUV_420_888 format output.
+ *
+ * <p>Like in the basic extender interface, the surface created with this supported
+ * format/size could be either added in CameraCaptureSession with HAL processing OR it
+ * configures intermediate surfaces(YUV/RAW..) and writes the output to the output surface.
+ */
+ Map<Integer, List<Size>> getSupportedCaptureOutputResolutions(String cameraId);
+
+ /**
+ * Returns supported output sizes for Image Analysis (YUV_420_888 format).
+ *
+ * <p>OEM can optionally support a YUV surface for ImageAnalysis along with Preview/ImageCapture
+ * output surfaces. If imageAnalysis YUV surface is not supported, OEM should return null or
+ * empty list.
+ */
+ List<Size> getSupportedYuvAnalysisResolutions(String cameraId);
+
+ /**
+ * Returns a processor for activating extension sessions. It implements all the interactions
+ * required for starting a extension and cleanup.
+ */
+ SessionProcessorImpl createSessionProcessor();
+
+ /**
+ * Returns a list of orthogonal capture request keys.
+ *
+ * <p>Any keys included in the list will be configurable by clients of the extension and will
+ * affect the extension functionality.</p>
+ *
+ * <p>Please note that the keys {@link CaptureRequest#JPEG_QUALITY} and
+ * {@link CaptureRequest#JPEG_ORIENTATION} are always supported regardless being added in the
+ * list or not. To support common camera operations like zoom, tap-to-focus, flash and
+ * exposure compensation, we recommend supporting the following keys if possible.
+ * <pre>
+ * zoom: {@link CaptureRequest#CONTROL_ZOOM_RATIO}
+ * {@link CaptureRequest#SCALER_CROP_REGION}
+ * tap-to-focus:
+ * {@link CaptureRequest#CONTROL_AF_MODE}
+ * {@link CaptureRequest#CONTROL_AF_TRIGGER}
+ * {@link CaptureRequest#CONTROL_AF_REGIONS}
+ * {@link CaptureRequest#CONTROL_AE_REGIONS}
+ * {@link CaptureRequest#CONTROL_AWB_REGIONS}
+ * flash:
+ * {@link CaptureRequest#CONTROL_AE_MODE}
+ * {@link CaptureRequest#CONTROL_AE_PRECAPTURE_TRIGGER}
+ * {@link CaptureRequest#FLASH_MODE}
+ * exposure compensation:
+ * {@link CaptureRequest#CONTROL_AE_EXPOSURE_COMPENSATION}
+ * </pre>
+ *
+ * @return List of supported orthogonal capture keys, or an empty list if no capture settings
+ * are not supported.
+ * @since 1.3
+ */
+ List<CaptureRequest.Key> getAvailableCaptureRequestKeys();
+
+ /**
+ * Returns a list of supported capture result keys.
+ *
+ * <p>Any keys included in this list must be available as part of the registered
+ * {@link SessionProcessorImpl.CaptureCallback#onCaptureCompleted} callback.</p>
+ *
+ * <p>At the very minimum, it is expected that the result key list is a superset of the
+ * capture request keys.</p>
+ *
+ * @return List of supported capture result keys, or
+ * an empty list if capture results are not supported.
+ * @since 1.3
+ */
+ List<CaptureResult.Key> getAvailableCaptureResultKeys();
+}
diff --git a/camera/camera-testlib-extensions/src/main/java/androidx/camera/extensions/impl/advanced/AutoAdvancedExtenderImpl.java b/camera/camera-testlib-extensions/src/main/java/androidx/camera/extensions/impl/advanced/AutoAdvancedExtenderImpl.java
new file mode 100644
index 0000000..7065a8f
--- /dev/null
+++ b/camera/camera-testlib-extensions/src/main/java/androidx/camera/extensions/impl/advanced/AutoAdvancedExtenderImpl.java
@@ -0,0 +1,90 @@
+/*
+ * Copyright 2021 The Android Open Source Project
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package androidx.camera.extensions.impl.advanced;
+
+import android.annotation.SuppressLint;
+import android.hardware.camera2.CameraCharacteristics;
+import android.hardware.camera2.CaptureRequest;
+import android.hardware.camera2.CaptureResult;
+import android.util.Range;
+import android.util.Size;
+
+import java.util.List;
+import java.util.Map;
+
+/**
+ * Stub advanced extender implementation for auto.
+ *
+ * <p>This class should be implemented by OEM and deployed to the target devices.
+ *
+ * @since 1.2
+ */
+@SuppressLint("UnknownNullness")
+public class AutoAdvancedExtenderImpl implements AdvancedExtenderImpl {
+ public AutoAdvancedExtenderImpl() {
+ }
+
+ @Override
+ public boolean isExtensionAvailable(String cameraId,
+ Map<String, CameraCharacteristics> characteristicsMap) {
+ return false;
+ }
+
+ @Override
+ public void init(String cameraId,
+ Map<String, CameraCharacteristics> characteristicsMap) {
+ }
+
+ @Override
+ public Range<Long> getEstimatedCaptureLatencyRange(
+ String cameraId, Size size, int imageFormat) {
+ return null;
+ }
+
+ @Override
+ public Map<Integer, List<Size>> getSupportedPreviewOutputResolutions(
+ String cameraId) {
+ return null;
+ }
+
+ @Override
+ public Map<Integer, List<Size>> getSupportedCaptureOutputResolutions(
+ String cameraId) {
+ return null;
+ }
+
+ @Override
+ public List<Size> getSupportedYuvAnalysisResolutions(
+ String cameraId) {
+ return null;
+ }
+
+ @Override
+ public SessionProcessorImpl createSessionProcessor() {
+ return null;
+ }
+
+ @Override
+ public List<CaptureRequest.Key> getAvailableCaptureRequestKeys() {
+ return null;
+ }
+
+ @Override
+ public List<CaptureResult.Key> getAvailableCaptureResultKeys() {
+ return null;
+ }
+}
diff --git a/camera/camera-testlib-extensions/src/main/java/androidx/camera/extensions/impl/advanced/BeautyAdvancedExtenderImpl.java b/camera/camera-testlib-extensions/src/main/java/androidx/camera/extensions/impl/advanced/BeautyAdvancedExtenderImpl.java
new file mode 100644
index 0000000..b553ed6
--- /dev/null
+++ b/camera/camera-testlib-extensions/src/main/java/androidx/camera/extensions/impl/advanced/BeautyAdvancedExtenderImpl.java
@@ -0,0 +1,90 @@
+/*
+ * Copyright 2021 The Android Open Source Project
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package androidx.camera.extensions.impl.advanced;
+
+import android.annotation.SuppressLint;
+import android.hardware.camera2.CameraCharacteristics;
+import android.hardware.camera2.CaptureRequest;
+import android.hardware.camera2.CaptureResult;
+import android.util.Range;
+import android.util.Size;
+
+import java.util.List;
+import java.util.Map;
+
+/**
+ * Stub advanced extender implementation for beauty.
+ *
+ * <p>This class should be implemented by OEM and deployed to the target devices.
+ *
+ * @since 1.2
+ */
+@SuppressLint("UnknownNullness")
+public class BeautyAdvancedExtenderImpl implements AdvancedExtenderImpl {
+ public BeautyAdvancedExtenderImpl() {
+ }
+
+ @Override
+ public boolean isExtensionAvailable(String cameraId,
+ Map<String, CameraCharacteristics> characteristicsMap) {
+ return false;
+ }
+
+ @Override
+ public void init(String cameraId,
+ Map<String, CameraCharacteristics> characteristicsMap) {
+ }
+
+ @Override
+ public Range<Long> getEstimatedCaptureLatencyRange(
+ String cameraId, Size size, int imageFormat) {
+ return null;
+ }
+
+ @Override
+ public Map<Integer, List<Size>> getSupportedPreviewOutputResolutions(
+ String cameraId) {
+ return null;
+ }
+
+ @Override
+ public Map<Integer, List<Size>> getSupportedCaptureOutputResolutions(
+ String cameraId) {
+ return null;
+ }
+
+ @Override
+ public List<Size> getSupportedYuvAnalysisResolutions(
+ String cameraId) {
+ return null;
+ }
+
+ @Override
+ public SessionProcessorImpl createSessionProcessor() {
+ return null;
+ }
+
+ @Override
+ public List<CaptureRequest.Key> getAvailableCaptureRequestKeys() {
+ return null;
+ }
+
+ @Override
+ public List<CaptureResult.Key> getAvailableCaptureResultKeys() {
+ return null;
+ }
+}
diff --git a/camera/camera-testlib-extensions/src/main/java/androidx/camera/extensions/impl/advanced/BokehAdvancedExtenderImpl.java b/camera/camera-testlib-extensions/src/main/java/androidx/camera/extensions/impl/advanced/BokehAdvancedExtenderImpl.java
new file mode 100644
index 0000000..c1df4f4
--- /dev/null
+++ b/camera/camera-testlib-extensions/src/main/java/androidx/camera/extensions/impl/advanced/BokehAdvancedExtenderImpl.java
@@ -0,0 +1,90 @@
+/*
+ * Copyright 2021 The Android Open Source Project
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package androidx.camera.extensions.impl.advanced;
+
+import android.annotation.SuppressLint;
+import android.hardware.camera2.CameraCharacteristics;
+import android.hardware.camera2.CaptureRequest;
+import android.hardware.camera2.CaptureResult;
+import android.util.Range;
+import android.util.Size;
+
+import java.util.List;
+import java.util.Map;
+
+/**
+ * Stub advanced extender implementation for bokeh.
+ *
+ * <p>This class should be implemented by OEM and deployed to the target devices.
+ *
+ * @since 1.2
+ */
+@SuppressLint("UnknownNullness")
+public class BokehAdvancedExtenderImpl implements AdvancedExtenderImpl {
+ public BokehAdvancedExtenderImpl() {
+ }
+
+ @Override
+ public boolean isExtensionAvailable(String cameraId,
+ Map<String, CameraCharacteristics> characteristicsMap) {
+ return false;
+ }
+
+ @Override
+ public void init(String cameraId,
+ Map<String, CameraCharacteristics> characteristicsMap) {
+ }
+
+ @Override
+ public Range<Long> getEstimatedCaptureLatencyRange(
+ String cameraId, Size size, int imageFormat) {
+ return null;
+ }
+
+ @Override
+ public Map<Integer, List<Size>> getSupportedPreviewOutputResolutions(
+ String cameraId) {
+ return null;
+ }
+
+ @Override
+ public Map<Integer, List<Size>> getSupportedCaptureOutputResolutions(
+ String cameraId) {
+ return null;
+ }
+
+ @Override
+ public List<Size> getSupportedYuvAnalysisResolutions(
+ String cameraId) {
+ return null;
+ }
+
+ @Override
+ public SessionProcessorImpl createSessionProcessor() {
+ return null;
+ }
+
+ @Override
+ public List<CaptureRequest.Key> getAvailableCaptureRequestKeys() {
+ return null;
+ }
+
+ @Override
+ public List<CaptureResult.Key> getAvailableCaptureResultKeys() {
+ return null;
+ }
+}
diff --git a/camera/camera-testlib-extensions/src/main/java/androidx/camera/extensions/impl/advanced/Camera2OutputConfigImpl.java b/camera/camera-testlib-extensions/src/main/java/androidx/camera/extensions/impl/advanced/Camera2OutputConfigImpl.java
new file mode 100644
index 0000000..68de01b
--- /dev/null
+++ b/camera/camera-testlib-extensions/src/main/java/androidx/camera/extensions/impl/advanced/Camera2OutputConfigImpl.java
@@ -0,0 +1,51 @@
+/*
+ * Copyright 2021 The Android Open Source Project
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package androidx.camera.extensions.impl.advanced;
+
+import android.annotation.SuppressLint;
+
+import java.util.List;
+
+/**
+ * A config representing a {@link android.hardware.camera2.params.OutputConfiguration} where
+ * Surface will be created by the information in this config.
+ */
+@SuppressLint("UnknownNullness")
+public interface Camera2OutputConfigImpl {
+ /**
+ * Gets thd id of this output config. The id can be used to identify the stream in vendor
+ * implementations.
+ */
+ int getId();
+
+ /**
+ * Gets the surface group id. Vendor can use the surface group id to share memory between
+ * Surfaces.
+ */
+ int getSurfaceGroupId();
+
+ /**
+ * Gets the physical camera id. Returns null if not specified.
+ */
+ String getPhysicalCameraId();
+
+ /**
+ * If non-null, enable surface sharing and add the surface constructed by the return
+ * Camera2OutputConfig.
+ */
+ List<Camera2OutputConfigImpl> getSurfaceSharingOutputConfigs();
+}
diff --git a/camera/camera-testlib-extensions/src/main/java/androidx/camera/extensions/impl/advanced/Camera2OutputConfigImplBuilder.java b/camera/camera-testlib-extensions/src/main/java/androidx/camera/extensions/impl/advanced/Camera2OutputConfigImplBuilder.java
new file mode 100644
index 0000000..a66d3ce
--- /dev/null
+++ b/camera/camera-testlib-extensions/src/main/java/androidx/camera/extensions/impl/advanced/Camera2OutputConfigImplBuilder.java
@@ -0,0 +1,227 @@
+/*
+ * Copyright 2021 The Android Open Source Project
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package androidx.camera.extensions.impl.advanced;
+
+import android.annotation.SuppressLint;
+import android.hardware.camera2.params.OutputConfiguration;
+import android.util.Size;
+import android.view.Surface;
+
+import java.util.ArrayList;
+import java.util.List;
+import java.util.concurrent.atomic.AtomicInteger;
+
+/**
+ * A builder implementation to help OEM build the {@link Camera2OutputConfigImpl} instance.
+ */
+@SuppressLint("UnknownNullness")
+public class Camera2OutputConfigImplBuilder {
+ static AtomicInteger sLastId = new AtomicInteger(0);
+ private OutputConfigImplImpl mOutputConfig;
+ private int mSurfaceGroupId = OutputConfiguration.SURFACE_GROUP_ID_NONE;
+ private String mPhysicalCameraId;
+ private List<Camera2OutputConfigImpl> mSurfaceSharingConfigs;
+
+ private Camera2OutputConfigImplBuilder(OutputConfigImplImpl outputConfig) {
+ mOutputConfig = outputConfig;
+ }
+
+ private int getNextId() {
+ return sLastId.getAndIncrement();
+ }
+
+ /**
+ * Creates a {@link Camera2OutputConfigImpl} that represents a {@link android.media.ImageReader}
+ * with the given parameters.
+ */
+ public static Camera2OutputConfigImplBuilder newImageReaderConfig(
+ Size size, int imageFormat, int maxImages) {
+ return new Camera2OutputConfigImplBuilder(
+ new ImageReaderOutputConfigImplImpl(size, imageFormat, maxImages));
+ }
+
+ /**
+ * Creates a {@link Camera2OutputConfigImpl} that represents a MultiResolutionImageReader with
+ * the given parameters.
+ */
+ public static Camera2OutputConfigImplBuilder newMultiResolutionImageReaderConfig(
+ int imageFormat, int maxImages) {
+ return new Camera2OutputConfigImplBuilder(
+ new MultiResolutionImageReaderOutputConfigImplImpl(imageFormat, maxImages));
+ }
+
+ /**
+ * Creates a {@link Camera2OutputConfigImpl} that contains the Surface directly.
+ */
+ public static Camera2OutputConfigImplBuilder newSurfaceConfig(Surface surface) {
+ return new Camera2OutputConfigImplBuilder(new SurfaceOutputConfigImplImpl(surface));
+ }
+
+ /**
+ * Adds a {@link Camera2SessionConfigImpl} to be shared with current config.
+ */
+ public Camera2OutputConfigImplBuilder addSurfaceSharingOutputConfig(
+ Camera2OutputConfigImpl camera2OutputConfig) {
+ if (mSurfaceSharingConfigs == null) {
+ mSurfaceSharingConfigs = new ArrayList<>();
+ }
+
+ mSurfaceSharingConfigs.add(camera2OutputConfig);
+ return this;
+ }
+
+ /**
+ * Sets a physical camera id.
+ */
+ public Camera2OutputConfigImplBuilder setPhysicalCameraId(String physicalCameraId) {
+ mPhysicalCameraId = physicalCameraId;
+ return this;
+ }
+
+ /**
+ * Sets surface group id.
+ */
+ public Camera2OutputConfigImplBuilder setSurfaceGroupId(int surfaceGroupId) {
+ mSurfaceGroupId = surfaceGroupId;
+ return this;
+ }
+
+ /**
+ * Build a {@link Camera2OutputConfigImpl} instance.
+ */
+ public Camera2OutputConfigImpl build() {
+ mOutputConfig.setId(getNextId());
+ mOutputConfig.setPhysicalCameraId(mPhysicalCameraId);
+ mOutputConfig.setSurfaceGroup(mSurfaceGroupId);
+ mOutputConfig.setSurfaceSharingConfigs(mSurfaceSharingConfigs);
+ return mOutputConfig;
+ }
+
+ private static class OutputConfigImplImpl implements Camera2OutputConfigImpl {
+ private int mId;
+ private int mSurfaceGroup;
+ private String mPhysicalCameraId;
+ private List<Camera2OutputConfigImpl> mSurfaceSharingConfigs;
+
+ OutputConfigImplImpl() {
+ mId = -1;
+ mSurfaceGroup = 0;
+ mPhysicalCameraId = null;
+ mSurfaceSharingConfigs = null;
+ }
+
+ @Override
+ public int getId() {
+ return mId;
+ }
+
+ @Override
+ public int getSurfaceGroupId() {
+ return mSurfaceGroup;
+ }
+
+ @Override
+ public String getPhysicalCameraId() {
+ return mPhysicalCameraId;
+ }
+
+ @Override
+ public List<Camera2OutputConfigImpl> getSurfaceSharingOutputConfigs() {
+ return mSurfaceSharingConfigs;
+ }
+
+ public void setId(int id) {
+ mId = id;
+ }
+
+ public void setSurfaceGroup(int surfaceGroup) {
+ mSurfaceGroup = surfaceGroup;
+ }
+
+ public void setPhysicalCameraId(String physicalCameraId) {
+ mPhysicalCameraId = physicalCameraId;
+ }
+
+ public void setSurfaceSharingConfigs(
+ List<Camera2OutputConfigImpl> surfaceSharingConfigs) {
+ mSurfaceSharingConfigs = surfaceSharingConfigs;
+ }
+ }
+
+ private static class SurfaceOutputConfigImplImpl extends OutputConfigImplImpl
+ implements SurfaceOutputConfigImpl {
+ private Surface mSurface;
+
+ SurfaceOutputConfigImplImpl(Surface surface) {
+ mSurface = surface;
+ }
+
+ @Override
+ public Surface getSurface() {
+ return mSurface;
+ }
+ }
+
+ private static class ImageReaderOutputConfigImplImpl extends OutputConfigImplImpl
+ implements ImageReaderOutputConfigImpl {
+ private Size mSize;
+ private int mImageFormat;
+ private int mMaxImages;
+
+ ImageReaderOutputConfigImplImpl(Size size, int imageFormat, int maxImages) {
+ mSize = size;
+ mImageFormat = imageFormat;
+ mMaxImages = maxImages;
+ }
+
+ @Override
+ public Size getSize() {
+ return mSize;
+ }
+
+ @Override
+ public int getImageFormat() {
+ return mImageFormat;
+ }
+
+ @Override
+ public int getMaxImages() {
+ return mMaxImages;
+ }
+ }
+
+ private static class MultiResolutionImageReaderOutputConfigImplImpl extends OutputConfigImplImpl
+ implements MultiResolutionImageReaderOutputConfigImpl {
+ private int mImageFormat;
+ private int mMaxImages;
+
+ MultiResolutionImageReaderOutputConfigImplImpl(int imageFormat, int maxImages) {
+ mImageFormat = imageFormat;
+ mMaxImages = maxImages;
+ }
+
+ @Override
+ public int getImageFormat() {
+ return mImageFormat;
+ }
+
+ @Override
+ public int getMaxImages() {
+ return mMaxImages;
+ }
+ }
+}
diff --git a/camera/camera-testlib-extensions/src/main/java/androidx/camera/extensions/impl/advanced/Camera2SessionConfigImpl.java b/camera/camera-testlib-extensions/src/main/java/androidx/camera/extensions/impl/advanced/Camera2SessionConfigImpl.java
new file mode 100644
index 0000000..d121717
--- /dev/null
+++ b/camera/camera-testlib-extensions/src/main/java/androidx/camera/extensions/impl/advanced/Camera2SessionConfigImpl.java
@@ -0,0 +1,46 @@
+/*
+ * Copyright 2021 The Android Open Source Project
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package androidx.camera.extensions.impl.advanced;
+
+import android.annotation.SuppressLint;
+import android.hardware.camera2.CaptureRequest;
+
+import java.util.List;
+import java.util.Map;
+
+/**
+ * A config representing a {@link android.hardware.camera2.params.SessionConfiguration}
+ */
+@SuppressLint("UnknownNullness")
+public interface Camera2SessionConfigImpl {
+ /**
+ * Returns all the {@link Camera2OutputConfigImpl}s that will be used to create
+ * {@link android.hardware.camera2.params.OutputConfiguration}.
+ */
+ List<Camera2OutputConfigImpl> getOutputConfigs();
+
+ /**
+ * Gets all the parameters to create the session parameters with.
+ */
+ Map<CaptureRequest.Key<?>, Object> getSessionParameters();
+
+ /**
+ * Gets the template id used for creating {@link CaptureRequest}s to be passed in
+ * {@link android.hardware.camera2.params.SessionConfiguration#setSessionParameters}.
+ */
+ int getSessionTemplateId();
+}
diff --git a/camera/camera-testlib-extensions/src/main/java/androidx/camera/extensions/impl/advanced/Camera2SessionConfigImplBuilder.java b/camera/camera-testlib-extensions/src/main/java/androidx/camera/extensions/impl/advanced/Camera2SessionConfigImplBuilder.java
new file mode 100644
index 0000000..a301166
--- /dev/null
+++ b/camera/camera-testlib-extensions/src/main/java/androidx/camera/extensions/impl/advanced/Camera2SessionConfigImplBuilder.java
@@ -0,0 +1,123 @@
+/*
+ * Copyright 2021 The Android Open Source Project
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package androidx.camera.extensions.impl.advanced;
+
+
+import android.annotation.SuppressLint;
+import android.hardware.camera2.CameraDevice;
+import android.hardware.camera2.CaptureRequest;
+
+import java.util.ArrayList;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+
+/**
+ * A builder implementation to help OEM build the {@link Camera2SessionConfigImpl} instance.
+ */
+@SuppressLint("UnknownNullness")
+public class Camera2SessionConfigImplBuilder {
+ private int mSessionTemplateId = CameraDevice.TEMPLATE_PREVIEW;
+ Map<CaptureRequest.Key<?>, Object> mSessionParameters = new HashMap<>();
+ List<Camera2OutputConfigImpl> mCamera2OutputConfigs = new ArrayList<>();
+
+ public Camera2SessionConfigImplBuilder() {
+ }
+
+ /**
+ * Adds a output config.
+ */
+ public Camera2SessionConfigImplBuilder addOutputConfig(
+ Camera2OutputConfigImpl outputConfig) {
+ mCamera2OutputConfigs.add(outputConfig);
+ return this;
+ }
+
+ /**
+ * Sets session parameters.
+ */
+ public <T> Camera2SessionConfigImplBuilder addSessionParameter(
+ CaptureRequest.Key<T> key, T value) {
+ mSessionParameters.put(key, value);
+ return this;
+ }
+
+ /**
+ * Sets the template id for session parameters request.
+ */
+ public Camera2SessionConfigImplBuilder setSessionTemplateId(int templateId) {
+ mSessionTemplateId = templateId;
+ return this;
+ }
+
+ /**
+ * Gets the session template id.
+ */
+ public int getSessionTemplateId() {
+ return mSessionTemplateId;
+ }
+
+ /**
+ * Gets the session parameters.
+ */
+ public Map<CaptureRequest.Key<?>, Object> getSessionParameters() {
+ return mSessionParameters;
+ }
+
+ /**
+ * Gets all the output configs.
+ */
+ public List<Camera2OutputConfigImpl> getCamera2OutputConfigs() {
+ return mCamera2OutputConfigs;
+ }
+
+ /**
+ * Builds a {@link Camera2SessionConfigImpl} instance.
+ */
+ public Camera2SessionConfigImpl build() {
+ return new Camera2SessionConfigImplImpl(this);
+ }
+
+ private static class Camera2SessionConfigImplImpl implements
+ Camera2SessionConfigImpl {
+ int mSessionTemplateId;
+ Map<CaptureRequest.Key<?>, Object> mSessionParameters;
+ List<Camera2OutputConfigImpl> mCamera2OutputConfigs;
+
+ Camera2SessionConfigImplImpl(Camera2SessionConfigImplBuilder builder) {
+ mSessionTemplateId = builder.getSessionTemplateId();
+ mSessionParameters = builder.getSessionParameters();
+ mCamera2OutputConfigs = builder.getCamera2OutputConfigs();
+ }
+
+ @Override
+ public List<Camera2OutputConfigImpl> getOutputConfigs() {
+ return mCamera2OutputConfigs;
+ }
+
+ @Override
+ public Map<CaptureRequest.Key<?>, Object> getSessionParameters() {
+ return mSessionParameters;
+ }
+
+ @Override
+ public int getSessionTemplateId() {
+ return mSessionTemplateId;
+ }
+ }
+}
+
diff --git a/camera/camera-testlib-extensions/src/main/java/androidx/camera/extensions/impl/advanced/HdrAdvancedExtenderImpl.java b/camera/camera-testlib-extensions/src/main/java/androidx/camera/extensions/impl/advanced/HdrAdvancedExtenderImpl.java
new file mode 100644
index 0000000..1621f3e
--- /dev/null
+++ b/camera/camera-testlib-extensions/src/main/java/androidx/camera/extensions/impl/advanced/HdrAdvancedExtenderImpl.java
@@ -0,0 +1,91 @@
+/*
+ * Copyright 2021 The Android Open Source Project
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package androidx.camera.extensions.impl.advanced;
+
+import android.annotation.SuppressLint;
+import android.hardware.camera2.CameraCharacteristics;
+import android.hardware.camera2.CaptureRequest;
+import android.hardware.camera2.CaptureResult;
+import android.util.Range;
+import android.util.Size;
+
+import java.util.List;
+import java.util.Map;
+
+/**
+ * Stub advanced extender implementation for hdr.
+ *
+ * <p>This class should be implemented by OEM and deployed to the target devices.
+ *
+ * @since 1.2
+ */
+@SuppressLint("UnknownNullness")
+public class HdrAdvancedExtenderImpl implements AdvancedExtenderImpl {
+ public HdrAdvancedExtenderImpl() {
+ }
+
+ @Override
+ public boolean isExtensionAvailable(String cameraId,
+ Map<String, CameraCharacteristics> characteristicsMap) {
+ return false;
+ }
+
+ @Override
+ public void init(String cameraId,
+ Map<String, CameraCharacteristics> characteristicsMap) {
+ }
+
+ @Override
+ public Range<Long> getEstimatedCaptureLatencyRange(
+ String cameraId, Size size, int imageFormat) {
+ return null;
+ }
+
+ @Override
+ public Map<Integer, List<Size>> getSupportedPreviewOutputResolutions(
+ String cameraId) {
+ return null;
+ }
+
+
+ @Override
+ public Map<Integer, List<Size>> getSupportedCaptureOutputResolutions(
+ String cameraId) {
+ return null;
+ }
+
+ @Override
+ public List<Size> getSupportedYuvAnalysisResolutions(
+ String cameraId) {
+ return null;
+ }
+
+ @Override
+ public SessionProcessorImpl createSessionProcessor() {
+ return null;
+ }
+
+ @Override
+ public List<CaptureRequest.Key> getAvailableCaptureRequestKeys() {
+ return null;
+ }
+
+ @Override
+ public List<CaptureResult.Key> getAvailableCaptureResultKeys() {
+ return null;
+ }
+}
diff --git a/camera/camera-testlib-extensions/src/main/java/androidx/camera/extensions/impl/advanced/ImageProcessorImpl.java b/camera/camera-testlib-extensions/src/main/java/androidx/camera/extensions/impl/advanced/ImageProcessorImpl.java
new file mode 100644
index 0000000..ce17c4f
--- /dev/null
+++ b/camera/camera-testlib-extensions/src/main/java/androidx/camera/extensions/impl/advanced/ImageProcessorImpl.java
@@ -0,0 +1,54 @@
+/*
+ * Copyright 2021 The Android Open Source Project
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package androidx.camera.extensions.impl.advanced;
+
+import android.annotation.SuppressLint;
+
+/**
+ * A interface to receive and process the upcoming next available Image.
+ *
+ * <p>Implemented by OEM.
+ */
+@SuppressLint("UnknownNullness")
+public interface ImageProcessorImpl {
+ /**
+ * The reference count will be decremented when this method returns. If an extension wants
+ * to hold onto the image it should increment the reference count in this method and
+ * decrement it when the image is no longer needed.
+ *
+ * <p>If OEM is not closing(decrement) the image fast enough, the imageReference passed
+ * in this method might contain null image meaning that the Image was closed to prevent
+ * preview from stalling.
+ *
+ * @param outputConfigId the id of {@link Camera2OutputConfigImpl} which identifies
+ * corresponding Surface
+ * @param timestampNs the timestamp in nanoseconds associated with this image
+ * @param imageReference A reference to the {@link android.media.Image} which might contain
+ * null if OEM close(decrement) the image too slowly
+ * @param physicalCameraId used to distinguish which physical camera id the image comes from
+ * when the output configuration is
+ * MultiResolutionImageReaderOutputConfigImpl. It is also set if
+ * physicalCameraId is set in other Camera2OutputConfigImpl types.
+ *
+ */
+ void onNextImageAvailable(
+ int outputConfigId,
+ long timestampNs,
+ ImageReferenceImpl imageReference,
+ String physicalCameraId
+ );
+}
diff --git a/camera/camera-testlib-extensions/src/main/java/androidx/camera/extensions/impl/advanced/ImageReaderOutputConfigImpl.java b/camera/camera-testlib-extensions/src/main/java/androidx/camera/extensions/impl/advanced/ImageReaderOutputConfigImpl.java
new file mode 100644
index 0000000..ca4dcaf
--- /dev/null
+++ b/camera/camera-testlib-extensions/src/main/java/androidx/camera/extensions/impl/advanced/ImageReaderOutputConfigImpl.java
@@ -0,0 +1,41 @@
+/*
+ * Copyright 2021 The Android Open Source Project
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package androidx.camera.extensions.impl.advanced;
+
+import android.annotation.SuppressLint;
+import android.util.Size;
+
+/**
+ * Surface will be created by constructing a ImageReader.
+ */
+@SuppressLint("UnknownNullness")
+public interface ImageReaderOutputConfigImpl extends Camera2OutputConfigImpl {
+ /**
+ * Returns the size of the surface.
+ */
+ Size getSize();
+
+ /**
+ * Gets the image format of the surface.
+ */
+ int getImageFormat();
+
+ /**
+ * Gets the capacity for TYPE_IMAGEREADER.
+ */
+ int getMaxImages();
+}
diff --git a/camera/camera-testlib-extensions/src/main/java/androidx/camera/extensions/impl/advanced/ImageReferenceImpl.java b/camera/camera-testlib-extensions/src/main/java/androidx/camera/extensions/impl/advanced/ImageReferenceImpl.java
new file mode 100644
index 0000000..95f2c3b
--- /dev/null
+++ b/camera/camera-testlib-extensions/src/main/java/androidx/camera/extensions/impl/advanced/ImageReferenceImpl.java
@@ -0,0 +1,50 @@
+/*
+ * Copyright 2021 The Android Open Source Project
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package androidx.camera.extensions.impl.advanced;
+
+import android.annotation.SuppressLint;
+import android.media.Image;
+
+/**
+ * A Image reference container that enables the Image sharing between Camera2/CameraX and OEM
+ * using reference counting. The wrapped Image will be closed once the reference count
+ * reaches 0.
+ *
+ * <p>Implemented by Camera2/CameraX.
+ */
+@SuppressLint("UnknownNullness")
+public interface ImageReferenceImpl {
+
+ /**
+ * Increment the reference count. Returns true if the value was incremented.
+ * (returns false if the reference count has already reached zero.)
+ */
+ boolean increment();
+
+ /**
+ * Decrement the reference count. Image will be closed if reference count reaches 0.
+ * Returns true if the value was decremented (returns false if the reference count has
+ * already reached zero)
+ */
+ boolean decrement();
+
+ /**
+ * Return the Android image. This object MUST not be closed directly.
+ * Returns null when the reference count is zero.
+ */
+ Image get();
+}
diff --git a/camera/camera-testlib-extensions/src/main/java/androidx/camera/extensions/impl/advanced/MultiResolutionImageReaderOutputConfigImpl.java b/camera/camera-testlib-extensions/src/main/java/androidx/camera/extensions/impl/advanced/MultiResolutionImageReaderOutputConfigImpl.java
new file mode 100644
index 0000000..c3ad61b
--- /dev/null
+++ b/camera/camera-testlib-extensions/src/main/java/androidx/camera/extensions/impl/advanced/MultiResolutionImageReaderOutputConfigImpl.java
@@ -0,0 +1,32 @@
+/*
+ * Copyright 2021 The Android Open Source Project
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package androidx.camera.extensions.impl.advanced;
+
+/**
+ * Surface will be created by constructing a MultiResolutionImageReader.
+ */
+public interface MultiResolutionImageReaderOutputConfigImpl extends Camera2OutputConfigImpl {
+ /**
+ * Gets the image format of the surface.
+ */
+ int getImageFormat();
+
+ /**
+ * Gets the max images of the ImageReader.
+ */
+ int getMaxImages();
+}
diff --git a/camera/camera-testlib-extensions/src/main/java/androidx/camera/extensions/impl/advanced/NightAdvancedExtenderImpl.java b/camera/camera-testlib-extensions/src/main/java/androidx/camera/extensions/impl/advanced/NightAdvancedExtenderImpl.java
new file mode 100644
index 0000000..a5e0775
--- /dev/null
+++ b/camera/camera-testlib-extensions/src/main/java/androidx/camera/extensions/impl/advanced/NightAdvancedExtenderImpl.java
@@ -0,0 +1,90 @@
+/*
+ * Copyright 2021 The Android Open Source Project
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package androidx.camera.extensions.impl.advanced;
+
+import android.annotation.SuppressLint;
+import android.hardware.camera2.CameraCharacteristics;
+import android.hardware.camera2.CaptureRequest;
+import android.hardware.camera2.CaptureResult;
+import android.util.Range;
+import android.util.Size;
+
+import java.util.List;
+import java.util.Map;
+
+/**
+ * Stub advanced extender implementation for night.
+ *
+ * <p>This class should be implemented by OEM and deployed to the target devices.
+ *
+ * @since 1.2
+ */
+@SuppressLint("UnknownNullness")
+public class NightAdvancedExtenderImpl implements AdvancedExtenderImpl {
+ public NightAdvancedExtenderImpl() {
+ }
+
+ @Override
+ public boolean isExtensionAvailable(String cameraId,
+ Map<String, CameraCharacteristics> characteristicsMap) {
+ return false;
+ }
+
+ @Override
+ public void init(String cameraId,
+ Map<String, CameraCharacteristics> characteristicsMap) {
+ }
+
+ @Override
+ public Range<Long> getEstimatedCaptureLatencyRange(
+ String cameraId, Size size, int imageFormat) {
+ return null;
+ }
+
+ @Override
+ public Map<Integer, List<Size>> getSupportedPreviewOutputResolutions(
+ String cameraId) {
+ return null;
+ }
+
+ @Override
+ public Map<Integer, List<Size>> getSupportedCaptureOutputResolutions(
+ String cameraId) {
+ return null;
+ }
+
+ @Override
+ public List<Size> getSupportedYuvAnalysisResolutions(
+ String cameraId) {
+ return null;
+ }
+
+ @Override
+ public SessionProcessorImpl createSessionProcessor() {
+ return null;
+ }
+
+ @Override
+ public List<CaptureRequest.Key> getAvailableCaptureRequestKeys() {
+ return null;
+ }
+
+ @Override
+ public List<CaptureResult.Key> getAvailableCaptureResultKeys() {
+ return null;
+ }
+}
diff --git a/camera/camera-testlib-extensions/src/main/java/androidx/camera/extensions/impl/advanced/OutputSurfaceImpl.java b/camera/camera-testlib-extensions/src/main/java/androidx/camera/extensions/impl/advanced/OutputSurfaceImpl.java
new file mode 100644
index 0000000..f692029
--- /dev/null
+++ b/camera/camera-testlib-extensions/src/main/java/androidx/camera/extensions/impl/advanced/OutputSurfaceImpl.java
@@ -0,0 +1,42 @@
+/*
+ * Copyright 2021 The Android Open Source Project
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package androidx.camera.extensions.impl.advanced;
+
+import android.annotation.SuppressLint;
+import android.util.Size;
+import android.view.Surface;
+
+/**
+ * For specifying output surface of the extension.
+ */
+@SuppressLint("UnknownNullness")
+public interface OutputSurfaceImpl {
+ /**
+ * Gets the surface.
+ */
+ Surface getSurface();
+
+ /**
+ * Gets the size.
+ */
+ Size getSize();
+
+ /**
+ * Gets the image format.
+ */
+ int getImageFormat();
+}
diff --git a/camera/camera-testlib-extensions/src/main/java/androidx/camera/extensions/impl/advanced/RequestProcessorImpl.java b/camera/camera-testlib-extensions/src/main/java/androidx/camera/extensions/impl/advanced/RequestProcessorImpl.java
new file mode 100644
index 0000000..5185333
--- /dev/null
+++ b/camera/camera-testlib-extensions/src/main/java/androidx/camera/extensions/impl/advanced/RequestProcessorImpl.java
@@ -0,0 +1,123 @@
+/*
+ * Copyright 2021 The Android Open Source Project
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package androidx.camera.extensions.impl.advanced;
+
+import android.annotation.SuppressLint;
+import android.hardware.camera2.CaptureFailure;
+import android.hardware.camera2.CaptureRequest;
+import android.hardware.camera2.CaptureResult;
+import android.hardware.camera2.TotalCaptureResult;
+
+import java.util.List;
+import java.util.Map;
+
+/**
+ * An Interface to execute Camera2 capture requests.
+ */
+@SuppressLint("UnknownNullness")
+public interface RequestProcessorImpl {
+ /**
+ * Sets a {@link ImageProcessorImpl} to receive {@link ImageReferenceImpl} to process.
+ */
+ void setImageProcessor(int outputconfigId, ImageProcessorImpl imageProcessor);
+
+ /**
+ * Submits a request.
+ * @return the id of the capture sequence or -1 in case the processor encounters a fatal error
+ * or receives an invalid argument.
+ */
+ int submit(Request request, Callback callback);
+
+ /**
+ * Submits a list of requests.
+ * @return the id of the capture sequence or -1 in case the processor encounters a fatal error
+ * or receives an invalid argument.
+ */
+ int submit(List<Request> requests, Callback callback);
+
+ /**
+ * Set repeating requests.
+ * @return the id of the capture sequence or -1 in case the processor encounters a fatal error
+ * or receives an invalid argument.
+ */
+ int setRepeating(Request request, Callback callback);
+
+
+ /**
+ * Abort captures.
+ */
+ void abortCaptures();
+
+ /**
+ * Stop Repeating.
+ */
+ void stopRepeating();
+
+ /**
+ * A interface representing a capture request configuration used for submitting requests in
+ * {@link RequestProcessorImpl}.
+ */
+ interface Request {
+ /**
+ * Gets the target ids of {@link Camera2OutputConfigImpl} which identifies corresponding
+ * Surface to be the targeted for the request.
+ */
+ List<Integer> getTargetOutputConfigIds();
+
+ /**
+ * Gets all the parameters.
+ */
+ Map<CaptureRequest.Key<?>, Object> getParameters();
+
+ /**
+ * Gets the template id.
+ */
+ Integer getTemplateId();
+ }
+
+ /**
+ * Callback to be invoked during the capture.
+ */
+ interface Callback {
+ void onCaptureStarted(
+ Request request,
+ long frameNumber,
+ long timestamp);
+
+ void onCaptureProgressed(
+ Request request,
+ CaptureResult partialResult);
+
+ void onCaptureCompleted(
+ Request request,
+ TotalCaptureResult totalCaptureResult);
+
+ void onCaptureFailed(
+ Request request,
+ CaptureFailure captureFailure);
+
+ void onCaptureBufferLost(
+ Request request,
+ long frameNumber,
+ int outputStreamId);
+
+ void onCaptureSequenceCompleted(int sequenceId, long frameNumber);
+
+ void onCaptureSequenceAborted(int sequenceId);
+
+ }
+}
diff --git a/camera/camera-testlib-extensions/src/main/java/androidx/camera/extensions/impl/advanced/SessionProcessorImpl.java b/camera/camera-testlib-extensions/src/main/java/androidx/camera/extensions/impl/advanced/SessionProcessorImpl.java
new file mode 100644
index 0000000..fabfc2b
--- /dev/null
+++ b/camera/camera-testlib-extensions/src/main/java/androidx/camera/extensions/impl/advanced/SessionProcessorImpl.java
@@ -0,0 +1,281 @@
+/*
+ * Copyright 2021 The Android Open Source Project
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package androidx.camera.extensions.impl.advanced;
+
+import android.annotation.SuppressLint;
+import android.content.Context;
+import android.hardware.camera2.CameraCharacteristics;
+import android.hardware.camera2.CaptureRequest;
+import android.hardware.camera2.CaptureResult;
+import android.view.Surface;
+
+import java.util.Map;
+
+/**
+ * Interface for creating Camera2 CameraCaptureSessions with extension enabled based on
+ * advanced vendor implementation.
+ *
+ * <p><pre>
+ * The flow of a extension session is shown below:
+ * (1) {@link #initSession}: CameraX prepares streams configuration for creating
+ * CameraCaptureSession. Output surfaces for Preview, ImageCapture and ImageAnalysis are passed
+ * in and vendor is responsible for outputting the results to these surfaces.
+ *
+ * (2) {@link #onCaptureSessionStart}: It is called after CameraCaptureSession is configured.
+ * A {@link RequestProcessorImpl} is passed for vendor to send repeating requests and
+ * single requests.
+ *
+ * (3) {@link #startRepeating}: CameraX will call this method to start the repeating request
+ * after CameraCaptureSession is called. Vendor should start the repeating request by
+ * {@link RequestProcessorImpl}. Vendor can also update the repeating request if needed later.
+ *
+ * (4) {@link #setParameters(Map)}: The passed parameters will be attached to the repeating request
+ * and single requests but vendor can choose to apply some of them only.
+ *
+ * (5) {@link #startCapture(CaptureCallback)}: It is called when apps want to
+ * start a multi-frame image capture. {@link CaptureCallback} will be called
+ * to report the status and the output image will be written to the capture output surface
+ * specified in {@link #initSession}.
+ *
+ * (5) {@link #onCaptureSessionEnd}: It is called right BEFORE CameraCaptureSession.close() is
+ * called.
+ *
+ * (6) {@link #deInitSession}: called when CameraCaptureSession is closed.
+ * </pre>
+ */
+@SuppressLint("UnknownNullness")
+public interface SessionProcessorImpl {
+ /**
+ * Initializes the session for the extension. This is where the OEMs allocate resources for
+ * preparing a CameraCaptureSession. After initSession() is called, the camera ID,
+ * cameraCharacteristics and context will not change until deInitSession() has been called.
+ *
+ * <p>CameraX specifies the output surface configurations for preview, image capture and image
+ * analysis[optional]. And OEM returns a {@link Camera2SessionConfigImpl} which consists of a
+ * list of {@link Camera2OutputConfigImpl} and session parameters. The
+ * {@link Camera2SessionConfigImpl} will be used to configure the CameraCaptureSession.
+ *
+ * <p>OEM is responsible for outputting correct camera images output to these output surfaces.
+ * OEM can have the following options to enable the output:
+ * <pre>
+ * (1) Add these output surfaces in CameraCaptureSession directly using
+ * {@link Camera2OutputConfigImplBuilder#newSurfaceConfig(Surface)} }. Processing is done in
+ * HAL.
+ *
+ * (2) Use surface sharing with other surface by calling
+ * {@link Camera2OutputConfigImplBuilder#addSurfaceSharingOutputConfig(Camera2OutputConfigImpl)}
+ * to add the output surface to the other {@link Camera2OutputConfigImpl}.
+ *
+ * (3) Process output from other surfaces (RAW, YUV..) and write the result to the output
+ * surface. The output surface won't be contained in the returned
+ * {@link Camera2SessionConfigImpl}.
+ * </pre>
+ *
+ * <p>{@link Camera2OutputConfigImplBuilder} and {@link Camera2SessionConfigImplBuilder}
+ * implementations are provided in the stub for OEM to construct the
+ * {@link Camera2OutputConfigImpl} and {@link Camera2SessionConfigImpl} instances.
+ *
+ * @param previewSurfaceConfig output surface for preview
+ * @param imageCaptureSurfaceConfig output surface for image capture.
+ * @param imageAnalysisSurfaceConfig an optional output config for image analysis
+ * (YUV_420_888).
+ * @return a {@link Camera2SessionConfigImpl} consisting of a list of
+ * {@link Camera2OutputConfigImpl} and session parameters which will decide the
+ * {@link android.hardware.camera2.params.SessionConfiguration} for configuring the
+ * CameraCaptureSession. Please note that the OutputConfiguration list may not be part of any
+ * supported or mandatory stream combination BUT OEM must ensure this list will always
+ * produce a valid camera capture session.
+ */
+ Camera2SessionConfigImpl initSession(
+ String cameraId,
+ Map<String, CameraCharacteristics> cameraCharacteristicsMap,
+ Context context,
+ OutputSurfaceImpl previewSurfaceConfig,
+ OutputSurfaceImpl imageCaptureSurfaceConfig,
+ OutputSurfaceImpl imageAnalysisSurfaceConfig);
+
+ /**
+ * Notify to de-initialize the extension. This callback will be invoked after
+ * CameraCaptureSession is closed. After onDeInit() was called, it is expected that the
+ * camera ID, cameraCharacteristics will no longer hold and tear down any resources allocated
+ * for this extension. Aborts all pending captures.
+ */
+ void deInitSession();
+
+ /**
+ * CameraX / Camera2 would call these API’s to pass parameters from the app to the OEM. It’s
+ * expected that the OEM would (eventually) update the repeating request if the keys are
+ * supported. Setting a value to null explicitly un-sets the value.
+ */
+ void setParameters(Map<CaptureRequest.Key<?>, Object> parameters);
+
+ /**
+ * CameraX / Camera2 will call this interface in response to client requests involving
+ * the output preview surface. Typical examples include requests that include AF/AE triggers.
+ * Extensions can disregard any capture request keys that were not advertised in
+ * {@link AdvancedExtenderImpl#getAvailableCaptureRequestKeys}.
+ *
+ * @param triggers Capture request key value map.
+ * @param callback a callback to report the status.
+ * @return the id of the capture sequence.
+ *
+ * @throws IllegalArgumentException If there are no valid settings that can be applied
+ *
+ * @since 1.3
+ */
+ int startTrigger(Map<CaptureRequest.Key<?>, Object> triggers, CaptureCallback callback);
+
+ /**
+ * This will be invoked once after the {@link android.hardware.camera2.CameraCaptureSession}
+ * has been created. {@link RequestProcessorImpl} is passed for OEM to submit single
+ * requests or set repeating requests. This ExtensionRequestProcessor will be valid to use
+ * until onCaptureSessionEnd is called.
+ */
+ void onCaptureSessionStart(RequestProcessorImpl requestProcessor);
+
+ /**
+ * This will be invoked before the {@link android.hardware.camera2.CameraCaptureSession} is
+ * closed. {@link RequestProcessorImpl} passed in onCaptureSessionStart will no longer
+ * accept any requests after onCaptureSessionEnd() returns.
+ */
+ void onCaptureSessionEnd();
+
+ /**
+ * Starts the repeating request after CameraCaptureSession is called. Vendor should start the
+ * repeating request by {@link RequestProcessorImpl}. Vendor can also update the
+ * repeating request when needed later.
+ *
+ * @param callback a callback to report the status.
+ * @return the id of the capture sequence.
+ */
+ int startRepeating(CaptureCallback callback);
+
+ /**
+ * Stop the repeating request. To prevent OEM from not calling stopRepeating, CameraX will
+ * first stop the repeating request of current CameraCaptureSession and call this API to signal
+ * OEM that the repeating request was stopped and going forward calling
+ * {@link RequestProcessorImpl#setRepeating} will simply do nothing.
+ */
+ void stopRepeating();
+
+ /**
+ * Start a multi-frame capture.
+ *
+ * When the capture is completed, {@link CaptureCallback#onCaptureSequenceCompleted}
+ * is called and {@code OnImageAvailableListener#onImageAvailable}
+ * will also be called on the ImageReader that creates the image capture output surface.
+ *
+ * <p>Only one capture can perform at a time. Starting a capture when another capture is running
+ * will cause onCaptureFailed to be called immediately.
+ *
+ * @param callback a callback to report the status.
+ * @return the id of the capture sequence.
+ */
+ int startCapture(CaptureCallback callback);
+
+ /**
+ * Abort all capture tasks.
+ */
+ void abortCapture(int captureSequenceId);
+
+ /**
+ * Callback for notifying the status of {@link #startCapture(CaptureCallback)} and
+ * {@link #startRepeating(CaptureCallback)}.
+ */
+ interface CaptureCallback {
+ /**
+ * This method is called when the camera device has started capturing the initial input
+ * image.
+ *
+ * For a multi-frame capture, the method is called when the
+ * CameraCaptureSession.CaptureCallback onCaptureStarted of first frame is called and its
+ * timestamp is directly forwarded to timestamp parameter of
+ * this method.
+ *
+ * @param captureSequenceId id of the current capture sequence
+ * @param timestamp the timestamp at start of capture for repeating
+ * request or the timestamp at start of capture of the
+ * first frame in a multi-frame capture, in nanoseconds.
+ */
+ void onCaptureStarted(int captureSequenceId, long timestamp);
+
+ /**
+ * This method is called when an image (or images in case of multi-frame
+ * capture) is captured and device-specific extension processing is triggered.
+ *
+ * @param captureSequenceId id of the current capture sequence
+ */
+ void onCaptureProcessStarted(int captureSequenceId);
+
+ /**
+ * This method is called instead of
+ * {@link #onCaptureProcessStarted} when the camera device failed
+ * to produce the required input for the device-specific extension. The
+ * cause could be a failed camera capture request, a failed
+ * capture result or dropped camera frame.
+ *
+ * @param captureSequenceId id of the current capture sequence
+ */
+ void onCaptureFailed(int captureSequenceId);
+
+ /**
+ * This method is called independently of the others in the CaptureCallback, when a capture
+ * sequence finishes.
+ *
+ * <p>In total, there will be at least one
+ * {@link #onCaptureProcessStarted}/{@link #onCaptureFailed}
+ * invocation before this callback is triggered. If the capture
+ * sequence is aborted before any requests have begun processing,
+ * {@link #onCaptureSequenceAborted} is invoked instead.</p>
+ *
+ * @param captureSequenceId id of the current capture sequence
+ */
+ void onCaptureSequenceCompleted(int captureSequenceId);
+
+ /**
+ * This method is called when a capture sequence aborts.
+ *
+ * @param captureSequenceId id of the current capture sequence
+ */
+ void onCaptureSequenceAborted(int captureSequenceId);
+
+ /**
+ * Capture result callback that needs to be called when the process capture results are
+ * ready as part of frame post-processing.
+ *
+ * This callback will fire after {@link #onCaptureStarted}, {@link #onCaptureProcessStarted}
+ * and before {@link #onCaptureSequenceCompleted}. The callback is not expected to fire
+ * in case of capture failure {@link #onCaptureFailed} or capture abort
+ * {@link #onCaptureSequenceAborted}.
+ *
+ * @param timestamp The timestamp at start of capture. The same timestamp value
+ * passed to {@link #onCaptureStarted}.
+ * @param captureSequenceId the capture id of the request that generated the capture
+ * results. This is the return value of either
+ * {@link #startRepeating} or {@link #startCapture}.
+ * @param result Map containing the supported capture results. Do note
+ * that if results 'android.jpeg.quality' and
+ * 'android.jpeg.orientation' are present in the process
+ * capture input results, then the values must also be passed
+ * as part of this callback. Both Camera2 and CameraX guarantee
+ * that those two settings and results are always supported and
+ * applied by the corresponding framework.
+ */
+ void onCaptureCompleted(long timestamp, int captureSequenceId,
+ Map<CaptureResult.Key, Object> result);
+ }
+}
diff --git a/camera/camera-testlib-extensions/src/main/java/androidx/camera/extensions/impl/advanced/SurfaceOutputConfigImpl.java b/camera/camera-testlib-extensions/src/main/java/androidx/camera/extensions/impl/advanced/SurfaceOutputConfigImpl.java
new file mode 100644
index 0000000..7b8d83c
--- /dev/null
+++ b/camera/camera-testlib-extensions/src/main/java/androidx/camera/extensions/impl/advanced/SurfaceOutputConfigImpl.java
@@ -0,0 +1,31 @@
+/*
+ * Copyright 2021 The Android Open Source Project
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package androidx.camera.extensions.impl.advanced;
+
+import android.annotation.SuppressLint;
+import android.view.Surface;
+
+/**
+ * Use Surface directly to create the OutputConfiguration.
+ */
+@SuppressLint("UnknownNullness")
+public interface SurfaceOutputConfigImpl extends Camera2OutputConfigImpl {
+ /**
+ * Get the {@link Surface}. It'll return valid surface only when type is TYPE_SURFACE.
+ */
+ Surface getSurface();
+}
diff --git a/camera/camera-video/src/androidTest/java/androidx/camera/video/RecorderTest.kt b/camera/camera-video/src/androidTest/java/androidx/camera/video/RecorderTest.kt
index d5f4323..e008a6e 100644
--- a/camera/camera-video/src/androidTest/java/androidx/camera/video/RecorderTest.kt
+++ b/camera/camera-video/src/androidTest/java/androidx/camera/video/RecorderTest.kt
@@ -70,6 +70,7 @@
import java.util.concurrent.Executor
import java.util.concurrent.Semaphore
import java.util.concurrent.TimeUnit
+import kotlin.math.abs
import kotlin.time.Duration.Companion.seconds
import kotlinx.coroutines.CompletableDeferred
import kotlinx.coroutines.Dispatchers
@@ -455,6 +456,35 @@
file.delete()
}
+ @LabTestRule.LabTestOnly
+ @Test
+ fun canRecordWithAvSyncInStart() {
+ val diffThresholdUs = 50000L // 50,000 is about 0.05 second
+
+ clearInvocations(videoRecordEventListener)
+ invokeSurfaceRequest()
+ val file = File.createTempFile("CameraX", ".tmp").apply { deleteOnExit() }
+ val recording = recorder.prepareRecording(context, FileOutputOptions.Builder(file).build())
+ .withAudioEnabled()
+ .start(CameraXExecutors.directExecutor(), videoRecordEventListener)
+
+ val inOrder = inOrder(videoRecordEventListener)
+ inOrder.verify(videoRecordEventListener, timeout(5000L))
+ .accept(any(VideoRecordEvent.Start::class.java))
+ inOrder.verify(videoRecordEventListener, timeout(15000L)
+ .atLeast(5))
+ .accept(any(VideoRecordEvent.Status::class.java))
+
+ // check if the time difference between the first video and audio data is within a threshold
+ val firstAudioTime = recorder.mFirstRecordingAudioDataTimeUs
+ val firstVideoTime = recorder.mFirstRecordingVideoDataTimeUs
+ val timeDiff = abs(firstAudioTime - firstVideoTime)
+ assertThat(timeDiff).isLessThan(diffThresholdUs)
+
+ recording.stopSafely()
+ file.delete()
+ }
+
@Test
fun canReceiveRecordingStats() {
clearInvocations(videoRecordEventListener)
@@ -749,39 +779,6 @@
}
@Test
- fun noStatusEventsComeAfterPauseEventsWithoutResuming() {
- clearInvocations(videoRecordEventListener)
- invokeSurfaceRequest()
- val file = File.createTempFile("CameraX", ".tmp").apply { deleteOnExit() }
-
- val recording =
- recorder.prepareRecording(context, FileOutputOptions.Builder(file).build())
- .withAudioEnabled()
- .start(CameraXExecutors.directExecutor(), videoRecordEventListener)
-
- val inOrder = inOrder(videoRecordEventListener)
- inOrder.verify(videoRecordEventListener, timeout(5000L))
- .accept(any(VideoRecordEvent.Start::class.java))
- inOrder.verify(videoRecordEventListener, timeout(15000L).atLeast(5))
- .accept(any(VideoRecordEvent.Status::class.java))
-
- recording.pause()
- inOrder.verify(videoRecordEventListener, timeout(5000L).atLeastOnce())
- .accept(any(VideoRecordEvent.Pause::class.java))
-
- Thread.sleep(5000L)
- inOrder.verifyNoMoreInteractions()
-
- recording.resume()
- inOrder.verify(videoRecordEventListener, timeout(15000L).atLeast(5))
- .accept(any(VideoRecordEvent.Status::class.java))
-
- recording.stopSafely()
-
- file.delete()
- }
-
- @Test
fun resume_noOpWhenNotPaused() {
clearInvocations(videoRecordEventListener)
invokeSurfaceRequest()
diff --git a/camera/camera-video/src/main/java/androidx/camera/video/Recorder.java b/camera/camera-video/src/main/java/androidx/camera/video/Recorder.java
index 1dbc4b5..f0b4b9b 100644
--- a/camera/camera-video/src/main/java/androidx/camera/video/Recorder.java
+++ b/camera/camera-video/src/main/java/androidx/camera/video/Recorder.java
@@ -25,6 +25,7 @@
import static androidx.camera.video.VideoRecordEvent.Finalize.ERROR_SOURCE_INACTIVE;
import static androidx.camera.video.VideoRecordEvent.Finalize.ERROR_UNKNOWN;
import static androidx.camera.video.VideoRecordEvent.Finalize.VideoRecordError;
+import static androidx.camera.video.internal.DebugUtils.readableUs;
import android.Manifest;
import android.annotation.SuppressLint;
@@ -75,6 +76,7 @@
import androidx.camera.video.internal.config.VideoEncoderConfigCamcorderProfileResolver;
import androidx.camera.video.internal.config.VideoEncoderConfigDefaultResolver;
import androidx.camera.video.internal.encoder.AudioEncoderConfig;
+import androidx.camera.video.internal.encoder.BufferCopiedEncodedData;
import androidx.camera.video.internal.encoder.EncodeException;
import androidx.camera.video.internal.encoder.EncodedData;
import androidx.camera.video.internal.encoder.Encoder;
@@ -84,7 +86,9 @@
import androidx.camera.video.internal.encoder.InvalidConfigException;
import androidx.camera.video.internal.encoder.OutputConfig;
import androidx.camera.video.internal.encoder.VideoEncoderConfig;
+import androidx.camera.video.internal.utils.ArrayDequeRingBuffer;
import androidx.camera.video.internal.utils.OutputUtil;
+import androidx.camera.video.internal.utils.RingBuffer;
import androidx.concurrent.futures.CallbackToFutureAdapter;
import androidx.core.util.Consumer;
import androidx.core.util.Preconditions;
@@ -274,6 +278,9 @@
private static final int PENDING = 1;
private static final int NOT_PENDING = 0;
private static final long SOURCE_NON_STREAMING_TIMEOUT_MS = 1000L;
+ // The audio data is expected to be less than 1 kB, the value of the cache size is used to limit
+ // the memory used within an acceptable range.
+ private static final int AUDIO_CACHE_SIZE = 60;
@VisibleForTesting
static final EncoderFactory DEFAULT_ENCODER_FACTORY = EncoderImpl::new;
@@ -357,8 +364,12 @@
long mRecordingBytes = 0L;
@SuppressWarnings("WeakerAccess") /* synthetic accessor */
long mRecordingDurationNs = 0L;
+ @VisibleForTesting
@SuppressWarnings("WeakerAccess") /* synthetic accessor */
long mFirstRecordingVideoDataTimeUs = 0L;
+ @VisibleForTesting
+ @SuppressWarnings("WeakerAccess") /* synthetic accessor */
+ long mFirstRecordingAudioDataTimeUs = 0L;
@SuppressWarnings("WeakerAccess") /* synthetic accessor */
long mFileSizeLimitInBytes = OutputOptions.FILE_SIZE_UNLIMITED;
@SuppressWarnings("WeakerAccess") /* synthetic accessor */
@@ -368,8 +379,12 @@
Throwable mRecordingStopErrorCause = null;
@SuppressWarnings("WeakerAccess") /* synthetic accessor */
EncodedData mPendingFirstVideoData = null;
+ // A cache that hold audio data created before the muxer starts to prevent A/V out of sync in
+ // the beginning of the recording.
@SuppressWarnings("WeakerAccess") /* synthetic accessor */
- EncodedData mPendingFirstAudioData = null;
+ @NonNull
+ final RingBuffer<EncodedData> mPendingAudioRingBuffer = new ArrayDequeRingBuffer<>(
+ AUDIO_CACHE_SIZE);
@SuppressWarnings("WeakerAccess") /* synthetic accessor */
Throwable mAudioErrorCause = null;
@SuppressWarnings("WeakerAccess") /* synthetic accessor */
@@ -377,10 +392,6 @@
@SuppressWarnings("WeakerAccess") /* synthetic accessor */
SourceState mSourceState = SourceState.INACTIVE;
private ScheduledFuture<?> mSourceNonStreamingTimeout = null;
- @SuppressWarnings("WeakerAccess") /* synthetic accessor */
- boolean mAudioPaused = false;
- @SuppressWarnings("WeakerAccess") /* synthetic accessor */
- boolean mVideoPaused = false;
//--------------------------------------------------------------------------------------------//
Recorder(@Nullable Executor executor, @NonNull MediaSpec mediaSpec,
@@ -1465,7 +1476,7 @@
throw new AssertionError("Unable to set up media muxer when one already exists.");
}
- if (isAudioEnabled() && mPendingFirstAudioData == null) {
+ if (isAudioEnabled() && mPendingAudioRingBuffer.isEmpty()) {
throw new AssertionError("Audio is enabled but no audio sample is ready. Cannot start"
+ " media muxer.");
}
@@ -1475,15 +1486,16 @@
+ "frame.");
}
- try (EncodedData videoDataToWrite = mPendingFirstVideoData; EncodedData audioDataToWrite =
- mPendingFirstAudioData) {
+ try (EncodedData videoDataToWrite = mPendingFirstVideoData) {
mPendingFirstVideoData = null;
- mPendingFirstAudioData = null;
+ List<EncodedData> audioDataToWrite = getAudioDataToWriteAndClearCache(
+ videoDataToWrite.getPresentationTimeUs()
+ );
// Make sure we can write the first audio and video data without hitting the file size
// limit. Otherwise we will be left with a malformed (empty) track on stop.
long firstDataSize = videoDataToWrite.size();
- if (audioDataToWrite != null) {
- firstDataSize += audioDataToWrite.size();
+ for (EncodedData data : audioDataToWrite) {
+ firstDataSize += data.size();
}
if (mFileSizeLimitInBytes != OutputOptions.FILE_SIZE_UNLIMITED
&& firstDataSize > mFileSizeLimitInBytes) {
@@ -1524,12 +1536,29 @@
// Write first data to ensure tracks are not empty
writeVideoData(videoDataToWrite, recordingToStart);
- if (audioDataToWrite != null) {
- writeAudioData(audioDataToWrite, recordingToStart);
+ for (EncodedData data : audioDataToWrite) {
+ writeAudioData(data, recordingToStart);
}
}
}
+ @ExecutedBy("mSequentialExecutor")
+ @NonNull
+ private List<EncodedData> getAudioDataToWriteAndClearCache(long firstVideoDataTimeUs) {
+ List<EncodedData> res = new ArrayList<>();
+
+ EncodedData data;
+ while ((data = mPendingAudioRingBuffer.poll()) != null) {
+ // Add all audio data that has timestamp greater than or equal to the first video data
+ // timestamp.
+ if (data.getPresentationTimeUs() >= firstVideoDataTimeUs) {
+ res.add(data);
+ }
+ }
+
+ return res;
+ }
+
@SuppressLint("MissingPermission")
@ExecutedBy("mSequentialExecutor")
private void startInternal(@NonNull RecordingRecord recordingToStart) {
@@ -1601,7 +1630,7 @@
@ExecutedBy("mSequentialExecutor")
@Override
public void onEncodeStart() {
- mVideoPaused = false;
+ // No-op.
}
@ExecutedBy("mSequentialExecutor")
@@ -1610,14 +1639,6 @@
completer.set(null);
}
- @Override
- public void onEncodePaused() {
- mVideoPaused = true;
- if (!isAudioEnabled() || (isAudioEnabled() && mAudioPaused)) {
- onRecordingPaused();
- }
- }
-
@ExecutedBy("mSequentialExecutor")
@Override
public void onEncodeError(@NonNull EncodeException e) {
@@ -1646,7 +1667,8 @@
mPendingFirstVideoData = encodedData;
// If first pending audio data exists or audio is
// disabled, we can start the muxer.
- if (!isAudioEnabled() || mPendingFirstAudioData != null) {
+ if (!isAudioEnabled()
+ || !mPendingAudioRingBuffer.isEmpty()) {
Logger.d(TAG, "Received video keyframe. Starting "
+ "muxer...");
setupAndStartMediaMuxer(recordingToStart);
@@ -1704,7 +1726,7 @@
@ExecutedBy("mSequentialExecutor")
@Override
public void onEncodeStart() {
- mAudioPaused = false;
+ // No-op.
}
@ExecutedBy("mSequentialExecutor")
@@ -1713,14 +1735,6 @@
completer.set(null);
}
- @Override
- public void onEncodePaused() {
- mAudioPaused = true;
- if (mVideoPaused) {
- onRecordingPaused();
- }
- }
-
@ExecutedBy("mSequentialExecutor")
@Override
public void onEncodeError(@NonNull EncodeException e) {
@@ -1745,33 +1759,29 @@
// start it. Otherwise we can write the data.
if (mMediaMuxer == null) {
if (!mInProgressRecordingStopping) {
- boolean cachedDataDropped = false;
- if (mPendingFirstAudioData != null) {
- cachedDataDropped = true;
- mPendingFirstAudioData.close();
- mPendingFirstAudioData = null;
- }
+ // BufferCopiedEncodedData is used to copy the content of
+ // the encoded data, preventing byte buffers of the media
+ // codec from being occupied. Also, since the resources of
+ // BufferCopiedEncodedData will be automatically released
+ // by garbage collection, there is no need to call its
+ // close() function.
+ mPendingAudioRingBuffer.offer(
+ new BufferCopiedEncodedData(encodedData));
- mPendingFirstAudioData = encodedData;
if (mPendingFirstVideoData != null) {
// Both audio and data are ready. Start the muxer.
Logger.d(TAG, "Received audio data. Starting muxer...");
setupAndStartMediaMuxer(recordingToStart);
} else {
- if (cachedDataDropped) {
- Logger.d(TAG, "Replaced cached audio data with "
- + "newer data.");
- } else {
- Logger.d(TAG, "Cached audio data while we wait for "
- + "video keyframe before starting muxer.");
- }
+ Logger.d(TAG, "Cached audio data while we wait"
+ + " for video keyframe before starting muxer.");
}
} else {
// Recording is stopping before muxer has been started.
Logger.d(TAG,
"Drop audio data since recording is stopping.");
- encodedData.close();
}
+ encodedData.close();
} else {
try (EncodedData audioDataToWrite = encodedData) {
writeAudioData(audioDataToWrite, recordingToStart);
@@ -1834,6 +1844,8 @@
if (mFirstRecordingVideoDataTimeUs == 0L) {
mFirstRecordingVideoDataTimeUs = encodedData.getPresentationTimeUs();
+ Logger.d(TAG, String.format("First video time: %d (%s)", mFirstRecordingVideoDataTimeUs,
+ readableUs(mFirstRecordingVideoDataTimeUs)));
}
mRecordingDurationNs = TimeUnit.MICROSECONDS.toNanos(
encodedData.getPresentationTimeUs() - mFirstRecordingVideoDataTimeUs);
@@ -1861,6 +1873,12 @@
encodedData.getBufferInfo());
mRecordingBytes = newRecordingBytes;
+
+ if (mFirstRecordingAudioDataTimeUs == 0L) {
+ mFirstRecordingAudioDataTimeUs = encodedData.getPresentationTimeUs();
+ Logger.d(TAG, String.format("First audio time: %d (%s)", mFirstRecordingAudioDataTimeUs,
+ readableUs(mFirstRecordingAudioDataTimeUs)));
+ }
}
@ExecutedBy("mSequentialExecutor")
@@ -1871,28 +1889,21 @@
mAudioEncoder.pause();
}
mVideoEncoder.pause();
+
+ mInProgressRecording.updateVideoRecordEvent(VideoRecordEvent.pause(
+ mInProgressRecording.getOutputOptions(),
+ getInProgressRecordingStats()));
}
}
- @SuppressWarnings("WeakerAccess") /* synthetic accessor */
- @ExecutedBy("mSequentialExecutor")
- void onRecordingPaused() {
- mInProgressRecording.updateVideoRecordEvent(VideoRecordEvent.pause(
- mInProgressRecording.getOutputOptions(),
- getInProgressRecordingStats()));
- }
-
-
@ExecutedBy("mSequentialExecutor")
private void resumeInternal(@NonNull RecordingRecord recordingToResume) {
// Only resume recording if recording is in-progress and it is not stopping.
if (mInProgressRecording == recordingToResume && !mInProgressRecordingStopping) {
if (isAudioEnabled()) {
mAudioEncoder.start();
- mAudioPaused = false;
}
mVideoEncoder.start();
- mVideoPaused = false;
mInProgressRecording.updateVideoRecordEvent(VideoRecordEvent.resume(
mInProgressRecording.getOutputOptions(),
@@ -1913,10 +1924,7 @@
mRecordingStopError = stopError;
mRecordingStopErrorCause = errorCause;
if (isAudioEnabled()) {
- if (mPendingFirstAudioData != null) {
- mPendingFirstAudioData.close();
- mPendingFirstAudioData = null;
- }
+ mPendingAudioRingBuffer.clear();
if (explicitlyStopTime == null) {
mAudioEncoder.stop();
} else {
@@ -2089,9 +2097,11 @@
mRecordingBytes = 0L;
mRecordingDurationNs = 0L;
mFirstRecordingVideoDataTimeUs = 0L;
+ mFirstRecordingAudioDataTimeUs = 0L;
mRecordingStopError = ERROR_UNKNOWN;
mRecordingStopErrorCause = null;
mAudioErrorCause = null;
+ mPendingAudioRingBuffer.clear();
switch (mAudioState) {
case IDLING:
diff --git a/camera/camera-video/src/main/java/androidx/camera/video/VideoCapabilities.java b/camera/camera-video/src/main/java/androidx/camera/video/VideoCapabilities.java
index 84fb8e0..640c671 100644
--- a/camera/camera-video/src/main/java/androidx/camera/video/VideoCapabilities.java
+++ b/camera/camera-video/src/main/java/androidx/camera/video/VideoCapabilities.java
@@ -134,8 +134,8 @@
* Checks if the quality is supported.
*
* @param quality one of the quality constants. Possible values include
- * {@link Quality#LOWEST}, {@link Quality#HIGHEST}, {@link {@link Quality#SD},
- * {@link Quality#HD}, {@link {@link Quality#FHD}, or {@link Quality#UHD}.
+ * {@link Quality#LOWEST}, {@link Quality#HIGHEST}, {@link Quality#SD},
+ * {@link Quality#HD}, {@link Quality#FHD}, or {@link Quality#UHD}.
* @return {@code true} if the quality is supported; {@code false} otherwise.
* @throws IllegalArgumentException if not a quality constant.
*/
diff --git a/camera/camera-video/src/main/java/androidx/camera/video/VideoCapture.java b/camera/camera-video/src/main/java/androidx/camera/video/VideoCapture.java
index e6ae23e..27032ba 100644
--- a/camera/camera-video/src/main/java/androidx/camera/video/VideoCapture.java
+++ b/camera/camera-video/src/main/java/androidx/camera/video/VideoCapture.java
@@ -27,6 +27,7 @@
import static androidx.camera.core.impl.UseCaseConfig.OPTION_DEFAULT_SESSION_CONFIG;
import static androidx.camera.core.impl.UseCaseConfig.OPTION_SESSION_CONFIG_UNPACKER;
import static androidx.camera.core.impl.UseCaseConfig.OPTION_SURFACE_OCCUPANCY_PRIORITY;
+import static androidx.camera.core.impl.UseCaseConfig.OPTION_ZSL_DISABLED;
import static androidx.camera.core.internal.TargetConfig.OPTION_TARGET_CLASS;
import static androidx.camera.core.internal.TargetConfig.OPTION_TARGET_NAME;
import static androidx.camera.core.internal.ThreadConfig.OPTION_BACKGROUND_EXECUTOR;
@@ -47,6 +48,7 @@
import androidx.annotation.RequiresApi;
import androidx.annotation.RestrictTo;
import androidx.annotation.RestrictTo.Scope;
+import androidx.annotation.VisibleForTesting;
import androidx.camera.core.AspectRatio;
import androidx.camera.core.CameraSelector;
import androidx.camera.core.ImageCapture;
@@ -242,6 +244,7 @@
}
}
}
+ Size finalSelectedResolution = suggestedResolution;
if (supportedResolutions != null) {
int suggestedSize = suggestedResolution.getWidth() * suggestedResolution.getHeight();
// The supportedResolutions is sorted by preferred order of QualitySelector.
@@ -250,7 +253,7 @@
break;
} else if (resolution.getWidth() * resolution.getHeight() < suggestedSize) {
Logger.d(TAG, "Find a higher priority resolution: " + resolution);
- suggestedResolution = resolution;
+ finalSelectedResolution = resolution;
break;
}
}
@@ -258,13 +261,13 @@
mStreamInfo = fetchObservableValue(getOutput().getStreamInfo(),
StreamInfo.STREAM_INFO_ANY_INACTIVE);
- mSessionConfigBuilder = createPipeline(cameraId, config, suggestedResolution);
+ mSessionConfigBuilder = createPipeline(cameraId, config, finalSelectedResolution);
applyStreamInfoToSessionConfigBuilder(mSessionConfigBuilder, mStreamInfo);
updateSessionConfig(mSessionConfigBuilder.build());
// VideoCapture has to be active to apply SessionConfig's template type.
notifyActive();
- return suggestedResolution;
+ return finalSelectedResolution;
}
@@ -463,7 +466,7 @@
@RestrictTo(Scope.LIBRARY_GROUP)
public static final class Defaults implements ConfigProvider<VideoCaptureConfig<?>> {
/** Surface occupancy priority to this use case */
- private static final int DEFAULT_SURFACE_OCCUPANCY_PRIORITY = 3;
+ private static final int DEFAULT_SURFACE_OCCUPANCY_PRIORITY = 5;
private static final VideoOutput DEFAULT_VIDEO_OUTPUT =
SurfaceRequest::willNotProvideSurface;
private static final VideoCaptureConfig<?> DEFAULT_CONFIG;
@@ -661,10 +664,8 @@
QualitySelector qualitySelector = mediaSpec.getVideoSpec().getQualitySelector();
List<Quality> selectedQualities = qualitySelector.getPrioritizedQualities(cameraInfo);
-
Logger.d(TAG,
"Found selectedQualities " + selectedQualities + " by " + qualitySelector);
-
if (selectedQualities.isEmpty()) {
throw new IllegalArgumentException(
"Unable to find supported quality by QualitySelector");
@@ -675,12 +676,51 @@
supportedResolutions.add(QualitySelector.getResolution(cameraInfo, selectedQuality));
}
Logger.d(TAG, "Set supported resolutions = " + supportedResolutions);
+
+ supportedResolutions = filterOutResolutions(supportedResolutions);
+ Logger.d(TAG, "supportedResolutions after filter out " + supportedResolutions);
+ Preconditions.checkState(!selectedQualities.isEmpty(),
+ "No supportedResolutions after filter out");
+
builder.getMutableConfig().insertOption(OPTION_SUPPORTED_RESOLUTIONS,
Collections.singletonList(
Pair.create(getImageFormat(), supportedResolutions.toArray(new Size[0]))));
}
/**
+ * Filters out resolutions that will never be selected
+ *
+ * <p>For example, when the resolution list is {1920x1080, 720x480, 3840x2160}, 3840x2160
+ * will never be selected because 720x480 is smaller and has higher priority. Filtering out
+ * these resolutions keeps the auto-resolution mechanism from incorrectly assuming that
+ * VideoCapture might use it, preventing other use cases from not being able to get a larger
+ * resolution.
+ *
+ * @param prioritizedResolutions prioritized resolutions to be filtered out
+ * @return resolutions after filter out
+ */
+ @VisibleForTesting
+ @NonNull
+ static List<Size> filterOutResolutions(@NonNull List<Size> prioritizedResolutions) {
+ ArrayList<Size> ret = new ArrayList<>(prioritizedResolutions.size());
+
+ int minArea = Integer.MAX_VALUE;
+ for (Size resolution : prioritizedResolutions) {
+ int area = getArea(resolution);
+ if (area < minArea) {
+ minArea = area;
+ ret.add(resolution);
+ }
+ }
+
+ return ret;
+ }
+
+ private static int getArea(@NonNull Size size) {
+ return size.getWidth() * size.getHeight();
+ }
+
+ /**
* Gets the snapshot value of the given {@link Observable}.
*
* <p>Note: Set {@code valueIfMissing} to a non-{@code null} value doesn't mean the method
@@ -1039,5 +1079,14 @@
getMutableConfig().insertOption(OPTION_USE_CASE_EVENT_CALLBACK, useCaseEventCallback);
return this;
}
+
+ /** @hide */
+ @RestrictTo(Scope.LIBRARY_GROUP)
+ @NonNull
+ @Override
+ public Builder<T> setZslDisabled(boolean disabled) {
+ getMutableConfig().insertOption(OPTION_ZSL_DISABLED, disabled);
+ return this;
+ }
}
}
diff --git a/camera/camera-video/src/main/java/androidx/camera/video/VideoCaptureLegacy.java b/camera/camera-video/src/main/java/androidx/camera/video/VideoCaptureLegacy.java
deleted file mode 100644
index 431b269..0000000
--- a/camera/camera-video/src/main/java/androidx/camera/video/VideoCaptureLegacy.java
+++ /dev/null
@@ -1,1878 +0,0 @@
-/*
- * Copyright (C) 2019 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package androidx.camera.video;
-
-import static androidx.camera.core.impl.ImageOutputConfig.OPTION_DEFAULT_RESOLUTION;
-import static androidx.camera.core.impl.ImageOutputConfig.OPTION_MAX_RESOLUTION;
-import static androidx.camera.core.impl.ImageOutputConfig.OPTION_SUPPORTED_RESOLUTIONS;
-import static androidx.camera.core.impl.ImageOutputConfig.OPTION_TARGET_ASPECT_RATIO;
-import static androidx.camera.core.impl.ImageOutputConfig.OPTION_TARGET_RESOLUTION;
-import static androidx.camera.core.impl.ImageOutputConfig.OPTION_TARGET_ROTATION;
-import static androidx.camera.core.impl.UseCaseConfig.OPTION_CAMERA_SELECTOR;
-import static androidx.camera.core.impl.UseCaseConfig.OPTION_CAPTURE_CONFIG_UNPACKER;
-import static androidx.camera.core.impl.UseCaseConfig.OPTION_DEFAULT_CAPTURE_CONFIG;
-import static androidx.camera.core.impl.UseCaseConfig.OPTION_DEFAULT_SESSION_CONFIG;
-import static androidx.camera.core.impl.UseCaseConfig.OPTION_SESSION_CONFIG_UNPACKER;
-import static androidx.camera.core.impl.UseCaseConfig.OPTION_SURFACE_OCCUPANCY_PRIORITY;
-import static androidx.camera.core.internal.TargetConfig.OPTION_TARGET_CLASS;
-import static androidx.camera.core.internal.TargetConfig.OPTION_TARGET_NAME;
-import static androidx.camera.core.internal.ThreadConfig.OPTION_BACKGROUND_EXECUTOR;
-import static androidx.camera.core.internal.UseCaseEventConfig.OPTION_USE_CASE_EVENT_CALLBACK;
-import static androidx.camera.video.impl.VideoCaptureLegacyConfig.OPTION_AUDIO_BIT_RATE;
-import static androidx.camera.video.impl.VideoCaptureLegacyConfig.OPTION_AUDIO_CHANNEL_COUNT;
-import static androidx.camera.video.impl.VideoCaptureLegacyConfig.OPTION_AUDIO_MIN_BUFFER_SIZE;
-import static androidx.camera.video.impl.VideoCaptureLegacyConfig.OPTION_AUDIO_RECORD_SOURCE;
-import static androidx.camera.video.impl.VideoCaptureLegacyConfig.OPTION_AUDIO_SAMPLE_RATE;
-import static androidx.camera.video.impl.VideoCaptureLegacyConfig.OPTION_BIT_RATE;
-import static androidx.camera.video.impl.VideoCaptureLegacyConfig.OPTION_INTRA_FRAME_INTERVAL;
-import static androidx.camera.video.impl.VideoCaptureLegacyConfig.OPTION_VIDEO_FRAME_RATE;
-
-import android.Manifest;
-import android.content.ContentResolver;
-import android.content.ContentValues;
-import android.location.Location;
-import android.media.AudioFormat;
-import android.media.AudioRecord;
-import android.media.CamcorderProfile;
-import android.media.MediaCodec;
-import android.media.MediaCodec.BufferInfo;
-import android.media.MediaCodecInfo;
-import android.media.MediaCodecInfo.CodecCapabilities;
-import android.media.MediaFormat;
-import android.media.MediaMuxer;
-import android.media.MediaRecorder.AudioSource;
-import android.net.Uri;
-import android.os.Build;
-import android.os.Handler;
-import android.os.HandlerThread;
-import android.os.Looper;
-import android.os.ParcelFileDescriptor;
-import android.provider.MediaStore;
-import android.util.Pair;
-import android.util.Size;
-import android.view.Display;
-import android.view.Surface;
-
-import androidx.annotation.GuardedBy;
-import androidx.annotation.IntDef;
-import androidx.annotation.NonNull;
-import androidx.annotation.Nullable;
-import androidx.annotation.RequiresApi;
-import androidx.annotation.RequiresPermission;
-import androidx.annotation.RestrictTo;
-import androidx.annotation.RestrictTo.Scope;
-import androidx.annotation.UiThread;
-import androidx.camera.core.AspectRatio;
-import androidx.camera.core.CameraSelector;
-import androidx.camera.core.CameraXThreads;
-import androidx.camera.core.ImageCapture;
-import androidx.camera.core.Logger;
-import androidx.camera.core.UseCase;
-import androidx.camera.core.impl.CameraInternal;
-import androidx.camera.core.impl.CaptureConfig;
-import androidx.camera.core.impl.Config;
-import androidx.camera.core.impl.ConfigProvider;
-import androidx.camera.core.impl.DeferrableSurface;
-import androidx.camera.core.impl.ImageOutputConfig;
-import androidx.camera.core.impl.ImageOutputConfig.RotationValue;
-import androidx.camera.core.impl.ImmediateSurface;
-import androidx.camera.core.impl.MutableConfig;
-import androidx.camera.core.impl.MutableOptionsBundle;
-import androidx.camera.core.impl.OptionsBundle;
-import androidx.camera.core.impl.SessionConfig;
-import androidx.camera.core.impl.UseCaseConfig;
-import androidx.camera.core.impl.UseCaseConfigFactory;
-import androidx.camera.core.impl.utils.executor.CameraXExecutors;
-import androidx.camera.core.internal.ThreadConfig;
-import androidx.camera.core.internal.utils.VideoUtil;
-import androidx.camera.video.impl.VideoCaptureLegacyConfig;
-import androidx.camera.video.internal.compat.Api26Impl;
-import androidx.concurrent.futures.CallbackToFutureAdapter;
-import androidx.concurrent.futures.CallbackToFutureAdapter.Completer;
-import androidx.core.util.Preconditions;
-
-import com.google.common.util.concurrent.ListenableFuture;
-
-import java.io.File;
-import java.io.FileDescriptor;
-import java.io.IOException;
-import java.lang.annotation.Retention;
-import java.lang.annotation.RetentionPolicy;
-import java.nio.ByteBuffer;
-import java.util.List;
-import java.util.UUID;
-import java.util.concurrent.Executor;
-import java.util.concurrent.RejectedExecutionException;
-import java.util.concurrent.atomic.AtomicBoolean;
-import java.util.concurrent.atomic.AtomicReference;
-
-/**
- * A use case for taking a video.
- *
- * <p>This class is designed for simple video capturing. It gives basic configuration of the
- * recorded video such as resolution and file format.
- *
- * @hide
- */
-@RequiresApi(21) // TODO(b/200306659): Remove and replace with annotation on package-info.java
-@RestrictTo(Scope.LIBRARY_GROUP)
-public final class VideoCaptureLegacy extends UseCase {
-
- ////////////////////////////////////////////////////////////////////////////////////////////
- // [UseCase lifetime constant] - Stays constant for the lifetime of the UseCase. Which means
- // they could be created in the constructor.
- ////////////////////////////////////////////////////////////////////////////////////////////
-
- /**
- * An unknown error occurred.
- *
- * <p>See message parameter in onError callback or log for more details.
- */
- public static final int ERROR_UNKNOWN = 0;
- /**
- * An error occurred with encoder state, either when trying to change state or when an
- * unexpected state change occurred.
- */
- public static final int ERROR_ENCODER = 1;
- /** An error with muxer state such as during creation or when stopping. */
- public static final int ERROR_MUXER = 2;
- /**
- * An error indicating start recording was called when video recording is still in progress.
- */
- public static final int ERROR_RECORDING_IN_PROGRESS = 3;
- /**
- * An error indicating the file saving operations.
- */
- public static final int ERROR_FILE_IO = 4;
- /**
- * An error indicating this VideoCaptureLegacy is not bound to a camera.
- */
- public static final int ERROR_INVALID_CAMERA = 5;
-
- /**
- * Provides a static configuration with implementation-agnostic options.
- *
- * @hide
- */
- @RestrictTo(Scope.LIBRARY_GROUP)
- public static final Defaults DEFAULT_CONFIG = new Defaults();
- private static final String TAG = "VideoCaptureLegacy";
- /** Amount of time to wait for dequeuing a buffer from the videoEncoder. */
- private static final int DEQUE_TIMEOUT_USEC = 10000;
- /** Android preferred mime type for AVC video. */
- private static final String VIDEO_MIME_TYPE = "video/avc";
- private static final String AUDIO_MIME_TYPE = "audio/mp4a-latm";
- /** Camcorder profiles quality list */
- private static final int[] CamcorderQuality = {
- CamcorderProfile.QUALITY_2160P,
- CamcorderProfile.QUALITY_1080P,
- CamcorderProfile.QUALITY_720P,
- CamcorderProfile.QUALITY_480P
- };
- /**
- * Audio encoding
- *
- * <p>the result of PCM_8BIT and PCM_FLOAT are not good. Set PCM_16BIT as the first option.
- */
- private static final short[] sAudioEncoding = {
- AudioFormat.ENCODING_PCM_16BIT,
- AudioFormat.ENCODING_PCM_8BIT,
- AudioFormat.ENCODING_PCM_FLOAT
- };
-
- private final BufferInfo mVideoBufferInfo = new BufferInfo();
- private final Object mMuxerLock = new Object();
- private final AtomicBoolean mEndOfVideoStreamSignal = new AtomicBoolean(true);
- private final AtomicBoolean mEndOfAudioStreamSignal = new AtomicBoolean(true);
- private final AtomicBoolean mEndOfAudioVideoSignal = new AtomicBoolean(true);
- private final BufferInfo mAudioBufferInfo = new BufferInfo();
- /** For record the first sample written time. */
- private final AtomicBoolean mIsFirstVideoSampleWrite = new AtomicBoolean(false);
- private final AtomicBoolean mIsFirstAudioSampleWrite = new AtomicBoolean(false);
-
- ////////////////////////////////////////////////////////////////////////////////////////////
- // [UseCase attached constant] - Is only valid when the UseCase is attached to a camera.
- ////////////////////////////////////////////////////////////////////////////////////////////
-
- /** Thread on which all encoding occurs. */
- private HandlerThread mVideoHandlerThread;
- private Handler mVideoHandler;
- /** Thread on which audio encoding occurs. */
- private HandlerThread mAudioHandlerThread;
- private Handler mAudioHandler;
-
- @NonNull
- MediaCodec mVideoEncoder;
- @NonNull
- private MediaCodec mAudioEncoder;
- @Nullable
- private ListenableFuture<Void> mRecordingFuture = null;
-
- ////////////////////////////////////////////////////////////////////////////////////////////
- // [UseCase attached dynamic] - Can change but is only available when the UseCase is attached.
- ////////////////////////////////////////////////////////////////////////////////////////////
-
- /** The muxer that writes the encoding data to file. */
- @GuardedBy("mMuxerLock")
- private MediaMuxer mMuxer;
- private boolean mMuxerStarted = false;
- /** The index of the video track used by the muxer. */
- private int mVideoTrackIndex;
- /** The index of the audio track used by the muxer. */
- private int mAudioTrackIndex;
- /** Surface the camera writes to, which the videoEncoder uses as input. */
- Surface mCameraSurface;
-
- /** audio raw data */
- @NonNull
- private AudioRecord mAudioRecorder;
- private int mAudioBufferSize;
- private boolean mIsRecording = false;
- private int mAudioChannelCount;
- private int mAudioSampleRate;
- private int mAudioBitRate;
- private DeferrableSurface mDeferrableSurface;
- @SuppressWarnings("WeakerAccess") /* synthetic accessor */
- Uri mSavedVideoUri;
- private ParcelFileDescriptor mParcelFileDescriptor;
-
- /**
- * Creates a new video capture use case from the given configuration.
- *
- * @param config for this use case instance
- */
- VideoCaptureLegacy(@NonNull VideoCaptureLegacyConfig config) {
- super(config);
- }
-
- /** Creates a {@link MediaFormat} using parameters from the configuration */
- private static MediaFormat createMediaFormat(VideoCaptureLegacyConfig config, Size resolution) {
- MediaFormat format =
- MediaFormat.createVideoFormat(
- VIDEO_MIME_TYPE, resolution.getWidth(), resolution.getHeight());
- format.setInteger(MediaFormat.KEY_COLOR_FORMAT, CodecCapabilities.COLOR_FormatSurface);
- format.setInteger(MediaFormat.KEY_BIT_RATE, config.getBitRate());
- format.setInteger(MediaFormat.KEY_FRAME_RATE, config.getVideoFrameRate());
- format.setInteger(MediaFormat.KEY_I_FRAME_INTERVAL, config.getIFrameInterval());
-
- return format;
- }
-
- /**
- * {@inheritDoc}
- *
- * @hide
- */
- @RestrictTo(Scope.LIBRARY_GROUP)
- @Override
- @Nullable
- public UseCaseConfig<?> getDefaultConfig(boolean applyDefaultConfig,
- @NonNull UseCaseConfigFactory factory) {
- Config captureConfig = factory.getConfig(
- UseCaseConfigFactory.CaptureType.VIDEO_CAPTURE,
- ImageCapture.CAPTURE_MODE_MINIMIZE_LATENCY);
-
- if (applyDefaultConfig) {
- captureConfig = Config.mergeConfigs(captureConfig, DEFAULT_CONFIG.getConfig());
- }
-
- return captureConfig == null ? null :
- getUseCaseConfigBuilder(captureConfig).getUseCaseConfig();
- }
-
- /**
- * {@inheritDoc}
- *
- * @hide
- */
- @SuppressWarnings("WrongConstant")
- @Override
- @RestrictTo(Scope.LIBRARY_GROUP)
- public void onAttached() {
- mVideoHandlerThread = new HandlerThread(CameraXThreads.TAG + "video encoding thread");
- mAudioHandlerThread = new HandlerThread(CameraXThreads.TAG + "audio encoding thread");
-
- // video thread start
- mVideoHandlerThread.start();
- mVideoHandler = new Handler(mVideoHandlerThread.getLooper());
-
- // audio thread start
- mAudioHandlerThread.start();
- mAudioHandler = new Handler(mAudioHandlerThread.getLooper());
- }
-
- /**
- * {@inheritDoc}
- *
- * @hide
- */
- @Override
- @RequiresPermission(Manifest.permission.RECORD_AUDIO)
- @RestrictTo(Scope.LIBRARY_GROUP)
- @NonNull
- protected Size onSuggestedResolutionUpdated(@NonNull Size suggestedResolution) {
- if (mCameraSurface != null) {
- mVideoEncoder.stop();
- mVideoEncoder.release();
- mAudioEncoder.stop();
- mAudioEncoder.release();
- releaseCameraSurface(false);
- }
-
- try {
- mVideoEncoder = MediaCodec.createEncoderByType(VIDEO_MIME_TYPE);
- mAudioEncoder = MediaCodec.createEncoderByType(AUDIO_MIME_TYPE);
- } catch (IOException e) {
- throw new IllegalStateException("Unable to create MediaCodec due to: " + e.getCause());
- }
-
- setupEncoder(getCameraId(), suggestedResolution);
- return suggestedResolution;
- }
-
- /**
- * Starts recording video, which continues until {@link VideoCaptureLegacy#stopRecording()} is
- * called.
- *
- * <p>StartRecording() is asynchronous. User needs to check if any error occurs by setting the
- * {@link OnVideoSavedCallback#onError(int, String, Throwable)}.
- *
- * @param outputFileOptions Location to save the video capture
- * @param executor The executor in which the callback methods will be run.
- * @param callback Callback for when the recorded video saving completion or failure.
- */
- @SuppressWarnings("ObjectToString")
- @RequiresPermission(Manifest.permission.RECORD_AUDIO)
- public void startRecording(
- @NonNull OutputFileOptions outputFileOptions, @NonNull Executor executor,
- @NonNull OnVideoSavedCallback callback) {
- if (Looper.getMainLooper() != Looper.myLooper()) {
- CameraXExecutors.mainThreadExecutor().execute(() -> startRecording(outputFileOptions,
- executor, callback));
- return;
- }
- Logger.i(TAG, "startRecording");
- mIsFirstVideoSampleWrite.set(false);
- mIsFirstAudioSampleWrite.set(false);
-
- OnVideoSavedCallback postListener = new VideoSavedListenerWrapper(executor, callback);
-
- CameraInternal attachedCamera = getCamera();
- if (attachedCamera == null) {
- // Not bound. Notify callback.
- postListener.onError(ERROR_INVALID_CAMERA,
- "Not bound to a Camera [" + VideoCaptureLegacy.this + "]", null);
- return;
- }
-
- if (!mEndOfAudioVideoSignal.get()) {
- postListener.onError(
- ERROR_RECORDING_IN_PROGRESS, "It is still in video recording!",
- null);
- return;
- }
-
- try {
- // audioRecord start
- mAudioRecorder.startRecording();
- } catch (IllegalStateException e) {
- postListener.onError(ERROR_ENCODER, "AudioRecorder start fail", e);
- return;
- }
-
- AtomicReference<Completer<Void>> recordingCompleterRef = new AtomicReference<>();
- mRecordingFuture = CallbackToFutureAdapter.getFuture(
- completer -> {
- recordingCompleterRef.set(completer);
- return "startRecording";
- });
- Completer<Void> recordingCompleter =
- Preconditions.checkNotNull(recordingCompleterRef.get());
-
- mRecordingFuture.addListener(() -> {
- mRecordingFuture = null;
- // Do the setup of the videoEncoder at the end of video recording instead of at the
- // start of recording because it requires attaching a new Surface. This causes a
- // glitch so we don't want that to incur latency at the start of capture.
- if (getCamera() != null) {
- // Ensure the use case is bound. Asynchronous stopping procedure may occur after
- // the use case is unbound, i.e. after onDetached().
- setupEncoder(getCameraId(), getAttachedSurfaceResolution());
- notifyReset();
- }
- }, CameraXExecutors.mainThreadExecutor());
-
- try {
- // video encoder start
- Logger.i(TAG, "videoEncoder start");
- mVideoEncoder.start();
- // audio encoder start
- Logger.i(TAG, "audioEncoder start");
- mAudioEncoder.start();
-
- } catch (IllegalStateException e) {
- recordingCompleter.set(null);
- postListener.onError(ERROR_ENCODER, "Audio/Video encoder start fail", e);
- return;
- }
-
- try {
- synchronized (mMuxerLock) {
- mMuxer = initMediaMuxer(outputFileOptions);
- Preconditions.checkNotNull(mMuxer);
- mMuxer.setOrientationHint(getRelativeRotation(attachedCamera));
-
- Metadata metadata = outputFileOptions.getMetadata();
- if (metadata != null && metadata.location != null) {
- mMuxer.setLocation(
- (float) metadata.location.getLatitude(),
- (float) metadata.location.getLongitude());
- }
- }
- } catch (IOException e) {
- recordingCompleter.set(null);
- postListener.onError(ERROR_MUXER, "MediaMuxer creation failed!", e);
- return;
- }
-
- mEndOfVideoStreamSignal.set(false);
- mEndOfAudioStreamSignal.set(false);
- mEndOfAudioVideoSignal.set(false);
- mIsRecording = true;
-
- notifyActive();
- mAudioHandler.post(() -> audioEncode(postListener));
-
- String cameraId = getCameraId();
- Size resolution = getAttachedSurfaceResolution();
- mVideoHandler.post(
- () -> {
- boolean errorOccurred = videoEncode(postListener, cameraId, resolution);
- if (!errorOccurred) {
- postListener.onVideoSaved(new OutputFileResults(mSavedVideoUri));
- mSavedVideoUri = null;
- }
- recordingCompleter.set(null);
- });
- }
-
- /**
- * Stops recording video, this must be called after {@link
- * VideoCaptureLegacy#startRecording(OutputFileOptions, Executor, OnVideoSavedCallback)} is
- * called.
- *
- * <p>stopRecording() is asynchronous API. User need to check if {@link
- * OnVideoSavedCallback#onVideoSaved(OutputFileResults)} or
- * {@link OnVideoSavedCallback#onError(int, String, Throwable)} be called
- * before startRecording.
- */
- public void stopRecording() {
- if (Looper.getMainLooper() != Looper.myLooper()) {
- CameraXExecutors.mainThreadExecutor().execute(() -> stopRecording());
- return;
- }
- Logger.i(TAG, "stopRecording");
- notifyInactive();
- if (!mEndOfAudioVideoSignal.get() && mIsRecording) {
- // stop audio encoder thread, and wait video encoder and muxer stop.
- mEndOfAudioStreamSignal.set(true);
- }
- }
-
- /**
- * {@inheritDoc}
- *
- * @hide
- */
- @RestrictTo(Scope.LIBRARY_GROUP)
- @Override
- public void onDetached() {
- stopRecording();
-
- if (mRecordingFuture != null) {
- mRecordingFuture.addListener(() -> releaseResources(),
- CameraXExecutors.mainThreadExecutor());
- } else {
- releaseResources();
- }
- }
-
- private void releaseResources() {
- mVideoHandlerThread.quitSafely();
-
- // audio encoder release
- mAudioHandlerThread.quitSafely();
- if (mAudioEncoder != null) {
- mAudioEncoder.release();
- mAudioEncoder = null;
- }
-
- if (mAudioRecorder != null) {
- mAudioRecorder.release();
- mAudioRecorder = null;
- }
-
- if (mCameraSurface != null) {
- releaseCameraSurface(true);
- }
- }
-
- /**
- * {@inheritDoc}
- *
- * @hide
- */
- @NonNull
- @RestrictTo(Scope.LIBRARY_GROUP)
- @Override
- public UseCaseConfig.Builder<?, ?, ?> getUseCaseConfigBuilder(@NonNull Config config) {
- return Builder.fromConfig(config);
- }
-
- /**
- * {@inheritDoc}
- *
- * @hide
- */
- @RestrictTo(Scope.LIBRARY_GROUP)
- @UiThread
- @Override
- public void onStateDetached() {
- stopRecording();
- }
-
- @UiThread
- private void releaseCameraSurface(final boolean releaseVideoEncoder) {
- if (mDeferrableSurface == null) {
- return;
- }
-
- final MediaCodec videoEncoder = mVideoEncoder;
-
- // Calling close should allow termination future to complete and close the surface with
- // the listener that was added after constructing the DeferrableSurface.
- mDeferrableSurface.close();
- mDeferrableSurface.getTerminationFuture().addListener(
- () -> {
- if (releaseVideoEncoder && videoEncoder != null) {
- videoEncoder.release();
- }
- }, CameraXExecutors.mainThreadExecutor());
-
- if (releaseVideoEncoder) {
- mVideoEncoder = null;
- }
- mCameraSurface = null;
- mDeferrableSurface = null;
- }
-
-
- /**
- * Sets the desired rotation of the output video.
- *
- * <p>In most cases this should be set to the current rotation returned by {@link
- * Display#getRotation()}.
- *
- * @param rotation Desired rotation of the output video.
- */
- public void setTargetRotation(@RotationValue int rotation) {
- setTargetRotationInternal(rotation);
- }
-
- /**
- * Setup the {@link MediaCodec} for encoding video from a camera {@link Surface} and encoding
- * audio from selected audio source.
- */
- @UiThread
- @SuppressWarnings("WeakerAccess") /* synthetic accessor */
- @RequiresPermission(Manifest.permission.RECORD_AUDIO)
- void setupEncoder(@NonNull String cameraId, @NonNull Size resolution) {
- VideoCaptureLegacyConfig config = (VideoCaptureLegacyConfig) getCurrentConfig();
-
- // video encoder setup
- mVideoEncoder.reset();
- mVideoEncoder.configure(
- createMediaFormat(config, resolution), /*surface*/
- null, /*crypto*/
- null,
- MediaCodec.CONFIGURE_FLAG_ENCODE);
- if (mCameraSurface != null) {
- releaseCameraSurface(false);
- }
- Surface cameraSurface = mVideoEncoder.createInputSurface();
- mCameraSurface = cameraSurface;
-
- SessionConfig.Builder sessionConfigBuilder = SessionConfig.Builder.createFrom(config);
-
- if (mDeferrableSurface != null) {
- mDeferrableSurface.close();
- }
- mDeferrableSurface = new ImmediateSurface(mCameraSurface);
- mDeferrableSurface.getTerminationFuture().addListener(
- cameraSurface::release, CameraXExecutors.mainThreadExecutor()
- );
-
- sessionConfigBuilder.addSurface(mDeferrableSurface);
-
- sessionConfigBuilder.addErrorListener(new SessionConfig.ErrorListener() {
- @Override
- @RequiresPermission(Manifest.permission.RECORD_AUDIO)
- public void onError(@NonNull SessionConfig sessionConfig,
- @NonNull SessionConfig.SessionError error) {
- // Ensure the attached camera has not changed before calling setupEncoder.
- // TODO(b/143915543): Ensure this never gets called by a camera that is not attached
- // to this use case so we don't need to do this check.
- if (isCurrentCamera(cameraId)) {
- // Only reset the pipeline when the bound camera is the same.
- setupEncoder(cameraId, resolution);
- notifyReset();
- }
- }
- });
-
- updateSessionConfig(sessionConfigBuilder.build());
-
- // audio encoder setup
- setAudioParametersByCamcorderProfile(resolution, cameraId);
- mAudioEncoder.reset();
- mAudioEncoder.configure(
- createAudioMediaFormat(), null, null, MediaCodec.CONFIGURE_FLAG_ENCODE);
-
- if (mAudioRecorder != null) {
- mAudioRecorder.release();
- }
- mAudioRecorder = autoConfigAudioRecordSource(config);
- // check mAudioRecorder
- if (mAudioRecorder == null) {
- Logger.e(TAG, "AudioRecord object cannot initialized correctly!");
- }
-
- mVideoTrackIndex = -1;
- mAudioTrackIndex = -1;
- mIsRecording = false;
- }
-
- /**
- * Write a buffer that has been encoded to file.
- *
- * @param bufferIndex the index of the buffer in the videoEncoder that has available data
- * @return returns true if this buffer is the end of the stream
- */
- private boolean writeVideoEncodedBuffer(int bufferIndex) {
- if (bufferIndex < 0) {
- Logger.e(TAG, "Output buffer should not have negative index: " + bufferIndex);
- return false;
- }
- // Get data from buffer
- ByteBuffer outputBuffer = mVideoEncoder.getOutputBuffer(bufferIndex);
-
- // Check if buffer is valid, if not then return
- if (outputBuffer == null) {
- Logger.d(TAG, "OutputBuffer was null.");
- return false;
- }
-
- // Write data to mMuxer if available
- if (mAudioTrackIndex >= 0 && mVideoTrackIndex >= 0 && mVideoBufferInfo.size > 0) {
- outputBuffer.position(mVideoBufferInfo.offset);
- outputBuffer.limit(mVideoBufferInfo.offset + mVideoBufferInfo.size);
- mVideoBufferInfo.presentationTimeUs = (System.nanoTime() / 1000);
-
- synchronized (mMuxerLock) {
- if (!mIsFirstVideoSampleWrite.get()) {
- Logger.i(TAG, "First video sample written.");
- mIsFirstVideoSampleWrite.set(true);
- }
- mMuxer.writeSampleData(mVideoTrackIndex, outputBuffer, mVideoBufferInfo);
- }
- }
-
- // Release data
- mVideoEncoder.releaseOutputBuffer(bufferIndex, false);
-
- // Return true if EOS is set
- return (mVideoBufferInfo.flags & MediaCodec.BUFFER_FLAG_END_OF_STREAM) != 0;
- }
-
- private boolean writeAudioEncodedBuffer(int bufferIndex) {
- ByteBuffer buffer = getOutputBuffer(mAudioEncoder, bufferIndex);
- buffer.position(mAudioBufferInfo.offset);
- if (mAudioTrackIndex >= 0
- && mVideoTrackIndex >= 0
- && mAudioBufferInfo.size > 0
- && mAudioBufferInfo.presentationTimeUs > 0) {
- try {
- synchronized (mMuxerLock) {
- if (!mIsFirstAudioSampleWrite.get()) {
- Logger.i(TAG, "First audio sample written.");
- mIsFirstAudioSampleWrite.set(true);
- }
- mMuxer.writeSampleData(mAudioTrackIndex, buffer, mAudioBufferInfo);
- }
- } catch (Exception e) {
- Logger.e(
- TAG,
- "audio error:size="
- + mAudioBufferInfo.size
- + "/offset="
- + mAudioBufferInfo.offset
- + "/timeUs="
- + mAudioBufferInfo.presentationTimeUs);
- e.printStackTrace();
- }
- }
- mAudioEncoder.releaseOutputBuffer(bufferIndex, false);
- return (mAudioBufferInfo.flags & MediaCodec.BUFFER_FLAG_END_OF_STREAM) != 0;
- }
-
- /**
- * Encoding which runs indefinitely until end of stream is signaled. This should not run on the
- * main thread otherwise it will cause the application to block.
- *
- * @return returns {@code true} if an error condition occurred, otherwise returns {@code false}
- */
- boolean videoEncode(@NonNull OnVideoSavedCallback videoSavedCallback, @NonNull String cameraId,
- @NonNull Size resolution) {
- // Main encoding loop. Exits on end of stream.
- boolean errorOccurred = false;
- boolean videoEos = false;
- while (!videoEos && !errorOccurred) {
- // Check for end of stream from main thread
- if (mEndOfVideoStreamSignal.get()) {
- mVideoEncoder.signalEndOfInputStream();
- mEndOfVideoStreamSignal.set(false);
- }
-
- // Deque buffer to check for processing step
- int outputBufferId =
- mVideoEncoder.dequeueOutputBuffer(mVideoBufferInfo, DEQUE_TIMEOUT_USEC);
- switch (outputBufferId) {
- case MediaCodec.INFO_OUTPUT_FORMAT_CHANGED:
- if (mMuxerStarted) {
- videoSavedCallback.onError(
- ERROR_ENCODER,
- "Unexpected change in video encoding format.",
- null);
- errorOccurred = true;
- }
-
- synchronized (mMuxerLock) {
- mVideoTrackIndex = mMuxer.addTrack(mVideoEncoder.getOutputFormat());
- if (mAudioTrackIndex >= 0 && mVideoTrackIndex >= 0) {
- mMuxerStarted = true;
- Logger.i(TAG, "media mMuxer start");
- mMuxer.start();
- }
- }
- break;
- case MediaCodec.INFO_TRY_AGAIN_LATER:
- // Timed out. Just wait until next attempt to deque.
- break;
- default:
- videoEos = writeVideoEncodedBuffer(outputBufferId);
- }
- }
-
- try {
- Logger.i(TAG, "videoEncoder stop");
- mVideoEncoder.stop();
- } catch (IllegalStateException e) {
- videoSavedCallback.onError(ERROR_ENCODER,
- "Video encoder stop failed!", e);
- errorOccurred = true;
- }
-
- try {
- // new MediaMuxer instance required for each new file written, and release current one.
- synchronized (mMuxerLock) {
- if (mMuxer != null) {
- if (mMuxerStarted) {
- mMuxer.stop();
- }
- mMuxer.release();
- mMuxer = null;
- }
- }
- } catch (IllegalStateException e) {
- videoSavedCallback.onError(ERROR_MUXER, "Muxer stop failed!", e);
- errorOccurred = true;
- }
-
- if (mParcelFileDescriptor != null) {
- try {
- mParcelFileDescriptor.close();
- mParcelFileDescriptor = null;
- } catch (IOException e) {
- videoSavedCallback.onError(ERROR_MUXER, "File descriptor close failed!", e);
- errorOccurred = true;
- }
- }
-
- mMuxerStarted = false;
-
- // notify the UI thread that the video recording has finished
- mEndOfAudioVideoSignal.set(true);
-
- Logger.i(TAG, "Video encode thread end.");
- return errorOccurred;
- }
-
- boolean audioEncode(OnVideoSavedCallback videoSavedCallback) {
- // Audio encoding loop. Exits on end of stream.
- boolean audioEos = false;
- int outIndex;
- long lastAudioTimestamp = 0;
- while (!audioEos && mIsRecording) {
- // Check for end of stream from main thread
- if (mEndOfAudioStreamSignal.get()) {
- mEndOfAudioStreamSignal.set(false);
- mIsRecording = false;
- }
-
- // get audio deque input buffer
- if (mAudioEncoder != null && mAudioRecorder != null) {
- int index = mAudioEncoder.dequeueInputBuffer(-1);
- if (index >= 0) {
- final ByteBuffer buffer = getInputBuffer(mAudioEncoder, index);
- buffer.clear();
- int length = mAudioRecorder.read(buffer, mAudioBufferSize);
- if (length > 0) {
- mAudioEncoder.queueInputBuffer(
- index,
- 0,
- length,
- (System.nanoTime() / 1000),
- mIsRecording ? 0 : MediaCodec.BUFFER_FLAG_END_OF_STREAM);
- }
- }
-
- // start to dequeue audio output buffer
- do {
- outIndex = mAudioEncoder.dequeueOutputBuffer(mAudioBufferInfo, 0);
- switch (outIndex) {
- case MediaCodec.INFO_OUTPUT_FORMAT_CHANGED:
- synchronized (mMuxerLock) {
- mAudioTrackIndex = mMuxer.addTrack(mAudioEncoder.getOutputFormat());
- if (mAudioTrackIndex >= 0 && mVideoTrackIndex >= 0) {
- mMuxerStarted = true;
- mMuxer.start();
- }
- }
- break;
- case MediaCodec.INFO_TRY_AGAIN_LATER:
- break;
- default:
- // Drops out of order audio frame if the frame's earlier than last
- // frame.
- if (mAudioBufferInfo.presentationTimeUs >= lastAudioTimestamp) {
- audioEos = writeAudioEncodedBuffer(outIndex);
- lastAudioTimestamp = mAudioBufferInfo.presentationTimeUs;
- } else {
- Logger.w(TAG,
- "Drops frame, current frame's timestamp "
- + mAudioBufferInfo.presentationTimeUs
- + " is earlier that last frame "
- + lastAudioTimestamp);
- // Releases this frame from output buffer
- mAudioEncoder.releaseOutputBuffer(outIndex, false);
- }
- }
- } while (outIndex >= 0 && !audioEos); // end of dequeue output buffer
- }
- } // end of while loop
-
- // Audio Stop
- try {
- Logger.i(TAG, "audioRecorder stop");
- mAudioRecorder.stop();
- } catch (IllegalStateException e) {
- videoSavedCallback.onError(
- ERROR_ENCODER, "Audio recorder stop failed!", e);
- }
-
- try {
- mAudioEncoder.stop();
- } catch (IllegalStateException e) {
- videoSavedCallback.onError(ERROR_ENCODER,
- "Audio encoder stop failed!", e);
- }
-
- Logger.i(TAG, "Audio encode thread end");
- // Use AtomicBoolean to signal because MediaCodec.signalEndOfInputStream() is not thread
- // safe
- mEndOfVideoStreamSignal.set(true);
-
- return false;
- }
-
- private ByteBuffer getInputBuffer(MediaCodec codec, int index) {
- return codec.getInputBuffer(index);
- }
-
- private ByteBuffer getOutputBuffer(MediaCodec codec, int index) {
- return codec.getOutputBuffer(index);
- }
-
- /** Creates a {@link MediaFormat} using parameters for audio from the configuration */
- private MediaFormat createAudioMediaFormat() {
- MediaFormat format =
- MediaFormat.createAudioFormat(AUDIO_MIME_TYPE, mAudioSampleRate,
- mAudioChannelCount);
- format.setInteger(
- MediaFormat.KEY_AAC_PROFILE, MediaCodecInfo.CodecProfileLevel.AACObjectLC);
- format.setInteger(MediaFormat.KEY_BIT_RATE, mAudioBitRate);
-
- return format;
- }
-
- /** Create a AudioRecord object to get raw data */
- @RequiresPermission(Manifest.permission.RECORD_AUDIO)
- private AudioRecord autoConfigAudioRecordSource(VideoCaptureLegacyConfig config) {
- for (short audioFormat : sAudioEncoding) {
-
- // Use channel count to determine stereo vs mono
- int channelConfig =
- mAudioChannelCount == 1
- ? AudioFormat.CHANNEL_IN_MONO
- : AudioFormat.CHANNEL_IN_STEREO;
- int source = config.getAudioRecordSource();
-
- try {
- int bufferSize =
- AudioRecord.getMinBufferSize(mAudioSampleRate, channelConfig, audioFormat);
-
- if (bufferSize <= 0) {
- bufferSize = config.getAudioMinBufferSize();
- }
-
- AudioRecord recorder =
- new AudioRecord(
- source,
- mAudioSampleRate,
- channelConfig,
- audioFormat,
- bufferSize * 2);
-
- if (recorder.getState() == AudioRecord.STATE_INITIALIZED) {
- mAudioBufferSize = bufferSize;
- Logger.i(
- TAG,
- "source: "
- + source
- + " audioSampleRate: "
- + mAudioSampleRate
- + " channelConfig: "
- + channelConfig
- + " audioFormat: "
- + audioFormat
- + " bufferSize: "
- + bufferSize);
- return recorder;
- }
- } catch (Exception e) {
- Logger.e(TAG, "Exception, keep trying.", e);
- }
- }
-
- return null;
- }
-
- /** Set audio record parameters by CamcorderProfile */
- @SuppressWarnings("deprecation")
- private void setAudioParametersByCamcorderProfile(Size currentResolution, String cameraId) {
- CamcorderProfile profile;
- boolean isCamcorderProfileFound = false;
-
- try {
- for (int quality : CamcorderQuality) {
- if (CamcorderProfile.hasProfile(Integer.parseInt(cameraId), quality)) {
- profile = CamcorderProfile.get(Integer.parseInt(cameraId), quality);
- if (currentResolution.getWidth() == profile.videoFrameWidth
- && currentResolution.getHeight() == profile.videoFrameHeight) {
- mAudioChannelCount = profile.audioChannels;
- mAudioSampleRate = profile.audioSampleRate;
- mAudioBitRate = profile.audioBitRate;
- isCamcorderProfileFound = true;
- break;
- }
- }
- }
- } catch (NumberFormatException e) {
- Logger.i(TAG, "The camera Id is not an integer because the camera may be a removable "
- + "device. Use the default values for the audio related settings.");
- }
-
- // In case no corresponding camcorder profile can be founded, * get default value from
- // VideoCaptureConfig.
- if (!isCamcorderProfileFound) {
- VideoCaptureLegacyConfig config = (VideoCaptureLegacyConfig) getCurrentConfig();
- mAudioChannelCount = config.getAudioChannelCount();
- mAudioSampleRate = config.getAudioSampleRate();
- mAudioBitRate = config.getAudioBitRate();
- }
- }
-
- @NonNull
- private MediaMuxer initMediaMuxer(@NonNull OutputFileOptions outputFileOptions)
- throws IOException {
- MediaMuxer mediaMuxer;
-
- if (outputFileOptions.isSavingToFile()) {
- File savedVideoFile = outputFileOptions.getFile();
- mSavedVideoUri = Uri.fromFile(outputFileOptions.getFile());
-
- mediaMuxer = new MediaMuxer(savedVideoFile.getAbsolutePath(),
- MediaMuxer.OutputFormat.MUXER_OUTPUT_MPEG_4);
- } else if (outputFileOptions.isSavingToFileDescriptor()) {
- if (Build.VERSION.SDK_INT < Build.VERSION_CODES.O) {
- throw new IllegalArgumentException("Using a FileDescriptor to record a video is "
- + "only supported for Android 8.0 or above.");
- }
-
- mediaMuxer = Api26Impl.createMediaMuxer(outputFileOptions.getFileDescriptor(),
- MediaMuxer.OutputFormat.MUXER_OUTPUT_MPEG_4);
- } else if (outputFileOptions.isSavingToMediaStore()) {
- ContentValues values = outputFileOptions.getContentValues() != null
- ? new ContentValues(outputFileOptions.getContentValues())
- : new ContentValues();
-
- mSavedVideoUri = outputFileOptions.getContentResolver().insert(
- outputFileOptions.getSaveCollection(), values);
-
- if (mSavedVideoUri == null) {
- throw new IOException("Invalid Uri!");
- }
-
- // Sine API 26, media muxer could be initiated by a FileDescriptor.
- try {
- if (Build.VERSION.SDK_INT < Build.VERSION_CODES.O) {
- String savedLocationPath = VideoUtil.getAbsolutePathFromUri(
- outputFileOptions.getContentResolver(), mSavedVideoUri);
-
- Logger.i(TAG, "Saved Location Path: " + savedLocationPath);
- mediaMuxer = new MediaMuxer(savedLocationPath,
- MediaMuxer.OutputFormat.MUXER_OUTPUT_MPEG_4);
- } else {
- mParcelFileDescriptor =
- outputFileOptions.getContentResolver().openFileDescriptor(
- mSavedVideoUri, "rw");
- mediaMuxer = Api26Impl.createMediaMuxer(
- mParcelFileDescriptor.getFileDescriptor(),
- MediaMuxer.OutputFormat.MUXER_OUTPUT_MPEG_4);
- }
- } catch (IOException e) {
- mSavedVideoUri = null;
- throw e;
- }
- } else {
- throw new IllegalArgumentException(
- "The OutputFileOptions should assign before recording");
- }
-
- return mediaMuxer;
- }
-
- /**
- * Describes the error that occurred during video capture operations.
- *
- * <p>This is a parameter sent to the error callback functions set in listeners such as {@link
- * OnVideoSavedCallback#onError(int, String, Throwable)}.
- *
- * <p>See message parameter in onError callback or log for more details.
- *
- * @hide
- */
- @IntDef({ERROR_UNKNOWN, ERROR_ENCODER, ERROR_MUXER, ERROR_RECORDING_IN_PROGRESS,
- ERROR_FILE_IO, ERROR_INVALID_CAMERA})
- @Retention(RetentionPolicy.SOURCE)
- @RestrictTo(Scope.LIBRARY_GROUP)
- public @interface VideoCaptureError {
- }
-
- /** Listener containing callbacks for video file I/O events. */
- public interface OnVideoSavedCallback {
- /** Called when the video has been successfully saved. */
- void onVideoSaved(@NonNull OutputFileResults outputFileResults);
-
- /** Called when an error occurs while attempting to save the video. */
- void onError(@VideoCaptureError int videoCaptureError, @NonNull String message,
- @Nullable Throwable cause);
- }
-
- /**
- * Provides a base static default configuration for the VideoCapture
- *
- * <p>These values may be overridden by the implementation. They only provide a minimum set of
- * defaults that are implementation independent.
- *
- * @hide
- */
- @RequiresApi(21) // TODO(b/200306659): Remove and replace with annotation on package-info.java
- @RestrictTo(Scope.LIBRARY_GROUP)
- public static final class Defaults
- implements ConfigProvider<VideoCaptureLegacyConfig> {
- private static final int DEFAULT_VIDEO_FRAME_RATE = 30;
- /** 8Mb/s the recommend rate for 30fps 1080p */
- private static final int DEFAULT_BIT_RATE = 8 * 1024 * 1024;
- /** Seconds between each key frame */
- private static final int DEFAULT_INTRA_FRAME_INTERVAL = 1;
- /** audio bit rate */
- private static final int DEFAULT_AUDIO_BIT_RATE = 64000;
- /** audio sample rate */
- private static final int DEFAULT_AUDIO_SAMPLE_RATE = 8000;
- /** audio channel count */
- private static final int DEFAULT_AUDIO_CHANNEL_COUNT = 1;
- /** audio record source */
- private static final int DEFAULT_AUDIO_RECORD_SOURCE = AudioSource.MIC;
- /** audio default minimum buffer size */
- private static final int DEFAULT_AUDIO_MIN_BUFFER_SIZE = 1024;
- /** Current max resolution of VideoCaptureLegacy is set as FHD */
- private static final Size DEFAULT_MAX_RESOLUTION = new Size(1920, 1080);
- /** Surface occupancy prioirty to this use case */
- private static final int DEFAULT_SURFACE_OCCUPANCY_PRIORITY = 3;
- private static final int DEFAULT_ASPECT_RATIO = AspectRatio.RATIO_16_9;
-
- private static final VideoCaptureLegacyConfig DEFAULT_CONFIG;
-
- static {
- Builder builder = new Builder()
- .setVideoFrameRate(DEFAULT_VIDEO_FRAME_RATE)
- .setBitRate(DEFAULT_BIT_RATE)
- .setIFrameInterval(DEFAULT_INTRA_FRAME_INTERVAL)
- .setAudioBitRate(DEFAULT_AUDIO_BIT_RATE)
- .setAudioSampleRate(DEFAULT_AUDIO_SAMPLE_RATE)
- .setAudioChannelCount(DEFAULT_AUDIO_CHANNEL_COUNT)
- .setAudioRecordSource(DEFAULT_AUDIO_RECORD_SOURCE)
- .setAudioMinBufferSize(DEFAULT_AUDIO_MIN_BUFFER_SIZE)
- .setMaxResolution(DEFAULT_MAX_RESOLUTION)
- .setSurfaceOccupancyPriority(DEFAULT_SURFACE_OCCUPANCY_PRIORITY)
- .setTargetAspectRatio(DEFAULT_ASPECT_RATIO);
-
- DEFAULT_CONFIG = builder.getUseCaseConfig();
- }
-
- @NonNull
- @Override
- public VideoCaptureLegacyConfig getConfig() {
- return DEFAULT_CONFIG;
- }
- }
-
- /** Holder class for metadata that should be saved alongside captured video. */
- public static final class Metadata {
- /** Data representing a geographic location. */
- @Nullable
- public Location location;
- }
-
- private static final class VideoSavedListenerWrapper implements OnVideoSavedCallback {
-
- @NonNull
- Executor mExecutor;
- @NonNull
- OnVideoSavedCallback mOnVideoSavedCallback;
-
- VideoSavedListenerWrapper(@NonNull Executor executor,
- @NonNull OnVideoSavedCallback onVideoSavedCallback) {
- mExecutor = executor;
- mOnVideoSavedCallback = onVideoSavedCallback;
- }
-
- @Override
- public void onVideoSaved(@NonNull OutputFileResults outputFileResults) {
- try {
- mExecutor.execute(() -> mOnVideoSavedCallback.onVideoSaved(outputFileResults));
- } catch (RejectedExecutionException e) {
- Logger.e(TAG, "Unable to post to the supplied executor.");
- }
- }
-
- @Override
- public void onError(@VideoCaptureError int videoCaptureError, @NonNull String message,
- @Nullable Throwable cause) {
- try {
- mExecutor.execute(
- () -> mOnVideoSavedCallback.onError(videoCaptureError, message, cause));
- } catch (RejectedExecutionException e) {
- Logger.e(TAG, "Unable to post to the supplied executor.");
- }
- }
-
- }
-
- /** Builder for a {@link VideoCaptureLegacy}. */
- @SuppressWarnings("ObjectToString")
- public static final class Builder
- implements
- UseCaseConfig.Builder<VideoCaptureLegacy, VideoCaptureLegacyConfig, Builder>,
- ImageOutputConfig.Builder<Builder>,
- ThreadConfig.Builder<Builder> {
-
- private final MutableOptionsBundle mMutableConfig;
-
- /** Creates a new Builder object. */
- public Builder() {
- this(MutableOptionsBundle.create());
- }
-
- private Builder(@NonNull MutableOptionsBundle mutableConfig) {
- mMutableConfig = mutableConfig;
-
- Class<?> oldConfigClass =
- mutableConfig.retrieveOption(OPTION_TARGET_CLASS, null);
- if (oldConfigClass != null && !oldConfigClass.equals(VideoCaptureLegacy.class)) {
- throw new IllegalArgumentException(
- "Invalid target class configuration for "
- + Builder.this
- + ": "
- + oldConfigClass);
- }
-
- setTargetClass(VideoCaptureLegacy.class);
- }
-
- /**
- * Generates a Builder from another Config object.
- *
- * @param configuration An immutable configuration to pre-populate this builder.
- * @return The new Builder.
- * @hide
- */
- @RestrictTo(Scope.LIBRARY_GROUP)
- @NonNull
- static Builder fromConfig(@NonNull Config configuration) {
- return new Builder(MutableOptionsBundle.from(configuration));
- }
-
-
- /**
- * Generates a Builder from another Config object
- *
- * @param configuration An immutable configuration to pre-populate this builder.
- * @return The new Builder.
- */
- @NonNull
- public static Builder fromConfig(@NonNull VideoCaptureLegacyConfig configuration) {
- return new Builder(MutableOptionsBundle.from(configuration));
- }
-
- /**
- * {@inheritDoc}
- *
- * @hide
- */
- @RestrictTo(Scope.LIBRARY_GROUP)
- @Override
- @NonNull
- public MutableConfig getMutableConfig() {
- return mMutableConfig;
- }
-
- /**
- * {@inheritDoc}
- *
- * @hide
- */
- @RestrictTo(Scope.LIBRARY_GROUP)
- @NonNull
- @Override
- public VideoCaptureLegacyConfig getUseCaseConfig() {
- return new VideoCaptureLegacyConfig(OptionsBundle.from(mMutableConfig));
- }
-
- /**
- * Builds an immutable {@link VideoCaptureLegacyConfig} from the current state.
- *
- * @return A {@link VideoCaptureLegacyConfig} populated with the current state.
- */
- @Override
- @NonNull
- public VideoCaptureLegacy build() {
- // Error at runtime for using both setTargetResolution and setTargetAspectRatio on
- // the same config.
- if (getMutableConfig().retrieveOption(OPTION_TARGET_ASPECT_RATIO, null) != null
- && getMutableConfig().retrieveOption(OPTION_TARGET_RESOLUTION, null) != null) {
- throw new IllegalArgumentException(
- "Cannot use both setTargetResolution and setTargetAspectRatio on the same "
- + "config.");
- }
- return new VideoCaptureLegacy(getUseCaseConfig());
- }
-
- /**
- * Sets the recording frames per second.
- *
- * @param videoFrameRate The requested interval in seconds.
- * @return The current Builder.
- * @hide
- */
- @RestrictTo(Scope.LIBRARY_GROUP)
- @NonNull
- public Builder setVideoFrameRate(int videoFrameRate) {
- getMutableConfig().insertOption(OPTION_VIDEO_FRAME_RATE, videoFrameRate);
- return this;
- }
-
- /**
- * Sets the encoding bit rate.
- *
- * @param bitRate The requested bit rate in bits per second.
- * @return The current Builder.
- * @hide
- */
- @RestrictTo(Scope.LIBRARY_GROUP)
- @NonNull
- public Builder setBitRate(int bitRate) {
- getMutableConfig().insertOption(OPTION_BIT_RATE, bitRate);
- return this;
- }
-
- /**
- * Sets number of seconds between each key frame in seconds.
- *
- * @param interval The requested interval in seconds.
- * @return The current Builder.
- * @hide
- */
- @RestrictTo(Scope.LIBRARY_GROUP)
- @NonNull
- public Builder setIFrameInterval(int interval) {
- getMutableConfig().insertOption(OPTION_INTRA_FRAME_INTERVAL, interval);
- return this;
- }
-
- /**
- * Sets the bit rate of the audio stream.
- *
- * @param bitRate The requested bit rate in bits/s.
- * @return The current Builder.
- * @hide
- */
- @RestrictTo(Scope.LIBRARY_GROUP)
- @NonNull
- public Builder setAudioBitRate(int bitRate) {
- getMutableConfig().insertOption(OPTION_AUDIO_BIT_RATE, bitRate);
- return this;
- }
-
- /**
- * Sets the sample rate of the audio stream.
- *
- * @param sampleRate The requested sample rate in bits/s.
- * @return The current Builder.
- * @hide
- */
- @RestrictTo(Scope.LIBRARY_GROUP)
- @NonNull
- public Builder setAudioSampleRate(int sampleRate) {
- getMutableConfig().insertOption(OPTION_AUDIO_SAMPLE_RATE, sampleRate);
- return this;
- }
-
- /**
- * Sets the number of audio channels.
- *
- * @param channelCount The requested number of audio channels.
- * @return The current Builder.
- * @hide
- */
- @RestrictTo(Scope.LIBRARY_GROUP)
- @NonNull
- public Builder setAudioChannelCount(int channelCount) {
- getMutableConfig().insertOption(OPTION_AUDIO_CHANNEL_COUNT, channelCount);
- return this;
- }
-
- /**
- * Sets the audio source.
- *
- * @param source The audio source. Currently only AudioSource.MIC is supported.
- * @return The current Builder.
- * @hide
- */
- @RestrictTo(Scope.LIBRARY_GROUP)
- @NonNull
- public Builder setAudioRecordSource(int source) {
- getMutableConfig().insertOption(OPTION_AUDIO_RECORD_SOURCE, source);
- return this;
- }
-
- /**
- * Sets the audio min buffer size.
- *
- * @param minBufferSize The requested audio minimum buffer size, in bytes.
- * @return The current Builder.
- * @hide
- */
- @RestrictTo(Scope.LIBRARY_GROUP)
- @NonNull
- public Builder setAudioMinBufferSize(int minBufferSize) {
- getMutableConfig().insertOption(OPTION_AUDIO_MIN_BUFFER_SIZE, minBufferSize);
- return this;
- }
-
- // Implementations of TargetConfig.Builder default methods
-
- /** @hide */
- @RestrictTo(Scope.LIBRARY_GROUP)
- @Override
- @NonNull
- public Builder setTargetClass(@NonNull Class<VideoCaptureLegacy> targetClass) {
- getMutableConfig().insertOption(OPTION_TARGET_CLASS, targetClass);
-
- // If no name is set yet, then generate a unique name
- if (null == getMutableConfig().retrieveOption(OPTION_TARGET_NAME, null)) {
- String targetName = targetClass.getCanonicalName() + "-" + UUID.randomUUID();
- setTargetName(targetName);
- }
-
- return this;
- }
-
- /**
- * Sets the name of the target object being configured, used only for debug logging.
- *
- * <p>The name should be a value that can uniquely identify an instance of the object being
- * configured.
- *
- * <p>If not set, the target name will default to an unique name automatically generated
- * with the class canonical name and random UUID.
- *
- * @param targetName A unique string identifier for the instance of the class being
- * configured.
- * @return the current Builder.
- */
- @Override
- @NonNull
- public Builder setTargetName(@NonNull String targetName) {
- getMutableConfig().insertOption(OPTION_TARGET_NAME, targetName);
- return this;
- }
-
- // Implementations of ImageOutputConfig.Builder default methods
-
- /**
- * Sets the aspect ratio of the intended target for images from this configuration.
- *
- * <p>It is not allowed to set both target aspect ratio and target resolution on the same
- * use case.
- *
- * <p>The target aspect ratio is used as a hint when determining the resulting output aspect
- * ratio which may differ from the request, possibly due to device constraints.
- * Application code should check the resulting output's resolution.
- *
- * <p>If not set, resolutions with aspect ratio 4:3 will be considered in higher
- * priority.
- *
- * @param aspectRatio A {@link AspectRatio} representing the ratio of the
- * target's width and height.
- * @return The current Builder.
- * @hide
- */
- @RestrictTo(Scope.LIBRARY_GROUP)
- @NonNull
- @Override
- public Builder setTargetAspectRatio(@AspectRatio.Ratio int aspectRatio) {
- getMutableConfig().insertOption(OPTION_TARGET_ASPECT_RATIO, aspectRatio);
- return this;
- }
-
- /**
- * Sets the rotation of the intended target for images from this configuration.
- *
- * <p>This is one of four valid values: {@link Surface#ROTATION_0}, {@link
- * Surface#ROTATION_90}, {@link Surface#ROTATION_180}, {@link Surface#ROTATION_270}.
- * Rotation values are relative to the "natural" rotation, {@link Surface#ROTATION_0}.
- *
- * <p>If not set, the target rotation will default to the value of
- * {@link Display#getRotation()} of the default display at the time the use case is
- * created. The use case is fully created once it has been attached to a camera.
- *
- * @param rotation The rotation of the intended target.
- * @return The current Builder.
- * @hide
- */
- @RestrictTo(Scope.LIBRARY_GROUP)
- @NonNull
- @Override
- public Builder setTargetRotation(@RotationValue int rotation) {
- getMutableConfig().insertOption(OPTION_TARGET_ROTATION, rotation);
- return this;
- }
-
- /**
- * Sets the resolution of the intended target from this configuration.
- *
- * <p>The target resolution attempts to establish a minimum bound for the image resolution.
- * The actual image resolution will be the closest available resolution in size that is not
- * smaller than the target resolution, as determined by the Camera implementation. However,
- * if no resolution exists that is equal to or larger than the target resolution, the
- * nearest available resolution smaller than the target resolution will be chosen.
- *
- * <p>It is not allowed to set both target aspect ratio and target resolution on the same
- * use case.
- *
- * <p>The target aspect ratio will also be set the same as the aspect ratio of the provided
- * {@link Size}. Make sure to set the target resolution with the correct orientation.
- *
- * @param resolution The target resolution to choose from supported output sizes list.
- * @return The current Builder.
- * @hide
- */
- @RestrictTo(Scope.LIBRARY_GROUP)
- @NonNull
- @Override
- public Builder setTargetResolution(@NonNull Size resolution) {
- getMutableConfig().insertOption(OPTION_TARGET_RESOLUTION, resolution);
- return this;
- }
-
- /**
- * Sets the default resolution of the intended target from this configuration.
- *
- * @param resolution The default resolution to choose from supported output sizes list.
- * @return The current Builder.
- * @hide
- */
- @RestrictTo(Scope.LIBRARY_GROUP)
- @NonNull
- @Override
- public Builder setDefaultResolution(@NonNull Size resolution) {
- getMutableConfig().insertOption(OPTION_DEFAULT_RESOLUTION, resolution);
- return this;
- }
-
- /** @hide */
- @RestrictTo(Scope.LIBRARY_GROUP)
- @NonNull
- @Override
- public Builder setMaxResolution(@NonNull Size resolution) {
- getMutableConfig().insertOption(OPTION_MAX_RESOLUTION, resolution);
- return this;
- }
-
- /** @hide */
- @RestrictTo(Scope.LIBRARY_GROUP)
- @Override
- @NonNull
- public Builder setSupportedResolutions(@NonNull List<Pair<Integer, Size[]>> resolutions) {
- getMutableConfig().insertOption(OPTION_SUPPORTED_RESOLUTIONS, resolutions);
- return this;
- }
-
- // Implementations of ThreadConfig.Builder default methods
-
- /**
- * Sets the default executor that will be used for background tasks.
- *
- * <p>If not set, the background executor will default to an automatically generated
- * {@link Executor}.
- *
- * @param executor The executor which will be used for background tasks.
- * @return the current Builder.
- * @hide
- */
- @RestrictTo(Scope.LIBRARY_GROUP)
- @Override
- @NonNull
- public Builder setBackgroundExecutor(@NonNull Executor executor) {
- getMutableConfig().insertOption(OPTION_BACKGROUND_EXECUTOR, executor);
- return this;
- }
-
- // Implementations of UseCaseConfig.Builder default methods
-
- /** @hide */
- @RestrictTo(Scope.LIBRARY_GROUP)
- @Override
- @NonNull
- public Builder setDefaultSessionConfig(@NonNull SessionConfig sessionConfig) {
- getMutableConfig().insertOption(OPTION_DEFAULT_SESSION_CONFIG, sessionConfig);
- return this;
- }
-
- /** @hide */
- @RestrictTo(Scope.LIBRARY_GROUP)
- @Override
- @NonNull
- public Builder setDefaultCaptureConfig(@NonNull CaptureConfig captureConfig) {
- getMutableConfig().insertOption(OPTION_DEFAULT_CAPTURE_CONFIG, captureConfig);
- return this;
- }
-
- /** @hide */
- @RestrictTo(Scope.LIBRARY_GROUP)
- @Override
- @NonNull
- public Builder setSessionOptionUnpacker(
- @NonNull SessionConfig.OptionUnpacker optionUnpacker) {
- getMutableConfig().insertOption(OPTION_SESSION_CONFIG_UNPACKER, optionUnpacker);
- return this;
- }
-
- /** @hide */
- @RestrictTo(Scope.LIBRARY_GROUP)
- @Override
- @NonNull
- public Builder setCaptureOptionUnpacker(
- @NonNull CaptureConfig.OptionUnpacker optionUnpacker) {
- getMutableConfig().insertOption(OPTION_CAPTURE_CONFIG_UNPACKER, optionUnpacker);
- return this;
- }
-
- /** @hide */
- @RestrictTo(Scope.LIBRARY_GROUP)
- @Override
- @NonNull
- public Builder setSurfaceOccupancyPriority(int priority) {
- getMutableConfig().insertOption(OPTION_SURFACE_OCCUPANCY_PRIORITY, priority);
- return this;
- }
-
- /** @hide */
- @RestrictTo(Scope.LIBRARY)
- @Override
- @NonNull
- public Builder setCameraSelector(@NonNull CameraSelector cameraSelector) {
- getMutableConfig().insertOption(OPTION_CAMERA_SELECTOR, cameraSelector);
- return this;
- }
-
- /** @hide */
- @RestrictTo(Scope.LIBRARY_GROUP)
- @Override
- @NonNull
- public Builder setUseCaseEventCallback(
- @NonNull EventCallback useCaseEventCallback) {
- getMutableConfig().insertOption(OPTION_USE_CASE_EVENT_CALLBACK, useCaseEventCallback);
- return this;
- }
- }
-
- /**
- * Info about the saved video file.
- */
- public static class OutputFileResults {
- @Nullable
- private Uri mSavedUri;
-
- OutputFileResults(@Nullable Uri savedUri) {
- mSavedUri = savedUri;
- }
-
- /**
- * Returns the {@link Uri} of the saved video file.
- *
- * <p> This field is only returned if the {@link OutputFileOptions} is
- * backed by {@link MediaStore} constructed with
- * {@link OutputFileOptions}.
- */
- @Nullable
- public Uri getSavedUri() {
- return mSavedUri;
- }
- }
-
- /**
- * Options for saving newly captured video.
- *
- * <p> this class is used to configure save location and metadata. Save location can be
- * either a {@link File}, {@link MediaStore}. The metadata will be
- * stored with the saved video.
- */
- public static final class OutputFileOptions {
-
- // Empty metadata object used as a placeholder for no user-supplied metadata.
- // Should be initialized to all default values.
- private static final Metadata EMPTY_METADATA = new Metadata();
-
- @Nullable
- private final File mFile;
- @Nullable
- private final FileDescriptor mFileDescriptor;
- @Nullable
- private final ContentResolver mContentResolver;
- @Nullable
- private final Uri mSaveCollection;
- @Nullable
- private final ContentValues mContentValues;
- @Nullable
- private final Metadata mMetadata;
-
- OutputFileOptions(@Nullable File file,
- @Nullable FileDescriptor fileDescriptor,
- @Nullable ContentResolver contentResolver,
- @Nullable Uri saveCollection,
- @Nullable ContentValues contentValues,
- @Nullable Metadata metadata) {
- mFile = file;
- mFileDescriptor = fileDescriptor;
- mContentResolver = contentResolver;
- mSaveCollection = saveCollection;
- mContentValues = contentValues;
- mMetadata = metadata == null ? EMPTY_METADATA : metadata;
- }
-
- /** Returns the File object which is set by the {@link Builder}. */
- @Nullable
- File getFile() {
- return mFile;
- }
-
- /**
- * Returns the FileDescriptor object which is set by the {@link Builder}.
- */
- @Nullable
- FileDescriptor getFileDescriptor() {
- return mFileDescriptor;
- }
-
- /** Returns the content resolver which is set by the {@link Builder}. */
- @Nullable
- ContentResolver getContentResolver() {
- return mContentResolver;
- }
-
- /** Returns the URI which is set by the {@link Builder}. */
- @Nullable
- Uri getSaveCollection() {
- return mSaveCollection;
- }
-
- /** Returns the content values which is set by the {@link Builder}. */
- @Nullable
- ContentValues getContentValues() {
- return mContentValues;
- }
-
- /** Return the metadata which is set by the {@link Builder}.. */
- @Nullable
- Metadata getMetadata() {
- return mMetadata;
- }
-
- /** Checking the caller wants to save video to MediaStore. */
- boolean isSavingToMediaStore() {
- return getSaveCollection() != null && getContentResolver() != null
- && getContentValues() != null;
- }
-
- /** Checking the caller wants to save video to a File. */
- boolean isSavingToFile() {
- return getFile() != null;
- }
-
- /** Checking the caller wants to save video to a FileDescriptor. */
- boolean isSavingToFileDescriptor() {
- return getFileDescriptor() != null;
- }
-
- /**
- * Builder class for {@link OutputFileOptions}.
- */
- public static final class Builder {
- @Nullable
- private File mFile;
- @Nullable
- private FileDescriptor mFileDescriptor;
- @Nullable
- private ContentResolver mContentResolver;
- @Nullable
- private Uri mSaveCollection;
- @Nullable
- private ContentValues mContentValues;
- @Nullable
- private Metadata mMetadata;
-
- /**
- * Creates options to write captured video to a {@link File}.
- *
- * @param file save location of the video.
- */
- public Builder(@NonNull File file) {
- mFile = file;
- }
-
- /**
- * Creates options to write captured video to a {@link FileDescriptor}.
- *
- * <p>Using a FileDescriptor to record a video is only supported for Android 8.0 or
- * above.
- *
- * @param fileDescriptor to save the video.
- * @throws IllegalArgumentException when the device is not running Android 8.0 or above.
- */
- public Builder(@NonNull FileDescriptor fileDescriptor) {
- Preconditions.checkArgument(Build.VERSION.SDK_INT >= Build.VERSION_CODES.O,
- "Using a FileDescriptor to record a video is only supported for Android 8"
- + ".0 or above.");
-
- mFileDescriptor = fileDescriptor;
- }
-
- /**
- * Creates options to write captured video to {@link MediaStore}.
- *
- * Example:
- *
- * <pre>{@code
- *
- * ContentValues contentValues = new ContentValues();
- * contentValues.put(MediaStore.MediaColumns.DISPLAY_NAME, "NEW_VIDEO");
- * contentValues.put(MediaStore.MediaColumns.MIME_TYPE, "video/mp4");
- *
- * OutputFileOptions options = new OutputFileOptions.Builder(
- * getContentResolver(),
- * MediaStore.Video.Media.EXTERNAL_CONTENT_URI,
- * contentValues).build();
- *
- * }</pre>
- *
- * @param contentResolver to access {@link MediaStore}
- * @param saveCollection The URL of the table to insert into.
- * @param contentValues to be included in the created video file.
- */
- public Builder(@NonNull ContentResolver contentResolver,
- @NonNull Uri saveCollection,
- @NonNull ContentValues contentValues) {
- mContentResolver = contentResolver;
- mSaveCollection = saveCollection;
- mContentValues = contentValues;
- }
-
- /**
- * Sets the metadata to be stored with the saved video.
- *
- * @param metadata Metadata to be stored with the saved video.
- */
- @NonNull
- public Builder setMetadata(@NonNull Metadata metadata) {
- mMetadata = metadata;
- return this;
- }
-
- /**
- * Builds {@link OutputFileOptions}.
- */
- @NonNull
- public OutputFileOptions build() {
- return new OutputFileOptions(mFile, mFileDescriptor, mContentResolver,
- mSaveCollection, mContentValues, mMetadata);
- }
- }
- }
-}
diff --git a/camera/camera-video/src/main/java/androidx/camera/video/impl/VideoCaptureLegacyConfig.java b/camera/camera-video/src/main/java/androidx/camera/video/impl/VideoCaptureLegacyConfig.java
deleted file mode 100644
index 76df0b2..0000000
--- a/camera/camera-video/src/main/java/androidx/camera/video/impl/VideoCaptureLegacyConfig.java
+++ /dev/null
@@ -1,251 +0,0 @@
-/*
- * Copyright 2019 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package androidx.camera.video.impl;
-
-import androidx.annotation.NonNull;
-import androidx.annotation.RequiresApi;
-import androidx.camera.core.impl.Config;
-import androidx.camera.core.impl.ImageFormatConstants;
-import androidx.camera.core.impl.ImageOutputConfig;
-import androidx.camera.core.impl.OptionsBundle;
-import androidx.camera.core.impl.UseCaseConfig;
-import androidx.camera.core.internal.ThreadConfig;
-import androidx.camera.video.VideoCaptureLegacy;
-
-/**
- * Config for a video capture use case.
- *
- * <p>In the earlier stage, the VideoCaptureLegacy is deprioritized.
- */
-@RequiresApi(21) // TODO(b/200306659): Remove and replace with annotation on package-info.java
-public final class VideoCaptureLegacyConfig
- implements UseCaseConfig<VideoCaptureLegacy>,
- ImageOutputConfig,
- ThreadConfig {
-
- // Option Declarations:
- // *********************************************************************************************
-
- public static final Option<Integer> OPTION_VIDEO_FRAME_RATE =
- Option.create("camerax.video.videoCaptureLegacy.recordingFrameRate", int.class);
- public static final Option<Integer> OPTION_BIT_RATE =
- Option.create("camerax.video.videoCaptureLegacy.bitRate", int.class);
- public static final Option<Integer> OPTION_INTRA_FRAME_INTERVAL =
- Option.create("camerax.video.videoCaptureLegacy.intraFrameInterval", int.class);
- public static final Option<Integer> OPTION_AUDIO_BIT_RATE =
- Option.create("camerax.video.videoCaptureLegacy.audioBitRate", int.class);
- public static final Option<Integer> OPTION_AUDIO_SAMPLE_RATE =
- Option.create("camerax.video.videoCaptureLegacy.audioSampleRate", int.class);
- public static final Option<Integer> OPTION_AUDIO_CHANNEL_COUNT =
- Option.create("camerax.video.videoCaptureLegacy.audioChannelCount", int.class);
- public static final Option<Integer> OPTION_AUDIO_RECORD_SOURCE =
- Option.create("camerax.video.videoCaptureLegacy.audioRecordSource", int.class);
- public static final Option<Integer> OPTION_AUDIO_MIN_BUFFER_SIZE =
- Option.create("camerax.video.videoCaptureLegacy.audioMinBufferSize", int.class);
-
- // *********************************************************************************************
-
- private final OptionsBundle mConfig;
-
- public VideoCaptureLegacyConfig(@NonNull OptionsBundle config) {
- mConfig = config;
- }
-
- /**
- * Returns the recording frames per second.
- *
- * @param valueIfMissing The value to return if this configuration option has not been set.
- * @return The stored value or <code>valueIfMissing</code> if the value does not exist in this
- * configuration.
- */
- public int getVideoFrameRate(int valueIfMissing) {
- return retrieveOption(OPTION_VIDEO_FRAME_RATE, valueIfMissing);
- }
-
- /**
- * Returns the recording frames per second.
- *
- * @return The stored value, if it exists in this configuration.
- * @throws IllegalArgumentException if the option does not exist in this configuration.
- */
- public int getVideoFrameRate() {
- return retrieveOption(OPTION_VIDEO_FRAME_RATE);
- }
-
- /**
- * Returns the encoding bit rate.
- *
- * @param valueIfMissing The value to return if this configuration option has not been set.
- * @return The stored value or <code>valueIfMissing</code> if the value does not exist in this
- * configuration.
- */
- public int getBitRate(int valueIfMissing) {
- return retrieveOption(OPTION_BIT_RATE, valueIfMissing);
- }
-
- /**
- * Returns the encoding bit rate.
- *
- * @return The stored value, if it exists in this configuration.
- * @throws IllegalArgumentException if the option does not exist in this configuration.
- */
- public int getBitRate() {
- return retrieveOption(OPTION_BIT_RATE);
- }
-
- /**
- * Returns the number of seconds between each key frame.
- *
- * @param valueIfMissing The value to return if this configuration option has not been set.
- * @return The stored value or <code>valueIfMissing</code> if the value does not exist in this
- * configuration.
- */
- public int getIFrameInterval(int valueIfMissing) {
- return retrieveOption(OPTION_INTRA_FRAME_INTERVAL, valueIfMissing);
- }
-
- /**
- * Returns the number of seconds between each key frame.
- *
- * @return The stored value, if it exists in this configuration.
- * @throws IllegalArgumentException if the option does not exist in this configuration.
- */
- public int getIFrameInterval() {
- return retrieveOption(OPTION_INTRA_FRAME_INTERVAL);
- }
-
- /**
- * Returns the audio encoding bit rate.
- *
- * @param valueIfMissing The value to return if this configuration option has not been set.
- * @return The stored value or <code>valueIfMissing</code> if the value does not exist in this
- * configuration.
- */
- public int getAudioBitRate(int valueIfMissing) {
- return retrieveOption(OPTION_AUDIO_BIT_RATE, valueIfMissing);
- }
-
- /**
- * Returns the audio encoding bit rate.
- *
- * @return The stored value, if it exists in this configuration.
- * @throws IllegalArgumentException if the option does not exist in this configuration.
- */
- public int getAudioBitRate() {
- return retrieveOption(OPTION_AUDIO_BIT_RATE);
- }
-
- /**
- * Returns the audio sample rate.
- *
- * @param valueIfMissing The value to return if this configuration option has not been set.
- * @return The stored value or <code>valueIfMissing</code> if the value does not exist in this
- * configuration.
- */
- public int getAudioSampleRate(int valueIfMissing) {
- return retrieveOption(OPTION_AUDIO_SAMPLE_RATE, valueIfMissing);
- }
-
- /**
- * Returns the audio sample rate.
- *
- * @return The stored value, if it exists in this configuration.
- * @throws IllegalArgumentException if the option does not exist in this configuration.
- */
- public int getAudioSampleRate() {
- return retrieveOption(OPTION_AUDIO_SAMPLE_RATE);
- }
-
- /**
- * Returns the audio channel count.
- *
- * @param valueIfMissing The value to return if this configuration option has not been set.
- * @return The stored value or <code>valueIfMissing</code> if the value does not exist in this
- * configuration.
- */
- public int getAudioChannelCount(int valueIfMissing) {
- return retrieveOption(OPTION_AUDIO_CHANNEL_COUNT, valueIfMissing);
- }
-
- /**
- * Returns the audio channel count.
- *
- * @return The stored value, if it exists in this configuration.
- * @throws IllegalArgumentException if the option does not exist in this configuration.
- */
- public int getAudioChannelCount() {
- return retrieveOption(OPTION_AUDIO_CHANNEL_COUNT);
- }
-
- /**
- * Returns the audio recording source.
- *
- * @param valueIfMissing The value to return if this configuration option has not been set.
- * @return The stored value or <code>valueIfMissing</code> if the value does not exist in this
- * configuration.
- */
- public int getAudioRecordSource(int valueIfMissing) {
- return retrieveOption(OPTION_AUDIO_RECORD_SOURCE, valueIfMissing);
- }
-
- /**
- * Returns the audio recording source.
- *
- * @return The stored value, if it exists in this configuration.
- * @throws IllegalArgumentException if the option does not exist in this configuration.
- */
- public int getAudioRecordSource() {
- return retrieveOption(OPTION_AUDIO_RECORD_SOURCE);
- }
-
- /**
- * Returns the audio minimum buffer size, in bytes.
- *
- * @param valueIfMissing The value to return if this configuration option has not been set.
- * @return The stored value or <code>valueIfMissing</code> if the value does not exist in this
- * configuration.
- */
- public int getAudioMinBufferSize(int valueIfMissing) {
- return retrieveOption(OPTION_AUDIO_MIN_BUFFER_SIZE, valueIfMissing);
- }
-
- /**
- * Returns the audio minimum buffer size, in bytes.
- *
- * @return The stored value, if it exists in this configuration.
- * @throws IllegalArgumentException if the option does not exist in this configuration.
- */
- public int getAudioMinBufferSize() {
- return retrieveOption(OPTION_AUDIO_MIN_BUFFER_SIZE);
- }
-
- /**
- * Retrieves the format of the image that is fed as input.
- *
- * <p>This should always be PRIVATE for VideoCaptureLegacy.
- */
- @Override
- public int getInputFormat() {
- return ImageFormatConstants.INTERNAL_DEFINED_IMAGE_FORMAT_PRIVATE;
- }
-
- @NonNull
- @Override
- public Config getConfig() {
- return mConfig;
- }
-}
diff --git a/camera/camera-video/src/main/java/androidx/camera/video/internal/encoder/BufferCopiedEncodedData.java b/camera/camera-video/src/main/java/androidx/camera/video/internal/encoder/BufferCopiedEncodedData.java
new file mode 100644
index 0000000..44e5f9d
--- /dev/null
+++ b/camera/camera-video/src/main/java/androidx/camera/video/internal/encoder/BufferCopiedEncodedData.java
@@ -0,0 +1,137 @@
+/*
+ * Copyright 2022 The Android Open Source Project
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package androidx.camera.video.internal.encoder;
+
+import android.media.MediaCodec;
+
+import androidx.annotation.NonNull;
+import androidx.annotation.RequiresApi;
+import androidx.camera.core.impl.utils.futures.Futures;
+import androidx.concurrent.futures.CallbackToFutureAdapter;
+import androidx.core.util.Preconditions;
+
+import com.google.common.util.concurrent.ListenableFuture;
+
+import java.nio.ByteBuffer;
+import java.util.concurrent.atomic.AtomicReference;
+
+/**
+ * A class used to hold a copy of encoded data to prevent occupying the byte buffer of the media
+ * codec.
+ *
+ * <p> To reduce the memory used, the capacity of the copied byte buffer may not equal to its
+ * source, only the required size is allocated to put the copied data.
+ */
+@RequiresApi(21) // TODO(b/200306659): Remove and replace with annotation on package-info.java
+public class BufferCopiedEncodedData implements EncodedData {
+
+ private final ByteBuffer mByteBuffer;
+ private final MediaCodec.BufferInfo mBufferInfo;
+ private final ListenableFuture<Void> mClosedFuture;
+ private final CallbackToFutureAdapter.Completer<Void> mClosedCompleter;
+
+ public BufferCopiedEncodedData(@NonNull EncodedData encodedData) {
+ mBufferInfo = generateCopiedByteInfo(encodedData);
+ mByteBuffer = generateCopiedByteBuffer(encodedData);
+
+ // Prepare close future and completer
+ AtomicReference<CallbackToFutureAdapter.Completer<Void>> ref = new AtomicReference<>();
+ mClosedFuture = CallbackToFutureAdapter.getFuture(completer -> {
+ ref.set(completer);
+ return "Data closed";
+ });
+ mClosedCompleter = Preconditions.checkNotNull(ref.get());
+ }
+
+ @NonNull
+ private MediaCodec.BufferInfo generateCopiedByteInfo(@NonNull EncodedData encodedData) {
+ MediaCodec.BufferInfo bufferInfo = encodedData.getBufferInfo();
+
+ MediaCodec.BufferInfo copiedBufferInfo = new MediaCodec.BufferInfo();
+ copiedBufferInfo.set(
+ 0,
+ bufferInfo.size,
+ bufferInfo.presentationTimeUs,
+ bufferInfo.flags
+ );
+
+ return copiedBufferInfo;
+ }
+
+ @NonNull
+ private ByteBuffer generateCopiedByteBuffer(@NonNull EncodedData encodedData) {
+ ByteBuffer byteBuffer = encodedData.getByteBuffer();
+ MediaCodec.BufferInfo bufferInfo = encodedData.getBufferInfo();
+ byteBuffer.position(bufferInfo.offset);
+ byteBuffer.limit(bufferInfo.offset + bufferInfo.size);
+
+ // Copy only the part that contents data
+ ByteBuffer copiedByteBuffer = ByteBuffer.allocate(bufferInfo.size);
+ copiedByteBuffer.put(byteBuffer);
+
+ return copiedByteBuffer;
+ }
+
+ /** {@inheritDoc} */
+ @NonNull
+ @Override
+ public ByteBuffer getByteBuffer() {
+ return mByteBuffer;
+ }
+
+ /** {@inheritDoc} */
+ @NonNull
+ @Override
+ public MediaCodec.BufferInfo getBufferInfo() {
+ return mBufferInfo;
+ }
+
+ /** {@inheritDoc} */
+ @Override
+ public long getPresentationTimeUs() {
+ return mBufferInfo.presentationTimeUs;
+ }
+
+ /** {@inheritDoc} */
+ @Override
+ public long size() {
+ return mBufferInfo.size;
+ }
+
+ /** {@inheritDoc} */
+ @Override
+ public boolean isKeyFrame() {
+ return (mBufferInfo.flags & MediaCodec.BUFFER_FLAG_KEY_FRAME) != 0;
+ }
+
+ /**
+ * No need to call this function. Resources will be released by garbage collection.
+ */
+ @Override
+ public void close() {
+ mClosedCompleter.set(null);
+ }
+
+ /**
+ * No need to call this function. Resources will be released by garbage collection.
+ */
+ @NonNull
+ @Override
+ public ListenableFuture<Void> getClosedFuture() {
+ return Futures.nonCancellationPropagating(mClosedFuture);
+ }
+}
diff --git a/camera/camera-video/src/main/java/androidx/camera/video/internal/utils/ArrayDequeRingBuffer.java b/camera/camera-video/src/main/java/androidx/camera/video/internal/utils/ArrayDequeRingBuffer.java
new file mode 100644
index 0000000..dce2e51
--- /dev/null
+++ b/camera/camera-video/src/main/java/androidx/camera/video/internal/utils/ArrayDequeRingBuffer.java
@@ -0,0 +1,110 @@
+/*
+ * Copyright 2022 The Android Open Source Project
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package androidx.camera.video.internal.utils;
+
+import androidx.annotation.NonNull;
+import androidx.annotation.Nullable;
+import androidx.annotation.RequiresApi;
+import androidx.camera.core.Logger;
+import androidx.core.util.Preconditions;
+
+import java.util.ArrayDeque;
+import java.util.Queue;
+
+/**
+ * Implements {@link RingBuffer} with an {@link ArrayDeque}.
+ *
+ * <p> A {@link ArrayDequeRingBuffer} must be configured with a maximum size. Each time an element
+ * is added to the {@link ArrayDequeRingBuffer} and its size reaches maximum, the element at the
+ * head of the {@link ArrayDequeRingBuffer} will be removed.
+ *
+ * <p> This class is not thread-safe, and does not accept null elements.
+ *
+ * @param <E> the type of elements stored in the RingBuffer
+ */
+@RequiresApi(21) // TODO(b/200306659): Remove and replace with annotation on package-info.java
+public class ArrayDequeRingBuffer<E> implements RingBuffer<E> {
+
+ private static final String TAG = "ArrayDequeRingBuffer";
+
+ private final int mCapacity;
+ private final Queue<E> mQueue = new ArrayDeque<>();
+
+ public ArrayDequeRingBuffer(int capacity) {
+ Preconditions.checkArgument(capacity > 0, "The capacity should be greater than 0.");
+
+ mCapacity = capacity;
+ }
+
+ /** {@inheritDoc}
+ *
+ * @throws NullPointerException if {@code data} is {@code null}.
+ */
+ @Override
+ public boolean offer(@NonNull E data) {
+ Preconditions.checkNotNull(data);
+
+ if (!mQueue.offer(data)) {
+ return false;
+ }
+
+ while (size() > mCapacity) {
+ poll();
+ Logger.d(TAG, "Head data is dropped because the ring buffer reached its capacity.");
+ }
+
+ return true;
+ }
+
+ /** {@inheritDoc} */
+ @Nullable
+ @Override
+ public E poll() {
+ return mQueue.poll();
+ }
+
+ /** {@inheritDoc} */
+ @Nullable
+ @Override
+ public E peek() {
+ return mQueue.peek();
+ }
+
+ /** {@inheritDoc} */
+ @Override
+ public int capacity() {
+ return mCapacity;
+ }
+
+ /** {@inheritDoc} */
+ @Override
+ public int size() {
+ return mQueue.size();
+ }
+
+ /** {@inheritDoc} */
+ @Override
+ public boolean isEmpty() {
+ return mQueue.isEmpty();
+ }
+
+ /** {@inheritDoc} */
+ @Override
+ public void clear() {
+ mQueue.clear();
+ }
+}
diff --git a/camera/camera-video/src/main/java/androidx/camera/video/internal/utils/RingBuffer.java b/camera/camera-video/src/main/java/androidx/camera/video/internal/utils/RingBuffer.java
new file mode 100644
index 0000000..d3572d75
--- /dev/null
+++ b/camera/camera-video/src/main/java/androidx/camera/video/internal/utils/RingBuffer.java
@@ -0,0 +1,84 @@
+/*
+ * Copyright 2022 The Android Open Source Project
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package androidx.camera.video.internal.utils;
+
+import androidx.annotation.NonNull;
+import androidx.annotation.Nullable;
+import androidx.annotation.RequiresApi;
+
+/**
+ * A limited size FIFO storage, which automatically evicts elements from the head when attempting
+ * to add new elements onto the storage and it is full.
+ *
+ * @param <E> the type of elements stored in the RingBuffer
+ */
+@RequiresApi(21) // TODO(b/200306659): Remove and replace with annotation on package-info.java
+public interface RingBuffer<E> {
+
+ /**
+ * Adds the specified element to the tail of the {@link RingBuffer}, if the number of elements
+ * reaches the capacity, the element at the head of the {@link RingBuffer} will be removed.
+ *
+ * @param element the element to add
+ * @return true if the element was added to the {@link RingBuffer}, else false
+ */
+ boolean offer(@NonNull E element);
+
+ /**
+ * Retrieves and removes the head of the {@link RingBuffer}, or returns null if the
+ * {@link RingBuffer} is empty.
+ *
+ * @return the head of the {@link RingBuffer}, or null if the {@link RingBuffer} is empty
+ */
+ @Nullable
+ E poll();
+
+ /**
+ * Retrieves, but does not remove, the head of the {@link RingBuffer}, or returns null if the
+ * {@link RingBuffer} is empty.
+ *
+ * @return the head of the {@link RingBuffer}, or null if the @link RingBuffer} is empty
+ */
+ @Nullable
+ E peek();
+
+ /**
+ * Returns the number of elements that the {@link RingBuffer} can hold.
+ *
+ * @return the number of elements that the {@link RingBuffer} can hold
+ */
+ int capacity();
+
+ /**
+ * Returns the number of elements in the {@link RingBuffer}.
+ *
+ * @return the number of elements in the {@link RingBuffer}
+ */
+ int size();
+
+ /**
+ * Returns true if the {@link RingBuffer} contains no elements.
+ *
+ * @return true if the {@link RingBuffer} contains no elements
+ */
+ boolean isEmpty();
+
+ /**
+ * Removes all of the elements. The {@link RingBuffer} will be empty after this method returns.
+ */
+ void clear();
+}
diff --git a/camera/camera-video/src/test/java/androidx/camera/video/VideoCaptureLegacyTest.kt b/camera/camera-video/src/test/java/androidx/camera/video/VideoCaptureLegacyTest.kt
deleted file mode 100644
index ba4a69e..0000000
--- a/camera/camera-video/src/test/java/androidx/camera/video/VideoCaptureLegacyTest.kt
+++ /dev/null
@@ -1,92 +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.camera.video
-
-import android.content.Context
-import android.os.Build
-import android.os.Looper
-import androidx.camera.core.CameraSelector
-import androidx.camera.core.CameraXConfig
-import androidx.camera.core.impl.CameraFactory
-import androidx.camera.core.impl.CameraThreadConfig
-import androidx.camera.core.impl.utils.executor.CameraXExecutors
-import androidx.camera.testing.CameraXUtil
-import androidx.camera.testing.fakes.FakeAppConfig
-import androidx.camera.testing.fakes.FakeCamera
-import androidx.camera.testing.fakes.FakeCameraFactory
-import androidx.test.core.app.ApplicationProvider
-import org.junit.After
-import org.junit.Before
-import org.junit.Test
-import org.junit.runner.RunWith
-import org.mockito.ArgumentMatchers.any
-import org.mockito.ArgumentMatchers.anyString
-import org.mockito.ArgumentMatchers.eq
-import org.mockito.Mockito.mock
-import org.mockito.Mockito.verify
-import org.robolectric.RobolectricTestRunner
-import org.robolectric.Shadows.shadowOf
-import org.robolectric.annotation.Config
-import org.robolectric.annotation.internal.DoNotInstrument
-import java.io.File
-
-@RunWith(RobolectricTestRunner::class)
-@DoNotInstrument
-@Config(
- minSdk = Build.VERSION_CODES.LOLLIPOP
-)
-class VideoCaptureLegacyTest {
- @Before
- fun setUp() {
- val camera = FakeCamera()
-
- val cameraFactoryProvider =
- CameraFactory.Provider { _: Context?, _: CameraThreadConfig?, _: CameraSelector? ->
- val cameraFactory = FakeCameraFactory()
- cameraFactory.insertDefaultBackCamera(camera.cameraInfoInternal.cameraId) {
- camera
- }
- cameraFactory
- }
- val cameraXConfig = CameraXConfig.Builder.fromConfig(FakeAppConfig.create())
- .setCameraFactoryProvider(cameraFactoryProvider)
- .build()
- val context = ApplicationProvider.getApplicationContext<Context>()
- CameraXUtil.initialize(context, cameraXConfig).get()
- }
-
- @After
- fun tearDown() {
- CameraXUtil.shutdown().get()
- }
-
- @Test
- fun startRecording_beforeUseCaseIsBound() {
- val videoCaptureLegacy = VideoCaptureLegacy.Builder().build()
- val file = File.createTempFile("CameraX", ".tmp").apply { deleteOnExit() }
- val outputFileOptions = VideoCaptureLegacy.OutputFileOptions.Builder(file).build()
- val callback = mock(VideoCaptureLegacy.OnVideoSavedCallback::class.java)
- videoCaptureLegacy.startRecording(
- outputFileOptions,
- CameraXExecutors.mainThreadExecutor(),
- callback
- )
- shadowOf(Looper.getMainLooper()).idle()
-
- verify(callback).onError(eq(VideoCaptureLegacy.ERROR_INVALID_CAMERA), anyString(), any())
- }
-}
\ No newline at end of file
diff --git a/camera/camera-video/src/test/java/androidx/camera/video/VideoCaptureTest.kt b/camera/camera-video/src/test/java/androidx/camera/video/VideoCaptureTest.kt
index 2c21e22..1bd92a0 100644
--- a/camera/camera-video/src/test/java/androidx/camera/video/VideoCaptureTest.kt
+++ b/camera/camera-video/src/test/java/androidx/camera/video/VideoCaptureTest.kt
@@ -52,6 +52,7 @@
import androidx.core.util.Consumer
import androidx.test.core.app.ApplicationProvider
import com.google.common.truth.Truth.assertThat
+import com.google.common.truth.Truth.assertWithMessage
import org.junit.After
import org.junit.Assert.assertThrows
import org.junit.Test
@@ -237,7 +238,8 @@
// Assert.
assertSupportedResolutions(
- videoCapture, RESOLUTION_2160P, RESOLUTION_480P, RESOLUTION_720P, RESOLUTION_1080P
+ videoCapture, RESOLUTION_2160P, RESOLUTION_480P
+ // RESOLUTION_720P, RESOLUTION_1080P is filtered out
)
assertThat(videoCapture.attachedSurfaceResolution).isEqualTo(RESOLUTION_480P)
}
@@ -400,6 +402,40 @@
assertThat(transformationInfo!!.targetRotation).isEqualTo(Surface.ROTATION_180)
}
+ @Test
+ fun filterOutResolutions() {
+ // Arrange.
+ val inputs = listOf(
+ listOf(RESOLUTION_2160P, RESOLUTION_1080P, RESOLUTION_720P), // 0
+ listOf(RESOLUTION_2160P, RESOLUTION_720P, RESOLUTION_1080P), // 1
+ listOf(RESOLUTION_1080P, RESOLUTION_2160P, RESOLUTION_720P), // 2
+ listOf(RESOLUTION_1080P, RESOLUTION_720P, RESOLUTION_2160P), // 3
+ listOf(RESOLUTION_720P, RESOLUTION_2160P, RESOLUTION_1080P), // 4
+ listOf(RESOLUTION_720P, RESOLUTION_1080P, RESOLUTION_2160P), // 5
+ listOf(RESOLUTION_1080P, RESOLUTION_1080P, RESOLUTION_720P), // 6 contain duplicate
+ )
+
+ val expected = listOf(
+ listOf(RESOLUTION_2160P, RESOLUTION_1080P, RESOLUTION_720P), // 0
+ listOf(RESOLUTION_2160P, RESOLUTION_720P), // 1
+ listOf(RESOLUTION_1080P, RESOLUTION_720P), // 2
+ listOf(RESOLUTION_1080P, RESOLUTION_720P), // 3
+ listOf(RESOLUTION_720P), // 4
+ listOf(RESOLUTION_720P), // 5
+ listOf(RESOLUTION_1080P, RESOLUTION_720P), // 6
+ )
+
+ inputs.zip(expected).forEachIndexed { index, (input, exp) ->
+ // Act.
+ val result = VideoCapture.filterOutResolutions(input)
+
+ // Assert.
+ assertWithMessage("filterOutResolutions fails on index: $index")
+ .that(result)
+ .isEqualTo(exp)
+ }
+ }
+
private fun assertSupportedResolutions(
videoCapture: VideoCapture<out VideoOutput>,
vararg expectedResolutions: Size
diff --git a/camera/camera-video/src/test/java/androidx/camera/video/internal/encoder/BufferCopiedEncodedDataTest.kt b/camera/camera-video/src/test/java/androidx/camera/video/internal/encoder/BufferCopiedEncodedDataTest.kt
new file mode 100644
index 0000000..4159b8ac
--- /dev/null
+++ b/camera/camera-video/src/test/java/androidx/camera/video/internal/encoder/BufferCopiedEncodedDataTest.kt
@@ -0,0 +1,111 @@
+/*
+ * Copyright 2022 The Android Open Source Project
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package androidx.camera.video.internal.encoder
+
+import android.media.MediaCodec
+import android.os.Build
+import com.google.common.truth.Truth.assertThat
+import java.nio.ByteBuffer
+import org.junit.Before
+import org.junit.Test
+import org.junit.runner.RunWith
+import org.robolectric.ParameterizedRobolectricTestRunner
+import org.robolectric.annotation.Config
+import org.robolectric.annotation.internal.DoNotInstrument
+
+@RunWith(ParameterizedRobolectricTestRunner::class)
+@DoNotInstrument
+@Config(minSdk = Build.VERSION_CODES.LOLLIPOP)
+class BufferCopiedEncodedDataTest(
+ private val sourceOffset: Int,
+ private val sourceSize: Int
+) {
+ companion object {
+ private const val SOURCE_CAPACITY = 1024
+ // The index value is used to generate the content, 127 is chosen because it is the largest
+ // prime number less than 128 (bytes allow -128 to 127).
+ private val SOURCE_CONTENT = ByteArray(SOURCE_CAPACITY) { i -> (i % 127).toByte() }
+
+ @JvmStatic
+ @ParameterizedRobolectricTestRunner.Parameters(name = "offset={0}, size={1}")
+ fun createTestSet() = listOf(
+ arrayOf(0, 1024),
+ arrayOf(0, 0),
+ arrayOf(1024, 0),
+ arrayOf(1023, 1),
+ arrayOf(1, 1023),
+ arrayOf(512, 512),
+ arrayOf(0, 29),
+ arrayOf(947, 73),
+ )
+ }
+
+ private val sourceTimeUs = 123456L
+ private val sourceFlags = 0
+ private lateinit var fakeEncodedData: EncodedData
+ private lateinit var copiedEncodedData: EncodedData
+
+ @Before
+ fun setup() {
+ val byteBuffer = ByteBuffer.allocate(SOURCE_CAPACITY)
+ byteBuffer.put(SOURCE_CONTENT)
+ val bufferInfo = MediaCodec.BufferInfo()
+ bufferInfo.set(sourceOffset, sourceSize, sourceTimeUs, sourceFlags)
+
+ fakeEncodedData = FakeEncodedData(byteBuffer, bufferInfo)
+ copiedEncodedData = BufferCopiedEncodedData(fakeEncodedData)
+ }
+
+ @Test
+ fun getBufferInfo_haveSameContentExceptOffsetIsZero() {
+ with(copiedEncodedData.bufferInfo) {
+ assertThat(offset).isEqualTo(0)
+ assertThat(size).isEqualTo(sourceSize)
+ assertThat(presentationTimeUs).isEqualTo(sourceTimeUs)
+ assertThat(flags).isEqualTo(sourceFlags)
+ }
+ }
+
+ @Test
+ fun getByteBuffer_haveSameContent() {
+ val sourceByteBuffer = fakeEncodedData.byteBuffer
+ val copiedByteBuffer = copiedEncodedData.byteBuffer
+ assertThat(copiedByteBuffer).isEqualTo(sourceByteBuffer)
+ }
+
+ @Test
+ fun getByteBuffer_capacityEqualsToBufferInfoSize() {
+ val bufferInfo = copiedEncodedData.bufferInfo
+ val byteBuffer = copiedEncodedData.byteBuffer
+ assertThat(byteBuffer.capacity()).isEqualTo(bufferInfo.size)
+ }
+
+ @Test
+ fun getPresentationTimeUs_returnCorrectResult() {
+ assertThat(copiedEncodedData.presentationTimeUs).isEqualTo(sourceTimeUs)
+ }
+
+ @Test
+ fun getSize_returnCorrectResult() {
+ assertThat(copiedEncodedData.size()).isEqualTo(fakeEncodedData.size())
+ }
+
+ @Test
+ fun getIsKeyFrame_returnCorrectResult() {
+ assertThat(copiedEncodedData.isKeyFrame).isEqualTo(fakeEncodedData.isKeyFrame)
+ }
+}
\ No newline at end of file
diff --git a/camera/camera-video/src/test/java/androidx/camera/video/internal/encoder/FakeEncodedData.kt b/camera/camera-video/src/test/java/androidx/camera/video/internal/encoder/FakeEncodedData.kt
new file mode 100644
index 0000000..f0fa204
--- /dev/null
+++ b/camera/camera-video/src/test/java/androidx/camera/video/internal/encoder/FakeEncodedData.kt
@@ -0,0 +1,60 @@
+/*
+ * Copyright 2022 The Android Open Source Project
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package androidx.camera.video.internal.encoder
+
+import android.media.MediaCodec
+import android.media.MediaCodec.BufferInfo
+import androidx.annotation.RequiresApi
+import androidx.concurrent.futures.ResolvableFuture
+import com.google.common.util.concurrent.ListenableFuture
+import java.nio.ByteBuffer
+
+@RequiresApi(21) // TODO(b/200306659): Remove and replace with annotation on package-info.java
+class FakeEncodedData(
+ private val byteBuffer: ByteBuffer,
+ private val bufferInfo: BufferInfo
+) : EncodedData {
+ private val terminationFuture = ResolvableFuture.create<Void>()
+
+ override fun getByteBuffer(): ByteBuffer {
+ return byteBuffer
+ }
+
+ override fun getBufferInfo(): BufferInfo {
+ return bufferInfo
+ }
+
+ override fun getPresentationTimeUs(): Long {
+ return bufferInfo.presentationTimeUs
+ }
+
+ override fun size(): Long {
+ return bufferInfo.size.toLong()
+ }
+
+ override fun isKeyFrame(): Boolean {
+ return (bufferInfo.flags and MediaCodec.BUFFER_FLAG_KEY_FRAME) != 0
+ }
+
+ override fun close() {
+ terminationFuture.set(null)
+ }
+
+ override fun getClosedFuture(): ListenableFuture<Void> {
+ return terminationFuture
+ }
+}
\ No newline at end of file
diff --git a/camera/camera-video/src/test/java/androidx/camera/video/internal/utils/ArrayDequeRingBufferTest.kt b/camera/camera-video/src/test/java/androidx/camera/video/internal/utils/ArrayDequeRingBufferTest.kt
new file mode 100644
index 0000000..5184867
--- /dev/null
+++ b/camera/camera-video/src/test/java/androidx/camera/video/internal/utils/ArrayDequeRingBufferTest.kt
@@ -0,0 +1,130 @@
+/*
+ * Copyright 2022 The Android Open Source Project
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package androidx.camera.video.internal.utils
+
+import android.os.Build
+import com.google.common.truth.Truth
+import org.junit.Test
+import org.junit.runner.RunWith
+import org.robolectric.RobolectricTestRunner
+import org.robolectric.annotation.Config
+import org.robolectric.annotation.internal.DoNotInstrument
+
+@RunWith(RobolectricTestRunner::class)
+@DoNotInstrument
+@Config(minSdk = Build.VERSION_CODES.LOLLIPOP)
+class ArrayDequeRingBufferTest {
+
+ private val capacity = 10
+
+ @Test
+ fun getCapacity_returnCorrectResult() {
+ val ringBuffer = ArrayDequeRingBuffer<Any>(capacity)
+ Truth.assertThat(ringBuffer.capacity()).isEqualTo(capacity)
+ }
+
+ @Test
+ fun getSize_returnCorrectResult() {
+ val offerTimes = 5
+
+ val ringBuffer = ArrayDequeRingBuffer<Any>(capacity)
+ for (i in 0 until offerTimes) {
+ ringBuffer.offer(i)
+ }
+
+ Truth.assertThat(ringBuffer.size()).isEqualTo(offerTimes)
+ }
+
+ @Test
+ fun getSize_returnCorrectResultWhenReachCapacity() {
+ val offerTimes = 15
+
+ val ringBuffer = ArrayDequeRingBuffer<Any>(capacity)
+ for (i in 0 until offerTimes) {
+ ringBuffer.offer(i)
+ }
+
+ Truth.assertThat(ringBuffer.size()).isEqualTo(capacity)
+ }
+
+ @Test
+ fun getSize_returnCorrectResultWhenDataAddedThenRemoved() {
+ val offerTimes = 7
+ val pollTimes = 3
+
+ val ringBuffer = ArrayDequeRingBuffer<Any>(capacity)
+ for (i in 0 until offerTimes) {
+ ringBuffer.offer(i)
+ }
+ for (i in 0 until pollTimes) {
+ ringBuffer.poll()
+ }
+
+ Truth.assertThat(ringBuffer.size()).isEqualTo(offerTimes - pollTimes)
+ }
+
+ @Test
+ fun remove_returnCorrectResult() {
+ val offerTimes = 5
+
+ val ringBuffer = ArrayDequeRingBuffer<Any>(capacity)
+ for (i in 0 until offerTimes) {
+ ringBuffer.offer(i)
+ }
+ for (i in 0 until offerTimes) {
+ Truth.assertThat(ringBuffer.poll()).isEqualTo(i)
+ }
+ }
+
+ @Test
+ fun peek_returnCorrectResult() {
+ val offeredValues = listOf(0, 1, 2, 3, 4)
+ val pollTimes = 3
+ val expectedPeekResult = 3
+
+ val ringBuffer = ArrayDequeRingBuffer<Any>(capacity)
+ for (value in offeredValues) {
+ ringBuffer.offer(value)
+ }
+ for (i in 0 until pollTimes) {
+ ringBuffer.poll()
+ }
+
+ Truth.assertThat(ringBuffer.peek()).isEqualTo(expectedPeekResult)
+ }
+
+ @Test
+ fun isEmpty_returnCorrectResultAfterDataAdded() {
+ val ringBuffer = ArrayDequeRingBuffer<Any>(capacity)
+ ringBuffer.offer(Any())
+
+ Truth.assertThat(ringBuffer.isEmpty).isFalse()
+ }
+
+ @Test
+ fun isEmpty_returnCorrectResultAfterClear() {
+ val offerTimes = 5
+
+ val ringBuffer = ArrayDequeRingBuffer<Any>(capacity)
+ for (i in 0 until offerTimes) {
+ ringBuffer.offer(i)
+ }
+ ringBuffer.clear()
+
+ Truth.assertThat(ringBuffer.isEmpty).isTrue()
+ }
+}
\ No newline at end of file
diff --git a/camera/camera-view/src/main/java/androidx/camera/view/internal/compat/quirk/SurfaceViewStretchedQuirk.java b/camera/camera-view/src/main/java/androidx/camera/view/internal/compat/quirk/SurfaceViewStretchedQuirk.java
index 87b2d4b..4760af0 100644
--- a/camera/camera-view/src/main/java/androidx/camera/view/internal/compat/quirk/SurfaceViewStretchedQuirk.java
+++ b/camera/camera-view/src/main/java/androidx/camera/view/internal/compat/quirk/SurfaceViewStretchedQuirk.java
@@ -42,7 +42,9 @@
private static final String OPPO_FIND_N = "OP4E75L1";
static boolean load() {
- return isSamsungFold2OrFold3() || isOppoFoldable();
+ // The surface view issue is fixed in Android T.
+ return Build.VERSION.SDK_INT < 33
+ && (isSamsungFold2OrFold3() || isOppoFoldable());
}
private static boolean isSamsungFold2OrFold3() {
diff --git a/camera/camera-viewfinder/src/main/java/androidx/camera/viewfinder/internal/quirk/SurfaceViewStretchedQuirk.java b/camera/camera-viewfinder/src/main/java/androidx/camera/viewfinder/internal/quirk/SurfaceViewStretchedQuirk.java
index e19400f..fd1695b 100644
--- a/camera/camera-viewfinder/src/main/java/androidx/camera/viewfinder/internal/quirk/SurfaceViewStretchedQuirk.java
+++ b/camera/camera-viewfinder/src/main/java/androidx/camera/viewfinder/internal/quirk/SurfaceViewStretchedQuirk.java
@@ -40,7 +40,9 @@
private static final String OPPO_FIND_N = "OP4E75L1";
static boolean load() {
- return isSamsungFold2OrFold3() || isOppoFoldable();
+ // The surface view issue is fixed in Android T.
+ return Build.VERSION.SDK_INT < 33
+ && (isSamsungFold2OrFold3() || isOppoFoldable());
}
private static boolean isSamsungFold2OrFold3() {
diff --git a/camera/integration-tests/coretestapp/src/androidTest/java/androidx/camera/integration/core/ImageCaptureTest.kt b/camera/integration-tests/coretestapp/src/androidTest/java/androidx/camera/integration/core/ImageCaptureTest.kt
index a1e4df0..892dafa 100644
--- a/camera/integration-tests/coretestapp/src/androidTest/java/androidx/camera/integration/core/ImageCaptureTest.kt
+++ b/camera/integration-tests/coretestapp/src/androidTest/java/androidx/camera/integration/core/ImageCaptureTest.kt
@@ -1425,7 +1425,6 @@
)
val imageCapture = builder
- .setSessionProcessorEnabled(true)
.setSupportedResolutions(
listOf(android.util.Pair(ImageFormat.YUV_420_888, arrayOf(Size(640, 480)))))
.build()
@@ -1473,7 +1472,6 @@
)
val imageCapture = builder
- .setSessionProcessorEnabled(true)
.setSupportedResolutions(
listOf(android.util.Pair(ImageFormat.JPEG, arrayOf(Size(640, 480)))))
.build()
diff --git a/camera/integration-tests/coretestapp/src/main/java/androidx/camera/integration/core/CameraXActivity.java b/camera/integration-tests/coretestapp/src/main/java/androidx/camera/integration/core/CameraXActivity.java
index 78b3287..c44d3c3 100644
--- a/camera/integration-tests/coretestapp/src/main/java/androidx/camera/integration/core/CameraXActivity.java
+++ b/camera/integration-tests/coretestapp/src/main/java/androidx/camera/integration/core/CameraXActivity.java
@@ -773,6 +773,8 @@
mRecordUi.setEnabled(mVideoToggle.isChecked());
mTakePicture.setEnabled(mPhotoToggle.isChecked());
mCaptureQualityToggle.setEnabled(mPhotoToggle.isChecked());
+ mZslToggle.setVisibility(getCameraInfo() != null
+ && getCameraInfo().isZslSupported() ? View.VISIBLE : View.GONE);
mZslToggle.setEnabled(mPhotoToggle.isChecked());
mCameraDirectionButton.setEnabled(getCameraInfo() != null);
mTorchButton.setEnabled(isFlashAvailable());
diff --git a/car/app/app-automotive/src/main/java/androidx/car/app/hardware/common/CarPropertyResponse.java b/car/app/app-automotive/src/main/java/androidx/car/app/hardware/common/CarPropertyResponse.java
index 75a19c4..87abaf1 100644
--- a/car/app/app-automotive/src/main/java/androidx/car/app/hardware/common/CarPropertyResponse.java
+++ b/car/app/app-automotive/src/main/java/androidx/car/app/hardware/common/CarPropertyResponse.java
@@ -18,15 +18,17 @@
import static androidx.annotation.RestrictTo.Scope.LIBRARY;
-import android.car.hardware.CarPropertyValue;
-
import androidx.annotation.NonNull;
import androidx.annotation.Nullable;
+import androidx.annotation.OptIn;
import androidx.annotation.RestrictTo;
+import androidx.car.app.annotations.ExperimentalCarApi;
import com.google.auto.value.AutoValue;
+import com.google.common.collect.ImmutableList;
-import java.util.concurrent.TimeUnit;
+import java.util.Collections;
+import java.util.List;
/**
* Container class for information about property value and status.
@@ -40,49 +42,6 @@
@RestrictTo(LIBRARY)
@AutoValue
public abstract class CarPropertyResponse<T> {
- /**
- * Creates a response for {@link androidx.car.app.hardware.info.AutomotiveCarInfo}.
- *
- * @param propertyId one of the values in {@link android.car.VehiclePropertyIds}.
- * @param status one of the values in {@link CarValue.StatusCode}
- * @param timestampMillis timestamp in milliseconds
- * @param value the same value in {@link CarPropertyValue#getValue()}
- * @param <T> the value type of {@link CarPropertyResponse}
- */
- @NonNull
- public static <T> CarPropertyResponse<T> create(int propertyId,
- @CarValue.StatusCode int status, long timestampMillis, @Nullable T value) {
- return new AutoValue_CarPropertyResponse<>(propertyId, status, timestampMillis,
- value);
- }
-
- /**
- * Creates a response from {@link CarPropertyValue}.
- *
- * @see #create(int, int, long, Object)
- */
- @SuppressWarnings("unchecked")
- @NonNull
- public static <T> CarPropertyResponse<T> createFromPropertyValue(
- @NonNull CarPropertyValue<T> propertyValue) {
- int status = PropertyUtils.mapToStatusCodeInCarValue(propertyValue.getStatus());
- long timestamp = TimeUnit.MILLISECONDS.convert(propertyValue.getTimestamp(),
- TimeUnit.NANOSECONDS);
- return create(propertyValue.getPropertyId(), status, timestamp,
- propertyValue.getValue());
- }
-
-
- /**
- * Creates an error response. The timestamp is always 0 and the value is always {@code null}.
- *
- * @see #create(int, int, long, Object)
- */
- @NonNull
- public static <T> CarPropertyResponse<T> createErrorResponse(int propertyId,
- @CarValue.StatusCode int status) {
- return create(propertyId, status, 0, null);
- }
/** Returns one of the values in {@link android.car.VehiclePropertyIds}. */
public abstract int getPropertyId();
@@ -101,4 +60,51 @@
/** Returns response's value. */
@Nullable
public abstract T getValue();
+
+
+ /** Returns a list of {@link CarZone}s. */
+ @NonNull
+ public abstract ImmutableList<CarZone> getCarZones();
+
+ /** Get a builder class for {@link CarPropertyResponse}*/
+ @NonNull
+ @OptIn(markerClass = ExperimentalCarApi.class)
+ public static <T> Builder<T> builder() {
+ return new AutoValue_CarPropertyResponse.Builder<T>()
+ .setCarZones(Collections.singletonList(CarZone.CAR_ZONE_GLOBAL))
+ .setValue(null)
+ .setTimestampMillis(0);
+ }
+
+ /**
+ * A builder for {@link CarPropertyResponse}
+ *
+ * @param <T> is the value type of {@link CarPropertyResponse#getValue()}
+ */
+ @AutoValue.Builder
+ public abstract static class Builder<T> {
+ /** Sets a property ID for the {@link CarPropertyResponse}. */
+ @NonNull
+ public abstract Builder<T> setPropertyId(int propertyId);
+
+ /** Sets a timestamp for the {@link CarPropertyResponse}. */
+ @NonNull
+ public abstract Builder<T> setTimestampMillis(long timestampMillis);
+
+ /** Sets a value for the {@link CarPropertyResponse}. */
+ @NonNull
+ public abstract Builder<T> setValue(@Nullable T value);
+
+ /** Sets a status code for the {@link CarPropertyResponse}. */
+ @NonNull
+ public abstract Builder<T> setStatus(@CarValue.StatusCode int status);
+
+ /** Sets the list of {@link CarZone}s for the {@link CarPropertyResponse}. */
+ @NonNull
+ public abstract Builder<T> setCarZones(@NonNull List<CarZone> carZones);
+
+ /** Create an instance of {@link CarPropertyResponse}. */
+ @NonNull
+ public abstract CarPropertyResponse<T> build();
+ }
}
diff --git a/car/app/app-automotive/src/main/java/androidx/car/app/hardware/common/GetPropertyRequest.java b/car/app/app-automotive/src/main/java/androidx/car/app/hardware/common/GetPropertyRequest.java
index 7d59e28..78b4195 100644
--- a/car/app/app-automotive/src/main/java/androidx/car/app/hardware/common/GetPropertyRequest.java
+++ b/car/app/app-automotive/src/main/java/androidx/car/app/hardware/common/GetPropertyRequest.java
@@ -19,9 +19,15 @@
import static androidx.annotation.RestrictTo.Scope.LIBRARY;
import androidx.annotation.NonNull;
+import androidx.annotation.OptIn;
import androidx.annotation.RestrictTo;
+import androidx.car.app.annotations.ExperimentalCarApi;
import com.google.auto.value.AutoValue;
+import com.google.common.collect.ImmutableList;
+
+import java.util.Collections;
+import java.util.List;
/**
* Container class for information about getting property values.
@@ -34,14 +40,44 @@
@RestrictTo(LIBRARY)
public abstract class GetPropertyRequest {
/**
+ * Creates a request with {@link CarZone#CAR_ZONE_GLOBAL}.
+ *
* @param propertyId one of the values in {@link android.car.VehiclePropertyIds}
*/
@NonNull
public static GetPropertyRequest create(int propertyId) {
- return new AutoValue_GetPropertyRequest(propertyId);
+ return builder().setPropertyId(propertyId).build();
}
/** Returns one of the values in {@link android.car.VehiclePropertyIds}. */
public abstract int getPropertyId();
+ /** Returns a list of {@link CarZone}s associated with this request. */
+ @NonNull
+ public abstract ImmutableList<CarZone> getCarZones();
+
+ /** Get a {@link Builder} for creating the {@link GetPropertyRequest}. */
+ @NonNull
+ @OptIn(markerClass = ExperimentalCarApi.class)
+ public static Builder builder() {
+ return new AutoValue_GetPropertyRequest.Builder()
+ .setCarZones(Collections.singletonList(CarZone.CAR_ZONE_GLOBAL));
+ }
+
+ /** A builder for the {@link GetPropertyRequest}. */
+ @AutoValue.Builder
+ public abstract static class Builder {
+ /** Sets a property ID for the {@link GetPropertyRequest}. */
+ @NonNull
+ public abstract Builder setPropertyId(int propertyId);
+
+ /** Sets a list of {@link CarZone}s for the {@link GetPropertyRequest}. */
+ @NonNull
+ public abstract Builder setCarZones(@NonNull List<CarZone> carZones);
+
+ /** Creates an instance of {@link GetPropertyRequest}. */
+ @NonNull
+ public abstract GetPropertyRequest build();
+ }
+
}
diff --git a/car/app/app-automotive/src/main/java/androidx/car/app/hardware/common/PropertyManager.java b/car/app/app-automotive/src/main/java/androidx/car/app/hardware/common/PropertyManager.java
index fd8170a..59d7a1c 100644
--- a/car/app/app-automotive/src/main/java/androidx/car/app/hardware/common/PropertyManager.java
+++ b/car/app/app-automotive/src/main/java/androidx/car/app/hardware/common/PropertyManager.java
@@ -277,15 +277,12 @@
// TODO(b/190869722): handle AreaId to VehicleZone map in V1.2
List<CarPropertyResponse<?>> carResponses = new ArrayList<>();
for (CarPropertyValue<?> value : propertyValues) {
- int statusCode = PropertyUtils.mapToStatusCodeInCarValue(value.getStatus());
- long timeInMillis = TimeUnit.MILLISECONDS.convert(value.getTimestamp(),
- TimeUnit.NANOSECONDS);
- carResponses.add(CarPropertyResponse.create(
- value.getPropertyId(), statusCode, timeInMillis, value.getValue()));
+ carResponses.add(PropertyUtils.convertPropertyValueToPropertyResponse(value));
}
for (CarInternalError error: propertyErrors) {
- carResponses.add(CarPropertyResponse.createErrorResponse(error.getPropertyId(),
- error.getErrorCode()));
+ carResponses.add(CarPropertyResponse.builder()
+ .setPropertyId(error.getPropertyId())
+ .setStatus(error.getErrorCode()).build());
}
return carResponses;
}
diff --git a/car/app/app-automotive/src/main/java/androidx/car/app/hardware/common/PropertyResponseCache.java b/car/app/app-automotive/src/main/java/androidx/car/app/hardware/common/PropertyResponseCache.java
index b3c7c55..c43e584 100644
--- a/car/app/app-automotive/src/main/java/androidx/car/app/hardware/common/PropertyResponseCache.java
+++ b/car/app/app-automotive/src/main/java/androidx/car/app/hardware/common/PropertyResponseCache.java
@@ -73,8 +73,8 @@
// add an init value if needed
if (mPropertyIdToResponse.get(propertyId) == null) {
mPropertyIdToResponse.put(propertyId,
- CarPropertyResponse.createErrorResponse(propertyId,
- CarValue.STATUS_UNAVAILABLE));
+ CarPropertyResponse.builder().setPropertyId(propertyId)
+ .setValue(CarValue.STATUS_SUCCESS).build());
}
}
}
@@ -109,8 +109,8 @@
for (int propertyId : propertyIds) {
// return a response with unavailable status if can not find in cache
CarPropertyResponse<?> propertyResponse = mPropertyIdToResponse.get(propertyId,
- CarPropertyResponse.createErrorResponse(propertyId,
- CarValue.STATUS_UNAVAILABLE));
+ CarPropertyResponse.builder().setPropertyId(propertyId)
+ .setValue(CarValue.STATUS_SUCCESS).build());
values.add(propertyResponse);
}
}
@@ -159,7 +159,7 @@
if (responseInCache.getTimestampMillis() <= timestampMs) {
// In V1.1, all properties are global properties.
CarPropertyResponse<?> response =
- CarPropertyResponse.createFromPropertyValue(propertyValue);
+ PropertyUtils.convertPropertyValueToPropertyResponse(propertyValue);
mPropertyIdToResponse.put(propertyId, response);
return true;
}
@@ -169,8 +169,9 @@
/** Updates the error event in cache */
void updateInternalError(CarInternalError internalError) {
- CarPropertyResponse<?> response = CarPropertyResponse.createErrorResponse(
- internalError.getPropertyId(), internalError.getErrorCode());
+ CarPropertyResponse<?> response = CarPropertyResponse.builder()
+ .setPropertyId(internalError.getPropertyId())
+ .setStatus(internalError.getErrorCode()).build();
synchronized (mLock) {
mPropertyIdToResponse.put(internalError.getPropertyId(), response);
}
diff --git a/car/app/app-automotive/src/main/java/androidx/car/app/hardware/common/PropertyUtils.java b/car/app/app-automotive/src/main/java/androidx/car/app/hardware/common/PropertyUtils.java
index 8dc560a..9e5e0c5 100644
--- a/car/app/app-automotive/src/main/java/androidx/car/app/hardware/common/PropertyUtils.java
+++ b/car/app/app-automotive/src/main/java/androidx/car/app/hardware/common/PropertyUtils.java
@@ -23,21 +23,27 @@
import static androidx.car.app.hardware.common.CarUnit.US_GALLON;
import android.car.Car;
+import android.car.VehicleAreaSeat;
+import android.car.VehicleAreaType;
import android.car.VehiclePropertyIds;
import android.car.hardware.CarPropertyValue;
import android.util.Pair;
import android.util.SparseArray;
+import androidx.annotation.NonNull;
import androidx.annotation.OptIn;
import androidx.annotation.RestrictTo;
import androidx.car.app.annotations.ExperimentalCarApi;
import androidx.car.app.hardware.info.AutomotiveCarInfo;
import androidx.car.app.hardware.info.EnergyProfile;
+import java.util.ArrayList;
import java.util.Arrays;
+import java.util.Collections;
import java.util.HashSet;
import java.util.List;
import java.util.Set;
+import java.util.concurrent.TimeUnit;
/**
* Utility functions to work with {@link android.car.hardware.CarPropertyValue}
@@ -102,6 +108,39 @@
}
};
+ @ExperimentalCarApi
+ private static final SparseArray<CarZone> AREAID_TO_CARZONE = new SparseArray<CarZone>() {
+ {
+ append(VehicleAreaSeat.SEAT_ROW_1_LEFT,
+ new CarZone.Builder().setRow(CarZone.CAR_ZONE_ROW_FIRST)
+ .setColumn(CarZone.CAR_ZONE_COLUMN_LEFT).build());
+ append(VehicleAreaSeat.SEAT_ROW_1_CENTER,
+ new CarZone.Builder().setRow(CarZone.CAR_ZONE_ROW_FIRST)
+ .setColumn(CarZone.CAR_ZONE_COLUMN_CENTER).build());
+ append(VehicleAreaSeat.SEAT_ROW_1_RIGHT,
+ new CarZone.Builder().setRow(CarZone.CAR_ZONE_ROW_FIRST)
+ .setColumn(CarZone.CAR_ZONE_COLUMN_RIGHT).build());
+ append(VehicleAreaSeat.SEAT_ROW_2_LEFT,
+ new CarZone.Builder().setRow(CarZone.CAR_ZONE_ROW_SECOND)
+ .setColumn(CarZone.CAR_ZONE_COLUMN_LEFT).build());
+ append(VehicleAreaSeat.SEAT_ROW_2_CENTER,
+ new CarZone.Builder().setRow(CarZone.CAR_ZONE_ROW_SECOND)
+ .setColumn(CarZone.CAR_ZONE_COLUMN_CENTER).build());
+ append(VehicleAreaSeat.SEAT_ROW_2_RIGHT,
+ new CarZone.Builder().setRow(CarZone.CAR_ZONE_ROW_SECOND)
+ .setColumn(CarZone.CAR_ZONE_COLUMN_RIGHT).build());
+ append(VehicleAreaSeat.SEAT_ROW_3_LEFT,
+ new CarZone.Builder().setRow(CarZone.CAR_ZONE_ROW_THIRD)
+ .setColumn(CarZone.CAR_ZONE_COLUMN_LEFT).build());
+ append(VehicleAreaSeat.SEAT_ROW_3_CENTER,
+ new CarZone.Builder().setRow(CarZone.CAR_ZONE_ROW_THIRD)
+ .setColumn(CarZone.CAR_ZONE_COLUMN_CENTER).build());
+ append(VehicleAreaSeat.SEAT_ROW_3_RIGHT,
+ new CarZone.Builder().setRow(CarZone.CAR_ZONE_ROW_THIRD)
+ .setColumn(CarZone.CAR_ZONE_COLUMN_RIGHT).build());
+ }
+ };
+
// Permissions for writing properties. They are system level permissions.
private static final SparseArray<String> PERMISSION_WRITE_PROPERTY = new SparseArray<String>() {
{
@@ -247,6 +286,30 @@
}
/**
+ * Creates a response from {@link CarPropertyValue}.
+ */
+ @SuppressWarnings("unchecked")
+ @NonNull
+ @OptIn(markerClass = ExperimentalCarApi.class)
+ public static CarPropertyResponse<?> convertPropertyValueToPropertyResponse(
+ @NonNull CarPropertyValue<?> propertyValue) {
+ int status = mapToStatusCodeInCarValue(propertyValue.getStatus());
+ long timestamp = TimeUnit.MILLISECONDS.convert(propertyValue.getTimestamp(),
+ TimeUnit.NANOSECONDS);
+ List<CarZone> carZones;
+ if (propertyValue.getAreaId() == VehicleAreaType.VEHICLE_AREA_TYPE_GLOBAL) {
+ carZones = Collections.singletonList(CarZone.CAR_ZONE_GLOBAL);
+ } else {
+ carZones = mapAreaIdToCarZones(propertyValue.getAreaId());
+ }
+ return CarPropertyResponse.builder().setValue(propertyValue.getValue())
+ .setPropertyId(propertyValue.getPropertyId())
+ .setCarZones(carZones)
+ .setStatus(status)
+ .setTimestampMillis(timestamp).build();
+ }
+
+ /**
* Returns a {@link Set<String>} that contains permissions for reading properties.
*
* @throws SecurityException if android application cannot access the property
@@ -319,6 +382,21 @@
}
}
+ /**
+ * Builds a list of {@link CarZone}s from the {@link CarPropertyValue#getAreaId()}.
+ */
+ @OptIn(markerClass = ExperimentalCarApi.class)
+ static List<CarZone> mapAreaIdToCarZones(int areaId) {
+ List<CarZone> carZones = new ArrayList<>();
+ for (int i = 0; i < AREAID_TO_CARZONE.size(); i++) {
+ int key = AREAID_TO_CARZONE.keyAt(i);
+ if ((key & areaId) != key) {
+ carZones.add(AREAID_TO_CARZONE.valueAt(i));
+ }
+ }
+ return carZones;
+ }
+
private PropertyUtils() {
}
}
diff --git a/car/app/app-automotive/src/test/java/androidx/car/app/hardware/common/PropertyManagerTest.java b/car/app/app-automotive/src/test/java/androidx/car/app/hardware/common/PropertyManagerTest.java
index ff5ac31..01eeb85 100644
--- a/car/app/app-automotive/src/test/java/androidx/car/app/hardware/common/PropertyManagerTest.java
+++ b/car/app/app-automotive/src/test/java/androidx/car/app/hardware/common/PropertyManagerTest.java
@@ -39,6 +39,7 @@
import org.robolectric.shadows.ShadowApplication;
import java.util.ArrayList;
+import java.util.Collections;
import java.util.List;
import java.util.concurrent.Executor;
import java.util.concurrent.Executors;
@@ -47,6 +48,8 @@
@DoNotInstrument
public class PropertyManagerTest extends MockedCarTestBase {
private final Executor mExecutor = Executors.newSingleThreadExecutor();
+ private static final List<CarZone> CAR_ZONE_GLOBAL =
+ Collections.singletonList(CarZone.CAR_ZONE_GLOBAL);
private PropertyManager mPropertyManager;
@Before
@@ -78,6 +81,7 @@
assertThat(infoYearResponse.getPropertyId()).isEqualTo(VehiclePropertyIds.INFO_MODEL_YEAR);
assertThat(infoYearResponse.getValue()).isEqualTo(MODEL_YEAR);
assertThat(infoYearResponse.getStatus()).isEqualTo(CarValue.STATUS_SUCCESS);
+ assertThat(infoYearResponse.getCarZones()).isEqualTo(CAR_ZONE_GLOBAL);
}
/**
@@ -104,8 +108,10 @@
assertThat(infoMakerResponse.getStatus()).isEqualTo(CarValue.STATUS_UNAVAILABLE);
assertThat(infoModelResponse.getValue()).isEqualTo(MODEL_NAME);
assertThat(infoModelResponse.getStatus()).isEqualTo(CarValue.STATUS_UNKNOWN);
+ assertThat(infoModelResponse.getCarZones()).isEqualTo(CAR_ZONE_GLOBAL);
assertThat(infoYearResponse.getValue()).isEqualTo(MODEL_YEAR);
assertThat(infoYearResponse.getStatus()).isEqualTo(CarValue.STATUS_SUCCESS);
+ assertThat(infoYearResponse.getCarZones()).isEqualTo(CAR_ZONE_GLOBAL);
}
/**
@@ -137,6 +143,7 @@
assertThat(responses.size()).isEqualTo(requests.size());
assertThat(response.getValue()).isNull();
assertThat(response.getStatus()).isEqualTo(CarValue.STATUS_UNIMPLEMENTED);
+ assertThat(response.getCarZones()).isEqualTo(CAR_ZONE_GLOBAL);
}
private static SparseArray<CarPropertyResponse<?>> getCarPropertyResponseMap(
diff --git a/car/app/app-automotive/src/test/java/androidx/car/app/hardware/info/AutomotiveCarInfoTest.java b/car/app/app-automotive/src/test/java/androidx/car/app/hardware/info/AutomotiveCarInfoTest.java
index 23c5c8e..d43df1a 100644
--- a/car/app/app-automotive/src/test/java/androidx/car/app/hardware/info/AutomotiveCarInfoTest.java
+++ b/car/app/app-automotive/src/test/java/androidx/car/app/hardware/info/AutomotiveCarInfoTest.java
@@ -36,6 +36,7 @@
import static androidx.car.app.hardware.common.CarValue.STATUS_SUCCESS;
import static androidx.car.app.hardware.common.CarValue.STATUS_UNAVAILABLE;
+import static androidx.car.app.hardware.common.CarValue.STATUS_UNKNOWN;
import static androidx.car.app.hardware.info.AutomotiveCarInfo.DEFAULT_SAMPLE_RATE;
import static androidx.car.app.hardware.info.AutomotiveCarInfo.SPEED_DISPLAY_UNIT_ID;
import static androidx.car.app.hardware.info.AutomotiveCarInfo.TOLL_CARD_STATUS_ID;
@@ -59,6 +60,7 @@
import androidx.car.app.hardware.common.CarPropertyResponse;
import androidx.car.app.hardware.common.CarUnit;
import androidx.car.app.hardware.common.CarValue;
+import androidx.car.app.hardware.common.CarZone;
import androidx.car.app.hardware.common.GetPropertyRequest;
import androidx.car.app.hardware.common.OnCarDataAvailableListener;
import androidx.car.app.hardware.common.OnCarPropertyResponseListener;
@@ -79,6 +81,7 @@
import org.robolectric.annotation.internal.DoNotInstrument;
import java.util.ArrayList;
+import java.util.Collections;
import java.util.List;
import java.util.concurrent.CountDownLatch;
import java.util.concurrent.Executor;
@@ -103,6 +106,8 @@
private CarPropertyManager mCarPropertyManagerMock;
@Mock
private PropertyManager mPropertyManager;
+ private static final List<CarZone> GLOBAL_ZONE = Collections.singletonList(
+ CarZone.CAR_ZONE_GLOBAL);
@Before
public void setUp() {
@@ -124,12 +129,21 @@
mGetPropertyRequests.add(GetPropertyRequest.create(INFO_MODEL_YEAR));
// Add "make", "model", "year" values to the response.
- mResponse.add(CarPropertyResponse.create(INFO_MAKE,
- STATUS_SUCCESS, 1, "Toy Vehicle"));
- mResponse.add(CarPropertyResponse.create(INFO_MODEL,
- STATUS_SUCCESS, 2, "Speedy Model"));
- mResponse.add(CarPropertyResponse.create(INFO_MODEL_YEAR,
- STATUS_SUCCESS, 3, 2020));
+ mResponse.add(CarPropertyResponse.builder()
+ .setPropertyId(INFO_MAKE)
+ .setStatus(STATUS_SUCCESS)
+ .setValue("Toy Vehicle")
+ .setTimestampMillis(1L).build());
+ mResponse.add(CarPropertyResponse.builder()
+ .setPropertyId(INFO_MODEL)
+ .setStatus(STATUS_SUCCESS)
+ .setValue("Speedy Model")
+ .setTimestampMillis(2L).build());
+ mResponse.add(CarPropertyResponse.builder()
+ .setPropertyId(INFO_MODEL_YEAR)
+ .setStatus(STATUS_SUCCESS)
+ .setValue(2020)
+ .setTimestampMillis(3L).build());
ListenableFuture<List<CarPropertyResponse<?>>> listenableCarPropertyResponse =
Futures.immediateFuture(mResponse);
when(mPropertyManager.submitGetPropertyRequest(
@@ -149,6 +163,10 @@
assertThat(mModel.getYear().getValue()).isEqualTo(2020);
assertThat(mModel.getManufacturer().getTimestampMillis()).isEqualTo(1);
assertThat(mModel.getName().getTimestampMillis()).isEqualTo(2);
+ // test CarZone
+ assertThat(mModel.getName().getCarZones()).isEqualTo(GLOBAL_ZONE);
+ assertThat(mModel.getManufacturer().getCarZones()).isEqualTo(GLOBAL_ZONE);
+ assertThat(mModel.getYear().getCarZones()).isEqualTo(GLOBAL_ZONE);
assertThat(mModel.getYear().getTimestampMillis()).isEqualTo(3);
}
@@ -159,12 +177,21 @@
mGetPropertyRequests.add(GetPropertyRequest.create(INFO_MODEL));
// Add "make", "model", "year" values to the response.
- mResponse.add(CarPropertyResponse.create(INFO_MAKE,
- STATUS_SUCCESS, 1, "Toy Vehicle"));
- mResponse.add(CarPropertyResponse.create(INFO_MODEL,
- STATUS_SUCCESS, 2, "Speedy Model"));
- mResponse.add(CarPropertyResponse.create(INFO_MODEL_YEAR,
- STATUS_SUCCESS, 3, 2020));
+ mResponse.add(CarPropertyResponse.builder()
+ .setPropertyId(INFO_MAKE)
+ .setStatus(STATUS_SUCCESS)
+ .setValue("Toy Vehicle")
+ .setTimestampMillis(1L).build());
+ mResponse.add(CarPropertyResponse.builder()
+ .setPropertyId(INFO_MODEL)
+ .setStatus(STATUS_SUCCESS)
+ .setValue("Speedy Model")
+ .setTimestampMillis(2L).build());
+ mResponse.add(CarPropertyResponse.builder()
+ .setPropertyId(INFO_MODEL_YEAR)
+ .setStatus(STATUS_SUCCESS)
+ .setValue(2020)
+ .setTimestampMillis(3L).build());
ListenableFuture<List<CarPropertyResponse<?>>> listenableCarPropertyResponse =
Futures.immediateFuture(mResponse);
when(mPropertyManager.submitGetPropertyRequest(
@@ -187,10 +214,16 @@
mGetPropertyRequests.add(GetPropertyRequest.create(INFO_FUEL_TYPE));
// Add "evConnector" and "fuel" type of the vehicle to the response.
- mResponse.add(CarPropertyResponse.create(INFO_EV_CONNECTOR_TYPE,
- STATUS_SUCCESS, 1, new Integer[]{chademoInVehicle}));
- mResponse.add(CarPropertyResponse.create(INFO_FUEL_TYPE,
- STATUS_SUCCESS, 2, new Integer[]{FUEL_TYPE_UNLEADED}));
+ mResponse.add(CarPropertyResponse.builder()
+ .setPropertyId(INFO_EV_CONNECTOR_TYPE)
+ .setStatus(STATUS_SUCCESS)
+ .setValue(new Integer[]{chademoInVehicle})
+ .setTimestampMillis(1L).build());
+ mResponse.add(CarPropertyResponse.builder()
+ .setPropertyId(INFO_FUEL_TYPE)
+ .setStatus(STATUS_SUCCESS)
+ .setValue(new Integer[]{FUEL_TYPE_UNLEADED})
+ .setTimestampMillis(2L).build());
ListenableFuture<List<CarPropertyResponse<?>>> listenableCarPropertyResponse =
Futures.immediateFuture(mResponse);
when(mPropertyManager.submitGetPropertyRequest(
@@ -262,9 +295,16 @@
verify(mPropertyManager).submitRegisterListenerRequest(eq(mPropertyIds),
eq(DEFAULT_SAMPLE_RATE), captor.capture(), eq(mExecutor));
- mResponse.add(CarPropertyResponse.create(PERF_ODOMETER, STATUS_SUCCESS, 1, 1f));
- mResponse.add(CarPropertyResponse.create(DISTANCE_DISPLAY_UNITS, STATUS_SUCCESS, 2,
- meterUnit));
+ mResponse.add(CarPropertyResponse.builder()
+ .setPropertyId(PERF_ODOMETER)
+ .setStatus(STATUS_SUCCESS)
+ .setValue(1f)
+ .setTimestampMillis(1L).build());
+ mResponse.add(CarPropertyResponse.builder()
+ .setPropertyId(DISTANCE_DISPLAY_UNITS)
+ .setStatus(STATUS_SUCCESS)
+ .setValue(meterUnit)
+ .setTimestampMillis(2L).build());
captor.getValue().onCarPropertyResponses(mResponse);
mCountDownLatch.await();
@@ -297,9 +337,16 @@
verify(mPropertyManager, times(2)).submitRegisterListenerRequest(
eq(mPropertyIds), eq(DEFAULT_SAMPLE_RATE), captor.capture(), eq(mExecutor));
- mResponse.add(CarPropertyResponse.create(PERF_ODOMETER, STATUS_SUCCESS, 1, 1f));
- mResponse.add(CarPropertyResponse.create(DISTANCE_DISPLAY_UNITS, STATUS_SUCCESS, 2,
- meterUnit));
+ mResponse.add(CarPropertyResponse.builder()
+ .setPropertyId(PERF_ODOMETER)
+ .setStatus(STATUS_SUCCESS)
+ .setValue(1f)
+ .setTimestampMillis(1L).build());
+ mResponse.add(CarPropertyResponse.builder()
+ .setPropertyId(DISTANCE_DISPLAY_UNITS)
+ .setStatus(STATUS_SUCCESS)
+ .setValue(meterUnit)
+ .setTimestampMillis(2L).build());
captor.getValue().onCarPropertyResponses(mResponse);
mCountDownLatch.await();
@@ -345,9 +392,16 @@
eq(mPropertyIds), eq(DEFAULT_SAMPLE_RATE), firstCaptor.capture(),
eq(firstExecutor));
- mResponse.add(CarPropertyResponse.create(PERF_ODOMETER, STATUS_SUCCESS, 1, 1f));
- mResponse.add(CarPropertyResponse.create(DISTANCE_DISPLAY_UNITS, STATUS_SUCCESS, 2,
- meterUnit));
+ mResponse.add(CarPropertyResponse.builder()
+ .setPropertyId(PERF_ODOMETER)
+ .setStatus(STATUS_SUCCESS)
+ .setValue(1f)
+ .setTimestampMillis(1L).build());
+ mResponse.add(CarPropertyResponse.builder()
+ .setPropertyId(DISTANCE_DISPLAY_UNITS)
+ .setStatus(STATUS_SUCCESS)
+ .setValue(meterUnit)
+ .setTimestampMillis(2L).build());
firstCaptor.getValue().onCarPropertyResponses(mResponse);
@@ -393,9 +447,16 @@
verify(mPropertyManager).submitRegisterListenerRequest(eq(mPropertyIds),
eq(DEFAULT_SAMPLE_RATE), captor.capture(), eq(mExecutor));
- mResponse.add(CarPropertyResponse.create(EV_CHARGE_PORT_OPEN, STATUS_SUCCESS, 1, true));
- mResponse.add(
- CarPropertyResponse.create(EV_CHARGE_PORT_CONNECTED, STATUS_SUCCESS, 2, false));
+ mResponse.add(CarPropertyResponse.builder()
+ .setPropertyId(EV_CHARGE_PORT_OPEN)
+ .setStatus(STATUS_SUCCESS)
+ .setValue(true)
+ .setTimestampMillis(1L).build());
+ mResponse.add(CarPropertyResponse.builder()
+ .setPropertyId(EV_CHARGE_PORT_CONNECTED)
+ .setStatus(STATUS_SUCCESS)
+ .setValue(false)
+ .setTimestampMillis(2L).build());
captor.getValue().onCarPropertyResponses(mResponse);
mCountDownLatch.await();
@@ -424,10 +485,16 @@
verify(mPropertyManager).submitRegisterListenerRequest(eq(mPropertyIds),
eq(DEFAULT_SAMPLE_RATE), captor.capture(), eq(mExecutor));
- mResponse.add(CarPropertyResponse.create(EV_CHARGE_PORT_OPEN, STATUS_SUCCESS, 1, true));
- mResponse.add(
- CarPropertyResponse.create(EV_CHARGE_PORT_CONNECTED, CarValue.STATUS_UNKNOWN, 1,
- null));
+ mResponse.add(CarPropertyResponse.builder()
+ .setPropertyId(EV_CHARGE_PORT_OPEN)
+ .setStatus(STATUS_SUCCESS)
+ .setValue(true)
+ .setTimestampMillis(1L).build());
+ mResponse.add(CarPropertyResponse.builder()
+ .setPropertyId(EV_CHARGE_PORT_CONNECTED)
+ .setStatus(STATUS_UNKNOWN)
+ .setValue(null)
+ .setTimestampMillis(1L).build());
captor.getValue().onCarPropertyResponses(mResponse);
mCountDownLatch.await();
@@ -457,14 +524,18 @@
verify(mPropertyManager).submitRegisterListenerRequest(eq(mPropertyIds),
eq(DEFAULT_SAMPLE_RATE), captor.capture(), eq(mExecutor));
- mResponse.add(CarPropertyResponse.create(TOLL_CARD_STATUS_ID,
- STATUS_SUCCESS, 1, TollCard.TOLLCARD_STATE_VALID));
+ mResponse.add(CarPropertyResponse.builder()
+ .setPropertyId(TOLL_CARD_STATUS_ID)
+ .setStatus(STATUS_SUCCESS)
+ .setValue(TollCard.TOLLCARD_STATE_VALID)
+ .setTimestampMillis(1L).build());
captor.getValue().onCarPropertyResponses(mResponse);
mCountDownLatch.await();
TollCard tollCard = loadedResult.get();
assertThat(tollCard.getCardState().getValue()).isEqualTo(TollCard.TOLLCARD_STATE_VALID);
+ assertThat(tollCard.getCardState().getCarZones()).isEqualTo(GLOBAL_ZONE);
}
@Config(maxSdk = 30)
@@ -479,6 +550,7 @@
TollCard tollCard = loadedResult.get();
assertThat(tollCard.getCardState().getStatus()).isEqualTo(CarValue.STATUS_UNIMPLEMENTED);
+ assertThat(tollCard.getCardState().getCarZones().isEmpty()).isTrue();
}
@Test
@@ -508,12 +580,21 @@
verify(mPropertyManager).submitRegisterListenerRequest(eq(mPropertyIds),
eq(DEFAULT_SAMPLE_RATE), captor.capture(), eq(mExecutor));
- mResponse.add(CarPropertyResponse.create(SPEED_DISPLAY_UNIT_ID, STATUS_SUCCESS, 1,
- metersPerSec));
- mResponse.add(CarPropertyResponse.create(PERF_VEHICLE_SPEED,
- STATUS_SUCCESS, 2, defaultRawSpeed));
- mResponse.add(CarPropertyResponse.create(PERF_VEHICLE_SPEED_DISPLAY,
- STATUS_SUCCESS, 3, defaultSpeed));
+ mResponse.add(CarPropertyResponse.builder()
+ .setPropertyId(SPEED_DISPLAY_UNIT_ID)
+ .setStatus(STATUS_SUCCESS)
+ .setValue(metersPerSec)
+ .setTimestampMillis(1L).build());
+ mResponse.add(CarPropertyResponse.builder()
+ .setPropertyId(PERF_VEHICLE_SPEED)
+ .setStatus(STATUS_SUCCESS)
+ .setValue(defaultRawSpeed)
+ .setTimestampMillis(2L).build());
+ mResponse.add(CarPropertyResponse.builder()
+ .setPropertyId(PERF_VEHICLE_SPEED_DISPLAY)
+ .setStatus(STATUS_SUCCESS)
+ .setValue(defaultSpeed)
+ .setTimestampMillis(3L).build());
captor.getValue().onCarPropertyResponses(mResponse);
mCountDownLatch.await();
@@ -539,10 +620,16 @@
float fuelCapacity = 120f;
float fuelLevelValue = 50f;
List<CarPropertyResponse<?>> capacities = new ArrayList<>();
- capacities.add(CarPropertyResponse.create(INFO_EV_BATTERY_CAPACITY,
- STATUS_SUCCESS, 1, evBatteryCapacity));
- capacities.add(CarPropertyResponse.create(INFO_FUEL_CAPACITY,
- STATUS_SUCCESS, 1, fuelCapacity));
+ capacities.add(CarPropertyResponse.builder()
+ .setPropertyId(INFO_EV_BATTERY_CAPACITY)
+ .setStatus(STATUS_SUCCESS)
+ .setValue(evBatteryCapacity)
+ .setTimestampMillis(1L).build());
+ capacities.add(CarPropertyResponse.builder()
+ .setPropertyId(INFO_FUEL_CAPACITY)
+ .setStatus(STATUS_SUCCESS)
+ .setValue(fuelCapacity)
+ .setTimestampMillis(1L).build());
ListenableFuture<List<CarPropertyResponse<?>>> future =
Futures.immediateFuture(capacities);
when(mPropertyManager.submitGetPropertyRequest(eq(mGetPropertyRequests), any()))
@@ -570,18 +657,37 @@
verify(mPropertyManager, times(1)).submitRegisterListenerRequest(
eq(mPropertyIds), eq(DEFAULT_SAMPLE_RATE), captor.capture(), eq(mExecutor));
- mResponse.add(CarPropertyResponse.create(EV_BATTERY_LEVEL,
- STATUS_SUCCESS, 1, evBatteryLevelValue));
- mResponse.add(CarPropertyResponse.create(FUEL_LEVEL,
- STATUS_SUCCESS, 1, fuelLevelValue));
- mResponse.add(CarPropertyResponse.create(FUEL_LEVEL_LOW,
- STATUS_SUCCESS, 1, true));
- mResponse.add(CarPropertyResponse.create(RANGE_REMAINING,
- STATUS_SUCCESS, 1, 5f));
- mResponse.add(CarPropertyResponse.create(DISTANCE_DISPLAY_UNITS,
- STATUS_SUCCESS, 1, meterDistanceUnit));
- mResponse.add(CarPropertyResponse.create(FUEL_VOLUME_DISPLAY_UNITS,
- STATUS_SUCCESS, 2, meterVolumeUnit));
+ mResponse.add(CarPropertyResponse.builder()
+ .setPropertyId(EV_BATTERY_LEVEL)
+ .setStatus(STATUS_SUCCESS)
+ .setValue(evBatteryLevelValue)
+ .setTimestampMillis(1L).build());
+ mResponse.add(CarPropertyResponse.builder()
+ .setPropertyId(FUEL_LEVEL)
+ .setStatus(STATUS_SUCCESS)
+ .setValue(fuelLevelValue)
+ .setTimestampMillis(1L).build());
+ mResponse.add(CarPropertyResponse.builder()
+ .setPropertyId(FUEL_LEVEL_LOW)
+ .setStatus(STATUS_SUCCESS)
+ .setValue(true)
+ .setTimestampMillis(1L).build());
+ mResponse.add(CarPropertyResponse.builder()
+ .setPropertyId(RANGE_REMAINING)
+ .setStatus(STATUS_SUCCESS)
+ .setValue(5f)
+ .setTimestampMillis(1L).build());
+ mResponse.add(CarPropertyResponse.builder()
+ .setPropertyId(DISTANCE_DISPLAY_UNITS)
+ .setStatus(STATUS_SUCCESS)
+ .setValue(meterDistanceUnit)
+ .setTimestampMillis(1L).build());
+ mResponse.add(CarPropertyResponse.builder()
+ .setPropertyId(FUEL_VOLUME_DISPLAY_UNITS)
+ .setStatus(STATUS_SUCCESS)
+ .setValue(meterVolumeUnit)
+ .setTimestampMillis(1L).build());
+
captor.getValue().onCarPropertyResponses(mResponse);
mCountDownLatch.await();
@@ -613,10 +719,16 @@
float fuelCapacity = 120f;
float fuelLevelValue = 50f;
List<CarPropertyResponse<?>> capacities = new ArrayList<>();
- capacities.add(CarPropertyResponse.create(INFO_EV_BATTERY_CAPACITY,
- STATUS_UNAVAILABLE, 1, evBatteryCapacity));
- capacities.add(CarPropertyResponse.create(INFO_FUEL_CAPACITY,
- STATUS_UNAVAILABLE, 1, fuelCapacity));
+ capacities.add(CarPropertyResponse.builder()
+ .setPropertyId(INFO_EV_BATTERY_CAPACITY)
+ .setStatus(STATUS_UNAVAILABLE)
+ .setValue(evBatteryCapacity)
+ .setTimestampMillis(1L).build());
+ capacities.add(CarPropertyResponse.builder()
+ .setPropertyId(INFO_FUEL_CAPACITY)
+ .setStatus(STATUS_UNAVAILABLE)
+ .setValue(fuelCapacity)
+ .setTimestampMillis(1L).build());
ListenableFuture<List<CarPropertyResponse<?>>> future =
Futures.immediateFuture(capacities);
when(mPropertyManager.submitGetPropertyRequest(
@@ -644,18 +756,36 @@
verify(mPropertyManager, times(1)).submitRegisterListenerRequest(
eq(mPropertyIds), eq(DEFAULT_SAMPLE_RATE), captor.capture(), eq(mExecutor));
- mResponse.add(CarPropertyResponse.create(EV_BATTERY_LEVEL,
- STATUS_SUCCESS, 1, evBatteryLevelValue));
- mResponse.add(CarPropertyResponse.create(FUEL_LEVEL,
- STATUS_SUCCESS, 1, fuelLevelValue));
- mResponse.add(CarPropertyResponse.create(FUEL_LEVEL_LOW,
- STATUS_SUCCESS, 1, true));
- mResponse.add(CarPropertyResponse.create(RANGE_REMAINING,
- STATUS_SUCCESS, 1, 5f));
- mResponse.add(CarPropertyResponse.create(DISTANCE_DISPLAY_UNITS,
- STATUS_SUCCESS, 1, meterDistanceUnit));
- mResponse.add(CarPropertyResponse.create(FUEL_VOLUME_DISPLAY_UNITS,
- STATUS_SUCCESS, 2, meterVolumeUnit));
+ mResponse.add(CarPropertyResponse.builder()
+ .setPropertyId(EV_BATTERY_LEVEL)
+ .setStatus(STATUS_SUCCESS)
+ .setValue(evBatteryLevelValue)
+ .setTimestampMillis(1L).build());
+ mResponse.add(CarPropertyResponse.builder()
+ .setPropertyId(FUEL_LEVEL)
+ .setStatus(STATUS_SUCCESS)
+ .setValue(fuelLevelValue)
+ .setTimestampMillis(1L).build());
+ mResponse.add(CarPropertyResponse.builder()
+ .setPropertyId(FUEL_LEVEL_LOW)
+ .setStatus(STATUS_SUCCESS)
+ .setValue(true)
+ .setTimestampMillis(1L).build());
+ mResponse.add(CarPropertyResponse.builder()
+ .setPropertyId(RANGE_REMAINING)
+ .setStatus(STATUS_SUCCESS)
+ .setValue(5f)
+ .setTimestampMillis(1L).build());
+ mResponse.add(CarPropertyResponse.builder()
+ .setPropertyId(DISTANCE_DISPLAY_UNITS)
+ .setStatus(STATUS_SUCCESS)
+ .setValue(meterDistanceUnit)
+ .setTimestampMillis(1L).build());
+ mResponse.add(CarPropertyResponse.builder()
+ .setPropertyId(FUEL_VOLUME_DISPLAY_UNITS)
+ .setStatus(STATUS_SUCCESS)
+ .setValue(meterVolumeUnit)
+ .setTimestampMillis(1L).build());
captor.getValue().onCarPropertyResponses(mResponse);
mCountDownLatch.await();
@@ -691,10 +821,16 @@
float fuelCapacity = 120f;
float fuelLevelValue = 50f;
List<CarPropertyResponse<?>> capacities = new ArrayList<>();
- capacities.add(CarPropertyResponse.create(INFO_EV_BATTERY_CAPACITY,
- STATUS_SUCCESS, 1, evBatteryCapacity));
- capacities.add(CarPropertyResponse.create(INFO_FUEL_CAPACITY,
- STATUS_SUCCESS, 1, fuelCapacity));
+ capacities.add(CarPropertyResponse.builder()
+ .setPropertyId(INFO_EV_BATTERY_CAPACITY)
+ .setStatus(STATUS_SUCCESS)
+ .setValue(evBatteryCapacity)
+ .setTimestampMillis(1L).build());
+ capacities.add(CarPropertyResponse.builder()
+ .setPropertyId(INFO_FUEL_CAPACITY)
+ .setStatus(STATUS_SUCCESS)
+ .setValue(fuelCapacity)
+ .setTimestampMillis(1L).build());
ListenableFuture<List<CarPropertyResponse<?>>> future =
Futures.immediateFuture(capacities);
when(mPropertyManager.submitGetPropertyRequest(
@@ -723,16 +859,31 @@
eq(mPropertyIds), eq(DEFAULT_SAMPLE_RATE), captor.capture(), eq(mExecutor));
// Missing response for FUEL_VOLUME_DISPLAY_UNITS.
- mResponse.add(CarPropertyResponse.create(EV_BATTERY_LEVEL,
- STATUS_SUCCESS, 1, evBatteryLevelValue));
- mResponse.add(CarPropertyResponse.create(FUEL_LEVEL,
- STATUS_SUCCESS, 1, fuelLevelValue));
- mResponse.add(CarPropertyResponse.create(FUEL_LEVEL_LOW,
- STATUS_SUCCESS, 1, true));
- mResponse.add(CarPropertyResponse.create(RANGE_REMAINING,
- STATUS_SUCCESS, 1, 5f));
- mResponse.add(CarPropertyResponse.create(DISTANCE_DISPLAY_UNITS,
- STATUS_SUCCESS, 1, meterDistanceUnit));
+ mResponse.add(CarPropertyResponse.builder()
+ .setPropertyId(EV_BATTERY_LEVEL)
+ .setStatus(STATUS_SUCCESS)
+ .setValue(evBatteryLevelValue)
+ .setTimestampMillis(1L).build());
+ mResponse.add(CarPropertyResponse.builder()
+ .setPropertyId(FUEL_LEVEL)
+ .setStatus(STATUS_SUCCESS)
+ .setValue(fuelLevelValue)
+ .setTimestampMillis(1L).build());
+ mResponse.add(CarPropertyResponse.builder()
+ .setPropertyId(FUEL_LEVEL_LOW)
+ .setStatus(STATUS_SUCCESS)
+ .setValue(true)
+ .setTimestampMillis(1L).build());
+ mResponse.add(CarPropertyResponse.builder()
+ .setPropertyId(RANGE_REMAINING)
+ .setStatus(STATUS_SUCCESS)
+ .setValue(5f)
+ .setTimestampMillis(1L).build());
+ mResponse.add(CarPropertyResponse.builder()
+ .setPropertyId(DISTANCE_DISPLAY_UNITS)
+ .setStatus(STATUS_SUCCESS)
+ .setValue(meterDistanceUnit)
+ .setTimestampMillis(1L).build());
captor.getValue().onCarPropertyResponses(mResponse);
mCountDownLatch.await();
diff --git a/car/app/app-samples/showcase/common/src/main/java/androidx/car/app/sample/showcase/common/SelectableListsDemoScreen.java b/car/app/app-samples/showcase/common/src/main/java/androidx/car/app/sample/showcase/common/SelectableListsDemoScreen.java
index 0a53e69..b7fd241 100644
--- a/car/app/app-samples/showcase/common/src/main/java/androidx/car/app/sample/showcase/common/SelectableListsDemoScreen.java
+++ b/car/app/app-samples/showcase/common/src/main/java/androidx/car/app/sample/showcase/common/SelectableListsDemoScreen.java
@@ -18,17 +18,26 @@
import static androidx.car.app.CarToast.LENGTH_LONG;
import static androidx.car.app.model.Action.BACK;
+import static androidx.car.app.model.CarColor.YELLOW;
+
+import android.content.res.Resources;
+import android.graphics.Bitmap;
+import android.graphics.BitmapFactory;
+import android.text.SpannableString;
import androidx.annotation.NonNull;
import androidx.car.app.CarContext;
import androidx.car.app.CarToast;
import androidx.car.app.Screen;
+import androidx.car.app.model.Action;
+import androidx.car.app.model.ActionStrip;
import androidx.car.app.model.CarIcon;
import androidx.car.app.model.ItemList;
import androidx.car.app.model.ListTemplate;
import androidx.car.app.model.Row;
import androidx.car.app.model.SectionedItemList;
import androidx.car.app.model.Template;
+import androidx.car.app.sample.showcase.common.common.Utils;
import androidx.core.graphics.drawable.IconCompat;
/** A screen demonstrating selectable lists. */
@@ -38,32 +47,64 @@
super(carContext);
}
+ private boolean mIsEnabled = true;
+
+ // Get colorized spannable string
+ private static CharSequence getColoredString(String str, boolean isEnabled) {
+ if (isEnabled && !str.isEmpty()) {
+ SpannableString ss = new SpannableString(str);
+ Utils.colorize(ss, YELLOW, 0, str.length());
+ return ss;
+ }
+ return str;
+ }
+
@NonNull
@Override
public Template onGetTemplate() {
ListTemplate.Builder templateBuilder = new ListTemplate.Builder();
+ // The Image to be displayed in a row
+ Resources resources = getCarContext().getResources();
+ Bitmap bitmap = BitmapFactory.decodeResource(resources, R.drawable.test_image_square);
+ IconCompat mImage = IconCompat.createWithBitmap(bitmap);
+
ItemList radioList =
new ItemList.Builder()
- .addItem(
- new Row.Builder()
- .setImage(
- new CarIcon.Builder(
- IconCompat.createWithResource(
- getCarContext(),
- R.drawable
- .ic_fastfood_white_48dp))
- .build(),
- Row.IMAGE_TYPE_ICON)
- .setTitle(
- getCarContext().getString(R.string.option_1_title))
- .addText(getCarContext().getString(
- R.string.some_additional_text))
- .build())
- .addItem(new Row.Builder().setTitle(
- getCarContext().getString(R.string.option_2_title)).build())
- .addItem(new Row.Builder().setTitle(
- getCarContext().getString(R.string.option_3_title)).build())
+ .addItem(new Row.Builder()
+ .setTitle(getCarContext()
+ .getString(R.string.option_row_radio_title))
+ .addText(getCarContext().getString(
+ R.string.additional_text))
+ .setEnabled(mIsEnabled)
+ .build())
+ .addItem(new Row.Builder()
+ .setImage(
+ new CarIcon.Builder(
+ IconCompat.createWithResource(
+ getCarContext(),
+ R.drawable
+ .ic_fastfood_white_48dp))
+ .build(),
+ Row.IMAGE_TYPE_ICON)
+ .setTitle(getCarContext()
+ .getString(R.string.option_row_radio_icon_title))
+ .addText(getCarContext().getString(
+ R.string.additional_text))
+ .setEnabled(mIsEnabled)
+ .build())
+ .addItem(new Row.Builder()
+ .setImage(
+ new CarIcon.Builder(mImage).build(),
+ Row.IMAGE_TYPE_LARGE)
+ .setTitle(getCarContext()
+ .getString(
+ R.string.option_row_radio_icon_colored_text_title))
+ .addText(getColoredString(
+ getCarContext().getString(
+ R.string.additional_text), mIsEnabled))
+ .setEnabled(mIsEnabled)
+ .build())
.setOnSelectedListener(this::onSelected)
.build();
templateBuilder.addSectionedList(
@@ -72,6 +113,22 @@
return templateBuilder
.setTitle(getCarContext().getString(R.string.selectable_lists_demo_title))
+ .setActionStrip(
+ new ActionStrip.Builder()
+ .addAction(
+ new Action.Builder()
+ .setTitle(mIsEnabled
+ ? getCarContext().getString(
+ R.string.disable_all_rows)
+ : getCarContext().getString(
+ R.string.enable_all_rows))
+ .setOnClickListener(
+ () -> {
+ mIsEnabled = !mIsEnabled;
+ invalidate();
+ })
+ .build())
+ .build())
.setHeaderAction(
BACK).build();
}
diff --git a/car/app/app-samples/showcase/common/src/main/java/androidx/car/app/sample/showcase/common/TaskRestrictionDemoScreen.java b/car/app/app-samples/showcase/common/src/main/java/androidx/car/app/sample/showcase/common/TaskRestrictionDemoScreen.java
index 9adf0c7..bc8ca3a 100644
--- a/car/app/app-samples/showcase/common/src/main/java/androidx/car/app/sample/showcase/common/TaskRestrictionDemoScreen.java
+++ b/car/app/app-samples/showcase/common/src/main/java/androidx/car/app/sample/showcase/common/TaskRestrictionDemoScreen.java
@@ -16,10 +16,12 @@
package androidx.car.app.sample.showcase.common;
+import static androidx.car.app.CarToast.LENGTH_LONG;
import static androidx.car.app.model.Action.BACK;
import androidx.annotation.NonNull;
import androidx.car.app.CarContext;
+import androidx.car.app.CarToast;
import androidx.car.app.Screen;
import androidx.car.app.model.Action;
import androidx.car.app.model.ActionStrip;
@@ -40,7 +42,9 @@
private final int mStep;
private boolean mIsBackOperation = false;
- private boolean mToggleState = false;
+ private boolean mFirstToggleState = false;
+ private boolean mSecondToggleState = false;
+ private boolean mSecondToggleEnabled = true;
private int mImageType = Row.IMAGE_TYPE_ICON;
public TaskRestrictionDemoScreen(int step, @NonNull CarContext carContext) {
@@ -75,6 +79,24 @@
.build();
}
+ Toggle mFirstToggle = new Toggle.Builder((checked) -> {
+ mSecondToggleEnabled = checked;
+ if (checked) {
+ CarToast.makeText(getCarContext(), R.string.toggle_test_enabled,
+ LENGTH_LONG).show();
+ } else {
+ CarToast.makeText(getCarContext(), R.string.toggle_test_disabled,
+ LENGTH_LONG).show();
+ }
+ mFirstToggleState = !mFirstToggleState;
+ invalidate();
+ }).setChecked(mFirstToggleState).build();
+
+ Toggle mSecondToggle = new Toggle.Builder((checked) -> {
+ mSecondToggleState = !mSecondToggleState;
+ invalidate();
+ }).setChecked(mSecondToggleState).setEnabled(mSecondToggleEnabled).build();
+
ItemList.Builder builder = new ItemList.Builder();
builder.addItem(
new Row.Builder()
@@ -92,16 +114,19 @@
.build())
.addItem(
new Row.Builder()
- .setTitle(getCarContext().getString(R.string.toggle_test_title))
- .addText(getCarContext().getString(R.string.toggle_test_text))
- .setToggle(
- new Toggle.Builder(
- checked -> {
- mToggleState = !mToggleState;
- invalidate();
- })
- .setChecked(mToggleState)
- .build())
+ .setTitle(getCarContext().getString(
+ R.string.toggle_test_first_toggle_title))
+ .addText(getCarContext().getString(
+ R.string.toggle_test_first_toggle_text))
+ .setToggle(mFirstToggle)
+ .build())
+ .addItem(
+ new Row.Builder()
+ .setTitle(getCarContext().getString(
+ R.string.toggle_test_second_toggle_title))
+ .addText(getCarContext().getString(
+ R.string.toggle_test_second_toggle_text))
+ .setToggle(mSecondToggle)
.build())
.addItem(
new Row.Builder()
diff --git a/car/app/app-samples/showcase/common/src/main/java/androidx/car/app/sample/showcase/common/navigation/MapTemplateWithListDemoScreen.java b/car/app/app-samples/showcase/common/src/main/java/androidx/car/app/sample/showcase/common/navigation/MapTemplateWithListDemoScreen.java
index 8bb250c..581f775 100644
--- a/car/app/app-samples/showcase/common/src/main/java/androidx/car/app/sample/showcase/common/navigation/MapTemplateWithListDemoScreen.java
+++ b/car/app/app-samples/showcase/common/src/main/java/androidx/car/app/sample/showcase/common/navigation/MapTemplateWithListDemoScreen.java
@@ -106,16 +106,16 @@
: R.drawable.ic_favorite_white_24dp))
.build())
.setOnClickListener(() -> {
+ mIsFavorite = !mIsFavorite;
CarToast.makeText(
getCarContext(),
mIsFavorite
? getCarContext().getString(
- R.string.not_favorite_toast_msg)
+ R.string.favorite_toast_msg)
: getCarContext().getString(
- R.string.favorite_toast_msg),
+ R.string.not_favorite_toast_msg),
LENGTH_SHORT)
.show();
- mIsFavorite = !mIsFavorite;
invalidate();
})
.build())
diff --git a/car/app/app-samples/showcase/common/src/main/java/androidx/car/app/sample/showcase/common/navigation/MapTemplateWithPaneDemoScreen.java b/car/app/app-samples/showcase/common/src/main/java/androidx/car/app/sample/showcase/common/navigation/MapTemplateWithPaneDemoScreen.java
index 3df7dbd..1baa8c1 100644
--- a/car/app/app-samples/showcase/common/src/main/java/androidx/car/app/sample/showcase/common/navigation/MapTemplateWithPaneDemoScreen.java
+++ b/car/app/app-samples/showcase/common/src/main/java/androidx/car/app/sample/showcase/common/navigation/MapTemplateWithPaneDemoScreen.java
@@ -117,6 +117,7 @@
: R.drawable.ic_favorite_white_24dp))
.build())
.setOnClickListener(() -> {
+ mIsFavorite = !mIsFavorite;
CarToast.makeText(
getCarContext(),
mIsFavorite
@@ -126,7 +127,6 @@
R.string.not_favorite_toast_msg),
LENGTH_SHORT)
.show();
- mIsFavorite = !mIsFavorite;
invalidate();
})
.build())
diff --git a/car/app/app-samples/showcase/common/src/main/res/values-af/strings.xml b/car/app/app-samples/showcase/common/src/main/res/values-af/strings.xml
index 76f3f20..49fd32b 100644
--- a/car/app/app-samples/showcase/common/src/main/res/values-af/strings.xml
+++ b/car/app/app-samples/showcase/common/src/main/res/values-af/strings.xml
@@ -36,7 +36,8 @@
<string name="on_action_title" msgid="4129601573763429611">"Aan"</string>
<string name="off_action_title" msgid="8669201170189204848">"Af"</string>
<string name="settings_action_title" msgid="8616900063253887861">"Instellings"</string>
- <string name="accept_action_title" msgid="6172053420803596132">"Instellings"</string>
+ <!-- no translation found for accept_action_title (4899660585470647578) -->
+ <skip />
<string name="reject_action_title" msgid="6730366705938402668">"Weier"</string>
<string name="ok_action_title" msgid="7128494973966098611">"OK"</string>
<string name="throw_action_title" msgid="7163710562670220163">"Gooi"</string>
@@ -140,6 +141,14 @@
<string name="importance_title" msgid="9034862997821839831">"Belangrikheid"</string>
<string name="category_title" msgid="4783851267093259949">"Kategorie"</string>
<string name="ongoing_title" msgid="4957996003270280496">"Nog besig"</string>
+ <!-- no translation found for default_importance (6347996298832939989) -->
+ <skip />
+ <!-- no translation found for high_importance (5009120714837304882) -->
+ <skip />
+ <!-- no translation found for low_importance (4721161314404294033) -->
+ <skip />
+ <!-- no translation found for unknown_importance (909001735933359216) -->
+ <skip />
<string name="notification_demo" msgid="1819496937832036387">"Kennisgewingdemonstrasie"</string>
<string name="misc_demo_title" msgid="7399959062407349380">"Demonstrasies oor diverse onderwerpe"</string>
<string name="navigating_demo_title" msgid="7454579665387386476">"Navigasiedemonstrasie"</string>
@@ -286,8 +295,7 @@
<string name="additional_data_text" msgid="2846223398214158872">"Opdaterings toegelaat vir terughandelinge."</string>
<string name="misc_templates_demos_title" msgid="6077169010255928114">"Demonstrasies oor diverse template"</string>
<string name="showcase_demos_title" msgid="1542092687878113304">"Stal demonstrasies uit"</string>
- <!-- no translation found for location_1_title (3939821089928425181) -->
- <skip />
+ <string name="location_1_title" msgid="3939821089928425181">"translatable=falseGoogle Kirkland"</string>
<string name="location_1_description" msgid="4801052291684791371">"Hulpbronvektor wat getint is"</string>
<string name="location_2_description" msgid="3331356135359047166">"Prenthulpbronbiskaart"</string>
<string name="location_3_description" msgid="3982142774088944850">"Gekleurde teksmerker"</string>
diff --git a/car/app/app-samples/showcase/common/src/main/res/values-am/strings.xml b/car/app/app-samples/showcase/common/src/main/res/values-am/strings.xml
index 2ee4259..4be48ae 100644
--- a/car/app/app-samples/showcase/common/src/main/res/values-am/strings.xml
+++ b/car/app/app-samples/showcase/common/src/main/res/values-am/strings.xml
@@ -36,7 +36,8 @@
<string name="on_action_title" msgid="4129601573763429611">"አብራ"</string>
<string name="off_action_title" msgid="8669201170189204848">"አጥፋ"</string>
<string name="settings_action_title" msgid="8616900063253887861">"ቅንብሮች"</string>
- <string name="accept_action_title" msgid="6172053420803596132">"ቅንብሮች"</string>
+ <!-- no translation found for accept_action_title (4899660585470647578) -->
+ <skip />
<string name="reject_action_title" msgid="6730366705938402668">"አትቀበል"</string>
<string name="ok_action_title" msgid="7128494973966098611">"እሺ"</string>
<string name="throw_action_title" msgid="7163710562670220163">"ጣል"</string>
@@ -140,6 +141,14 @@
<string name="importance_title" msgid="9034862997821839831">"አስፈላጊነት"</string>
<string name="category_title" msgid="4783851267093259949">"ምድብ"</string>
<string name="ongoing_title" msgid="4957996003270280496">"በመካሄድ ላይ ያለ"</string>
+ <!-- no translation found for default_importance (6347996298832939989) -->
+ <skip />
+ <!-- no translation found for high_importance (5009120714837304882) -->
+ <skip />
+ <!-- no translation found for low_importance (4721161314404294033) -->
+ <skip />
+ <!-- no translation found for unknown_importance (909001735933359216) -->
+ <skip />
<string name="notification_demo" msgid="1819496937832036387">"የማሳወቂያ ቅንጭብ ማሳያ"</string>
<string name="misc_demo_title" msgid="7399959062407349380">"የተለያዩ ቅንጭብ ማሳያዎች"</string>
<string name="navigating_demo_title" msgid="7454579665387386476">"ማሳያን በማሰስ ላይ"</string>
@@ -286,8 +295,7 @@
<string name="additional_data_text" msgid="2846223398214158872">"ዝማኔዎች በዳራ ክወናዎች ላይ ይፈቀዳሉ።"</string>
<string name="misc_templates_demos_title" msgid="6077169010255928114">"የተለያዩ ቅንብር ደንቦች ቅንጭብ ማሳያዎች"</string>
<string name="showcase_demos_title" msgid="1542092687878113304">"የመሳያ ቅንጭብ ማሳያ"</string>
- <!-- no translation found for location_1_title (3939821089928425181) -->
- <skip />
+ <string name="location_1_title" msgid="3939821089928425181">"translatable=falseGoogle Kirkland"</string>
<string name="location_1_description" msgid="4801052291684791371">"የተቀለመ ንብረት ቬክተር"</string>
<string name="location_2_description" msgid="3331356135359047166">"የምስል ንብረት ቢትማፕ"</string>
<string name="location_3_description" msgid="3982142774088944850">"ባለቀለም የጽሑፍ ምልክት ማድረጊያ"</string>
diff --git a/car/app/app-samples/showcase/common/src/main/res/values-ar/strings.xml b/car/app/app-samples/showcase/common/src/main/res/values-ar/strings.xml
index 805aebc..82bd70d 100644
--- a/car/app/app-samples/showcase/common/src/main/res/values-ar/strings.xml
+++ b/car/app/app-samples/showcase/common/src/main/res/values-ar/strings.xml
@@ -36,7 +36,8 @@
<string name="on_action_title" msgid="4129601573763429611">"مُفعّل"</string>
<string name="off_action_title" msgid="8669201170189204848">"إيقاف"</string>
<string name="settings_action_title" msgid="8616900063253887861">"الإعدادات"</string>
- <string name="accept_action_title" msgid="6172053420803596132">"الإعدادات"</string>
+ <!-- no translation found for accept_action_title (4899660585470647578) -->
+ <skip />
<string name="reject_action_title" msgid="6730366705938402668">"رفض"</string>
<string name="ok_action_title" msgid="7128494973966098611">"حسنًا"</string>
<string name="throw_action_title" msgid="7163710562670220163">"طرح"</string>
@@ -110,8 +111,7 @@
<string name="content_limits_demo_title" msgid="3207211638386727610">"إصدار تجريبي للقيود على المحتوى"</string>
<string name="finish_app_msg" msgid="8354334557053141891">"سيؤدي هذا إلى إنهاء التطبيق. وعند إرجاعه سيتم إجراء إعدادات مُسبَقة لشاشة الإذن."</string>
<string name="finish_app_title" msgid="9013328479438745074">"إصدار تجريبي لإنهاء التطبيق"</string>
- <!-- no translation found for finish_app_demo_title (8223819062053448384) -->
- <skip />
+ <string name="finish_app_demo_title" msgid="8223819062053448384">"إصدار تجريبي للإعدادات المُسبَقة لشاشة الأذونات عند عملية التشغيل التالية"</string>
<string name="loading_demo_title" msgid="1086529475809143517">"جارٍ تحميل الإصدار التجريبي."</string>
<string name="loading_demo_row_title" msgid="8933049915126088142">"اكتملت عملية التحميل."</string>
<string name="pop_to_root" msgid="2078277386355064198">"الانتقال إلى الجذر"</string>
@@ -141,6 +141,14 @@
<string name="importance_title" msgid="9034862997821839831">"مدى الأهمية"</string>
<string name="category_title" msgid="4783851267093259949">"الفئة"</string>
<string name="ongoing_title" msgid="4957996003270280496">"مستمر"</string>
+ <!-- no translation found for default_importance (6347996298832939989) -->
+ <skip />
+ <!-- no translation found for high_importance (5009120714837304882) -->
+ <skip />
+ <!-- no translation found for low_importance (4721161314404294033) -->
+ <skip />
+ <!-- no translation found for unknown_importance (909001735933359216) -->
+ <skip />
<string name="notification_demo" msgid="1819496937832036387">"إصدار تجريبي للإشعارات"</string>
<string name="misc_demo_title" msgid="7399959062407349380">"إصدارات تجريبية لميزات متنوعة"</string>
<string name="navigating_demo_title" msgid="7454579665387386476">"إصدار تجريبي حول التنقّل"</string>
@@ -284,12 +292,10 @@
<string name="image_test_title" msgid="8273863429801477547">"اختبار الصورة"</string>
<string name="image_test_text" msgid="6264812093895530445">"يُسمَح بإجراء تغييرات على الصورة."</string>
<string name="additional_data_title" msgid="3546689652240300617">"البيانات الإضافية"</string>
- <!-- no translation found for additional_data_text (2846223398214158872) -->
- <skip />
+ <string name="additional_data_text" msgid="2846223398214158872">"التحديثات المسموح بها على العمليات التي تتم بالخلفية"</string>
<string name="misc_templates_demos_title" msgid="6077169010255928114">"إصدارات تجريبية لنموذج ميزات متنوّعة"</string>
<string name="showcase_demos_title" msgid="1542092687878113304">"عرض الإصدارات التجريبية"</string>
- <!-- no translation found for location_1_title (3939821089928425181) -->
- <skip />
+ <string name="location_1_title" msgid="3939821089928425181">"translatable=falseGoogle Kirkland"</string>
<string name="location_1_description" msgid="4801052291684791371">"متّجه مورد بدرجات ألوان"</string>
<string name="location_2_description" msgid="3331356135359047166">"صورة نقطية لمصدر الصورة"</string>
<string name="location_3_description" msgid="3982142774088944850">"علامة النص الملوّن"</string>
diff --git a/car/app/app-samples/showcase/common/src/main/res/values-as/strings.xml b/car/app/app-samples/showcase/common/src/main/res/values-as/strings.xml
index e5b0a52..90895cc 100644
--- a/car/app/app-samples/showcase/common/src/main/res/values-as/strings.xml
+++ b/car/app/app-samples/showcase/common/src/main/res/values-as/strings.xml
@@ -36,7 +36,8 @@
<string name="on_action_title" msgid="4129601573763429611">"অন আছে"</string>
<string name="off_action_title" msgid="8669201170189204848">"অফ আছে"</string>
<string name="settings_action_title" msgid="8616900063253887861">"ছেটিং"</string>
- <string name="accept_action_title" msgid="6172053420803596132">"ছেটিং"</string>
+ <!-- no translation found for accept_action_title (4899660585470647578) -->
+ <skip />
<string name="reject_action_title" msgid="6730366705938402668">"প্ৰত্যাখ্যান কৰক"</string>
<string name="ok_action_title" msgid="7128494973966098611">"ঠিক আছে"</string>
<string name="throw_action_title" msgid="7163710562670220163">"দলিয়াওক"</string>
@@ -140,6 +141,14 @@
<string name="importance_title" msgid="9034862997821839831">"প্ৰাধান্য"</string>
<string name="category_title" msgid="4783851267093259949">"শিতান"</string>
<string name="ongoing_title" msgid="4957996003270280496">"চলিত"</string>
+ <!-- no translation found for default_importance (6347996298832939989) -->
+ <skip />
+ <!-- no translation found for high_importance (5009120714837304882) -->
+ <skip />
+ <!-- no translation found for low_importance (4721161314404294033) -->
+ <skip />
+ <!-- no translation found for unknown_importance (909001735933359216) -->
+ <skip />
<string name="notification_demo" msgid="1819496937832036387">"জাননীৰ ডেম’"</string>
<string name="misc_demo_title" msgid="7399959062407349380">"সানমিহলি ডেম’"</string>
<string name="navigating_demo_title" msgid="7454579665387386476">"নেভিগেশ্বনৰ ডেম’"</string>
@@ -286,8 +295,7 @@
<string name="additional_data_text" msgid="2846223398214158872">"নেপথ্যৰ কাৰ্যত আপডে’টৰ অনুমতি আছে।"</string>
<string name="misc_templates_demos_title" msgid="6077169010255928114">"সানমিহলি টেম্পলে’টৰ ডেম’"</string>
<string name="showcase_demos_title" msgid="1542092687878113304">"ডেম’ দেখুৱাওক"</string>
- <!-- no translation found for location_1_title (3939821089928425181) -->
- <skip />
+ <string name="location_1_title" msgid="3939821089928425181">"translatable=falseGoogle Kirkland"</string>
<string name="location_1_description" msgid="4801052291684791371">"ৰং কৰা উৎসৰ ভেক্টৰ"</string>
<string name="location_2_description" msgid="3331356135359047166">"প্ৰতিচ্ছবিৰ উৎসৰ বিটমেপ"</string>
<string name="location_3_description" msgid="3982142774088944850">"ৰং কৰা পাঠৰ চিহ্ন"</string>
diff --git a/car/app/app-samples/showcase/common/src/main/res/values-az/strings.xml b/car/app/app-samples/showcase/common/src/main/res/values-az/strings.xml
index 0bfa8c6..05f66f2 100644
--- a/car/app/app-samples/showcase/common/src/main/res/values-az/strings.xml
+++ b/car/app/app-samples/showcase/common/src/main/res/values-az/strings.xml
@@ -36,7 +36,8 @@
<string name="on_action_title" msgid="4129601573763429611">"Aktiv"</string>
<string name="off_action_title" msgid="8669201170189204848">"Deaktiv"</string>
<string name="settings_action_title" msgid="8616900063253887861">"Ayarlar"</string>
- <string name="accept_action_title" msgid="6172053420803596132">"Ayarlar"</string>
+ <!-- no translation found for accept_action_title (4899660585470647578) -->
+ <skip />
<string name="reject_action_title" msgid="6730366705938402668">"Rədd edin"</string>
<string name="ok_action_title" msgid="7128494973966098611">"OK"</string>
<string name="throw_action_title" msgid="7163710562670220163">"Atın"</string>
@@ -140,6 +141,14 @@
<string name="importance_title" msgid="9034862997821839831">"Əhəmiyyət"</string>
<string name="category_title" msgid="4783851267093259949">"Kateqoriya"</string>
<string name="ongoing_title" msgid="4957996003270280496">"Davam edir"</string>
+ <!-- no translation found for default_importance (6347996298832939989) -->
+ <skip />
+ <!-- no translation found for high_importance (5009120714837304882) -->
+ <skip />
+ <!-- no translation found for low_importance (4721161314404294033) -->
+ <skip />
+ <!-- no translation found for unknown_importance (909001735933359216) -->
+ <skip />
<string name="notification_demo" msgid="1819496937832036387">"Bildiriş Demosu"</string>
<string name="misc_demo_title" msgid="7399959062407349380">"Digər Demolar"</string>
<string name="navigating_demo_title" msgid="7454579665387386476">"Naviqasiya Demosu"</string>
@@ -286,8 +295,7 @@
<string name="additional_data_text" msgid="2846223398214158872">"Geri əməliyyatlar üzrə güncəlləmələrə icazə verilir."</string>
<string name="misc_templates_demos_title" msgid="6077169010255928114">"Digər Şablon Demoları"</string>
<string name="showcase_demos_title" msgid="1542092687878113304">"Vitrin Demoları"</string>
- <!-- no translation found for location_1_title (3939821089928425181) -->
- <skip />
+ <string name="location_1_title" msgid="3939821089928425181">"translatable=falseGoogle Kirkland"</string>
<string name="location_1_description" msgid="4801052291684791371">"Rənglənmiş resurs vektoru"</string>
<string name="location_2_description" msgid="3331356135359047166">"Şəkil resursunun nöqtəli görüntüsü"</string>
<string name="location_3_description" msgid="3982142774088944850">"Rəngli mətn markeri"</string>
diff --git a/car/app/app-samples/showcase/common/src/main/res/values-b+sr+Latn/strings.xml b/car/app/app-samples/showcase/common/src/main/res/values-b+sr+Latn/strings.xml
index ae1863b..ecd6ce8 100644
--- a/car/app/app-samples/showcase/common/src/main/res/values-b+sr+Latn/strings.xml
+++ b/car/app/app-samples/showcase/common/src/main/res/values-b+sr+Latn/strings.xml
@@ -36,7 +36,8 @@
<string name="on_action_title" msgid="4129601573763429611">"Uključeno"</string>
<string name="off_action_title" msgid="8669201170189204848">"Isključeno"</string>
<string name="settings_action_title" msgid="8616900063253887861">"Podešavanja"</string>
- <string name="accept_action_title" msgid="6172053420803596132">"Podešavanja"</string>
+ <!-- no translation found for accept_action_title (4899660585470647578) -->
+ <skip />
<string name="reject_action_title" msgid="6730366705938402668">"Odbij"</string>
<string name="ok_action_title" msgid="7128494973966098611">"Potvrdi"</string>
<string name="throw_action_title" msgid="7163710562670220163">"Baci"</string>
@@ -140,6 +141,14 @@
<string name="importance_title" msgid="9034862997821839831">"Važnost"</string>
<string name="category_title" msgid="4783851267093259949">"Kategorija"</string>
<string name="ongoing_title" msgid="4957996003270280496">"Aktivno"</string>
+ <!-- no translation found for default_importance (6347996298832939989) -->
+ <skip />
+ <!-- no translation found for high_importance (5009120714837304882) -->
+ <skip />
+ <!-- no translation found for low_importance (4721161314404294033) -->
+ <skip />
+ <!-- no translation found for unknown_importance (909001735933359216) -->
+ <skip />
<string name="notification_demo" msgid="1819496937832036387">"Demonstracija obaveštenja"</string>
<string name="misc_demo_title" msgid="7399959062407349380">"Različite demonstracije"</string>
<string name="navigating_demo_title" msgid="7454579665387386476">"Demonstracija navigacije"</string>
@@ -286,8 +295,7 @@
<string name="additional_data_text" msgid="2846223398214158872">"Ažuriranja su dozvoljena za operacije u pozadini."</string>
<string name="misc_templates_demos_title" msgid="6077169010255928114">"Demonstracije različitih šablona"</string>
<string name="showcase_demos_title" msgid="1542092687878113304">"Demonstracije prikazivanja"</string>
- <!-- no translation found for location_1_title (3939821089928425181) -->
- <skip />
+ <string name="location_1_title" msgid="3939821089928425181">"translatable=falseGoogle Kirkland"</string>
<string name="location_1_description" msgid="4801052291684791371">"Vektor resursa sa tonalitetom"</string>
<string name="location_2_description" msgid="3331356135359047166">"Bit mapa resursa slike"</string>
<string name="location_3_description" msgid="3982142774088944850">"Marker teksta u boji"</string>
diff --git a/car/app/app-samples/showcase/common/src/main/res/values-be/strings.xml b/car/app/app-samples/showcase/common/src/main/res/values-be/strings.xml
index fe87193..ad90ef7 100644
--- a/car/app/app-samples/showcase/common/src/main/res/values-be/strings.xml
+++ b/car/app/app-samples/showcase/common/src/main/res/values-be/strings.xml
@@ -36,7 +36,8 @@
<string name="on_action_title" msgid="4129601573763429611">"Уключана"</string>
<string name="off_action_title" msgid="8669201170189204848">"Выключана"</string>
<string name="settings_action_title" msgid="8616900063253887861">"Налады"</string>
- <string name="accept_action_title" msgid="6172053420803596132">"Налады"</string>
+ <!-- no translation found for accept_action_title (4899660585470647578) -->
+ <skip />
<string name="reject_action_title" msgid="6730366705938402668">"Адхіліць"</string>
<string name="ok_action_title" msgid="7128494973966098611">"ОК"</string>
<string name="throw_action_title" msgid="7163710562670220163">"Памылка"</string>
@@ -110,8 +111,7 @@
<string name="content_limits_demo_title" msgid="3207211638386727610">"Дэманстрацыя абмежаванняў змесціва"</string>
<string name="finish_app_msg" msgid="8354334557053141891">"Гэта дзеянне закрые праграму, а калі вы зноў запусціце яе, з\'явіцца папярэдне зададзены экран дазволаў"</string>
<string name="finish_app_title" msgid="9013328479438745074">"Завяршыць дэманстрацыю праграмы"</string>
- <!-- no translation found for finish_app_demo_title (8223819062053448384) -->
- <skip />
+ <string name="finish_app_demo_title" msgid="8223819062053448384">"Дэманстрацыя папярэдне зададзенага экрана дазволаў, які з\'явіцца пры наступным запуску праграмы"</string>
<string name="loading_demo_title" msgid="1086529475809143517">"Загружаецца дэманстрацыя"</string>
<string name="loading_demo_row_title" msgid="8933049915126088142">"Загрузка завершана!"</string>
<string name="pop_to_root" msgid="2078277386355064198">"Перайсці да першага экрана"</string>
@@ -141,6 +141,14 @@
<string name="importance_title" msgid="9034862997821839831">"Значнасць"</string>
<string name="category_title" msgid="4783851267093259949">"Катэгорыя"</string>
<string name="ongoing_title" msgid="4957996003270280496">"Бягучы"</string>
+ <!-- no translation found for default_importance (6347996298832939989) -->
+ <skip />
+ <!-- no translation found for high_importance (5009120714837304882) -->
+ <skip />
+ <!-- no translation found for low_importance (4721161314404294033) -->
+ <skip />
+ <!-- no translation found for unknown_importance (909001735933359216) -->
+ <skip />
<string name="notification_demo" msgid="1819496937832036387">"Дэманстрацыя апавяшчэння"</string>
<string name="misc_demo_title" msgid="7399959062407349380">"Розныя дэманстрацыі"</string>
<string name="navigating_demo_title" msgid="7454579665387386476">"Дэманстрацыя навігацыі"</string>
@@ -284,12 +292,10 @@
<string name="image_test_title" msgid="8273863429801477547">"Тэсціраванне відарыса"</string>
<string name="image_test_text" msgid="6264812093895530445">"Дазволена змяняць відарысы"</string>
<string name="additional_data_title" msgid="3546689652240300617">"Дадатковыя даныя"</string>
- <!-- no translation found for additional_data_text (2846223398214158872) -->
- <skip />
+ <string name="additional_data_text" msgid="2846223398214158872">"Абнаўленні дазволены для аперацый вяртання."</string>
<string name="misc_templates_demos_title" msgid="6077169010255928114">"Дэманстрацыі розных шаблонаў"</string>
<string name="showcase_demos_title" msgid="1542092687878113304">"Дэманстрацыі выбранага"</string>
- <!-- no translation found for location_1_title (3939821089928425181) -->
- <skip />
+ <string name="location_1_title" msgid="3939821089928425181">"translatable=falseGoogle Kirkland"</string>
<string name="location_1_description" msgid="4801052291684791371">"Вектар рэсурсу затаніраваны"</string>
<string name="location_2_description" msgid="3331356135359047166">"Растравая выява рэсурсу відарыса"</string>
<string name="location_3_description" msgid="3982142774088944850">"Тэкставы маркер афарбаваны"</string>
diff --git a/car/app/app-samples/showcase/common/src/main/res/values-bg/strings.xml b/car/app/app-samples/showcase/common/src/main/res/values-bg/strings.xml
index 805e322..84c3e63 100644
--- a/car/app/app-samples/showcase/common/src/main/res/values-bg/strings.xml
+++ b/car/app/app-samples/showcase/common/src/main/res/values-bg/strings.xml
@@ -36,7 +36,8 @@
<string name="on_action_title" msgid="4129601573763429611">"Вкл."</string>
<string name="off_action_title" msgid="8669201170189204848">"Изкл."</string>
<string name="settings_action_title" msgid="8616900063253887861">"Настройки"</string>
- <string name="accept_action_title" msgid="6172053420803596132">"Настройки"</string>
+ <!-- no translation found for accept_action_title (4899660585470647578) -->
+ <skip />
<string name="reject_action_title" msgid="6730366705938402668">"Отхвърляне"</string>
<string name="ok_action_title" msgid="7128494973966098611">"OK"</string>
<string name="throw_action_title" msgid="7163710562670220163">"Изпращане на грешка"</string>
@@ -110,8 +111,7 @@
<string name="content_limits_demo_title" msgid="3207211638386727610">"Демонстрация на ограниченията за съдържанието"</string>
<string name="finish_app_msg" msgid="8354334557053141891">"Приложението ще се затвори и когато се върнете към него, то ще зареди предварително екран за разрешения"</string>
<string name="finish_app_title" msgid="9013328479438745074">"Демонстрация на затваряне на приложение"</string>
- <!-- no translation found for finish_app_demo_title (8223819062053448384) -->
- <skip />
+ <string name="finish_app_demo_title" msgid="8223819062053448384">"Демонстрация на предварително зареждане на екрана с разрешения при следващото стартиране"</string>
<string name="loading_demo_title" msgid="1086529475809143517">"Демонстрацията се зарежда"</string>
<string name="loading_demo_row_title" msgid="8933049915126088142">"Зареждането завърши!"</string>
<string name="pop_to_root" msgid="2078277386355064198">"Преминаване към основния екран"</string>
@@ -141,6 +141,14 @@
<string name="importance_title" msgid="9034862997821839831">"Важност"</string>
<string name="category_title" msgid="4783851267093259949">"Категория"</string>
<string name="ongoing_title" msgid="4957996003270280496">"В момента"</string>
+ <!-- no translation found for default_importance (6347996298832939989) -->
+ <skip />
+ <!-- no translation found for high_importance (5009120714837304882) -->
+ <skip />
+ <!-- no translation found for low_importance (4721161314404294033) -->
+ <skip />
+ <!-- no translation found for unknown_importance (909001735933359216) -->
+ <skip />
<string name="notification_demo" msgid="1819496937832036387">"Демонстрация на известие"</string>
<string name="misc_demo_title" msgid="7399959062407349380">"Разни демонстрации"</string>
<string name="navigating_demo_title" msgid="7454579665387386476">"Демонстрация на навигация"</string>
@@ -284,12 +292,10 @@
<string name="image_test_title" msgid="8273863429801477547">"Тест с изображение"</string>
<string name="image_test_text" msgid="6264812093895530445">"Промените на изображението за разрешени"</string>
<string name="additional_data_title" msgid="3546689652240300617">"Допълнителни данни"</string>
- <!-- no translation found for additional_data_text (2846223398214158872) -->
- <skip />
+ <string name="additional_data_text" msgid="2846223398214158872">"Актуализациите са разрешени за операции за връщане назад."</string>
<string name="misc_templates_demos_title" msgid="6077169010255928114">"Демонстрации на разни шаблони"</string>
<string name="showcase_demos_title" msgid="1542092687878113304">"Демонстрации на Showcase"</string>
- <!-- no translation found for location_1_title (3939821089928425181) -->
- <skip />
+ <string name="location_1_title" msgid="3939821089928425181">"translatable=falseGoogle Kirkland"</string>
<string name="location_1_description" msgid="4801052291684791371">"Нюансиран векторен ресурс"</string>
<string name="location_2_description" msgid="3331356135359047166">"Растерен графичен ресурс"</string>
<string name="location_3_description" msgid="3982142774088944850">"Цветен текстов маркер"</string>
diff --git a/car/app/app-samples/showcase/common/src/main/res/values-bn/strings.xml b/car/app/app-samples/showcase/common/src/main/res/values-bn/strings.xml
index 5a738c5..a87153e 100644
--- a/car/app/app-samples/showcase/common/src/main/res/values-bn/strings.xml
+++ b/car/app/app-samples/showcase/common/src/main/res/values-bn/strings.xml
@@ -36,7 +36,8 @@
<string name="on_action_title" msgid="4129601573763429611">"চালু আছে"</string>
<string name="off_action_title" msgid="8669201170189204848">"বন্ধ আছে"</string>
<string name="settings_action_title" msgid="8616900063253887861">"সেটিংস"</string>
- <string name="accept_action_title" msgid="6172053420803596132">"সেটিংস"</string>
+ <!-- no translation found for accept_action_title (4899660585470647578) -->
+ <skip />
<string name="reject_action_title" msgid="6730366705938402668">"বাতিল করুন"</string>
<string name="ok_action_title" msgid="7128494973966098611">"ওকে"</string>
<string name="throw_action_title" msgid="7163710562670220163">"থ্রো"</string>
@@ -140,6 +141,14 @@
<string name="importance_title" msgid="9034862997821839831">"গুরুত্ব"</string>
<string name="category_title" msgid="4783851267093259949">"বিভাগ"</string>
<string name="ongoing_title" msgid="4957996003270280496">"চলছে"</string>
+ <!-- no translation found for default_importance (6347996298832939989) -->
+ <skip />
+ <!-- no translation found for high_importance (5009120714837304882) -->
+ <skip />
+ <!-- no translation found for low_importance (4721161314404294033) -->
+ <skip />
+ <!-- no translation found for unknown_importance (909001735933359216) -->
+ <skip />
<string name="notification_demo" msgid="1819496937832036387">"বিজ্ঞপ্তির ডেমো"</string>
<string name="misc_demo_title" msgid="7399959062407349380">"অন্যান্য ডেমো"</string>
<string name="navigating_demo_title" msgid="7454579665387386476">"নেভিগেট করার ডেমো"</string>
@@ -286,8 +295,7 @@
<string name="additional_data_text" msgid="2846223398214158872">"পিছনের পৃষ্ঠাতে গিয়ে পরিবর্তন করা যাবে।"</string>
<string name="misc_templates_demos_title" msgid="6077169010255928114">"অন্যান্য টেমপ্লেটের ডেমো"</string>
<string name="showcase_demos_title" msgid="1542092687878113304">"ডেমো শোকেস করুন"</string>
- <!-- no translation found for location_1_title (3939821089928425181) -->
- <skip />
+ <string name="location_1_title" msgid="3939821089928425181">"translatable=falseGoogle Kirkland"</string>
<string name="location_1_description" msgid="4801052291684791371">"রঙিন রিসোর্স ভেক্টর"</string>
<string name="location_2_description" msgid="3331356135359047166">"ছবির রিসোর্সের বিটম্যাপ"</string>
<string name="location_3_description" msgid="3982142774088944850">"রঙিন টেক্সট মার্কার"</string>
diff --git a/car/app/app-samples/showcase/common/src/main/res/values-bs/strings.xml b/car/app/app-samples/showcase/common/src/main/res/values-bs/strings.xml
index e5a415ec..ea8f5a9 100644
--- a/car/app/app-samples/showcase/common/src/main/res/values-bs/strings.xml
+++ b/car/app/app-samples/showcase/common/src/main/res/values-bs/strings.xml
@@ -36,7 +36,8 @@
<string name="on_action_title" msgid="4129601573763429611">"Uključeno"</string>
<string name="off_action_title" msgid="8669201170189204848">"Isključeno"</string>
<string name="settings_action_title" msgid="8616900063253887861">"Postavke"</string>
- <string name="accept_action_title" msgid="6172053420803596132">"Postavke"</string>
+ <!-- no translation found for accept_action_title (4899660585470647578) -->
+ <skip />
<string name="reject_action_title" msgid="6730366705938402668">"Odbij"</string>
<string name="ok_action_title" msgid="7128494973966098611">"Uredu"</string>
<string name="throw_action_title" msgid="7163710562670220163">"Baci"</string>
@@ -110,7 +111,7 @@
<string name="content_limits_demo_title" msgid="3207211638386727610">"Demo verzija ograničenja sadržaja"</string>
<string name="finish_app_msg" msgid="8354334557053141891">"To će zatvoriti aplikaciju, a kada se vratite, ekran s odobrenjem će se pripremiti"</string>
<string name="finish_app_title" msgid="9013328479438745074">"Završi demo verziju aplikacije"</string>
- <string name="finish_app_demo_title" msgid="8223819062053448384">"Pokazna verzija dodat će zaslon dopuštenja prilikom sljedećeg pokretanja"</string>
+ <string name="finish_app_demo_title" msgid="8223819062053448384">"Demonstracija predučitavanja ekrana odobrenja prilikom sljedećeg pokretanja"</string>
<string name="loading_demo_title" msgid="1086529475809143517">"Učitavanje demo verzije"</string>
<string name="loading_demo_row_title" msgid="8933049915126088142">"Učitavanje je završeno!"</string>
<string name="pop_to_root" msgid="2078277386355064198">"Pređite na korijenski direktorij"</string>
@@ -140,6 +141,14 @@
<string name="importance_title" msgid="9034862997821839831">"Važnost"</string>
<string name="category_title" msgid="4783851267093259949">"Kategorija"</string>
<string name="ongoing_title" msgid="4957996003270280496">"U toku"</string>
+ <!-- no translation found for default_importance (6347996298832939989) -->
+ <skip />
+ <!-- no translation found for high_importance (5009120714837304882) -->
+ <skip />
+ <!-- no translation found for low_importance (4721161314404294033) -->
+ <skip />
+ <!-- no translation found for unknown_importance (909001735933359216) -->
+ <skip />
<string name="notification_demo" msgid="1819496937832036387">"Demo verzija obavještenja"</string>
<string name="misc_demo_title" msgid="7399959062407349380">"Razne demo verzije"</string>
<string name="navigating_demo_title" msgid="7454579665387386476">"Demo verzija navigacije"</string>
@@ -283,11 +292,10 @@
<string name="image_test_title" msgid="8273863429801477547">"Test slike"</string>
<string name="image_test_text" msgid="6264812093895530445">"Dozvoljene su promjene slike"</string>
<string name="additional_data_title" msgid="3546689652240300617">"Dodatni podaci"</string>
- <string name="additional_data_text" msgid="2846223398214158872">"Ažuriranja dopuštena na prethodnim radnjama."</string>
+ <string name="additional_data_text" msgid="2846223398214158872">"Dozvoljena su ažuriranja u vezi s radnjama navigiranja prema nazad."</string>
<string name="misc_templates_demos_title" msgid="6077169010255928114">"Demo verzije raznih šablona"</string>
<string name="showcase_demos_title" msgid="1542092687878113304">"Demo verzije predstavljanja"</string>
- <!-- no translation found for location_1_title (3939821089928425181) -->
- <skip />
+ <string name="location_1_title" msgid="3939821089928425181">"translatable=falseGoogle Kirkland"</string>
<string name="location_1_description" msgid="4801052291684791371">"Nijansirani vektor izvora"</string>
<string name="location_2_description" msgid="3331356135359047166">"Slika izvora u formatu bitmape"</string>
<string name="location_3_description" msgid="3982142774088944850">"Označivač teksta u boji"</string>
diff --git a/car/app/app-samples/showcase/common/src/main/res/values-ca/strings.xml b/car/app/app-samples/showcase/common/src/main/res/values-ca/strings.xml
index 1fd108f..3bf6f04 100644
--- a/car/app/app-samples/showcase/common/src/main/res/values-ca/strings.xml
+++ b/car/app/app-samples/showcase/common/src/main/res/values-ca/strings.xml
@@ -36,7 +36,8 @@
<string name="on_action_title" msgid="4129601573763429611">"Activat"</string>
<string name="off_action_title" msgid="8669201170189204848">"Desactivat"</string>
<string name="settings_action_title" msgid="8616900063253887861">"Configuració"</string>
- <string name="accept_action_title" msgid="6172053420803596132">"Configuració"</string>
+ <!-- no translation found for accept_action_title (4899660585470647578) -->
+ <skip />
<string name="reject_action_title" msgid="6730366705938402668">"Rebutja"</string>
<string name="ok_action_title" msgid="7128494973966098611">"D’acord"</string>
<string name="throw_action_title" msgid="7163710562670220163">"Llança"</string>
@@ -110,8 +111,7 @@
<string name="content_limits_demo_title" msgid="3207211638386727610">"Demostració de límits de contingut"</string>
<string name="finish_app_msg" msgid="8354334557053141891">"Aquesta acció tancarà l\'aplicació, i quan la tornis a obrir farà la precàrrega d\'una pantalla de permisos"</string>
<string name="finish_app_title" msgid="9013328479438745074">"Finalitza la demostració de l\'aplicació"</string>
- <!-- no translation found for finish_app_demo_title (8223819062053448384) -->
- <skip />
+ <string name="finish_app_demo_title" msgid="8223819062053448384">"Demostració de precàrrega de la pantalla de permisos en l\'execució següent"</string>
<string name="loading_demo_title" msgid="1086529475809143517">"S\'està carregant la demostració"</string>
<string name="loading_demo_row_title" msgid="8933049915126088142">"Càrrega completada"</string>
<string name="pop_to_root" msgid="2078277386355064198">"Ves a l\'arrel"</string>
@@ -141,6 +141,14 @@
<string name="importance_title" msgid="9034862997821839831">"Importància"</string>
<string name="category_title" msgid="4783851267093259949">"Categoria"</string>
<string name="ongoing_title" msgid="4957996003270280496">"En curs"</string>
+ <!-- no translation found for default_importance (6347996298832939989) -->
+ <skip />
+ <!-- no translation found for high_importance (5009120714837304882) -->
+ <skip />
+ <!-- no translation found for low_importance (4721161314404294033) -->
+ <skip />
+ <!-- no translation found for unknown_importance (909001735933359216) -->
+ <skip />
<string name="notification_demo" msgid="1819496937832036387">"Demostració d\'una notificació"</string>
<string name="misc_demo_title" msgid="7399959062407349380">"Demostracions diverses"</string>
<string name="navigating_demo_title" msgid="7454579665387386476">"Demostració de navegació"</string>
@@ -284,12 +292,10 @@
<string name="image_test_title" msgid="8273863429801477547">"Prova d\'imatge"</string>
<string name="image_test_text" msgid="6264812093895530445">"S\'admeten canvis d\'imatges"</string>
<string name="additional_data_title" msgid="3546689652240300617">"Dades addicionals"</string>
- <!-- no translation found for additional_data_text (2846223398214158872) -->
- <skip />
+ <string name="additional_data_text" msgid="2846223398214158872">"Es permeten actualitzacions a les operacions d\'anar enrere."</string>
<string name="misc_templates_demos_title" msgid="6077169010255928114">"Demostracions de plantilles diverses"</string>
<string name="showcase_demos_title" msgid="1542092687878113304">"Demostracions de Showcase"</string>
- <!-- no translation found for location_1_title (3939821089928425181) -->
- <skip />
+ <string name="location_1_title" msgid="3939821089928425181">"translatable=falseGoogle Kirkland"</string>
<string name="location_1_description" msgid="4801052291684791371">"Vector de recursos amb to"</string>
<string name="location_2_description" msgid="3331356135359047166">"Mapa de bits del recurs d\'imatge"</string>
<string name="location_3_description" msgid="3982142774088944850">"Marcador de text acolorit"</string>
diff --git a/car/app/app-samples/showcase/common/src/main/res/values-cs/strings.xml b/car/app/app-samples/showcase/common/src/main/res/values-cs/strings.xml
index 5a73a3c..d633cf1 100644
--- a/car/app/app-samples/showcase/common/src/main/res/values-cs/strings.xml
+++ b/car/app/app-samples/showcase/common/src/main/res/values-cs/strings.xml
@@ -36,7 +36,8 @@
<string name="on_action_title" msgid="4129601573763429611">"Zapnout"</string>
<string name="off_action_title" msgid="8669201170189204848">"Vypnout"</string>
<string name="settings_action_title" msgid="8616900063253887861">"Nastavení"</string>
- <string name="accept_action_title" msgid="6172053420803596132">"Nastavení"</string>
+ <!-- no translation found for accept_action_title (4899660585470647578) -->
+ <skip />
<string name="reject_action_title" msgid="6730366705938402668">"Zamítnout"</string>
<string name="ok_action_title" msgid="7128494973966098611">"OK"</string>
<string name="throw_action_title" msgid="7163710562670220163">"Vyvolat"</string>
@@ -110,8 +111,7 @@
<string name="content_limits_demo_title" msgid="3207211638386727610">"Ukázka omezení obsahu"</string>
<string name="finish_app_msg" msgid="8354334557053141891">"Touto akcí ukončíte aplikaci, a když se do ní vrátíte, předkonfiguruje obrazovku s oprávněním"</string>
<string name="finish_app_title" msgid="9013328479438745074">"Ukončit ukázku aplikace"</string>
- <!-- no translation found for finish_app_demo_title (8223819062053448384) -->
- <skip />
+ <string name="finish_app_demo_title" msgid="8223819062053448384">"Ukázka předvyplnění obrazovky oprávnění při dalším spuštění"</string>
<string name="loading_demo_title" msgid="1086529475809143517">"Načítání ukázky"</string>
<string name="loading_demo_row_title" msgid="8933049915126088142">"Načítání bylo dokončeno!"</string>
<string name="pop_to_root" msgid="2078277386355064198">"Přejít do kořene"</string>
@@ -141,6 +141,14 @@
<string name="importance_title" msgid="9034862997821839831">"Důležitost"</string>
<string name="category_title" msgid="4783851267093259949">"Kategorie"</string>
<string name="ongoing_title" msgid="4957996003270280496">"Probíhající"</string>
+ <!-- no translation found for default_importance (6347996298832939989) -->
+ <skip />
+ <!-- no translation found for high_importance (5009120714837304882) -->
+ <skip />
+ <!-- no translation found for low_importance (4721161314404294033) -->
+ <skip />
+ <!-- no translation found for unknown_importance (909001735933359216) -->
+ <skip />
<string name="notification_demo" msgid="1819496937832036387">"Ukázka oznámení"</string>
<string name="misc_demo_title" msgid="7399959062407349380">"Různé ukázky"</string>
<string name="navigating_demo_title" msgid="7454579665387386476">"Ukázka navigování"</string>
@@ -284,12 +292,10 @@
<string name="image_test_title" msgid="8273863429801477547">"Test obrázku"</string>
<string name="image_test_text" msgid="6264812093895530445">"Změny obrázku jsou povoleny"</string>
<string name="additional_data_title" msgid="3546689652240300617">"Další data"</string>
- <!-- no translation found for additional_data_text (2846223398214158872) -->
- <skip />
+ <string name="additional_data_text" msgid="2846223398214158872">"U zpětných operací jsou povoleny aktualizace."</string>
<string name="misc_templates_demos_title" msgid="6077169010255928114">"Ukázky různých šablon"</string>
<string name="showcase_demos_title" msgid="1542092687878113304">"Ukázky Výběru"</string>
- <!-- no translation found for location_1_title (3939821089928425181) -->
- <skip />
+ <string name="location_1_title" msgid="3939821089928425181">"translatable=falseGoogle Kirkland"</string>
<string name="location_1_description" msgid="4801052291684791371">"Tónovaný zdroj vektoru"</string>
<string name="location_2_description" msgid="3331356135359047166">"Rastrový zdroj obrázku"</string>
<string name="location_3_description" msgid="3982142774088944850">"Barevná značka textu"</string>
diff --git a/car/app/app-samples/showcase/common/src/main/res/values-da/strings.xml b/car/app/app-samples/showcase/common/src/main/res/values-da/strings.xml
index 921e5cc..7d7745d 100644
--- a/car/app/app-samples/showcase/common/src/main/res/values-da/strings.xml
+++ b/car/app/app-samples/showcase/common/src/main/res/values-da/strings.xml
@@ -36,7 +36,8 @@
<string name="on_action_title" msgid="4129601573763429611">"Til"</string>
<string name="off_action_title" msgid="8669201170189204848">"Fra"</string>
<string name="settings_action_title" msgid="8616900063253887861">"Indstillinger"</string>
- <string name="accept_action_title" msgid="6172053420803596132">"Indstillinger"</string>
+ <!-- no translation found for accept_action_title (4899660585470647578) -->
+ <skip />
<string name="reject_action_title" msgid="6730366705938402668">"Afvis"</string>
<string name="ok_action_title" msgid="7128494973966098611">"OK"</string>
<string name="throw_action_title" msgid="7163710562670220163">"Udløs"</string>
@@ -110,8 +111,7 @@
<string name="content_limits_demo_title" msgid="3207211638386727610">"Demonstration af indholdsbegrænsninger"</string>
<string name="finish_app_msg" msgid="8354334557053141891">"Denne handling vil lukke appen, og når du genstarter den forudindlæses en tilladelsesskærm"</string>
<string name="finish_app_title" msgid="9013328479438745074">"Afslut demonstrationen af appen"</string>
- <!-- no translation found for finish_app_demo_title (8223819062053448384) -->
- <skip />
+ <string name="finish_app_demo_title" msgid="8223819062053448384">"Forudindlæs tilladelsesskærm ved næste kørsel af demo"</string>
<string name="loading_demo_title" msgid="1086529475809143517">"Indlæser demonstration"</string>
<string name="loading_demo_row_title" msgid="8933049915126088142">"Indlæsningen er fuldført"</string>
<string name="pop_to_root" msgid="2078277386355064198">"Skfit til rod"</string>
@@ -141,6 +141,14 @@
<string name="importance_title" msgid="9034862997821839831">"Vigtighed"</string>
<string name="category_title" msgid="4783851267093259949">"Kategori"</string>
<string name="ongoing_title" msgid="4957996003270280496">"I gang"</string>
+ <!-- no translation found for default_importance (6347996298832939989) -->
+ <skip />
+ <!-- no translation found for high_importance (5009120714837304882) -->
+ <skip />
+ <!-- no translation found for low_importance (4721161314404294033) -->
+ <skip />
+ <!-- no translation found for unknown_importance (909001735933359216) -->
+ <skip />
<string name="notification_demo" msgid="1819496937832036387">"Demonstration af notifikation"</string>
<string name="misc_demo_title" msgid="7399959062407349380">"Diverse demonstrationer"</string>
<string name="navigating_demo_title" msgid="7454579665387386476">"Demonstration af navigation"</string>
@@ -284,12 +292,10 @@
<string name="image_test_title" msgid="8273863429801477547">"Billedtest."</string>
<string name="image_test_text" msgid="6264812093895530445">"Billedændringer er tilladt"</string>
<string name="additional_data_title" msgid="3546689652240300617">"Yderligere data"</string>
- <!-- no translation found for additional_data_text (2846223398214158872) -->
- <skip />
+ <string name="additional_data_text" msgid="2846223398214158872">"Opdateringer er tilladt ved handlinger, hvor der navigeres tilbage."</string>
<string name="misc_templates_demos_title" msgid="6077169010255928114">"Demonstrationer af diverse skabeloner"</string>
<string name="showcase_demos_title" msgid="1542092687878113304">"Vis demonstrationer"</string>
- <!-- no translation found for location_1_title (3939821089928425181) -->
- <skip />
+ <string name="location_1_title" msgid="3939821089928425181">"translatable=falseGoogle Kirkland"</string>
<string name="location_1_description" msgid="4801052291684791371">"Nedtoned ressourcevektor"</string>
<string name="location_2_description" msgid="3331356135359047166">"Billedressourcebitmap"</string>
<string name="location_3_description" msgid="3982142774088944850">"Farvet tekstmarkør"</string>
diff --git a/car/app/app-samples/showcase/common/src/main/res/values-de/strings.xml b/car/app/app-samples/showcase/common/src/main/res/values-de/strings.xml
index 87e28031..d4e6702 100644
--- a/car/app/app-samples/showcase/common/src/main/res/values-de/strings.xml
+++ b/car/app/app-samples/showcase/common/src/main/res/values-de/strings.xml
@@ -36,7 +36,8 @@
<string name="on_action_title" msgid="4129601573763429611">"An"</string>
<string name="off_action_title" msgid="8669201170189204848">"Aus"</string>
<string name="settings_action_title" msgid="8616900063253887861">"Einstellungen"</string>
- <string name="accept_action_title" msgid="6172053420803596132">"Einstellungen"</string>
+ <!-- no translation found for accept_action_title (4899660585470647578) -->
+ <skip />
<string name="reject_action_title" msgid="6730366705938402668">"Ablehnen"</string>
<string name="ok_action_title" msgid="7128494973966098611">"OK"</string>
<string name="throw_action_title" msgid="7163710562670220163">"Auslösen"</string>
@@ -110,8 +111,7 @@
<string name="content_limits_demo_title" msgid="3207211638386727610">"Demo für „Beschränkungen für Inhalte“"</string>
<string name="finish_app_msg" msgid="8354334557053141891">"Dadurch wird die App geschlossen und beim nächsten Ausführen eine Berechtigungsanfrage eingeblendet"</string>
<string name="finish_app_title" msgid="9013328479438745074">"App-Demo beenden"</string>
- <!-- no translation found for finish_app_demo_title (8223819062053448384) -->
- <skip />
+ <string name="finish_app_demo_title" msgid="8223819062053448384">"Beim nächsten Ausführen der Demo Berechtigungsbildschirm voranstellen"</string>
<string name="loading_demo_title" msgid="1086529475809143517">"Demo wird geladen"</string>
<string name="loading_demo_row_title" msgid="8933049915126088142">"Ladevorgang abgeschlossen!"</string>
<string name="pop_to_root" msgid="2078277386355064198">"Zu Stammverzeichnis wechseln"</string>
@@ -141,6 +141,14 @@
<string name="importance_title" msgid="9034862997821839831">"Wichtigkeit"</string>
<string name="category_title" msgid="4783851267093259949">"Kategorie"</string>
<string name="ongoing_title" msgid="4957996003270280496">"Aktiv"</string>
+ <!-- no translation found for default_importance (6347996298832939989) -->
+ <skip />
+ <!-- no translation found for high_importance (5009120714837304882) -->
+ <skip />
+ <!-- no translation found for low_importance (4721161314404294033) -->
+ <skip />
+ <!-- no translation found for unknown_importance (909001735933359216) -->
+ <skip />
<string name="notification_demo" msgid="1819496937832036387">"Benachrichtigungsdemo"</string>
<string name="misc_demo_title" msgid="7399959062407349380">"Verschiedene Demos"</string>
<string name="navigating_demo_title" msgid="7454579665387386476">"Navigationsdemo"</string>
@@ -284,12 +292,10 @@
<string name="image_test_title" msgid="8273863429801477547">"Bildtest"</string>
<string name="image_test_text" msgid="6264812093895530445">"Bildänderungen sind erlaubt"</string>
<string name="additional_data_title" msgid="3546689652240300617">"Zusätzliche Daten"</string>
- <!-- no translation found for additional_data_text (2846223398214158872) -->
- <skip />
+ <string name="additional_data_text" msgid="2846223398214158872">"Updates beim Zurückgehen erlaubt."</string>
<string name="misc_templates_demos_title" msgid="6077169010255928114">"Demos der verschiedenen Vorlagen"</string>
<string name="showcase_demos_title" msgid="1542092687878113304">"Demos anzeigen"</string>
- <!-- no translation found for location_1_title (3939821089928425181) -->
- <skip />
+ <string name="location_1_title" msgid="3939821089928425181">"translatable=falseGoogle Kirkland"</string>
<string name="location_1_description" msgid="4801052291684791371">"Gefärbter Ressourcenvektor"</string>
<string name="location_2_description" msgid="3331356135359047166">"Bitmap-Infobild"</string>
<string name="location_3_description" msgid="3982142774088944850">"Farbige Textmarkierung"</string>
diff --git a/car/app/app-samples/showcase/common/src/main/res/values-el/strings.xml b/car/app/app-samples/showcase/common/src/main/res/values-el/strings.xml
index 07f0ede..eec9234 100644
--- a/car/app/app-samples/showcase/common/src/main/res/values-el/strings.xml
+++ b/car/app/app-samples/showcase/common/src/main/res/values-el/strings.xml
@@ -36,7 +36,8 @@
<string name="on_action_title" msgid="4129601573763429611">"Ενεργό"</string>
<string name="off_action_title" msgid="8669201170189204848">"Ανενεργό"</string>
<string name="settings_action_title" msgid="8616900063253887861">"Ρυθμίσεις"</string>
- <string name="accept_action_title" msgid="6172053420803596132">"Ρυθμίσεις"</string>
+ <!-- no translation found for accept_action_title (4899660585470647578) -->
+ <skip />
<string name="reject_action_title" msgid="6730366705938402668">"Απόρριψη"</string>
<string name="ok_action_title" msgid="7128494973966098611">"OK"</string>
<string name="throw_action_title" msgid="7163710562670220163">"Ρίψη"</string>
@@ -140,6 +141,14 @@
<string name="importance_title" msgid="9034862997821839831">"Βαρύτητα"</string>
<string name="category_title" msgid="4783851267093259949">"Κατηγορία"</string>
<string name="ongoing_title" msgid="4957996003270280496">"Σε εξέλιξη"</string>
+ <!-- no translation found for default_importance (6347996298832939989) -->
+ <skip />
+ <!-- no translation found for high_importance (5009120714837304882) -->
+ <skip />
+ <!-- no translation found for low_importance (4721161314404294033) -->
+ <skip />
+ <!-- no translation found for unknown_importance (909001735933359216) -->
+ <skip />
<string name="notification_demo" msgid="1819496937832036387">"Επίδειξη ειδοποίησης"</string>
<string name="misc_demo_title" msgid="7399959062407349380">"Διάφορες επιδείξεις"</string>
<string name="navigating_demo_title" msgid="7454579665387386476">"Επίδειξη πλοήγησης"</string>
@@ -286,8 +295,7 @@
<string name="additional_data_text" msgid="2846223398214158872">"Οι ενημερώσεις επιτρέπονται σε λειτουργίες παρασκηνίου."</string>
<string name="misc_templates_demos_title" msgid="6077169010255928114">"Διάφορες επιδείξεις προτύπων"</string>
<string name="showcase_demos_title" msgid="1542092687878113304">"Προβολή επιδείξεων"</string>
- <!-- no translation found for location_1_title (3939821089928425181) -->
- <skip />
+ <string name="location_1_title" msgid="3939821089928425181">"translatable=falseGoogle Kirkland"</string>
<string name="location_1_description" msgid="4801052291684791371">"Διάνυσμα πόρου με απόχρωση"</string>
<string name="location_2_description" msgid="3331356135359047166">"Χάρτης bit πόρων εικόνας"</string>
<string name="location_3_description" msgid="3982142774088944850">"Έγχρωμος δείκτης κειμένου"</string>
diff --git a/car/app/app-samples/showcase/common/src/main/res/values-en-rAU/strings.xml b/car/app/app-samples/showcase/common/src/main/res/values-en-rAU/strings.xml
index 644036c..36ceefb 100644
--- a/car/app/app-samples/showcase/common/src/main/res/values-en-rAU/strings.xml
+++ b/car/app/app-samples/showcase/common/src/main/res/values-en-rAU/strings.xml
@@ -36,7 +36,8 @@
<string name="on_action_title" msgid="4129601573763429611">"On"</string>
<string name="off_action_title" msgid="8669201170189204848">"Off"</string>
<string name="settings_action_title" msgid="8616900063253887861">"Settings"</string>
- <string name="accept_action_title" msgid="6172053420803596132">"Settings"</string>
+ <!-- no translation found for accept_action_title (4899660585470647578) -->
+ <skip />
<string name="reject_action_title" msgid="6730366705938402668">"Reject"</string>
<string name="ok_action_title" msgid="7128494973966098611">"OK"</string>
<string name="throw_action_title" msgid="7163710562670220163">"Throw"</string>
@@ -140,6 +141,10 @@
<string name="importance_title" msgid="9034862997821839831">"Importance"</string>
<string name="category_title" msgid="4783851267093259949">"Category"</string>
<string name="ongoing_title" msgid="4957996003270280496">"Ongoing"</string>
+ <string name="default_importance" msgid="6347996298832939989">"Default"</string>
+ <string name="high_importance" msgid="5009120714837304882">"High"</string>
+ <string name="low_importance" msgid="4721161314404294033">"Low"</string>
+ <string name="unknown_importance" msgid="909001735933359216">"Unknown"</string>
<string name="notification_demo" msgid="1819496937832036387">"Notification demo"</string>
<string name="misc_demo_title" msgid="7399959062407349380">"Misc demos"</string>
<string name="navigating_demo_title" msgid="7454579665387386476">"Navigating demo"</string>
@@ -286,8 +291,7 @@
<string name="additional_data_text" msgid="2846223398214158872">"Updates allowed on back operations."</string>
<string name="misc_templates_demos_title" msgid="6077169010255928114">"Misc templates demos"</string>
<string name="showcase_demos_title" msgid="1542092687878113304">"Showcase demos"</string>
- <!-- no translation found for location_1_title (3939821089928425181) -->
- <skip />
+ <string name="location_1_title" msgid="3939821089928425181">"translatable=falseGoogle Kirkland"</string>
<string name="location_1_description" msgid="4801052291684791371">"Tinted resource vector"</string>
<string name="location_2_description" msgid="3331356135359047166">"Image resource bitmap"</string>
<string name="location_3_description" msgid="3982142774088944850">"Coloured text marker"</string>
diff --git a/car/app/app-samples/showcase/common/src/main/res/values-en-rCA/strings.xml b/car/app/app-samples/showcase/common/src/main/res/values-en-rCA/strings.xml
index 644036c..36ceefb 100644
--- a/car/app/app-samples/showcase/common/src/main/res/values-en-rCA/strings.xml
+++ b/car/app/app-samples/showcase/common/src/main/res/values-en-rCA/strings.xml
@@ -36,7 +36,8 @@
<string name="on_action_title" msgid="4129601573763429611">"On"</string>
<string name="off_action_title" msgid="8669201170189204848">"Off"</string>
<string name="settings_action_title" msgid="8616900063253887861">"Settings"</string>
- <string name="accept_action_title" msgid="6172053420803596132">"Settings"</string>
+ <!-- no translation found for accept_action_title (4899660585470647578) -->
+ <skip />
<string name="reject_action_title" msgid="6730366705938402668">"Reject"</string>
<string name="ok_action_title" msgid="7128494973966098611">"OK"</string>
<string name="throw_action_title" msgid="7163710562670220163">"Throw"</string>
@@ -140,6 +141,10 @@
<string name="importance_title" msgid="9034862997821839831">"Importance"</string>
<string name="category_title" msgid="4783851267093259949">"Category"</string>
<string name="ongoing_title" msgid="4957996003270280496">"Ongoing"</string>
+ <string name="default_importance" msgid="6347996298832939989">"Default"</string>
+ <string name="high_importance" msgid="5009120714837304882">"High"</string>
+ <string name="low_importance" msgid="4721161314404294033">"Low"</string>
+ <string name="unknown_importance" msgid="909001735933359216">"Unknown"</string>
<string name="notification_demo" msgid="1819496937832036387">"Notification demo"</string>
<string name="misc_demo_title" msgid="7399959062407349380">"Misc demos"</string>
<string name="navigating_demo_title" msgid="7454579665387386476">"Navigating demo"</string>
@@ -286,8 +291,7 @@
<string name="additional_data_text" msgid="2846223398214158872">"Updates allowed on back operations."</string>
<string name="misc_templates_demos_title" msgid="6077169010255928114">"Misc templates demos"</string>
<string name="showcase_demos_title" msgid="1542092687878113304">"Showcase demos"</string>
- <!-- no translation found for location_1_title (3939821089928425181) -->
- <skip />
+ <string name="location_1_title" msgid="3939821089928425181">"translatable=falseGoogle Kirkland"</string>
<string name="location_1_description" msgid="4801052291684791371">"Tinted resource vector"</string>
<string name="location_2_description" msgid="3331356135359047166">"Image resource bitmap"</string>
<string name="location_3_description" msgid="3982142774088944850">"Coloured text marker"</string>
diff --git a/car/app/app-samples/showcase/common/src/main/res/values-en-rGB/strings.xml b/car/app/app-samples/showcase/common/src/main/res/values-en-rGB/strings.xml
index 644036c..36ceefb 100644
--- a/car/app/app-samples/showcase/common/src/main/res/values-en-rGB/strings.xml
+++ b/car/app/app-samples/showcase/common/src/main/res/values-en-rGB/strings.xml
@@ -36,7 +36,8 @@
<string name="on_action_title" msgid="4129601573763429611">"On"</string>
<string name="off_action_title" msgid="8669201170189204848">"Off"</string>
<string name="settings_action_title" msgid="8616900063253887861">"Settings"</string>
- <string name="accept_action_title" msgid="6172053420803596132">"Settings"</string>
+ <!-- no translation found for accept_action_title (4899660585470647578) -->
+ <skip />
<string name="reject_action_title" msgid="6730366705938402668">"Reject"</string>
<string name="ok_action_title" msgid="7128494973966098611">"OK"</string>
<string name="throw_action_title" msgid="7163710562670220163">"Throw"</string>
@@ -140,6 +141,10 @@
<string name="importance_title" msgid="9034862997821839831">"Importance"</string>
<string name="category_title" msgid="4783851267093259949">"Category"</string>
<string name="ongoing_title" msgid="4957996003270280496">"Ongoing"</string>
+ <string name="default_importance" msgid="6347996298832939989">"Default"</string>
+ <string name="high_importance" msgid="5009120714837304882">"High"</string>
+ <string name="low_importance" msgid="4721161314404294033">"Low"</string>
+ <string name="unknown_importance" msgid="909001735933359216">"Unknown"</string>
<string name="notification_demo" msgid="1819496937832036387">"Notification demo"</string>
<string name="misc_demo_title" msgid="7399959062407349380">"Misc demos"</string>
<string name="navigating_demo_title" msgid="7454579665387386476">"Navigating demo"</string>
@@ -286,8 +291,7 @@
<string name="additional_data_text" msgid="2846223398214158872">"Updates allowed on back operations."</string>
<string name="misc_templates_demos_title" msgid="6077169010255928114">"Misc templates demos"</string>
<string name="showcase_demos_title" msgid="1542092687878113304">"Showcase demos"</string>
- <!-- no translation found for location_1_title (3939821089928425181) -->
- <skip />
+ <string name="location_1_title" msgid="3939821089928425181">"translatable=falseGoogle Kirkland"</string>
<string name="location_1_description" msgid="4801052291684791371">"Tinted resource vector"</string>
<string name="location_2_description" msgid="3331356135359047166">"Image resource bitmap"</string>
<string name="location_3_description" msgid="3982142774088944850">"Coloured text marker"</string>
diff --git a/car/app/app-samples/showcase/common/src/main/res/values-en-rIN/strings.xml b/car/app/app-samples/showcase/common/src/main/res/values-en-rIN/strings.xml
index 644036c..36ceefb 100644
--- a/car/app/app-samples/showcase/common/src/main/res/values-en-rIN/strings.xml
+++ b/car/app/app-samples/showcase/common/src/main/res/values-en-rIN/strings.xml
@@ -36,7 +36,8 @@
<string name="on_action_title" msgid="4129601573763429611">"On"</string>
<string name="off_action_title" msgid="8669201170189204848">"Off"</string>
<string name="settings_action_title" msgid="8616900063253887861">"Settings"</string>
- <string name="accept_action_title" msgid="6172053420803596132">"Settings"</string>
+ <!-- no translation found for accept_action_title (4899660585470647578) -->
+ <skip />
<string name="reject_action_title" msgid="6730366705938402668">"Reject"</string>
<string name="ok_action_title" msgid="7128494973966098611">"OK"</string>
<string name="throw_action_title" msgid="7163710562670220163">"Throw"</string>
@@ -140,6 +141,10 @@
<string name="importance_title" msgid="9034862997821839831">"Importance"</string>
<string name="category_title" msgid="4783851267093259949">"Category"</string>
<string name="ongoing_title" msgid="4957996003270280496">"Ongoing"</string>
+ <string name="default_importance" msgid="6347996298832939989">"Default"</string>
+ <string name="high_importance" msgid="5009120714837304882">"High"</string>
+ <string name="low_importance" msgid="4721161314404294033">"Low"</string>
+ <string name="unknown_importance" msgid="909001735933359216">"Unknown"</string>
<string name="notification_demo" msgid="1819496937832036387">"Notification demo"</string>
<string name="misc_demo_title" msgid="7399959062407349380">"Misc demos"</string>
<string name="navigating_demo_title" msgid="7454579665387386476">"Navigating demo"</string>
@@ -286,8 +291,7 @@
<string name="additional_data_text" msgid="2846223398214158872">"Updates allowed on back operations."</string>
<string name="misc_templates_demos_title" msgid="6077169010255928114">"Misc templates demos"</string>
<string name="showcase_demos_title" msgid="1542092687878113304">"Showcase demos"</string>
- <!-- no translation found for location_1_title (3939821089928425181) -->
- <skip />
+ <string name="location_1_title" msgid="3939821089928425181">"translatable=falseGoogle Kirkland"</string>
<string name="location_1_description" msgid="4801052291684791371">"Tinted resource vector"</string>
<string name="location_2_description" msgid="3331356135359047166">"Image resource bitmap"</string>
<string name="location_3_description" msgid="3982142774088944850">"Coloured text marker"</string>
diff --git a/car/app/app-samples/showcase/common/src/main/res/values-en-rXC/strings.xml b/car/app/app-samples/showcase/common/src/main/res/values-en-rXC/strings.xml
index c000c30..0a10159 100644
--- a/car/app/app-samples/showcase/common/src/main/res/values-en-rXC/strings.xml
+++ b/car/app/app-samples/showcase/common/src/main/res/values-en-rXC/strings.xml
@@ -36,7 +36,8 @@
<string name="on_action_title" msgid="4129601573763429611">"On"</string>
<string name="off_action_title" msgid="8669201170189204848">"Off"</string>
<string name="settings_action_title" msgid="8616900063253887861">"Settings"</string>
- <string name="accept_action_title" msgid="6172053420803596132">"Settings"</string>
+ <!-- no translation found for accept_action_title (4899660585470647578) -->
+ <skip />
<string name="reject_action_title" msgid="6730366705938402668">"Reject"</string>
<string name="ok_action_title" msgid="7128494973966098611">"OK"</string>
<string name="throw_action_title" msgid="7163710562670220163">"Throw"</string>
@@ -140,6 +141,10 @@
<string name="importance_title" msgid="9034862997821839831">"Importance"</string>
<string name="category_title" msgid="4783851267093259949">"Category"</string>
<string name="ongoing_title" msgid="4957996003270280496">"Ongoing"</string>
+ <string name="default_importance" msgid="6347996298832939989">"Default"</string>
+ <string name="high_importance" msgid="5009120714837304882">"High"</string>
+ <string name="low_importance" msgid="4721161314404294033">"Low"</string>
+ <string name="unknown_importance" msgid="909001735933359216">"Unknown"</string>
<string name="notification_demo" msgid="1819496937832036387">"Notification Demo"</string>
<string name="misc_demo_title" msgid="7399959062407349380">"Misc Demos"</string>
<string name="navigating_demo_title" msgid="7454579665387386476">"Navigating Demo"</string>
@@ -286,8 +291,7 @@
<string name="additional_data_text" msgid="2846223398214158872">"Updates allowed on back operations."</string>
<string name="misc_templates_demos_title" msgid="6077169010255928114">"Misc Templates Demos"</string>
<string name="showcase_demos_title" msgid="1542092687878113304">"Showcase Demos"</string>
- <!-- no translation found for location_1_title (3939821089928425181) -->
- <skip />
+ <string name="location_1_title" msgid="3939821089928425181">"translatable=falseGoogle Kirkland"</string>
<string name="location_1_description" msgid="4801052291684791371">"Tinted resource vector"</string>
<string name="location_2_description" msgid="3331356135359047166">"Image resource bitmap"</string>
<string name="location_3_description" msgid="3982142774088944850">"Colored text marker"</string>
diff --git a/car/app/app-samples/showcase/common/src/main/res/values-es-rUS/strings.xml b/car/app/app-samples/showcase/common/src/main/res/values-es-rUS/strings.xml
index 327ab14..9b76e75 100644
--- a/car/app/app-samples/showcase/common/src/main/res/values-es-rUS/strings.xml
+++ b/car/app/app-samples/showcase/common/src/main/res/values-es-rUS/strings.xml
@@ -36,7 +36,8 @@
<string name="on_action_title" msgid="4129601573763429611">"Activado"</string>
<string name="off_action_title" msgid="8669201170189204848">"Desactivado"</string>
<string name="settings_action_title" msgid="8616900063253887861">"Configuración"</string>
- <string name="accept_action_title" msgid="6172053420803596132">"Configuración"</string>
+ <!-- no translation found for accept_action_title (4899660585470647578) -->
+ <skip />
<string name="reject_action_title" msgid="6730366705938402668">"Rechazar"</string>
<string name="ok_action_title" msgid="7128494973966098611">"Aceptar"</string>
<string name="throw_action_title" msgid="7163710562670220163">"Arrojar"</string>
@@ -110,8 +111,7 @@
<string name="content_limits_demo_title" msgid="3207211638386727610">"Demostración de los límites de contenido"</string>
<string name="finish_app_msg" msgid="8354334557053141891">"Esta acción cerrará la app y, cuando vuelvas a abrirla, se preconfigurará una pantalla de permisos"</string>
<string name="finish_app_title" msgid="9013328479438745074">"Demostración de cierre de la app"</string>
- <!-- no translation found for finish_app_demo_title (8223819062053448384) -->
- <skip />
+ <string name="finish_app_demo_title" msgid="8223819062053448384">"Demostración para completar previamente la pantalla de permisos en la próxima ejecución"</string>
<string name="loading_demo_title" msgid="1086529475809143517">"Cargando demostración"</string>
<string name="loading_demo_row_title" msgid="8933049915126088142">"Carga completa"</string>
<string name="pop_to_root" msgid="2078277386355064198">"Ir a la raíz"</string>
@@ -141,6 +141,14 @@
<string name="importance_title" msgid="9034862997821839831">"Importancia"</string>
<string name="category_title" msgid="4783851267093259949">"Categoría"</string>
<string name="ongoing_title" msgid="4957996003270280496">"En curso"</string>
+ <!-- no translation found for default_importance (6347996298832939989) -->
+ <skip />
+ <!-- no translation found for high_importance (5009120714837304882) -->
+ <skip />
+ <!-- no translation found for low_importance (4721161314404294033) -->
+ <skip />
+ <!-- no translation found for unknown_importance (909001735933359216) -->
+ <skip />
<string name="notification_demo" msgid="1819496937832036387">"Demostración de notificación"</string>
<string name="misc_demo_title" msgid="7399959062407349380">"Demostraciones varias"</string>
<string name="navigating_demo_title" msgid="7454579665387386476">"Demostración de navegación"</string>
@@ -284,12 +292,10 @@
<string name="image_test_title" msgid="8273863429801477547">"Prueba de imágenes"</string>
<string name="image_test_text" msgid="6264812093895530445">"Se permiten los cambios de imagen"</string>
<string name="additional_data_title" msgid="3546689652240300617">"Datos adicionales"</string>
- <!-- no translation found for additional_data_text (2846223398214158872) -->
- <skip />
+ <string name="additional_data_text" msgid="2846223398214158872">"Se permiten las actualizaciones en las operaciones de retroceso."</string>
<string name="misc_templates_demos_title" msgid="6077169010255928114">"Demostraciones de plantillas varias"</string>
<string name="showcase_demos_title" msgid="1542092687878113304">"Demostraciones de Showcase"</string>
- <!-- no translation found for location_1_title (3939821089928425181) -->
- <skip />
+ <string name="location_1_title" msgid="3939821089928425181">"translatable=falseGoogle Kirkland"</string>
<string name="location_1_description" msgid="4801052291684791371">"Vector de recursos en color"</string>
<string name="location_2_description" msgid="3331356135359047166">"Mapa de bits de recursos de imagen"</string>
<string name="location_3_description" msgid="3982142774088944850">"Marcador de texto en color"</string>
diff --git a/car/app/app-samples/showcase/common/src/main/res/values-es/strings.xml b/car/app/app-samples/showcase/common/src/main/res/values-es/strings.xml
index 5ff5e2f..136ee62 100644
--- a/car/app/app-samples/showcase/common/src/main/res/values-es/strings.xml
+++ b/car/app/app-samples/showcase/common/src/main/res/values-es/strings.xml
@@ -36,7 +36,8 @@
<string name="on_action_title" msgid="4129601573763429611">"Activado"</string>
<string name="off_action_title" msgid="8669201170189204848">"Desactivado"</string>
<string name="settings_action_title" msgid="8616900063253887861">"Ajustes"</string>
- <string name="accept_action_title" msgid="6172053420803596132">"Ajustes"</string>
+ <!-- no translation found for accept_action_title (4899660585470647578) -->
+ <skip />
<string name="reject_action_title" msgid="6730366705938402668">"Rechazar"</string>
<string name="ok_action_title" msgid="7128494973966098611">"Aceptar"</string>
<string name="throw_action_title" msgid="7163710562670220163">"Lanzar"</string>
@@ -110,8 +111,7 @@
<string name="content_limits_demo_title" msgid="3207211638386727610">"Demo de límites de contenido"</string>
<string name="finish_app_msg" msgid="8354334557053141891">"Esta acción cerrará la aplicación y, cuando la vuelvas a abrir, precargará una pantalla de permisos"</string>
<string name="finish_app_title" msgid="9013328479438745074">"Finalizar demo de la aplicación"</string>
- <!-- no translation found for finish_app_demo_title (8223819062053448384) -->
- <skip />
+ <string name="finish_app_demo_title" msgid="8223819062053448384">"Precarga la pantalla de permisos en el siguiente inicio de la demo"</string>
<string name="loading_demo_title" msgid="1086529475809143517">"Cargando demo"</string>
<string name="loading_demo_row_title" msgid="8933049915126088142">"Carga completa"</string>
<string name="pop_to_root" msgid="2078277386355064198">"Ir a la raíz"</string>
@@ -141,6 +141,14 @@
<string name="importance_title" msgid="9034862997821839831">"Importancia"</string>
<string name="category_title" msgid="4783851267093259949">"Categoría"</string>
<string name="ongoing_title" msgid="4957996003270280496">"En curso"</string>
+ <!-- no translation found for default_importance (6347996298832939989) -->
+ <skip />
+ <!-- no translation found for high_importance (5009120714837304882) -->
+ <skip />
+ <!-- no translation found for low_importance (4721161314404294033) -->
+ <skip />
+ <!-- no translation found for unknown_importance (909001735933359216) -->
+ <skip />
<string name="notification_demo" msgid="1819496937832036387">"Demo de notificación"</string>
<string name="misc_demo_title" msgid="7399959062407349380">"Otras demos"</string>
<string name="navigating_demo_title" msgid="7454579665387386476">"Demo de navegación"</string>
@@ -284,12 +292,10 @@
<string name="image_test_title" msgid="8273863429801477547">"Prueba de imagen"</string>
<string name="image_test_text" msgid="6264812093895530445">"Los cambios en la imagen están permitidos"</string>
<string name="additional_data_title" msgid="3546689652240300617">"Datos adicionales"</string>
- <!-- no translation found for additional_data_text (2846223398214158872) -->
- <skip />
+ <string name="additional_data_text" msgid="2846223398214158872">"Actualizaciones permitidas al ir atrás."</string>
<string name="misc_templates_demos_title" msgid="6077169010255928114">"Otras demos de plantillas"</string>
<string name="showcase_demos_title" msgid="1542092687878113304">"Demos de Showcase"</string>
- <!-- no translation found for location_1_title (3939821089928425181) -->
- <skip />
+ <string name="location_1_title" msgid="3939821089928425181">"translatable=falseGoogle Kirkland"</string>
<string name="location_1_description" msgid="4801052291684791371">"Vector de recursos con color"</string>
<string name="location_2_description" msgid="3331356135359047166">"Mapa de bits de recursos de imagen"</string>
<string name="location_3_description" msgid="3982142774088944850">"Marcador de texto con color"</string>
diff --git a/car/app/app-samples/showcase/common/src/main/res/values-et/strings.xml b/car/app/app-samples/showcase/common/src/main/res/values-et/strings.xml
index 06d5250..76b4cbe 100644
--- a/car/app/app-samples/showcase/common/src/main/res/values-et/strings.xml
+++ b/car/app/app-samples/showcase/common/src/main/res/values-et/strings.xml
@@ -36,7 +36,8 @@
<string name="on_action_title" msgid="4129601573763429611">"Sees"</string>
<string name="off_action_title" msgid="8669201170189204848">"Väljas"</string>
<string name="settings_action_title" msgid="8616900063253887861">"Seaded"</string>
- <string name="accept_action_title" msgid="6172053420803596132">"Seaded"</string>
+ <!-- no translation found for accept_action_title (4899660585470647578) -->
+ <skip />
<string name="reject_action_title" msgid="6730366705938402668">"Keeldu"</string>
<string name="ok_action_title" msgid="7128494973966098611">"OK"</string>
<string name="throw_action_title" msgid="7163710562670220163">"Vise"</string>
@@ -110,8 +111,7 @@
<string name="content_limits_demo_title" msgid="3207211638386727610">"Sisupiirangute demo"</string>
<string name="finish_app_msg" msgid="8354334557053141891">"See sulgeb rakenduse; kui naasete, eeltäidetakse lubade kuva"</string>
<string name="finish_app_title" msgid="9013328479438745074">"Lõpeta rakenduse demo"</string>
- <!-- no translation found for finish_app_demo_title (8223819062053448384) -->
- <skip />
+ <string name="finish_app_demo_title" msgid="8223819062053448384">"Järgmisel käitamisel lubade kuva eeltäitmise demo"</string>
<string name="loading_demo_title" msgid="1086529475809143517">"Laadimise demo"</string>
<string name="loading_demo_row_title" msgid="8933049915126088142">"Laadimine jõudis lõpule!"</string>
<string name="pop_to_root" msgid="2078277386355064198">"Hüppa juurüksusesse"</string>
@@ -141,6 +141,14 @@
<string name="importance_title" msgid="9034862997821839831">"Tähtsus"</string>
<string name="category_title" msgid="4783851267093259949">"Kategooria"</string>
<string name="ongoing_title" msgid="4957996003270280496">"Pooleli"</string>
+ <!-- no translation found for default_importance (6347996298832939989) -->
+ <skip />
+ <!-- no translation found for high_importance (5009120714837304882) -->
+ <skip />
+ <!-- no translation found for low_importance (4721161314404294033) -->
+ <skip />
+ <!-- no translation found for unknown_importance (909001735933359216) -->
+ <skip />
<string name="notification_demo" msgid="1819496937832036387">"Märguande demo"</string>
<string name="misc_demo_title" msgid="7399959062407349380">"Mitmesuguste demod"</string>
<string name="navigating_demo_title" msgid="7454579665387386476">"Navigeerimise demo"</string>
@@ -284,12 +292,10 @@
<string name="image_test_title" msgid="8273863429801477547">"Pildi test"</string>
<string name="image_test_text" msgid="6264812093895530445">"Piltide muutmine on lubatud"</string>
<string name="additional_data_title" msgid="3546689652240300617">"Lisaandmed"</string>
- <!-- no translation found for additional_data_text (2846223398214158872) -->
- <skip />
+ <string name="additional_data_text" msgid="2846223398214158872">"Värskendused on tagasiminekutoimingute korral lubatud."</string>
<string name="misc_templates_demos_title" msgid="6077169010255928114">"Mitmesuguste mallide demod"</string>
<string name="showcase_demos_title" msgid="1542092687878113304">"Esiletõstmise demod"</string>
- <!-- no translation found for location_1_title (3939821089928425181) -->
- <skip />
+ <string name="location_1_title" msgid="3939821089928425181">"Google Kirkland"</string>
<string name="location_1_description" msgid="4801052291684791371">"Toonitud ressursi vektor"</string>
<string name="location_2_description" msgid="3331356135359047166">"Pildiressursi raster"</string>
<string name="location_3_description" msgid="3982142774088944850">"Värviline tekstimarker"</string>
diff --git a/car/app/app-samples/showcase/common/src/main/res/values-eu/strings.xml b/car/app/app-samples/showcase/common/src/main/res/values-eu/strings.xml
index 4a7e5962..75628eb 100644
--- a/car/app/app-samples/showcase/common/src/main/res/values-eu/strings.xml
+++ b/car/app/app-samples/showcase/common/src/main/res/values-eu/strings.xml
@@ -36,7 +36,8 @@
<string name="on_action_title" msgid="4129601573763429611">"Aktibatuta"</string>
<string name="off_action_title" msgid="8669201170189204848">"Desaktibatuta"</string>
<string name="settings_action_title" msgid="8616900063253887861">"Ezarpenak"</string>
- <string name="accept_action_title" msgid="6172053420803596132">"Ezarpenak"</string>
+ <!-- no translation found for accept_action_title (4899660585470647578) -->
+ <skip />
<string name="reject_action_title" msgid="6730366705938402668">"Baztertu"</string>
<string name="ok_action_title" msgid="7128494973966098611">"Ados"</string>
<string name="throw_action_title" msgid="7163710562670220163">"Jaurti"</string>
@@ -110,8 +111,7 @@
<string name="content_limits_demo_title" msgid="3207211638386727610">"Edukien mugen demo-bertsioa"</string>
<string name="finish_app_msg" msgid="8354334557053141891">"Aplikazioa itxiko da. Itzultzen zarenean, kargatzeko lehentasuna emango zaio baimenen pantaila bati."</string>
<string name="finish_app_title" msgid="9013328479438745074">"Itxi aplikazioaren demo-bertsioa"</string>
- <!-- no translation found for finish_app_demo_title (8223819062053448384) -->
- <skip />
+ <string name="finish_app_demo_title" msgid="8223819062053448384">"Eman kargatzeko lehentasuna baimen-pantailari demo-bertsioa abiarazten den hurrengoan"</string>
<string name="loading_demo_title" msgid="1086529475809143517">"Demo-bertsioa kargatzen"</string>
<string name="loading_demo_row_title" msgid="8933049915126088142">"Kargatu da"</string>
<string name="pop_to_root" msgid="2078277386355064198">"Joan errora"</string>
@@ -141,6 +141,14 @@
<string name="importance_title" msgid="9034862997821839831">"Garrantzia"</string>
<string name="category_title" msgid="4783851267093259949">"Kategoria"</string>
<string name="ongoing_title" msgid="4957996003270280496">"Abian"</string>
+ <!-- no translation found for default_importance (6347996298832939989) -->
+ <skip />
+ <!-- no translation found for high_importance (5009120714837304882) -->
+ <skip />
+ <!-- no translation found for low_importance (4721161314404294033) -->
+ <skip />
+ <!-- no translation found for unknown_importance (909001735933359216) -->
+ <skip />
<string name="notification_demo" msgid="1819496937832036387">"Jakinarazpenen demo-bertsioa"</string>
<string name="misc_demo_title" msgid="7399959062407349380">"Bestelako demo-bertsioak"</string>
<string name="navigating_demo_title" msgid="7454579665387386476">"Nabigazioaren demo-bertsioa"</string>
@@ -284,12 +292,10 @@
<string name="image_test_title" msgid="8273863429801477547">"Irudiaren proba"</string>
<string name="image_test_text" msgid="6264812093895530445">"Aldaketak egin daitezke irudian"</string>
<string name="additional_data_title" msgid="3546689652240300617">"Datu gehigarriak"</string>
- <!-- no translation found for additional_data_text (2846223398214158872) -->
- <skip />
+ <string name="additional_data_text" msgid="2846223398214158872">"Atzeko planoko eragiketak eguneratu egin daitezke."</string>
<string name="misc_templates_demos_title" msgid="6077169010255928114">"Bestelako txantiloien demo-bertsioak"</string>
<string name="showcase_demos_title" msgid="1542092687878113304">"Erakutsi demo-bertsioak"</string>
- <!-- no translation found for location_1_title (3939821089928425181) -->
- <skip />
+ <string name="location_1_title" msgid="3939821089928425181">"translatable=falseGoogle Kirkland"</string>
<string name="location_1_description" msgid="4801052291684791371">"Baliabide-bektore tonuduna"</string>
<string name="location_2_description" msgid="3331356135359047166">"Irudiaren baliabidearen bit-mapa"</string>
<string name="location_3_description" msgid="3982142774088944850">"Koloreztatutako testu-markatzailea"</string>
diff --git a/car/app/app-samples/showcase/common/src/main/res/values-fa/strings.xml b/car/app/app-samples/showcase/common/src/main/res/values-fa/strings.xml
index f47c6b7..08ca58d7 100644
--- a/car/app/app-samples/showcase/common/src/main/res/values-fa/strings.xml
+++ b/car/app/app-samples/showcase/common/src/main/res/values-fa/strings.xml
@@ -36,7 +36,8 @@
<string name="on_action_title" msgid="4129601573763429611">"روشن"</string>
<string name="off_action_title" msgid="8669201170189204848">"خاموش"</string>
<string name="settings_action_title" msgid="8616900063253887861">"تنظیمات"</string>
- <string name="accept_action_title" msgid="6172053420803596132">"تنظیمات"</string>
+ <!-- no translation found for accept_action_title (4899660585470647578) -->
+ <skip />
<string name="reject_action_title" msgid="6730366705938402668">"رد کردن"</string>
<string name="ok_action_title" msgid="7128494973966098611">"تأیید"</string>
<string name="throw_action_title" msgid="7163710562670220163">"پرتاب کردن"</string>
@@ -110,8 +111,7 @@
<string name="content_limits_demo_title" msgid="3207211638386727610">"نمونه محدودیتهای محتوا"</string>
<string name="finish_app_msg" msgid="8354334557053141891">"با این کار، برنامه بهپایان میرسد و وقتی برگردید، صفحه اجازه را اضافه خواهد کرد"</string>
<string name="finish_app_title" msgid="9013328479438745074">"بهپایان رساندن نمونه برنامه"</string>
- <!-- no translation found for finish_app_demo_title (8223819062053448384) -->
- <skip />
+ <string name="finish_app_demo_title" msgid="8223819062053448384">"پیشپیگردی «صفحه اجازه» در اجرای بعدی نسخه نمونه"</string>
<string name="loading_demo_title" msgid="1086529475809143517">"درحال بار کردن نسخه نمونه"</string>
<string name="loading_demo_row_title" msgid="8933049915126088142">"بار کردن انجام شد!"</string>
<string name="pop_to_root" msgid="2078277386355064198">"رفتن به ریشه"</string>
@@ -141,6 +141,14 @@
<string name="importance_title" msgid="9034862997821839831">"اهمیت"</string>
<string name="category_title" msgid="4783851267093259949">"دسته"</string>
<string name="ongoing_title" msgid="4957996003270280496">"درحال انجام"</string>
+ <!-- no translation found for default_importance (6347996298832939989) -->
+ <skip />
+ <!-- no translation found for high_importance (5009120714837304882) -->
+ <skip />
+ <!-- no translation found for low_importance (4721161314404294033) -->
+ <skip />
+ <!-- no translation found for unknown_importance (909001735933359216) -->
+ <skip />
<string name="notification_demo" msgid="1819496937832036387">"اعلان نمونه"</string>
<string name="misc_demo_title" msgid="7399959062407349380">"نمونههای متفرقه"</string>
<string name="navigating_demo_title" msgid="7454579665387386476">"نمونه ناوبری"</string>
@@ -284,12 +292,10 @@
<string name="image_test_title" msgid="8273863429801477547">"امتحان کردن تصویر"</string>
<string name="image_test_text" msgid="6264812093895530445">"تغییرات تصویر مجاز است"</string>
<string name="additional_data_title" msgid="3546689652240300617">"دادههای تکمیلی"</string>
- <!-- no translation found for additional_data_text (2846223398214158872) -->
- <skip />
+ <string name="additional_data_text" msgid="2846223398214158872">"بهروزرسانی در عملیاتهای برگشتی مجاز است."</string>
<string name="misc_templates_demos_title" msgid="6077169010255928114">"الگوهای متفرقه نمونه"</string>
<string name="showcase_demos_title" msgid="1542092687878113304">"نمایش نمونهها"</string>
- <!-- no translation found for location_1_title (3939821089928425181) -->
- <skip />
+ <string name="location_1_title" msgid="3939821089928425181">"translatable=falseGoogle Kirkland"</string>
<string name="location_1_description" msgid="4801052291684791371">"بردار منبع با سایهرنگ"</string>
<string name="location_2_description" msgid="3331356135359047166">"بیتمپ منبع تصویر"</string>
<string name="location_3_description" msgid="3982142774088944850">"نشانگر نوشتار رنگی"</string>
diff --git a/car/app/app-samples/showcase/common/src/main/res/values-fi/strings.xml b/car/app/app-samples/showcase/common/src/main/res/values-fi/strings.xml
index 9d491d1..f3143d6 100644
--- a/car/app/app-samples/showcase/common/src/main/res/values-fi/strings.xml
+++ b/car/app/app-samples/showcase/common/src/main/res/values-fi/strings.xml
@@ -36,7 +36,8 @@
<string name="on_action_title" msgid="4129601573763429611">"Päällä"</string>
<string name="off_action_title" msgid="8669201170189204848">"Pois päältä"</string>
<string name="settings_action_title" msgid="8616900063253887861">"Asetukset"</string>
- <string name="accept_action_title" msgid="6172053420803596132">"Asetukset"</string>
+ <!-- no translation found for accept_action_title (4899660585470647578) -->
+ <skip />
<string name="reject_action_title" msgid="6730366705938402668">"Hylkää"</string>
<string name="ok_action_title" msgid="7128494973966098611">"OK"</string>
<string name="throw_action_title" msgid="7163710562670220163">"Aiheuttaa"</string>
@@ -110,8 +111,7 @@
<string name="content_limits_demo_title" msgid="3207211638386727610">"Sisällön rajoitusten esittely"</string>
<string name="finish_app_msg" msgid="8354334557053141891">"Tämä sulkee sovelluksen ja alustaa lupanäytön seuraavalle käynnistyskerralle"</string>
<string name="finish_app_title" msgid="9013328479438745074">"Päätä sovelluksen esittely"</string>
- <!-- no translation found for finish_app_demo_title (8223819062053448384) -->
- <skip />
+ <string name="finish_app_demo_title" msgid="8223819062053448384">"Alusta lupanäyttö esittelyn seuraavalle käynnistyskerralle"</string>
<string name="loading_demo_title" msgid="1086529475809143517">"Ladataan esittelyä"</string>
<string name="loading_demo_row_title" msgid="8933049915126088142">"Lataus valmis!"</string>
<string name="pop_to_root" msgid="2078277386355064198">"Siirry ensimmäiselle näytölle"</string>
@@ -141,6 +141,14 @@
<string name="importance_title" msgid="9034862997821839831">"Tärkeys"</string>
<string name="category_title" msgid="4783851267093259949">"Luokka"</string>
<string name="ongoing_title" msgid="4957996003270280496">"Käynnissä"</string>
+ <!-- no translation found for default_importance (6347996298832939989) -->
+ <skip />
+ <!-- no translation found for high_importance (5009120714837304882) -->
+ <skip />
+ <!-- no translation found for low_importance (4721161314404294033) -->
+ <skip />
+ <!-- no translation found for unknown_importance (909001735933359216) -->
+ <skip />
<string name="notification_demo" msgid="1819496937832036387">"Ilmoitusten esittely"</string>
<string name="misc_demo_title" msgid="7399959062407349380">"Sekalaiset esittelyt"</string>
<string name="navigating_demo_title" msgid="7454579665387386476">"Navigoinnin esittely"</string>
@@ -284,12 +292,10 @@
<string name="image_test_title" msgid="8273863429801477547">"Kuvatesti"</string>
<string name="image_test_text" msgid="6264812093895530445">"Kuvat on sallittu"</string>
<string name="additional_data_title" msgid="3546689652240300617">"Lisädata"</string>
- <!-- no translation found for additional_data_text (2846223398214158872) -->
- <skip />
+ <string name="additional_data_text" msgid="2846223398214158872">"Päivitykset sallittu siirryttäessä edelliseen näkymään."</string>
<string name="misc_templates_demos_title" msgid="6077169010255928114">"Sekalaisten mallien esittelyt"</string>
<string name="showcase_demos_title" msgid="1542092687878113304">"Showcase-esittelyt"</string>
- <!-- no translation found for location_1_title (3939821089928425181) -->
- <skip />
+ <string name="location_1_title" msgid="3939821089928425181">"translatable=falseGoogle Kirkland"</string>
<string name="location_1_description" msgid="4801052291684791371">"Sävytetty resurssivektori"</string>
<string name="location_2_description" msgid="3331356135359047166">"Kuvaresurssin bittikartta"</string>
<string name="location_3_description" msgid="3982142774088944850">"Väritetty tekstimerkki"</string>
diff --git a/car/app/app-samples/showcase/common/src/main/res/values-fr-rCA/strings.xml b/car/app/app-samples/showcase/common/src/main/res/values-fr-rCA/strings.xml
index 1757b84..78a18d7 100644
--- a/car/app/app-samples/showcase/common/src/main/res/values-fr-rCA/strings.xml
+++ b/car/app/app-samples/showcase/common/src/main/res/values-fr-rCA/strings.xml
@@ -36,7 +36,8 @@
<string name="on_action_title" msgid="4129601573763429611">"Activé"</string>
<string name="off_action_title" msgid="8669201170189204848">"Désactivé"</string>
<string name="settings_action_title" msgid="8616900063253887861">"Paramètres"</string>
- <string name="accept_action_title" msgid="6172053420803596132">"Paramètres"</string>
+ <!-- no translation found for accept_action_title (4899660585470647578) -->
+ <skip />
<string name="reject_action_title" msgid="6730366705938402668">"Refuser"</string>
<string name="ok_action_title" msgid="7128494973966098611">"OK"</string>
<string name="throw_action_title" msgid="7163710562670220163">"Jeter"</string>
@@ -110,8 +111,7 @@
<string name="content_limits_demo_title" msgid="3207211638386727610">"Démo des limites de contenu"</string>
<string name="finish_app_msg" msgid="8354334557053141891">"L\'application sera fermée, et un écran d\'autorisation sera ajouté quand vous la rouvrirez"</string>
<string name="finish_app_title" msgid="9013328479438745074">"Terminer la démo de l\'application"</string>
- <!-- no translation found for finish_app_demo_title (8223819062053448384) -->
- <skip />
+ <string name="finish_app_demo_title" msgid="8223819062053448384">"Ajout de l\'écran d\'autorisation lors de la prochaine exécution de la démo"</string>
<string name="loading_demo_title" msgid="1086529475809143517">"Chargement de la démo en cours…"</string>
<string name="loading_demo_row_title" msgid="8933049915126088142">"Chargement terminé!"</string>
<string name="pop_to_root" msgid="2078277386355064198">"Aller à la racine"</string>
@@ -141,6 +141,14 @@
<string name="importance_title" msgid="9034862997821839831">"Importance"</string>
<string name="category_title" msgid="4783851267093259949">"Catégorie"</string>
<string name="ongoing_title" msgid="4957996003270280496">"En cours"</string>
+ <!-- no translation found for default_importance (6347996298832939989) -->
+ <skip />
+ <!-- no translation found for high_importance (5009120714837304882) -->
+ <skip />
+ <!-- no translation found for low_importance (4721161314404294033) -->
+ <skip />
+ <!-- no translation found for unknown_importance (909001735933359216) -->
+ <skip />
<string name="notification_demo" msgid="1819496937832036387">"Démo de la notification"</string>
<string name="misc_demo_title" msgid="7399959062407349380">"Démos diverses"</string>
<string name="navigating_demo_title" msgid="7454579665387386476">"Navigation dans la démo"</string>
@@ -284,12 +292,10 @@
<string name="image_test_title" msgid="8273863429801477547">"Test d\'image"</string>
<string name="image_test_text" msgid="6264812093895530445">"Les changements d\'image sont autorisés"</string>
<string name="additional_data_title" msgid="3546689652240300617">"Données supplémentaires"</string>
- <!-- no translation found for additional_data_text (2846223398214158872) -->
- <skip />
+ <string name="additional_data_text" msgid="2846223398214158872">"Mises à jour autorisées lors des opérations de retour."</string>
<string name="misc_templates_demos_title" msgid="6077169010255928114">"Démos de divers modèles"</string>
<string name="showcase_demos_title" msgid="1542092687878113304">"Présenter les démos"</string>
- <!-- no translation found for location_1_title (3939821089928425181) -->
- <skip />
+ <string name="location_1_title" msgid="3939821089928425181">"translatable=falseGoogle Kirkland"</string>
<string name="location_1_description" msgid="4801052291684791371">"Vecteur de ressource teintée"</string>
<string name="location_2_description" msgid="3331356135359047166">"Table de bits de la ressource d\'image"</string>
<string name="location_3_description" msgid="3982142774088944850">"Marqueur de texte coloré"</string>
diff --git a/car/app/app-samples/showcase/common/src/main/res/values-fr/strings.xml b/car/app/app-samples/showcase/common/src/main/res/values-fr/strings.xml
index b0927ff..136586e 100644
--- a/car/app/app-samples/showcase/common/src/main/res/values-fr/strings.xml
+++ b/car/app/app-samples/showcase/common/src/main/res/values-fr/strings.xml
@@ -36,7 +36,8 @@
<string name="on_action_title" msgid="4129601573763429611">"Activé"</string>
<string name="off_action_title" msgid="8669201170189204848">"Désactivé"</string>
<string name="settings_action_title" msgid="8616900063253887861">"Paramètres"</string>
- <string name="accept_action_title" msgid="6172053420803596132">"Paramètres"</string>
+ <!-- no translation found for accept_action_title (4899660585470647578) -->
+ <skip />
<string name="reject_action_title" msgid="6730366705938402668">"Refuser"</string>
<string name="ok_action_title" msgid="7128494973966098611">"OK"</string>
<string name="throw_action_title" msgid="7163710562670220163">"Générer"</string>
@@ -110,8 +111,7 @@
<string name="content_limits_demo_title" msgid="3207211638386727610">"Démo des limites du contenu"</string>
<string name="finish_app_msg" msgid="8354334557053141891">"L\'appli sera fermée et un écran d\'autorisation sera préchargé lorsque vous la relancerez"</string>
<string name="finish_app_title" msgid="9013328479438745074">"Terminer la démo de l\'appli"</string>
- <!-- no translation found for finish_app_demo_title (8223819062053448384) -->
- <skip />
+ <string name="finish_app_demo_title" msgid="8223819062053448384">"Précharger l\'écran d\'autorisation lors de la prochaine démo"</string>
<string name="loading_demo_title" msgid="1086529475809143517">"Chargement de la démo…"</string>
<string name="loading_demo_row_title" msgid="8933049915126088142">"Chargement terminé !"</string>
<string name="pop_to_root" msgid="2078277386355064198">"Accéder à la racine"</string>
@@ -141,6 +141,14 @@
<string name="importance_title" msgid="9034862997821839831">"Importance"</string>
<string name="category_title" msgid="4783851267093259949">"Catégorie"</string>
<string name="ongoing_title" msgid="4957996003270280496">"En cours"</string>
+ <!-- no translation found for default_importance (6347996298832939989) -->
+ <skip />
+ <!-- no translation found for high_importance (5009120714837304882) -->
+ <skip />
+ <!-- no translation found for low_importance (4721161314404294033) -->
+ <skip />
+ <!-- no translation found for unknown_importance (909001735933359216) -->
+ <skip />
<string name="notification_demo" msgid="1819496937832036387">"Démo des notifications"</string>
<string name="misc_demo_title" msgid="7399959062407349380">"Démos diverses"</string>
<string name="navigating_demo_title" msgid="7454579665387386476">"Démo de la navigation"</string>
@@ -284,12 +292,10 @@
<string name="image_test_title" msgid="8273863429801477547">"Test d\'images"</string>
<string name="image_test_text" msgid="6264812093895530445">"La modification des images est autorisée"</string>
<string name="additional_data_title" msgid="3546689652240300617">"Données supplémentaires"</string>
- <!-- no translation found for additional_data_text (2846223398214158872) -->
- <skip />
+ <string name="additional_data_text" msgid="2846223398214158872">"Mises à jour autorisées sur les opérations de retour."</string>
<string name="misc_templates_demos_title" msgid="6077169010255928114">"Démos de divers modèles"</string>
<string name="showcase_demos_title" msgid="1542092687878113304">"Présenter les démos"</string>
- <!-- no translation found for location_1_title (3939821089928425181) -->
- <skip />
+ <string name="location_1_title" msgid="3939821089928425181">"Google Kirkland"</string>
<string name="location_1_description" msgid="4801052291684791371">"Vecteur de ressource teinté"</string>
<string name="location_2_description" msgid="3331356135359047166">"Bitmap de ressource d\'image"</string>
<string name="location_3_description" msgid="3982142774088944850">"Marqueur de texte en couleur"</string>
diff --git a/car/app/app-samples/showcase/common/src/main/res/values-gl/strings.xml b/car/app/app-samples/showcase/common/src/main/res/values-gl/strings.xml
index 98949916..5e810dc 100644
--- a/car/app/app-samples/showcase/common/src/main/res/values-gl/strings.xml
+++ b/car/app/app-samples/showcase/common/src/main/res/values-gl/strings.xml
@@ -36,7 +36,8 @@
<string name="on_action_title" msgid="4129601573763429611">"Activado"</string>
<string name="off_action_title" msgid="8669201170189204848">"Desactivado"</string>
<string name="settings_action_title" msgid="8616900063253887861">"Configuración"</string>
- <string name="accept_action_title" msgid="6172053420803596132">"Configuración"</string>
+ <!-- no translation found for accept_action_title (4899660585470647578) -->
+ <skip />
<string name="reject_action_title" msgid="6730366705938402668">"Rexeitar"</string>
<string name="ok_action_title" msgid="7128494973966098611">"Aceptar"</string>
<string name="throw_action_title" msgid="7163710562670220163">"Mostrar"</string>
@@ -110,8 +111,7 @@
<string name="content_limits_demo_title" msgid="3207211638386727610">"Demostración de límites de contido"</string>
<string name="finish_app_msg" msgid="8354334557053141891">"Esta acción pechará a aplicación e, cando a volvas abrir, precargará unha pantalla de permisos"</string>
<string name="finish_app_title" msgid="9013328479438745074">"Finalizar demostración de aplicación"</string>
- <!-- no translation found for finish_app_demo_title (8223819062053448384) -->
- <skip />
+ <string name="finish_app_demo_title" msgid="8223819062053448384">"Precarga a pantalla de permisos no seguinte inicio da demostración"</string>
<string name="loading_demo_title" msgid="1086529475809143517">"Cargando demostración"</string>
<string name="loading_demo_row_title" msgid="8933049915126088142">"Completouse a carga"</string>
<string name="pop_to_root" msgid="2078277386355064198">"Ir á raíz"</string>
@@ -141,6 +141,14 @@
<string name="importance_title" msgid="9034862997821839831">"Importancia"</string>
<string name="category_title" msgid="4783851267093259949">"Categoría"</string>
<string name="ongoing_title" msgid="4957996003270280496">"En curso"</string>
+ <!-- no translation found for default_importance (6347996298832939989) -->
+ <skip />
+ <!-- no translation found for high_importance (5009120714837304882) -->
+ <skip />
+ <!-- no translation found for low_importance (4721161314404294033) -->
+ <skip />
+ <!-- no translation found for unknown_importance (909001735933359216) -->
+ <skip />
<string name="notification_demo" msgid="1819496937832036387">"Demostración de notificación"</string>
<string name="misc_demo_title" msgid="7399959062407349380">"Outras demostracións"</string>
<string name="navigating_demo_title" msgid="7454579665387386476">"Demostración de navegación"</string>
@@ -284,12 +292,10 @@
<string name="image_test_title" msgid="8273863429801477547">"Proba de imaxe"</string>
<string name="image_test_text" msgid="6264812093895530445">"Os cambios nas imaxes están permitidos"</string>
<string name="additional_data_title" msgid="3546689652240300617">"Datos adicionais"</string>
- <!-- no translation found for additional_data_text (2846223398214158872) -->
- <skip />
+ <string name="additional_data_text" msgid="2846223398214158872">"Permítense actualizacións ao ir á pantalla anterior."</string>
<string name="misc_templates_demos_title" msgid="6077169010255928114">"Outras demostracións de modelos"</string>
<string name="showcase_demos_title" msgid="1542092687878113304">"Demostracións de Showcase"</string>
- <!-- no translation found for location_1_title (3939821089928425181) -->
- <skip />
+ <string name="location_1_title" msgid="3939821089928425181">"translatable=falseGoogle Kirkland"</string>
<string name="location_1_description" msgid="4801052291684791371">"Vector de recursos con cor"</string>
<string name="location_2_description" msgid="3331356135359047166">"Mapa de bits de recursos de imaxe"</string>
<string name="location_3_description" msgid="3982142774088944850">"Marcador de texto con cor"</string>
diff --git a/car/app/app-samples/showcase/common/src/main/res/values-gu/strings.xml b/car/app/app-samples/showcase/common/src/main/res/values-gu/strings.xml
index 24e4c6e..624f08f 100644
--- a/car/app/app-samples/showcase/common/src/main/res/values-gu/strings.xml
+++ b/car/app/app-samples/showcase/common/src/main/res/values-gu/strings.xml
@@ -36,7 +36,8 @@
<string name="on_action_title" msgid="4129601573763429611">"ચાલુ છે"</string>
<string name="off_action_title" msgid="8669201170189204848">"બંધ છે"</string>
<string name="settings_action_title" msgid="8616900063253887861">"સેટિંગ"</string>
- <string name="accept_action_title" msgid="6172053420803596132">"સેટિંગ"</string>
+ <!-- no translation found for accept_action_title (4899660585470647578) -->
+ <skip />
<string name="reject_action_title" msgid="6730366705938402668">"નકારો"</string>
<string name="ok_action_title" msgid="7128494973966098611">"ઓકે"</string>
<string name="throw_action_title" msgid="7163710562670220163">"ફેંકો"</string>
@@ -140,6 +141,14 @@
<string name="importance_title" msgid="9034862997821839831">"મહત્ત્વ"</string>
<string name="category_title" msgid="4783851267093259949">"કૅટેગરી"</string>
<string name="ongoing_title" msgid="4957996003270280496">"ચાલી રહેલું"</string>
+ <!-- no translation found for default_importance (6347996298832939989) -->
+ <skip />
+ <!-- no translation found for high_importance (5009120714837304882) -->
+ <skip />
+ <!-- no translation found for low_importance (4721161314404294033) -->
+ <skip />
+ <!-- no translation found for unknown_importance (909001735933359216) -->
+ <skip />
<string name="notification_demo" msgid="1819496937832036387">"નોટિફિકેશનનો ડેમો"</string>
<string name="misc_demo_title" msgid="7399959062407349380">"વિવિધ ડેમો"</string>
<string name="navigating_demo_title" msgid="7454579665387386476">"નૅવિગેટ કરવાનો ડેમો"</string>
@@ -286,8 +295,7 @@
<string name="additional_data_text" msgid="2846223398214158872">"અગાઉના કાર્યો પર અપડેટ કરવાની મંજૂરી છે."</string>
<string name="misc_templates_demos_title" msgid="6077169010255928114">"વિવિધ નમૂનાઓના ડેમો"</string>
<string name="showcase_demos_title" msgid="1542092687878113304">"ડેમો બતાવો"</string>
- <!-- no translation found for location_1_title (3939821089928425181) -->
- <skip />
+ <string name="location_1_title" msgid="3939821089928425181">"translatable=falseGoogle Kirkland"</string>
<string name="location_1_description" msgid="4801052291684791371">"રંગની છટા ગોઠવણીવાળા સંસાધન સંબંધિત વેક્ટર"</string>
<string name="location_2_description" msgid="3331356135359047166">"છબી સંસાધનની પ્રસ્તુતિ"</string>
<string name="location_3_description" msgid="3982142774088944850">"રંગીન ટેક્સ્ટ માટેનું માર્કર"</string>
diff --git a/car/app/app-samples/showcase/common/src/main/res/values-hi/strings.xml b/car/app/app-samples/showcase/common/src/main/res/values-hi/strings.xml
index 7da025a..738989f 100644
--- a/car/app/app-samples/showcase/common/src/main/res/values-hi/strings.xml
+++ b/car/app/app-samples/showcase/common/src/main/res/values-hi/strings.xml
@@ -36,7 +36,8 @@
<string name="on_action_title" msgid="4129601573763429611">"चालू है"</string>
<string name="off_action_title" msgid="8669201170189204848">"बंद है"</string>
<string name="settings_action_title" msgid="8616900063253887861">"सेटिंग"</string>
- <string name="accept_action_title" msgid="6172053420803596132">"सेटिंग"</string>
+ <!-- no translation found for accept_action_title (4899660585470647578) -->
+ <skip />
<string name="reject_action_title" msgid="6730366705938402668">"अस्वीकार करें"</string>
<string name="ok_action_title" msgid="7128494973966098611">"ठीक है"</string>
<string name="throw_action_title" msgid="7163710562670220163">"थ्रॉ"</string>
@@ -140,6 +141,14 @@
<string name="importance_title" msgid="9034862997821839831">"अहमियत"</string>
<string name="category_title" msgid="4783851267093259949">"कैटगरी"</string>
<string name="ongoing_title" msgid="4957996003270280496">"जारी है"</string>
+ <!-- no translation found for default_importance (6347996298832939989) -->
+ <skip />
+ <!-- no translation found for high_importance (5009120714837304882) -->
+ <skip />
+ <!-- no translation found for low_importance (4721161314404294033) -->
+ <skip />
+ <!-- no translation found for unknown_importance (909001735933359216) -->
+ <skip />
<string name="notification_demo" msgid="1819496937832036387">"सूचना का डेमो"</string>
<string name="misc_demo_title" msgid="7399959062407349380">"दूसरे डेमो"</string>
<string name="navigating_demo_title" msgid="7454579665387386476">"नेविगेट करने का डेमो"</string>
@@ -286,8 +295,7 @@
<string name="additional_data_text" msgid="2846223398214158872">"पिछले पेज पर जाकर बदलाव किए जा सकते हैं."</string>
<string name="misc_templates_demos_title" msgid="6077169010255928114">"दूसरे टेंप्लेट के डेमो"</string>
<string name="showcase_demos_title" msgid="1542092687878113304">"डेमो दिखाएं"</string>
- <!-- no translation found for location_1_title (3939821089928425181) -->
- <skip />
+ <string name="location_1_title" msgid="3939821089928425181">"translatable=falseGoogle Kirkland"</string>
<string name="location_1_description" msgid="4801052291684791371">"रंगीन रिसॉर्स वेक्टर"</string>
<string name="location_2_description" msgid="3331356135359047166">"इमेज रिसॉर्स का बिट मैप"</string>
<string name="location_3_description" msgid="3982142774088944850">"रंगीन टेक्स्ट मार्कर"</string>
diff --git a/car/app/app-samples/showcase/common/src/main/res/values-hr/strings.xml b/car/app/app-samples/showcase/common/src/main/res/values-hr/strings.xml
index 43e408b..25e1604 100644
--- a/car/app/app-samples/showcase/common/src/main/res/values-hr/strings.xml
+++ b/car/app/app-samples/showcase/common/src/main/res/values-hr/strings.xml
@@ -36,7 +36,8 @@
<string name="on_action_title" msgid="4129601573763429611">"Uključeno"</string>
<string name="off_action_title" msgid="8669201170189204848">"Isključeno"</string>
<string name="settings_action_title" msgid="8616900063253887861">"Postavke"</string>
- <string name="accept_action_title" msgid="6172053420803596132">"Postavke"</string>
+ <!-- no translation found for accept_action_title (4899660585470647578) -->
+ <skip />
<string name="reject_action_title" msgid="6730366705938402668">"Odbij"</string>
<string name="ok_action_title" msgid="7128494973966098611">"U redu"</string>
<string name="throw_action_title" msgid="7163710562670220163">"Izbaciti"</string>
@@ -140,6 +141,14 @@
<string name="importance_title" msgid="9034862997821839831">"Važnost"</string>
<string name="category_title" msgid="4783851267093259949">"Kategorija"</string>
<string name="ongoing_title" msgid="4957996003270280496">"U tijeku"</string>
+ <!-- no translation found for default_importance (6347996298832939989) -->
+ <skip />
+ <!-- no translation found for high_importance (5009120714837304882) -->
+ <skip />
+ <!-- no translation found for low_importance (4721161314404294033) -->
+ <skip />
+ <!-- no translation found for unknown_importance (909001735933359216) -->
+ <skip />
<string name="notification_demo" msgid="1819496937832036387">"Pokazna verzija obavijesti"</string>
<string name="misc_demo_title" msgid="7399959062407349380">"Razne pokazne verzije"</string>
<string name="navigating_demo_title" msgid="7454579665387386476">"Pokazna verzija navigacije"</string>
@@ -286,8 +295,7 @@
<string name="additional_data_text" msgid="2846223398214158872">"Ažuriranja dopuštena na prethodnim radnjama."</string>
<string name="misc_templates_demos_title" msgid="6077169010255928114">"Pokazne verzije raznih predložaka"</string>
<string name="showcase_demos_title" msgid="1542092687878113304">"Prikaži pokazne verzije"</string>
- <!-- no translation found for location_1_title (3939821089928425181) -->
- <skip />
+ <string name="location_1_title" msgid="3939821089928425181">"translatable=falseGoogle Kirkland"</string>
<string name="location_1_description" msgid="4801052291684791371">"Vektor nijansiranog izvora"</string>
<string name="location_2_description" msgid="3331356135359047166">"Bitmapa slikovnog resursa"</string>
<string name="location_3_description" msgid="3982142774088944850">"Označivač teksta u boji"</string>
diff --git a/car/app/app-samples/showcase/common/src/main/res/values-hu/strings.xml b/car/app/app-samples/showcase/common/src/main/res/values-hu/strings.xml
index f221fd8..3a4f320 100644
--- a/car/app/app-samples/showcase/common/src/main/res/values-hu/strings.xml
+++ b/car/app/app-samples/showcase/common/src/main/res/values-hu/strings.xml
@@ -36,7 +36,8 @@
<string name="on_action_title" msgid="4129601573763429611">"Be"</string>
<string name="off_action_title" msgid="8669201170189204848">"Ki"</string>
<string name="settings_action_title" msgid="8616900063253887861">"Beállítások"</string>
- <string name="accept_action_title" msgid="6172053420803596132">"Beállítások"</string>
+ <!-- no translation found for accept_action_title (4899660585470647578) -->
+ <skip />
<string name="reject_action_title" msgid="6730366705938402668">"Elutasítás"</string>
<string name="ok_action_title" msgid="7128494973966098611">"OK"</string>
<string name="throw_action_title" msgid="7163710562670220163">"Küld"</string>
@@ -110,8 +111,7 @@
<string name="content_limits_demo_title" msgid="3207211638386727610">"Tartalomkorlátok – demó"</string>
<string name="finish_app_msg" msgid="8354334557053141891">"Ez befejezi az alkalmazást, és amikor visszatér hozzá, előkészíti az engedélykérő képernyőt"</string>
<string name="finish_app_title" msgid="9013328479438745074">"Alkalmazás befejezése – demó"</string>
- <!-- no translation found for finish_app_demo_title (8223819062053448384) -->
- <skip />
+ <string name="finish_app_demo_title" msgid="8223819062053448384">"Engedély képernyő előkészítése a következő futtatásra – demó"</string>
<string name="loading_demo_title" msgid="1086529475809143517">"Betöltés – demó"</string>
<string name="loading_demo_row_title" msgid="8933049915126088142">"Betöltés kész!"</string>
<string name="pop_to_root" msgid="2078277386355064198">"Ugrás a gyökérhez"</string>
@@ -141,6 +141,14 @@
<string name="importance_title" msgid="9034862997821839831">"Fontosság"</string>
<string name="category_title" msgid="4783851267093259949">"Kategória"</string>
<string name="ongoing_title" msgid="4957996003270280496">"Folyamatban van"</string>
+ <!-- no translation found for default_importance (6347996298832939989) -->
+ <skip />
+ <!-- no translation found for high_importance (5009120714837304882) -->
+ <skip />
+ <!-- no translation found for low_importance (4721161314404294033) -->
+ <skip />
+ <!-- no translation found for unknown_importance (909001735933359216) -->
+ <skip />
<string name="notification_demo" msgid="1819496937832036387">"Értesítés – demó"</string>
<string name="misc_demo_title" msgid="7399959062407349380">"Egyéb – demók"</string>
<string name="navigating_demo_title" msgid="7454579665387386476">"Navigáció – demó"</string>
@@ -284,12 +292,10 @@
<string name="image_test_title" msgid="8273863429801477547">"Képteszt"</string>
<string name="image_test_text" msgid="6264812093895530445">"A képek módosítása engedélyezett"</string>
<string name="additional_data_title" msgid="3546689652240300617">"Kiegészítő adatok"</string>
- <!-- no translation found for additional_data_text (2846223398214158872) -->
- <skip />
+ <string name="additional_data_text" msgid="2846223398214158872">"Frissítések engedélyezve a visszalépési műveleteknél."</string>
<string name="misc_templates_demos_title" msgid="6077169010255928114">"Egyéb sablonok – demók"</string>
<string name="showcase_demos_title" msgid="1542092687878113304">"Kirakat – demók"</string>
- <!-- no translation found for location_1_title (3939821089928425181) -->
- <skip />
+ <string name="location_1_title" msgid="3939821089928425181">"translatable=falseGoogle Kirkland"</string>
<string name="location_1_description" msgid="4801052291684791371">"Árnyalt erőforrásvektor"</string>
<string name="location_2_description" msgid="3331356135359047166">"Képforrás bittérképe"</string>
<string name="location_3_description" msgid="3982142774088944850">"Színes szövegkijelölő"</string>
diff --git a/car/app/app-samples/showcase/common/src/main/res/values-hy/strings.xml b/car/app/app-samples/showcase/common/src/main/res/values-hy/strings.xml
index e7a5a27..952d477 100644
--- a/car/app/app-samples/showcase/common/src/main/res/values-hy/strings.xml
+++ b/car/app/app-samples/showcase/common/src/main/res/values-hy/strings.xml
@@ -36,7 +36,8 @@
<string name="on_action_title" msgid="4129601573763429611">"Միացված է"</string>
<string name="off_action_title" msgid="8669201170189204848">"Անջատված է"</string>
<string name="settings_action_title" msgid="8616900063253887861">"Կարգավորումներ"</string>
- <string name="accept_action_title" msgid="6172053420803596132">"Կարգավորումներ"</string>
+ <!-- no translation found for accept_action_title (4899660585470647578) -->
+ <skip />
<string name="reject_action_title" msgid="6730366705938402668">"Մերժել"</string>
<string name="ok_action_title" msgid="7128494973966098611">"Եղավ"</string>
<string name="throw_action_title" msgid="7163710562670220163">"Նետում"</string>
@@ -110,8 +111,7 @@
<string name="content_limits_demo_title" msgid="3207211638386727610">"Բովանդակության սահմանափակումների դեմո"</string>
<string name="finish_app_msg" msgid="8354334557053141891">"Հավելվածը կփակվի, և երբ այն նորից բացեք, թույլտվությունների էկրանը նախապես կբեռնվի"</string>
<string name="finish_app_title" msgid="9013328479438745074">"Հավելվածից դուրս գալու դեմո"</string>
- <!-- no translation found for finish_app_demo_title (8223819062053448384) -->
- <skip />
+ <string name="finish_app_demo_title" msgid="8223819062053448384">"Թույլտվությունների Էկրանի նախապես կարգավորված տեղադրման դեմո հաջորդ գործարկման ժամանակ"</string>
<string name="loading_demo_title" msgid="1086529475809143517">"Բեռնման դեմո"</string>
<string name="loading_demo_row_title" msgid="8933049915126088142">"Բեռնումն ավարտվեց"</string>
<string name="pop_to_root" msgid="2078277386355064198">"Անցնել կատալոգին"</string>
@@ -141,6 +141,14 @@
<string name="importance_title" msgid="9034862997821839831">"Կարևորություն"</string>
<string name="category_title" msgid="4783851267093259949">"Կատեգորիա"</string>
<string name="ongoing_title" msgid="4957996003270280496">"Ընթացիկ"</string>
+ <!-- no translation found for default_importance (6347996298832939989) -->
+ <skip />
+ <!-- no translation found for high_importance (5009120714837304882) -->
+ <skip />
+ <!-- no translation found for low_importance (4721161314404294033) -->
+ <skip />
+ <!-- no translation found for unknown_importance (909001735933359216) -->
+ <skip />
<string name="notification_demo" msgid="1819496937832036387">"Ծանուցման դեմո"</string>
<string name="misc_demo_title" msgid="7399959062407349380">"Այլ դեմոներ"</string>
<string name="navigating_demo_title" msgid="7454579665387386476">"Նավիգացիայի օգտագործման դեմո"</string>
@@ -284,12 +292,10 @@
<string name="image_test_title" msgid="8273863429801477547">"Պատկերների ստուգում"</string>
<string name="image_test_text" msgid="6264812093895530445">"Դուք կարող եք փոխել պատկերները"</string>
<string name="additional_data_title" msgid="3546689652240300617">"Լրացուցիչ տվյալներ"</string>
- <!-- no translation found for additional_data_text (2846223398214158872) -->
- <skip />
+ <string name="additional_data_text" msgid="2846223398214158872">"Թարմացումները թույլատրված են՝ ֆոնային ռեժիմում գործողություններ կատարելու համար։"</string>
<string name="misc_templates_demos_title" msgid="6077169010255928114">"Այլ ձևանմուշների դեմոներ"</string>
<string name="showcase_demos_title" msgid="1542092687878113304">"Ցուցադրել դեմոները"</string>
- <!-- no translation found for location_1_title (3939821089928425181) -->
- <skip />
+ <string name="location_1_title" msgid="3939821089928425181">"translatable=falseGoogle Kirkland"</string>
<string name="location_1_description" msgid="4801052291684791371">"Երանգավորված ռեսուրսների վեկտոր"</string>
<string name="location_2_description" msgid="3331356135359047166">"Պատկերի ռեսուրսի բիթային քարտեզ"</string>
<string name="location_3_description" msgid="3982142774088944850">"Գունավոր տեքստի նշիչ"</string>
diff --git a/car/app/app-samples/showcase/common/src/main/res/values-in/strings.xml b/car/app/app-samples/showcase/common/src/main/res/values-in/strings.xml
index e078370..d7087d0 100644
--- a/car/app/app-samples/showcase/common/src/main/res/values-in/strings.xml
+++ b/car/app/app-samples/showcase/common/src/main/res/values-in/strings.xml
@@ -36,7 +36,8 @@
<string name="on_action_title" msgid="4129601573763429611">"Aktif"</string>
<string name="off_action_title" msgid="8669201170189204848">"Nonaktif"</string>
<string name="settings_action_title" msgid="8616900063253887861">"Setelan"</string>
- <string name="accept_action_title" msgid="6172053420803596132">"Setelan"</string>
+ <!-- no translation found for accept_action_title (4899660585470647578) -->
+ <skip />
<string name="reject_action_title" msgid="6730366705938402668">"Tolak"</string>
<string name="ok_action_title" msgid="7128494973966098611">"Oke"</string>
<string name="throw_action_title" msgid="7163710562670220163">"Lempar"</string>
@@ -110,8 +111,7 @@
<string name="content_limits_demo_title" msgid="3207211638386727610">"Demo Batas Konten"</string>
<string name="finish_app_msg" msgid="8354334557053141891">"Tindakan ini akan menutup aplikasi, dan saat Anda memulai aplikasi lagi, layar izin akan disiapkan sebelumnya"</string>
<string name="finish_app_title" msgid="9013328479438745074">"Demo Menutup Aplikasi"</string>
- <!-- no translation found for finish_app_demo_title (8223819062053448384) -->
- <skip />
+ <string name="finish_app_demo_title" msgid="8223819062053448384">"Demo penyiapan sebelumnya Layar Izin pada peluncuran berikutnya"</string>
<string name="loading_demo_title" msgid="1086529475809143517">"Demo Pemuatan"</string>
<string name="loading_demo_row_title" msgid="8933049915126088142">"Pemuatan Selesai!"</string>
<string name="pop_to_root" msgid="2078277386355064198">"Buka root"</string>
@@ -141,6 +141,14 @@
<string name="importance_title" msgid="9034862997821839831">"Tingkat Kepentingan"</string>
<string name="category_title" msgid="4783851267093259949">"Kategori"</string>
<string name="ongoing_title" msgid="4957996003270280496">"Sedang berlangsung"</string>
+ <!-- no translation found for default_importance (6347996298832939989) -->
+ <skip />
+ <!-- no translation found for high_importance (5009120714837304882) -->
+ <skip />
+ <!-- no translation found for low_importance (4721161314404294033) -->
+ <skip />
+ <!-- no translation found for unknown_importance (909001735933359216) -->
+ <skip />
<string name="notification_demo" msgid="1819496937832036387">"Demo Notifikasi"</string>
<string name="misc_demo_title" msgid="7399959062407349380">"Demo Lain-Lain"</string>
<string name="navigating_demo_title" msgid="7454579665387386476">"Demo Menavigasi"</string>
@@ -284,12 +292,10 @@
<string name="image_test_title" msgid="8273863429801477547">"Pengujian gambar"</string>
<string name="image_test_text" msgid="6264812093895530445">"Perubahan gambar diizinkan"</string>
<string name="additional_data_title" msgid="3546689652240300617">"Data Tambahan"</string>
- <!-- no translation found for additional_data_text (2846223398214158872) -->
- <skip />
+ <string name="additional_data_text" msgid="2846223398214158872">"Update diizinkan di halaman sebelumnya."</string>
<string name="misc_templates_demos_title" msgid="6077169010255928114">"Demo Template Lain-Lain"</string>
<string name="showcase_demos_title" msgid="1542092687878113304">"Demo Berita Pilihan"</string>
- <!-- no translation found for location_1_title (3939821089928425181) -->
- <skip />
+ <string name="location_1_title" msgid="3939821089928425181">"translatable=falseGoogle Kirkland"</string>
<string name="location_1_description" msgid="4801052291684791371">"Vektor resource dengan tint"</string>
<string name="location_2_description" msgid="3331356135359047166">"Bitmap resource gambar"</string>
<string name="location_3_description" msgid="3982142774088944850">"Penanda teks berwarna"</string>
diff --git a/car/app/app-samples/showcase/common/src/main/res/values-is/strings.xml b/car/app/app-samples/showcase/common/src/main/res/values-is/strings.xml
index 154941fd..175bfc3 100644
--- a/car/app/app-samples/showcase/common/src/main/res/values-is/strings.xml
+++ b/car/app/app-samples/showcase/common/src/main/res/values-is/strings.xml
@@ -36,7 +36,8 @@
<string name="on_action_title" msgid="4129601573763429611">"Kveikt"</string>
<string name="off_action_title" msgid="8669201170189204848">"Slökkt"</string>
<string name="settings_action_title" msgid="8616900063253887861">"Stillingar"</string>
- <string name="accept_action_title" msgid="6172053420803596132">"Stillingar"</string>
+ <!-- no translation found for accept_action_title (4899660585470647578) -->
+ <skip />
<string name="reject_action_title" msgid="6730366705938402668">"Hafna"</string>
<string name="ok_action_title" msgid="7128494973966098611">"Í lagi"</string>
<string name="throw_action_title" msgid="7163710562670220163">"Kasta"</string>
@@ -110,8 +111,7 @@
<string name="content_limits_demo_title" msgid="3207211638386727610">"Sýnishorn efnistakmarkana"</string>
<string name="finish_app_msg" msgid="8354334557053141891">"Þetta lokar forritinu og þegar það er opnað aftur mun það forhlaða heimildaskjá"</string>
<string name="finish_app_title" msgid="9013328479438745074">"Loka sýnishorni forrits"</string>
- <!-- no translation found for finish_app_demo_title (8223819062053448384) -->
- <skip />
+ <string name="finish_app_demo_title" msgid="8223819062053448384">"Sýnishorn forhleðslu heimildaskjás við næstu keyrslu"</string>
<string name="loading_demo_title" msgid="1086529475809143517">"Hleður sýnishorni"</string>
<string name="loading_demo_row_title" msgid="8933049915126088142">"Hleðslu lokið!"</string>
<string name="pop_to_root" msgid="2078277386355064198">"Fara í rótarskjá"</string>
@@ -141,6 +141,14 @@
<string name="importance_title" msgid="9034862997821839831">"Mikilvægi"</string>
<string name="category_title" msgid="4783851267093259949">"Flokkur"</string>
<string name="ongoing_title" msgid="4957996003270280496">"Í gangi"</string>
+ <!-- no translation found for default_importance (6347996298832939989) -->
+ <skip />
+ <!-- no translation found for high_importance (5009120714837304882) -->
+ <skip />
+ <!-- no translation found for low_importance (4721161314404294033) -->
+ <skip />
+ <!-- no translation found for unknown_importance (909001735933359216) -->
+ <skip />
<string name="notification_demo" msgid="1819496937832036387">"Sýnishorn tilkynningar"</string>
<string name="misc_demo_title" msgid="7399959062407349380">"Ýmis sýnishorn"</string>
<string name="navigating_demo_title" msgid="7454579665387386476">"Sýnishorn leiðsagnar"</string>
@@ -284,12 +292,10 @@
<string name="image_test_title" msgid="8273863429801477547">"Myndaprófun"</string>
<string name="image_test_text" msgid="6264812093895530445">"Myndabreytingar eru leyfðar"</string>
<string name="additional_data_title" msgid="3546689652240300617">"Viðbótargögn"</string>
- <!-- no translation found for additional_data_text (2846223398214158872) -->
- <skip />
+ <string name="additional_data_text" msgid="2846223398214158872">"Uppfærslur leyfðar á fyrri aðgerðum."</string>
<string name="misc_templates_demos_title" msgid="6077169010255928114">"Sýnishorn ýmissa sniðmáta"</string>
<string name="showcase_demos_title" msgid="1542092687878113304">"Prufuútgáfur Showcase"</string>
- <!-- no translation found for location_1_title (3939821089928425181) -->
- <skip />
+ <string name="location_1_title" msgid="3939821089928425181">"translatable=falseGoogle Kirkland"</string>
<string name="location_1_description" msgid="4801052291684791371">"Litaður gagnavektor"</string>
<string name="location_2_description" msgid="3331356135359047166">"Punktamyndagögn myndar"</string>
<string name="location_3_description" msgid="3982142774088944850">"Litað textamerki"</string>
diff --git a/car/app/app-samples/showcase/common/src/main/res/values-it/strings.xml b/car/app/app-samples/showcase/common/src/main/res/values-it/strings.xml
index 802d075..25ff23d 100644
--- a/car/app/app-samples/showcase/common/src/main/res/values-it/strings.xml
+++ b/car/app/app-samples/showcase/common/src/main/res/values-it/strings.xml
@@ -36,7 +36,8 @@
<string name="on_action_title" msgid="4129601573763429611">"On"</string>
<string name="off_action_title" msgid="8669201170189204848">"Off"</string>
<string name="settings_action_title" msgid="8616900063253887861">"Impostazioni"</string>
- <string name="accept_action_title" msgid="6172053420803596132">"Impostazioni"</string>
+ <!-- no translation found for accept_action_title (4899660585470647578) -->
+ <skip />
<string name="reject_action_title" msgid="6730366705938402668">"Rifiuta"</string>
<string name="ok_action_title" msgid="7128494973966098611">"OK"</string>
<string name="throw_action_title" msgid="7163710562670220163">"Genera"</string>
@@ -110,8 +111,7 @@
<string name="content_limits_demo_title" msgid="3207211638386727610">"Demo Limiti per i contenuti"</string>
<string name="finish_app_msg" msgid="8354334557053141891">"L\'operazione comporta la chiusura dell\'app e al riavvio verrà pre-configurata una schermata di autorizzazione"</string>
<string name="finish_app_title" msgid="9013328479438745074">"Demo Completa app"</string>
- <!-- no translation found for finish_app_demo_title (8223819062053448384) -->
- <skip />
+ <string name="finish_app_demo_title" msgid="8223819062053448384">"Preconfigura la schermata di autorizzazione all\'esecuzione successiva della demo"</string>
<string name="loading_demo_title" msgid="1086529475809143517">"Caricamento demo in corso…"</string>
<string name="loading_demo_row_title" msgid="8933049915126088142">"Caricamento completato"</string>
<string name="pop_to_root" msgid="2078277386355064198">"Vai a principale"</string>
@@ -141,6 +141,14 @@
<string name="importance_title" msgid="9034862997821839831">"Importanza"</string>
<string name="category_title" msgid="4783851267093259949">"Categoria"</string>
<string name="ongoing_title" msgid="4957996003270280496">"In corso"</string>
+ <!-- no translation found for default_importance (6347996298832939989) -->
+ <skip />
+ <!-- no translation found for high_importance (5009120714837304882) -->
+ <skip />
+ <!-- no translation found for low_importance (4721161314404294033) -->
+ <skip />
+ <!-- no translation found for unknown_importance (909001735933359216) -->
+ <skip />
<string name="notification_demo" msgid="1819496937832036387">"Demo Notifica"</string>
<string name="misc_demo_title" msgid="7399959062407349380">"Demo varie"</string>
<string name="navigating_demo_title" msgid="7454579665387386476">"Demo Navigazione"</string>
@@ -284,12 +292,10 @@
<string name="image_test_title" msgid="8273863429801477547">"Test immagini"</string>
<string name="image_test_text" msgid="6264812093895530445">"Sono consentite modifiche alle immagini"</string>
<string name="additional_data_title" msgid="3546689652240300617">"Dati aggiuntivi"</string>
- <!-- no translation found for additional_data_text (2846223398214158872) -->
- <skip />
+ <string name="additional_data_text" msgid="2846223398214158872">"Aggiornamenti consentiti per le operazioni in background."</string>
<string name="misc_templates_demos_title" msgid="6077169010255928114">"Demo modelli vari"</string>
<string name="showcase_demos_title" msgid="1542092687878113304">"Demo Showcase"</string>
- <!-- no translation found for location_1_title (3939821089928425181) -->
- <skip />
+ <string name="location_1_title" msgid="3939821089928425181">"translatable=falseGoogle Kirkland"</string>
<string name="location_1_description" msgid="4801052291684791371">"Vettore risorsa colorata"</string>
<string name="location_2_description" msgid="3331356135359047166">"Bitmap risorsa immagine"</string>
<string name="location_3_description" msgid="3982142774088944850">"Indicatore testo colorato"</string>
diff --git a/car/app/app-samples/showcase/common/src/main/res/values-iw/strings.xml b/car/app/app-samples/showcase/common/src/main/res/values-iw/strings.xml
index d7ea1eb..12fb1bb 100644
--- a/car/app/app-samples/showcase/common/src/main/res/values-iw/strings.xml
+++ b/car/app/app-samples/showcase/common/src/main/res/values-iw/strings.xml
@@ -36,7 +36,8 @@
<string name="on_action_title" msgid="4129601573763429611">"מופעל"</string>
<string name="off_action_title" msgid="8669201170189204848">"כבוי"</string>
<string name="settings_action_title" msgid="8616900063253887861">"הגדרות"</string>
- <string name="accept_action_title" msgid="6172053420803596132">"הגדרות"</string>
+ <!-- no translation found for accept_action_title (4899660585470647578) -->
+ <skip />
<string name="reject_action_title" msgid="6730366705938402668">"דחייה"</string>
<string name="ok_action_title" msgid="7128494973966098611">"כן"</string>
<string name="throw_action_title" msgid="7163710562670220163">"להקפיץ הודעת שגיאה (throw)"</string>
@@ -140,6 +141,14 @@
<string name="importance_title" msgid="9034862997821839831">"חשיבות"</string>
<string name="category_title" msgid="4783851267093259949">"קטגוריה"</string>
<string name="ongoing_title" msgid="4957996003270280496">"מתמשך"</string>
+ <!-- no translation found for default_importance (6347996298832939989) -->
+ <skip />
+ <!-- no translation found for high_importance (5009120714837304882) -->
+ <skip />
+ <!-- no translation found for low_importance (4721161314404294033) -->
+ <skip />
+ <!-- no translation found for unknown_importance (909001735933359216) -->
+ <skip />
<string name="notification_demo" msgid="1819496937832036387">"הדגמת ההתראה"</string>
<string name="misc_demo_title" msgid="7399959062407349380">"הדגמות שונות"</string>
<string name="navigating_demo_title" msgid="7454579665387386476">"הדגמת ניווט"</string>
@@ -286,8 +295,7 @@
<string name="additional_data_text" msgid="2846223398214158872">"העדכונים מותרים כשחוזרים לדף הקודם."</string>
<string name="misc_templates_demos_title" msgid="6077169010255928114">"הדגמות של תבניות שונות"</string>
<string name="showcase_demos_title" msgid="1542092687878113304">"הדגמות תצוגה"</string>
- <!-- no translation found for location_1_title (3939821089928425181) -->
- <skip />
+ <string name="location_1_title" msgid="3939821089928425181">"translatable=falseGoogle Kirkland"</string>
<string name="location_1_description" msgid="4801052291684791371">"וקטור משאבים צבוע"</string>
<string name="location_2_description" msgid="3331356135359047166">"מקור של תמונת מפת סיביות"</string>
<string name="location_3_description" msgid="3982142774088944850">"סמן טקסט צבוע"</string>
diff --git a/car/app/app-samples/showcase/common/src/main/res/values-ja/strings.xml b/car/app/app-samples/showcase/common/src/main/res/values-ja/strings.xml
index 47fe7d7..465f4a6 100644
--- a/car/app/app-samples/showcase/common/src/main/res/values-ja/strings.xml
+++ b/car/app/app-samples/showcase/common/src/main/res/values-ja/strings.xml
@@ -36,7 +36,8 @@
<string name="on_action_title" msgid="4129601573763429611">"ON"</string>
<string name="off_action_title" msgid="8669201170189204848">"OFF"</string>
<string name="settings_action_title" msgid="8616900063253887861">"設定"</string>
- <string name="accept_action_title" msgid="6172053420803596132">"設定"</string>
+ <!-- no translation found for accept_action_title (4899660585470647578) -->
+ <skip />
<string name="reject_action_title" msgid="6730366705938402668">"拒否"</string>
<string name="ok_action_title" msgid="7128494973966098611">"OK"</string>
<string name="throw_action_title" msgid="7163710562670220163">"スローする"</string>
@@ -140,6 +141,14 @@
<string name="importance_title" msgid="9034862997821839831">"重要度"</string>
<string name="category_title" msgid="4783851267093259949">"カテゴリ"</string>
<string name="ongoing_title" msgid="4957996003270280496">"実行中"</string>
+ <!-- no translation found for default_importance (6347996298832939989) -->
+ <skip />
+ <!-- no translation found for high_importance (5009120714837304882) -->
+ <skip />
+ <!-- no translation found for low_importance (4721161314404294033) -->
+ <skip />
+ <!-- no translation found for unknown_importance (909001735933359216) -->
+ <skip />
<string name="notification_demo" msgid="1819496937832036387">"通知のデモ"</string>
<string name="misc_demo_title" msgid="7399959062407349380">"その他のデモ"</string>
<string name="navigating_demo_title" msgid="7454579665387386476">"ナビゲーションのデモ"</string>
@@ -286,8 +295,7 @@
<string name="additional_data_text" msgid="2846223398214158872">"アップデートにより「戻る」操作ができるようになりました。"</string>
<string name="misc_templates_demos_title" msgid="6077169010255928114">"その他のテンプレートのデモ"</string>
<string name="showcase_demos_title" msgid="1542092687878113304">"デモを表示"</string>
- <!-- no translation found for location_1_title (3939821089928425181) -->
- <skip />
+ <string name="location_1_title" msgid="3939821089928425181">"translatable=falseGoogle Kirkland"</string>
<string name="location_1_description" msgid="4801052291684791371">"色合い調整されたリソース ベクター"</string>
<string name="location_2_description" msgid="3331356135359047166">"画像リソースのビットマップ"</string>
<string name="location_3_description" msgid="3982142774088944850">"色付きのテキスト マーカー"</string>
diff --git a/car/app/app-samples/showcase/common/src/main/res/values-ka/strings.xml b/car/app/app-samples/showcase/common/src/main/res/values-ka/strings.xml
index db77661..5362c40 100644
--- a/car/app/app-samples/showcase/common/src/main/res/values-ka/strings.xml
+++ b/car/app/app-samples/showcase/common/src/main/res/values-ka/strings.xml
@@ -36,7 +36,8 @@
<string name="on_action_title" msgid="4129601573763429611">"ჩართვა"</string>
<string name="off_action_title" msgid="8669201170189204848">"გამორთვა"</string>
<string name="settings_action_title" msgid="8616900063253887861">"პარამეტრები"</string>
- <string name="accept_action_title" msgid="6172053420803596132">"პარამეტრები"</string>
+ <!-- no translation found for accept_action_title (4899660585470647578) -->
+ <skip />
<string name="reject_action_title" msgid="6730366705938402668">"უარყოფა"</string>
<string name="ok_action_title" msgid="7128494973966098611">"კარგი"</string>
<string name="throw_action_title" msgid="7163710562670220163">"გადაგდება"</string>
@@ -110,8 +111,7 @@
<string name="content_limits_demo_title" msgid="3207211638386727610">"კონტენტის ზღვრების დემო"</string>
<string name="finish_app_msg" msgid="8354334557053141891">"ამ მოქმედებით აპი გამოირთვება და აპში ხელახლა დაბრუნებისას ნებართვის ეკრანი გამოჩნდება"</string>
<string name="finish_app_title" msgid="9013328479438745074">"აპის დემოს დასრულება"</string>
- <!-- no translation found for finish_app_demo_title (8223819062053448384) -->
- <skip />
+ <string name="finish_app_demo_title" msgid="8223819062053448384">"აპის ხელახლა გაშვებისას ნებართვის მოთხოვნის ეკრანის დამატების დემო"</string>
<string name="loading_demo_title" msgid="1086529475809143517">"მიმდინარეობს დემოს ჩატვირთვა"</string>
<string name="loading_demo_row_title" msgid="8933049915126088142">"ჩატვირთვა დასრულდა!"</string>
<string name="pop_to_root" msgid="2078277386355064198">"ძირეულ საქაღალდეში გადასვლა"</string>
@@ -141,6 +141,10 @@
<string name="importance_title" msgid="9034862997821839831">"მნიშვნელობა"</string>
<string name="category_title" msgid="4783851267093259949">"კატეგორია"</string>
<string name="ongoing_title" msgid="4957996003270280496">"მიმდინარე"</string>
+ <string name="default_importance" msgid="6347996298832939989">"ნაგულისხმევი"</string>
+ <string name="high_importance" msgid="5009120714837304882">"მაღალი"</string>
+ <string name="low_importance" msgid="4721161314404294033">"დაბალი"</string>
+ <string name="unknown_importance" msgid="909001735933359216">"უცნობი"</string>
<string name="notification_demo" msgid="1819496937832036387">"შეტყობინებების დემო"</string>
<string name="misc_demo_title" msgid="7399959062407349380">"სხვადასხვა დემო"</string>
<string name="navigating_demo_title" msgid="7454579665387386476">"დემო: ნავიგაცია"</string>
@@ -284,12 +288,10 @@
<string name="image_test_title" msgid="8273863429801477547">"სურათის ტესტი"</string>
<string name="image_test_text" msgid="6264812093895530445">"ნებადართულია სურათების შეცვლა"</string>
<string name="additional_data_title" msgid="3546689652240300617">"დამატებითი მონაცემები"</string>
- <!-- no translation found for additional_data_text (2846223398214158872) -->
- <skip />
+ <string name="additional_data_text" msgid="2846223398214158872">"განახლებებმა დაუშვა უკან დაბრუნება."</string>
<string name="misc_templates_demos_title" msgid="6077169010255928114">"სხვადასხვა შაბლონური დემოები"</string>
<string name="showcase_demos_title" msgid="1542092687878113304">"დემოების ჩვენება"</string>
- <!-- no translation found for location_1_title (3939821089928425181) -->
- <skip />
+ <string name="location_1_title" msgid="3939821089928425181">"translatable=falseGoogle კირკლენდი"</string>
<string name="location_1_description" msgid="4801052291684791371">"შეღებილი ვექტორი"</string>
<string name="location_2_description" msgid="3331356135359047166">"სურათის რესურსი bitmap ფორმატში"</string>
<string name="location_3_description" msgid="3982142774088944850">"გაფერადებული ტექსტის მარკერი"</string>
diff --git a/car/app/app-samples/showcase/common/src/main/res/values-kk/strings.xml b/car/app/app-samples/showcase/common/src/main/res/values-kk/strings.xml
index f56ee5d..278acf6 100644
--- a/car/app/app-samples/showcase/common/src/main/res/values-kk/strings.xml
+++ b/car/app/app-samples/showcase/common/src/main/res/values-kk/strings.xml
@@ -36,7 +36,8 @@
<string name="on_action_title" msgid="4129601573763429611">"Қосу"</string>
<string name="off_action_title" msgid="8669201170189204848">"Өшіру"</string>
<string name="settings_action_title" msgid="8616900063253887861">"Параметрлер"</string>
- <string name="accept_action_title" msgid="6172053420803596132">"Параметрлер"</string>
+ <!-- no translation found for accept_action_title (4899660585470647578) -->
+ <skip />
<string name="reject_action_title" msgid="6730366705938402668">"Қабылдамау"</string>
<string name="ok_action_title" msgid="7128494973966098611">"Жарайды"</string>
<string name="throw_action_title" msgid="7163710562670220163">"Лақтыру"</string>
@@ -110,8 +111,7 @@
<string name="content_limits_demo_title" msgid="3207211638386727610">"Мазмұн шектеулерінің демо нұсқасы"</string>
<string name="finish_app_msg" msgid="8354334557053141891">"Қолданба жабылады, ал қайта ашқан кезде, рұқсат сұрау экранын қосады."</string>
<string name="finish_app_title" msgid="9013328479438745074">"Қолданбаның демо нұсқасын аяқтау"</string>
- <!-- no translation found for finish_app_demo_title (8223819062053448384) -->
- <skip />
+ <string name="finish_app_demo_title" msgid="8223819062053448384">"Келесі іске қосу кезінде рұқсат сұрау экранын қосу операциясының демо нұсқасы"</string>
<string name="loading_demo_title" msgid="1086529475809143517">"Жүктеу процесінің демо нұсқасы"</string>
<string name="loading_demo_row_title" msgid="8933049915126088142">"Жүктеу аяқталды!"</string>
<string name="pop_to_root" msgid="2078277386355064198">"Жолға өту"</string>
@@ -141,6 +141,14 @@
<string name="importance_title" msgid="9034862997821839831">"Маңыздылығы"</string>
<string name="category_title" msgid="4783851267093259949">"Санат"</string>
<string name="ongoing_title" msgid="4957996003270280496">"Ағымдағы"</string>
+ <!-- no translation found for default_importance (6347996298832939989) -->
+ <skip />
+ <!-- no translation found for high_importance (5009120714837304882) -->
+ <skip />
+ <!-- no translation found for low_importance (4721161314404294033) -->
+ <skip />
+ <!-- no translation found for unknown_importance (909001735933359216) -->
+ <skip />
<string name="notification_demo" msgid="1819496937832036387">"Хабарландырудың демо нұсқасы"</string>
<string name="misc_demo_title" msgid="7399959062407349380">"Басқаларының демо нұсқасы"</string>
<string name="navigating_demo_title" msgid="7454579665387386476">"Навигация бойынша өтудің демо нұсқасы"</string>
@@ -284,12 +292,10 @@
<string name="image_test_title" msgid="8273863429801477547">"Сынақ суреті"</string>
<string name="image_test_text" msgid="6264812093895530445">"Суретті өзгертуге рұқсат берілді."</string>
<string name="additional_data_title" msgid="3546689652240300617">"Қосымша дерек"</string>
- <!-- no translation found for additional_data_text (2846223398214158872) -->
- <skip />
+ <string name="additional_data_text" msgid="2846223398214158872">"\"Артқа\" операциясында өзгертуге рұқсат етілген"</string>
<string name="misc_templates_demos_title" msgid="6077169010255928114">"\"Басқалары\" үлгісінің демо нұсқасы"</string>
<string name="showcase_demos_title" msgid="1542092687878113304">"Презентацияның демо нұсқасы"</string>
- <!-- no translation found for location_1_title (3939821089928425181) -->
- <skip />
+ <string name="location_1_title" msgid="3939821089928425181">"translatable=falseGoogle Kirkland"</string>
<string name="location_1_description" msgid="4801052291684791371">"Түс реңкі өзгерген ресурс векторы"</string>
<string name="location_2_description" msgid="3331356135359047166">"Сурет ресурсының бит картасы"</string>
<string name="location_3_description" msgid="3982142774088944850">"Боялған мәтін маркері"</string>
diff --git a/car/app/app-samples/showcase/common/src/main/res/values-km/strings.xml b/car/app/app-samples/showcase/common/src/main/res/values-km/strings.xml
index b12ff45..fd4e290 100644
--- a/car/app/app-samples/showcase/common/src/main/res/values-km/strings.xml
+++ b/car/app/app-samples/showcase/common/src/main/res/values-km/strings.xml
@@ -36,7 +36,8 @@
<string name="on_action_title" msgid="4129601573763429611">"បើក"</string>
<string name="off_action_title" msgid="8669201170189204848">"បិទ"</string>
<string name="settings_action_title" msgid="8616900063253887861">"ការកំណត់"</string>
- <string name="accept_action_title" msgid="6172053420803596132">"ការកំណត់"</string>
+ <!-- no translation found for accept_action_title (4899660585470647578) -->
+ <skip />
<string name="reject_action_title" msgid="6730366705938402668">"បដិសេធ"</string>
<string name="ok_action_title" msgid="7128494973966098611">"យល់ព្រម"</string>
<string name="throw_action_title" msgid="7163710562670220163">"គប់"</string>
@@ -140,6 +141,14 @@
<string name="importance_title" msgid="9034862997821839831">"សារៈសំខាន់"</string>
<string name="category_title" msgid="4783851267093259949">"ប្រភេទ"</string>
<string name="ongoing_title" msgid="4957996003270280496">"កំពុងដំណើរការ"</string>
+ <!-- no translation found for default_importance (6347996298832939989) -->
+ <skip />
+ <!-- no translation found for high_importance (5009120714837304882) -->
+ <skip />
+ <!-- no translation found for low_importance (4721161314404294033) -->
+ <skip />
+ <!-- no translation found for unknown_importance (909001735933359216) -->
+ <skip />
<string name="notification_demo" msgid="1819496937832036387">"គំរូបង្ហាញនៃការជូនដំណឹង"</string>
<string name="misc_demo_title" msgid="7399959062407349380">"គំរូបង្ហាញផ្សេងៗ"</string>
<string name="navigating_demo_title" msgid="7454579665387386476">"គំរូបង្ហាញលក្ខណៈរុករក"</string>
@@ -286,8 +295,7 @@
<string name="additional_data_text" msgid="2846223398214158872">"បានអនុញ្ញាតការដំឡើងកំណែនៅលើប្រតិបត្តិការថយក្រោយ។"</string>
<string name="misc_templates_demos_title" msgid="6077169010255928114">"គំរូបង្ហាញនៃទម្រង់គំរូផ្សេងៗ"</string>
<string name="showcase_demos_title" msgid="1542092687878113304">"គំរូបង្ហាញអំពីការតាំងរំលេច"</string>
- <!-- no translation found for location_1_title (3939821089928425181) -->
- <skip />
+ <string name="location_1_title" msgid="3939821089928425181">"translatable=falseGoogle Kirkland"</string>
<string name="location_1_description" msgid="4801052291684791371">"វ៉ិចទ័រធនធានពណ៌ព្រឿងៗ"</string>
<string name="location_2_description" msgid="3331356135359047166">"ប៊ីតម៉ាបធនធានរូបភាព"</string>
<string name="location_3_description" msgid="3982142774088944850">"សញ្ញាសម្គាល់ជាអក្សរដែលមានពណ៌"</string>
diff --git a/car/app/app-samples/showcase/common/src/main/res/values-kn/strings.xml b/car/app/app-samples/showcase/common/src/main/res/values-kn/strings.xml
index 2dfe43e1..199972b 100644
--- a/car/app/app-samples/showcase/common/src/main/res/values-kn/strings.xml
+++ b/car/app/app-samples/showcase/common/src/main/res/values-kn/strings.xml
@@ -36,7 +36,8 @@
<string name="on_action_title" msgid="4129601573763429611">"ಆನ್ ಮಾಡಿ"</string>
<string name="off_action_title" msgid="8669201170189204848">"ಆಫ್ ಮಾಡಿ"</string>
<string name="settings_action_title" msgid="8616900063253887861">"ಸೆಟ್ಟಿಂಗ್ಗಳು"</string>
- <string name="accept_action_title" msgid="6172053420803596132">"ಸೆಟ್ಟಿಂಗ್ಗಳು"</string>
+ <!-- no translation found for accept_action_title (4899660585470647578) -->
+ <skip />
<string name="reject_action_title" msgid="6730366705938402668">"ತಿರಸ್ಕರಿಸಿ"</string>
<string name="ok_action_title" msgid="7128494973966098611">"ಸರಿ"</string>
<string name="throw_action_title" msgid="7163710562670220163">"ದೋಷವನ್ನು ತಿಳಿಸುವುದು"</string>
@@ -140,6 +141,14 @@
<string name="importance_title" msgid="9034862997821839831">"ಪ್ರಾಮುಖ್ಯತೆ"</string>
<string name="category_title" msgid="4783851267093259949">"ವರ್ಗ"</string>
<string name="ongoing_title" msgid="4957996003270280496">"ಚಾಲ್ತಿಯಲ್ಲಿದೆ"</string>
+ <!-- no translation found for default_importance (6347996298832939989) -->
+ <skip />
+ <!-- no translation found for high_importance (5009120714837304882) -->
+ <skip />
+ <!-- no translation found for low_importance (4721161314404294033) -->
+ <skip />
+ <!-- no translation found for unknown_importance (909001735933359216) -->
+ <skip />
<string name="notification_demo" msgid="1819496937832036387">"ಅಧಿಸೂಚನೆ ಡೆಮೋ"</string>
<string name="misc_demo_title" msgid="7399959062407349380">"ಇತರ ಡೆಮೋಗಳು"</string>
<string name="navigating_demo_title" msgid="7454579665387386476">"ನ್ಯಾವಿಗೇಶನ್ ಪ್ರಕ್ರಿಯೆಯ ಡೆಮೋ"</string>
@@ -286,8 +295,7 @@
<string name="additional_data_text" msgid="2846223398214158872">"ಹಿನ್ನೆಲೆ ಕಾರ್ಯಾಚರಣೆಗಳಿಗಾಗಿ ಅಪ್ಡೇಟ್ಗಳನ್ನು ಅನುಮತಿಸಲಾಗಿದೆ."</string>
<string name="misc_templates_demos_title" msgid="6077169010255928114">"ಇತರ ಟೆಂಪ್ಲೇಟ್ಗಳ ಡೆಮೋಗಳು"</string>
<string name="showcase_demos_title" msgid="1542092687878113304">"Showcase ಡೆಮೋಗಳು"</string>
- <!-- no translation found for location_1_title (3939821089928425181) -->
- <skip />
+ <string name="location_1_title" msgid="3939821089928425181">"translatable=falseGoogle Kirkland"</string>
<string name="location_1_description" msgid="4801052291684791371">"ಟಿಂಟ್ ಮಾಡಲಾದ ಸಂಪನ್ಮೂಲ ವೆಕ್ಟರ್"</string>
<string name="location_2_description" msgid="3331356135359047166">"ಚಿತ್ರ ಸಂಪನ್ಮೂಲ ಬಿಟ್ಮ್ಯಾಪ್"</string>
<string name="location_3_description" msgid="3982142774088944850">"ಬಣ್ಣದ ಪಠ್ಯ ಮಾರ್ಕರ್"</string>
diff --git a/car/app/app-samples/showcase/common/src/main/res/values-ko/strings.xml b/car/app/app-samples/showcase/common/src/main/res/values-ko/strings.xml
index 2ae5ca7..416eccd 100644
--- a/car/app/app-samples/showcase/common/src/main/res/values-ko/strings.xml
+++ b/car/app/app-samples/showcase/common/src/main/res/values-ko/strings.xml
@@ -36,7 +36,8 @@
<string name="on_action_title" msgid="4129601573763429611">"켜짐"</string>
<string name="off_action_title" msgid="8669201170189204848">"꺼짐"</string>
<string name="settings_action_title" msgid="8616900063253887861">"설정"</string>
- <string name="accept_action_title" msgid="6172053420803596132">"설정"</string>
+ <!-- no translation found for accept_action_title (4899660585470647578) -->
+ <skip />
<string name="reject_action_title" msgid="6730366705938402668">"거부"</string>
<string name="ok_action_title" msgid="7128494973966098611">"확인"</string>
<string name="throw_action_title" msgid="7163710562670220163">"발생"</string>
@@ -110,8 +111,7 @@
<string name="content_limits_demo_title" msgid="3207211638386727610">"콘텐츠 제한 데모"</string>
<string name="finish_app_msg" msgid="8354334557053141891">"이렇게 하면 앱이 종료되고 재실행 시 미리 시드된 권한 화면이 표시됩니다"</string>
<string name="finish_app_title" msgid="9013328479438745074">"앱 데모 종료"</string>
- <!-- no translation found for finish_app_demo_title (8223819062053448384) -->
- <skip />
+ <string name="finish_app_demo_title" msgid="8223819062053448384">"다음 주행 데모 시 권한 화면 미리 시드"</string>
<string name="loading_demo_title" msgid="1086529475809143517">"데모 로드 중"</string>
<string name="loading_demo_row_title" msgid="8933049915126088142">"로드 완료"</string>
<string name="pop_to_root" msgid="2078277386355064198">"루트로 건너뛰기"</string>
@@ -141,6 +141,14 @@
<string name="importance_title" msgid="9034862997821839831">"중요도"</string>
<string name="category_title" msgid="4783851267093259949">"카테고리"</string>
<string name="ongoing_title" msgid="4957996003270280496">"진행 중"</string>
+ <!-- no translation found for default_importance (6347996298832939989) -->
+ <skip />
+ <!-- no translation found for high_importance (5009120714837304882) -->
+ <skip />
+ <!-- no translation found for low_importance (4721161314404294033) -->
+ <skip />
+ <!-- no translation found for unknown_importance (909001735933359216) -->
+ <skip />
<string name="notification_demo" msgid="1819496937832036387">"알림 데모"</string>
<string name="misc_demo_title" msgid="7399959062407349380">"기타 데모"</string>
<string name="navigating_demo_title" msgid="7454579665387386476">"경로 안내 데모"</string>
@@ -284,12 +292,10 @@
<string name="image_test_title" msgid="8273863429801477547">"이미지 테스트"</string>
<string name="image_test_text" msgid="6264812093895530445">"이미지 변경이 허용됨"</string>
<string name="additional_data_title" msgid="3546689652240300617">"추가 데이터"</string>
- <!-- no translation found for additional_data_text (2846223398214158872) -->
- <skip />
+ <string name="additional_data_text" msgid="2846223398214158872">"뒤로 작업에서 업데이트가 허용되었습니다."</string>
<string name="misc_templates_demos_title" msgid="6077169010255928114">"기타 템플릿 데모"</string>
<string name="showcase_demos_title" msgid="1542092687878113304">"쇼케이스 데모"</string>
- <!-- no translation found for location_1_title (3939821089928425181) -->
- <skip />
+ <string name="location_1_title" msgid="3939821089928425181">"Google Kirkland"</string>
<string name="location_1_description" msgid="4801052291684791371">"색조가 들어간 리소스 벡터"</string>
<string name="location_2_description" msgid="3331356135359047166">"이미지 리소스 비트맵"</string>
<string name="location_3_description" msgid="3982142774088944850">"색상이 지정된 텍스트 마커"</string>
diff --git a/car/app/app-samples/showcase/common/src/main/res/values-ky/strings.xml b/car/app/app-samples/showcase/common/src/main/res/values-ky/strings.xml
index 197f883..0e55e15 100644
--- a/car/app/app-samples/showcase/common/src/main/res/values-ky/strings.xml
+++ b/car/app/app-samples/showcase/common/src/main/res/values-ky/strings.xml
@@ -36,7 +36,8 @@
<string name="on_action_title" msgid="4129601573763429611">"Күйүк"</string>
<string name="off_action_title" msgid="8669201170189204848">"Өчүк"</string>
<string name="settings_action_title" msgid="8616900063253887861">"Жөндөөлөр"</string>
- <string name="accept_action_title" msgid="6172053420803596132">"Жөндөөлөр"</string>
+ <!-- no translation found for accept_action_title (4899660585470647578) -->
+ <skip />
<string name="reject_action_title" msgid="6730366705938402668">"Четке кагуу"</string>
<string name="ok_action_title" msgid="7128494973966098611">"Макул"</string>
<string name="throw_action_title" msgid="7163710562670220163">"Ыргытуу"</string>
@@ -140,6 +141,14 @@
<string name="importance_title" msgid="9034862997821839831">"Маанилүүлүгү"</string>
<string name="category_title" msgid="4783851267093259949">"Категория"</string>
<string name="ongoing_title" msgid="4957996003270280496">"Учурдагы"</string>
+ <!-- no translation found for default_importance (6347996298832939989) -->
+ <skip />
+ <!-- no translation found for high_importance (5009120714837304882) -->
+ <skip />
+ <!-- no translation found for low_importance (4721161314404294033) -->
+ <skip />
+ <!-- no translation found for unknown_importance (909001735933359216) -->
+ <skip />
<string name="notification_demo" msgid="1819496937832036387">"Билдирме демосу"</string>
<string name="misc_demo_title" msgid="7399959062407349380">"Башка демолор"</string>
<string name="navigating_demo_title" msgid="7454579665387386476">"Багыт алуу демосу"</string>
@@ -286,8 +295,7 @@
<string name="additional_data_text" msgid="2846223398214158872">"Артка операцияларында жаңыртууларга уруксат берет."</string>
<string name="misc_templates_demos_title" msgid="6077169010255928114">"Башка үлгүлөрдүн демолору"</string>
<string name="showcase_demos_title" msgid="1542092687878113304">"Showcase демолору"</string>
- <!-- no translation found for location_1_title (3939821089928425181) -->
- <skip />
+ <string name="location_1_title" msgid="3939821089928425181">"translatable=falseGoogle Kirkland"</string>
<string name="location_1_description" msgid="4801052291684791371">"Түстүү ресурс вектору"</string>
<string name="location_2_description" msgid="3331356135359047166">"Сүрөт ресурсунун бит. картасы"</string>
<string name="location_3_description" msgid="3982142774088944850">"Түстүү текст маркери"</string>
diff --git a/car/app/app-samples/showcase/common/src/main/res/values-lo/strings.xml b/car/app/app-samples/showcase/common/src/main/res/values-lo/strings.xml
index 8541d55..233b449 100644
--- a/car/app/app-samples/showcase/common/src/main/res/values-lo/strings.xml
+++ b/car/app/app-samples/showcase/common/src/main/res/values-lo/strings.xml
@@ -36,7 +36,8 @@
<string name="on_action_title" msgid="4129601573763429611">"ເປີດ"</string>
<string name="off_action_title" msgid="8669201170189204848">"ປິດ"</string>
<string name="settings_action_title" msgid="8616900063253887861">"ການຕັ້ງຄ່າ"</string>
- <string name="accept_action_title" msgid="6172053420803596132">"ການຕັ້ງຄ່າ"</string>
+ <!-- no translation found for accept_action_title (4899660585470647578) -->
+ <skip />
<string name="reject_action_title" msgid="6730366705938402668">"ປະຕິເສດ"</string>
<string name="ok_action_title" msgid="7128494973966098611">"ຕົກລົງ"</string>
<string name="throw_action_title" msgid="7163710562670220163">"ໂຍນ"</string>
@@ -110,8 +111,7 @@
<string name="content_limits_demo_title" msgid="3207211638386727610">"ເດໂມຂີດຈຳກັດເນື້ອຫາ"</string>
<string name="finish_app_msg" msgid="8354334557053141891">"ການດຳເນີນການນີ້ຈະຢຸດແອັບ ແລະ ເພີ່ມໜ້າຈໍການອະນຸຍາດເມື່ອທ່ານກັບມາເອີ້ນໃຊ້ແອັບຄືນໃໝ່"</string>
<string name="finish_app_title" msgid="9013328479438745074">"ເດໂມການຢຸດແອັບ"</string>
- <!-- no translation found for finish_app_demo_title (8223819062053448384) -->
- <skip />
+ <string name="finish_app_demo_title" msgid="8223819062053448384">"ເດໂມການເພີ່ມໜ້າຈໍການອະນຸຍາດຢູ່ການເອີ້ນໃຊ້ແອັບເທື່ອຕໍ່ໄປ"</string>
<string name="loading_demo_title" msgid="1086529475809143517">"ກຳລັງໂຫຼດເດໂມ"</string>
<string name="loading_demo_row_title" msgid="8933049915126088142">"ການໂຫຼດສຳເລັດແລ້ວ!"</string>
<string name="pop_to_root" msgid="2078277386355064198">"ໂດດໄປຮາກ"</string>
@@ -141,6 +141,14 @@
<string name="importance_title" msgid="9034862997821839831">"ຄວາມສໍາຄັນ"</string>
<string name="category_title" msgid="4783851267093259949">"ໝວດໝູ່"</string>
<string name="ongoing_title" msgid="4957996003270280496">"ດຳເນີນຢູ່"</string>
+ <!-- no translation found for default_importance (6347996298832939989) -->
+ <skip />
+ <!-- no translation found for high_importance (5009120714837304882) -->
+ <skip />
+ <!-- no translation found for low_importance (4721161314404294033) -->
+ <skip />
+ <!-- no translation found for unknown_importance (909001735933359216) -->
+ <skip />
<string name="notification_demo" msgid="1819496937832036387">"ເດໂມການແຈ້ງເຕືອນ"</string>
<string name="misc_demo_title" msgid="7399959062407349380">"ເດໂມອື່ນໆ"</string>
<string name="navigating_demo_title" msgid="7454579665387386476">"ເດໂມການນຳທາງ"</string>
@@ -284,12 +292,10 @@
<string name="image_test_title" msgid="8273863429801477547">"ທົດສອບຮູບ"</string>
<string name="image_test_text" msgid="6264812093895530445">"ອະນຸຍາດການປ່ຽນແປງຮູບ"</string>
<string name="additional_data_title" msgid="3546689652240300617">"ຂໍ້ມູນເພີ່ມເຕີມ"</string>
- <!-- no translation found for additional_data_text (2846223398214158872) -->
- <skip />
+ <string name="additional_data_text" msgid="2846223398214158872">"ອະນຸຍາດໃຫ້ອັບເດດໃນການດຳເນີນການເບື້ອງຫຼັງ."</string>
<string name="misc_templates_demos_title" msgid="6077169010255928114">"ເດໂມແມ່ແບບອື່ນໆ"</string>
<string name="showcase_demos_title" msgid="1542092687878113304">"ເດໂມ Showcase"</string>
- <!-- no translation found for location_1_title (3939821089928425181) -->
- <skip />
+ <string name="location_1_title" msgid="3939821089928425181">"translatable=falseGoogle Kirkland"</string>
<string name="location_1_description" msgid="4801052291684791371">"ເວັກເຕີຊັບພະຍາກອນແບບສີອ່ອນ"</string>
<string name="location_2_description" msgid="3331356135359047166">"ບິດແມັບຊັບພະຍາກອນຮູບ"</string>
<string name="location_3_description" msgid="3982142774088944850">"ຕົວໝາຍຂໍ້ຄວາມທີ່ມີສີ"</string>
diff --git a/car/app/app-samples/showcase/common/src/main/res/values-lt/strings.xml b/car/app/app-samples/showcase/common/src/main/res/values-lt/strings.xml
index a3cba67..b151ca1 100644
--- a/car/app/app-samples/showcase/common/src/main/res/values-lt/strings.xml
+++ b/car/app/app-samples/showcase/common/src/main/res/values-lt/strings.xml
@@ -36,7 +36,8 @@
<string name="on_action_title" msgid="4129601573763429611">"Įjungta"</string>
<string name="off_action_title" msgid="8669201170189204848">"Išjungta"</string>
<string name="settings_action_title" msgid="8616900063253887861">"Nustatymai"</string>
- <string name="accept_action_title" msgid="6172053420803596132">"Nustatymai"</string>
+ <!-- no translation found for accept_action_title (4899660585470647578) -->
+ <skip />
<string name="reject_action_title" msgid="6730366705938402668">"Atmesti"</string>
<string name="ok_action_title" msgid="7128494973966098611">"Gerai"</string>
<string name="throw_action_title" msgid="7163710562670220163">"Sustabdyti apdorojimą"</string>
@@ -140,6 +141,14 @@
<string name="importance_title" msgid="9034862997821839831">"Svarba"</string>
<string name="category_title" msgid="4783851267093259949">"Kategorija"</string>
<string name="ongoing_title" msgid="4957996003270280496">"Vyksta"</string>
+ <!-- no translation found for default_importance (6347996298832939989) -->
+ <skip />
+ <!-- no translation found for high_importance (5009120714837304882) -->
+ <skip />
+ <!-- no translation found for low_importance (4721161314404294033) -->
+ <skip />
+ <!-- no translation found for unknown_importance (909001735933359216) -->
+ <skip />
<string name="notification_demo" msgid="1819496937832036387">"Pranešimo demonstracinė versija"</string>
<string name="misc_demo_title" msgid="7399959062407349380">"Įvairios demonstracinės versijos"</string>
<string name="navigating_demo_title" msgid="7454579665387386476">"Tyrinėjimo demonstracinė versija"</string>
@@ -286,8 +295,7 @@
<string name="additional_data_text" msgid="2846223398214158872">"Naujiniai leidžiami ankstesnėms operacijoms."</string>
<string name="misc_templates_demos_title" msgid="6077169010255928114">"Įvairių šablonų demonstracinės versijos"</string>
<string name="showcase_demos_title" msgid="1542092687878113304">"Rodyti demonstracines versijas"</string>
- <!-- no translation found for location_1_title (3939821089928425181) -->
- <skip />
+ <string name="location_1_title" msgid="3939821089928425181">"translatable=falseGoogle Kirkland"</string>
<string name="location_1_description" msgid="4801052291684791371">"Pakeisto atspalvio šaltinio vektorius"</string>
<string name="location_2_description" msgid="3331356135359047166">"Vaizdo šaltinio taškinė grafika"</string>
<string name="location_3_description" msgid="3982142774088944850">"Spalvoto teksto žymeklis"</string>
diff --git a/car/app/app-samples/showcase/common/src/main/res/values-lv/strings.xml b/car/app/app-samples/showcase/common/src/main/res/values-lv/strings.xml
index c28ce21..f08b8f3 100644
--- a/car/app/app-samples/showcase/common/src/main/res/values-lv/strings.xml
+++ b/car/app/app-samples/showcase/common/src/main/res/values-lv/strings.xml
@@ -36,7 +36,8 @@
<string name="on_action_title" msgid="4129601573763429611">"Ieslēgt"</string>
<string name="off_action_title" msgid="8669201170189204848">"Izslēgt"</string>
<string name="settings_action_title" msgid="8616900063253887861">"Iestatījumi"</string>
- <string name="accept_action_title" msgid="6172053420803596132">"Iestatījumi"</string>
+ <!-- no translation found for accept_action_title (4899660585470647578) -->
+ <skip />
<string name="reject_action_title" msgid="6730366705938402668">"Noraidīt"</string>
<string name="ok_action_title" msgid="7128494973966098611">"Labi"</string>
<string name="throw_action_title" msgid="7163710562670220163">"Izmest"</string>
@@ -110,8 +111,7 @@
<string name="content_limits_demo_title" msgid="3207211638386727610">"Satura ierobežojumu demonstrācija"</string>
<string name="finish_app_msg" msgid="8354334557053141891">"Lietotne tiks aizvērta. Kad restartēsiet lietotni, tajā tiks iepriekš iestatīts atļaujas ekrāns."</string>
<string name="finish_app_title" msgid="9013328479438745074">"Lietotnes darba pabeigšanas demonstrācija"</string>
- <!-- no translation found for finish_app_demo_title (8223819062053448384) -->
- <skip />
+ <string name="finish_app_demo_title" msgid="8223819062053448384">"Demonstrācija: nākamajā palaišanas reizē tiks pievienots ekrāns Atļaujas"</string>
<string name="loading_demo_title" msgid="1086529475809143517">"Ielādes demonstrācija"</string>
<string name="loading_demo_row_title" msgid="8933049915126088142">"Ielāde pabeigta!"</string>
<string name="pop_to_root" msgid="2078277386355064198">"Pāriet uz sakni"</string>
@@ -141,6 +141,14 @@
<string name="importance_title" msgid="9034862997821839831">"Svarīgums"</string>
<string name="category_title" msgid="4783851267093259949">"Kategorija"</string>
<string name="ongoing_title" msgid="4957996003270280496">"Notiek"</string>
+ <!-- no translation found for default_importance (6347996298832939989) -->
+ <skip />
+ <!-- no translation found for high_importance (5009120714837304882) -->
+ <skip />
+ <!-- no translation found for low_importance (4721161314404294033) -->
+ <skip />
+ <!-- no translation found for unknown_importance (909001735933359216) -->
+ <skip />
<string name="notification_demo" msgid="1819496937832036387">"Paziņojuma demonstrācija"</string>
<string name="misc_demo_title" msgid="7399959062407349380">"Dažādas demonstrācijas"</string>
<string name="navigating_demo_title" msgid="7454579665387386476">"Navigācijas demonstrācija"</string>
@@ -284,12 +292,10 @@
<string name="image_test_title" msgid="8273863429801477547">"Attēla tests"</string>
<string name="image_test_text" msgid="6264812093895530445">"Attēlu izmaiņas ir atļautas"</string>
<string name="additional_data_title" msgid="3546689652240300617">"Papildu dati"</string>
- <!-- no translation found for additional_data_text (2846223398214158872) -->
- <skip />
+ <string name="additional_data_text" msgid="2846223398214158872">"Pārejai atpakaļ ir atļauti atjauninājumi."</string>
<string name="misc_templates_demos_title" msgid="6077169010255928114">"Dažādu veidņu demonstrācijas"</string>
<string name="showcase_demos_title" msgid="1542092687878113304">"Showcase demonstrācijas"</string>
- <!-- no translation found for location_1_title (3939821089928425181) -->
- <skip />
+ <string name="location_1_title" msgid="3939821089928425181">"Google Kirkland"</string>
<string name="location_1_description" msgid="4801052291684791371">"Ietonēts resursu vektors"</string>
<string name="location_2_description" msgid="3331356135359047166">"Attēlu resursu bitkarte"</string>
<string name="location_3_description" msgid="3982142774088944850">"Teksta krāsas marķieris"</string>
diff --git a/car/app/app-samples/showcase/common/src/main/res/values-mk/strings.xml b/car/app/app-samples/showcase/common/src/main/res/values-mk/strings.xml
index fdcfd6b..5e5aad5 100644
--- a/car/app/app-samples/showcase/common/src/main/res/values-mk/strings.xml
+++ b/car/app/app-samples/showcase/common/src/main/res/values-mk/strings.xml
@@ -36,7 +36,8 @@
<string name="on_action_title" msgid="4129601573763429611">"Вклучено"</string>
<string name="off_action_title" msgid="8669201170189204848">"Исклучено"</string>
<string name="settings_action_title" msgid="8616900063253887861">"Поставки"</string>
- <string name="accept_action_title" msgid="6172053420803596132">"Поставки"</string>
+ <!-- no translation found for accept_action_title (4899660585470647578) -->
+ <skip />
<string name="reject_action_title" msgid="6730366705938402668">"Одбиј"</string>
<string name="ok_action_title" msgid="7128494973966098611">"Во ред"</string>
<string name="throw_action_title" msgid="7163710562670220163">"Постави"</string>
@@ -140,6 +141,14 @@
<string name="importance_title" msgid="9034862997821839831">"Важност"</string>
<string name="category_title" msgid="4783851267093259949">"Категорија"</string>
<string name="ongoing_title" msgid="4957996003270280496">"Во тек"</string>
+ <!-- no translation found for default_importance (6347996298832939989) -->
+ <skip />
+ <!-- no translation found for high_importance (5009120714837304882) -->
+ <skip />
+ <!-- no translation found for low_importance (4721161314404294033) -->
+ <skip />
+ <!-- no translation found for unknown_importance (909001735933359216) -->
+ <skip />
<string name="notification_demo" msgid="1819496937832036387">"Демо за известување"</string>
<string name="misc_demo_title" msgid="7399959062407349380">"Разни демоа"</string>
<string name="navigating_demo_title" msgid="7454579665387386476">"Демо за навигација"</string>
@@ -286,8 +295,7 @@
<string name="additional_data_text" msgid="2846223398214158872">"Ажурирањата се дозволени при операции на враќање назад."</string>
<string name="misc_templates_demos_title" msgid="6077169010255928114">"Разни демоа за шаблони"</string>
<string name="showcase_demos_title" msgid="1542092687878113304">"Демоа за прикажување"</string>
- <!-- no translation found for location_1_title (3939821089928425181) -->
- <skip />
+ <string name="location_1_title" msgid="3939821089928425181">"translatable=falseGoogle Kirkland"</string>
<string name="location_1_description" msgid="4801052291684791371">"Вектор за нијансиран ресурс"</string>
<string name="location_2_description" msgid="3331356135359047166">"Мапа со битови на ресурсот за сликата"</string>
<string name="location_3_description" msgid="3982142774088944850">"Означувач за текст во боја"</string>
diff --git a/car/app/app-samples/showcase/common/src/main/res/values-ml/strings.xml b/car/app/app-samples/showcase/common/src/main/res/values-ml/strings.xml
index 21627f1..68e9c19 100644
--- a/car/app/app-samples/showcase/common/src/main/res/values-ml/strings.xml
+++ b/car/app/app-samples/showcase/common/src/main/res/values-ml/strings.xml
@@ -36,7 +36,8 @@
<string name="on_action_title" msgid="4129601573763429611">"ഓണാണ്"</string>
<string name="off_action_title" msgid="8669201170189204848">"ഓഫാണ്"</string>
<string name="settings_action_title" msgid="8616900063253887861">"ക്രമീകരണം"</string>
- <string name="accept_action_title" msgid="6172053420803596132">"ക്രമീകരണം"</string>
+ <!-- no translation found for accept_action_title (4899660585470647578) -->
+ <skip />
<string name="reject_action_title" msgid="6730366705938402668">"നിരസിക്കുക"</string>
<string name="ok_action_title" msgid="7128494973966098611">"ശരി"</string>
<string name="throw_action_title" msgid="7163710562670220163">"കളയുക"</string>
@@ -140,6 +141,14 @@
<string name="importance_title" msgid="9034862997821839831">"പ്രാധാന്യം"</string>
<string name="category_title" msgid="4783851267093259949">"വിഭാഗം"</string>
<string name="ongoing_title" msgid="4957996003270280496">"നടന്നുകൊണ്ടിരിക്കുന്നവ"</string>
+ <!-- no translation found for default_importance (6347996298832939989) -->
+ <skip />
+ <!-- no translation found for high_importance (5009120714837304882) -->
+ <skip />
+ <!-- no translation found for low_importance (4721161314404294033) -->
+ <skip />
+ <!-- no translation found for unknown_importance (909001735933359216) -->
+ <skip />
<string name="notification_demo" msgid="1819496937832036387">"അറിയിപ്പ് ഡെമോ"</string>
<string name="misc_demo_title" msgid="7399959062407349380">"പലവക ഡെമോകൾ"</string>
<string name="navigating_demo_title" msgid="7454579665387386476">"നാവിഗേറ്റ് ചെയ്യൽ ഡെമോ"</string>
@@ -286,8 +295,7 @@
<string name="additional_data_text" msgid="2846223398214158872">"ബാക്ക് ഓപ്പറേഷനുകളിൽ അപ്ഡേറ്റുകൾ അനുവദിക്കുന്നു."</string>
<string name="misc_templates_demos_title" msgid="6077169010255928114">"പലവക ടെംപ്ലേറ്റ് ഡെമോകൾ"</string>
<string name="showcase_demos_title" msgid="1542092687878113304">"ഡെമോകൾ ഷോക്കേസ് ചെയ്യുക"</string>
- <!-- no translation found for location_1_title (3939821089928425181) -->
- <skip />
+ <string name="location_1_title" msgid="3939821089928425181">"translatable=falseGoogle Kirkland"</string>
<string name="location_1_description" msgid="4801052291684791371">"നിറമുള്ള റിസോഴ്സ് വെക്ടർ"</string>
<string name="location_2_description" msgid="3331356135359047166">"ഇമേജ് റിസോഴ്സ് ബിറ്റ്മാപ്പ്"</string>
<string name="location_3_description" msgid="3982142774088944850">"ടെക്സ്റ്റ് മാർക്കറിന് നിറം നൽകി"</string>
diff --git a/car/app/app-samples/showcase/common/src/main/res/values-mn/strings.xml b/car/app/app-samples/showcase/common/src/main/res/values-mn/strings.xml
index 76982ed..a0382c3 100644
--- a/car/app/app-samples/showcase/common/src/main/res/values-mn/strings.xml
+++ b/car/app/app-samples/showcase/common/src/main/res/values-mn/strings.xml
@@ -36,7 +36,8 @@
<string name="on_action_title" msgid="4129601573763429611">"Асаалттай"</string>
<string name="off_action_title" msgid="8669201170189204848">"Унтраалттай"</string>
<string name="settings_action_title" msgid="8616900063253887861">"Тохиргоо"</string>
- <string name="accept_action_title" msgid="6172053420803596132">"Тохиргоо"</string>
+ <!-- no translation found for accept_action_title (4899660585470647578) -->
+ <skip />
<string name="reject_action_title" msgid="6730366705938402668">"Татгалзах"</string>
<string name="ok_action_title" msgid="7128494973966098611">"OK"</string>
<string name="throw_action_title" msgid="7163710562670220163">"Шидэх"</string>
@@ -140,6 +141,14 @@
<string name="importance_title" msgid="9034862997821839831">"Ач холбогдол"</string>
<string name="category_title" msgid="4783851267093259949">"Ангилал"</string>
<string name="ongoing_title" msgid="4957996003270280496">"Үргэлжилж байгаа"</string>
+ <!-- no translation found for default_importance (6347996298832939989) -->
+ <skip />
+ <!-- no translation found for high_importance (5009120714837304882) -->
+ <skip />
+ <!-- no translation found for low_importance (4721161314404294033) -->
+ <skip />
+ <!-- no translation found for unknown_importance (909001735933359216) -->
+ <skip />
<string name="notification_demo" msgid="1819496937832036387">"Мэдэгдлийн демо"</string>
<string name="misc_demo_title" msgid="7399959062407349380">"Холимог демо"</string>
<string name="navigating_demo_title" msgid="7454579665387386476">"Навигацын демо"</string>
@@ -286,8 +295,7 @@
<string name="additional_data_text" msgid="2846223398214158872">"Шинэчлэлтүүдийг арын үйл ажиллагаанд хийхийг зөвшөөрдөг."</string>
<string name="misc_templates_demos_title" msgid="6077169010255928114">"Холимог загварын демо"</string>
<string name="showcase_demos_title" msgid="1542092687878113304">"Showcase-н демо"</string>
- <!-- no translation found for location_1_title (3939821089928425181) -->
- <skip />
+ <string name="location_1_title" msgid="3939821089928425181">"translatable=falseGoogle Kirkland"</string>
<string name="location_1_description" msgid="4801052291684791371">"Өнгө оруулсан нөөцийн вектор"</string>
<string name="location_2_description" msgid="3331356135359047166">"Зургийн нөөцийн растер"</string>
<string name="location_3_description" msgid="3982142774088944850">"Өнгөтэй текстийн тэмдэглэгээ"</string>
diff --git a/car/app/app-samples/showcase/common/src/main/res/values-mr/strings.xml b/car/app/app-samples/showcase/common/src/main/res/values-mr/strings.xml
index ad4a424..5fa689c 100644
--- a/car/app/app-samples/showcase/common/src/main/res/values-mr/strings.xml
+++ b/car/app/app-samples/showcase/common/src/main/res/values-mr/strings.xml
@@ -36,7 +36,8 @@
<string name="on_action_title" msgid="4129601573763429611">"सुरू आहे"</string>
<string name="off_action_title" msgid="8669201170189204848">"बंद आहे"</string>
<string name="settings_action_title" msgid="8616900063253887861">"सेटिंग्ज"</string>
- <string name="accept_action_title" msgid="6172053420803596132">"सेटिंग्ज"</string>
+ <!-- no translation found for accept_action_title (4899660585470647578) -->
+ <skip />
<string name="reject_action_title" msgid="6730366705938402668">"नकार द्या"</string>
<string name="ok_action_title" msgid="7128494973966098611">"ओके"</string>
<string name="throw_action_title" msgid="7163710562670220163">"थ्रो"</string>
@@ -140,6 +141,14 @@
<string name="importance_title" msgid="9034862997821839831">"महत्त्व"</string>
<string name="category_title" msgid="4783851267093259949">"वर्गवारी"</string>
<string name="ongoing_title" msgid="4957996003270280496">"सुरू असलेले"</string>
+ <!-- no translation found for default_importance (6347996298832939989) -->
+ <skip />
+ <!-- no translation found for high_importance (5009120714837304882) -->
+ <skip />
+ <!-- no translation found for low_importance (4721161314404294033) -->
+ <skip />
+ <!-- no translation found for unknown_importance (909001735933359216) -->
+ <skip />
<string name="notification_demo" msgid="1819496937832036387">"सूचनेचा डेमो"</string>
<string name="misc_demo_title" msgid="7399959062407349380">"इतर डेमो"</string>
<string name="navigating_demo_title" msgid="7454579665387386476">"नेव्हिगेट करण्याशी संबंधित डेमो"</string>
@@ -286,8 +295,7 @@
<string name="additional_data_text" msgid="2846223398214158872">"बॅक ऑपरेशनवर अपडेटना अनुमती दिली आहे."</string>
<string name="misc_templates_demos_title" msgid="6077169010255928114">"इतर टेंप्लेटचे डेमो"</string>
<string name="showcase_demos_title" msgid="1542092687878113304">"डेमो दाखवा"</string>
- <!-- no translation found for location_1_title (3939821089928425181) -->
- <skip />
+ <string name="location_1_title" msgid="3939821089928425181">"translatable=falseGoogle Kirkland"</string>
<string name="location_1_description" msgid="4801052291684791371">"छटा असलेले स्रोत व्हेक्टर"</string>
<string name="location_2_description" msgid="3331356135359047166">"इमेज स्रोताचा बिटमॅप"</string>
<string name="location_3_description" msgid="3982142774088944850">"मजकुराचा रंगीत मार्कर"</string>
diff --git a/car/app/app-samples/showcase/common/src/main/res/values-ms/strings.xml b/car/app/app-samples/showcase/common/src/main/res/values-ms/strings.xml
index 3635aab..d15f059 100644
--- a/car/app/app-samples/showcase/common/src/main/res/values-ms/strings.xml
+++ b/car/app/app-samples/showcase/common/src/main/res/values-ms/strings.xml
@@ -36,7 +36,8 @@
<string name="on_action_title" msgid="4129601573763429611">"Hidup"</string>
<string name="off_action_title" msgid="8669201170189204848">"Mati"</string>
<string name="settings_action_title" msgid="8616900063253887861">"Tetapan"</string>
- <string name="accept_action_title" msgid="6172053420803596132">"Tetapan"</string>
+ <!-- no translation found for accept_action_title (4899660585470647578) -->
+ <skip />
<string name="reject_action_title" msgid="6730366705938402668">"Tolak"</string>
<string name="ok_action_title" msgid="7128494973966098611">"OK"</string>
<string name="throw_action_title" msgid="7163710562670220163">"Baling"</string>
@@ -110,8 +111,7 @@
<string name="content_limits_demo_title" msgid="3207211638386727610">"Demo Had Kandungan"</string>
<string name="finish_app_msg" msgid="8354334557053141891">"Hal ini akan menyelesaikan apl dan apabila anda kembali, skrin kebenaran akan disemai terlebih dahulu"</string>
<string name="finish_app_title" msgid="9013328479438745074">"Selesaikan Demo Apl"</string>
- <!-- no translation found for finish_app_demo_title (8223819062053448384) -->
- <skip />
+ <string name="finish_app_demo_title" msgid="8223819062053448384">"Semai Kebenaran Skrin terlebih dahulu pada larian Demo seterusnya"</string>
<string name="loading_demo_title" msgid="1086529475809143517">"Memuatkan Demo"</string>
<string name="loading_demo_row_title" msgid="8933049915126088142">"Pemuatan Selesai!"</string>
<string name="pop_to_root" msgid="2078277386355064198">"Pergi ke akar"</string>
@@ -141,6 +141,14 @@
<string name="importance_title" msgid="9034862997821839831">"Kepentingan"</string>
<string name="category_title" msgid="4783851267093259949">"Kategori"</string>
<string name="ongoing_title" msgid="4957996003270280496">"Sedang berlangsung"</string>
+ <!-- no translation found for default_importance (6347996298832939989) -->
+ <skip />
+ <!-- no translation found for high_importance (5009120714837304882) -->
+ <skip />
+ <!-- no translation found for low_importance (4721161314404294033) -->
+ <skip />
+ <!-- no translation found for unknown_importance (909001735933359216) -->
+ <skip />
<string name="notification_demo" msgid="1819496937832036387">"Demo Pemberitahuan"</string>
<string name="misc_demo_title" msgid="7399959062407349380">"Pelbagai Demo"</string>
<string name="navigating_demo_title" msgid="7454579665387386476">"Demo Navigasi"</string>
@@ -284,12 +292,10 @@
<string name="image_test_title" msgid="8273863429801477547">"Ujian imej"</string>
<string name="image_test_text" msgid="6264812093895530445">"Perubahan imej dibenarkan"</string>
<string name="additional_data_title" msgid="3546689652240300617">"Data Tambahan"</string>
- <!-- no translation found for additional_data_text (2846223398214158872) -->
- <skip />
+ <string name="additional_data_text" msgid="2846223398214158872">"Kemaskinian dibenarkan pada operasi belakang."</string>
<string name="misc_templates_demos_title" msgid="6077169010255928114">"Pelbagai Demo Templat"</string>
<string name="showcase_demos_title" msgid="1542092687878113304">"Demo Wadah"</string>
- <!-- no translation found for location_1_title (3939821089928425181) -->
- <skip />
+ <string name="location_1_title" msgid="3939821089928425181">"translatable=falseGoogle Kirkland"</string>
<string name="location_1_description" msgid="4801052291684791371">"Vektor sumber diwarnai"</string>
<string name="location_2_description" msgid="3331356135359047166">"Peta bit sumber imej"</string>
<string name="location_3_description" msgid="3982142774088944850">"Penanda teks berwarna"</string>
diff --git a/car/app/app-samples/showcase/common/src/main/res/values-my/strings.xml b/car/app/app-samples/showcase/common/src/main/res/values-my/strings.xml
index a57b5fd..b3a5b57 100644
--- a/car/app/app-samples/showcase/common/src/main/res/values-my/strings.xml
+++ b/car/app/app-samples/showcase/common/src/main/res/values-my/strings.xml
@@ -36,7 +36,8 @@
<string name="on_action_title" msgid="4129601573763429611">"ဖွင့်"</string>
<string name="off_action_title" msgid="8669201170189204848">"ပိတ်"</string>
<string name="settings_action_title" msgid="8616900063253887861">"ဆက်တင်များ"</string>
- <string name="accept_action_title" msgid="6172053420803596132">"ဆက်တင်များ"</string>
+ <!-- no translation found for accept_action_title (4899660585470647578) -->
+ <skip />
<string name="reject_action_title" msgid="6730366705938402668">"ပယ်ရန်"</string>
<string name="ok_action_title" msgid="7128494973966098611">"OK"</string>
<string name="throw_action_title" msgid="7163710562670220163">"ပစ်ရန်"</string>
@@ -110,8 +111,7 @@
<string name="content_limits_demo_title" msgid="3207211638386727610">"အကြောင်းအရာ ကန့်သတ်ချက်များ သရုပ်ပြချက်"</string>
<string name="finish_app_msg" msgid="8354334557053141891">"အက်ပ်ကိုအပြီးသတ်လိုက်မည် ဖြစ်ပြီး ပြန်သွားသည့်အခါ ၎င်းက ခွင့်ပြုချက်စခရင်ကို ကြိုတင်ထည့်သွင်းမည်"</string>
<string name="finish_app_title" msgid="9013328479438745074">"အက်ပ်သရုပ်ပြချက် အပြီးသတ်ရန်"</string>
- <!-- no translation found for finish_app_demo_title (8223819062053448384) -->
- <skip />
+ <string name="finish_app_demo_title" msgid="8223819062053448384">"သရုပ်ပြချက်ကို နောက်တစ်ကြိမ်လုပ်ဆောင်သည့်အခါ ခွင့်ပြုချက်စခရင် ကြိုတင်ထည့်သွင်းရန်"</string>
<string name="loading_demo_title" msgid="1086529475809143517">"သရုပ်ပြချက် ဖွင့်နေသည်"</string>
<string name="loading_demo_row_title" msgid="8933049915126088142">"ဖွင့်ပြီးသွားပြီ။"</string>
<string name="pop_to_root" msgid="2078277386355064198">"ရင်းမြစ် သို့သွားရန်"</string>
@@ -141,6 +141,10 @@
<string name="importance_title" msgid="9034862997821839831">"အရေးပါမှု"</string>
<string name="category_title" msgid="4783851267093259949">"အမျိုးအစား"</string>
<string name="ongoing_title" msgid="4957996003270280496">"လက်ရှိသုံးနေသည်"</string>
+ <string name="default_importance" msgid="6347996298832939989">"မူရင်း"</string>
+ <string name="high_importance" msgid="5009120714837304882">"မြင့်"</string>
+ <string name="low_importance" msgid="4721161314404294033">"နိမ့်"</string>
+ <string name="unknown_importance" msgid="909001735933359216">"မသိ"</string>
<string name="notification_demo" msgid="1819496937832036387">"အကြောင်းကြားချက် သရုပ်ပြချက်"</string>
<string name="misc_demo_title" msgid="7399959062407349380">"အထွေထွေသရုပ်ပြချက်"</string>
<string name="navigating_demo_title" msgid="7454579665387386476">"လမ်းညွှန် သရုပ်ပြချက်"</string>
@@ -284,12 +288,10 @@
<string name="image_test_title" msgid="8273863429801477547">"ပုံစစ်ဆေးမှု"</string>
<string name="image_test_text" msgid="6264812093895530445">"ပုံအပြောင်းအလဲများ ခွင့်ပြုထားသည်"</string>
<string name="additional_data_title" msgid="3546689652240300617">"နောက်ထပ်ဒေတာများ"</string>
- <!-- no translation found for additional_data_text (2846223398214158872) -->
- <skip />
+ <string name="additional_data_text" msgid="2846223398214158872">"ပြန်ရွှေ့ခြင်းများတွင် အပ်ဒိတ်များကို ခွင့်ပြုသည်။"</string>
<string name="misc_templates_demos_title" msgid="6077169010255928114">"အထွေထွေ ပုံစံသရုပ်ပြချက်များ"</string>
<string name="showcase_demos_title" msgid="1542092687878113304">"Showcase သရုပ်ပြချက်များ"</string>
- <!-- no translation found for location_1_title (3939821089928425181) -->
- <skip />
+ <string name="location_1_title" msgid="3939821089928425181">"translatable=falseGoogle Kirkland"</string>
<string name="location_1_description" msgid="4801052291684791371">"အရောင်ထည့်ထားသော ရင်းမြစ်ဗက်တာ"</string>
<string name="location_2_description" msgid="3331356135359047166">"ပုံရင်းမြစ် bitmap"</string>
<string name="location_3_description" msgid="3982142774088944850">"အရောင်ထည့်ထားသော စာသားညွှန်မှတ်"</string>
diff --git a/car/app/app-samples/showcase/common/src/main/res/values-nb/strings.xml b/car/app/app-samples/showcase/common/src/main/res/values-nb/strings.xml
index cefed90..481c62a 100644
--- a/car/app/app-samples/showcase/common/src/main/res/values-nb/strings.xml
+++ b/car/app/app-samples/showcase/common/src/main/res/values-nb/strings.xml
@@ -36,7 +36,8 @@
<string name="on_action_title" msgid="4129601573763429611">"På"</string>
<string name="off_action_title" msgid="8669201170189204848">"Av"</string>
<string name="settings_action_title" msgid="8616900063253887861">"Innstillinger"</string>
- <string name="accept_action_title" msgid="6172053420803596132">"Innstillinger"</string>
+ <!-- no translation found for accept_action_title (4899660585470647578) -->
+ <skip />
<string name="reject_action_title" msgid="6730366705938402668">"Avvis"</string>
<string name="ok_action_title" msgid="7128494973966098611">"OK"</string>
<string name="throw_action_title" msgid="7163710562670220163">"Avbryt med en feil"</string>
@@ -110,8 +111,7 @@
<string name="content_limits_demo_title" msgid="3207211638386727610">"Demo av innholdsgrenser"</string>
<string name="finish_app_msg" msgid="8354334557053141891">"Dette lukker appen, og når du kommer tilbake til den, forhåndsseeder den en tillatelsesskjerm"</string>
<string name="finish_app_title" msgid="9013328479438745074">"Lukk appdemo"</string>
- <!-- no translation found for finish_app_demo_title (8223819062053448384) -->
- <skip />
+ <string name="finish_app_demo_title" msgid="8223819062053448384">"Demo av forhåndsseeding av tillatelsesskjermen ved neste kjøring"</string>
<string name="loading_demo_title" msgid="1086529475809143517">"Laster inn demoen"</string>
<string name="loading_demo_row_title" msgid="8933049915126088142">"Innlastingen er ferdig!"</string>
<string name="pop_to_root" msgid="2078277386355064198">"Gå til rotnivå"</string>
@@ -141,6 +141,14 @@
<string name="importance_title" msgid="9034862997821839831">"Viktighet"</string>
<string name="category_title" msgid="4783851267093259949">"Kategori"</string>
<string name="ongoing_title" msgid="4957996003270280496">"Kontinuerlig"</string>
+ <!-- no translation found for default_importance (6347996298832939989) -->
+ <skip />
+ <!-- no translation found for high_importance (5009120714837304882) -->
+ <skip />
+ <!-- no translation found for low_importance (4721161314404294033) -->
+ <skip />
+ <!-- no translation found for unknown_importance (909001735933359216) -->
+ <skip />
<string name="notification_demo" msgid="1819496937832036387">"Varseldemo"</string>
<string name="misc_demo_title" msgid="7399959062407349380">"Diverse demoer"</string>
<string name="navigating_demo_title" msgid="7454579665387386476">"Navigasjonsdemo"</string>
@@ -284,12 +292,10 @@
<string name="image_test_title" msgid="8273863429801477547">"Bildetest"</string>
<string name="image_test_text" msgid="6264812093895530445">"Bildeendringer tillates"</string>
<string name="additional_data_title" msgid="3546689652240300617">"Tilleggsdata"</string>
- <!-- no translation found for additional_data_text (2846223398214158872) -->
- <skip />
+ <string name="additional_data_text" msgid="2846223398214158872">"Oppdateringer tillates ved tilbakeoperasjoner."</string>
<string name="misc_templates_demos_title" msgid="6077169010255928114">"Demoer av diverse maler"</string>
<string name="showcase_demos_title" msgid="1542092687878113304">"Demoer i fokus"</string>
- <!-- no translation found for location_1_title (3939821089928425181) -->
- <skip />
+ <string name="location_1_title" msgid="3939821089928425181">"translatable=falseGoogle Kirkland"</string>
<string name="location_1_description" msgid="4801052291684791371">"Ressursvektor med justert fargetone"</string>
<string name="location_2_description" msgid="3331356135359047166">"Punktgrafikk av bilderessurs"</string>
<string name="location_3_description" msgid="3982142774088944850">"Farget tekstmarkør"</string>
diff --git a/car/app/app-samples/showcase/common/src/main/res/values-ne/strings.xml b/car/app/app-samples/showcase/common/src/main/res/values-ne/strings.xml
index 913bdb9..bdbccbf 100644
--- a/car/app/app-samples/showcase/common/src/main/res/values-ne/strings.xml
+++ b/car/app/app-samples/showcase/common/src/main/res/values-ne/strings.xml
@@ -36,7 +36,8 @@
<string name="on_action_title" msgid="4129601573763429611">"अन छ"</string>
<string name="off_action_title" msgid="8669201170189204848">"अफ छ"</string>
<string name="settings_action_title" msgid="8616900063253887861">"सेटिङ"</string>
- <string name="accept_action_title" msgid="6172053420803596132">"सेटिङ"</string>
+ <!-- no translation found for accept_action_title (4899660585470647578) -->
+ <skip />
<string name="reject_action_title" msgid="6730366705938402668">"अस्वीकार गर्नुहोस्"</string>
<string name="ok_action_title" msgid="7128494973966098611">"ठिक छ"</string>
<string name="throw_action_title" msgid="7163710562670220163">"थ्रो"</string>
@@ -140,6 +141,14 @@
<string name="importance_title" msgid="9034862997821839831">"महत्त्व"</string>
<string name="category_title" msgid="4783851267093259949">"कोटी"</string>
<string name="ongoing_title" msgid="4957996003270280496">"चलिरहेको छ"</string>
+ <!-- no translation found for default_importance (6347996298832939989) -->
+ <skip />
+ <!-- no translation found for high_importance (5009120714837304882) -->
+ <skip />
+ <!-- no translation found for low_importance (4721161314404294033) -->
+ <skip />
+ <!-- no translation found for unknown_importance (909001735933359216) -->
+ <skip />
<string name="notification_demo" msgid="1819496937832036387">"सूचनाको डेमो"</string>
<string name="misc_demo_title" msgid="7399959062407349380">"विविध डेमोहरू"</string>
<string name="navigating_demo_title" msgid="7454579665387386476">"डेमो नेभिगेट गरिँदै छ"</string>
@@ -286,8 +295,7 @@
<string name="additional_data_text" msgid="2846223398214158872">"अघिल्लो पेजमा गई परिवर्तन गर्न सकिन्छ।"</string>
<string name="misc_templates_demos_title" msgid="6077169010255928114">"टेम्प्लेटका विविध डेमोहरू"</string>
<string name="showcase_demos_title" msgid="1542092687878113304">"सोकेसहरूको डेमो"</string>
- <!-- no translation found for location_1_title (3939821089928425181) -->
- <skip />
+ <string name="location_1_title" msgid="3939821089928425181">"translatable=falseGoogle Kirkland"</string>
<string name="location_1_description" msgid="4801052291684791371">"रङ्गीन स्रोतको भेक्टर"</string>
<string name="location_2_description" msgid="3331356135359047166">"फोटो स्रोतको बिटम्याप"</string>
<string name="location_3_description" msgid="3982142774088944850">"रङ्गीन टेक्स्ट मार्कर"</string>
diff --git a/car/app/app-samples/showcase/common/src/main/res/values-nl/strings.xml b/car/app/app-samples/showcase/common/src/main/res/values-nl/strings.xml
index e1bfa9b..1bfd97a 100644
--- a/car/app/app-samples/showcase/common/src/main/res/values-nl/strings.xml
+++ b/car/app/app-samples/showcase/common/src/main/res/values-nl/strings.xml
@@ -36,7 +36,8 @@
<string name="on_action_title" msgid="4129601573763429611">"Aan"</string>
<string name="off_action_title" msgid="8669201170189204848">"Uit"</string>
<string name="settings_action_title" msgid="8616900063253887861">"Instellingen"</string>
- <string name="accept_action_title" msgid="6172053420803596132">"Instellingen"</string>
+ <!-- no translation found for accept_action_title (4899660585470647578) -->
+ <skip />
<string name="reject_action_title" msgid="6730366705938402668">"Weigeren"</string>
<string name="ok_action_title" msgid="7128494973966098611">"OK"</string>
<string name="throw_action_title" msgid="7163710562670220163">"Werpen"</string>
@@ -110,8 +111,7 @@
<string name="content_limits_demo_title" msgid="3207211638386727610">"Demo van Contentlimieten"</string>
<string name="finish_app_msg" msgid="8354334557053141891">"Hiermee wordt de app gesloten. Als je terugkeert, zie je een toestemmingsscherm."</string>
<string name="finish_app_title" msgid="9013328479438745074">"App-demo beëindigen"</string>
- <!-- no translation found for finish_app_demo_title (8223819062053448384) -->
- <skip />
+ <string name="finish_app_demo_title" msgid="8223819062053448384">"Toestemmingsscherm tonen bij volgende uitvoering van Demo"</string>
<string name="loading_demo_title" msgid="1086529475809143517">"Demo laden"</string>
<string name="loading_demo_row_title" msgid="8933049915126088142">"Laden afgerond"</string>
<string name="pop_to_root" msgid="2078277386355064198">"Spring naar root"</string>
@@ -141,6 +141,14 @@
<string name="importance_title" msgid="9034862997821839831">"Belang"</string>
<string name="category_title" msgid="4783851267093259949">"Categorie"</string>
<string name="ongoing_title" msgid="4957996003270280496">"Actief"</string>
+ <!-- no translation found for default_importance (6347996298832939989) -->
+ <skip />
+ <!-- no translation found for high_importance (5009120714837304882) -->
+ <skip />
+ <!-- no translation found for low_importance (4721161314404294033) -->
+ <skip />
+ <!-- no translation found for unknown_importance (909001735933359216) -->
+ <skip />
<string name="notification_demo" msgid="1819496937832036387">"Demo van melding"</string>
<string name="misc_demo_title" msgid="7399959062407349380">"Diverse demo\'s"</string>
<string name="navigating_demo_title" msgid="7454579665387386476">"Navigatiedemo"</string>
@@ -284,12 +292,10 @@
<string name="image_test_title" msgid="8273863429801477547">"Afbeeldingstest"</string>
<string name="image_test_text" msgid="6264812093895530445">"Wijzigingen in afbeeldingen zijn toegestaan"</string>
<string name="additional_data_title" msgid="3546689652240300617">"Aanvullende gegevens"</string>
- <!-- no translation found for additional_data_text (2846223398214158872) -->
- <skip />
+ <string name="additional_data_text" msgid="2846223398214158872">"Updates toegestaan bij teruggaan in de weergavestapel."</string>
<string name="misc_templates_demos_title" msgid="6077169010255928114">"Diverse templatedemo\'s"</string>
<string name="showcase_demos_title" msgid="1542092687878113304">"Demo\'s laten zien"</string>
- <!-- no translation found for location_1_title (3939821089928425181) -->
- <skip />
+ <string name="location_1_title" msgid="3939821089928425181">"translatable=falseGoogle Kirkland"</string>
<string name="location_1_description" msgid="4801052291684791371">"Getinte bronvector"</string>
<string name="location_2_description" msgid="3331356135359047166">"Bitmap afbeeldingsbron"</string>
<string name="location_3_description" msgid="3982142774088944850">"Gekleurde tekstmarkering"</string>
diff --git a/car/app/app-samples/showcase/common/src/main/res/values-or/strings.xml b/car/app/app-samples/showcase/common/src/main/res/values-or/strings.xml
index 78da8c6..1665c82 100644
--- a/car/app/app-samples/showcase/common/src/main/res/values-or/strings.xml
+++ b/car/app/app-samples/showcase/common/src/main/res/values-or/strings.xml
@@ -36,7 +36,8 @@
<string name="on_action_title" msgid="4129601573763429611">"ଚାଲୁ ଅଛି"</string>
<string name="off_action_title" msgid="8669201170189204848">"ବନ୍ଦ ଅଛି"</string>
<string name="settings_action_title" msgid="8616900063253887861">"ସେଟିଂସ"</string>
- <string name="accept_action_title" msgid="6172053420803596132">"ସେଟିଂସ"</string>
+ <!-- no translation found for accept_action_title (4899660585470647578) -->
+ <skip />
<string name="reject_action_title" msgid="6730366705938402668">"ଅଗ୍ରାହ୍ୟ କରନ୍ତୁ"</string>
<string name="ok_action_title" msgid="7128494973966098611">"ଠିକ୍ ଅଛି"</string>
<string name="throw_action_title" msgid="7163710562670220163">"ଥ୍ରୋ କରନ୍ତୁ"</string>
@@ -110,8 +111,7 @@
<string name="content_limits_demo_title" msgid="3207211638386727610">"ବିଷୟବସ୍ତୁର ସୀମାର ଡେମୋ"</string>
<string name="finish_app_msg" msgid="8354334557053141891">"ଏହା ଆପକୁ ସମ୍ପୂର୍ଣ୍ଣ କରିବ ଏବଂ ଆପଣ ଫେରିଆସିଲେ ଏହା ଏକ ଅନୁମତିର ସ୍କ୍ରିନକୁ ପ୍ରି-ସିଡ କରିବ"</string>
<string name="finish_app_title" msgid="9013328479438745074">"ଆପର ଡେମୋ ସମ୍ପୂର୍ଣ୍ଣ କରନ୍ତୁ"</string>
- <!-- no translation found for finish_app_demo_title (8223819062053448384) -->
- <skip />
+ <string name="finish_app_demo_title" msgid="8223819062053448384">"ପରବର୍ତ୍ତୀ ଥର ଡେମୋ ଚଲାଇବା ସମୟରେ ଅନୁମତି ସ୍କ୍ରିନକୁ ପ୍ରି-ସିଡ କରନ୍ତୁ"</string>
<string name="loading_demo_title" msgid="1086529475809143517">"ଡେମୋ ଲୋଡ କରାଯାଉଛି"</string>
<string name="loading_demo_row_title" msgid="8933049915126088142">"ଲୋଡ ହେବା ସମ୍ପୂର୍ଣ୍ଣ ହୋଇଛି!"</string>
<string name="pop_to_root" msgid="2078277386355064198">"ରୁଟରେ ପପ କରନ୍ତୁ"</string>
@@ -141,6 +141,14 @@
<string name="importance_title" msgid="9034862997821839831">"ମହତ୍ତ୍ୱ"</string>
<string name="category_title" msgid="4783851267093259949">"ବର୍ଗ"</string>
<string name="ongoing_title" msgid="4957996003270280496">"ଚାଲୁଥିବା"</string>
+ <!-- no translation found for default_importance (6347996298832939989) -->
+ <skip />
+ <!-- no translation found for high_importance (5009120714837304882) -->
+ <skip />
+ <!-- no translation found for low_importance (4721161314404294033) -->
+ <skip />
+ <!-- no translation found for unknown_importance (909001735933359216) -->
+ <skip />
<string name="notification_demo" msgid="1819496937832036387">"ବିଜ୍ଞପ୍ତିର ଡେମୋ"</string>
<string name="misc_demo_title" msgid="7399959062407349380">"ବିବିଧ ଡେମୋ"</string>
<string name="navigating_demo_title" msgid="7454579665387386476">"ନାଭିଗେଟ କରିବାର ଡେମୋ"</string>
@@ -284,12 +292,10 @@
<string name="image_test_title" msgid="8273863429801477547">"ଇମେଜର ପରୀକ୍ଷା"</string>
<string name="image_test_text" msgid="6264812093895530445">"ଇମେଜ ପରିବର୍ତ୍ତନ କରିବାର ଅନୁମତି ଅଛି"</string>
<string name="additional_data_title" msgid="3546689652240300617">"ଅତିରିକ୍ତ ଡାଟା"</string>
- <!-- no translation found for additional_data_text (2846223398214158872) -->
- <skip />
+ <string name="additional_data_text" msgid="2846223398214158872">"ପୃଷ୍ଠପଟର ଅପରେସନଗୁଡ଼ିକରେ ଅପଡେଟଗୁଡ଼ିକୁ ଅନୁମତି ଦିଆଯାଇଛି।"</string>
<string name="misc_templates_demos_title" msgid="6077169010255928114">"ବିବିଧ ଟେମ୍ପଲେଟର ଡେମୋ"</string>
<string name="showcase_demos_title" msgid="1542092687878113304">"Showcase ଡେମୋ"</string>
- <!-- no translation found for location_1_title (3939821089928425181) -->
- <skip />
+ <string name="location_1_title" msgid="3939821089928425181">"translatable=falseGoogle Kirkland"</string>
<string name="location_1_description" msgid="4801052291684791371">"ଟିଣ୍ଟ କରାଯାଇଥିବା ରିସୋର୍ସ ଭେକ୍ଟର"</string>
<string name="location_2_description" msgid="3331356135359047166">"ଇମେଜ ରିସୋର୍ସର ବିଟମ୍ୟାପ"</string>
<string name="location_3_description" msgid="3982142774088944850">"ରଙ୍ଗୀନ ଟେକ୍ସଟ ମାର୍କର"</string>
diff --git a/car/app/app-samples/showcase/common/src/main/res/values-pa/strings.xml b/car/app/app-samples/showcase/common/src/main/res/values-pa/strings.xml
index ed8cab5..51b80c1 100644
--- a/car/app/app-samples/showcase/common/src/main/res/values-pa/strings.xml
+++ b/car/app/app-samples/showcase/common/src/main/res/values-pa/strings.xml
@@ -36,7 +36,8 @@
<string name="on_action_title" msgid="4129601573763429611">"ਚਾਲੂ"</string>
<string name="off_action_title" msgid="8669201170189204848">"ਬੰਦ"</string>
<string name="settings_action_title" msgid="8616900063253887861">"ਸੈਟਿੰਗਾਂ"</string>
- <string name="accept_action_title" msgid="6172053420803596132">"ਸੈਟਿੰਗਾਂ"</string>
+ <!-- no translation found for accept_action_title (4899660585470647578) -->
+ <skip />
<string name="reject_action_title" msgid="6730366705938402668">"ਅਸਵੀਕਾਰ ਕਰੋ"</string>
<string name="ok_action_title" msgid="7128494973966098611">"ਠੀਕ ਹੈ"</string>
<string name="throw_action_title" msgid="7163710562670220163">"ਲਾਗੂ ਕਰੋ"</string>
@@ -110,8 +111,7 @@
<string name="content_limits_demo_title" msgid="3207211638386727610">"ਸਮੱਗਰੀ ਦੀਆਂ ਸੀਮਾਵਾਂ ਦਾ ਡੈਮੋ"</string>
<string name="finish_app_msg" msgid="8354334557053141891">"ਇਹ ਐਪ ਨੂੰ ਪੂਰਾ ਕਰੇਗਾ ਅਤੇ ਤੁਹਾਡੇ ਵਾਪਸ ਆਉਣ \'ਤੇ ਇਹ ਇਜਾਜ਼ਤ ਸਕ੍ਰੀਨ ਨੂੰ ਪ੍ਰੀ-ਸੀਡ ਕਰੇਗਾ"</string>
<string name="finish_app_title" msgid="9013328479438745074">"ਐਪ ਨੂੰ ਪੂਰਾ ਕਰਨ ਦਾ ਡੈਮੋ"</string>
- <!-- no translation found for finish_app_demo_title (8223819062053448384) -->
- <skip />
+ <string name="finish_app_demo_title" msgid="8223819062053448384">"ਅਗਲੀ ਵਾਰ ਡੈਮੋ ਚਲਾਉਣ \'ਤੇ ਇਜਾਜ਼ਤ ਸਕ੍ਰੀਨ ਨੂੰ ਪ੍ਰੀ-ਸੀਡ ਕਰੋ"</string>
<string name="loading_demo_title" msgid="1086529475809143517">"ਲੋਡ ਕਰਨ ਦੀ ਪ੍ਰਕਿਰਿਆ ਦਾ ਡੈਮੋ"</string>
<string name="loading_demo_row_title" msgid="8933049915126088142">"ਲੋਡ ਕਰਨ ਦੀ ਪ੍ਰਕਿਰਿਆ ਪੂਰੀ ਹੋਈ!"</string>
<string name="pop_to_root" msgid="2078277386355064198">"ਰੂਟ \'ਤੇ ਪੌਪ ਕਰੋ"</string>
@@ -141,6 +141,14 @@
<string name="importance_title" msgid="9034862997821839831">"ਮਹੱਤਤਾ"</string>
<string name="category_title" msgid="4783851267093259949">"ਸ਼੍ਰੇਣੀ"</string>
<string name="ongoing_title" msgid="4957996003270280496">"ਜਾਰੀ"</string>
+ <!-- no translation found for default_importance (6347996298832939989) -->
+ <skip />
+ <!-- no translation found for high_importance (5009120714837304882) -->
+ <skip />
+ <!-- no translation found for low_importance (4721161314404294033) -->
+ <skip />
+ <!-- no translation found for unknown_importance (909001735933359216) -->
+ <skip />
<string name="notification_demo" msgid="1819496937832036387">"ਸੂਚਨਾ ਦਾ ਡੈਮੋ"</string>
<string name="misc_demo_title" msgid="7399959062407349380">"ਫੁਟਕਲ ਦੇ ਡੈਮੋ"</string>
<string name="navigating_demo_title" msgid="7454579665387386476">"ਨੈਵੀਗੇਟ ਕਰਨ ਦੀ ਪ੍ਰਕਿਰਿਆ ਦਾ ਡੈਮੋ"</string>
@@ -284,12 +292,10 @@
<string name="image_test_title" msgid="8273863429801477547">"ਚਿੱਤਰ ਦੀ ਜਾਂਚ"</string>
<string name="image_test_text" msgid="6264812093895530445">"ਚਿੱਤਰ ਵਿੱਚ ਤਬਦੀਲੀਆਂ ਕਰਨ ਦੀ ਆਗਿਆ ਹੈ"</string>
<string name="additional_data_title" msgid="3546689652240300617">"ਵਧੀਕ ਡਾਟਾ"</string>
- <!-- no translation found for additional_data_text (2846223398214158872) -->
- <skip />
+ <string name="additional_data_text" msgid="2846223398214158872">"ਪਿਛਲੇ ਪੰਨੇ \'ਤੇ ਅੱਪਡੇਟ ਕਰਨ ਦੀ ਆਗਿਆ ਹੈ।"</string>
<string name="misc_templates_demos_title" msgid="6077169010255928114">"ਫੁਟਕਲ ਟੈਮਪਲੇਟਾਂ ਦੇ ਡੈਮੋ"</string>
<string name="showcase_demos_title" msgid="1542092687878113304">"ਸ਼ੋਅਕੇਸ ਦੇ ਡੈਮੋ"</string>
- <!-- no translation found for location_1_title (3939821089928425181) -->
- <skip />
+ <string name="location_1_title" msgid="3939821089928425181">"translatable=falseGoogle Kirkland"</string>
<string name="location_1_description" msgid="4801052291684791371">"ਰੰਗਿਆ ਹੋਇਆ ਸਰੋਤ ਵੈਕਟਰ"</string>
<string name="location_2_description" msgid="3331356135359047166">"ਚਿੱਤਰ ਸਰੋਤ ਬਿਟ ਮੈਪ"</string>
<string name="location_3_description" msgid="3982142774088944850">"ਰੰਗੀਨ ਲਿਖਤ ਮਾਰਕਰ"</string>
diff --git a/car/app/app-samples/showcase/common/src/main/res/values-pl/strings.xml b/car/app/app-samples/showcase/common/src/main/res/values-pl/strings.xml
index be0bd73..8cc0f0c 100644
--- a/car/app/app-samples/showcase/common/src/main/res/values-pl/strings.xml
+++ b/car/app/app-samples/showcase/common/src/main/res/values-pl/strings.xml
@@ -36,7 +36,8 @@
<string name="on_action_title" msgid="4129601573763429611">"Włączono"</string>
<string name="off_action_title" msgid="8669201170189204848">"Wyłączono"</string>
<string name="settings_action_title" msgid="8616900063253887861">"Ustawienia"</string>
- <string name="accept_action_title" msgid="6172053420803596132">"Ustawienia"</string>
+ <!-- no translation found for accept_action_title (4899660585470647578) -->
+ <skip />
<string name="reject_action_title" msgid="6730366705938402668">"Odrzuć"</string>
<string name="ok_action_title" msgid="7128494973966098611">"OK"</string>
<string name="throw_action_title" msgid="7163710562670220163">"Zgłoś"</string>
@@ -110,8 +111,7 @@
<string name="content_limits_demo_title" msgid="3207211638386727610">"Wersja demonstracyjna limitów dotyczących treści"</string>
<string name="finish_app_msg" msgid="8354334557053141891">"Spowoduje to zamknięcie aplikacji, a przy następnym uruchomieniu ekran zostanie wstępnie zainicjowany"</string>
<string name="finish_app_title" msgid="9013328479438745074">"Wersja demonstracyjna zamykania aplikacji"</string>
- <!-- no translation found for finish_app_demo_title (8223819062053448384) -->
- <skip />
+ <string name="finish_app_demo_title" msgid="8223819062053448384">"Wypełnij wstępnie ekran uprawnień przy następnym uruchomieniu wersji demonstracyjnej"</string>
<string name="loading_demo_title" msgid="1086529475809143517">"Wersja demonstracyjna wczytywania"</string>
<string name="loading_demo_row_title" msgid="8933049915126088142">"Wczytywanie ukończone"</string>
<string name="pop_to_root" msgid="2078277386355064198">"Przejdź na poziom główny"</string>
@@ -141,6 +141,14 @@
<string name="importance_title" msgid="9034862997821839831">"Ważność"</string>
<string name="category_title" msgid="4783851267093259949">"Kategoria"</string>
<string name="ongoing_title" msgid="4957996003270280496">"W toku"</string>
+ <!-- no translation found for default_importance (6347996298832939989) -->
+ <skip />
+ <!-- no translation found for high_importance (5009120714837304882) -->
+ <skip />
+ <!-- no translation found for low_importance (4721161314404294033) -->
+ <skip />
+ <!-- no translation found for unknown_importance (909001735933359216) -->
+ <skip />
<string name="notification_demo" msgid="1819496937832036387">"Wersja demonstracyjna powiadomienia"</string>
<string name="misc_demo_title" msgid="7399959062407349380">"Różne wersje demonstracyjne"</string>
<string name="navigating_demo_title" msgid="7454579665387386476">"Wersja demonstracyjna nawigacji"</string>
@@ -284,12 +292,10 @@
<string name="image_test_title" msgid="8273863429801477547">"Test grafiki"</string>
<string name="image_test_text" msgid="6264812093895530445">"Zmiany grafiki są dozwolone"</string>
<string name="additional_data_title" msgid="3546689652240300617">"Dane dodatkowe"</string>
- <!-- no translation found for additional_data_text (2846223398214158872) -->
- <skip />
+ <string name="additional_data_text" msgid="2846223398214158872">"Aktualizacje dozwolone na operacjach cofania."</string>
<string name="misc_templates_demos_title" msgid="6077169010255928114">"Wersje demonstracyjne różnych szablonów"</string>
<string name="showcase_demos_title" msgid="1542092687878113304">"Wersje demonstracyjne do prezentacji"</string>
- <!-- no translation found for location_1_title (3939821089928425181) -->
- <skip />
+ <string name="location_1_title" msgid="3939821089928425181">"translatable=falseGoogle Kirkland"</string>
<string name="location_1_description" msgid="4801052291684791371">"Zabarwiony wektor zasobu"</string>
<string name="location_2_description" msgid="3331356135359047166">"Bitmapa zasobu graficznego"</string>
<string name="location_3_description" msgid="3982142774088944850">"Znacznik kolorowego tekstu"</string>
diff --git a/car/app/app-samples/showcase/common/src/main/res/values-pt-rBR/strings.xml b/car/app/app-samples/showcase/common/src/main/res/values-pt-rBR/strings.xml
index 798d2c9..83fbd9e 100644
--- a/car/app/app-samples/showcase/common/src/main/res/values-pt-rBR/strings.xml
+++ b/car/app/app-samples/showcase/common/src/main/res/values-pt-rBR/strings.xml
@@ -36,7 +36,8 @@
<string name="on_action_title" msgid="4129601573763429611">"Ativado"</string>
<string name="off_action_title" msgid="8669201170189204848">"Desativado"</string>
<string name="settings_action_title" msgid="8616900063253887861">"Configurações"</string>
- <string name="accept_action_title" msgid="6172053420803596132">"Configurações"</string>
+ <!-- no translation found for accept_action_title (4899660585470647578) -->
+ <skip />
<string name="reject_action_title" msgid="6730366705938402668">"Recusar"</string>
<string name="ok_action_title" msgid="7128494973966098611">"OK"</string>
<string name="throw_action_title" msgid="7163710562670220163">"Gerar"</string>
@@ -110,8 +111,7 @@
<string name="content_limits_demo_title" msgid="3207211638386727610">"Demonstração de limites de conteúdo"</string>
<string name="finish_app_msg" msgid="8354334557053141891">"Isso encerra o app e quando você retornar, ele vai configurar com antecedência uma tela de permissão"</string>
<string name="finish_app_title" msgid="9013328479438745074">"Encerrar demonstração do app"</string>
- <!-- no translation found for finish_app_demo_title (8223819062053448384) -->
- <skip />
+ <string name="finish_app_demo_title" msgid="8223819062053448384">"Configurar com antecedência a tela de permissões na próxima demonstração"</string>
<string name="loading_demo_title" msgid="1086529475809143517">"Carregando a demonstração"</string>
<string name="loading_demo_row_title" msgid="8933049915126088142">"Carregamento concluído"</string>
<string name="pop_to_root" msgid="2078277386355064198">"Ir até a raiz"</string>
@@ -141,6 +141,14 @@
<string name="importance_title" msgid="9034862997821839831">"Importância"</string>
<string name="category_title" msgid="4783851267093259949">"Categoria"</string>
<string name="ongoing_title" msgid="4957996003270280496">"Em andamento"</string>
+ <!-- no translation found for default_importance (6347996298832939989) -->
+ <skip />
+ <!-- no translation found for high_importance (5009120714837304882) -->
+ <skip />
+ <!-- no translation found for low_importance (4721161314404294033) -->
+ <skip />
+ <!-- no translation found for unknown_importance (909001735933359216) -->
+ <skip />
<string name="notification_demo" msgid="1819496937832036387">"Demonstração de notificação"</string>
<string name="misc_demo_title" msgid="7399959062407349380">"Demonstrações diversas"</string>
<string name="navigating_demo_title" msgid="7454579665387386476">"Demonstração de navegação"</string>
@@ -284,12 +292,10 @@
<string name="image_test_title" msgid="8273863429801477547">"Teste de imagem"</string>
<string name="image_test_text" msgid="6264812093895530445">"Mudanças de imagem são permitidas"</string>
<string name="additional_data_title" msgid="3546689652240300617">"Outros dados"</string>
- <!-- no translation found for additional_data_text (2846223398214158872) -->
- <skip />
+ <string name="additional_data_text" msgid="2846223398214158872">"Atualizações permitidas em operações de retorno."</string>
<string name="misc_templates_demos_title" msgid="6077169010255928114">"Demonstração de modelos diversos"</string>
<string name="showcase_demos_title" msgid="1542092687878113304">"Demonstrações em destaque"</string>
- <!-- no translation found for location_1_title (3939821089928425181) -->
- <skip />
+ <string name="location_1_title" msgid="3939821089928425181">"translatable=falseGoogle Kirkland"</string>
<string name="location_1_description" msgid="4801052291684791371">"Vetor de recurso de tonalidade"</string>
<string name="location_2_description" msgid="3331356135359047166">"Bitmap de recurso de imagem"</string>
<string name="location_3_description" msgid="3982142774088944850">"Marcador de texto colorido"</string>
diff --git a/car/app/app-samples/showcase/common/src/main/res/values-pt-rPT/strings.xml b/car/app/app-samples/showcase/common/src/main/res/values-pt-rPT/strings.xml
index c04e6be..6f904e6 100644
--- a/car/app/app-samples/showcase/common/src/main/res/values-pt-rPT/strings.xml
+++ b/car/app/app-samples/showcase/common/src/main/res/values-pt-rPT/strings.xml
@@ -36,7 +36,8 @@
<string name="on_action_title" msgid="4129601573763429611">"Ativado"</string>
<string name="off_action_title" msgid="8669201170189204848">"Desativado"</string>
<string name="settings_action_title" msgid="8616900063253887861">"Definições"</string>
- <string name="accept_action_title" msgid="6172053420803596132">"Definições"</string>
+ <!-- no translation found for accept_action_title (4899660585470647578) -->
+ <skip />
<string name="reject_action_title" msgid="6730366705938402668">"Rejeitar"</string>
<string name="ok_action_title" msgid="7128494973966098611">"OK"</string>
<string name="throw_action_title" msgid="7163710562670220163">"Acionar"</string>
@@ -110,8 +111,7 @@
<string name="content_limits_demo_title" msgid="3207211638386727610">"Demonstração de limites do conteúdo"</string>
<string name="finish_app_msg" msgid="8354334557053141891">"A app vai ser concluída e, quando voltar, vai ser adicionado um ecrã de autorização"</string>
<string name="finish_app_title" msgid="9013328479438745074">"Demonstração sobre como concluir a app"</string>
- <!-- no translation found for finish_app_demo_title (8223819062053448384) -->
- <skip />
+ <string name="finish_app_demo_title" msgid="8223819062053448384">"Demonstração sobre como adicionar um ecrã de autorização na próxima execução"</string>
<string name="loading_demo_title" msgid="1086529475809143517">"A carregar demonstração"</string>
<string name="loading_demo_row_title" msgid="8933049915126088142">"Carregamento concluído!"</string>
<string name="pop_to_root" msgid="2078277386355064198">"Ir para raiz"</string>
@@ -141,6 +141,14 @@
<string name="importance_title" msgid="9034862997821839831">"Importância"</string>
<string name="category_title" msgid="4783851267093259949">"Categoria"</string>
<string name="ongoing_title" msgid="4957996003270280496">"Em curso"</string>
+ <!-- no translation found for default_importance (6347996298832939989) -->
+ <skip />
+ <!-- no translation found for high_importance (5009120714837304882) -->
+ <skip />
+ <!-- no translation found for low_importance (4721161314404294033) -->
+ <skip />
+ <!-- no translation found for unknown_importance (909001735933359216) -->
+ <skip />
<string name="notification_demo" msgid="1819496937832036387">"Demonstração de notificação"</string>
<string name="misc_demo_title" msgid="7399959062407349380">"Demonstrações diversas"</string>
<string name="navigating_demo_title" msgid="7454579665387386476">"Demonstração de navegação"</string>
@@ -284,12 +292,10 @@
<string name="image_test_title" msgid="8273863429801477547">"Teste de imagem"</string>
<string name="image_test_text" msgid="6264812093895530445">"São permitidas alterações de imagens"</string>
<string name="additional_data_title" msgid="3546689652240300617">"Dados adicionais"</string>
- <!-- no translation found for additional_data_text (2846223398214158872) -->
- <skip />
+ <string name="additional_data_text" msgid="2846223398214158872">"Atualizações permitidas nas operações de retrocesso."</string>
<string name="misc_templates_demos_title" msgid="6077169010255928114">"Demonstrações de modelos diversos"</string>
<string name="showcase_demos_title" msgid="1542092687878113304">"Demonstrações de destaque"</string>
- <!-- no translation found for location_1_title (3939821089928425181) -->
- <skip />
+ <string name="location_1_title" msgid="3939821089928425181">"translatable=falseGoogle Kirkland"</string>
<string name="location_1_description" msgid="4801052291684791371">"Vetor do recurso com matiz"</string>
<string name="location_2_description" msgid="3331356135359047166">"Mapa de bits dos recursos da imagem"</string>
<string name="location_3_description" msgid="3982142774088944850">"Marcador de texto a cores"</string>
diff --git a/car/app/app-samples/showcase/common/src/main/res/values-pt/strings.xml b/car/app/app-samples/showcase/common/src/main/res/values-pt/strings.xml
index 798d2c9..83fbd9e 100644
--- a/car/app/app-samples/showcase/common/src/main/res/values-pt/strings.xml
+++ b/car/app/app-samples/showcase/common/src/main/res/values-pt/strings.xml
@@ -36,7 +36,8 @@
<string name="on_action_title" msgid="4129601573763429611">"Ativado"</string>
<string name="off_action_title" msgid="8669201170189204848">"Desativado"</string>
<string name="settings_action_title" msgid="8616900063253887861">"Configurações"</string>
- <string name="accept_action_title" msgid="6172053420803596132">"Configurações"</string>
+ <!-- no translation found for accept_action_title (4899660585470647578) -->
+ <skip />
<string name="reject_action_title" msgid="6730366705938402668">"Recusar"</string>
<string name="ok_action_title" msgid="7128494973966098611">"OK"</string>
<string name="throw_action_title" msgid="7163710562670220163">"Gerar"</string>
@@ -110,8 +111,7 @@
<string name="content_limits_demo_title" msgid="3207211638386727610">"Demonstração de limites de conteúdo"</string>
<string name="finish_app_msg" msgid="8354334557053141891">"Isso encerra o app e quando você retornar, ele vai configurar com antecedência uma tela de permissão"</string>
<string name="finish_app_title" msgid="9013328479438745074">"Encerrar demonstração do app"</string>
- <!-- no translation found for finish_app_demo_title (8223819062053448384) -->
- <skip />
+ <string name="finish_app_demo_title" msgid="8223819062053448384">"Configurar com antecedência a tela de permissões na próxima demonstração"</string>
<string name="loading_demo_title" msgid="1086529475809143517">"Carregando a demonstração"</string>
<string name="loading_demo_row_title" msgid="8933049915126088142">"Carregamento concluído"</string>
<string name="pop_to_root" msgid="2078277386355064198">"Ir até a raiz"</string>
@@ -141,6 +141,14 @@
<string name="importance_title" msgid="9034862997821839831">"Importância"</string>
<string name="category_title" msgid="4783851267093259949">"Categoria"</string>
<string name="ongoing_title" msgid="4957996003270280496">"Em andamento"</string>
+ <!-- no translation found for default_importance (6347996298832939989) -->
+ <skip />
+ <!-- no translation found for high_importance (5009120714837304882) -->
+ <skip />
+ <!-- no translation found for low_importance (4721161314404294033) -->
+ <skip />
+ <!-- no translation found for unknown_importance (909001735933359216) -->
+ <skip />
<string name="notification_demo" msgid="1819496937832036387">"Demonstração de notificação"</string>
<string name="misc_demo_title" msgid="7399959062407349380">"Demonstrações diversas"</string>
<string name="navigating_demo_title" msgid="7454579665387386476">"Demonstração de navegação"</string>
@@ -284,12 +292,10 @@
<string name="image_test_title" msgid="8273863429801477547">"Teste de imagem"</string>
<string name="image_test_text" msgid="6264812093895530445">"Mudanças de imagem são permitidas"</string>
<string name="additional_data_title" msgid="3546689652240300617">"Outros dados"</string>
- <!-- no translation found for additional_data_text (2846223398214158872) -->
- <skip />
+ <string name="additional_data_text" msgid="2846223398214158872">"Atualizações permitidas em operações de retorno."</string>
<string name="misc_templates_demos_title" msgid="6077169010255928114">"Demonstração de modelos diversos"</string>
<string name="showcase_demos_title" msgid="1542092687878113304">"Demonstrações em destaque"</string>
- <!-- no translation found for location_1_title (3939821089928425181) -->
- <skip />
+ <string name="location_1_title" msgid="3939821089928425181">"translatable=falseGoogle Kirkland"</string>
<string name="location_1_description" msgid="4801052291684791371">"Vetor de recurso de tonalidade"</string>
<string name="location_2_description" msgid="3331356135359047166">"Bitmap de recurso de imagem"</string>
<string name="location_3_description" msgid="3982142774088944850">"Marcador de texto colorido"</string>
diff --git a/car/app/app-samples/showcase/common/src/main/res/values-ro/strings.xml b/car/app/app-samples/showcase/common/src/main/res/values-ro/strings.xml
index d0ca31a..817a005 100644
--- a/car/app/app-samples/showcase/common/src/main/res/values-ro/strings.xml
+++ b/car/app/app-samples/showcase/common/src/main/res/values-ro/strings.xml
@@ -36,7 +36,8 @@
<string name="on_action_title" msgid="4129601573763429611">"Activat"</string>
<string name="off_action_title" msgid="8669201170189204848">"Dezactivat"</string>
<string name="settings_action_title" msgid="8616900063253887861">"Setări"</string>
- <string name="accept_action_title" msgid="6172053420803596132">"Setări"</string>
+ <!-- no translation found for accept_action_title (4899660585470647578) -->
+ <skip />
<string name="reject_action_title" msgid="6730366705938402668">"Respingeți"</string>
<string name="ok_action_title" msgid="7128494973966098611">"OK"</string>
<string name="throw_action_title" msgid="7163710562670220163">"Întrerupeți"</string>
@@ -110,8 +111,7 @@
<string name="content_limits_demo_title" msgid="3207211638386727610">"Demonstrație cu limite privind conținutul"</string>
<string name="finish_app_msg" msgid="8354334557053141891">"Astfel, aplicația se va încheia și, când reveniți, va pregăti un ecran pentru permisiuni"</string>
<string name="finish_app_title" msgid="9013328479438745074">"Finalizați demonstrația aplicației"</string>
- <!-- no translation found for finish_app_demo_title (8223819062053448384) -->
- <skip />
+ <string name="finish_app_demo_title" msgid="8223819062053448384">"Pregătiți ecranul pentru permisiuni la următoarea rulare a demonstrației"</string>
<string name="loading_demo_title" msgid="1086529475809143517">"Se încarcă demonstrația"</string>
<string name="loading_demo_row_title" msgid="8933049915126088142">"Încărcarea s-a finalizat!"</string>
<string name="pop_to_root" msgid="2078277386355064198">"Accesați ecranul rădăcină"</string>
@@ -141,6 +141,14 @@
<string name="importance_title" msgid="9034862997821839831">"Importanță"</string>
<string name="category_title" msgid="4783851267093259949">"Categorie"</string>
<string name="ongoing_title" msgid="4957996003270280496">"În desfășurare"</string>
+ <!-- no translation found for default_importance (6347996298832939989) -->
+ <skip />
+ <!-- no translation found for high_importance (5009120714837304882) -->
+ <skip />
+ <!-- no translation found for low_importance (4721161314404294033) -->
+ <skip />
+ <!-- no translation found for unknown_importance (909001735933359216) -->
+ <skip />
<string name="notification_demo" msgid="1819496937832036387">"Demonstrație cu notificări"</string>
<string name="misc_demo_title" msgid="7399959062407349380">"Demonstrații diverse"</string>
<string name="navigating_demo_title" msgid="7454579665387386476">"Demonstrație pentru navigare"</string>
@@ -284,12 +292,10 @@
<string name="image_test_title" msgid="8273863429801477547">"Test pentru imagini"</string>
<string name="image_test_text" msgid="6264812093895530445">"Sunt permise modificări ale imaginilor"</string>
<string name="additional_data_title" msgid="3546689652240300617">"Date suplimentare"</string>
- <!-- no translation found for additional_data_text (2846223398214158872) -->
- <skip />
+ <string name="additional_data_text" msgid="2846223398214158872">"Sunt permise actualizările operațiunilor în fundal."</string>
<string name="misc_templates_demos_title" msgid="6077169010255928114">"Demonstrații diverse cu șabloane"</string>
<string name="showcase_demos_title" msgid="1542092687878113304">"Demonstrații pentru Showcase"</string>
- <!-- no translation found for location_1_title (3939821089928425181) -->
- <skip />
+ <string name="location_1_title" msgid="3939821089928425181">"translatable=falseGoogle Kirkland"</string>
<string name="location_1_description" msgid="4801052291684791371">"Vector de resursă colorat"</string>
<string name="location_2_description" msgid="3331356135359047166">"Bitmap cu resursele imaginii"</string>
<string name="location_3_description" msgid="3982142774088944850">"Marcator de text colorat"</string>
diff --git a/car/app/app-samples/showcase/common/src/main/res/values-ru/strings.xml b/car/app/app-samples/showcase/common/src/main/res/values-ru/strings.xml
index 66b9352..81fec41a 100644
--- a/car/app/app-samples/showcase/common/src/main/res/values-ru/strings.xml
+++ b/car/app/app-samples/showcase/common/src/main/res/values-ru/strings.xml
@@ -36,7 +36,8 @@
<string name="on_action_title" msgid="4129601573763429611">"Вкл."</string>
<string name="off_action_title" msgid="8669201170189204848">"Выкл."</string>
<string name="settings_action_title" msgid="8616900063253887861">"Настройки"</string>
- <string name="accept_action_title" msgid="6172053420803596132">"Настройки"</string>
+ <!-- no translation found for accept_action_title (4899660585470647578) -->
+ <skip />
<string name="reject_action_title" msgid="6730366705938402668">"Отклонить"</string>
<string name="ok_action_title" msgid="7128494973966098611">"ОК"</string>
<string name="throw_action_title" msgid="7163710562670220163">"Вызвать исключение"</string>
@@ -140,6 +141,14 @@
<string name="importance_title" msgid="9034862997821839831">"Важность"</string>
<string name="category_title" msgid="4783851267093259949">"Категория"</string>
<string name="ongoing_title" msgid="4957996003270280496">"Текущие"</string>
+ <!-- no translation found for default_importance (6347996298832939989) -->
+ <skip />
+ <!-- no translation found for high_importance (5009120714837304882) -->
+ <skip />
+ <!-- no translation found for low_importance (4721161314404294033) -->
+ <skip />
+ <!-- no translation found for unknown_importance (909001735933359216) -->
+ <skip />
<string name="notification_demo" msgid="1819496937832036387">"Демонстрация уведомления"</string>
<string name="misc_demo_title" msgid="7399959062407349380">"Прочие демонстрации"</string>
<string name="navigating_demo_title" msgid="7454579665387386476">"Демонстрация навигации"</string>
@@ -286,8 +295,7 @@
<string name="additional_data_text" msgid="2846223398214158872">"Обновления разрешены для обратных операций."</string>
<string name="misc_templates_demos_title" msgid="6077169010255928114">"Демонстрации прочих шаблонов"</string>
<string name="showcase_demos_title" msgid="1542092687878113304">"Демонстрации Showcase"</string>
- <!-- no translation found for location_1_title (3939821089928425181) -->
- <skip />
+ <string name="location_1_title" msgid="3939821089928425181">"Google Kirkland"</string>
<string name="location_1_description" msgid="4801052291684791371">"Цветное векторное изображение"</string>
<string name="location_2_description" msgid="3331356135359047166">"Растровое изображение"</string>
<string name="location_3_description" msgid="3982142774088944850">"Цветной текстовый маркер"</string>
diff --git a/car/app/app-samples/showcase/common/src/main/res/values-si/strings.xml b/car/app/app-samples/showcase/common/src/main/res/values-si/strings.xml
index 0c3799e..82640bb 100644
--- a/car/app/app-samples/showcase/common/src/main/res/values-si/strings.xml
+++ b/car/app/app-samples/showcase/common/src/main/res/values-si/strings.xml
@@ -36,7 +36,8 @@
<string name="on_action_title" msgid="4129601573763429611">"ක්රියාත්මකයි"</string>
<string name="off_action_title" msgid="8669201170189204848">"ක්රියාවිරහිතයි"</string>
<string name="settings_action_title" msgid="8616900063253887861">"සැකසීම්"</string>
- <string name="accept_action_title" msgid="6172053420803596132">"සැකසීම්"</string>
+ <!-- no translation found for accept_action_title (4899660585470647578) -->
+ <skip />
<string name="reject_action_title" msgid="6730366705938402668">"ප්රතික්ෂේප කරන්න"</string>
<string name="ok_action_title" msgid="7128494973966098611">"හරි"</string>
<string name="throw_action_title" msgid="7163710562670220163">"විසි කරන්න"</string>
@@ -110,8 +111,7 @@
<string name="content_limits_demo_title" msgid="3207211638386727610">"අන්තර්ගත සීමා ආදර්ශනය"</string>
<string name="finish_app_msg" msgid="8354334557053141891">"මෙය යෙදුම අවසන් කරනු ඇති අතර, ඔබ ආපසු පැමිණෙන විට එය අවසර තිරයක් පූර්ව-වපුරනු ඇත"</string>
<string name="finish_app_title" msgid="9013328479438745074">"යෙදුම් ආදර්ශනය අවසන් කරන්න"</string>
- <!-- no translation found for finish_app_demo_title (8223819062053448384) -->
- <skip />
+ <string name="finish_app_demo_title" msgid="8223819062053448384">"මීළඟ ධාවන ආදර්ශනයෙහි අවසර තිරය පූර්ව-වපුරන්න"</string>
<string name="loading_demo_title" msgid="1086529475809143517">"ආදර්ශනය පූරණය කරමින්"</string>
<string name="loading_demo_row_title" msgid="8933049915126088142">"පූරණය කිරීම සම්පූර්ණයි!"</string>
<string name="pop_to_root" msgid="2078277386355064198">"මූලය වෙත පොප් කරන්න"</string>
@@ -141,6 +141,14 @@
<string name="importance_title" msgid="9034862997821839831">"වැදගත්කම"</string>
<string name="category_title" msgid="4783851267093259949">"ප්රවර්ගය"</string>
<string name="ongoing_title" msgid="4957996003270280496">"දැනට පවතින"</string>
+ <!-- no translation found for default_importance (6347996298832939989) -->
+ <skip />
+ <!-- no translation found for high_importance (5009120714837304882) -->
+ <skip />
+ <!-- no translation found for low_importance (4721161314404294033) -->
+ <skip />
+ <!-- no translation found for unknown_importance (909001735933359216) -->
+ <skip />
<string name="notification_demo" msgid="1819496937832036387">"දැනුම්දීම් ආදර්ශනය"</string>
<string name="misc_demo_title" msgid="7399959062407349380">"විවිධ ආදර්ශන"</string>
<string name="navigating_demo_title" msgid="7454579665387386476">"සංචාලන ආදර්ශනය"</string>
@@ -284,12 +292,10 @@
<string name="image_test_title" msgid="8273863429801477547">"රූප පරීක්ෂාව"</string>
<string name="image_test_text" msgid="6264812093895530445">"රූප වෙනස් කිරීම් ඉඩ දේ"</string>
<string name="additional_data_title" msgid="3546689652240300617">"අතිරේක දත්ත"</string>
- <!-- no translation found for additional_data_text (2846223398214158872) -->
- <skip />
+ <string name="additional_data_text" msgid="2846223398214158872">"පසු මෙහෙයුම්වල යාවත්කාලීන කිරීම් ඉඩ දෙනු ලැබේ."</string>
<string name="misc_templates_demos_title" msgid="6077169010255928114">"විවිධ අච්චු ආදර්ශන"</string>
<string name="showcase_demos_title" msgid="1542092687878113304">"ප්රකාශක තේරූ ආදර්ශන"</string>
- <!-- no translation found for location_1_title (3939821089928425181) -->
- <skip />
+ <string name="location_1_title" msgid="3939821089928425181">"translatable=falseGoogle Kirkland"</string>
<string name="location_1_description" msgid="4801052291684791371">"ටින්ටඩ් සම්පත් දෛශිකය"</string>
<string name="location_2_description" msgid="3331356135359047166">"රූප සම්පත් බිටු සිතියම"</string>
<string name="location_3_description" msgid="3982142774088944850">"වර්ණ ගැන්වූ පෙළ ලකුණුකරය"</string>
diff --git a/car/app/app-samples/showcase/common/src/main/res/values-sk/strings.xml b/car/app/app-samples/showcase/common/src/main/res/values-sk/strings.xml
index f203437..6e430a3 100644
--- a/car/app/app-samples/showcase/common/src/main/res/values-sk/strings.xml
+++ b/car/app/app-samples/showcase/common/src/main/res/values-sk/strings.xml
@@ -36,7 +36,8 @@
<string name="on_action_title" msgid="4129601573763429611">"Zapnuté"</string>
<string name="off_action_title" msgid="8669201170189204848">"Vypnuté"</string>
<string name="settings_action_title" msgid="8616900063253887861">"Nastavenia"</string>
- <string name="accept_action_title" msgid="6172053420803596132">"Nastavenia"</string>
+ <!-- no translation found for accept_action_title (4899660585470647578) -->
+ <skip />
<string name="reject_action_title" msgid="6730366705938402668">"Odmietnuť"</string>
<string name="ok_action_title" msgid="7128494973966098611">"OK"</string>
<string name="throw_action_title" msgid="7163710562670220163">"Vyvolať výnimku"</string>
@@ -140,6 +141,14 @@
<string name="importance_title" msgid="9034862997821839831">"Dôležitosť"</string>
<string name="category_title" msgid="4783851267093259949">"Kategória"</string>
<string name="ongoing_title" msgid="4957996003270280496">"Prebieha"</string>
+ <!-- no translation found for default_importance (6347996298832939989) -->
+ <skip />
+ <!-- no translation found for high_importance (5009120714837304882) -->
+ <skip />
+ <!-- no translation found for low_importance (4721161314404294033) -->
+ <skip />
+ <!-- no translation found for unknown_importance (909001735933359216) -->
+ <skip />
<string name="notification_demo" msgid="1819496937832036387">"Upozornenie – demo"</string>
<string name="misc_demo_title" msgid="7399959062407349380">"Rôzne demá"</string>
<string name="navigating_demo_title" msgid="7454579665387386476">"Navigácia – demo"</string>
@@ -286,8 +295,7 @@
<string name="additional_data_text" msgid="2846223398214158872">"Aktualizácie sú povolené pre operácie na pozadí."</string>
<string name="misc_templates_demos_title" msgid="6077169010255928114">"Rôzne šablóny – demá"</string>
<string name="showcase_demos_title" msgid="1542092687878113304">"Výber – demá"</string>
- <!-- no translation found for location_1_title (3939821089928425181) -->
- <skip />
+ <string name="location_1_title" msgid="3939821089928425181">"translatable=falseGoogle Kirkland"</string>
<string name="location_1_description" msgid="4801052291684791371">"Tónovaný vektor zdroja"</string>
<string name="location_2_description" msgid="3331356135359047166">"Bitmapa obrázkového zdroja"</string>
<string name="location_3_description" msgid="3982142774088944850">"Farebná značka textu"</string>
diff --git a/car/app/app-samples/showcase/common/src/main/res/values-sl/strings.xml b/car/app/app-samples/showcase/common/src/main/res/values-sl/strings.xml
index 6a72514..4fcadbd 100644
--- a/car/app/app-samples/showcase/common/src/main/res/values-sl/strings.xml
+++ b/car/app/app-samples/showcase/common/src/main/res/values-sl/strings.xml
@@ -36,7 +36,8 @@
<string name="on_action_title" msgid="4129601573763429611">"Vklopljeno"</string>
<string name="off_action_title" msgid="8669201170189204848">"Izklopljeno"</string>
<string name="settings_action_title" msgid="8616900063253887861">"Nastavitve"</string>
- <string name="accept_action_title" msgid="6172053420803596132">"Nastavitve"</string>
+ <!-- no translation found for accept_action_title (4899660585470647578) -->
+ <skip />
<string name="reject_action_title" msgid="6730366705938402668">"Zavrni"</string>
<string name="ok_action_title" msgid="7128494973966098611">"V redu"</string>
<string name="throw_action_title" msgid="7163710562670220163">"Met"</string>
@@ -110,8 +111,7 @@
<string name="content_limits_demo_title" msgid="3207211638386727610">"Predstavitvena različica omejitev vsebine"</string>
<string name="finish_app_msg" msgid="8354334557053141891">"S tem boste končali izvajanje aplikacije. Ko se boste vanjo vrnili, bo vnaprej izpolnjena z zaslonom za dovoljenje."</string>
<string name="finish_app_title" msgid="9013328479438745074">"Končanje predstavitvene različice aplikacije"</string>
- <!-- no translation found for finish_app_demo_title (8223819062053448384) -->
- <skip />
+ <string name="finish_app_demo_title" msgid="8223819062053448384">"Predstavitvena različica za vnaprejšnje izpolnjevanje zaslona za dovoljenja ob naslednjem zagonu"</string>
<string name="loading_demo_title" msgid="1086529475809143517">"Nalaganje predstavitvene različice"</string>
<string name="loading_demo_row_title" msgid="8933049915126088142">"Nalaganje je dokončano."</string>
<string name="pop_to_root" msgid="2078277386355064198">"Koren za »Prikaz v«"</string>
@@ -141,6 +141,14 @@
<string name="importance_title" msgid="9034862997821839831">"Pomembnost"</string>
<string name="category_title" msgid="4783851267093259949">"Kategorija"</string>
<string name="ongoing_title" msgid="4957996003270280496">"Poteka"</string>
+ <!-- no translation found for default_importance (6347996298832939989) -->
+ <skip />
+ <!-- no translation found for high_importance (5009120714837304882) -->
+ <skip />
+ <!-- no translation found for low_importance (4721161314404294033) -->
+ <skip />
+ <!-- no translation found for unknown_importance (909001735933359216) -->
+ <skip />
<string name="notification_demo" msgid="1819496937832036387">"Predstavitvena različica obvestila"</string>
<string name="misc_demo_title" msgid="7399959062407349380">"Predstavitvene različice različnih predlog"</string>
<string name="navigating_demo_title" msgid="7454579665387386476">"Predstavitvena različica navigacije"</string>
@@ -284,12 +292,10 @@
<string name="image_test_title" msgid="8273863429801477547">"Preizkus slik"</string>
<string name="image_test_text" msgid="6264812093895530445">"Spremembe slik so dovoljene."</string>
<string name="additional_data_title" msgid="3546689652240300617">"Dodatni podatki"</string>
- <!-- no translation found for additional_data_text (2846223398214158872) -->
- <skip />
+ <string name="additional_data_text" msgid="2846223398214158872">"Posodobitve so dovoljene pri pomikih nazaj."</string>
<string name="misc_templates_demos_title" msgid="6077169010255928114">"Predstavitvene različice različnih predlog"</string>
<string name="showcase_demos_title" msgid="1542092687878113304">"Predstavitvene različice izpostavljenih stvari"</string>
- <!-- no translation found for location_1_title (3939821089928425181) -->
- <skip />
+ <string name="location_1_title" msgid="3939821089928425181">"translatable=falseGoogle Kirkland"</string>
<string name="location_1_description" msgid="4801052291684791371">"Obarvana vektorska slika virov."</string>
<string name="location_2_description" msgid="3331356135359047166">"Bitna slika virov."</string>
<string name="location_3_description" msgid="3982142774088944850">"Označevalnik obarvanega besedila."</string>
diff --git a/car/app/app-samples/showcase/common/src/main/res/values-sq/strings.xml b/car/app/app-samples/showcase/common/src/main/res/values-sq/strings.xml
index 9811728..fcd62fe 100644
--- a/car/app/app-samples/showcase/common/src/main/res/values-sq/strings.xml
+++ b/car/app/app-samples/showcase/common/src/main/res/values-sq/strings.xml
@@ -36,7 +36,8 @@
<string name="on_action_title" msgid="4129601573763429611">"Aktiv"</string>
<string name="off_action_title" msgid="8669201170189204848">"Joaktiv"</string>
<string name="settings_action_title" msgid="8616900063253887861">"Cilësimet"</string>
- <string name="accept_action_title" msgid="6172053420803596132">"Cilësimet"</string>
+ <!-- no translation found for accept_action_title (4899660585470647578) -->
+ <skip />
<string name="reject_action_title" msgid="6730366705938402668">"Refuzo"</string>
<string name="ok_action_title" msgid="7128494973966098611">"Në rregull"</string>
<string name="throw_action_title" msgid="7163710562670220163">"Hidh"</string>
@@ -140,6 +141,14 @@
<string name="importance_title" msgid="9034862997821839831">"Rëndësia"</string>
<string name="category_title" msgid="4783851267093259949">"Kategoria"</string>
<string name="ongoing_title" msgid="4957996003270280496">"Vazhdon"</string>
+ <!-- no translation found for default_importance (6347996298832939989) -->
+ <skip />
+ <!-- no translation found for high_importance (5009120714837304882) -->
+ <skip />
+ <!-- no translation found for low_importance (4721161314404294033) -->
+ <skip />
+ <!-- no translation found for unknown_importance (909001735933359216) -->
+ <skip />
<string name="notification_demo" msgid="1819496937832036387">"Demonstrimi i njoftimit"</string>
<string name="misc_demo_title" msgid="7399959062407349380">"Demonstrime të ndryshme"</string>
<string name="navigating_demo_title" msgid="7454579665387386476">"Demonstrimi i navigimit"</string>
@@ -286,8 +295,7 @@
<string name="additional_data_text" msgid="2846223398214158872">"Përditësimet lejohen në veprimet e mëparshme."</string>
<string name="misc_templates_demos_title" msgid="6077169010255928114">"Demonstrime shabllonesh të ndryshme"</string>
<string name="showcase_demos_title" msgid="1542092687878113304">"Demonstrime të prezantimit"</string>
- <!-- no translation found for location_1_title (3939821089928425181) -->
- <skip />
+ <string name="location_1_title" msgid="3939821089928425181">"translatable=falseGoogle Kirkland"</string>
<string name="location_1_description" msgid="4801052291684791371">"U caktua nuanca e vektorit të burimit"</string>
<string name="location_2_description" msgid="3331356135359047166">"Bitmap i burimit të imazhit"</string>
<string name="location_3_description" msgid="3982142774088944850">"Shënues teksti me ngjyra"</string>
diff --git a/car/app/app-samples/showcase/common/src/main/res/values-sr/strings.xml b/car/app/app-samples/showcase/common/src/main/res/values-sr/strings.xml
index c8dc55c..d9fd590 100644
--- a/car/app/app-samples/showcase/common/src/main/res/values-sr/strings.xml
+++ b/car/app/app-samples/showcase/common/src/main/res/values-sr/strings.xml
@@ -36,7 +36,8 @@
<string name="on_action_title" msgid="4129601573763429611">"Укључено"</string>
<string name="off_action_title" msgid="8669201170189204848">"Искључено"</string>
<string name="settings_action_title" msgid="8616900063253887861">"Подешавања"</string>
- <string name="accept_action_title" msgid="6172053420803596132">"Подешавања"</string>
+ <!-- no translation found for accept_action_title (4899660585470647578) -->
+ <skip />
<string name="reject_action_title" msgid="6730366705938402668">"Одбиј"</string>
<string name="ok_action_title" msgid="7128494973966098611">"Потврди"</string>
<string name="throw_action_title" msgid="7163710562670220163">"Баци"</string>
@@ -140,6 +141,14 @@
<string name="importance_title" msgid="9034862997821839831">"Важност"</string>
<string name="category_title" msgid="4783851267093259949">"Категорија"</string>
<string name="ongoing_title" msgid="4957996003270280496">"Активно"</string>
+ <!-- no translation found for default_importance (6347996298832939989) -->
+ <skip />
+ <!-- no translation found for high_importance (5009120714837304882) -->
+ <skip />
+ <!-- no translation found for low_importance (4721161314404294033) -->
+ <skip />
+ <!-- no translation found for unknown_importance (909001735933359216) -->
+ <skip />
<string name="notification_demo" msgid="1819496937832036387">"Демонстрација обавештења"</string>
<string name="misc_demo_title" msgid="7399959062407349380">"Различите демонстрације"</string>
<string name="navigating_demo_title" msgid="7454579665387386476">"Демонстрација навигације"</string>
@@ -286,8 +295,7 @@
<string name="additional_data_text" msgid="2846223398214158872">"Ажурирања су дозвољена за операције у позадини."</string>
<string name="misc_templates_demos_title" msgid="6077169010255928114">"Демонстрације различитих шаблона"</string>
<string name="showcase_demos_title" msgid="1542092687878113304">"Демонстрације приказивања"</string>
- <!-- no translation found for location_1_title (3939821089928425181) -->
- <skip />
+ <string name="location_1_title" msgid="3939821089928425181">"translatable=falseGoogle Kirkland"</string>
<string name="location_1_description" msgid="4801052291684791371">"Вектор ресурса са тоналитетом"</string>
<string name="location_2_description" msgid="3331356135359047166">"Бит мапа ресурса слике"</string>
<string name="location_3_description" msgid="3982142774088944850">"Маркер текста у боји"</string>
diff --git a/car/app/app-samples/showcase/common/src/main/res/values-sv/strings.xml b/car/app/app-samples/showcase/common/src/main/res/values-sv/strings.xml
index 5972a19..c253590 100644
--- a/car/app/app-samples/showcase/common/src/main/res/values-sv/strings.xml
+++ b/car/app/app-samples/showcase/common/src/main/res/values-sv/strings.xml
@@ -36,7 +36,8 @@
<string name="on_action_title" msgid="4129601573763429611">"På"</string>
<string name="off_action_title" msgid="8669201170189204848">"Av"</string>
<string name="settings_action_title" msgid="8616900063253887861">"Inställningar"</string>
- <string name="accept_action_title" msgid="6172053420803596132">"Inställningar"</string>
+ <!-- no translation found for accept_action_title (4899660585470647578) -->
+ <skip />
<string name="reject_action_title" msgid="6730366705938402668">"Avvisa"</string>
<string name="ok_action_title" msgid="7128494973966098611">"OK"</string>
<string name="throw_action_title" msgid="7163710562670220163">"Framtvinga"</string>
@@ -110,8 +111,7 @@
<string name="content_limits_demo_title" msgid="3207211638386727610">"Demo för innehållsbegränsningar"</string>
<string name="finish_app_msg" msgid="8354334557053141891">"Detta avslutar appen och när du öppnar den igen läser den in en behörighetsskärm i förväg"</string>
<string name="finish_app_title" msgid="9013328479438745074">"Avsluta appdemon"</string>
- <!-- no translation found for finish_app_demo_title (8223819062053448384) -->
- <skip />
+ <string name="finish_app_demo_title" msgid="8223819062053448384">"Läs in behörighetsskärmen i förväg nästa gång du kör demon"</string>
<string name="loading_demo_title" msgid="1086529475809143517">"Demo läses in …"</string>
<string name="loading_demo_row_title" msgid="8933049915126088142">"Inläsningen har slutförts."</string>
<string name="pop_to_root" msgid="2078277386355064198">"Gå till rot"</string>
@@ -141,6 +141,14 @@
<string name="importance_title" msgid="9034862997821839831">"Relevans"</string>
<string name="category_title" msgid="4783851267093259949">"Kategori"</string>
<string name="ongoing_title" msgid="4957996003270280496">"Pågående"</string>
+ <!-- no translation found for default_importance (6347996298832939989) -->
+ <skip />
+ <!-- no translation found for high_importance (5009120714837304882) -->
+ <skip />
+ <!-- no translation found for low_importance (4721161314404294033) -->
+ <skip />
+ <!-- no translation found for unknown_importance (909001735933359216) -->
+ <skip />
<string name="notification_demo" msgid="1819496937832036387">"Aviseringsdemo"</string>
<string name="misc_demo_title" msgid="7399959062407349380">"Övriga demor"</string>
<string name="navigating_demo_title" msgid="7454579665387386476">"Navigeringsdemo"</string>
@@ -284,12 +292,10 @@
<string name="image_test_title" msgid="8273863429801477547">"Bildtest"</string>
<string name="image_test_text" msgid="6264812093895530445">"Bildändringar är tillåtna"</string>
<string name="additional_data_title" msgid="3546689652240300617">"Ytterligare data"</string>
- <!-- no translation found for additional_data_text (2846223398214158872) -->
- <skip />
+ <string name="additional_data_text" msgid="2846223398214158872">"Uppdateringar tillåtet i bakåtåtgärder."</string>
<string name="misc_templates_demos_title" msgid="6077169010255928114">"Demor för övriga mallar"</string>
<string name="showcase_demos_title" msgid="1542092687878113304">"Visa demor"</string>
- <!-- no translation found for location_1_title (3939821089928425181) -->
- <skip />
+ <string name="location_1_title" msgid="3939821089928425181">"translatable=falseGoogle Kirkland"</string>
<string name="location_1_description" msgid="4801052291684791371">"Tonad resursvektor"</string>
<string name="location_2_description" msgid="3331356135359047166">"Bitmap för resursbild"</string>
<string name="location_3_description" msgid="3982142774088944850">"Färgad textmarkör"</string>
diff --git a/car/app/app-samples/showcase/common/src/main/res/values-sw/strings.xml b/car/app/app-samples/showcase/common/src/main/res/values-sw/strings.xml
index 019ca0a..6bd1407 100644
--- a/car/app/app-samples/showcase/common/src/main/res/values-sw/strings.xml
+++ b/car/app/app-samples/showcase/common/src/main/res/values-sw/strings.xml
@@ -36,7 +36,8 @@
<string name="on_action_title" msgid="4129601573763429611">"Imewashwa"</string>
<string name="off_action_title" msgid="8669201170189204848">"Imezimwa"</string>
<string name="settings_action_title" msgid="8616900063253887861">"Mipangilio"</string>
- <string name="accept_action_title" msgid="6172053420803596132">"Mipangilio"</string>
+ <!-- no translation found for accept_action_title (4899660585470647578) -->
+ <skip />
<string name="reject_action_title" msgid="6730366705938402668">"Kataa"</string>
<string name="ok_action_title" msgid="7128494973966098611">"Sawa"</string>
<string name="throw_action_title" msgid="7163710562670220163">"Rusha"</string>
@@ -110,8 +111,7 @@
<string name="content_limits_demo_title" msgid="3207211638386727610">"Onyesho la Vikomo vya Maudhui"</string>
<string name="finish_app_msg" msgid="8354334557053141891">"Kitendo hiki kitakamilisha programu na wakati utakapoirudia, itajaza mapema skrini ya ruhusa"</string>
<string name="finish_app_title" msgid="9013328479438745074">"Kamilisha Toleo la kujaribu Programu"</string>
- <!-- no translation found for finish_app_demo_title (8223819062053448384) -->
- <skip />
+ <string name="finish_app_demo_title" msgid="8223819062053448384">"Jaza mapema Skrini ya Ruhusa kwenye utekelezaji unaofuata wa Onyesho"</string>
<string name="loading_demo_title" msgid="1086529475809143517">"Inapakia Onyesho"</string>
<string name="loading_demo_row_title" msgid="8933049915126088142">"Imemaliza Kupakia!"</string>
<string name="pop_to_root" msgid="2078277386355064198">"Nenda kwenye idhini maalum ya kudhibiti"</string>
@@ -141,6 +141,14 @@
<string name="importance_title" msgid="9034862997821839831">"Umuhimu"</string>
<string name="category_title" msgid="4783851267093259949">"Aina"</string>
<string name="ongoing_title" msgid="4957996003270280496">"Inaendelea"</string>
+ <!-- no translation found for default_importance (6347996298832939989) -->
+ <skip />
+ <!-- no translation found for high_importance (5009120714837304882) -->
+ <skip />
+ <!-- no translation found for low_importance (4721161314404294033) -->
+ <skip />
+ <!-- no translation found for unknown_importance (909001735933359216) -->
+ <skip />
<string name="notification_demo" msgid="1819496937832036387">"Onyesho la Arifa"</string>
<string name="misc_demo_title" msgid="7399959062407349380">"Maonyesho Anuwai"</string>
<string name="navigating_demo_title" msgid="7454579665387386476">"Onyesho la Usogezaji"</string>
@@ -284,12 +292,10 @@
<string name="image_test_title" msgid="8273863429801477547">"Jaribio la picha"</string>
<string name="image_test_text" msgid="6264812093895530445">"Mabadiliko ya picha yanaruhusiwa"</string>
<string name="additional_data_title" msgid="3546689652240300617">"Data ya Ziada"</string>
- <!-- no translation found for additional_data_text (2846223398214158872) -->
- <skip />
+ <string name="additional_data_text" msgid="2846223398214158872">"Masasisho yameruhusiwa kwenye shughuli za nyuma."</string>
<string name="misc_templates_demos_title" msgid="6077169010255928114">"Maonyesho ya Violezo Anuwai"</string>
<string name="showcase_demos_title" msgid="1542092687878113304">"Maonyesho ya Kuangazia"</string>
- <!-- no translation found for location_1_title (3939821089928425181) -->
- <skip />
+ <string name="location_1_title" msgid="3939821089928425181">"translatable=falseGoogle Kirkland"</string>
<string name="location_1_description" msgid="4801052291684791371">"Nyenzo ya vekta iliyowekewa rangi maalumu"</string>
<string name="location_2_description" msgid="3331356135359047166">"Bitmap ya nyenzo ya picha"</string>
<string name="location_3_description" msgid="3982142774088944850">"Alama ya maandishi yenye rangi"</string>
diff --git a/car/app/app-samples/showcase/common/src/main/res/values-ta/strings.xml b/car/app/app-samples/showcase/common/src/main/res/values-ta/strings.xml
index 74973b6..24c640c 100644
--- a/car/app/app-samples/showcase/common/src/main/res/values-ta/strings.xml
+++ b/car/app/app-samples/showcase/common/src/main/res/values-ta/strings.xml
@@ -36,7 +36,8 @@
<string name="on_action_title" msgid="4129601573763429611">"ஆன்"</string>
<string name="off_action_title" msgid="8669201170189204848">"ஆஃப்"</string>
<string name="settings_action_title" msgid="8616900063253887861">"அமைப்புகள்"</string>
- <string name="accept_action_title" msgid="6172053420803596132">"அமைப்புகள்"</string>
+ <!-- no translation found for accept_action_title (4899660585470647578) -->
+ <skip />
<string name="reject_action_title" msgid="6730366705938402668">"நிராகரி"</string>
<string name="ok_action_title" msgid="7128494973966098611">"சரி"</string>
<string name="throw_action_title" msgid="7163710562670220163">"த்ரோ"</string>
@@ -140,6 +141,14 @@
<string name="importance_title" msgid="9034862997821839831">"முக்கியத்துவம்"</string>
<string name="category_title" msgid="4783851267093259949">"வகை"</string>
<string name="ongoing_title" msgid="4957996003270280496">"செயலிலுள்ளது"</string>
+ <!-- no translation found for default_importance (6347996298832939989) -->
+ <skip />
+ <!-- no translation found for high_importance (5009120714837304882) -->
+ <skip />
+ <!-- no translation found for low_importance (4721161314404294033) -->
+ <skip />
+ <!-- no translation found for unknown_importance (909001735933359216) -->
+ <skip />
<string name="notification_demo" msgid="1819496937832036387">"அறிவிப்பு டெமோ"</string>
<string name="misc_demo_title" msgid="7399959062407349380">"மற்ற டெமோக்கள்"</string>
<string name="navigating_demo_title" msgid="7454579665387386476">"வழிசெலுத்துதலுக்கான டெமோ"</string>
@@ -286,8 +295,7 @@
<string name="additional_data_text" msgid="2846223398214158872">"முந்தைய பக்கத்திற்குச் சென்று மாற்றங்களைச் செய்யலாம்."</string>
<string name="misc_templates_demos_title" msgid="6077169010255928114">"மற்ற டெம்ப்ளேட்டுகளின் டெமோக்கள்"</string>
<string name="showcase_demos_title" msgid="1542092687878113304">"ஷோகேஸின் டெமோக்கள்"</string>
- <!-- no translation found for location_1_title (3939821089928425181) -->
- <skip />
+ <string name="location_1_title" msgid="3939821089928425181">"translatable=falseGoogle Kirkland"</string>
<string name="location_1_description" msgid="4801052291684791371">"ரிசோர்ஸ் வெக்டார் மென்னிறமாக்கப்பட்டது"</string>
<string name="location_2_description" msgid="3331356135359047166">"பட ரிசோர்ஸ் பிட்மேப்"</string>
<string name="location_3_description" msgid="3982142774088944850">"வண்ண உரை அடையாளங்காட்டி"</string>
diff --git a/car/app/app-samples/showcase/common/src/main/res/values-te/strings.xml b/car/app/app-samples/showcase/common/src/main/res/values-te/strings.xml
index 45788ba..ed1a297 100644
--- a/car/app/app-samples/showcase/common/src/main/res/values-te/strings.xml
+++ b/car/app/app-samples/showcase/common/src/main/res/values-te/strings.xml
@@ -36,7 +36,8 @@
<string name="on_action_title" msgid="4129601573763429611">"ఆన్లో ఉంది"</string>
<string name="off_action_title" msgid="8669201170189204848">"ఆఫ్లో ఉంది"</string>
<string name="settings_action_title" msgid="8616900063253887861">"సెట్టింగ్లు"</string>
- <string name="accept_action_title" msgid="6172053420803596132">"సెట్టింగ్లు"</string>
+ <!-- no translation found for accept_action_title (4899660585470647578) -->
+ <skip />
<string name="reject_action_title" msgid="6730366705938402668">"తిరస్కరించండి"</string>
<string name="ok_action_title" msgid="7128494973966098611">"సరే"</string>
<string name="throw_action_title" msgid="7163710562670220163">"విసరండి"</string>
@@ -140,6 +141,14 @@
<string name="importance_title" msgid="9034862997821839831">"ప్రాముఖ్యత"</string>
<string name="category_title" msgid="4783851267093259949">"కేటగిరీ"</string>
<string name="ongoing_title" msgid="4957996003270280496">"కొనసాగుతోంది"</string>
+ <!-- no translation found for default_importance (6347996298832939989) -->
+ <skip />
+ <!-- no translation found for high_importance (5009120714837304882) -->
+ <skip />
+ <!-- no translation found for low_importance (4721161314404294033) -->
+ <skip />
+ <!-- no translation found for unknown_importance (909001735933359216) -->
+ <skip />
<string name="notification_demo" msgid="1819496937832036387">"నోటిఫికేషన్ డెమో"</string>
<string name="misc_demo_title" msgid="7399959062407349380">"ఇతర డెమోలు"</string>
<string name="navigating_demo_title" msgid="7454579665387386476">"డెమోను నావిగేట్ చేస్తోంది"</string>
@@ -286,8 +295,7 @@
<string name="additional_data_text" msgid="2846223398214158872">"బ్యాక్గ్రౌండ్ ఆపరేషన్ల కోసం అప్డేట్లు అనుమతించబడ్డాయి."</string>
<string name="misc_templates_demos_title" msgid="6077169010255928114">"ఇతర టెంప్లేట్ల డెమోలు"</string>
<string name="showcase_demos_title" msgid="1542092687878113304">"డెమోలను ప్రదర్శించండి"</string>
- <!-- no translation found for location_1_title (3939821089928425181) -->
- <skip />
+ <string name="location_1_title" msgid="3939821089928425181">"translatable=falseGoogle Kirkland"</string>
<string name="location_1_description" msgid="4801052291684791371">"టింట్డ్ రిసోర్స్ వెక్టార్"</string>
<string name="location_2_description" msgid="3331356135359047166">"ఇమేజ్ రిసోర్స్ బిట్మ్యాప్"</string>
<string name="location_3_description" msgid="3982142774088944850">"రంగుల టెక్స్ట్ మార్కర్"</string>
diff --git a/car/app/app-samples/showcase/common/src/main/res/values-th/strings.xml b/car/app/app-samples/showcase/common/src/main/res/values-th/strings.xml
index 52d1a85..da39907 100644
--- a/car/app/app-samples/showcase/common/src/main/res/values-th/strings.xml
+++ b/car/app/app-samples/showcase/common/src/main/res/values-th/strings.xml
@@ -36,7 +36,8 @@
<string name="on_action_title" msgid="4129601573763429611">"เปิด"</string>
<string name="off_action_title" msgid="8669201170189204848">"ปิด"</string>
<string name="settings_action_title" msgid="8616900063253887861">"การตั้งค่า"</string>
- <string name="accept_action_title" msgid="6172053420803596132">"การตั้งค่า"</string>
+ <!-- no translation found for accept_action_title (4899660585470647578) -->
+ <skip />
<string name="reject_action_title" msgid="6730366705938402668">"ปฏิเสธ"</string>
<string name="ok_action_title" msgid="7128494973966098611">"ตกลง"</string>
<string name="throw_action_title" msgid="7163710562670220163">"ส่ง"</string>
@@ -140,6 +141,14 @@
<string name="importance_title" msgid="9034862997821839831">"ความสำคัญ"</string>
<string name="category_title" msgid="4783851267093259949">"หมวดหมู่"</string>
<string name="ongoing_title" msgid="4957996003270280496">"ดำเนินอยู่"</string>
+ <!-- no translation found for default_importance (6347996298832939989) -->
+ <skip />
+ <!-- no translation found for high_importance (5009120714837304882) -->
+ <skip />
+ <!-- no translation found for low_importance (4721161314404294033) -->
+ <skip />
+ <!-- no translation found for unknown_importance (909001735933359216) -->
+ <skip />
<string name="notification_demo" msgid="1819496937832036387">"การสาธิตการแจ้งเตือน"</string>
<string name="misc_demo_title" msgid="7399959062407349380">"การสาธิตเบ็ดเตล็ด"</string>
<string name="navigating_demo_title" msgid="7454579665387386476">"การสาธิตการนำทาง"</string>
@@ -286,8 +295,7 @@
<string name="additional_data_text" msgid="2846223398214158872">"อนุญาตให้อัปเดตในการดำเนินการเบื้องหลัง"</string>
<string name="misc_templates_demos_title" msgid="6077169010255928114">"การสาธิตเทมเพลตเบ็ดเตล็ด"</string>
<string name="showcase_demos_title" msgid="1542092687878113304">"การสาธิต Showcase"</string>
- <!-- no translation found for location_1_title (3939821089928425181) -->
- <skip />
+ <string name="location_1_title" msgid="3939821089928425181">"translatable=falseGoogle Kirkland"</string>
<string name="location_1_description" msgid="4801052291684791371">"ปรับสมดุลสีเขียว-แดงของเวกเตอร์ทรัพยากรแล้ว"</string>
<string name="location_2_description" msgid="3331356135359047166">"บิตแมปของทรัพยากรรูปภาพ"</string>
<string name="location_3_description" msgid="3982142774088944850">"ตัวทำเครื่องหมายข้อความที่มีสี"</string>
diff --git a/car/app/app-samples/showcase/common/src/main/res/values-tl/strings.xml b/car/app/app-samples/showcase/common/src/main/res/values-tl/strings.xml
index f8c33d7..b6a8f26 100644
--- a/car/app/app-samples/showcase/common/src/main/res/values-tl/strings.xml
+++ b/car/app/app-samples/showcase/common/src/main/res/values-tl/strings.xml
@@ -36,7 +36,8 @@
<string name="on_action_title" msgid="4129601573763429611">"I-on"</string>
<string name="off_action_title" msgid="8669201170189204848">"I-off"</string>
<string name="settings_action_title" msgid="8616900063253887861">"Mga Setting"</string>
- <string name="accept_action_title" msgid="6172053420803596132">"Mga Setting"</string>
+ <!-- no translation found for accept_action_title (4899660585470647578) -->
+ <skip />
<string name="reject_action_title" msgid="6730366705938402668">"Tanggihan"</string>
<string name="ok_action_title" msgid="7128494973966098611">"OK"</string>
<string name="throw_action_title" msgid="7163710562670220163">"I-throw"</string>
@@ -140,6 +141,14 @@
<string name="importance_title" msgid="9034862997821839831">"Kahalagahan"</string>
<string name="category_title" msgid="4783851267093259949">"Kategorya"</string>
<string name="ongoing_title" msgid="4957996003270280496">"Kasalukuyan"</string>
+ <!-- no translation found for default_importance (6347996298832939989) -->
+ <skip />
+ <!-- no translation found for high_importance (5009120714837304882) -->
+ <skip />
+ <!-- no translation found for low_importance (4721161314404294033) -->
+ <skip />
+ <!-- no translation found for unknown_importance (909001735933359216) -->
+ <skip />
<string name="notification_demo" msgid="1819496937832036387">"Demo ng Notification"</string>
<string name="misc_demo_title" msgid="7399959062407349380">"Iba Pang Demo"</string>
<string name="navigating_demo_title" msgid="7454579665387386476">"Demo ng Nagna-navigate"</string>
@@ -286,8 +295,7 @@
<string name="additional_data_text" msgid="2846223398214158872">"Pinapayagan ang mga update sa mga pagbabalik."</string>
<string name="misc_templates_demos_title" msgid="6077169010255928114">"Iba Pang Demo ng Mga Template"</string>
<string name="showcase_demos_title" msgid="1542092687878113304">"Itampok ang Mga Demo"</string>
- <!-- no translation found for location_1_title (3939821089928425181) -->
- <skip />
+ <string name="location_1_title" msgid="3939821089928425181">"translatable=falseGoogle Kirkland"</string>
<string name="location_1_description" msgid="4801052291684791371">"Tinted resource vector"</string>
<string name="location_2_description" msgid="3331356135359047166">"Resource bitmap ng larawan"</string>
<string name="location_3_description" msgid="3982142774088944850">"May kulay na text marker"</string>
diff --git a/car/app/app-samples/showcase/common/src/main/res/values-tr/strings.xml b/car/app/app-samples/showcase/common/src/main/res/values-tr/strings.xml
index 3e3bead..2298e87 100644
--- a/car/app/app-samples/showcase/common/src/main/res/values-tr/strings.xml
+++ b/car/app/app-samples/showcase/common/src/main/res/values-tr/strings.xml
@@ -36,7 +36,8 @@
<string name="on_action_title" msgid="4129601573763429611">"Açık"</string>
<string name="off_action_title" msgid="8669201170189204848">"Kapalı"</string>
<string name="settings_action_title" msgid="8616900063253887861">"Ayarlar"</string>
- <string name="accept_action_title" msgid="6172053420803596132">"Ayarlar"</string>
+ <!-- no translation found for accept_action_title (4899660585470647578) -->
+ <skip />
<string name="reject_action_title" msgid="6730366705938402668">"Reddet"</string>
<string name="ok_action_title" msgid="7128494973966098611">"Tamam"</string>
<string name="throw_action_title" msgid="7163710562670220163">"Hata ver"</string>
@@ -110,8 +111,7 @@
<string name="content_limits_demo_title" msgid="3207211638386727610">"İçerik Sınırları Demosu"</string>
<string name="finish_app_msg" msgid="8354334557053141891">"Bu işlem uygulamayı sonlandırır ve geri döndüğünüzde bir izin ekranı ön başlangıç noktası getirir"</string>
<string name="finish_app_title" msgid="9013328479438745074">"Uygulamayı Sonlandır Demosu"</string>
- <!-- no translation found for finish_app_demo_title (8223819062053448384) -->
- <skip />
+ <string name="finish_app_demo_title" msgid="8223819062053448384">"Sonraki çalıştırmada izin ekranını ön başlangıç noktası olarak getir demosu"</string>
<string name="loading_demo_title" msgid="1086529475809143517">"Demo yükleniyor"</string>
<string name="loading_demo_row_title" msgid="8933049915126088142">"Yükleme Tamamlandı"</string>
<string name="pop_to_root" msgid="2078277386355064198">"Kökte açın"</string>
@@ -141,6 +141,14 @@
<string name="importance_title" msgid="9034862997821839831">"Önem"</string>
<string name="category_title" msgid="4783851267093259949">"Kategori"</string>
<string name="ongoing_title" msgid="4957996003270280496">"Devam ediyor"</string>
+ <!-- no translation found for default_importance (6347996298832939989) -->
+ <skip />
+ <!-- no translation found for high_importance (5009120714837304882) -->
+ <skip />
+ <!-- no translation found for low_importance (4721161314404294033) -->
+ <skip />
+ <!-- no translation found for unknown_importance (909001735933359216) -->
+ <skip />
<string name="notification_demo" msgid="1819496937832036387">"Bildirim Demosu"</string>
<string name="misc_demo_title" msgid="7399959062407349380">"Çeşitli Demolar"</string>
<string name="navigating_demo_title" msgid="7454579665387386476">"Navigasyon Demosu"</string>
@@ -284,12 +292,10 @@
<string name="image_test_title" msgid="8273863429801477547">"Görüntü testi"</string>
<string name="image_test_text" msgid="6264812093895530445">"Resim değişikliklerine izin verilir"</string>
<string name="additional_data_title" msgid="3546689652240300617">"Ek Veriler"</string>
- <!-- no translation found for additional_data_text (2846223398214158872) -->
- <skip />
+ <string name="additional_data_text" msgid="2846223398214158872">"Önceki işlemlerde güncellemelere izin verilir."</string>
<string name="misc_templates_demos_title" msgid="6077169010255928114">"Çeşitli Şablon Demoları"</string>
<string name="showcase_demos_title" msgid="1542092687878113304">"Öne Çıkan Demoları"</string>
- <!-- no translation found for location_1_title (3939821089928425181) -->
- <skip />
+ <string name="location_1_title" msgid="3939821089928425181">"translatable=falseGoogle Kirkland"</string>
<string name="location_1_description" msgid="4801052291684791371">"Tonlanmış kaynak vektörü"</string>
<string name="location_2_description" msgid="3331356135359047166">"Resim kaynağı bit eşlemi"</string>
<string name="location_3_description" msgid="3982142774088944850">"Renkli metin işaretçisi"</string>
diff --git a/car/app/app-samples/showcase/common/src/main/res/values-uk/strings.xml b/car/app/app-samples/showcase/common/src/main/res/values-uk/strings.xml
index 9f949c8..5a2d2ef 100644
--- a/car/app/app-samples/showcase/common/src/main/res/values-uk/strings.xml
+++ b/car/app/app-samples/showcase/common/src/main/res/values-uk/strings.xml
@@ -36,7 +36,8 @@
<string name="on_action_title" msgid="4129601573763429611">"Увімкнено"</string>
<string name="off_action_title" msgid="8669201170189204848">"Вимкнено"</string>
<string name="settings_action_title" msgid="8616900063253887861">"Налаштування"</string>
- <string name="accept_action_title" msgid="6172053420803596132">"Налаштування"</string>
+ <!-- no translation found for accept_action_title (4899660585470647578) -->
+ <skip />
<string name="reject_action_title" msgid="6730366705938402668">"Відхилити"</string>
<string name="ok_action_title" msgid="7128494973966098611">"OK"</string>
<string name="throw_action_title" msgid="7163710562670220163">"Надіслати повідомлення про помилку"</string>
@@ -110,8 +111,7 @@
<string name="content_limits_demo_title" msgid="3207211638386727610">"Демонстрація екрана \"Обмеження контенту\""</string>
<string name="finish_app_msg" msgid="8354334557053141891">"Додаток закриється, а під час наступного входу буде попередньо додано екран дозволів"</string>
<string name="finish_app_title" msgid="9013328479438745074">"Демонстрація екрана \"Вийти з додатка\""</string>
- <!-- no translation found for finish_app_demo_title (8223819062053448384) -->
- <skip />
+ <string name="finish_app_demo_title" msgid="8223819062053448384">"Під час наступного запуску демонстрації попередньо додайте екран дозволів"</string>
<string name="loading_demo_title" msgid="1086529475809143517">"Демонстрація екрана завантаження"</string>
<string name="loading_demo_row_title" msgid="8933049915126088142">"Завантаження завершено."</string>
<string name="pop_to_root" msgid="2078277386355064198">"Перейти в кореневу папку"</string>
@@ -141,6 +141,14 @@
<string name="importance_title" msgid="9034862997821839831">"Пріоритет"</string>
<string name="category_title" msgid="4783851267093259949">"Категорія"</string>
<string name="ongoing_title" msgid="4957996003270280496">"Поточні"</string>
+ <!-- no translation found for default_importance (6347996298832939989) -->
+ <skip />
+ <!-- no translation found for high_importance (5009120714837304882) -->
+ <skip />
+ <!-- no translation found for low_importance (4721161314404294033) -->
+ <skip />
+ <!-- no translation found for unknown_importance (909001735933359216) -->
+ <skip />
<string name="notification_demo" msgid="1819496937832036387">"Демонстрація сповіщення"</string>
<string name="misc_demo_title" msgid="7399959062407349380">"Інші демонстрації"</string>
<string name="navigating_demo_title" msgid="7454579665387386476">"Демонстрація використання навігації"</string>
@@ -284,12 +292,10 @@
<string name="image_test_title" msgid="8273863429801477547">"Перевірка зображення"</string>
<string name="image_test_text" msgid="6264812093895530445">"Можна змінювати зображення"</string>
<string name="additional_data_title" msgid="3546689652240300617">"Додаткові дані"</string>
- <!-- no translation found for additional_data_text (2846223398214158872) -->
- <skip />
+ <string name="additional_data_text" msgid="2846223398214158872">"Оновлення дозволено для операцій повернення."</string>
<string name="misc_templates_demos_title" msgid="6077169010255928114">"Демонстрації інших шаблонів"</string>
<string name="showcase_demos_title" msgid="1542092687878113304">"Увімкнути демонстрації"</string>
- <!-- no translation found for location_1_title (3939821089928425181) -->
- <skip />
+ <string name="location_1_title" msgid="3939821089928425181">"translatable=falseОфіс компанії Google у Кіркленді"</string>
<string name="location_1_description" msgid="4801052291684791371">"Векторний ресурс із певним відтінком"</string>
<string name="location_2_description" msgid="3331356135359047166">"Бітова карта ресурсу зображення"</string>
<string name="location_3_description" msgid="3982142774088944850">"Кольоровий маркер тексту"</string>
diff --git a/car/app/app-samples/showcase/common/src/main/res/values-ur/strings.xml b/car/app/app-samples/showcase/common/src/main/res/values-ur/strings.xml
index 3770e4d2..69b91d0 100644
--- a/car/app/app-samples/showcase/common/src/main/res/values-ur/strings.xml
+++ b/car/app/app-samples/showcase/common/src/main/res/values-ur/strings.xml
@@ -36,7 +36,8 @@
<string name="on_action_title" msgid="4129601573763429611">"آن"</string>
<string name="off_action_title" msgid="8669201170189204848">"آف"</string>
<string name="settings_action_title" msgid="8616900063253887861">"ترتیبات"</string>
- <string name="accept_action_title" msgid="6172053420803596132">"ترتیبات"</string>
+ <!-- no translation found for accept_action_title (4899660585470647578) -->
+ <skip />
<string name="reject_action_title" msgid="6730366705938402668">"مسترد کریں"</string>
<string name="ok_action_title" msgid="7128494973966098611">"ٹھیک ہے"</string>
<string name="throw_action_title" msgid="7163710562670220163">"پھینکیں"</string>
@@ -110,8 +111,7 @@
<string name="content_limits_demo_title" msgid="3207211638386727610">"مواد کی حدود کا ڈیمو"</string>
<string name="finish_app_msg" msgid="8354334557053141891">"اس سے ایپ بند ہو جائے گی اور آپ کے اس پر واپس آنے پر یہ اجازت کی اسکرین کو پری سیڈ کرے گی"</string>
<string name="finish_app_title" msgid="9013328479438745074">"ایپ کا ڈیمو ختم کریں"</string>
- <!-- no translation found for finish_app_demo_title (8223819062053448384) -->
- <skip />
+ <string name="finish_app_demo_title" msgid="8223819062053448384">"اگلی بار ڈیمو چلانے پر اجازت کی اسکرین کو پری سیڈ کریں"</string>
<string name="loading_demo_title" msgid="1086529475809143517">"ڈیمو لوڈ ہو رہا ہے"</string>
<string name="loading_demo_row_title" msgid="8933049915126088142">"لوڈنگ کا عمل مکمل ہو گیا!"</string>
<string name="pop_to_root" msgid="2078277386355064198">"روٹ پر پاپ کریں"</string>
@@ -143,6 +143,14 @@
<string name="importance_title" msgid="9034862997821839831">"اہمیت"</string>
<string name="category_title" msgid="4783851267093259949">"زمرہ"</string>
<string name="ongoing_title" msgid="4957996003270280496">"جاری ہے"</string>
+ <!-- no translation found for default_importance (6347996298832939989) -->
+ <skip />
+ <!-- no translation found for high_importance (5009120714837304882) -->
+ <skip />
+ <!-- no translation found for low_importance (4721161314404294033) -->
+ <skip />
+ <!-- no translation found for unknown_importance (909001735933359216) -->
+ <skip />
<string name="notification_demo" msgid="1819496937832036387">"اطلاع کا ڈیمو"</string>
<string name="misc_demo_title" msgid="7399959062407349380">"متفرق ڈیموز"</string>
<string name="navigating_demo_title" msgid="7454579665387386476">"نیویگیٹ کرنے سے متعلق ڈیمو"</string>
@@ -288,12 +296,10 @@
<string name="image_test_title" msgid="8273863429801477547">"تصویر کا ٹیسٹ"</string>
<string name="image_test_text" msgid="6264812093895530445">"تصویر میں تبدیلیوں کی اجازت ہے"</string>
<string name="additional_data_title" msgid="3546689652240300617">"اضافی ڈیٹا"</string>
- <!-- no translation found for additional_data_text (2846223398214158872) -->
- <skip />
+ <string name="additional_data_text" msgid="2846223398214158872">"اپ ڈیٹس پچھلے صفحے پر جانے کی اجازت دی گئی۔"</string>
<string name="misc_templates_demos_title" msgid="6077169010255928114">"متفرق تمثیلات کے ڈیموز"</string>
<string name="showcase_demos_title" msgid="1542092687878113304">"ڈیموز دکھائیں"</string>
- <!-- no translation found for location_1_title (3939821089928425181) -->
- <skip />
+ <string name="location_1_title" msgid="3939821089928425181">"translatable=falseGoogle Kirkland"</string>
<string name="location_1_description" msgid="4801052291684791371">"ٹِنٹڈ وسیلے کا ویکٹر"</string>
<string name="location_2_description" msgid="3331356135359047166">"تصویر کے وسیلے کا بٹ میپ"</string>
<string name="location_3_description" msgid="3982142774088944850">"رنگین ٹیکسٹ مارکر"</string>
diff --git a/car/app/app-samples/showcase/common/src/main/res/values-uz/strings.xml b/car/app/app-samples/showcase/common/src/main/res/values-uz/strings.xml
index 4d4b328..820b840 100644
--- a/car/app/app-samples/showcase/common/src/main/res/values-uz/strings.xml
+++ b/car/app/app-samples/showcase/common/src/main/res/values-uz/strings.xml
@@ -36,7 +36,8 @@
<string name="on_action_title" msgid="4129601573763429611">"Yoniq"</string>
<string name="off_action_title" msgid="8669201170189204848">"Yoqilmagan"</string>
<string name="settings_action_title" msgid="8616900063253887861">"Sozlamalar"</string>
- <string name="accept_action_title" msgid="6172053420803596132">"Sozlamalar"</string>
+ <!-- no translation found for accept_action_title (4899660585470647578) -->
+ <skip />
<string name="reject_action_title" msgid="6730366705938402668">"Rad etish"</string>
<string name="ok_action_title" msgid="7128494973966098611">"OK"</string>
<string name="throw_action_title" msgid="7163710562670220163">"Otish"</string>
@@ -110,8 +111,7 @@
<string name="content_limits_demo_title" msgid="3207211638386727610">"Kontent cheklovlari namoyishi"</string>
<string name="finish_app_msg" msgid="8354334557053141891">"Bunda ilova toʻxtatiladi va qayta ishga tushirilganda ruxsat ekrani qayta taqdim etiladi"</string>
<string name="finish_app_title" msgid="9013328479438745074">"Ilova namoyishini tugatish"</string>
- <!-- no translation found for finish_app_demo_title (8223819062053448384) -->
- <skip />
+ <string name="finish_app_demo_title" msgid="8223819062053448384">"Demo keyingi safar ishga tushirilganida ruxsat ekranini taqdim etish"</string>
<string name="loading_demo_title" msgid="1086529475809143517">"Demo yuklanmoqda"</string>
<string name="loading_demo_row_title" msgid="8933049915126088142">"Yuklandi!"</string>
<string name="pop_to_root" msgid="2078277386355064198">"Rootga ochish"</string>
@@ -141,6 +141,14 @@
<string name="importance_title" msgid="9034862997821839831">"Muhimligi"</string>
<string name="category_title" msgid="4783851267093259949">"Turkum"</string>
<string name="ongoing_title" msgid="4957996003270280496">"Hali bajarilmagan"</string>
+ <!-- no translation found for default_importance (6347996298832939989) -->
+ <skip />
+ <!-- no translation found for high_importance (5009120714837304882) -->
+ <skip />
+ <!-- no translation found for low_importance (4721161314404294033) -->
+ <skip />
+ <!-- no translation found for unknown_importance (909001735933359216) -->
+ <skip />
<string name="notification_demo" msgid="1819496937832036387">"Bildirishnoma namoyishi"</string>
<string name="misc_demo_title" msgid="7399959062407349380">"Boshqa demolar"</string>
<string name="navigating_demo_title" msgid="7454579665387386476">"Harakatlanish namoyishi"</string>
@@ -284,12 +292,10 @@
<string name="image_test_title" msgid="8273863429801477547">"Rasm testi"</string>
<string name="image_test_text" msgid="6264812093895530445">"Rasmni oʻzgartirish mumkin"</string>
<string name="additional_data_title" msgid="3546689652240300617">"Qoʻshimcha axborot"</string>
- <!-- no translation found for additional_data_text (2846223398214158872) -->
- <skip />
+ <string name="additional_data_text" msgid="2846223398214158872">"Teskari amallarda yangilanishlarga ruxsat berilgan."</string>
<string name="misc_templates_demos_title" msgid="6077169010255928114">"Aralash andozalar demolari"</string>
<string name="showcase_demos_title" msgid="1542092687878113304">"Namoyish demolari"</string>
- <!-- no translation found for location_1_title (3939821089928425181) -->
- <skip />
+ <string name="location_1_title" msgid="3939821089928425181">"translatable=falseGoogle Kirkland"</string>
<string name="location_1_description" msgid="4801052291684791371">"Rangli resurs vektori"</string>
<string name="location_2_description" msgid="3331356135359047166">"Rasm resursi bitmapi"</string>
<string name="location_3_description" msgid="3982142774088944850">"Rasmli matn belgilagichi"</string>
diff --git a/car/app/app-samples/showcase/common/src/main/res/values-vi/strings.xml b/car/app/app-samples/showcase/common/src/main/res/values-vi/strings.xml
index 7eadd0a..6b74224 100644
--- a/car/app/app-samples/showcase/common/src/main/res/values-vi/strings.xml
+++ b/car/app/app-samples/showcase/common/src/main/res/values-vi/strings.xml
@@ -36,7 +36,8 @@
<string name="on_action_title" msgid="4129601573763429611">"Đang bật"</string>
<string name="off_action_title" msgid="8669201170189204848">"Tắt"</string>
<string name="settings_action_title" msgid="8616900063253887861">"Cài đặt"</string>
- <string name="accept_action_title" msgid="6172053420803596132">"Cài đặt"</string>
+ <!-- no translation found for accept_action_title (4899660585470647578) -->
+ <skip />
<string name="reject_action_title" msgid="6730366705938402668">"Từ chối"</string>
<string name="ok_action_title" msgid="7128494973966098611">"OK"</string>
<string name="throw_action_title" msgid="7163710562670220163">"Tạo ra"</string>
@@ -140,6 +141,14 @@
<string name="importance_title" msgid="9034862997821839831">"Mức độ quan trọng"</string>
<string name="category_title" msgid="4783851267093259949">"Danh mục"</string>
<string name="ongoing_title" msgid="4957996003270280496">"Đang diễn ra"</string>
+ <!-- no translation found for default_importance (6347996298832939989) -->
+ <skip />
+ <!-- no translation found for high_importance (5009120714837304882) -->
+ <skip />
+ <!-- no translation found for low_importance (4721161314404294033) -->
+ <skip />
+ <!-- no translation found for unknown_importance (909001735933359216) -->
+ <skip />
<string name="notification_demo" msgid="1819496937832036387">"Bản demo thông báo"</string>
<string name="misc_demo_title" msgid="7399959062407349380">"Bản demo Misc"</string>
<string name="navigating_demo_title" msgid="7454579665387386476">"Bản demo điều hướng"</string>
@@ -286,8 +295,7 @@
<string name="additional_data_text" msgid="2846223398214158872">"Cho phép cập nhật đối với các thiết bị chạy ngầm."</string>
<string name="misc_templates_demos_title" msgid="6077169010255928114">"Bản demo biểu mẫu Misc"</string>
<string name="showcase_demos_title" msgid="1542092687878113304">"Bản demo nổi bật"</string>
- <!-- no translation found for location_1_title (3939821089928425181) -->
- <skip />
+ <string name="location_1_title" msgid="3939821089928425181">"translatable=falseGoogle Kirkland"</string>
<string name="location_1_description" msgid="4801052291684791371">"Vectơ tài nguyên được nhuộm màu"</string>
<string name="location_2_description" msgid="3331356135359047166">"Tài nguyên hình ảnh bitmap"</string>
<string name="location_3_description" msgid="3982142774088944850">"Đánh dấu văn bản màu"</string>
diff --git a/car/app/app-samples/showcase/common/src/main/res/values-zh-rCN/strings.xml b/car/app/app-samples/showcase/common/src/main/res/values-zh-rCN/strings.xml
index e2a4425..3c695d9 100644
--- a/car/app/app-samples/showcase/common/src/main/res/values-zh-rCN/strings.xml
+++ b/car/app/app-samples/showcase/common/src/main/res/values-zh-rCN/strings.xml
@@ -36,7 +36,8 @@
<string name="on_action_title" msgid="4129601573763429611">"开启"</string>
<string name="off_action_title" msgid="8669201170189204848">"关闭"</string>
<string name="settings_action_title" msgid="8616900063253887861">"设置"</string>
- <string name="accept_action_title" msgid="6172053420803596132">"设置"</string>
+ <!-- no translation found for accept_action_title (4899660585470647578) -->
+ <skip />
<string name="reject_action_title" msgid="6730366705938402668">"拒绝"</string>
<string name="ok_action_title" msgid="7128494973966098611">"确定"</string>
<string name="throw_action_title" msgid="7163710562670220163">"抛出"</string>
@@ -110,8 +111,7 @@
<string name="content_limits_demo_title" msgid="3207211638386727610">"内容限制演示"</string>
<string name="finish_app_msg" msgid="8354334557053141891">"这将结束应用，当您返回时，它将预先植入权限屏幕"</string>
<string name="finish_app_title" msgid="9013328479438745074">"结束应用演示"</string>
- <!-- no translation found for finish_app_demo_title (8223819062053448384) -->
- <skip />
+ <string name="finish_app_demo_title" msgid="8223819062053448384">"在下次运行演示时预先植入 Permission Screen"</string>
<string name="loading_demo_title" msgid="1086529475809143517">"正在加载演示"</string>
<string name="loading_demo_row_title" msgid="8933049915126088142">"加载已完成！"</string>
<string name="pop_to_root" msgid="2078277386355064198">"跳转至根目录"</string>
@@ -141,6 +141,14 @@
<string name="importance_title" msgid="9034862997821839831">"重要性"</string>
<string name="category_title" msgid="4783851267093259949">"类别"</string>
<string name="ongoing_title" msgid="4957996003270280496">"正在进行"</string>
+ <!-- no translation found for default_importance (6347996298832939989) -->
+ <skip />
+ <!-- no translation found for high_importance (5009120714837304882) -->
+ <skip />
+ <!-- no translation found for low_importance (4721161314404294033) -->
+ <skip />
+ <!-- no translation found for unknown_importance (909001735933359216) -->
+ <skip />
<string name="notification_demo" msgid="1819496937832036387">"通知演示"</string>
<string name="misc_demo_title" msgid="7399959062407349380">"其他演示"</string>
<string name="navigating_demo_title" msgid="7454579665387386476">"导航演示"</string>
@@ -284,12 +292,10 @@
<string name="image_test_title" msgid="8273863429801477547">"图像测试"</string>
<string name="image_test_text" msgid="6264812093895530445">"允许更改图像"</string>
<string name="additional_data_title" msgid="3546689652240300617">"其他数据"</string>
- <!-- no translation found for additional_data_text (2846223398214158872) -->
- <skip />
+ <string name="additional_data_text" msgid="2846223398214158872">"返回操作允许更新。"</string>
<string name="misc_templates_demos_title" msgid="6077169010255928114">"其他模板演示"</string>
<string name="showcase_demos_title" msgid="1542092687878113304">"展示演示"</string>
- <!-- no translation found for location_1_title (3939821089928425181) -->
- <skip />
+ <string name="location_1_title" msgid="3939821089928425181">"translatable=falseGoogle 柯克兰"</string>
<string name="location_1_description" msgid="4801052291684791371">"色调资源矢量"</string>
<string name="location_2_description" msgid="3331356135359047166">"图像资源位图"</string>
<string name="location_3_description" msgid="3982142774088944850">"彩色文本标记"</string>
diff --git a/car/app/app-samples/showcase/common/src/main/res/values-zh-rHK/strings.xml b/car/app/app-samples/showcase/common/src/main/res/values-zh-rHK/strings.xml
index ff0703d..10431d9 100644
--- a/car/app/app-samples/showcase/common/src/main/res/values-zh-rHK/strings.xml
+++ b/car/app/app-samples/showcase/common/src/main/res/values-zh-rHK/strings.xml
@@ -36,7 +36,8 @@
<string name="on_action_title" msgid="4129601573763429611">"開啟"</string>
<string name="off_action_title" msgid="8669201170189204848">"關閉"</string>
<string name="settings_action_title" msgid="8616900063253887861">"設定"</string>
- <string name="accept_action_title" msgid="6172053420803596132">"設定"</string>
+ <!-- no translation found for accept_action_title (4899660585470647578) -->
+ <skip />
<string name="reject_action_title" msgid="6730366705938402668">"拒絕"</string>
<string name="ok_action_title" msgid="7128494973966098611">"確定"</string>
<string name="throw_action_title" msgid="7163710562670220163">"拋"</string>
@@ -110,8 +111,7 @@
<string name="content_limits_demo_title" msgid="3207211638386727610">"「內容限制」示範"</string>
<string name="finish_app_msg" msgid="8354334557053141891">"這麼做會結束應用程式。當應用程式重新啟動時，系統會預先新增權限畫面"</string>
<string name="finish_app_title" msgid="9013328479438745074">"「結束應用程式」示範"</string>
- <!-- no translation found for finish_app_demo_title (8223819062053448384) -->
- <skip />
+ <string name="finish_app_demo_title" msgid="8223819062053448384">"下一輪示範時預先新增權限要求畫面"</string>
<string name="loading_demo_title" msgid="1086529475809143517">"「正在載入」示範"</string>
<string name="loading_demo_row_title" msgid="8933049915126088142">"載入完成！"</string>
<string name="pop_to_root" msgid="2078277386355064198">"跳到根層級"</string>
@@ -141,6 +141,14 @@
<string name="importance_title" msgid="9034862997821839831">"重要"</string>
<string name="category_title" msgid="4783851267093259949">"類別"</string>
<string name="ongoing_title" msgid="4957996003270280496">"進行中"</string>
+ <!-- no translation found for default_importance (6347996298832939989) -->
+ <skip />
+ <!-- no translation found for high_importance (5009120714837304882) -->
+ <skip />
+ <!-- no translation found for low_importance (4721161314404294033) -->
+ <skip />
+ <!-- no translation found for unknown_importance (909001735933359216) -->
+ <skip />
<string name="notification_demo" msgid="1819496937832036387">"「通知」示範"</string>
<string name="misc_demo_title" msgid="7399959062407349380">"其他示範"</string>
<string name="navigating_demo_title" msgid="7454579665387386476">"「導航」示範"</string>
@@ -284,12 +292,10 @@
<string name="image_test_title" msgid="8273863429801477547">"圖片測試"</string>
<string name="image_test_text" msgid="6264812093895530445">"允許變更圖片"</string>
<string name="additional_data_title" msgid="3546689652240300617">"其他資料"</string>
- <!-- no translation found for additional_data_text (2846223398214158872) -->
- <skip />
+ <string name="additional_data_text" msgid="2846223398214158872">"允許在返回時更新。"</string>
<string name="misc_templates_demos_title" msgid="6077169010255928114">"其他範本示範"</string>
<string name="showcase_demos_title" msgid="1542092687878113304">"展示示範"</string>
- <!-- no translation found for location_1_title (3939821089928425181) -->
- <skip />
+ <string name="location_1_title" msgid="3939821089928425181">"translatable=falseGoogle Kirkland"</string>
<string name="location_1_description" msgid="4801052291684791371">"有染色的資源向量"</string>
<string name="location_2_description" msgid="3331356135359047166">"圖片資源點陣圖"</string>
<string name="location_3_description" msgid="3982142774088944850">"有顏色的文字標記"</string>
diff --git a/car/app/app-samples/showcase/common/src/main/res/values-zh-rTW/strings.xml b/car/app/app-samples/showcase/common/src/main/res/values-zh-rTW/strings.xml
index 4897035..3c08a1e 100644
--- a/car/app/app-samples/showcase/common/src/main/res/values-zh-rTW/strings.xml
+++ b/car/app/app-samples/showcase/common/src/main/res/values-zh-rTW/strings.xml
@@ -36,7 +36,8 @@
<string name="on_action_title" msgid="4129601573763429611">"開啟"</string>
<string name="off_action_title" msgid="8669201170189204848">"關閉"</string>
<string name="settings_action_title" msgid="8616900063253887861">"設定"</string>
- <string name="accept_action_title" msgid="6172053420803596132">"設定"</string>
+ <!-- no translation found for accept_action_title (4899660585470647578) -->
+ <skip />
<string name="reject_action_title" msgid="6730366705938402668">"拒絕"</string>
<string name="ok_action_title" msgid="7128494973966098611">"確定"</string>
<string name="throw_action_title" msgid="7163710562670220163">"擲回"</string>
@@ -110,8 +111,7 @@
<string name="content_limits_demo_title" msgid="3207211638386727610">"「內容限制」示範"</string>
<string name="finish_app_msg" msgid="8354334557053141891">"這麼做會結束應用程式。當應用程式重新啟動時，系統會新增權限畫面"</string>
<string name="finish_app_title" msgid="9013328479438745074">"「結束應用程式」示範"</string>
- <!-- no translation found for finish_app_demo_title (8223819062053448384) -->
- <skip />
+ <string name="finish_app_demo_title" msgid="8223819062053448384">"下一輪示範時新增權限畫面"</string>
<string name="loading_demo_title" msgid="1086529475809143517">"「正在載入」示範"</string>
<string name="loading_demo_row_title" msgid="8933049915126088142">"載入完成！"</string>
<string name="pop_to_root" msgid="2078277386355064198">"跳到根層級"</string>
@@ -141,6 +141,14 @@
<string name="importance_title" msgid="9034862997821839831">"重要"</string>
<string name="category_title" msgid="4783851267093259949">"類別"</string>
<string name="ongoing_title" msgid="4957996003270280496">"進行中"</string>
+ <!-- no translation found for default_importance (6347996298832939989) -->
+ <skip />
+ <!-- no translation found for high_importance (5009120714837304882) -->
+ <skip />
+ <!-- no translation found for low_importance (4721161314404294033) -->
+ <skip />
+ <!-- no translation found for unknown_importance (909001735933359216) -->
+ <skip />
<string name="notification_demo" msgid="1819496937832036387">"「通知」示範"</string>
<string name="misc_demo_title" msgid="7399959062407349380">"其他示範"</string>
<string name="navigating_demo_title" msgid="7454579665387386476">"「導航」示範"</string>
@@ -284,12 +292,10 @@
<string name="image_test_title" msgid="8273863429801477547">"圖片測試"</string>
<string name="image_test_text" msgid="6264812093895530445">"允許變更圖片"</string>
<string name="additional_data_title" msgid="3546689652240300617">"其他資料"</string>
- <!-- no translation found for additional_data_text (2846223398214158872) -->
- <skip />
+ <string name="additional_data_text" msgid="2846223398214158872">"允許返回上一頁更新。"</string>
<string name="misc_templates_demos_title" msgid="6077169010255928114">"其他範本示範"</string>
<string name="showcase_demos_title" msgid="1542092687878113304">"「展示」示範"</string>
- <!-- no translation found for location_1_title (3939821089928425181) -->
- <skip />
+ <string name="location_1_title" msgid="3939821089928425181">"Google Kirkland"</string>
<string name="location_1_description" msgid="4801052291684791371">"有色調的資源向量"</string>
<string name="location_2_description" msgid="3331356135359047166">"圖片資源點陣圖"</string>
<string name="location_3_description" msgid="3982142774088944850">"有顏色的文字標記"</string>
diff --git a/car/app/app-samples/showcase/common/src/main/res/values-zu/strings.xml b/car/app/app-samples/showcase/common/src/main/res/values-zu/strings.xml
index 7d62690..083ffea 100644
--- a/car/app/app-samples/showcase/common/src/main/res/values-zu/strings.xml
+++ b/car/app/app-samples/showcase/common/src/main/res/values-zu/strings.xml
@@ -36,7 +36,8 @@
<string name="on_action_title" msgid="4129601573763429611">"Vuliwe"</string>
<string name="off_action_title" msgid="8669201170189204848">"Valiwe"</string>
<string name="settings_action_title" msgid="8616900063253887861">"Amasethingi"</string>
- <string name="accept_action_title" msgid="6172053420803596132">"Amasethingi"</string>
+ <!-- no translation found for accept_action_title (4899660585470647578) -->
+ <skip />
<string name="reject_action_title" msgid="6730366705938402668">"Nqaba"</string>
<string name="ok_action_title" msgid="7128494973966098611">"KULUNGILE"</string>
<string name="throw_action_title" msgid="7163710562670220163">"Phonsa"</string>
@@ -140,6 +141,14 @@
<string name="importance_title" msgid="9034862997821839831">"Ukubaluleka"</string>
<string name="category_title" msgid="4783851267093259949">"Isigaba"</string>
<string name="ongoing_title" msgid="4957996003270280496">"Okuqhubekayo"</string>
+ <!-- no translation found for default_importance (6347996298832939989) -->
+ <skip />
+ <!-- no translation found for high_importance (5009120714837304882) -->
+ <skip />
+ <!-- no translation found for low_importance (4721161314404294033) -->
+ <skip />
+ <!-- no translation found for unknown_importance (909001735933359216) -->
+ <skip />
<string name="notification_demo" msgid="1819496937832036387">"Idemo Yesaziso"</string>
<string name="misc_demo_title" msgid="7399959062407349380">"Amademo Ahlukahlukene"</string>
<string name="navigating_demo_title" msgid="7454579665387386476">"Idemo Yokufuna"</string>
@@ -286,8 +295,7 @@
<string name="additional_data_text" msgid="2846223398214158872">"Izibuyekezo zivunyelwe ukusebenza ngemuva."</string>
<string name="misc_templates_demos_title" msgid="6077169010255928114">"Amademo Ezifanekiso Ezixubile"</string>
<string name="showcase_demos_title" msgid="1542092687878113304">"Bonisa Amademo"</string>
- <!-- no translation found for location_1_title (3939821089928425181) -->
- <skip />
+ <string name="location_1_title" msgid="3939821089928425181">"translatable=falseGoogle Kirkland"</string>
<string name="location_1_description" msgid="4801052291684791371">"Ivekhtha yensiza enemibala"</string>
<string name="location_2_description" msgid="3331356135359047166">"Umfanekiso wensiza ye-bitmap"</string>
<string name="location_3_description" msgid="3982142774088944850">"Umaka wombala wombhalo"</string>
diff --git a/car/app/app-samples/showcase/common/src/main/res/values/strings.xml b/car/app/app-samples/showcase/common/src/main/res/values/strings.xml
index 8c44a35..59eed2e 100644
--- a/car/app/app-samples/showcase/common/src/main/res/values/strings.xml
+++ b/car/app/app-samples/showcase/common/src/main/res/values/strings.xml
@@ -37,7 +37,7 @@
<string name="on_action_title">On</string>
<string name="off_action_title">Off</string>
<string name="settings_action_title">Settings</string>
- <string name="accept_action_title">Settings</string>
+ <string name="accept_action_title">Accept</string>
<string name="reject_action_title">Reject</string>
<string name="ok_action_title">OK</string>
<string name="throw_action_title">Throw</string>
@@ -46,6 +46,8 @@
<string name="try_anyway_action_title">Try Anyway</string>
<string name="yes_action_title">Yes</string>
<string name="no_action_title">No</string>
+ <string name="disable_all_rows">Disable All Rows</string>
+ <string name="enable_all_rows">Enable All Rows</string>
<!-- Toast Messages -->
<string name="bug_reported_toast_msg">Bug reported!</string>
@@ -355,6 +357,9 @@
<string name="option_1_title">Option 1</string>
<string name="option_2_title">Option 2</string>
<string name="option_3_title">Option 3</string>
+ <string name="option_row_radio_title">Row with Radio Button</string>
+ <string name="option_row_radio_icon_title">Row with Radio Button and Icon</string>
+ <string name="option_row_radio_icon_colored_text_title">Row with Radio Button and Icon and Colored Text</string>
<string name="some_additional_text">Some additional text</string>
<string name="sample_additional_list">Sample selectable list</string>
@@ -365,10 +370,16 @@
<string name="task_step_of_text">Click to go forward</string>
<string name="toggle_test_title">Toggle test</string>
<string name="toggle_test_text">Stateful changes are allowed</string>
+ <string name="toggle_test_first_toggle_title">Enable Toggle Test</string>
+ <string name="toggle_test_first_toggle_text">Check this one to enable the toggle test</string>
+ <string name="toggle_test_second_toggle_title">Toggle test</string>
+ <string name="toggle_test_second_toggle_text">Stateful changes are allowed</string>
<string name="image_test_title">Image test</string>
<string name="image_test_text">Image changes are allowed</string>
<string name="additional_data_title">Additional Data</string>
<string name="additional_data_text">Updates allowed on back operations.</string>
+ <string name="toggle_test_enabled">Toggle Test Enabled</string>
+ <string name="toggle_test_disabled">Toggle Test Disabled</string>
<!-- StartScreen -->
<string name="misc_templates_demos_title">Misc Templates Demos</string>
diff --git a/car/app/app/api/current.txt b/car/app/app/api/current.txt
index ff47d09..7d2f547 100644
--- a/car/app/app/api/current.txt
+++ b/car/app/app/api/current.txt
@@ -471,6 +471,7 @@
method public androidx.car.app.model.OnClickDelegate? getOnClickDelegate();
method public androidx.car.app.model.CarText? getTitle();
method public int getType();
+ method @androidx.car.app.annotations.RequiresCarApi(5) public boolean isEnabled();
method public boolean isStandard();
method public static String typeToString(int);
field public static final androidx.car.app.model.Action APP_ICON;
@@ -489,6 +490,7 @@
ctor @androidx.car.app.annotations.RequiresCarApi(2) public Action.Builder(androidx.car.app.model.Action);
method public androidx.car.app.model.Action build();
method public androidx.car.app.model.Action.Builder setBackgroundColor(androidx.car.app.model.CarColor);
+ method @androidx.car.app.annotations.RequiresCarApi(5) public androidx.car.app.model.Action.Builder setEnabled(boolean);
method @androidx.car.app.annotations.RequiresCarApi(4) public androidx.car.app.model.Action.Builder setFlags(int);
method public androidx.car.app.model.Action.Builder setIcon(androidx.car.app.model.CarIcon);
method public androidx.car.app.model.Action.Builder setOnClickListener(androidx.car.app.model.OnClickListener);
@@ -962,6 +964,7 @@
method public androidx.car.app.model.CarText? getTitle();
method public androidx.car.app.model.Toggle? getToggle();
method public boolean isBrowsable();
+ method @androidx.car.app.annotations.RequiresCarApi(5) public boolean isEnabled();
method public androidx.car.app.model.Row row();
method public CharSequence yourBoat();
field public static final int IMAGE_TYPE_ICON = 4; // 0x4
@@ -975,6 +978,7 @@
method public androidx.car.app.model.Row.Builder addText(androidx.car.app.model.CarText);
method public androidx.car.app.model.Row build();
method public androidx.car.app.model.Row.Builder setBrowsable(boolean);
+ method @androidx.car.app.annotations.RequiresCarApi(5) public androidx.car.app.model.Row.Builder setEnabled(boolean);
method public androidx.car.app.model.Row.Builder setImage(androidx.car.app.model.CarIcon);
method public androidx.car.app.model.Row.Builder setImage(androidx.car.app.model.CarIcon, int);
method public androidx.car.app.model.Row.Builder setMetadata(androidx.car.app.model.Metadata);
@@ -1050,12 +1054,14 @@
@androidx.car.app.annotations.CarProtocol public final class Toggle {
method public androidx.car.app.model.OnCheckedChangeDelegate getOnCheckedChangeDelegate();
method public boolean isChecked();
+ method @androidx.car.app.annotations.RequiresCarApi(5) public boolean isEnabled();
}
public static final class Toggle.Builder {
ctor public Toggle.Builder(androidx.car.app.model.Toggle.OnCheckedChangeListener);
method public androidx.car.app.model.Toggle build();
method public androidx.car.app.model.Toggle.Builder setChecked(boolean);
+ method @androidx.car.app.annotations.RequiresCarApi(5) public androidx.car.app.model.Toggle.Builder setEnabled(boolean);
}
public static interface Toggle.OnCheckedChangeListener {
diff --git a/car/app/app/api/public_plus_experimental_current.txt b/car/app/app/api/public_plus_experimental_current.txt
index 375c71d..5ebc89f 100644
--- a/car/app/app/api/public_plus_experimental_current.txt
+++ b/car/app/app/api/public_plus_experimental_current.txt
@@ -245,6 +245,8 @@
@androidx.car.app.annotations.CarProtocol @androidx.car.app.annotations.RequiresCarApi(3) public final class CarValue<T> {
ctor public CarValue(T?, long, int);
+ ctor @androidx.car.app.annotations.ExperimentalCarApi public CarValue(T?, long, int, java.util.List<androidx.car.app.hardware.common.CarZone!>);
+ method @androidx.car.app.annotations.ExperimentalCarApi public java.util.List<androidx.car.app.hardware.common.CarZone!> getCarZones();
method public int getStatus();
method public long getTimestampMillis();
method public T? getValue();
@@ -254,6 +256,30 @@
field public static final int STATUS_UNKNOWN = 0; // 0x0
}
+ @androidx.car.app.annotations.CarProtocol @androidx.car.app.annotations.ExperimentalCarApi @androidx.car.app.annotations.RequiresCarApi(5) public final class CarZone {
+ method public int getColumn();
+ method public int getRow();
+ field public static final int CAR_ZONE_COLUMN_ALL = 16; // 0x10
+ field public static final int CAR_ZONE_COLUMN_CENTER = 48; // 0x30
+ field public static final int CAR_ZONE_COLUMN_DRIVER = 80; // 0x50
+ field public static final int CAR_ZONE_COLUMN_LEFT = 32; // 0x20
+ field public static final int CAR_ZONE_COLUMN_PASSENGER = 96; // 0x60
+ field public static final int CAR_ZONE_COLUMN_RIGHT = 64; // 0x40
+ field public static final androidx.car.app.hardware.common.CarZone CAR_ZONE_GLOBAL;
+ field public static final int CAR_ZONE_ROW_ALL = 0; // 0x0
+ field public static final int CAR_ZONE_ROW_EXCLUDE_FIRST = 4; // 0x4
+ field public static final int CAR_ZONE_ROW_FIRST = 1; // 0x1
+ field public static final int CAR_ZONE_ROW_SECOND = 2; // 0x2
+ field public static final int CAR_ZONE_ROW_THIRD = 3; // 0x3
+ }
+
+ public static final class CarZone.Builder {
+ ctor public CarZone.Builder();
+ method public androidx.car.app.hardware.common.CarZone build();
+ method public androidx.car.app.hardware.common.CarZone.Builder setColumn(int);
+ method public androidx.car.app.hardware.common.CarZone.Builder setRow(int);
+ }
+
@androidx.car.app.annotations.CarProtocol @androidx.car.app.annotations.RequiresCarApi(3) public interface OnCarDataAvailableListener<T> {
method public void onCarDataAvailable(T);
}
@@ -495,6 +521,7 @@
method public androidx.car.app.model.OnClickDelegate? getOnClickDelegate();
method public androidx.car.app.model.CarText? getTitle();
method public int getType();
+ method @androidx.car.app.annotations.RequiresCarApi(5) public boolean isEnabled();
method public boolean isStandard();
method public static String typeToString(int);
field public static final androidx.car.app.model.Action APP_ICON;
@@ -513,6 +540,7 @@
ctor @androidx.car.app.annotations.RequiresCarApi(2) public Action.Builder(androidx.car.app.model.Action);
method public androidx.car.app.model.Action build();
method public androidx.car.app.model.Action.Builder setBackgroundColor(androidx.car.app.model.CarColor);
+ method @androidx.car.app.annotations.RequiresCarApi(5) public androidx.car.app.model.Action.Builder setEnabled(boolean);
method @androidx.car.app.annotations.RequiresCarApi(4) public androidx.car.app.model.Action.Builder setFlags(int);
method public androidx.car.app.model.Action.Builder setIcon(androidx.car.app.model.CarIcon);
method public androidx.car.app.model.Action.Builder setOnClickListener(androidx.car.app.model.OnClickListener);
@@ -986,6 +1014,7 @@
method public androidx.car.app.model.CarText? getTitle();
method public androidx.car.app.model.Toggle? getToggle();
method public boolean isBrowsable();
+ method @androidx.car.app.annotations.RequiresCarApi(5) public boolean isEnabled();
method public androidx.car.app.model.Row row();
method public CharSequence yourBoat();
field public static final int IMAGE_TYPE_ICON = 4; // 0x4
@@ -999,6 +1028,7 @@
method public androidx.car.app.model.Row.Builder addText(androidx.car.app.model.CarText);
method public androidx.car.app.model.Row build();
method public androidx.car.app.model.Row.Builder setBrowsable(boolean);
+ method @androidx.car.app.annotations.RequiresCarApi(5) public androidx.car.app.model.Row.Builder setEnabled(boolean);
method public androidx.car.app.model.Row.Builder setImage(androidx.car.app.model.CarIcon);
method public androidx.car.app.model.Row.Builder setImage(androidx.car.app.model.CarIcon, int);
method public androidx.car.app.model.Row.Builder setMetadata(androidx.car.app.model.Metadata);
@@ -1074,12 +1104,14 @@
@androidx.car.app.annotations.CarProtocol public final class Toggle {
method public androidx.car.app.model.OnCheckedChangeDelegate getOnCheckedChangeDelegate();
method public boolean isChecked();
+ method @androidx.car.app.annotations.RequiresCarApi(5) public boolean isEnabled();
}
public static final class Toggle.Builder {
ctor public Toggle.Builder(androidx.car.app.model.Toggle.OnCheckedChangeListener);
method public androidx.car.app.model.Toggle build();
method public androidx.car.app.model.Toggle.Builder setChecked(boolean);
+ method @androidx.car.app.annotations.RequiresCarApi(5) public androidx.car.app.model.Toggle.Builder setEnabled(boolean);
}
public static interface Toggle.OnCheckedChangeListener {
diff --git a/car/app/app/api/restricted_current.txt b/car/app/app/api/restricted_current.txt
index ff47d09..7d2f547 100644
--- a/car/app/app/api/restricted_current.txt
+++ b/car/app/app/api/restricted_current.txt
@@ -471,6 +471,7 @@
method public androidx.car.app.model.OnClickDelegate? getOnClickDelegate();
method public androidx.car.app.model.CarText? getTitle();
method public int getType();
+ method @androidx.car.app.annotations.RequiresCarApi(5) public boolean isEnabled();
method public boolean isStandard();
method public static String typeToString(int);
field public static final androidx.car.app.model.Action APP_ICON;
@@ -489,6 +490,7 @@
ctor @androidx.car.app.annotations.RequiresCarApi(2) public Action.Builder(androidx.car.app.model.Action);
method public androidx.car.app.model.Action build();
method public androidx.car.app.model.Action.Builder setBackgroundColor(androidx.car.app.model.CarColor);
+ method @androidx.car.app.annotations.RequiresCarApi(5) public androidx.car.app.model.Action.Builder setEnabled(boolean);
method @androidx.car.app.annotations.RequiresCarApi(4) public androidx.car.app.model.Action.Builder setFlags(int);
method public androidx.car.app.model.Action.Builder setIcon(androidx.car.app.model.CarIcon);
method public androidx.car.app.model.Action.Builder setOnClickListener(androidx.car.app.model.OnClickListener);
@@ -962,6 +964,7 @@
method public androidx.car.app.model.CarText? getTitle();
method public androidx.car.app.model.Toggle? getToggle();
method public boolean isBrowsable();
+ method @androidx.car.app.annotations.RequiresCarApi(5) public boolean isEnabled();
method public androidx.car.app.model.Row row();
method public CharSequence yourBoat();
field public static final int IMAGE_TYPE_ICON = 4; // 0x4
@@ -975,6 +978,7 @@
method public androidx.car.app.model.Row.Builder addText(androidx.car.app.model.CarText);
method public androidx.car.app.model.Row build();
method public androidx.car.app.model.Row.Builder setBrowsable(boolean);
+ method @androidx.car.app.annotations.RequiresCarApi(5) public androidx.car.app.model.Row.Builder setEnabled(boolean);
method public androidx.car.app.model.Row.Builder setImage(androidx.car.app.model.CarIcon);
method public androidx.car.app.model.Row.Builder setImage(androidx.car.app.model.CarIcon, int);
method public androidx.car.app.model.Row.Builder setMetadata(androidx.car.app.model.Metadata);
@@ -1050,12 +1054,14 @@
@androidx.car.app.annotations.CarProtocol public final class Toggle {
method public androidx.car.app.model.OnCheckedChangeDelegate getOnCheckedChangeDelegate();
method public boolean isChecked();
+ method @androidx.car.app.annotations.RequiresCarApi(5) public boolean isEnabled();
}
public static final class Toggle.Builder {
ctor public Toggle.Builder(androidx.car.app.model.Toggle.OnCheckedChangeListener);
method public androidx.car.app.model.Toggle build();
method public androidx.car.app.model.Toggle.Builder setChecked(boolean);
+ method @androidx.car.app.annotations.RequiresCarApi(5) public androidx.car.app.model.Toggle.Builder setEnabled(boolean);
}
public static interface Toggle.OnCheckedChangeListener {
diff --git a/car/app/app/src/main/java/androidx/car/app/hardware/common/CarValue.java b/car/app/app/src/main/java/androidx/car/app/hardware/common/CarValue.java
index c1ca29a..ae610f3 100644
--- a/car/app/app/src/main/java/androidx/car/app/hardware/common/CarValue.java
+++ b/car/app/app/src/main/java/androidx/car/app/hardware/common/CarValue.java
@@ -21,12 +21,15 @@
import androidx.annotation.Keep;
import androidx.annotation.NonNull;
import androidx.annotation.Nullable;
+import androidx.annotation.OptIn;
import androidx.annotation.RestrictTo;
import androidx.car.app.annotations.CarProtocol;
+import androidx.car.app.annotations.ExperimentalCarApi;
import androidx.car.app.annotations.RequiresCarApi;
import java.lang.annotation.Retention;
import java.lang.annotation.RetentionPolicy;
+import java.util.Collections;
import java.util.List;
import java.util.Objects;
@@ -94,6 +97,9 @@
@Keep
@StatusCode
private final int mStatus;
+ @Keep
+ @NonNull
+ private final List<CarZone> mCarZones;
private static <T> CarValue<T> unimplemented() {
return new CarValue<>(null, 0, CarValue.STATUS_UNIMPLEMENTED);
@@ -151,6 +157,22 @@
return mStatus;
}
+ /**
+ * Returns a list of car zones associated with this {@link CarValue}.
+ *
+ * <p>For a global vehicle function, the list will only contain {@link CarZone#GLOBAL_ZONE}.
+ * Returns an empty list when {@link CarValue#getStatus()} is
+ * {@link CarValue#STATUS_UNIMPLEMENTED}.
+ */
+ @ExperimentalCarApi
+ @NonNull
+ public List<CarZone> getCarZones() {
+ if (mStatus == STATUS_UNIMPLEMENTED) {
+ return Collections.emptyList();
+ }
+ return mCarZones;
+ }
+
@Override
@NonNull
public String toString() {
@@ -160,14 +182,17 @@
+ mTimestampMillis
+ ", Status: "
+ mStatus
+ + ", CarZones: "
+ + mCarZones
+ "]";
}
@Override
public int hashCode() {
- return Objects.hash(mValue, mTimestampMillis, mStatus);
+ return Objects.hash(mValue, mTimestampMillis, mStatus, mCarZones);
}
+ @OptIn(markerClass = ExperimentalCarApi.class)
@Override
public boolean equals(@Nullable Object other) {
if (this == other) {
@@ -179,7 +204,25 @@
CarValue<?> otherCarValue = (CarValue<?>) other;
return Objects.equals(mValue, otherCarValue.mValue)
&& mTimestampMillis == otherCarValue.mTimestampMillis
- && mStatus == otherCarValue.mStatus;
+ && mStatus == otherCarValue.mStatus
+ && Objects.equals(mCarZones, otherCarValue.getCarZones());
+ }
+
+ /**
+ * Constructs a new instance of a {@link CarValue}. Uses {@link CarZone#CAR_ZONE_GLOBAL} as the
+ * zone for this instance.
+ *
+ * @param value data to be returned with the result
+ * @param timestampMillis the time in milliseconds when the value was generated (see
+ * {@link #getTimestampMillis})
+ * @param status the status code associated with this value
+ */
+ @OptIn(markerClass = ExperimentalCarApi.class)
+ public CarValue(@Nullable T value, long timestampMillis, @StatusCode int status) {
+ mValue = value;
+ mTimestampMillis = timestampMillis;
+ mStatus = status;
+ mCarZones = Collections.singletonList(CarZone.CAR_ZONE_GLOBAL);
}
/**
@@ -189,11 +232,15 @@
* @param timestampMillis the time in milliseconds when the value was generated (see
* {@link #getTimestampMillis})
* @param status the status code associated with this value
+ * @param zones the car zones associated with this value
*/
- public CarValue(@Nullable T value, long timestampMillis, @StatusCode int status) {
+ @ExperimentalCarApi
+ public CarValue(@Nullable T value, long timestampMillis, @StatusCode int status,
+ @NonNull List<CarZone> zones) {
mValue = value;
mTimestampMillis = timestampMillis;
mStatus = status;
+ mCarZones = zones;
}
/** Constructs an empty instance, used by serialization code. */
@@ -201,5 +248,6 @@
mValue = null;
mTimestampMillis = 0;
mStatus = STATUS_UNKNOWN;
+ mCarZones = Collections.emptyList();
}
}
diff --git a/car/app/app/src/main/java/androidx/car/app/hardware/common/CarZone.java b/car/app/app/src/main/java/androidx/car/app/hardware/common/CarZone.java
new file mode 100644
index 0000000..be3ff6c
--- /dev/null
+++ b/car/app/app/src/main/java/androidx/car/app/hardware/common/CarZone.java
@@ -0,0 +1,270 @@
+/*
+ * Copyright 2021 The Android Open Source Project
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package androidx.car.app.hardware.common;
+
+import static androidx.annotation.RestrictTo.Scope.LIBRARY;
+
+import androidx.annotation.IntDef;
+import androidx.annotation.NonNull;
+import androidx.annotation.Nullable;
+import androidx.annotation.RestrictTo;
+import androidx.car.app.annotations.CarProtocol;
+import androidx.car.app.annotations.ExperimentalCarApi;
+import androidx.car.app.annotations.RequiresCarApi;
+
+import java.lang.annotation.Retention;
+import java.lang.annotation.RetentionPolicy;
+import java.util.Objects;
+
+/**
+ * Allows specification of a car zone using rows and columns. For example, CarZone.Driver allows
+ * modification of Driver's seat controls without knowing whether it is a left side driving car
+ * or right side driving car.
+ *
+ * This class is different from CarOccupantZoneManager in that CarZone is specifically for
+ * AndroidX APIs' implementation to control car features such as temperature based on zones while
+ * CarOccupantZoneManager class provides APIs to get displays and users information.
+ *
+ * <p> {@link CarValue#getCarZones()} returns a list of these {@link CarZone}s. It indicates the
+ * {@link CarValue} happens in those {@link CarValue}s of the vehicle.
+ */
+@CarProtocol
+@RequiresCarApi(5)
+@ExperimentalCarApi
+public final class CarZone {
+ /**
+ * Possible row values.
+ *
+ * @hide
+ */
+ @IntDef({
+ CAR_ZONE_ROW_ALL,
+ CAR_ZONE_ROW_FIRST,
+ CAR_ZONE_ROW_SECOND,
+ CAR_ZONE_ROW_THIRD,
+ CAR_ZONE_ROW_EXCLUDE_FIRST,
+ })
+ @Retention(RetentionPolicy.SOURCE)
+ @RestrictTo(LIBRARY)
+ public @interface CarZoneRow {
+ }
+
+ /** Refers to all the rows in the vehicle. */
+ @CarZoneRow
+ public static final int CAR_ZONE_ROW_ALL = 0x0;
+
+ /** Refers to the front row of the vehicle only. */
+ @CarZoneRow
+ public static final int CAR_ZONE_ROW_FIRST = 0x1;
+
+ /** Refers to the second row of the vehicle only. */
+ @CarZoneRow
+ public static final int CAR_ZONE_ROW_SECOND = 0x2;
+
+ /** Refers to the third row of the vehicle only. */
+ @CarZoneRow
+ public static final int CAR_ZONE_ROW_THIRD = 0x3;
+
+ /** Refers to the all rows, except for {@link CarZone#CAR_ZONE_ROW_FIRST} of the vehicle. */
+ @CarZoneRow
+ public static final int CAR_ZONE_ROW_EXCLUDE_FIRST = 0x4;
+
+ /**
+ * Possible column values.
+ *
+ * @hide
+ */
+ @IntDef({
+ CAR_ZONE_COLUMN_ALL,
+ CAR_ZONE_COLUMN_LEFT,
+ CAR_ZONE_COLUMN_CENTER,
+ CAR_ZONE_COLUMN_RIGHT,
+ CAR_ZONE_COLUMN_DRIVER,
+ CAR_ZONE_COLUMN_PASSENGER,
+ })
+ @Retention(RetentionPolicy.SOURCE)
+ @RestrictTo(LIBRARY)
+ public @interface CarZoneColumn {
+ }
+
+ /** Refers to all the columns in the vehicle. */
+ @CarZoneColumn
+ public static final int CAR_ZONE_COLUMN_ALL = 0x10;
+
+ /** Refers to the left-most column of the vehicle only. */
+ @CarZoneColumn
+ public static final int CAR_ZONE_COLUMN_LEFT = 0x20;
+
+ /** Refers to the center column of the vehicle only. */
+ @CarZoneColumn
+ public static final int CAR_ZONE_COLUMN_CENTER = 0x30;
+
+ /** Refers to the right-most column of the vehicle only. */
+ @CarZoneColumn
+ public static final int CAR_ZONE_COLUMN_RIGHT = 0x40;
+
+ /**
+ * Refers to either {@link CarZone#CAR_ZONE_COLUMN_LEFT} or
+ * {@link CarZone#CAR_ZONE_COLUMN_RIGHT}, depending on the vehicle
+ * configuration.
+ */
+ @CarZoneColumn
+ public static final int CAR_ZONE_COLUMN_DRIVER = 0x50;
+
+ /**
+ * Refers to either {@link CarZone#CAR_ZONE_COLUMN_LEFT} or
+ * {@link CarZone#CAR_ZONE_COLUMN_RIGHT}, depending on the vehicle
+ * configuration.
+ */
+ @CarZoneColumn
+ public static final int CAR_ZONE_COLUMN_PASSENGER = 0x60;
+
+ /**
+ * Refers to the global zone, represented by {@link CarZone#CAR_ZONE_ROW_ALL},
+ * {@link CarZone#CAR_ZONE_COLUMN_ALL}.
+ */
+ public static final CarZone CAR_ZONE_GLOBAL = new CarZone.Builder().build();
+
+ private final int mRow;
+ private final int mColumn;
+
+ /** Returns one of the values in CarZoneRow. */
+ public @CarZoneRow int getRow() {
+ return mRow;
+ }
+
+ /** Returns one of the values in CarZoneColumn. */
+ public @CarZoneColumn int getColumn() {
+ return mColumn;
+ }
+
+ /** Constructs a new instance by using {@link Builder}. */
+ CarZone(@NonNull Builder builder) {
+ mRow = builder.mRow;
+ mColumn = builder.mColumn;
+ }
+
+ @NonNull
+ @Override
+ public String toString() {
+ String rowName;
+ switch (mRow) {
+ case CAR_ZONE_ROW_ALL:
+ rowName = "CAR_ZONE_ROW_ALL";
+ break;
+ case CAR_ZONE_ROW_FIRST:
+ rowName = "CAR_ZONE_ROW_FIRST";
+ break;
+ case CAR_ZONE_ROW_SECOND:
+ rowName = "CAR_ZONE_ROW_SECOND";
+ break;
+ case CAR_ZONE_ROW_THIRD:
+ rowName = "CAR_ZONE_ROW_THIRD";
+ break;
+ case CAR_ZONE_ROW_EXCLUDE_FIRST:
+ rowName = "CAR_ZONE_ROW_EXCLUDE_FIRST";
+ break;
+ default:
+ rowName = "UNKNOWN";
+ }
+ String columnName;
+ switch (mColumn) {
+ case CAR_ZONE_COLUMN_ALL:
+ columnName = "CAR_ZONE_COLUMN_ALL";
+ break;
+ case CAR_ZONE_COLUMN_LEFT:
+ columnName = "CAR_ZONE_COLUMN_LEFT";
+ break;
+ case CAR_ZONE_COLUMN_CENTER:
+ columnName = "CAR_ZONE_COLUMN_CENTER";
+ break;
+ case CAR_ZONE_COLUMN_RIGHT:
+ columnName = "CAR_ZONE_COLUMN_RIGHT";
+ break;
+ case CAR_ZONE_COLUMN_DRIVER:
+ columnName = "CAR_ZONE_COLUMN_DRIVER";
+ break;
+ case CAR_ZONE_COLUMN_PASSENGER:
+ columnName = "CAR_ZONE_COLUMN_PASSENGER";
+ break;
+ default:
+ columnName = "UNKNOWN";
+ }
+ return "[CarZone row value: " + rowName + ", column value: " + columnName + "]";
+ }
+
+ @Override
+ public int hashCode() {
+ return Objects.hash(mRow, mColumn);
+ }
+
+ @Override
+ public boolean equals(@Nullable Object object) {
+ if (this == object) {
+ return true;
+ }
+ if (!(object instanceof CarZone)) {
+ return false;
+ }
+ CarZone otherZone = (CarZone) object;
+ return Objects.equals(mColumn, otherZone.getColumn())
+ && Objects.equals(mRow, otherZone.getRow());
+ }
+
+ /** Constructs an empty instance, used by serialization code. */
+ private CarZone() {
+ mRow = 0;
+ mColumn = 0;
+ }
+
+ /** A builder for instantiating {@link CarZone}. */
+ public static final class Builder {
+ int mRow = CAR_ZONE_ROW_ALL;
+ int mColumn = CAR_ZONE_COLUMN_ALL;
+
+ /**
+ * Sets the row value for the {@link CarZone}.
+ *
+ * <p> The row value should be in the CarZoneRow list.
+ */
+ public @NonNull Builder setRow(@CarZoneRow int row) {
+ this.mRow = row;
+ return this;
+ }
+
+ /**
+ * Sets the column value for the {@link CarZone}.
+ *
+ * <p> The column value should be in the CarZoneColumn list.
+ */
+ public @NonNull Builder setColumn(@CarZoneColumn int column) {
+ this.mColumn = column;
+ return this;
+ }
+
+ /**
+ * Constructs the {@link CarZone} defined by this builder.
+ *
+ * <p> {@link CarZoneRow#CAR_ZONE_ROW_ALL} will be used by default if the row value is not
+ * set using {@link Builder#setRow(int)}. {@link CarZoneColumn#CAR_ZONE_COLUMN_ALL} will be
+ * used by default if the column value is not set {@link Builder#setColumn(int)}.
+ */
+ @NonNull
+ public CarZone build() {
+ return new CarZone(this);
+ }
+ }
+}
diff --git a/car/app/app/src/main/java/androidx/car/app/model/Action.java b/car/app/app/src/main/java/androidx/car/app/model/Action.java
index 8a8c914..5adfca5 100644
--- a/car/app/app/src/main/java/androidx/car/app/model/Action.java
+++ b/car/app/app/src/main/java/androidx/car/app/model/Action.java
@@ -175,6 +175,8 @@
public static final Action PAN = new Action(TYPE_PAN);
@Keep
+ private final boolean mIsEnabled;
+ @Keep
@Nullable
private final CarText mTitle;
@Keep
@@ -250,11 +252,19 @@
return mOnClickDelegate;
}
+ /**
+ * Returns {@code true} if the action is enabled.
+ */
+ @RequiresCarApi(5)
+ public boolean isEnabled() {
+ return mIsEnabled;
+ }
+
@Override
@NonNull
public String toString() {
- return "[type: " + typeToString(mType) + ", icon: " + mIcon + ", bkg: " + mBackgroundColor
- + "]";
+ return "[type: " + typeToString(mType) + ", icon: " + mIcon
+ + ", bkg: " + mBackgroundColor + ", isEnabled: " + mIsEnabled + "]";
}
/**
@@ -289,6 +299,7 @@
mOnClickDelegate = null;
mType = type;
mFlags = 0;
+ mIsEnabled = true;
}
Action(Builder builder) {
@@ -298,6 +309,7 @@
mOnClickDelegate = builder.mOnClickDelegate;
mType = builder.mType;
mFlags = builder.mFlags;
+ mIsEnabled = builder.mIsEnabled;
}
/** Constructs an empty instance, used by serialization code. */
@@ -308,11 +320,12 @@
mOnClickDelegate = null;
mType = TYPE_CUSTOM;
mFlags = 0;
+ mIsEnabled = true;
}
@Override
public int hashCode() {
- return Objects.hash(mTitle, mType, mOnClickDelegate == null, mIcon == null);
+ return Objects.hash(mTitle, mType, mOnClickDelegate == null, mIcon == null, mIsEnabled);
}
@Override
@@ -331,7 +344,8 @@
&& mType == otherAction.mType
&& Objects.equals(mIcon, otherAction.mIcon)
&& Objects.equals(mOnClickDelegate == null, otherAction.mOnClickDelegate == null)
- && Objects.equals(mFlags, otherAction.mFlags);
+ && Objects.equals(mFlags, otherAction.mFlags)
+ && mIsEnabled == otherAction.mIsEnabled;
}
static boolean isStandardActionType(@ActionType int type) {
@@ -340,6 +354,7 @@
/** A builder of {@link Action}. */
public static final class Builder {
+ boolean mIsEnabled = true;
@Nullable
CarText mTitle;
@Nullable
@@ -444,6 +459,18 @@
return this;
}
+ /**
+ * Sets the initial enabled state for {@link Action}.
+ *
+ * <p>The default state of a {@link Action} is enabled.
+ */
+ @NonNull
+ @RequiresCarApi(5)
+ public Builder setEnabled(boolean enabled) {
+ mIsEnabled = enabled;
+ return this;
+ }
+
/** Sets flags affecting how this action should be treated. */
@NonNull
@RequiresCarApi(4)
@@ -512,6 +539,7 @@
CarColor backgroundColor = action.getBackgroundColor();
mBackgroundColor = backgroundColor == null ? DEFAULT : backgroundColor;
mFlags = action.getFlags();
+ mIsEnabled = action.isEnabled();
}
}
}
diff --git a/car/app/app/src/main/java/androidx/car/app/model/Row.java b/car/app/app/src/main/java/androidx/car/app/model/Row.java
index 14d0d83..64c0391 100644
--- a/car/app/app/src/main/java/androidx/car/app/model/Row.java
+++ b/car/app/app/src/main/java/androidx/car/app/model/Row.java
@@ -30,6 +30,7 @@
import androidx.annotation.Nullable;
import androidx.annotation.RestrictTo;
import androidx.car.app.annotations.CarProtocol;
+import androidx.car.app.annotations.RequiresCarApi;
import androidx.car.app.model.constraints.CarIconConstraints;
import androidx.car.app.model.constraints.CarTextConstraints;
import androidx.car.app.utils.CollectionUtils;
@@ -92,6 +93,8 @@
public static final int IMAGE_TYPE_ICON = (1 << 2);
@Keep
+ private final boolean mIsEnabled;
+ @Keep
@Nullable
private final CarText mTitle;
@Keep
@@ -211,6 +214,14 @@
return this;
}
+ /**
+ * Returns {@code true} if the row is enabled.
+ */
+ @RequiresCarApi(5)
+ public boolean isEnabled() {
+ return mIsEnabled;
+ }
+
@Override
@NonNull
public String toString() {
@@ -222,6 +233,8 @@
+ mImage
+ ", isBrowsable: "
+ mIsBrowsable
+ + ", isEnabled: "
+ + mIsEnabled
+ "]";
}
@@ -235,7 +248,8 @@
mOnClickDelegate == null,
mMetadata,
mIsBrowsable,
- mRowImageType);
+ mRowImageType,
+ mIsEnabled);
}
@Override
@@ -256,7 +270,8 @@
&& Objects.equals(mOnClickDelegate == null, otherRow.mOnClickDelegate == null)
&& Objects.equals(mMetadata, otherRow.mMetadata)
&& mIsBrowsable == otherRow.mIsBrowsable
- && mRowImageType == otherRow.mRowImageType;
+ && mRowImageType == otherRow.mRowImageType
+ && mIsEnabled == otherRow.isEnabled();
}
Row(Builder builder) {
@@ -268,6 +283,7 @@
mMetadata = builder.mMetadata;
mIsBrowsable = builder.mIsBrowsable;
mRowImageType = builder.mRowImageType;
+ mIsEnabled = builder.mIsEnabled;
}
/** Constructs an empty instance, used by serialization code. */
@@ -280,10 +296,12 @@
mMetadata = EMPTY_METADATA;
mIsBrowsable = false;
mRowImageType = IMAGE_TYPE_SMALL;
+ mIsEnabled = true;
}
/** A builder of {@link Row}. */
public static final class Builder {
+ boolean mIsEnabled = true;
@Nullable
CarText mTitle;
final List<CarText> mTexts = new ArrayList<>();
@@ -524,6 +542,18 @@
}
/**
+ * Sets the initial enabled state for {@link Row}.
+ *
+ * <p>The default state of a {@link Row} is enabled.
+ */
+ @NonNull
+ @RequiresCarApi(5)
+ public Builder setEnabled(boolean enabled) {
+ mIsEnabled = enabled;
+ return this;
+ }
+
+ /**
* Constructs the {@link Row} defined by this builder.
*
* @throws IllegalStateException if the row's title is not set, if it is a browsable
diff --git a/car/app/app/src/main/java/androidx/car/app/model/Toggle.java b/car/app/app/src/main/java/androidx/car/app/model/Toggle.java
index 1c46453..b628a8b 100644
--- a/car/app/app/src/main/java/androidx/car/app/model/Toggle.java
+++ b/car/app/app/src/main/java/androidx/car/app/model/Toggle.java
@@ -25,6 +25,9 @@
import androidx.annotation.NonNull;
import androidx.annotation.Nullable;
import androidx.car.app.annotations.CarProtocol;
+import androidx.car.app.annotations.RequiresCarApi;
+
+import java.util.Objects;
/** Represents a toggle that can have either a checked or unchecked state. */
@CarProtocol
@@ -40,6 +43,8 @@
private final OnCheckedChangeDelegate mOnCheckedChangeDelegate;
@Keep
private final boolean mIsChecked;
+ @Keep
+ private final boolean mIsEnabled;
/**
* Returns {@code true} if the toggle is checked.
@@ -49,6 +54,14 @@
}
/**
+ * Returns {@code true} if the toggle is enabled.
+ */
+ @RequiresCarApi(5)
+ public boolean isEnabled() {
+ return mIsEnabled;
+ }
+
+ /**
* Returns the {@link OnCheckedChangeDelegate} that is called when the checked state of
* the {@link Toggle} is changed.
*/
@@ -60,12 +73,12 @@
@Override
@NonNull
public String toString() {
- return "[ isChecked: " + mIsChecked + "]";
+ return "[ isChecked: " + mIsChecked + ", isEnabled: " + mIsEnabled + "]";
}
@Override
public int hashCode() {
- return Boolean.valueOf(mIsChecked).hashCode();
+ return Objects.hash(mIsChecked, mIsEnabled);
}
@Override
@@ -79,11 +92,12 @@
Toggle otherToggle = (Toggle) other;
// Don't compare listener.
- return mIsChecked == otherToggle.mIsChecked;
+ return mIsChecked == otherToggle.mIsChecked && mIsEnabled == otherToggle.mIsEnabled;
}
Toggle(Builder builder) {
mIsChecked = builder.mIsChecked;
+ mIsEnabled = builder.mIsEnabled;
mOnCheckedChangeDelegate = builder.mOnCheckedChangeDelegate;
}
@@ -91,12 +105,14 @@
private Toggle() {
mOnCheckedChangeDelegate = null;
mIsChecked = false;
+ mIsEnabled = true;
}
/** A builder of {@link Toggle}. */
public static final class Builder {
OnCheckedChangeDelegate mOnCheckedChangeDelegate;
boolean mIsChecked;
+ boolean mIsEnabled = true;
/**
* Sets the initial checked state for {@link Toggle}.
@@ -109,6 +125,18 @@
return this;
}
+ /**
+ * Sets the initial enabled state for {@link Toggle}.
+ *
+ * <p>The default state of a {@link Toggle} is enabled.
+ */
+ @NonNull
+ @RequiresCarApi(5)
+ public Builder setEnabled(boolean enabled) {
+ mIsEnabled = enabled;
+ return this;
+ }
+
/** Constructs the {@link Toggle} defined by this builder. */
@NonNull
public Toggle build() {
diff --git a/car/app/app/src/test/java/androidx/car/app/hardware/common/CarValueTest.java b/car/app/app/src/test/java/androidx/car/app/hardware/common/CarValueTest.java
index 7ac9981..9551348 100644
--- a/car/app/app/src/test/java/androidx/car/app/hardware/common/CarValueTest.java
+++ b/car/app/app/src/test/java/androidx/car/app/hardware/common/CarValueTest.java
@@ -16,8 +16,6 @@
package androidx.car.app.hardware.common;
-/** Tests for {@link VehicleException}. */
-
import static com.google.common.truth.Truth.assertThat;
import org.junit.Test;
@@ -25,27 +23,50 @@
import org.robolectric.RobolectricTestRunner;
import org.robolectric.annotation.internal.DoNotInstrument;
+import java.util.Collections;
+import java.util.List;
+
+/** Tests for {@link androidx.car.app.hardware.common.CarValue}. */
@RunWith(RobolectricTestRunner.class)
@DoNotInstrument
public class CarValueTest {
@Test
- public void createInstance() {
+ public void createInstance_withoutCarZones() {
String value = "VALUE";
long timeStampMillis = 10;
- int status = CarValue.STATUS_UNIMPLEMENTED;
+ int status = CarValue.STATUS_SUCCESS;
+ List<CarZone> globalZoneList = Collections.singletonList(CarZone.CAR_ZONE_GLOBAL);
CarValue<String> carValue = new CarValue<>(value, timeStampMillis, status);
assertThat(value).isEqualTo(carValue.getValue());
assertThat(timeStampMillis).isEqualTo(carValue.getTimestampMillis());
assertThat(status).isEqualTo(carValue.getStatus());
+ assertThat(globalZoneList).isEqualTo(carValue.getCarZones());
+ }
+
+ @Test
+ public void createInstance_withCarZones() {
+ String value = "VALUE";
+ long timeStampMillis = 10;
+ int status = CarValue.STATUS_SUCCESS;
+ CarZone driverZone = new CarZone.Builder()
+ .setRow(CarZone.CAR_ZONE_ROW_FIRST)
+ .setColumn(CarZone.CAR_ZONE_COLUMN_DRIVER).build();
+ List<CarZone> carZones = Collections.singletonList(driverZone);
+ CarValue<String> carValue = new CarValue<>(value, timeStampMillis, status, carZones);
+
+ assertThat(value).isEqualTo(carValue.getValue());
+ assertThat(timeStampMillis).isEqualTo(carValue.getTimestampMillis());
+ assertThat(status).isEqualTo(carValue.getStatus());
+ assertThat(carZones).isEqualTo(carValue.getCarZones());
}
@Test
public void equals() {
String value = "VALUE";
long timeStampMillis = 10;
- int status = CarValue.STATUS_UNIMPLEMENTED;
+ int status = CarValue.STATUS_SUCCESS;
CarValue<String> carValue = new CarValue<>(value, timeStampMillis, status);
assertThat(new CarValue<>(value, timeStampMillis, status)).isEqualTo(carValue);
}
@@ -54,7 +75,7 @@
public void notEquals_differentValue() {
String value = "VALUE";
long timeStampMillis = 10;
- int status = CarValue.STATUS_UNIMPLEMENTED;
+ int status = CarValue.STATUS_SUCCESS;
CarValue<String> carValue = new CarValue<>(value, timeStampMillis, status);
assertThat(new CarValue<>("other", timeStampMillis, status))
.isNotEqualTo(carValue);
@@ -64,7 +85,7 @@
public void notEquals_differentTimestamp() {
String value = "VALUE";
long timeStampMillis = 10;
- int status = CarValue.STATUS_UNIMPLEMENTED;
+ int status = CarValue.STATUS_SUCCESS;
CarValue<String> carValue = new CarValue<>(value, timeStampMillis, status);
assertThat(new CarValue<>(value, 20, status)).isNotEqualTo(carValue);
}
@@ -73,10 +94,24 @@
public void notEquals_differentStatus() {
String value = "VALUE";
long timeStampMillis = 10;
- int status = CarValue.STATUS_UNIMPLEMENTED;
+ int status = CarValue.STATUS_SUCCESS;
CarValue<String> carValue = new CarValue<>(value, timeStampMillis, status);
assertThat(new CarValue<>(value, timeStampMillis,
CarValue.STATUS_UNAVAILABLE)).isNotEqualTo(carValue);
}
+ @Test
+ public void notEquals_differentCarZones() {
+ String value = "VALUE";
+ long timeStampMillis = 10;
+ int status = CarValue.STATUS_UNKNOWN;
+ CarZone driverZone = new CarZone.Builder()
+ .setRow(CarZone.CAR_ZONE_ROW_FIRST)
+ .setColumn(CarZone.CAR_ZONE_COLUMN_DRIVER).build();
+ List<CarZone> carZones = Collections.singletonList(driverZone);
+ CarValue<String> carValue = new CarValue<>(value, timeStampMillis, status, carZones);
+ assertThat(new CarValue<>(value, timeStampMillis,
+ CarValue.STATUS_UNKNOWN)).isNotEqualTo(carValue);
+ }
+
}
diff --git a/car/app/app/src/test/java/androidx/car/app/hardware/common/CarZoneTest.java b/car/app/app/src/test/java/androidx/car/app/hardware/common/CarZoneTest.java
new file mode 100644
index 0000000..123e19b
--- /dev/null
+++ b/car/app/app/src/test/java/androidx/car/app/hardware/common/CarZoneTest.java
@@ -0,0 +1,79 @@
+/*
+ * Copyright 2021 The Android Open Source Project
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package androidx.car.app.hardware.common;
+
+import static com.google.common.truth.Truth.assertThat;
+
+import org.junit.Test;
+import org.junit.runner.RunWith;
+import org.robolectric.RobolectricTestRunner;
+import org.robolectric.annotation.internal.DoNotInstrument;
+
+/** Tests for {@link CarZone}*/
+@RunWith(RobolectricTestRunner.class)
+@DoNotInstrument
+public class CarZoneTest {
+
+ @Test
+ public void createInstance_defaultValue() {
+ CarZone carZone = new CarZone.Builder().build();
+ assertThat(CarZone.CAR_ZONE_COLUMN_ALL).isEqualTo(carZone.getColumn());
+ assertThat(CarZone.CAR_ZONE_ROW_ALL).isEqualTo(carZone.getRow());
+ }
+
+ @Test
+ public void createInstance_driveSide() {
+ CarZone carZone = new CarZone.Builder()
+ .setRow(CarZone.CAR_ZONE_ROW_FIRST)
+ .setColumn(CarZone.CAR_ZONE_COLUMN_DRIVER).build();
+ assertThat(CarZone.CAR_ZONE_COLUMN_DRIVER).isEqualTo(carZone.getColumn());
+ assertThat(CarZone.CAR_ZONE_ROW_FIRST).isEqualTo(carZone.getRow());
+ }
+
+ @Test
+ public void equals() {
+ CarZone carZoneDriver = new CarZone.Builder()
+ .setRow(CarZone.CAR_ZONE_ROW_FIRST)
+ .setColumn(CarZone.CAR_ZONE_COLUMN_DRIVER).build();
+ CarZone carZoneDriverDuplicate = new CarZone.Builder()
+ .setRow(CarZone.CAR_ZONE_ROW_FIRST)
+ .setColumn(CarZone.CAR_ZONE_COLUMN_DRIVER).build();
+ assertThat(carZoneDriver).isEqualTo(carZoneDriverDuplicate);
+ }
+
+ @Test
+ public void notEquals_differentRow() {
+ CarZone carZoneDriver = new CarZone.Builder()
+ .setRow(CarZone.CAR_ZONE_ROW_FIRST)
+ .setColumn(CarZone.CAR_ZONE_COLUMN_DRIVER).build();
+ CarZone allDriverSideSeat = new CarZone.Builder()
+ .setRow(CarZone.CAR_ZONE_ROW_ALL)
+ .setColumn(CarZone.CAR_ZONE_COLUMN_DRIVER).build();
+ assertThat(carZoneDriver).isNotEqualTo(allDriverSideSeat);
+ }
+
+ @Test
+ public void notEquals_differentColumn() {
+ CarZone carZoneDriver = new CarZone.Builder()
+ .setRow(CarZone.CAR_ZONE_ROW_FIRST)
+ .setColumn(CarZone.CAR_ZONE_COLUMN_DRIVER).build();
+ CarZone carZonePassenger = new CarZone.Builder()
+ .setRow(CarZone.CAR_ZONE_ROW_FIRST)
+ .setColumn(CarZone.CAR_ZONE_COLUMN_PASSENGER).build();
+ assertThat(carZoneDriver).isNotEqualTo(carZonePassenger);
+ }
+}
diff --git a/car/app/app/src/test/java/androidx/car/app/model/ActionTest.java b/car/app/app/src/test/java/androidx/car/app/model/ActionTest.java
index a9ea96b..ad8eab9 100644
--- a/car/app/app/src/test/java/androidx/car/app/model/ActionTest.java
+++ b/car/app/app/src/test/java/androidx/car/app/model/ActionTest.java
@@ -28,7 +28,6 @@
import android.content.Context;
import android.net.Uri;
-import androidx.car.app.IOnDoneCallback;
import androidx.car.app.OnDoneCallback;
import androidx.car.app.TestUtils;
import androidx.core.graphics.drawable.IconCompat;
@@ -37,7 +36,6 @@
import org.junit.Rule;
import org.junit.Test;
import org.junit.runner.RunWith;
-import org.mockito.Mock;
import org.mockito.junit.MockitoJUnit;
import org.mockito.junit.MockitoRule;
import org.robolectric.RobolectricTestRunner;
@@ -50,9 +48,6 @@
@Rule
public final MockitoRule mockito = MockitoJUnit.rule();
- @Mock
- private IOnDoneCallback.Stub mMockOnDoneCallback;
-
@Test
public void create_throws_noTitleOrIcon() {
assertThrows(
@@ -87,6 +82,18 @@
}
@Test
+ public void create_enabledStateDefault() {
+ OnClickListener onClickListener = mock(OnClickListener.class);
+ Action action = new Action.Builder()
+ .setIcon(TestUtils.getTestCarIcon(ApplicationProvider.getApplicationContext(),
+ "ic_test_1"))
+ .setTitle("foo")
+ .setOnClickListener(onClickListener)
+ .build();
+ assertThat(action.isEnabled()).isTrue();
+ }
+
+ @Test
public void create_noIconDefault() {
OnClickListener onClickListener = mock(OnClickListener.class);
Action action = new Action.Builder().setTitle("foo").setOnClickListener(
@@ -133,10 +140,12 @@
.setIcon(new CarIcon.Builder(icon).build())
.setBackgroundColor(CarColor.BLUE)
.setOnClickListener(onClickListener)
+ .setEnabled(true)
.build();
assertThat(icon).isEqualTo(action.getIcon().getIcon());
assertThat(CarText.create(title)).isEqualTo(action.getTitle());
assertThat(CarColor.BLUE).isEqualTo(action.getBackgroundColor());
+ assertThat(action.isEnabled()).isTrue();
OnDoneCallback onDoneCallback = mock(OnDoneCallback.class);
action.getOnClickDelegate().sendClick(onDoneCallback);
verify(onClickListener).onClick();
@@ -171,10 +180,10 @@
Action action1 =
new Action.Builder().setOnClickListener(() -> {
- }).setTitle(title).setIcon(icon).setFlags(FLAG_PRIMARY).build();
+ }).setTitle(title).setIcon(icon).setFlags(FLAG_PRIMARY).setEnabled(true).build();
Action action2 =
new Action.Builder().setOnClickListener(() -> {
- }).setTitle(title).setIcon(icon).setFlags(FLAG_PRIMARY).build();
+ }).setTitle(title).setIcon(icon).setFlags(FLAG_PRIMARY).setEnabled(true).build();
assertThat(action2).isEqualTo(action1);
}
@@ -218,4 +227,19 @@
assertThat(action2).isNotEqualTo(action1);
}
+
+ @Test
+ public void notEquals_nonMatchingEnabledState() {
+ String title = "foo";
+ CarIcon icon = CarIcon.ALERT;
+
+ Action action1 =
+ new Action.Builder().setOnClickListener(() -> {
+ }).setTitle(title).setIcon(icon).setEnabled(true).build();
+ Action action2 =
+ new Action.Builder().setOnClickListener(() -> {
+ }).setTitle(title).setIcon(icon).setEnabled(false).build();
+
+ assertThat(action2).isNotEqualTo(action1);
+ }
}
diff --git a/car/app/app/src/test/java/androidx/car/app/model/RowTest.java b/car/app/app/src/test/java/androidx/car/app/model/RowTest.java
index 6bd8869..06aee1d 100644
--- a/car/app/app/src/test/java/androidx/car/app/model/RowTest.java
+++ b/car/app/app/src/test/java/androidx/car/app/model/RowTest.java
@@ -51,6 +51,7 @@
assertThat(row.isBrowsable()).isFalse();
assertThat(row.getMetadata()).isEqualTo(Metadata.EMPTY_METADATA);
assertThat(row.getRowImageType()).isEqualTo(Row.IMAGE_TYPE_SMALL);
+ assertThat(row.isEnabled()).isTrue();
}
@Test
@@ -173,6 +174,12 @@
}
@Test
+ public void setEnabledState() {
+ Row row = new Row.Builder().setTitle("Title").setEnabled(false).build();
+ assertThat(row.isEnabled()).isFalse();
+ }
+
+ @Test
public void setIsBrowsable_noListener_throws() {
assertThrows(
IllegalStateException.class,
@@ -218,6 +225,7 @@
})
.setBrowsable(false)
.setMetadata(Metadata.EMPTY_METADATA)
+ .setEnabled(true)
.addText(title)
.build();
@@ -229,6 +237,7 @@
})
.setBrowsable(false)
.setMetadata(Metadata.EMPTY_METADATA)
+ .setEnabled(true)
.addText(title)
.build())
.isEqualTo(row);
@@ -251,6 +260,13 @@
}
@Test
+ public void notEquals_differentEnabledState() {
+ Row row = new Row.Builder().setTitle("Title").setEnabled(true).build();
+
+ assertThat(new Row.Builder().setTitle("Title").setEnabled(false).build()).isNotEqualTo(row);
+ }
+
+ @Test
public void notEquals_oneHasNoCallback() {
Row row = new Row.Builder().setTitle("Title").setOnClickListener(() -> {
}).build();
diff --git a/car/app/app/src/test/java/androidx/car/app/model/ToggleTest.java b/car/app/app/src/test/java/androidx/car/app/model/ToggleTest.java
index d4c3e28..fd4f56d 100644
--- a/car/app/app/src/test/java/androidx/car/app/model/ToggleTest.java
+++ b/car/app/app/src/test/java/androidx/car/app/model/ToggleTest.java
@@ -52,6 +52,12 @@
}
@Test
+ public void build_withValues_enabledByDefault() {
+ Toggle toggle = new Toggle.Builder(mMockOnCheckedChangeListener).build();
+ assertThat(toggle.isEnabled()).isTrue();
+ }
+
+ @Test
public void build_checkedChange_sendsCheckedChangeCall() {
Toggle toggle = new Toggle.Builder(mMockOnCheckedChangeListener).setChecked(true).build();
OnDoneCallback onDoneCallback = mock(OnDoneCallback.class);
@@ -81,17 +87,31 @@
@Test
public void equals() {
- Toggle toggle = new Toggle.Builder(mMockOnCheckedChangeListener).setChecked(true).build();
+ Toggle toggle =
+ new Toggle.Builder(mMockOnCheckedChangeListener).setChecked(true).setEnabled(
+ false).build();
+
assertThat(toggle)
- .isEqualTo(new Toggle.Builder(mMockOnCheckedChangeListener).setChecked(
- true).build());
+ .isEqualTo(new Toggle.Builder(mMockOnCheckedChangeListener)
+ .setChecked(true)
+ .setEnabled(false)
+ .build());
}
@Test
- public void notEquals() {
+ public void notEquals_differentCheckedState() {
Toggle toggle = new Toggle.Builder(mMockOnCheckedChangeListener).setChecked(true).build();
assertThat(toggle)
.isNotEqualTo(new Toggle.Builder(mMockOnCheckedChangeListener).setChecked(
false).build());
}
+
+ @Test
+ public void notEquals_differentEnabledState() {
+ Toggle toggle = new Toggle.Builder(mMockOnCheckedChangeListener).setEnabled(true).build();
+ assertThat(toggle)
+ .isNotEqualTo(new Toggle.Builder(mMockOnCheckedChangeListener)
+ .setEnabled(false)
+ .build());
+ }
}
diff --git a/collection/collection/build.gradle b/collection/collection/build.gradle
index e301bb9..88b6cfdd 100644
--- a/collection/collection/build.gradle
+++ b/collection/collection/build.gradle
@@ -122,6 +122,15 @@
}
}
+dependencies {
+ // Required for users who only depend on this artifact, but pull an older version of
+ // collection-ktx transitively, which would lead to duplicate definition since the -ktx
+ // extensions were moved into the main artifact.
+ constraints {
+ jvmImplementation("androidx.collection:collection-ktx:1.3.0-alpha01")
+ }
+}
+
androidx {
name = "Android Support Library collections"
publish = Publish.SNAPSHOT_AND_RELEASE
diff --git a/collection/collection/src/commonMain/kotlin/androidx/collection/LruCache.kt b/collection/collection/src/commonMain/kotlin/androidx/collection/LruCache.kt
index 66f26bb..9c4b106 100644
--- a/collection/collection/src/commonMain/kotlin/androidx/collection/LruCache.kt
+++ b/collection/collection/src/commonMain/kotlin/androidx/collection/LruCache.kt
@@ -289,17 +289,20 @@
public fun evictionCount(): Int = lock.synchronized { evictionCount }
/**
- * Returns a copy of the current contents of the cache, ordered from least
+ * Returns a mutable copy of the current contents of the cache, ordered from least
* recently accessed to most recently accessed.
*/
- public fun snapshot(): Map<K, V> =
+ public fun snapshot(): MutableMap<K, V> {
+ // order and mutability is important for backwards compatibility so we intentionally use
+ // a LinkedHashMap here.
+ val copy = LinkedHashMap<K, V>()
lock.synchronized {
- buildMap {
- map.entries.forEach { (key, value) ->
- put(key, value)
- }
+ map.entries.forEach { (key, value) ->
+ copy[key] = value
}
}
+ return copy
+ }
override fun toString(): String {
lock.synchronized {
diff --git a/collection/collection/src/commonMain/kotlin/androidx/collection/internal/Lock.kt b/collection/collection/src/commonMain/kotlin/androidx/collection/internal/Lock.kt
index c89204c..de5684f 100644
--- a/collection/collection/src/commonMain/kotlin/androidx/collection/internal/Lock.kt
+++ b/collection/collection/src/commonMain/kotlin/androidx/collection/internal/Lock.kt
@@ -18,12 +18,17 @@
/**
* A simple reentrant lock.
- * On JVM the implementation is typealiased to `java.util.concurrent.locks.ReentrantLock`.
+ * On JVM it is implemented via `synchronized {}`,
+ * `ReentrantLock` is avoided for performance reasons.
* On Native it is implemented via POSIX mutex with PTHREAD_MUTEX_RECURSIVE flag.
*/
internal expect class Lock() {
- fun lock()
-
- fun unlock()
+ /**
+ * It's not possible to specify a `contract` for an expect function,
+ * see https://youtrack.jetbrains.com/issue/KT-29963.
+ *
+ * Please use [Lock.synchronized] function, where the `contract` is actually specified.
+ */
+ inline fun <T> synchronizedImpl(block: () -> T): T
}
diff --git a/collection/collection/src/commonMain/kotlin/androidx/collection/internal/LockExt.kt b/collection/collection/src/commonMain/kotlin/androidx/collection/internal/LockExt.kt
index 7a937d4..61e384a 100644
--- a/collection/collection/src/commonMain/kotlin/androidx/collection/internal/LockExt.kt
+++ b/collection/collection/src/commonMain/kotlin/androidx/collection/internal/LockExt.kt
@@ -22,10 +22,5 @@
internal inline fun <T> Lock.synchronized(block: () -> T): T {
contract { callsInPlace(block, InvocationKind.EXACTLY_ONCE) }
- lock()
- try {
- return block()
- } finally {
- unlock()
- }
+ return synchronizedImpl(block)
}
diff --git a/collection/collection/src/commonTest/kotlin/androidx/collection/LruCacheTest.kt b/collection/collection/src/commonTest/kotlin/androidx/collection/LruCacheTest.kt
index 480a384..d95a501 100644
--- a/collection/collection/src/commonTest/kotlin/androidx/collection/LruCacheTest.kt
+++ b/collection/collection/src/commonTest/kotlin/androidx/collection/LruCacheTest.kt
@@ -471,6 +471,35 @@
assertEquals(rounds, valuesPut + conflicts + removed)
}
+ @Test // regression test for b/231464384
+ fun snapshotIsMutableAndInTheRightOrder() {
+ val myCache = newCreatingCache()
+ myCache.put("a", "will be overridden")
+ myCache.put("c", "d")
+ myCache.put("a", "b")
+ val snapshot1 = myCache.snapshot()
+ assertEquals(
+ listOf("c" to "d", "a" to "b"),
+ snapshot1.entries.map { it.key to it.value },
+ )
+ // trigger access to move C to the end.
+ assertEquals("d", myCache["c"])
+ val snapshot2 = myCache.snapshot()
+ assertEquals(
+ listOf("a" to "b", "c" to "d"),
+ snapshot2.entries.map { it.key to it.value },
+ )
+ // Make sure it is mutable. This assertion doesn't make sense right now since the API
+ // returns MutableMap but we track APIs only w/ their Java signatures, which means a change
+ // to Map wouldn't show up in API files. Hence we have a test that would break if it starts
+ // returning immutable map.
+ snapshot1["c"] = "e"
+ assertEquals(
+ "e",
+ snapshot1["c"]
+ )
+ }
+
private fun newCreatingCache(): LruCache<String, String> =
object : LruCache<String, String>(3) {
override fun create(key: String): String? =
diff --git a/collection/collection/src/jvmMain/kotlin/androidx/collection/internal/Lock.jvm.kt b/collection/collection/src/jvmMain/kotlin/androidx/collection/internal/Lock.jvm.kt
index ce82206..1be5d51 100644
--- a/collection/collection/src/jvmMain/kotlin/androidx/collection/internal/Lock.jvm.kt
+++ b/collection/collection/src/jvmMain/kotlin/androidx/collection/internal/Lock.jvm.kt
@@ -19,7 +19,9 @@
package androidx.collection.internal
import androidx.annotation.RestrictTo
-import java.util.concurrent.locks.ReentrantLock
-@Suppress("ACTUAL_WITHOUT_EXPECT") // https://youtrack.jetbrains.com/issue/KT-37316
-internal actual typealias Lock = ReentrantLock
+internal actual class Lock {
+
+ actual inline fun <T> synchronizedImpl(block: () -> T): T =
+ synchronized(lock = this, block = block)
+}
diff --git a/collection/collection/src/jvmTest/java/androidx/collection/ArraySetCompatTest.java b/collection/collection/src/jvmTest/java/androidx/collection/ArraySetCompatTest.java
deleted file mode 100644
index ed353cb..0000000
--- a/collection/collection/src/jvmTest/java/androidx/collection/ArraySetCompatTest.java
+++ /dev/null
@@ -1,48 +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.collection;
-
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertFalse;
-import static org.junit.Assert.assertTrue;
-import static org.junit.Assert.fail;
-
-import org.junit.Test;
-import org.junit.runner.RunWith;
-import org.junit.runners.JUnit4;
-
-import java.util.Iterator;
-import java.util.NoSuchElementException;
-
-@RunWith(JUnit4.class)
-public class ArraySetCompatTest {
- @Test
- public void testCanNotIteratePastEnd() {
- ArraySet<String> set = new ArraySet<>();
- set.add("value");
- Iterator<String> iterator = set.iterator();
-
- assertTrue(iterator.hasNext());
- assertEquals("value", iterator.next());
- assertFalse(iterator.hasNext());
-
- try {
- iterator.next();
- fail();
- } catch (NoSuchElementException expected) {
- }
- }
-}
diff --git a/collection/collection/src/jvmTest/java/androidx/collection/ArraySetTest.java b/collection/collection/src/jvmTest/java/androidx/collection/ArraySetTest.java
deleted file mode 100644
index 643e67d..0000000
--- a/collection/collection/src/jvmTest/java/androidx/collection/ArraySetTest.java
+++ /dev/null
@@ -1,105 +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.collection;
-
-import static org.junit.Assert.fail;
-
-import org.junit.After;
-import org.junit.Test;
-import org.junit.runner.RunWith;
-import org.junit.runners.JUnit4;
-
-import java.util.ConcurrentModificationException;
-
-@RunWith(JUnit4.class)
-public class ArraySetTest {
- ArraySet<String> mSet = new ArraySet<>();
-
- @After
- public void tearDown() {
- mSet = null;
- }
-
- /**
- * Attempt to generate a ConcurrentModificationException in ArraySet.
- * <p>
- * ArraySet is explicitly documented to be non-thread-safe, yet it's easy to accidentally screw
- * this up; ArraySet should (in the spirit of the core Java collection types) make an effort to
- * catch this and throw ConcurrentModificationException instead of crashing somewhere in its
- * internals.
- */
- @Test
- public void testConcurrentModificationException() throws Exception {
- final int testDurMs = 10_000;
- System.out.println("Starting ArraySet concurrency test");
- new Thread(new Runnable() {
- @Override
- public void run() {
- int i = 0;
- while (mSet != null) {
- try {
- mSet.add(String.format("key %d", i++));
- } catch (ArrayIndexOutOfBoundsException e) {
- fail(e.getMessage());
- } catch (ClassCastException e) {
- fail(e.getMessage());
- } catch (ConcurrentModificationException e) {
- System.out.println("[successfully caught CME at put #" + i
- + " size=" + (mSet == null ? "??" : String.valueOf(mSet.size()))
- + "]");
- }
- }
- }
- }).start();
- for (int i = 0; i < (testDurMs / 100); i++) {
- try {
- if (mSet.size() % 4 == 0) {
- mSet.clear();
- }
- System.out.print("X");
- } catch (ArrayIndexOutOfBoundsException e) {
- fail(e.getMessage());
- } catch (ClassCastException e) {
- fail(e.getMessage());
- } catch (ConcurrentModificationException e) {
- System.out.println(
- "[successfully caught CME at clear #" + i + " size=" + mSet.size() + "]");
- }
- }
- }
-
- /**
- * Check to make sure the same operations behave as expected in a single thread.
- */
- @Test
- public void testNonConcurrentAccesses() throws Exception {
- for (int i = 0; i < 100000; i++) {
- try {
- mSet.add(String.format("key %d", i++));
- if (i % 200 == 0) {
- System.out.print(".");
- }
- if (i % 500 == 0) {
- mSet.clear();
- }
- } catch (ConcurrentModificationException e) {
- fail(e.getMessage());
- }
- }
- }
-
-}
diff --git a/collection/collection/src/jvmTest/kotlin/androidx/collection/ArraySetCompatTest.kt b/collection/collection/src/jvmTest/kotlin/androidx/collection/ArraySetCompatTest.kt
new file mode 100644
index 0000000..12d96a4
--- /dev/null
+++ b/collection/collection/src/jvmTest/kotlin/androidx/collection/ArraySetCompatTest.kt
@@ -0,0 +1,39 @@
+/*
+ * 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.collection
+
+import kotlin.test.Test
+import kotlin.test.assertEquals
+import kotlin.test.assertFailsWith
+import kotlin.test.assertFalse
+import kotlin.test.assertTrue
+
+internal class ArraySetCompatTest {
+
+ @Test
+ fun testCanNotIteratePastEnd() {
+ val set = ArraySet<String>()
+ set.add("value")
+ val iterator: Iterator<String> = set.iterator()
+ assertTrue(iterator.hasNext())
+ assertEquals("value", iterator.next())
+ assertFalse(iterator.hasNext())
+
+ assertFailsWith<NoSuchElementException> {
+ iterator.next()
+ }
+ }
+}
\ No newline at end of file
diff --git a/collection/collection/src/jvmTest/kotlin/androidx/collection/ArraySetTest.kt b/collection/collection/src/jvmTest/kotlin/androidx/collection/ArraySetTest.kt
new file mode 100644
index 0000000..9970abf
--- /dev/null
+++ b/collection/collection/src/jvmTest/kotlin/androidx/collection/ArraySetTest.kt
@@ -0,0 +1,117 @@
+/*
+ * 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.collection
+
+import androidx.collection.internal.Lock
+import androidx.collection.internal.synchronized
+import kotlin.random.Random
+import kotlin.test.Test
+import kotlinx.coroutines.CoroutineScope
+import kotlinx.coroutines.DelicateCoroutinesApi
+import kotlinx.coroutines.Dispatchers
+import kotlinx.coroutines.cancel
+import kotlinx.coroutines.delay
+import kotlinx.coroutines.isActive
+import kotlinx.coroutines.launch
+import kotlinx.coroutines.newFixedThreadPoolContext
+import kotlinx.coroutines.runBlocking
+
+internal class ArraySetTest {
+
+ private val set = ArraySet<String>()
+
+ /**
+ * Attempt to generate a ConcurrentModificationException in ArraySet.
+ *
+ *
+ * ArraySet is explicitly documented to be non-thread-safe, yet it's easy to accidentally screw
+ * this up; ArraySet should (in the spirit of the core Java collection types) make an effort to
+ * catch this and throw ConcurrentModificationException instead of crashing somewhere in its
+ * internals.
+ */
+ @OptIn(DelicateCoroutinesApi::class)
+ @Test
+ fun testConcurrentModificationException() {
+ var error: Throwable? = null
+ val nThreads = 20
+ var nActiveThreads = 0
+ val lock = Lock()
+ val dispatcher = newFixedThreadPoolContext(nThreads = nThreads, name = "ArraySetTest")
+ val scope = CoroutineScope(dispatcher)
+
+ repeat(nThreads) {
+ scope.launch {
+ lock.synchronized { nActiveThreads++ }
+
+ while (isActive) {
+ val add = Random.nextBoolean()
+ try {
+ if (add) {
+ set.add(Random.nextLong().toString())
+ } else {
+ set.clear()
+ }
+ } catch (e: ArrayIndexOutOfBoundsException) {
+ if (!add) {
+ error = e
+ throw e
+ } // Expected exception otherwise
+ } catch (e: ClassCastException) {
+ error = e
+ throw e
+ } catch (ignored: ConcurrentModificationException) {
+ // Expected exception
+ }
+ }
+ }
+ }
+
+ runBlocking(Dispatchers.Default) {
+ // Wait until all worker threads are started
+ for (i in 0 until 100) {
+ if (lock.synchronized { nActiveThreads == nThreads }) {
+ break
+ } else {
+ delay(timeMillis = 10L)
+ }
+ }
+
+ // Allow the worker threads to run concurrently for some time
+ delay(timeMillis = 100L)
+ }
+
+ scope.cancel()
+ dispatcher.close()
+
+ error?.also { throw it }
+ }
+
+ /**
+ * Check to make sure the same operations behave as expected in a single thread.
+ */
+ @Test
+ fun testNonConcurrentAccesses() {
+ repeat(100_000) { i ->
+ set.add("key $i")
+ if (i % 200 == 0) {
+ print(".")
+ }
+ if (i % 500 == 0) {
+ set.clear()
+ }
+ }
+ }
+}
\ No newline at end of file
diff --git a/collection/collection/src/nativeMain/kotlin/androidx/collection/internal/Lock.native.kt b/collection/collection/src/nativeMain/kotlin/androidx/collection/internal/Lock.native.kt
index 3e1ce71..558b8dc 100644
--- a/collection/collection/src/nativeMain/kotlin/androidx/collection/internal/Lock.native.kt
+++ b/collection/collection/src/nativeMain/kotlin/androidx/collection/internal/Lock.native.kt
@@ -16,6 +16,7 @@
package androidx.collection.internal
+import kotlin.native.internal.createCleaner
import kotlinx.cinterop.Arena
import kotlinx.cinterop.alloc
import kotlinx.cinterop.ptr
@@ -28,7 +29,6 @@
import platform.posix.pthread_mutexattr_init
import platform.posix.pthread_mutexattr_settype
import platform.posix.pthread_mutexattr_t
-import kotlin.native.internal.createCleaner
/**
* Wrapper for platform.posix.PTHREAD_MUTEX_RECURSIVE which
@@ -46,11 +46,20 @@
@ExperimentalStdlibApi
private val cleaner = createCleaner(resources, Resources::destroy)
- actual fun lock() {
+ actual inline fun <T> synchronizedImpl(block: () -> T): T {
+ lock()
+ return try {
+ block()
+ } finally {
+ unlock()
+ }
+ }
+
+ fun lock() {
pthread_mutex_lock(resources.mutex.ptr)
}
- actual fun unlock() {
+ fun unlock() {
pthread_mutex_unlock(resources.mutex.ptr)
}
diff --git a/compose/animation/animation-core/api/1.2.0-beta02.txt b/compose/animation/animation-core/api/1.2.0-beta02.txt
new file mode 100644
index 0000000..eea899a
--- /dev/null
+++ b/compose/animation/animation-core/api/1.2.0-beta02.txt
@@ -0,0 +1,668 @@
+// Signature format: 4.0
+package androidx.compose.animation.core {
+
+ public final class ActualJvmKt {
+ }
+
+ public final class Animatable<T, V extends androidx.compose.animation.core.AnimationVector> {
+ ctor public Animatable(T? initialValue, androidx.compose.animation.core.TwoWayConverter<T,V> typeConverter, optional T? visibilityThreshold);
+ method public suspend Object? animateDecay(T? initialVelocity, androidx.compose.animation.core.DecayAnimationSpec<T> animationSpec, optional kotlin.jvm.functions.Function1<? super androidx.compose.animation.core.Animatable<T,V>,kotlin.Unit>? block, optional kotlin.coroutines.Continuation<? super androidx.compose.animation.core.AnimationResult<T,V>>);
+ method public suspend Object? animateTo(T? targetValue, optional androidx.compose.animation.core.AnimationSpec<T> animationSpec, optional T? initialVelocity, optional kotlin.jvm.functions.Function1<? super androidx.compose.animation.core.Animatable<T,V>,kotlin.Unit>? block, optional kotlin.coroutines.Continuation<? super androidx.compose.animation.core.AnimationResult<T,V>>);
+ method public androidx.compose.runtime.State<T> asState();
+ method public T? getLowerBound();
+ method public T! getTargetValue();
+ method public androidx.compose.animation.core.TwoWayConverter<T,V> getTypeConverter();
+ method public T? getUpperBound();
+ method public T! getValue();
+ method public T! getVelocity();
+ method public V getVelocityVector();
+ method public boolean isRunning();
+ method public suspend Object? snapTo(T? targetValue, kotlin.coroutines.Continuation<? super kotlin.Unit>);
+ method public suspend Object? stop(kotlin.coroutines.Continuation<? super kotlin.Unit>);
+ method public void updateBounds(optional T? lowerBound, optional T? upperBound);
+ property public final boolean isRunning;
+ property public final T? lowerBound;
+ property public final T! targetValue;
+ property public final androidx.compose.animation.core.TwoWayConverter<T,V> typeConverter;
+ property public final T? upperBound;
+ property public final T! value;
+ property public final T! velocity;
+ property public final V velocityVector;
+ }
+
+ public final class AnimatableKt {
+ method public static androidx.compose.animation.core.Animatable<java.lang.Float,androidx.compose.animation.core.AnimationVector1D> Animatable(float initialValue, optional float visibilityThreshold);
+ }
+
+ public final class AnimateAsStateKt {
+ method @androidx.compose.runtime.Composable public static androidx.compose.runtime.State<androidx.compose.ui.unit.Dp> animateDpAsState(float targetValue, optional androidx.compose.animation.core.AnimationSpec<androidx.compose.ui.unit.Dp> animationSpec, optional kotlin.jvm.functions.Function1<? super androidx.compose.ui.unit.Dp,kotlin.Unit>? finishedListener);
+ method @androidx.compose.runtime.Composable public static androidx.compose.runtime.State<java.lang.Float> animateFloatAsState(float targetValue, optional androidx.compose.animation.core.AnimationSpec<java.lang.Float> animationSpec, optional float visibilityThreshold, optional kotlin.jvm.functions.Function1<? super java.lang.Float,kotlin.Unit>? finishedListener);
+ method @androidx.compose.runtime.Composable public static androidx.compose.runtime.State<java.lang.Integer> animateIntAsState(int targetValue, optional androidx.compose.animation.core.AnimationSpec<java.lang.Integer> animationSpec, optional kotlin.jvm.functions.Function1<? super java.lang.Integer,kotlin.Unit>? finishedListener);
+ method @androidx.compose.runtime.Composable public static androidx.compose.runtime.State<androidx.compose.ui.unit.IntOffset> animateIntOffsetAsState(long targetValue, optional androidx.compose.animation.core.AnimationSpec<androidx.compose.ui.unit.IntOffset> animationSpec, optional kotlin.jvm.functions.Function1<? super androidx.compose.ui.unit.IntOffset,kotlin.Unit>? finishedListener);
+ method @androidx.compose.runtime.Composable public static androidx.compose.runtime.State<androidx.compose.ui.unit.IntSize> animateIntSizeAsState(long targetValue, optional androidx.compose.animation.core.AnimationSpec<androidx.compose.ui.unit.IntSize> animationSpec, optional kotlin.jvm.functions.Function1<? super androidx.compose.ui.unit.IntSize,kotlin.Unit>? finishedListener);
+ method @androidx.compose.runtime.Composable public static androidx.compose.runtime.State<androidx.compose.ui.geometry.Offset> animateOffsetAsState(long targetValue, optional androidx.compose.animation.core.AnimationSpec<androidx.compose.ui.geometry.Offset> animationSpec, optional kotlin.jvm.functions.Function1<? super androidx.compose.ui.geometry.Offset,kotlin.Unit>? finishedListener);
+ method @androidx.compose.runtime.Composable public static androidx.compose.runtime.State<androidx.compose.ui.geometry.Rect> animateRectAsState(androidx.compose.ui.geometry.Rect targetValue, optional androidx.compose.animation.core.AnimationSpec<androidx.compose.ui.geometry.Rect> animationSpec, optional kotlin.jvm.functions.Function1<? super androidx.compose.ui.geometry.Rect,kotlin.Unit>? finishedListener);
+ method @androidx.compose.runtime.Composable public static androidx.compose.runtime.State<androidx.compose.ui.geometry.Size> animateSizeAsState(long targetValue, optional androidx.compose.animation.core.AnimationSpec<androidx.compose.ui.geometry.Size> animationSpec, optional kotlin.jvm.functions.Function1<? super androidx.compose.ui.geometry.Size,kotlin.Unit>? finishedListener);
+ method @androidx.compose.runtime.Composable public static <T, V extends androidx.compose.animation.core.AnimationVector> androidx.compose.runtime.State<T> animateValueAsState(T? targetValue, androidx.compose.animation.core.TwoWayConverter<T,V> typeConverter, optional androidx.compose.animation.core.AnimationSpec<T> animationSpec, optional T? visibilityThreshold, optional kotlin.jvm.functions.Function1<? super T,kotlin.Unit>? finishedListener);
+ }
+
+ public interface Animation<T, V extends androidx.compose.animation.core.AnimationVector> {
+ method public long getDurationNanos();
+ method public T! getTargetValue();
+ method public androidx.compose.animation.core.TwoWayConverter<T,V> getTypeConverter();
+ method public T! getValueFromNanos(long playTimeNanos);
+ method public V getVelocityVectorFromNanos(long playTimeNanos);
+ method public default boolean isFinishedFromNanos(long playTimeNanos);
+ method public boolean isInfinite();
+ property public abstract long durationNanos;
+ property public abstract boolean isInfinite;
+ property public abstract T! targetValue;
+ property public abstract androidx.compose.animation.core.TwoWayConverter<T,V> typeConverter;
+ }
+
+ public final class AnimationConstants {
+ field public static final int DefaultDurationMillis = 300; // 0x12c
+ field public static final androidx.compose.animation.core.AnimationConstants INSTANCE;
+ field public static final long UnspecifiedTime = -9223372036854775808L; // 0x8000000000000000L
+ }
+
+ public enum AnimationEndReason {
+ enum_constant public static final androidx.compose.animation.core.AnimationEndReason BoundReached;
+ enum_constant public static final androidx.compose.animation.core.AnimationEndReason Finished;
+ }
+
+ public final class AnimationKt {
+ method public static androidx.compose.animation.core.DecayAnimation<java.lang.Float,androidx.compose.animation.core.AnimationVector1D> DecayAnimation(androidx.compose.animation.core.FloatDecayAnimationSpec animationSpec, float initialValue, optional float initialVelocity);
+ method public static <T, V extends androidx.compose.animation.core.AnimationVector> androidx.compose.animation.core.TargetBasedAnimation<T,V> TargetBasedAnimation(androidx.compose.animation.core.AnimationSpec<T> animationSpec, androidx.compose.animation.core.TwoWayConverter<T,V> typeConverter, T? initialValue, T? targetValue, T? initialVelocity);
+ method public static <T, V extends androidx.compose.animation.core.AnimationVector> T! getVelocityFromNanos(androidx.compose.animation.core.Animation<T,V>, long playTimeNanos);
+ }
+
+ public final class AnimationResult<T, V extends androidx.compose.animation.core.AnimationVector> {
+ ctor public AnimationResult(androidx.compose.animation.core.AnimationState<T,V> endState, androidx.compose.animation.core.AnimationEndReason endReason);
+ method public androidx.compose.animation.core.AnimationEndReason getEndReason();
+ method public androidx.compose.animation.core.AnimationState<T,V> getEndState();
+ property public final androidx.compose.animation.core.AnimationEndReason endReason;
+ property public final androidx.compose.animation.core.AnimationState<T,V> endState;
+ }
+
+ public final class AnimationScope<T, V extends androidx.compose.animation.core.AnimationVector> {
+ method public void cancelAnimation();
+ method public long getFinishedTimeNanos();
+ method public long getLastFrameTimeNanos();
+ method public long getStartTimeNanos();
+ method public T! getTargetValue();
+ method public androidx.compose.animation.core.TwoWayConverter<T,V> getTypeConverter();
+ method public T! getValue();
+ method public T! getVelocity();
+ method public V getVelocityVector();
+ method public boolean isRunning();
+ method public androidx.compose.animation.core.AnimationState<T,V> toAnimationState();
+ property public final long finishedTimeNanos;
+ property public final boolean isRunning;
+ property public final long lastFrameTimeNanos;
+ property public final long startTimeNanos;
+ property public final T! targetValue;
+ property public final androidx.compose.animation.core.TwoWayConverter<T,V> typeConverter;
+ property public final T! value;
+ property public final T! velocity;
+ property public final V velocityVector;
+ }
+
+ public interface AnimationSpec<T> {
+ method public <V extends androidx.compose.animation.core.AnimationVector> androidx.compose.animation.core.VectorizedAnimationSpec<V> vectorize(androidx.compose.animation.core.TwoWayConverter<T,V> converter);
+ }
+
+ public final class AnimationSpecKt {
+ method @androidx.compose.runtime.Stable public static <T> androidx.compose.animation.core.InfiniteRepeatableSpec<T> infiniteRepeatable(androidx.compose.animation.core.DurationBasedAnimationSpec<T> animation, optional androidx.compose.animation.core.RepeatMode repeatMode, optional long initialStartOffset);
+ method @Deprecated @androidx.compose.runtime.Stable public static <T> androidx.compose.animation.core.InfiniteRepeatableSpec<T>! infiniteRepeatable(androidx.compose.animation.core.DurationBasedAnimationSpec<T> animation, optional androidx.compose.animation.core.RepeatMode repeatMode);
+ method @androidx.compose.runtime.Stable public static <T> androidx.compose.animation.core.KeyframesSpec<T> keyframes(kotlin.jvm.functions.Function1<? super androidx.compose.animation.core.KeyframesSpec.KeyframesSpecConfig<T>,kotlin.Unit> init);
+ method @androidx.compose.runtime.Stable public static <T> androidx.compose.animation.core.RepeatableSpec<T> repeatable(int iterations, androidx.compose.animation.core.DurationBasedAnimationSpec<T> animation, optional androidx.compose.animation.core.RepeatMode repeatMode, optional long initialStartOffset);
+ method @Deprecated @androidx.compose.runtime.Stable public static <T> androidx.compose.animation.core.RepeatableSpec<T>! repeatable(int iterations, androidx.compose.animation.core.DurationBasedAnimationSpec<T> animation, optional androidx.compose.animation.core.RepeatMode repeatMode);
+ method @androidx.compose.runtime.Stable public static <T> androidx.compose.animation.core.SnapSpec<T> snap(optional int delayMillis);
+ method @androidx.compose.runtime.Stable public static <T> androidx.compose.animation.core.SpringSpec<T> spring(optional float dampingRatio, optional float stiffness, optional T? visibilityThreshold);
+ method @androidx.compose.runtime.Stable public static <T> androidx.compose.animation.core.TweenSpec<T> tween(optional int durationMillis, optional int delayMillis, optional androidx.compose.animation.core.Easing easing);
+ }
+
+ public final class AnimationState<T, V extends androidx.compose.animation.core.AnimationVector> implements androidx.compose.runtime.State<T> {
+ ctor public AnimationState(androidx.compose.animation.core.TwoWayConverter<T,V> typeConverter, T? initialValue, optional V? initialVelocityVector, optional long lastFrameTimeNanos, optional long finishedTimeNanos, optional boolean isRunning);
+ method public long getFinishedTimeNanos();
+ method public long getLastFrameTimeNanos();
+ method public androidx.compose.animation.core.TwoWayConverter<T,V> getTypeConverter();
+ method public T! getValue();
+ method public T! getVelocity();
+ method public V getVelocityVector();
+ method public boolean isRunning();
+ property public final long finishedTimeNanos;
+ property public final boolean isRunning;
+ property public final long lastFrameTimeNanos;
+ property public final androidx.compose.animation.core.TwoWayConverter<T,V> typeConverter;
+ property public T! value;
+ property public final T! velocity;
+ property public final V velocityVector;
+ }
+
+ public final class AnimationStateKt {
+ method public static androidx.compose.animation.core.AnimationState<java.lang.Float,androidx.compose.animation.core.AnimationVector1D> AnimationState(float initialValue, optional float initialVelocity, optional long lastFrameTimeNanos, optional long finishedTimeNanos, optional boolean isRunning);
+ method public static <T, V extends androidx.compose.animation.core.AnimationVector> androidx.compose.animation.core.AnimationState<T,V> AnimationState(androidx.compose.animation.core.TwoWayConverter<T,V> typeConverter, T? initialValue, T? initialVelocity, optional long lastFrameTimeNanos, optional long finishedTimeNanos, optional boolean isRunning);
+ method public static <T, V extends androidx.compose.animation.core.AnimationVector> androidx.compose.animation.core.AnimationState<T,V> copy(androidx.compose.animation.core.AnimationState<T,V>, optional T? value, optional V? velocityVector, optional long lastFrameTimeNanos, optional long finishedTimeNanos, optional boolean isRunning);
+ method public static androidx.compose.animation.core.AnimationState<java.lang.Float,androidx.compose.animation.core.AnimationVector1D> copy(androidx.compose.animation.core.AnimationState<java.lang.Float,androidx.compose.animation.core.AnimationVector1D>, optional float value, optional float velocity, optional long lastFrameTimeNanos, optional long finishedTimeNanos, optional boolean isRunning);
+ method public static <T, V extends androidx.compose.animation.core.AnimationVector> V createZeroVectorFrom(androidx.compose.animation.core.TwoWayConverter<T,V>, T? value);
+ method public static boolean isFinished(androidx.compose.animation.core.AnimationState<?,?>);
+ }
+
+ public abstract sealed class AnimationVector {
+ }
+
+ public final class AnimationVector1D extends androidx.compose.animation.core.AnimationVector {
+ ctor public AnimationVector1D(float initVal);
+ method public float getValue();
+ property public final float value;
+ }
+
+ public final class AnimationVector2D extends androidx.compose.animation.core.AnimationVector {
+ ctor public AnimationVector2D(float v1, float v2);
+ method public float getV1();
+ method public float getV2();
+ property public final float v1;
+ property public final float v2;
+ }
+
+ public final class AnimationVector3D extends androidx.compose.animation.core.AnimationVector {
+ ctor public AnimationVector3D(float v1, float v2, float v3);
+ method public float getV1();
+ method public float getV2();
+ method public float getV3();
+ property public final float v1;
+ property public final float v2;
+ property public final float v3;
+ }
+
+ public final class AnimationVector4D extends androidx.compose.animation.core.AnimationVector {
+ ctor public AnimationVector4D(float v1, float v2, float v3, float v4);
+ method public float getV1();
+ method public float getV2();
+ method public float getV3();
+ method public float getV4();
+ property public final float v1;
+ property public final float v2;
+ property public final float v3;
+ property public final float v4;
+ }
+
+ public final class AnimationVectorsKt {
+ method public static androidx.compose.animation.core.AnimationVector1D AnimationVector(float v1);
+ method public static androidx.compose.animation.core.AnimationVector2D AnimationVector(float v1, float v2);
+ method public static androidx.compose.animation.core.AnimationVector3D AnimationVector(float v1, float v2, float v3);
+ method public static androidx.compose.animation.core.AnimationVector4D AnimationVector(float v1, float v2, float v3, float v4);
+ }
+
+ public final class ComplexDoubleKt {
+ }
+
+ @androidx.compose.runtime.Immutable public final class CubicBezierEasing implements androidx.compose.animation.core.Easing {
+ ctor public CubicBezierEasing(float a, float b, float c, float d);
+ method public float transform(float fraction);
+ }
+
+ public final class DecayAnimation<T, V extends androidx.compose.animation.core.AnimationVector> implements androidx.compose.animation.core.Animation<T,V> {
+ ctor public DecayAnimation(androidx.compose.animation.core.VectorizedDecayAnimationSpec<V> animationSpec, androidx.compose.animation.core.TwoWayConverter<T,V> typeConverter, T? initialValue, V initialVelocityVector);
+ ctor public DecayAnimation(androidx.compose.animation.core.DecayAnimationSpec<T> animationSpec, androidx.compose.animation.core.TwoWayConverter<T,V> typeConverter, T? initialValue, V initialVelocityVector);
+ ctor public DecayAnimation(androidx.compose.animation.core.DecayAnimationSpec<T> animationSpec, androidx.compose.animation.core.TwoWayConverter<T,V> typeConverter, T? initialValue, T? initialVelocity);
+ method public long getDurationNanos();
+ method public T! getInitialValue();
+ method public V getInitialVelocityVector();
+ method public T! getTargetValue();
+ method public androidx.compose.animation.core.TwoWayConverter<T,V> getTypeConverter();
+ method public T! getValueFromNanos(long playTimeNanos);
+ method public V getVelocityVectorFromNanos(long playTimeNanos);
+ method public boolean isInfinite();
+ property public long durationNanos;
+ property public final T! initialValue;
+ property public final V initialVelocityVector;
+ property public boolean isInfinite;
+ property public T! targetValue;
+ property public androidx.compose.animation.core.TwoWayConverter<T,V> typeConverter;
+ }
+
+ public interface DecayAnimationSpec<T> {
+ method public <V extends androidx.compose.animation.core.AnimationVector> androidx.compose.animation.core.VectorizedDecayAnimationSpec<V> vectorize(androidx.compose.animation.core.TwoWayConverter<T,V> typeConverter);
+ }
+
+ public final class DecayAnimationSpecKt {
+ method public static <T, V extends androidx.compose.animation.core.AnimationVector> T! calculateTargetValue(androidx.compose.animation.core.DecayAnimationSpec<T>, androidx.compose.animation.core.TwoWayConverter<T,V> typeConverter, T? initialValue, T? initialVelocity);
+ method public static float calculateTargetValue(androidx.compose.animation.core.DecayAnimationSpec<java.lang.Float>, float initialValue, float initialVelocity);
+ method public static <T> androidx.compose.animation.core.DecayAnimationSpec<T> exponentialDecay(optional float frictionMultiplier, optional float absVelocityThreshold);
+ method public static <T> androidx.compose.animation.core.DecayAnimationSpec<T> generateDecayAnimationSpec(androidx.compose.animation.core.FloatDecayAnimationSpec);
+ }
+
+ public interface DurationBasedAnimationSpec<T> extends androidx.compose.animation.core.FiniteAnimationSpec<T> {
+ method public <V extends androidx.compose.animation.core.AnimationVector> androidx.compose.animation.core.VectorizedDurationBasedAnimationSpec<V> vectorize(androidx.compose.animation.core.TwoWayConverter<T,V> converter);
+ }
+
+ @androidx.compose.runtime.Stable public fun interface Easing {
+ method public float transform(float fraction);
+ }
+
+ public final class EasingKt {
+ method public static androidx.compose.animation.core.Easing getFastOutLinearInEasing();
+ method public static androidx.compose.animation.core.Easing getFastOutSlowInEasing();
+ method public static androidx.compose.animation.core.Easing getLinearEasing();
+ method public static androidx.compose.animation.core.Easing getLinearOutSlowInEasing();
+ property public static final androidx.compose.animation.core.Easing FastOutLinearInEasing;
+ property public static final androidx.compose.animation.core.Easing FastOutSlowInEasing;
+ property public static final androidx.compose.animation.core.Easing LinearEasing;
+ property public static final androidx.compose.animation.core.Easing LinearOutSlowInEasing;
+ }
+
+ public interface FiniteAnimationSpec<T> extends androidx.compose.animation.core.AnimationSpec<T> {
+ method public <V extends androidx.compose.animation.core.AnimationVector> androidx.compose.animation.core.VectorizedFiniteAnimationSpec<V> vectorize(androidx.compose.animation.core.TwoWayConverter<T,V> converter);
+ }
+
+ public interface FloatAnimationSpec extends androidx.compose.animation.core.AnimationSpec<java.lang.Float> {
+ method public long getDurationNanos(float initialValue, float targetValue, float initialVelocity);
+ method public default float getEndVelocity(float initialValue, float targetValue, float initialVelocity);
+ method public float getValueFromNanos(long playTimeNanos, float initialValue, float targetValue, float initialVelocity);
+ method public float getVelocityFromNanos(long playTimeNanos, float initialValue, float targetValue, float initialVelocity);
+ method public default <V extends androidx.compose.animation.core.AnimationVector> androidx.compose.animation.core.VectorizedFloatAnimationSpec<V> vectorize(androidx.compose.animation.core.TwoWayConverter<java.lang.Float,V> converter);
+ }
+
+ public interface FloatDecayAnimationSpec {
+ method public float getAbsVelocityThreshold();
+ method public long getDurationNanos(float initialValue, float initialVelocity);
+ method public float getTargetValue(float initialValue, float initialVelocity);
+ method public float getValueFromNanos(long playTimeNanos, float initialValue, float initialVelocity);
+ method public float getVelocityFromNanos(long playTimeNanos, float initialValue, float initialVelocity);
+ property public abstract float absVelocityThreshold;
+ }
+
+ public final class FloatDecayAnimationSpecKt {
+ }
+
+ public final class FloatExponentialDecaySpec implements androidx.compose.animation.core.FloatDecayAnimationSpec {
+ ctor public FloatExponentialDecaySpec(optional float frictionMultiplier, optional float absVelocityThreshold);
+ method public float getAbsVelocityThreshold();
+ method public long getDurationNanos(float initialValue, float initialVelocity);
+ method public float getTargetValue(float initialValue, float initialVelocity);
+ method public float getValueFromNanos(long playTimeNanos, float initialValue, float initialVelocity);
+ method public float getVelocityFromNanos(long playTimeNanos, float initialValue, float initialVelocity);
+ property public float absVelocityThreshold;
+ }
+
+ public final class FloatSpringSpec implements androidx.compose.animation.core.FloatAnimationSpec {
+ ctor public FloatSpringSpec(optional float dampingRatio, optional float stiffness, optional float visibilityThreshold);
+ method public float getDampingRatio();
+ method public long getDurationNanos(float initialValue, float targetValue, float initialVelocity);
+ method public float getStiffness();
+ method public float getValueFromNanos(long playTimeNanos, float initialValue, float targetValue, float initialVelocity);
+ method public float getVelocityFromNanos(long playTimeNanos, float initialValue, float targetValue, float initialVelocity);
+ property public final float dampingRatio;
+ property public final float stiffness;
+ }
+
+ public final class FloatTweenSpec implements androidx.compose.animation.core.FloatAnimationSpec {
+ ctor public FloatTweenSpec(optional int duration, optional int delay, optional androidx.compose.animation.core.Easing easing);
+ method public int getDelay();
+ method public int getDuration();
+ method public long getDurationNanos(float initialValue, float targetValue, float initialVelocity);
+ method public float getValueFromNanos(long playTimeNanos, float initialValue, float targetValue, float initialVelocity);
+ method public float getVelocityFromNanos(long playTimeNanos, float initialValue, float targetValue, float initialVelocity);
+ property public final int delay;
+ property public final int duration;
+ }
+
+ public final class InfiniteAnimationPolicyKt {
+ method public static suspend inline <R> Object? withInfiniteAnimationFrameMillis(kotlin.jvm.functions.Function1<? super java.lang.Long,? extends R> onFrame, kotlin.coroutines.Continuation<? super R>);
+ method public static suspend <R> Object? withInfiniteAnimationFrameNanos(kotlin.jvm.functions.Function1<? super java.lang.Long,? extends R> onFrame, kotlin.coroutines.Continuation<? super R>);
+ }
+
+ public final class InfiniteRepeatableSpec<T> implements androidx.compose.animation.core.AnimationSpec<T> {
+ ctor public InfiniteRepeatableSpec(androidx.compose.animation.core.DurationBasedAnimationSpec<T> animation, optional androidx.compose.animation.core.RepeatMode repeatMode, optional long initialStartOffset);
+ method @Deprecated public androidx.compose.animation.core.InfiniteRepeatableSpec<T>! InfiniteRepeatableSpec(androidx.compose.animation.core.DurationBasedAnimationSpec<T> animation, optional androidx.compose.animation.core.RepeatMode repeatMode);
+ method public androidx.compose.animation.core.DurationBasedAnimationSpec<T> getAnimation();
+ method public long getInitialStartOffset();
+ method public androidx.compose.animation.core.RepeatMode getRepeatMode();
+ method public <V extends androidx.compose.animation.core.AnimationVector> androidx.compose.animation.core.VectorizedAnimationSpec<V> vectorize(androidx.compose.animation.core.TwoWayConverter<T,V> converter);
+ property public final androidx.compose.animation.core.DurationBasedAnimationSpec<T> animation;
+ property public final long initialStartOffset;
+ property public final androidx.compose.animation.core.RepeatMode repeatMode;
+ }
+
+ public final class InfiniteTransition {
+ }
+
+ public final class InfiniteTransitionKt {
+ method @androidx.compose.runtime.Composable public static androidx.compose.runtime.State<java.lang.Float> animateFloat(androidx.compose.animation.core.InfiniteTransition, float initialValue, float targetValue, androidx.compose.animation.core.InfiniteRepeatableSpec<java.lang.Float> animationSpec);
+ method @androidx.compose.runtime.Composable public static <T, V extends androidx.compose.animation.core.AnimationVector> androidx.compose.runtime.State<T> animateValue(androidx.compose.animation.core.InfiniteTransition, T? initialValue, T? targetValue, androidx.compose.animation.core.TwoWayConverter<T,V> typeConverter, androidx.compose.animation.core.InfiniteRepeatableSpec<T> animationSpec);
+ method @androidx.compose.runtime.Composable public static androidx.compose.animation.core.InfiniteTransition rememberInfiniteTransition();
+ }
+
+ @androidx.compose.runtime.Immutable public final class KeyframesSpec<T> implements androidx.compose.animation.core.DurationBasedAnimationSpec<T> {
+ ctor public KeyframesSpec(androidx.compose.animation.core.KeyframesSpec.KeyframesSpecConfig<T> config);
+ method public androidx.compose.animation.core.KeyframesSpec.KeyframesSpecConfig<T> getConfig();
+ method public <V extends androidx.compose.animation.core.AnimationVector> androidx.compose.animation.core.VectorizedKeyframesSpec<V> vectorize(androidx.compose.animation.core.TwoWayConverter<T,V> converter);
+ property public final androidx.compose.animation.core.KeyframesSpec.KeyframesSpecConfig<T> config;
+ }
+
+ public static final class KeyframesSpec.KeyframeEntity<T> {
+ }
+
+ public static final class KeyframesSpec.KeyframesSpecConfig<T> {
+ ctor public KeyframesSpec.KeyframesSpecConfig();
+ method public infix androidx.compose.animation.core.KeyframesSpec.KeyframeEntity<T> at(T?, int timeStamp);
+ method public int getDelayMillis();
+ method public int getDurationMillis();
+ method public void setDelayMillis(int);
+ method public void setDurationMillis(int);
+ method public infix void with(androidx.compose.animation.core.KeyframesSpec.KeyframeEntity<T>, androidx.compose.animation.core.Easing easing);
+ property public final int delayMillis;
+ property public final int durationMillis;
+ }
+
+ public final class MutableTransitionState<S> {
+ ctor public MutableTransitionState(S? initialState);
+ method public S! getCurrentState();
+ method public S! getTargetState();
+ method public boolean isIdle();
+ method public void setTargetState(S!);
+ property public final S! currentState;
+ property public final boolean isIdle;
+ property public final S! targetState;
+ }
+
+ public enum RepeatMode {
+ enum_constant public static final androidx.compose.animation.core.RepeatMode Restart;
+ enum_constant public static final androidx.compose.animation.core.RepeatMode Reverse;
+ }
+
+ @androidx.compose.runtime.Immutable public final class RepeatableSpec<T> implements androidx.compose.animation.core.FiniteAnimationSpec<T> {
+ ctor public RepeatableSpec(int iterations, androidx.compose.animation.core.DurationBasedAnimationSpec<T> animation, optional androidx.compose.animation.core.RepeatMode repeatMode, optional long initialStartOffset);
+ method @Deprecated public androidx.compose.animation.core.RepeatableSpec<T>! RepeatableSpec(int iterations, androidx.compose.animation.core.DurationBasedAnimationSpec<T> animation, optional androidx.compose.animation.core.RepeatMode repeatMode);
+ method public androidx.compose.animation.core.DurationBasedAnimationSpec<T> getAnimation();
+ method public long getInitialStartOffset();
+ method public int getIterations();
+ method public androidx.compose.animation.core.RepeatMode getRepeatMode();
+ method public <V extends androidx.compose.animation.core.AnimationVector> androidx.compose.animation.core.VectorizedFiniteAnimationSpec<V> vectorize(androidx.compose.animation.core.TwoWayConverter<T,V> converter);
+ property public final androidx.compose.animation.core.DurationBasedAnimationSpec<T> animation;
+ property public final long initialStartOffset;
+ property public final int iterations;
+ property public final androidx.compose.animation.core.RepeatMode repeatMode;
+ }
+
+ @androidx.compose.runtime.Immutable public final class SnapSpec<T> implements androidx.compose.animation.core.DurationBasedAnimationSpec<T> {
+ ctor public SnapSpec(optional int delay);
+ method public int getDelay();
+ method public <V extends androidx.compose.animation.core.AnimationVector> androidx.compose.animation.core.VectorizedDurationBasedAnimationSpec<V> vectorize(androidx.compose.animation.core.TwoWayConverter<T,V> converter);
+ property public final int delay;
+ }
+
+ public final class Spring {
+ field public static final float DampingRatioHighBouncy = 0.2f;
+ field public static final float DampingRatioLowBouncy = 0.75f;
+ field public static final float DampingRatioMediumBouncy = 0.5f;
+ field public static final float DampingRatioNoBouncy = 1.0f;
+ field public static final float DefaultDisplacementThreshold = 0.01f;
+ field public static final androidx.compose.animation.core.Spring INSTANCE;
+ field public static final float StiffnessHigh = 10000.0f;
+ field public static final float StiffnessLow = 200.0f;
+ field public static final float StiffnessMedium = 1500.0f;
+ field public static final float StiffnessMediumLow = 400.0f;
+ field public static final float StiffnessVeryLow = 50.0f;
+ }
+
+ public final class SpringEstimationKt {
+ }
+
+ public final class SpringSimulationKt {
+ }
+
+ @androidx.compose.runtime.Immutable public final class SpringSpec<T> implements androidx.compose.animation.core.FiniteAnimationSpec<T> {
+ ctor public SpringSpec(optional float dampingRatio, optional float stiffness, optional T? visibilityThreshold);
+ method public float getDampingRatio();
+ method public float getStiffness();
+ method public T? getVisibilityThreshold();
+ method public <V extends androidx.compose.animation.core.AnimationVector> androidx.compose.animation.core.VectorizedSpringSpec<V> vectorize(androidx.compose.animation.core.TwoWayConverter<T,V> converter);
+ property public final float dampingRatio;
+ property public final float stiffness;
+ property public final T? visibilityThreshold;
+ }
+
+ @kotlin.jvm.JvmInline public final value class StartOffset {
+ ctor public StartOffset(int offsetMillis, optional int offsetType);
+ method public int getOffsetMillis();
+ method public int getOffsetType();
+ property public final int offsetMillis;
+ property public final int offsetType;
+ }
+
+ @kotlin.jvm.JvmInline public final value class StartOffsetType {
+ field public static final androidx.compose.animation.core.StartOffsetType.Companion Companion;
+ }
+
+ public static final class StartOffsetType.Companion {
+ method public int getDelay();
+ method public int getFastForward();
+ property public final int Delay;
+ property public final int FastForward;
+ }
+
+ public final class SuspendAnimationKt {
+ method public static suspend Object? animate(float initialValue, float targetValue, optional float initialVelocity, optional androidx.compose.animation.core.AnimationSpec<java.lang.Float> animationSpec, kotlin.jvm.functions.Function2<? super java.lang.Float,? super java.lang.Float,kotlin.Unit> block, kotlin.coroutines.Continuation<? super kotlin.Unit>);
+ method public static suspend <T, V extends androidx.compose.animation.core.AnimationVector> Object? animate(androidx.compose.animation.core.TwoWayConverter<T,V> typeConverter, T? initialValue, T? targetValue, optional T? initialVelocity, optional androidx.compose.animation.core.AnimationSpec<T> animationSpec, kotlin.jvm.functions.Function2<? super T,? super T,kotlin.Unit> block, kotlin.coroutines.Continuation<? super kotlin.Unit>);
+ method public static suspend Object? animateDecay(float initialValue, float initialVelocity, androidx.compose.animation.core.FloatDecayAnimationSpec animationSpec, kotlin.jvm.functions.Function2<? super java.lang.Float,? super java.lang.Float,kotlin.Unit> block, kotlin.coroutines.Continuation<? super kotlin.Unit>);
+ method public static suspend <T, V extends androidx.compose.animation.core.AnimationVector> Object? animateDecay(androidx.compose.animation.core.AnimationState<T,V>, androidx.compose.animation.core.DecayAnimationSpec<T> animationSpec, optional boolean sequentialAnimation, optional kotlin.jvm.functions.Function1<? super androidx.compose.animation.core.AnimationScope<T,V>,kotlin.Unit> block, optional kotlin.coroutines.Continuation<? super kotlin.Unit>);
+ method public static suspend <T, V extends androidx.compose.animation.core.AnimationVector> Object? animateTo(androidx.compose.animation.core.AnimationState<T,V>, T? targetValue, optional androidx.compose.animation.core.AnimationSpec<T> animationSpec, optional boolean sequentialAnimation, optional kotlin.jvm.functions.Function1<? super androidx.compose.animation.core.AnimationScope<T,V>,kotlin.Unit> block, optional kotlin.coroutines.Continuation<? super kotlin.Unit>);
+ }
+
+ public final class TargetBasedAnimation<T, V extends androidx.compose.animation.core.AnimationVector> implements androidx.compose.animation.core.Animation<T,V> {
+ ctor public TargetBasedAnimation(androidx.compose.animation.core.AnimationSpec<T> animationSpec, androidx.compose.animation.core.TwoWayConverter<T,V> typeConverter, T? initialValue, T? targetValue, optional V? initialVelocityVector);
+ method public long getDurationNanos();
+ method public T! getInitialValue();
+ method public T! getTargetValue();
+ method public androidx.compose.animation.core.TwoWayConverter<T,V> getTypeConverter();
+ method public T! getValueFromNanos(long playTimeNanos);
+ method public V getVelocityVectorFromNanos(long playTimeNanos);
+ method public boolean isInfinite();
+ property public long durationNanos;
+ property public final T! initialValue;
+ property public boolean isInfinite;
+ property public T! targetValue;
+ property public androidx.compose.animation.core.TwoWayConverter<T,V> typeConverter;
+ }
+
+ @androidx.compose.runtime.Stable public final class Transition<S> {
+ method public java.util.List<androidx.compose.animation.core.Transition<S>.TransitionAnimationState<?,?>> getAnimations();
+ method public S! getCurrentState();
+ method public String? getLabel();
+ method public androidx.compose.animation.core.Transition.Segment<S> getSegment();
+ method public S! getTargetState();
+ method public long getTotalDurationNanos();
+ method public java.util.List<androidx.compose.animation.core.Transition<?>> getTransitions();
+ method public boolean isRunning();
+ property public final java.util.List<androidx.compose.animation.core.Transition<S>.TransitionAnimationState<?,?>> animations;
+ property public final S! currentState;
+ property public final boolean isRunning;
+ property public final String? label;
+ property public final androidx.compose.animation.core.Transition.Segment<S> segment;
+ property public final S! targetState;
+ property public final long totalDurationNanos;
+ property public final java.util.List<androidx.compose.animation.core.Transition<?>> transitions;
+ }
+
+ public static interface Transition.Segment<S> {
+ method public S! getInitialState();
+ method public S! getTargetState();
+ method public default infix boolean isTransitioningTo(S?, S? targetState);
+ property public abstract S! initialState;
+ property public abstract S! targetState;
+ }
+
+ @androidx.compose.runtime.Stable public final class Transition.TransitionAnimationState<T, V extends androidx.compose.animation.core.AnimationVector> implements androidx.compose.runtime.State<T> {
+ method public androidx.compose.animation.core.TargetBasedAnimation<T,V> getAnimation();
+ method public androidx.compose.animation.core.FiniteAnimationSpec<T> getAnimationSpec();
+ method public String getLabel();
+ method public androidx.compose.animation.core.TwoWayConverter<T,V> getTypeConverter();
+ method public T! getValue();
+ property public final androidx.compose.animation.core.TargetBasedAnimation<T,V> animation;
+ property public final androidx.compose.animation.core.FiniteAnimationSpec<T> animationSpec;
+ property public final String label;
+ property public final androidx.compose.animation.core.TwoWayConverter<T,V> typeConverter;
+ property public T! value;
+ }
+
+ public final class TransitionKt {
+ method @androidx.compose.runtime.Composable public static inline <S> androidx.compose.runtime.State<androidx.compose.ui.unit.Dp> animateDp(androidx.compose.animation.core.Transition<S>, optional kotlin.jvm.functions.Function1<? super androidx.compose.animation.core.Transition.Segment<S>,? extends androidx.compose.animation.core.FiniteAnimationSpec<androidx.compose.ui.unit.Dp>> transitionSpec, optional String label, kotlin.jvm.functions.Function1<? super S,androidx.compose.ui.unit.Dp> targetValueByState);
+ method @androidx.compose.runtime.Composable public static inline <S> androidx.compose.runtime.State<java.lang.Float> animateFloat(androidx.compose.animation.core.Transition<S>, optional kotlin.jvm.functions.Function1<? super androidx.compose.animation.core.Transition.Segment<S>,? extends androidx.compose.animation.core.FiniteAnimationSpec<java.lang.Float>> transitionSpec, optional String label, kotlin.jvm.functions.Function1<? super S,java.lang.Float> targetValueByState);
+ method @androidx.compose.runtime.Composable public static inline <S> androidx.compose.runtime.State<java.lang.Integer> animateInt(androidx.compose.animation.core.Transition<S>, optional kotlin.jvm.functions.Function1<? super androidx.compose.animation.core.Transition.Segment<S>,? extends androidx.compose.animation.core.FiniteAnimationSpec<java.lang.Integer>> transitionSpec, optional String label, kotlin.jvm.functions.Function1<? super S,java.lang.Integer> targetValueByState);
+ method @androidx.compose.runtime.Composable public static inline <S> androidx.compose.runtime.State<androidx.compose.ui.unit.IntOffset> animateIntOffset(androidx.compose.animation.core.Transition<S>, optional kotlin.jvm.functions.Function1<? super androidx.compose.animation.core.Transition.Segment<S>,? extends androidx.compose.animation.core.FiniteAnimationSpec<androidx.compose.ui.unit.IntOffset>> transitionSpec, optional String label, kotlin.jvm.functions.Function1<? super S,androidx.compose.ui.unit.IntOffset> targetValueByState);
+ method @androidx.compose.runtime.Composable public static inline <S> androidx.compose.runtime.State<androidx.compose.ui.unit.IntSize> animateIntSize(androidx.compose.animation.core.Transition<S>, optional kotlin.jvm.functions.Function1<? super androidx.compose.animation.core.Transition.Segment<S>,? extends androidx.compose.animation.core.FiniteAnimationSpec<androidx.compose.ui.unit.IntSize>> transitionSpec, optional String label, kotlin.jvm.functions.Function1<? super S,androidx.compose.ui.unit.IntSize> targetValueByState);
+ method @androidx.compose.runtime.Composable public static inline <S> androidx.compose.runtime.State<androidx.compose.ui.geometry.Offset> animateOffset(androidx.compose.animation.core.Transition<S>, optional kotlin.jvm.functions.Function1<? super androidx.compose.animation.core.Transition.Segment<S>,? extends androidx.compose.animation.core.FiniteAnimationSpec<androidx.compose.ui.geometry.Offset>> transitionSpec, optional String label, kotlin.jvm.functions.Function1<? super S,androidx.compose.ui.geometry.Offset> targetValueByState);
+ method @androidx.compose.runtime.Composable public static inline <S> androidx.compose.runtime.State<androidx.compose.ui.geometry.Rect> animateRect(androidx.compose.animation.core.Transition<S>, optional kotlin.jvm.functions.Function1<? super androidx.compose.animation.core.Transition.Segment<S>,? extends androidx.compose.animation.core.FiniteAnimationSpec<androidx.compose.ui.geometry.Rect>> transitionSpec, optional String label, kotlin.jvm.functions.Function1<? super S,androidx.compose.ui.geometry.Rect> targetValueByState);
+ method @androidx.compose.runtime.Composable public static inline <S> androidx.compose.runtime.State<androidx.compose.ui.geometry.Size> animateSize(androidx.compose.animation.core.Transition<S>, optional kotlin.jvm.functions.Function1<? super androidx.compose.animation.core.Transition.Segment<S>,? extends androidx.compose.animation.core.FiniteAnimationSpec<androidx.compose.ui.geometry.Size>> transitionSpec, optional String label, kotlin.jvm.functions.Function1<? super S,androidx.compose.ui.geometry.Size> targetValueByState);
+ method @androidx.compose.runtime.Composable public static inline <S, T, V extends androidx.compose.animation.core.AnimationVector> androidx.compose.runtime.State<T> animateValue(androidx.compose.animation.core.Transition<S>, androidx.compose.animation.core.TwoWayConverter<T,V> typeConverter, optional kotlin.jvm.functions.Function1<? super androidx.compose.animation.core.Transition.Segment<S>,? extends androidx.compose.animation.core.FiniteAnimationSpec<T>> transitionSpec, optional String label, kotlin.jvm.functions.Function1<? super S,? extends T> targetValueByState);
+ method @androidx.compose.runtime.Composable public static <T> androidx.compose.animation.core.Transition<T> updateTransition(T? targetState, optional String? label);
+ method @androidx.compose.runtime.Composable public static <T> androidx.compose.animation.core.Transition<T> updateTransition(androidx.compose.animation.core.MutableTransitionState<T> transitionState, optional String? label);
+ }
+
+ @androidx.compose.runtime.Immutable public final class TweenSpec<T> implements androidx.compose.animation.core.DurationBasedAnimationSpec<T> {
+ ctor public TweenSpec(optional int durationMillis, optional int delay, optional androidx.compose.animation.core.Easing easing);
+ method public int getDelay();
+ method public int getDurationMillis();
+ method public androidx.compose.animation.core.Easing getEasing();
+ method public <V extends androidx.compose.animation.core.AnimationVector> androidx.compose.animation.core.VectorizedTweenSpec<V> vectorize(androidx.compose.animation.core.TwoWayConverter<T,V> converter);
+ property public final int delay;
+ property public final int durationMillis;
+ property public final androidx.compose.animation.core.Easing easing;
+ }
+
+ public interface TwoWayConverter<T, V extends androidx.compose.animation.core.AnimationVector> {
+ method public kotlin.jvm.functions.Function1<V,T> getConvertFromVector();
+ method public kotlin.jvm.functions.Function1<T,V> getConvertToVector();
+ property public abstract kotlin.jvm.functions.Function1<V,T> convertFromVector;
+ property public abstract kotlin.jvm.functions.Function1<T,V> convertToVector;
+ }
+
+ public final class VectorConvertersKt {
+ method public static <T, V extends androidx.compose.animation.core.AnimationVector> androidx.compose.animation.core.TwoWayConverter<T,V> TwoWayConverter(kotlin.jvm.functions.Function1<? super T,? extends V> convertToVector, kotlin.jvm.functions.Function1<? super V,? extends T> convertFromVector);
+ method public static androidx.compose.animation.core.TwoWayConverter<java.lang.Float,androidx.compose.animation.core.AnimationVector1D> getVectorConverter(kotlin.jvm.internal.FloatCompanionObject);
+ method public static androidx.compose.animation.core.TwoWayConverter<java.lang.Integer,androidx.compose.animation.core.AnimationVector1D> getVectorConverter(kotlin.jvm.internal.IntCompanionObject);
+ method public static androidx.compose.animation.core.TwoWayConverter<androidx.compose.ui.geometry.Rect,androidx.compose.animation.core.AnimationVector4D> getVectorConverter(androidx.compose.ui.geometry.Rect.Companion);
+ method public static androidx.compose.animation.core.TwoWayConverter<androidx.compose.ui.unit.Dp,androidx.compose.animation.core.AnimationVector1D> getVectorConverter(androidx.compose.ui.unit.Dp.Companion);
+ method public static androidx.compose.animation.core.TwoWayConverter<androidx.compose.ui.unit.DpOffset,androidx.compose.animation.core.AnimationVector2D> getVectorConverter(androidx.compose.ui.unit.DpOffset.Companion);
+ method public static androidx.compose.animation.core.TwoWayConverter<androidx.compose.ui.geometry.Size,androidx.compose.animation.core.AnimationVector2D> getVectorConverter(androidx.compose.ui.geometry.Size.Companion);
+ method public static androidx.compose.animation.core.TwoWayConverter<androidx.compose.ui.geometry.Offset,androidx.compose.animation.core.AnimationVector2D> getVectorConverter(androidx.compose.ui.geometry.Offset.Companion);
+ method public static androidx.compose.animation.core.TwoWayConverter<androidx.compose.ui.unit.IntOffset,androidx.compose.animation.core.AnimationVector2D> getVectorConverter(androidx.compose.ui.unit.IntOffset.Companion);
+ method public static androidx.compose.animation.core.TwoWayConverter<androidx.compose.ui.unit.IntSize,androidx.compose.animation.core.AnimationVector2D> getVectorConverter(androidx.compose.ui.unit.IntSize.Companion);
+ }
+
+ public interface VectorizedAnimationSpec<V extends androidx.compose.animation.core.AnimationVector> {
+ method public long getDurationNanos(V initialValue, V targetValue, V initialVelocity);
+ method public default V getEndVelocity(V initialValue, V targetValue, V initialVelocity);
+ method public V getValueFromNanos(long playTimeNanos, V initialValue, V targetValue, V initialVelocity);
+ method public V getVelocityFromNanos(long playTimeNanos, V initialValue, V targetValue, V initialVelocity);
+ method public boolean isInfinite();
+ property public abstract boolean isInfinite;
+ }
+
+ public final class VectorizedAnimationSpecKt {
+ }
+
+ public interface VectorizedDecayAnimationSpec<V extends androidx.compose.animation.core.AnimationVector> {
+ method public float getAbsVelocityThreshold();
+ method public long getDurationNanos(V initialValue, V initialVelocity);
+ method public V getTargetValue(V initialValue, V initialVelocity);
+ method public V getValueFromNanos(long playTimeNanos, V initialValue, V initialVelocity);
+ method public V getVelocityFromNanos(long playTimeNanos, V initialValue, V initialVelocity);
+ property public abstract float absVelocityThreshold;
+ }
+
+ public interface VectorizedDurationBasedAnimationSpec<V extends androidx.compose.animation.core.AnimationVector> extends androidx.compose.animation.core.VectorizedFiniteAnimationSpec<V> {
+ method public int getDelayMillis();
+ method public int getDurationMillis();
+ method public default long getDurationNanos(V initialValue, V targetValue, V initialVelocity);
+ property public abstract int delayMillis;
+ property public abstract int durationMillis;
+ }
+
+ public interface VectorizedFiniteAnimationSpec<V extends androidx.compose.animation.core.AnimationVector> extends androidx.compose.animation.core.VectorizedAnimationSpec<V> {
+ method public default boolean isInfinite();
+ property public default boolean isInfinite;
+ }
+
+ public final class VectorizedFloatAnimationSpec<V extends androidx.compose.animation.core.AnimationVector> implements androidx.compose.animation.core.VectorizedFiniteAnimationSpec<V> {
+ ctor public VectorizedFloatAnimationSpec(androidx.compose.animation.core.FloatAnimationSpec anim);
+ method public long getDurationNanos(V initialValue, V targetValue, V initialVelocity);
+ method public V getValueFromNanos(long playTimeNanos, V initialValue, V targetValue, V initialVelocity);
+ method public V getVelocityFromNanos(long playTimeNanos, V initialValue, V targetValue, V initialVelocity);
+ }
+
+ public final class VectorizedInfiniteRepeatableSpec<V extends androidx.compose.animation.core.AnimationVector> implements androidx.compose.animation.core.VectorizedAnimationSpec<V> {
+ ctor public VectorizedInfiniteRepeatableSpec(androidx.compose.animation.core.VectorizedDurationBasedAnimationSpec<V> animation, optional androidx.compose.animation.core.RepeatMode repeatMode, optional long initialStartOffset);
+ method @Deprecated public androidx.compose.animation.core.VectorizedInfiniteRepeatableSpec<V>! VectorizedInfiniteRepeatableSpec(androidx.compose.animation.core.VectorizedDurationBasedAnimationSpec<V> animation, optional androidx.compose.animation.core.RepeatMode repeatMode);
+ method public long getDurationNanos(V initialValue, V targetValue, V initialVelocity);
+ method public V getValueFromNanos(long playTimeNanos, V initialValue, V targetValue, V initialVelocity);
+ method public V getVelocityFromNanos(long playTimeNanos, V initialValue, V targetValue, V initialVelocity);
+ method public boolean isInfinite();
+ property public boolean isInfinite;
+ }
+
+ public final class VectorizedKeyframesSpec<V extends androidx.compose.animation.core.AnimationVector> implements androidx.compose.animation.core.VectorizedDurationBasedAnimationSpec<V> {
+ ctor public VectorizedKeyframesSpec(java.util.Map<java.lang.Integer,? extends kotlin.Pair<? extends V,? extends androidx.compose.animation.core.Easing>> keyframes, int durationMillis, optional int delayMillis);
+ method public int getDelayMillis();
+ method public int getDurationMillis();
+ method public V getValueFromNanos(long playTimeNanos, V initialValue, V targetValue, V initialVelocity);
+ method public V getVelocityFromNanos(long playTimeNanos, V initialValue, V targetValue, V initialVelocity);
+ property public int delayMillis;
+ property public int durationMillis;
+ }
+
+ public final class VectorizedRepeatableSpec<V extends androidx.compose.animation.core.AnimationVector> implements androidx.compose.animation.core.VectorizedFiniteAnimationSpec<V> {
+ ctor public VectorizedRepeatableSpec(int iterations, androidx.compose.animation.core.VectorizedDurationBasedAnimationSpec<V> animation, optional androidx.compose.animation.core.RepeatMode repeatMode, optional long initialStartOffset);
+ method @Deprecated public androidx.compose.animation.core.VectorizedRepeatableSpec<V>! VectorizedRepeatableSpec(int iterations, androidx.compose.animation.core.VectorizedDurationBasedAnimationSpec<V> animation, optional androidx.compose.animation.core.RepeatMode repeatMode);
+ method public long getDurationNanos(V initialValue, V targetValue, V initialVelocity);
+ method public V getValueFromNanos(long playTimeNanos, V initialValue, V targetValue, V initialVelocity);
+ method public V getVelocityFromNanos(long playTimeNanos, V initialValue, V targetValue, V initialVelocity);
+ }
+
+ public final class VectorizedSnapSpec<V extends androidx.compose.animation.core.AnimationVector> implements androidx.compose.animation.core.VectorizedDurationBasedAnimationSpec<V> {
+ ctor public VectorizedSnapSpec(optional int delayMillis);
+ method public int getDelayMillis();
+ method public int getDurationMillis();
+ method public V getValueFromNanos(long playTimeNanos, V initialValue, V targetValue, V initialVelocity);
+ method public V getVelocityFromNanos(long playTimeNanos, V initialValue, V targetValue, V initialVelocity);
+ property public int delayMillis;
+ property public int durationMillis;
+ }
+
+ public final class VectorizedSpringSpec<V extends androidx.compose.animation.core.AnimationVector> implements androidx.compose.animation.core.VectorizedFiniteAnimationSpec<V> {
+ ctor public VectorizedSpringSpec(optional float dampingRatio, optional float stiffness, optional V? visibilityThreshold);
+ method public float getDampingRatio();
+ method public float getStiffness();
+ property public final float dampingRatio;
+ property public final float stiffness;
+ }
+
+ public final class VectorizedTweenSpec<V extends androidx.compose.animation.core.AnimationVector> implements androidx.compose.animation.core.VectorizedDurationBasedAnimationSpec<V> {
+ ctor public VectorizedTweenSpec(optional int durationMillis, optional int delayMillis, optional androidx.compose.animation.core.Easing easing);
+ method public int getDelayMillis();
+ method public int getDurationMillis();
+ method public androidx.compose.animation.core.Easing getEasing();
+ method public V getValueFromNanos(long playTimeNanos, V initialValue, V targetValue, V initialVelocity);
+ method public V getVelocityFromNanos(long playTimeNanos, V initialValue, V targetValue, V initialVelocity);
+ property public int delayMillis;
+ property public int durationMillis;
+ property public final androidx.compose.animation.core.Easing easing;
+ }
+
+ public final class VisibilityThresholdsKt {
+ method public static long getVisibilityThreshold(androidx.compose.ui.unit.IntOffset.Companion);
+ method public static long getVisibilityThreshold(androidx.compose.ui.geometry.Offset.Companion);
+ method public static int getVisibilityThreshold(kotlin.jvm.internal.IntCompanionObject);
+ method public static float getVisibilityThreshold(androidx.compose.ui.unit.Dp.Companion);
+ method public static long getVisibilityThreshold(androidx.compose.ui.unit.DpOffset.Companion);
+ method public static long getVisibilityThreshold(androidx.compose.ui.geometry.Size.Companion);
+ method public static long getVisibilityThreshold(androidx.compose.ui.unit.IntSize.Companion);
+ method public static androidx.compose.ui.geometry.Rect getVisibilityThreshold(androidx.compose.ui.geometry.Rect.Companion);
+ }
+
+}
+
diff --git a/compose/animation/animation-core/api/public_plus_experimental_1.2.0-beta02.txt b/compose/animation/animation-core/api/public_plus_experimental_1.2.0-beta02.txt
new file mode 100644
index 0000000..baea8ca
--- /dev/null
+++ b/compose/animation/animation-core/api/public_plus_experimental_1.2.0-beta02.txt
@@ -0,0 +1,675 @@
+// Signature format: 4.0
+package androidx.compose.animation.core {
+
+ public final class ActualJvmKt {
+ }
+
+ public final class Animatable<T, V extends androidx.compose.animation.core.AnimationVector> {
+ ctor public Animatable(T? initialValue, androidx.compose.animation.core.TwoWayConverter<T,V> typeConverter, optional T? visibilityThreshold);
+ method public suspend Object? animateDecay(T? initialVelocity, androidx.compose.animation.core.DecayAnimationSpec<T> animationSpec, optional kotlin.jvm.functions.Function1<? super androidx.compose.animation.core.Animatable<T,V>,kotlin.Unit>? block, optional kotlin.coroutines.Continuation<? super androidx.compose.animation.core.AnimationResult<T,V>>);
+ method public suspend Object? animateTo(T? targetValue, optional androidx.compose.animation.core.AnimationSpec<T> animationSpec, optional T? initialVelocity, optional kotlin.jvm.functions.Function1<? super androidx.compose.animation.core.Animatable<T,V>,kotlin.Unit>? block, optional kotlin.coroutines.Continuation<? super androidx.compose.animation.core.AnimationResult<T,V>>);
+ method public androidx.compose.runtime.State<T> asState();
+ method public T? getLowerBound();
+ method public T! getTargetValue();
+ method public androidx.compose.animation.core.TwoWayConverter<T,V> getTypeConverter();
+ method public T? getUpperBound();
+ method public T! getValue();
+ method public T! getVelocity();
+ method public V getVelocityVector();
+ method public boolean isRunning();
+ method public suspend Object? snapTo(T? targetValue, kotlin.coroutines.Continuation<? super kotlin.Unit>);
+ method public suspend Object? stop(kotlin.coroutines.Continuation<? super kotlin.Unit>);
+ method public void updateBounds(optional T? lowerBound, optional T? upperBound);
+ property public final boolean isRunning;
+ property public final T? lowerBound;
+ property public final T! targetValue;
+ property public final androidx.compose.animation.core.TwoWayConverter<T,V> typeConverter;
+ property public final T? upperBound;
+ property public final T! value;
+ property public final T! velocity;
+ property public final V velocityVector;
+ }
+
+ public final class AnimatableKt {
+ method public static androidx.compose.animation.core.Animatable<java.lang.Float,androidx.compose.animation.core.AnimationVector1D> Animatable(float initialValue, optional float visibilityThreshold);
+ }
+
+ public final class AnimateAsStateKt {
+ method @androidx.compose.runtime.Composable public static androidx.compose.runtime.State<androidx.compose.ui.unit.Dp> animateDpAsState(float targetValue, optional androidx.compose.animation.core.AnimationSpec<androidx.compose.ui.unit.Dp> animationSpec, optional kotlin.jvm.functions.Function1<? super androidx.compose.ui.unit.Dp,kotlin.Unit>? finishedListener);
+ method @androidx.compose.runtime.Composable public static androidx.compose.runtime.State<java.lang.Float> animateFloatAsState(float targetValue, optional androidx.compose.animation.core.AnimationSpec<java.lang.Float> animationSpec, optional float visibilityThreshold, optional kotlin.jvm.functions.Function1<? super java.lang.Float,kotlin.Unit>? finishedListener);
+ method @androidx.compose.runtime.Composable public static androidx.compose.runtime.State<java.lang.Integer> animateIntAsState(int targetValue, optional androidx.compose.animation.core.AnimationSpec<java.lang.Integer> animationSpec, optional kotlin.jvm.functions.Function1<? super java.lang.Integer,kotlin.Unit>? finishedListener);
+ method @androidx.compose.runtime.Composable public static androidx.compose.runtime.State<androidx.compose.ui.unit.IntOffset> animateIntOffsetAsState(long targetValue, optional androidx.compose.animation.core.AnimationSpec<androidx.compose.ui.unit.IntOffset> animationSpec, optional kotlin.jvm.functions.Function1<? super androidx.compose.ui.unit.IntOffset,kotlin.Unit>? finishedListener);
+ method @androidx.compose.runtime.Composable public static androidx.compose.runtime.State<androidx.compose.ui.unit.IntSize> animateIntSizeAsState(long targetValue, optional androidx.compose.animation.core.AnimationSpec<androidx.compose.ui.unit.IntSize> animationSpec, optional kotlin.jvm.functions.Function1<? super androidx.compose.ui.unit.IntSize,kotlin.Unit>? finishedListener);
+ method @androidx.compose.runtime.Composable public static androidx.compose.runtime.State<androidx.compose.ui.geometry.Offset> animateOffsetAsState(long targetValue, optional androidx.compose.animation.core.AnimationSpec<androidx.compose.ui.geometry.Offset> animationSpec, optional kotlin.jvm.functions.Function1<? super androidx.compose.ui.geometry.Offset,kotlin.Unit>? finishedListener);
+ method @androidx.compose.runtime.Composable public static androidx.compose.runtime.State<androidx.compose.ui.geometry.Rect> animateRectAsState(androidx.compose.ui.geometry.Rect targetValue, optional androidx.compose.animation.core.AnimationSpec<androidx.compose.ui.geometry.Rect> animationSpec, optional kotlin.jvm.functions.Function1<? super androidx.compose.ui.geometry.Rect,kotlin.Unit>? finishedListener);
+ method @androidx.compose.runtime.Composable public static androidx.compose.runtime.State<androidx.compose.ui.geometry.Size> animateSizeAsState(long targetValue, optional androidx.compose.animation.core.AnimationSpec<androidx.compose.ui.geometry.Size> animationSpec, optional kotlin.jvm.functions.Function1<? super androidx.compose.ui.geometry.Size,kotlin.Unit>? finishedListener);
+ method @androidx.compose.runtime.Composable public static <T, V extends androidx.compose.animation.core.AnimationVector> androidx.compose.runtime.State<T> animateValueAsState(T? targetValue, androidx.compose.animation.core.TwoWayConverter<T,V> typeConverter, optional androidx.compose.animation.core.AnimationSpec<T> animationSpec, optional T? visibilityThreshold, optional kotlin.jvm.functions.Function1<? super T,kotlin.Unit>? finishedListener);
+ }
+
+ public interface Animation<T, V extends androidx.compose.animation.core.AnimationVector> {
+ method public long getDurationNanos();
+ method public T! getTargetValue();
+ method public androidx.compose.animation.core.TwoWayConverter<T,V> getTypeConverter();
+ method public T! getValueFromNanos(long playTimeNanos);
+ method public V getVelocityVectorFromNanos(long playTimeNanos);
+ method public default boolean isFinishedFromNanos(long playTimeNanos);
+ method public boolean isInfinite();
+ property public abstract long durationNanos;
+ property public abstract boolean isInfinite;
+ property public abstract T! targetValue;
+ property public abstract androidx.compose.animation.core.TwoWayConverter<T,V> typeConverter;
+ }
+
+ public final class AnimationConstants {
+ field public static final int DefaultDurationMillis = 300; // 0x12c
+ field public static final androidx.compose.animation.core.AnimationConstants INSTANCE;
+ field public static final long UnspecifiedTime = -9223372036854775808L; // 0x8000000000000000L
+ }
+
+ public enum AnimationEndReason {
+ enum_constant public static final androidx.compose.animation.core.AnimationEndReason BoundReached;
+ enum_constant public static final androidx.compose.animation.core.AnimationEndReason Finished;
+ }
+
+ public final class AnimationKt {
+ method public static androidx.compose.animation.core.DecayAnimation<java.lang.Float,androidx.compose.animation.core.AnimationVector1D> DecayAnimation(androidx.compose.animation.core.FloatDecayAnimationSpec animationSpec, float initialValue, optional float initialVelocity);
+ method public static <T, V extends androidx.compose.animation.core.AnimationVector> androidx.compose.animation.core.TargetBasedAnimation<T,V> TargetBasedAnimation(androidx.compose.animation.core.AnimationSpec<T> animationSpec, androidx.compose.animation.core.TwoWayConverter<T,V> typeConverter, T? initialValue, T? targetValue, T? initialVelocity);
+ method public static <T, V extends androidx.compose.animation.core.AnimationVector> T! getVelocityFromNanos(androidx.compose.animation.core.Animation<T,V>, long playTimeNanos);
+ }
+
+ public final class AnimationResult<T, V extends androidx.compose.animation.core.AnimationVector> {
+ ctor public AnimationResult(androidx.compose.animation.core.AnimationState<T,V> endState, androidx.compose.animation.core.AnimationEndReason endReason);
+ method public androidx.compose.animation.core.AnimationEndReason getEndReason();
+ method public androidx.compose.animation.core.AnimationState<T,V> getEndState();
+ property public final androidx.compose.animation.core.AnimationEndReason endReason;
+ property public final androidx.compose.animation.core.AnimationState<T,V> endState;
+ }
+
+ public final class AnimationScope<T, V extends androidx.compose.animation.core.AnimationVector> {
+ method public void cancelAnimation();
+ method public long getFinishedTimeNanos();
+ method public long getLastFrameTimeNanos();
+ method public long getStartTimeNanos();
+ method public T! getTargetValue();
+ method public androidx.compose.animation.core.TwoWayConverter<T,V> getTypeConverter();
+ method public T! getValue();
+ method public T! getVelocity();
+ method public V getVelocityVector();
+ method public boolean isRunning();
+ method public androidx.compose.animation.core.AnimationState<T,V> toAnimationState();
+ property public final long finishedTimeNanos;
+ property public final boolean isRunning;
+ property public final long lastFrameTimeNanos;
+ property public final long startTimeNanos;
+ property public final T! targetValue;
+ property public final androidx.compose.animation.core.TwoWayConverter<T,V> typeConverter;
+ property public final T! value;
+ property public final T! velocity;
+ property public final V velocityVector;
+ }
+
+ public interface AnimationSpec<T> {
+ method public <V extends androidx.compose.animation.core.AnimationVector> androidx.compose.animation.core.VectorizedAnimationSpec<V> vectorize(androidx.compose.animation.core.TwoWayConverter<T,V> converter);
+ }
+
+ public final class AnimationSpecKt {
+ method @androidx.compose.runtime.Stable public static <T> androidx.compose.animation.core.InfiniteRepeatableSpec<T> infiniteRepeatable(androidx.compose.animation.core.DurationBasedAnimationSpec<T> animation, optional androidx.compose.animation.core.RepeatMode repeatMode, optional long initialStartOffset);
+ method @Deprecated @androidx.compose.runtime.Stable public static <T> androidx.compose.animation.core.InfiniteRepeatableSpec<T>! infiniteRepeatable(androidx.compose.animation.core.DurationBasedAnimationSpec<T> animation, optional androidx.compose.animation.core.RepeatMode repeatMode);
+ method @androidx.compose.runtime.Stable public static <T> androidx.compose.animation.core.KeyframesSpec<T> keyframes(kotlin.jvm.functions.Function1<? super androidx.compose.animation.core.KeyframesSpec.KeyframesSpecConfig<T>,kotlin.Unit> init);
+ method @androidx.compose.runtime.Stable public static <T> androidx.compose.animation.core.RepeatableSpec<T> repeatable(int iterations, androidx.compose.animation.core.DurationBasedAnimationSpec<T> animation, optional androidx.compose.animation.core.RepeatMode repeatMode, optional long initialStartOffset);
+ method @Deprecated @androidx.compose.runtime.Stable public static <T> androidx.compose.animation.core.RepeatableSpec<T>! repeatable(int iterations, androidx.compose.animation.core.DurationBasedAnimationSpec<T> animation, optional androidx.compose.animation.core.RepeatMode repeatMode);
+ method @androidx.compose.runtime.Stable public static <T> androidx.compose.animation.core.SnapSpec<T> snap(optional int delayMillis);
+ method @androidx.compose.runtime.Stable public static <T> androidx.compose.animation.core.SpringSpec<T> spring(optional float dampingRatio, optional float stiffness, optional T? visibilityThreshold);
+ method @androidx.compose.runtime.Stable public static <T> androidx.compose.animation.core.TweenSpec<T> tween(optional int durationMillis, optional int delayMillis, optional androidx.compose.animation.core.Easing easing);
+ }
+
+ public final class AnimationState<T, V extends androidx.compose.animation.core.AnimationVector> implements androidx.compose.runtime.State<T> {
+ ctor public AnimationState(androidx.compose.animation.core.TwoWayConverter<T,V> typeConverter, T? initialValue, optional V? initialVelocityVector, optional long lastFrameTimeNanos, optional long finishedTimeNanos, optional boolean isRunning);
+ method public long getFinishedTimeNanos();
+ method public long getLastFrameTimeNanos();
+ method public androidx.compose.animation.core.TwoWayConverter<T,V> getTypeConverter();
+ method public T! getValue();
+ method public T! getVelocity();
+ method public V getVelocityVector();
+ method public boolean isRunning();
+ property public final long finishedTimeNanos;
+ property public final boolean isRunning;
+ property public final long lastFrameTimeNanos;
+ property public final androidx.compose.animation.core.TwoWayConverter<T,V> typeConverter;
+ property public T! value;
+ property public final T! velocity;
+ property public final V velocityVector;
+ }
+
+ public final class AnimationStateKt {
+ method public static androidx.compose.animation.core.AnimationState<java.lang.Float,androidx.compose.animation.core.AnimationVector1D> AnimationState(float initialValue, optional float initialVelocity, optional long lastFrameTimeNanos, optional long finishedTimeNanos, optional boolean isRunning);
+ method public static <T, V extends androidx.compose.animation.core.AnimationVector> androidx.compose.animation.core.AnimationState<T,V> AnimationState(androidx.compose.animation.core.TwoWayConverter<T,V> typeConverter, T? initialValue, T? initialVelocity, optional long lastFrameTimeNanos, optional long finishedTimeNanos, optional boolean isRunning);
+ method public static <T, V extends androidx.compose.animation.core.AnimationVector> androidx.compose.animation.core.AnimationState<T,V> copy(androidx.compose.animation.core.AnimationState<T,V>, optional T? value, optional V? velocityVector, optional long lastFrameTimeNanos, optional long finishedTimeNanos, optional boolean isRunning);
+ method public static androidx.compose.animation.core.AnimationState<java.lang.Float,androidx.compose.animation.core.AnimationVector1D> copy(androidx.compose.animation.core.AnimationState<java.lang.Float,androidx.compose.animation.core.AnimationVector1D>, optional float value, optional float velocity, optional long lastFrameTimeNanos, optional long finishedTimeNanos, optional boolean isRunning);
+ method public static <T, V extends androidx.compose.animation.core.AnimationVector> V createZeroVectorFrom(androidx.compose.animation.core.TwoWayConverter<T,V>, T? value);
+ method public static boolean isFinished(androidx.compose.animation.core.AnimationState<?,?>);
+ }
+
+ public abstract sealed class AnimationVector {
+ }
+
+ public final class AnimationVector1D extends androidx.compose.animation.core.AnimationVector {
+ ctor public AnimationVector1D(float initVal);
+ method public float getValue();
+ property public final float value;
+ }
+
+ public final class AnimationVector2D extends androidx.compose.animation.core.AnimationVector {
+ ctor public AnimationVector2D(float v1, float v2);
+ method public float getV1();
+ method public float getV2();
+ property public final float v1;
+ property public final float v2;
+ }
+
+ public final class AnimationVector3D extends androidx.compose.animation.core.AnimationVector {
+ ctor public AnimationVector3D(float v1, float v2, float v3);
+ method public float getV1();
+ method public float getV2();
+ method public float getV3();
+ property public final float v1;
+ property public final float v2;
+ property public final float v3;
+ }
+
+ public final class AnimationVector4D extends androidx.compose.animation.core.AnimationVector {
+ ctor public AnimationVector4D(float v1, float v2, float v3, float v4);
+ method public float getV1();
+ method public float getV2();
+ method public float getV3();
+ method public float getV4();
+ property public final float v1;
+ property public final float v2;
+ property public final float v3;
+ property public final float v4;
+ }
+
+ public final class AnimationVectorsKt {
+ method public static androidx.compose.animation.core.AnimationVector1D AnimationVector(float v1);
+ method public static androidx.compose.animation.core.AnimationVector2D AnimationVector(float v1, float v2);
+ method public static androidx.compose.animation.core.AnimationVector3D AnimationVector(float v1, float v2, float v3);
+ method public static androidx.compose.animation.core.AnimationVector4D AnimationVector(float v1, float v2, float v3, float v4);
+ }
+
+ public final class ComplexDoubleKt {
+ }
+
+ @androidx.compose.runtime.Immutable public final class CubicBezierEasing implements androidx.compose.animation.core.Easing {
+ ctor public CubicBezierEasing(float a, float b, float c, float d);
+ method public float transform(float fraction);
+ }
+
+ public final class DecayAnimation<T, V extends androidx.compose.animation.core.AnimationVector> implements androidx.compose.animation.core.Animation<T,V> {
+ ctor public DecayAnimation(androidx.compose.animation.core.VectorizedDecayAnimationSpec<V> animationSpec, androidx.compose.animation.core.TwoWayConverter<T,V> typeConverter, T? initialValue, V initialVelocityVector);
+ ctor public DecayAnimation(androidx.compose.animation.core.DecayAnimationSpec<T> animationSpec, androidx.compose.animation.core.TwoWayConverter<T,V> typeConverter, T? initialValue, V initialVelocityVector);
+ ctor public DecayAnimation(androidx.compose.animation.core.DecayAnimationSpec<T> animationSpec, androidx.compose.animation.core.TwoWayConverter<T,V> typeConverter, T? initialValue, T? initialVelocity);
+ method public long getDurationNanos();
+ method public T! getInitialValue();
+ method public V getInitialVelocityVector();
+ method public T! getTargetValue();
+ method public androidx.compose.animation.core.TwoWayConverter<T,V> getTypeConverter();
+ method public T! getValueFromNanos(long playTimeNanos);
+ method public V getVelocityVectorFromNanos(long playTimeNanos);
+ method public boolean isInfinite();
+ property public long durationNanos;
+ property public final T! initialValue;
+ property public final V initialVelocityVector;
+ property public boolean isInfinite;
+ property public T! targetValue;
+ property public androidx.compose.animation.core.TwoWayConverter<T,V> typeConverter;
+ }
+
+ public interface DecayAnimationSpec<T> {
+ method public <V extends androidx.compose.animation.core.AnimationVector> androidx.compose.animation.core.VectorizedDecayAnimationSpec<V> vectorize(androidx.compose.animation.core.TwoWayConverter<T,V> typeConverter);
+ }
+
+ public final class DecayAnimationSpecKt {
+ method public static <T, V extends androidx.compose.animation.core.AnimationVector> T! calculateTargetValue(androidx.compose.animation.core.DecayAnimationSpec<T>, androidx.compose.animation.core.TwoWayConverter<T,V> typeConverter, T? initialValue, T? initialVelocity);
+ method public static float calculateTargetValue(androidx.compose.animation.core.DecayAnimationSpec<java.lang.Float>, float initialValue, float initialVelocity);
+ method public static <T> androidx.compose.animation.core.DecayAnimationSpec<T> exponentialDecay(optional float frictionMultiplier, optional float absVelocityThreshold);
+ method public static <T> androidx.compose.animation.core.DecayAnimationSpec<T> generateDecayAnimationSpec(androidx.compose.animation.core.FloatDecayAnimationSpec);
+ }
+
+ public interface DurationBasedAnimationSpec<T> extends androidx.compose.animation.core.FiniteAnimationSpec<T> {
+ method public <V extends androidx.compose.animation.core.AnimationVector> androidx.compose.animation.core.VectorizedDurationBasedAnimationSpec<V> vectorize(androidx.compose.animation.core.TwoWayConverter<T,V> converter);
+ }
+
+ @androidx.compose.runtime.Stable public fun interface Easing {
+ method public float transform(float fraction);
+ }
+
+ public final class EasingKt {
+ method public static androidx.compose.animation.core.Easing getFastOutLinearInEasing();
+ method public static androidx.compose.animation.core.Easing getFastOutSlowInEasing();
+ method public static androidx.compose.animation.core.Easing getLinearEasing();
+ method public static androidx.compose.animation.core.Easing getLinearOutSlowInEasing();
+ property public static final androidx.compose.animation.core.Easing FastOutLinearInEasing;
+ property public static final androidx.compose.animation.core.Easing FastOutSlowInEasing;
+ property public static final androidx.compose.animation.core.Easing LinearEasing;
+ property public static final androidx.compose.animation.core.Easing LinearOutSlowInEasing;
+ }
+
+ @kotlin.RequiresOptIn(message="This is an experimental animation API for Transition. It may change in the future.") public @interface ExperimentalTransitionApi {
+ }
+
+ public interface FiniteAnimationSpec<T> extends androidx.compose.animation.core.AnimationSpec<T> {
+ method public <V extends androidx.compose.animation.core.AnimationVector> androidx.compose.animation.core.VectorizedFiniteAnimationSpec<V> vectorize(androidx.compose.animation.core.TwoWayConverter<T,V> converter);
+ }
+
+ public interface FloatAnimationSpec extends androidx.compose.animation.core.AnimationSpec<java.lang.Float> {
+ method public long getDurationNanos(float initialValue, float targetValue, float initialVelocity);
+ method public default float getEndVelocity(float initialValue, float targetValue, float initialVelocity);
+ method public float getValueFromNanos(long playTimeNanos, float initialValue, float targetValue, float initialVelocity);
+ method public float getVelocityFromNanos(long playTimeNanos, float initialValue, float targetValue, float initialVelocity);
+ method public default <V extends androidx.compose.animation.core.AnimationVector> androidx.compose.animation.core.VectorizedFloatAnimationSpec<V> vectorize(androidx.compose.animation.core.TwoWayConverter<java.lang.Float,V> converter);
+ }
+
+ public interface FloatDecayAnimationSpec {
+ method public float getAbsVelocityThreshold();
+ method public long getDurationNanos(float initialValue, float initialVelocity);
+ method public float getTargetValue(float initialValue, float initialVelocity);
+ method public float getValueFromNanos(long playTimeNanos, float initialValue, float initialVelocity);
+ method public float getVelocityFromNanos(long playTimeNanos, float initialValue, float initialVelocity);
+ property public abstract float absVelocityThreshold;
+ }
+
+ public final class FloatDecayAnimationSpecKt {
+ }
+
+ public final class FloatExponentialDecaySpec implements androidx.compose.animation.core.FloatDecayAnimationSpec {
+ ctor public FloatExponentialDecaySpec(optional float frictionMultiplier, optional float absVelocityThreshold);
+ method public float getAbsVelocityThreshold();
+ method public long getDurationNanos(float initialValue, float initialVelocity);
+ method public float getTargetValue(float initialValue, float initialVelocity);
+ method public float getValueFromNanos(long playTimeNanos, float initialValue, float initialVelocity);
+ method public float getVelocityFromNanos(long playTimeNanos, float initialValue, float initialVelocity);
+ property public float absVelocityThreshold;
+ }
+
+ public final class FloatSpringSpec implements androidx.compose.animation.core.FloatAnimationSpec {
+ ctor public FloatSpringSpec(optional float dampingRatio, optional float stiffness, optional float visibilityThreshold);
+ method public float getDampingRatio();
+ method public long getDurationNanos(float initialValue, float targetValue, float initialVelocity);
+ method public float getStiffness();
+ method public float getValueFromNanos(long playTimeNanos, float initialValue, float targetValue, float initialVelocity);
+ method public float getVelocityFromNanos(long playTimeNanos, float initialValue, float targetValue, float initialVelocity);
+ property public final float dampingRatio;
+ property public final float stiffness;
+ }
+
+ public final class FloatTweenSpec implements androidx.compose.animation.core.FloatAnimationSpec {
+ ctor public FloatTweenSpec(optional int duration, optional int delay, optional androidx.compose.animation.core.Easing easing);
+ method public int getDelay();
+ method public int getDuration();
+ method public long getDurationNanos(float initialValue, float targetValue, float initialVelocity);
+ method public float getValueFromNanos(long playTimeNanos, float initialValue, float targetValue, float initialVelocity);
+ method public float getVelocityFromNanos(long playTimeNanos, float initialValue, float targetValue, float initialVelocity);
+ property public final int delay;
+ property public final int duration;
+ }
+
+ public final class InfiniteAnimationPolicyKt {
+ method public static suspend inline <R> Object? withInfiniteAnimationFrameMillis(kotlin.jvm.functions.Function1<? super java.lang.Long,? extends R> onFrame, kotlin.coroutines.Continuation<? super R>);
+ method public static suspend <R> Object? withInfiniteAnimationFrameNanos(kotlin.jvm.functions.Function1<? super java.lang.Long,? extends R> onFrame, kotlin.coroutines.Continuation<? super R>);
+ }
+
+ public final class InfiniteRepeatableSpec<T> implements androidx.compose.animation.core.AnimationSpec<T> {
+ ctor public InfiniteRepeatableSpec(androidx.compose.animation.core.DurationBasedAnimationSpec<T> animation, optional androidx.compose.animation.core.RepeatMode repeatMode, optional long initialStartOffset);
+ method @Deprecated public androidx.compose.animation.core.InfiniteRepeatableSpec<T>! InfiniteRepeatableSpec(androidx.compose.animation.core.DurationBasedAnimationSpec<T> animation, optional androidx.compose.animation.core.RepeatMode repeatMode);
+ method public androidx.compose.animation.core.DurationBasedAnimationSpec<T> getAnimation();
+ method public long getInitialStartOffset();
+ method public androidx.compose.animation.core.RepeatMode getRepeatMode();
+ method public <V extends androidx.compose.animation.core.AnimationVector> androidx.compose.animation.core.VectorizedAnimationSpec<V> vectorize(androidx.compose.animation.core.TwoWayConverter<T,V> converter);
+ property public final androidx.compose.animation.core.DurationBasedAnimationSpec<T> animation;
+ property public final long initialStartOffset;
+ property public final androidx.compose.animation.core.RepeatMode repeatMode;
+ }
+
+ public final class InfiniteTransition {
+ }
+
+ public final class InfiniteTransitionKt {
+ method @androidx.compose.runtime.Composable public static androidx.compose.runtime.State<java.lang.Float> animateFloat(androidx.compose.animation.core.InfiniteTransition, float initialValue, float targetValue, androidx.compose.animation.core.InfiniteRepeatableSpec<java.lang.Float> animationSpec);
+ method @androidx.compose.runtime.Composable public static <T, V extends androidx.compose.animation.core.AnimationVector> androidx.compose.runtime.State<T> animateValue(androidx.compose.animation.core.InfiniteTransition, T? initialValue, T? targetValue, androidx.compose.animation.core.TwoWayConverter<T,V> typeConverter, androidx.compose.animation.core.InfiniteRepeatableSpec<T> animationSpec);
+ method @androidx.compose.runtime.Composable public static androidx.compose.animation.core.InfiniteTransition rememberInfiniteTransition();
+ }
+
+ @kotlin.RequiresOptIn(message="This API is internal to library.") @kotlin.annotation.Target(allowedTargets={kotlin.annotation.AnnotationTarget.CLASS, kotlin.annotation.AnnotationTarget.FUNCTION, kotlin.annotation.AnnotationTarget.PROPERTY, kotlin.annotation.AnnotationTarget.FIELD, kotlin.annotation.AnnotationTarget.PROPERTY_GETTER}) public @interface InternalAnimationApi {
+ }
+
+ @androidx.compose.runtime.Immutable public final class KeyframesSpec<T> implements androidx.compose.animation.core.DurationBasedAnimationSpec<T> {
+ ctor public KeyframesSpec(androidx.compose.animation.core.KeyframesSpec.KeyframesSpecConfig<T> config);
+ method public androidx.compose.animation.core.KeyframesSpec.KeyframesSpecConfig<T> getConfig();
+ method public <V extends androidx.compose.animation.core.AnimationVector> androidx.compose.animation.core.VectorizedKeyframesSpec<V> vectorize(androidx.compose.animation.core.TwoWayConverter<T,V> converter);
+ property public final androidx.compose.animation.core.KeyframesSpec.KeyframesSpecConfig<T> config;
+ }
+
+ public static final class KeyframesSpec.KeyframeEntity<T> {
+ }
+
+ public static final class KeyframesSpec.KeyframesSpecConfig<T> {
+ ctor public KeyframesSpec.KeyframesSpecConfig();
+ method public infix androidx.compose.animation.core.KeyframesSpec.KeyframeEntity<T> at(T?, int timeStamp);
+ method public int getDelayMillis();
+ method public int getDurationMillis();
+ method public void setDelayMillis(int);
+ method public void setDurationMillis(int);
+ method public infix void with(androidx.compose.animation.core.KeyframesSpec.KeyframeEntity<T>, androidx.compose.animation.core.Easing easing);
+ property public final int delayMillis;
+ property public final int durationMillis;
+ }
+
+ public final class MutableTransitionState<S> {
+ ctor public MutableTransitionState(S? initialState);
+ method public S! getCurrentState();
+ method public S! getTargetState();
+ method public boolean isIdle();
+ method public void setTargetState(S!);
+ property public final S! currentState;
+ property public final boolean isIdle;
+ property public final S! targetState;
+ }
+
+ public enum RepeatMode {
+ enum_constant public static final androidx.compose.animation.core.RepeatMode Restart;
+ enum_constant public static final androidx.compose.animation.core.RepeatMode Reverse;
+ }
+
+ @androidx.compose.runtime.Immutable public final class RepeatableSpec<T> implements androidx.compose.animation.core.FiniteAnimationSpec<T> {
+ ctor public RepeatableSpec(int iterations, androidx.compose.animation.core.DurationBasedAnimationSpec<T> animation, optional androidx.compose.animation.core.RepeatMode repeatMode, optional long initialStartOffset);
+ method @Deprecated public androidx.compose.animation.core.RepeatableSpec<T>! RepeatableSpec(int iterations, androidx.compose.animation.core.DurationBasedAnimationSpec<T> animation, optional androidx.compose.animation.core.RepeatMode repeatMode);
+ method public androidx.compose.animation.core.DurationBasedAnimationSpec<T> getAnimation();
+ method public long getInitialStartOffset();
+ method public int getIterations();
+ method public androidx.compose.animation.core.RepeatMode getRepeatMode();
+ method public <V extends androidx.compose.animation.core.AnimationVector> androidx.compose.animation.core.VectorizedFiniteAnimationSpec<V> vectorize(androidx.compose.animation.core.TwoWayConverter<T,V> converter);
+ property public final androidx.compose.animation.core.DurationBasedAnimationSpec<T> animation;
+ property public final long initialStartOffset;
+ property public final int iterations;
+ property public final androidx.compose.animation.core.RepeatMode repeatMode;
+ }
+
+ @androidx.compose.runtime.Immutable public final class SnapSpec<T> implements androidx.compose.animation.core.DurationBasedAnimationSpec<T> {
+ ctor public SnapSpec(optional int delay);
+ method public int getDelay();
+ method public <V extends androidx.compose.animation.core.AnimationVector> androidx.compose.animation.core.VectorizedDurationBasedAnimationSpec<V> vectorize(androidx.compose.animation.core.TwoWayConverter<T,V> converter);
+ property public final int delay;
+ }
+
+ public final class Spring {
+ field public static final float DampingRatioHighBouncy = 0.2f;
+ field public static final float DampingRatioLowBouncy = 0.75f;
+ field public static final float DampingRatioMediumBouncy = 0.5f;
+ field public static final float DampingRatioNoBouncy = 1.0f;
+ field public static final float DefaultDisplacementThreshold = 0.01f;
+ field public static final androidx.compose.animation.core.Spring INSTANCE;
+ field public static final float StiffnessHigh = 10000.0f;
+ field public static final float StiffnessLow = 200.0f;
+ field public static final float StiffnessMedium = 1500.0f;
+ field public static final float StiffnessMediumLow = 400.0f;
+ field public static final float StiffnessVeryLow = 50.0f;
+ }
+
+ public final class SpringEstimationKt {
+ }
+
+ public final class SpringSimulationKt {
+ }
+
+ @androidx.compose.runtime.Immutable public final class SpringSpec<T> implements androidx.compose.animation.core.FiniteAnimationSpec<T> {
+ ctor public SpringSpec(optional float dampingRatio, optional float stiffness, optional T? visibilityThreshold);
+ method public float getDampingRatio();
+ method public float getStiffness();
+ method public T? getVisibilityThreshold();
+ method public <V extends androidx.compose.animation.core.AnimationVector> androidx.compose.animation.core.VectorizedSpringSpec<V> vectorize(androidx.compose.animation.core.TwoWayConverter<T,V> converter);
+ property public final float dampingRatio;
+ property public final float stiffness;
+ property public final T? visibilityThreshold;
+ }
+
+ @kotlin.jvm.JvmInline public final value class StartOffset {
+ ctor public StartOffset(int offsetMillis, optional int offsetType);
+ method public int getOffsetMillis();
+ method public int getOffsetType();
+ property public final int offsetMillis;
+ property public final int offsetType;
+ }
+
+ @kotlin.jvm.JvmInline public final value class StartOffsetType {
+ field public static final androidx.compose.animation.core.StartOffsetType.Companion Companion;
+ }
+
+ public static final class StartOffsetType.Companion {
+ method public int getDelay();
+ method public int getFastForward();
+ property public final int Delay;
+ property public final int FastForward;
+ }
+
+ public final class SuspendAnimationKt {
+ method public static suspend Object? animate(float initialValue, float targetValue, optional float initialVelocity, optional androidx.compose.animation.core.AnimationSpec<java.lang.Float> animationSpec, kotlin.jvm.functions.Function2<? super java.lang.Float,? super java.lang.Float,kotlin.Unit> block, kotlin.coroutines.Continuation<? super kotlin.Unit>);
+ method public static suspend <T, V extends androidx.compose.animation.core.AnimationVector> Object? animate(androidx.compose.animation.core.TwoWayConverter<T,V> typeConverter, T? initialValue, T? targetValue, optional T? initialVelocity, optional androidx.compose.animation.core.AnimationSpec<T> animationSpec, kotlin.jvm.functions.Function2<? super T,? super T,kotlin.Unit> block, kotlin.coroutines.Continuation<? super kotlin.Unit>);
+ method public static suspend Object? animateDecay(float initialValue, float initialVelocity, androidx.compose.animation.core.FloatDecayAnimationSpec animationSpec, kotlin.jvm.functions.Function2<? super java.lang.Float,? super java.lang.Float,kotlin.Unit> block, kotlin.coroutines.Continuation<? super kotlin.Unit>);
+ method public static suspend <T, V extends androidx.compose.animation.core.AnimationVector> Object? animateDecay(androidx.compose.animation.core.AnimationState<T,V>, androidx.compose.animation.core.DecayAnimationSpec<T> animationSpec, optional boolean sequentialAnimation, optional kotlin.jvm.functions.Function1<? super androidx.compose.animation.core.AnimationScope<T,V>,kotlin.Unit> block, optional kotlin.coroutines.Continuation<? super kotlin.Unit>);
+ method public static suspend <T, V extends androidx.compose.animation.core.AnimationVector> Object? animateTo(androidx.compose.animation.core.AnimationState<T,V>, T? targetValue, optional androidx.compose.animation.core.AnimationSpec<T> animationSpec, optional boolean sequentialAnimation, optional kotlin.jvm.functions.Function1<? super androidx.compose.animation.core.AnimationScope<T,V>,kotlin.Unit> block, optional kotlin.coroutines.Continuation<? super kotlin.Unit>);
+ }
+
+ public final class TargetBasedAnimation<T, V extends androidx.compose.animation.core.AnimationVector> implements androidx.compose.animation.core.Animation<T,V> {
+ ctor public TargetBasedAnimation(androidx.compose.animation.core.AnimationSpec<T> animationSpec, androidx.compose.animation.core.TwoWayConverter<T,V> typeConverter, T? initialValue, T? targetValue, optional V? initialVelocityVector);
+ method public long getDurationNanos();
+ method public T! getInitialValue();
+ method public T! getTargetValue();
+ method public androidx.compose.animation.core.TwoWayConverter<T,V> getTypeConverter();
+ method public T! getValueFromNanos(long playTimeNanos);
+ method public V getVelocityVectorFromNanos(long playTimeNanos);
+ method public boolean isInfinite();
+ property public long durationNanos;
+ property public final T! initialValue;
+ property public boolean isInfinite;
+ property public T! targetValue;
+ property public androidx.compose.animation.core.TwoWayConverter<T,V> typeConverter;
+ }
+
+ @androidx.compose.runtime.Stable public final class Transition<S> {
+ method public java.util.List<androidx.compose.animation.core.Transition<S>.TransitionAnimationState<?,?>> getAnimations();
+ method public S! getCurrentState();
+ method public String? getLabel();
+ method public androidx.compose.animation.core.Transition.Segment<S> getSegment();
+ method public S! getTargetState();
+ method public long getTotalDurationNanos();
+ method public java.util.List<androidx.compose.animation.core.Transition<?>> getTransitions();
+ method public boolean isRunning();
+ property public final java.util.List<androidx.compose.animation.core.Transition<S>.TransitionAnimationState<?,?>> animations;
+ property public final S! currentState;
+ property public final boolean isRunning;
+ property public final String? label;
+ property public final androidx.compose.animation.core.Transition.Segment<S> segment;
+ property public final S! targetState;
+ property public final long totalDurationNanos;
+ property public final java.util.List<androidx.compose.animation.core.Transition<?>> transitions;
+ }
+
+ public static interface Transition.Segment<S> {
+ method public S! getInitialState();
+ method public S! getTargetState();
+ method public default infix boolean isTransitioningTo(S?, S? targetState);
+ property public abstract S! initialState;
+ property public abstract S! targetState;
+ }
+
+ @androidx.compose.runtime.Stable public final class Transition.TransitionAnimationState<T, V extends androidx.compose.animation.core.AnimationVector> implements androidx.compose.runtime.State<T> {
+ method public androidx.compose.animation.core.TargetBasedAnimation<T,V> getAnimation();
+ method public androidx.compose.animation.core.FiniteAnimationSpec<T> getAnimationSpec();
+ method public String getLabel();
+ method public androidx.compose.animation.core.TwoWayConverter<T,V> getTypeConverter();
+ method public T! getValue();
+ property public final androidx.compose.animation.core.TargetBasedAnimation<T,V> animation;
+ property public final androidx.compose.animation.core.FiniteAnimationSpec<T> animationSpec;
+ property public final String label;
+ property public final androidx.compose.animation.core.TwoWayConverter<T,V> typeConverter;
+ property public T! value;
+ }
+
+ public final class TransitionKt {
+ method @androidx.compose.runtime.Composable public static inline <S> androidx.compose.runtime.State<androidx.compose.ui.unit.Dp> animateDp(androidx.compose.animation.core.Transition<S>, optional kotlin.jvm.functions.Function1<? super androidx.compose.animation.core.Transition.Segment<S>,? extends androidx.compose.animation.core.FiniteAnimationSpec<androidx.compose.ui.unit.Dp>> transitionSpec, optional String label, kotlin.jvm.functions.Function1<? super S,androidx.compose.ui.unit.Dp> targetValueByState);
+ method @androidx.compose.runtime.Composable public static inline <S> androidx.compose.runtime.State<java.lang.Float> animateFloat(androidx.compose.animation.core.Transition<S>, optional kotlin.jvm.functions.Function1<? super androidx.compose.animation.core.Transition.Segment<S>,? extends androidx.compose.animation.core.FiniteAnimationSpec<java.lang.Float>> transitionSpec, optional String label, kotlin.jvm.functions.Function1<? super S,java.lang.Float> targetValueByState);
+ method @androidx.compose.runtime.Composable public static inline <S> androidx.compose.runtime.State<java.lang.Integer> animateInt(androidx.compose.animation.core.Transition<S>, optional kotlin.jvm.functions.Function1<? super androidx.compose.animation.core.Transition.Segment<S>,? extends androidx.compose.animation.core.FiniteAnimationSpec<java.lang.Integer>> transitionSpec, optional String label, kotlin.jvm.functions.Function1<? super S,java.lang.Integer> targetValueByState);
+ method @androidx.compose.runtime.Composable public static inline <S> androidx.compose.runtime.State<androidx.compose.ui.unit.IntOffset> animateIntOffset(androidx.compose.animation.core.Transition<S>, optional kotlin.jvm.functions.Function1<? super androidx.compose.animation.core.Transition.Segment<S>,? extends androidx.compose.animation.core.FiniteAnimationSpec<androidx.compose.ui.unit.IntOffset>> transitionSpec, optional String label, kotlin.jvm.functions.Function1<? super S,androidx.compose.ui.unit.IntOffset> targetValueByState);
+ method @androidx.compose.runtime.Composable public static inline <S> androidx.compose.runtime.State<androidx.compose.ui.unit.IntSize> animateIntSize(androidx.compose.animation.core.Transition<S>, optional kotlin.jvm.functions.Function1<? super androidx.compose.animation.core.Transition.Segment<S>,? extends androidx.compose.animation.core.FiniteAnimationSpec<androidx.compose.ui.unit.IntSize>> transitionSpec, optional String label, kotlin.jvm.functions.Function1<? super S,androidx.compose.ui.unit.IntSize> targetValueByState);
+ method @androidx.compose.runtime.Composable public static inline <S> androidx.compose.runtime.State<androidx.compose.ui.geometry.Offset> animateOffset(androidx.compose.animation.core.Transition<S>, optional kotlin.jvm.functions.Function1<? super androidx.compose.animation.core.Transition.Segment<S>,? extends androidx.compose.animation.core.FiniteAnimationSpec<androidx.compose.ui.geometry.Offset>> transitionSpec, optional String label, kotlin.jvm.functions.Function1<? super S,androidx.compose.ui.geometry.Offset> targetValueByState);
+ method @androidx.compose.runtime.Composable public static inline <S> androidx.compose.runtime.State<androidx.compose.ui.geometry.Rect> animateRect(androidx.compose.animation.core.Transition<S>, optional kotlin.jvm.functions.Function1<? super androidx.compose.animation.core.Transition.Segment<S>,? extends androidx.compose.animation.core.FiniteAnimationSpec<androidx.compose.ui.geometry.Rect>> transitionSpec, optional String label, kotlin.jvm.functions.Function1<? super S,androidx.compose.ui.geometry.Rect> targetValueByState);
+ method @androidx.compose.runtime.Composable public static inline <S> androidx.compose.runtime.State<androidx.compose.ui.geometry.Size> animateSize(androidx.compose.animation.core.Transition<S>, optional kotlin.jvm.functions.Function1<? super androidx.compose.animation.core.Transition.Segment<S>,? extends androidx.compose.animation.core.FiniteAnimationSpec<androidx.compose.ui.geometry.Size>> transitionSpec, optional String label, kotlin.jvm.functions.Function1<? super S,androidx.compose.ui.geometry.Size> targetValueByState);
+ method @androidx.compose.runtime.Composable public static inline <S, T, V extends androidx.compose.animation.core.AnimationVector> androidx.compose.runtime.State<T> animateValue(androidx.compose.animation.core.Transition<S>, androidx.compose.animation.core.TwoWayConverter<T,V> typeConverter, optional kotlin.jvm.functions.Function1<? super androidx.compose.animation.core.Transition.Segment<S>,? extends androidx.compose.animation.core.FiniteAnimationSpec<T>> transitionSpec, optional String label, kotlin.jvm.functions.Function1<? super S,? extends T> targetValueByState);
+ method @androidx.compose.animation.core.ExperimentalTransitionApi @androidx.compose.runtime.Composable public static inline <S, T> androidx.compose.animation.core.Transition<T> createChildTransition(androidx.compose.animation.core.Transition<S>, optional String label, kotlin.jvm.functions.Function1<? super S,? extends T> transformToChildState);
+ method @androidx.compose.runtime.Composable public static <T> androidx.compose.animation.core.Transition<T> updateTransition(T? targetState, optional String? label);
+ method @androidx.compose.runtime.Composable public static <T> androidx.compose.animation.core.Transition<T> updateTransition(androidx.compose.animation.core.MutableTransitionState<T> transitionState, optional String? label);
+ }
+
+ @androidx.compose.runtime.Immutable public final class TweenSpec<T> implements androidx.compose.animation.core.DurationBasedAnimationSpec<T> {
+ ctor public TweenSpec(optional int durationMillis, optional int delay, optional androidx.compose.animation.core.Easing easing);
+ method public int getDelay();
+ method public int getDurationMillis();
+ method public androidx.compose.animation.core.Easing getEasing();
+ method public <V extends androidx.compose.animation.core.AnimationVector> androidx.compose.animation.core.VectorizedTweenSpec<V> vectorize(androidx.compose.animation.core.TwoWayConverter<T,V> converter);
+ property public final int delay;
+ property public final int durationMillis;
+ property public final androidx.compose.animation.core.Easing easing;
+ }
+
+ public interface TwoWayConverter<T, V extends androidx.compose.animation.core.AnimationVector> {
+ method public kotlin.jvm.functions.Function1<V,T> getConvertFromVector();
+ method public kotlin.jvm.functions.Function1<T,V> getConvertToVector();
+ property public abstract kotlin.jvm.functions.Function1<V,T> convertFromVector;
+ property public abstract kotlin.jvm.functions.Function1<T,V> convertToVector;
+ }
+
+ public final class VectorConvertersKt {
+ method public static <T, V extends androidx.compose.animation.core.AnimationVector> androidx.compose.animation.core.TwoWayConverter<T,V> TwoWayConverter(kotlin.jvm.functions.Function1<? super T,? extends V> convertToVector, kotlin.jvm.functions.Function1<? super V,? extends T> convertFromVector);
+ method public static androidx.compose.animation.core.TwoWayConverter<java.lang.Float,androidx.compose.animation.core.AnimationVector1D> getVectorConverter(kotlin.jvm.internal.FloatCompanionObject);
+ method public static androidx.compose.animation.core.TwoWayConverter<java.lang.Integer,androidx.compose.animation.core.AnimationVector1D> getVectorConverter(kotlin.jvm.internal.IntCompanionObject);
+ method public static androidx.compose.animation.core.TwoWayConverter<androidx.compose.ui.geometry.Rect,androidx.compose.animation.core.AnimationVector4D> getVectorConverter(androidx.compose.ui.geometry.Rect.Companion);
+ method public static androidx.compose.animation.core.TwoWayConverter<androidx.compose.ui.unit.Dp,androidx.compose.animation.core.AnimationVector1D> getVectorConverter(androidx.compose.ui.unit.Dp.Companion);
+ method public static androidx.compose.animation.core.TwoWayConverter<androidx.compose.ui.unit.DpOffset,androidx.compose.animation.core.AnimationVector2D> getVectorConverter(androidx.compose.ui.unit.DpOffset.Companion);
+ method public static androidx.compose.animation.core.TwoWayConverter<androidx.compose.ui.geometry.Size,androidx.compose.animation.core.AnimationVector2D> getVectorConverter(androidx.compose.ui.geometry.Size.Companion);
+ method public static androidx.compose.animation.core.TwoWayConverter<androidx.compose.ui.geometry.Offset,androidx.compose.animation.core.AnimationVector2D> getVectorConverter(androidx.compose.ui.geometry.Offset.Companion);
+ method public static androidx.compose.animation.core.TwoWayConverter<androidx.compose.ui.unit.IntOffset,androidx.compose.animation.core.AnimationVector2D> getVectorConverter(androidx.compose.ui.unit.IntOffset.Companion);
+ method public static androidx.compose.animation.core.TwoWayConverter<androidx.compose.ui.unit.IntSize,androidx.compose.animation.core.AnimationVector2D> getVectorConverter(androidx.compose.ui.unit.IntSize.Companion);
+ }
+
+ public interface VectorizedAnimationSpec<V extends androidx.compose.animation.core.AnimationVector> {
+ method public long getDurationNanos(V initialValue, V targetValue, V initialVelocity);
+ method public default V getEndVelocity(V initialValue, V targetValue, V initialVelocity);
+ method public V getValueFromNanos(long playTimeNanos, V initialValue, V targetValue, V initialVelocity);
+ method public V getVelocityFromNanos(long playTimeNanos, V initialValue, V targetValue, V initialVelocity);
+ method public boolean isInfinite();
+ property public abstract boolean isInfinite;
+ }
+
+ public final class VectorizedAnimationSpecKt {
+ }
+
+ public interface VectorizedDecayAnimationSpec<V extends androidx.compose.animation.core.AnimationVector> {
+ method public float getAbsVelocityThreshold();
+ method public long getDurationNanos(V initialValue, V initialVelocity);
+ method public V getTargetValue(V initialValue, V initialVelocity);
+ method public V getValueFromNanos(long playTimeNanos, V initialValue, V initialVelocity);
+ method public V getVelocityFromNanos(long playTimeNanos, V initialValue, V initialVelocity);
+ property public abstract float absVelocityThreshold;
+ }
+
+ public interface VectorizedDurationBasedAnimationSpec<V extends androidx.compose.animation.core.AnimationVector> extends androidx.compose.animation.core.VectorizedFiniteAnimationSpec<V> {
+ method public int getDelayMillis();
+ method public int getDurationMillis();
+ method public default long getDurationNanos(V initialValue, V targetValue, V initialVelocity);
+ property public abstract int delayMillis;
+ property public abstract int durationMillis;
+ }
+
+ public interface VectorizedFiniteAnimationSpec<V extends androidx.compose.animation.core.AnimationVector> extends androidx.compose.animation.core.VectorizedAnimationSpec<V> {
+ method public default boolean isInfinite();
+ property public default boolean isInfinite;
+ }
+
+ public final class VectorizedFloatAnimationSpec<V extends androidx.compose.animation.core.AnimationVector> implements androidx.compose.animation.core.VectorizedFiniteAnimationSpec<V> {
+ ctor public VectorizedFloatAnimationSpec(androidx.compose.animation.core.FloatAnimationSpec anim);
+ method public long getDurationNanos(V initialValue, V targetValue, V initialVelocity);
+ method public V getValueFromNanos(long playTimeNanos, V initialValue, V targetValue, V initialVelocity);
+ method public V getVelocityFromNanos(long playTimeNanos, V initialValue, V targetValue, V initialVelocity);
+ }
+
+ public final class VectorizedInfiniteRepeatableSpec<V extends androidx.compose.animation.core.AnimationVector> implements androidx.compose.animation.core.VectorizedAnimationSpec<V> {
+ ctor public VectorizedInfiniteRepeatableSpec(androidx.compose.animation.core.VectorizedDurationBasedAnimationSpec<V> animation, optional androidx.compose.animation.core.RepeatMode repeatMode, optional long initialStartOffset);
+ method @Deprecated public androidx.compose.animation.core.VectorizedInfiniteRepeatableSpec<V>! VectorizedInfiniteRepeatableSpec(androidx.compose.animation.core.VectorizedDurationBasedAnimationSpec<V> animation, optional androidx.compose.animation.core.RepeatMode repeatMode);
+ method public long getDurationNanos(V initialValue, V targetValue, V initialVelocity);
+ method public V getValueFromNanos(long playTimeNanos, V initialValue, V targetValue, V initialVelocity);
+ method public V getVelocityFromNanos(long playTimeNanos, V initialValue, V targetValue, V initialVelocity);
+ method public boolean isInfinite();
+ property public boolean isInfinite;
+ }
+
+ public final class VectorizedKeyframesSpec<V extends androidx.compose.animation.core.AnimationVector> implements androidx.compose.animation.core.VectorizedDurationBasedAnimationSpec<V> {
+ ctor public VectorizedKeyframesSpec(java.util.Map<java.lang.Integer,? extends kotlin.Pair<? extends V,? extends androidx.compose.animation.core.Easing>> keyframes, int durationMillis, optional int delayMillis);
+ method public int getDelayMillis();
+ method public int getDurationMillis();
+ method public V getValueFromNanos(long playTimeNanos, V initialValue, V targetValue, V initialVelocity);
+ method public V getVelocityFromNanos(long playTimeNanos, V initialValue, V targetValue, V initialVelocity);
+ property public int delayMillis;
+ property public int durationMillis;
+ }
+
+ public final class VectorizedRepeatableSpec<V extends androidx.compose.animation.core.AnimationVector> implements androidx.compose.animation.core.VectorizedFiniteAnimationSpec<V> {
+ ctor public VectorizedRepeatableSpec(int iterations, androidx.compose.animation.core.VectorizedDurationBasedAnimationSpec<V> animation, optional androidx.compose.animation.core.RepeatMode repeatMode, optional long initialStartOffset);
+ method @Deprecated public androidx.compose.animation.core.VectorizedRepeatableSpec<V>! VectorizedRepeatableSpec(int iterations, androidx.compose.animation.core.VectorizedDurationBasedAnimationSpec<V> animation, optional androidx.compose.animation.core.RepeatMode repeatMode);
+ method public long getDurationNanos(V initialValue, V targetValue, V initialVelocity);
+ method public V getValueFromNanos(long playTimeNanos, V initialValue, V targetValue, V initialVelocity);
+ method public V getVelocityFromNanos(long playTimeNanos, V initialValue, V targetValue, V initialVelocity);
+ }
+
+ public final class VectorizedSnapSpec<V extends androidx.compose.animation.core.AnimationVector> implements androidx.compose.animation.core.VectorizedDurationBasedAnimationSpec<V> {
+ ctor public VectorizedSnapSpec(optional int delayMillis);
+ method public int getDelayMillis();
+ method public int getDurationMillis();
+ method public V getValueFromNanos(long playTimeNanos, V initialValue, V targetValue, V initialVelocity);
+ method public V getVelocityFromNanos(long playTimeNanos, V initialValue, V targetValue, V initialVelocity);
+ property public int delayMillis;
+ property public int durationMillis;
+ }
+
+ public final class VectorizedSpringSpec<V extends androidx.compose.animation.core.AnimationVector> implements androidx.compose.animation.core.VectorizedFiniteAnimationSpec<V> {
+ ctor public VectorizedSpringSpec(optional float dampingRatio, optional float stiffness, optional V? visibilityThreshold);
+ method public float getDampingRatio();
+ method public float getStiffness();
+ property public final float dampingRatio;
+ property public final float stiffness;
+ }
+
+ public final class VectorizedTweenSpec<V extends androidx.compose.animation.core.AnimationVector> implements androidx.compose.animation.core.VectorizedDurationBasedAnimationSpec<V> {
+ ctor public VectorizedTweenSpec(optional int durationMillis, optional int delayMillis, optional androidx.compose.animation.core.Easing easing);
+ method public int getDelayMillis();
+ method public int getDurationMillis();
+ method public androidx.compose.animation.core.Easing getEasing();
+ method public V getValueFromNanos(long playTimeNanos, V initialValue, V targetValue, V initialVelocity);
+ method public V getVelocityFromNanos(long playTimeNanos, V initialValue, V targetValue, V initialVelocity);
+ property public int delayMillis;
+ property public int durationMillis;
+ property public final androidx.compose.animation.core.Easing easing;
+ }
+
+ public final class VisibilityThresholdsKt {
+ method public static long getVisibilityThreshold(androidx.compose.ui.unit.IntOffset.Companion);
+ method public static long getVisibilityThreshold(androidx.compose.ui.geometry.Offset.Companion);
+ method public static int getVisibilityThreshold(kotlin.jvm.internal.IntCompanionObject);
+ method public static float getVisibilityThreshold(androidx.compose.ui.unit.Dp.Companion);
+ method public static long getVisibilityThreshold(androidx.compose.ui.unit.DpOffset.Companion);
+ method public static long getVisibilityThreshold(androidx.compose.ui.geometry.Size.Companion);
+ method public static long getVisibilityThreshold(androidx.compose.ui.unit.IntSize.Companion);
+ method public static androidx.compose.ui.geometry.Rect getVisibilityThreshold(androidx.compose.ui.geometry.Rect.Companion);
+ }
+
+}
+
diff --git a/compose/animation/animation-core/api/res-1.2.0-beta02.txt b/compose/animation/animation-core/api/res-1.2.0-beta02.txt
new file mode 100644
index 0000000..e69de29
--- /dev/null
+++ b/compose/animation/animation-core/api/res-1.2.0-beta02.txt
diff --git a/compose/animation/animation-core/api/restricted_1.2.0-beta02.txt b/compose/animation/animation-core/api/restricted_1.2.0-beta02.txt
new file mode 100644
index 0000000..998d951
--- /dev/null
+++ b/compose/animation/animation-core/api/restricted_1.2.0-beta02.txt
@@ -0,0 +1,671 @@
+// Signature format: 4.0
+package androidx.compose.animation.core {
+
+ public final class ActualJvmKt {
+ }
+
+ public final class Animatable<T, V extends androidx.compose.animation.core.AnimationVector> {
+ ctor public Animatable(T? initialValue, androidx.compose.animation.core.TwoWayConverter<T,V> typeConverter, optional T? visibilityThreshold);
+ method public suspend Object? animateDecay(T? initialVelocity, androidx.compose.animation.core.DecayAnimationSpec<T> animationSpec, optional kotlin.jvm.functions.Function1<? super androidx.compose.animation.core.Animatable<T,V>,kotlin.Unit>? block, optional kotlin.coroutines.Continuation<? super androidx.compose.animation.core.AnimationResult<T,V>>);
+ method public suspend Object? animateTo(T? targetValue, optional androidx.compose.animation.core.AnimationSpec<T> animationSpec, optional T? initialVelocity, optional kotlin.jvm.functions.Function1<? super androidx.compose.animation.core.Animatable<T,V>,kotlin.Unit>? block, optional kotlin.coroutines.Continuation<? super androidx.compose.animation.core.AnimationResult<T,V>>);
+ method public androidx.compose.runtime.State<T> asState();
+ method public T? getLowerBound();
+ method public T! getTargetValue();
+ method public androidx.compose.animation.core.TwoWayConverter<T,V> getTypeConverter();
+ method public T? getUpperBound();
+ method public T! getValue();
+ method public T! getVelocity();
+ method public V getVelocityVector();
+ method public boolean isRunning();
+ method public suspend Object? snapTo(T? targetValue, kotlin.coroutines.Continuation<? super kotlin.Unit>);
+ method public suspend Object? stop(kotlin.coroutines.Continuation<? super kotlin.Unit>);
+ method public void updateBounds(optional T? lowerBound, optional T? upperBound);
+ property public final boolean isRunning;
+ property public final T? lowerBound;
+ property public final T! targetValue;
+ property public final androidx.compose.animation.core.TwoWayConverter<T,V> typeConverter;
+ property public final T? upperBound;
+ property public final T! value;
+ property public final T! velocity;
+ property public final V velocityVector;
+ }
+
+ public final class AnimatableKt {
+ method public static androidx.compose.animation.core.Animatable<java.lang.Float,androidx.compose.animation.core.AnimationVector1D> Animatable(float initialValue, optional float visibilityThreshold);
+ }
+
+ public final class AnimateAsStateKt {
+ method @androidx.compose.runtime.Composable public static androidx.compose.runtime.State<androidx.compose.ui.unit.Dp> animateDpAsState(float targetValue, optional androidx.compose.animation.core.AnimationSpec<androidx.compose.ui.unit.Dp> animationSpec, optional kotlin.jvm.functions.Function1<? super androidx.compose.ui.unit.Dp,kotlin.Unit>? finishedListener);
+ method @androidx.compose.runtime.Composable public static androidx.compose.runtime.State<java.lang.Float> animateFloatAsState(float targetValue, optional androidx.compose.animation.core.AnimationSpec<java.lang.Float> animationSpec, optional float visibilityThreshold, optional kotlin.jvm.functions.Function1<? super java.lang.Float,kotlin.Unit>? finishedListener);
+ method @androidx.compose.runtime.Composable public static androidx.compose.runtime.State<java.lang.Integer> animateIntAsState(int targetValue, optional androidx.compose.animation.core.AnimationSpec<java.lang.Integer> animationSpec, optional kotlin.jvm.functions.Function1<? super java.lang.Integer,kotlin.Unit>? finishedListener);
+ method @androidx.compose.runtime.Composable public static androidx.compose.runtime.State<androidx.compose.ui.unit.IntOffset> animateIntOffsetAsState(long targetValue, optional androidx.compose.animation.core.AnimationSpec<androidx.compose.ui.unit.IntOffset> animationSpec, optional kotlin.jvm.functions.Function1<? super androidx.compose.ui.unit.IntOffset,kotlin.Unit>? finishedListener);
+ method @androidx.compose.runtime.Composable public static androidx.compose.runtime.State<androidx.compose.ui.unit.IntSize> animateIntSizeAsState(long targetValue, optional androidx.compose.animation.core.AnimationSpec<androidx.compose.ui.unit.IntSize> animationSpec, optional kotlin.jvm.functions.Function1<? super androidx.compose.ui.unit.IntSize,kotlin.Unit>? finishedListener);
+ method @androidx.compose.runtime.Composable public static androidx.compose.runtime.State<androidx.compose.ui.geometry.Offset> animateOffsetAsState(long targetValue, optional androidx.compose.animation.core.AnimationSpec<androidx.compose.ui.geometry.Offset> animationSpec, optional kotlin.jvm.functions.Function1<? super androidx.compose.ui.geometry.Offset,kotlin.Unit>? finishedListener);
+ method @androidx.compose.runtime.Composable public static androidx.compose.runtime.State<androidx.compose.ui.geometry.Rect> animateRectAsState(androidx.compose.ui.geometry.Rect targetValue, optional androidx.compose.animation.core.AnimationSpec<androidx.compose.ui.geometry.Rect> animationSpec, optional kotlin.jvm.functions.Function1<? super androidx.compose.ui.geometry.Rect,kotlin.Unit>? finishedListener);
+ method @androidx.compose.runtime.Composable public static androidx.compose.runtime.State<androidx.compose.ui.geometry.Size> animateSizeAsState(long targetValue, optional androidx.compose.animation.core.AnimationSpec<androidx.compose.ui.geometry.Size> animationSpec, optional kotlin.jvm.functions.Function1<? super androidx.compose.ui.geometry.Size,kotlin.Unit>? finishedListener);
+ method @androidx.compose.runtime.Composable public static <T, V extends androidx.compose.animation.core.AnimationVector> androidx.compose.runtime.State<T> animateValueAsState(T? targetValue, androidx.compose.animation.core.TwoWayConverter<T,V> typeConverter, optional androidx.compose.animation.core.AnimationSpec<T> animationSpec, optional T? visibilityThreshold, optional kotlin.jvm.functions.Function1<? super T,kotlin.Unit>? finishedListener);
+ }
+
+ public interface Animation<T, V extends androidx.compose.animation.core.AnimationVector> {
+ method public long getDurationNanos();
+ method public T! getTargetValue();
+ method public androidx.compose.animation.core.TwoWayConverter<T,V> getTypeConverter();
+ method public T! getValueFromNanos(long playTimeNanos);
+ method public V getVelocityVectorFromNanos(long playTimeNanos);
+ method public default boolean isFinishedFromNanos(long playTimeNanos);
+ method public boolean isInfinite();
+ property public abstract long durationNanos;
+ property public abstract boolean isInfinite;
+ property public abstract T! targetValue;
+ property public abstract androidx.compose.animation.core.TwoWayConverter<T,V> typeConverter;
+ }
+
+ public final class AnimationConstants {
+ field public static final int DefaultDurationMillis = 300; // 0x12c
+ field public static final androidx.compose.animation.core.AnimationConstants INSTANCE;
+ field public static final long UnspecifiedTime = -9223372036854775808L; // 0x8000000000000000L
+ }
+
+ public enum AnimationEndReason {
+ enum_constant public static final androidx.compose.animation.core.AnimationEndReason BoundReached;
+ enum_constant public static final androidx.compose.animation.core.AnimationEndReason Finished;
+ }
+
+ public final class AnimationKt {
+ method public static androidx.compose.animation.core.DecayAnimation<java.lang.Float,androidx.compose.animation.core.AnimationVector1D> DecayAnimation(androidx.compose.animation.core.FloatDecayAnimationSpec animationSpec, float initialValue, optional float initialVelocity);
+ method public static <T, V extends androidx.compose.animation.core.AnimationVector> androidx.compose.animation.core.TargetBasedAnimation<T,V> TargetBasedAnimation(androidx.compose.animation.core.AnimationSpec<T> animationSpec, androidx.compose.animation.core.TwoWayConverter<T,V> typeConverter, T? initialValue, T? targetValue, T? initialVelocity);
+ method public static <T, V extends androidx.compose.animation.core.AnimationVector> T! getVelocityFromNanos(androidx.compose.animation.core.Animation<T,V>, long playTimeNanos);
+ }
+
+ public final class AnimationResult<T, V extends androidx.compose.animation.core.AnimationVector> {
+ ctor public AnimationResult(androidx.compose.animation.core.AnimationState<T,V> endState, androidx.compose.animation.core.AnimationEndReason endReason);
+ method public androidx.compose.animation.core.AnimationEndReason getEndReason();
+ method public androidx.compose.animation.core.AnimationState<T,V> getEndState();
+ property public final androidx.compose.animation.core.AnimationEndReason endReason;
+ property public final androidx.compose.animation.core.AnimationState<T,V> endState;
+ }
+
+ public final class AnimationScope<T, V extends androidx.compose.animation.core.AnimationVector> {
+ method public void cancelAnimation();
+ method public long getFinishedTimeNanos();
+ method public long getLastFrameTimeNanos();
+ method public long getStartTimeNanos();
+ method public T! getTargetValue();
+ method public androidx.compose.animation.core.TwoWayConverter<T,V> getTypeConverter();
+ method public T! getValue();
+ method public T! getVelocity();
+ method public V getVelocityVector();
+ method public boolean isRunning();
+ method public androidx.compose.animation.core.AnimationState<T,V> toAnimationState();
+ property public final long finishedTimeNanos;
+ property public final boolean isRunning;
+ property public final long lastFrameTimeNanos;
+ property public final long startTimeNanos;
+ property public final T! targetValue;
+ property public final androidx.compose.animation.core.TwoWayConverter<T,V> typeConverter;
+ property public final T! value;
+ property public final T! velocity;
+ property public final V velocityVector;
+ }
+
+ public interface AnimationSpec<T> {
+ method public <V extends androidx.compose.animation.core.AnimationVector> androidx.compose.animation.core.VectorizedAnimationSpec<V> vectorize(androidx.compose.animation.core.TwoWayConverter<T,V> converter);
+ }
+
+ public final class AnimationSpecKt {
+ method @androidx.compose.runtime.Stable public static <T> androidx.compose.animation.core.InfiniteRepeatableSpec<T> infiniteRepeatable(androidx.compose.animation.core.DurationBasedAnimationSpec<T> animation, optional androidx.compose.animation.core.RepeatMode repeatMode, optional long initialStartOffset);
+ method @Deprecated @androidx.compose.runtime.Stable public static <T> androidx.compose.animation.core.InfiniteRepeatableSpec<T>! infiniteRepeatable(androidx.compose.animation.core.DurationBasedAnimationSpec<T> animation, optional androidx.compose.animation.core.RepeatMode repeatMode);
+ method @androidx.compose.runtime.Stable public static <T> androidx.compose.animation.core.KeyframesSpec<T> keyframes(kotlin.jvm.functions.Function1<? super androidx.compose.animation.core.KeyframesSpec.KeyframesSpecConfig<T>,kotlin.Unit> init);
+ method @androidx.compose.runtime.Stable public static <T> androidx.compose.animation.core.RepeatableSpec<T> repeatable(int iterations, androidx.compose.animation.core.DurationBasedAnimationSpec<T> animation, optional androidx.compose.animation.core.RepeatMode repeatMode, optional long initialStartOffset);
+ method @Deprecated @androidx.compose.runtime.Stable public static <T> androidx.compose.animation.core.RepeatableSpec<T>! repeatable(int iterations, androidx.compose.animation.core.DurationBasedAnimationSpec<T> animation, optional androidx.compose.animation.core.RepeatMode repeatMode);
+ method @androidx.compose.runtime.Stable public static <T> androidx.compose.animation.core.SnapSpec<T> snap(optional int delayMillis);
+ method @androidx.compose.runtime.Stable public static <T> androidx.compose.animation.core.SpringSpec<T> spring(optional float dampingRatio, optional float stiffness, optional T? visibilityThreshold);
+ method @androidx.compose.runtime.Stable public static <T> androidx.compose.animation.core.TweenSpec<T> tween(optional int durationMillis, optional int delayMillis, optional androidx.compose.animation.core.Easing easing);
+ }
+
+ public final class AnimationState<T, V extends androidx.compose.animation.core.AnimationVector> implements androidx.compose.runtime.State<T> {
+ ctor public AnimationState(androidx.compose.animation.core.TwoWayConverter<T,V> typeConverter, T? initialValue, optional V? initialVelocityVector, optional long lastFrameTimeNanos, optional long finishedTimeNanos, optional boolean isRunning);
+ method public long getFinishedTimeNanos();
+ method public long getLastFrameTimeNanos();
+ method public androidx.compose.animation.core.TwoWayConverter<T,V> getTypeConverter();
+ method public T! getValue();
+ method public T! getVelocity();
+ method public V getVelocityVector();
+ method public boolean isRunning();
+ property public final long finishedTimeNanos;
+ property public final boolean isRunning;
+ property public final long lastFrameTimeNanos;
+ property public final androidx.compose.animation.core.TwoWayConverter<T,V> typeConverter;
+ property public T! value;
+ property public final T! velocity;
+ property public final V velocityVector;
+ }
+
+ public final class AnimationStateKt {
+ method public static androidx.compose.animation.core.AnimationState<java.lang.Float,androidx.compose.animation.core.AnimationVector1D> AnimationState(float initialValue, optional float initialVelocity, optional long lastFrameTimeNanos, optional long finishedTimeNanos, optional boolean isRunning);
+ method public static <T, V extends androidx.compose.animation.core.AnimationVector> androidx.compose.animation.core.AnimationState<T,V> AnimationState(androidx.compose.animation.core.TwoWayConverter<T,V> typeConverter, T? initialValue, T? initialVelocity, optional long lastFrameTimeNanos, optional long finishedTimeNanos, optional boolean isRunning);
+ method public static <T, V extends androidx.compose.animation.core.AnimationVector> androidx.compose.animation.core.AnimationState<T,V> copy(androidx.compose.animation.core.AnimationState<T,V>, optional T? value, optional V? velocityVector, optional long lastFrameTimeNanos, optional long finishedTimeNanos, optional boolean isRunning);
+ method public static androidx.compose.animation.core.AnimationState<java.lang.Float,androidx.compose.animation.core.AnimationVector1D> copy(androidx.compose.animation.core.AnimationState<java.lang.Float,androidx.compose.animation.core.AnimationVector1D>, optional float value, optional float velocity, optional long lastFrameTimeNanos, optional long finishedTimeNanos, optional boolean isRunning);
+ method public static <T, V extends androidx.compose.animation.core.AnimationVector> V createZeroVectorFrom(androidx.compose.animation.core.TwoWayConverter<T,V>, T? value);
+ method public static boolean isFinished(androidx.compose.animation.core.AnimationState<?,?>);
+ }
+
+ public abstract sealed class AnimationVector {
+ }
+
+ public final class AnimationVector1D extends androidx.compose.animation.core.AnimationVector {
+ ctor public AnimationVector1D(float initVal);
+ method public float getValue();
+ property public final float value;
+ }
+
+ public final class AnimationVector2D extends androidx.compose.animation.core.AnimationVector {
+ ctor public AnimationVector2D(float v1, float v2);
+ method public float getV1();
+ method public float getV2();
+ property public final float v1;
+ property public final float v2;
+ }
+
+ public final class AnimationVector3D extends androidx.compose.animation.core.AnimationVector {
+ ctor public AnimationVector3D(float v1, float v2, float v3);
+ method public float getV1();
+ method public float getV2();
+ method public float getV3();
+ property public final float v1;
+ property public final float v2;
+ property public final float v3;
+ }
+
+ public final class AnimationVector4D extends androidx.compose.animation.core.AnimationVector {
+ ctor public AnimationVector4D(float v1, float v2, float v3, float v4);
+ method public float getV1();
+ method public float getV2();
+ method public float getV3();
+ method public float getV4();
+ property public final float v1;
+ property public final float v2;
+ property public final float v3;
+ property public final float v4;
+ }
+
+ public final class AnimationVectorsKt {
+ method public static androidx.compose.animation.core.AnimationVector1D AnimationVector(float v1);
+ method public static androidx.compose.animation.core.AnimationVector2D AnimationVector(float v1, float v2);
+ method public static androidx.compose.animation.core.AnimationVector3D AnimationVector(float v1, float v2, float v3);
+ method public static androidx.compose.animation.core.AnimationVector4D AnimationVector(float v1, float v2, float v3, float v4);
+ }
+
+ public final class ComplexDoubleKt {
+ }
+
+ @androidx.compose.runtime.Immutable public final class CubicBezierEasing implements androidx.compose.animation.core.Easing {
+ ctor public CubicBezierEasing(float a, float b, float c, float d);
+ method public float transform(float fraction);
+ }
+
+ public final class DecayAnimation<T, V extends androidx.compose.animation.core.AnimationVector> implements androidx.compose.animation.core.Animation<T,V> {
+ ctor public DecayAnimation(androidx.compose.animation.core.VectorizedDecayAnimationSpec<V> animationSpec, androidx.compose.animation.core.TwoWayConverter<T,V> typeConverter, T? initialValue, V initialVelocityVector);
+ ctor public DecayAnimation(androidx.compose.animation.core.DecayAnimationSpec<T> animationSpec, androidx.compose.animation.core.TwoWayConverter<T,V> typeConverter, T? initialValue, V initialVelocityVector);
+ ctor public DecayAnimation(androidx.compose.animation.core.DecayAnimationSpec<T> animationSpec, androidx.compose.animation.core.TwoWayConverter<T,V> typeConverter, T? initialValue, T? initialVelocity);
+ method public long getDurationNanos();
+ method public T! getInitialValue();
+ method public V getInitialVelocityVector();
+ method public T! getTargetValue();
+ method public androidx.compose.animation.core.TwoWayConverter<T,V> getTypeConverter();
+ method public T! getValueFromNanos(long playTimeNanos);
+ method public V getVelocityVectorFromNanos(long playTimeNanos);
+ method public boolean isInfinite();
+ property public long durationNanos;
+ property public final T! initialValue;
+ property public final V initialVelocityVector;
+ property public boolean isInfinite;
+ property public T! targetValue;
+ property public androidx.compose.animation.core.TwoWayConverter<T,V> typeConverter;
+ }
+
+ public interface DecayAnimationSpec<T> {
+ method public <V extends androidx.compose.animation.core.AnimationVector> androidx.compose.animation.core.VectorizedDecayAnimationSpec<V> vectorize(androidx.compose.animation.core.TwoWayConverter<T,V> typeConverter);
+ }
+
+ public final class DecayAnimationSpecKt {
+ method public static <T, V extends androidx.compose.animation.core.AnimationVector> T! calculateTargetValue(androidx.compose.animation.core.DecayAnimationSpec<T>, androidx.compose.animation.core.TwoWayConverter<T,V> typeConverter, T? initialValue, T? initialVelocity);
+ method public static float calculateTargetValue(androidx.compose.animation.core.DecayAnimationSpec<java.lang.Float>, float initialValue, float initialVelocity);
+ method public static <T> androidx.compose.animation.core.DecayAnimationSpec<T> exponentialDecay(optional float frictionMultiplier, optional float absVelocityThreshold);
+ method public static <T> androidx.compose.animation.core.DecayAnimationSpec<T> generateDecayAnimationSpec(androidx.compose.animation.core.FloatDecayAnimationSpec);
+ }
+
+ public interface DurationBasedAnimationSpec<T> extends androidx.compose.animation.core.FiniteAnimationSpec<T> {
+ method public <V extends androidx.compose.animation.core.AnimationVector> androidx.compose.animation.core.VectorizedDurationBasedAnimationSpec<V> vectorize(androidx.compose.animation.core.TwoWayConverter<T,V> converter);
+ }
+
+ @androidx.compose.runtime.Stable public fun interface Easing {
+ method public float transform(float fraction);
+ }
+
+ public final class EasingKt {
+ method public static androidx.compose.animation.core.Easing getFastOutLinearInEasing();
+ method public static androidx.compose.animation.core.Easing getFastOutSlowInEasing();
+ method public static androidx.compose.animation.core.Easing getLinearEasing();
+ method public static androidx.compose.animation.core.Easing getLinearOutSlowInEasing();
+ property public static final androidx.compose.animation.core.Easing FastOutLinearInEasing;
+ property public static final androidx.compose.animation.core.Easing FastOutSlowInEasing;
+ property public static final androidx.compose.animation.core.Easing LinearEasing;
+ property public static final androidx.compose.animation.core.Easing LinearOutSlowInEasing;
+ }
+
+ public interface FiniteAnimationSpec<T> extends androidx.compose.animation.core.AnimationSpec<T> {
+ method public <V extends androidx.compose.animation.core.AnimationVector> androidx.compose.animation.core.VectorizedFiniteAnimationSpec<V> vectorize(androidx.compose.animation.core.TwoWayConverter<T,V> converter);
+ }
+
+ public interface FloatAnimationSpec extends androidx.compose.animation.core.AnimationSpec<java.lang.Float> {
+ method public long getDurationNanos(float initialValue, float targetValue, float initialVelocity);
+ method public default float getEndVelocity(float initialValue, float targetValue, float initialVelocity);
+ method public float getValueFromNanos(long playTimeNanos, float initialValue, float targetValue, float initialVelocity);
+ method public float getVelocityFromNanos(long playTimeNanos, float initialValue, float targetValue, float initialVelocity);
+ method public default <V extends androidx.compose.animation.core.AnimationVector> androidx.compose.animation.core.VectorizedFloatAnimationSpec<V> vectorize(androidx.compose.animation.core.TwoWayConverter<java.lang.Float,V> converter);
+ }
+
+ public interface FloatDecayAnimationSpec {
+ method public float getAbsVelocityThreshold();
+ method public long getDurationNanos(float initialValue, float initialVelocity);
+ method public float getTargetValue(float initialValue, float initialVelocity);
+ method public float getValueFromNanos(long playTimeNanos, float initialValue, float initialVelocity);
+ method public float getVelocityFromNanos(long playTimeNanos, float initialValue, float initialVelocity);
+ property public abstract float absVelocityThreshold;
+ }
+
+ public final class FloatDecayAnimationSpecKt {
+ }
+
+ public final class FloatExponentialDecaySpec implements androidx.compose.animation.core.FloatDecayAnimationSpec {
+ ctor public FloatExponentialDecaySpec(optional float frictionMultiplier, optional float absVelocityThreshold);
+ method public float getAbsVelocityThreshold();
+ method public long getDurationNanos(float initialValue, float initialVelocity);
+ method public float getTargetValue(float initialValue, float initialVelocity);
+ method public float getValueFromNanos(long playTimeNanos, float initialValue, float initialVelocity);
+ method public float getVelocityFromNanos(long playTimeNanos, float initialValue, float initialVelocity);
+ property public float absVelocityThreshold;
+ }
+
+ public final class FloatSpringSpec implements androidx.compose.animation.core.FloatAnimationSpec {
+ ctor public FloatSpringSpec(optional float dampingRatio, optional float stiffness, optional float visibilityThreshold);
+ method public float getDampingRatio();
+ method public long getDurationNanos(float initialValue, float targetValue, float initialVelocity);
+ method public float getStiffness();
+ method public float getValueFromNanos(long playTimeNanos, float initialValue, float targetValue, float initialVelocity);
+ method public float getVelocityFromNanos(long playTimeNanos, float initialValue, float targetValue, float initialVelocity);
+ property public final float dampingRatio;
+ property public final float stiffness;
+ }
+
+ public final class FloatTweenSpec implements androidx.compose.animation.core.FloatAnimationSpec {
+ ctor public FloatTweenSpec(optional int duration, optional int delay, optional androidx.compose.animation.core.Easing easing);
+ method public int getDelay();
+ method public int getDuration();
+ method public long getDurationNanos(float initialValue, float targetValue, float initialVelocity);
+ method public float getValueFromNanos(long playTimeNanos, float initialValue, float targetValue, float initialVelocity);
+ method public float getVelocityFromNanos(long playTimeNanos, float initialValue, float targetValue, float initialVelocity);
+ property public final int delay;
+ property public final int duration;
+ }
+
+ public final class InfiniteAnimationPolicyKt {
+ method public static suspend inline <R> Object? withInfiniteAnimationFrameMillis(kotlin.jvm.functions.Function1<? super java.lang.Long,? extends R> onFrame, kotlin.coroutines.Continuation<? super R>);
+ method public static suspend <R> Object? withInfiniteAnimationFrameNanos(kotlin.jvm.functions.Function1<? super java.lang.Long,? extends R> onFrame, kotlin.coroutines.Continuation<? super R>);
+ }
+
+ public final class InfiniteRepeatableSpec<T> implements androidx.compose.animation.core.AnimationSpec<T> {
+ ctor public InfiniteRepeatableSpec(androidx.compose.animation.core.DurationBasedAnimationSpec<T> animation, optional androidx.compose.animation.core.RepeatMode repeatMode, optional long initialStartOffset);
+ method @Deprecated public androidx.compose.animation.core.InfiniteRepeatableSpec<T>! InfiniteRepeatableSpec(androidx.compose.animation.core.DurationBasedAnimationSpec<T> animation, optional androidx.compose.animation.core.RepeatMode repeatMode);
+ method public androidx.compose.animation.core.DurationBasedAnimationSpec<T> getAnimation();
+ method public long getInitialStartOffset();
+ method public androidx.compose.animation.core.RepeatMode getRepeatMode();
+ method public <V extends androidx.compose.animation.core.AnimationVector> androidx.compose.animation.core.VectorizedAnimationSpec<V> vectorize(androidx.compose.animation.core.TwoWayConverter<T,V> converter);
+ property public final androidx.compose.animation.core.DurationBasedAnimationSpec<T> animation;
+ property public final long initialStartOffset;
+ property public final androidx.compose.animation.core.RepeatMode repeatMode;
+ }
+
+ public final class InfiniteTransition {
+ }
+
+ public final class InfiniteTransitionKt {
+ method @androidx.compose.runtime.Composable public static androidx.compose.runtime.State<java.lang.Float> animateFloat(androidx.compose.animation.core.InfiniteTransition, float initialValue, float targetValue, androidx.compose.animation.core.InfiniteRepeatableSpec<java.lang.Float> animationSpec);
+ method @androidx.compose.runtime.Composable public static <T, V extends androidx.compose.animation.core.AnimationVector> androidx.compose.runtime.State<T> animateValue(androidx.compose.animation.core.InfiniteTransition, T? initialValue, T? targetValue, androidx.compose.animation.core.TwoWayConverter<T,V> typeConverter, androidx.compose.animation.core.InfiniteRepeatableSpec<T> animationSpec);
+ method @androidx.compose.runtime.Composable public static androidx.compose.animation.core.InfiniteTransition rememberInfiniteTransition();
+ }
+
+ @androidx.compose.runtime.Immutable public final class KeyframesSpec<T> implements androidx.compose.animation.core.DurationBasedAnimationSpec<T> {
+ ctor public KeyframesSpec(androidx.compose.animation.core.KeyframesSpec.KeyframesSpecConfig<T> config);
+ method public androidx.compose.animation.core.KeyframesSpec.KeyframesSpecConfig<T> getConfig();
+ method public <V extends androidx.compose.animation.core.AnimationVector> androidx.compose.animation.core.VectorizedKeyframesSpec<V> vectorize(androidx.compose.animation.core.TwoWayConverter<T,V> converter);
+ property public final androidx.compose.animation.core.KeyframesSpec.KeyframesSpecConfig<T> config;
+ }
+
+ public static final class KeyframesSpec.KeyframeEntity<T> {
+ }
+
+ public static final class KeyframesSpec.KeyframesSpecConfig<T> {
+ ctor public KeyframesSpec.KeyframesSpecConfig();
+ method public infix androidx.compose.animation.core.KeyframesSpec.KeyframeEntity<T> at(T?, int timeStamp);
+ method public int getDelayMillis();
+ method public int getDurationMillis();
+ method public void setDelayMillis(int);
+ method public void setDurationMillis(int);
+ method public infix void with(androidx.compose.animation.core.KeyframesSpec.KeyframeEntity<T>, androidx.compose.animation.core.Easing easing);
+ property public final int delayMillis;
+ property public final int durationMillis;
+ }
+
+ public final class MutableTransitionState<S> {
+ ctor public MutableTransitionState(S? initialState);
+ method public S! getCurrentState();
+ method public S! getTargetState();
+ method public boolean isIdle();
+ method public void setTargetState(S!);
+ property public final S! currentState;
+ property public final boolean isIdle;
+ property public final S! targetState;
+ }
+
+ public enum RepeatMode {
+ enum_constant public static final androidx.compose.animation.core.RepeatMode Restart;
+ enum_constant public static final androidx.compose.animation.core.RepeatMode Reverse;
+ }
+
+ @androidx.compose.runtime.Immutable public final class RepeatableSpec<T> implements androidx.compose.animation.core.FiniteAnimationSpec<T> {
+ ctor public RepeatableSpec(int iterations, androidx.compose.animation.core.DurationBasedAnimationSpec<T> animation, optional androidx.compose.animation.core.RepeatMode repeatMode, optional long initialStartOffset);
+ method @Deprecated public androidx.compose.animation.core.RepeatableSpec<T>! RepeatableSpec(int iterations, androidx.compose.animation.core.DurationBasedAnimationSpec<T> animation, optional androidx.compose.animation.core.RepeatMode repeatMode);
+ method public androidx.compose.animation.core.DurationBasedAnimationSpec<T> getAnimation();
+ method public long getInitialStartOffset();
+ method public int getIterations();
+ method public androidx.compose.animation.core.RepeatMode getRepeatMode();
+ method public <V extends androidx.compose.animation.core.AnimationVector> androidx.compose.animation.core.VectorizedFiniteAnimationSpec<V> vectorize(androidx.compose.animation.core.TwoWayConverter<T,V> converter);
+ property public final androidx.compose.animation.core.DurationBasedAnimationSpec<T> animation;
+ property public final long initialStartOffset;
+ property public final int iterations;
+ property public final androidx.compose.animation.core.RepeatMode repeatMode;
+ }
+
+ @androidx.compose.runtime.Immutable public final class SnapSpec<T> implements androidx.compose.animation.core.DurationBasedAnimationSpec<T> {
+ ctor public SnapSpec(optional int delay);
+ method public int getDelay();
+ method public <V extends androidx.compose.animation.core.AnimationVector> androidx.compose.animation.core.VectorizedDurationBasedAnimationSpec<V> vectorize(androidx.compose.animation.core.TwoWayConverter<T,V> converter);
+ property public final int delay;
+ }
+
+ public final class Spring {
+ field public static final float DampingRatioHighBouncy = 0.2f;
+ field public static final float DampingRatioLowBouncy = 0.75f;
+ field public static final float DampingRatioMediumBouncy = 0.5f;
+ field public static final float DampingRatioNoBouncy = 1.0f;
+ field public static final float DefaultDisplacementThreshold = 0.01f;
+ field public static final androidx.compose.animation.core.Spring INSTANCE;
+ field public static final float StiffnessHigh = 10000.0f;
+ field public static final float StiffnessLow = 200.0f;
+ field public static final float StiffnessMedium = 1500.0f;
+ field public static final float StiffnessMediumLow = 400.0f;
+ field public static final float StiffnessVeryLow = 50.0f;
+ }
+
+ public final class SpringEstimationKt {
+ }
+
+ public final class SpringSimulationKt {
+ }
+
+ @androidx.compose.runtime.Immutable public final class SpringSpec<T> implements androidx.compose.animation.core.FiniteAnimationSpec<T> {
+ ctor public SpringSpec(optional float dampingRatio, optional float stiffness, optional T? visibilityThreshold);
+ method public float getDampingRatio();
+ method public float getStiffness();
+ method public T? getVisibilityThreshold();
+ method public <V extends androidx.compose.animation.core.AnimationVector> androidx.compose.animation.core.VectorizedSpringSpec<V> vectorize(androidx.compose.animation.core.TwoWayConverter<T,V> converter);
+ property public final float dampingRatio;
+ property public final float stiffness;
+ property public final T? visibilityThreshold;
+ }
+
+ @kotlin.jvm.JvmInline public final value class StartOffset {
+ ctor public StartOffset(int offsetMillis, optional int offsetType);
+ method public int getOffsetMillis();
+ method public int getOffsetType();
+ property public final int offsetMillis;
+ property public final int offsetType;
+ }
+
+ @kotlin.jvm.JvmInline public final value class StartOffsetType {
+ field public static final androidx.compose.animation.core.StartOffsetType.Companion Companion;
+ }
+
+ public static final class StartOffsetType.Companion {
+ method public int getDelay();
+ method public int getFastForward();
+ property public final int Delay;
+ property public final int FastForward;
+ }
+
+ public final class SuspendAnimationKt {
+ method public static suspend Object? animate(float initialValue, float targetValue, optional float initialVelocity, optional androidx.compose.animation.core.AnimationSpec<java.lang.Float> animationSpec, kotlin.jvm.functions.Function2<? super java.lang.Float,? super java.lang.Float,kotlin.Unit> block, kotlin.coroutines.Continuation<? super kotlin.Unit>);
+ method public static suspend <T, V extends androidx.compose.animation.core.AnimationVector> Object? animate(androidx.compose.animation.core.TwoWayConverter<T,V> typeConverter, T? initialValue, T? targetValue, optional T? initialVelocity, optional androidx.compose.animation.core.AnimationSpec<T> animationSpec, kotlin.jvm.functions.Function2<? super T,? super T,kotlin.Unit> block, kotlin.coroutines.Continuation<? super kotlin.Unit>);
+ method public static suspend Object? animateDecay(float initialValue, float initialVelocity, androidx.compose.animation.core.FloatDecayAnimationSpec animationSpec, kotlin.jvm.functions.Function2<? super java.lang.Float,? super java.lang.Float,kotlin.Unit> block, kotlin.coroutines.Continuation<? super kotlin.Unit>);
+ method public static suspend <T, V extends androidx.compose.animation.core.AnimationVector> Object? animateDecay(androidx.compose.animation.core.AnimationState<T,V>, androidx.compose.animation.core.DecayAnimationSpec<T> animationSpec, optional boolean sequentialAnimation, optional kotlin.jvm.functions.Function1<? super androidx.compose.animation.core.AnimationScope<T,V>,kotlin.Unit> block, optional kotlin.coroutines.Continuation<? super kotlin.Unit>);
+ method public static suspend <T, V extends androidx.compose.animation.core.AnimationVector> Object? animateTo(androidx.compose.animation.core.AnimationState<T,V>, T? targetValue, optional androidx.compose.animation.core.AnimationSpec<T> animationSpec, optional boolean sequentialAnimation, optional kotlin.jvm.functions.Function1<? super androidx.compose.animation.core.AnimationScope<T,V>,kotlin.Unit> block, optional kotlin.coroutines.Continuation<? super kotlin.Unit>);
+ }
+
+ public final class TargetBasedAnimation<T, V extends androidx.compose.animation.core.AnimationVector> implements androidx.compose.animation.core.Animation<T,V> {
+ ctor public TargetBasedAnimation(androidx.compose.animation.core.AnimationSpec<T> animationSpec, androidx.compose.animation.core.TwoWayConverter<T,V> typeConverter, T? initialValue, T? targetValue, optional V? initialVelocityVector);
+ method public long getDurationNanos();
+ method public T! getInitialValue();
+ method public T! getTargetValue();
+ method public androidx.compose.animation.core.TwoWayConverter<T,V> getTypeConverter();
+ method public T! getValueFromNanos(long playTimeNanos);
+ method public V getVelocityVectorFromNanos(long playTimeNanos);
+ method public boolean isInfinite();
+ property public long durationNanos;
+ property public final T! initialValue;
+ property public boolean isInfinite;
+ property public T! targetValue;
+ property public androidx.compose.animation.core.TwoWayConverter<T,V> typeConverter;
+ }
+
+ @androidx.compose.runtime.Stable public final class Transition<S> {
+ ctor @kotlin.PublishedApi internal Transition(androidx.compose.animation.core.MutableTransitionState<S> transitionState, optional String? label);
+ method public java.util.List<androidx.compose.animation.core.Transition<S>.TransitionAnimationState<?,?>> getAnimations();
+ method public S! getCurrentState();
+ method public String? getLabel();
+ method public androidx.compose.animation.core.Transition.Segment<S> getSegment();
+ method public S! getTargetState();
+ method public long getTotalDurationNanos();
+ method public java.util.List<androidx.compose.animation.core.Transition<?>> getTransitions();
+ method public boolean isRunning();
+ property public final java.util.List<androidx.compose.animation.core.Transition<S>.TransitionAnimationState<?,?>> animations;
+ property public final S! currentState;
+ property public final boolean isRunning;
+ property public final String? label;
+ property public final androidx.compose.animation.core.Transition.Segment<S> segment;
+ property public final S! targetState;
+ property public final long totalDurationNanos;
+ property public final java.util.List<androidx.compose.animation.core.Transition<?>> transitions;
+ }
+
+ public static interface Transition.Segment<S> {
+ method public S! getInitialState();
+ method public S! getTargetState();
+ method public default infix boolean isTransitioningTo(S?, S? targetState);
+ property public abstract S! initialState;
+ property public abstract S! targetState;
+ }
+
+ @androidx.compose.runtime.Stable public final class Transition.TransitionAnimationState<T, V extends androidx.compose.animation.core.AnimationVector> implements androidx.compose.runtime.State<T> {
+ method public androidx.compose.animation.core.TargetBasedAnimation<T,V> getAnimation();
+ method public androidx.compose.animation.core.FiniteAnimationSpec<T> getAnimationSpec();
+ method public String getLabel();
+ method public androidx.compose.animation.core.TwoWayConverter<T,V> getTypeConverter();
+ method public T! getValue();
+ property public final androidx.compose.animation.core.TargetBasedAnimation<T,V> animation;
+ property public final androidx.compose.animation.core.FiniteAnimationSpec<T> animationSpec;
+ property public final String label;
+ property public final androidx.compose.animation.core.TwoWayConverter<T,V> typeConverter;
+ property public T! value;
+ }
+
+ public final class TransitionKt {
+ method @androidx.compose.runtime.Composable public static inline <S> androidx.compose.runtime.State<androidx.compose.ui.unit.Dp> animateDp(androidx.compose.animation.core.Transition<S>, optional kotlin.jvm.functions.Function1<? super androidx.compose.animation.core.Transition.Segment<S>,? extends androidx.compose.animation.core.FiniteAnimationSpec<androidx.compose.ui.unit.Dp>> transitionSpec, optional String label, kotlin.jvm.functions.Function1<? super S,androidx.compose.ui.unit.Dp> targetValueByState);
+ method @androidx.compose.runtime.Composable public static inline <S> androidx.compose.runtime.State<java.lang.Float> animateFloat(androidx.compose.animation.core.Transition<S>, optional kotlin.jvm.functions.Function1<? super androidx.compose.animation.core.Transition.Segment<S>,? extends androidx.compose.animation.core.FiniteAnimationSpec<java.lang.Float>> transitionSpec, optional String label, kotlin.jvm.functions.Function1<? super S,java.lang.Float> targetValueByState);
+ method @androidx.compose.runtime.Composable public static inline <S> androidx.compose.runtime.State<java.lang.Integer> animateInt(androidx.compose.animation.core.Transition<S>, optional kotlin.jvm.functions.Function1<? super androidx.compose.animation.core.Transition.Segment<S>,? extends androidx.compose.animation.core.FiniteAnimationSpec<java.lang.Integer>> transitionSpec, optional String label, kotlin.jvm.functions.Function1<? super S,java.lang.Integer> targetValueByState);
+ method @androidx.compose.runtime.Composable public static inline <S> androidx.compose.runtime.State<androidx.compose.ui.unit.IntOffset> animateIntOffset(androidx.compose.animation.core.Transition<S>, optional kotlin.jvm.functions.Function1<? super androidx.compose.animation.core.Transition.Segment<S>,? extends androidx.compose.animation.core.FiniteAnimationSpec<androidx.compose.ui.unit.IntOffset>> transitionSpec, optional String label, kotlin.jvm.functions.Function1<? super S,androidx.compose.ui.unit.IntOffset> targetValueByState);
+ method @androidx.compose.runtime.Composable public static inline <S> androidx.compose.runtime.State<androidx.compose.ui.unit.IntSize> animateIntSize(androidx.compose.animation.core.Transition<S>, optional kotlin.jvm.functions.Function1<? super androidx.compose.animation.core.Transition.Segment<S>,? extends androidx.compose.animation.core.FiniteAnimationSpec<androidx.compose.ui.unit.IntSize>> transitionSpec, optional String label, kotlin.jvm.functions.Function1<? super S,androidx.compose.ui.unit.IntSize> targetValueByState);
+ method @androidx.compose.runtime.Composable public static inline <S> androidx.compose.runtime.State<androidx.compose.ui.geometry.Offset> animateOffset(androidx.compose.animation.core.Transition<S>, optional kotlin.jvm.functions.Function1<? super androidx.compose.animation.core.Transition.Segment<S>,? extends androidx.compose.animation.core.FiniteAnimationSpec<androidx.compose.ui.geometry.Offset>> transitionSpec, optional String label, kotlin.jvm.functions.Function1<? super S,androidx.compose.ui.geometry.Offset> targetValueByState);
+ method @androidx.compose.runtime.Composable public static inline <S> androidx.compose.runtime.State<androidx.compose.ui.geometry.Rect> animateRect(androidx.compose.animation.core.Transition<S>, optional kotlin.jvm.functions.Function1<? super androidx.compose.animation.core.Transition.Segment<S>,? extends androidx.compose.animation.core.FiniteAnimationSpec<androidx.compose.ui.geometry.Rect>> transitionSpec, optional String label, kotlin.jvm.functions.Function1<? super S,androidx.compose.ui.geometry.Rect> targetValueByState);
+ method @androidx.compose.runtime.Composable public static inline <S> androidx.compose.runtime.State<androidx.compose.ui.geometry.Size> animateSize(androidx.compose.animation.core.Transition<S>, optional kotlin.jvm.functions.Function1<? super androidx.compose.animation.core.Transition.Segment<S>,? extends androidx.compose.animation.core.FiniteAnimationSpec<androidx.compose.ui.geometry.Size>> transitionSpec, optional String label, kotlin.jvm.functions.Function1<? super S,androidx.compose.ui.geometry.Size> targetValueByState);
+ method @androidx.compose.runtime.Composable public static inline <S, T, V extends androidx.compose.animation.core.AnimationVector> androidx.compose.runtime.State<T> animateValue(androidx.compose.animation.core.Transition<S>, androidx.compose.animation.core.TwoWayConverter<T,V> typeConverter, optional kotlin.jvm.functions.Function1<? super androidx.compose.animation.core.Transition.Segment<S>,? extends androidx.compose.animation.core.FiniteAnimationSpec<T>> transitionSpec, optional String label, kotlin.jvm.functions.Function1<? super S,? extends T> targetValueByState);
+ method @androidx.compose.runtime.Composable @kotlin.PublishedApi internal static <S, T> androidx.compose.animation.core.Transition<T> createChildTransitionInternal(androidx.compose.animation.core.Transition<S>, T? initialState, T? targetState, String childLabel);
+ method @androidx.compose.runtime.Composable @kotlin.PublishedApi internal static <S, T, V extends androidx.compose.animation.core.AnimationVector> androidx.compose.runtime.State<T> createTransitionAnimation(androidx.compose.animation.core.Transition<S>, T? initialValue, T? targetValue, androidx.compose.animation.core.FiniteAnimationSpec<T> animationSpec, androidx.compose.animation.core.TwoWayConverter<T,V> typeConverter, String label);
+ method @androidx.compose.runtime.Composable public static <T> androidx.compose.animation.core.Transition<T> updateTransition(T? targetState, optional String? label);
+ method @androidx.compose.runtime.Composable public static <T> androidx.compose.animation.core.Transition<T> updateTransition(androidx.compose.animation.core.MutableTransitionState<T> transitionState, optional String? label);
+ }
+
+ @androidx.compose.runtime.Immutable public final class TweenSpec<T> implements androidx.compose.animation.core.DurationBasedAnimationSpec<T> {
+ ctor public TweenSpec(optional int durationMillis, optional int delay, optional androidx.compose.animation.core.Easing easing);
+ method public int getDelay();
+ method public int getDurationMillis();
+ method public androidx.compose.animation.core.Easing getEasing();
+ method public <V extends androidx.compose.animation.core.AnimationVector> androidx.compose.animation.core.VectorizedTweenSpec<V> vectorize(androidx.compose.animation.core.TwoWayConverter<T,V> converter);
+ property public final int delay;
+ property public final int durationMillis;
+ property public final androidx.compose.animation.core.Easing easing;
+ }
+
+ public interface TwoWayConverter<T, V extends androidx.compose.animation.core.AnimationVector> {
+ method public kotlin.jvm.functions.Function1<V,T> getConvertFromVector();
+ method public kotlin.jvm.functions.Function1<T,V> getConvertToVector();
+ property public abstract kotlin.jvm.functions.Function1<V,T> convertFromVector;
+ property public abstract kotlin.jvm.functions.Function1<T,V> convertToVector;
+ }
+
+ public final class VectorConvertersKt {
+ method public static <T, V extends androidx.compose.animation.core.AnimationVector> androidx.compose.animation.core.TwoWayConverter<T,V> TwoWayConverter(kotlin.jvm.functions.Function1<? super T,? extends V> convertToVector, kotlin.jvm.functions.Function1<? super V,? extends T> convertFromVector);
+ method public static androidx.compose.animation.core.TwoWayConverter<java.lang.Float,androidx.compose.animation.core.AnimationVector1D> getVectorConverter(kotlin.jvm.internal.FloatCompanionObject);
+ method public static androidx.compose.animation.core.TwoWayConverter<java.lang.Integer,androidx.compose.animation.core.AnimationVector1D> getVectorConverter(kotlin.jvm.internal.IntCompanionObject);
+ method public static androidx.compose.animation.core.TwoWayConverter<androidx.compose.ui.geometry.Rect,androidx.compose.animation.core.AnimationVector4D> getVectorConverter(androidx.compose.ui.geometry.Rect.Companion);
+ method public static androidx.compose.animation.core.TwoWayConverter<androidx.compose.ui.unit.Dp,androidx.compose.animation.core.AnimationVector1D> getVectorConverter(androidx.compose.ui.unit.Dp.Companion);
+ method public static androidx.compose.animation.core.TwoWayConverter<androidx.compose.ui.unit.DpOffset,androidx.compose.animation.core.AnimationVector2D> getVectorConverter(androidx.compose.ui.unit.DpOffset.Companion);
+ method public static androidx.compose.animation.core.TwoWayConverter<androidx.compose.ui.geometry.Size,androidx.compose.animation.core.AnimationVector2D> getVectorConverter(androidx.compose.ui.geometry.Size.Companion);
+ method public static androidx.compose.animation.core.TwoWayConverter<androidx.compose.ui.geometry.Offset,androidx.compose.animation.core.AnimationVector2D> getVectorConverter(androidx.compose.ui.geometry.Offset.Companion);
+ method public static androidx.compose.animation.core.TwoWayConverter<androidx.compose.ui.unit.IntOffset,androidx.compose.animation.core.AnimationVector2D> getVectorConverter(androidx.compose.ui.unit.IntOffset.Companion);
+ method public static androidx.compose.animation.core.TwoWayConverter<androidx.compose.ui.unit.IntSize,androidx.compose.animation.core.AnimationVector2D> getVectorConverter(androidx.compose.ui.unit.IntSize.Companion);
+ }
+
+ public interface VectorizedAnimationSpec<V extends androidx.compose.animation.core.AnimationVector> {
+ method public long getDurationNanos(V initialValue, V targetValue, V initialVelocity);
+ method public default V getEndVelocity(V initialValue, V targetValue, V initialVelocity);
+ method public V getValueFromNanos(long playTimeNanos, V initialValue, V targetValue, V initialVelocity);
+ method public V getVelocityFromNanos(long playTimeNanos, V initialValue, V targetValue, V initialVelocity);
+ method public boolean isInfinite();
+ property public abstract boolean isInfinite;
+ }
+
+ public final class VectorizedAnimationSpecKt {
+ }
+
+ public interface VectorizedDecayAnimationSpec<V extends androidx.compose.animation.core.AnimationVector> {
+ method public float getAbsVelocityThreshold();
+ method public long getDurationNanos(V initialValue, V initialVelocity);
+ method public V getTargetValue(V initialValue, V initialVelocity);
+ method public V getValueFromNanos(long playTimeNanos, V initialValue, V initialVelocity);
+ method public V getVelocityFromNanos(long playTimeNanos, V initialValue, V initialVelocity);
+ property public abstract float absVelocityThreshold;
+ }
+
+ public interface VectorizedDurationBasedAnimationSpec<V extends androidx.compose.animation.core.AnimationVector> extends androidx.compose.animation.core.VectorizedFiniteAnimationSpec<V> {
+ method public int getDelayMillis();
+ method public int getDurationMillis();
+ method public default long getDurationNanos(V initialValue, V targetValue, V initialVelocity);
+ property public abstract int delayMillis;
+ property public abstract int durationMillis;
+ }
+
+ public interface VectorizedFiniteAnimationSpec<V extends androidx.compose.animation.core.AnimationVector> extends androidx.compose.animation.core.VectorizedAnimationSpec<V> {
+ method public default boolean isInfinite();
+ property public default boolean isInfinite;
+ }
+
+ public final class VectorizedFloatAnimationSpec<V extends androidx.compose.animation.core.AnimationVector> implements androidx.compose.animation.core.VectorizedFiniteAnimationSpec<V> {
+ ctor public VectorizedFloatAnimationSpec(androidx.compose.animation.core.FloatAnimationSpec anim);
+ method public long getDurationNanos(V initialValue, V targetValue, V initialVelocity);
+ method public V getValueFromNanos(long playTimeNanos, V initialValue, V targetValue, V initialVelocity);
+ method public V getVelocityFromNanos(long playTimeNanos, V initialValue, V targetValue, V initialVelocity);
+ }
+
+ public final class VectorizedInfiniteRepeatableSpec<V extends androidx.compose.animation.core.AnimationVector> implements androidx.compose.animation.core.VectorizedAnimationSpec<V> {
+ ctor public VectorizedInfiniteRepeatableSpec(androidx.compose.animation.core.VectorizedDurationBasedAnimationSpec<V> animation, optional androidx.compose.animation.core.RepeatMode repeatMode, optional long initialStartOffset);
+ method @Deprecated public androidx.compose.animation.core.VectorizedInfiniteRepeatableSpec<V>! VectorizedInfiniteRepeatableSpec(androidx.compose.animation.core.VectorizedDurationBasedAnimationSpec<V> animation, optional androidx.compose.animation.core.RepeatMode repeatMode);
+ method public long getDurationNanos(V initialValue, V targetValue, V initialVelocity);
+ method public V getValueFromNanos(long playTimeNanos, V initialValue, V targetValue, V initialVelocity);
+ method public V getVelocityFromNanos(long playTimeNanos, V initialValue, V targetValue, V initialVelocity);
+ method public boolean isInfinite();
+ property public boolean isInfinite;
+ }
+
+ public final class VectorizedKeyframesSpec<V extends androidx.compose.animation.core.AnimationVector> implements androidx.compose.animation.core.VectorizedDurationBasedAnimationSpec<V> {
+ ctor public VectorizedKeyframesSpec(java.util.Map<java.lang.Integer,? extends kotlin.Pair<? extends V,? extends androidx.compose.animation.core.Easing>> keyframes, int durationMillis, optional int delayMillis);
+ method public int getDelayMillis();
+ method public int getDurationMillis();
+ method public V getValueFromNanos(long playTimeNanos, V initialValue, V targetValue, V initialVelocity);
+ method public V getVelocityFromNanos(long playTimeNanos, V initialValue, V targetValue, V initialVelocity);
+ property public int delayMillis;
+ property public int durationMillis;
+ }
+
+ public final class VectorizedRepeatableSpec<V extends androidx.compose.animation.core.AnimationVector> implements androidx.compose.animation.core.VectorizedFiniteAnimationSpec<V> {
+ ctor public VectorizedRepeatableSpec(int iterations, androidx.compose.animation.core.VectorizedDurationBasedAnimationSpec<V> animation, optional androidx.compose.animation.core.RepeatMode repeatMode, optional long initialStartOffset);
+ method @Deprecated public androidx.compose.animation.core.VectorizedRepeatableSpec<V>! VectorizedRepeatableSpec(int iterations, androidx.compose.animation.core.VectorizedDurationBasedAnimationSpec<V> animation, optional androidx.compose.animation.core.RepeatMode repeatMode);
+ method public long getDurationNanos(V initialValue, V targetValue, V initialVelocity);
+ method public V getValueFromNanos(long playTimeNanos, V initialValue, V targetValue, V initialVelocity);
+ method public V getVelocityFromNanos(long playTimeNanos, V initialValue, V targetValue, V initialVelocity);
+ }
+
+ public final class VectorizedSnapSpec<V extends androidx.compose.animation.core.AnimationVector> implements androidx.compose.animation.core.VectorizedDurationBasedAnimationSpec<V> {
+ ctor public VectorizedSnapSpec(optional int delayMillis);
+ method public int getDelayMillis();
+ method public int getDurationMillis();
+ method public V getValueFromNanos(long playTimeNanos, V initialValue, V targetValue, V initialVelocity);
+ method public V getVelocityFromNanos(long playTimeNanos, V initialValue, V targetValue, V initialVelocity);
+ property public int delayMillis;
+ property public int durationMillis;
+ }
+
+ public final class VectorizedSpringSpec<V extends androidx.compose.animation.core.AnimationVector> implements androidx.compose.animation.core.VectorizedFiniteAnimationSpec<V> {
+ ctor public VectorizedSpringSpec(optional float dampingRatio, optional float stiffness, optional V? visibilityThreshold);
+ method public float getDampingRatio();
+ method public float getStiffness();
+ property public final float dampingRatio;
+ property public final float stiffness;
+ }
+
+ public final class VectorizedTweenSpec<V extends androidx.compose.animation.core.AnimationVector> implements androidx.compose.animation.core.VectorizedDurationBasedAnimationSpec<V> {
+ ctor public VectorizedTweenSpec(optional int durationMillis, optional int delayMillis, optional androidx.compose.animation.core.Easing easing);
+ method public int getDelayMillis();
+ method public int getDurationMillis();
+ method public androidx.compose.animation.core.Easing getEasing();
+ method public V getValueFromNanos(long playTimeNanos, V initialValue, V targetValue, V initialVelocity);
+ method public V getVelocityFromNanos(long playTimeNanos, V initialValue, V targetValue, V initialVelocity);
+ property public int delayMillis;
+ property public int durationMillis;
+ property public final androidx.compose.animation.core.Easing easing;
+ }
+
+ public final class VisibilityThresholdsKt {
+ method public static long getVisibilityThreshold(androidx.compose.ui.unit.IntOffset.Companion);
+ method public static long getVisibilityThreshold(androidx.compose.ui.geometry.Offset.Companion);
+ method public static int getVisibilityThreshold(kotlin.jvm.internal.IntCompanionObject);
+ method public static float getVisibilityThreshold(androidx.compose.ui.unit.Dp.Companion);
+ method public static long getVisibilityThreshold(androidx.compose.ui.unit.DpOffset.Companion);
+ method public static long getVisibilityThreshold(androidx.compose.ui.geometry.Size.Companion);
+ method public static long getVisibilityThreshold(androidx.compose.ui.unit.IntSize.Companion);
+ method public static androidx.compose.ui.geometry.Rect getVisibilityThreshold(androidx.compose.ui.geometry.Rect.Companion);
+ }
+
+}
+
diff --git a/compose/animation/animation-graphics/api/1.2.0-beta02.txt b/compose/animation/animation-graphics/api/1.2.0-beta02.txt
new file mode 100644
index 0000000..9c4ad0e
--- /dev/null
+++ b/compose/animation/animation-graphics/api/1.2.0-beta02.txt
@@ -0,0 +1,37 @@
+// Signature format: 4.0
+package androidx.compose.animation.graphics.res {
+
+ public final class AnimatedVectorPainterResources_androidKt {
+ }
+
+ public final class AnimatedVectorResources_androidKt {
+ }
+
+ public final class AnimatorResources_androidKt {
+ }
+
+}
+
+package androidx.compose.animation.graphics.vector {
+
+ public final class AnimatorAnimationSpecsKt {
+ }
+
+ public final class AnimatorKt {
+ }
+
+}
+
+package androidx.compose.animation.graphics.vector.compat {
+
+ public final class XmlAnimatedVectorParser_androidKt {
+ }
+
+ public final class XmlAnimatorParser_androidKt {
+ }
+
+ public final class XmlPullParserUtils_androidKt {
+ }
+
+}
+
diff --git a/compose/animation/animation-graphics/api/public_plus_experimental_1.2.0-beta02.txt b/compose/animation/animation-graphics/api/public_plus_experimental_1.2.0-beta02.txt
new file mode 100644
index 0000000..f650e30
--- /dev/null
+++ b/compose/animation/animation-graphics/api/public_plus_experimental_1.2.0-beta02.txt
@@ -0,0 +1,57 @@
+// Signature format: 4.0
+package androidx.compose.animation.graphics {
+
+ @kotlin.RequiresOptIn(message="This is an experimental animation graphics API.") @kotlin.annotation.Target(allowedTargets={kotlin.annotation.AnnotationTarget.CLASS, kotlin.annotation.AnnotationTarget.FUNCTION, kotlin.annotation.AnnotationTarget.PROPERTY}) public @interface ExperimentalAnimationGraphicsApi {
+ }
+
+}
+
+package androidx.compose.animation.graphics.res {
+
+ public final class AnimatedVectorPainterResources_androidKt {
+ method @androidx.compose.animation.graphics.ExperimentalAnimationGraphicsApi @androidx.compose.runtime.Composable public static androidx.compose.ui.graphics.painter.Painter rememberAnimatedVectorPainter(androidx.compose.animation.graphics.vector.AnimatedImageVector animatedImageVector, boolean atEnd);
+ }
+
+ public final class AnimatedVectorResources_androidKt {
+ method @androidx.compose.animation.graphics.ExperimentalAnimationGraphicsApi @androidx.compose.runtime.Composable public static androidx.compose.animation.graphics.vector.AnimatedImageVector animatedVectorResource(androidx.compose.animation.graphics.vector.AnimatedImageVector.Companion, @DrawableRes int id);
+ }
+
+ public final class AnimatorResources_androidKt {
+ }
+
+}
+
+package androidx.compose.animation.graphics.vector {
+
+ @androidx.compose.animation.graphics.ExperimentalAnimationGraphicsApi @androidx.compose.runtime.Immutable public final class AnimatedImageVector {
+ method public androidx.compose.ui.graphics.vector.ImageVector getImageVector();
+ method public int getTotalDuration();
+ property public final androidx.compose.ui.graphics.vector.ImageVector imageVector;
+ property public final int totalDuration;
+ field public static final androidx.compose.animation.graphics.vector.AnimatedImageVector.Companion Companion;
+ }
+
+ public static final class AnimatedImageVector.Companion {
+ }
+
+ public final class AnimatorAnimationSpecsKt {
+ }
+
+ public final class AnimatorKt {
+ }
+
+}
+
+package androidx.compose.animation.graphics.vector.compat {
+
+ public final class XmlAnimatedVectorParser_androidKt {
+ }
+
+ public final class XmlAnimatorParser_androidKt {
+ }
+
+ public final class XmlPullParserUtils_androidKt {
+ }
+
+}
+
diff --git a/compose/animation/animation-graphics/api/res-1.2.0-beta02.txt b/compose/animation/animation-graphics/api/res-1.2.0-beta02.txt
new file mode 100644
index 0000000..e69de29
--- /dev/null
+++ b/compose/animation/animation-graphics/api/res-1.2.0-beta02.txt
diff --git a/compose/animation/animation-graphics/api/restricted_1.2.0-beta02.txt b/compose/animation/animation-graphics/api/restricted_1.2.0-beta02.txt
new file mode 100644
index 0000000..9c4ad0e
--- /dev/null
+++ b/compose/animation/animation-graphics/api/restricted_1.2.0-beta02.txt
@@ -0,0 +1,37 @@
+// Signature format: 4.0
+package androidx.compose.animation.graphics.res {
+
+ public final class AnimatedVectorPainterResources_androidKt {
+ }
+
+ public final class AnimatedVectorResources_androidKt {
+ }
+
+ public final class AnimatorResources_androidKt {
+ }
+
+}
+
+package androidx.compose.animation.graphics.vector {
+
+ public final class AnimatorAnimationSpecsKt {
+ }
+
+ public final class AnimatorKt {
+ }
+
+}
+
+package androidx.compose.animation.graphics.vector.compat {
+
+ public final class XmlAnimatedVectorParser_androidKt {
+ }
+
+ public final class XmlAnimatorParser_androidKt {
+ }
+
+ public final class XmlPullParserUtils_androidKt {
+ }
+
+}
+
diff --git a/compose/animation/animation-graphics/src/androidAndroidTest/kotlin/androidx/compose/animation/graphics/vector/AnimatorTest.kt b/compose/animation/animation-graphics/src/androidAndroidTest/kotlin/androidx/compose/animation/graphics/vector/AnimatorTest.kt
index 2cde3c0..d22597f 100644
--- a/compose/animation/animation-graphics/src/androidAndroidTest/kotlin/androidx/compose/animation/graphics/vector/AnimatorTest.kt
+++ b/compose/animation/animation-graphics/src/androidAndroidTest/kotlin/androidx/compose/animation/graphics/vector/AnimatorTest.kt
@@ -19,6 +19,8 @@
import androidx.compose.animation.core.InternalAnimationApi
import androidx.compose.animation.core.LinearEasing
import androidx.compose.animation.core.RepeatMode
+import androidx.compose.animation.core.animateFloat
+import androidx.compose.animation.core.tween
import androidx.compose.animation.core.updateTransition
import androidx.compose.runtime.mutableStateOf
import androidx.compose.ui.graphics.vector.PathNode
@@ -310,4 +312,44 @@
assertThat(config.getOrDefault(VectorProperty.PathData, emptyList()))
.isEqualTo(addPathNodes("M 0 0 L 1000 0 L 1000 1000 L 0 1000 Z"))
}
+
+ @Test
+ fun startDelay() {
+ val a = objectAnimator(
+ propertyName = "trimPathEnd",
+ duration = 400,
+ keyframes = listOf(
+ Keyframe(fraction = 0f, value = 0f, interpolator = LinearEasing),
+ Keyframe(fraction = 1f, value = 1f, interpolator = LinearEasing),
+ ),
+ startDelay = 100
+ )
+ val isAtEnd = mutableStateOf(false)
+ val config = StateVectorConfig()
+ rule.setContent {
+ val transition = updateTransition(isAtEnd.value, label = "startDelay")
+ val control = transition.animateFloat(
+ label = "control",
+ transitionSpec = {
+ if (targetState) {
+ tween(durationMillis = 400, delayMillis = 100, easing = LinearEasing)
+ } else {
+ tween(durationMillis = 400, easing = LinearEasing)
+ }
+ }
+ ) { if (it) 1f else 0f }
+ a.Configure(transition, config, 500)
+ if (transition.isRunning) {
+ val trimPathEnd = config.getOrDefault(VectorProperty.TrimPathEnd, -1f)
+ assertThat(trimPathEnd).isWithin(tolerance).of(control.value)
+ }
+ }
+ assertThat(config.getOrDefault(VectorProperty.TrimPathEnd, -1f)).isEqualTo(0f)
+ rule.runOnIdle { isAtEnd.value = true }
+ rule.waitForIdle()
+ assertThat(config.getOrDefault(VectorProperty.TrimPathEnd, -1f)).isEqualTo(1f)
+ rule.runOnIdle { isAtEnd.value = false }
+ rule.waitForIdle()
+ assertThat(config.getOrDefault(VectorProperty.TrimPathEnd, -1f)).isEqualTo(0f)
+ }
}
diff --git a/compose/animation/animation-graphics/src/commonMain/kotlin/androidx/compose/animation/graphics/vector/AnimatorAnimationSpecs.kt b/compose/animation/animation-graphics/src/commonMain/kotlin/androidx/compose/animation/graphics/vector/AnimatorAnimationSpecs.kt
index 5edea6e..3709bbc 100644
--- a/compose/animation/animation-graphics/src/commonMain/kotlin/androidx/compose/animation/graphics/vector/AnimatorAnimationSpecs.kt
+++ b/compose/animation/animation-graphics/src/commonMain/kotlin/androidx/compose/animation/graphics/vector/AnimatorAnimationSpecs.kt
@@ -113,9 +113,9 @@
) : VectorizedFiniteAnimationSpec<V> {
private fun chooseAnimation(playTimeNanos: Long): Pair<Long, VectorizedFiniteAnimationSpec<V>> {
- return animations.last { (timeNanos, _) ->
+ return animations.lastOrNull { (timeNanos, _) ->
timeNanos <= playTimeNanos
- }
+ } ?: animations.first()
}
override fun getValueFromNanos(
diff --git a/compose/animation/animation-tooling-internal/api/1.2.0-beta02.txt b/compose/animation/animation-tooling-internal/api/1.2.0-beta02.txt
new file mode 100644
index 0000000..bf1f86e
--- /dev/null
+++ b/compose/animation/animation-tooling-internal/api/1.2.0-beta02.txt
@@ -0,0 +1,47 @@
+// Signature format: 4.0
+package androidx.compose.animation.tooling {
+
+ public final class ComposeAnimatedProperty {
+ ctor public ComposeAnimatedProperty(String label, Object value);
+ method public String component1();
+ method public Object component2();
+ method public androidx.compose.animation.tooling.ComposeAnimatedProperty copy(String label, Object value);
+ method public String getLabel();
+ method public Object getValue();
+ property public final String label;
+ property public final Object value;
+ }
+
+ public interface ComposeAnimation {
+ method public Object getAnimationObject();
+ method public default String? getLabel();
+ method public default java.util.Set<java.lang.Object> getStates();
+ method public androidx.compose.animation.tooling.ComposeAnimationType getType();
+ property public abstract Object animationObject;
+ property public default String? label;
+ property public default java.util.Set<java.lang.Object> states;
+ property public abstract androidx.compose.animation.tooling.ComposeAnimationType type;
+ }
+
+ public enum ComposeAnimationType {
+ enum_constant public static final androidx.compose.animation.tooling.ComposeAnimationType ANIMATED_VALUE;
+ enum_constant public static final androidx.compose.animation.tooling.ComposeAnimationType ANIMATED_VISIBILITY;
+ enum_constant public static final androidx.compose.animation.tooling.ComposeAnimationType TRANSITION_ANIMATION;
+ }
+
+ public final class TransitionInfo {
+ ctor public TransitionInfo(String label, String specType, long startTimeMillis, long endTimeMillis, java.util.Map<java.lang.Long,?> values);
+ method public long getEndTimeMillis();
+ method public String getLabel();
+ method public String getSpecType();
+ method public long getStartTimeMillis();
+ method public java.util.Map<java.lang.Long,java.lang.Object> getValues();
+ property public final long endTimeMillis;
+ property public final String label;
+ property public final String specType;
+ property public final long startTimeMillis;
+ property public final java.util.Map<java.lang.Long,java.lang.Object> values;
+ }
+
+}
+
diff --git a/compose/animation/animation-tooling-internal/api/public_plus_experimental_1.2.0-beta02.txt b/compose/animation/animation-tooling-internal/api/public_plus_experimental_1.2.0-beta02.txt
new file mode 100644
index 0000000..bf1f86e
--- /dev/null
+++ b/compose/animation/animation-tooling-internal/api/public_plus_experimental_1.2.0-beta02.txt
@@ -0,0 +1,47 @@
+// Signature format: 4.0
+package androidx.compose.animation.tooling {
+
+ public final class ComposeAnimatedProperty {
+ ctor public ComposeAnimatedProperty(String label, Object value);
+ method public String component1();
+ method public Object component2();
+ method public androidx.compose.animation.tooling.ComposeAnimatedProperty copy(String label, Object value);
+ method public String getLabel();
+ method public Object getValue();
+ property public final String label;
+ property public final Object value;
+ }
+
+ public interface ComposeAnimation {
+ method public Object getAnimationObject();
+ method public default String? getLabel();
+ method public default java.util.Set<java.lang.Object> getStates();
+ method public androidx.compose.animation.tooling.ComposeAnimationType getType();
+ property public abstract Object animationObject;
+ property public default String? label;
+ property public default java.util.Set<java.lang.Object> states;
+ property public abstract androidx.compose.animation.tooling.ComposeAnimationType type;
+ }
+
+ public enum ComposeAnimationType {
+ enum_constant public static final androidx.compose.animation.tooling.ComposeAnimationType ANIMATED_VALUE;
+ enum_constant public static final androidx.compose.animation.tooling.ComposeAnimationType ANIMATED_VISIBILITY;
+ enum_constant public static final androidx.compose.animation.tooling.ComposeAnimationType TRANSITION_ANIMATION;
+ }
+
+ public final class TransitionInfo {
+ ctor public TransitionInfo(String label, String specType, long startTimeMillis, long endTimeMillis, java.util.Map<java.lang.Long,?> values);
+ method public long getEndTimeMillis();
+ method public String getLabel();
+ method public String getSpecType();
+ method public long getStartTimeMillis();
+ method public java.util.Map<java.lang.Long,java.lang.Object> getValues();
+ property public final long endTimeMillis;
+ property public final String label;
+ property public final String specType;
+ property public final long startTimeMillis;
+ property public final java.util.Map<java.lang.Long,java.lang.Object> values;
+ }
+
+}
+
diff --git a/compose/animation/animation-tooling-internal/api/restricted_1.2.0-beta02.txt b/compose/animation/animation-tooling-internal/api/restricted_1.2.0-beta02.txt
new file mode 100644
index 0000000..bf1f86e
--- /dev/null
+++ b/compose/animation/animation-tooling-internal/api/restricted_1.2.0-beta02.txt
@@ -0,0 +1,47 @@
+// Signature format: 4.0
+package androidx.compose.animation.tooling {
+
+ public final class ComposeAnimatedProperty {
+ ctor public ComposeAnimatedProperty(String label, Object value);
+ method public String component1();
+ method public Object component2();
+ method public androidx.compose.animation.tooling.ComposeAnimatedProperty copy(String label, Object value);
+ method public String getLabel();
+ method public Object getValue();
+ property public final String label;
+ property public final Object value;
+ }
+
+ public interface ComposeAnimation {
+ method public Object getAnimationObject();
+ method public default String? getLabel();
+ method public default java.util.Set<java.lang.Object> getStates();
+ method public androidx.compose.animation.tooling.ComposeAnimationType getType();
+ property public abstract Object animationObject;
+ property public default String? label;
+ property public default java.util.Set<java.lang.Object> states;
+ property public abstract androidx.compose.animation.tooling.ComposeAnimationType type;
+ }
+
+ public enum ComposeAnimationType {
+ enum_constant public static final androidx.compose.animation.tooling.ComposeAnimationType ANIMATED_VALUE;
+ enum_constant public static final androidx.compose.animation.tooling.ComposeAnimationType ANIMATED_VISIBILITY;
+ enum_constant public static final androidx.compose.animation.tooling.ComposeAnimationType TRANSITION_ANIMATION;
+ }
+
+ public final class TransitionInfo {
+ ctor public TransitionInfo(String label, String specType, long startTimeMillis, long endTimeMillis, java.util.Map<java.lang.Long,?> values);
+ method public long getEndTimeMillis();
+ method public String getLabel();
+ method public String getSpecType();
+ method public long getStartTimeMillis();
+ method public java.util.Map<java.lang.Long,java.lang.Object> getValues();
+ property public final long endTimeMillis;
+ property public final String label;
+ property public final String specType;
+ property public final long startTimeMillis;
+ property public final java.util.Map<java.lang.Long,java.lang.Object> values;
+ }
+
+}
+
diff --git a/compose/animation/animation/api/1.2.0-beta02.txt b/compose/animation/animation/api/1.2.0-beta02.txt
new file mode 100644
index 0000000..4f8ad04
--- /dev/null
+++ b/compose/animation/animation/api/1.2.0-beta02.txt
@@ -0,0 +1,105 @@
+// Signature format: 4.0
+package androidx.compose.animation {
+
+ public final class AndroidActualDefaultDecayAnimationSpec_androidKt {
+ method @Deprecated @androidx.compose.runtime.Composable public static androidx.compose.animation.core.DecayAnimationSpec<java.lang.Float> defaultDecayAnimationSpec();
+ }
+
+ public final class AnimatedContentKt {
+ }
+
+ public final class AnimatedVisibilityKt {
+ method @androidx.compose.runtime.Composable public static void AnimatedVisibility(boolean visible, optional androidx.compose.ui.Modifier modifier, optional androidx.compose.animation.EnterTransition enter, optional androidx.compose.animation.ExitTransition exit, optional String label, kotlin.jvm.functions.Function1<? super androidx.compose.animation.AnimatedVisibilityScope,kotlin.Unit> content);
+ method @androidx.compose.runtime.Composable public static void AnimatedVisibility(androidx.compose.foundation.layout.RowScope, boolean visible, optional androidx.compose.ui.Modifier modifier, optional androidx.compose.animation.EnterTransition enter, optional androidx.compose.animation.ExitTransition exit, optional String label, kotlin.jvm.functions.Function1<? super androidx.compose.animation.AnimatedVisibilityScope,kotlin.Unit> content);
+ method @androidx.compose.runtime.Composable public static void AnimatedVisibility(androidx.compose.foundation.layout.ColumnScope, boolean visible, optional androidx.compose.ui.Modifier modifier, optional androidx.compose.animation.EnterTransition enter, optional androidx.compose.animation.ExitTransition exit, optional String label, kotlin.jvm.functions.Function1<? super androidx.compose.animation.AnimatedVisibilityScope,kotlin.Unit> content);
+ method @androidx.compose.runtime.Composable public static void AnimatedVisibility(androidx.compose.animation.core.MutableTransitionState<java.lang.Boolean> visibleState, optional androidx.compose.ui.Modifier modifier, optional androidx.compose.animation.EnterTransition enter, optional androidx.compose.animation.ExitTransition exit, optional String label, kotlin.jvm.functions.Function1<? super androidx.compose.animation.AnimatedVisibilityScope,kotlin.Unit> content);
+ method @androidx.compose.runtime.Composable public static void AnimatedVisibility(androidx.compose.foundation.layout.RowScope, androidx.compose.animation.core.MutableTransitionState<java.lang.Boolean> visibleState, optional androidx.compose.ui.Modifier modifier, optional androidx.compose.animation.EnterTransition enter, optional androidx.compose.animation.ExitTransition exit, optional String label, kotlin.jvm.functions.Function1<? super androidx.compose.animation.AnimatedVisibilityScope,kotlin.Unit> content);
+ method @androidx.compose.runtime.Composable public static void AnimatedVisibility(androidx.compose.foundation.layout.ColumnScope, androidx.compose.animation.core.MutableTransitionState<java.lang.Boolean> visibleState, optional androidx.compose.ui.Modifier modifier, optional androidx.compose.animation.EnterTransition enter, optional androidx.compose.animation.ExitTransition exit, optional String label, kotlin.jvm.functions.Function1<? super androidx.compose.animation.AnimatedVisibilityScope,kotlin.Unit> content);
+ }
+
+ public interface AnimatedVisibilityScope {
+ }
+
+ public final class AnimationModifierKt {
+ method public static androidx.compose.ui.Modifier animateContentSize(androidx.compose.ui.Modifier, optional androidx.compose.animation.core.FiniteAnimationSpec<androidx.compose.ui.unit.IntSize> animationSpec, optional kotlin.jvm.functions.Function2<? super androidx.compose.ui.unit.IntSize,? super androidx.compose.ui.unit.IntSize,kotlin.Unit>? finishedListener);
+ }
+
+ public final class ColorVectorConverterKt {
+ method public static kotlin.jvm.functions.Function1<androidx.compose.ui.graphics.colorspace.ColorSpace,androidx.compose.animation.core.TwoWayConverter<androidx.compose.ui.graphics.Color,androidx.compose.animation.core.AnimationVector4D>> getVectorConverter(androidx.compose.ui.graphics.Color.Companion);
+ }
+
+ public final class CrossfadeKt {
+ method @androidx.compose.runtime.Composable public static <T> void Crossfade(T? targetState, optional androidx.compose.ui.Modifier modifier, optional androidx.compose.animation.core.FiniteAnimationSpec<java.lang.Float> animationSpec, kotlin.jvm.functions.Function1<? super T,kotlin.Unit> content);
+ }
+
+ public final class EnterExitTransitionKt {
+ method @androidx.compose.runtime.Stable public static androidx.compose.animation.EnterTransition expandHorizontally(optional androidx.compose.animation.core.FiniteAnimationSpec<androidx.compose.ui.unit.IntSize> animationSpec, optional androidx.compose.ui.Alignment.Horizontal expandFrom, optional boolean clip, optional kotlin.jvm.functions.Function1<? super java.lang.Integer,java.lang.Integer> initialWidth);
+ method @androidx.compose.runtime.Stable public static androidx.compose.animation.EnterTransition expandIn(optional androidx.compose.animation.core.FiniteAnimationSpec<androidx.compose.ui.unit.IntSize> animationSpec, optional androidx.compose.ui.Alignment expandFrom, optional boolean clip, optional kotlin.jvm.functions.Function1<? super androidx.compose.ui.unit.IntSize,androidx.compose.ui.unit.IntSize> initialSize);
+ method @androidx.compose.runtime.Stable public static androidx.compose.animation.EnterTransition expandVertically(optional androidx.compose.animation.core.FiniteAnimationSpec<androidx.compose.ui.unit.IntSize> animationSpec, optional androidx.compose.ui.Alignment.Vertical expandFrom, optional boolean clip, optional kotlin.jvm.functions.Function1<? super java.lang.Integer,java.lang.Integer> initialHeight);
+ method @androidx.compose.runtime.Stable public static androidx.compose.animation.EnterTransition fadeIn(optional androidx.compose.animation.core.FiniteAnimationSpec<java.lang.Float> animationSpec, optional float initialAlpha);
+ method @androidx.compose.runtime.Stable public static androidx.compose.animation.ExitTransition fadeOut(optional androidx.compose.animation.core.FiniteAnimationSpec<java.lang.Float> animationSpec, optional float targetAlpha);
+ method @androidx.compose.runtime.Stable public static androidx.compose.animation.ExitTransition shrinkHorizontally(optional androidx.compose.animation.core.FiniteAnimationSpec<androidx.compose.ui.unit.IntSize> animationSpec, optional androidx.compose.ui.Alignment.Horizontal shrinkTowards, optional boolean clip, optional kotlin.jvm.functions.Function1<? super java.lang.Integer,java.lang.Integer> targetWidth);
+ method @androidx.compose.runtime.Stable public static androidx.compose.animation.ExitTransition shrinkOut(optional androidx.compose.animation.core.FiniteAnimationSpec<androidx.compose.ui.unit.IntSize> animationSpec, optional androidx.compose.ui.Alignment shrinkTowards, optional boolean clip, optional kotlin.jvm.functions.Function1<? super androidx.compose.ui.unit.IntSize,androidx.compose.ui.unit.IntSize> targetSize);
+ method @androidx.compose.runtime.Stable public static androidx.compose.animation.ExitTransition shrinkVertically(optional androidx.compose.animation.core.FiniteAnimationSpec<androidx.compose.ui.unit.IntSize> animationSpec, optional androidx.compose.ui.Alignment.Vertical shrinkTowards, optional boolean clip, optional kotlin.jvm.functions.Function1<? super java.lang.Integer,java.lang.Integer> targetHeight);
+ method @androidx.compose.runtime.Stable public static androidx.compose.animation.EnterTransition slideIn(optional androidx.compose.animation.core.FiniteAnimationSpec<androidx.compose.ui.unit.IntOffset> animationSpec, kotlin.jvm.functions.Function1<? super androidx.compose.ui.unit.IntSize,androidx.compose.ui.unit.IntOffset> initialOffset);
+ method @androidx.compose.runtime.Stable public static androidx.compose.animation.EnterTransition slideInHorizontally(optional androidx.compose.animation.core.FiniteAnimationSpec<androidx.compose.ui.unit.IntOffset> animationSpec, optional kotlin.jvm.functions.Function1<? super java.lang.Integer,java.lang.Integer> initialOffsetX);
+ method @androidx.compose.runtime.Stable public static androidx.compose.animation.EnterTransition slideInVertically(optional androidx.compose.animation.core.FiniteAnimationSpec<androidx.compose.ui.unit.IntOffset> animationSpec, optional kotlin.jvm.functions.Function1<? super java.lang.Integer,java.lang.Integer> initialOffsetY);
+ method @androidx.compose.runtime.Stable public static androidx.compose.animation.ExitTransition slideOut(optional androidx.compose.animation.core.FiniteAnimationSpec<androidx.compose.ui.unit.IntOffset> animationSpec, kotlin.jvm.functions.Function1<? super androidx.compose.ui.unit.IntSize,androidx.compose.ui.unit.IntOffset> targetOffset);
+ method @androidx.compose.runtime.Stable public static androidx.compose.animation.ExitTransition slideOutHorizontally(optional androidx.compose.animation.core.FiniteAnimationSpec<androidx.compose.ui.unit.IntOffset> animationSpec, optional kotlin.jvm.functions.Function1<? super java.lang.Integer,java.lang.Integer> targetOffsetX);
+ method @androidx.compose.runtime.Stable public static androidx.compose.animation.ExitTransition slideOutVertically(optional androidx.compose.animation.core.FiniteAnimationSpec<androidx.compose.ui.unit.IntOffset> animationSpec, optional kotlin.jvm.functions.Function1<? super java.lang.Integer,java.lang.Integer> targetOffsetY);
+ }
+
+ @androidx.compose.runtime.Immutable public abstract sealed class EnterTransition {
+ method @androidx.compose.runtime.Stable public final operator androidx.compose.animation.EnterTransition plus(androidx.compose.animation.EnterTransition enter);
+ field public static final androidx.compose.animation.EnterTransition.Companion Companion;
+ }
+
+ public static final class EnterTransition.Companion {
+ method public androidx.compose.animation.EnterTransition getNone();
+ property public final androidx.compose.animation.EnterTransition None;
+ }
+
+ @androidx.compose.runtime.Immutable public abstract sealed class ExitTransition {
+ method @androidx.compose.runtime.Stable public final operator androidx.compose.animation.ExitTransition plus(androidx.compose.animation.ExitTransition exit);
+ field public static final androidx.compose.animation.ExitTransition.Companion Companion;
+ }
+
+ public static final class ExitTransition.Companion {
+ method public androidx.compose.animation.ExitTransition getNone();
+ property public final androidx.compose.animation.ExitTransition None;
+ }
+
+ public final class FlingCalculatorKt {
+ }
+
+ public final class SingleValueAnimationKt {
+ method public static androidx.compose.animation.core.Animatable<androidx.compose.ui.graphics.Color,androidx.compose.animation.core.AnimationVector4D> Animatable(long initialValue);
+ method @androidx.compose.runtime.Composable public static androidx.compose.runtime.State<androidx.compose.ui.graphics.Color> animateColorAsState(long targetValue, optional androidx.compose.animation.core.AnimationSpec<androidx.compose.ui.graphics.Color> animationSpec, optional kotlin.jvm.functions.Function1<? super androidx.compose.ui.graphics.Color,kotlin.Unit>? finishedListener);
+ }
+
+ public final class SplineBasedDecayKt {
+ method public static <T> androidx.compose.animation.core.DecayAnimationSpec<T> splineBasedDecay(androidx.compose.ui.unit.Density density);
+ }
+
+ public final class SplineBasedFloatDecayAnimationSpec implements androidx.compose.animation.core.FloatDecayAnimationSpec {
+ ctor public SplineBasedFloatDecayAnimationSpec(androidx.compose.ui.unit.Density density);
+ method public float getAbsVelocityThreshold();
+ method public long getDurationNanos(float initialValue, float initialVelocity);
+ method public float getTargetValue(float initialValue, float initialVelocity);
+ method public float getValueFromNanos(long playTimeNanos, float initialValue, float initialVelocity);
+ method public float getVelocityFromNanos(long playTimeNanos, float initialValue, float initialVelocity);
+ property public float absVelocityThreshold;
+ }
+
+ public final class SplineBasedFloatDecayAnimationSpec_androidKt {
+ method @androidx.compose.runtime.Composable public static <T> androidx.compose.animation.core.DecayAnimationSpec<T> rememberSplineBasedDecay();
+ method @Deprecated public static <T> androidx.compose.animation.core.DecayAnimationSpec<T>! splineBasedDecayDeprecated(androidx.compose.ui.unit.Density density);
+ }
+
+ public final class TransitionKt {
+ method @androidx.compose.runtime.Composable public static inline <S> androidx.compose.runtime.State<androidx.compose.ui.graphics.Color> animateColor(androidx.compose.animation.core.Transition<S>, optional kotlin.jvm.functions.Function1<? super androidx.compose.animation.core.Transition.Segment<S>,? extends androidx.compose.animation.core.FiniteAnimationSpec<androidx.compose.ui.graphics.Color>> transitionSpec, optional String label, kotlin.jvm.functions.Function1<? super S,androidx.compose.ui.graphics.Color> targetValueByState);
+ method @androidx.compose.runtime.Composable public static androidx.compose.runtime.State<androidx.compose.ui.graphics.Color> animateColor(androidx.compose.animation.core.InfiniteTransition, long initialValue, long targetValue, androidx.compose.animation.core.InfiniteRepeatableSpec<androidx.compose.ui.graphics.Color> animationSpec);
+ }
+
+}
+
diff --git a/compose/animation/animation/api/public_plus_experimental_1.2.0-beta02.txt b/compose/animation/animation/api/public_plus_experimental_1.2.0-beta02.txt
new file mode 100644
index 0000000..e7765d0
--- /dev/null
+++ b/compose/animation/animation/api/public_plus_experimental_1.2.0-beta02.txt
@@ -0,0 +1,174 @@
+// Signature format: 4.0
+package androidx.compose.animation {
+
+ public final class AndroidActualDefaultDecayAnimationSpec_androidKt {
+ method @Deprecated @androidx.compose.runtime.Composable public static androidx.compose.animation.core.DecayAnimationSpec<java.lang.Float> defaultDecayAnimationSpec();
+ }
+
+ public final class AnimatedContentKt {
+ method @androidx.compose.animation.ExperimentalAnimationApi @androidx.compose.runtime.Composable public static <S> void AnimatedContent(S? targetState, optional androidx.compose.ui.Modifier modifier, optional kotlin.jvm.functions.Function1<? super androidx.compose.animation.AnimatedContentScope<S>,androidx.compose.animation.ContentTransform> transitionSpec, optional androidx.compose.ui.Alignment contentAlignment, kotlin.jvm.functions.Function2<? super androidx.compose.animation.AnimatedVisibilityScope,? super S,kotlin.Unit> content);
+ method @androidx.compose.animation.ExperimentalAnimationApi @androidx.compose.runtime.Composable public static <S> void AnimatedContent(androidx.compose.animation.core.Transition<S>, optional androidx.compose.ui.Modifier modifier, optional kotlin.jvm.functions.Function1<? super androidx.compose.animation.AnimatedContentScope<S>,androidx.compose.animation.ContentTransform> transitionSpec, optional androidx.compose.ui.Alignment contentAlignment, optional kotlin.jvm.functions.Function1<? super S,?> contentKey, kotlin.jvm.functions.Function2<? super androidx.compose.animation.AnimatedVisibilityScope,? super S,kotlin.Unit> content);
+ method @androidx.compose.animation.ExperimentalAnimationApi public static androidx.compose.animation.SizeTransform SizeTransform(optional boolean clip, optional kotlin.jvm.functions.Function2<? super androidx.compose.ui.unit.IntSize,? super androidx.compose.ui.unit.IntSize,? extends androidx.compose.animation.core.FiniteAnimationSpec<androidx.compose.ui.unit.IntSize>> sizeAnimationSpec);
+ method @androidx.compose.animation.ExperimentalAnimationApi public static infix androidx.compose.animation.ContentTransform with(androidx.compose.animation.EnterTransition, androidx.compose.animation.ExitTransition exit);
+ }
+
+ @androidx.compose.animation.ExperimentalAnimationApi public final class AnimatedContentScope<S> implements androidx.compose.animation.core.Transition.Segment<S> {
+ method public S! getInitialState();
+ method public S! getTargetState();
+ method public androidx.compose.animation.EnterTransition slideIntoContainer(int towards, optional androidx.compose.animation.core.FiniteAnimationSpec<androidx.compose.ui.unit.IntOffset> animationSpec, optional kotlin.jvm.functions.Function1<? super java.lang.Integer,java.lang.Integer> initialOffset);
+ method public androidx.compose.animation.ExitTransition slideOutOfContainer(int towards, optional androidx.compose.animation.core.FiniteAnimationSpec<androidx.compose.ui.unit.IntOffset> animationSpec, optional kotlin.jvm.functions.Function1<? super java.lang.Integer,java.lang.Integer> targetOffset);
+ method @androidx.compose.animation.ExperimentalAnimationApi public infix androidx.compose.animation.ContentTransform using(androidx.compose.animation.ContentTransform, androidx.compose.animation.SizeTransform? sizeTransform);
+ property public S! initialState;
+ property public S! targetState;
+ }
+
+ @androidx.compose.runtime.Immutable @kotlin.jvm.JvmInline public static final value class AnimatedContentScope.SlideDirection {
+ field public static final androidx.compose.animation.AnimatedContentScope.SlideDirection.Companion Companion;
+ }
+
+ public static final class AnimatedContentScope.SlideDirection.Companion {
+ method public int getDown();
+ method public int getEnd();
+ method public int getLeft();
+ method public int getRight();
+ method public int getStart();
+ method public int getUp();
+ property public final int Down;
+ property public final int End;
+ property public final int Left;
+ property public final int Right;
+ property public final int Start;
+ property public final int Up;
+ }
+
+ public final class AnimatedVisibilityKt {
+ method @androidx.compose.runtime.Composable public static void AnimatedVisibility(boolean visible, optional androidx.compose.ui.Modifier modifier, optional androidx.compose.animation.EnterTransition enter, optional androidx.compose.animation.ExitTransition exit, optional String label, kotlin.jvm.functions.Function1<? super androidx.compose.animation.AnimatedVisibilityScope,kotlin.Unit> content);
+ method @androidx.compose.runtime.Composable public static void AnimatedVisibility(androidx.compose.foundation.layout.RowScope, boolean visible, optional androidx.compose.ui.Modifier modifier, optional androidx.compose.animation.EnterTransition enter, optional androidx.compose.animation.ExitTransition exit, optional String label, kotlin.jvm.functions.Function1<? super androidx.compose.animation.AnimatedVisibilityScope,kotlin.Unit> content);
+ method @androidx.compose.runtime.Composable public static void AnimatedVisibility(androidx.compose.foundation.layout.ColumnScope, boolean visible, optional androidx.compose.ui.Modifier modifier, optional androidx.compose.animation.EnterTransition enter, optional androidx.compose.animation.ExitTransition exit, optional String label, kotlin.jvm.functions.Function1<? super androidx.compose.animation.AnimatedVisibilityScope,kotlin.Unit> content);
+ method @androidx.compose.runtime.Composable public static void AnimatedVisibility(androidx.compose.animation.core.MutableTransitionState<java.lang.Boolean> visibleState, optional androidx.compose.ui.Modifier modifier, optional androidx.compose.animation.EnterTransition enter, optional androidx.compose.animation.ExitTransition exit, optional String label, kotlin.jvm.functions.Function1<? super androidx.compose.animation.AnimatedVisibilityScope,kotlin.Unit> content);
+ method @androidx.compose.runtime.Composable public static void AnimatedVisibility(androidx.compose.foundation.layout.RowScope, androidx.compose.animation.core.MutableTransitionState<java.lang.Boolean> visibleState, optional androidx.compose.ui.Modifier modifier, optional androidx.compose.animation.EnterTransition enter, optional androidx.compose.animation.ExitTransition exit, optional String label, kotlin.jvm.functions.Function1<? super androidx.compose.animation.AnimatedVisibilityScope,kotlin.Unit> content);
+ method @androidx.compose.runtime.Composable public static void AnimatedVisibility(androidx.compose.foundation.layout.ColumnScope, androidx.compose.animation.core.MutableTransitionState<java.lang.Boolean> visibleState, optional androidx.compose.ui.Modifier modifier, optional androidx.compose.animation.EnterTransition enter, optional androidx.compose.animation.ExitTransition exit, optional String label, kotlin.jvm.functions.Function1<? super androidx.compose.animation.AnimatedVisibilityScope,kotlin.Unit> content);
+ method @androidx.compose.animation.ExperimentalAnimationApi @androidx.compose.runtime.Composable public static <T> void AnimatedVisibility(androidx.compose.animation.core.Transition<T>, kotlin.jvm.functions.Function1<? super T,java.lang.Boolean> visible, optional androidx.compose.ui.Modifier modifier, optional androidx.compose.animation.EnterTransition enter, optional androidx.compose.animation.ExitTransition exit, kotlin.jvm.functions.Function1<? super androidx.compose.animation.AnimatedVisibilityScope,kotlin.Unit> content);
+ method @Deprecated @androidx.compose.animation.ExperimentalAnimationApi @androidx.compose.runtime.Composable public static void AnimatedVisibility(boolean visible, optional androidx.compose.ui.Modifier modifier, androidx.compose.animation.EnterTransition enter, androidx.compose.animation.ExitTransition exit, boolean initiallyVisible, kotlin.jvm.functions.Function0<kotlin.Unit> content);
+ }
+
+ public interface AnimatedVisibilityScope {
+ method @androidx.compose.animation.ExperimentalAnimationApi public default androidx.compose.ui.Modifier animateEnterExit(androidx.compose.ui.Modifier, optional androidx.compose.animation.EnterTransition enter, optional androidx.compose.animation.ExitTransition exit, optional String label);
+ method @androidx.compose.animation.ExperimentalAnimationApi public androidx.compose.animation.core.Transition<androidx.compose.animation.EnterExitState> getTransition();
+ property @androidx.compose.animation.ExperimentalAnimationApi public abstract androidx.compose.animation.core.Transition<androidx.compose.animation.EnterExitState> transition;
+ }
+
+ public final class AnimationModifierKt {
+ method public static androidx.compose.ui.Modifier animateContentSize(androidx.compose.ui.Modifier, optional androidx.compose.animation.core.FiniteAnimationSpec<androidx.compose.ui.unit.IntSize> animationSpec, optional kotlin.jvm.functions.Function2<? super androidx.compose.ui.unit.IntSize,? super androidx.compose.ui.unit.IntSize,kotlin.Unit>? finishedListener);
+ }
+
+ public final class ColorVectorConverterKt {
+ method public static kotlin.jvm.functions.Function1<androidx.compose.ui.graphics.colorspace.ColorSpace,androidx.compose.animation.core.TwoWayConverter<androidx.compose.ui.graphics.Color,androidx.compose.animation.core.AnimationVector4D>> getVectorConverter(androidx.compose.ui.graphics.Color.Companion);
+ }
+
+ @androidx.compose.animation.ExperimentalAnimationApi public final class ContentTransform {
+ ctor public ContentTransform(androidx.compose.animation.EnterTransition targetContentEnter, androidx.compose.animation.ExitTransition initialContentExit, optional float targetContentZIndex, optional androidx.compose.animation.SizeTransform? sizeTransform);
+ method public androidx.compose.animation.ExitTransition getInitialContentExit();
+ method public androidx.compose.animation.SizeTransform? getSizeTransform();
+ method public androidx.compose.animation.EnterTransition getTargetContentEnter();
+ method public float getTargetContentZIndex();
+ method public void setTargetContentZIndex(float);
+ property public final androidx.compose.animation.ExitTransition initialContentExit;
+ property public final androidx.compose.animation.SizeTransform? sizeTransform;
+ property public final androidx.compose.animation.EnterTransition targetContentEnter;
+ property public final float targetContentZIndex;
+ }
+
+ public final class CrossfadeKt {
+ method @androidx.compose.runtime.Composable public static <T> void Crossfade(T? targetState, optional androidx.compose.ui.Modifier modifier, optional androidx.compose.animation.core.FiniteAnimationSpec<java.lang.Float> animationSpec, kotlin.jvm.functions.Function1<? super T,kotlin.Unit> content);
+ method @androidx.compose.animation.ExperimentalAnimationApi @androidx.compose.runtime.Composable public static <T> void Crossfade(androidx.compose.animation.core.Transition<T>, optional androidx.compose.ui.Modifier modifier, optional androidx.compose.animation.core.FiniteAnimationSpec<java.lang.Float> animationSpec, optional kotlin.jvm.functions.Function1<? super T,?> contentKey, kotlin.jvm.functions.Function1<? super T,kotlin.Unit> content);
+ }
+
+ @androidx.compose.animation.ExperimentalAnimationApi public enum EnterExitState {
+ enum_constant public static final androidx.compose.animation.EnterExitState PostExit;
+ enum_constant public static final androidx.compose.animation.EnterExitState PreEnter;
+ enum_constant public static final androidx.compose.animation.EnterExitState Visible;
+ }
+
+ public final class EnterExitTransitionKt {
+ method @androidx.compose.runtime.Stable public static androidx.compose.animation.EnterTransition expandHorizontally(optional androidx.compose.animation.core.FiniteAnimationSpec<androidx.compose.ui.unit.IntSize> animationSpec, optional androidx.compose.ui.Alignment.Horizontal expandFrom, optional boolean clip, optional kotlin.jvm.functions.Function1<? super java.lang.Integer,java.lang.Integer> initialWidth);
+ method @androidx.compose.runtime.Stable public static androidx.compose.animation.EnterTransition expandIn(optional androidx.compose.animation.core.FiniteAnimationSpec<androidx.compose.ui.unit.IntSize> animationSpec, optional androidx.compose.ui.Alignment expandFrom, optional boolean clip, optional kotlin.jvm.functions.Function1<? super androidx.compose.ui.unit.IntSize,androidx.compose.ui.unit.IntSize> initialSize);
+ method @androidx.compose.runtime.Stable public static androidx.compose.animation.EnterTransition expandVertically(optional androidx.compose.animation.core.FiniteAnimationSpec<androidx.compose.ui.unit.IntSize> animationSpec, optional androidx.compose.ui.Alignment.Vertical expandFrom, optional boolean clip, optional kotlin.jvm.functions.Function1<? super java.lang.Integer,java.lang.Integer> initialHeight);
+ method @androidx.compose.runtime.Stable public static androidx.compose.animation.EnterTransition fadeIn(optional androidx.compose.animation.core.FiniteAnimationSpec<java.lang.Float> animationSpec, optional float initialAlpha);
+ method @androidx.compose.runtime.Stable public static androidx.compose.animation.ExitTransition fadeOut(optional androidx.compose.animation.core.FiniteAnimationSpec<java.lang.Float> animationSpec, optional float targetAlpha);
+ method @androidx.compose.animation.ExperimentalAnimationApi @androidx.compose.runtime.Stable public static androidx.compose.animation.EnterTransition scaleIn(optional androidx.compose.animation.core.FiniteAnimationSpec<java.lang.Float> animationSpec, optional float initialScale, optional long transformOrigin);
+ method @androidx.compose.animation.ExperimentalAnimationApi @androidx.compose.runtime.Stable public static androidx.compose.animation.ExitTransition scaleOut(optional androidx.compose.animation.core.FiniteAnimationSpec<java.lang.Float> animationSpec, optional float targetScale, optional long transformOrigin);
+ method @androidx.compose.runtime.Stable public static androidx.compose.animation.ExitTransition shrinkHorizontally(optional androidx.compose.animation.core.FiniteAnimationSpec<androidx.compose.ui.unit.IntSize> animationSpec, optional androidx.compose.ui.Alignment.Horizontal shrinkTowards, optional boolean clip, optional kotlin.jvm.functions.Function1<? super java.lang.Integer,java.lang.Integer> targetWidth);
+ method @androidx.compose.runtime.Stable public static androidx.compose.animation.ExitTransition shrinkOut(optional androidx.compose.animation.core.FiniteAnimationSpec<androidx.compose.ui.unit.IntSize> animationSpec, optional androidx.compose.ui.Alignment shrinkTowards, optional boolean clip, optional kotlin.jvm.functions.Function1<? super androidx.compose.ui.unit.IntSize,androidx.compose.ui.unit.IntSize> targetSize);
+ method @androidx.compose.runtime.Stable public static androidx.compose.animation.ExitTransition shrinkVertically(optional androidx.compose.animation.core.FiniteAnimationSpec<androidx.compose.ui.unit.IntSize> animationSpec, optional androidx.compose.ui.Alignment.Vertical shrinkTowards, optional boolean clip, optional kotlin.jvm.functions.Function1<? super java.lang.Integer,java.lang.Integer> targetHeight);
+ method @androidx.compose.runtime.Stable public static androidx.compose.animation.EnterTransition slideIn(optional androidx.compose.animation.core.FiniteAnimationSpec<androidx.compose.ui.unit.IntOffset> animationSpec, kotlin.jvm.functions.Function1<? super androidx.compose.ui.unit.IntSize,androidx.compose.ui.unit.IntOffset> initialOffset);
+ method @androidx.compose.runtime.Stable public static androidx.compose.animation.EnterTransition slideInHorizontally(optional androidx.compose.animation.core.FiniteAnimationSpec<androidx.compose.ui.unit.IntOffset> animationSpec, optional kotlin.jvm.functions.Function1<? super java.lang.Integer,java.lang.Integer> initialOffsetX);
+ method @androidx.compose.runtime.Stable public static androidx.compose.animation.EnterTransition slideInVertically(optional androidx.compose.animation.core.FiniteAnimationSpec<androidx.compose.ui.unit.IntOffset> animationSpec, optional kotlin.jvm.functions.Function1<? super java.lang.Integer,java.lang.Integer> initialOffsetY);
+ method @androidx.compose.runtime.Stable public static androidx.compose.animation.ExitTransition slideOut(optional androidx.compose.animation.core.FiniteAnimationSpec<androidx.compose.ui.unit.IntOffset> animationSpec, kotlin.jvm.functions.Function1<? super androidx.compose.ui.unit.IntSize,androidx.compose.ui.unit.IntOffset> targetOffset);
+ method @androidx.compose.runtime.Stable public static androidx.compose.animation.ExitTransition slideOutHorizontally(optional androidx.compose.animation.core.FiniteAnimationSpec<androidx.compose.ui.unit.IntOffset> animationSpec, optional kotlin.jvm.functions.Function1<? super java.lang.Integer,java.lang.Integer> targetOffsetX);
+ method @androidx.compose.runtime.Stable public static androidx.compose.animation.ExitTransition slideOutVertically(optional androidx.compose.animation.core.FiniteAnimationSpec<androidx.compose.ui.unit.IntOffset> animationSpec, optional kotlin.jvm.functions.Function1<? super java.lang.Integer,java.lang.Integer> targetOffsetY);
+ }
+
+ @androidx.compose.runtime.Immutable public abstract sealed class EnterTransition {
+ method @androidx.compose.runtime.Stable public final operator androidx.compose.animation.EnterTransition plus(androidx.compose.animation.EnterTransition enter);
+ field public static final androidx.compose.animation.EnterTransition.Companion Companion;
+ }
+
+ public static final class EnterTransition.Companion {
+ method public androidx.compose.animation.EnterTransition getNone();
+ property public final androidx.compose.animation.EnterTransition None;
+ }
+
+ @androidx.compose.runtime.Immutable public abstract sealed class ExitTransition {
+ method @androidx.compose.runtime.Stable public final operator androidx.compose.animation.ExitTransition plus(androidx.compose.animation.ExitTransition exit);
+ field public static final androidx.compose.animation.ExitTransition.Companion Companion;
+ }
+
+ public static final class ExitTransition.Companion {
+ method public androidx.compose.animation.ExitTransition getNone();
+ property public final androidx.compose.animation.ExitTransition None;
+ }
+
+ @kotlin.RequiresOptIn(message="This is an experimental animation API.") @kotlin.annotation.Target(allowedTargets={kotlin.annotation.AnnotationTarget.CLASS, kotlin.annotation.AnnotationTarget.FUNCTION, kotlin.annotation.AnnotationTarget.PROPERTY, kotlin.annotation.AnnotationTarget.FIELD, kotlin.annotation.AnnotationTarget.PROPERTY_GETTER}) public @interface ExperimentalAnimationApi {
+ }
+
+ public final class FlingCalculatorKt {
+ }
+
+ public final class SingleValueAnimationKt {
+ method public static androidx.compose.animation.core.Animatable<androidx.compose.ui.graphics.Color,androidx.compose.animation.core.AnimationVector4D> Animatable(long initialValue);
+ method @androidx.compose.runtime.Composable public static androidx.compose.runtime.State<androidx.compose.ui.graphics.Color> animateColorAsState(long targetValue, optional androidx.compose.animation.core.AnimationSpec<androidx.compose.ui.graphics.Color> animationSpec, optional kotlin.jvm.functions.Function1<? super androidx.compose.ui.graphics.Color,kotlin.Unit>? finishedListener);
+ }
+
+ @androidx.compose.animation.ExperimentalAnimationApi public interface SizeTransform {
+ method public androidx.compose.animation.core.FiniteAnimationSpec<androidx.compose.ui.unit.IntSize> createAnimationSpec(long initialSize, long targetSize);
+ method public boolean getClip();
+ property public abstract boolean clip;
+ }
+
+ public final class SplineBasedDecayKt {
+ method public static <T> androidx.compose.animation.core.DecayAnimationSpec<T> splineBasedDecay(androidx.compose.ui.unit.Density density);
+ }
+
+ public final class SplineBasedFloatDecayAnimationSpec implements androidx.compose.animation.core.FloatDecayAnimationSpec {
+ ctor public SplineBasedFloatDecayAnimationSpec(androidx.compose.ui.unit.Density density);
+ method public float getAbsVelocityThreshold();
+ method public long getDurationNanos(float initialValue, float initialVelocity);
+ method public float getTargetValue(float initialValue, float initialVelocity);
+ method public float getValueFromNanos(long playTimeNanos, float initialValue, float initialVelocity);
+ method public float getVelocityFromNanos(long playTimeNanos, float initialValue, float initialVelocity);
+ property public float absVelocityThreshold;
+ }
+
+ public final class SplineBasedFloatDecayAnimationSpec_androidKt {
+ method @androidx.compose.runtime.Composable public static <T> androidx.compose.animation.core.DecayAnimationSpec<T> rememberSplineBasedDecay();
+ method @Deprecated public static <T> androidx.compose.animation.core.DecayAnimationSpec<T>! splineBasedDecayDeprecated(androidx.compose.ui.unit.Density density);
+ }
+
+ public final class TransitionKt {
+ method @androidx.compose.runtime.Composable public static inline <S> androidx.compose.runtime.State<androidx.compose.ui.graphics.Color> animateColor(androidx.compose.animation.core.Transition<S>, optional kotlin.jvm.functions.Function1<? super androidx.compose.animation.core.Transition.Segment<S>,? extends androidx.compose.animation.core.FiniteAnimationSpec<androidx.compose.ui.graphics.Color>> transitionSpec, optional String label, kotlin.jvm.functions.Function1<? super S,androidx.compose.ui.graphics.Color> targetValueByState);
+ method @androidx.compose.runtime.Composable public static androidx.compose.runtime.State<androidx.compose.ui.graphics.Color> animateColor(androidx.compose.animation.core.InfiniteTransition, long initialValue, long targetValue, androidx.compose.animation.core.InfiniteRepeatableSpec<androidx.compose.ui.graphics.Color> animationSpec);
+ }
+
+}
+
diff --git a/compose/animation/animation/api/res-1.2.0-beta02.txt b/compose/animation/animation/api/res-1.2.0-beta02.txt
new file mode 100644
index 0000000..e69de29
--- /dev/null
+++ b/compose/animation/animation/api/res-1.2.0-beta02.txt
diff --git a/compose/animation/animation/api/restricted_1.2.0-beta02.txt b/compose/animation/animation/api/restricted_1.2.0-beta02.txt
new file mode 100644
index 0000000..4f8ad04
--- /dev/null
+++ b/compose/animation/animation/api/restricted_1.2.0-beta02.txt
@@ -0,0 +1,105 @@
+// Signature format: 4.0
+package androidx.compose.animation {
+
+ public final class AndroidActualDefaultDecayAnimationSpec_androidKt {
+ method @Deprecated @androidx.compose.runtime.Composable public static androidx.compose.animation.core.DecayAnimationSpec<java.lang.Float> defaultDecayAnimationSpec();
+ }
+
+ public final class AnimatedContentKt {
+ }
+
+ public final class AnimatedVisibilityKt {
+ method @androidx.compose.runtime.Composable public static void AnimatedVisibility(boolean visible, optional androidx.compose.ui.Modifier modifier, optional androidx.compose.animation.EnterTransition enter, optional androidx.compose.animation.ExitTransition exit, optional String label, kotlin.jvm.functions.Function1<? super androidx.compose.animation.AnimatedVisibilityScope,kotlin.Unit> content);
+ method @androidx.compose.runtime.Composable public static void AnimatedVisibility(androidx.compose.foundation.layout.RowScope, boolean visible, optional androidx.compose.ui.Modifier modifier, optional androidx.compose.animation.EnterTransition enter, optional androidx.compose.animation.ExitTransition exit, optional String label, kotlin.jvm.functions.Function1<? super androidx.compose.animation.AnimatedVisibilityScope,kotlin.Unit> content);
+ method @androidx.compose.runtime.Composable public static void AnimatedVisibility(androidx.compose.foundation.layout.ColumnScope, boolean visible, optional androidx.compose.ui.Modifier modifier, optional androidx.compose.animation.EnterTransition enter, optional androidx.compose.animation.ExitTransition exit, optional String label, kotlin.jvm.functions.Function1<? super androidx.compose.animation.AnimatedVisibilityScope,kotlin.Unit> content);
+ method @androidx.compose.runtime.Composable public static void AnimatedVisibility(androidx.compose.animation.core.MutableTransitionState<java.lang.Boolean> visibleState, optional androidx.compose.ui.Modifier modifier, optional androidx.compose.animation.EnterTransition enter, optional androidx.compose.animation.ExitTransition exit, optional String label, kotlin.jvm.functions.Function1<? super androidx.compose.animation.AnimatedVisibilityScope,kotlin.Unit> content);
+ method @androidx.compose.runtime.Composable public static void AnimatedVisibility(androidx.compose.foundation.layout.RowScope, androidx.compose.animation.core.MutableTransitionState<java.lang.Boolean> visibleState, optional androidx.compose.ui.Modifier modifier, optional androidx.compose.animation.EnterTransition enter, optional androidx.compose.animation.ExitTransition exit, optional String label, kotlin.jvm.functions.Function1<? super androidx.compose.animation.AnimatedVisibilityScope,kotlin.Unit> content);
+ method @androidx.compose.runtime.Composable public static void AnimatedVisibility(androidx.compose.foundation.layout.ColumnScope, androidx.compose.animation.core.MutableTransitionState<java.lang.Boolean> visibleState, optional androidx.compose.ui.Modifier modifier, optional androidx.compose.animation.EnterTransition enter, optional androidx.compose.animation.ExitTransition exit, optional String label, kotlin.jvm.functions.Function1<? super androidx.compose.animation.AnimatedVisibilityScope,kotlin.Unit> content);
+ }
+
+ public interface AnimatedVisibilityScope {
+ }
+
+ public final class AnimationModifierKt {
+ method public static androidx.compose.ui.Modifier animateContentSize(androidx.compose.ui.Modifier, optional androidx.compose.animation.core.FiniteAnimationSpec<androidx.compose.ui.unit.IntSize> animationSpec, optional kotlin.jvm.functions.Function2<? super androidx.compose.ui.unit.IntSize,? super androidx.compose.ui.unit.IntSize,kotlin.Unit>? finishedListener);
+ }
+
+ public final class ColorVectorConverterKt {
+ method public static kotlin.jvm.functions.Function1<androidx.compose.ui.graphics.colorspace.ColorSpace,androidx.compose.animation.core.TwoWayConverter<androidx.compose.ui.graphics.Color,androidx.compose.animation.core.AnimationVector4D>> getVectorConverter(androidx.compose.ui.graphics.Color.Companion);
+ }
+
+ public final class CrossfadeKt {
+ method @androidx.compose.runtime.Composable public static <T> void Crossfade(T? targetState, optional androidx.compose.ui.Modifier modifier, optional androidx.compose.animation.core.FiniteAnimationSpec<java.lang.Float> animationSpec, kotlin.jvm.functions.Function1<? super T,kotlin.Unit> content);
+ }
+
+ public final class EnterExitTransitionKt {
+ method @androidx.compose.runtime.Stable public static androidx.compose.animation.EnterTransition expandHorizontally(optional androidx.compose.animation.core.FiniteAnimationSpec<androidx.compose.ui.unit.IntSize> animationSpec, optional androidx.compose.ui.Alignment.Horizontal expandFrom, optional boolean clip, optional kotlin.jvm.functions.Function1<? super java.lang.Integer,java.lang.Integer> initialWidth);
+ method @androidx.compose.runtime.Stable public static androidx.compose.animation.EnterTransition expandIn(optional androidx.compose.animation.core.FiniteAnimationSpec<androidx.compose.ui.unit.IntSize> animationSpec, optional androidx.compose.ui.Alignment expandFrom, optional boolean clip, optional kotlin.jvm.functions.Function1<? super androidx.compose.ui.unit.IntSize,androidx.compose.ui.unit.IntSize> initialSize);
+ method @androidx.compose.runtime.Stable public static androidx.compose.animation.EnterTransition expandVertically(optional androidx.compose.animation.core.FiniteAnimationSpec<androidx.compose.ui.unit.IntSize> animationSpec, optional androidx.compose.ui.Alignment.Vertical expandFrom, optional boolean clip, optional kotlin.jvm.functions.Function1<? super java.lang.Integer,java.lang.Integer> initialHeight);
+ method @androidx.compose.runtime.Stable public static androidx.compose.animation.EnterTransition fadeIn(optional androidx.compose.animation.core.FiniteAnimationSpec<java.lang.Float> animationSpec, optional float initialAlpha);
+ method @androidx.compose.runtime.Stable public static androidx.compose.animation.ExitTransition fadeOut(optional androidx.compose.animation.core.FiniteAnimationSpec<java.lang.Float> animationSpec, optional float targetAlpha);
+ method @androidx.compose.runtime.Stable public static androidx.compose.animation.ExitTransition shrinkHorizontally(optional androidx.compose.animation.core.FiniteAnimationSpec<androidx.compose.ui.unit.IntSize> animationSpec, optional androidx.compose.ui.Alignment.Horizontal shrinkTowards, optional boolean clip, optional kotlin.jvm.functions.Function1<? super java.lang.Integer,java.lang.Integer> targetWidth);
+ method @androidx.compose.runtime.Stable public static androidx.compose.animation.ExitTransition shrinkOut(optional androidx.compose.animation.core.FiniteAnimationSpec<androidx.compose.ui.unit.IntSize> animationSpec, optional androidx.compose.ui.Alignment shrinkTowards, optional boolean clip, optional kotlin.jvm.functions.Function1<? super androidx.compose.ui.unit.IntSize,androidx.compose.ui.unit.IntSize> targetSize);
+ method @androidx.compose.runtime.Stable public static androidx.compose.animation.ExitTransition shrinkVertically(optional androidx.compose.animation.core.FiniteAnimationSpec<androidx.compose.ui.unit.IntSize> animationSpec, optional androidx.compose.ui.Alignment.Vertical shrinkTowards, optional boolean clip, optional kotlin.jvm.functions.Function1<? super java.lang.Integer,java.lang.Integer> targetHeight);
+ method @androidx.compose.runtime.Stable public static androidx.compose.animation.EnterTransition slideIn(optional androidx.compose.animation.core.FiniteAnimationSpec<androidx.compose.ui.unit.IntOffset> animationSpec, kotlin.jvm.functions.Function1<? super androidx.compose.ui.unit.IntSize,androidx.compose.ui.unit.IntOffset> initialOffset);
+ method @androidx.compose.runtime.Stable public static androidx.compose.animation.EnterTransition slideInHorizontally(optional androidx.compose.animation.core.FiniteAnimationSpec<androidx.compose.ui.unit.IntOffset> animationSpec, optional kotlin.jvm.functions.Function1<? super java.lang.Integer,java.lang.Integer> initialOffsetX);
+ method @androidx.compose.runtime.Stable public static androidx.compose.animation.EnterTransition slideInVertically(optional androidx.compose.animation.core.FiniteAnimationSpec<androidx.compose.ui.unit.IntOffset> animationSpec, optional kotlin.jvm.functions.Function1<? super java.lang.Integer,java.lang.Integer> initialOffsetY);
+ method @androidx.compose.runtime.Stable public static androidx.compose.animation.ExitTransition slideOut(optional androidx.compose.animation.core.FiniteAnimationSpec<androidx.compose.ui.unit.IntOffset> animationSpec, kotlin.jvm.functions.Function1<? super androidx.compose.ui.unit.IntSize,androidx.compose.ui.unit.IntOffset> targetOffset);
+ method @androidx.compose.runtime.Stable public static androidx.compose.animation.ExitTransition slideOutHorizontally(optional androidx.compose.animation.core.FiniteAnimationSpec<androidx.compose.ui.unit.IntOffset> animationSpec, optional kotlin.jvm.functions.Function1<? super java.lang.Integer,java.lang.Integer> targetOffsetX);
+ method @androidx.compose.runtime.Stable public static androidx.compose.animation.ExitTransition slideOutVertically(optional androidx.compose.animation.core.FiniteAnimationSpec<androidx.compose.ui.unit.IntOffset> animationSpec, optional kotlin.jvm.functions.Function1<? super java.lang.Integer,java.lang.Integer> targetOffsetY);
+ }
+
+ @androidx.compose.runtime.Immutable public abstract sealed class EnterTransition {
+ method @androidx.compose.runtime.Stable public final operator androidx.compose.animation.EnterTransition plus(androidx.compose.animation.EnterTransition enter);
+ field public static final androidx.compose.animation.EnterTransition.Companion Companion;
+ }
+
+ public static final class EnterTransition.Companion {
+ method public androidx.compose.animation.EnterTransition getNone();
+ property public final androidx.compose.animation.EnterTransition None;
+ }
+
+ @androidx.compose.runtime.Immutable public abstract sealed class ExitTransition {
+ method @androidx.compose.runtime.Stable public final operator androidx.compose.animation.ExitTransition plus(androidx.compose.animation.ExitTransition exit);
+ field public static final androidx.compose.animation.ExitTransition.Companion Companion;
+ }
+
+ public static final class ExitTransition.Companion {
+ method public androidx.compose.animation.ExitTransition getNone();
+ property public final androidx.compose.animation.ExitTransition None;
+ }
+
+ public final class FlingCalculatorKt {
+ }
+
+ public final class SingleValueAnimationKt {
+ method public static androidx.compose.animation.core.Animatable<androidx.compose.ui.graphics.Color,androidx.compose.animation.core.AnimationVector4D> Animatable(long initialValue);
+ method @androidx.compose.runtime.Composable public static androidx.compose.runtime.State<androidx.compose.ui.graphics.Color> animateColorAsState(long targetValue, optional androidx.compose.animation.core.AnimationSpec<androidx.compose.ui.graphics.Color> animationSpec, optional kotlin.jvm.functions.Function1<? super androidx.compose.ui.graphics.Color,kotlin.Unit>? finishedListener);
+ }
+
+ public final class SplineBasedDecayKt {
+ method public static <T> androidx.compose.animation.core.DecayAnimationSpec<T> splineBasedDecay(androidx.compose.ui.unit.Density density);
+ }
+
+ public final class SplineBasedFloatDecayAnimationSpec implements androidx.compose.animation.core.FloatDecayAnimationSpec {
+ ctor public SplineBasedFloatDecayAnimationSpec(androidx.compose.ui.unit.Density density);
+ method public float getAbsVelocityThreshold();
+ method public long getDurationNanos(float initialValue, float initialVelocity);
+ method public float getTargetValue(float initialValue, float initialVelocity);
+ method public float getValueFromNanos(long playTimeNanos, float initialValue, float initialVelocity);
+ method public float getVelocityFromNanos(long playTimeNanos, float initialValue, float initialVelocity);
+ property public float absVelocityThreshold;
+ }
+
+ public final class SplineBasedFloatDecayAnimationSpec_androidKt {
+ method @androidx.compose.runtime.Composable public static <T> androidx.compose.animation.core.DecayAnimationSpec<T> rememberSplineBasedDecay();
+ method @Deprecated public static <T> androidx.compose.animation.core.DecayAnimationSpec<T>! splineBasedDecayDeprecated(androidx.compose.ui.unit.Density density);
+ }
+
+ public final class TransitionKt {
+ method @androidx.compose.runtime.Composable public static inline <S> androidx.compose.runtime.State<androidx.compose.ui.graphics.Color> animateColor(androidx.compose.animation.core.Transition<S>, optional kotlin.jvm.functions.Function1<? super androidx.compose.animation.core.Transition.Segment<S>,? extends androidx.compose.animation.core.FiniteAnimationSpec<androidx.compose.ui.graphics.Color>> transitionSpec, optional String label, kotlin.jvm.functions.Function1<? super S,androidx.compose.ui.graphics.Color> targetValueByState);
+ method @androidx.compose.runtime.Composable public static androidx.compose.runtime.State<androidx.compose.ui.graphics.Color> animateColor(androidx.compose.animation.core.InfiniteTransition, long initialValue, long targetValue, androidx.compose.animation.core.InfiniteRepeatableSpec<androidx.compose.ui.graphics.Color> animationSpec);
+ }
+
+}
+
diff --git a/compose/compiler/compiler-hosted/integration-tests/src/test/java/androidx/compose/compiler/plugins/kotlin/ControlFlowTransformTests.kt b/compose/compiler/compiler-hosted/integration-tests/src/test/java/androidx/compose/compiler/plugins/kotlin/ControlFlowTransformTests.kt
index fc79a79..9a9e0e5 100644
--- a/compose/compiler/compiler-hosted/integration-tests/src/test/java/androidx/compose/compiler/plugins/kotlin/ControlFlowTransformTests.kt
+++ b/compose/compiler/compiler-hosted/integration-tests/src/test/java/androidx/compose/compiler/plugins/kotlin/ControlFlowTransformTests.kt
@@ -2422,10 +2422,9 @@
%composer.startReplaceableGroup(<>)
sourceInformation(%composer, "C(provided)*<rememb...>:Test.kt")
val tmp0 = remember({
- val tmp0_return = mutableStateOf(
+ mutableStateOf(
value = value
)
- tmp0_return
}, %composer, 0).apply {
%this%apply.value = value
}
@@ -4177,4 +4176,104 @@
fun Leaf(default: Int = 0) {}
"""
)
+
+ // There are a number of "inline constructors" in the Kotlin standard library for Array types.
+ // These are special cases, since normal constructors cannot be inlined.
+ @Test
+ fun testInlineArrayConstructor() = verifyComposeIrTransform(
+ """
+ import androidx.compose.runtime.*
+
+ @Composable
+ fun ArrayConstructorTest(n: Int) {
+ Array(n) { remember { it } }
+ ByteArray(n) { remember { it.toByte() } }
+ CharArray(n) { remember { it.toChar() } }
+ ShortArray(n) { remember { it.toShort() } }
+ IntArray(n) { remember { it } }
+ LongArray(n) { remember { it.toLong() } }
+ FloatArray(n) { remember { it.toFloat() } }
+ DoubleArray(n) { remember { it.toDouble() } }
+ BooleanArray(n) { remember { false } }
+ }
+ """,
+ """
+ @Composable
+ fun ArrayConstructorTest(n: Int, %composer: Composer?, %changed: Int) {
+ if (isTraceInProgress()) {
+ traceEventStart(<>)
+ }
+ %composer = %composer.startRestartGroup(<>)
+ sourceInformation(%composer, "C(ArrayConstructorTest)<rememb...>,<rememb...>,<rememb...>,<rememb...>,<rememb...>,<rememb...>,<rememb...>,<rememb...>,<rememb...>:Test.kt")
+ val %dirty = %changed
+ if (%changed and 0b1110 === 0) {
+ %dirty = %dirty or if (%composer.changed(n)) 0b0100 else 0b0010
+ }
+ if (%dirty and 0b1011 !== 0b0010 || !%composer.skipping) {
+ Array(n) { it: Int ->
+ val tmp0_return = remember({
+ it
+ }, %composer, 0)
+ tmp0_return
+ }
+ ByteArray(n) { it: Int ->
+ val tmp0_return = remember({
+ it.toByte()
+ }, %composer, 0)
+ tmp0_return
+ }
+ CharArray(n) { it: Int ->
+ val tmp0_return = remember({
+ it.toChar()
+ }, %composer, 0)
+ tmp0_return
+ }
+ ShortArray(n) { it: Int ->
+ val tmp0_return = remember({
+ it.toShort()
+ }, %composer, 0)
+ tmp0_return
+ }
+ IntArray(n) { it: Int ->
+ val tmp0_return = remember({
+ it
+ }, %composer, 0)
+ tmp0_return
+ }
+ LongArray(n) { it: Int ->
+ val tmp0_return = remember({
+ it.toLong()
+ }, %composer, 0)
+ tmp0_return
+ }
+ FloatArray(n) { it: Int ->
+ val tmp0_return = remember({
+ it.toFloat()
+ }, %composer, 0)
+ tmp0_return
+ }
+ DoubleArray(n) { it: Int ->
+ val tmp0_return = remember({
+ it.toDouble()
+ }, %composer, 0)
+ tmp0_return
+ }
+ BooleanArray(n) { it: Int ->
+ val tmp0_return = remember({
+ false
+ }, %composer, 0)
+ tmp0_return
+ }
+ } else {
+ %composer.skipToGroupEnd()
+ }
+ %composer.endRestartGroup()?.updateScope { %composer: Composer?, %force: Int ->
+ ArrayConstructorTest(n, %composer, %changed or 0b0001)
+ }
+ if (isTraceInProgress()) {
+ traceEventEnd()
+ }
+ }
+ """
+ )
}
diff --git a/compose/compiler/compiler-hosted/integration-tests/src/test/java/androidx/compose/compiler/plugins/kotlin/FunctionBodySkippingTransformTests.kt b/compose/compiler/compiler-hosted/integration-tests/src/test/java/androidx/compose/compiler/plugins/kotlin/FunctionBodySkippingTransformTests.kt
index e07b12a..d338b59 100644
--- a/compose/compiler/compiler-hosted/integration-tests/src/test/java/androidx/compose/compiler/plugins/kotlin/FunctionBodySkippingTransformTests.kt
+++ b/compose/compiler/compiler-hosted/integration-tests/src/test/java/androidx/compose/compiler/plugins/kotlin/FunctionBodySkippingTransformTests.kt
@@ -3684,7 +3684,8 @@
if (%changed and 0b0001 === 0 || %composer.defaultsInvalid) {
if (%default and 0b0010 !== 0) {
values = Array(1) { it: Int ->
- "value " + it
+ val tmp0_return = "value " + it
+ tmp0_return
}
%dirty = %dirty and 0b01110000.inv()
}
diff --git a/compose/compiler/compiler-hosted/integration-tests/src/test/java/androidx/compose/compiler/plugins/kotlin/LambdaMemoizationTransformTests.kt b/compose/compiler/compiler-hosted/integration-tests/src/test/java/androidx/compose/compiler/plugins/kotlin/LambdaMemoizationTransformTests.kt
index 03b4b10..a92ef62 100644
--- a/compose/compiler/compiler-hosted/integration-tests/src/test/java/androidx/compose/compiler/plugins/kotlin/LambdaMemoizationTransformTests.kt
+++ b/compose/compiler/compiler-hosted/integration-tests/src/test/java/androidx/compose/compiler/plugins/kotlin/LambdaMemoizationTransformTests.kt
@@ -730,4 +730,132 @@
}
"""
)
+
+ // We have to use composableLambdaInstance in crossinline lambdas, since they may be captured
+ // in anonymous objects and called in a context with a different composer.
+ @Test
+ fun testCrossinlineLambda() = verifyComposeIrTransform(
+ """
+ import androidx.compose.runtime.Composable
+
+ @Composable
+ fun Test() {
+ var lambda: (@Composable () -> Unit)? = null
+ f { s -> lambda = { Text(s) } }
+ lambda?.let { it() }
+ }
+ """,
+ """
+ @Composable
+ fun Test(%composer: Composer?, %changed: Int) {
+ if (isTraceInProgress()) {
+ traceEventStart(<>)
+ }
+ %composer = %composer.startRestartGroup(<>)
+ sourceInformation(%composer, "C(Test)*<it()>:Test.kt")
+ if (%changed !== 0 || !%composer.skipping) {
+ var lambda = null
+ f { s: String ->
+ lambda = composableLambdaInstance(<>, true) { %composer: Composer?, %changed: Int ->
+ sourceInformation(%composer, "C<Text(s...>:Test.kt")
+ if (%changed and 0b1011 !== 0b0010 || !%composer.skipping) {
+ Text(s, %composer, 0)
+ } else {
+ %composer.skipToGroupEnd()
+ }
+ }
+ }
+ val tmp0_safe_receiver = lambda
+ val tmp0_group = when {
+ tmp0_safe_receiver == null -> {
+ null
+ }
+ else -> {
+ tmp0_safe_receiver.let { it: Function2<Composer, Int, Unit> ->
+ it(%composer, 0)
+ }
+ }
+ }
+ tmp0_group
+ } else {
+ %composer.skipToGroupEnd()
+ }
+ %composer.endRestartGroup()?.updateScope { %composer: Composer?, %force: Int ->
+ Test(%composer, %changed or 0b0001)
+ }
+ if (isTraceInProgress()) {
+ traceEventEnd()
+ }
+ }
+ """,
+ """
+ import androidx.compose.runtime.Composable
+ @Composable fun Text(s: String) {}
+ inline fun f(crossinline block: (String) -> Unit) = block("")
+ """
+ )
+
+ // The lambda argument to remember and cache should not contain composable calls so
+ // we have to use composableLambdaInstance.
+ @Test
+ fun testRememberComposableLambda() = verifyComposeIrTransform(
+ """
+ import androidx.compose.runtime.*
+
+ @Composable
+ fun Test(s: String) {
+ remember<@Composable () -> Unit> { { Text(s) } }()
+ currentComposer.cache<@Composable () -> Unit>(false) { { Text(s) } }()
+ }
+ """,
+ """
+ @Composable
+ fun Test(s: String, %composer: Composer?, %changed: Int) {
+ if (isTraceInProgress()) {
+ traceEventStart(<>)
+ }
+ %composer = %composer.startRestartGroup(<>)
+ sourceInformation(%composer, "C(Test)<rememb...>,<rememb...>,<curren...>:Test.kt")
+ val %dirty = %changed
+ if (%changed and 0b1110 === 0) {
+ %dirty = %dirty or if (%composer.changed(s)) 0b0100 else 0b0010
+ }
+ if (%dirty and 0b1011 !== 0b0010 || !%composer.skipping) {
+ remember({
+ composableLambdaInstance(<>, true) { %composer: Composer?, %changed: Int ->
+ sourceInformation(%composer, "C<Text(s...>:Test.kt")
+ if (%changed and 0b1011 !== 0b0010 || !%composer.skipping) {
+ Text(s, %composer, 0b1110 and %dirty)
+ } else {
+ %composer.skipToGroupEnd()
+ }
+ }
+ }, %composer, 0)(%composer, 6)
+ %composer.cache(false) {
+ composableLambdaInstance(<>, true) { %composer: Composer?, %changed: Int ->
+ sourceInformation(%composer, "C<Text(s...>:Test.kt")
+ if (%changed and 0b1011 !== 0b0010 || !%composer.skipping) {
+ Text(s, %composer, 0b1110 and %dirty)
+ } else {
+ %composer.skipToGroupEnd()
+ }
+ }
+ }
+ (%composer, 0)
+ } else {
+ %composer.skipToGroupEnd()
+ }
+ %composer.endRestartGroup()?.updateScope { %composer: Composer?, %force: Int ->
+ Test(s, %composer, %changed or 0b0001)
+ }
+ if (isTraceInProgress()) {
+ traceEventEnd()
+ }
+ }
+ """,
+ """
+ import androidx.compose.runtime.Composable
+ @Composable fun Text(s: String) {}
+ """
+ )
}
diff --git a/compose/compiler/compiler-hosted/integration-tests/src/test/java/androidx/compose/compiler/plugins/kotlin/RememberIntrinsicTransformTests.kt b/compose/compiler/compiler-hosted/integration-tests/src/test/java/androidx/compose/compiler/plugins/kotlin/RememberIntrinsicTransformTests.kt
index ed6e655..06a4583 100644
--- a/compose/compiler/compiler-hosted/integration-tests/src/test/java/androidx/compose/compiler/plugins/kotlin/RememberIntrinsicTransformTests.kt
+++ b/compose/compiler/compiler-hosted/integration-tests/src/test/java/androidx/compose/compiler/plugins/kotlin/RememberIntrinsicTransformTests.kt
@@ -70,8 +70,7 @@
val a = %composer.startReplaceableGroup(<>)
val tmp0_group = if (x) {
%composer.cache(false) {
- val tmp0_return = 1
- tmp0_return
+ 1
}
} else {
2
@@ -79,8 +78,7 @@
%composer.endReplaceableGroup()
tmp0_group
val b = remember({
- val tmp0_return = 2
- tmp0_return
+ 2
}, %composer, 0)
%composer.endReplaceableGroup()
}
@@ -116,8 +114,7 @@
failedResource = null
}
val deferred = %composer.cache(%changed and 0b1110 xor 0b0110 > 4 && %composer.changed(key) || %changed and 0b0110 === 0b0100 or %changed and 0b01110000 xor 0b00110000 > 32 && %composer.changed(pendingResource) || %changed and 0b00110000 === 0b00100000 or %changed and 0b001110000000 xor 0b000110000000 > 256 && %composer.changed(failedResource) || %changed and 0b000110000000 === 0b000100000000) {
- val tmp0_return = 123
- tmp0_return
+ 123
}
val tmp0 = deferred > 10
%composer.endReplaceableGroup()
@@ -161,8 +158,7 @@
}
if (%dirty and 0b1011 !== 0b0010 || !%composer.skipping) {
%composer.cache(%dirty and 0b1110 === 0b0100) {
- val tmp0_return = 1
- tmp0_return
+ 1
}
} else {
%composer.skipToGroupEnd()
@@ -182,8 +178,7 @@
%composer = %composer.startRestartGroup(<>)
sourceInformation(%composer, "C(test2):Test.kt")
%composer.cache(%composer.changed(x)) {
- val tmp0_return = 1
- tmp0_return
+ 1
}
%composer.endRestartGroup()?.updateScope { %composer: Composer?, %force: Int ->
test2(x, %composer, %changed or 0b0001)
@@ -205,8 +200,7 @@
}
if (%dirty and 0b1011 !== 0b0010 || !%composer.skipping) {
%composer.cache(%dirty and 0b1110 === 0b0100 || %dirty and 0b1000 !== 0 && %composer.changed(x)) {
- val tmp0_return = 1
- tmp0_return
+ 1
}
} else {
%composer.skipToGroupEnd()
@@ -254,8 +248,7 @@
%composer.startReplaceableGroup(<>)
sourceInformation(%composer, "C(test1):Test.kt")
%composer.cache(%changed and 0b1110 xor 0b0110 > 4 && %composer.changed(x) || %changed and 0b0110 === 0b0100) {
- val tmp0_return = 1
- tmp0_return
+ 1
}
%composer.endReplaceableGroup()
}
@@ -265,8 +258,7 @@
%composer.startReplaceableGroup(<>)
sourceInformation(%composer, "C(test2):Test.kt")
%composer.cache(%composer.changed(x)) {
- val tmp0_return = 1
- tmp0_return
+ 1
}
%composer.endReplaceableGroup()
}
@@ -276,8 +268,7 @@
%composer.startReplaceableGroup(<>)
sourceInformation(%composer, "C(test3):Test.kt")
%composer.cache(%changed and 0b1110 xor 0b0110 > 4 && %composer.changed(x) || %changed and 0b0110 === 0b0100) {
- val tmp0_return = 1
- tmp0_return
+ 1
}
%composer.endReplaceableGroup()
}
@@ -299,8 +290,7 @@
%composer.startReplaceableGroup(<>)
sourceInformation(%composer, "C(rememberFoo):Test.kt")
val tmp0 = %composer.cache(%changed and 0b1110 xor 0b0110 > 4 && %composer.changed(a) || %changed and 0b0110 === 0b0100 or %changed and 0b01110000 xor 0b00110000 > 32 && %composer.changed(b) || %changed and 0b00110000 === 0b00100000) {
- val tmp0_return = Foo(a, b)
- tmp0_return
+ Foo(a, b)
}
%composer.endReplaceableGroup()
return tmp0
@@ -333,17 +323,14 @@
sourceInformation(%composer, "C(Test)<A()>,<rememb...>:Test.kt")
if (%changed !== 0 || !%composer.skipping) {
val foo = %composer.cache(false) {
- val tmp0_return = Foo()
- tmp0_return
+ Foo()
}
val bar = %composer.cache(false) {
- val tmp0_return = Foo()
- tmp0_return
+ Foo()
}
A(%composer, 0)
val bam = remember({
- val tmp0_return = Foo()
- tmp0_return
+ Foo()
}, %composer, 0)
} else {
%composer.skipToGroupEnd()
@@ -384,8 +371,7 @@
val a = someInt()
val b = someInt()
val foo = %composer.cache(%composer.changed(a) or %composer.changed(b)) {
- val tmp0_return = Foo(a, b)
- tmp0_return
+ Foo(a, b)
}
} else {
%composer.skipToGroupEnd()
@@ -422,8 +408,7 @@
sourceInformation(%composer, "C(Test)<CInt()...>,<rememb...>:Test.kt")
if (%changed !== 0 || !%composer.skipping) {
val foo = remember(CInt(%composer, 0), {
- val tmp0_return = Foo()
- tmp0_return
+ Foo()
}, %composer, 0)
} else {
%composer.skipToGroupEnd()
@@ -465,8 +450,7 @@
if (%changed !== 0 || !%composer.skipping) {
val bar = compositionLocalBar.current
val foo = %composer.cache(%composer.changed(bar)) {
- val tmp0_return = Foo()
- tmp0_return
+ Foo()
}
} else {
%composer.skipToGroupEnd()
@@ -506,8 +490,7 @@
sourceInformation(%composer, "C(Test)<curren...>:Test.kt")
if (%changed !== 0 || !%composer.skipping) {
val foo = %composer.cache(%composer.changed(compositionLocalBar.current)) {
- val tmp0_return = Foo()
- tmp0_return
+ Foo()
}
} else {
%composer.skipToGroupEnd()
@@ -546,8 +529,7 @@
if (%changed !== 0 || !%composer.skipping) {
A(%composer, 0)
val foo = remember({
- val tmp0_return = Foo()
- tmp0_return
+ Foo()
}, %composer, 0)
} else {
%composer.skipToGroupEnd()
@@ -593,8 +575,7 @@
A(%composer, 0)
if (condition) {
val foo = %composer.cache(false) {
- val tmp0_return = Foo()
- tmp0_return
+ Foo()
}
}
} else {
@@ -641,8 +622,7 @@
if (condition) {
A(%composer, 0)
val foo = remember({
- val tmp0_return = Foo()
- tmp0_return
+ Foo()
}, %composer, 0)
}
} else {
@@ -685,8 +665,7 @@
while (tmp0_iterator.hasNext()) {
val item = tmp0_iterator.next()
val foo = remember({
- val tmp0_return = Foo()
- tmp0_return
+ Foo()
}, %composer, 0)
print(foo)
print(item)
@@ -730,8 +709,7 @@
while (tmp0_iterator.hasNext()) {
val item = tmp0_iterator.next()
val foo = remember({
- val tmp0_return = Foo()
- tmp0_return
+ Foo()
}, %composer, 0)
A(%composer, 0)
print(foo)
@@ -768,8 +746,7 @@
%composer = %composer.startRestartGroup(<>)
sourceInformation(%composer, "C(Test):Test.kt")
val foo = %composer.cache(false) {
- val tmp0_return = Foo()
- tmp0_return
+ Foo()
}
used(items)
%composer.endRestartGroup()?.updateScope { %composer: Composer?, %force: Int ->
@@ -817,8 +794,7 @@
}
if (%dirty and 0b0001011011011011 !== 0b010010010010 || !%composer.skipping) {
val foo = %composer.cache(%dirty and 0b1110 === 0b0100 or %dirty and 0b01110000 === 0b00100000 or %dirty and 0b001110000000 === 0b000100000000 or %dirty and 0b0001110000000000 === 0b100000000000) {
- val tmp0_return = Foo()
- tmp0_return
+ Foo()
}
} else {
%composer.skipToGroupEnd()
@@ -854,8 +830,7 @@
%composer = %composer.startRestartGroup(<>)
sourceInformation(%composer, "C(Test)<rememb...>:Test.kt")
val foo = remember(*items, {
- val tmp0_return = Foo()
- tmp0_return
+ Foo()
}, %composer, 0)
%composer.endRestartGroup()?.updateScope { %composer: Composer?, %force: Int ->
Test(items, %composer, %changed or 0b0001)
@@ -895,8 +870,7 @@
if (%dirty and 0b1011 !== 0b0010 || !%composer.skipping) {
val a = InlineInt(123)
val foo = %composer.cache(%dirty and 0b1110 === 0b0100) {
- val tmp0_return = Foo()
- tmp0_return
+ Foo()
}
} else {
%composer.skipToGroupEnd()
@@ -940,14 +914,12 @@
val a = someInt()
val b = someInt()
val foo = %composer.cache(%composer.changed(a) or %composer.changed(b)) {
- val tmp0_return = Foo(a, b)
- tmp0_return
+ Foo(a, b)
}
val c = someInt()
val d = someInt()
val bar = %composer.cache(%composer.changed(c) or %composer.changed(d)) {
- val tmp0_return = Foo(c, d)
- tmp0_return
+ Foo(c, d)
}
} else {
%composer.skipToGroupEnd()
@@ -990,8 +962,7 @@
if (%dirty and 0b1011 !== 0b0010 || !%composer.skipping) {
val b = someInt()
val foo = %composer.cache(%dirty and 0b1110 === 0b0100 or %composer.changed(b)) {
- val tmp0_return = Foo(a, b)
- tmp0_return
+ Foo(a, b)
}
} else {
%composer.skipToGroupEnd()
@@ -1026,8 +997,7 @@
sourceInformation(%composer, "C(Test):Test.kt")
val b = someInt()
val tmp0 = %composer.cache(%changed and 0b1110 xor 0b0110 > 4 && %composer.changed(a) || %changed and 0b0110 === 0b0100 or %composer.changed(b)) {
- val tmp0_return = Foo(a, b)
- tmp0_return
+ Foo(a, b)
}
%composer.endReplaceableGroup()
return tmp0
diff --git a/compose/compiler/compiler-hosted/integration-tests/src/test/java/androidx/compose/compiler/plugins/kotlin/StabilityPropagationTransformTests.kt b/compose/compiler/compiler-hosted/integration-tests/src/test/java/androidx/compose/compiler/plugins/kotlin/StabilityPropagationTransformTests.kt
index fe408f3..963ccc0 100644
--- a/compose/compiler/compiler-hosted/integration-tests/src/test/java/androidx/compose/compiler/plugins/kotlin/StabilityPropagationTransformTests.kt
+++ b/compose/compiler/compiler-hosted/integration-tests/src/test/java/androidx/compose/compiler/plugins/kotlin/StabilityPropagationTransformTests.kt
@@ -74,8 +74,7 @@
A(x, %composer, 0b1110 and %dirty)
A(Foo(0), %composer, 0)
A(remember({
- val tmp0_return = Foo(0)
- tmp0_return
+ Foo(0)
}, %composer, 0), %composer, 0b0110)
} else {
%composer.skipToGroupEnd()
@@ -117,8 +116,7 @@
A(x, %composer, 0b1000)
A(Foo(0), %composer, 0b1000)
A(remember({
- val tmp0_return = Foo(0)
- tmp0_return
+ Foo(0)
}, %composer, 0), %composer, 0b1000)
%composer.endRestartGroup()?.updateScope { %composer: Composer?, %force: Int ->
Test(x, %composer, %changed or 0b0001)
diff --git a/compose/compiler/compiler-hosted/integration-tests/src/test/java/androidx/compose/compiler/plugins/kotlin/analysis/ComposableDeclarationCheckerTests.kt b/compose/compiler/compiler-hosted/integration-tests/src/test/java/androidx/compose/compiler/plugins/kotlin/analysis/ComposableDeclarationCheckerTests.kt
index cd14801..fc6c275 100644
--- a/compose/compiler/compiler-hosted/integration-tests/src/test/java/androidx/compose/compiler/plugins/kotlin/analysis/ComposableDeclarationCheckerTests.kt
+++ b/compose/compiler/compiler-hosted/integration-tests/src/test/java/androidx/compose/compiler/plugins/kotlin/analysis/ComposableDeclarationCheckerTests.kt
@@ -255,4 +255,19 @@
"""
)
}
+
+ fun testOverrideWithoutComposeAnnotation() {
+ doTest(
+ """
+ import androidx.compose.runtime.Composable
+ interface Base {
+ fun compose(content: () -> Unit)
+ }
+
+ class Impl : Base {
+ <!CONFLICTING_OVERLOADS!>override fun compose(content: @Composable () -> Unit)<!> {}
+ }
+ """
+ )
+ }
}
diff --git a/compose/compiler/compiler-hosted/src/main/java/androidx/compose/compiler/plugins/kotlin/ComposableDeclarationChecker.kt b/compose/compiler/compiler-hosted/src/main/java/androidx/compose/compiler/plugins/kotlin/ComposableDeclarationChecker.kt
index 201f555..30952f6 100644
--- a/compose/compiler/compiler-hosted/src/main/java/androidx/compose/compiler/plugins/kotlin/ComposableDeclarationChecker.kt
+++ b/compose/compiler/compiler-hosted/src/main/java/androidx/compose/compiler/plugins/kotlin/ComposableDeclarationChecker.kt
@@ -86,6 +86,21 @@
)
)
}
+
+ descriptor.valueParameters.forEach { valueParameter ->
+ valueParameter.overriddenDescriptors.firstOrNull()?.let { overriddenParam ->
+ val overrideIsComposable = overriddenParam.type.hasComposableAnnotation()
+ val paramIsComposable = valueParameter.type.hasComposableAnnotation()
+ if (paramIsComposable != overrideIsComposable) {
+ context.trace.report(
+ ComposeErrors.CONFLICTING_OVERLOADS.on(
+ declaration,
+ listOf(valueParameter, overriddenParam)
+ )
+ )
+ }
+ }
+ }
}
if (descriptor.isSuspend && hasComposableAnnotation) {
context.trace.report(
diff --git a/compose/compiler/compiler-hosted/src/main/java/androidx/compose/compiler/plugins/kotlin/ComposeErrorMessages.kt b/compose/compiler/compiler-hosted/src/main/java/androidx/compose/compiler/plugins/kotlin/ComposeErrorMessages.kt
index 726677c..726ae5b 100644
--- a/compose/compiler/compiler-hosted/src/main/java/androidx/compose/compiler/plugins/kotlin/ComposeErrorMessages.kt
+++ b/compose/compiler/compiler-hosted/src/main/java/androidx/compose/compiler/plugins/kotlin/ComposeErrorMessages.kt
@@ -87,7 +87,7 @@
)
MAP.put(
ComposeErrors.COMPOSABLE_SUSPEND_FUN,
- "Composable properties are not able to have backing fields"
+ "Composable function cannot be annotated as suspend"
)
MAP.put(
ComposeErrors.ABSTRACT_COMPOSABLE_DEFAULT_PARAMETER_VALUE,
diff --git a/compose/compiler/compiler-hosted/src/main/java/androidx/compose/compiler/plugins/kotlin/lower/AbstractComposeLowering.kt b/compose/compiler/compiler-hosted/src/main/java/androidx/compose/compiler/plugins/kotlin/lower/AbstractComposeLowering.kt
index 1c06fcd..7b9e942 100644
--- a/compose/compiler/compiler-hosted/src/main/java/androidx/compose/compiler/plugins/kotlin/lower/AbstractComposeLowering.kt
+++ b/compose/compiler/compiler-hosted/src/main/java/androidx/compose/compiler/plugins/kotlin/lower/AbstractComposeLowering.kt
@@ -16,11 +16,10 @@
package androidx.compose.compiler.plugins.kotlin.lower
-import androidx.compose.compiler.plugins.kotlin.ModuleMetrics
import androidx.compose.compiler.plugins.kotlin.ComposeFqNames
import androidx.compose.compiler.plugins.kotlin.FunctionMetrics
import androidx.compose.compiler.plugins.kotlin.KtxNameConventions
-import androidx.compose.compiler.plugins.kotlin.allowsComposableCalls
+import androidx.compose.compiler.plugins.kotlin.ModuleMetrics
import androidx.compose.compiler.plugins.kotlin.analysis.ComposeWritableSlices
import androidx.compose.compiler.plugins.kotlin.analysis.Stability
import androidx.compose.compiler.plugins.kotlin.analysis.StabilityInferencer
@@ -69,7 +68,6 @@
import org.jetbrains.kotlin.ir.declarations.IrField
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.IrProperty
import org.jetbrains.kotlin.ir.declarations.IrSimpleFunction
import org.jetbrains.kotlin.ir.declarations.IrTypeParameter
@@ -166,15 +164,6 @@
val bindingTrace: BindingTrace,
val metrics: ModuleMetrics
) : IrElementTransformerVoid(), ModuleLoweringPass {
-
- var inlinedFunctions: Set<InlineLambdaInfo> = setOf()
-
- override fun lower(module: IrModuleFragment) {
- // TODO: Might be worth caching this up in ComposeIrGenerationExtension, or maybe not
- // because it might be better to keep the transforms independent.
- inlinedFunctions = IrInlineReferenceLocator.scan(context, module)
- }
-
@ObsoleteDescriptorBasedAPI
protected val typeTranslator =
TypeTranslatorImpl(
@@ -377,13 +366,6 @@
return context.irTrace[ComposeWritableSlices.IS_COMPOSABLE_SINGLETON_CLASS, this] == true
}
- fun IrFunction.isInlinedLambda(): Boolean {
- for (element in inlinedFunctions) {
- if (element.argument.function == this) return true
- }
- return false
- }
-
protected val KotlinType.isEnum
get() =
(constructor.declarationDescriptor as? ClassDescriptor)?.kind == ClassKind.ENUM_CLASS
@@ -426,15 +408,6 @@
?.modality == Modality.FINAL
@OptIn(ObsoleteDescriptorBasedAPI::class)
- fun FunctionDescriptor.allowsComposableCalls(): Boolean {
- return allowsComposableCalls(context.bindingContext)
- }
-
- @OptIn(ObsoleteDescriptorBasedAPI::class)
- fun IrFunctionExpression.allowsComposableCalls(): Boolean =
- function.descriptor.allowsComposableCalls(context.bindingContext)
-
- @OptIn(ObsoleteDescriptorBasedAPI::class)
private fun IrFunction.createParameterDeclarations() {
fun ParameterDescriptor.irValueParameter() = IrValueParameterImpl(
this.startOffset ?: UNDEFINED_OFFSET,
diff --git a/compose/compiler/compiler-hosted/src/main/java/androidx/compose/compiler/plugins/kotlin/lower/ComposableFunctionBodyTransformer.kt b/compose/compiler/compiler-hosted/src/main/java/androidx/compose/compiler/plugins/kotlin/lower/ComposableFunctionBodyTransformer.kt
index b0224dc..e9ff94c 100644
--- a/compose/compiler/compiler-hosted/src/main/java/androidx/compose/compiler/plugins/kotlin/lower/ComposableFunctionBodyTransformer.kt
+++ b/compose/compiler/compiler-hosted/src/main/java/androidx/compose/compiler/plugins/kotlin/lower/ComposableFunctionBodyTransformer.kt
@@ -462,8 +462,10 @@
FileLoweringPass,
ModuleLoweringPass {
+ private var inlineLambdaInfo = ComposeInlineLambdaLocator(context)
+
override fun lower(module: IrModuleFragment) {
- super.lower(module)
+ inlineLambdaInfo.scan(module)
module.transformChildrenVoid(this)
applySourceFixups()
module.patchDeclarationParents()
@@ -782,7 +784,7 @@
return false
// Do not insert an observe scope in an inline composable lambda
- if (this.isInlinedLambda()) return false
+ if (inlineLambdaInfo.isInlineLambda(this)) return false
// Do not insert an observe scope if the function has a return result
if (descriptor.returnType.let { it == null || !it.isUnit() })
@@ -3013,13 +3015,12 @@
// now after the inner block is extracted, the $composer parameter used in the block needs
// to be remapped to the outer composer instead for the expression and any inlined lambdas.
block.transformChildrenVoid(object : IrElementTransformerVoid() {
- override fun visitFunction(declaration: IrFunction): IrStatement {
- if (declaration.isInlinedLambda()) {
- return super.visitFunction(declaration)
+ override fun visitFunction(declaration: IrFunction): IrStatement =
+ if (inlineLambdaInfo.isInlineLambda(declaration)) {
+ super.visitFunction(declaration)
} else {
- return declaration
+ declaration
}
- }
override fun visitGetValue(expression: IrGetValue): IrExpression {
super.visitGetValue(expression)
@@ -3484,7 +3485,8 @@
val function: IrFunction,
private val transformer: ComposableFunctionBodyTransformer
) : BlockScope("fun ${function.name.asString()}") {
- val isInlinedLambda = with(transformer) { function.isInlinedLambda() }
+ val isInlinedLambda: Boolean
+ get() = transformer.inlineLambdaInfo.isInlineLambda(function)
val metrics: FunctionMetrics = transformer.metricsFor(function)
@@ -3493,7 +3495,10 @@
private fun nextTemporaryIndex(): Int = lastTemporaryIndex++
override val isInComposable: Boolean
- get() = if (isInlinedLambda) (parent?.isInComposable ?: false) else isComposable
+ get() = isComposable ||
+ transformer.inlineLambdaInfo.preservesComposableScope(function) &&
+ parent?.isInComposable == true
+
override val functionScope: FunctionScope? get() = this
override val nearestComposer: IrValueParameter?
get() = composerParameter ?: super.nearestComposer
diff --git a/compose/compiler/compiler-hosted/src/main/java/androidx/compose/compiler/plugins/kotlin/lower/ComposableTargetAnnotationsTransformer.kt b/compose/compiler/compiler-hosted/src/main/java/androidx/compose/compiler/plugins/kotlin/lower/ComposableTargetAnnotationsTransformer.kt
index 780f8ec..345addb 100644
--- a/compose/compiler/compiler-hosted/src/main/java/androidx/compose/compiler/plugins/kotlin/lower/ComposableTargetAnnotationsTransformer.kt
+++ b/compose/compiler/compiler-hosted/src/main/java/androidx/compose/compiler/plugins/kotlin/lower/ComposableTargetAnnotationsTransformer.kt
@@ -210,7 +210,6 @@
ComposableInferredTargetClass != null &&
ComposableOpenTargetClass != null
) {
- super.lower(module)
module.transformChildrenVoid(this)
}
}
diff --git a/compose/compiler/compiler-hosted/src/main/java/androidx/compose/compiler/plugins/kotlin/lower/ComposerLambdaMemoization.kt b/compose/compiler/compiler-hosted/src/main/java/androidx/compose/compiler/plugins/kotlin/lower/ComposerLambdaMemoization.kt
index bd56470..4e5045b 100644
--- a/compose/compiler/compiler-hosted/src/main/java/androidx/compose/compiler/plugins/kotlin/lower/ComposerLambdaMemoization.kt
+++ b/compose/compiler/compiler-hosted/src/main/java/androidx/compose/compiler/plugins/kotlin/lower/ComposerLambdaMemoization.kt
@@ -16,8 +16,8 @@
package androidx.compose.compiler.plugins.kotlin.lower
-import androidx.compose.compiler.plugins.kotlin.ModuleMetrics
import androidx.compose.compiler.plugins.kotlin.ComposeFqNames
+import androidx.compose.compiler.plugins.kotlin.ModuleMetrics
import androidx.compose.compiler.plugins.kotlin.analysis.ComposeWritableSlices
import androidx.compose.compiler.plugins.kotlin.analysis.knownStable
import androidx.compose.compiler.plugins.kotlin.irTrace
@@ -190,7 +190,7 @@
val canRemember: Boolean
) : DeclarationContext() {
override val symbol get() = declaration.symbol
- override val functionContext: FunctionContext? get() = this
+ override val functionContext: FunctionContext get() = this
val locals = mutableSetOf<IrValueDeclaration>()
override val captures: MutableSet<IrValueDeclaration> = mutableSetOf()
var collectors = mutableListOf<CaptureCollector>()
@@ -282,7 +282,6 @@
const val COMPOSABLE_LAMBDA_INSTANCE = "composableLambdaInstance"
const val COMPOSABLE_LAMBDA_N_INSTANCE = "composableLambdaNInstance"
-@Suppress("PRE_RELEASE_CLASS")
class ComposerLambdaMemoization(
context: IrPluginContext,
symbolRemapper: DeepCopySymbolRemapper,
@@ -300,6 +299,8 @@
private var composableSingletonsClass: IrClass? = null
private var currentFile: IrFile? = null
+ private var inlineLambdaInfo = ComposeInlineLambdaLocator(context)
+
private fun getOrCreateComposableSingletonsClass(): IrClass {
if (composableSingletonsClass != null) return composableSingletonsClass!!
val declaration = currentFile!!
@@ -367,23 +368,22 @@
}
override fun lower(module: IrModuleFragment) {
- super.lower(module)
+ inlineLambdaInfo.scan(module)
module.transformChildrenVoid(this)
}
override fun visitDeclaration(declaration: IrDeclarationBase): IrStatement {
if (declaration is IrFunction)
return super.visitDeclaration(declaration)
- val symbolOwner = declaration as? IrSymbolOwner
- if (symbolOwner != null) {
- val functionContext = currentFunctionContext
- if (functionContext != null)
- declarationContextStack.push(FunctionLocalSymbol(declaration, functionContext))
- else
- declarationContextStack.push(SymbolOwnerContext(declaration))
+
+ val functionContext = currentFunctionContext
+ if (functionContext != null) {
+ declarationContextStack.push(FunctionLocalSymbol(declaration, functionContext))
+ } else {
+ declarationContextStack.push(SymbolOwnerContext(declaration))
}
val result = super.visitDeclaration(declaration)
- if (symbolOwner != null) declarationContextStack.pop()
+ declarationContextStack.pop()
return result
}
@@ -404,10 +404,15 @@
)
}
+ private val IrFunction.allowsComposableCalls: Boolean
+ get() = hasComposableAnnotation() ||
+ inlineLambdaInfo.preservesComposableScope(this) &&
+ declarationContextStack.peek()?.composable == true
+
@OptIn(ObsoleteDescriptorBasedAPI::class)
override fun visitFunction(declaration: IrFunction): IrStatement {
val descriptor = declaration.descriptor
- val composable = descriptor.allowsComposableCalls()
+ val composable = declaration.allowsComposableCalls
val canRemember = composable &&
// Don't use remember in an inline function
!descriptor.isInline &&
@@ -446,7 +451,6 @@
return super.visitValueAccess(expression)
}
- @OptIn(ObsoleteDescriptorBasedAPI::class)
override fun visitFunctionReference(expression: IrFunctionReference): IrExpression {
// Memoize the instance created by using the :: operator
val result = super.visitFunctionReference(expression)
@@ -527,7 +531,7 @@
// Only memoize non-composable lambdas in a context we can use remember
!functionContext.canRemember ||
// Don't memoize inlined lambdas
- expression.function.isInlinedLambda()
+ inlineLambdaInfo.isInlineLambda(expression.function)
) {
return super.visitFunctionExpression(expression)
}
@@ -580,7 +584,7 @@
val functionExpression = result as? IrFunctionExpression ?: return result
// Do not wrap target of an inline function
- if (expression.function.isInlinedLambda()) {
+ if (inlineLambdaInfo.isInlineLambda(expression.function)) {
return functionExpression
}
@@ -676,7 +680,7 @@
override fun visitFunctionExpression(expression: IrFunctionExpression): IrExpression {
val declarationContext = declarationContextStack.peek()
?: return super.visitFunctionExpression(expression)
- return if (expression.allowsComposableCalls())
+ return if (expression.function.allowsComposableCalls)
visitComposableFunctionExpression(expression, declarationContext)
else
visitNonComposableFunctionExpression(expression)
diff --git a/compose/compiler/compiler-hosted/src/main/java/androidx/compose/compiler/plugins/kotlin/lower/ComposerParamTransformer.kt b/compose/compiler/compiler-hosted/src/main/java/androidx/compose/compiler/plugins/kotlin/lower/ComposerParamTransformer.kt
index f655ba7..1c2facd 100644
--- a/compose/compiler/compiler-hosted/src/main/java/androidx/compose/compiler/plugins/kotlin/lower/ComposerParamTransformer.kt
+++ b/compose/compiler/compiler-hosted/src/main/java/androidx/compose/compiler/plugins/kotlin/lower/ComposerParamTransformer.kt
@@ -24,13 +24,13 @@
import androidx.compose.compiler.plugins.kotlin.lower.decoys.didDecoyHaveDefaultForValueParameter
import androidx.compose.compiler.plugins.kotlin.lower.decoys.isDecoy
import androidx.compose.compiler.plugins.kotlin.lower.decoys.isDecoyImplementation
+import kotlin.math.min
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.ir.moveBodyTo
import org.jetbrains.kotlin.backend.common.ir.remapTypeParameters
import org.jetbrains.kotlin.backend.jvm.ir.isInlineClassType
-import org.jetbrains.kotlin.backend.jvm.ir.isInlineParameter
import org.jetbrains.kotlin.descriptors.CallableDescriptor
import org.jetbrains.kotlin.descriptors.Modality
import org.jetbrains.kotlin.descriptors.ModuleDescriptor
@@ -92,7 +92,6 @@
import org.jetbrains.kotlin.resolve.DescriptorUtils
import org.jetbrains.kotlin.resolve.multiplatform.findCompatibleExpectsForActual
import org.jetbrains.kotlin.util.OperatorNameConventions
-import kotlin.math.min
@Suppress("DEPRECATION")
class ComposerParamTransformer(
@@ -111,11 +110,14 @@
*/
private var currentModule: IrModuleFragment? = null
+ private var inlineLambdaInfo = ComposeInlineLambdaLocator(context)
+
@OptIn(ObsoleteDescriptorBasedAPI::class)
override fun lower(module: IrModuleFragment) {
- super.lower(module)
currentModule = module
+ inlineLambdaInfo.scan(module)
+
module.transformChildrenVoid(this)
module.acceptVoid(symbolRemapper)
@@ -157,7 +159,6 @@
return v2
}
- @OptIn(ObsoleteDescriptorBasedAPI::class)
fun IrCall.withComposerParamIfNeeded(composerParam: IrValueParameter): IrCall {
val isComposableLambda = isComposableLambdaInvoke()
@@ -314,7 +315,6 @@
}
// Transform `@Composable fun foo(params): RetType` into `fun foo(params, $composer: Composer): RetType`
- @OptIn(ObsoleteDescriptorBasedAPI::class)
private fun IrFunction.withComposerParamIfNeeded(): IrFunction {
// don't transform functions that themselves were produced by this function. (ie, if we
// call this with a function that has the synthetic composer parameter, we don't want to
@@ -577,7 +577,7 @@
}
}
- inlinedFunctions += IrInlineReferenceLocator.scan(context, fn)
+ inlineLambdaInfo.scan(fn)
fn.transformChildrenVoid(object : IrElementTransformerVoid() {
var isNestedScope = false
@@ -635,7 +635,7 @@
}
}
- fun defaultParameterType(param: IrValueParameter): IrType {
+ private fun defaultParameterType(param: IrValueParameter): IrType {
val type = param.type
if (param.defaultValue == null) return type
return when {
@@ -645,26 +645,12 @@
}
}
- fun IrCall.isInlineParameterLambdaInvoke(): Boolean {
- if (origin != IrStatementOrigin.INVOKE) return false
- val lambda = dispatchReceiver as? IrGetValue
- val valueParameter = lambda?.symbol?.owner as? IrValueParameter
- return valueParameter?.isInlineParameter() == true
- }
-
private fun IrCall.isComposableLambdaInvoke(): Boolean {
return isInvoke() && dispatchReceiver?.type?.hasComposableAnnotation() == true
}
- private fun IrFunction.isNonComposableInlinedLambda(): Boolean {
- for (element in inlinedFunctions) {
- if (element.argument.function != this)
- continue
- if (!element.parameter.type.hasComposableAnnotation())
- return true
- }
- return false
- }
+ private fun IrFunction.isNonComposableInlinedLambda(): Boolean =
+ inlineLambdaInfo.isInlineLambda(this) && !hasComposableAnnotation()
@OptIn(ObsoleteDescriptorBasedAPI::class)
private fun IrFunction.expectDescriptor(): CallableDescriptor? =
diff --git a/compose/compiler/compiler-hosted/src/main/java/androidx/compose/compiler/plugins/kotlin/lower/IrInlineReferenceLocator.kt b/compose/compiler/compiler-hosted/src/main/java/androidx/compose/compiler/plugins/kotlin/lower/IrInlineReferenceLocator.kt
index d15103b..f3b721c 100644
--- a/compose/compiler/compiler-hosted/src/main/java/androidx/compose/compiler/plugins/kotlin/lower/IrInlineReferenceLocator.kt
+++ b/compose/compiler/compiler-hosted/src/main/java/androidx/compose/compiler/plugins/kotlin/lower/IrInlineReferenceLocator.kt
@@ -17,153 +17,96 @@
package androidx.compose.compiler.plugins.kotlin.lower
+import androidx.compose.compiler.plugins.kotlin.ComposeFqNames
import org.jetbrains.kotlin.backend.common.extensions.IrPluginContext
import org.jetbrains.kotlin.backend.jvm.ir.isInlineParameter
import org.jetbrains.kotlin.ir.IrElement
-import org.jetbrains.kotlin.ir.declarations.IrDeclaration
-import org.jetbrains.kotlin.ir.declarations.IrDeclarationBase
+import org.jetbrains.kotlin.ir.declarations.IrConstructor
import org.jetbrains.kotlin.ir.declarations.IrFunction
import org.jetbrains.kotlin.ir.declarations.IrValueParameter
-import org.jetbrains.kotlin.ir.declarations.IrVariable
import org.jetbrains.kotlin.ir.expressions.IrBlock
-import org.jetbrains.kotlin.ir.expressions.IrCallableReference
import org.jetbrains.kotlin.ir.expressions.IrExpression
import org.jetbrains.kotlin.ir.expressions.IrFunctionAccessExpression
import org.jetbrains.kotlin.ir.expressions.IrFunctionExpression
import org.jetbrains.kotlin.ir.expressions.IrFunctionReference
import org.jetbrains.kotlin.ir.expressions.IrStatementOrigin
-import org.jetbrains.kotlin.ir.util.dump
+import org.jetbrains.kotlin.ir.symbols.IrFunctionSymbol
+import org.jetbrains.kotlin.ir.util.constructedClass
+import org.jetbrains.kotlin.ir.util.hasAnnotation
import org.jetbrains.kotlin.ir.util.isLambda
-import org.jetbrains.kotlin.ir.visitors.IrElementVisitor
+import org.jetbrains.kotlin.ir.visitors.IrElementVisitorVoid
+import org.jetbrains.kotlin.ir.visitors.acceptChildrenVoid
+import org.jetbrains.kotlin.ir.visitors.acceptVoid
-internal open class IrInlineReferenceLocator(private val context: IrPluginContext) :
- IrElementVisitor<Unit, IrDeclaration?> {
- override fun visitElement(element: IrElement, data: IrDeclaration?) {
- element.acceptChildren(this, data)
- }
+class ComposeInlineLambdaLocator(private val context: IrPluginContext) {
+ private val inlineLambdaToParameter = mutableMapOf<IrFunctionSymbol, IrValueParameter>()
- override fun visitDeclaration(declaration: IrDeclarationBase, data: IrDeclaration?) {
- val scope = if (declaration is IrVariable) data else declaration
- declaration.acceptChildren(this, scope)
- }
+ fun isInlineLambda(irFunction: IrFunction): Boolean =
+ irFunction.symbol in inlineLambdaToParameter.keys
- override fun visitValueParameter(declaration: IrValueParameter, data: IrDeclaration?) {
- val parent = declaration.parent as? IrFunction
- if (parent?.isInline == true && declaration.isInlineParameter()) {
- val defaultValue = declaration.defaultValue
- if (defaultValue != null) {
- if (defaultValue.expression.isInlineIrExpression()) {
- visitInlineable(
- defaultValue.expression,
- declaration.parent as IrFunction,
- declaration,
- data!!
- )
+ fun preservesComposableScope(irFunction: IrFunction): Boolean =
+ inlineLambdaToParameter[irFunction.symbol]?.let {
+ !it.isCrossinline && !it.type.hasAnnotation(ComposeFqNames.DisallowComposableCalls)
+ } ?: false
+
+ // Locate all inline lambdas in the scope of the given IrElement.
+ fun scan(element: IrElement) {
+ element.acceptVoid(object : IrElementVisitorVoid {
+ override fun visitElement(element: IrElement) {
+ element.acceptChildrenVoid(this)
+ }
+
+ override fun visitValueParameter(declaration: IrValueParameter) {
+ declaration.acceptChildrenVoid(this)
+ val parent = declaration.parent as? IrFunction
+ if (parent?.isInlineFunctionCall(context) == true &&
+ declaration.isInlineParameter()) {
+ declaration.defaultValue?.expression?.unwrapInlineLambda()?.let {
+ inlineLambdaToParameter[it] = declaration
+ }
}
}
- }
- super.visitValueParameter(declaration, data)
- }
- override fun visitFunctionAccess(expression: IrFunctionAccessExpression, data: IrDeclaration?) {
- val function = expression.symbol.owner
- if (function.isInlineFunctionCall(context)) {
- for (parameter in function.valueParameters) {
- if (!parameter.isInlineParameter())
- continue
-
- val valueArgument = expression.getValueArgument(parameter.index) ?: continue
- if (!valueArgument.isInlineIrExpression())
- continue
-
- visitInlineable(valueArgument, function, parameter, data!!)
- }
- }
- return super.visitFunctionAccess(expression, data)
- }
-
- private fun visitInlineable(
- value: IrExpression,
- callee: IrFunction,
- parameter: IrValueParameter,
- scope: IrDeclaration
- ) {
- if (value is IrBlock) {
- visitInlineLambda(
- value.statements.last() as IrFunctionReference,
- callee,
- parameter,
- scope
- )
- } else if (value is IrFunctionExpression) {
- visitInlineLambda(value, callee, parameter, scope)
- } else if (value is IrCallableReference<*>) {
- visitInlineReference(value)
- }
- }
-
- open fun visitInlineReference(argument: IrCallableReference<*>) {}
-
- open fun visitInlineLambda(
- argument: IrFunctionReference,
- callee: IrFunction,
- parameter: IrValueParameter,
- scope: IrDeclaration
- ) = visitInlineReference(argument)
-
- open fun visitInlineLambda(
- argument: IrFunctionExpression,
- callee: IrFunction,
- parameter: IrValueParameter,
- scope: IrDeclaration
- ) {}
-
- companion object {
- fun scan(context: IrPluginContext, element: IrElement): Set<InlineLambdaInfo> =
- mutableSetOf<InlineLambdaInfo>().apply {
- element.accept(
- object : IrInlineReferenceLocator(context) {
- override fun visitInlineLambda(
- argument: IrFunctionExpression,
- callee: IrFunction,
- parameter: IrValueParameter,
- scope: IrDeclaration
- ) {
- add(InlineLambdaInfo(argument, callee, parameter, scope))
+ override fun visitFunctionAccess(expression: IrFunctionAccessExpression) {
+ expression.acceptChildrenVoid(this)
+ val function = expression.symbol.owner
+ if (function.isInlineFunctionCall(context)) {
+ for (parameter in function.valueParameters) {
+ if (parameter.isInlineParameter()) {
+ expression.getValueArgument(parameter.index)
+ ?.unwrapInlineLambda()
+ ?.let { inlineLambdaToParameter[it] = parameter }
}
- },
- null
- )
+ }
+ }
}
+ })
}
}
-data class InlineLambdaInfo(
- val argument: IrFunctionExpression,
- val callee: IrFunction,
- val parameter: IrValueParameter,
- val scope: IrDeclaration
-)
+// TODO: There is a Kotlin command line option to disable inlining (-Xno-inline). The code
+// should check for this option.
+private fun IrFunction.isInlineFunctionCall(context: IrPluginContext) =
+ isInline || isInlineArrayConstructor(context)
-@Suppress("UNUSED_PARAMETER")
-fun IrFunction.isInlineFunctionCall(context: IrPluginContext) =
- (/*!context.state.isInlineDisabled */ true || typeParameters.any { it.isReified }) && isInline
-
-fun IrExpression.isInlineIrExpression() =
- when (this) {
- is IrBlock -> origin.isInlineIrExpression()
- is IrCallableReference<*> -> true.also {
- assert((0 until valueArgumentsCount).count { getValueArgument(it) != null } == 0) {
- "Expecting 0 value arguments for bounded callable reference: ${dump()}"
- }
- }
- is IrFunctionExpression -> origin.isInlineIrExpression()
- else -> false
+// Constructors can't be marked as inline in metadata, hence this hack.
+private fun IrFunction.isInlineArrayConstructor(context: IrPluginContext): Boolean =
+ this is IrConstructor && valueParameters.size == 2 && constructedClass.symbol.let {
+ it == context.irBuiltIns.arrayClass ||
+ it in context.irBuiltIns.primitiveArraysToPrimitiveTypes
}
-fun IrStatementOrigin?.isInlineIrExpression(): Boolean {
- if (isLambda) return true
- if (this == IrStatementOrigin.ADAPTED_FUNCTION_REFERENCE) return true
- if (this == IrStatementOrigin.SUSPEND_CONVERSION) return true
- return false
+private fun IrExpression.unwrapInlineLambda(): IrFunctionSymbol? = when {
+ this is IrBlock && origin.isInlinable ->
+ (statements.lastOrNull() as? IrFunctionReference)?.symbol
+
+ this is IrFunctionExpression ->
+ function.symbol
+
+ else ->
+ null
}
+
+private val IrStatementOrigin?.isInlinable: Boolean
+ get() = isLambda || this == IrStatementOrigin.ADAPTED_FUNCTION_REFERENCE ||
+ this == IrStatementOrigin.SUSPEND_CONVERSION
diff --git a/compose/foundation/foundation-layout/api/1.2.0-beta02.txt b/compose/foundation/foundation-layout/api/1.2.0-beta02.txt
new file mode 100644
index 0000000..1f5a59d
--- /dev/null
+++ b/compose/foundation/foundation-layout/api/1.2.0-beta02.txt
@@ -0,0 +1,303 @@
+// Signature format: 4.0
+package androidx.compose.foundation.layout {
+
+ public final class AlignmentLineKt {
+ method @androidx.compose.runtime.Stable public static androidx.compose.ui.Modifier paddingFrom(androidx.compose.ui.Modifier, androidx.compose.ui.layout.AlignmentLine alignmentLine, optional float before, optional float after);
+ method @androidx.compose.runtime.Stable public static androidx.compose.ui.Modifier paddingFrom(androidx.compose.ui.Modifier, androidx.compose.ui.layout.AlignmentLine alignmentLine, optional long before, optional long after);
+ method @androidx.compose.runtime.Stable public static androidx.compose.ui.Modifier paddingFromBaseline(androidx.compose.ui.Modifier, optional float top, optional float bottom);
+ method @androidx.compose.runtime.Stable public static androidx.compose.ui.Modifier paddingFromBaseline(androidx.compose.ui.Modifier, optional long top, optional long bottom);
+ }
+
+ @androidx.compose.runtime.Immutable public final class Arrangement {
+ method @androidx.compose.runtime.Stable public androidx.compose.foundation.layout.Arrangement.Horizontal aligned(androidx.compose.ui.Alignment.Horizontal alignment);
+ method @androidx.compose.runtime.Stable public androidx.compose.foundation.layout.Arrangement.Vertical aligned(androidx.compose.ui.Alignment.Vertical alignment);
+ method public androidx.compose.foundation.layout.Arrangement.Vertical getBottom();
+ method public androidx.compose.foundation.layout.Arrangement.HorizontalOrVertical getCenter();
+ method public androidx.compose.foundation.layout.Arrangement.Horizontal getEnd();
+ method public androidx.compose.foundation.layout.Arrangement.HorizontalOrVertical getSpaceAround();
+ method public androidx.compose.foundation.layout.Arrangement.HorizontalOrVertical getSpaceBetween();
+ method public androidx.compose.foundation.layout.Arrangement.HorizontalOrVertical getSpaceEvenly();
+ method public androidx.compose.foundation.layout.Arrangement.Horizontal getStart();
+ method public androidx.compose.foundation.layout.Arrangement.Vertical getTop();
+ method @androidx.compose.runtime.Stable public androidx.compose.foundation.layout.Arrangement.HorizontalOrVertical spacedBy(float space);
+ method @androidx.compose.runtime.Stable public androidx.compose.foundation.layout.Arrangement.Horizontal spacedBy(float space, androidx.compose.ui.Alignment.Horizontal alignment);
+ method @androidx.compose.runtime.Stable public androidx.compose.foundation.layout.Arrangement.Vertical spacedBy(float space, androidx.compose.ui.Alignment.Vertical alignment);
+ property public final androidx.compose.foundation.layout.Arrangement.Vertical Bottom;
+ property public final androidx.compose.foundation.layout.Arrangement.HorizontalOrVertical Center;
+ property public final androidx.compose.foundation.layout.Arrangement.Horizontal End;
+ property public final androidx.compose.foundation.layout.Arrangement.HorizontalOrVertical SpaceAround;
+ property public final androidx.compose.foundation.layout.Arrangement.HorizontalOrVertical SpaceBetween;
+ property public final androidx.compose.foundation.layout.Arrangement.HorizontalOrVertical SpaceEvenly;
+ property public final androidx.compose.foundation.layout.Arrangement.Horizontal Start;
+ property public final androidx.compose.foundation.layout.Arrangement.Vertical Top;
+ field public static final androidx.compose.foundation.layout.Arrangement INSTANCE;
+ }
+
+ @androidx.compose.runtime.Immutable public static final class Arrangement.Absolute {
+ method @androidx.compose.runtime.Stable public androidx.compose.foundation.layout.Arrangement.Horizontal aligned(androidx.compose.ui.Alignment.Horizontal alignment);
+ method public androidx.compose.foundation.layout.Arrangement.Horizontal getCenter();
+ method public androidx.compose.foundation.layout.Arrangement.Horizontal getLeft();
+ method public androidx.compose.foundation.layout.Arrangement.Horizontal getRight();
+ method public androidx.compose.foundation.layout.Arrangement.Horizontal getSpaceAround();
+ method public androidx.compose.foundation.layout.Arrangement.Horizontal getSpaceBetween();
+ method public androidx.compose.foundation.layout.Arrangement.Horizontal getSpaceEvenly();
+ method @androidx.compose.runtime.Stable public androidx.compose.foundation.layout.Arrangement.HorizontalOrVertical spacedBy(float space);
+ method @androidx.compose.runtime.Stable public androidx.compose.foundation.layout.Arrangement.Horizontal spacedBy(float space, androidx.compose.ui.Alignment.Horizontal alignment);
+ method @androidx.compose.runtime.Stable public androidx.compose.foundation.layout.Arrangement.Vertical spacedBy(float space, androidx.compose.ui.Alignment.Vertical alignment);
+ property public final androidx.compose.foundation.layout.Arrangement.Horizontal Center;
+ property public final androidx.compose.foundation.layout.Arrangement.Horizontal Left;
+ property public final androidx.compose.foundation.layout.Arrangement.Horizontal Right;
+ property public final androidx.compose.foundation.layout.Arrangement.Horizontal SpaceAround;
+ property public final androidx.compose.foundation.layout.Arrangement.Horizontal SpaceBetween;
+ property public final androidx.compose.foundation.layout.Arrangement.Horizontal SpaceEvenly;
+ field public static final androidx.compose.foundation.layout.Arrangement.Absolute INSTANCE;
+ }
+
+ @androidx.compose.runtime.Stable public static interface Arrangement.Horizontal {
+ method public void arrange(androidx.compose.ui.unit.Density, int totalSize, int[] sizes, androidx.compose.ui.unit.LayoutDirection layoutDirection, int[] outPositions);
+ method public default float getSpacing();
+ property public default float spacing;
+ }
+
+ @androidx.compose.runtime.Stable public static interface Arrangement.HorizontalOrVertical extends androidx.compose.foundation.layout.Arrangement.Horizontal androidx.compose.foundation.layout.Arrangement.Vertical {
+ property public default float spacing;
+ }
+
+ @androidx.compose.runtime.Stable public static interface Arrangement.Vertical {
+ method public void arrange(androidx.compose.ui.unit.Density, int totalSize, int[] sizes, int[] outPositions);
+ method public default float getSpacing();
+ property public default float spacing;
+ }
+
+ public final class AspectRatioKt {
+ method @androidx.compose.runtime.Stable public static androidx.compose.ui.Modifier aspectRatio(androidx.compose.ui.Modifier, float ratio, optional boolean matchHeightConstraintsFirst);
+ }
+
+ public final class BoxKt {
+ method @androidx.compose.runtime.Composable public static inline void Box(optional androidx.compose.ui.Modifier modifier, optional androidx.compose.ui.Alignment contentAlignment, optional boolean propagateMinConstraints, kotlin.jvm.functions.Function1<? super androidx.compose.foundation.layout.BoxScope,kotlin.Unit> content);
+ method @androidx.compose.runtime.Composable public static void Box(androidx.compose.ui.Modifier modifier);
+ }
+
+ @androidx.compose.foundation.layout.LayoutScopeMarker @androidx.compose.runtime.Immutable public interface BoxScope {
+ method @androidx.compose.runtime.Stable public androidx.compose.ui.Modifier align(androidx.compose.ui.Modifier, androidx.compose.ui.Alignment alignment);
+ method @androidx.compose.runtime.Stable public androidx.compose.ui.Modifier matchParentSize(androidx.compose.ui.Modifier);
+ }
+
+ public final class BoxWithConstraintsKt {
+ method @androidx.compose.runtime.Composable @androidx.compose.ui.UiComposable public static void BoxWithConstraints(optional androidx.compose.ui.Modifier modifier, optional androidx.compose.ui.Alignment contentAlignment, optional boolean propagateMinConstraints, kotlin.jvm.functions.Function1<? super androidx.compose.foundation.layout.BoxWithConstraintsScope,kotlin.Unit> content);
+ }
+
+ @androidx.compose.runtime.Stable public interface BoxWithConstraintsScope extends androidx.compose.foundation.layout.BoxScope {
+ method public long getConstraints();
+ method public float getMaxHeight();
+ method public float getMaxWidth();
+ method public float getMinHeight();
+ method public float getMinWidth();
+ property public abstract long constraints;
+ property public abstract float maxHeight;
+ property public abstract float maxWidth;
+ property public abstract float minHeight;
+ property public abstract float minWidth;
+ }
+
+ public final class ColumnKt {
+ method @androidx.compose.runtime.Composable public static inline void Column(optional androidx.compose.ui.Modifier modifier, optional androidx.compose.foundation.layout.Arrangement.Vertical verticalArrangement, optional androidx.compose.ui.Alignment.Horizontal horizontalAlignment, kotlin.jvm.functions.Function1<? super androidx.compose.foundation.layout.ColumnScope,kotlin.Unit> content);
+ }
+
+ @androidx.compose.foundation.layout.LayoutScopeMarker @androidx.compose.runtime.Immutable public interface ColumnScope {
+ method @androidx.compose.runtime.Stable public androidx.compose.ui.Modifier align(androidx.compose.ui.Modifier, androidx.compose.ui.Alignment.Horizontal alignment);
+ method @androidx.compose.runtime.Stable public androidx.compose.ui.Modifier alignBy(androidx.compose.ui.Modifier, androidx.compose.ui.layout.VerticalAlignmentLine alignmentLine);
+ method @androidx.compose.runtime.Stable public androidx.compose.ui.Modifier alignBy(androidx.compose.ui.Modifier, kotlin.jvm.functions.Function1<? super androidx.compose.ui.layout.Measured,java.lang.Integer> alignmentLineBlock);
+ method @androidx.compose.runtime.Stable public androidx.compose.ui.Modifier weight(androidx.compose.ui.Modifier, float weight, optional boolean fill);
+ }
+
+ public final class IntrinsicKt {
+ method @androidx.compose.runtime.Stable public static androidx.compose.ui.Modifier height(androidx.compose.ui.Modifier, androidx.compose.foundation.layout.IntrinsicSize intrinsicSize);
+ method @androidx.compose.runtime.Stable public static androidx.compose.ui.Modifier requiredHeight(androidx.compose.ui.Modifier, androidx.compose.foundation.layout.IntrinsicSize intrinsicSize);
+ method @androidx.compose.runtime.Stable public static androidx.compose.ui.Modifier requiredWidth(androidx.compose.ui.Modifier, androidx.compose.foundation.layout.IntrinsicSize intrinsicSize);
+ method @androidx.compose.runtime.Stable public static androidx.compose.ui.Modifier width(androidx.compose.ui.Modifier, androidx.compose.foundation.layout.IntrinsicSize intrinsicSize);
+ }
+
+ public enum IntrinsicSize {
+ enum_constant public static final androidx.compose.foundation.layout.IntrinsicSize Max;
+ enum_constant public static final androidx.compose.foundation.layout.IntrinsicSize Min;
+ }
+
+ @kotlin.DslMarker public @interface LayoutScopeMarker {
+ }
+
+ public final class OffsetKt {
+ method @androidx.compose.runtime.Stable public static androidx.compose.ui.Modifier absoluteOffset(androidx.compose.ui.Modifier, optional float x, optional float y);
+ method public static androidx.compose.ui.Modifier absoluteOffset(androidx.compose.ui.Modifier, kotlin.jvm.functions.Function1<? super androidx.compose.ui.unit.Density,androidx.compose.ui.unit.IntOffset> offset);
+ method @androidx.compose.runtime.Stable public static androidx.compose.ui.Modifier offset(androidx.compose.ui.Modifier, optional float x, optional float y);
+ method public static androidx.compose.ui.Modifier offset(androidx.compose.ui.Modifier, kotlin.jvm.functions.Function1<? super androidx.compose.ui.unit.Density,androidx.compose.ui.unit.IntOffset> offset);
+ }
+
+ public final class PaddingKt {
+ method @androidx.compose.runtime.Stable public static androidx.compose.foundation.layout.PaddingValues PaddingValues(float all);
+ method @androidx.compose.runtime.Stable public static androidx.compose.foundation.layout.PaddingValues PaddingValues(optional float horizontal, optional float vertical);
+ method @androidx.compose.runtime.Stable public static androidx.compose.foundation.layout.PaddingValues PaddingValues(optional float start, optional float top, optional float end, optional float bottom);
+ method @androidx.compose.runtime.Stable public static androidx.compose.ui.Modifier absolutePadding(androidx.compose.ui.Modifier, optional float left, optional float top, optional float right, optional float bottom);
+ method @androidx.compose.runtime.Stable public static float calculateEndPadding(androidx.compose.foundation.layout.PaddingValues, androidx.compose.ui.unit.LayoutDirection layoutDirection);
+ method @androidx.compose.runtime.Stable public static float calculateStartPadding(androidx.compose.foundation.layout.PaddingValues, androidx.compose.ui.unit.LayoutDirection layoutDirection);
+ method @androidx.compose.runtime.Stable public static androidx.compose.ui.Modifier padding(androidx.compose.ui.Modifier, optional float start, optional float top, optional float end, optional float bottom);
+ method @androidx.compose.runtime.Stable public static androidx.compose.ui.Modifier padding(androidx.compose.ui.Modifier, optional float horizontal, optional float vertical);
+ method @androidx.compose.runtime.Stable public static androidx.compose.ui.Modifier padding(androidx.compose.ui.Modifier, float all);
+ method @androidx.compose.runtime.Stable public static androidx.compose.ui.Modifier padding(androidx.compose.ui.Modifier, androidx.compose.foundation.layout.PaddingValues paddingValues);
+ }
+
+ @androidx.compose.runtime.Stable public interface PaddingValues {
+ method public float calculateBottomPadding();
+ method public float calculateLeftPadding(androidx.compose.ui.unit.LayoutDirection layoutDirection);
+ method public float calculateRightPadding(androidx.compose.ui.unit.LayoutDirection layoutDirection);
+ method public float calculateTopPadding();
+ }
+
+ @androidx.compose.runtime.Immutable public static final class PaddingValues.Absolute implements androidx.compose.foundation.layout.PaddingValues {
+ ctor public PaddingValues.Absolute(optional @androidx.compose.runtime.Stable float left, optional @androidx.compose.runtime.Stable float top, optional @androidx.compose.runtime.Stable float right, optional @androidx.compose.runtime.Stable float bottom);
+ method public float calculateBottomPadding();
+ method public float calculateLeftPadding(androidx.compose.ui.unit.LayoutDirection layoutDirection);
+ method public float calculateRightPadding(androidx.compose.ui.unit.LayoutDirection layoutDirection);
+ method public float calculateTopPadding();
+ }
+
+ public final class RowColumnImplKt {
+ }
+
+ public final class RowKt {
+ method @androidx.compose.runtime.Composable public static inline void Row(optional androidx.compose.ui.Modifier modifier, optional androidx.compose.foundation.layout.Arrangement.Horizontal horizontalArrangement, optional androidx.compose.ui.Alignment.Vertical verticalAlignment, kotlin.jvm.functions.Function1<? super androidx.compose.foundation.layout.RowScope,kotlin.Unit> content);
+ }
+
+ @androidx.compose.foundation.layout.LayoutScopeMarker @androidx.compose.runtime.Immutable public interface RowScope {
+ method @androidx.compose.runtime.Stable public androidx.compose.ui.Modifier align(androidx.compose.ui.Modifier, androidx.compose.ui.Alignment.Vertical alignment);
+ method @androidx.compose.runtime.Stable public androidx.compose.ui.Modifier alignBy(androidx.compose.ui.Modifier, androidx.compose.ui.layout.HorizontalAlignmentLine alignmentLine);
+ method @androidx.compose.runtime.Stable public androidx.compose.ui.Modifier alignBy(androidx.compose.ui.Modifier, kotlin.jvm.functions.Function1<? super androidx.compose.ui.layout.Measured,java.lang.Integer> alignmentLineBlock);
+ method @androidx.compose.runtime.Stable public androidx.compose.ui.Modifier alignByBaseline(androidx.compose.ui.Modifier);
+ method @androidx.compose.runtime.Stable public androidx.compose.ui.Modifier weight(androidx.compose.ui.Modifier, float weight, optional boolean fill);
+ }
+
+ public final class SizeKt {
+ method @androidx.compose.runtime.Stable public static androidx.compose.ui.Modifier defaultMinSize(androidx.compose.ui.Modifier, optional float minWidth, optional float minHeight);
+ method @androidx.compose.runtime.Stable public static androidx.compose.ui.Modifier fillMaxHeight(androidx.compose.ui.Modifier, optional float fraction);
+ method @androidx.compose.runtime.Stable public static androidx.compose.ui.Modifier fillMaxSize(androidx.compose.ui.Modifier, optional float fraction);
+ method @androidx.compose.runtime.Stable public static androidx.compose.ui.Modifier fillMaxWidth(androidx.compose.ui.Modifier, optional float fraction);
+ method @androidx.compose.runtime.Stable public static androidx.compose.ui.Modifier height(androidx.compose.ui.Modifier, float height);
+ method @androidx.compose.runtime.Stable public static androidx.compose.ui.Modifier heightIn(androidx.compose.ui.Modifier, optional float min, optional float max);
+ method @androidx.compose.runtime.Stable public static androidx.compose.ui.Modifier requiredHeight(androidx.compose.ui.Modifier, float height);
+ method @androidx.compose.runtime.Stable public static androidx.compose.ui.Modifier requiredHeightIn(androidx.compose.ui.Modifier, optional float min, optional float max);
+ method @androidx.compose.runtime.Stable public static androidx.compose.ui.Modifier requiredSize(androidx.compose.ui.Modifier, float size);
+ method @androidx.compose.runtime.Stable public static androidx.compose.ui.Modifier requiredSize(androidx.compose.ui.Modifier, float width, float height);
+ method @androidx.compose.runtime.Stable public static androidx.compose.ui.Modifier requiredSize(androidx.compose.ui.Modifier, long size);
+ method @androidx.compose.runtime.Stable public static androidx.compose.ui.Modifier requiredSizeIn(androidx.compose.ui.Modifier, optional float minWidth, optional float minHeight, optional float maxWidth, optional float maxHeight);
+ method @androidx.compose.runtime.Stable public static androidx.compose.ui.Modifier requiredWidth(androidx.compose.ui.Modifier, float width);
+ method @androidx.compose.runtime.Stable public static androidx.compose.ui.Modifier requiredWidthIn(androidx.compose.ui.Modifier, optional float min, optional float max);
+ method @androidx.compose.runtime.Stable public static androidx.compose.ui.Modifier size(androidx.compose.ui.Modifier, float size);
+ method @androidx.compose.runtime.Stable public static androidx.compose.ui.Modifier size(androidx.compose.ui.Modifier, float width, float height);
+ method @androidx.compose.runtime.Stable public static androidx.compose.ui.Modifier size(androidx.compose.ui.Modifier, long size);
+ method @androidx.compose.runtime.Stable public static androidx.compose.ui.Modifier sizeIn(androidx.compose.ui.Modifier, optional float minWidth, optional float minHeight, optional float maxWidth, optional float maxHeight);
+ method @androidx.compose.runtime.Stable public static androidx.compose.ui.Modifier width(androidx.compose.ui.Modifier, float width);
+ method @androidx.compose.runtime.Stable public static androidx.compose.ui.Modifier widthIn(androidx.compose.ui.Modifier, optional float min, optional float max);
+ method @androidx.compose.runtime.Stable public static androidx.compose.ui.Modifier wrapContentHeight(androidx.compose.ui.Modifier, optional androidx.compose.ui.Alignment.Vertical align, optional boolean unbounded);
+ method @androidx.compose.runtime.Stable public static androidx.compose.ui.Modifier wrapContentSize(androidx.compose.ui.Modifier, optional androidx.compose.ui.Alignment align, optional boolean unbounded);
+ method @androidx.compose.runtime.Stable public static androidx.compose.ui.Modifier wrapContentWidth(androidx.compose.ui.Modifier, optional androidx.compose.ui.Alignment.Horizontal align, optional boolean unbounded);
+ }
+
+ public final class SpacerKt {
+ method @androidx.compose.runtime.Composable @androidx.compose.runtime.NonRestartableComposable public static void Spacer(androidx.compose.ui.Modifier modifier);
+ }
+
+ @androidx.compose.runtime.Stable public interface WindowInsets {
+ method public int getBottom(androidx.compose.ui.unit.Density density);
+ method public int getLeft(androidx.compose.ui.unit.Density density, androidx.compose.ui.unit.LayoutDirection layoutDirection);
+ method public int getRight(androidx.compose.ui.unit.Density density, androidx.compose.ui.unit.LayoutDirection layoutDirection);
+ method public int getTop(androidx.compose.ui.unit.Density density);
+ field public static final androidx.compose.foundation.layout.WindowInsets.Companion Companion;
+ }
+
+ public static final class WindowInsets.Companion {
+ }
+
+ public final class WindowInsetsConnection_androidKt {
+ }
+
+ public final class WindowInsetsKt {
+ method public static androidx.compose.foundation.layout.WindowInsets WindowInsets(optional int left, optional int top, optional int right, optional int bottom);
+ method public static androidx.compose.foundation.layout.WindowInsets WindowInsets(optional float left, optional float top, optional float right, optional float bottom);
+ method public static androidx.compose.foundation.layout.WindowInsets add(androidx.compose.foundation.layout.WindowInsets, androidx.compose.foundation.layout.WindowInsets insets);
+ method @androidx.compose.runtime.Composable @androidx.compose.runtime.ReadOnlyComposable public static androidx.compose.foundation.layout.PaddingValues asPaddingValues(androidx.compose.foundation.layout.WindowInsets);
+ method public static androidx.compose.foundation.layout.PaddingValues asPaddingValues(androidx.compose.foundation.layout.WindowInsets, androidx.compose.ui.unit.Density density);
+ method public static androidx.compose.foundation.layout.WindowInsets exclude(androidx.compose.foundation.layout.WindowInsets, androidx.compose.foundation.layout.WindowInsets insets);
+ method public static androidx.compose.foundation.layout.WindowInsets only(androidx.compose.foundation.layout.WindowInsets, int sides);
+ method public static androidx.compose.foundation.layout.WindowInsets union(androidx.compose.foundation.layout.WindowInsets, androidx.compose.foundation.layout.WindowInsets insets);
+ }
+
+ public final class WindowInsetsPaddingKt {
+ method @androidx.compose.runtime.Stable public static androidx.compose.ui.Modifier windowInsetsPadding(androidx.compose.ui.Modifier, androidx.compose.foundation.layout.WindowInsets insets);
+ }
+
+ public final class WindowInsetsPadding_androidKt {
+ method public static androidx.compose.ui.Modifier captionBarPadding(androidx.compose.ui.Modifier);
+ method public static androidx.compose.ui.Modifier displayCutoutPadding(androidx.compose.ui.Modifier);
+ method public static androidx.compose.ui.Modifier imePadding(androidx.compose.ui.Modifier);
+ method public static androidx.compose.ui.Modifier mandatorySystemGesturesPadding(androidx.compose.ui.Modifier);
+ method public static androidx.compose.ui.Modifier navigationBarsPadding(androidx.compose.ui.Modifier);
+ method public static androidx.compose.ui.Modifier safeContentPadding(androidx.compose.ui.Modifier);
+ method public static androidx.compose.ui.Modifier safeDrawingPadding(androidx.compose.ui.Modifier);
+ method public static androidx.compose.ui.Modifier safeGesturesPadding(androidx.compose.ui.Modifier);
+ method public static androidx.compose.ui.Modifier statusBarsPadding(androidx.compose.ui.Modifier);
+ method public static androidx.compose.ui.Modifier systemBarsPadding(androidx.compose.ui.Modifier);
+ method public static androidx.compose.ui.Modifier systemGesturesPadding(androidx.compose.ui.Modifier);
+ method public static androidx.compose.ui.Modifier waterfallPadding(androidx.compose.ui.Modifier);
+ }
+
+ @kotlin.jvm.JvmInline public final value class WindowInsetsSides {
+ method public operator int plus(int sides);
+ field public static final androidx.compose.foundation.layout.WindowInsetsSides.Companion Companion;
+ }
+
+ public static final class WindowInsetsSides.Companion {
+ method public int getBottom();
+ method public int getEnd();
+ method public int getHorizontal();
+ method public int getLeft();
+ method public int getRight();
+ method public int getStart();
+ method public int getTop();
+ method public int getVertical();
+ property public final int Bottom;
+ property public final int End;
+ property public final int Horizontal;
+ property public final int Left;
+ property public final int Right;
+ property public final int Start;
+ property public final int Top;
+ property public final int Vertical;
+ }
+
+ public final class WindowInsetsSizeKt {
+ method @androidx.compose.runtime.Stable public static androidx.compose.ui.Modifier windowInsetsBottomHeight(androidx.compose.ui.Modifier, androidx.compose.foundation.layout.WindowInsets insets);
+ method @androidx.compose.runtime.Stable public static androidx.compose.ui.Modifier windowInsetsEndWidth(androidx.compose.ui.Modifier, androidx.compose.foundation.layout.WindowInsets insets);
+ method @androidx.compose.runtime.Stable public static androidx.compose.ui.Modifier windowInsetsStartWidth(androidx.compose.ui.Modifier, androidx.compose.foundation.layout.WindowInsets insets);
+ method @androidx.compose.runtime.Stable public static androidx.compose.ui.Modifier windowInsetsTopHeight(androidx.compose.ui.Modifier, androidx.compose.foundation.layout.WindowInsets insets);
+ }
+
+ public final class WindowInsets_androidKt {
+ method @androidx.compose.runtime.Composable @androidx.compose.runtime.NonRestartableComposable public static androidx.compose.foundation.layout.WindowInsets getCaptionBar(androidx.compose.foundation.layout.WindowInsets.Companion);
+ method public static boolean getConsumeWindowInsets(androidx.compose.ui.platform.ComposeView);
+ method @androidx.compose.runtime.Composable @androidx.compose.runtime.NonRestartableComposable public static androidx.compose.foundation.layout.WindowInsets getDisplayCutout(androidx.compose.foundation.layout.WindowInsets.Companion);
+ method @androidx.compose.runtime.Composable @androidx.compose.runtime.NonRestartableComposable public static androidx.compose.foundation.layout.WindowInsets getIme(androidx.compose.foundation.layout.WindowInsets.Companion);
+ method @androidx.compose.runtime.Composable @androidx.compose.runtime.NonRestartableComposable public static androidx.compose.foundation.layout.WindowInsets getMandatorySystemGestures(androidx.compose.foundation.layout.WindowInsets.Companion);
+ method @androidx.compose.runtime.Composable @androidx.compose.runtime.NonRestartableComposable public static androidx.compose.foundation.layout.WindowInsets getNavigationBars(androidx.compose.foundation.layout.WindowInsets.Companion);
+ method @androidx.compose.runtime.Composable @androidx.compose.runtime.NonRestartableComposable public static androidx.compose.foundation.layout.WindowInsets getSafeContent(androidx.compose.foundation.layout.WindowInsets.Companion);
+ method @androidx.compose.runtime.Composable @androidx.compose.runtime.NonRestartableComposable public static androidx.compose.foundation.layout.WindowInsets getSafeDrawing(androidx.compose.foundation.layout.WindowInsets.Companion);
+ method @androidx.compose.runtime.Composable @androidx.compose.runtime.NonRestartableComposable public static androidx.compose.foundation.layout.WindowInsets getSafeGestures(androidx.compose.foundation.layout.WindowInsets.Companion);
+ method @androidx.compose.runtime.Composable @androidx.compose.runtime.NonRestartableComposable public static androidx.compose.foundation.layout.WindowInsets getStatusBars(androidx.compose.foundation.layout.WindowInsets.Companion);
+ method @androidx.compose.runtime.Composable @androidx.compose.runtime.NonRestartableComposable public static androidx.compose.foundation.layout.WindowInsets getSystemBars(androidx.compose.foundation.layout.WindowInsets.Companion);
+ method @androidx.compose.runtime.Composable @androidx.compose.runtime.NonRestartableComposable public static androidx.compose.foundation.layout.WindowInsets getSystemGestures(androidx.compose.foundation.layout.WindowInsets.Companion);
+ method @androidx.compose.runtime.Composable @androidx.compose.runtime.NonRestartableComposable public static androidx.compose.foundation.layout.WindowInsets getTappableElement(androidx.compose.foundation.layout.WindowInsets.Companion);
+ method @androidx.compose.runtime.Composable @androidx.compose.runtime.NonRestartableComposable public static androidx.compose.foundation.layout.WindowInsets getWaterfall(androidx.compose.foundation.layout.WindowInsets.Companion);
+ method public static void setConsumeWindowInsets(androidx.compose.ui.platform.ComposeView, boolean);
+ }
+
+}
+
diff --git a/compose/foundation/foundation-layout/api/public_plus_experimental_1.2.0-beta02.txt b/compose/foundation/foundation-layout/api/public_plus_experimental_1.2.0-beta02.txt
new file mode 100644
index 0000000..9e0d3ee
--- /dev/null
+++ b/compose/foundation/foundation-layout/api/public_plus_experimental_1.2.0-beta02.txt
@@ -0,0 +1,320 @@
+// Signature format: 4.0
+package androidx.compose.foundation.layout {
+
+ public final class AlignmentLineKt {
+ method @androidx.compose.runtime.Stable public static androidx.compose.ui.Modifier paddingFrom(androidx.compose.ui.Modifier, androidx.compose.ui.layout.AlignmentLine alignmentLine, optional float before, optional float after);
+ method @androidx.compose.runtime.Stable public static androidx.compose.ui.Modifier paddingFrom(androidx.compose.ui.Modifier, androidx.compose.ui.layout.AlignmentLine alignmentLine, optional long before, optional long after);
+ method @androidx.compose.runtime.Stable public static androidx.compose.ui.Modifier paddingFromBaseline(androidx.compose.ui.Modifier, optional float top, optional float bottom);
+ method @androidx.compose.runtime.Stable public static androidx.compose.ui.Modifier paddingFromBaseline(androidx.compose.ui.Modifier, optional long top, optional long bottom);
+ }
+
+ @androidx.compose.runtime.Immutable public final class Arrangement {
+ method @androidx.compose.runtime.Stable public androidx.compose.foundation.layout.Arrangement.Horizontal aligned(androidx.compose.ui.Alignment.Horizontal alignment);
+ method @androidx.compose.runtime.Stable public androidx.compose.foundation.layout.Arrangement.Vertical aligned(androidx.compose.ui.Alignment.Vertical alignment);
+ method public androidx.compose.foundation.layout.Arrangement.Vertical getBottom();
+ method public androidx.compose.foundation.layout.Arrangement.HorizontalOrVertical getCenter();
+ method public androidx.compose.foundation.layout.Arrangement.Horizontal getEnd();
+ method public androidx.compose.foundation.layout.Arrangement.HorizontalOrVertical getSpaceAround();
+ method public androidx.compose.foundation.layout.Arrangement.HorizontalOrVertical getSpaceBetween();
+ method public androidx.compose.foundation.layout.Arrangement.HorizontalOrVertical getSpaceEvenly();
+ method public androidx.compose.foundation.layout.Arrangement.Horizontal getStart();
+ method public androidx.compose.foundation.layout.Arrangement.Vertical getTop();
+ method @androidx.compose.runtime.Stable public androidx.compose.foundation.layout.Arrangement.HorizontalOrVertical spacedBy(float space);
+ method @androidx.compose.runtime.Stable public androidx.compose.foundation.layout.Arrangement.Horizontal spacedBy(float space, androidx.compose.ui.Alignment.Horizontal alignment);
+ method @androidx.compose.runtime.Stable public androidx.compose.foundation.layout.Arrangement.Vertical spacedBy(float space, androidx.compose.ui.Alignment.Vertical alignment);
+ property public final androidx.compose.foundation.layout.Arrangement.Vertical Bottom;
+ property public final androidx.compose.foundation.layout.Arrangement.HorizontalOrVertical Center;
+ property public final androidx.compose.foundation.layout.Arrangement.Horizontal End;
+ property public final androidx.compose.foundation.layout.Arrangement.HorizontalOrVertical SpaceAround;
+ property public final androidx.compose.foundation.layout.Arrangement.HorizontalOrVertical SpaceBetween;
+ property public final androidx.compose.foundation.layout.Arrangement.HorizontalOrVertical SpaceEvenly;
+ property public final androidx.compose.foundation.layout.Arrangement.Horizontal Start;
+ property public final androidx.compose.foundation.layout.Arrangement.Vertical Top;
+ field public static final androidx.compose.foundation.layout.Arrangement INSTANCE;
+ }
+
+ @androidx.compose.runtime.Immutable public static final class Arrangement.Absolute {
+ method @androidx.compose.runtime.Stable public androidx.compose.foundation.layout.Arrangement.Horizontal aligned(androidx.compose.ui.Alignment.Horizontal alignment);
+ method public androidx.compose.foundation.layout.Arrangement.Horizontal getCenter();
+ method public androidx.compose.foundation.layout.Arrangement.Horizontal getLeft();
+ method public androidx.compose.foundation.layout.Arrangement.Horizontal getRight();
+ method public androidx.compose.foundation.layout.Arrangement.Horizontal getSpaceAround();
+ method public androidx.compose.foundation.layout.Arrangement.Horizontal getSpaceBetween();
+ method public androidx.compose.foundation.layout.Arrangement.Horizontal getSpaceEvenly();
+ method @androidx.compose.runtime.Stable public androidx.compose.foundation.layout.Arrangement.HorizontalOrVertical spacedBy(float space);
+ method @androidx.compose.runtime.Stable public androidx.compose.foundation.layout.Arrangement.Horizontal spacedBy(float space, androidx.compose.ui.Alignment.Horizontal alignment);
+ method @androidx.compose.runtime.Stable public androidx.compose.foundation.layout.Arrangement.Vertical spacedBy(float space, androidx.compose.ui.Alignment.Vertical alignment);
+ property public final androidx.compose.foundation.layout.Arrangement.Horizontal Center;
+ property public final androidx.compose.foundation.layout.Arrangement.Horizontal Left;
+ property public final androidx.compose.foundation.layout.Arrangement.Horizontal Right;
+ property public final androidx.compose.foundation.layout.Arrangement.Horizontal SpaceAround;
+ property public final androidx.compose.foundation.layout.Arrangement.Horizontal SpaceBetween;
+ property public final androidx.compose.foundation.layout.Arrangement.Horizontal SpaceEvenly;
+ field public static final androidx.compose.foundation.layout.Arrangement.Absolute INSTANCE;
+ }
+
+ @androidx.compose.runtime.Stable public static interface Arrangement.Horizontal {
+ method public void arrange(androidx.compose.ui.unit.Density, int totalSize, int[] sizes, androidx.compose.ui.unit.LayoutDirection layoutDirection, int[] outPositions);
+ method public default float getSpacing();
+ property public default float spacing;
+ }
+
+ @androidx.compose.runtime.Stable public static interface Arrangement.HorizontalOrVertical extends androidx.compose.foundation.layout.Arrangement.Horizontal androidx.compose.foundation.layout.Arrangement.Vertical {
+ property public default float spacing;
+ }
+
+ @androidx.compose.runtime.Stable public static interface Arrangement.Vertical {
+ method public void arrange(androidx.compose.ui.unit.Density, int totalSize, int[] sizes, int[] outPositions);
+ method public default float getSpacing();
+ property public default float spacing;
+ }
+
+ public final class AspectRatioKt {
+ method @androidx.compose.runtime.Stable public static androidx.compose.ui.Modifier aspectRatio(androidx.compose.ui.Modifier, float ratio, optional boolean matchHeightConstraintsFirst);
+ }
+
+ public final class BoxKt {
+ method @androidx.compose.runtime.Composable public static inline void Box(optional androidx.compose.ui.Modifier modifier, optional androidx.compose.ui.Alignment contentAlignment, optional boolean propagateMinConstraints, kotlin.jvm.functions.Function1<? super androidx.compose.foundation.layout.BoxScope,kotlin.Unit> content);
+ method @androidx.compose.runtime.Composable public static void Box(androidx.compose.ui.Modifier modifier);
+ }
+
+ @androidx.compose.foundation.layout.LayoutScopeMarker @androidx.compose.runtime.Immutable public interface BoxScope {
+ method @androidx.compose.runtime.Stable public androidx.compose.ui.Modifier align(androidx.compose.ui.Modifier, androidx.compose.ui.Alignment alignment);
+ method @androidx.compose.runtime.Stable public androidx.compose.ui.Modifier matchParentSize(androidx.compose.ui.Modifier);
+ }
+
+ public final class BoxWithConstraintsKt {
+ method @androidx.compose.runtime.Composable @androidx.compose.ui.UiComposable public static void BoxWithConstraints(optional androidx.compose.ui.Modifier modifier, optional androidx.compose.ui.Alignment contentAlignment, optional boolean propagateMinConstraints, kotlin.jvm.functions.Function1<? super androidx.compose.foundation.layout.BoxWithConstraintsScope,kotlin.Unit> content);
+ }
+
+ @androidx.compose.runtime.Stable public interface BoxWithConstraintsScope extends androidx.compose.foundation.layout.BoxScope {
+ method public long getConstraints();
+ method public float getMaxHeight();
+ method public float getMaxWidth();
+ method public float getMinHeight();
+ method public float getMinWidth();
+ property public abstract long constraints;
+ property public abstract float maxHeight;
+ property public abstract float maxWidth;
+ property public abstract float minHeight;
+ property public abstract float minWidth;
+ }
+
+ public final class ColumnKt {
+ method @androidx.compose.runtime.Composable public static inline void Column(optional androidx.compose.ui.Modifier modifier, optional androidx.compose.foundation.layout.Arrangement.Vertical verticalArrangement, optional androidx.compose.ui.Alignment.Horizontal horizontalAlignment, kotlin.jvm.functions.Function1<? super androidx.compose.foundation.layout.ColumnScope,kotlin.Unit> content);
+ }
+
+ @androidx.compose.foundation.layout.LayoutScopeMarker @androidx.compose.runtime.Immutable public interface ColumnScope {
+ method @androidx.compose.runtime.Stable public androidx.compose.ui.Modifier align(androidx.compose.ui.Modifier, androidx.compose.ui.Alignment.Horizontal alignment);
+ method @androidx.compose.runtime.Stable public androidx.compose.ui.Modifier alignBy(androidx.compose.ui.Modifier, androidx.compose.ui.layout.VerticalAlignmentLine alignmentLine);
+ method @androidx.compose.runtime.Stable public androidx.compose.ui.Modifier alignBy(androidx.compose.ui.Modifier, kotlin.jvm.functions.Function1<? super androidx.compose.ui.layout.Measured,java.lang.Integer> alignmentLineBlock);
+ method @androidx.compose.runtime.Stable public androidx.compose.ui.Modifier weight(androidx.compose.ui.Modifier, float weight, optional boolean fill);
+ }
+
+ @kotlin.RequiresOptIn(message="The API of this layout is experimental and is likely to change in the future.") public @interface ExperimentalLayoutApi {
+ }
+
+ public final class IntrinsicKt {
+ method @androidx.compose.runtime.Stable public static androidx.compose.ui.Modifier height(androidx.compose.ui.Modifier, androidx.compose.foundation.layout.IntrinsicSize intrinsicSize);
+ method @androidx.compose.runtime.Stable public static androidx.compose.ui.Modifier requiredHeight(androidx.compose.ui.Modifier, androidx.compose.foundation.layout.IntrinsicSize intrinsicSize);
+ method @androidx.compose.runtime.Stable public static androidx.compose.ui.Modifier requiredWidth(androidx.compose.ui.Modifier, androidx.compose.foundation.layout.IntrinsicSize intrinsicSize);
+ method @androidx.compose.runtime.Stable public static androidx.compose.ui.Modifier width(androidx.compose.ui.Modifier, androidx.compose.foundation.layout.IntrinsicSize intrinsicSize);
+ }
+
+ public enum IntrinsicSize {
+ enum_constant public static final androidx.compose.foundation.layout.IntrinsicSize Max;
+ enum_constant public static final androidx.compose.foundation.layout.IntrinsicSize Min;
+ }
+
+ @kotlin.DslMarker public @interface LayoutScopeMarker {
+ }
+
+ public final class OffsetKt {
+ method @androidx.compose.runtime.Stable public static androidx.compose.ui.Modifier absoluteOffset(androidx.compose.ui.Modifier, optional float x, optional float y);
+ method public static androidx.compose.ui.Modifier absoluteOffset(androidx.compose.ui.Modifier, kotlin.jvm.functions.Function1<? super androidx.compose.ui.unit.Density,androidx.compose.ui.unit.IntOffset> offset);
+ method @androidx.compose.runtime.Stable public static androidx.compose.ui.Modifier offset(androidx.compose.ui.Modifier, optional float x, optional float y);
+ method public static androidx.compose.ui.Modifier offset(androidx.compose.ui.Modifier, kotlin.jvm.functions.Function1<? super androidx.compose.ui.unit.Density,androidx.compose.ui.unit.IntOffset> offset);
+ }
+
+ public final class PaddingKt {
+ method @androidx.compose.runtime.Stable public static androidx.compose.foundation.layout.PaddingValues PaddingValues(float all);
+ method @androidx.compose.runtime.Stable public static androidx.compose.foundation.layout.PaddingValues PaddingValues(optional float horizontal, optional float vertical);
+ method @androidx.compose.runtime.Stable public static androidx.compose.foundation.layout.PaddingValues PaddingValues(optional float start, optional float top, optional float end, optional float bottom);
+ method @androidx.compose.runtime.Stable public static androidx.compose.ui.Modifier absolutePadding(androidx.compose.ui.Modifier, optional float left, optional float top, optional float right, optional float bottom);
+ method @androidx.compose.runtime.Stable public static float calculateEndPadding(androidx.compose.foundation.layout.PaddingValues, androidx.compose.ui.unit.LayoutDirection layoutDirection);
+ method @androidx.compose.runtime.Stable public static float calculateStartPadding(androidx.compose.foundation.layout.PaddingValues, androidx.compose.ui.unit.LayoutDirection layoutDirection);
+ method @androidx.compose.runtime.Stable public static androidx.compose.ui.Modifier padding(androidx.compose.ui.Modifier, optional float start, optional float top, optional float end, optional float bottom);
+ method @androidx.compose.runtime.Stable public static androidx.compose.ui.Modifier padding(androidx.compose.ui.Modifier, optional float horizontal, optional float vertical);
+ method @androidx.compose.runtime.Stable public static androidx.compose.ui.Modifier padding(androidx.compose.ui.Modifier, float all);
+ method @androidx.compose.runtime.Stable public static androidx.compose.ui.Modifier padding(androidx.compose.ui.Modifier, androidx.compose.foundation.layout.PaddingValues paddingValues);
+ }
+
+ @androidx.compose.runtime.Stable public interface PaddingValues {
+ method public float calculateBottomPadding();
+ method public float calculateLeftPadding(androidx.compose.ui.unit.LayoutDirection layoutDirection);
+ method public float calculateRightPadding(androidx.compose.ui.unit.LayoutDirection layoutDirection);
+ method public float calculateTopPadding();
+ }
+
+ @androidx.compose.runtime.Immutable public static final class PaddingValues.Absolute implements androidx.compose.foundation.layout.PaddingValues {
+ ctor public PaddingValues.Absolute(optional @androidx.compose.runtime.Stable float left, optional @androidx.compose.runtime.Stable float top, optional @androidx.compose.runtime.Stable float right, optional @androidx.compose.runtime.Stable float bottom);
+ method public float calculateBottomPadding();
+ method public float calculateLeftPadding(androidx.compose.ui.unit.LayoutDirection layoutDirection);
+ method public float calculateRightPadding(androidx.compose.ui.unit.LayoutDirection layoutDirection);
+ method public float calculateTopPadding();
+ }
+
+ public final class RowColumnImplKt {
+ }
+
+ public final class RowKt {
+ method @androidx.compose.runtime.Composable public static inline void Row(optional androidx.compose.ui.Modifier modifier, optional androidx.compose.foundation.layout.Arrangement.Horizontal horizontalArrangement, optional androidx.compose.ui.Alignment.Vertical verticalAlignment, kotlin.jvm.functions.Function1<? super androidx.compose.foundation.layout.RowScope,kotlin.Unit> content);
+ }
+
+ @androidx.compose.foundation.layout.LayoutScopeMarker @androidx.compose.runtime.Immutable public interface RowScope {
+ method @androidx.compose.runtime.Stable public androidx.compose.ui.Modifier align(androidx.compose.ui.Modifier, androidx.compose.ui.Alignment.Vertical alignment);
+ method @androidx.compose.runtime.Stable public androidx.compose.ui.Modifier alignBy(androidx.compose.ui.Modifier, androidx.compose.ui.layout.HorizontalAlignmentLine alignmentLine);
+ method @androidx.compose.runtime.Stable public androidx.compose.ui.Modifier alignBy(androidx.compose.ui.Modifier, kotlin.jvm.functions.Function1<? super androidx.compose.ui.layout.Measured,java.lang.Integer> alignmentLineBlock);
+ method @androidx.compose.runtime.Stable public androidx.compose.ui.Modifier alignByBaseline(androidx.compose.ui.Modifier);
+ method @androidx.compose.runtime.Stable public androidx.compose.ui.Modifier weight(androidx.compose.ui.Modifier, float weight, optional boolean fill);
+ }
+
+ public final class SizeKt {
+ method @androidx.compose.runtime.Stable public static androidx.compose.ui.Modifier defaultMinSize(androidx.compose.ui.Modifier, optional float minWidth, optional float minHeight);
+ method @androidx.compose.runtime.Stable public static androidx.compose.ui.Modifier fillMaxHeight(androidx.compose.ui.Modifier, optional float fraction);
+ method @androidx.compose.runtime.Stable public static androidx.compose.ui.Modifier fillMaxSize(androidx.compose.ui.Modifier, optional float fraction);
+ method @androidx.compose.runtime.Stable public static androidx.compose.ui.Modifier fillMaxWidth(androidx.compose.ui.Modifier, optional float fraction);
+ method @androidx.compose.runtime.Stable public static androidx.compose.ui.Modifier height(androidx.compose.ui.Modifier, float height);
+ method @androidx.compose.runtime.Stable public static androidx.compose.ui.Modifier heightIn(androidx.compose.ui.Modifier, optional float min, optional float max);
+ method @androidx.compose.runtime.Stable public static androidx.compose.ui.Modifier requiredHeight(androidx.compose.ui.Modifier, float height);
+ method @androidx.compose.runtime.Stable public static androidx.compose.ui.Modifier requiredHeightIn(androidx.compose.ui.Modifier, optional float min, optional float max);
+ method @androidx.compose.runtime.Stable public static androidx.compose.ui.Modifier requiredSize(androidx.compose.ui.Modifier, float size);
+ method @androidx.compose.runtime.Stable public static androidx.compose.ui.Modifier requiredSize(androidx.compose.ui.Modifier, float width, float height);
+ method @androidx.compose.runtime.Stable public static androidx.compose.ui.Modifier requiredSize(androidx.compose.ui.Modifier, long size);
+ method @androidx.compose.runtime.Stable public static androidx.compose.ui.Modifier requiredSizeIn(androidx.compose.ui.Modifier, optional float minWidth, optional float minHeight, optional float maxWidth, optional float maxHeight);
+ method @androidx.compose.runtime.Stable public static androidx.compose.ui.Modifier requiredWidth(androidx.compose.ui.Modifier, float width);
+ method @androidx.compose.runtime.Stable public static androidx.compose.ui.Modifier requiredWidthIn(androidx.compose.ui.Modifier, optional float min, optional float max);
+ method @androidx.compose.runtime.Stable public static androidx.compose.ui.Modifier size(androidx.compose.ui.Modifier, float size);
+ method @androidx.compose.runtime.Stable public static androidx.compose.ui.Modifier size(androidx.compose.ui.Modifier, float width, float height);
+ method @androidx.compose.runtime.Stable public static androidx.compose.ui.Modifier size(androidx.compose.ui.Modifier, long size);
+ method @androidx.compose.runtime.Stable public static androidx.compose.ui.Modifier sizeIn(androidx.compose.ui.Modifier, optional float minWidth, optional float minHeight, optional float maxWidth, optional float maxHeight);
+ method @androidx.compose.runtime.Stable public static androidx.compose.ui.Modifier width(androidx.compose.ui.Modifier, float width);
+ method @androidx.compose.runtime.Stable public static androidx.compose.ui.Modifier widthIn(androidx.compose.ui.Modifier, optional float min, optional float max);
+ method @androidx.compose.runtime.Stable public static androidx.compose.ui.Modifier wrapContentHeight(androidx.compose.ui.Modifier, optional androidx.compose.ui.Alignment.Vertical align, optional boolean unbounded);
+ method @androidx.compose.runtime.Stable public static androidx.compose.ui.Modifier wrapContentSize(androidx.compose.ui.Modifier, optional androidx.compose.ui.Alignment align, optional boolean unbounded);
+ method @androidx.compose.runtime.Stable public static androidx.compose.ui.Modifier wrapContentWidth(androidx.compose.ui.Modifier, optional androidx.compose.ui.Alignment.Horizontal align, optional boolean unbounded);
+ }
+
+ public final class SpacerKt {
+ method @androidx.compose.runtime.Composable @androidx.compose.runtime.NonRestartableComposable public static void Spacer(androidx.compose.ui.Modifier modifier);
+ }
+
+ @androidx.compose.runtime.Stable public interface WindowInsets {
+ method public int getBottom(androidx.compose.ui.unit.Density density);
+ method public int getLeft(androidx.compose.ui.unit.Density density, androidx.compose.ui.unit.LayoutDirection layoutDirection);
+ method public int getRight(androidx.compose.ui.unit.Density density, androidx.compose.ui.unit.LayoutDirection layoutDirection);
+ method public int getTop(androidx.compose.ui.unit.Density density);
+ field public static final androidx.compose.foundation.layout.WindowInsets.Companion Companion;
+ }
+
+ public static final class WindowInsets.Companion {
+ }
+
+ public final class WindowInsetsConnection_androidKt {
+ method @androidx.compose.foundation.layout.ExperimentalLayoutApi public static androidx.compose.ui.Modifier imeNestedScroll(androidx.compose.ui.Modifier);
+ }
+
+ public final class WindowInsetsKt {
+ method public static androidx.compose.foundation.layout.WindowInsets WindowInsets(optional int left, optional int top, optional int right, optional int bottom);
+ method public static androidx.compose.foundation.layout.WindowInsets WindowInsets(optional float left, optional float top, optional float right, optional float bottom);
+ method public static androidx.compose.foundation.layout.WindowInsets add(androidx.compose.foundation.layout.WindowInsets, androidx.compose.foundation.layout.WindowInsets insets);
+ method @androidx.compose.runtime.Composable @androidx.compose.runtime.ReadOnlyComposable public static androidx.compose.foundation.layout.PaddingValues asPaddingValues(androidx.compose.foundation.layout.WindowInsets);
+ method public static androidx.compose.foundation.layout.PaddingValues asPaddingValues(androidx.compose.foundation.layout.WindowInsets, androidx.compose.ui.unit.Density density);
+ method public static androidx.compose.foundation.layout.WindowInsets exclude(androidx.compose.foundation.layout.WindowInsets, androidx.compose.foundation.layout.WindowInsets insets);
+ method public static androidx.compose.foundation.layout.WindowInsets only(androidx.compose.foundation.layout.WindowInsets, int sides);
+ method public static androidx.compose.foundation.layout.WindowInsets union(androidx.compose.foundation.layout.WindowInsets, androidx.compose.foundation.layout.WindowInsets insets);
+ }
+
+ public final class WindowInsetsPaddingKt {
+ method @androidx.compose.foundation.layout.ExperimentalLayoutApi @androidx.compose.runtime.Stable public static androidx.compose.ui.Modifier consumedWindowInsets(androidx.compose.ui.Modifier, androidx.compose.foundation.layout.WindowInsets insets);
+ method @androidx.compose.foundation.layout.ExperimentalLayoutApi @androidx.compose.runtime.Stable public static androidx.compose.ui.Modifier consumedWindowInsets(androidx.compose.ui.Modifier, androidx.compose.foundation.layout.PaddingValues paddingValues);
+ method @androidx.compose.runtime.Stable public static androidx.compose.ui.Modifier windowInsetsPadding(androidx.compose.ui.Modifier, androidx.compose.foundation.layout.WindowInsets insets);
+ }
+
+ public final class WindowInsetsPadding_androidKt {
+ method public static androidx.compose.ui.Modifier captionBarPadding(androidx.compose.ui.Modifier);
+ method public static androidx.compose.ui.Modifier displayCutoutPadding(androidx.compose.ui.Modifier);
+ method public static androidx.compose.ui.Modifier imePadding(androidx.compose.ui.Modifier);
+ method public static androidx.compose.ui.Modifier mandatorySystemGesturesPadding(androidx.compose.ui.Modifier);
+ method public static androidx.compose.ui.Modifier navigationBarsPadding(androidx.compose.ui.Modifier);
+ method public static androidx.compose.ui.Modifier safeContentPadding(androidx.compose.ui.Modifier);
+ method public static androidx.compose.ui.Modifier safeDrawingPadding(androidx.compose.ui.Modifier);
+ method public static androidx.compose.ui.Modifier safeGesturesPadding(androidx.compose.ui.Modifier);
+ method public static androidx.compose.ui.Modifier statusBarsPadding(androidx.compose.ui.Modifier);
+ method public static androidx.compose.ui.Modifier systemBarsPadding(androidx.compose.ui.Modifier);
+ method public static androidx.compose.ui.Modifier systemGesturesPadding(androidx.compose.ui.Modifier);
+ method public static androidx.compose.ui.Modifier waterfallPadding(androidx.compose.ui.Modifier);
+ }
+
+ @kotlin.jvm.JvmInline public final value class WindowInsetsSides {
+ method public operator int plus(int sides);
+ field public static final androidx.compose.foundation.layout.WindowInsetsSides.Companion Companion;
+ }
+
+ public static final class WindowInsetsSides.Companion {
+ method public int getBottom();
+ method public int getEnd();
+ method public int getHorizontal();
+ method public int getLeft();
+ method public int getRight();
+ method public int getStart();
+ method public int getTop();
+ method public int getVertical();
+ property public final int Bottom;
+ property public final int End;
+ property public final int Horizontal;
+ property public final int Left;
+ property public final int Right;
+ property public final int Start;
+ property public final int Top;
+ property public final int Vertical;
+ }
+
+ public final class WindowInsetsSizeKt {
+ method @androidx.compose.runtime.Stable public static androidx.compose.ui.Modifier windowInsetsBottomHeight(androidx.compose.ui.Modifier, androidx.compose.foundation.layout.WindowInsets insets);
+ method @androidx.compose.runtime.Stable public static androidx.compose.ui.Modifier windowInsetsEndWidth(androidx.compose.ui.Modifier, androidx.compose.foundation.layout.WindowInsets insets);
+ method @androidx.compose.runtime.Stable public static androidx.compose.ui.Modifier windowInsetsStartWidth(androidx.compose.ui.Modifier, androidx.compose.foundation.layout.WindowInsets insets);
+ method @androidx.compose.runtime.Stable public static androidx.compose.ui.Modifier windowInsetsTopHeight(androidx.compose.ui.Modifier, androidx.compose.foundation.layout.WindowInsets insets);
+ }
+
+ public final class WindowInsets_androidKt {
+ method @androidx.compose.foundation.layout.ExperimentalLayoutApi @androidx.compose.runtime.Composable @androidx.compose.runtime.NonRestartableComposable public static boolean getAreNavigationBarsVisible(androidx.compose.foundation.layout.WindowInsets.Companion);
+ method @androidx.compose.foundation.layout.ExperimentalLayoutApi @androidx.compose.runtime.Composable @androidx.compose.runtime.NonRestartableComposable public static boolean getAreStatusBarsVisible(androidx.compose.foundation.layout.WindowInsets.Companion);
+ method @androidx.compose.foundation.layout.ExperimentalLayoutApi @androidx.compose.runtime.Composable @androidx.compose.runtime.NonRestartableComposable public static boolean getAreSystemBarsVisible(androidx.compose.foundation.layout.WindowInsets.Companion);
+ method @androidx.compose.runtime.Composable @androidx.compose.runtime.NonRestartableComposable public static androidx.compose.foundation.layout.WindowInsets getCaptionBar(androidx.compose.foundation.layout.WindowInsets.Companion);
+ method @androidx.compose.foundation.layout.ExperimentalLayoutApi @androidx.compose.runtime.Composable @androidx.compose.runtime.NonRestartableComposable public static androidx.compose.foundation.layout.WindowInsets getCaptionBarIgnoringVisibility(androidx.compose.foundation.layout.WindowInsets.Companion);
+ method public static boolean getConsumeWindowInsets(androidx.compose.ui.platform.ComposeView);
+ method @androidx.compose.runtime.Composable @androidx.compose.runtime.NonRestartableComposable public static androidx.compose.foundation.layout.WindowInsets getDisplayCutout(androidx.compose.foundation.layout.WindowInsets.Companion);
+ method @androidx.compose.runtime.Composable @androidx.compose.runtime.NonRestartableComposable public static androidx.compose.foundation.layout.WindowInsets getIme(androidx.compose.foundation.layout.WindowInsets.Companion);
+ method @androidx.compose.runtime.Composable @androidx.compose.runtime.NonRestartableComposable public static androidx.compose.foundation.layout.WindowInsets getMandatorySystemGestures(androidx.compose.foundation.layout.WindowInsets.Companion);
+ method @androidx.compose.runtime.Composable @androidx.compose.runtime.NonRestartableComposable public static androidx.compose.foundation.layout.WindowInsets getNavigationBars(androidx.compose.foundation.layout.WindowInsets.Companion);
+ method @androidx.compose.foundation.layout.ExperimentalLayoutApi @androidx.compose.runtime.Composable @androidx.compose.runtime.NonRestartableComposable public static androidx.compose.foundation.layout.WindowInsets getNavigationBarsIgnoringVisibility(androidx.compose.foundation.layout.WindowInsets.Companion);
+ method @androidx.compose.runtime.Composable @androidx.compose.runtime.NonRestartableComposable public static androidx.compose.foundation.layout.WindowInsets getSafeContent(androidx.compose.foundation.layout.WindowInsets.Companion);
+ method @androidx.compose.runtime.Composable @androidx.compose.runtime.NonRestartableComposable public static androidx.compose.foundation.layout.WindowInsets getSafeDrawing(androidx.compose.foundation.layout.WindowInsets.Companion);
+ method @androidx.compose.runtime.Composable @androidx.compose.runtime.NonRestartableComposable public static androidx.compose.foundation.layout.WindowInsets getSafeGestures(androidx.compose.foundation.layout.WindowInsets.Companion);
+ method @androidx.compose.runtime.Composable @androidx.compose.runtime.NonRestartableComposable public static androidx.compose.foundation.layout.WindowInsets getStatusBars(androidx.compose.foundation.layout.WindowInsets.Companion);
+ method @androidx.compose.foundation.layout.ExperimentalLayoutApi @androidx.compose.runtime.Composable @androidx.compose.runtime.NonRestartableComposable public static androidx.compose.foundation.layout.WindowInsets getStatusBarsIgnoringVisibility(androidx.compose.foundation.layout.WindowInsets.Companion);
+ method @androidx.compose.runtime.Composable @androidx.compose.runtime.NonRestartableComposable public static androidx.compose.foundation.layout.WindowInsets getSystemBars(androidx.compose.foundation.layout.WindowInsets.Companion);
+ method @androidx.compose.foundation.layout.ExperimentalLayoutApi @androidx.compose.runtime.Composable @androidx.compose.runtime.NonRestartableComposable public static androidx.compose.foundation.layout.WindowInsets getSystemBarsIgnoringVisibility(androidx.compose.foundation.layout.WindowInsets.Companion);
+ method @androidx.compose.runtime.Composable @androidx.compose.runtime.NonRestartableComposable public static androidx.compose.foundation.layout.WindowInsets getSystemGestures(androidx.compose.foundation.layout.WindowInsets.Companion);
+ method @androidx.compose.runtime.Composable @androidx.compose.runtime.NonRestartableComposable public static androidx.compose.foundation.layout.WindowInsets getTappableElement(androidx.compose.foundation.layout.WindowInsets.Companion);
+ method @androidx.compose.foundation.layout.ExperimentalLayoutApi @androidx.compose.runtime.Composable @androidx.compose.runtime.NonRestartableComposable public static androidx.compose.foundation.layout.WindowInsets getTappableElementIgnoringVisibility(androidx.compose.foundation.layout.WindowInsets.Companion);
+ method @androidx.compose.runtime.Composable @androidx.compose.runtime.NonRestartableComposable public static androidx.compose.foundation.layout.WindowInsets getWaterfall(androidx.compose.foundation.layout.WindowInsets.Companion);
+ method @androidx.compose.foundation.layout.ExperimentalLayoutApi @androidx.compose.runtime.Composable @androidx.compose.runtime.NonRestartableComposable public static boolean isCaptionBarVisible(androidx.compose.foundation.layout.WindowInsets.Companion);
+ method @androidx.compose.foundation.layout.ExperimentalLayoutApi @androidx.compose.runtime.Composable @androidx.compose.runtime.NonRestartableComposable public static boolean isImeVisible(androidx.compose.foundation.layout.WindowInsets.Companion);
+ method @androidx.compose.foundation.layout.ExperimentalLayoutApi @androidx.compose.runtime.Composable @androidx.compose.runtime.NonRestartableComposable public static boolean isTappableElementVisible(androidx.compose.foundation.layout.WindowInsets.Companion);
+ method public static void setConsumeWindowInsets(androidx.compose.ui.platform.ComposeView, boolean);
+ }
+
+}
+
diff --git a/compose/foundation/foundation-layout/api/res-1.2.0-beta02.txt b/compose/foundation/foundation-layout/api/res-1.2.0-beta02.txt
new file mode 100644
index 0000000..e69de29
--- /dev/null
+++ b/compose/foundation/foundation-layout/api/res-1.2.0-beta02.txt
diff --git a/compose/foundation/foundation-layout/api/restricted_1.2.0-beta02.txt b/compose/foundation/foundation-layout/api/restricted_1.2.0-beta02.txt
new file mode 100644
index 0000000..e1603e2
--- /dev/null
+++ b/compose/foundation/foundation-layout/api/restricted_1.2.0-beta02.txt
@@ -0,0 +1,308 @@
+// Signature format: 4.0
+package androidx.compose.foundation.layout {
+
+ public final class AlignmentLineKt {
+ method @androidx.compose.runtime.Stable public static androidx.compose.ui.Modifier paddingFrom(androidx.compose.ui.Modifier, androidx.compose.ui.layout.AlignmentLine alignmentLine, optional float before, optional float after);
+ method @androidx.compose.runtime.Stable public static androidx.compose.ui.Modifier paddingFrom(androidx.compose.ui.Modifier, androidx.compose.ui.layout.AlignmentLine alignmentLine, optional long before, optional long after);
+ method @androidx.compose.runtime.Stable public static androidx.compose.ui.Modifier paddingFromBaseline(androidx.compose.ui.Modifier, optional float top, optional float bottom);
+ method @androidx.compose.runtime.Stable public static androidx.compose.ui.Modifier paddingFromBaseline(androidx.compose.ui.Modifier, optional long top, optional long bottom);
+ }
+
+ @androidx.compose.runtime.Immutable public final class Arrangement {
+ method @androidx.compose.runtime.Stable public androidx.compose.foundation.layout.Arrangement.Horizontal aligned(androidx.compose.ui.Alignment.Horizontal alignment);
+ method @androidx.compose.runtime.Stable public androidx.compose.foundation.layout.Arrangement.Vertical aligned(androidx.compose.ui.Alignment.Vertical alignment);
+ method public androidx.compose.foundation.layout.Arrangement.Vertical getBottom();
+ method public androidx.compose.foundation.layout.Arrangement.HorizontalOrVertical getCenter();
+ method public androidx.compose.foundation.layout.Arrangement.Horizontal getEnd();
+ method public androidx.compose.foundation.layout.Arrangement.HorizontalOrVertical getSpaceAround();
+ method public androidx.compose.foundation.layout.Arrangement.HorizontalOrVertical getSpaceBetween();
+ method public androidx.compose.foundation.layout.Arrangement.HorizontalOrVertical getSpaceEvenly();
+ method public androidx.compose.foundation.layout.Arrangement.Horizontal getStart();
+ method public androidx.compose.foundation.layout.Arrangement.Vertical getTop();
+ method @androidx.compose.runtime.Stable public androidx.compose.foundation.layout.Arrangement.HorizontalOrVertical spacedBy(float space);
+ method @androidx.compose.runtime.Stable public androidx.compose.foundation.layout.Arrangement.Horizontal spacedBy(float space, androidx.compose.ui.Alignment.Horizontal alignment);
+ method @androidx.compose.runtime.Stable public androidx.compose.foundation.layout.Arrangement.Vertical spacedBy(float space, androidx.compose.ui.Alignment.Vertical alignment);
+ property public final androidx.compose.foundation.layout.Arrangement.Vertical Bottom;
+ property public final androidx.compose.foundation.layout.Arrangement.HorizontalOrVertical Center;
+ property public final androidx.compose.foundation.layout.Arrangement.Horizontal End;
+ property public final androidx.compose.foundation.layout.Arrangement.HorizontalOrVertical SpaceAround;
+ property public final androidx.compose.foundation.layout.Arrangement.HorizontalOrVertical SpaceBetween;
+ property public final androidx.compose.foundation.layout.Arrangement.HorizontalOrVertical SpaceEvenly;
+ property public final androidx.compose.foundation.layout.Arrangement.Horizontal Start;
+ property public final androidx.compose.foundation.layout.Arrangement.Vertical Top;
+ field public static final androidx.compose.foundation.layout.Arrangement INSTANCE;
+ }
+
+ @androidx.compose.runtime.Immutable public static final class Arrangement.Absolute {
+ method @androidx.compose.runtime.Stable public androidx.compose.foundation.layout.Arrangement.Horizontal aligned(androidx.compose.ui.Alignment.Horizontal alignment);
+ method public androidx.compose.foundation.layout.Arrangement.Horizontal getCenter();
+ method public androidx.compose.foundation.layout.Arrangement.Horizontal getLeft();
+ method public androidx.compose.foundation.layout.Arrangement.Horizontal getRight();
+ method public androidx.compose.foundation.layout.Arrangement.Horizontal getSpaceAround();
+ method public androidx.compose.foundation.layout.Arrangement.Horizontal getSpaceBetween();
+ method public androidx.compose.foundation.layout.Arrangement.Horizontal getSpaceEvenly();
+ method @androidx.compose.runtime.Stable public androidx.compose.foundation.layout.Arrangement.HorizontalOrVertical spacedBy(float space);
+ method @androidx.compose.runtime.Stable public androidx.compose.foundation.layout.Arrangement.Horizontal spacedBy(float space, androidx.compose.ui.Alignment.Horizontal alignment);
+ method @androidx.compose.runtime.Stable public androidx.compose.foundation.layout.Arrangement.Vertical spacedBy(float space, androidx.compose.ui.Alignment.Vertical alignment);
+ property public final androidx.compose.foundation.layout.Arrangement.Horizontal Center;
+ property public final androidx.compose.foundation.layout.Arrangement.Horizontal Left;
+ property public final androidx.compose.foundation.layout.Arrangement.Horizontal Right;
+ property public final androidx.compose.foundation.layout.Arrangement.Horizontal SpaceAround;
+ property public final androidx.compose.foundation.layout.Arrangement.Horizontal SpaceBetween;
+ property public final androidx.compose.foundation.layout.Arrangement.Horizontal SpaceEvenly;
+ field public static final androidx.compose.foundation.layout.Arrangement.Absolute INSTANCE;
+ }
+
+ @androidx.compose.runtime.Stable public static interface Arrangement.Horizontal {
+ method public void arrange(androidx.compose.ui.unit.Density, int totalSize, int[] sizes, androidx.compose.ui.unit.LayoutDirection layoutDirection, int[] outPositions);
+ method public default float getSpacing();
+ property public default float spacing;
+ }
+
+ @androidx.compose.runtime.Stable public static interface Arrangement.HorizontalOrVertical extends androidx.compose.foundation.layout.Arrangement.Horizontal androidx.compose.foundation.layout.Arrangement.Vertical {
+ property public default float spacing;
+ }
+
+ @androidx.compose.runtime.Stable public static interface Arrangement.Vertical {
+ method public void arrange(androidx.compose.ui.unit.Density, int totalSize, int[] sizes, int[] outPositions);
+ method public default float getSpacing();
+ property public default float spacing;
+ }
+
+ public final class AspectRatioKt {
+ method @androidx.compose.runtime.Stable public static androidx.compose.ui.Modifier aspectRatio(androidx.compose.ui.Modifier, float ratio, optional boolean matchHeightConstraintsFirst);
+ }
+
+ public final class BoxKt {
+ method @androidx.compose.runtime.Composable public static inline void Box(optional androidx.compose.ui.Modifier modifier, optional androidx.compose.ui.Alignment contentAlignment, optional boolean propagateMinConstraints, kotlin.jvm.functions.Function1<? super androidx.compose.foundation.layout.BoxScope,kotlin.Unit> content);
+ method @androidx.compose.runtime.Composable public static void Box(androidx.compose.ui.Modifier modifier);
+ method @androidx.compose.runtime.Composable @kotlin.PublishedApi internal static androidx.compose.ui.layout.MeasurePolicy rememberBoxMeasurePolicy(androidx.compose.ui.Alignment alignment, boolean propagateMinConstraints);
+ }
+
+ @androidx.compose.foundation.layout.LayoutScopeMarker @androidx.compose.runtime.Immutable public interface BoxScope {
+ method @androidx.compose.runtime.Stable public androidx.compose.ui.Modifier align(androidx.compose.ui.Modifier, androidx.compose.ui.Alignment alignment);
+ method @androidx.compose.runtime.Stable public androidx.compose.ui.Modifier matchParentSize(androidx.compose.ui.Modifier);
+ }
+
+ public final class BoxWithConstraintsKt {
+ method @androidx.compose.runtime.Composable @androidx.compose.ui.UiComposable public static void BoxWithConstraints(optional androidx.compose.ui.Modifier modifier, optional androidx.compose.ui.Alignment contentAlignment, optional boolean propagateMinConstraints, kotlin.jvm.functions.Function1<? super androidx.compose.foundation.layout.BoxWithConstraintsScope,kotlin.Unit> content);
+ }
+
+ @androidx.compose.runtime.Stable public interface BoxWithConstraintsScope extends androidx.compose.foundation.layout.BoxScope {
+ method public long getConstraints();
+ method public float getMaxHeight();
+ method public float getMaxWidth();
+ method public float getMinHeight();
+ method public float getMinWidth();
+ property public abstract long constraints;
+ property public abstract float maxHeight;
+ property public abstract float maxWidth;
+ property public abstract float minHeight;
+ property public abstract float minWidth;
+ }
+
+ public final class ColumnKt {
+ method @androidx.compose.runtime.Composable public static inline void Column(optional androidx.compose.ui.Modifier modifier, optional androidx.compose.foundation.layout.Arrangement.Vertical verticalArrangement, optional androidx.compose.ui.Alignment.Horizontal horizontalAlignment, kotlin.jvm.functions.Function1<? super androidx.compose.foundation.layout.ColumnScope,kotlin.Unit> content);
+ method @androidx.compose.runtime.Composable @kotlin.PublishedApi internal static androidx.compose.ui.layout.MeasurePolicy columnMeasurePolicy(androidx.compose.foundation.layout.Arrangement.Vertical verticalArrangement, androidx.compose.ui.Alignment.Horizontal horizontalAlignment);
+ field @kotlin.PublishedApi internal static final androidx.compose.ui.layout.MeasurePolicy DefaultColumnMeasurePolicy;
+ }
+
+ @androidx.compose.foundation.layout.LayoutScopeMarker @androidx.compose.runtime.Immutable public interface ColumnScope {
+ method @androidx.compose.runtime.Stable public androidx.compose.ui.Modifier align(androidx.compose.ui.Modifier, androidx.compose.ui.Alignment.Horizontal alignment);
+ method @androidx.compose.runtime.Stable public androidx.compose.ui.Modifier alignBy(androidx.compose.ui.Modifier, androidx.compose.ui.layout.VerticalAlignmentLine alignmentLine);
+ method @androidx.compose.runtime.Stable public androidx.compose.ui.Modifier alignBy(androidx.compose.ui.Modifier, kotlin.jvm.functions.Function1<? super androidx.compose.ui.layout.Measured,java.lang.Integer> alignmentLineBlock);
+ method @androidx.compose.runtime.Stable public androidx.compose.ui.Modifier weight(androidx.compose.ui.Modifier, float weight, optional boolean fill);
+ }
+
+ public final class IntrinsicKt {
+ method @androidx.compose.runtime.Stable public static androidx.compose.ui.Modifier height(androidx.compose.ui.Modifier, androidx.compose.foundation.layout.IntrinsicSize intrinsicSize);
+ method @androidx.compose.runtime.Stable public static androidx.compose.ui.Modifier requiredHeight(androidx.compose.ui.Modifier, androidx.compose.foundation.layout.IntrinsicSize intrinsicSize);
+ method @androidx.compose.runtime.Stable public static androidx.compose.ui.Modifier requiredWidth(androidx.compose.ui.Modifier, androidx.compose.foundation.layout.IntrinsicSize intrinsicSize);
+ method @androidx.compose.runtime.Stable public static androidx.compose.ui.Modifier width(androidx.compose.ui.Modifier, androidx.compose.foundation.layout.IntrinsicSize intrinsicSize);
+ }
+
+ public enum IntrinsicSize {
+ enum_constant public static final androidx.compose.foundation.layout.IntrinsicSize Max;
+ enum_constant public static final androidx.compose.foundation.layout.IntrinsicSize Min;
+ }
+
+ @kotlin.DslMarker public @interface LayoutScopeMarker {
+ }
+
+ public final class OffsetKt {
+ method @androidx.compose.runtime.Stable public static androidx.compose.ui.Modifier absoluteOffset(androidx.compose.ui.Modifier, optional float x, optional float y);
+ method public static androidx.compose.ui.Modifier absoluteOffset(androidx.compose.ui.Modifier, kotlin.jvm.functions.Function1<? super androidx.compose.ui.unit.Density,androidx.compose.ui.unit.IntOffset> offset);
+ method @androidx.compose.runtime.Stable public static androidx.compose.ui.Modifier offset(androidx.compose.ui.Modifier, optional float x, optional float y);
+ method public static androidx.compose.ui.Modifier offset(androidx.compose.ui.Modifier, kotlin.jvm.functions.Function1<? super androidx.compose.ui.unit.Density,androidx.compose.ui.unit.IntOffset> offset);
+ }
+
+ public final class PaddingKt {
+ method @androidx.compose.runtime.Stable public static androidx.compose.foundation.layout.PaddingValues PaddingValues(float all);
+ method @androidx.compose.runtime.Stable public static androidx.compose.foundation.layout.PaddingValues PaddingValues(optional float horizontal, optional float vertical);
+ method @androidx.compose.runtime.Stable public static androidx.compose.foundation.layout.PaddingValues PaddingValues(optional float start, optional float top, optional float end, optional float bottom);
+ method @androidx.compose.runtime.Stable public static androidx.compose.ui.Modifier absolutePadding(androidx.compose.ui.Modifier, optional float left, optional float top, optional float right, optional float bottom);
+ method @androidx.compose.runtime.Stable public static float calculateEndPadding(androidx.compose.foundation.layout.PaddingValues, androidx.compose.ui.unit.LayoutDirection layoutDirection);
+ method @androidx.compose.runtime.Stable public static float calculateStartPadding(androidx.compose.foundation.layout.PaddingValues, androidx.compose.ui.unit.LayoutDirection layoutDirection);
+ method @androidx.compose.runtime.Stable public static androidx.compose.ui.Modifier padding(androidx.compose.ui.Modifier, optional float start, optional float top, optional float end, optional float bottom);
+ method @androidx.compose.runtime.Stable public static androidx.compose.ui.Modifier padding(androidx.compose.ui.Modifier, optional float horizontal, optional float vertical);
+ method @androidx.compose.runtime.Stable public static androidx.compose.ui.Modifier padding(androidx.compose.ui.Modifier, float all);
+ method @androidx.compose.runtime.Stable public static androidx.compose.ui.Modifier padding(androidx.compose.ui.Modifier, androidx.compose.foundation.layout.PaddingValues paddingValues);
+ }
+
+ @androidx.compose.runtime.Stable public interface PaddingValues {
+ method public float calculateBottomPadding();
+ method public float calculateLeftPadding(androidx.compose.ui.unit.LayoutDirection layoutDirection);
+ method public float calculateRightPadding(androidx.compose.ui.unit.LayoutDirection layoutDirection);
+ method public float calculateTopPadding();
+ }
+
+ @androidx.compose.runtime.Immutable public static final class PaddingValues.Absolute implements androidx.compose.foundation.layout.PaddingValues {
+ ctor public PaddingValues.Absolute(optional @androidx.compose.runtime.Stable float left, optional @androidx.compose.runtime.Stable float top, optional @androidx.compose.runtime.Stable float right, optional @androidx.compose.runtime.Stable float bottom);
+ method public float calculateBottomPadding();
+ method public float calculateLeftPadding(androidx.compose.ui.unit.LayoutDirection layoutDirection);
+ method public float calculateRightPadding(androidx.compose.ui.unit.LayoutDirection layoutDirection);
+ method public float calculateTopPadding();
+ }
+
+ public final class RowColumnImplKt {
+ }
+
+ public final class RowKt {
+ method @androidx.compose.runtime.Composable public static inline void Row(optional androidx.compose.ui.Modifier modifier, optional androidx.compose.foundation.layout.Arrangement.Horizontal horizontalArrangement, optional androidx.compose.ui.Alignment.Vertical verticalAlignment, kotlin.jvm.functions.Function1<? super androidx.compose.foundation.layout.RowScope,kotlin.Unit> content);
+ method @androidx.compose.runtime.Composable @kotlin.PublishedApi internal static androidx.compose.ui.layout.MeasurePolicy rowMeasurePolicy(androidx.compose.foundation.layout.Arrangement.Horizontal horizontalArrangement, androidx.compose.ui.Alignment.Vertical verticalAlignment);
+ field @kotlin.PublishedApi internal static final androidx.compose.ui.layout.MeasurePolicy DefaultRowMeasurePolicy;
+ }
+
+ @androidx.compose.foundation.layout.LayoutScopeMarker @androidx.compose.runtime.Immutable public interface RowScope {
+ method @androidx.compose.runtime.Stable public androidx.compose.ui.Modifier align(androidx.compose.ui.Modifier, androidx.compose.ui.Alignment.Vertical alignment);
+ method @androidx.compose.runtime.Stable public androidx.compose.ui.Modifier alignBy(androidx.compose.ui.Modifier, androidx.compose.ui.layout.HorizontalAlignmentLine alignmentLine);
+ method @androidx.compose.runtime.Stable public androidx.compose.ui.Modifier alignBy(androidx.compose.ui.Modifier, kotlin.jvm.functions.Function1<? super androidx.compose.ui.layout.Measured,java.lang.Integer> alignmentLineBlock);
+ method @androidx.compose.runtime.Stable public androidx.compose.ui.Modifier alignByBaseline(androidx.compose.ui.Modifier);
+ method @androidx.compose.runtime.Stable public androidx.compose.ui.Modifier weight(androidx.compose.ui.Modifier, float weight, optional boolean fill);
+ }
+
+ public final class SizeKt {
+ method @androidx.compose.runtime.Stable public static androidx.compose.ui.Modifier defaultMinSize(androidx.compose.ui.Modifier, optional float minWidth, optional float minHeight);
+ method @androidx.compose.runtime.Stable public static androidx.compose.ui.Modifier fillMaxHeight(androidx.compose.ui.Modifier, optional float fraction);
+ method @androidx.compose.runtime.Stable public static androidx.compose.ui.Modifier fillMaxSize(androidx.compose.ui.Modifier, optional float fraction);
+ method @androidx.compose.runtime.Stable public static androidx.compose.ui.Modifier fillMaxWidth(androidx.compose.ui.Modifier, optional float fraction);
+ method @androidx.compose.runtime.Stable public static androidx.compose.ui.Modifier height(androidx.compose.ui.Modifier, float height);
+ method @androidx.compose.runtime.Stable public static androidx.compose.ui.Modifier heightIn(androidx.compose.ui.Modifier, optional float min, optional float max);
+ method @androidx.compose.runtime.Stable public static androidx.compose.ui.Modifier requiredHeight(androidx.compose.ui.Modifier, float height);
+ method @androidx.compose.runtime.Stable public static androidx.compose.ui.Modifier requiredHeightIn(androidx.compose.ui.Modifier, optional float min, optional float max);
+ method @androidx.compose.runtime.Stable public static androidx.compose.ui.Modifier requiredSize(androidx.compose.ui.Modifier, float size);
+ method @androidx.compose.runtime.Stable public static androidx.compose.ui.Modifier requiredSize(androidx.compose.ui.Modifier, float width, float height);
+ method @androidx.compose.runtime.Stable public static androidx.compose.ui.Modifier requiredSize(androidx.compose.ui.Modifier, long size);
+ method @androidx.compose.runtime.Stable public static androidx.compose.ui.Modifier requiredSizeIn(androidx.compose.ui.Modifier, optional float minWidth, optional float minHeight, optional float maxWidth, optional float maxHeight);
+ method @androidx.compose.runtime.Stable public static androidx.compose.ui.Modifier requiredWidth(androidx.compose.ui.Modifier, float width);
+ method @androidx.compose.runtime.Stable public static androidx.compose.ui.Modifier requiredWidthIn(androidx.compose.ui.Modifier, optional float min, optional float max);
+ method @androidx.compose.runtime.Stable public static androidx.compose.ui.Modifier size(androidx.compose.ui.Modifier, float size);
+ method @androidx.compose.runtime.Stable public static androidx.compose.ui.Modifier size(androidx.compose.ui.Modifier, float width, float height);
+ method @androidx.compose.runtime.Stable public static androidx.compose.ui.Modifier size(androidx.compose.ui.Modifier, long size);
+ method @androidx.compose.runtime.Stable public static androidx.compose.ui.Modifier sizeIn(androidx.compose.ui.Modifier, optional float minWidth, optional float minHeight, optional float maxWidth, optional float maxHeight);
+ method @androidx.compose.runtime.Stable public static androidx.compose.ui.Modifier width(androidx.compose.ui.Modifier, float width);
+ method @androidx.compose.runtime.Stable public static androidx.compose.ui.Modifier widthIn(androidx.compose.ui.Modifier, optional float min, optional float max);
+ method @androidx.compose.runtime.Stable public static androidx.compose.ui.Modifier wrapContentHeight(androidx.compose.ui.Modifier, optional androidx.compose.ui.Alignment.Vertical align, optional boolean unbounded);
+ method @androidx.compose.runtime.Stable public static androidx.compose.ui.Modifier wrapContentSize(androidx.compose.ui.Modifier, optional androidx.compose.ui.Alignment align, optional boolean unbounded);
+ method @androidx.compose.runtime.Stable public static androidx.compose.ui.Modifier wrapContentWidth(androidx.compose.ui.Modifier, optional androidx.compose.ui.Alignment.Horizontal align, optional boolean unbounded);
+ }
+
+ public final class SpacerKt {
+ method @androidx.compose.runtime.Composable @androidx.compose.runtime.NonRestartableComposable public static void Spacer(androidx.compose.ui.Modifier modifier);
+ }
+
+ @androidx.compose.runtime.Stable public interface WindowInsets {
+ method public int getBottom(androidx.compose.ui.unit.Density density);
+ method public int getLeft(androidx.compose.ui.unit.Density density, androidx.compose.ui.unit.LayoutDirection layoutDirection);
+ method public int getRight(androidx.compose.ui.unit.Density density, androidx.compose.ui.unit.LayoutDirection layoutDirection);
+ method public int getTop(androidx.compose.ui.unit.Density density);
+ field public static final androidx.compose.foundation.layout.WindowInsets.Companion Companion;
+ }
+
+ public static final class WindowInsets.Companion {
+ }
+
+ public final class WindowInsetsConnection_androidKt {
+ }
+
+ public final class WindowInsetsKt {
+ method public static androidx.compose.foundation.layout.WindowInsets WindowInsets(optional int left, optional int top, optional int right, optional int bottom);
+ method public static androidx.compose.foundation.layout.WindowInsets WindowInsets(optional float left, optional float top, optional float right, optional float bottom);
+ method public static androidx.compose.foundation.layout.WindowInsets add(androidx.compose.foundation.layout.WindowInsets, androidx.compose.foundation.layout.WindowInsets insets);
+ method @androidx.compose.runtime.Composable @androidx.compose.runtime.ReadOnlyComposable public static androidx.compose.foundation.layout.PaddingValues asPaddingValues(androidx.compose.foundation.layout.WindowInsets);
+ method public static androidx.compose.foundation.layout.PaddingValues asPaddingValues(androidx.compose.foundation.layout.WindowInsets, androidx.compose.ui.unit.Density density);
+ method public static androidx.compose.foundation.layout.WindowInsets exclude(androidx.compose.foundation.layout.WindowInsets, androidx.compose.foundation.layout.WindowInsets insets);
+ method public static androidx.compose.foundation.layout.WindowInsets only(androidx.compose.foundation.layout.WindowInsets, int sides);
+ method public static androidx.compose.foundation.layout.WindowInsets union(androidx.compose.foundation.layout.WindowInsets, androidx.compose.foundation.layout.WindowInsets insets);
+ }
+
+ public final class WindowInsetsPaddingKt {
+ method @androidx.compose.runtime.Stable public static androidx.compose.ui.Modifier windowInsetsPadding(androidx.compose.ui.Modifier, androidx.compose.foundation.layout.WindowInsets insets);
+ }
+
+ public final class WindowInsetsPadding_androidKt {
+ method public static androidx.compose.ui.Modifier captionBarPadding(androidx.compose.ui.Modifier);
+ method public static androidx.compose.ui.Modifier displayCutoutPadding(androidx.compose.ui.Modifier);
+ method public static androidx.compose.ui.Modifier imePadding(androidx.compose.ui.Modifier);
+ method public static androidx.compose.ui.Modifier mandatorySystemGesturesPadding(androidx.compose.ui.Modifier);
+ method public static androidx.compose.ui.Modifier navigationBarsPadding(androidx.compose.ui.Modifier);
+ method public static androidx.compose.ui.Modifier safeContentPadding(androidx.compose.ui.Modifier);
+ method public static androidx.compose.ui.Modifier safeDrawingPadding(androidx.compose.ui.Modifier);
+ method public static androidx.compose.ui.Modifier safeGesturesPadding(androidx.compose.ui.Modifier);
+ method public static androidx.compose.ui.Modifier statusBarsPadding(androidx.compose.ui.Modifier);
+ method public static androidx.compose.ui.Modifier systemBarsPadding(androidx.compose.ui.Modifier);
+ method public static androidx.compose.ui.Modifier systemGesturesPadding(androidx.compose.ui.Modifier);
+ method public static androidx.compose.ui.Modifier waterfallPadding(androidx.compose.ui.Modifier);
+ }
+
+ @kotlin.jvm.JvmInline public final value class WindowInsetsSides {
+ method public operator int plus(int sides);
+ field public static final androidx.compose.foundation.layout.WindowInsetsSides.Companion Companion;
+ }
+
+ public static final class WindowInsetsSides.Companion {
+ method public int getBottom();
+ method public int getEnd();
+ method public int getHorizontal();
+ method public int getLeft();
+ method public int getRight();
+ method public int getStart();
+ method public int getTop();
+ method public int getVertical();
+ property public final int Bottom;
+ property public final int End;
+ property public final int Horizontal;
+ property public final int Left;
+ property public final int Right;
+ property public final int Start;
+ property public final int Top;
+ property public final int Vertical;
+ }
+
+ public final class WindowInsetsSizeKt {
+ method @androidx.compose.runtime.Stable public static androidx.compose.ui.Modifier windowInsetsBottomHeight(androidx.compose.ui.Modifier, androidx.compose.foundation.layout.WindowInsets insets);
+ method @androidx.compose.runtime.Stable public static androidx.compose.ui.Modifier windowInsetsEndWidth(androidx.compose.ui.Modifier, androidx.compose.foundation.layout.WindowInsets insets);
+ method @androidx.compose.runtime.Stable public static androidx.compose.ui.Modifier windowInsetsStartWidth(androidx.compose.ui.Modifier, androidx.compose.foundation.layout.WindowInsets insets);
+ method @androidx.compose.runtime.Stable public static androidx.compose.ui.Modifier windowInsetsTopHeight(androidx.compose.ui.Modifier, androidx.compose.foundation.layout.WindowInsets insets);
+ }
+
+ public final class WindowInsets_androidKt {
+ method @androidx.compose.runtime.Composable @androidx.compose.runtime.NonRestartableComposable public static androidx.compose.foundation.layout.WindowInsets getCaptionBar(androidx.compose.foundation.layout.WindowInsets.Companion);
+ method public static boolean getConsumeWindowInsets(androidx.compose.ui.platform.ComposeView);
+ method @androidx.compose.runtime.Composable @androidx.compose.runtime.NonRestartableComposable public static androidx.compose.foundation.layout.WindowInsets getDisplayCutout(androidx.compose.foundation.layout.WindowInsets.Companion);
+ method @androidx.compose.runtime.Composable @androidx.compose.runtime.NonRestartableComposable public static androidx.compose.foundation.layout.WindowInsets getIme(androidx.compose.foundation.layout.WindowInsets.Companion);
+ method @androidx.compose.runtime.Composable @androidx.compose.runtime.NonRestartableComposable public static androidx.compose.foundation.layout.WindowInsets getMandatorySystemGestures(androidx.compose.foundation.layout.WindowInsets.Companion);
+ method @androidx.compose.runtime.Composable @androidx.compose.runtime.NonRestartableComposable public static androidx.compose.foundation.layout.WindowInsets getNavigationBars(androidx.compose.foundation.layout.WindowInsets.Companion);
+ method @androidx.compose.runtime.Composable @androidx.compose.runtime.NonRestartableComposable public static androidx.compose.foundation.layout.WindowInsets getSafeContent(androidx.compose.foundation.layout.WindowInsets.Companion);
+ method @androidx.compose.runtime.Composable @androidx.compose.runtime.NonRestartableComposable public static androidx.compose.foundation.layout.WindowInsets getSafeDrawing(androidx.compose.foundation.layout.WindowInsets.Companion);
+ method @androidx.compose.runtime.Composable @androidx.compose.runtime.NonRestartableComposable public static androidx.compose.foundation.layout.WindowInsets getSafeGestures(androidx.compose.foundation.layout.WindowInsets.Companion);
+ method @androidx.compose.runtime.Composable @androidx.compose.runtime.NonRestartableComposable public static androidx.compose.foundation.layout.WindowInsets getStatusBars(androidx.compose.foundation.layout.WindowInsets.Companion);
+ method @androidx.compose.runtime.Composable @androidx.compose.runtime.NonRestartableComposable public static androidx.compose.foundation.layout.WindowInsets getSystemBars(androidx.compose.foundation.layout.WindowInsets.Companion);
+ method @androidx.compose.runtime.Composable @androidx.compose.runtime.NonRestartableComposable public static androidx.compose.foundation.layout.WindowInsets getSystemGestures(androidx.compose.foundation.layout.WindowInsets.Companion);
+ method @androidx.compose.runtime.Composable @androidx.compose.runtime.NonRestartableComposable public static androidx.compose.foundation.layout.WindowInsets getTappableElement(androidx.compose.foundation.layout.WindowInsets.Companion);
+ method @androidx.compose.runtime.Composable @androidx.compose.runtime.NonRestartableComposable public static androidx.compose.foundation.layout.WindowInsets getWaterfall(androidx.compose.foundation.layout.WindowInsets.Companion);
+ method public static void setConsumeWindowInsets(androidx.compose.ui.platform.ComposeView, boolean);
+ }
+
+}
+
diff --git a/compose/foundation/foundation-layout/src/androidAndroidTest/kotlin/androidx/compose/foundation/layout/WindowInsetsActivity.kt b/compose/foundation/foundation-layout/src/androidAndroidTest/kotlin/androidx/compose/foundation/layout/WindowInsetsActivity.kt
index 41e064f..e9bf1a3 100644
--- a/compose/foundation/foundation-layout/src/androidAndroidTest/kotlin/androidx/compose/foundation/layout/WindowInsetsActivity.kt
+++ b/compose/foundation/foundation-layout/src/androidAndroidTest/kotlin/androidx/compose/foundation/layout/WindowInsetsActivity.kt
@@ -19,6 +19,7 @@
import android.os.Bundle
import androidx.activity.ComponentActivity
import androidx.annotation.RequiresApi
+import androidx.core.view.WindowCompat
import java.util.concurrent.CountDownLatch
class WindowInsetsActivity : ComponentActivity() {
@@ -26,7 +27,7 @@
@RequiresApi(Build.VERSION_CODES.R)
override fun onCreate(savedInstanceState: Bundle?) {
- window.setDecorFitsSystemWindows(false)
+ WindowCompat.setDecorFitsSystemWindows(window, false)
super.onCreate(savedInstanceState)
createdLatch.countDown()
}
diff --git a/compose/foundation/foundation-layout/src/androidAndroidTest/kotlin/androidx/compose/foundation/layout/WindowInsetsControllerTest.kt b/compose/foundation/foundation-layout/src/androidAndroidTest/kotlin/androidx/compose/foundation/layout/WindowInsetsControllerTest.kt
index c79e1fa..0478143 100644
--- a/compose/foundation/foundation-layout/src/androidAndroidTest/kotlin/androidx/compose/foundation/layout/WindowInsetsControllerTest.kt
+++ b/compose/foundation/foundation-layout/src/androidAndroidTest/kotlin/androidx/compose/foundation/layout/WindowInsetsControllerTest.kt
@@ -16,12 +16,9 @@
package androidx.compose.foundation.layout
-import android.content.Context
import android.graphics.Insets
import android.os.Build
import android.os.SystemClock
-import android.view.View
-import android.view.inputmethod.InputMethodManager
import androidx.compose.foundation.lazy.LazyColumn
import androidx.compose.foundation.lazy.LazyListState
import androidx.compose.foundation.text.BasicTextField
@@ -70,7 +67,6 @@
import kotlinx.coroutines.withContext
import org.junit.After
import org.junit.Before
-import org.junit.Ignore
import org.junit.Rule
import org.junit.Test
import org.junit.runner.RunWith
@@ -648,7 +644,6 @@
* On some devices, the animation can begin and then end immediately without the value being
* set to the final state in onProgress().
*/
- @Ignore("b/230781717")
@Test
fun quickAnimation() {
var imeBottom by mutableStateOf(0)
@@ -673,28 +668,34 @@
}
}
- rule.runOnIdle {
- // Force the keyboard to show up
- val imm =
- rule.activity.getSystemService(Context.INPUT_METHOD_SERVICE) as InputMethodManager
- val content = rule.activity.findViewById<View>(android.R.id.content)
- @Suppress("DEPRECATION")
- imm.showSoftInput(content, InputMethodManager.SHOW_FORCED)
- }
-
rule.onNodeWithTag("textField").assertIsFocused()
+ rule.runOnIdle {
+ rule.activity.window.decorView.windowInsetsController?.show(
+ android.view.WindowInsets.Type.ime()
+ )
+ }
+
// We don't know when the IME will show up, so we should keep checking for it.
val endWaitImeShow = SystemClock.uptimeMillis() + 1000
while (imeBottom == 0 && SystemClock.uptimeMillis() < endWaitImeShow) {
Thread.sleep(10)
}
+
rule.runOnIdle {
assertThat(imeBottom).isNotEqualTo(0)
}
+ // wait for IME to finish showing
+ do {
+ val lastBottom = imeBottom
+ rule.waitForIdle()
+ } while (lastBottom != imeBottom)
+
showDialog = true
+ rule.waitForIdle() // wait for showDialog
+
// We don't know when the IME will go away, so we should keep checking for it.
val endWaitImeHide = SystemClock.uptimeMillis() + 1000
while (imeBottom != 0 && SystemClock.uptimeMillis() < endWaitImeHide) {
diff --git a/compose/foundation/foundation-layout/src/androidAndroidTest/kotlin/androidx/compose/foundation/layout/WindowInsetsDeviceTest.kt b/compose/foundation/foundation-layout/src/androidAndroidTest/kotlin/androidx/compose/foundation/layout/WindowInsetsDeviceTest.kt
index 019a50e..8d50d89 100644
--- a/compose/foundation/foundation-layout/src/androidAndroidTest/kotlin/androidx/compose/foundation/layout/WindowInsetsDeviceTest.kt
+++ b/compose/foundation/foundation-layout/src/androidAndroidTest/kotlin/androidx/compose/foundation/layout/WindowInsetsDeviceTest.kt
@@ -17,7 +17,14 @@
import android.os.Build
import android.os.SystemClock
+import android.view.View
+import android.view.ViewGroup
+import androidx.annotation.RequiresApi
import androidx.compose.runtime.Composable
+import androidx.compose.runtime.DisposableEffect
+import androidx.compose.runtime.getValue
+import androidx.compose.runtime.mutableStateOf
+import androidx.compose.runtime.setValue
import androidx.compose.runtime.snapshots.Snapshot
import androidx.compose.ui.Modifier
import androidx.compose.ui.geometry.Offset
@@ -28,27 +35,42 @@
import androidx.compose.ui.input.nestedscroll.nestedScroll
import androidx.compose.ui.platform.ComposeView
import androidx.compose.ui.platform.LocalDensity
+import androidx.compose.ui.platform.LocalView
import androidx.compose.ui.test.junit4.createAndroidComposeRule
+import androidx.compose.ui.unit.LayoutDirection
import androidx.compose.ui.viewinterop.AndroidView
+import androidx.core.graphics.Insets
+import androidx.core.view.OnApplyWindowInsetsListener
+import androidx.core.view.ViewCompat
+import androidx.core.view.WindowCompat
+import androidx.core.view.WindowInsetsCompat
+import androidx.core.view.WindowInsetsControllerCompat
+import androidx.core.view.children
import androidx.test.ext.junit.runners.AndroidJUnit4
-import androidx.test.filters.FlakyTest
import androidx.test.filters.MediumTest
import androidx.test.filters.SdkSuppress
import com.google.common.truth.Truth.assertThat
+import java.util.concurrent.CountDownLatch
+import java.util.concurrent.TimeUnit
+import org.junit.Before
import org.junit.Rule
import org.junit.Test
import org.junit.runner.RunWith
@MediumTest
@RunWith(AndroidJUnit4::class)
-@SdkSuppress(minSdkVersion = Build.VERSION_CODES.R)
class WindowInsetsDeviceTest {
@get:Rule
val rule = createAndroidComposeRule<WindowInsetsActivity>()
+ @Before
+ fun setup() {
+ rule.activity.createdLatch.await(1, TimeUnit.SECONDS)
+ }
+
@OptIn(ExperimentalLayoutApi::class)
- @FlakyTest(bugId = 230844979)
@Test
+ @SdkSuppress(minSdkVersion = Build.VERSION_CODES.R)
fun disableConsumeDisablesAnimationConsumption() {
var imeInset1 = 0
var imeInset2 = 0
@@ -92,12 +114,21 @@
)
}
+ rule.waitForIdle()
+
// We don't have any way to know when the animation controller is applied, so just
// loop until the value changes.
val endTime = SystemClock.uptimeMillis() + 1000L
+ var iteration = 0
while (imeInset1 == 0 && SystemClock.uptimeMillis() < endTime) {
rule.runOnIdle {
+ if (iteration % 5 == 0) {
+ // Cuttlefish doesn't consistently show the IME when requested, so
+ // we must poke it. This will poke it every 5 iterations to ensure that
+ // if we miss it once then it will get it on another pass.
+ pokeIME()
+ }
dispatcher.dispatchPostScroll(
Offset.Zero,
Offset(0f, -10f),
@@ -106,6 +137,7 @@
Snapshot.sendApplyNotifications()
}
Thread.sleep(50)
+ iteration++
}
rule.runOnIdle {
@@ -113,4 +145,195 @@
assertThat(imeInset2).isEqualTo(imeInset1)
}
}
+
+ @RequiresApi(Build.VERSION_CODES.R)
+ private fun pokeIME() {
+ // This appears to be necessary for cuttlefish devices to show the keyboard
+ val controller = rule.activity.window.insetsController
+ controller?.show(android.view.WindowInsets.Type.ime())
+ controller?.hide(android.view.WindowInsets.Type.ime())
+ }
+
+ @Test
+ fun insetsUsedAfterInitialComposition() {
+ var useInsets by mutableStateOf(false)
+ var systemBarsInsets by mutableStateOf(Insets.NONE)
+
+ rule.setContent {
+ val view = LocalView.current
+ DisposableEffect(Unit) {
+ // Ensure that the system bars are shown
+ val window = rule.activity.window
+
+ @Suppress("RedundantNullableReturnType") // nullable on some versions
+ val controller: WindowInsetsControllerCompat? =
+ WindowCompat.getInsetsController(window, view)
+ controller?.show(WindowInsetsCompat.Type.systemBars())
+ onDispose { }
+ }
+ Box(Modifier.fillMaxSize()) {
+ if (useInsets) {
+ val systemBars = WindowInsets.systemBars
+ val density = LocalDensity.current
+ val left = systemBars.getLeft(density, LayoutDirection.Ltr)
+ val top = systemBars.getTop(density)
+ val right = systemBars.getRight(density, LayoutDirection.Ltr)
+ val bottom = systemBars.getBottom(density)
+ systemBarsInsets = Insets.of(left, top, right, bottom)
+ }
+ }
+ }
+
+ rule.runOnIdle {
+ useInsets = true
+ }
+
+ rule.runOnIdle {
+ assertThat(systemBarsInsets).isNotEqualTo(Insets.NONE)
+ }
+ }
+
+ @Test
+ fun insetsAfterStopWatching() {
+ var useInsets by mutableStateOf(true)
+ var hasStatusBarInsets = false
+
+ rule.setContent {
+ val view = LocalView.current
+ DisposableEffect(Unit) {
+ // Ensure that the status bars are shown
+ val window = rule.activity.window
+
+ @Suppress("RedundantNullableReturnType") // nullable on some versions
+ val controller: WindowInsetsControllerCompat? =
+ WindowCompat.getInsetsController(window, view)
+ controller?.hide(WindowInsetsCompat.Type.statusBars())
+ onDispose { }
+ }
+ Box(Modifier.fillMaxSize()) {
+ if (useInsets) {
+ val statusBars = WindowInsets.statusBars
+ val density = LocalDensity.current
+ val left = statusBars.getLeft(density, LayoutDirection.Ltr)
+ val top = statusBars.getTop(density)
+ val right = statusBars.getRight(density, LayoutDirection.Ltr)
+ val bottom = statusBars.getBottom(density)
+ hasStatusBarInsets = left != 0 || top != 0 || right != 0 || bottom != 0
+ }
+ }
+ }
+
+ rule.waitForIdle()
+
+ rule.waitUntil(1000) { !hasStatusBarInsets }
+
+ // disable watching the insets
+ rule.runOnIdle {
+ useInsets = false
+ }
+
+ val statusBarsWatcher = StatusBarsShowListener()
+
+ // show the insets while we're not watching
+ rule.runOnIdle {
+ ViewCompat.setOnApplyWindowInsetsListener(
+ rule.activity.window.decorView,
+ statusBarsWatcher
+ )
+ @Suppress("RedundantNullableReturnType")
+ val controller: WindowInsetsControllerCompat? = WindowCompat.getInsetsController(
+ rule.activity.window,
+ rule.activity.window.decorView
+ )
+ controller?.show(WindowInsetsCompat.Type.statusBars())
+ }
+
+ assertThat(statusBarsWatcher.latch.await(1, TimeUnit.SECONDS)).isTrue()
+
+ // Now look at the insets
+ rule.runOnIdle {
+ useInsets = true
+ }
+
+ rule.runOnIdle {
+ assertThat(hasStatusBarInsets).isTrue()
+ }
+ }
+
+ @Test
+ fun insetsAfterReattachingView() {
+ var hasStatusBarInsets = false
+
+ // hide the insets
+ rule.runOnUiThread {
+ @Suppress("RedundantNullableReturnType")
+ val controller: WindowInsetsControllerCompat? = WindowCompat.getInsetsController(
+ rule.activity.window,
+ rule.activity.window.decorView
+ )
+ controller?.hide(WindowInsetsCompat.Type.statusBars())
+ }
+
+ rule.setContent {
+ Box(Modifier.fillMaxSize()) {
+ val statusBars = WindowInsets.statusBars
+ val density = LocalDensity.current
+ val left = statusBars.getLeft(density, LayoutDirection.Ltr)
+ val top = statusBars.getTop(density)
+ val right = statusBars.getRight(density, LayoutDirection.Ltr)
+ val bottom = statusBars.getBottom(density)
+ hasStatusBarInsets = left != 0 || top != 0 || right != 0 || bottom != 0
+ }
+ }
+
+ rule.waitForIdle()
+
+ rule.waitUntil(1000) { !hasStatusBarInsets }
+
+ val contentView = rule.activity.findViewById<ViewGroup>(android.R.id.content)
+ val composeView = contentView.children.first()
+
+ // remove the view
+ rule.runOnUiThread {
+ contentView.removeView(composeView)
+ }
+
+ val statusBarsWatcher = StatusBarsShowListener()
+
+ // show the insets while we're not watching
+ rule.runOnUiThread {
+ ViewCompat.setOnApplyWindowInsetsListener(
+ rule.activity.window.decorView,
+ statusBarsWatcher
+ )
+ @Suppress("RedundantNullableReturnType")
+ val controller: WindowInsetsControllerCompat? = WindowCompat.getInsetsController(
+ rule.activity.window,
+ rule.activity.window.decorView
+ )
+ controller?.show(WindowInsetsCompat.Type.statusBars())
+ }
+
+ assertThat(statusBarsWatcher.latch.await(1, TimeUnit.SECONDS)).isTrue()
+
+ // Now add the view back again
+ rule.runOnUiThread {
+ contentView.addView(composeView)
+ }
+
+ rule.waitUntil(1000) { hasStatusBarInsets }
+ }
+
+ class StatusBarsShowListener : OnApplyWindowInsetsListener {
+ val latch = CountDownLatch(1)
+
+ override fun onApplyWindowInsets(v: View, insets: WindowInsetsCompat): WindowInsetsCompat {
+ val statusBars = insets.getInsets(WindowInsetsCompat.Type.statusBars())
+ if (statusBars != Insets.NONE) {
+ latch.countDown()
+ ViewCompat.setOnApplyWindowInsetsListener(v, null)
+ }
+ return insets
+ }
+ }
}
diff --git a/compose/foundation/foundation-layout/src/androidMain/kotlin/androidx/compose/foundation/layout/WindowInsets.android.kt b/compose/foundation/foundation-layout/src/androidMain/kotlin/androidx/compose/foundation/layout/WindowInsets.android.kt
index b96f838..5f7031d 100644
--- a/compose/foundation/foundation-layout/src/androidMain/kotlin/androidx/compose/foundation/layout/WindowInsets.android.kt
+++ b/compose/foundation/foundation-layout/src/androidMain/kotlin/androidx/compose/foundation/layout/WindowInsets.android.kt
@@ -18,8 +18,8 @@
import androidx.core.graphics.Insets as AndroidXInsets
import android.os.Build
-import android.os.SystemClock
import android.view.View
+import android.view.View.OnAttachStateChangeListener
import androidx.annotation.DoNotInline
import androidx.annotation.RequiresApi
import androidx.compose.runtime.Composable
@@ -454,6 +454,11 @@
// add listeners
ViewCompat.setOnApplyWindowInsetsListener(view, insetsListener)
+ if (view.isAttachedToWindow) {
+ view.requestApplyInsets()
+ }
+ view.addOnAttachStateChangeListener(insetsListener)
+
// We don't need animation callbacks on earlier versions, so don't bother adding
// the listener. ViewCompat calls the animation callbacks superfluously.
if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.R) {
@@ -474,6 +479,7 @@
// remove listeners
ViewCompat.setOnApplyWindowInsetsListener(view, null)
ViewCompat.setWindowInsetsAnimationCallback(view, null)
+ view.removeOnAttachStateChangeListener(insetsListener)
}
}
@@ -617,9 +623,9 @@
private class InsetsListener(
val composeInsets: WindowInsetsHolder,
-) : OnApplyWindowInsetsListener, WindowInsetsAnimationCompat.Callback(
+) : WindowInsetsAnimationCompat.Callback(
if (composeInsets.consumes) DISPATCH_MODE_STOP else DISPATCH_MODE_CONTINUE_ON_SUBTREE
-) {
+), Runnable, OnApplyWindowInsetsListener, OnAttachStateChangeListener {
/**
* When [android.view.WindowInsetsController.controlWindowInsetsAnimation] is called,
* the [onApplyWindowInsets] is called after [onPrepare] with the target size. We
@@ -627,23 +633,15 @@
* so we must ignore those calls. However, the animation may be canceled before it
* progresses. On R, it won't make any callbacks, so we have to figure out whether
* the [onApplyWindowInsets] is from a canceled animation or if it is from the
- * controlled animation. We just have to guess that if we don't receive an [onStart]
- * before a certain time that the animation has been canceled, and to treat the
- * [onApplyWindowInsets] as a real call. [prepareGiveUpTime] has the time that we
- * give up waiting for the [onStart] or [onEnd].
+ * controlled animation. When [prepared] is `true` on R, we post a callback to
+ * set the [onApplyWindowInsets] insets value.
*/
- var prepareGiveUpTime = 0L
+ var prepared = false
- /**
- * `true` if the [onStart] has been called, so we know that we're part of an animation
- * and [onApplyWindowInsets] calls should be ignored.
- */
- var started = false
-
- var animationInsets: WindowInsetsCompat? = null
+ var savedInsets: WindowInsetsCompat? = null
override fun onPrepare(animation: WindowInsetsAnimationCompat) {
- prepareGiveUpTime = SystemClock.uptimeMillis() + AnimationCanceledMillis
+ prepared = true
super.onPrepare(animation)
}
@@ -651,7 +649,7 @@
animation: WindowInsetsAnimationCompat,
bounds: WindowInsetsAnimationCompat.BoundsCompat
): WindowInsetsAnimationCompat.BoundsCompat {
- started = true
+ prepared = false
return super.onStart(animation, bounds)
}
@@ -659,47 +657,58 @@
insets: WindowInsetsCompat,
runningAnimations: MutableList<WindowInsetsAnimationCompat>
): WindowInsetsCompat {
- prepareGiveUpTime = 0L
composeInsets.update(insets)
return if (composeInsets.consumes) WindowInsetsCompat.CONSUMED else insets
}
override fun onEnd(animation: WindowInsetsAnimationCompat) {
- started = false
- prepareGiveUpTime = 0L
- val insets = animationInsets
+ prepared = false
+ val insets = savedInsets
if (animation.durationMillis != 0L && insets != null) {
composeInsets.update(insets, animation.typeMask)
}
- animationInsets = null
+ savedInsets = null
super.onEnd(animation)
}
override fun onApplyWindowInsets(view: View, insets: WindowInsetsCompat): WindowInsetsCompat {
- val prepareGiveUpTime = prepareGiveUpTime
- this.prepareGiveUpTime = 0L
+ if (prepared) {
+ savedInsets = insets
- // There may be no callback on R if the animation is canceled after onPrepare(),
- // so we won't know if the onPrepare() was canceled or if the
- // So we must allow onApplyWindowInsets() to run if it isn't directly after the
- // onPrepare().
- val preparing = prepareGiveUpTime != 0L &&
- (Build.VERSION.SDK_INT > Build.VERSION_CODES.R ||
- prepareGiveUpTime > SystemClock.uptimeMillis())
- if (started || preparing) {
- animationInsets = insets
- // Just ignore this one. It came from the onPrepare.
+ // There may be no callback on R if the animation is canceled after onPrepare(),
+ // so we won't know if the onPrepare() was canceled or if this is an
+ // onApplyWindowInsets() after the cancelation. We'll just post the value
+ // and if it is still preparing then we just use the value.
+ if (Build.VERSION.SDK_INT == Build.VERSION_CODES.R) {
+ view.post(this)
+ }
return insets
}
composeInsets.update(insets)
return if (composeInsets.consumes) WindowInsetsCompat.CONSUMED else insets
}
- companion object {
- // If an [onApplyWindowInsets] is received this number of milliseconds after
- // [onPrepare] and the animation hasn't started, then it is assumed that the
- // animation was canceled before starting. On R and earlier, we don't get any
- // signal about cancellation.
- const val AnimationCanceledMillis = 100L
+ /**
+ * On [R], we don't receive the [onEnd] call when an animation is canceled, so we post
+ * the value received in [onApplyWindowInsets] immediately after [onPrepare]. If [onProgress]
+ * or [onEnd] is received before the runnable executes then the value won't be used. Otherwise,
+ * the [onApplyWindowInsets] value will be used. It may have a janky frame, but it is the best
+ * we can do.
+ */
+ override fun run() {
+ if (prepared) {
+ prepared = false
+ savedInsets?.let {
+ composeInsets.update(it)
+ savedInsets = null
+ }
+ }
+ }
+
+ override fun onViewAttachedToWindow(view: View) {
+ view.requestApplyInsets()
+ }
+
+ override fun onViewDetachedFromWindow(v: View) {
}
}
diff --git a/compose/foundation/foundation/api/1.2.0-beta02.txt b/compose/foundation/foundation/api/1.2.0-beta02.txt
new file mode 100644
index 0000000..3ebb0a3
--- /dev/null
+++ b/compose/foundation/foundation/api/1.2.0-beta02.txt
@@ -0,0 +1,1033 @@
+// Signature format: 4.0
+package androidx.compose.foundation {
+
+ public final class ActualJvmKt {
+ }
+
+ public final class BackgroundKt {
+ method public static androidx.compose.ui.Modifier background(androidx.compose.ui.Modifier, long color, optional androidx.compose.ui.graphics.Shape shape);
+ method public static androidx.compose.ui.Modifier background(androidx.compose.ui.Modifier, androidx.compose.ui.graphics.Brush brush, optional androidx.compose.ui.graphics.Shape shape, optional float alpha);
+ }
+
+ public final class BorderKt {
+ method public static androidx.compose.ui.Modifier border(androidx.compose.ui.Modifier, androidx.compose.foundation.BorderStroke border, optional androidx.compose.ui.graphics.Shape shape);
+ method public static androidx.compose.ui.Modifier border(androidx.compose.ui.Modifier, float width, long color, optional androidx.compose.ui.graphics.Shape shape);
+ method public static androidx.compose.ui.Modifier border(androidx.compose.ui.Modifier, float width, androidx.compose.ui.graphics.Brush brush, androidx.compose.ui.graphics.Shape shape);
+ }
+
+ @androidx.compose.runtime.Immutable public final class BorderStroke {
+ ctor public BorderStroke(float width, androidx.compose.ui.graphics.Brush brush);
+ method public androidx.compose.foundation.BorderStroke copy(optional float width, optional androidx.compose.ui.graphics.Brush brush);
+ method public androidx.compose.ui.graphics.Brush getBrush();
+ method public float getWidth();
+ property public final androidx.compose.ui.graphics.Brush brush;
+ property public final float width;
+ }
+
+ public final class BorderStrokeKt {
+ method @androidx.compose.runtime.Stable public static androidx.compose.foundation.BorderStroke BorderStroke(float width, long color);
+ }
+
+ public final class CanvasKt {
+ method @androidx.compose.runtime.Composable public static void Canvas(androidx.compose.ui.Modifier modifier, kotlin.jvm.functions.Function1<? super androidx.compose.ui.graphics.drawscope.DrawScope,kotlin.Unit> onDraw);
+ }
+
+ public final class ClickableKt {
+ method public static androidx.compose.ui.Modifier clickable(androidx.compose.ui.Modifier, optional boolean enabled, optional String? onClickLabel, optional androidx.compose.ui.semantics.Role? role, kotlin.jvm.functions.Function0<kotlin.Unit> onClick);
+ method public static androidx.compose.ui.Modifier clickable(androidx.compose.ui.Modifier, androidx.compose.foundation.interaction.MutableInteractionSource interactionSource, androidx.compose.foundation.Indication? indication, optional boolean enabled, optional String? onClickLabel, optional androidx.compose.ui.semantics.Role? role, kotlin.jvm.functions.Function0<kotlin.Unit> onClick);
+ }
+
+ public final class Clickable_androidKt {
+ }
+
+ public final class DarkThemeKt {
+ method @androidx.compose.runtime.Composable @androidx.compose.runtime.ReadOnlyComposable public static boolean isSystemInDarkTheme();
+ }
+
+ public final class DarkTheme_androidKt {
+ }
+
+ public final class ExcludeFromSystemGesture_androidKt {
+ method @Deprecated public static androidx.compose.ui.Modifier excludeFromSystemGesture(androidx.compose.ui.Modifier);
+ method @Deprecated public static androidx.compose.ui.Modifier excludeFromSystemGesture(androidx.compose.ui.Modifier, kotlin.jvm.functions.Function1<? super androidx.compose.ui.layout.LayoutCoordinates,androidx.compose.ui.geometry.Rect> exclusion);
+ }
+
+ public final class FocusableKt {
+ method public static androidx.compose.ui.Modifier focusable(androidx.compose.ui.Modifier, optional boolean enabled, optional androidx.compose.foundation.interaction.MutableInteractionSource? interactionSource);
+ }
+
+ public final class FocusedBoundsKt {
+ }
+
+ public final class HoverableKt {
+ method public static androidx.compose.ui.Modifier hoverable(androidx.compose.ui.Modifier, androidx.compose.foundation.interaction.MutableInteractionSource interactionSource, optional boolean enabled);
+ }
+
+ public final class ImageKt {
+ method @androidx.compose.runtime.Composable @androidx.compose.runtime.NonRestartableComposable public static void Image(androidx.compose.ui.graphics.ImageBitmap bitmap, String? contentDescription, optional androidx.compose.ui.Modifier modifier, optional androidx.compose.ui.Alignment alignment, optional androidx.compose.ui.layout.ContentScale contentScale, optional float alpha, optional androidx.compose.ui.graphics.ColorFilter? colorFilter, optional int filterQuality);
+ method @androidx.compose.runtime.Composable @androidx.compose.runtime.NonRestartableComposable public static void Image(androidx.compose.ui.graphics.vector.ImageVector imageVector, String? contentDescription, optional androidx.compose.ui.Modifier modifier, optional androidx.compose.ui.Alignment alignment, optional androidx.compose.ui.layout.ContentScale contentScale, optional float alpha, optional androidx.compose.ui.graphics.ColorFilter? colorFilter);
+ method @androidx.compose.runtime.Composable public static void Image(androidx.compose.ui.graphics.painter.Painter painter, String? contentDescription, optional androidx.compose.ui.Modifier modifier, optional androidx.compose.ui.Alignment alignment, optional androidx.compose.ui.layout.ContentScale contentScale, optional float alpha, optional androidx.compose.ui.graphics.ColorFilter? colorFilter);
+ method @Deprecated @androidx.compose.runtime.Composable @androidx.compose.runtime.NonRestartableComposable public static void Image(androidx.compose.ui.graphics.ImageBitmap bitmap, String contentDescription, optional androidx.compose.ui.Modifier modifier, optional androidx.compose.ui.Alignment alignment, optional androidx.compose.ui.layout.ContentScale contentScale, optional float alpha, optional androidx.compose.ui.graphics.ColorFilter? colorFilter);
+ }
+
+ @androidx.compose.runtime.Stable public interface Indication {
+ method @androidx.compose.runtime.Composable public androidx.compose.foundation.IndicationInstance rememberUpdatedInstance(androidx.compose.foundation.interaction.InteractionSource interactionSource);
+ }
+
+ public interface IndicationInstance {
+ method public void drawIndication(androidx.compose.ui.graphics.drawscope.ContentDrawScope);
+ }
+
+ public final class IndicationKt {
+ method public static androidx.compose.runtime.ProvidableCompositionLocal<androidx.compose.foundation.Indication> getLocalIndication();
+ method public static androidx.compose.ui.Modifier indication(androidx.compose.ui.Modifier, androidx.compose.foundation.interaction.InteractionSource interactionSource, androidx.compose.foundation.Indication? indication);
+ property public static final androidx.compose.runtime.ProvidableCompositionLocal<androidx.compose.foundation.Indication> LocalIndication;
+ }
+
+ public final class MagnifierKt {
+ }
+
+ public enum MutatePriority {
+ enum_constant public static final androidx.compose.foundation.MutatePriority Default;
+ enum_constant public static final androidx.compose.foundation.MutatePriority PreventUserInput;
+ enum_constant public static final androidx.compose.foundation.MutatePriority UserInput;
+ }
+
+ @androidx.compose.runtime.Stable public final class MutatorMutex {
+ ctor public MutatorMutex();
+ method public suspend <R> Object? mutate(optional androidx.compose.foundation.MutatePriority priority, kotlin.jvm.functions.Function1<? super kotlin.coroutines.Continuation<? super R>,?> block, kotlin.coroutines.Continuation<? super R>);
+ method public suspend <T, R> Object? mutateWith(T? receiver, optional androidx.compose.foundation.MutatePriority priority, kotlin.jvm.functions.Function2<? super T,? super kotlin.coroutines.Continuation<? super R>,?> block, kotlin.coroutines.Continuation<? super R>);
+ }
+
+ public final class ProgressSemanticsKt {
+ method @androidx.compose.runtime.Stable public static androidx.compose.ui.Modifier progressSemantics(androidx.compose.ui.Modifier, float value, optional kotlin.ranges.ClosedFloatingPointRange<java.lang.Float> valueRange, optional int steps);
+ method @androidx.compose.runtime.Stable public static androidx.compose.ui.Modifier progressSemantics(androidx.compose.ui.Modifier);
+ }
+
+ public final class ScrollKt {
+ method public static androidx.compose.ui.Modifier horizontalScroll(androidx.compose.ui.Modifier, androidx.compose.foundation.ScrollState state, optional boolean enabled, optional androidx.compose.foundation.gestures.FlingBehavior? flingBehavior, optional boolean reverseScrolling);
+ method @androidx.compose.runtime.Composable public static androidx.compose.foundation.ScrollState rememberScrollState(optional int initial);
+ method public static androidx.compose.ui.Modifier verticalScroll(androidx.compose.ui.Modifier, androidx.compose.foundation.ScrollState state, optional boolean enabled, optional androidx.compose.foundation.gestures.FlingBehavior? flingBehavior, optional boolean reverseScrolling);
+ }
+
+ @androidx.compose.runtime.Stable public final class ScrollState implements androidx.compose.foundation.gestures.ScrollableState {
+ ctor public ScrollState(int initial);
+ method public suspend Object? animateScrollTo(int value, optional androidx.compose.animation.core.AnimationSpec<java.lang.Float> animationSpec, optional kotlin.coroutines.Continuation<? super kotlin.Unit>);
+ method public float dispatchRawDelta(float delta);
+ method public androidx.compose.foundation.interaction.InteractionSource getInteractionSource();
+ method public int getMaxValue();
+ method public int getValue();
+ method public boolean isScrollInProgress();
+ method public suspend Object? scroll(androidx.compose.foundation.MutatePriority scrollPriority, kotlin.jvm.functions.Function2<? super androidx.compose.foundation.gestures.ScrollScope,? super kotlin.coroutines.Continuation<? super kotlin.Unit>,?> block, kotlin.coroutines.Continuation<? super kotlin.Unit>);
+ method public suspend Object? scrollTo(int value, kotlin.coroutines.Continuation<? super java.lang.Float>);
+ property public final androidx.compose.foundation.interaction.InteractionSource interactionSource;
+ property public boolean isScrollInProgress;
+ property public final int maxValue;
+ property public final int value;
+ field public static final androidx.compose.foundation.ScrollState.Companion Companion;
+ }
+
+ public static final class ScrollState.Companion {
+ method public androidx.compose.runtime.saveable.Saver<androidx.compose.foundation.ScrollState,?> getSaver();
+ property public final androidx.compose.runtime.saveable.Saver<androidx.compose.foundation.ScrollState,?> Saver;
+ }
+
+ public final class SystemGestureExclusionKt {
+ method public static androidx.compose.ui.Modifier systemGestureExclusion(androidx.compose.ui.Modifier);
+ method public static androidx.compose.ui.Modifier systemGestureExclusion(androidx.compose.ui.Modifier, kotlin.jvm.functions.Function1<? super androidx.compose.ui.layout.LayoutCoordinates,androidx.compose.ui.geometry.Rect> exclusion);
+ }
+
+ public final class TempListUtilsKt {
+ }
+
+}
+
+package androidx.compose.foundation.gestures {
+
+ public final class AndroidOverScrollKt {
+ }
+
+ public final class AndroidScrollable_androidKt {
+ }
+
+ public final class DragGestureDetectorKt {
+ method public static suspend Object? awaitDragOrCancellation(androidx.compose.ui.input.pointer.AwaitPointerEventScope, long pointerId, kotlin.coroutines.Continuation<? super androidx.compose.ui.input.pointer.PointerInputChange>);
+ method public static suspend Object? awaitHorizontalDragOrCancellation(androidx.compose.ui.input.pointer.AwaitPointerEventScope, long pointerId, kotlin.coroutines.Continuation<? super androidx.compose.ui.input.pointer.PointerInputChange>);
+ method public static suspend Object? awaitHorizontalTouchSlopOrCancellation(androidx.compose.ui.input.pointer.AwaitPointerEventScope, long pointerId, kotlin.jvm.functions.Function2<? super androidx.compose.ui.input.pointer.PointerInputChange,? super java.lang.Float,kotlin.Unit> onTouchSlopReached, kotlin.coroutines.Continuation<? super androidx.compose.ui.input.pointer.PointerInputChange>);
+ method public static suspend Object? awaitTouchSlopOrCancellation(androidx.compose.ui.input.pointer.AwaitPointerEventScope, long pointerId, kotlin.jvm.functions.Function2<? super androidx.compose.ui.input.pointer.PointerInputChange,? super androidx.compose.ui.geometry.Offset,kotlin.Unit> onTouchSlopReached, kotlin.coroutines.Continuation<? super androidx.compose.ui.input.pointer.PointerInputChange>);
+ method public static suspend Object? awaitVerticalDragOrCancellation(androidx.compose.ui.input.pointer.AwaitPointerEventScope, long pointerId, kotlin.coroutines.Continuation<? super androidx.compose.ui.input.pointer.PointerInputChange>);
+ method public static suspend Object? awaitVerticalTouchSlopOrCancellation(androidx.compose.ui.input.pointer.AwaitPointerEventScope, long pointerId, kotlin.jvm.functions.Function2<? super androidx.compose.ui.input.pointer.PointerInputChange,? super java.lang.Float,kotlin.Unit> onTouchSlopReached, kotlin.coroutines.Continuation<? super androidx.compose.ui.input.pointer.PointerInputChange>);
+ method public static suspend Object? detectDragGestures(androidx.compose.ui.input.pointer.PointerInputScope, optional kotlin.jvm.functions.Function1<? super androidx.compose.ui.geometry.Offset,kotlin.Unit> onDragStart, optional kotlin.jvm.functions.Function0<kotlin.Unit> onDragEnd, optional kotlin.jvm.functions.Function0<kotlin.Unit> onDragCancel, kotlin.jvm.functions.Function2<? super androidx.compose.ui.input.pointer.PointerInputChange,? super androidx.compose.ui.geometry.Offset,kotlin.Unit> onDrag, kotlin.coroutines.Continuation<? super kotlin.Unit>);
+ method public static suspend Object? detectDragGesturesAfterLongPress(androidx.compose.ui.input.pointer.PointerInputScope, optional kotlin.jvm.functions.Function1<? super androidx.compose.ui.geometry.Offset,kotlin.Unit> onDragStart, optional kotlin.jvm.functions.Function0<kotlin.Unit> onDragEnd, optional kotlin.jvm.functions.Function0<kotlin.Unit> onDragCancel, kotlin.jvm.functions.Function2<? super androidx.compose.ui.input.pointer.PointerInputChange,? super androidx.compose.ui.geometry.Offset,kotlin.Unit> onDrag, kotlin.coroutines.Continuation<? super kotlin.Unit>);
+ method public static suspend Object? detectHorizontalDragGestures(androidx.compose.ui.input.pointer.PointerInputScope, optional kotlin.jvm.functions.Function1<? super androidx.compose.ui.geometry.Offset,kotlin.Unit> onDragStart, optional kotlin.jvm.functions.Function0<kotlin.Unit> onDragEnd, optional kotlin.jvm.functions.Function0<kotlin.Unit> onDragCancel, kotlin.jvm.functions.Function2<? super androidx.compose.ui.input.pointer.PointerInputChange,? super java.lang.Float,kotlin.Unit> onHorizontalDrag, kotlin.coroutines.Continuation<? super kotlin.Unit>);
+ method public static suspend Object? detectVerticalDragGestures(androidx.compose.ui.input.pointer.PointerInputScope, optional kotlin.jvm.functions.Function1<? super androidx.compose.ui.geometry.Offset,kotlin.Unit> onDragStart, optional kotlin.jvm.functions.Function0<kotlin.Unit> onDragEnd, optional kotlin.jvm.functions.Function0<kotlin.Unit> onDragCancel, kotlin.jvm.functions.Function2<? super androidx.compose.ui.input.pointer.PointerInputChange,? super java.lang.Float,kotlin.Unit> onVerticalDrag, kotlin.coroutines.Continuation<? super kotlin.Unit>);
+ method public static suspend Object? drag(androidx.compose.ui.input.pointer.AwaitPointerEventScope, long pointerId, kotlin.jvm.functions.Function1<? super androidx.compose.ui.input.pointer.PointerInputChange,kotlin.Unit> onDrag, kotlin.coroutines.Continuation<? super java.lang.Boolean>);
+ method public static suspend Object? horizontalDrag(androidx.compose.ui.input.pointer.AwaitPointerEventScope, long pointerId, kotlin.jvm.functions.Function1<? super androidx.compose.ui.input.pointer.PointerInputChange,kotlin.Unit> onDrag, kotlin.coroutines.Continuation<? super java.lang.Boolean>);
+ method public static suspend Object? verticalDrag(androidx.compose.ui.input.pointer.AwaitPointerEventScope, long pointerId, kotlin.jvm.functions.Function1<? super androidx.compose.ui.input.pointer.PointerInputChange,kotlin.Unit> onDrag, kotlin.coroutines.Continuation<? super java.lang.Boolean>);
+ }
+
+ public interface DragScope {
+ method public void dragBy(float pixels);
+ }
+
+ public final class DraggableKt {
+ method public static androidx.compose.foundation.gestures.DraggableState DraggableState(kotlin.jvm.functions.Function1<? super java.lang.Float,kotlin.Unit> onDelta);
+ method public static androidx.compose.ui.Modifier draggable(androidx.compose.ui.Modifier, androidx.compose.foundation.gestures.DraggableState state, androidx.compose.foundation.gestures.Orientation orientation, optional boolean enabled, optional androidx.compose.foundation.interaction.MutableInteractionSource? interactionSource, optional boolean startDragImmediately, optional kotlin.jvm.functions.Function3<? super kotlinx.coroutines.CoroutineScope,? super androidx.compose.ui.geometry.Offset,? super kotlin.coroutines.Continuation<? super kotlin.Unit>,?> onDragStarted, optional kotlin.jvm.functions.Function3<? super kotlinx.coroutines.CoroutineScope,? super java.lang.Float,? super kotlin.coroutines.Continuation<? super kotlin.Unit>,?> onDragStopped, optional boolean reverseDirection);
+ method @androidx.compose.runtime.Composable public static androidx.compose.foundation.gestures.DraggableState rememberDraggableState(kotlin.jvm.functions.Function1<? super java.lang.Float,kotlin.Unit> onDelta);
+ }
+
+ public interface DraggableState {
+ method public void dispatchRawDelta(float delta);
+ method public suspend Object? drag(optional androidx.compose.foundation.MutatePriority dragPriority, kotlin.jvm.functions.Function2<? super androidx.compose.foundation.gestures.DragScope,? super kotlin.coroutines.Continuation<? super kotlin.Unit>,?> block, kotlin.coroutines.Continuation<? super kotlin.Unit>);
+ }
+
+ @androidx.compose.runtime.Stable public interface FlingBehavior {
+ method public suspend Object? performFling(androidx.compose.foundation.gestures.ScrollScope, float initialVelocity, kotlin.coroutines.Continuation<? super java.lang.Float>);
+ }
+
+ public final class ForEachGestureKt {
+ method public static suspend Object? forEachGesture(androidx.compose.ui.input.pointer.PointerInputScope, kotlin.jvm.functions.Function2<? super androidx.compose.ui.input.pointer.PointerInputScope,? super kotlin.coroutines.Continuation<? super kotlin.Unit>,?> block, kotlin.coroutines.Continuation<? super kotlin.Unit>);
+ }
+
+ public final class GestureCancellationException extends java.util.concurrent.CancellationException {
+ ctor public GestureCancellationException(optional String? message);
+ }
+
+ public enum Orientation {
+ enum_constant public static final androidx.compose.foundation.gestures.Orientation Horizontal;
+ enum_constant public static final androidx.compose.foundation.gestures.Orientation Vertical;
+ }
+
+ public final class OverScrollConfigurationKt {
+ }
+
+ public interface PressGestureScope extends androidx.compose.ui.unit.Density {
+ method public suspend Object? awaitRelease(kotlin.coroutines.Continuation<? super kotlin.Unit>);
+ method public suspend Object? tryAwaitRelease(kotlin.coroutines.Continuation<? super java.lang.Boolean>);
+ }
+
+ public final class ScrollExtensionsKt {
+ method public static suspend Object? animateScrollBy(androidx.compose.foundation.gestures.ScrollableState, float value, optional androidx.compose.animation.core.AnimationSpec<java.lang.Float> animationSpec, optional kotlin.coroutines.Continuation<? super java.lang.Float>);
+ method public static suspend Object? scrollBy(androidx.compose.foundation.gestures.ScrollableState, float value, kotlin.coroutines.Continuation<? super java.lang.Float>);
+ method public static suspend Object? stopScroll(androidx.compose.foundation.gestures.ScrollableState, optional androidx.compose.foundation.MutatePriority scrollPriority, optional kotlin.coroutines.Continuation<? super kotlin.Unit>);
+ }
+
+ public interface ScrollScope {
+ method public float scrollBy(float pixels);
+ }
+
+ public final class ScrollableDefaults {
+ method @androidx.compose.runtime.Composable public androidx.compose.foundation.gestures.FlingBehavior flingBehavior();
+ field public static final androidx.compose.foundation.gestures.ScrollableDefaults INSTANCE;
+ }
+
+ public final class ScrollableKt {
+ method public static androidx.compose.ui.Modifier scrollable(androidx.compose.ui.Modifier, androidx.compose.foundation.gestures.ScrollableState state, androidx.compose.foundation.gestures.Orientation orientation, optional boolean enabled, optional boolean reverseDirection, optional androidx.compose.foundation.gestures.FlingBehavior? flingBehavior, optional androidx.compose.foundation.interaction.MutableInteractionSource? interactionSource);
+ }
+
+ public interface ScrollableState {
+ method public float dispatchRawDelta(float delta);
+ method public boolean isScrollInProgress();
+ method public suspend Object? scroll(optional androidx.compose.foundation.MutatePriority scrollPriority, kotlin.jvm.functions.Function2<? super androidx.compose.foundation.gestures.ScrollScope,? super kotlin.coroutines.Continuation<? super kotlin.Unit>,?> block, kotlin.coroutines.Continuation<? super kotlin.Unit>);
+ property public abstract boolean isScrollInProgress;
+ }
+
+ public final class ScrollableStateKt {
+ method public static androidx.compose.foundation.gestures.ScrollableState ScrollableState(kotlin.jvm.functions.Function1<? super java.lang.Float,java.lang.Float> consumeScrollDelta);
+ method @androidx.compose.runtime.Composable public static androidx.compose.foundation.gestures.ScrollableState rememberScrollableState(kotlin.jvm.functions.Function1<? super java.lang.Float,java.lang.Float> consumeScrollDelta);
+ }
+
+ public final class TapGestureDetectorKt {
+ method public static suspend Object? awaitFirstDown(androidx.compose.ui.input.pointer.AwaitPointerEventScope, optional boolean requireUnconsumed, optional kotlin.coroutines.Continuation<? super androidx.compose.ui.input.pointer.PointerInputChange>);
+ method public static suspend Object? detectTapGestures(androidx.compose.ui.input.pointer.PointerInputScope, optional kotlin.jvm.functions.Function1<? super androidx.compose.ui.geometry.Offset,kotlin.Unit>? onDoubleTap, optional kotlin.jvm.functions.Function1<? super androidx.compose.ui.geometry.Offset,kotlin.Unit>? onLongPress, optional kotlin.jvm.functions.Function3<? super androidx.compose.foundation.gestures.PressGestureScope,? super androidx.compose.ui.geometry.Offset,? super kotlin.coroutines.Continuation<? super kotlin.Unit>,?> onPress, optional kotlin.jvm.functions.Function1<? super androidx.compose.ui.geometry.Offset,kotlin.Unit>? onTap, optional kotlin.coroutines.Continuation<? super kotlin.Unit>);
+ method public static suspend Object? waitForUpOrCancellation(androidx.compose.ui.input.pointer.AwaitPointerEventScope, kotlin.coroutines.Continuation<? super androidx.compose.ui.input.pointer.PointerInputChange>);
+ }
+
+ public final class TransformGestureDetectorKt {
+ method public static long calculateCentroid(androidx.compose.ui.input.pointer.PointerEvent, optional boolean useCurrent);
+ method public static float calculateCentroidSize(androidx.compose.ui.input.pointer.PointerEvent, optional boolean useCurrent);
+ method public static long calculatePan(androidx.compose.ui.input.pointer.PointerEvent);
+ method public static float calculateRotation(androidx.compose.ui.input.pointer.PointerEvent);
+ method public static float calculateZoom(androidx.compose.ui.input.pointer.PointerEvent);
+ method public static suspend Object? detectTransformGestures(androidx.compose.ui.input.pointer.PointerInputScope, optional boolean panZoomLock, kotlin.jvm.functions.Function4<? super androidx.compose.ui.geometry.Offset,? super androidx.compose.ui.geometry.Offset,? super java.lang.Float,? super java.lang.Float,kotlin.Unit> onGesture, kotlin.coroutines.Continuation<? super kotlin.Unit>);
+ }
+
+ public interface TransformScope {
+ method public void transformBy(optional float zoomChange, optional long panChange, optional float rotationChange);
+ }
+
+ public final class TransformableKt {
+ method public static androidx.compose.ui.Modifier transformable(androidx.compose.ui.Modifier, androidx.compose.foundation.gestures.TransformableState state, optional boolean lockRotationOnZoomPan, optional boolean enabled);
+ }
+
+ public interface TransformableState {
+ method public boolean isTransformInProgress();
+ method public suspend Object? transform(optional androidx.compose.foundation.MutatePriority transformPriority, kotlin.jvm.functions.Function2<? super androidx.compose.foundation.gestures.TransformScope,? super kotlin.coroutines.Continuation<? super kotlin.Unit>,?> block, kotlin.coroutines.Continuation<? super kotlin.Unit>);
+ property public abstract boolean isTransformInProgress;
+ }
+
+ public final class TransformableStateKt {
+ method public static androidx.compose.foundation.gestures.TransformableState TransformableState(kotlin.jvm.functions.Function3<? super java.lang.Float,? super androidx.compose.ui.geometry.Offset,? super java.lang.Float,kotlin.Unit> onTransformation);
+ method public static suspend Object? animatePanBy(androidx.compose.foundation.gestures.TransformableState, long offset, optional androidx.compose.animation.core.AnimationSpec<androidx.compose.ui.geometry.Offset> animationSpec, optional kotlin.coroutines.Continuation<? super kotlin.Unit>);
+ method public static suspend Object? animateRotateBy(androidx.compose.foundation.gestures.TransformableState, float degrees, optional androidx.compose.animation.core.AnimationSpec<java.lang.Float> animationSpec, optional kotlin.coroutines.Continuation<? super kotlin.Unit>);
+ method public static suspend Object? animateZoomBy(androidx.compose.foundation.gestures.TransformableState, float zoomFactor, optional androidx.compose.animation.core.AnimationSpec<java.lang.Float> animationSpec, optional kotlin.coroutines.Continuation<? super kotlin.Unit>);
+ method public static suspend Object? panBy(androidx.compose.foundation.gestures.TransformableState, long offset, kotlin.coroutines.Continuation<? super kotlin.Unit>);
+ method @androidx.compose.runtime.Composable public static androidx.compose.foundation.gestures.TransformableState rememberTransformableState(kotlin.jvm.functions.Function3<? super java.lang.Float,? super androidx.compose.ui.geometry.Offset,? super java.lang.Float,kotlin.Unit> onTransformation);
+ method public static suspend Object? rotateBy(androidx.compose.foundation.gestures.TransformableState, float degrees, kotlin.coroutines.Continuation<? super kotlin.Unit>);
+ method public static suspend Object? stopTransformation(androidx.compose.foundation.gestures.TransformableState, optional androidx.compose.foundation.MutatePriority terminationPriority, optional kotlin.coroutines.Continuation<? super kotlin.Unit>);
+ method public static suspend Object? zoomBy(androidx.compose.foundation.gestures.TransformableState, float zoomFactor, kotlin.coroutines.Continuation<? super kotlin.Unit>);
+ }
+
+}
+
+package androidx.compose.foundation.interaction {
+
+ public interface DragInteraction extends androidx.compose.foundation.interaction.Interaction {
+ }
+
+ public static final class DragInteraction.Cancel implements androidx.compose.foundation.interaction.DragInteraction {
+ ctor public DragInteraction.Cancel(androidx.compose.foundation.interaction.DragInteraction.Start start);
+ method public androidx.compose.foundation.interaction.DragInteraction.Start getStart();
+ property public final androidx.compose.foundation.interaction.DragInteraction.Start start;
+ }
+
+ public static final class DragInteraction.Start implements androidx.compose.foundation.interaction.DragInteraction {
+ ctor public DragInteraction.Start();
+ }
+
+ public static final class DragInteraction.Stop implements androidx.compose.foundation.interaction.DragInteraction {
+ ctor public DragInteraction.Stop(androidx.compose.foundation.interaction.DragInteraction.Start start);
+ method public androidx.compose.foundation.interaction.DragInteraction.Start getStart();
+ property public final androidx.compose.foundation.interaction.DragInteraction.Start start;
+ }
+
+ public final class DragInteractionKt {
+ method @androidx.compose.runtime.Composable public static androidx.compose.runtime.State<java.lang.Boolean> collectIsDraggedAsState(androidx.compose.foundation.interaction.InteractionSource);
+ }
+
+ public interface FocusInteraction extends androidx.compose.foundation.interaction.Interaction {
+ }
+
+ public static final class FocusInteraction.Focus implements androidx.compose.foundation.interaction.FocusInteraction {
+ ctor public FocusInteraction.Focus();
+ }
+
+ public static final class FocusInteraction.Unfocus implements androidx.compose.foundation.interaction.FocusInteraction {
+ ctor public FocusInteraction.Unfocus(androidx.compose.foundation.interaction.FocusInteraction.Focus focus);
+ method public androidx.compose.foundation.interaction.FocusInteraction.Focus getFocus();
+ property public final androidx.compose.foundation.interaction.FocusInteraction.Focus focus;
+ }
+
+ public final class FocusInteractionKt {
+ method @androidx.compose.runtime.Composable public static androidx.compose.runtime.State<java.lang.Boolean> collectIsFocusedAsState(androidx.compose.foundation.interaction.InteractionSource);
+ }
+
+ public interface HoverInteraction extends androidx.compose.foundation.interaction.Interaction {
+ }
+
+ public static final class HoverInteraction.Enter implements androidx.compose.foundation.interaction.HoverInteraction {
+ ctor public HoverInteraction.Enter();
+ }
+
+ public static final class HoverInteraction.Exit implements androidx.compose.foundation.interaction.HoverInteraction {
+ ctor public HoverInteraction.Exit(androidx.compose.foundation.interaction.HoverInteraction.Enter enter);
+ method public androidx.compose.foundation.interaction.HoverInteraction.Enter getEnter();
+ property public final androidx.compose.foundation.interaction.HoverInteraction.Enter enter;
+ }
+
+ public final class HoverInteractionKt {
+ method @androidx.compose.runtime.Composable public static androidx.compose.runtime.State<java.lang.Boolean> collectIsHoveredAsState(androidx.compose.foundation.interaction.InteractionSource);
+ }
+
+ public interface Interaction {
+ }
+
+ @androidx.compose.runtime.Stable public interface InteractionSource {
+ method public kotlinx.coroutines.flow.Flow<androidx.compose.foundation.interaction.Interaction> getInteractions();
+ property public abstract kotlinx.coroutines.flow.Flow<androidx.compose.foundation.interaction.Interaction> interactions;
+ }
+
+ public final class InteractionSourceKt {
+ method public static androidx.compose.foundation.interaction.MutableInteractionSource MutableInteractionSource();
+ }
+
+ @androidx.compose.runtime.Stable public interface MutableInteractionSource extends androidx.compose.foundation.interaction.InteractionSource {
+ method public suspend Object? emit(androidx.compose.foundation.interaction.Interaction interaction, kotlin.coroutines.Continuation<? super kotlin.Unit>);
+ method public boolean tryEmit(androidx.compose.foundation.interaction.Interaction interaction);
+ }
+
+ public interface PressInteraction extends androidx.compose.foundation.interaction.Interaction {
+ }
+
+ public static final class PressInteraction.Cancel implements androidx.compose.foundation.interaction.PressInteraction {
+ ctor public PressInteraction.Cancel(androidx.compose.foundation.interaction.PressInteraction.Press press);
+ method public androidx.compose.foundation.interaction.PressInteraction.Press getPress();
+ property public final androidx.compose.foundation.interaction.PressInteraction.Press press;
+ }
+
+ public static final class PressInteraction.Press implements androidx.compose.foundation.interaction.PressInteraction {
+ ctor public PressInteraction.Press(long pressPosition);
+ method public long getPressPosition();
+ property public final long pressPosition;
+ }
+
+ public static final class PressInteraction.Release implements androidx.compose.foundation.interaction.PressInteraction {
+ ctor public PressInteraction.Release(androidx.compose.foundation.interaction.PressInteraction.Press press);
+ method public androidx.compose.foundation.interaction.PressInteraction.Press getPress();
+ property public final androidx.compose.foundation.interaction.PressInteraction.Press press;
+ }
+
+ public final class PressInteractionKt {
+ method @androidx.compose.runtime.Composable public static androidx.compose.runtime.State<java.lang.Boolean> collectIsPressedAsState(androidx.compose.foundation.interaction.InteractionSource);
+ }
+
+}
+
+package androidx.compose.foundation.lazy {
+
+ public final class LazyBeyondBoundsModifierKt {
+ }
+
+ public final class LazyDslKt {
+ method @androidx.compose.runtime.Composable public static void LazyColumn(optional androidx.compose.ui.Modifier modifier, optional androidx.compose.foundation.lazy.LazyListState state, optional androidx.compose.foundation.layout.PaddingValues contentPadding, optional boolean reverseLayout, optional androidx.compose.foundation.layout.Arrangement.Vertical verticalArrangement, optional androidx.compose.ui.Alignment.Horizontal horizontalAlignment, optional androidx.compose.foundation.gestures.FlingBehavior flingBehavior, optional boolean userScrollEnabled, kotlin.jvm.functions.Function1<? super androidx.compose.foundation.lazy.LazyListScope,kotlin.Unit> content);
+ method @Deprecated @androidx.compose.runtime.Composable public static void LazyColumn(optional androidx.compose.ui.Modifier modifier, optional androidx.compose.foundation.lazy.LazyListState state, optional androidx.compose.foundation.layout.PaddingValues contentPadding, optional boolean reverseLayout, optional androidx.compose.foundation.layout.Arrangement.Vertical verticalArrangement, optional androidx.compose.ui.Alignment.Horizontal horizontalAlignment, optional androidx.compose.foundation.gestures.FlingBehavior flingBehavior, kotlin.jvm.functions.Function1<? super androidx.compose.foundation.lazy.LazyListScope,? extends kotlin.Unit> content);
+ method @androidx.compose.runtime.Composable public static void LazyRow(optional androidx.compose.ui.Modifier modifier, optional androidx.compose.foundation.lazy.LazyListState state, optional androidx.compose.foundation.layout.PaddingValues contentPadding, optional boolean reverseLayout, optional androidx.compose.foundation.layout.Arrangement.Horizontal horizontalArrangement, optional androidx.compose.ui.Alignment.Vertical verticalAlignment, optional androidx.compose.foundation.gestures.FlingBehavior flingBehavior, optional boolean userScrollEnabled, kotlin.jvm.functions.Function1<? super androidx.compose.foundation.lazy.LazyListScope,kotlin.Unit> content);
+ method @Deprecated @androidx.compose.runtime.Composable public static void LazyRow(optional androidx.compose.ui.Modifier modifier, optional androidx.compose.foundation.lazy.LazyListState state, optional androidx.compose.foundation.layout.PaddingValues contentPadding, optional boolean reverseLayout, optional androidx.compose.foundation.layout.Arrangement.Horizontal horizontalArrangement, optional androidx.compose.ui.Alignment.Vertical verticalAlignment, optional androidx.compose.foundation.gestures.FlingBehavior flingBehavior, kotlin.jvm.functions.Function1<? super androidx.compose.foundation.lazy.LazyListScope,? extends kotlin.Unit> content);
+ method public static inline <T> void items(androidx.compose.foundation.lazy.LazyListScope, java.util.List<? extends T> items, optional kotlin.jvm.functions.Function1<? super T,?>? key, optional kotlin.jvm.functions.Function1<? super T,?> contentType, kotlin.jvm.functions.Function2<? super androidx.compose.foundation.lazy.LazyItemScope,? super T,kotlin.Unit> itemContent);
+ method public static inline <T> void items(androidx.compose.foundation.lazy.LazyListScope, T![] items, optional kotlin.jvm.functions.Function1<? super T,?>? key, optional kotlin.jvm.functions.Function1<? super T,?> contentType, kotlin.jvm.functions.Function2<? super androidx.compose.foundation.lazy.LazyItemScope,? super T,kotlin.Unit> itemContent);
+ method @Deprecated public static inline <T> void items(androidx.compose.foundation.lazy.LazyListScope, java.util.List<? extends T> items, optional kotlin.jvm.functions.Function1<? super T,?>? key, kotlin.jvm.functions.Function2<? super androidx.compose.foundation.lazy.LazyItemScope,? super T,? extends kotlin.Unit> itemContent);
+ method @Deprecated public static inline <T> void items(androidx.compose.foundation.lazy.LazyListScope, T![] items, optional kotlin.jvm.functions.Function1<? super T,?>? key, kotlin.jvm.functions.Function2<? super androidx.compose.foundation.lazy.LazyItemScope,? super T,? extends kotlin.Unit> itemContent);
+ method public static inline <T> void itemsIndexed(androidx.compose.foundation.lazy.LazyListScope, java.util.List<? extends T> items, optional kotlin.jvm.functions.Function2<? super java.lang.Integer,? super T,?>? key, optional kotlin.jvm.functions.Function2<? super java.lang.Integer,? super T,?> contentType, kotlin.jvm.functions.Function3<? super androidx.compose.foundation.lazy.LazyItemScope,? super java.lang.Integer,? super T,kotlin.Unit> itemContent);
+ method public static inline <T> void itemsIndexed(androidx.compose.foundation.lazy.LazyListScope, T![] items, optional kotlin.jvm.functions.Function2<? super java.lang.Integer,? super T,?>? key, optional kotlin.jvm.functions.Function2<? super java.lang.Integer,? super T,?> contentType, kotlin.jvm.functions.Function3<? super androidx.compose.foundation.lazy.LazyItemScope,? super java.lang.Integer,? super T,kotlin.Unit> itemContent);
+ method @Deprecated public static inline <T> void itemsIndexed(androidx.compose.foundation.lazy.LazyListScope, java.util.List<? extends T> items, optional kotlin.jvm.functions.Function2<? super java.lang.Integer,? super T,?>? key, kotlin.jvm.functions.Function3<? super androidx.compose.foundation.lazy.LazyItemScope,? super java.lang.Integer,? super T,? extends kotlin.Unit> itemContent);
+ method @Deprecated public static inline <T> void itemsIndexed(androidx.compose.foundation.lazy.LazyListScope, T![] items, optional kotlin.jvm.functions.Function2<? super java.lang.Integer,? super T,?>? key, kotlin.jvm.functions.Function3<? super androidx.compose.foundation.lazy.LazyItemScope,? super java.lang.Integer,? super T,? extends kotlin.Unit> itemContent);
+ }
+
+ public final class LazyGridDeprecatedKt {
+ }
+
+ @androidx.compose.foundation.lazy.LazyScopeMarker @androidx.compose.runtime.Stable public interface LazyItemScope {
+ method public androidx.compose.ui.Modifier fillParentMaxHeight(androidx.compose.ui.Modifier, optional float fraction);
+ method public androidx.compose.ui.Modifier fillParentMaxSize(androidx.compose.ui.Modifier, optional float fraction);
+ method public androidx.compose.ui.Modifier fillParentMaxWidth(androidx.compose.ui.Modifier, optional float fraction);
+ }
+
+ public final class LazyListHeadersKt {
+ }
+
+ public interface LazyListItemInfo {
+ method public int getIndex();
+ method public Object getKey();
+ method public int getOffset();
+ method public int getSize();
+ property public abstract int index;
+ property public abstract Object key;
+ property public abstract int offset;
+ property public abstract int size;
+ }
+
+ public final class LazyListItemPlacementAnimatorKt {
+ }
+
+ public final class LazyListItemProviderImplKt {
+ }
+
+ public final class LazyListKt {
+ }
+
+ public interface LazyListLayoutInfo {
+ method public default int getAfterContentPadding();
+ method public default int getBeforeContentPadding();
+ method public default androidx.compose.foundation.gestures.Orientation getOrientation();
+ method public default boolean getReverseLayout();
+ method public int getTotalItemsCount();
+ method public int getViewportEndOffset();
+ method public default long getViewportSize();
+ method public int getViewportStartOffset();
+ method public java.util.List<androidx.compose.foundation.lazy.LazyListItemInfo> getVisibleItemsInfo();
+ property public default int afterContentPadding;
+ property public default int beforeContentPadding;
+ property public default androidx.compose.foundation.gestures.Orientation orientation;
+ property public default boolean reverseLayout;
+ property public abstract int totalItemsCount;
+ property public abstract int viewportEndOffset;
+ property public default long viewportSize;
+ property public abstract int viewportStartOffset;
+ property public abstract java.util.List<androidx.compose.foundation.lazy.LazyListItemInfo> visibleItemsInfo;
+ }
+
+ public final class LazyListMeasureKt {
+ }
+
+ public final class LazyListPinningModifierKt {
+ }
+
+ @androidx.compose.foundation.lazy.LazyScopeMarker public interface LazyListScope {
+ method public default void item(optional Object? key, optional Object? contentType, kotlin.jvm.functions.Function1<? super androidx.compose.foundation.lazy.LazyItemScope,kotlin.Unit> content);
+ method @Deprecated public void item(optional Object? key, kotlin.jvm.functions.Function1<? super androidx.compose.foundation.lazy.LazyItemScope,? extends kotlin.Unit> content);
+ method public default void items(int count, optional kotlin.jvm.functions.Function1<? super java.lang.Integer,?>? key, optional kotlin.jvm.functions.Function1<? super java.lang.Integer,?> contentType, kotlin.jvm.functions.Function2<? super androidx.compose.foundation.lazy.LazyItemScope,? super java.lang.Integer,kotlin.Unit> itemContent);
+ method @Deprecated public void items(int count, optional kotlin.jvm.functions.Function1<? super java.lang.Integer,?>? key, kotlin.jvm.functions.Function2<? super androidx.compose.foundation.lazy.LazyItemScope,? super java.lang.Integer,? extends kotlin.Unit> itemContent);
+ }
+
+ public final class LazyListScrollingKt {
+ }
+
+ @androidx.compose.runtime.Stable public final class LazyListState implements androidx.compose.foundation.gestures.ScrollableState {
+ ctor public LazyListState(optional int firstVisibleItemIndex, optional int firstVisibleItemScrollOffset);
+ method public suspend Object? animateScrollToItem(int index, optional int scrollOffset, optional kotlin.coroutines.Continuation<? super kotlin.Unit>);
+ method public float dispatchRawDelta(float delta);
+ method public int getFirstVisibleItemIndex();
+ method public int getFirstVisibleItemScrollOffset();
+ method public androidx.compose.foundation.interaction.InteractionSource getInteractionSource();
+ method public androidx.compose.foundation.lazy.LazyListLayoutInfo getLayoutInfo();
+ method public boolean isScrollInProgress();
+ method public suspend Object? scroll(androidx.compose.foundation.MutatePriority scrollPriority, kotlin.jvm.functions.Function2<? super androidx.compose.foundation.gestures.ScrollScope,? super kotlin.coroutines.Continuation<? super kotlin.Unit>,?> block, kotlin.coroutines.Continuation<? super kotlin.Unit>);
+ method public suspend Object? scrollToItem(int index, optional int scrollOffset, optional kotlin.coroutines.Continuation<? super kotlin.Unit>);
+ property public final int firstVisibleItemIndex;
+ property public final int firstVisibleItemScrollOffset;
+ property public final androidx.compose.foundation.interaction.InteractionSource interactionSource;
+ property public boolean isScrollInProgress;
+ property public final androidx.compose.foundation.lazy.LazyListLayoutInfo layoutInfo;
+ field public static final androidx.compose.foundation.lazy.LazyListState.Companion Companion;
+ }
+
+ public static final class LazyListState.Companion {
+ method public androidx.compose.runtime.saveable.Saver<androidx.compose.foundation.lazy.LazyListState,?> getSaver();
+ property public final androidx.compose.runtime.saveable.Saver<androidx.compose.foundation.lazy.LazyListState,?> Saver;
+ }
+
+ public final class LazyListStateKt {
+ method @androidx.compose.runtime.Composable public static androidx.compose.foundation.lazy.LazyListState rememberLazyListState(optional int initialFirstVisibleItemIndex, optional int initialFirstVisibleItemScrollOffset);
+ }
+
+ @kotlin.DslMarker public @interface LazyScopeMarker {
+ }
+
+ public final class LazySemanticsKt {
+ }
+
+}
+
+package androidx.compose.foundation.lazy.grid {
+
+ @androidx.compose.runtime.Stable public interface GridCells {
+ method public java.util.List<java.lang.Integer> calculateCrossAxisCellSizes(androidx.compose.ui.unit.Density, int availableSize, int spacing);
+ }
+
+ public static final class GridCells.Adaptive implements androidx.compose.foundation.lazy.grid.GridCells {
+ ctor public GridCells.Adaptive(float minSize);
+ method public java.util.List<java.lang.Integer> calculateCrossAxisCellSizes(androidx.compose.ui.unit.Density, int availableSize, int spacing);
+ }
+
+ public static final class GridCells.Fixed implements androidx.compose.foundation.lazy.grid.GridCells {
+ ctor public GridCells.Fixed(int count);
+ method public java.util.List<java.lang.Integer> calculateCrossAxisCellSizes(androidx.compose.ui.unit.Density, int availableSize, int spacing);
+ }
+
+ @androidx.compose.runtime.Immutable @kotlin.jvm.JvmInline public final value class GridItemSpan {
+ method public int getCurrentLineSpan();
+ property public final int currentLineSpan;
+ }
+
+ public final class LazyGridDslKt {
+ method @androidx.compose.runtime.Composable public static void LazyHorizontalGrid(androidx.compose.foundation.lazy.grid.GridCells rows, optional androidx.compose.ui.Modifier modifier, optional androidx.compose.foundation.lazy.grid.LazyGridState state, optional androidx.compose.foundation.layout.PaddingValues contentPadding, optional boolean reverseLayout, optional androidx.compose.foundation.layout.Arrangement.Horizontal horizontalArrangement, optional androidx.compose.foundation.layout.Arrangement.Vertical verticalArrangement, optional androidx.compose.foundation.gestures.FlingBehavior flingBehavior, optional boolean userScrollEnabled, kotlin.jvm.functions.Function1<? super androidx.compose.foundation.lazy.grid.LazyGridScope,kotlin.Unit> content);
+ method @androidx.compose.runtime.Composable public static void LazyVerticalGrid(androidx.compose.foundation.lazy.grid.GridCells columns, optional androidx.compose.ui.Modifier modifier, optional androidx.compose.foundation.lazy.grid.LazyGridState state, optional androidx.compose.foundation.layout.PaddingValues contentPadding, optional boolean reverseLayout, optional androidx.compose.foundation.layout.Arrangement.Vertical verticalArrangement, optional androidx.compose.foundation.layout.Arrangement.Horizontal horizontalArrangement, optional androidx.compose.foundation.gestures.FlingBehavior flingBehavior, optional boolean userScrollEnabled, kotlin.jvm.functions.Function1<? super androidx.compose.foundation.lazy.grid.LazyGridScope,kotlin.Unit> content);
+ method public static inline <T> void items(androidx.compose.foundation.lazy.grid.LazyGridScope, java.util.List<? extends T> items, optional kotlin.jvm.functions.Function1<? super T,?>? key, optional kotlin.jvm.functions.Function2<? super androidx.compose.foundation.lazy.grid.LazyGridItemSpanScope,? super T,androidx.compose.foundation.lazy.grid.GridItemSpan>? span, optional kotlin.jvm.functions.Function1<? super T,?> contentType, kotlin.jvm.functions.Function2<? super androidx.compose.foundation.lazy.grid.LazyGridItemScope,? super T,kotlin.Unit> itemContent);
+ method public static inline <T> void items(androidx.compose.foundation.lazy.grid.LazyGridScope, T![] items, optional kotlin.jvm.functions.Function1<? super T,?>? key, optional kotlin.jvm.functions.Function2<? super androidx.compose.foundation.lazy.grid.LazyGridItemSpanScope,? super T,androidx.compose.foundation.lazy.grid.GridItemSpan>? span, optional kotlin.jvm.functions.Function1<? super T,?> contentType, kotlin.jvm.functions.Function2<? super androidx.compose.foundation.lazy.grid.LazyGridItemScope,? super T,kotlin.Unit> itemContent);
+ method public static inline <T> void itemsIndexed(androidx.compose.foundation.lazy.grid.LazyGridScope, java.util.List<? extends T> items, optional kotlin.jvm.functions.Function2<? super java.lang.Integer,? super T,?>? key, optional kotlin.jvm.functions.Function3<? super androidx.compose.foundation.lazy.grid.LazyGridItemSpanScope,? super java.lang.Integer,? super T,androidx.compose.foundation.lazy.grid.GridItemSpan>? span, optional kotlin.jvm.functions.Function2<? super java.lang.Integer,? super T,?> contentType, kotlin.jvm.functions.Function3<? super androidx.compose.foundation.lazy.grid.LazyGridItemScope,? super java.lang.Integer,? super T,kotlin.Unit> itemContent);
+ method public static inline <T> void itemsIndexed(androidx.compose.foundation.lazy.grid.LazyGridScope, T![] items, optional kotlin.jvm.functions.Function2<? super java.lang.Integer,? super T,?>? key, optional kotlin.jvm.functions.Function3<? super androidx.compose.foundation.lazy.grid.LazyGridItemSpanScope,? super java.lang.Integer,? super T,androidx.compose.foundation.lazy.grid.GridItemSpan>? span, optional kotlin.jvm.functions.Function2<? super java.lang.Integer,? super T,?> contentType, kotlin.jvm.functions.Function3<? super androidx.compose.foundation.lazy.grid.LazyGridItemScope,? super java.lang.Integer,? super T,kotlin.Unit> itemContent);
+ }
+
+ public sealed interface LazyGridItemInfo {
+ method public int getColumn();
+ method public int getIndex();
+ method public Object getKey();
+ method public long getOffset();
+ method public int getRow();
+ method public long getSize();
+ property public abstract int column;
+ property public abstract int index;
+ property public abstract Object key;
+ property public abstract long offset;
+ property public abstract int row;
+ property public abstract long size;
+ field public static final androidx.compose.foundation.lazy.grid.LazyGridItemInfo.Companion Companion;
+ field public static final int UnknownColumn = -1; // 0xffffffff
+ field public static final int UnknownRow = -1; // 0xffffffff
+ }
+
+ public static final class LazyGridItemInfo.Companion {
+ field public static final int UnknownColumn = -1; // 0xffffffff
+ field public static final int UnknownRow = -1; // 0xffffffff
+ }
+
+ public final class LazyGridItemPlacementAnimatorKt {
+ }
+
+ public final class LazyGridItemProviderImplKt {
+ }
+
+ @androidx.compose.foundation.lazy.grid.LazyGridScopeMarker @androidx.compose.runtime.Stable public sealed interface LazyGridItemScope {
+ }
+
+ @androidx.compose.foundation.lazy.grid.LazyGridScopeMarker public sealed interface LazyGridItemSpanScope {
+ method public int getMaxCurrentLineSpan();
+ method public int getMaxLineSpan();
+ property public abstract int maxCurrentLineSpan;
+ property public abstract int maxLineSpan;
+ }
+
+ public final class LazyGridKt {
+ }
+
+ public sealed interface LazyGridLayoutInfo {
+ method public int getAfterContentPadding();
+ method public int getBeforeContentPadding();
+ method public androidx.compose.foundation.gestures.Orientation getOrientation();
+ method public boolean getReverseLayout();
+ method public int getTotalItemsCount();
+ method public int getViewportEndOffset();
+ method public long getViewportSize();
+ method public int getViewportStartOffset();
+ method public java.util.List<androidx.compose.foundation.lazy.grid.LazyGridItemInfo> getVisibleItemsInfo();
+ property public abstract int afterContentPadding;
+ property public abstract int beforeContentPadding;
+ property public abstract androidx.compose.foundation.gestures.Orientation orientation;
+ property public abstract boolean reverseLayout;
+ property public abstract int totalItemsCount;
+ property public abstract int viewportEndOffset;
+ property public abstract long viewportSize;
+ property public abstract int viewportStartOffset;
+ property public abstract java.util.List<androidx.compose.foundation.lazy.grid.LazyGridItemInfo> visibleItemsInfo;
+ }
+
+ public final class LazyGridMeasureKt {
+ }
+
+ @androidx.compose.foundation.lazy.grid.LazyGridScopeMarker public sealed interface LazyGridScope {
+ method public void item(optional Object? key, optional kotlin.jvm.functions.Function1<? super androidx.compose.foundation.lazy.grid.LazyGridItemSpanScope,androidx.compose.foundation.lazy.grid.GridItemSpan>? span, optional Object? contentType, kotlin.jvm.functions.Function1<? super androidx.compose.foundation.lazy.grid.LazyGridItemScope,kotlin.Unit> content);
+ method public void items(int count, optional kotlin.jvm.functions.Function1<? super java.lang.Integer,?>? key, optional kotlin.jvm.functions.Function2<? super androidx.compose.foundation.lazy.grid.LazyGridItemSpanScope,? super java.lang.Integer,androidx.compose.foundation.lazy.grid.GridItemSpan>? span, optional kotlin.jvm.functions.Function1<? super java.lang.Integer,?> contentType, kotlin.jvm.functions.Function2<? super androidx.compose.foundation.lazy.grid.LazyGridItemScope,? super java.lang.Integer,kotlin.Unit> itemContent);
+ }
+
+ @kotlin.DslMarker public @interface LazyGridScopeMarker {
+ }
+
+ public final class LazyGridScrollingKt {
+ }
+
+ public final class LazyGridSpanKt {
+ method public static long GridItemSpan(int currentLineSpan);
+ }
+
+ @androidx.compose.runtime.Stable public final class LazyGridState implements androidx.compose.foundation.gestures.ScrollableState {
+ ctor public LazyGridState(optional int firstVisibleItemIndex, optional int firstVisibleItemScrollOffset);
+ method public suspend Object? animateScrollToItem(int index, optional int scrollOffset, optional kotlin.coroutines.Continuation<? super kotlin.Unit>);
+ method public float dispatchRawDelta(float delta);
+ method public int getFirstVisibleItemIndex();
+ method public int getFirstVisibleItemScrollOffset();
+ method public androidx.compose.foundation.interaction.InteractionSource getInteractionSource();
+ method public androidx.compose.foundation.lazy.grid.LazyGridLayoutInfo getLayoutInfo();
+ method public boolean isScrollInProgress();
+ method public suspend Object? scroll(androidx.compose.foundation.MutatePriority scrollPriority, kotlin.jvm.functions.Function2<? super androidx.compose.foundation.gestures.ScrollScope,? super kotlin.coroutines.Continuation<? super kotlin.Unit>,?> block, kotlin.coroutines.Continuation<? super kotlin.Unit>);
+ method public suspend Object? scrollToItem(int index, optional int scrollOffset, optional kotlin.coroutines.Continuation<? super kotlin.Unit>);
+ property public final int firstVisibleItemIndex;
+ property public final int firstVisibleItemScrollOffset;
+ property public final androidx.compose.foundation.interaction.InteractionSource interactionSource;
+ property public boolean isScrollInProgress;
+ property public final androidx.compose.foundation.lazy.grid.LazyGridLayoutInfo layoutInfo;
+ field public static final androidx.compose.foundation.lazy.grid.LazyGridState.Companion Companion;
+ }
+
+ public static final class LazyGridState.Companion {
+ method public androidx.compose.runtime.saveable.Saver<androidx.compose.foundation.lazy.grid.LazyGridState,?> getSaver();
+ property public final androidx.compose.runtime.saveable.Saver<androidx.compose.foundation.lazy.grid.LazyGridState,?> Saver;
+ }
+
+ public final class LazyGridStateKt {
+ method @androidx.compose.runtime.Composable public static androidx.compose.foundation.lazy.grid.LazyGridState rememberLazyGridState(optional int initialFirstVisibleItemIndex, optional int initialFirstVisibleItemScrollOffset);
+ }
+
+ public final class LazySemanticsKt {
+ }
+
+}
+
+package androidx.compose.foundation.lazy.layout {
+
+ public final class IntervalListKt {
+ }
+
+ public final class LazyLayoutKt {
+ }
+
+ public final class LazyLayoutPrefetcher_androidKt {
+ }
+
+ public final class Lazy_androidKt {
+ }
+
+ public final class PinnableParentKt {
+ }
+
+}
+
+package androidx.compose.foundation.relocation {
+
+ public final class BringIntoViewKt {
+ }
+
+ public final class BringIntoViewRequesterKt {
+ }
+
+ public final class BringIntoViewResponderKt {
+ }
+
+ public final class BringIntoViewResponder_androidKt {
+ }
+
+}
+
+package androidx.compose.foundation.selection {
+
+ public final class SelectableGroupKt {
+ method public static androidx.compose.ui.Modifier selectableGroup(androidx.compose.ui.Modifier);
+ }
+
+ public final class SelectableKt {
+ method public static androidx.compose.ui.Modifier selectable(androidx.compose.ui.Modifier, boolean selected, optional boolean enabled, optional androidx.compose.ui.semantics.Role? role, kotlin.jvm.functions.Function0<kotlin.Unit> onClick);
+ method public static androidx.compose.ui.Modifier selectable(androidx.compose.ui.Modifier, boolean selected, androidx.compose.foundation.interaction.MutableInteractionSource interactionSource, androidx.compose.foundation.Indication? indication, optional boolean enabled, optional androidx.compose.ui.semantics.Role? role, kotlin.jvm.functions.Function0<kotlin.Unit> onClick);
+ }
+
+ public final class ToggleableKt {
+ method public static androidx.compose.ui.Modifier toggleable(androidx.compose.ui.Modifier, boolean value, optional boolean enabled, optional androidx.compose.ui.semantics.Role? role, kotlin.jvm.functions.Function1<? super java.lang.Boolean,kotlin.Unit> onValueChange);
+ method public static androidx.compose.ui.Modifier toggleable(androidx.compose.ui.Modifier, boolean value, androidx.compose.foundation.interaction.MutableInteractionSource interactionSource, androidx.compose.foundation.Indication? indication, optional boolean enabled, optional androidx.compose.ui.semantics.Role? role, kotlin.jvm.functions.Function1<? super java.lang.Boolean,kotlin.Unit> onValueChange);
+ method public static androidx.compose.ui.Modifier triStateToggleable(androidx.compose.ui.Modifier, androidx.compose.ui.state.ToggleableState state, optional boolean enabled, optional androidx.compose.ui.semantics.Role? role, kotlin.jvm.functions.Function0<kotlin.Unit> onClick);
+ method public static androidx.compose.ui.Modifier triStateToggleable(androidx.compose.ui.Modifier, androidx.compose.ui.state.ToggleableState state, androidx.compose.foundation.interaction.MutableInteractionSource interactionSource, androidx.compose.foundation.Indication? indication, optional boolean enabled, optional androidx.compose.ui.semantics.Role? role, kotlin.jvm.functions.Function0<kotlin.Unit> onClick);
+ }
+
+}
+
+package androidx.compose.foundation.shape {
+
+ public final class AbsoluteCutCornerShape extends androidx.compose.foundation.shape.CornerBasedShape {
+ ctor public AbsoluteCutCornerShape(androidx.compose.foundation.shape.CornerSize topLeft, androidx.compose.foundation.shape.CornerSize topRight, androidx.compose.foundation.shape.CornerSize bottomRight, androidx.compose.foundation.shape.CornerSize bottomLeft);
+ method public androidx.compose.foundation.shape.AbsoluteCutCornerShape copy(androidx.compose.foundation.shape.CornerSize topStart, androidx.compose.foundation.shape.CornerSize topEnd, androidx.compose.foundation.shape.CornerSize bottomEnd, androidx.compose.foundation.shape.CornerSize bottomStart);
+ method public androidx.compose.ui.graphics.Outline createOutline(long size, float topStart, float topEnd, float bottomEnd, float bottomStart, androidx.compose.ui.unit.LayoutDirection layoutDirection);
+ }
+
+ public final class AbsoluteCutCornerShapeKt {
+ method public static androidx.compose.foundation.shape.AbsoluteCutCornerShape AbsoluteCutCornerShape(androidx.compose.foundation.shape.CornerSize corner);
+ method public static androidx.compose.foundation.shape.AbsoluteCutCornerShape AbsoluteCutCornerShape(float size);
+ method public static androidx.compose.foundation.shape.AbsoluteCutCornerShape AbsoluteCutCornerShape(float size);
+ method public static androidx.compose.foundation.shape.AbsoluteCutCornerShape AbsoluteCutCornerShape(int percent);
+ method public static androidx.compose.foundation.shape.AbsoluteCutCornerShape AbsoluteCutCornerShape(optional float topLeft, optional float topRight, optional float bottomRight, optional float bottomLeft);
+ method public static androidx.compose.foundation.shape.AbsoluteCutCornerShape AbsoluteCutCornerShape(optional float topLeft, optional float topRight, optional float bottomRight, optional float bottomLeft);
+ method public static androidx.compose.foundation.shape.AbsoluteCutCornerShape AbsoluteCutCornerShape(optional int topLeftPercent, optional int topRightPercent, optional int bottomRightPercent, optional int bottomLeftPercent);
+ }
+
+ public final class AbsoluteRoundedCornerShape extends androidx.compose.foundation.shape.CornerBasedShape {
+ ctor public AbsoluteRoundedCornerShape(androidx.compose.foundation.shape.CornerSize topLeft, androidx.compose.foundation.shape.CornerSize topRight, androidx.compose.foundation.shape.CornerSize bottomRight, androidx.compose.foundation.shape.CornerSize bottomLeft);
+ method public androidx.compose.foundation.shape.AbsoluteRoundedCornerShape copy(androidx.compose.foundation.shape.CornerSize topStart, androidx.compose.foundation.shape.CornerSize topEnd, androidx.compose.foundation.shape.CornerSize bottomEnd, androidx.compose.foundation.shape.CornerSize bottomStart);
+ method public androidx.compose.ui.graphics.Outline createOutline(long size, float topStart, float topEnd, float bottomEnd, float bottomStart, androidx.compose.ui.unit.LayoutDirection layoutDirection);
+ }
+
+ public final class AbsoluteRoundedCornerShapeKt {
+ method public static androidx.compose.foundation.shape.AbsoluteRoundedCornerShape AbsoluteRoundedCornerShape(androidx.compose.foundation.shape.CornerSize corner);
+ method public static androidx.compose.foundation.shape.AbsoluteRoundedCornerShape AbsoluteRoundedCornerShape(float size);
+ method public static androidx.compose.foundation.shape.AbsoluteRoundedCornerShape AbsoluteRoundedCornerShape(float size);
+ method public static androidx.compose.foundation.shape.AbsoluteRoundedCornerShape AbsoluteRoundedCornerShape(int percent);
+ method public static androidx.compose.foundation.shape.AbsoluteRoundedCornerShape AbsoluteRoundedCornerShape(optional float topLeft, optional float topRight, optional float bottomRight, optional float bottomLeft);
+ method public static androidx.compose.foundation.shape.AbsoluteRoundedCornerShape AbsoluteRoundedCornerShape(optional float topLeft, optional float topRight, optional float bottomRight, optional float bottomLeft);
+ method public static androidx.compose.foundation.shape.AbsoluteRoundedCornerShape AbsoluteRoundedCornerShape(optional int topLeftPercent, optional int topRightPercent, optional int bottomRightPercent, optional int bottomLeftPercent);
+ }
+
+ public abstract class CornerBasedShape implements androidx.compose.ui.graphics.Shape {
+ ctor public CornerBasedShape(androidx.compose.foundation.shape.CornerSize topStart, androidx.compose.foundation.shape.CornerSize topEnd, androidx.compose.foundation.shape.CornerSize bottomEnd, androidx.compose.foundation.shape.CornerSize bottomStart);
+ method public abstract androidx.compose.foundation.shape.CornerBasedShape copy(optional androidx.compose.foundation.shape.CornerSize topStart, optional androidx.compose.foundation.shape.CornerSize topEnd, optional androidx.compose.foundation.shape.CornerSize bottomEnd, optional androidx.compose.foundation.shape.CornerSize bottomStart);
+ method public final androidx.compose.foundation.shape.CornerBasedShape copy(androidx.compose.foundation.shape.CornerSize all);
+ method public final androidx.compose.ui.graphics.Outline createOutline(long size, androidx.compose.ui.unit.LayoutDirection layoutDirection, androidx.compose.ui.unit.Density density);
+ method public abstract androidx.compose.ui.graphics.Outline createOutline(long size, float topStart, float topEnd, float bottomEnd, float bottomStart, androidx.compose.ui.unit.LayoutDirection layoutDirection);
+ method public final androidx.compose.foundation.shape.CornerSize getBottomEnd();
+ method public final androidx.compose.foundation.shape.CornerSize getBottomStart();
+ method public final androidx.compose.foundation.shape.CornerSize getTopEnd();
+ method public final androidx.compose.foundation.shape.CornerSize getTopStart();
+ property public final androidx.compose.foundation.shape.CornerSize bottomEnd;
+ property public final androidx.compose.foundation.shape.CornerSize bottomStart;
+ property public final androidx.compose.foundation.shape.CornerSize topEnd;
+ property public final androidx.compose.foundation.shape.CornerSize topStart;
+ }
+
+ @androidx.compose.runtime.Immutable public interface CornerSize {
+ method public float toPx(long shapeSize, androidx.compose.ui.unit.Density density);
+ }
+
+ public final class CornerSizeKt {
+ method @androidx.compose.runtime.Stable public static androidx.compose.foundation.shape.CornerSize CornerSize(float size);
+ method @androidx.compose.runtime.Stable public static androidx.compose.foundation.shape.CornerSize CornerSize(float size);
+ method @androidx.compose.runtime.Stable public static androidx.compose.foundation.shape.CornerSize CornerSize(int percent);
+ method public static androidx.compose.foundation.shape.CornerSize getZeroCornerSize();
+ property public static final androidx.compose.foundation.shape.CornerSize ZeroCornerSize;
+ }
+
+ public final class CutCornerShape extends androidx.compose.foundation.shape.CornerBasedShape {
+ ctor public CutCornerShape(androidx.compose.foundation.shape.CornerSize topStart, androidx.compose.foundation.shape.CornerSize topEnd, androidx.compose.foundation.shape.CornerSize bottomEnd, androidx.compose.foundation.shape.CornerSize bottomStart);
+ method public androidx.compose.foundation.shape.CutCornerShape copy(androidx.compose.foundation.shape.CornerSize topStart, androidx.compose.foundation.shape.CornerSize topEnd, androidx.compose.foundation.shape.CornerSize bottomEnd, androidx.compose.foundation.shape.CornerSize bottomStart);
+ method public androidx.compose.ui.graphics.Outline createOutline(long size, float topStart, float topEnd, float bottomEnd, float bottomStart, androidx.compose.ui.unit.LayoutDirection layoutDirection);
+ }
+
+ public final class CutCornerShapeKt {
+ method public static androidx.compose.foundation.shape.CutCornerShape CutCornerShape(androidx.compose.foundation.shape.CornerSize corner);
+ method public static androidx.compose.foundation.shape.CutCornerShape CutCornerShape(float size);
+ method public static androidx.compose.foundation.shape.CutCornerShape CutCornerShape(float size);
+ method public static androidx.compose.foundation.shape.CutCornerShape CutCornerShape(int percent);
+ method public static androidx.compose.foundation.shape.CutCornerShape CutCornerShape(optional float topStart, optional float topEnd, optional float bottomEnd, optional float bottomStart);
+ method public static androidx.compose.foundation.shape.CutCornerShape CutCornerShape(optional float topStart, optional float topEnd, optional float bottomEnd, optional float bottomStart);
+ method public static androidx.compose.foundation.shape.CutCornerShape CutCornerShape(optional int topStartPercent, optional int topEndPercent, optional int bottomEndPercent, optional int bottomStartPercent);
+ }
+
+ public final class GenericShape implements androidx.compose.ui.graphics.Shape {
+ ctor public GenericShape(kotlin.jvm.functions.Function3<? super androidx.compose.ui.graphics.Path,? super androidx.compose.ui.geometry.Size,? super androidx.compose.ui.unit.LayoutDirection,kotlin.Unit> builder);
+ method public androidx.compose.ui.graphics.Outline createOutline(long size, androidx.compose.ui.unit.LayoutDirection layoutDirection, androidx.compose.ui.unit.Density density);
+ }
+
+ public final class RoundedCornerShape extends androidx.compose.foundation.shape.CornerBasedShape {
+ ctor public RoundedCornerShape(androidx.compose.foundation.shape.CornerSize topStart, androidx.compose.foundation.shape.CornerSize topEnd, androidx.compose.foundation.shape.CornerSize bottomEnd, androidx.compose.foundation.shape.CornerSize bottomStart);
+ method public androidx.compose.foundation.shape.RoundedCornerShape copy(androidx.compose.foundation.shape.CornerSize topStart, androidx.compose.foundation.shape.CornerSize topEnd, androidx.compose.foundation.shape.CornerSize bottomEnd, androidx.compose.foundation.shape.CornerSize bottomStart);
+ method public androidx.compose.ui.graphics.Outline createOutline(long size, float topStart, float topEnd, float bottomEnd, float bottomStart, androidx.compose.ui.unit.LayoutDirection layoutDirection);
+ }
+
+ public final class RoundedCornerShapeKt {
+ method public static androidx.compose.foundation.shape.RoundedCornerShape RoundedCornerShape(androidx.compose.foundation.shape.CornerSize corner);
+ method public static androidx.compose.foundation.shape.RoundedCornerShape RoundedCornerShape(float size);
+ method public static androidx.compose.foundation.shape.RoundedCornerShape RoundedCornerShape(float size);
+ method public static androidx.compose.foundation.shape.RoundedCornerShape RoundedCornerShape(int percent);
+ method public static androidx.compose.foundation.shape.RoundedCornerShape RoundedCornerShape(optional float topStart, optional float topEnd, optional float bottomEnd, optional float bottomStart);
+ method public static androidx.compose.foundation.shape.RoundedCornerShape RoundedCornerShape(optional float topStart, optional float topEnd, optional float bottomEnd, optional float bottomStart);
+ method public static androidx.compose.foundation.shape.RoundedCornerShape RoundedCornerShape(optional int topStartPercent, optional int topEndPercent, optional int bottomEndPercent, optional int bottomStartPercent);
+ method public static androidx.compose.foundation.shape.RoundedCornerShape getCircleShape();
+ property public static final androidx.compose.foundation.shape.RoundedCornerShape CircleShape;
+ }
+
+}
+
+package androidx.compose.foundation.text {
+
+ public final class AndroidCursorHandle_androidKt {
+ }
+
+ public final class BasicTextFieldKt {
+ method @androidx.compose.runtime.Composable public static void BasicTextField(String value, kotlin.jvm.functions.Function1<? super java.lang.String,kotlin.Unit> onValueChange, optional androidx.compose.ui.Modifier modifier, optional boolean enabled, optional boolean readOnly, optional androidx.compose.ui.text.TextStyle textStyle, optional androidx.compose.foundation.text.KeyboardOptions keyboardOptions, optional androidx.compose.foundation.text.KeyboardActions keyboardActions, optional boolean singleLine, optional int maxLines, optional androidx.compose.ui.text.input.VisualTransformation visualTransformation, optional kotlin.jvm.functions.Function1<? super androidx.compose.ui.text.TextLayoutResult,kotlin.Unit> onTextLayout, optional androidx.compose.foundation.interaction.MutableInteractionSource interactionSource, optional androidx.compose.ui.graphics.Brush cursorBrush, optional kotlin.jvm.functions.Function1<? super kotlin.jvm.functions.Function0<kotlin.Unit>,kotlin.Unit> decorationBox);
+ method @androidx.compose.runtime.Composable public static void BasicTextField(androidx.compose.ui.text.input.TextFieldValue value, kotlin.jvm.functions.Function1<? super androidx.compose.ui.text.input.TextFieldValue,kotlin.Unit> onValueChange, optional androidx.compose.ui.Modifier modifier, optional boolean enabled, optional boolean readOnly, optional androidx.compose.ui.text.TextStyle textStyle, optional androidx.compose.foundation.text.KeyboardOptions keyboardOptions, optional androidx.compose.foundation.text.KeyboardActions keyboardActions, optional boolean singleLine, optional int maxLines, optional androidx.compose.ui.text.input.VisualTransformation visualTransformation, optional kotlin.jvm.functions.Function1<? super androidx.compose.ui.text.TextLayoutResult,kotlin.Unit> onTextLayout, optional androidx.compose.foundation.interaction.MutableInteractionSource interactionSource, optional androidx.compose.ui.graphics.Brush cursorBrush, optional kotlin.jvm.functions.Function1<? super kotlin.jvm.functions.Function0<kotlin.Unit>,kotlin.Unit> decorationBox);
+ }
+
+ public final class BasicTextKt {
+ method @androidx.compose.runtime.Composable public static void BasicText(String text, optional androidx.compose.ui.Modifier modifier, optional androidx.compose.ui.text.TextStyle style, optional kotlin.jvm.functions.Function1<? super androidx.compose.ui.text.TextLayoutResult,kotlin.Unit> onTextLayout, optional int overflow, optional boolean softWrap, optional int maxLines);
+ method @androidx.compose.runtime.Composable public static void BasicText(androidx.compose.ui.text.AnnotatedString text, optional androidx.compose.ui.Modifier modifier, optional androidx.compose.ui.text.TextStyle style, optional kotlin.jvm.functions.Function1<? super androidx.compose.ui.text.TextLayoutResult,kotlin.Unit> onTextLayout, optional int overflow, optional boolean softWrap, optional int maxLines, optional java.util.Map<java.lang.String,androidx.compose.foundation.text.InlineTextContent> inlineContent);
+ }
+
+ public final class ClickableTextKt {
+ method @androidx.compose.runtime.Composable public static void ClickableText(androidx.compose.ui.text.AnnotatedString text, optional androidx.compose.ui.Modifier modifier, optional androidx.compose.ui.text.TextStyle style, optional boolean softWrap, optional int overflow, optional int maxLines, optional kotlin.jvm.functions.Function1<? super androidx.compose.ui.text.TextLayoutResult,kotlin.Unit> onTextLayout, kotlin.jvm.functions.Function1<? super java.lang.Integer,kotlin.Unit> onClick);
+ }
+
+ public final class ContextMenu_androidKt {
+ }
+
+ public final class CoreTextFieldKt {
+ }
+
+ public final class CoreTextKt {
+ }
+
+ @androidx.compose.runtime.Immutable public final class InlineTextContent {
+ ctor public InlineTextContent(androidx.compose.ui.text.Placeholder placeholder, kotlin.jvm.functions.Function1<? super java.lang.String,kotlin.Unit> children);
+ method public kotlin.jvm.functions.Function1<java.lang.String,kotlin.Unit> getChildren();
+ method public androidx.compose.ui.text.Placeholder getPlaceholder();
+ property public final kotlin.jvm.functions.Function1<java.lang.String,kotlin.Unit> children;
+ property public final androidx.compose.ui.text.Placeholder placeholder;
+ }
+
+ public final class InlineTextContentKt {
+ method public static void appendInlineContent(androidx.compose.ui.text.AnnotatedString.Builder, String id, optional String alternateText);
+ }
+
+ public final class KeyEventHelpers_androidKt {
+ }
+
+ public final class KeyMappingKt {
+ }
+
+ public final class KeyMapping_androidKt {
+ }
+
+ public interface KeyboardActionScope {
+ method public void defaultKeyboardAction(int imeAction);
+ }
+
+ public final class KeyboardActions {
+ ctor public KeyboardActions(optional kotlin.jvm.functions.Function1<? super androidx.compose.foundation.text.KeyboardActionScope,kotlin.Unit>? onDone, optional kotlin.jvm.functions.Function1<? super androidx.compose.foundation.text.KeyboardActionScope,kotlin.Unit>? onGo, optional kotlin.jvm.functions.Function1<? super androidx.compose.foundation.text.KeyboardActionScope,kotlin.Unit>? onNext, optional kotlin.jvm.functions.Function1<? super androidx.compose.foundation.text.KeyboardActionScope,kotlin.Unit>? onPrevious, optional kotlin.jvm.functions.Function1<? super androidx.compose.foundation.text.KeyboardActionScope,kotlin.Unit>? onSearch, optional kotlin.jvm.functions.Function1<? super androidx.compose.foundation.text.KeyboardActionScope,kotlin.Unit>? onSend);
+ method public kotlin.jvm.functions.Function1<androidx.compose.foundation.text.KeyboardActionScope,kotlin.Unit>? getOnDone();
+ method public kotlin.jvm.functions.Function1<androidx.compose.foundation.text.KeyboardActionScope,kotlin.Unit>? getOnGo();
+ method public kotlin.jvm.functions.Function1<androidx.compose.foundation.text.KeyboardActionScope,kotlin.Unit>? getOnNext();
+ method public kotlin.jvm.functions.Function1<androidx.compose.foundation.text.KeyboardActionScope,kotlin.Unit>? getOnPrevious();
+ method public kotlin.jvm.functions.Function1<androidx.compose.foundation.text.KeyboardActionScope,kotlin.Unit>? getOnSearch();
+ method public kotlin.jvm.functions.Function1<androidx.compose.foundation.text.KeyboardActionScope,kotlin.Unit>? getOnSend();
+ property public final kotlin.jvm.functions.Function1<androidx.compose.foundation.text.KeyboardActionScope,kotlin.Unit>? onDone;
+ property public final kotlin.jvm.functions.Function1<androidx.compose.foundation.text.KeyboardActionScope,kotlin.Unit>? onGo;
+ property public final kotlin.jvm.functions.Function1<androidx.compose.foundation.text.KeyboardActionScope,kotlin.Unit>? onNext;
+ property public final kotlin.jvm.functions.Function1<androidx.compose.foundation.text.KeyboardActionScope,kotlin.Unit>? onPrevious;
+ property public final kotlin.jvm.functions.Function1<androidx.compose.foundation.text.KeyboardActionScope,kotlin.Unit>? onSearch;
+ property public final kotlin.jvm.functions.Function1<androidx.compose.foundation.text.KeyboardActionScope,kotlin.Unit>? onSend;
+ field public static final androidx.compose.foundation.text.KeyboardActions.Companion Companion;
+ }
+
+ public static final class KeyboardActions.Companion {
+ method public androidx.compose.foundation.text.KeyboardActions getDefault();
+ property public final androidx.compose.foundation.text.KeyboardActions Default;
+ }
+
+ public final class KeyboardActionsKt {
+ method public static androidx.compose.foundation.text.KeyboardActions KeyboardActions(kotlin.jvm.functions.Function1<? super androidx.compose.foundation.text.KeyboardActionScope,kotlin.Unit> onAny);
+ }
+
+ @androidx.compose.runtime.Immutable public final class KeyboardOptions {
+ ctor public KeyboardOptions(optional int capitalization, optional boolean autoCorrect, optional int keyboardType, optional int imeAction);
+ method public androidx.compose.foundation.text.KeyboardOptions copy(optional int capitalization, optional boolean autoCorrect, optional int keyboardType, optional int imeAction);
+ method public boolean getAutoCorrect();
+ method public int getCapitalization();
+ method public int getImeAction();
+ method public int getKeyboardType();
+ property public final boolean autoCorrect;
+ property public final int capitalization;
+ property public final int imeAction;
+ property public final int keyboardType;
+ field public static final androidx.compose.foundation.text.KeyboardOptions.Companion Companion;
+ }
+
+ public static final class KeyboardOptions.Companion {
+ method public androidx.compose.foundation.text.KeyboardOptions getDefault();
+ property public final androidx.compose.foundation.text.KeyboardOptions Default;
+ }
+
+ public final class LongPressTextDragObserverKt {
+ }
+
+ public final class MaxLinesHeightModifierKt {
+ }
+
+ public final class StringHelpersKt {
+ }
+
+ public final class StringHelpers_androidKt {
+ }
+
+ public final class StringHelpers_jvmKt {
+ }
+
+ public final class TextFieldCursorKt {
+ }
+
+ public final class TextFieldDelegateKt {
+ }
+
+ public final class TextFieldGestureModifiersKt {
+ }
+
+ public final class TextFieldKeyInputKt {
+ }
+
+ public final class TextFieldKeyInput_androidKt {
+ }
+
+ public final class TextFieldPressGestureFilterKt {
+ }
+
+ public final class TextFieldScrollKt {
+ }
+
+ public final class TextFieldSizeKt {
+ }
+
+ public final class TextLayoutHelperKt {
+ }
+
+ public final class TextLayoutResultProxyKt {
+ }
+
+ public final class TextPointerIcon_androidKt {
+ }
+
+ public final class TouchMode_androidKt {
+ }
+
+ public final class UndoManagerKt {
+ }
+
+ public final class UndoManager_jvmKt {
+ }
+
+}
+
+package androidx.compose.foundation.text.selection {
+
+ public final class AndroidSelectionHandles_androidKt {
+ }
+
+ public final class MultiWidgetSelectionDelegateKt {
+ }
+
+ public final class SelectionAdjustmentKt {
+ }
+
+ public final class SelectionContainerKt {
+ method @androidx.compose.runtime.Composable public static void DisableSelection(kotlin.jvm.functions.Function0<kotlin.Unit> content);
+ method @androidx.compose.runtime.Composable public static void SelectionContainer(optional androidx.compose.ui.Modifier modifier, kotlin.jvm.functions.Function0<kotlin.Unit> content);
+ }
+
+ public final class SelectionHandlesKt {
+ }
+
+ public final class SelectionMagnifierKt {
+ }
+
+ public final class SelectionManagerKt {
+ }
+
+ public final class SelectionManager_androidKt {
+ }
+
+ public final class SelectionRegistrarKt {
+ }
+
+ public final class SimpleLayoutKt {
+ }
+
+ public final class TextFieldSelectionDelegateKt {
+ }
+
+ public final class TextFieldSelectionManagerKt {
+ }
+
+ public final class TextFieldSelectionManager_androidKt {
+ }
+
+ @androidx.compose.runtime.Immutable public final class TextSelectionColors {
+ ctor public TextSelectionColors(long handleColor, long backgroundColor);
+ method public long getBackgroundColor();
+ method public long getHandleColor();
+ property public final long backgroundColor;
+ property public final long handleColor;
+ }
+
+ public final class TextSelectionColorsKt {
+ method public static androidx.compose.runtime.ProvidableCompositionLocal<androidx.compose.foundation.text.selection.TextSelectionColors> getLocalTextSelectionColors();
+ property public static final androidx.compose.runtime.ProvidableCompositionLocal<androidx.compose.foundation.text.selection.TextSelectionColors> LocalTextSelectionColors;
+ }
+
+ public final class TextSelectionDelegateKt {
+ }
+
+ public final class TextSelectionMouseDetectorKt {
+ }
+
+}
+
diff --git a/compose/foundation/foundation/api/public_plus_experimental_1.2.0-beta02.txt b/compose/foundation/foundation/api/public_plus_experimental_1.2.0-beta02.txt
new file mode 100644
index 0000000..2059d47
--- /dev/null
+++ b/compose/foundation/foundation/api/public_plus_experimental_1.2.0-beta02.txt
@@ -0,0 +1,1155 @@
+// Signature format: 4.0
+package androidx.compose.foundation {
+
+ public final class ActualJvmKt {
+ }
+
+ public final class BackgroundKt {
+ method public static androidx.compose.ui.Modifier background(androidx.compose.ui.Modifier, long color, optional androidx.compose.ui.graphics.Shape shape);
+ method public static androidx.compose.ui.Modifier background(androidx.compose.ui.Modifier, androidx.compose.ui.graphics.Brush brush, optional androidx.compose.ui.graphics.Shape shape, optional float alpha);
+ }
+
+ public final class BorderKt {
+ method public static androidx.compose.ui.Modifier border(androidx.compose.ui.Modifier, androidx.compose.foundation.BorderStroke border, optional androidx.compose.ui.graphics.Shape shape);
+ method public static androidx.compose.ui.Modifier border(androidx.compose.ui.Modifier, float width, long color, optional androidx.compose.ui.graphics.Shape shape);
+ method public static androidx.compose.ui.Modifier border(androidx.compose.ui.Modifier, float width, androidx.compose.ui.graphics.Brush brush, androidx.compose.ui.graphics.Shape shape);
+ }
+
+ @androidx.compose.runtime.Immutable public final class BorderStroke {
+ ctor public BorderStroke(float width, androidx.compose.ui.graphics.Brush brush);
+ method public androidx.compose.foundation.BorderStroke copy(optional float width, optional androidx.compose.ui.graphics.Brush brush);
+ method public androidx.compose.ui.graphics.Brush getBrush();
+ method public float getWidth();
+ property public final androidx.compose.ui.graphics.Brush brush;
+ property public final float width;
+ }
+
+ public final class BorderStrokeKt {
+ method @androidx.compose.runtime.Stable public static androidx.compose.foundation.BorderStroke BorderStroke(float width, long color);
+ }
+
+ public final class CanvasKt {
+ method @androidx.compose.runtime.Composable public static void Canvas(androidx.compose.ui.Modifier modifier, kotlin.jvm.functions.Function1<? super androidx.compose.ui.graphics.drawscope.DrawScope,kotlin.Unit> onDraw);
+ method @androidx.compose.foundation.ExperimentalFoundationApi @androidx.compose.runtime.Composable public static void Canvas(androidx.compose.ui.Modifier modifier, String contentDescription, kotlin.jvm.functions.Function1<? super androidx.compose.ui.graphics.drawscope.DrawScope,kotlin.Unit> onDraw);
+ }
+
+ public final class ClickableKt {
+ method public static androidx.compose.ui.Modifier clickable(androidx.compose.ui.Modifier, optional boolean enabled, optional String? onClickLabel, optional androidx.compose.ui.semantics.Role? role, kotlin.jvm.functions.Function0<kotlin.Unit> onClick);
+ method public static androidx.compose.ui.Modifier clickable(androidx.compose.ui.Modifier, androidx.compose.foundation.interaction.MutableInteractionSource interactionSource, androidx.compose.foundation.Indication? indication, optional boolean enabled, optional String? onClickLabel, optional androidx.compose.ui.semantics.Role? role, kotlin.jvm.functions.Function0<kotlin.Unit> onClick);
+ method @androidx.compose.foundation.ExperimentalFoundationApi public static androidx.compose.ui.Modifier combinedClickable(androidx.compose.ui.Modifier, optional boolean enabled, optional String? onClickLabel, optional androidx.compose.ui.semantics.Role? role, optional String? onLongClickLabel, optional kotlin.jvm.functions.Function0<kotlin.Unit>? onLongClick, optional kotlin.jvm.functions.Function0<kotlin.Unit>? onDoubleClick, kotlin.jvm.functions.Function0<kotlin.Unit> onClick);
+ method @androidx.compose.foundation.ExperimentalFoundationApi public static androidx.compose.ui.Modifier combinedClickable(androidx.compose.ui.Modifier, androidx.compose.foundation.interaction.MutableInteractionSource interactionSource, androidx.compose.foundation.Indication? indication, optional boolean enabled, optional String? onClickLabel, optional androidx.compose.ui.semantics.Role? role, optional String? onLongClickLabel, optional kotlin.jvm.functions.Function0<kotlin.Unit>? onLongClick, optional kotlin.jvm.functions.Function0<kotlin.Unit>? onDoubleClick, kotlin.jvm.functions.Function0<kotlin.Unit> onClick);
+ }
+
+ public final class Clickable_androidKt {
+ }
+
+ public final class DarkThemeKt {
+ method @androidx.compose.runtime.Composable @androidx.compose.runtime.ReadOnlyComposable public static boolean isSystemInDarkTheme();
+ }
+
+ public final class DarkTheme_androidKt {
+ }
+
+ public final class ExcludeFromSystemGesture_androidKt {
+ method @Deprecated public static androidx.compose.ui.Modifier excludeFromSystemGesture(androidx.compose.ui.Modifier);
+ method @Deprecated public static androidx.compose.ui.Modifier excludeFromSystemGesture(androidx.compose.ui.Modifier, kotlin.jvm.functions.Function1<? super androidx.compose.ui.layout.LayoutCoordinates,androidx.compose.ui.geometry.Rect> exclusion);
+ }
+
+ @kotlin.RequiresOptIn(message="This foundation API is experimental and is likely to change or be removed in the " + "future.") public @interface ExperimentalFoundationApi {
+ }
+
+ public final class FocusableKt {
+ method @androidx.compose.foundation.ExperimentalFoundationApi public static androidx.compose.ui.Modifier focusGroup(androidx.compose.ui.Modifier);
+ method public static androidx.compose.ui.Modifier focusable(androidx.compose.ui.Modifier, optional boolean enabled, optional androidx.compose.foundation.interaction.MutableInteractionSource? interactionSource);
+ }
+
+ public final class FocusedBoundsKt {
+ method @androidx.compose.foundation.ExperimentalFoundationApi public static androidx.compose.ui.Modifier onFocusedBoundsChanged(androidx.compose.ui.Modifier, kotlin.jvm.functions.Function1<? super androidx.compose.ui.layout.LayoutCoordinates,kotlin.Unit> onPositioned);
+ }
+
+ public final class HoverableKt {
+ method public static androidx.compose.ui.Modifier hoverable(androidx.compose.ui.Modifier, androidx.compose.foundation.interaction.MutableInteractionSource interactionSource, optional boolean enabled);
+ }
+
+ public final class ImageKt {
+ method @androidx.compose.runtime.Composable @androidx.compose.runtime.NonRestartableComposable public static void Image(androidx.compose.ui.graphics.ImageBitmap bitmap, String? contentDescription, optional androidx.compose.ui.Modifier modifier, optional androidx.compose.ui.Alignment alignment, optional androidx.compose.ui.layout.ContentScale contentScale, optional float alpha, optional androidx.compose.ui.graphics.ColorFilter? colorFilter, optional int filterQuality);
+ method @androidx.compose.runtime.Composable @androidx.compose.runtime.NonRestartableComposable public static void Image(androidx.compose.ui.graphics.vector.ImageVector imageVector, String? contentDescription, optional androidx.compose.ui.Modifier modifier, optional androidx.compose.ui.Alignment alignment, optional androidx.compose.ui.layout.ContentScale contentScale, optional float alpha, optional androidx.compose.ui.graphics.ColorFilter? colorFilter);
+ method @androidx.compose.runtime.Composable public static void Image(androidx.compose.ui.graphics.painter.Painter painter, String? contentDescription, optional androidx.compose.ui.Modifier modifier, optional androidx.compose.ui.Alignment alignment, optional androidx.compose.ui.layout.ContentScale contentScale, optional float alpha, optional androidx.compose.ui.graphics.ColorFilter? colorFilter);
+ method @Deprecated @androidx.compose.runtime.Composable @androidx.compose.runtime.NonRestartableComposable public static void Image(androidx.compose.ui.graphics.ImageBitmap bitmap, String contentDescription, optional androidx.compose.ui.Modifier modifier, optional androidx.compose.ui.Alignment alignment, optional androidx.compose.ui.layout.ContentScale contentScale, optional float alpha, optional androidx.compose.ui.graphics.ColorFilter? colorFilter);
+ }
+
+ @androidx.compose.runtime.Stable public interface Indication {
+ method @androidx.compose.runtime.Composable public androidx.compose.foundation.IndicationInstance rememberUpdatedInstance(androidx.compose.foundation.interaction.InteractionSource interactionSource);
+ }
+
+ public interface IndicationInstance {
+ method public void drawIndication(androidx.compose.ui.graphics.drawscope.ContentDrawScope);
+ }
+
+ public final class IndicationKt {
+ method public static androidx.compose.runtime.ProvidableCompositionLocal<androidx.compose.foundation.Indication> getLocalIndication();
+ method public static androidx.compose.ui.Modifier indication(androidx.compose.ui.Modifier, androidx.compose.foundation.interaction.InteractionSource interactionSource, androidx.compose.foundation.Indication? indication);
+ property public static final androidx.compose.runtime.ProvidableCompositionLocal<androidx.compose.foundation.Indication> LocalIndication;
+ }
+
+ @kotlin.RequiresOptIn(message="This API is internal to library.") @kotlin.annotation.Target(allowedTargets={kotlin.annotation.AnnotationTarget.CLASS, kotlin.annotation.AnnotationTarget.FUNCTION, kotlin.annotation.AnnotationTarget.PROPERTY, kotlin.annotation.AnnotationTarget.PROPERTY_GETTER, kotlin.annotation.AnnotationTarget.PROPERTY_SETTER}) public @interface InternalFoundationApi {
+ }
+
+ public final class MagnifierKt {
+ method @androidx.compose.foundation.ExperimentalFoundationApi public static androidx.compose.ui.Modifier magnifier(androidx.compose.ui.Modifier, kotlin.jvm.functions.Function1<? super androidx.compose.ui.unit.Density,androidx.compose.ui.geometry.Offset> sourceCenter, optional kotlin.jvm.functions.Function1<? super androidx.compose.ui.unit.Density,androidx.compose.ui.geometry.Offset> magnifierCenter, optional float zoom, optional androidx.compose.foundation.MagnifierStyle style, optional kotlin.jvm.functions.Function1<? super androidx.compose.ui.unit.DpSize,kotlin.Unit>? onSizeChanged);
+ }
+
+ @androidx.compose.foundation.ExperimentalFoundationApi @androidx.compose.runtime.Stable public final class MagnifierStyle {
+ ctor @androidx.compose.foundation.ExperimentalFoundationApi public MagnifierStyle(optional long size, optional float cornerRadius, optional float elevation, optional boolean clippingEnabled, optional boolean fishEyeEnabled);
+ method public boolean isSupported();
+ property public final boolean isSupported;
+ field public static final androidx.compose.foundation.MagnifierStyle.Companion Companion;
+ }
+
+ public static final class MagnifierStyle.Companion {
+ method public androidx.compose.foundation.MagnifierStyle getDefault();
+ method public androidx.compose.foundation.MagnifierStyle getTextDefault();
+ property public final androidx.compose.foundation.MagnifierStyle Default;
+ property public final androidx.compose.foundation.MagnifierStyle TextDefault;
+ }
+
+ public enum MutatePriority {
+ enum_constant public static final androidx.compose.foundation.MutatePriority Default;
+ enum_constant public static final androidx.compose.foundation.MutatePriority PreventUserInput;
+ enum_constant public static final androidx.compose.foundation.MutatePriority UserInput;
+ }
+
+ @androidx.compose.runtime.Stable public final class MutatorMutex {
+ ctor public MutatorMutex();
+ method public suspend <R> Object? mutate(optional androidx.compose.foundation.MutatePriority priority, kotlin.jvm.functions.Function1<? super kotlin.coroutines.Continuation<? super R>,?> block, kotlin.coroutines.Continuation<? super R>);
+ method public suspend <T, R> Object? mutateWith(T? receiver, optional androidx.compose.foundation.MutatePriority priority, kotlin.jvm.functions.Function2<? super T,? super kotlin.coroutines.Continuation<? super R>,?> block, kotlin.coroutines.Continuation<? super R>);
+ }
+
+ public final class ProgressSemanticsKt {
+ method @androidx.compose.runtime.Stable public static androidx.compose.ui.Modifier progressSemantics(androidx.compose.ui.Modifier, float value, optional kotlin.ranges.ClosedFloatingPointRange<java.lang.Float> valueRange, optional int steps);
+ method @androidx.compose.runtime.Stable public static androidx.compose.ui.Modifier progressSemantics(androidx.compose.ui.Modifier);
+ }
+
+ public final class ScrollKt {
+ method public static androidx.compose.ui.Modifier horizontalScroll(androidx.compose.ui.Modifier, androidx.compose.foundation.ScrollState state, optional boolean enabled, optional androidx.compose.foundation.gestures.FlingBehavior? flingBehavior, optional boolean reverseScrolling);
+ method @androidx.compose.runtime.Composable public static androidx.compose.foundation.ScrollState rememberScrollState(optional int initial);
+ method public static androidx.compose.ui.Modifier verticalScroll(androidx.compose.ui.Modifier, androidx.compose.foundation.ScrollState state, optional boolean enabled, optional androidx.compose.foundation.gestures.FlingBehavior? flingBehavior, optional boolean reverseScrolling);
+ }
+
+ @androidx.compose.runtime.Stable public final class ScrollState implements androidx.compose.foundation.gestures.ScrollableState {
+ ctor public ScrollState(int initial);
+ method public suspend Object? animateScrollTo(int value, optional androidx.compose.animation.core.AnimationSpec<java.lang.Float> animationSpec, optional kotlin.coroutines.Continuation<? super kotlin.Unit>);
+ method public float dispatchRawDelta(float delta);
+ method public androidx.compose.foundation.interaction.InteractionSource getInteractionSource();
+ method public int getMaxValue();
+ method public int getValue();
+ method public boolean isScrollInProgress();
+ method public suspend Object? scroll(androidx.compose.foundation.MutatePriority scrollPriority, kotlin.jvm.functions.Function2<? super androidx.compose.foundation.gestures.ScrollScope,? super kotlin.coroutines.Continuation<? super kotlin.Unit>,?> block, kotlin.coroutines.Continuation<? super kotlin.Unit>);
+ method public suspend Object? scrollTo(int value, kotlin.coroutines.Continuation<? super java.lang.Float>);
+ property public final androidx.compose.foundation.interaction.InteractionSource interactionSource;
+ property public boolean isScrollInProgress;
+ property public final int maxValue;
+ property public final int value;
+ field public static final androidx.compose.foundation.ScrollState.Companion Companion;
+ }
+
+ public static final class ScrollState.Companion {
+ method public androidx.compose.runtime.saveable.Saver<androidx.compose.foundation.ScrollState,?> getSaver();
+ property public final androidx.compose.runtime.saveable.Saver<androidx.compose.foundation.ScrollState,?> Saver;
+ }
+
+ public final class SystemGestureExclusionKt {
+ method public static androidx.compose.ui.Modifier systemGestureExclusion(androidx.compose.ui.Modifier);
+ method public static androidx.compose.ui.Modifier systemGestureExclusion(androidx.compose.ui.Modifier, kotlin.jvm.functions.Function1<? super androidx.compose.ui.layout.LayoutCoordinates,androidx.compose.ui.geometry.Rect> exclusion);
+ }
+
+ public final class TempListUtilsKt {
+ }
+
+}
+
+package androidx.compose.foundation.gestures {
+
+ public final class AndroidOverScrollKt {
+ }
+
+ public final class AndroidScrollable_androidKt {
+ }
+
+ public final class DragGestureDetectorKt {
+ method public static suspend Object? awaitDragOrCancellation(androidx.compose.ui.input.pointer.AwaitPointerEventScope, long pointerId, kotlin.coroutines.Continuation<? super androidx.compose.ui.input.pointer.PointerInputChange>);
+ method public static suspend Object? awaitHorizontalDragOrCancellation(androidx.compose.ui.input.pointer.AwaitPointerEventScope, long pointerId, kotlin.coroutines.Continuation<? super androidx.compose.ui.input.pointer.PointerInputChange>);
+ method public static suspend Object? awaitHorizontalTouchSlopOrCancellation(androidx.compose.ui.input.pointer.AwaitPointerEventScope, long pointerId, kotlin.jvm.functions.Function2<? super androidx.compose.ui.input.pointer.PointerInputChange,? super java.lang.Float,kotlin.Unit> onTouchSlopReached, kotlin.coroutines.Continuation<? super androidx.compose.ui.input.pointer.PointerInputChange>);
+ method public static suspend Object? awaitTouchSlopOrCancellation(androidx.compose.ui.input.pointer.AwaitPointerEventScope, long pointerId, kotlin.jvm.functions.Function2<? super androidx.compose.ui.input.pointer.PointerInputChange,? super androidx.compose.ui.geometry.Offset,kotlin.Unit> onTouchSlopReached, kotlin.coroutines.Continuation<? super androidx.compose.ui.input.pointer.PointerInputChange>);
+ method public static suspend Object? awaitVerticalDragOrCancellation(androidx.compose.ui.input.pointer.AwaitPointerEventScope, long pointerId, kotlin.coroutines.Continuation<? super androidx.compose.ui.input.pointer.PointerInputChange>);
+ method public static suspend Object? awaitVerticalTouchSlopOrCancellation(androidx.compose.ui.input.pointer.AwaitPointerEventScope, long pointerId, kotlin.jvm.functions.Function2<? super androidx.compose.ui.input.pointer.PointerInputChange,? super java.lang.Float,kotlin.Unit> onTouchSlopReached, kotlin.coroutines.Continuation<? super androidx.compose.ui.input.pointer.PointerInputChange>);
+ method public static suspend Object? detectDragGestures(androidx.compose.ui.input.pointer.PointerInputScope, optional kotlin.jvm.functions.Function1<? super androidx.compose.ui.geometry.Offset,kotlin.Unit> onDragStart, optional kotlin.jvm.functions.Function0<kotlin.Unit> onDragEnd, optional kotlin.jvm.functions.Function0<kotlin.Unit> onDragCancel, kotlin.jvm.functions.Function2<? super androidx.compose.ui.input.pointer.PointerInputChange,? super androidx.compose.ui.geometry.Offset,kotlin.Unit> onDrag, kotlin.coroutines.Continuation<? super kotlin.Unit>);
+ method public static suspend Object? detectDragGesturesAfterLongPress(androidx.compose.ui.input.pointer.PointerInputScope, optional kotlin.jvm.functions.Function1<? super androidx.compose.ui.geometry.Offset,kotlin.Unit> onDragStart, optional kotlin.jvm.functions.Function0<kotlin.Unit> onDragEnd, optional kotlin.jvm.functions.Function0<kotlin.Unit> onDragCancel, kotlin.jvm.functions.Function2<? super androidx.compose.ui.input.pointer.PointerInputChange,? super androidx.compose.ui.geometry.Offset,kotlin.Unit> onDrag, kotlin.coroutines.Continuation<? super kotlin.Unit>);
+ method public static suspend Object? detectHorizontalDragGestures(androidx.compose.ui.input.pointer.PointerInputScope, optional kotlin.jvm.functions.Function1<? super androidx.compose.ui.geometry.Offset,kotlin.Unit> onDragStart, optional kotlin.jvm.functions.Function0<kotlin.Unit> onDragEnd, optional kotlin.jvm.functions.Function0<kotlin.Unit> onDragCancel, kotlin.jvm.functions.Function2<? super androidx.compose.ui.input.pointer.PointerInputChange,? super java.lang.Float,kotlin.Unit> onHorizontalDrag, kotlin.coroutines.Continuation<? super kotlin.Unit>);
+ method public static suspend Object? detectVerticalDragGestures(androidx.compose.ui.input.pointer.PointerInputScope, optional kotlin.jvm.functions.Function1<? super androidx.compose.ui.geometry.Offset,kotlin.Unit> onDragStart, optional kotlin.jvm.functions.Function0<kotlin.Unit> onDragEnd, optional kotlin.jvm.functions.Function0<kotlin.Unit> onDragCancel, kotlin.jvm.functions.Function2<? super androidx.compose.ui.input.pointer.PointerInputChange,? super java.lang.Float,kotlin.Unit> onVerticalDrag, kotlin.coroutines.Continuation<? super kotlin.Unit>);
+ method public static suspend Object? drag(androidx.compose.ui.input.pointer.AwaitPointerEventScope, long pointerId, kotlin.jvm.functions.Function1<? super androidx.compose.ui.input.pointer.PointerInputChange,kotlin.Unit> onDrag, kotlin.coroutines.Continuation<? super java.lang.Boolean>);
+ method public static suspend Object? horizontalDrag(androidx.compose.ui.input.pointer.AwaitPointerEventScope, long pointerId, kotlin.jvm.functions.Function1<? super androidx.compose.ui.input.pointer.PointerInputChange,kotlin.Unit> onDrag, kotlin.coroutines.Continuation<? super java.lang.Boolean>);
+ method public static suspend Object? verticalDrag(androidx.compose.ui.input.pointer.AwaitPointerEventScope, long pointerId, kotlin.jvm.functions.Function1<? super androidx.compose.ui.input.pointer.PointerInputChange,kotlin.Unit> onDrag, kotlin.coroutines.Continuation<? super java.lang.Boolean>);
+ }
+
+ public interface DragScope {
+ method public void dragBy(float pixels);
+ }
+
+ public final class DraggableKt {
+ method public static androidx.compose.foundation.gestures.DraggableState DraggableState(kotlin.jvm.functions.Function1<? super java.lang.Float,kotlin.Unit> onDelta);
+ method public static androidx.compose.ui.Modifier draggable(androidx.compose.ui.Modifier, androidx.compose.foundation.gestures.DraggableState state, androidx.compose.foundation.gestures.Orientation orientation, optional boolean enabled, optional androidx.compose.foundation.interaction.MutableInteractionSource? interactionSource, optional boolean startDragImmediately, optional kotlin.jvm.functions.Function3<? super kotlinx.coroutines.CoroutineScope,? super androidx.compose.ui.geometry.Offset,? super kotlin.coroutines.Continuation<? super kotlin.Unit>,?> onDragStarted, optional kotlin.jvm.functions.Function3<? super kotlinx.coroutines.CoroutineScope,? super java.lang.Float,? super kotlin.coroutines.Continuation<? super kotlin.Unit>,?> onDragStopped, optional boolean reverseDirection);
+ method @androidx.compose.runtime.Composable public static androidx.compose.foundation.gestures.DraggableState rememberDraggableState(kotlin.jvm.functions.Function1<? super java.lang.Float,kotlin.Unit> onDelta);
+ }
+
+ public interface DraggableState {
+ method public void dispatchRawDelta(float delta);
+ method public suspend Object? drag(optional androidx.compose.foundation.MutatePriority dragPriority, kotlin.jvm.functions.Function2<? super androidx.compose.foundation.gestures.DragScope,? super kotlin.coroutines.Continuation<? super kotlin.Unit>,?> block, kotlin.coroutines.Continuation<? super kotlin.Unit>);
+ }
+
+ @androidx.compose.runtime.Stable public interface FlingBehavior {
+ method public suspend Object? performFling(androidx.compose.foundation.gestures.ScrollScope, float initialVelocity, kotlin.coroutines.Continuation<? super java.lang.Float>);
+ }
+
+ public final class ForEachGestureKt {
+ method public static suspend Object? forEachGesture(androidx.compose.ui.input.pointer.PointerInputScope, kotlin.jvm.functions.Function2<? super androidx.compose.ui.input.pointer.PointerInputScope,? super kotlin.coroutines.Continuation<? super kotlin.Unit>,?> block, kotlin.coroutines.Continuation<? super kotlin.Unit>);
+ }
+
+ public final class GestureCancellationException extends java.util.concurrent.CancellationException {
+ ctor public GestureCancellationException(optional String? message);
+ }
+
+ public enum Orientation {
+ enum_constant public static final androidx.compose.foundation.gestures.Orientation Horizontal;
+ enum_constant public static final androidx.compose.foundation.gestures.Orientation Vertical;
+ }
+
+ @androidx.compose.foundation.ExperimentalFoundationApi @androidx.compose.runtime.Stable public final class OverScrollConfiguration {
+ ctor public OverScrollConfiguration(optional long glowColor, optional boolean forceShowAlways, optional androidx.compose.foundation.layout.PaddingValues drawPadding);
+ method public androidx.compose.foundation.layout.PaddingValues getDrawPadding();
+ method public boolean getForceShowAlways();
+ method public long getGlowColor();
+ property public final androidx.compose.foundation.layout.PaddingValues drawPadding;
+ property public final boolean forceShowAlways;
+ property public final long glowColor;
+ }
+
+ public final class OverScrollConfigurationKt {
+ method @androidx.compose.foundation.ExperimentalFoundationApi public static androidx.compose.runtime.ProvidableCompositionLocal<androidx.compose.foundation.gestures.OverScrollConfiguration> getLocalOverScrollConfiguration();
+ property @androidx.compose.foundation.ExperimentalFoundationApi public static final androidx.compose.runtime.ProvidableCompositionLocal<androidx.compose.foundation.gestures.OverScrollConfiguration> LocalOverScrollConfiguration;
+ }
+
+ public interface PressGestureScope extends androidx.compose.ui.unit.Density {
+ method public suspend Object? awaitRelease(kotlin.coroutines.Continuation<? super kotlin.Unit>);
+ method public suspend Object? tryAwaitRelease(kotlin.coroutines.Continuation<? super java.lang.Boolean>);
+ }
+
+ public final class ScrollExtensionsKt {
+ method public static suspend Object? animateScrollBy(androidx.compose.foundation.gestures.ScrollableState, float value, optional androidx.compose.animation.core.AnimationSpec<java.lang.Float> animationSpec, optional kotlin.coroutines.Continuation<? super java.lang.Float>);
+ method public static suspend Object? scrollBy(androidx.compose.foundation.gestures.ScrollableState, float value, kotlin.coroutines.Continuation<? super java.lang.Float>);
+ method public static suspend Object? stopScroll(androidx.compose.foundation.gestures.ScrollableState, optional androidx.compose.foundation.MutatePriority scrollPriority, optional kotlin.coroutines.Continuation<? super kotlin.Unit>);
+ }
+
+ public interface ScrollScope {
+ method public float scrollBy(float pixels);
+ }
+
+ public final class ScrollableDefaults {
+ method @androidx.compose.runtime.Composable public androidx.compose.foundation.gestures.FlingBehavior flingBehavior();
+ field public static final androidx.compose.foundation.gestures.ScrollableDefaults INSTANCE;
+ }
+
+ public final class ScrollableKt {
+ method public static androidx.compose.ui.Modifier scrollable(androidx.compose.ui.Modifier, androidx.compose.foundation.gestures.ScrollableState state, androidx.compose.foundation.gestures.Orientation orientation, optional boolean enabled, optional boolean reverseDirection, optional androidx.compose.foundation.gestures.FlingBehavior? flingBehavior, optional androidx.compose.foundation.interaction.MutableInteractionSource? interactionSource);
+ }
+
+ public interface ScrollableState {
+ method public float dispatchRawDelta(float delta);
+ method public boolean isScrollInProgress();
+ method public suspend Object? scroll(optional androidx.compose.foundation.MutatePriority scrollPriority, kotlin.jvm.functions.Function2<? super androidx.compose.foundation.gestures.ScrollScope,? super kotlin.coroutines.Continuation<? super kotlin.Unit>,?> block, kotlin.coroutines.Continuation<? super kotlin.Unit>);
+ property public abstract boolean isScrollInProgress;
+ }
+
+ public final class ScrollableStateKt {
+ method public static androidx.compose.foundation.gestures.ScrollableState ScrollableState(kotlin.jvm.functions.Function1<? super java.lang.Float,java.lang.Float> consumeScrollDelta);
+ method @androidx.compose.runtime.Composable public static androidx.compose.foundation.gestures.ScrollableState rememberScrollableState(kotlin.jvm.functions.Function1<? super java.lang.Float,java.lang.Float> consumeScrollDelta);
+ }
+
+ public final class TapGestureDetectorKt {
+ method public static suspend Object? awaitFirstDown(androidx.compose.ui.input.pointer.AwaitPointerEventScope, optional boolean requireUnconsumed, optional kotlin.coroutines.Continuation<? super androidx.compose.ui.input.pointer.PointerInputChange>);
+ method public static suspend Object? detectTapGestures(androidx.compose.ui.input.pointer.PointerInputScope, optional kotlin.jvm.functions.Function1<? super androidx.compose.ui.geometry.Offset,kotlin.Unit>? onDoubleTap, optional kotlin.jvm.functions.Function1<? super androidx.compose.ui.geometry.Offset,kotlin.Unit>? onLongPress, optional kotlin.jvm.functions.Function3<? super androidx.compose.foundation.gestures.PressGestureScope,? super androidx.compose.ui.geometry.Offset,? super kotlin.coroutines.Continuation<? super kotlin.Unit>,?> onPress, optional kotlin.jvm.functions.Function1<? super androidx.compose.ui.geometry.Offset,kotlin.Unit>? onTap, optional kotlin.coroutines.Continuation<? super kotlin.Unit>);
+ method public static suspend Object? waitForUpOrCancellation(androidx.compose.ui.input.pointer.AwaitPointerEventScope, kotlin.coroutines.Continuation<? super androidx.compose.ui.input.pointer.PointerInputChange>);
+ }
+
+ public final class TransformGestureDetectorKt {
+ method public static long calculateCentroid(androidx.compose.ui.input.pointer.PointerEvent, optional boolean useCurrent);
+ method public static float calculateCentroidSize(androidx.compose.ui.input.pointer.PointerEvent, optional boolean useCurrent);
+ method public static long calculatePan(androidx.compose.ui.input.pointer.PointerEvent);
+ method public static float calculateRotation(androidx.compose.ui.input.pointer.PointerEvent);
+ method public static float calculateZoom(androidx.compose.ui.input.pointer.PointerEvent);
+ method public static suspend Object? detectTransformGestures(androidx.compose.ui.input.pointer.PointerInputScope, optional boolean panZoomLock, kotlin.jvm.functions.Function4<? super androidx.compose.ui.geometry.Offset,? super androidx.compose.ui.geometry.Offset,? super java.lang.Float,? super java.lang.Float,kotlin.Unit> onGesture, kotlin.coroutines.Continuation<? super kotlin.Unit>);
+ }
+
+ public interface TransformScope {
+ method public void transformBy(optional float zoomChange, optional long panChange, optional float rotationChange);
+ }
+
+ public final class TransformableKt {
+ method public static androidx.compose.ui.Modifier transformable(androidx.compose.ui.Modifier, androidx.compose.foundation.gestures.TransformableState state, optional boolean lockRotationOnZoomPan, optional boolean enabled);
+ }
+
+ public interface TransformableState {
+ method public boolean isTransformInProgress();
+ method public suspend Object? transform(optional androidx.compose.foundation.MutatePriority transformPriority, kotlin.jvm.functions.Function2<? super androidx.compose.foundation.gestures.TransformScope,? super kotlin.coroutines.Continuation<? super kotlin.Unit>,?> block, kotlin.coroutines.Continuation<? super kotlin.Unit>);
+ property public abstract boolean isTransformInProgress;
+ }
+
+ public final class TransformableStateKt {
+ method public static androidx.compose.foundation.gestures.TransformableState TransformableState(kotlin.jvm.functions.Function3<? super java.lang.Float,? super androidx.compose.ui.geometry.Offset,? super java.lang.Float,kotlin.Unit> onTransformation);
+ method public static suspend Object? animatePanBy(androidx.compose.foundation.gestures.TransformableState, long offset, optional androidx.compose.animation.core.AnimationSpec<androidx.compose.ui.geometry.Offset> animationSpec, optional kotlin.coroutines.Continuation<? super kotlin.Unit>);
+ method public static suspend Object? animateRotateBy(androidx.compose.foundation.gestures.TransformableState, float degrees, optional androidx.compose.animation.core.AnimationSpec<java.lang.Float> animationSpec, optional kotlin.coroutines.Continuation<? super kotlin.Unit>);
+ method public static suspend Object? animateZoomBy(androidx.compose.foundation.gestures.TransformableState, float zoomFactor, optional androidx.compose.animation.core.AnimationSpec<java.lang.Float> animationSpec, optional kotlin.coroutines.Continuation<? super kotlin.Unit>);
+ method public static suspend Object? panBy(androidx.compose.foundation.gestures.TransformableState, long offset, kotlin.coroutines.Continuation<? super kotlin.Unit>);
+ method @androidx.compose.runtime.Composable public static androidx.compose.foundation.gestures.TransformableState rememberTransformableState(kotlin.jvm.functions.Function3<? super java.lang.Float,? super androidx.compose.ui.geometry.Offset,? super java.lang.Float,kotlin.Unit> onTransformation);
+ method public static suspend Object? rotateBy(androidx.compose.foundation.gestures.TransformableState, float degrees, kotlin.coroutines.Continuation<? super kotlin.Unit>);
+ method public static suspend Object? stopTransformation(androidx.compose.foundation.gestures.TransformableState, optional androidx.compose.foundation.MutatePriority terminationPriority, optional kotlin.coroutines.Continuation<? super kotlin.Unit>);
+ method public static suspend Object? zoomBy(androidx.compose.foundation.gestures.TransformableState, float zoomFactor, kotlin.coroutines.Continuation<? super kotlin.Unit>);
+ }
+
+}
+
+package androidx.compose.foundation.interaction {
+
+ public interface DragInteraction extends androidx.compose.foundation.interaction.Interaction {
+ }
+
+ public static final class DragInteraction.Cancel implements androidx.compose.foundation.interaction.DragInteraction {
+ ctor public DragInteraction.Cancel(androidx.compose.foundation.interaction.DragInteraction.Start start);
+ method public androidx.compose.foundation.interaction.DragInteraction.Start getStart();
+ property public final androidx.compose.foundation.interaction.DragInteraction.Start start;
+ }
+
+ public static final class DragInteraction.Start implements androidx.compose.foundation.interaction.DragInteraction {
+ ctor public DragInteraction.Start();
+ }
+
+ public static final class DragInteraction.Stop implements androidx.compose.foundation.interaction.DragInteraction {
+ ctor public DragInteraction.Stop(androidx.compose.foundation.interaction.DragInteraction.Start start);
+ method public androidx.compose.foundation.interaction.DragInteraction.Start getStart();
+ property public final androidx.compose.foundation.interaction.DragInteraction.Start start;
+ }
+
+ public final class DragInteractionKt {
+ method @androidx.compose.runtime.Composable public static androidx.compose.runtime.State<java.lang.Boolean> collectIsDraggedAsState(androidx.compose.foundation.interaction.InteractionSource);
+ }
+
+ public interface FocusInteraction extends androidx.compose.foundation.interaction.Interaction {
+ }
+
+ public static final class FocusInteraction.Focus implements androidx.compose.foundation.interaction.FocusInteraction {
+ ctor public FocusInteraction.Focus();
+ }
+
+ public static final class FocusInteraction.Unfocus implements androidx.compose.foundation.interaction.FocusInteraction {
+ ctor public FocusInteraction.Unfocus(androidx.compose.foundation.interaction.FocusInteraction.Focus focus);
+ method public androidx.compose.foundation.interaction.FocusInteraction.Focus getFocus();
+ property public final androidx.compose.foundation.interaction.FocusInteraction.Focus focus;
+ }
+
+ public final class FocusInteractionKt {
+ method @androidx.compose.runtime.Composable public static androidx.compose.runtime.State<java.lang.Boolean> collectIsFocusedAsState(androidx.compose.foundation.interaction.InteractionSource);
+ }
+
+ public interface HoverInteraction extends androidx.compose.foundation.interaction.Interaction {
+ }
+
+ public static final class HoverInteraction.Enter implements androidx.compose.foundation.interaction.HoverInteraction {
+ ctor public HoverInteraction.Enter();
+ }
+
+ public static final class HoverInteraction.Exit implements androidx.compose.foundation.interaction.HoverInteraction {
+ ctor public HoverInteraction.Exit(androidx.compose.foundation.interaction.HoverInteraction.Enter enter);
+ method public androidx.compose.foundation.interaction.HoverInteraction.Enter getEnter();
+ property public final androidx.compose.foundation.interaction.HoverInteraction.Enter enter;
+ }
+
+ public final class HoverInteractionKt {
+ method @androidx.compose.runtime.Composable public static androidx.compose.runtime.State<java.lang.Boolean> collectIsHoveredAsState(androidx.compose.foundation.interaction.InteractionSource);
+ }
+
+ public interface Interaction {
+ }
+
+ @androidx.compose.runtime.Stable public interface InteractionSource {
+ method public kotlinx.coroutines.flow.Flow<androidx.compose.foundation.interaction.Interaction> getInteractions();
+ property public abstract kotlinx.coroutines.flow.Flow<androidx.compose.foundation.interaction.Interaction> interactions;
+ }
+
+ public final class InteractionSourceKt {
+ method public static androidx.compose.foundation.interaction.MutableInteractionSource MutableInteractionSource();
+ }
+
+ @androidx.compose.runtime.Stable public interface MutableInteractionSource extends androidx.compose.foundation.interaction.InteractionSource {
+ method public suspend Object? emit(androidx.compose.foundation.interaction.Interaction interaction, kotlin.coroutines.Continuation<? super kotlin.Unit>);
+ method public boolean tryEmit(androidx.compose.foundation.interaction.Interaction interaction);
+ }
+
+ public interface PressInteraction extends androidx.compose.foundation.interaction.Interaction {
+ }
+
+ public static final class PressInteraction.Cancel implements androidx.compose.foundation.interaction.PressInteraction {
+ ctor public PressInteraction.Cancel(androidx.compose.foundation.interaction.PressInteraction.Press press);
+ method public androidx.compose.foundation.interaction.PressInteraction.Press getPress();
+ property public final androidx.compose.foundation.interaction.PressInteraction.Press press;
+ }
+
+ public static final class PressInteraction.Press implements androidx.compose.foundation.interaction.PressInteraction {
+ ctor public PressInteraction.Press(long pressPosition);
+ method public long getPressPosition();
+ property public final long pressPosition;
+ }
+
+ public static final class PressInteraction.Release implements androidx.compose.foundation.interaction.PressInteraction {
+ ctor public PressInteraction.Release(androidx.compose.foundation.interaction.PressInteraction.Press press);
+ method public androidx.compose.foundation.interaction.PressInteraction.Press getPress();
+ property public final androidx.compose.foundation.interaction.PressInteraction.Press press;
+ }
+
+ public final class PressInteractionKt {
+ method @androidx.compose.runtime.Composable public static androidx.compose.runtime.State<java.lang.Boolean> collectIsPressedAsState(androidx.compose.foundation.interaction.InteractionSource);
+ }
+
+}
+
+package androidx.compose.foundation.lazy {
+
+ @Deprecated @androidx.compose.foundation.ExperimentalFoundationApi public final class GridCells implements androidx.compose.foundation.lazy.grid.GridCells {
+ method @Deprecated @androidx.compose.foundation.ExperimentalFoundationApi public androidx.compose.foundation.lazy.GridCells Adaptive(float minSize);
+ method @Deprecated @androidx.compose.foundation.ExperimentalFoundationApi public androidx.compose.foundation.lazy.GridCells Fixed(int count);
+ method @Deprecated public java.util.List<java.lang.Integer> calculateCrossAxisCellSizes(androidx.compose.ui.unit.Density, int availableSize, int spacing);
+ field @Deprecated public static final androidx.compose.foundation.lazy.GridCells INSTANCE;
+ }
+
+ @Deprecated @androidx.compose.foundation.ExperimentalFoundationApi public final class GridItemSpan {
+ method @Deprecated public int getCurrentLineSpan();
+ property public final int currentLineSpan;
+ }
+
+ public final class LazyBeyondBoundsModifierKt {
+ }
+
+ public final class LazyDslKt {
+ method @androidx.compose.runtime.Composable public static void LazyColumn(optional androidx.compose.ui.Modifier modifier, optional androidx.compose.foundation.lazy.LazyListState state, optional androidx.compose.foundation.layout.PaddingValues contentPadding, optional boolean reverseLayout, optional androidx.compose.foundation.layout.Arrangement.Vertical verticalArrangement, optional androidx.compose.ui.Alignment.Horizontal horizontalAlignment, optional androidx.compose.foundation.gestures.FlingBehavior flingBehavior, optional boolean userScrollEnabled, kotlin.jvm.functions.Function1<? super androidx.compose.foundation.lazy.LazyListScope,kotlin.Unit> content);
+ method @Deprecated @androidx.compose.runtime.Composable public static void LazyColumn(optional androidx.compose.ui.Modifier modifier, optional androidx.compose.foundation.lazy.LazyListState state, optional androidx.compose.foundation.layout.PaddingValues contentPadding, optional boolean reverseLayout, optional androidx.compose.foundation.layout.Arrangement.Vertical verticalArrangement, optional androidx.compose.ui.Alignment.Horizontal horizontalAlignment, optional androidx.compose.foundation.gestures.FlingBehavior flingBehavior, kotlin.jvm.functions.Function1<? super androidx.compose.foundation.lazy.LazyListScope,? extends kotlin.Unit> content);
+ method @androidx.compose.runtime.Composable public static void LazyRow(optional androidx.compose.ui.Modifier modifier, optional androidx.compose.foundation.lazy.LazyListState state, optional androidx.compose.foundation.layout.PaddingValues contentPadding, optional boolean reverseLayout, optional androidx.compose.foundation.layout.Arrangement.Horizontal horizontalArrangement, optional androidx.compose.ui.Alignment.Vertical verticalAlignment, optional androidx.compose.foundation.gestures.FlingBehavior flingBehavior, optional boolean userScrollEnabled, kotlin.jvm.functions.Function1<? super androidx.compose.foundation.lazy.LazyListScope,kotlin.Unit> content);
+ method @Deprecated @androidx.compose.runtime.Composable public static void LazyRow(optional androidx.compose.ui.Modifier modifier, optional androidx.compose.foundation.lazy.LazyListState state, optional androidx.compose.foundation.layout.PaddingValues contentPadding, optional boolean reverseLayout, optional androidx.compose.foundation.layout.Arrangement.Horizontal horizontalArrangement, optional androidx.compose.ui.Alignment.Vertical verticalAlignment, optional androidx.compose.foundation.gestures.FlingBehavior flingBehavior, kotlin.jvm.functions.Function1<? super androidx.compose.foundation.lazy.LazyListScope,? extends kotlin.Unit> content);
+ method public static inline <T> void items(androidx.compose.foundation.lazy.LazyListScope, java.util.List<? extends T> items, optional kotlin.jvm.functions.Function1<? super T,?>? key, optional kotlin.jvm.functions.Function1<? super T,?> contentType, kotlin.jvm.functions.Function2<? super androidx.compose.foundation.lazy.LazyItemScope,? super T,kotlin.Unit> itemContent);
+ method public static inline <T> void items(androidx.compose.foundation.lazy.LazyListScope, T![] items, optional kotlin.jvm.functions.Function1<? super T,?>? key, optional kotlin.jvm.functions.Function1<? super T,?> contentType, kotlin.jvm.functions.Function2<? super androidx.compose.foundation.lazy.LazyItemScope,? super T,kotlin.Unit> itemContent);
+ method @Deprecated public static inline <T> void items(androidx.compose.foundation.lazy.LazyListScope, java.util.List<? extends T> items, optional kotlin.jvm.functions.Function1<? super T,?>? key, kotlin.jvm.functions.Function2<? super androidx.compose.foundation.lazy.LazyItemScope,? super T,? extends kotlin.Unit> itemContent);
+ method @Deprecated public static inline <T> void items(androidx.compose.foundation.lazy.LazyListScope, T![] items, optional kotlin.jvm.functions.Function1<? super T,?>? key, kotlin.jvm.functions.Function2<? super androidx.compose.foundation.lazy.LazyItemScope,? super T,? extends kotlin.Unit> itemContent);
+ method public static inline <T> void itemsIndexed(androidx.compose.foundation.lazy.LazyListScope, java.util.List<? extends T> items, optional kotlin.jvm.functions.Function2<? super java.lang.Integer,? super T,?>? key, optional kotlin.jvm.functions.Function2<? super java.lang.Integer,? super T,?> contentType, kotlin.jvm.functions.Function3<? super androidx.compose.foundation.lazy.LazyItemScope,? super java.lang.Integer,? super T,kotlin.Unit> itemContent);
+ method public static inline <T> void itemsIndexed(androidx.compose.foundation.lazy.LazyListScope, T![] items, optional kotlin.jvm.functions.Function2<? super java.lang.Integer,? super T,?>? key, optional kotlin.jvm.functions.Function2<? super java.lang.Integer,? super T,?> contentType, kotlin.jvm.functions.Function3<? super androidx.compose.foundation.lazy.LazyItemScope,? super java.lang.Integer,? super T,kotlin.Unit> itemContent);
+ method @Deprecated public static inline <T> void itemsIndexed(androidx.compose.foundation.lazy.LazyListScope, java.util.List<? extends T> items, optional kotlin.jvm.functions.Function2<? super java.lang.Integer,? super T,?>? key, kotlin.jvm.functions.Function3<? super androidx.compose.foundation.lazy.LazyItemScope,? super java.lang.Integer,? super T,? extends kotlin.Unit> itemContent);
+ method @Deprecated public static inline <T> void itemsIndexed(androidx.compose.foundation.lazy.LazyListScope, T![] items, optional kotlin.jvm.functions.Function2<? super java.lang.Integer,? super T,?>? key, kotlin.jvm.functions.Function3<? super androidx.compose.foundation.lazy.LazyItemScope,? super java.lang.Integer,? super T,? extends kotlin.Unit> itemContent);
+ }
+
+ public final class LazyGridDeprecatedKt {
+ method @Deprecated @androidx.compose.foundation.ExperimentalFoundationApi public static long GridItemSpan(int currentLineSpan);
+ method @Deprecated @androidx.compose.foundation.ExperimentalFoundationApi @androidx.compose.runtime.Composable public static void LazyVerticalGrid(androidx.compose.foundation.lazy.GridCells cells, optional androidx.compose.ui.Modifier modifier, optional androidx.compose.foundation.lazy.LazyGridState state, optional androidx.compose.foundation.layout.PaddingValues contentPadding, optional boolean reverseLayout, optional androidx.compose.foundation.layout.Arrangement.Vertical verticalArrangement, optional androidx.compose.foundation.layout.Arrangement.Horizontal horizontalArrangement, optional androidx.compose.foundation.gestures.FlingBehavior flingBehavior, optional boolean userScrollEnabled, kotlin.jvm.functions.Function1<? super androidx.compose.foundation.lazy.grid.LazyGridScope,kotlin.Unit> content);
+ method @Deprecated @androidx.compose.foundation.ExperimentalFoundationApi public static <T> void items(androidx.compose.foundation.lazy.grid.LazyGridScope, java.util.List<? extends T> items, optional kotlin.jvm.functions.Function1<? super T,?>? key, optional kotlin.jvm.functions.Function2<? super androidx.compose.foundation.lazy.grid.LazyGridItemSpanScope,? super T,? extends androidx.compose.foundation.lazy.grid.GridItemSpan>? span, optional kotlin.jvm.functions.Function1<? super T,?> contentType, kotlin.jvm.functions.Function2<? super androidx.compose.foundation.lazy.grid.LazyGridItemScope,? super T,? extends kotlin.Unit> itemContent);
+ method @Deprecated @androidx.compose.foundation.ExperimentalFoundationApi public static <T> void items(androidx.compose.foundation.lazy.grid.LazyGridScope, T![] items, optional kotlin.jvm.functions.Function1<? super T,?>? key, optional kotlin.jvm.functions.Function2<? super androidx.compose.foundation.lazy.grid.LazyGridItemSpanScope,? super T,? extends androidx.compose.foundation.lazy.grid.GridItemSpan>? span, optional kotlin.jvm.functions.Function1<? super T,?> contentType, kotlin.jvm.functions.Function2<? super androidx.compose.foundation.lazy.grid.LazyGridItemScope,? super T,? extends kotlin.Unit> itemContent);
+ method @Deprecated @androidx.compose.foundation.ExperimentalFoundationApi public static <T> void itemsIndexed(androidx.compose.foundation.lazy.grid.LazyGridScope, java.util.List<? extends T> items, optional kotlin.jvm.functions.Function2<? super java.lang.Integer,? super T,?>? key, optional kotlin.jvm.functions.Function3<? super androidx.compose.foundation.lazy.grid.LazyGridItemSpanScope,? super java.lang.Integer,? super T,? extends androidx.compose.foundation.lazy.grid.GridItemSpan>? span, optional kotlin.jvm.functions.Function2<? super java.lang.Integer,? super T,?> contentType, kotlin.jvm.functions.Function3<? super androidx.compose.foundation.lazy.grid.LazyGridItemScope,? super java.lang.Integer,? super T,? extends kotlin.Unit> itemContent);
+ method @Deprecated @androidx.compose.foundation.ExperimentalFoundationApi public static <T> void itemsIndexed(androidx.compose.foundation.lazy.grid.LazyGridScope, T![] items, optional kotlin.jvm.functions.Function2<? super java.lang.Integer,? super T,?>? key, optional kotlin.jvm.functions.Function3<? super androidx.compose.foundation.lazy.grid.LazyGridItemSpanScope,? super java.lang.Integer,? super T,? extends androidx.compose.foundation.lazy.grid.GridItemSpan>? span, optional kotlin.jvm.functions.Function2<? super java.lang.Integer,? super T,?> contentType, kotlin.jvm.functions.Function3<? super androidx.compose.foundation.lazy.grid.LazyGridItemScope,? super java.lang.Integer,? super T,? extends kotlin.Unit> itemContent);
+ method @Deprecated @androidx.compose.foundation.ExperimentalFoundationApi @androidx.compose.runtime.Composable public static androidx.compose.foundation.lazy.LazyGridState rememberLazyGridState(optional int initialFirstVisibleItemIndex, optional int initialFirstVisibleItemScrollOffset);
+ }
+
+ @Deprecated @androidx.compose.foundation.ExperimentalFoundationApi public final class LazyGridState {
+ ctor @Deprecated public LazyGridState();
+ }
+
+ @androidx.compose.foundation.lazy.LazyScopeMarker @androidx.compose.runtime.Stable public interface LazyItemScope {
+ method @androidx.compose.foundation.ExperimentalFoundationApi public androidx.compose.ui.Modifier animateItemPlacement(androidx.compose.ui.Modifier, optional androidx.compose.animation.core.FiniteAnimationSpec<androidx.compose.ui.unit.IntOffset> animationSpec);
+ method public androidx.compose.ui.Modifier fillParentMaxHeight(androidx.compose.ui.Modifier, optional float fraction);
+ method public androidx.compose.ui.Modifier fillParentMaxSize(androidx.compose.ui.Modifier, optional float fraction);
+ method public androidx.compose.ui.Modifier fillParentMaxWidth(androidx.compose.ui.Modifier, optional float fraction);
+ }
+
+ public final class LazyListHeadersKt {
+ }
+
+ public interface LazyListItemInfo {
+ method public int getIndex();
+ method public Object getKey();
+ method public int getOffset();
+ method public int getSize();
+ property public abstract int index;
+ property public abstract Object key;
+ property public abstract int offset;
+ property public abstract int size;
+ }
+
+ public final class LazyListItemPlacementAnimatorKt {
+ }
+
+ public final class LazyListItemProviderImplKt {
+ }
+
+ public final class LazyListKt {
+ }
+
+ public interface LazyListLayoutInfo {
+ method public default int getAfterContentPadding();
+ method public default int getBeforeContentPadding();
+ method public default androidx.compose.foundation.gestures.Orientation getOrientation();
+ method public default boolean getReverseLayout();
+ method public int getTotalItemsCount();
+ method public int getViewportEndOffset();
+ method public default long getViewportSize();
+ method public int getViewportStartOffset();
+ method public java.util.List<androidx.compose.foundation.lazy.LazyListItemInfo> getVisibleItemsInfo();
+ property public default int afterContentPadding;
+ property public default int beforeContentPadding;
+ property public default androidx.compose.foundation.gestures.Orientation orientation;
+ property public default boolean reverseLayout;
+ property public abstract int totalItemsCount;
+ property public abstract int viewportEndOffset;
+ property public default long viewportSize;
+ property public abstract int viewportStartOffset;
+ property public abstract java.util.List<androidx.compose.foundation.lazy.LazyListItemInfo> visibleItemsInfo;
+ }
+
+ public final class LazyListMeasureKt {
+ }
+
+ public final class LazyListPinningModifierKt {
+ }
+
+ @androidx.compose.foundation.lazy.LazyScopeMarker public interface LazyListScope {
+ method public default void item(optional Object? key, optional Object? contentType, kotlin.jvm.functions.Function1<? super androidx.compose.foundation.lazy.LazyItemScope,kotlin.Unit> content);
+ method @Deprecated public void item(optional Object? key, kotlin.jvm.functions.Function1<? super androidx.compose.foundation.lazy.LazyItemScope,? extends kotlin.Unit> content);
+ method public default void items(int count, optional kotlin.jvm.functions.Function1<? super java.lang.Integer,?>? key, optional kotlin.jvm.functions.Function1<? super java.lang.Integer,?> contentType, kotlin.jvm.functions.Function2<? super androidx.compose.foundation.lazy.LazyItemScope,? super java.lang.Integer,kotlin.Unit> itemContent);
+ method @Deprecated public void items(int count, optional kotlin.jvm.functions.Function1<? super java.lang.Integer,?>? key, kotlin.jvm.functions.Function2<? super androidx.compose.foundation.lazy.LazyItemScope,? super java.lang.Integer,? extends kotlin.Unit> itemContent);
+ method @androidx.compose.foundation.ExperimentalFoundationApi public void stickyHeader(optional Object? key, optional Object? contentType, kotlin.jvm.functions.Function1<? super androidx.compose.foundation.lazy.LazyItemScope,kotlin.Unit> content);
+ }
+
+ public final class LazyListScrollingKt {
+ }
+
+ @androidx.compose.runtime.Stable public final class LazyListState implements androidx.compose.foundation.gestures.ScrollableState {
+ ctor public LazyListState(optional int firstVisibleItemIndex, optional int firstVisibleItemScrollOffset);
+ method public suspend Object? animateScrollToItem(int index, optional int scrollOffset, optional kotlin.coroutines.Continuation<? super kotlin.Unit>);
+ method public float dispatchRawDelta(float delta);
+ method public int getFirstVisibleItemIndex();
+ method public int getFirstVisibleItemScrollOffset();
+ method public androidx.compose.foundation.interaction.InteractionSource getInteractionSource();
+ method public androidx.compose.foundation.lazy.LazyListLayoutInfo getLayoutInfo();
+ method public boolean isScrollInProgress();
+ method public suspend Object? scroll(androidx.compose.foundation.MutatePriority scrollPriority, kotlin.jvm.functions.Function2<? super androidx.compose.foundation.gestures.ScrollScope,? super kotlin.coroutines.Continuation<? super kotlin.Unit>,?> block, kotlin.coroutines.Continuation<? super kotlin.Unit>);
+ method public suspend Object? scrollToItem(int index, optional int scrollOffset, optional kotlin.coroutines.Continuation<? super kotlin.Unit>);
+ property public final int firstVisibleItemIndex;
+ property public final int firstVisibleItemScrollOffset;
+ property public final androidx.compose.foundation.interaction.InteractionSource interactionSource;
+ property public boolean isScrollInProgress;
+ property public final androidx.compose.foundation.lazy.LazyListLayoutInfo layoutInfo;
+ field public static final androidx.compose.foundation.lazy.LazyListState.Companion Companion;
+ }
+
+ public static final class LazyListState.Companion {
+ method public androidx.compose.runtime.saveable.Saver<androidx.compose.foundation.lazy.LazyListState,?> getSaver();
+ property public final androidx.compose.runtime.saveable.Saver<androidx.compose.foundation.lazy.LazyListState,?> Saver;
+ }
+
+ public final class LazyListStateKt {
+ method @androidx.compose.runtime.Composable public static androidx.compose.foundation.lazy.LazyListState rememberLazyListState(optional int initialFirstVisibleItemIndex, optional int initialFirstVisibleItemScrollOffset);
+ }
+
+ @kotlin.DslMarker public @interface LazyScopeMarker {
+ }
+
+ public final class LazySemanticsKt {
+ }
+
+}
+
+package androidx.compose.foundation.lazy.grid {
+
+ @androidx.compose.runtime.Stable public interface GridCells {
+ method public java.util.List<java.lang.Integer> calculateCrossAxisCellSizes(androidx.compose.ui.unit.Density, int availableSize, int spacing);
+ }
+
+ public static final class GridCells.Adaptive implements androidx.compose.foundation.lazy.grid.GridCells {
+ ctor public GridCells.Adaptive(float minSize);
+ method public java.util.List<java.lang.Integer> calculateCrossAxisCellSizes(androidx.compose.ui.unit.Density, int availableSize, int spacing);
+ }
+
+ public static final class GridCells.Fixed implements androidx.compose.foundation.lazy.grid.GridCells {
+ ctor public GridCells.Fixed(int count);
+ method public java.util.List<java.lang.Integer> calculateCrossAxisCellSizes(androidx.compose.ui.unit.Density, int availableSize, int spacing);
+ }
+
+ @androidx.compose.runtime.Immutable @kotlin.jvm.JvmInline public final value class GridItemSpan {
+ method public int getCurrentLineSpan();
+ property public final int currentLineSpan;
+ }
+
+ public final class LazyGridDslKt {
+ method @androidx.compose.runtime.Composable public static void LazyHorizontalGrid(androidx.compose.foundation.lazy.grid.GridCells rows, optional androidx.compose.ui.Modifier modifier, optional androidx.compose.foundation.lazy.grid.LazyGridState state, optional androidx.compose.foundation.layout.PaddingValues contentPadding, optional boolean reverseLayout, optional androidx.compose.foundation.layout.Arrangement.Horizontal horizontalArrangement, optional androidx.compose.foundation.layout.Arrangement.Vertical verticalArrangement, optional androidx.compose.foundation.gestures.FlingBehavior flingBehavior, optional boolean userScrollEnabled, kotlin.jvm.functions.Function1<? super androidx.compose.foundation.lazy.grid.LazyGridScope,kotlin.Unit> content);
+ method @androidx.compose.runtime.Composable public static void LazyVerticalGrid(androidx.compose.foundation.lazy.grid.GridCells columns, optional androidx.compose.ui.Modifier modifier, optional androidx.compose.foundation.lazy.grid.LazyGridState state, optional androidx.compose.foundation.layout.PaddingValues contentPadding, optional boolean reverseLayout, optional androidx.compose.foundation.layout.Arrangement.Vertical verticalArrangement, optional androidx.compose.foundation.layout.Arrangement.Horizontal horizontalArrangement, optional androidx.compose.foundation.gestures.FlingBehavior flingBehavior, optional boolean userScrollEnabled, kotlin.jvm.functions.Function1<? super androidx.compose.foundation.lazy.grid.LazyGridScope,kotlin.Unit> content);
+ method public static inline <T> void items(androidx.compose.foundation.lazy.grid.LazyGridScope, java.util.List<? extends T> items, optional kotlin.jvm.functions.Function1<? super T,?>? key, optional kotlin.jvm.functions.Function2<? super androidx.compose.foundation.lazy.grid.LazyGridItemSpanScope,? super T,androidx.compose.foundation.lazy.grid.GridItemSpan>? span, optional kotlin.jvm.functions.Function1<? super T,?> contentType, kotlin.jvm.functions.Function2<? super androidx.compose.foundation.lazy.grid.LazyGridItemScope,? super T,kotlin.Unit> itemContent);
+ method public static inline <T> void items(androidx.compose.foundation.lazy.grid.LazyGridScope, T![] items, optional kotlin.jvm.functions.Function1<? super T,?>? key, optional kotlin.jvm.functions.Function2<? super androidx.compose.foundation.lazy.grid.LazyGridItemSpanScope,? super T,androidx.compose.foundation.lazy.grid.GridItemSpan>? span, optional kotlin.jvm.functions.Function1<? super T,?> contentType, kotlin.jvm.functions.Function2<? super androidx.compose.foundation.lazy.grid.LazyGridItemScope,? super T,kotlin.Unit> itemContent);
+ method public static inline <T> void itemsIndexed(androidx.compose.foundation.lazy.grid.LazyGridScope, java.util.List<? extends T> items, optional kotlin.jvm.functions.Function2<? super java.lang.Integer,? super T,?>? key, optional kotlin.jvm.functions.Function3<? super androidx.compose.foundation.lazy.grid.LazyGridItemSpanScope,? super java.lang.Integer,? super T,androidx.compose.foundation.lazy.grid.GridItemSpan>? span, optional kotlin.jvm.functions.Function2<? super java.lang.Integer,? super T,?> contentType, kotlin.jvm.functions.Function3<? super androidx.compose.foundation.lazy.grid.LazyGridItemScope,? super java.lang.Integer,? super T,kotlin.Unit> itemContent);
+ method public static inline <T> void itemsIndexed(androidx.compose.foundation.lazy.grid.LazyGridScope, T![] items, optional kotlin.jvm.functions.Function2<? super java.lang.Integer,? super T,?>? key, optional kotlin.jvm.functions.Function3<? super androidx.compose.foundation.lazy.grid.LazyGridItemSpanScope,? super java.lang.Integer,? super T,androidx.compose.foundation.lazy.grid.GridItemSpan>? span, optional kotlin.jvm.functions.Function2<? super java.lang.Integer,? super T,?> contentType, kotlin.jvm.functions.Function3<? super androidx.compose.foundation.lazy.grid.LazyGridItemScope,? super java.lang.Integer,? super T,kotlin.Unit> itemContent);
+ }
+
+ public sealed interface LazyGridItemInfo {
+ method public int getColumn();
+ method public int getIndex();
+ method public Object getKey();
+ method public long getOffset();
+ method public int getRow();
+ method public long getSize();
+ property public abstract int column;
+ property public abstract int index;
+ property public abstract Object key;
+ property public abstract long offset;
+ property public abstract int row;
+ property public abstract long size;
+ field public static final androidx.compose.foundation.lazy.grid.LazyGridItemInfo.Companion Companion;
+ field public static final int UnknownColumn = -1; // 0xffffffff
+ field public static final int UnknownRow = -1; // 0xffffffff
+ }
+
+ public static final class LazyGridItemInfo.Companion {
+ field public static final int UnknownColumn = -1; // 0xffffffff
+ field public static final int UnknownRow = -1; // 0xffffffff
+ }
+
+ public final class LazyGridItemPlacementAnimatorKt {
+ }
+
+ public final class LazyGridItemProviderImplKt {
+ }
+
+ @androidx.compose.foundation.lazy.grid.LazyGridScopeMarker @androidx.compose.runtime.Stable public sealed interface LazyGridItemScope {
+ method @androidx.compose.foundation.ExperimentalFoundationApi public androidx.compose.ui.Modifier animateItemPlacement(androidx.compose.ui.Modifier, optional androidx.compose.animation.core.FiniteAnimationSpec<androidx.compose.ui.unit.IntOffset> animationSpec);
+ }
+
+ @androidx.compose.foundation.lazy.grid.LazyGridScopeMarker public sealed interface LazyGridItemSpanScope {
+ method public int getMaxCurrentLineSpan();
+ method public int getMaxLineSpan();
+ property public abstract int maxCurrentLineSpan;
+ property public abstract int maxLineSpan;
+ }
+
+ public final class LazyGridKt {
+ }
+
+ public sealed interface LazyGridLayoutInfo {
+ method public int getAfterContentPadding();
+ method public int getBeforeContentPadding();
+ method public androidx.compose.foundation.gestures.Orientation getOrientation();
+ method public boolean getReverseLayout();
+ method public int getTotalItemsCount();
+ method public int getViewportEndOffset();
+ method public long getViewportSize();
+ method public int getViewportStartOffset();
+ method public java.util.List<androidx.compose.foundation.lazy.grid.LazyGridItemInfo> getVisibleItemsInfo();
+ property public abstract int afterContentPadding;
+ property public abstract int beforeContentPadding;
+ property public abstract androidx.compose.foundation.gestures.Orientation orientation;
+ property public abstract boolean reverseLayout;
+ property public abstract int totalItemsCount;
+ property public abstract int viewportEndOffset;
+ property public abstract long viewportSize;
+ property public abstract int viewportStartOffset;
+ property public abstract java.util.List<androidx.compose.foundation.lazy.grid.LazyGridItemInfo> visibleItemsInfo;
+ }
+
+ public final class LazyGridMeasureKt {
+ }
+
+ @androidx.compose.foundation.lazy.grid.LazyGridScopeMarker public sealed interface LazyGridScope {
+ method public void item(optional Object? key, optional kotlin.jvm.functions.Function1<? super androidx.compose.foundation.lazy.grid.LazyGridItemSpanScope,androidx.compose.foundation.lazy.grid.GridItemSpan>? span, optional Object? contentType, kotlin.jvm.functions.Function1<? super androidx.compose.foundation.lazy.grid.LazyGridItemScope,kotlin.Unit> content);
+ method public void items(int count, optional kotlin.jvm.functions.Function1<? super java.lang.Integer,?>? key, optional kotlin.jvm.functions.Function2<? super androidx.compose.foundation.lazy.grid.LazyGridItemSpanScope,? super java.lang.Integer,androidx.compose.foundation.lazy.grid.GridItemSpan>? span, optional kotlin.jvm.functions.Function1<? super java.lang.Integer,?> contentType, kotlin.jvm.functions.Function2<? super androidx.compose.foundation.lazy.grid.LazyGridItemScope,? super java.lang.Integer,kotlin.Unit> itemContent);
+ }
+
+ @kotlin.DslMarker public @interface LazyGridScopeMarker {
+ }
+
+ public final class LazyGridScrollingKt {
+ }
+
+ public final class LazyGridSpanKt {
+ method public static long GridItemSpan(int currentLineSpan);
+ }
+
+ @androidx.compose.runtime.Stable public final class LazyGridState implements androidx.compose.foundation.gestures.ScrollableState {
+ ctor public LazyGridState(optional int firstVisibleItemIndex, optional int firstVisibleItemScrollOffset);
+ method public suspend Object? animateScrollToItem(int index, optional int scrollOffset, optional kotlin.coroutines.Continuation<? super kotlin.Unit>);
+ method public float dispatchRawDelta(float delta);
+ method public int getFirstVisibleItemIndex();
+ method public int getFirstVisibleItemScrollOffset();
+ method public androidx.compose.foundation.interaction.InteractionSource getInteractionSource();
+ method public androidx.compose.foundation.lazy.grid.LazyGridLayoutInfo getLayoutInfo();
+ method public boolean isScrollInProgress();
+ method public suspend Object? scroll(androidx.compose.foundation.MutatePriority scrollPriority, kotlin.jvm.functions.Function2<? super androidx.compose.foundation.gestures.ScrollScope,? super kotlin.coroutines.Continuation<? super kotlin.Unit>,?> block, kotlin.coroutines.Continuation<? super kotlin.Unit>);
+ method public suspend Object? scrollToItem(int index, optional int scrollOffset, optional kotlin.coroutines.Continuation<? super kotlin.Unit>);
+ property public final int firstVisibleItemIndex;
+ property public final int firstVisibleItemScrollOffset;
+ property public final androidx.compose.foundation.interaction.InteractionSource interactionSource;
+ property public boolean isScrollInProgress;
+ property public final androidx.compose.foundation.lazy.grid.LazyGridLayoutInfo layoutInfo;
+ field public static final androidx.compose.foundation.lazy.grid.LazyGridState.Companion Companion;
+ }
+
+ public static final class LazyGridState.Companion {
+ method public androidx.compose.runtime.saveable.Saver<androidx.compose.foundation.lazy.grid.LazyGridState,?> getSaver();
+ property public final androidx.compose.runtime.saveable.Saver<androidx.compose.foundation.lazy.grid.LazyGridState,?> Saver;
+ }
+
+ public final class LazyGridStateKt {
+ method @androidx.compose.runtime.Composable public static androidx.compose.foundation.lazy.grid.LazyGridState rememberLazyGridState(optional int initialFirstVisibleItemIndex, optional int initialFirstVisibleItemScrollOffset);
+ }
+
+ public final class LazySemanticsKt {
+ }
+
+}
+
+package androidx.compose.foundation.lazy.layout {
+
+ public final class IntervalListKt {
+ }
+
+ @androidx.compose.foundation.ExperimentalFoundationApi @androidx.compose.runtime.Stable public interface LazyLayoutItemProvider {
+ method @androidx.compose.runtime.Composable public void Item(int index);
+ method public default Object? getContentType(int index);
+ method public int getItemCount();
+ method public default Object getKey(int index);
+ method public default java.util.Map<java.lang.Object,java.lang.Integer> getKeyToIndexMap();
+ property public abstract int itemCount;
+ property public default java.util.Map<java.lang.Object,java.lang.Integer> keyToIndexMap;
+ }
+
+ public final class LazyLayoutKt {
+ method @androidx.compose.foundation.ExperimentalFoundationApi @androidx.compose.runtime.Composable public static void LazyLayout(androidx.compose.foundation.lazy.layout.LazyLayoutItemProvider itemProvider, optional androidx.compose.ui.Modifier modifier, optional androidx.compose.foundation.lazy.layout.LazyLayoutPrefetchState? prefetchState, kotlin.jvm.functions.Function2<? super androidx.compose.foundation.lazy.layout.LazyLayoutMeasureScope,? super androidx.compose.ui.unit.Constraints,? extends androidx.compose.ui.layout.MeasureResult> measurePolicy);
+ }
+
+ @androidx.compose.foundation.ExperimentalFoundationApi @androidx.compose.runtime.Stable public sealed interface LazyLayoutMeasureScope extends androidx.compose.ui.layout.MeasureScope {
+ method public androidx.compose.ui.layout.Placeable![] measure(int index, long constraints);
+ method @androidx.compose.runtime.Stable public default float toDp(long);
+ method @androidx.compose.runtime.Stable public default float toDp(int);
+ method @androidx.compose.runtime.Stable public default float toDp(float);
+ method @androidx.compose.runtime.Stable public default long toDpSize(long);
+ method @androidx.compose.runtime.Stable public default long toSize(long);
+ method @androidx.compose.runtime.Stable public default long toSp(float);
+ method @androidx.compose.runtime.Stable public default long toSp(int);
+ method @androidx.compose.runtime.Stable public default long toSp(float);
+ }
+
+ @androidx.compose.foundation.ExperimentalFoundationApi @androidx.compose.runtime.Stable public final class LazyLayoutPrefetchState {
+ ctor public LazyLayoutPrefetchState();
+ method public androidx.compose.foundation.lazy.layout.LazyLayoutPrefetchState.PrefetchHandle schedulePrefetch(int index, long constraints);
+ }
+
+ public static sealed interface LazyLayoutPrefetchState.PrefetchHandle {
+ method public void cancel();
+ }
+
+ public final class LazyLayoutPrefetcher_androidKt {
+ }
+
+ public final class Lazy_androidKt {
+ method @androidx.compose.foundation.ExperimentalFoundationApi public static Object getDefaultLazyLayoutKey(int index);
+ }
+
+ @androidx.compose.foundation.ExperimentalFoundationApi public interface PinnableParent {
+ method public androidx.compose.foundation.lazy.layout.PinnableParent.PinnedItemsHandle pinItems();
+ }
+
+ @androidx.compose.foundation.ExperimentalFoundationApi public static interface PinnableParent.PinnedItemsHandle {
+ method public void unpin();
+ }
+
+ public final class PinnableParentKt {
+ method @androidx.compose.foundation.ExperimentalFoundationApi public static androidx.compose.ui.modifier.ProvidableModifierLocal<androidx.compose.foundation.lazy.layout.PinnableParent> getModifierLocalPinnableParent();
+ property @androidx.compose.foundation.ExperimentalFoundationApi public static final androidx.compose.ui.modifier.ProvidableModifierLocal<androidx.compose.foundation.lazy.layout.PinnableParent> ModifierLocalPinnableParent;
+ }
+
+}
+
+package androidx.compose.foundation.relocation {
+
+ public final class BringIntoViewKt {
+ }
+
+ @androidx.compose.foundation.ExperimentalFoundationApi public sealed interface BringIntoViewRequester {
+ method public suspend Object? bringIntoView(optional androidx.compose.ui.geometry.Rect? rect, optional kotlin.coroutines.Continuation<? super kotlin.Unit>);
+ }
+
+ public final class BringIntoViewRequesterKt {
+ method @androidx.compose.foundation.ExperimentalFoundationApi public static androidx.compose.foundation.relocation.BringIntoViewRequester BringIntoViewRequester();
+ method @androidx.compose.foundation.ExperimentalFoundationApi public static androidx.compose.ui.Modifier bringIntoViewRequester(androidx.compose.ui.Modifier, androidx.compose.foundation.relocation.BringIntoViewRequester bringIntoViewRequester);
+ }
+
+ @androidx.compose.foundation.ExperimentalFoundationApi public interface BringIntoViewResponder {
+ method @androidx.compose.foundation.ExperimentalFoundationApi public suspend Object? bringChildIntoView(androidx.compose.ui.geometry.Rect localRect, kotlin.coroutines.Continuation<? super kotlin.Unit>);
+ method @androidx.compose.foundation.ExperimentalFoundationApi public androidx.compose.ui.geometry.Rect calculateRectForParent(androidx.compose.ui.geometry.Rect localRect);
+ }
+
+ public final class BringIntoViewResponderKt {
+ method @androidx.compose.foundation.ExperimentalFoundationApi public static androidx.compose.ui.Modifier bringIntoViewResponder(androidx.compose.ui.Modifier, androidx.compose.foundation.relocation.BringIntoViewResponder responder);
+ }
+
+ public final class BringIntoViewResponder_androidKt {
+ }
+
+}
+
+package androidx.compose.foundation.selection {
+
+ public final class SelectableGroupKt {
+ method public static androidx.compose.ui.Modifier selectableGroup(androidx.compose.ui.Modifier);
+ }
+
+ public final class SelectableKt {
+ method public static androidx.compose.ui.Modifier selectable(androidx.compose.ui.Modifier, boolean selected, optional boolean enabled, optional androidx.compose.ui.semantics.Role? role, kotlin.jvm.functions.Function0<kotlin.Unit> onClick);
+ method public static androidx.compose.ui.Modifier selectable(androidx.compose.ui.Modifier, boolean selected, androidx.compose.foundation.interaction.MutableInteractionSource interactionSource, androidx.compose.foundation.Indication? indication, optional boolean enabled, optional androidx.compose.ui.semantics.Role? role, kotlin.jvm.functions.Function0<kotlin.Unit> onClick);
+ }
+
+ public final class ToggleableKt {
+ method public static androidx.compose.ui.Modifier toggleable(androidx.compose.ui.Modifier, boolean value, optional boolean enabled, optional androidx.compose.ui.semantics.Role? role, kotlin.jvm.functions.Function1<? super java.lang.Boolean,kotlin.Unit> onValueChange);
+ method public static androidx.compose.ui.Modifier toggleable(androidx.compose.ui.Modifier, boolean value, androidx.compose.foundation.interaction.MutableInteractionSource interactionSource, androidx.compose.foundation.Indication? indication, optional boolean enabled, optional androidx.compose.ui.semantics.Role? role, kotlin.jvm.functions.Function1<? super java.lang.Boolean,kotlin.Unit> onValueChange);
+ method public static androidx.compose.ui.Modifier triStateToggleable(androidx.compose.ui.Modifier, androidx.compose.ui.state.ToggleableState state, optional boolean enabled, optional androidx.compose.ui.semantics.Role? role, kotlin.jvm.functions.Function0<kotlin.Unit> onClick);
+ method public static androidx.compose.ui.Modifier triStateToggleable(androidx.compose.ui.Modifier, androidx.compose.ui.state.ToggleableState state, androidx.compose.foundation.interaction.MutableInteractionSource interactionSource, androidx.compose.foundation.Indication? indication, optional boolean enabled, optional androidx.compose.ui.semantics.Role? role, kotlin.jvm.functions.Function0<kotlin.Unit> onClick);
+ }
+
+}
+
+package androidx.compose.foundation.shape {
+
+ public final class AbsoluteCutCornerShape extends androidx.compose.foundation.shape.CornerBasedShape {
+ ctor public AbsoluteCutCornerShape(androidx.compose.foundation.shape.CornerSize topLeft, androidx.compose.foundation.shape.CornerSize topRight, androidx.compose.foundation.shape.CornerSize bottomRight, androidx.compose.foundation.shape.CornerSize bottomLeft);
+ method public androidx.compose.foundation.shape.AbsoluteCutCornerShape copy(androidx.compose.foundation.shape.CornerSize topStart, androidx.compose.foundation.shape.CornerSize topEnd, androidx.compose.foundation.shape.CornerSize bottomEnd, androidx.compose.foundation.shape.CornerSize bottomStart);
+ method public androidx.compose.ui.graphics.Outline createOutline(long size, float topStart, float topEnd, float bottomEnd, float bottomStart, androidx.compose.ui.unit.LayoutDirection layoutDirection);
+ }
+
+ public final class AbsoluteCutCornerShapeKt {
+ method public static androidx.compose.foundation.shape.AbsoluteCutCornerShape AbsoluteCutCornerShape(androidx.compose.foundation.shape.CornerSize corner);
+ method public static androidx.compose.foundation.shape.AbsoluteCutCornerShape AbsoluteCutCornerShape(float size);
+ method public static androidx.compose.foundation.shape.AbsoluteCutCornerShape AbsoluteCutCornerShape(float size);
+ method public static androidx.compose.foundation.shape.AbsoluteCutCornerShape AbsoluteCutCornerShape(int percent);
+ method public static androidx.compose.foundation.shape.AbsoluteCutCornerShape AbsoluteCutCornerShape(optional float topLeft, optional float topRight, optional float bottomRight, optional float bottomLeft);
+ method public static androidx.compose.foundation.shape.AbsoluteCutCornerShape AbsoluteCutCornerShape(optional float topLeft, optional float topRight, optional float bottomRight, optional float bottomLeft);
+ method public static androidx.compose.foundation.shape.AbsoluteCutCornerShape AbsoluteCutCornerShape(optional int topLeftPercent, optional int topRightPercent, optional int bottomRightPercent, optional int bottomLeftPercent);
+ }
+
+ public final class AbsoluteRoundedCornerShape extends androidx.compose.foundation.shape.CornerBasedShape {
+ ctor public AbsoluteRoundedCornerShape(androidx.compose.foundation.shape.CornerSize topLeft, androidx.compose.foundation.shape.CornerSize topRight, androidx.compose.foundation.shape.CornerSize bottomRight, androidx.compose.foundation.shape.CornerSize bottomLeft);
+ method public androidx.compose.foundation.shape.AbsoluteRoundedCornerShape copy(androidx.compose.foundation.shape.CornerSize topStart, androidx.compose.foundation.shape.CornerSize topEnd, androidx.compose.foundation.shape.CornerSize bottomEnd, androidx.compose.foundation.shape.CornerSize bottomStart);
+ method public androidx.compose.ui.graphics.Outline createOutline(long size, float topStart, float topEnd, float bottomEnd, float bottomStart, androidx.compose.ui.unit.LayoutDirection layoutDirection);
+ }
+
+ public final class AbsoluteRoundedCornerShapeKt {
+ method public static androidx.compose.foundation.shape.AbsoluteRoundedCornerShape AbsoluteRoundedCornerShape(androidx.compose.foundation.shape.CornerSize corner);
+ method public static androidx.compose.foundation.shape.AbsoluteRoundedCornerShape AbsoluteRoundedCornerShape(float size);
+ method public static androidx.compose.foundation.shape.AbsoluteRoundedCornerShape AbsoluteRoundedCornerShape(float size);
+ method public static androidx.compose.foundation.shape.AbsoluteRoundedCornerShape AbsoluteRoundedCornerShape(int percent);
+ method public static androidx.compose.foundation.shape.AbsoluteRoundedCornerShape AbsoluteRoundedCornerShape(optional float topLeft, optional float topRight, optional float bottomRight, optional float bottomLeft);
+ method public static androidx.compose.foundation.shape.AbsoluteRoundedCornerShape AbsoluteRoundedCornerShape(optional float topLeft, optional float topRight, optional float bottomRight, optional float bottomLeft);
+ method public static androidx.compose.foundation.shape.AbsoluteRoundedCornerShape AbsoluteRoundedCornerShape(optional int topLeftPercent, optional int topRightPercent, optional int bottomRightPercent, optional int bottomLeftPercent);
+ }
+
+ public abstract class CornerBasedShape implements androidx.compose.ui.graphics.Shape {
+ ctor public CornerBasedShape(androidx.compose.foundation.shape.CornerSize topStart, androidx.compose.foundation.shape.CornerSize topEnd, androidx.compose.foundation.shape.CornerSize bottomEnd, androidx.compose.foundation.shape.CornerSize bottomStart);
+ method public abstract androidx.compose.foundation.shape.CornerBasedShape copy(optional androidx.compose.foundation.shape.CornerSize topStart, optional androidx.compose.foundation.shape.CornerSize topEnd, optional androidx.compose.foundation.shape.CornerSize bottomEnd, optional androidx.compose.foundation.shape.CornerSize bottomStart);
+ method public final androidx.compose.foundation.shape.CornerBasedShape copy(androidx.compose.foundation.shape.CornerSize all);
+ method public final androidx.compose.ui.graphics.Outline createOutline(long size, androidx.compose.ui.unit.LayoutDirection layoutDirection, androidx.compose.ui.unit.Density density);
+ method public abstract androidx.compose.ui.graphics.Outline createOutline(long size, float topStart, float topEnd, float bottomEnd, float bottomStart, androidx.compose.ui.unit.LayoutDirection layoutDirection);
+ method public final androidx.compose.foundation.shape.CornerSize getBottomEnd();
+ method public final androidx.compose.foundation.shape.CornerSize getBottomStart();
+ method public final androidx.compose.foundation.shape.CornerSize getTopEnd();
+ method public final androidx.compose.foundation.shape.CornerSize getTopStart();
+ property public final androidx.compose.foundation.shape.CornerSize bottomEnd;
+ property public final androidx.compose.foundation.shape.CornerSize bottomStart;
+ property public final androidx.compose.foundation.shape.CornerSize topEnd;
+ property public final androidx.compose.foundation.shape.CornerSize topStart;
+ }
+
+ @androidx.compose.runtime.Immutable public interface CornerSize {
+ method public float toPx(long shapeSize, androidx.compose.ui.unit.Density density);
+ }
+
+ public final class CornerSizeKt {
+ method @androidx.compose.runtime.Stable public static androidx.compose.foundation.shape.CornerSize CornerSize(float size);
+ method @androidx.compose.runtime.Stable public static androidx.compose.foundation.shape.CornerSize CornerSize(float size);
+ method @androidx.compose.runtime.Stable public static androidx.compose.foundation.shape.CornerSize CornerSize(int percent);
+ method public static androidx.compose.foundation.shape.CornerSize getZeroCornerSize();
+ property public static final androidx.compose.foundation.shape.CornerSize ZeroCornerSize;
+ }
+
+ public final class CutCornerShape extends androidx.compose.foundation.shape.CornerBasedShape {
+ ctor public CutCornerShape(androidx.compose.foundation.shape.CornerSize topStart, androidx.compose.foundation.shape.CornerSize topEnd, androidx.compose.foundation.shape.CornerSize bottomEnd, androidx.compose.foundation.shape.CornerSize bottomStart);
+ method public androidx.compose.foundation.shape.CutCornerShape copy(androidx.compose.foundation.shape.CornerSize topStart, androidx.compose.foundation.shape.CornerSize topEnd, androidx.compose.foundation.shape.CornerSize bottomEnd, androidx.compose.foundation.shape.CornerSize bottomStart);
+ method public androidx.compose.ui.graphics.Outline createOutline(long size, float topStart, float topEnd, float bottomEnd, float bottomStart, androidx.compose.ui.unit.LayoutDirection layoutDirection);
+ }
+
+ public final class CutCornerShapeKt {
+ method public static androidx.compose.foundation.shape.CutCornerShape CutCornerShape(androidx.compose.foundation.shape.CornerSize corner);
+ method public static androidx.compose.foundation.shape.CutCornerShape CutCornerShape(float size);
+ method public static androidx.compose.foundation.shape.CutCornerShape CutCornerShape(float size);
+ method public static androidx.compose.foundation.shape.CutCornerShape CutCornerShape(int percent);
+ method public static androidx.compose.foundation.shape.CutCornerShape CutCornerShape(optional float topStart, optional float topEnd, optional float bottomEnd, optional float bottomStart);
+ method public static androidx.compose.foundation.shape.CutCornerShape CutCornerShape(optional float topStart, optional float topEnd, optional float bottomEnd, optional float bottomStart);
+ method public static androidx.compose.foundation.shape.CutCornerShape CutCornerShape(optional int topStartPercent, optional int topEndPercent, optional int bottomEndPercent, optional int bottomStartPercent);
+ }
+
+ public final class GenericShape implements androidx.compose.ui.graphics.Shape {
+ ctor public GenericShape(kotlin.jvm.functions.Function3<? super androidx.compose.ui.graphics.Path,? super androidx.compose.ui.geometry.Size,? super androidx.compose.ui.unit.LayoutDirection,kotlin.Unit> builder);
+ method public androidx.compose.ui.graphics.Outline createOutline(long size, androidx.compose.ui.unit.LayoutDirection layoutDirection, androidx.compose.ui.unit.Density density);
+ }
+
+ public final class RoundedCornerShape extends androidx.compose.foundation.shape.CornerBasedShape {
+ ctor public RoundedCornerShape(androidx.compose.foundation.shape.CornerSize topStart, androidx.compose.foundation.shape.CornerSize topEnd, androidx.compose.foundation.shape.CornerSize bottomEnd, androidx.compose.foundation.shape.CornerSize bottomStart);
+ method public androidx.compose.foundation.shape.RoundedCornerShape copy(androidx.compose.foundation.shape.CornerSize topStart, androidx.compose.foundation.shape.CornerSize topEnd, androidx.compose.foundation.shape.CornerSize bottomEnd, androidx.compose.foundation.shape.CornerSize bottomStart);
+ method public androidx.compose.ui.graphics.Outline createOutline(long size, float topStart, float topEnd, float bottomEnd, float bottomStart, androidx.compose.ui.unit.LayoutDirection layoutDirection);
+ }
+
+ public final class RoundedCornerShapeKt {
+ method public static androidx.compose.foundation.shape.RoundedCornerShape RoundedCornerShape(androidx.compose.foundation.shape.CornerSize corner);
+ method public static androidx.compose.foundation.shape.RoundedCornerShape RoundedCornerShape(float size);
+ method public static androidx.compose.foundation.shape.RoundedCornerShape RoundedCornerShape(float size);
+ method public static androidx.compose.foundation.shape.RoundedCornerShape RoundedCornerShape(int percent);
+ method public static androidx.compose.foundation.shape.RoundedCornerShape RoundedCornerShape(optional float topStart, optional float topEnd, optional float bottomEnd, optional float bottomStart);
+ method public static androidx.compose.foundation.shape.RoundedCornerShape RoundedCornerShape(optional float topStart, optional float topEnd, optional float bottomEnd, optional float bottomStart);
+ method public static androidx.compose.foundation.shape.RoundedCornerShape RoundedCornerShape(optional int topStartPercent, optional int topEndPercent, optional int bottomEndPercent, optional int bottomStartPercent);
+ method public static androidx.compose.foundation.shape.RoundedCornerShape getCircleShape();
+ property public static final androidx.compose.foundation.shape.RoundedCornerShape CircleShape;
+ }
+
+}
+
+package androidx.compose.foundation.text {
+
+ public final class AndroidCursorHandle_androidKt {
+ }
+
+ public final class BasicTextFieldKt {
+ method @androidx.compose.runtime.Composable public static void BasicTextField(String value, kotlin.jvm.functions.Function1<? super java.lang.String,kotlin.Unit> onValueChange, optional androidx.compose.ui.Modifier modifier, optional boolean enabled, optional boolean readOnly, optional androidx.compose.ui.text.TextStyle textStyle, optional androidx.compose.foundation.text.KeyboardOptions keyboardOptions, optional androidx.compose.foundation.text.KeyboardActions keyboardActions, optional boolean singleLine, optional int maxLines, optional androidx.compose.ui.text.input.VisualTransformation visualTransformation, optional kotlin.jvm.functions.Function1<? super androidx.compose.ui.text.TextLayoutResult,kotlin.Unit> onTextLayout, optional androidx.compose.foundation.interaction.MutableInteractionSource interactionSource, optional androidx.compose.ui.graphics.Brush cursorBrush, optional kotlin.jvm.functions.Function1<? super kotlin.jvm.functions.Function0<kotlin.Unit>,kotlin.Unit> decorationBox);
+ method @androidx.compose.runtime.Composable public static void BasicTextField(androidx.compose.ui.text.input.TextFieldValue value, kotlin.jvm.functions.Function1<? super androidx.compose.ui.text.input.TextFieldValue,kotlin.Unit> onValueChange, optional androidx.compose.ui.Modifier modifier, optional boolean enabled, optional boolean readOnly, optional androidx.compose.ui.text.TextStyle textStyle, optional androidx.compose.foundation.text.KeyboardOptions keyboardOptions, optional androidx.compose.foundation.text.KeyboardActions keyboardActions, optional boolean singleLine, optional int maxLines, optional androidx.compose.ui.text.input.VisualTransformation visualTransformation, optional kotlin.jvm.functions.Function1<? super androidx.compose.ui.text.TextLayoutResult,kotlin.Unit> onTextLayout, optional androidx.compose.foundation.interaction.MutableInteractionSource interactionSource, optional androidx.compose.ui.graphics.Brush cursorBrush, optional kotlin.jvm.functions.Function1<? super kotlin.jvm.functions.Function0<kotlin.Unit>,kotlin.Unit> decorationBox);
+ }
+
+ public final class BasicTextKt {
+ method @androidx.compose.runtime.Composable public static void BasicText(String text, optional androidx.compose.ui.Modifier modifier, optional androidx.compose.ui.text.TextStyle style, optional kotlin.jvm.functions.Function1<? super androidx.compose.ui.text.TextLayoutResult,kotlin.Unit> onTextLayout, optional int overflow, optional boolean softWrap, optional int maxLines);
+ method @androidx.compose.runtime.Composable public static void BasicText(androidx.compose.ui.text.AnnotatedString text, optional androidx.compose.ui.Modifier modifier, optional androidx.compose.ui.text.TextStyle style, optional kotlin.jvm.functions.Function1<? super androidx.compose.ui.text.TextLayoutResult,kotlin.Unit> onTextLayout, optional int overflow, optional boolean softWrap, optional int maxLines, optional java.util.Map<java.lang.String,androidx.compose.foundation.text.InlineTextContent> inlineContent);
+ }
+
+ public final class ClickableTextKt {
+ method @androidx.compose.runtime.Composable public static void ClickableText(androidx.compose.ui.text.AnnotatedString text, optional androidx.compose.ui.Modifier modifier, optional androidx.compose.ui.text.TextStyle style, optional boolean softWrap, optional int overflow, optional int maxLines, optional kotlin.jvm.functions.Function1<? super androidx.compose.ui.text.TextLayoutResult,kotlin.Unit> onTextLayout, kotlin.jvm.functions.Function1<? super java.lang.Integer,kotlin.Unit> onClick);
+ }
+
+ public final class ContextMenu_androidKt {
+ }
+
+ public final class CoreTextFieldKt {
+ }
+
+ public final class CoreTextKt {
+ }
+
+ @androidx.compose.runtime.Immutable public final class InlineTextContent {
+ ctor public InlineTextContent(androidx.compose.ui.text.Placeholder placeholder, kotlin.jvm.functions.Function1<? super java.lang.String,kotlin.Unit> children);
+ method public kotlin.jvm.functions.Function1<java.lang.String,kotlin.Unit> getChildren();
+ method public androidx.compose.ui.text.Placeholder getPlaceholder();
+ property public final kotlin.jvm.functions.Function1<java.lang.String,kotlin.Unit> children;
+ property public final androidx.compose.ui.text.Placeholder placeholder;
+ }
+
+ public final class InlineTextContentKt {
+ method public static void appendInlineContent(androidx.compose.ui.text.AnnotatedString.Builder, String id, optional String alternateText);
+ }
+
+ @kotlin.RequiresOptIn(message="Internal/Unstable API for use only between foundation modules sharing " + "the same exact version, subject to change without notice.") @kotlin.annotation.Target(allowedTargets={kotlin.annotation.AnnotationTarget.CLASS, kotlin.annotation.AnnotationTarget.FUNCTION, kotlin.annotation.AnnotationTarget.PROPERTY, kotlin.annotation.AnnotationTarget.PROPERTY_GETTER, kotlin.annotation.AnnotationTarget.PROPERTY_SETTER}) public @interface InternalFoundationTextApi {
+ }
+
+ public final class KeyEventHelpers_androidKt {
+ }
+
+ public final class KeyMappingKt {
+ }
+
+ public final class KeyMapping_androidKt {
+ }
+
+ public interface KeyboardActionScope {
+ method public void defaultKeyboardAction(int imeAction);
+ }
+
+ public final class KeyboardActions {
+ ctor public KeyboardActions(optional kotlin.jvm.functions.Function1<? super androidx.compose.foundation.text.KeyboardActionScope,kotlin.Unit>? onDone, optional kotlin.jvm.functions.Function1<? super androidx.compose.foundation.text.KeyboardActionScope,kotlin.Unit>? onGo, optional kotlin.jvm.functions.Function1<? super androidx.compose.foundation.text.KeyboardActionScope,kotlin.Unit>? onNext, optional kotlin.jvm.functions.Function1<? super androidx.compose.foundation.text.KeyboardActionScope,kotlin.Unit>? onPrevious, optional kotlin.jvm.functions.Function1<? super androidx.compose.foundation.text.KeyboardActionScope,kotlin.Unit>? onSearch, optional kotlin.jvm.functions.Function1<? super androidx.compose.foundation.text.KeyboardActionScope,kotlin.Unit>? onSend);
+ method public kotlin.jvm.functions.Function1<androidx.compose.foundation.text.KeyboardActionScope,kotlin.Unit>? getOnDone();
+ method public kotlin.jvm.functions.Function1<androidx.compose.foundation.text.KeyboardActionScope,kotlin.Unit>? getOnGo();
+ method public kotlin.jvm.functions.Function1<androidx.compose.foundation.text.KeyboardActionScope,kotlin.Unit>? getOnNext();
+ method public kotlin.jvm.functions.Function1<androidx.compose.foundation.text.KeyboardActionScope,kotlin.Unit>? getOnPrevious();
+ method public kotlin.jvm.functions.Function1<androidx.compose.foundation.text.KeyboardActionScope,kotlin.Unit>? getOnSearch();
+ method public kotlin.jvm.functions.Function1<androidx.compose.foundation.text.KeyboardActionScope,kotlin.Unit>? getOnSend();
+ property public final kotlin.jvm.functions.Function1<androidx.compose.foundation.text.KeyboardActionScope,kotlin.Unit>? onDone;
+ property public final kotlin.jvm.functions.Function1<androidx.compose.foundation.text.KeyboardActionScope,kotlin.Unit>? onGo;
+ property public final kotlin.jvm.functions.Function1<androidx.compose.foundation.text.KeyboardActionScope,kotlin.Unit>? onNext;
+ property public final kotlin.jvm.functions.Function1<androidx.compose.foundation.text.KeyboardActionScope,kotlin.Unit>? onPrevious;
+ property public final kotlin.jvm.functions.Function1<androidx.compose.foundation.text.KeyboardActionScope,kotlin.Unit>? onSearch;
+ property public final kotlin.jvm.functions.Function1<androidx.compose.foundation.text.KeyboardActionScope,kotlin.Unit>? onSend;
+ field public static final androidx.compose.foundation.text.KeyboardActions.Companion Companion;
+ }
+
+ public static final class KeyboardActions.Companion {
+ method public androidx.compose.foundation.text.KeyboardActions getDefault();
+ property public final androidx.compose.foundation.text.KeyboardActions Default;
+ }
+
+ public final class KeyboardActionsKt {
+ method public static androidx.compose.foundation.text.KeyboardActions KeyboardActions(kotlin.jvm.functions.Function1<? super androidx.compose.foundation.text.KeyboardActionScope,kotlin.Unit> onAny);
+ }
+
+ @androidx.compose.runtime.Immutable public final class KeyboardOptions {
+ ctor public KeyboardOptions(optional int capitalization, optional boolean autoCorrect, optional int keyboardType, optional int imeAction);
+ method public androidx.compose.foundation.text.KeyboardOptions copy(optional int capitalization, optional boolean autoCorrect, optional int keyboardType, optional int imeAction);
+ method public boolean getAutoCorrect();
+ method public int getCapitalization();
+ method public int getImeAction();
+ method public int getKeyboardType();
+ property public final boolean autoCorrect;
+ property public final int capitalization;
+ property public final int imeAction;
+ property public final int keyboardType;
+ field public static final androidx.compose.foundation.text.KeyboardOptions.Companion Companion;
+ }
+
+ public static final class KeyboardOptions.Companion {
+ method public androidx.compose.foundation.text.KeyboardOptions getDefault();
+ property public final androidx.compose.foundation.text.KeyboardOptions Default;
+ }
+
+ public final class LongPressTextDragObserverKt {
+ }
+
+ public final class MaxLinesHeightModifierKt {
+ }
+
+ public final class StringHelpersKt {
+ }
+
+ public final class StringHelpers_androidKt {
+ }
+
+ public final class StringHelpers_jvmKt {
+ }
+
+ public final class TextFieldCursorKt {
+ }
+
+ public final class TextFieldDelegateKt {
+ }
+
+ public final class TextFieldGestureModifiersKt {
+ }
+
+ public final class TextFieldKeyInputKt {
+ }
+
+ public final class TextFieldKeyInput_androidKt {
+ }
+
+ public final class TextFieldPressGestureFilterKt {
+ }
+
+ public final class TextFieldScrollKt {
+ }
+
+ public final class TextFieldSizeKt {
+ }
+
+ public final class TextLayoutHelperKt {
+ }
+
+ public final class TextLayoutResultProxyKt {
+ }
+
+ public final class TextPointerIcon_androidKt {
+ }
+
+ public final class TouchMode_androidKt {
+ }
+
+ public final class UndoManagerKt {
+ }
+
+ public final class UndoManager_jvmKt {
+ }
+
+}
+
+package androidx.compose.foundation.text.selection {
+
+ public final class AndroidSelectionHandles_androidKt {
+ }
+
+ public final class MultiWidgetSelectionDelegateKt {
+ }
+
+ public final class SelectionAdjustmentKt {
+ }
+
+ public final class SelectionContainerKt {
+ method @androidx.compose.runtime.Composable public static void DisableSelection(kotlin.jvm.functions.Function0<kotlin.Unit> content);
+ method @androidx.compose.runtime.Composable public static void SelectionContainer(optional androidx.compose.ui.Modifier modifier, kotlin.jvm.functions.Function0<kotlin.Unit> content);
+ }
+
+ public final class SelectionHandlesKt {
+ }
+
+ public final class SelectionMagnifierKt {
+ }
+
+ public final class SelectionManagerKt {
+ }
+
+ public final class SelectionManager_androidKt {
+ }
+
+ public final class SelectionRegistrarKt {
+ }
+
+ public final class SimpleLayoutKt {
+ }
+
+ public final class TextFieldSelectionDelegateKt {
+ }
+
+ public final class TextFieldSelectionManagerKt {
+ }
+
+ public final class TextFieldSelectionManager_androidKt {
+ }
+
+ @androidx.compose.runtime.Immutable public final class TextSelectionColors {
+ ctor public TextSelectionColors(long handleColor, long backgroundColor);
+ method public long getBackgroundColor();
+ method public long getHandleColor();
+ property public final long backgroundColor;
+ property public final long handleColor;
+ }
+
+ public final class TextSelectionColorsKt {
+ method public static androidx.compose.runtime.ProvidableCompositionLocal<androidx.compose.foundation.text.selection.TextSelectionColors> getLocalTextSelectionColors();
+ property public static final androidx.compose.runtime.ProvidableCompositionLocal<androidx.compose.foundation.text.selection.TextSelectionColors> LocalTextSelectionColors;
+ }
+
+ public final class TextSelectionDelegateKt {
+ }
+
+ public final class TextSelectionMouseDetectorKt {
+ }
+
+}
+
diff --git a/compose/foundation/foundation/api/res-1.2.0-beta02.txt b/compose/foundation/foundation/api/res-1.2.0-beta02.txt
new file mode 100644
index 0000000..e69de29
--- /dev/null
+++ b/compose/foundation/foundation/api/res-1.2.0-beta02.txt
diff --git a/compose/foundation/foundation/api/restricted_1.2.0-beta02.txt b/compose/foundation/foundation/api/restricted_1.2.0-beta02.txt
new file mode 100644
index 0000000..3ebb0a3
--- /dev/null
+++ b/compose/foundation/foundation/api/restricted_1.2.0-beta02.txt
@@ -0,0 +1,1033 @@
+// Signature format: 4.0
+package androidx.compose.foundation {
+
+ public final class ActualJvmKt {
+ }
+
+ public final class BackgroundKt {
+ method public static androidx.compose.ui.Modifier background(androidx.compose.ui.Modifier, long color, optional androidx.compose.ui.graphics.Shape shape);
+ method public static androidx.compose.ui.Modifier background(androidx.compose.ui.Modifier, androidx.compose.ui.graphics.Brush brush, optional androidx.compose.ui.graphics.Shape shape, optional float alpha);
+ }
+
+ public final class BorderKt {
+ method public static androidx.compose.ui.Modifier border(androidx.compose.ui.Modifier, androidx.compose.foundation.BorderStroke border, optional androidx.compose.ui.graphics.Shape shape);
+ method public static androidx.compose.ui.Modifier border(androidx.compose.ui.Modifier, float width, long color, optional androidx.compose.ui.graphics.Shape shape);
+ method public static androidx.compose.ui.Modifier border(androidx.compose.ui.Modifier, float width, androidx.compose.ui.graphics.Brush brush, androidx.compose.ui.graphics.Shape shape);
+ }
+
+ @androidx.compose.runtime.Immutable public final class BorderStroke {
+ ctor public BorderStroke(float width, androidx.compose.ui.graphics.Brush brush);
+ method public androidx.compose.foundation.BorderStroke copy(optional float width, optional androidx.compose.ui.graphics.Brush brush);
+ method public androidx.compose.ui.graphics.Brush getBrush();
+ method public float getWidth();
+ property public final androidx.compose.ui.graphics.Brush brush;
+ property public final float width;
+ }
+
+ public final class BorderStrokeKt {
+ method @androidx.compose.runtime.Stable public static androidx.compose.foundation.BorderStroke BorderStroke(float width, long color);
+ }
+
+ public final class CanvasKt {
+ method @androidx.compose.runtime.Composable public static void Canvas(androidx.compose.ui.Modifier modifier, kotlin.jvm.functions.Function1<? super androidx.compose.ui.graphics.drawscope.DrawScope,kotlin.Unit> onDraw);
+ }
+
+ public final class ClickableKt {
+ method public static androidx.compose.ui.Modifier clickable(androidx.compose.ui.Modifier, optional boolean enabled, optional String? onClickLabel, optional androidx.compose.ui.semantics.Role? role, kotlin.jvm.functions.Function0<kotlin.Unit> onClick);
+ method public static androidx.compose.ui.Modifier clickable(androidx.compose.ui.Modifier, androidx.compose.foundation.interaction.MutableInteractionSource interactionSource, androidx.compose.foundation.Indication? indication, optional boolean enabled, optional String? onClickLabel, optional androidx.compose.ui.semantics.Role? role, kotlin.jvm.functions.Function0<kotlin.Unit> onClick);
+ }
+
+ public final class Clickable_androidKt {
+ }
+
+ public final class DarkThemeKt {
+ method @androidx.compose.runtime.Composable @androidx.compose.runtime.ReadOnlyComposable public static boolean isSystemInDarkTheme();
+ }
+
+ public final class DarkTheme_androidKt {
+ }
+
+ public final class ExcludeFromSystemGesture_androidKt {
+ method @Deprecated public static androidx.compose.ui.Modifier excludeFromSystemGesture(androidx.compose.ui.Modifier);
+ method @Deprecated public static androidx.compose.ui.Modifier excludeFromSystemGesture(androidx.compose.ui.Modifier, kotlin.jvm.functions.Function1<? super androidx.compose.ui.layout.LayoutCoordinates,androidx.compose.ui.geometry.Rect> exclusion);
+ }
+
+ public final class FocusableKt {
+ method public static androidx.compose.ui.Modifier focusable(androidx.compose.ui.Modifier, optional boolean enabled, optional androidx.compose.foundation.interaction.MutableInteractionSource? interactionSource);
+ }
+
+ public final class FocusedBoundsKt {
+ }
+
+ public final class HoverableKt {
+ method public static androidx.compose.ui.Modifier hoverable(androidx.compose.ui.Modifier, androidx.compose.foundation.interaction.MutableInteractionSource interactionSource, optional boolean enabled);
+ }
+
+ public final class ImageKt {
+ method @androidx.compose.runtime.Composable @androidx.compose.runtime.NonRestartableComposable public static void Image(androidx.compose.ui.graphics.ImageBitmap bitmap, String? contentDescription, optional androidx.compose.ui.Modifier modifier, optional androidx.compose.ui.Alignment alignment, optional androidx.compose.ui.layout.ContentScale contentScale, optional float alpha, optional androidx.compose.ui.graphics.ColorFilter? colorFilter, optional int filterQuality);
+ method @androidx.compose.runtime.Composable @androidx.compose.runtime.NonRestartableComposable public static void Image(androidx.compose.ui.graphics.vector.ImageVector imageVector, String? contentDescription, optional androidx.compose.ui.Modifier modifier, optional androidx.compose.ui.Alignment alignment, optional androidx.compose.ui.layout.ContentScale contentScale, optional float alpha, optional androidx.compose.ui.graphics.ColorFilter? colorFilter);
+ method @androidx.compose.runtime.Composable public static void Image(androidx.compose.ui.graphics.painter.Painter painter, String? contentDescription, optional androidx.compose.ui.Modifier modifier, optional androidx.compose.ui.Alignment alignment, optional androidx.compose.ui.layout.ContentScale contentScale, optional float alpha, optional androidx.compose.ui.graphics.ColorFilter? colorFilter);
+ method @Deprecated @androidx.compose.runtime.Composable @androidx.compose.runtime.NonRestartableComposable public static void Image(androidx.compose.ui.graphics.ImageBitmap bitmap, String contentDescription, optional androidx.compose.ui.Modifier modifier, optional androidx.compose.ui.Alignment alignment, optional androidx.compose.ui.layout.ContentScale contentScale, optional float alpha, optional androidx.compose.ui.graphics.ColorFilter? colorFilter);
+ }
+
+ @androidx.compose.runtime.Stable public interface Indication {
+ method @androidx.compose.runtime.Composable public androidx.compose.foundation.IndicationInstance rememberUpdatedInstance(androidx.compose.foundation.interaction.InteractionSource interactionSource);
+ }
+
+ public interface IndicationInstance {
+ method public void drawIndication(androidx.compose.ui.graphics.drawscope.ContentDrawScope);
+ }
+
+ public final class IndicationKt {
+ method public static androidx.compose.runtime.ProvidableCompositionLocal<androidx.compose.foundation.Indication> getLocalIndication();
+ method public static androidx.compose.ui.Modifier indication(androidx.compose.ui.Modifier, androidx.compose.foundation.interaction.InteractionSource interactionSource, androidx.compose.foundation.Indication? indication);
+ property public static final androidx.compose.runtime.ProvidableCompositionLocal<androidx.compose.foundation.Indication> LocalIndication;
+ }
+
+ public final class MagnifierKt {
+ }
+
+ public enum MutatePriority {
+ enum_constant public static final androidx.compose.foundation.MutatePriority Default;
+ enum_constant public static final androidx.compose.foundation.MutatePriority PreventUserInput;
+ enum_constant public static final androidx.compose.foundation.MutatePriority UserInput;
+ }
+
+ @androidx.compose.runtime.Stable public final class MutatorMutex {
+ ctor public MutatorMutex();
+ method public suspend <R> Object? mutate(optional androidx.compose.foundation.MutatePriority priority, kotlin.jvm.functions.Function1<? super kotlin.coroutines.Continuation<? super R>,?> block, kotlin.coroutines.Continuation<? super R>);
+ method public suspend <T, R> Object? mutateWith(T? receiver, optional androidx.compose.foundation.MutatePriority priority, kotlin.jvm.functions.Function2<? super T,? super kotlin.coroutines.Continuation<? super R>,?> block, kotlin.coroutines.Continuation<? super R>);
+ }
+
+ public final class ProgressSemanticsKt {
+ method @androidx.compose.runtime.Stable public static androidx.compose.ui.Modifier progressSemantics(androidx.compose.ui.Modifier, float value, optional kotlin.ranges.ClosedFloatingPointRange<java.lang.Float> valueRange, optional int steps);
+ method @androidx.compose.runtime.Stable public static androidx.compose.ui.Modifier progressSemantics(androidx.compose.ui.Modifier);
+ }
+
+ public final class ScrollKt {
+ method public static androidx.compose.ui.Modifier horizontalScroll(androidx.compose.ui.Modifier, androidx.compose.foundation.ScrollState state, optional boolean enabled, optional androidx.compose.foundation.gestures.FlingBehavior? flingBehavior, optional boolean reverseScrolling);
+ method @androidx.compose.runtime.Composable public static androidx.compose.foundation.ScrollState rememberScrollState(optional int initial);
+ method public static androidx.compose.ui.Modifier verticalScroll(androidx.compose.ui.Modifier, androidx.compose.foundation.ScrollState state, optional boolean enabled, optional androidx.compose.foundation.gestures.FlingBehavior? flingBehavior, optional boolean reverseScrolling);
+ }
+
+ @androidx.compose.runtime.Stable public final class ScrollState implements androidx.compose.foundation.gestures.ScrollableState {
+ ctor public ScrollState(int initial);
+ method public suspend Object? animateScrollTo(int value, optional androidx.compose.animation.core.AnimationSpec<java.lang.Float> animationSpec, optional kotlin.coroutines.Continuation<? super kotlin.Unit>);
+ method public float dispatchRawDelta(float delta);
+ method public androidx.compose.foundation.interaction.InteractionSource getInteractionSource();
+ method public int getMaxValue();
+ method public int getValue();
+ method public boolean isScrollInProgress();
+ method public suspend Object? scroll(androidx.compose.foundation.MutatePriority scrollPriority, kotlin.jvm.functions.Function2<? super androidx.compose.foundation.gestures.ScrollScope,? super kotlin.coroutines.Continuation<? super kotlin.Unit>,?> block, kotlin.coroutines.Continuation<? super kotlin.Unit>);
+ method public suspend Object? scrollTo(int value, kotlin.coroutines.Continuation<? super java.lang.Float>);
+ property public final androidx.compose.foundation.interaction.InteractionSource interactionSource;
+ property public boolean isScrollInProgress;
+ property public final int maxValue;
+ property public final int value;
+ field public static final androidx.compose.foundation.ScrollState.Companion Companion;
+ }
+
+ public static final class ScrollState.Companion {
+ method public androidx.compose.runtime.saveable.Saver<androidx.compose.foundation.ScrollState,?> getSaver();
+ property public final androidx.compose.runtime.saveable.Saver<androidx.compose.foundation.ScrollState,?> Saver;
+ }
+
+ public final class SystemGestureExclusionKt {
+ method public static androidx.compose.ui.Modifier systemGestureExclusion(androidx.compose.ui.Modifier);
+ method public static androidx.compose.ui.Modifier systemGestureExclusion(androidx.compose.ui.Modifier, kotlin.jvm.functions.Function1<? super androidx.compose.ui.layout.LayoutCoordinates,androidx.compose.ui.geometry.Rect> exclusion);
+ }
+
+ public final class TempListUtilsKt {
+ }
+
+}
+
+package androidx.compose.foundation.gestures {
+
+ public final class AndroidOverScrollKt {
+ }
+
+ public final class AndroidScrollable_androidKt {
+ }
+
+ public final class DragGestureDetectorKt {
+ method public static suspend Object? awaitDragOrCancellation(androidx.compose.ui.input.pointer.AwaitPointerEventScope, long pointerId, kotlin.coroutines.Continuation<? super androidx.compose.ui.input.pointer.PointerInputChange>);
+ method public static suspend Object? awaitHorizontalDragOrCancellation(androidx.compose.ui.input.pointer.AwaitPointerEventScope, long pointerId, kotlin.coroutines.Continuation<? super androidx.compose.ui.input.pointer.PointerInputChange>);
+ method public static suspend Object? awaitHorizontalTouchSlopOrCancellation(androidx.compose.ui.input.pointer.AwaitPointerEventScope, long pointerId, kotlin.jvm.functions.Function2<? super androidx.compose.ui.input.pointer.PointerInputChange,? super java.lang.Float,kotlin.Unit> onTouchSlopReached, kotlin.coroutines.Continuation<? super androidx.compose.ui.input.pointer.PointerInputChange>);
+ method public static suspend Object? awaitTouchSlopOrCancellation(androidx.compose.ui.input.pointer.AwaitPointerEventScope, long pointerId, kotlin.jvm.functions.Function2<? super androidx.compose.ui.input.pointer.PointerInputChange,? super androidx.compose.ui.geometry.Offset,kotlin.Unit> onTouchSlopReached, kotlin.coroutines.Continuation<? super androidx.compose.ui.input.pointer.PointerInputChange>);
+ method public static suspend Object? awaitVerticalDragOrCancellation(androidx.compose.ui.input.pointer.AwaitPointerEventScope, long pointerId, kotlin.coroutines.Continuation<? super androidx.compose.ui.input.pointer.PointerInputChange>);
+ method public static suspend Object? awaitVerticalTouchSlopOrCancellation(androidx.compose.ui.input.pointer.AwaitPointerEventScope, long pointerId, kotlin.jvm.functions.Function2<? super androidx.compose.ui.input.pointer.PointerInputChange,? super java.lang.Float,kotlin.Unit> onTouchSlopReached, kotlin.coroutines.Continuation<? super androidx.compose.ui.input.pointer.PointerInputChange>);
+ method public static suspend Object? detectDragGestures(androidx.compose.ui.input.pointer.PointerInputScope, optional kotlin.jvm.functions.Function1<? super androidx.compose.ui.geometry.Offset,kotlin.Unit> onDragStart, optional kotlin.jvm.functions.Function0<kotlin.Unit> onDragEnd, optional kotlin.jvm.functions.Function0<kotlin.Unit> onDragCancel, kotlin.jvm.functions.Function2<? super androidx.compose.ui.input.pointer.PointerInputChange,? super androidx.compose.ui.geometry.Offset,kotlin.Unit> onDrag, kotlin.coroutines.Continuation<? super kotlin.Unit>);
+ method public static suspend Object? detectDragGesturesAfterLongPress(androidx.compose.ui.input.pointer.PointerInputScope, optional kotlin.jvm.functions.Function1<? super androidx.compose.ui.geometry.Offset,kotlin.Unit> onDragStart, optional kotlin.jvm.functions.Function0<kotlin.Unit> onDragEnd, optional kotlin.jvm.functions.Function0<kotlin.Unit> onDragCancel, kotlin.jvm.functions.Function2<? super androidx.compose.ui.input.pointer.PointerInputChange,? super androidx.compose.ui.geometry.Offset,kotlin.Unit> onDrag, kotlin.coroutines.Continuation<? super kotlin.Unit>);
+ method public static suspend Object? detectHorizontalDragGestures(androidx.compose.ui.input.pointer.PointerInputScope, optional kotlin.jvm.functions.Function1<? super androidx.compose.ui.geometry.Offset,kotlin.Unit> onDragStart, optional kotlin.jvm.functions.Function0<kotlin.Unit> onDragEnd, optional kotlin.jvm.functions.Function0<kotlin.Unit> onDragCancel, kotlin.jvm.functions.Function2<? super androidx.compose.ui.input.pointer.PointerInputChange,? super java.lang.Float,kotlin.Unit> onHorizontalDrag, kotlin.coroutines.Continuation<? super kotlin.Unit>);
+ method public static suspend Object? detectVerticalDragGestures(androidx.compose.ui.input.pointer.PointerInputScope, optional kotlin.jvm.functions.Function1<? super androidx.compose.ui.geometry.Offset,kotlin.Unit> onDragStart, optional kotlin.jvm.functions.Function0<kotlin.Unit> onDragEnd, optional kotlin.jvm.functions.Function0<kotlin.Unit> onDragCancel, kotlin.jvm.functions.Function2<? super androidx.compose.ui.input.pointer.PointerInputChange,? super java.lang.Float,kotlin.Unit> onVerticalDrag, kotlin.coroutines.Continuation<? super kotlin.Unit>);
+ method public static suspend Object? drag(androidx.compose.ui.input.pointer.AwaitPointerEventScope, long pointerId, kotlin.jvm.functions.Function1<? super androidx.compose.ui.input.pointer.PointerInputChange,kotlin.Unit> onDrag, kotlin.coroutines.Continuation<? super java.lang.Boolean>);
+ method public static suspend Object? horizontalDrag(androidx.compose.ui.input.pointer.AwaitPointerEventScope, long pointerId, kotlin.jvm.functions.Function1<? super androidx.compose.ui.input.pointer.PointerInputChange,kotlin.Unit> onDrag, kotlin.coroutines.Continuation<? super java.lang.Boolean>);
+ method public static suspend Object? verticalDrag(androidx.compose.ui.input.pointer.AwaitPointerEventScope, long pointerId, kotlin.jvm.functions.Function1<? super androidx.compose.ui.input.pointer.PointerInputChange,kotlin.Unit> onDrag, kotlin.coroutines.Continuation<? super java.lang.Boolean>);
+ }
+
+ public interface DragScope {
+ method public void dragBy(float pixels);
+ }
+
+ public final class DraggableKt {
+ method public static androidx.compose.foundation.gestures.DraggableState DraggableState(kotlin.jvm.functions.Function1<? super java.lang.Float,kotlin.Unit> onDelta);
+ method public static androidx.compose.ui.Modifier draggable(androidx.compose.ui.Modifier, androidx.compose.foundation.gestures.DraggableState state, androidx.compose.foundation.gestures.Orientation orientation, optional boolean enabled, optional androidx.compose.foundation.interaction.MutableInteractionSource? interactionSource, optional boolean startDragImmediately, optional kotlin.jvm.functions.Function3<? super kotlinx.coroutines.CoroutineScope,? super androidx.compose.ui.geometry.Offset,? super kotlin.coroutines.Continuation<? super kotlin.Unit>,?> onDragStarted, optional kotlin.jvm.functions.Function3<? super kotlinx.coroutines.CoroutineScope,? super java.lang.Float,? super kotlin.coroutines.Continuation<? super kotlin.Unit>,?> onDragStopped, optional boolean reverseDirection);
+ method @androidx.compose.runtime.Composable public static androidx.compose.foundation.gestures.DraggableState rememberDraggableState(kotlin.jvm.functions.Function1<? super java.lang.Float,kotlin.Unit> onDelta);
+ }
+
+ public interface DraggableState {
+ method public void dispatchRawDelta(float delta);
+ method public suspend Object? drag(optional androidx.compose.foundation.MutatePriority dragPriority, kotlin.jvm.functions.Function2<? super androidx.compose.foundation.gestures.DragScope,? super kotlin.coroutines.Continuation<? super kotlin.Unit>,?> block, kotlin.coroutines.Continuation<? super kotlin.Unit>);
+ }
+
+ @androidx.compose.runtime.Stable public interface FlingBehavior {
+ method public suspend Object? performFling(androidx.compose.foundation.gestures.ScrollScope, float initialVelocity, kotlin.coroutines.Continuation<? super java.lang.Float>);
+ }
+
+ public final class ForEachGestureKt {
+ method public static suspend Object? forEachGesture(androidx.compose.ui.input.pointer.PointerInputScope, kotlin.jvm.functions.Function2<? super androidx.compose.ui.input.pointer.PointerInputScope,? super kotlin.coroutines.Continuation<? super kotlin.Unit>,?> block, kotlin.coroutines.Continuation<? super kotlin.Unit>);
+ }
+
+ public final class GestureCancellationException extends java.util.concurrent.CancellationException {
+ ctor public GestureCancellationException(optional String? message);
+ }
+
+ public enum Orientation {
+ enum_constant public static final androidx.compose.foundation.gestures.Orientation Horizontal;
+ enum_constant public static final androidx.compose.foundation.gestures.Orientation Vertical;
+ }
+
+ public final class OverScrollConfigurationKt {
+ }
+
+ public interface PressGestureScope extends androidx.compose.ui.unit.Density {
+ method public suspend Object? awaitRelease(kotlin.coroutines.Continuation<? super kotlin.Unit>);
+ method public suspend Object? tryAwaitRelease(kotlin.coroutines.Continuation<? super java.lang.Boolean>);
+ }
+
+ public final class ScrollExtensionsKt {
+ method public static suspend Object? animateScrollBy(androidx.compose.foundation.gestures.ScrollableState, float value, optional androidx.compose.animation.core.AnimationSpec<java.lang.Float> animationSpec, optional kotlin.coroutines.Continuation<? super java.lang.Float>);
+ method public static suspend Object? scrollBy(androidx.compose.foundation.gestures.ScrollableState, float value, kotlin.coroutines.Continuation<? super java.lang.Float>);
+ method public static suspend Object? stopScroll(androidx.compose.foundation.gestures.ScrollableState, optional androidx.compose.foundation.MutatePriority scrollPriority, optional kotlin.coroutines.Continuation<? super kotlin.Unit>);
+ }
+
+ public interface ScrollScope {
+ method public float scrollBy(float pixels);
+ }
+
+ public final class ScrollableDefaults {
+ method @androidx.compose.runtime.Composable public androidx.compose.foundation.gestures.FlingBehavior flingBehavior();
+ field public static final androidx.compose.foundation.gestures.ScrollableDefaults INSTANCE;
+ }
+
+ public final class ScrollableKt {
+ method public static androidx.compose.ui.Modifier scrollable(androidx.compose.ui.Modifier, androidx.compose.foundation.gestures.ScrollableState state, androidx.compose.foundation.gestures.Orientation orientation, optional boolean enabled, optional boolean reverseDirection, optional androidx.compose.foundation.gestures.FlingBehavior? flingBehavior, optional androidx.compose.foundation.interaction.MutableInteractionSource? interactionSource);
+ }
+
+ public interface ScrollableState {
+ method public float dispatchRawDelta(float delta);
+ method public boolean isScrollInProgress();
+ method public suspend Object? scroll(optional androidx.compose.foundation.MutatePriority scrollPriority, kotlin.jvm.functions.Function2<? super androidx.compose.foundation.gestures.ScrollScope,? super kotlin.coroutines.Continuation<? super kotlin.Unit>,?> block, kotlin.coroutines.Continuation<? super kotlin.Unit>);
+ property public abstract boolean isScrollInProgress;
+ }
+
+ public final class ScrollableStateKt {
+ method public static androidx.compose.foundation.gestures.ScrollableState ScrollableState(kotlin.jvm.functions.Function1<? super java.lang.Float,java.lang.Float> consumeScrollDelta);
+ method @androidx.compose.runtime.Composable public static androidx.compose.foundation.gestures.ScrollableState rememberScrollableState(kotlin.jvm.functions.Function1<? super java.lang.Float,java.lang.Float> consumeScrollDelta);
+ }
+
+ public final class TapGestureDetectorKt {
+ method public static suspend Object? awaitFirstDown(androidx.compose.ui.input.pointer.AwaitPointerEventScope, optional boolean requireUnconsumed, optional kotlin.coroutines.Continuation<? super androidx.compose.ui.input.pointer.PointerInputChange>);
+ method public static suspend Object? detectTapGestures(androidx.compose.ui.input.pointer.PointerInputScope, optional kotlin.jvm.functions.Function1<? super androidx.compose.ui.geometry.Offset,kotlin.Unit>? onDoubleTap, optional kotlin.jvm.functions.Function1<? super androidx.compose.ui.geometry.Offset,kotlin.Unit>? onLongPress, optional kotlin.jvm.functions.Function3<? super androidx.compose.foundation.gestures.PressGestureScope,? super androidx.compose.ui.geometry.Offset,? super kotlin.coroutines.Continuation<? super kotlin.Unit>,?> onPress, optional kotlin.jvm.functions.Function1<? super androidx.compose.ui.geometry.Offset,kotlin.Unit>? onTap, optional kotlin.coroutines.Continuation<? super kotlin.Unit>);
+ method public static suspend Object? waitForUpOrCancellation(androidx.compose.ui.input.pointer.AwaitPointerEventScope, kotlin.coroutines.Continuation<? super androidx.compose.ui.input.pointer.PointerInputChange>);
+ }
+
+ public final class TransformGestureDetectorKt {
+ method public static long calculateCentroid(androidx.compose.ui.input.pointer.PointerEvent, optional boolean useCurrent);
+ method public static float calculateCentroidSize(androidx.compose.ui.input.pointer.PointerEvent, optional boolean useCurrent);
+ method public static long calculatePan(androidx.compose.ui.input.pointer.PointerEvent);
+ method public static float calculateRotation(androidx.compose.ui.input.pointer.PointerEvent);
+ method public static float calculateZoom(androidx.compose.ui.input.pointer.PointerEvent);
+ method public static suspend Object? detectTransformGestures(androidx.compose.ui.input.pointer.PointerInputScope, optional boolean panZoomLock, kotlin.jvm.functions.Function4<? super androidx.compose.ui.geometry.Offset,? super androidx.compose.ui.geometry.Offset,? super java.lang.Float,? super java.lang.Float,kotlin.Unit> onGesture, kotlin.coroutines.Continuation<? super kotlin.Unit>);
+ }
+
+ public interface TransformScope {
+ method public void transformBy(optional float zoomChange, optional long panChange, optional float rotationChange);
+ }
+
+ public final class TransformableKt {
+ method public static androidx.compose.ui.Modifier transformable(androidx.compose.ui.Modifier, androidx.compose.foundation.gestures.TransformableState state, optional boolean lockRotationOnZoomPan, optional boolean enabled);
+ }
+
+ public interface TransformableState {
+ method public boolean isTransformInProgress();
+ method public suspend Object? transform(optional androidx.compose.foundation.MutatePriority transformPriority, kotlin.jvm.functions.Function2<? super androidx.compose.foundation.gestures.TransformScope,? super kotlin.coroutines.Continuation<? super kotlin.Unit>,?> block, kotlin.coroutines.Continuation<? super kotlin.Unit>);
+ property public abstract boolean isTransformInProgress;
+ }
+
+ public final class TransformableStateKt {
+ method public static androidx.compose.foundation.gestures.TransformableState TransformableState(kotlin.jvm.functions.Function3<? super java.lang.Float,? super androidx.compose.ui.geometry.Offset,? super java.lang.Float,kotlin.Unit> onTransformation);
+ method public static suspend Object? animatePanBy(androidx.compose.foundation.gestures.TransformableState, long offset, optional androidx.compose.animation.core.AnimationSpec<androidx.compose.ui.geometry.Offset> animationSpec, optional kotlin.coroutines.Continuation<? super kotlin.Unit>);
+ method public static suspend Object? animateRotateBy(androidx.compose.foundation.gestures.TransformableState, float degrees, optional androidx.compose.animation.core.AnimationSpec<java.lang.Float> animationSpec, optional kotlin.coroutines.Continuation<? super kotlin.Unit>);
+ method public static suspend Object? animateZoomBy(androidx.compose.foundation.gestures.TransformableState, float zoomFactor, optional androidx.compose.animation.core.AnimationSpec<java.lang.Float> animationSpec, optional kotlin.coroutines.Continuation<? super kotlin.Unit>);
+ method public static suspend Object? panBy(androidx.compose.foundation.gestures.TransformableState, long offset, kotlin.coroutines.Continuation<? super kotlin.Unit>);
+ method @androidx.compose.runtime.Composable public static androidx.compose.foundation.gestures.TransformableState rememberTransformableState(kotlin.jvm.functions.Function3<? super java.lang.Float,? super androidx.compose.ui.geometry.Offset,? super java.lang.Float,kotlin.Unit> onTransformation);
+ method public static suspend Object? rotateBy(androidx.compose.foundation.gestures.TransformableState, float degrees, kotlin.coroutines.Continuation<? super kotlin.Unit>);
+ method public static suspend Object? stopTransformation(androidx.compose.foundation.gestures.TransformableState, optional androidx.compose.foundation.MutatePriority terminationPriority, optional kotlin.coroutines.Continuation<? super kotlin.Unit>);
+ method public static suspend Object? zoomBy(androidx.compose.foundation.gestures.TransformableState, float zoomFactor, kotlin.coroutines.Continuation<? super kotlin.Unit>);
+ }
+
+}
+
+package androidx.compose.foundation.interaction {
+
+ public interface DragInteraction extends androidx.compose.foundation.interaction.Interaction {
+ }
+
+ public static final class DragInteraction.Cancel implements androidx.compose.foundation.interaction.DragInteraction {
+ ctor public DragInteraction.Cancel(androidx.compose.foundation.interaction.DragInteraction.Start start);
+ method public androidx.compose.foundation.interaction.DragInteraction.Start getStart();
+ property public final androidx.compose.foundation.interaction.DragInteraction.Start start;
+ }
+
+ public static final class DragInteraction.Start implements androidx.compose.foundation.interaction.DragInteraction {
+ ctor public DragInteraction.Start();
+ }
+
+ public static final class DragInteraction.Stop implements androidx.compose.foundation.interaction.DragInteraction {
+ ctor public DragInteraction.Stop(androidx.compose.foundation.interaction.DragInteraction.Start start);
+ method public androidx.compose.foundation.interaction.DragInteraction.Start getStart();
+ property public final androidx.compose.foundation.interaction.DragInteraction.Start start;
+ }
+
+ public final class DragInteractionKt {
+ method @androidx.compose.runtime.Composable public static androidx.compose.runtime.State<java.lang.Boolean> collectIsDraggedAsState(androidx.compose.foundation.interaction.InteractionSource);
+ }
+
+ public interface FocusInteraction extends androidx.compose.foundation.interaction.Interaction {
+ }
+
+ public static final class FocusInteraction.Focus implements androidx.compose.foundation.interaction.FocusInteraction {
+ ctor public FocusInteraction.Focus();
+ }
+
+ public static final class FocusInteraction.Unfocus implements androidx.compose.foundation.interaction.FocusInteraction {
+ ctor public FocusInteraction.Unfocus(androidx.compose.foundation.interaction.FocusInteraction.Focus focus);
+ method public androidx.compose.foundation.interaction.FocusInteraction.Focus getFocus();
+ property public final androidx.compose.foundation.interaction.FocusInteraction.Focus focus;
+ }
+
+ public final class FocusInteractionKt {
+ method @androidx.compose.runtime.Composable public static androidx.compose.runtime.State<java.lang.Boolean> collectIsFocusedAsState(androidx.compose.foundation.interaction.InteractionSource);
+ }
+
+ public interface HoverInteraction extends androidx.compose.foundation.interaction.Interaction {
+ }
+
+ public static final class HoverInteraction.Enter implements androidx.compose.foundation.interaction.HoverInteraction {
+ ctor public HoverInteraction.Enter();
+ }
+
+ public static final class HoverInteraction.Exit implements androidx.compose.foundation.interaction.HoverInteraction {
+ ctor public HoverInteraction.Exit(androidx.compose.foundation.interaction.HoverInteraction.Enter enter);
+ method public androidx.compose.foundation.interaction.HoverInteraction.Enter getEnter();
+ property public final androidx.compose.foundation.interaction.HoverInteraction.Enter enter;
+ }
+
+ public final class HoverInteractionKt {
+ method @androidx.compose.runtime.Composable public static androidx.compose.runtime.State<java.lang.Boolean> collectIsHoveredAsState(androidx.compose.foundation.interaction.InteractionSource);
+ }
+
+ public interface Interaction {
+ }
+
+ @androidx.compose.runtime.Stable public interface InteractionSource {
+ method public kotlinx.coroutines.flow.Flow<androidx.compose.foundation.interaction.Interaction> getInteractions();
+ property public abstract kotlinx.coroutines.flow.Flow<androidx.compose.foundation.interaction.Interaction> interactions;
+ }
+
+ public final class InteractionSourceKt {
+ method public static androidx.compose.foundation.interaction.MutableInteractionSource MutableInteractionSource();
+ }
+
+ @androidx.compose.runtime.Stable public interface MutableInteractionSource extends androidx.compose.foundation.interaction.InteractionSource {
+ method public suspend Object? emit(androidx.compose.foundation.interaction.Interaction interaction, kotlin.coroutines.Continuation<? super kotlin.Unit>);
+ method public boolean tryEmit(androidx.compose.foundation.interaction.Interaction interaction);
+ }
+
+ public interface PressInteraction extends androidx.compose.foundation.interaction.Interaction {
+ }
+
+ public static final class PressInteraction.Cancel implements androidx.compose.foundation.interaction.PressInteraction {
+ ctor public PressInteraction.Cancel(androidx.compose.foundation.interaction.PressInteraction.Press press);
+ method public androidx.compose.foundation.interaction.PressInteraction.Press getPress();
+ property public final androidx.compose.foundation.interaction.PressInteraction.Press press;
+ }
+
+ public static final class PressInteraction.Press implements androidx.compose.foundation.interaction.PressInteraction {
+ ctor public PressInteraction.Press(long pressPosition);
+ method public long getPressPosition();
+ property public final long pressPosition;
+ }
+
+ public static final class PressInteraction.Release implements androidx.compose.foundation.interaction.PressInteraction {
+ ctor public PressInteraction.Release(androidx.compose.foundation.interaction.PressInteraction.Press press);
+ method public androidx.compose.foundation.interaction.PressInteraction.Press getPress();
+ property public final androidx.compose.foundation.interaction.PressInteraction.Press press;
+ }
+
+ public final class PressInteractionKt {
+ method @androidx.compose.runtime.Composable public static androidx.compose.runtime.State<java.lang.Boolean> collectIsPressedAsState(androidx.compose.foundation.interaction.InteractionSource);
+ }
+
+}
+
+package androidx.compose.foundation.lazy {
+
+ public final class LazyBeyondBoundsModifierKt {
+ }
+
+ public final class LazyDslKt {
+ method @androidx.compose.runtime.Composable public static void LazyColumn(optional androidx.compose.ui.Modifier modifier, optional androidx.compose.foundation.lazy.LazyListState state, optional androidx.compose.foundation.layout.PaddingValues contentPadding, optional boolean reverseLayout, optional androidx.compose.foundation.layout.Arrangement.Vertical verticalArrangement, optional androidx.compose.ui.Alignment.Horizontal horizontalAlignment, optional androidx.compose.foundation.gestures.FlingBehavior flingBehavior, optional boolean userScrollEnabled, kotlin.jvm.functions.Function1<? super androidx.compose.foundation.lazy.LazyListScope,kotlin.Unit> content);
+ method @Deprecated @androidx.compose.runtime.Composable public static void LazyColumn(optional androidx.compose.ui.Modifier modifier, optional androidx.compose.foundation.lazy.LazyListState state, optional androidx.compose.foundation.layout.PaddingValues contentPadding, optional boolean reverseLayout, optional androidx.compose.foundation.layout.Arrangement.Vertical verticalArrangement, optional androidx.compose.ui.Alignment.Horizontal horizontalAlignment, optional androidx.compose.foundation.gestures.FlingBehavior flingBehavior, kotlin.jvm.functions.Function1<? super androidx.compose.foundation.lazy.LazyListScope,? extends kotlin.Unit> content);
+ method @androidx.compose.runtime.Composable public static void LazyRow(optional androidx.compose.ui.Modifier modifier, optional androidx.compose.foundation.lazy.LazyListState state, optional androidx.compose.foundation.layout.PaddingValues contentPadding, optional boolean reverseLayout, optional androidx.compose.foundation.layout.Arrangement.Horizontal horizontalArrangement, optional androidx.compose.ui.Alignment.Vertical verticalAlignment, optional androidx.compose.foundation.gestures.FlingBehavior flingBehavior, optional boolean userScrollEnabled, kotlin.jvm.functions.Function1<? super androidx.compose.foundation.lazy.LazyListScope,kotlin.Unit> content);
+ method @Deprecated @androidx.compose.runtime.Composable public static void LazyRow(optional androidx.compose.ui.Modifier modifier, optional androidx.compose.foundation.lazy.LazyListState state, optional androidx.compose.foundation.layout.PaddingValues contentPadding, optional boolean reverseLayout, optional androidx.compose.foundation.layout.Arrangement.Horizontal horizontalArrangement, optional androidx.compose.ui.Alignment.Vertical verticalAlignment, optional androidx.compose.foundation.gestures.FlingBehavior flingBehavior, kotlin.jvm.functions.Function1<? super androidx.compose.foundation.lazy.LazyListScope,? extends kotlin.Unit> content);
+ method public static inline <T> void items(androidx.compose.foundation.lazy.LazyListScope, java.util.List<? extends T> items, optional kotlin.jvm.functions.Function1<? super T,?>? key, optional kotlin.jvm.functions.Function1<? super T,?> contentType, kotlin.jvm.functions.Function2<? super androidx.compose.foundation.lazy.LazyItemScope,? super T,kotlin.Unit> itemContent);
+ method public static inline <T> void items(androidx.compose.foundation.lazy.LazyListScope, T![] items, optional kotlin.jvm.functions.Function1<? super T,?>? key, optional kotlin.jvm.functions.Function1<? super T,?> contentType, kotlin.jvm.functions.Function2<? super androidx.compose.foundation.lazy.LazyItemScope,? super T,kotlin.Unit> itemContent);
+ method @Deprecated public static inline <T> void items(androidx.compose.foundation.lazy.LazyListScope, java.util.List<? extends T> items, optional kotlin.jvm.functions.Function1<? super T,?>? key, kotlin.jvm.functions.Function2<? super androidx.compose.foundation.lazy.LazyItemScope,? super T,? extends kotlin.Unit> itemContent);
+ method @Deprecated public static inline <T> void items(androidx.compose.foundation.lazy.LazyListScope, T![] items, optional kotlin.jvm.functions.Function1<? super T,?>? key, kotlin.jvm.functions.Function2<? super androidx.compose.foundation.lazy.LazyItemScope,? super T,? extends kotlin.Unit> itemContent);
+ method public static inline <T> void itemsIndexed(androidx.compose.foundation.lazy.LazyListScope, java.util.List<? extends T> items, optional kotlin.jvm.functions.Function2<? super java.lang.Integer,? super T,?>? key, optional kotlin.jvm.functions.Function2<? super java.lang.Integer,? super T,?> contentType, kotlin.jvm.functions.Function3<? super androidx.compose.foundation.lazy.LazyItemScope,? super java.lang.Integer,? super T,kotlin.Unit> itemContent);
+ method public static inline <T> void itemsIndexed(androidx.compose.foundation.lazy.LazyListScope, T![] items, optional kotlin.jvm.functions.Function2<? super java.lang.Integer,? super T,?>? key, optional kotlin.jvm.functions.Function2<? super java.lang.Integer,? super T,?> contentType, kotlin.jvm.functions.Function3<? super androidx.compose.foundation.lazy.LazyItemScope,? super java.lang.Integer,? super T,kotlin.Unit> itemContent);
+ method @Deprecated public static inline <T> void itemsIndexed(androidx.compose.foundation.lazy.LazyListScope, java.util.List<? extends T> items, optional kotlin.jvm.functions.Function2<? super java.lang.Integer,? super T,?>? key, kotlin.jvm.functions.Function3<? super androidx.compose.foundation.lazy.LazyItemScope,? super java.lang.Integer,? super T,? extends kotlin.Unit> itemContent);
+ method @Deprecated public static inline <T> void itemsIndexed(androidx.compose.foundation.lazy.LazyListScope, T![] items, optional kotlin.jvm.functions.Function2<? super java.lang.Integer,? super T,?>? key, kotlin.jvm.functions.Function3<? super androidx.compose.foundation.lazy.LazyItemScope,? super java.lang.Integer,? super T,? extends kotlin.Unit> itemContent);
+ }
+
+ public final class LazyGridDeprecatedKt {
+ }
+
+ @androidx.compose.foundation.lazy.LazyScopeMarker @androidx.compose.runtime.Stable public interface LazyItemScope {
+ method public androidx.compose.ui.Modifier fillParentMaxHeight(androidx.compose.ui.Modifier, optional float fraction);
+ method public androidx.compose.ui.Modifier fillParentMaxSize(androidx.compose.ui.Modifier, optional float fraction);
+ method public androidx.compose.ui.Modifier fillParentMaxWidth(androidx.compose.ui.Modifier, optional float fraction);
+ }
+
+ public final class LazyListHeadersKt {
+ }
+
+ public interface LazyListItemInfo {
+ method public int getIndex();
+ method public Object getKey();
+ method public int getOffset();
+ method public int getSize();
+ property public abstract int index;
+ property public abstract Object key;
+ property public abstract int offset;
+ property public abstract int size;
+ }
+
+ public final class LazyListItemPlacementAnimatorKt {
+ }
+
+ public final class LazyListItemProviderImplKt {
+ }
+
+ public final class LazyListKt {
+ }
+
+ public interface LazyListLayoutInfo {
+ method public default int getAfterContentPadding();
+ method public default int getBeforeContentPadding();
+ method public default androidx.compose.foundation.gestures.Orientation getOrientation();
+ method public default boolean getReverseLayout();
+ method public int getTotalItemsCount();
+ method public int getViewportEndOffset();
+ method public default long getViewportSize();
+ method public int getViewportStartOffset();
+ method public java.util.List<androidx.compose.foundation.lazy.LazyListItemInfo> getVisibleItemsInfo();
+ property public default int afterContentPadding;
+ property public default int beforeContentPadding;
+ property public default androidx.compose.foundation.gestures.Orientation orientation;
+ property public default boolean reverseLayout;
+ property public abstract int totalItemsCount;
+ property public abstract int viewportEndOffset;
+ property public default long viewportSize;
+ property public abstract int viewportStartOffset;
+ property public abstract java.util.List<androidx.compose.foundation.lazy.LazyListItemInfo> visibleItemsInfo;
+ }
+
+ public final class LazyListMeasureKt {
+ }
+
+ public final class LazyListPinningModifierKt {
+ }
+
+ @androidx.compose.foundation.lazy.LazyScopeMarker public interface LazyListScope {
+ method public default void item(optional Object? key, optional Object? contentType, kotlin.jvm.functions.Function1<? super androidx.compose.foundation.lazy.LazyItemScope,kotlin.Unit> content);
+ method @Deprecated public void item(optional Object? key, kotlin.jvm.functions.Function1<? super androidx.compose.foundation.lazy.LazyItemScope,? extends kotlin.Unit> content);
+ method public default void items(int count, optional kotlin.jvm.functions.Function1<? super java.lang.Integer,?>? key, optional kotlin.jvm.functions.Function1<? super java.lang.Integer,?> contentType, kotlin.jvm.functions.Function2<? super androidx.compose.foundation.lazy.LazyItemScope,? super java.lang.Integer,kotlin.Unit> itemContent);
+ method @Deprecated public void items(int count, optional kotlin.jvm.functions.Function1<? super java.lang.Integer,?>? key, kotlin.jvm.functions.Function2<? super androidx.compose.foundation.lazy.LazyItemScope,? super java.lang.Integer,? extends kotlin.Unit> itemContent);
+ }
+
+ public final class LazyListScrollingKt {
+ }
+
+ @androidx.compose.runtime.Stable public final class LazyListState implements androidx.compose.foundation.gestures.ScrollableState {
+ ctor public LazyListState(optional int firstVisibleItemIndex, optional int firstVisibleItemScrollOffset);
+ method public suspend Object? animateScrollToItem(int index, optional int scrollOffset, optional kotlin.coroutines.Continuation<? super kotlin.Unit>);
+ method public float dispatchRawDelta(float delta);
+ method public int getFirstVisibleItemIndex();
+ method public int getFirstVisibleItemScrollOffset();
+ method public androidx.compose.foundation.interaction.InteractionSource getInteractionSource();
+ method public androidx.compose.foundation.lazy.LazyListLayoutInfo getLayoutInfo();
+ method public boolean isScrollInProgress();
+ method public suspend Object? scroll(androidx.compose.foundation.MutatePriority scrollPriority, kotlin.jvm.functions.Function2<? super androidx.compose.foundation.gestures.ScrollScope,? super kotlin.coroutines.Continuation<? super kotlin.Unit>,?> block, kotlin.coroutines.Continuation<? super kotlin.Unit>);
+ method public suspend Object? scrollToItem(int index, optional int scrollOffset, optional kotlin.coroutines.Continuation<? super kotlin.Unit>);
+ property public final int firstVisibleItemIndex;
+ property public final int firstVisibleItemScrollOffset;
+ property public final androidx.compose.foundation.interaction.InteractionSource interactionSource;
+ property public boolean isScrollInProgress;
+ property public final androidx.compose.foundation.lazy.LazyListLayoutInfo layoutInfo;
+ field public static final androidx.compose.foundation.lazy.LazyListState.Companion Companion;
+ }
+
+ public static final class LazyListState.Companion {
+ method public androidx.compose.runtime.saveable.Saver<androidx.compose.foundation.lazy.LazyListState,?> getSaver();
+ property public final androidx.compose.runtime.saveable.Saver<androidx.compose.foundation.lazy.LazyListState,?> Saver;
+ }
+
+ public final class LazyListStateKt {
+ method @androidx.compose.runtime.Composable public static androidx.compose.foundation.lazy.LazyListState rememberLazyListState(optional int initialFirstVisibleItemIndex, optional int initialFirstVisibleItemScrollOffset);
+ }
+
+ @kotlin.DslMarker public @interface LazyScopeMarker {
+ }
+
+ public final class LazySemanticsKt {
+ }
+
+}
+
+package androidx.compose.foundation.lazy.grid {
+
+ @androidx.compose.runtime.Stable public interface GridCells {
+ method public java.util.List<java.lang.Integer> calculateCrossAxisCellSizes(androidx.compose.ui.unit.Density, int availableSize, int spacing);
+ }
+
+ public static final class GridCells.Adaptive implements androidx.compose.foundation.lazy.grid.GridCells {
+ ctor public GridCells.Adaptive(float minSize);
+ method public java.util.List<java.lang.Integer> calculateCrossAxisCellSizes(androidx.compose.ui.unit.Density, int availableSize, int spacing);
+ }
+
+ public static final class GridCells.Fixed implements androidx.compose.foundation.lazy.grid.GridCells {
+ ctor public GridCells.Fixed(int count);
+ method public java.util.List<java.lang.Integer> calculateCrossAxisCellSizes(androidx.compose.ui.unit.Density, int availableSize, int spacing);
+ }
+
+ @androidx.compose.runtime.Immutable @kotlin.jvm.JvmInline public final value class GridItemSpan {
+ method public int getCurrentLineSpan();
+ property public final int currentLineSpan;
+ }
+
+ public final class LazyGridDslKt {
+ method @androidx.compose.runtime.Composable public static void LazyHorizontalGrid(androidx.compose.foundation.lazy.grid.GridCells rows, optional androidx.compose.ui.Modifier modifier, optional androidx.compose.foundation.lazy.grid.LazyGridState state, optional androidx.compose.foundation.layout.PaddingValues contentPadding, optional boolean reverseLayout, optional androidx.compose.foundation.layout.Arrangement.Horizontal horizontalArrangement, optional androidx.compose.foundation.layout.Arrangement.Vertical verticalArrangement, optional androidx.compose.foundation.gestures.FlingBehavior flingBehavior, optional boolean userScrollEnabled, kotlin.jvm.functions.Function1<? super androidx.compose.foundation.lazy.grid.LazyGridScope,kotlin.Unit> content);
+ method @androidx.compose.runtime.Composable public static void LazyVerticalGrid(androidx.compose.foundation.lazy.grid.GridCells columns, optional androidx.compose.ui.Modifier modifier, optional androidx.compose.foundation.lazy.grid.LazyGridState state, optional androidx.compose.foundation.layout.PaddingValues contentPadding, optional boolean reverseLayout, optional androidx.compose.foundation.layout.Arrangement.Vertical verticalArrangement, optional androidx.compose.foundation.layout.Arrangement.Horizontal horizontalArrangement, optional androidx.compose.foundation.gestures.FlingBehavior flingBehavior, optional boolean userScrollEnabled, kotlin.jvm.functions.Function1<? super androidx.compose.foundation.lazy.grid.LazyGridScope,kotlin.Unit> content);
+ method public static inline <T> void items(androidx.compose.foundation.lazy.grid.LazyGridScope, java.util.List<? extends T> items, optional kotlin.jvm.functions.Function1<? super T,?>? key, optional kotlin.jvm.functions.Function2<? super androidx.compose.foundation.lazy.grid.LazyGridItemSpanScope,? super T,androidx.compose.foundation.lazy.grid.GridItemSpan>? span, optional kotlin.jvm.functions.Function1<? super T,?> contentType, kotlin.jvm.functions.Function2<? super androidx.compose.foundation.lazy.grid.LazyGridItemScope,? super T,kotlin.Unit> itemContent);
+ method public static inline <T> void items(androidx.compose.foundation.lazy.grid.LazyGridScope, T![] items, optional kotlin.jvm.functions.Function1<? super T,?>? key, optional kotlin.jvm.functions.Function2<? super androidx.compose.foundation.lazy.grid.LazyGridItemSpanScope,? super T,androidx.compose.foundation.lazy.grid.GridItemSpan>? span, optional kotlin.jvm.functions.Function1<? super T,?> contentType, kotlin.jvm.functions.Function2<? super androidx.compose.foundation.lazy.grid.LazyGridItemScope,? super T,kotlin.Unit> itemContent);
+ method public static inline <T> void itemsIndexed(androidx.compose.foundation.lazy.grid.LazyGridScope, java.util.List<? extends T> items, optional kotlin.jvm.functions.Function2<? super java.lang.Integer,? super T,?>? key, optional kotlin.jvm.functions.Function3<? super androidx.compose.foundation.lazy.grid.LazyGridItemSpanScope,? super java.lang.Integer,? super T,androidx.compose.foundation.lazy.grid.GridItemSpan>? span, optional kotlin.jvm.functions.Function2<? super java.lang.Integer,? super T,?> contentType, kotlin.jvm.functions.Function3<? super androidx.compose.foundation.lazy.grid.LazyGridItemScope,? super java.lang.Integer,? super T,kotlin.Unit> itemContent);
+ method public static inline <T> void itemsIndexed(androidx.compose.foundation.lazy.grid.LazyGridScope, T![] items, optional kotlin.jvm.functions.Function2<? super java.lang.Integer,? super T,?>? key, optional kotlin.jvm.functions.Function3<? super androidx.compose.foundation.lazy.grid.LazyGridItemSpanScope,? super java.lang.Integer,? super T,androidx.compose.foundation.lazy.grid.GridItemSpan>? span, optional kotlin.jvm.functions.Function2<? super java.lang.Integer,? super T,?> contentType, kotlin.jvm.functions.Function3<? super androidx.compose.foundation.lazy.grid.LazyGridItemScope,? super java.lang.Integer,? super T,kotlin.Unit> itemContent);
+ }
+
+ public sealed interface LazyGridItemInfo {
+ method public int getColumn();
+ method public int getIndex();
+ method public Object getKey();
+ method public long getOffset();
+ method public int getRow();
+ method public long getSize();
+ property public abstract int column;
+ property public abstract int index;
+ property public abstract Object key;
+ property public abstract long offset;
+ property public abstract int row;
+ property public abstract long size;
+ field public static final androidx.compose.foundation.lazy.grid.LazyGridItemInfo.Companion Companion;
+ field public static final int UnknownColumn = -1; // 0xffffffff
+ field public static final int UnknownRow = -1; // 0xffffffff
+ }
+
+ public static final class LazyGridItemInfo.Companion {
+ field public static final int UnknownColumn = -1; // 0xffffffff
+ field public static final int UnknownRow = -1; // 0xffffffff
+ }
+
+ public final class LazyGridItemPlacementAnimatorKt {
+ }
+
+ public final class LazyGridItemProviderImplKt {
+ }
+
+ @androidx.compose.foundation.lazy.grid.LazyGridScopeMarker @androidx.compose.runtime.Stable public sealed interface LazyGridItemScope {
+ }
+
+ @androidx.compose.foundation.lazy.grid.LazyGridScopeMarker public sealed interface LazyGridItemSpanScope {
+ method public int getMaxCurrentLineSpan();
+ method public int getMaxLineSpan();
+ property public abstract int maxCurrentLineSpan;
+ property public abstract int maxLineSpan;
+ }
+
+ public final class LazyGridKt {
+ }
+
+ public sealed interface LazyGridLayoutInfo {
+ method public int getAfterContentPadding();
+ method public int getBeforeContentPadding();
+ method public androidx.compose.foundation.gestures.Orientation getOrientation();
+ method public boolean getReverseLayout();
+ method public int getTotalItemsCount();
+ method public int getViewportEndOffset();
+ method public long getViewportSize();
+ method public int getViewportStartOffset();
+ method public java.util.List<androidx.compose.foundation.lazy.grid.LazyGridItemInfo> getVisibleItemsInfo();
+ property public abstract int afterContentPadding;
+ property public abstract int beforeContentPadding;
+ property public abstract androidx.compose.foundation.gestures.Orientation orientation;
+ property public abstract boolean reverseLayout;
+ property public abstract int totalItemsCount;
+ property public abstract int viewportEndOffset;
+ property public abstract long viewportSize;
+ property public abstract int viewportStartOffset;
+ property public abstract java.util.List<androidx.compose.foundation.lazy.grid.LazyGridItemInfo> visibleItemsInfo;
+ }
+
+ public final class LazyGridMeasureKt {
+ }
+
+ @androidx.compose.foundation.lazy.grid.LazyGridScopeMarker public sealed interface LazyGridScope {
+ method public void item(optional Object? key, optional kotlin.jvm.functions.Function1<? super androidx.compose.foundation.lazy.grid.LazyGridItemSpanScope,androidx.compose.foundation.lazy.grid.GridItemSpan>? span, optional Object? contentType, kotlin.jvm.functions.Function1<? super androidx.compose.foundation.lazy.grid.LazyGridItemScope,kotlin.Unit> content);
+ method public void items(int count, optional kotlin.jvm.functions.Function1<? super java.lang.Integer,?>? key, optional kotlin.jvm.functions.Function2<? super androidx.compose.foundation.lazy.grid.LazyGridItemSpanScope,? super java.lang.Integer,androidx.compose.foundation.lazy.grid.GridItemSpan>? span, optional kotlin.jvm.functions.Function1<? super java.lang.Integer,?> contentType, kotlin.jvm.functions.Function2<? super androidx.compose.foundation.lazy.grid.LazyGridItemScope,? super java.lang.Integer,kotlin.Unit> itemContent);
+ }
+
+ @kotlin.DslMarker public @interface LazyGridScopeMarker {
+ }
+
+ public final class LazyGridScrollingKt {
+ }
+
+ public final class LazyGridSpanKt {
+ method public static long GridItemSpan(int currentLineSpan);
+ }
+
+ @androidx.compose.runtime.Stable public final class LazyGridState implements androidx.compose.foundation.gestures.ScrollableState {
+ ctor public LazyGridState(optional int firstVisibleItemIndex, optional int firstVisibleItemScrollOffset);
+ method public suspend Object? animateScrollToItem(int index, optional int scrollOffset, optional kotlin.coroutines.Continuation<? super kotlin.Unit>);
+ method public float dispatchRawDelta(float delta);
+ method public int getFirstVisibleItemIndex();
+ method public int getFirstVisibleItemScrollOffset();
+ method public androidx.compose.foundation.interaction.InteractionSource getInteractionSource();
+ method public androidx.compose.foundation.lazy.grid.LazyGridLayoutInfo getLayoutInfo();
+ method public boolean isScrollInProgress();
+ method public suspend Object? scroll(androidx.compose.foundation.MutatePriority scrollPriority, kotlin.jvm.functions.Function2<? super androidx.compose.foundation.gestures.ScrollScope,? super kotlin.coroutines.Continuation<? super kotlin.Unit>,?> block, kotlin.coroutines.Continuation<? super kotlin.Unit>);
+ method public suspend Object? scrollToItem(int index, optional int scrollOffset, optional kotlin.coroutines.Continuation<? super kotlin.Unit>);
+ property public final int firstVisibleItemIndex;
+ property public final int firstVisibleItemScrollOffset;
+ property public final androidx.compose.foundation.interaction.InteractionSource interactionSource;
+ property public boolean isScrollInProgress;
+ property public final androidx.compose.foundation.lazy.grid.LazyGridLayoutInfo layoutInfo;
+ field public static final androidx.compose.foundation.lazy.grid.LazyGridState.Companion Companion;
+ }
+
+ public static final class LazyGridState.Companion {
+ method public androidx.compose.runtime.saveable.Saver<androidx.compose.foundation.lazy.grid.LazyGridState,?> getSaver();
+ property public final androidx.compose.runtime.saveable.Saver<androidx.compose.foundation.lazy.grid.LazyGridState,?> Saver;
+ }
+
+ public final class LazyGridStateKt {
+ method @androidx.compose.runtime.Composable public static androidx.compose.foundation.lazy.grid.LazyGridState rememberLazyGridState(optional int initialFirstVisibleItemIndex, optional int initialFirstVisibleItemScrollOffset);
+ }
+
+ public final class LazySemanticsKt {
+ }
+
+}
+
+package androidx.compose.foundation.lazy.layout {
+
+ public final class IntervalListKt {
+ }
+
+ public final class LazyLayoutKt {
+ }
+
+ public final class LazyLayoutPrefetcher_androidKt {
+ }
+
+ public final class Lazy_androidKt {
+ }
+
+ public final class PinnableParentKt {
+ }
+
+}
+
+package androidx.compose.foundation.relocation {
+
+ public final class BringIntoViewKt {
+ }
+
+ public final class BringIntoViewRequesterKt {
+ }
+
+ public final class BringIntoViewResponderKt {
+ }
+
+ public final class BringIntoViewResponder_androidKt {
+ }
+
+}
+
+package androidx.compose.foundation.selection {
+
+ public final class SelectableGroupKt {
+ method public static androidx.compose.ui.Modifier selectableGroup(androidx.compose.ui.Modifier);
+ }
+
+ public final class SelectableKt {
+ method public static androidx.compose.ui.Modifier selectable(androidx.compose.ui.Modifier, boolean selected, optional boolean enabled, optional androidx.compose.ui.semantics.Role? role, kotlin.jvm.functions.Function0<kotlin.Unit> onClick);
+ method public static androidx.compose.ui.Modifier selectable(androidx.compose.ui.Modifier, boolean selected, androidx.compose.foundation.interaction.MutableInteractionSource interactionSource, androidx.compose.foundation.Indication? indication, optional boolean enabled, optional androidx.compose.ui.semantics.Role? role, kotlin.jvm.functions.Function0<kotlin.Unit> onClick);
+ }
+
+ public final class ToggleableKt {
+ method public static androidx.compose.ui.Modifier toggleable(androidx.compose.ui.Modifier, boolean value, optional boolean enabled, optional androidx.compose.ui.semantics.Role? role, kotlin.jvm.functions.Function1<? super java.lang.Boolean,kotlin.Unit> onValueChange);
+ method public static androidx.compose.ui.Modifier toggleable(androidx.compose.ui.Modifier, boolean value, androidx.compose.foundation.interaction.MutableInteractionSource interactionSource, androidx.compose.foundation.Indication? indication, optional boolean enabled, optional androidx.compose.ui.semantics.Role? role, kotlin.jvm.functions.Function1<? super java.lang.Boolean,kotlin.Unit> onValueChange);
+ method public static androidx.compose.ui.Modifier triStateToggleable(androidx.compose.ui.Modifier, androidx.compose.ui.state.ToggleableState state, optional boolean enabled, optional androidx.compose.ui.semantics.Role? role, kotlin.jvm.functions.Function0<kotlin.Unit> onClick);
+ method public static androidx.compose.ui.Modifier triStateToggleable(androidx.compose.ui.Modifier, androidx.compose.ui.state.ToggleableState state, androidx.compose.foundation.interaction.MutableInteractionSource interactionSource, androidx.compose.foundation.Indication? indication, optional boolean enabled, optional androidx.compose.ui.semantics.Role? role, kotlin.jvm.functions.Function0<kotlin.Unit> onClick);
+ }
+
+}
+
+package androidx.compose.foundation.shape {
+
+ public final class AbsoluteCutCornerShape extends androidx.compose.foundation.shape.CornerBasedShape {
+ ctor public AbsoluteCutCornerShape(androidx.compose.foundation.shape.CornerSize topLeft, androidx.compose.foundation.shape.CornerSize topRight, androidx.compose.foundation.shape.CornerSize bottomRight, androidx.compose.foundation.shape.CornerSize bottomLeft);
+ method public androidx.compose.foundation.shape.AbsoluteCutCornerShape copy(androidx.compose.foundation.shape.CornerSize topStart, androidx.compose.foundation.shape.CornerSize topEnd, androidx.compose.foundation.shape.CornerSize bottomEnd, androidx.compose.foundation.shape.CornerSize bottomStart);
+ method public androidx.compose.ui.graphics.Outline createOutline(long size, float topStart, float topEnd, float bottomEnd, float bottomStart, androidx.compose.ui.unit.LayoutDirection layoutDirection);
+ }
+
+ public final class AbsoluteCutCornerShapeKt {
+ method public static androidx.compose.foundation.shape.AbsoluteCutCornerShape AbsoluteCutCornerShape(androidx.compose.foundation.shape.CornerSize corner);
+ method public static androidx.compose.foundation.shape.AbsoluteCutCornerShape AbsoluteCutCornerShape(float size);
+ method public static androidx.compose.foundation.shape.AbsoluteCutCornerShape AbsoluteCutCornerShape(float size);
+ method public static androidx.compose.foundation.shape.AbsoluteCutCornerShape AbsoluteCutCornerShape(int percent);
+ method public static androidx.compose.foundation.shape.AbsoluteCutCornerShape AbsoluteCutCornerShape(optional float topLeft, optional float topRight, optional float bottomRight, optional float bottomLeft);
+ method public static androidx.compose.foundation.shape.AbsoluteCutCornerShape AbsoluteCutCornerShape(optional float topLeft, optional float topRight, optional float bottomRight, optional float bottomLeft);
+ method public static androidx.compose.foundation.shape.AbsoluteCutCornerShape AbsoluteCutCornerShape(optional int topLeftPercent, optional int topRightPercent, optional int bottomRightPercent, optional int bottomLeftPercent);
+ }
+
+ public final class AbsoluteRoundedCornerShape extends androidx.compose.foundation.shape.CornerBasedShape {
+ ctor public AbsoluteRoundedCornerShape(androidx.compose.foundation.shape.CornerSize topLeft, androidx.compose.foundation.shape.CornerSize topRight, androidx.compose.foundation.shape.CornerSize bottomRight, androidx.compose.foundation.shape.CornerSize bottomLeft);
+ method public androidx.compose.foundation.shape.AbsoluteRoundedCornerShape copy(androidx.compose.foundation.shape.CornerSize topStart, androidx.compose.foundation.shape.CornerSize topEnd, androidx.compose.foundation.shape.CornerSize bottomEnd, androidx.compose.foundation.shape.CornerSize bottomStart);
+ method public androidx.compose.ui.graphics.Outline createOutline(long size, float topStart, float topEnd, float bottomEnd, float bottomStart, androidx.compose.ui.unit.LayoutDirection layoutDirection);
+ }
+
+ public final class AbsoluteRoundedCornerShapeKt {
+ method public static androidx.compose.foundation.shape.AbsoluteRoundedCornerShape AbsoluteRoundedCornerShape(androidx.compose.foundation.shape.CornerSize corner);
+ method public static androidx.compose.foundation.shape.AbsoluteRoundedCornerShape AbsoluteRoundedCornerShape(float size);
+ method public static androidx.compose.foundation.shape.AbsoluteRoundedCornerShape AbsoluteRoundedCornerShape(float size);
+ method public static androidx.compose.foundation.shape.AbsoluteRoundedCornerShape AbsoluteRoundedCornerShape(int percent);
+ method public static androidx.compose.foundation.shape.AbsoluteRoundedCornerShape AbsoluteRoundedCornerShape(optional float topLeft, optional float topRight, optional float bottomRight, optional float bottomLeft);
+ method public static androidx.compose.foundation.shape.AbsoluteRoundedCornerShape AbsoluteRoundedCornerShape(optional float topLeft, optional float topRight, optional float bottomRight, optional float bottomLeft);
+ method public static androidx.compose.foundation.shape.AbsoluteRoundedCornerShape AbsoluteRoundedCornerShape(optional int topLeftPercent, optional int topRightPercent, optional int bottomRightPercent, optional int bottomLeftPercent);
+ }
+
+ public abstract class CornerBasedShape implements androidx.compose.ui.graphics.Shape {
+ ctor public CornerBasedShape(androidx.compose.foundation.shape.CornerSize topStart, androidx.compose.foundation.shape.CornerSize topEnd, androidx.compose.foundation.shape.CornerSize bottomEnd, androidx.compose.foundation.shape.CornerSize bottomStart);
+ method public abstract androidx.compose.foundation.shape.CornerBasedShape copy(optional androidx.compose.foundation.shape.CornerSize topStart, optional androidx.compose.foundation.shape.CornerSize topEnd, optional androidx.compose.foundation.shape.CornerSize bottomEnd, optional androidx.compose.foundation.shape.CornerSize bottomStart);
+ method public final androidx.compose.foundation.shape.CornerBasedShape copy(androidx.compose.foundation.shape.CornerSize all);
+ method public final androidx.compose.ui.graphics.Outline createOutline(long size, androidx.compose.ui.unit.LayoutDirection layoutDirection, androidx.compose.ui.unit.Density density);
+ method public abstract androidx.compose.ui.graphics.Outline createOutline(long size, float topStart, float topEnd, float bottomEnd, float bottomStart, androidx.compose.ui.unit.LayoutDirection layoutDirection);
+ method public final androidx.compose.foundation.shape.CornerSize getBottomEnd();
+ method public final androidx.compose.foundation.shape.CornerSize getBottomStart();
+ method public final androidx.compose.foundation.shape.CornerSize getTopEnd();
+ method public final androidx.compose.foundation.shape.CornerSize getTopStart();
+ property public final androidx.compose.foundation.shape.CornerSize bottomEnd;
+ property public final androidx.compose.foundation.shape.CornerSize bottomStart;
+ property public final androidx.compose.foundation.shape.CornerSize topEnd;
+ property public final androidx.compose.foundation.shape.CornerSize topStart;
+ }
+
+ @androidx.compose.runtime.Immutable public interface CornerSize {
+ method public float toPx(long shapeSize, androidx.compose.ui.unit.Density density);
+ }
+
+ public final class CornerSizeKt {
+ method @androidx.compose.runtime.Stable public static androidx.compose.foundation.shape.CornerSize CornerSize(float size);
+ method @androidx.compose.runtime.Stable public static androidx.compose.foundation.shape.CornerSize CornerSize(float size);
+ method @androidx.compose.runtime.Stable public static androidx.compose.foundation.shape.CornerSize CornerSize(int percent);
+ method public static androidx.compose.foundation.shape.CornerSize getZeroCornerSize();
+ property public static final androidx.compose.foundation.shape.CornerSize ZeroCornerSize;
+ }
+
+ public final class CutCornerShape extends androidx.compose.foundation.shape.CornerBasedShape {
+ ctor public CutCornerShape(androidx.compose.foundation.shape.CornerSize topStart, androidx.compose.foundation.shape.CornerSize topEnd, androidx.compose.foundation.shape.CornerSize bottomEnd, androidx.compose.foundation.shape.CornerSize bottomStart);
+ method public androidx.compose.foundation.shape.CutCornerShape copy(androidx.compose.foundation.shape.CornerSize topStart, androidx.compose.foundation.shape.CornerSize topEnd, androidx.compose.foundation.shape.CornerSize bottomEnd, androidx.compose.foundation.shape.CornerSize bottomStart);
+ method public androidx.compose.ui.graphics.Outline createOutline(long size, float topStart, float topEnd, float bottomEnd, float bottomStart, androidx.compose.ui.unit.LayoutDirection layoutDirection);
+ }
+
+ public final class CutCornerShapeKt {
+ method public static androidx.compose.foundation.shape.CutCornerShape CutCornerShape(androidx.compose.foundation.shape.CornerSize corner);
+ method public static androidx.compose.foundation.shape.CutCornerShape CutCornerShape(float size);
+ method public static androidx.compose.foundation.shape.CutCornerShape CutCornerShape(float size);
+ method public static androidx.compose.foundation.shape.CutCornerShape CutCornerShape(int percent);
+ method public static androidx.compose.foundation.shape.CutCornerShape CutCornerShape(optional float topStart, optional float topEnd, optional float bottomEnd, optional float bottomStart);
+ method public static androidx.compose.foundation.shape.CutCornerShape CutCornerShape(optional float topStart, optional float topEnd, optional float bottomEnd, optional float bottomStart);
+ method public static androidx.compose.foundation.shape.CutCornerShape CutCornerShape(optional int topStartPercent, optional int topEndPercent, optional int bottomEndPercent, optional int bottomStartPercent);
+ }
+
+ public final class GenericShape implements androidx.compose.ui.graphics.Shape {
+ ctor public GenericShape(kotlin.jvm.functions.Function3<? super androidx.compose.ui.graphics.Path,? super androidx.compose.ui.geometry.Size,? super androidx.compose.ui.unit.LayoutDirection,kotlin.Unit> builder);
+ method public androidx.compose.ui.graphics.Outline createOutline(long size, androidx.compose.ui.unit.LayoutDirection layoutDirection, androidx.compose.ui.unit.Density density);
+ }
+
+ public final class RoundedCornerShape extends androidx.compose.foundation.shape.CornerBasedShape {
+ ctor public RoundedCornerShape(androidx.compose.foundation.shape.CornerSize topStart, androidx.compose.foundation.shape.CornerSize topEnd, androidx.compose.foundation.shape.CornerSize bottomEnd, androidx.compose.foundation.shape.CornerSize bottomStart);
+ method public androidx.compose.foundation.shape.RoundedCornerShape copy(androidx.compose.foundation.shape.CornerSize topStart, androidx.compose.foundation.shape.CornerSize topEnd, androidx.compose.foundation.shape.CornerSize bottomEnd, androidx.compose.foundation.shape.CornerSize bottomStart);
+ method public androidx.compose.ui.graphics.Outline createOutline(long size, float topStart, float topEnd, float bottomEnd, float bottomStart, androidx.compose.ui.unit.LayoutDirection layoutDirection);
+ }
+
+ public final class RoundedCornerShapeKt {
+ method public static androidx.compose.foundation.shape.RoundedCornerShape RoundedCornerShape(androidx.compose.foundation.shape.CornerSize corner);
+ method public static androidx.compose.foundation.shape.RoundedCornerShape RoundedCornerShape(float size);
+ method public static androidx.compose.foundation.shape.RoundedCornerShape RoundedCornerShape(float size);
+ method public static androidx.compose.foundation.shape.RoundedCornerShape RoundedCornerShape(int percent);
+ method public static androidx.compose.foundation.shape.RoundedCornerShape RoundedCornerShape(optional float topStart, optional float topEnd, optional float bottomEnd, optional float bottomStart);
+ method public static androidx.compose.foundation.shape.RoundedCornerShape RoundedCornerShape(optional float topStart, optional float topEnd, optional float bottomEnd, optional float bottomStart);
+ method public static androidx.compose.foundation.shape.RoundedCornerShape RoundedCornerShape(optional int topStartPercent, optional int topEndPercent, optional int bottomEndPercent, optional int bottomStartPercent);
+ method public static androidx.compose.foundation.shape.RoundedCornerShape getCircleShape();
+ property public static final androidx.compose.foundation.shape.RoundedCornerShape CircleShape;
+ }
+
+}
+
+package androidx.compose.foundation.text {
+
+ public final class AndroidCursorHandle_androidKt {
+ }
+
+ public final class BasicTextFieldKt {
+ method @androidx.compose.runtime.Composable public static void BasicTextField(String value, kotlin.jvm.functions.Function1<? super java.lang.String,kotlin.Unit> onValueChange, optional androidx.compose.ui.Modifier modifier, optional boolean enabled, optional boolean readOnly, optional androidx.compose.ui.text.TextStyle textStyle, optional androidx.compose.foundation.text.KeyboardOptions keyboardOptions, optional androidx.compose.foundation.text.KeyboardActions keyboardActions, optional boolean singleLine, optional int maxLines, optional androidx.compose.ui.text.input.VisualTransformation visualTransformation, optional kotlin.jvm.functions.Function1<? super androidx.compose.ui.text.TextLayoutResult,kotlin.Unit> onTextLayout, optional androidx.compose.foundation.interaction.MutableInteractionSource interactionSource, optional androidx.compose.ui.graphics.Brush cursorBrush, optional kotlin.jvm.functions.Function1<? super kotlin.jvm.functions.Function0<kotlin.Unit>,kotlin.Unit> decorationBox);
+ method @androidx.compose.runtime.Composable public static void BasicTextField(androidx.compose.ui.text.input.TextFieldValue value, kotlin.jvm.functions.Function1<? super androidx.compose.ui.text.input.TextFieldValue,kotlin.Unit> onValueChange, optional androidx.compose.ui.Modifier modifier, optional boolean enabled, optional boolean readOnly, optional androidx.compose.ui.text.TextStyle textStyle, optional androidx.compose.foundation.text.KeyboardOptions keyboardOptions, optional androidx.compose.foundation.text.KeyboardActions keyboardActions, optional boolean singleLine, optional int maxLines, optional androidx.compose.ui.text.input.VisualTransformation visualTransformation, optional kotlin.jvm.functions.Function1<? super androidx.compose.ui.text.TextLayoutResult,kotlin.Unit> onTextLayout, optional androidx.compose.foundation.interaction.MutableInteractionSource interactionSource, optional androidx.compose.ui.graphics.Brush cursorBrush, optional kotlin.jvm.functions.Function1<? super kotlin.jvm.functions.Function0<kotlin.Unit>,kotlin.Unit> decorationBox);
+ }
+
+ public final class BasicTextKt {
+ method @androidx.compose.runtime.Composable public static void BasicText(String text, optional androidx.compose.ui.Modifier modifier, optional androidx.compose.ui.text.TextStyle style, optional kotlin.jvm.functions.Function1<? super androidx.compose.ui.text.TextLayoutResult,kotlin.Unit> onTextLayout, optional int overflow, optional boolean softWrap, optional int maxLines);
+ method @androidx.compose.runtime.Composable public static void BasicText(androidx.compose.ui.text.AnnotatedString text, optional androidx.compose.ui.Modifier modifier, optional androidx.compose.ui.text.TextStyle style, optional kotlin.jvm.functions.Function1<? super androidx.compose.ui.text.TextLayoutResult,kotlin.Unit> onTextLayout, optional int overflow, optional boolean softWrap, optional int maxLines, optional java.util.Map<java.lang.String,androidx.compose.foundation.text.InlineTextContent> inlineContent);
+ }
+
+ public final class ClickableTextKt {
+ method @androidx.compose.runtime.Composable public static void ClickableText(androidx.compose.ui.text.AnnotatedString text, optional androidx.compose.ui.Modifier modifier, optional androidx.compose.ui.text.TextStyle style, optional boolean softWrap, optional int overflow, optional int maxLines, optional kotlin.jvm.functions.Function1<? super androidx.compose.ui.text.TextLayoutResult,kotlin.Unit> onTextLayout, kotlin.jvm.functions.Function1<? super java.lang.Integer,kotlin.Unit> onClick);
+ }
+
+ public final class ContextMenu_androidKt {
+ }
+
+ public final class CoreTextFieldKt {
+ }
+
+ public final class CoreTextKt {
+ }
+
+ @androidx.compose.runtime.Immutable public final class InlineTextContent {
+ ctor public InlineTextContent(androidx.compose.ui.text.Placeholder placeholder, kotlin.jvm.functions.Function1<? super java.lang.String,kotlin.Unit> children);
+ method public kotlin.jvm.functions.Function1<java.lang.String,kotlin.Unit> getChildren();
+ method public androidx.compose.ui.text.Placeholder getPlaceholder();
+ property public final kotlin.jvm.functions.Function1<java.lang.String,kotlin.Unit> children;
+ property public final androidx.compose.ui.text.Placeholder placeholder;
+ }
+
+ public final class InlineTextContentKt {
+ method public static void appendInlineContent(androidx.compose.ui.text.AnnotatedString.Builder, String id, optional String alternateText);
+ }
+
+ public final class KeyEventHelpers_androidKt {
+ }
+
+ public final class KeyMappingKt {
+ }
+
+ public final class KeyMapping_androidKt {
+ }
+
+ public interface KeyboardActionScope {
+ method public void defaultKeyboardAction(int imeAction);
+ }
+
+ public final class KeyboardActions {
+ ctor public KeyboardActions(optional kotlin.jvm.functions.Function1<? super androidx.compose.foundation.text.KeyboardActionScope,kotlin.Unit>? onDone, optional kotlin.jvm.functions.Function1<? super androidx.compose.foundation.text.KeyboardActionScope,kotlin.Unit>? onGo, optional kotlin.jvm.functions.Function1<? super androidx.compose.foundation.text.KeyboardActionScope,kotlin.Unit>? onNext, optional kotlin.jvm.functions.Function1<? super androidx.compose.foundation.text.KeyboardActionScope,kotlin.Unit>? onPrevious, optional kotlin.jvm.functions.Function1<? super androidx.compose.foundation.text.KeyboardActionScope,kotlin.Unit>? onSearch, optional kotlin.jvm.functions.Function1<? super androidx.compose.foundation.text.KeyboardActionScope,kotlin.Unit>? onSend);
+ method public kotlin.jvm.functions.Function1<androidx.compose.foundation.text.KeyboardActionScope,kotlin.Unit>? getOnDone();
+ method public kotlin.jvm.functions.Function1<androidx.compose.foundation.text.KeyboardActionScope,kotlin.Unit>? getOnGo();
+ method public kotlin.jvm.functions.Function1<androidx.compose.foundation.text.KeyboardActionScope,kotlin.Unit>? getOnNext();
+ method public kotlin.jvm.functions.Function1<androidx.compose.foundation.text.KeyboardActionScope,kotlin.Unit>? getOnPrevious();
+ method public kotlin.jvm.functions.Function1<androidx.compose.foundation.text.KeyboardActionScope,kotlin.Unit>? getOnSearch();
+ method public kotlin.jvm.functions.Function1<androidx.compose.foundation.text.KeyboardActionScope,kotlin.Unit>? getOnSend();
+ property public final kotlin.jvm.functions.Function1<androidx.compose.foundation.text.KeyboardActionScope,kotlin.Unit>? onDone;
+ property public final kotlin.jvm.functions.Function1<androidx.compose.foundation.text.KeyboardActionScope,kotlin.Unit>? onGo;
+ property public final kotlin.jvm.functions.Function1<androidx.compose.foundation.text.KeyboardActionScope,kotlin.Unit>? onNext;
+ property public final kotlin.jvm.functions.Function1<androidx.compose.foundation.text.KeyboardActionScope,kotlin.Unit>? onPrevious;
+ property public final kotlin.jvm.functions.Function1<androidx.compose.foundation.text.KeyboardActionScope,kotlin.Unit>? onSearch;
+ property public final kotlin.jvm.functions.Function1<androidx.compose.foundation.text.KeyboardActionScope,kotlin.Unit>? onSend;
+ field public static final androidx.compose.foundation.text.KeyboardActions.Companion Companion;
+ }
+
+ public static final class KeyboardActions.Companion {
+ method public androidx.compose.foundation.text.KeyboardActions getDefault();
+ property public final androidx.compose.foundation.text.KeyboardActions Default;
+ }
+
+ public final class KeyboardActionsKt {
+ method public static androidx.compose.foundation.text.KeyboardActions KeyboardActions(kotlin.jvm.functions.Function1<? super androidx.compose.foundation.text.KeyboardActionScope,kotlin.Unit> onAny);
+ }
+
+ @androidx.compose.runtime.Immutable public final class KeyboardOptions {
+ ctor public KeyboardOptions(optional int capitalization, optional boolean autoCorrect, optional int keyboardType, optional int imeAction);
+ method public androidx.compose.foundation.text.KeyboardOptions copy(optional int capitalization, optional boolean autoCorrect, optional int keyboardType, optional int imeAction);
+ method public boolean getAutoCorrect();
+ method public int getCapitalization();
+ method public int getImeAction();
+ method public int getKeyboardType();
+ property public final boolean autoCorrect;
+ property public final int capitalization;
+ property public final int imeAction;
+ property public final int keyboardType;
+ field public static final androidx.compose.foundation.text.KeyboardOptions.Companion Companion;
+ }
+
+ public static final class KeyboardOptions.Companion {
+ method public androidx.compose.foundation.text.KeyboardOptions getDefault();
+ property public final androidx.compose.foundation.text.KeyboardOptions Default;
+ }
+
+ public final class LongPressTextDragObserverKt {
+ }
+
+ public final class MaxLinesHeightModifierKt {
+ }
+
+ public final class StringHelpersKt {
+ }
+
+ public final class StringHelpers_androidKt {
+ }
+
+ public final class StringHelpers_jvmKt {
+ }
+
+ public final class TextFieldCursorKt {
+ }
+
+ public final class TextFieldDelegateKt {
+ }
+
+ public final class TextFieldGestureModifiersKt {
+ }
+
+ public final class TextFieldKeyInputKt {
+ }
+
+ public final class TextFieldKeyInput_androidKt {
+ }
+
+ public final class TextFieldPressGestureFilterKt {
+ }
+
+ public final class TextFieldScrollKt {
+ }
+
+ public final class TextFieldSizeKt {
+ }
+
+ public final class TextLayoutHelperKt {
+ }
+
+ public final class TextLayoutResultProxyKt {
+ }
+
+ public final class TextPointerIcon_androidKt {
+ }
+
+ public final class TouchMode_androidKt {
+ }
+
+ public final class UndoManagerKt {
+ }
+
+ public final class UndoManager_jvmKt {
+ }
+
+}
+
+package androidx.compose.foundation.text.selection {
+
+ public final class AndroidSelectionHandles_androidKt {
+ }
+
+ public final class MultiWidgetSelectionDelegateKt {
+ }
+
+ public final class SelectionAdjustmentKt {
+ }
+
+ public final class SelectionContainerKt {
+ method @androidx.compose.runtime.Composable public static void DisableSelection(kotlin.jvm.functions.Function0<kotlin.Unit> content);
+ method @androidx.compose.runtime.Composable public static void SelectionContainer(optional androidx.compose.ui.Modifier modifier, kotlin.jvm.functions.Function0<kotlin.Unit> content);
+ }
+
+ public final class SelectionHandlesKt {
+ }
+
+ public final class SelectionMagnifierKt {
+ }
+
+ public final class SelectionManagerKt {
+ }
+
+ public final class SelectionManager_androidKt {
+ }
+
+ public final class SelectionRegistrarKt {
+ }
+
+ public final class SimpleLayoutKt {
+ }
+
+ public final class TextFieldSelectionDelegateKt {
+ }
+
+ public final class TextFieldSelectionManagerKt {
+ }
+
+ public final class TextFieldSelectionManager_androidKt {
+ }
+
+ @androidx.compose.runtime.Immutable public final class TextSelectionColors {
+ ctor public TextSelectionColors(long handleColor, long backgroundColor);
+ method public long getBackgroundColor();
+ method public long getHandleColor();
+ property public final long backgroundColor;
+ property public final long handleColor;
+ }
+
+ public final class TextSelectionColorsKt {
+ method public static androidx.compose.runtime.ProvidableCompositionLocal<androidx.compose.foundation.text.selection.TextSelectionColors> getLocalTextSelectionColors();
+ property public static final androidx.compose.runtime.ProvidableCompositionLocal<androidx.compose.foundation.text.selection.TextSelectionColors> LocalTextSelectionColors;
+ }
+
+ public final class TextSelectionDelegateKt {
+ }
+
+ public final class TextSelectionMouseDetectorKt {
+ }
+
+}
+
diff --git a/compose/foundation/foundation/integration-tests/foundation-demos/src/main/java/androidx/compose/foundation/demos/text/ComposeLineHeight.kt b/compose/foundation/foundation/integration-tests/foundation-demos/src/main/java/androidx/compose/foundation/demos/text/ComposeLineHeight.kt
index 023eb045..9f1e5de 100644
--- a/compose/foundation/foundation/integration-tests/foundation-demos/src/main/java/androidx/compose/foundation/demos/text/ComposeLineHeight.kt
+++ b/compose/foundation/foundation/integration-tests/foundation-demos/src/main/java/androidx/compose/foundation/demos/text/ComposeLineHeight.kt
@@ -227,7 +227,7 @@
onClick = null,
enabled = enabled
)
- Text(text = option.toString().split(".")[1], style = HintStyle)
+ Text(text = option.toString().split(".").last(), style = HintStyle)
}
}
}
@@ -268,7 +268,7 @@
onClick = null,
enabled = enabled
)
- Text(text = option.toString().split(".")[1], style = HintStyle)
+ Text(text = option.toString().split(".").last(), style = HintStyle)
}
}
}
diff --git a/compose/foundation/foundation/integration-tests/foundation-demos/src/main/java/androidx/compose/foundation/demos/text/FontFamilyDemo.kt b/compose/foundation/foundation/integration-tests/foundation-demos/src/main/java/androidx/compose/foundation/demos/text/FontFamilyDemo.kt
index 7106058..5e33f75 100644
--- a/compose/foundation/foundation/integration-tests/foundation-demos/src/main/java/androidx/compose/foundation/demos/text/FontFamilyDemo.kt
+++ b/compose/foundation/foundation/integration-tests/foundation-demos/src/main/java/androidx/compose/foundation/demos/text/FontFamilyDemo.kt
@@ -20,7 +20,6 @@
import android.graphics.Typeface
import androidx.compose.foundation.layout.Column
import androidx.compose.foundation.layout.Spacer
-import androidx.compose.foundation.layout.fillMaxWidth
import androidx.compose.foundation.layout.height
import androidx.compose.foundation.lazy.LazyColumn
import androidx.compose.material.Button
@@ -128,8 +127,7 @@
Spacer(Modifier.height(16.dp))
Text(
"(Normal, Normal) text with async loading with fallback (2000ms)",
- fontFamily = fontFamily,
- modifier = Modifier.fillMaxWidth().height(100.dp)
+ fontFamily = fontFamily
)
Text(
"(W200, Normal) text async loading, same FontFamily (500ms)",
diff --git a/compose/foundation/foundation/src/androidAndroidTest/kotlin/androidx/compose/foundation/gesture/OverScrollTest.kt b/compose/foundation/foundation/src/androidAndroidTest/kotlin/androidx/compose/foundation/gesture/OverScrollTest.kt
index eab4477..846490b 100644
--- a/compose/foundation/foundation/src/androidAndroidTest/kotlin/androidx/compose/foundation/gesture/OverScrollTest.kt
+++ b/compose/foundation/foundation/src/androidAndroidTest/kotlin/androidx/compose/foundation/gesture/OverScrollTest.kt
@@ -210,6 +210,8 @@
assertThat(controller.stopAnimationCallsCount).isEqualTo(0)
}
+ // This actually produces a velocity of 100,000 (500 px moved in 5 ms), but we are
+ // relying on the compatibility behaviour that 2 points produce a zero velocity.
rule.onNodeWithTag(boxTag).performTouchInput {
down(center)
moveBy(Offset(500f, 0f))
diff --git a/compose/foundation/foundation/src/androidAndroidTest/kotlin/androidx/compose/foundation/lazy/grid/LazyArrangementsTest.kt b/compose/foundation/foundation/src/androidAndroidTest/kotlin/androidx/compose/foundation/lazy/grid/LazyArrangementsTest.kt
index cf0cc10..a6ce04c 100644
--- a/compose/foundation/foundation/src/androidAndroidTest/kotlin/androidx/compose/foundation/lazy/grid/LazyArrangementsTest.kt
+++ b/compose/foundation/foundation/src/androidAndroidTest/kotlin/androidx/compose/foundation/lazy/grid/LazyArrangementsTest.kt
@@ -608,12 +608,7 @@
outPositions.forEachIndexed { index, position ->
val realIndex = if (reverseLayout) if (index == 0) 1 else 0 else index
- val size = if (realIndex == 0) itemSize else smallerItemSize
- val expectedPosition = if (layoutDirection == LayoutDirection.Ltr) {
- position.toDp()
- } else {
- containerSize - position.toDp() - size
- }
+ val expectedPosition = position.toDp()
rule.onNodeWithTag("$realIndex")
.assertLeftPositionInRootIsEqualTo(expectedPosition)
}
diff --git a/compose/foundation/foundation/src/androidAndroidTest/kotlin/androidx/compose/foundation/lazy/grid/LazyGridTest.kt b/compose/foundation/foundation/src/androidAndroidTest/kotlin/androidx/compose/foundation/lazy/grid/LazyGridTest.kt
index 1de6600..08b80b6 100644
--- a/compose/foundation/foundation/src/androidAndroidTest/kotlin/androidx/compose/foundation/lazy/grid/LazyGridTest.kt
+++ b/compose/foundation/foundation/src/androidAndroidTest/kotlin/androidx/compose/foundation/lazy/grid/LazyGridTest.kt
@@ -18,6 +18,7 @@
import android.os.Build
import androidx.compose.foundation.AutoTestFrameClock
+import androidx.compose.foundation.background
import androidx.compose.foundation.gestures.Orientation
import androidx.compose.foundation.gestures.scrollBy
import androidx.compose.foundation.layout.Box
@@ -1069,6 +1070,38 @@
}
@Test
+ fun laysOutRtlCorrectlyWithLargerContainer() {
+ val mainAxisSize = with(rule.density) { 250.toDp() }
+ val crossAxisSize = with(rule.density) { 110.toDp() }
+ val itemSize = with(rule.density) { 50.toDp() }
+
+ rule.setContent {
+ CompositionLocalProvider(LocalLayoutDirection provides LayoutDirection.Rtl) {
+ LazyGrid(cells = 2, modifier = Modifier.axisSize(crossAxisSize, mainAxisSize)) {
+ items(4) { index ->
+ val label = (index + 1).toString()
+ BasicText(label, Modifier.size(itemSize).testTag(label))
+ }
+ }
+ }
+ }
+
+ rule.onNodeWithTag("1").apply {
+ if (vertical) {
+ // 2 1
+ // 4 3
+ assertMainAxisStartPositionInRootIsEqualTo(0.dp)
+ assertCrossAxisStartPositionInRootIsEqualTo(crossAxisSize / 2)
+ } else {
+ // 3 1
+ // 4 2
+ assertCrossAxisStartPositionInRootIsEqualTo(0.dp)
+ assertMainAxisStartPositionInRootIsEqualTo(mainAxisSize - itemSize)
+ }
+ }
+ }
+
+ @Test
fun scrollDuringMeasure() {
rule.setContent {
BoxWithConstraints {
@@ -1121,6 +1154,48 @@
rule.onNodeWithTag("10")
.assertMainAxisStartPositionInRootIsEqualTo(0.dp)
}
+
+ @Test
+ fun changedLinesRemeasuredCorrectly() {
+ var flag by mutableStateOf(false)
+ rule.setContent {
+ LazyGrid(cells = GridCells.Fixed(2), modifier = Modifier.axisSize(60.dp, 100.dp)) {
+ item(
+ span = { GridItemSpan(maxLineSpan) }
+ ) {
+ Box(Modifier.mainAxisSize(32.dp).background(Color.Red))
+ }
+
+ if (flag) {
+ item {
+ Box(Modifier.mainAxisSize(32.dp).background(Color.Blue))
+ }
+
+ item {
+ Box(Modifier.mainAxisSize(32.dp).background(Color.Yellow).testTag("target"))
+ }
+ } else {
+ item(
+ span = { GridItemSpan(maxLineSpan) }
+ ) {
+ Box(Modifier.mainAxisSize(32.dp).background(Color.Blue))
+ }
+
+ item(
+ span = { GridItemSpan(maxLineSpan) }
+ ) {
+ Box(Modifier.mainAxisSize(32.dp).background(Color.Yellow).testTag("target"))
+ }
+ }
+ }
+ }
+
+ flag = true
+ rule.onNodeWithTag("target")
+ .assertCrossAxisSizeIsEqualTo(30.dp)
+ .assertMainAxisStartPositionInRootIsEqualTo(32.dp)
+ .assertCrossAxisStartPositionInRootIsEqualTo(30.dp)
+ }
}
internal fun IntegerSubject.isEqualTo(expected: Int, tolerance: Int) {
diff --git a/compose/foundation/foundation/src/androidAndroidTest/kotlin/androidx/compose/foundation/lazy/list/LazyArrangementsTest.kt b/compose/foundation/foundation/src/androidAndroidTest/kotlin/androidx/compose/foundation/lazy/list/LazyArrangementsTest.kt
index 48bb5d9..5464c8c 100644
--- a/compose/foundation/foundation/src/androidAndroidTest/kotlin/androidx/compose/foundation/lazy/list/LazyArrangementsTest.kt
+++ b/compose/foundation/foundation/src/androidAndroidTest/kotlin/androidx/compose/foundation/lazy/list/LazyArrangementsTest.kt
@@ -587,12 +587,7 @@
outPositions.forEachIndexed { index, position ->
val realIndex = if (reverseLayout) if (index == 0) 1 else 0 else index
- val size = if (realIndex == 0) itemSize else smallerItemSize
- val expectedPosition = if (layoutDirection == LayoutDirection.Ltr) {
- position.toDp()
- } else {
- containerSize - position.toDp() - size
- }
+ val expectedPosition = position.toDp()
rule.onNodeWithTag("$realIndex")
.assertLeftPositionInRootIsEqualTo(expectedPosition)
}
diff --git a/compose/foundation/foundation/src/androidAndroidTest/kotlin/androidx/compose/foundation/lazy/list/LazyRowTest.kt b/compose/foundation/foundation/src/androidAndroidTest/kotlin/androidx/compose/foundation/lazy/list/LazyRowTest.kt
index 69f89a5..74535c5 100644
--- a/compose/foundation/foundation/src/androidAndroidTest/kotlin/androidx/compose/foundation/lazy/list/LazyRowTest.kt
+++ b/compose/foundation/foundation/src/androidAndroidTest/kotlin/androidx/compose/foundation/lazy/list/LazyRowTest.kt
@@ -17,6 +17,7 @@
package androidx.compose.foundation.lazy.list
import androidx.compose.foundation.layout.Box
+import androidx.compose.foundation.layout.Column
import androidx.compose.foundation.layout.Spacer
import androidx.compose.foundation.layout.requiredHeight
import androidx.compose.foundation.layout.size
@@ -25,6 +26,7 @@
import androidx.compose.foundation.lazy.LazyRow
import androidx.compose.foundation.lazy.items
import androidx.compose.foundation.lazy.rememberLazyListState
+import androidx.compose.foundation.text.BasicText
import androidx.compose.runtime.CompositionLocalProvider
import androidx.compose.ui.Alignment
import androidx.compose.ui.Modifier
@@ -146,4 +148,26 @@
assertThat(state.firstVisibleItemScrollOffset).isGreaterThan(0)
}
}
+
+ @Test
+ fun laysOutRtlCorrectlyWithLargerRow() {
+ val rowWidth = with(rule.density) { 300.toDp() }
+ val rowHeight = with(rule.density) { 100.toDp() }
+ val itemSize = with(rule.density) { 50.toDp() }
+ rule.setContent {
+ Column {
+ CompositionLocalProvider(LocalLayoutDirection provides LayoutDirection.Rtl) {
+ LazyRow(modifier = Modifier.size(width = rowWidth, height = rowHeight)) {
+ items(3) { index ->
+ val label = index.toString()
+ BasicText(label, Modifier.size(itemSize).testTag(label))
+ }
+ }
+ }
+ }
+ }
+
+ rule.onNodeWithTag("0")
+ .assertPositionInRootIsEqualTo(rowWidth - itemSize, 0.dp)
+ }
}
diff --git a/compose/foundation/foundation/src/androidAndroidTest/kotlin/androidx/compose/foundation/text/TextControllerTest.kt b/compose/foundation/foundation/src/androidAndroidTest/kotlin/androidx/compose/foundation/text/TextControllerTest.kt
deleted file mode 100644
index 3bad5a1..0000000
--- a/compose/foundation/foundation/src/androidAndroidTest/kotlin/androidx/compose/foundation/text/TextControllerTest.kt
+++ /dev/null
@@ -1,120 +0,0 @@
-/*
- * Copyright 2021 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package androidx.compose.foundation.text
-
-import android.content.Context
-import android.graphics.Typeface
-import android.os.Build
-import androidx.compose.ui.draw.drawBehind
-import androidx.compose.ui.layout.Layout
-import androidx.compose.ui.test.junit4.createComposeRule
-import androidx.compose.ui.text.AnnotatedString
-import androidx.compose.ui.text.TextStyle
-import androidx.compose.ui.text.font.AndroidFont
-import androidx.compose.ui.text.font.AndroidFont.TypefaceLoader
-import androidx.compose.ui.text.font.FontLoadingStrategy
-import androidx.compose.ui.text.font.FontStyle
-import androidx.compose.ui.text.font.FontWeight
-import androidx.compose.ui.text.font.createFontFamilyResolver
-import androidx.compose.ui.text.font.toFontFamily
-import androidx.compose.ui.unit.Density
-import androidx.test.ext.junit.runners.AndroidJUnit4
-import androidx.test.filters.MediumTest
-import androidx.test.filters.SdkSuppress
-import androidx.test.platform.app.InstrumentationRegistry
-import com.google.common.truth.Truth.assertThat
-import java.util.concurrent.atomic.AtomicInteger
-import kotlinx.coroutines.CompletableDeferred
-import kotlinx.coroutines.ExperimentalCoroutinesApi
-import kotlinx.coroutines.channels.Channel
-import kotlinx.coroutines.runBlocking
-import org.junit.Rule
-import org.junit.Test
-import org.junit.runner.RunWith
-
-@MediumTest
-@RunWith(AndroidJUnit4::class)
-@SdkSuppress(minSdkVersion = Build.VERSION_CODES.O)
-class TextControllerTest {
- @get:Rule
- val rule = createComposeRule()
-
- val context: Context = InstrumentationRegistry.getInstrumentation().context
-
- @OptIn(ExperimentalCoroutinesApi::class, InternalFoundationTextApi::class)
- @Test
- fun asyncTextResolution_causesRedraw() {
- val loadDeferred = CompletableDeferred<Unit>()
- val drawChannel = Channel<Unit>(capacity = Channel.UNLIMITED)
- val drawCount = AtomicInteger(0)
- val textDelegate = makeTextDelegate(loadDeferred)
-
- val subject = TextController(TextState(textDelegate, 17L))
-
- val modifiers = subject.modifiers.drawBehind {
- drawCount.incrementAndGet()
- drawChannel.trySend(Unit)
- }
-
- rule.setContent {
- Layout(modifiers, subject.measurePolicy)
- }
- runBlocking {
- // empty the draw channel here. sentContent already ensured that draw ran.
- // we just need this for sequencing AtomicInteger read/write/read later
- while (!drawChannel.isEmpty) {
- drawChannel.receive()
- }
- }
- val initialCount = drawCount.get()
- assertThat(initialCount).isGreaterThan(0)
-
- // this may take a while to make compose non-idle, so wait for drawChannel explicit sync
- loadDeferred.complete(Unit)
- runBlocking { drawChannel.receive() }
- rule.waitForIdle()
-
- assertThat(drawCount.get()).isGreaterThan(initialCount)
- }
-
- @OptIn(InternalFoundationTextApi::class)
- private fun makeTextDelegate(onFontFinishedLoad: CompletableDeferred<Unit>): TextDelegate {
- val typefaceLoader = object : TypefaceLoader {
- override fun loadBlocking(context: Context, font: AndroidFont): Typeface? {
- TODO("Not yet implemented")
- }
-
- override suspend fun awaitLoad(context: Context, font: AndroidFont): Typeface? {
- onFontFinishedLoad.await()
- return Typeface.create("cursive", 0)
- }
- }
- val asyncFont = object : AndroidFont(FontLoadingStrategy.Async, typefaceLoader) {
- override val weight: FontWeight
- get() = FontWeight.Normal
- override val style: FontStyle
- get() = FontStyle.Normal
- }
-
- return TextDelegate(
- AnnotatedString("til"),
- TextStyle.Default.copy(fontFamily = asyncFont.toFontFamily()),
- density = Density(1f, 1f),
- fontFamilyResolver = createFontFamilyResolver(context)
- )
- }
-}
\ No newline at end of file
diff --git a/compose/foundation/foundation/src/androidAndroidTest/kotlin/androidx/compose/foundation/text/selection/TextSelectionColorsScreenshotTest.kt b/compose/foundation/foundation/src/androidAndroidTest/kotlin/androidx/compose/foundation/text/selection/TextSelectionColorsScreenshotTest.kt
index bd3c896..96980dac 100644
--- a/compose/foundation/foundation/src/androidAndroidTest/kotlin/androidx/compose/foundation/text/selection/TextSelectionColorsScreenshotTest.kt
+++ b/compose/foundation/foundation/src/androidAndroidTest/kotlin/androidx/compose/foundation/text/selection/TextSelectionColorsScreenshotTest.kt
@@ -43,7 +43,6 @@
import androidx.test.ext.junit.runners.AndroidJUnit4
import androidx.test.filters.LargeTest
import androidx.test.filters.SdkSuppress
-import androidx.test.filters.Suppress
import androidx.test.screenshot.AndroidXScreenshotTestRule
import org.junit.Rule
import org.junit.Test
@@ -107,7 +106,6 @@
.assertAgainstGolden(screenshotRule, "text_customSelectionColors")
}
- @Suppress // crashes when creating actuals on local b/228583901
@Test
fun textField_defaultSelectionColors() {
rule.setContent {
@@ -128,7 +126,6 @@
.assertAgainstGolden(screenshotRule, "textField_defaultSelectionColors")
}
- @Suppress // crashes when creating actuals on local b/228583901
@Test
fun textField_customSelectionColors() {
rule.setContent {
diff --git a/compose/foundation/foundation/src/commonMain/kotlin/androidx/compose/foundation/gestures/Scrollable.kt b/compose/foundation/foundation/src/commonMain/kotlin/androidx/compose/foundation/gestures/Scrollable.kt
index e71eeb8..f94e0a6 100644
--- a/compose/foundation/foundation/src/commonMain/kotlin/androidx/compose/foundation/gestures/Scrollable.kt
+++ b/compose/foundation/foundation/src/commonMain/kotlin/androidx/compose/foundation/gestures/Scrollable.kt
@@ -226,8 +226,8 @@
scrollingLogicState: State<ScrollingLogic>,
mouseWheelScrollConfig: ScrollConfig,
) = pointerInput(scrollingLogicState, mouseWheelScrollConfig) {
- while (true) {
- awaitPointerEventScope {
+ awaitPointerEventScope {
+ while (true) {
val event = awaitScrollEvent()
if (event.changes.fastAll { !it.isConsumed }) {
with(mouseWheelScrollConfig) {
diff --git a/compose/foundation/foundation/src/commonMain/kotlin/androidx/compose/foundation/gestures/TransformGestureDetector.kt b/compose/foundation/foundation/src/commonMain/kotlin/androidx/compose/foundation/gestures/TransformGestureDetector.kt
index e7aedb6..4213b98 100644
--- a/compose/foundation/foundation/src/commonMain/kotlin/androidx/compose/foundation/gestures/TransformGestureDetector.kt
+++ b/compose/foundation/foundation/src/commonMain/kotlin/androidx/compose/foundation/gestures/TransformGestureDetector.kt
@@ -24,7 +24,6 @@
import androidx.compose.ui.util.fastAny
import androidx.compose.ui.util.fastForEach
import androidx.compose.ui.util.fastSumBy
-import kotlin.contracts.ExperimentalContracts
import kotlin.math.PI
import kotlin.math.abs
import kotlin.math.atan2
@@ -236,7 +235,6 @@
* Example Usage:
* @sample androidx.compose.foundation.samples.CalculateCentroidSize
*/
-@OptIn(ExperimentalContracts::class)
fun PointerEvent.calculateCentroid(
useCurrent: Boolean = true
): Offset {
diff --git a/compose/foundation/foundation/src/commonMain/kotlin/androidx/compose/foundation/lazy/LazyList.kt b/compose/foundation/foundation/src/commonMain/kotlin/androidx/compose/foundation/lazy/LazyList.kt
index 858a996..14a479e 100644
--- a/compose/foundation/foundation/src/commonMain/kotlin/androidx/compose/foundation/lazy/LazyList.kt
+++ b/compose/foundation/foundation/src/commonMain/kotlin/androidx/compose/foundation/lazy/LazyList.kt
@@ -280,7 +280,6 @@
horizontalArrangement = horizontalArrangement,
reverseLayout = reverseLayout,
density = this,
- layoutDirection = layoutDirection,
placementAnimator = placementAnimator,
beyondBoundsInfo = beyondBoundsInfo,
layout = { width, height, placement ->
diff --git a/compose/foundation/foundation/src/commonMain/kotlin/androidx/compose/foundation/lazy/LazyListMeasure.kt b/compose/foundation/foundation/src/commonMain/kotlin/androidx/compose/foundation/lazy/LazyListMeasure.kt
index 00a5ac1..22dc643 100644
--- a/compose/foundation/foundation/src/commonMain/kotlin/androidx/compose/foundation/lazy/LazyListMeasure.kt
+++ b/compose/foundation/foundation/src/commonMain/kotlin/androidx/compose/foundation/lazy/LazyListMeasure.kt
@@ -51,7 +51,6 @@
horizontalArrangement: Arrangement.Horizontal?,
reverseLayout: Boolean,
density: Density,
- layoutDirection: LayoutDirection,
placementAnimator: LazyListItemPlacementAnimator,
beyondBoundsInfo: LazyListBeyondBoundsInfo,
layout: (Int, Int, Placeable.PlacementScope.() -> Unit) -> MeasureResult
@@ -264,7 +263,6 @@
horizontalArrangement = horizontalArrangement,
reverseLayout = reverseLayout,
density = density,
- layoutDirection = layoutDirection
)
val headerItem = if (headerIndexes.isNotEmpty()) {
@@ -334,7 +332,6 @@
horizontalArrangement: Arrangement.Horizontal?,
reverseLayout: Boolean,
density: Density,
- layoutDirection: LayoutDirection
): MutableList<LazyListPositionedItem> {
val mainAxisLayoutSize = if (isVertical) layoutHeight else layoutWidth
val hasSpareSpace = finalMainAxisOffset < minOf(mainAxisLayoutSize, maxOffset)
@@ -359,7 +356,8 @@
}
} else {
with(requireNotNull(horizontalArrangement)) {
- density.arrange(mainAxisLayoutSize, sizes, layoutDirection, offsets)
+ // Enforces Ltr layout direction as it is mirrored with placeRelative later.
+ density.arrange(mainAxisLayoutSize, sizes, LayoutDirection.Ltr, offsets)
}
}
offsets.forEachIndexed { index, absoluteOffset ->
diff --git a/compose/foundation/foundation/src/commonMain/kotlin/androidx/compose/foundation/lazy/grid/LazyGrid.kt b/compose/foundation/foundation/src/commonMain/kotlin/androidx/compose/foundation/lazy/grid/LazyGrid.kt
index 581205b..bce900a 100644
--- a/compose/foundation/foundation/src/commonMain/kotlin/androidx/compose/foundation/lazy/grid/LazyGrid.kt
+++ b/compose/foundation/foundation/src/commonMain/kotlin/androidx/compose/foundation/lazy/grid/LazyGrid.kt
@@ -32,8 +32,6 @@
import androidx.compose.foundation.lazy.layout.LazyLayout
import androidx.compose.foundation.lazy.layout.LazyLayoutMeasureScope
import androidx.compose.runtime.Composable
-import androidx.compose.runtime.State
-import androidx.compose.runtime.derivedStateOf
import androidx.compose.runtime.remember
import androidx.compose.runtime.rememberCoroutineScope
import androidx.compose.ui.Modifier
@@ -80,10 +78,6 @@
val itemProvider = rememberItemProvider(state, content)
- val spanLayoutProvider = remember(itemProvider) {
- derivedStateOf { LazyGridSpanLayoutProvider(itemProvider) }
- }
-
val scope = rememberCoroutineScope()
val placementAnimator = remember(state, isVertical) {
LazyGridItemPlacementAnimator(scope, isVertical)
@@ -94,7 +88,6 @@
itemProvider,
state,
overScrollController,
- spanLayoutProvider,
slotSizesSums,
contentPadding,
reverseLayout,
@@ -167,8 +160,6 @@
state: LazyGridState,
/** The overscroll controller. */
overScrollController: OverScrollController,
- /** Cache based provider for spans. */
- stateOfSpanLayoutProvider: State<LazyGridSpanLayoutProvider>,
/** Prefix sums of cross axis sizes of slots of the grid. */
slotSizesSums: Density.(Constraints) -> List<Int>,
/** The inner padding to be added for the whole content(nor for each individual item) */
@@ -216,7 +207,7 @@
state.updateScrollPositionIfTheFirstItemWasMoved(itemProvider)
- val spanLayoutProvider = stateOfSpanLayoutProvider.value
+ val spanLayoutProvider = itemProvider.spanLayoutProvider
val resolvedSlotSizesSums = slotSizesSums(constraints)
spanLayoutProvider.slotsPerLine = resolvedSlotSizesSums.size
@@ -330,7 +321,6 @@
horizontalArrangement = horizontalArrangement,
reverseLayout = reverseLayout,
density = this,
- layoutDirection = layoutDirection,
placementAnimator = placementAnimator,
layout = { width, height, placement ->
layout(
diff --git a/compose/foundation/foundation/src/commonMain/kotlin/androidx/compose/foundation/lazy/grid/LazyGridItemProvider.kt b/compose/foundation/foundation/src/commonMain/kotlin/androidx/compose/foundation/lazy/grid/LazyGridItemProvider.kt
index d2f12c5..df4d695 100644
--- a/compose/foundation/foundation/src/commonMain/kotlin/androidx/compose/foundation/lazy/grid/LazyGridItemProvider.kt
+++ b/compose/foundation/foundation/src/commonMain/kotlin/androidx/compose/foundation/lazy/grid/LazyGridItemProvider.kt
@@ -21,9 +21,5 @@
@ExperimentalFoundationApi
internal interface LazyGridItemProvider : LazyLayoutItemProvider {
- /** Returns the span for the given [index] */
- fun LazyGridItemSpanScope.getSpan(index: Int): GridItemSpan
-
- /** Whether the grid has custom spans. Otherwise, it means all items are 1x1 */
- val hasCustomSpans: Boolean
+ val spanLayoutProvider: LazyGridSpanLayoutProvider
}
diff --git a/compose/foundation/foundation/src/commonMain/kotlin/androidx/compose/foundation/lazy/grid/LazyGridItemProviderImpl.kt b/compose/foundation/foundation/src/commonMain/kotlin/androidx/compose/foundation/lazy/grid/LazyGridItemProviderImpl.kt
index cbd7cd0..f6d26df 100644
--- a/compose/foundation/foundation/src/commonMain/kotlin/androidx/compose/foundation/lazy/grid/LazyGridItemProviderImpl.kt
+++ b/compose/foundation/foundation/src/commonMain/kotlin/androidx/compose/foundation/lazy/grid/LazyGridItemProviderImpl.kt
@@ -77,6 +77,8 @@
val itemsCount get() = intervals.totalSize
+ val spanLayoutProvider = LazyGridSpanLayoutProvider(this)
+
fun getKey(index: Int): Any {
val interval = getIntervalForIndex(index)
val localIntervalIndex = index - interval.startIndex
@@ -118,16 +120,10 @@
internal class LazyGridItemProviderImpl(
private val itemsSnapshot: State<LazyGridItemsSnapshot>
) : LazyGridItemProvider {
-
override val itemCount get() = itemsSnapshot.value.itemsCount
override fun getKey(index: Int) = itemsSnapshot.value.getKey(index)
- override fun LazyGridItemSpanScope.getSpan(index: Int): GridItemSpan =
- with(itemsSnapshot.value) { getSpan(index) }
-
- override val hasCustomSpans: Boolean get() = itemsSnapshot.value.hasCustomSpans
-
@Composable
override fun Item(index: Int) {
itemsSnapshot.value.Item(index)
@@ -136,6 +132,9 @@
override val keyToIndexMap: Map<Any, Int> get() = itemsSnapshot.value.keyToIndexMap
override fun getContentType(index: Int) = itemsSnapshot.value.getContentType(index)
+
+ override val spanLayoutProvider: LazyGridSpanLayoutProvider
+ get() = itemsSnapshot.value.spanLayoutProvider
}
/**
diff --git a/compose/foundation/foundation/src/commonMain/kotlin/androidx/compose/foundation/lazy/grid/LazyGridMeasure.kt b/compose/foundation/foundation/src/commonMain/kotlin/androidx/compose/foundation/lazy/grid/LazyGridMeasure.kt
index 04e730d..541c7c8 100644
--- a/compose/foundation/foundation/src/commonMain/kotlin/androidx/compose/foundation/lazy/grid/LazyGridMeasure.kt
+++ b/compose/foundation/foundation/src/commonMain/kotlin/androidx/compose/foundation/lazy/grid/LazyGridMeasure.kt
@@ -54,7 +54,6 @@
horizontalArrangement: Arrangement.Horizontal?,
reverseLayout: Boolean,
density: Density,
- layoutDirection: LayoutDirection,
placementAnimator: LazyGridItemPlacementAnimator,
layout: (Int, Int, Placeable.PlacementScope.() -> Unit) -> MeasureResult
): LazyGridMeasureResult {
@@ -231,8 +230,7 @@
verticalArrangement = verticalArrangement,
horizontalArrangement = horizontalArrangement,
reverseLayout = reverseLayout,
- density = density,
- layoutDirection = layoutDirection
+ density = density
)
placementAnimator.onMeasured(
@@ -280,7 +278,6 @@
horizontalArrangement: Arrangement.Horizontal?,
reverseLayout: Boolean,
density: Density,
- layoutDirection: LayoutDirection
): MutableList<LazyGridPositionedItem> {
val mainAxisLayoutSize = if (isVertical) layoutHeight else layoutWidth
val hasSpareSpace = finalMainAxisOffset < min(mainAxisLayoutSize, maxOffset)
@@ -303,7 +300,8 @@
}
} else {
with(requireNotNull(horizontalArrangement)) {
- density.arrange(mainAxisLayoutSize, sizes, layoutDirection, offsets)
+ // Enforces Ltr layout direction as it is mirrored with placeRelative later.
+ density.arrange(mainAxisLayoutSize, sizes, LayoutDirection.Ltr, offsets)
}
}
offsets.forEachIndexed { index, absoluteOffset ->
diff --git a/compose/foundation/foundation/src/commonMain/kotlin/androidx/compose/foundation/lazy/grid/LazyGridSpanLayoutProvider.kt b/compose/foundation/foundation/src/commonMain/kotlin/androidx/compose/foundation/lazy/grid/LazyGridSpanLayoutProvider.kt
index 6c0f594..18b32e7 100644
--- a/compose/foundation/foundation/src/commonMain/kotlin/androidx/compose/foundation/lazy/grid/LazyGridSpanLayoutProvider.kt
+++ b/compose/foundation/foundation/src/commonMain/kotlin/androidx/compose/foundation/lazy/grid/LazyGridSpanLayoutProvider.kt
@@ -21,7 +21,7 @@
import kotlin.math.sqrt
@OptIn(ExperimentalFoundationApi::class)
-internal class LazyGridSpanLayoutProvider(private val itemProvider: LazyGridItemProvider) {
+internal class LazyGridSpanLayoutProvider(private val itemsSnapshot: LazyGridItemsSnapshot) {
class LineConfiguration(val firstItemIndex: Int, val spans: List<GridItemSpan>)
/** Caches the bucket info on lines 0, [bucketSize], 2 * [bucketSize], etc. */
@@ -60,7 +60,7 @@
List(currentSlotsPerLine) { GridItemSpan(1) }.also { previousDefaultSpans = it }
}
- val totalSize get() = itemProvider.itemCount
+ val totalSize get() = itemsSnapshot.itemsCount
/** The number of slots on one grid line e.g. the number of columns of a vertical grid. */
var slotsPerLine = 0
@@ -72,7 +72,7 @@
}
fun getLineConfiguration(lineIndex: Int): LineConfiguration {
- if (!itemProvider.hasCustomSpans) {
+ if (!itemsSnapshot.hasCustomSpans) {
// Quick return when all spans are 1x1 - in this case we can easily calculate positions.
val firstItemIndex = lineIndex * slotsPerLine
return LineConfiguration(
@@ -172,7 +172,7 @@
return LineIndex(0)
}
require(itemIndex < totalSize)
- if (!itemProvider.hasCustomSpans) {
+ if (!itemsSnapshot.hasCustomSpans) {
return LineIndex(itemIndex / slotsPerLine)
}
@@ -210,7 +210,7 @@
return LineIndex(currentLine)
}
- private fun spanOf(itemIndex: Int, maxSpan: Int) = with(itemProvider) {
+ private fun spanOf(itemIndex: Int, maxSpan: Int) = with(itemsSnapshot) {
with(LazyGridItemSpanScopeImpl) {
maxCurrentLineSpan = maxSpan
maxLineSpan = slotsPerLine
diff --git a/compose/foundation/foundation/src/commonMain/kotlin/androidx/compose/foundation/text/CoreText.kt b/compose/foundation/foundation/src/commonMain/kotlin/androidx/compose/foundation/text/CoreText.kt
index ffaf532..6b9c9b4 100644
--- a/compose/foundation/foundation/src/commonMain/kotlin/androidx/compose/foundation/text/CoreText.kt
+++ b/compose/foundation/foundation/src/commonMain/kotlin/androidx/compose/foundation/text/CoreText.kt
@@ -28,10 +28,6 @@
import androidx.compose.runtime.Composable
import androidx.compose.runtime.RememberObserver
import androidx.compose.runtime.Stable
-import androidx.compose.runtime.getValue
-import androidx.compose.runtime.mutableStateOf
-import androidx.compose.runtime.setValue
-import androidx.compose.runtime.snapshots.Snapshot
import androidx.compose.ui.Modifier
import androidx.compose.ui.draw.drawBehind
import androidx.compose.ui.geometry.Offset
@@ -310,18 +306,15 @@
// NOTE(text-perf-review): current implementation of layout means that layoutResult
// will _never_ be the same instance. We should try and fast path case where
// everything is the same and return same instance in that case.
- val prevLayout = Snapshot.withoutReadObservation {
- state.layoutResult
- }
val layoutResult = state.textDelegate.layout(
constraints,
layoutDirection,
- prevLayout
+ state.layoutResult
)
- if (prevLayout != layoutResult) {
+ if (state.layoutResult != layoutResult) {
state.onTextLayout(layoutResult)
- prevLayout?.let { prevLayoutResult ->
+ state.layoutResult?.let { prevLayoutResult ->
// If the input text of this CoreText has changed, notify the SelectionContainer.
if (prevLayoutResult.layoutInput.text != layoutResult.layoutInput.text) {
selectionRegistrar?.notifySelectableChange(state.selectableId)
@@ -346,6 +339,7 @@
)
}
}
+
return layout(
layoutResult.size.width,
layoutResult.size.height,
@@ -530,7 +524,7 @@
var layoutCoordinates: LayoutCoordinates? = null
/** The latest TextLayoutResult calculated in the measure block.*/
- var layoutResult: TextLayoutResult? by mutableStateOf(null)
+ var layoutResult: TextLayoutResult? = null
/** The global position calculated during the last notifyPosition callback */
var previousGlobalPosition: Offset = Offset.Zero
diff --git a/compose/foundation/foundation/src/commonMain/kotlin/androidx/compose/foundation/text/CoreTextField.kt b/compose/foundation/foundation/src/commonMain/kotlin/androidx/compose/foundation/text/CoreTextField.kt
index c088c4f..0080496 100644
--- a/compose/foundation/foundation/src/commonMain/kotlin/androidx/compose/foundation/text/CoreTextField.kt
+++ b/compose/foundation/foundation/src/commonMain/kotlin/androidx/compose/foundation/text/CoreTextField.kt
@@ -41,7 +41,6 @@
import androidx.compose.runtime.rememberCoroutineScope
import androidx.compose.runtime.saveable.rememberSaveable
import androidx.compose.runtime.setValue
-import androidx.compose.runtime.snapshots.Snapshot
import androidx.compose.ui.Modifier
import androidx.compose.ui.draw.drawBehind
import androidx.compose.ui.focus.FocusManager
@@ -556,16 +555,13 @@
measurables: List<Measurable>,
constraints: Constraints
): MeasureResult {
- val prevResult = Snapshot.withoutReadObservation {
- state.layoutResult?.value
- }
val (width, height, result) = TextFieldDelegate.layout(
state.textDelegate,
constraints,
layoutDirection,
- prevResult
+ state.layoutResult?.value
)
- if (prevResult != result) {
+ if (state.layoutResult?.value != result) {
state.layoutResult = TextLayoutResultProxy(result)
onTextLayout(result)
}
@@ -705,7 +701,7 @@
* position using the [TextFieldValue.selection] value which corresponds to the text directly,
* and therefore does not require the translation.
*/
- var layoutResult: TextLayoutResultProxy? by mutableStateOf(null)
+ var layoutResult: TextLayoutResultProxy? = null
/**
* The gesture detector state, to indicate whether current state is selection, cursor
diff --git a/compose/foundation/foundation/src/test/kotlin/androidx/compose/foundation/text/TextFieldStateTest.kt b/compose/foundation/foundation/src/test/kotlin/androidx/compose/foundation/text/TextFieldStateTest.kt
deleted file mode 100644
index fb19cb8..0000000
--- a/compose/foundation/foundation/src/test/kotlin/androidx/compose/foundation/text/TextFieldStateTest.kt
+++ /dev/null
@@ -1,45 +0,0 @@
-/*
- * Copyright 2022 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package androidx.compose.foundation.text
-
-import androidx.compose.runtime.snapshots.Snapshot
-import com.google.common.truth.Truth
-import com.nhaarman.mockitokotlin2.mock
-import org.junit.Test
-import org.junit.runner.RunWith
-import org.junit.runners.JUnit4
-
-@RunWith(JUnit4::class)
-internal class TextFieldStateTest {
-
- @OptIn(InternalFoundationTextApi::class)
- @Test
- fun layoutResult_isSnapshotState() {
- // this is really a test about references, so just using mocks
- val subject = TextFieldState(
- mock(), // not needed for test
- mock(), // not needed for test
- )
- val result1 = TextLayoutResultProxy(mock())
- val snapshot = Snapshot.takeMutableSnapshot()
- snapshot.enter {
- subject.layoutResult = result1
- Truth.assertThat(subject.layoutResult).isSameInstanceAs(result1)
- }
- Truth.assertThat(subject.layoutResult).isSameInstanceAs(null)
- }
-}
\ No newline at end of file
diff --git a/compose/foundation/foundation/src/test/kotlin/androidx/compose/foundation/text/TextStateTest.kt b/compose/foundation/foundation/src/test/kotlin/androidx/compose/foundation/text/TextStateTest.kt
deleted file mode 100644
index 78908fe..0000000
--- a/compose/foundation/foundation/src/test/kotlin/androidx/compose/foundation/text/TextStateTest.kt
+++ /dev/null
@@ -1,46 +0,0 @@
-/*
- * Copyright 2022 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package androidx.compose.foundation.text
-
-import androidx.compose.runtime.snapshots.Snapshot
-import androidx.compose.ui.text.TextLayoutResult
-import com.google.common.truth.Truth.assertThat
-import com.nhaarman.mockitokotlin2.mock
-import org.junit.Test
-import org.junit.runner.RunWith
-import org.junit.runners.JUnit4
-
-@RunWith(JUnit4::class)
-internal class TextStateTest {
-
- @OptIn(InternalFoundationTextApi::class)
- @Test
- fun layoutResult_isSnapshotState() {
- // this is really a test about references, so just using mocks
- val subject = TextState(
- mock(), // not needed for test
- 17L,
- )
- val result1 = mock<TextLayoutResult>()
- val snapshot = Snapshot.takeMutableSnapshot()
- snapshot.enter {
- subject.layoutResult = result1
- assertThat(subject.layoutResult).isSameInstanceAs(result1)
- }
- assertThat(subject.layoutResult).isSameInstanceAs(null)
- }
-}
\ No newline at end of file
diff --git a/compose/integration-tests/docs-snippets/OWNERS b/compose/integration-tests/docs-snippets/OWNERS
index 2d38f28..0cec323 100644
--- a/compose/integration-tests/docs-snippets/OWNERS
+++ b/compose/integration-tests/docs-snippets/OWNERS
@@ -1,10 +1,13 @@
asolovay@google.com
-chrisbanes@google.com
florinam@google.com
jolandaverhoef@google.com
jalc@google.com
mvivo@google.com
nickbutcher@google.com
-shailentuli@google.com
-yrezgui@google.com
-yaraki@google.com
+bentrengrove@google.com
+anomis@google.com
+iangclifton@google.com
+stamato@google.com
+riggaroo@google.com
+chrisarriola@google.com
+nickrout@google.com
\ No newline at end of file
diff --git a/compose/integration-tests/docs-snippets/src/main/java/androidx/compose/integration/docs/performance/Performance.kt b/compose/integration-tests/docs-snippets/src/main/java/androidx/compose/integration/docs/performance/Performance.kt
new file mode 100644
index 0000000..c824121
--- /dev/null
+++ b/compose/integration-tests/docs-snippets/src/main/java/androidx/compose/integration/docs/performance/Performance.kt
@@ -0,0 +1,290 @@
+/*
+ * 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.
+ */
+
+// Ignore lint warnings in documentation snippets
+@file:Suppress("unused", "UNUSED_PARAMETER", "UNUSED_VARIABLE", "UNUSED_ANONYMOUS_PARAMETER")
+
+package androidx.compose.integration.docs.performance
+
+import androidx.compose.animation.AnimatedVisibility
+import androidx.compose.foundation.background
+import androidx.compose.foundation.layout.Box
+import androidx.compose.foundation.layout.Column
+import androidx.compose.foundation.layout.fillMaxSize
+import androidx.compose.foundation.layout.offset
+import androidx.compose.foundation.layout.wrapContentSize
+import androidx.compose.foundation.lazy.LazyColumn
+import androidx.compose.foundation.lazy.items
+import androidx.compose.foundation.lazy.rememberLazyListState
+import androidx.compose.foundation.rememberScrollState
+import androidx.compose.material.Button
+import androidx.compose.material.Text
+import androidx.compose.runtime.Composable
+import androidx.compose.runtime.State
+import androidx.compose.runtime.derivedStateOf
+import androidx.compose.runtime.getValue
+import androidx.compose.runtime.mutableStateOf
+import androidx.compose.runtime.remember
+import androidx.compose.runtime.setValue
+import androidx.compose.ui.Modifier
+import androidx.compose.ui.draw.drawBehind
+import androidx.compose.ui.graphics.Color
+import androidx.compose.ui.platform.LocalDensity
+import androidx.compose.ui.unit.IntOffset
+
+/**
+ * This file lets DevRel track changes to snippets present in
+ * https://developer.android.com/jetpack/compose/performance
+ *
+ * No action required if it's modified.
+ */
+
+private object ContactsListBadSort {
+ @Composable
+ fun ContactList(
+ contacts: List<Contact>,
+ comparator: Comparator<Contact>,
+ modifier: Modifier = Modifier
+ ) {
+ LazyColumn(modifier) {
+ // DON’T DO THIS
+ items(contacts.sortedWith(comparator)) { contact ->
+ // ...
+ }
+ }
+ }
+}
+
+private object ContactsListGoodSort {
+ @Composable
+ fun ContactList(
+ contacts: List<Contact>,
+ comparator: Comparator<Contact>,
+ modifier: Modifier = Modifier
+ ) {
+ val sortedContacts = remember(contacts, sortComparator) {
+ contacts.sortedWith(sortComparator)
+ }
+
+ LazyColumn(modifier) {
+ items(sortedContacts) {
+ // ...
+ }
+ }
+ }
+}
+
+private object NotesListNoKeys {
+ @Composable
+ fun NotesList(notes: List<Note>) {
+ LazyColumn {
+ items(
+ items = notes
+ ) { note ->
+ NoteRow(note)
+ }
+ }
+ }
+}
+
+private object NotesListKeys {
+ @Composable
+ fun NotesList(notes: List<Note>) {
+ LazyColumn {
+ items(
+ items = notes,
+ key = { note ->
+ // Return a stable, unique key for the note
+ note.id
+ }
+ ) { note ->
+ NoteRow(note)
+ }
+ }
+ }
+}
+
+// RememberListStateBadExampleSnippet is an antipattern, the correct way
+// to do this is shown in DerivedStateSnippet
+@Composable
+private fun RememberListStateBadExampleSnippet() {
+ val listState = rememberLazyListState()
+
+ LazyColumn(state = listState) {
+ // ...
+ }
+
+ val showButton = listState.firstVisibleItemIndex > 0
+
+ AnimatedVisibility(visible = showButton) {
+ ScrollToTopButton()
+ }
+}
+
+@Composable
+private fun DerivedStateSnippet() {
+ val listState = rememberLazyListState()
+
+ LazyColumn(state = listState) {
+ // ...
+ }
+
+ val showButton by remember {
+ derivedStateOf {
+ listState.firstVisibleItemIndex > 0
+ }
+ }
+
+ AnimatedVisibility(visible = showButton) {
+ ScrollToTopButton()
+ }
+}
+
+private object DeferredReadPreOptimization {
+ @Composable
+ fun SnackDetail() {
+ // ...
+
+ Box(Modifier.fillMaxSize()) { // Recomposition Scope Start
+ val scroll = rememberScrollState(0)
+ // ...
+ Title(snack, scroll.value)
+ // ...
+ } // Recomposition Scope End
+ }
+
+ @Composable
+ private fun Title(snack: Snack, scroll: Int) {
+ // ...
+ val offset = with(LocalDensity.current) { scroll.toDp() }
+
+ Column(
+ modifier = Modifier
+ .offset(y = offset)
+ ) {
+ // ...
+ }
+ }
+}
+
+private object DeferredReadFirstOptimization {
+ @Composable
+ fun SnackDetail() {
+ // ...
+
+ Box(Modifier.fillMaxSize()) { // Recomposition Scope Start
+ val scroll = rememberScrollState(0)
+ // ...
+ Title(snack) { scroll.value }
+ // ...
+ } // Recomposition Scope End
+ }
+
+ @Composable
+ private fun Title(snack: Snack, scrollProvider: () -> Int) {
+ // ...
+ val offset = with(LocalDensity.current) { scrollProvider().toDp() }
+ Column(
+ modifier = Modifier
+ .offset(y = offset)
+ ) {
+ // ...
+ }
+ }
+}
+
+private object DeferredReadSecondOptimization {
+ @Composable
+ private fun Title(snack: Snack, scrollProvider: () -> Int) {
+ // ...
+ Column(
+ modifier = Modifier
+ .offset { IntOffset(x = 0, y = scrollProvider()) }
+ ) {
+ // ...
+ }
+ }
+}
+
+// Following code is an antipattern, better code is in the following AnimateColorFixed
+@Composable
+private fun AnimateColorBadExample() {
+ // Here, assume animateColorBetween() is a function that swaps between
+ // two colors
+ val color by animateColorBetween(Color.Cyan, Color.Magenta)
+
+ Box(Modifier.fillMaxSize().background(color))
+}
+
+@Composable
+private fun AnimateColorFixed() {
+ val color by animateColorBetween(Color.Cyan, Color.Magenta)
+
+ Box(
+ Modifier
+ .fillMaxSize()
+ .drawBehind {
+ drawRect(color)
+ }
+ )
+}
+
+// Following function shows antipattern, bad backwards write to state
+
+private object BackwardsWriteSnippet {
+ @Composable
+ fun BadComposable() {
+ var count by remember { mutableStateOf(0) }
+
+ // Causes recomposition on click
+ Button(onClick = { count++ }, Modifier.wrapContentSize()) {
+ Text("Recompose")
+ }
+
+ Text("$count")
+ count++ // Backwards write, writing to state after it has been read
+ }
+}
+
+/*
+Fakes needed for snippets to build:
+ */
+
+private data class Contact(val name: String) : Comparable<Contact> {
+ override fun compareTo(other: Contact): Int {
+ TODO("Not yet implemented")
+ }
+}
+
+private val sortComparator = naturalOrder<Contact>()
+
+class Note {
+ val id: Int = 0
+}
+
+class NoteRow(note: Any)
+
+@Composable
+private fun ScrollToTopButton(onClick: () -> Unit = {}) = Unit
+
+val snack = Snack()
+
+class Snack
+
+@Composable
+private fun animateColorBetween(color1: Color, color2: Color): State<Color> {
+ return remember { mutableStateOf(color1) }
+}
diff --git a/compose/integration-tests/macrobenchmark-target/build.gradle b/compose/integration-tests/macrobenchmark-target/build.gradle
index 37eacb5..0c1ddaf 100644
--- a/compose/integration-tests/macrobenchmark-target/build.gradle
+++ b/compose/integration-tests/macrobenchmark-target/build.gradle
@@ -32,6 +32,7 @@
implementation(project(":compose:foundation:foundation"))
implementation(project(":compose:material:material"))
implementation(project(":compose:runtime:runtime"))
+ implementation(project(":compose:runtime:runtime-tracing"))
implementation(project(":compose:ui:ui"))
implementation(project(":compose:ui:ui-tooling"))
}
diff --git a/compose/integration-tests/macrobenchmark-target/src/main/AndroidManifest.xml b/compose/integration-tests/macrobenchmark-target/src/main/AndroidManifest.xml
index 333c84e..d997cfc 100644
--- a/compose/integration-tests/macrobenchmark-target/src/main/AndroidManifest.xml
+++ b/compose/integration-tests/macrobenchmark-target/src/main/AndroidManifest.xml
@@ -103,5 +103,13 @@
<category android:name="android.intent.category.DEFAULT" />
</intent-filter>
</activity>
+ <activity
+ android:name=".TrivialTracingActivity"
+ android:exported="true">
+ <intent-filter>
+ <action android:name="androidx.compose.integration.macrobenchmark.target.TRIVIAL_TRACING_ACTIVITY" />
+ <category android:name="android.intent.category.DEFAULT" />
+ </intent-filter>
+ </activity>
</application>
</manifest>
diff --git a/compose/integration-tests/macrobenchmark-target/src/main/java/androidx/compose/integration/macrobenchmark/target/LazyColumnActivity.kt b/compose/integration-tests/macrobenchmark-target/src/main/java/androidx/compose/integration/macrobenchmark/target/LazyColumnActivity.kt
index 413971e..4d7df44 100644
--- a/compose/integration-tests/macrobenchmark-target/src/main/java/androidx/compose/integration/macrobenchmark/target/LazyColumnActivity.kt
+++ b/compose/integration-tests/macrobenchmark-target/src/main/java/androidx/compose/integration/macrobenchmark/target/LazyColumnActivity.kt
@@ -42,12 +42,13 @@
super.onCreate(savedInstanceState)
val itemCount = intent.getIntExtra(EXTRA_ITEM_COUNT, 3000)
+ val entries = List(itemCount) { Entry("Item $it") }
setContent {
LazyColumn(
modifier = Modifier.fillMaxWidth().semantics { contentDescription = "IamLazy" }
) {
- items(List(itemCount) { Entry("Item $it") }) {
+ items(entries) {
ListRow(it)
}
}
@@ -94,4 +95,4 @@
}
}
-data class Entry(val contents: String)
\ No newline at end of file
+data class Entry(val contents: String)
diff --git a/compose/integration-tests/macrobenchmark-target/src/main/java/androidx/compose/integration/macrobenchmark/target/TrivialTracingActivity.kt b/compose/integration-tests/macrobenchmark-target/src/main/java/androidx/compose/integration/macrobenchmark/target/TrivialTracingActivity.kt
new file mode 100644
index 0000000..00d60904
--- /dev/null
+++ b/compose/integration-tests/macrobenchmark-target/src/main/java/androidx/compose/integration/macrobenchmark/target/TrivialTracingActivity.kt
@@ -0,0 +1,45 @@
+/*
+ * Copyright 2022 The Android Open Source Project
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package androidx.compose.integration.macrobenchmark.target
+
+import android.os.Bundle
+import androidx.activity.ComponentActivity
+import androidx.activity.compose.setContent
+import androidx.compose.runtime.Composable
+
+class TrivialTracingActivity : ComponentActivity() {
+ override fun onCreate(savedInstanceState: Bundle?) {
+ super.onCreate(savedInstanceState)
+
+ setContent {
+ Foo_BBC27C8E_13A7_4A5F_A735_AFDC433F54C3()
+ Baz_609801AB_F5A9_47C3_9405_2E82542F21B8()
+ }
+ }
+}
+
+@Composable
+private fun Foo_BBC27C8E_13A7_4A5F_A735_AFDC433F54C3() =
+ Bar_4888EA32_ABC5_4550_BA78_1247FEC1AAC9()
+
+@Composable
+private fun Bar_4888EA32_ABC5_4550_BA78_1247FEC1AAC9() {
+}
+
+@Composable
+private fun Baz_609801AB_F5A9_47C3_9405_2E82542F21B8() {
+}
\ No newline at end of file
diff --git a/compose/integration-tests/macrobenchmark/build.gradle b/compose/integration-tests/macrobenchmark/build.gradle
index 60103b8..52926c1 100644
--- a/compose/integration-tests/macrobenchmark/build.gradle
+++ b/compose/integration-tests/macrobenchmark/build.gradle
@@ -14,6 +14,8 @@
* limitations under the License.
*/
+import org.jetbrains.kotlin.gradle.tasks.KotlinCompile
+
plugins {
id("AndroidXPlugin")
id("com.android.library")
@@ -42,3 +44,10 @@
// Define a task dependency so the app is installed before we run macro benchmarks.
tasks.getByPath(":compose:integration-tests:macrobenchmark:connectedCheck")
.dependsOn(tasks.getByPath(":compose:integration-tests:macrobenchmark-target:installRelease"))
+
+// Allow usage of Kotlin's @OptIn.
+tasks.withType(KotlinCompile).configureEach {
+ kotlinOptions {
+ freeCompilerArgs += ["-opt-in=kotlin.RequiresOptIn"]
+ }
+}
diff --git a/compose/integration-tests/macrobenchmark/src/androidTest/java/androidx/compose/integration/macrobenchmark/TrivialTracingBenchmark.kt b/compose/integration-tests/macrobenchmark/src/androidTest/java/androidx/compose/integration/macrobenchmark/TrivialTracingBenchmark.kt
new file mode 100644
index 0000000..2da52f3
--- /dev/null
+++ b/compose/integration-tests/macrobenchmark/src/androidTest/java/androidx/compose/integration/macrobenchmark/TrivialTracingBenchmark.kt
@@ -0,0 +1,78 @@
+/*
+ * Copyright 2022 The Android Open Source Project
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package androidx.compose.integration.macrobenchmark
+
+import android.content.Intent
+import android.os.Build
+import androidx.annotation.RequiresApi
+import androidx.benchmark.macro.ExperimentalMetricApi
+import androidx.benchmark.macro.TraceSectionMetric
+import androidx.benchmark.macro.junit4.MacrobenchmarkRule
+import androidx.benchmark.perfetto.PerfettoCapture
+import androidx.test.ext.junit.runners.AndroidJUnit4
+import androidx.test.filters.LargeTest
+import org.junit.Rule
+import org.junit.Test
+import org.junit.runner.RunWith
+
+@LargeTest
+@RunWith(AndroidJUnit4::class)
+/**
+ * End-to-end test for compose-runtime-tracing verifying that names of Composables show up in
+ * a Perfetto trace.
+ */
+class TrivialTracingBenchmark {
+ @get:Rule
+ val benchmarkRule = MacrobenchmarkRule()
+
+ @RequiresApi(Build.VERSION_CODES.Q)
+ @OptIn(ExperimentalMetricApi::class)
+ @Test
+ fun test_composable_names_present_in_trace() {
+ val metrics = COMPOSABLE_NAMES.map { composableName ->
+ TraceSectionMetric("%$PACKAGE_NAME.$composableName %$FILE_NAME:% key=%")
+ }
+ benchmarkRule.measureRepeated(
+ packageName = PACKAGE_NAME,
+ metrics = metrics,
+ iterations = 1, // we are only verifying the presence of entries (not the timing data)
+ setupBlock = {
+ PerfettoCapture().enableAndroidxTracingPerfetto(
+ PACKAGE_NAME,
+ provideBinariesIfMissing = true
+ )
+ }
+ ) {
+ startActivityAndWait(Intent(ACTION))
+ }
+ }
+
+ companion object {
+ private const val PACKAGE_NAME = "androidx.compose.integration.macrobenchmark.target"
+
+ private const val ACTION =
+ "androidx.compose.integration.macrobenchmark.target.TRIVIAL_TRACING_ACTIVITY"
+
+ private const val FILE_NAME = "TrivialTracingActivity.kt"
+
+ private val COMPOSABLE_NAMES = listOf(
+ "Foo_BBC27C8E_13A7_4A5F_A735_AFDC433F54C3",
+ "Bar_4888EA32_ABC5_4550_BA78_1247FEC1AAC9",
+ "Baz_609801AB_F5A9_47C3_9405_2E82542F21B8"
+ )
+ }
+}
diff --git a/compose/material/material-icons-core/api/1.2.0-beta02.txt b/compose/material/material-icons-core/api/1.2.0-beta02.txt
new file mode 100644
index 0000000..b95d770
--- /dev/null
+++ b/compose/material/material-icons-core/api/1.2.0-beta02.txt
@@ -0,0 +1,1036 @@
+// Signature format: 4.0
+package androidx.compose.material.icons {
+
+ public final class Icons {
+ method public androidx.compose.material.icons.Icons.Filled getDefault();
+ property public final androidx.compose.material.icons.Icons.Filled Default;
+ field public static final androidx.compose.material.icons.Icons INSTANCE;
+ }
+
+ public static final class Icons.Filled {
+ field public static final androidx.compose.material.icons.Icons.Filled INSTANCE;
+ }
+
+ public static final class Icons.Outlined {
+ field public static final androidx.compose.material.icons.Icons.Outlined INSTANCE;
+ }
+
+ public static final class Icons.Rounded {
+ field public static final androidx.compose.material.icons.Icons.Rounded INSTANCE;
+ }
+
+ public static final class Icons.Sharp {
+ field public static final androidx.compose.material.icons.Icons.Sharp INSTANCE;
+ }
+
+ public static final class Icons.TwoTone {
+ field public static final androidx.compose.material.icons.Icons.TwoTone INSTANCE;
+ }
+
+ public final class IconsKt {
+ method public static inline androidx.compose.ui.graphics.vector.ImageVector materialIcon(String name, kotlin.jvm.functions.Function1<? super androidx.compose.ui.graphics.vector.ImageVector.Builder,androidx.compose.ui.graphics.vector.ImageVector.Builder> block);
+ method public static inline androidx.compose.ui.graphics.vector.ImageVector.Builder materialPath(androidx.compose.ui.graphics.vector.ImageVector.Builder, optional float fillAlpha, optional float strokeAlpha, optional int pathFillType, kotlin.jvm.functions.Function1<? super androidx.compose.ui.graphics.vector.PathBuilder,kotlin.Unit> pathBuilder);
+ }
+
+}
+
+package androidx.compose.material.icons.filled {
+
+ public final class AccountBoxKt {
+ method public static androidx.compose.ui.graphics.vector.ImageVector getAccountBox(androidx.compose.material.icons.Icons.Filled);
+ }
+
+ public final class AccountCircleKt {
+ method public static androidx.compose.ui.graphics.vector.ImageVector getAccountCircle(androidx.compose.material.icons.Icons.Filled);
+ }
+
+ public final class AddCircleKt {
+ method public static androidx.compose.ui.graphics.vector.ImageVector getAddCircle(androidx.compose.material.icons.Icons.Filled);
+ }
+
+ public final class AddKt {
+ method public static androidx.compose.ui.graphics.vector.ImageVector getAdd(androidx.compose.material.icons.Icons.Filled);
+ }
+
+ public final class ArrowBackKt {
+ method public static androidx.compose.ui.graphics.vector.ImageVector getArrowBack(androidx.compose.material.icons.Icons.Filled);
+ }
+
+ public final class ArrowDropDownKt {
+ method public static androidx.compose.ui.graphics.vector.ImageVector getArrowDropDown(androidx.compose.material.icons.Icons.Filled);
+ }
+
+ public final class ArrowForwardKt {
+ method public static androidx.compose.ui.graphics.vector.ImageVector getArrowForward(androidx.compose.material.icons.Icons.Filled);
+ }
+
+ public final class BuildKt {
+ method public static androidx.compose.ui.graphics.vector.ImageVector getBuild(androidx.compose.material.icons.Icons.Filled);
+ }
+
+ public final class CallKt {
+ method public static androidx.compose.ui.graphics.vector.ImageVector getCall(androidx.compose.material.icons.Icons.Filled);
+ }
+
+ public final class CheckCircleKt {
+ method public static androidx.compose.ui.graphics.vector.ImageVector getCheckCircle(androidx.compose.material.icons.Icons.Filled);
+ }
+
+ public final class CheckKt {
+ method public static androidx.compose.ui.graphics.vector.ImageVector getCheck(androidx.compose.material.icons.Icons.Filled);
+ }
+
+ public final class ClearKt {
+ method public static androidx.compose.ui.graphics.vector.ImageVector getClear(androidx.compose.material.icons.Icons.Filled);
+ }
+
+ public final class CloseKt {
+ method public static androidx.compose.ui.graphics.vector.ImageVector getClose(androidx.compose.material.icons.Icons.Filled);
+ }
+
+ public final class CreateKt {
+ method public static androidx.compose.ui.graphics.vector.ImageVector getCreate(androidx.compose.material.icons.Icons.Filled);
+ }
+
+ public final class DateRangeKt {
+ method public static androidx.compose.ui.graphics.vector.ImageVector getDateRange(androidx.compose.material.icons.Icons.Filled);
+ }
+
+ public final class DeleteKt {
+ method public static androidx.compose.ui.graphics.vector.ImageVector getDelete(androidx.compose.material.icons.Icons.Filled);
+ }
+
+ public final class DoneKt {
+ method public static androidx.compose.ui.graphics.vector.ImageVector getDone(androidx.compose.material.icons.Icons.Filled);
+ }
+
+ public final class EditKt {
+ method public static androidx.compose.ui.graphics.vector.ImageVector getEdit(androidx.compose.material.icons.Icons.Filled);
+ }
+
+ public final class EmailKt {
+ method public static androidx.compose.ui.graphics.vector.ImageVector getEmail(androidx.compose.material.icons.Icons.Filled);
+ }
+
+ public final class ExitToAppKt {
+ method public static androidx.compose.ui.graphics.vector.ImageVector getExitToApp(androidx.compose.material.icons.Icons.Filled);
+ }
+
+ public final class FaceKt {
+ method public static androidx.compose.ui.graphics.vector.ImageVector getFace(androidx.compose.material.icons.Icons.Filled);
+ }
+
+ public final class FavoriteBorderKt {
+ method public static androidx.compose.ui.graphics.vector.ImageVector getFavoriteBorder(androidx.compose.material.icons.Icons.Filled);
+ }
+
+ public final class FavoriteKt {
+ method public static androidx.compose.ui.graphics.vector.ImageVector getFavorite(androidx.compose.material.icons.Icons.Filled);
+ }
+
+ public final class HomeKt {
+ method public static androidx.compose.ui.graphics.vector.ImageVector getHome(androidx.compose.material.icons.Icons.Filled);
+ }
+
+ public final class InfoKt {
+ method public static androidx.compose.ui.graphics.vector.ImageVector getInfo(androidx.compose.material.icons.Icons.Filled);
+ }
+
+ public final class KeyboardArrowDownKt {
+ method public static androidx.compose.ui.graphics.vector.ImageVector getKeyboardArrowDown(androidx.compose.material.icons.Icons.Filled);
+ }
+
+ public final class KeyboardArrowLeftKt {
+ method public static androidx.compose.ui.graphics.vector.ImageVector getKeyboardArrowLeft(androidx.compose.material.icons.Icons.Filled);
+ }
+
+ public final class KeyboardArrowRightKt {
+ method public static androidx.compose.ui.graphics.vector.ImageVector getKeyboardArrowRight(androidx.compose.material.icons.Icons.Filled);
+ }
+
+ public final class KeyboardArrowUpKt {
+ method public static androidx.compose.ui.graphics.vector.ImageVector getKeyboardArrowUp(androidx.compose.material.icons.Icons.Filled);
+ }
+
+ public final class ListKt {
+ method public static androidx.compose.ui.graphics.vector.ImageVector getList(androidx.compose.material.icons.Icons.Filled);
+ }
+
+ public final class LocationOnKt {
+ method public static androidx.compose.ui.graphics.vector.ImageVector getLocationOn(androidx.compose.material.icons.Icons.Filled);
+ }
+
+ public final class LockKt {
+ method public static androidx.compose.ui.graphics.vector.ImageVector getLock(androidx.compose.material.icons.Icons.Filled);
+ }
+
+ public final class MailOutlineKt {
+ method public static androidx.compose.ui.graphics.vector.ImageVector getMailOutline(androidx.compose.material.icons.Icons.Filled);
+ }
+
+ public final class MenuKt {
+ method public static androidx.compose.ui.graphics.vector.ImageVector getMenu(androidx.compose.material.icons.Icons.Filled);
+ }
+
+ public final class MoreVertKt {
+ method public static androidx.compose.ui.graphics.vector.ImageVector getMoreVert(androidx.compose.material.icons.Icons.Filled);
+ }
+
+ public final class NotificationsKt {
+ method public static androidx.compose.ui.graphics.vector.ImageVector getNotifications(androidx.compose.material.icons.Icons.Filled);
+ }
+
+ public final class PersonKt {
+ method public static androidx.compose.ui.graphics.vector.ImageVector getPerson(androidx.compose.material.icons.Icons.Filled);
+ }
+
+ public final class PhoneKt {
+ method public static androidx.compose.ui.graphics.vector.ImageVector getPhone(androidx.compose.material.icons.Icons.Filled);
+ }
+
+ public final class PlaceKt {
+ method public static androidx.compose.ui.graphics.vector.ImageVector getPlace(androidx.compose.material.icons.Icons.Filled);
+ }
+
+ public final class PlayArrowKt {
+ method public static androidx.compose.ui.graphics.vector.ImageVector getPlayArrow(androidx.compose.material.icons.Icons.Filled);
+ }
+
+ public final class RefreshKt {
+ method public static androidx.compose.ui.graphics.vector.ImageVector getRefresh(androidx.compose.material.icons.Icons.Filled);
+ }
+
+ public final class SearchKt {
+ method public static androidx.compose.ui.graphics.vector.ImageVector getSearch(androidx.compose.material.icons.Icons.Filled);
+ }
+
+ public final class SendKt {
+ method public static androidx.compose.ui.graphics.vector.ImageVector getSend(androidx.compose.material.icons.Icons.Filled);
+ }
+
+ public final class SettingsKt {
+ method public static androidx.compose.ui.graphics.vector.ImageVector getSettings(androidx.compose.material.icons.Icons.Filled);
+ }
+
+ public final class ShareKt {
+ method public static androidx.compose.ui.graphics.vector.ImageVector getShare(androidx.compose.material.icons.Icons.Filled);
+ }
+
+ public final class ShoppingCartKt {
+ method public static androidx.compose.ui.graphics.vector.ImageVector getShoppingCart(androidx.compose.material.icons.Icons.Filled);
+ }
+
+ public final class StarKt {
+ method public static androidx.compose.ui.graphics.vector.ImageVector getStar(androidx.compose.material.icons.Icons.Filled);
+ }
+
+ public final class ThumbUpKt {
+ method public static androidx.compose.ui.graphics.vector.ImageVector getThumbUp(androidx.compose.material.icons.Icons.Filled);
+ }
+
+ public final class WarningKt {
+ method public static androidx.compose.ui.graphics.vector.ImageVector getWarning(androidx.compose.material.icons.Icons.Filled);
+ }
+
+}
+
+package androidx.compose.material.icons.outlined {
+
+ public final class AccountBoxKt {
+ method public static androidx.compose.ui.graphics.vector.ImageVector getAccountBox(androidx.compose.material.icons.Icons.Outlined);
+ }
+
+ public final class AccountCircleKt {
+ method public static androidx.compose.ui.graphics.vector.ImageVector getAccountCircle(androidx.compose.material.icons.Icons.Outlined);
+ }
+
+ public final class AddCircleKt {
+ method public static androidx.compose.ui.graphics.vector.ImageVector getAddCircle(androidx.compose.material.icons.Icons.Outlined);
+ }
+
+ public final class AddKt {
+ method public static androidx.compose.ui.graphics.vector.ImageVector getAdd(androidx.compose.material.icons.Icons.Outlined);
+ }
+
+ public final class ArrowBackKt {
+ method public static androidx.compose.ui.graphics.vector.ImageVector getArrowBack(androidx.compose.material.icons.Icons.Outlined);
+ }
+
+ public final class ArrowDropDownKt {
+ method public static androidx.compose.ui.graphics.vector.ImageVector getArrowDropDown(androidx.compose.material.icons.Icons.Outlined);
+ }
+
+ public final class ArrowForwardKt {
+ method public static androidx.compose.ui.graphics.vector.ImageVector getArrowForward(androidx.compose.material.icons.Icons.Outlined);
+ }
+
+ public final class BuildKt {
+ method public static androidx.compose.ui.graphics.vector.ImageVector getBuild(androidx.compose.material.icons.Icons.Outlined);
+ }
+
+ public final class CallKt {
+ method public static androidx.compose.ui.graphics.vector.ImageVector getCall(androidx.compose.material.icons.Icons.Outlined);
+ }
+
+ public final class CheckCircleKt {
+ method public static androidx.compose.ui.graphics.vector.ImageVector getCheckCircle(androidx.compose.material.icons.Icons.Outlined);
+ }
+
+ public final class CheckKt {
+ method public static androidx.compose.ui.graphics.vector.ImageVector getCheck(androidx.compose.material.icons.Icons.Outlined);
+ }
+
+ public final class ClearKt {
+ method public static androidx.compose.ui.graphics.vector.ImageVector getClear(androidx.compose.material.icons.Icons.Outlined);
+ }
+
+ public final class CloseKt {
+ method public static androidx.compose.ui.graphics.vector.ImageVector getClose(androidx.compose.material.icons.Icons.Outlined);
+ }
+
+ public final class CreateKt {
+ method public static androidx.compose.ui.graphics.vector.ImageVector getCreate(androidx.compose.material.icons.Icons.Outlined);
+ }
+
+ public final class DateRangeKt {
+ method public static androidx.compose.ui.graphics.vector.ImageVector getDateRange(androidx.compose.material.icons.Icons.Outlined);
+ }
+
+ public final class DeleteKt {
+ method public static androidx.compose.ui.graphics.vector.ImageVector getDelete(androidx.compose.material.icons.Icons.Outlined);
+ }
+
+ public final class DoneKt {
+ method public static androidx.compose.ui.graphics.vector.ImageVector getDone(androidx.compose.material.icons.Icons.Outlined);
+ }
+
+ public final class EditKt {
+ method public static androidx.compose.ui.graphics.vector.ImageVector getEdit(androidx.compose.material.icons.Icons.Outlined);
+ }
+
+ public final class EmailKt {
+ method public static androidx.compose.ui.graphics.vector.ImageVector getEmail(androidx.compose.material.icons.Icons.Outlined);
+ }
+
+ public final class ExitToAppKt {
+ method public static androidx.compose.ui.graphics.vector.ImageVector getExitToApp(androidx.compose.material.icons.Icons.Outlined);
+ }
+
+ public final class FaceKt {
+ method public static androidx.compose.ui.graphics.vector.ImageVector getFace(androidx.compose.material.icons.Icons.Outlined);
+ }
+
+ public final class FavoriteBorderKt {
+ method public static androidx.compose.ui.graphics.vector.ImageVector getFavoriteBorder(androidx.compose.material.icons.Icons.Outlined);
+ }
+
+ public final class FavoriteKt {
+ method public static androidx.compose.ui.graphics.vector.ImageVector getFavorite(androidx.compose.material.icons.Icons.Outlined);
+ }
+
+ public final class HomeKt {
+ method public static androidx.compose.ui.graphics.vector.ImageVector getHome(androidx.compose.material.icons.Icons.Outlined);
+ }
+
+ public final class InfoKt {
+ method public static androidx.compose.ui.graphics.vector.ImageVector getInfo(androidx.compose.material.icons.Icons.Outlined);
+ }
+
+ public final class KeyboardArrowDownKt {
+ method public static androidx.compose.ui.graphics.vector.ImageVector getKeyboardArrowDown(androidx.compose.material.icons.Icons.Outlined);
+ }
+
+ public final class KeyboardArrowLeftKt {
+ method public static androidx.compose.ui.graphics.vector.ImageVector getKeyboardArrowLeft(androidx.compose.material.icons.Icons.Outlined);
+ }
+
+ public final class KeyboardArrowRightKt {
+ method public static androidx.compose.ui.graphics.vector.ImageVector getKeyboardArrowRight(androidx.compose.material.icons.Icons.Outlined);
+ }
+
+ public final class KeyboardArrowUpKt {
+ method public static androidx.compose.ui.graphics.vector.ImageVector getKeyboardArrowUp(androidx.compose.material.icons.Icons.Outlined);
+ }
+
+ public final class ListKt {
+ method public static androidx.compose.ui.graphics.vector.ImageVector getList(androidx.compose.material.icons.Icons.Outlined);
+ }
+
+ public final class LocationOnKt {
+ method public static androidx.compose.ui.graphics.vector.ImageVector getLocationOn(androidx.compose.material.icons.Icons.Outlined);
+ }
+
+ public final class LockKt {
+ method public static androidx.compose.ui.graphics.vector.ImageVector getLock(androidx.compose.material.icons.Icons.Outlined);
+ }
+
+ public final class MailOutlineKt {
+ method public static androidx.compose.ui.graphics.vector.ImageVector getMailOutline(androidx.compose.material.icons.Icons.Outlined);
+ }
+
+ public final class MenuKt {
+ method public static androidx.compose.ui.graphics.vector.ImageVector getMenu(androidx.compose.material.icons.Icons.Outlined);
+ }
+
+ public final class MoreVertKt {
+ method public static androidx.compose.ui.graphics.vector.ImageVector getMoreVert(androidx.compose.material.icons.Icons.Outlined);
+ }
+
+ public final class NotificationsKt {
+ method public static androidx.compose.ui.graphics.vector.ImageVector getNotifications(androidx.compose.material.icons.Icons.Outlined);
+ }
+
+ public final class PersonKt {
+ method public static androidx.compose.ui.graphics.vector.ImageVector getPerson(androidx.compose.material.icons.Icons.Outlined);
+ }
+
+ public final class PhoneKt {
+ method public static androidx.compose.ui.graphics.vector.ImageVector getPhone(androidx.compose.material.icons.Icons.Outlined);
+ }
+
+ public final class PlaceKt {
+ method public static androidx.compose.ui.graphics.vector.ImageVector getPlace(androidx.compose.material.icons.Icons.Outlined);
+ }
+
+ public final class PlayArrowKt {
+ method public static androidx.compose.ui.graphics.vector.ImageVector getPlayArrow(androidx.compose.material.icons.Icons.Outlined);
+ }
+
+ public final class RefreshKt {
+ method public static androidx.compose.ui.graphics.vector.ImageVector getRefresh(androidx.compose.material.icons.Icons.Outlined);
+ }
+
+ public final class SearchKt {
+ method public static androidx.compose.ui.graphics.vector.ImageVector getSearch(androidx.compose.material.icons.Icons.Outlined);
+ }
+
+ public final class SendKt {
+ method public static androidx.compose.ui.graphics.vector.ImageVector getSend(androidx.compose.material.icons.Icons.Outlined);
+ }
+
+ public final class SettingsKt {
+ method public static androidx.compose.ui.graphics.vector.ImageVector getSettings(androidx.compose.material.icons.Icons.Outlined);
+ }
+
+ public final class ShareKt {
+ method public static androidx.compose.ui.graphics.vector.ImageVector getShare(androidx.compose.material.icons.Icons.Outlined);
+ }
+
+ public final class ShoppingCartKt {
+ method public static androidx.compose.ui.graphics.vector.ImageVector getShoppingCart(androidx.compose.material.icons.Icons.Outlined);
+ }
+
+ public final class StarKt {
+ method public static androidx.compose.ui.graphics.vector.ImageVector getStar(androidx.compose.material.icons.Icons.Outlined);
+ }
+
+ public final class ThumbUpKt {
+ method public static androidx.compose.ui.graphics.vector.ImageVector getThumbUp(androidx.compose.material.icons.Icons.Outlined);
+ }
+
+ public final class WarningKt {
+ method public static androidx.compose.ui.graphics.vector.ImageVector getWarning(androidx.compose.material.icons.Icons.Outlined);
+ }
+
+}
+
+package androidx.compose.material.icons.rounded {
+
+ public final class AccountBoxKt {
+ method public static androidx.compose.ui.graphics.vector.ImageVector getAccountBox(androidx.compose.material.icons.Icons.Rounded);
+ }
+
+ public final class AccountCircleKt {
+ method public static androidx.compose.ui.graphics.vector.ImageVector getAccountCircle(androidx.compose.material.icons.Icons.Rounded);
+ }
+
+ public final class AddCircleKt {
+ method public static androidx.compose.ui.graphics.vector.ImageVector getAddCircle(androidx.compose.material.icons.Icons.Rounded);
+ }
+
+ public final class AddKt {
+ method public static androidx.compose.ui.graphics.vector.ImageVector getAdd(androidx.compose.material.icons.Icons.Rounded);
+ }
+
+ public final class ArrowBackKt {
+ method public static androidx.compose.ui.graphics.vector.ImageVector getArrowBack(androidx.compose.material.icons.Icons.Rounded);
+ }
+
+ public final class ArrowDropDownKt {
+ method public static androidx.compose.ui.graphics.vector.ImageVector getArrowDropDown(androidx.compose.material.icons.Icons.Rounded);
+ }
+
+ public final class ArrowForwardKt {
+ method public static androidx.compose.ui.graphics.vector.ImageVector getArrowForward(androidx.compose.material.icons.Icons.Rounded);
+ }
+
+ public final class BuildKt {
+ method public static androidx.compose.ui.graphics.vector.ImageVector getBuild(androidx.compose.material.icons.Icons.Rounded);
+ }
+
+ public final class CallKt {
+ method public static androidx.compose.ui.graphics.vector.ImageVector getCall(androidx.compose.material.icons.Icons.Rounded);
+ }
+
+ public final class CheckCircleKt {
+ method public static androidx.compose.ui.graphics.vector.ImageVector getCheckCircle(androidx.compose.material.icons.Icons.Rounded);
+ }
+
+ public final class CheckKt {
+ method public static androidx.compose.ui.graphics.vector.ImageVector getCheck(androidx.compose.material.icons.Icons.Rounded);
+ }
+
+ public final class ClearKt {
+ method public static androidx.compose.ui.graphics.vector.ImageVector getClear(androidx.compose.material.icons.Icons.Rounded);
+ }
+
+ public final class CloseKt {
+ method public static androidx.compose.ui.graphics.vector.ImageVector getClose(androidx.compose.material.icons.Icons.Rounded);
+ }
+
+ public final class CreateKt {
+ method public static androidx.compose.ui.graphics.vector.ImageVector getCreate(androidx.compose.material.icons.Icons.Rounded);
+ }
+
+ public final class DateRangeKt {
+ method public static androidx.compose.ui.graphics.vector.ImageVector getDateRange(androidx.compose.material.icons.Icons.Rounded);
+ }
+
+ public final class DeleteKt {
+ method public static androidx.compose.ui.graphics.vector.ImageVector getDelete(androidx.compose.material.icons.Icons.Rounded);
+ }
+
+ public final class DoneKt {
+ method public static androidx.compose.ui.graphics.vector.ImageVector getDone(androidx.compose.material.icons.Icons.Rounded);
+ }
+
+ public final class EditKt {
+ method public static androidx.compose.ui.graphics.vector.ImageVector getEdit(androidx.compose.material.icons.Icons.Rounded);
+ }
+
+ public final class EmailKt {
+ method public static androidx.compose.ui.graphics.vector.ImageVector getEmail(androidx.compose.material.icons.Icons.Rounded);
+ }
+
+ public final class ExitToAppKt {
+ method public static androidx.compose.ui.graphics.vector.ImageVector getExitToApp(androidx.compose.material.icons.Icons.Rounded);
+ }
+
+ public final class FaceKt {
+ method public static androidx.compose.ui.graphics.vector.ImageVector getFace(androidx.compose.material.icons.Icons.Rounded);
+ }
+
+ public final class FavoriteBorderKt {
+ method public static androidx.compose.ui.graphics.vector.ImageVector getFavoriteBorder(androidx.compose.material.icons.Icons.Rounded);
+ }
+
+ public final class FavoriteKt {
+ method public static androidx.compose.ui.graphics.vector.ImageVector getFavorite(androidx.compose.material.icons.Icons.Rounded);
+ }
+
+ public final class HomeKt {
+ method public static androidx.compose.ui.graphics.vector.ImageVector getHome(androidx.compose.material.icons.Icons.Rounded);
+ }
+
+ public final class InfoKt {
+ method public static androidx.compose.ui.graphics.vector.ImageVector getInfo(androidx.compose.material.icons.Icons.Rounded);
+ }
+
+ public final class KeyboardArrowDownKt {
+ method public static androidx.compose.ui.graphics.vector.ImageVector getKeyboardArrowDown(androidx.compose.material.icons.Icons.Rounded);
+ }
+
+ public final class KeyboardArrowLeftKt {
+ method public static androidx.compose.ui.graphics.vector.ImageVector getKeyboardArrowLeft(androidx.compose.material.icons.Icons.Rounded);
+ }
+
+ public final class KeyboardArrowRightKt {
+ method public static androidx.compose.ui.graphics.vector.ImageVector getKeyboardArrowRight(androidx.compose.material.icons.Icons.Rounded);
+ }
+
+ public final class KeyboardArrowUpKt {
+ method public static androidx.compose.ui.graphics.vector.ImageVector getKeyboardArrowUp(androidx.compose.material.icons.Icons.Rounded);
+ }
+
+ public final class ListKt {
+ method public static androidx.compose.ui.graphics.vector.ImageVector getList(androidx.compose.material.icons.Icons.Rounded);
+ }
+
+ public final class LocationOnKt {
+ method public static androidx.compose.ui.graphics.vector.ImageVector getLocationOn(androidx.compose.material.icons.Icons.Rounded);
+ }
+
+ public final class LockKt {
+ method public static androidx.compose.ui.graphics.vector.ImageVector getLock(androidx.compose.material.icons.Icons.Rounded);
+ }
+
+ public final class MailOutlineKt {
+ method public static androidx.compose.ui.graphics.vector.ImageVector getMailOutline(androidx.compose.material.icons.Icons.Rounded);
+ }
+
+ public final class MenuKt {
+ method public static androidx.compose.ui.graphics.vector.ImageVector getMenu(androidx.compose.material.icons.Icons.Rounded);
+ }
+
+ public final class MoreVertKt {
+ method public static androidx.compose.ui.graphics.vector.ImageVector getMoreVert(androidx.compose.material.icons.Icons.Rounded);
+ }
+
+ public final class NotificationsKt {
+ method public static androidx.compose.ui.graphics.vector.ImageVector getNotifications(androidx.compose.material.icons.Icons.Rounded);
+ }
+
+ public final class PersonKt {
+ method public static androidx.compose.ui.graphics.vector.ImageVector getPerson(androidx.compose.material.icons.Icons.Rounded);
+ }
+
+ public final class PhoneKt {
+ method public static androidx.compose.ui.graphics.vector.ImageVector getPhone(androidx.compose.material.icons.Icons.Rounded);
+ }
+
+ public final class PlaceKt {
+ method public static androidx.compose.ui.graphics.vector.ImageVector getPlace(androidx.compose.material.icons.Icons.Rounded);
+ }
+
+ public final class PlayArrowKt {
+ method public static androidx.compose.ui.graphics.vector.ImageVector getPlayArrow(androidx.compose.material.icons.Icons.Rounded);
+ }
+
+ public final class RefreshKt {
+ method public static androidx.compose.ui.graphics.vector.ImageVector getRefresh(androidx.compose.material.icons.Icons.Rounded);
+ }
+
+ public final class SearchKt {
+ method public static androidx.compose.ui.graphics.vector.ImageVector getSearch(androidx.compose.material.icons.Icons.Rounded);
+ }
+
+ public final class SendKt {
+ method public static androidx.compose.ui.graphics.vector.ImageVector getSend(androidx.compose.material.icons.Icons.Rounded);
+ }
+
+ public final class SettingsKt {
+ method public static androidx.compose.ui.graphics.vector.ImageVector getSettings(androidx.compose.material.icons.Icons.Rounded);
+ }
+
+ public final class ShareKt {
+ method public static androidx.compose.ui.graphics.vector.ImageVector getShare(androidx.compose.material.icons.Icons.Rounded);
+ }
+
+ public final class ShoppingCartKt {
+ method public static androidx.compose.ui.graphics.vector.ImageVector getShoppingCart(androidx.compose.material.icons.Icons.Rounded);
+ }
+
+ public final class StarKt {
+ method public static androidx.compose.ui.graphics.vector.ImageVector getStar(androidx.compose.material.icons.Icons.Rounded);
+ }
+
+ public final class ThumbUpKt {
+ method public static androidx.compose.ui.graphics.vector.ImageVector getThumbUp(androidx.compose.material.icons.Icons.Rounded);
+ }
+
+ public final class WarningKt {
+ method public static androidx.compose.ui.graphics.vector.ImageVector getWarning(androidx.compose.material.icons.Icons.Rounded);
+ }
+
+}
+
+package androidx.compose.material.icons.sharp {
+
+ public final class AccountBoxKt {
+ method public static androidx.compose.ui.graphics.vector.ImageVector getAccountBox(androidx.compose.material.icons.Icons.Sharp);
+ }
+
+ public final class AccountCircleKt {
+ method public static androidx.compose.ui.graphics.vector.ImageVector getAccountCircle(androidx.compose.material.icons.Icons.Sharp);
+ }
+
+ public final class AddCircleKt {
+ method public static androidx.compose.ui.graphics.vector.ImageVector getAddCircle(androidx.compose.material.icons.Icons.Sharp);
+ }
+
+ public final class AddKt {
+ method public static androidx.compose.ui.graphics.vector.ImageVector getAdd(androidx.compose.material.icons.Icons.Sharp);
+ }
+
+ public final class ArrowBackKt {
+ method public static androidx.compose.ui.graphics.vector.ImageVector getArrowBack(androidx.compose.material.icons.Icons.Sharp);
+ }
+
+ public final class ArrowDropDownKt {
+ method public static androidx.compose.ui.graphics.vector.ImageVector getArrowDropDown(androidx.compose.material.icons.Icons.Sharp);
+ }
+
+ public final class ArrowForwardKt {
+ method public static androidx.compose.ui.graphics.vector.ImageVector getArrowForward(androidx.compose.material.icons.Icons.Sharp);
+ }
+
+ public final class BuildKt {
+ method public static androidx.compose.ui.graphics.vector.ImageVector getBuild(androidx.compose.material.icons.Icons.Sharp);
+ }
+
+ public final class CallKt {
+ method public static androidx.compose.ui.graphics.vector.ImageVector getCall(androidx.compose.material.icons.Icons.Sharp);
+ }
+
+ public final class CheckCircleKt {
+ method public static androidx.compose.ui.graphics.vector.ImageVector getCheckCircle(androidx.compose.material.icons.Icons.Sharp);
+ }
+
+ public final class CheckKt {
+ method public static androidx.compose.ui.graphics.vector.ImageVector getCheck(androidx.compose.material.icons.Icons.Sharp);
+ }
+
+ public final class ClearKt {
+ method public static androidx.compose.ui.graphics.vector.ImageVector getClear(androidx.compose.material.icons.Icons.Sharp);
+ }
+
+ public final class CloseKt {
+ method public static androidx.compose.ui.graphics.vector.ImageVector getClose(androidx.compose.material.icons.Icons.Sharp);
+ }
+
+ public final class CreateKt {
+ method public static androidx.compose.ui.graphics.vector.ImageVector getCreate(androidx.compose.material.icons.Icons.Sharp);
+ }
+
+ public final class DateRangeKt {
+ method public static androidx.compose.ui.graphics.vector.ImageVector getDateRange(androidx.compose.material.icons.Icons.Sharp);
+ }
+
+ public final class DeleteKt {
+ method public static androidx.compose.ui.graphics.vector.ImageVector getDelete(androidx.compose.material.icons.Icons.Sharp);
+ }
+
+ public final class DoneKt {
+ method public static androidx.compose.ui.graphics.vector.ImageVector getDone(androidx.compose.material.icons.Icons.Sharp);
+ }
+
+ public final class EditKt {
+ method public static androidx.compose.ui.graphics.vector.ImageVector getEdit(androidx.compose.material.icons.Icons.Sharp);
+ }
+
+ public final class EmailKt {
+ method public static androidx.compose.ui.graphics.vector.ImageVector getEmail(androidx.compose.material.icons.Icons.Sharp);
+ }
+
+ public final class ExitToAppKt {
+ method public static androidx.compose.ui.graphics.vector.ImageVector getExitToApp(androidx.compose.material.icons.Icons.Sharp);
+ }
+
+ public final class FaceKt {
+ method public static androidx.compose.ui.graphics.vector.ImageVector getFace(androidx.compose.material.icons.Icons.Sharp);
+ }
+
+ public final class FavoriteBorderKt {
+ method public static androidx.compose.ui.graphics.vector.ImageVector getFavoriteBorder(androidx.compose.material.icons.Icons.Sharp);
+ }
+
+ public final class FavoriteKt {
+ method public static androidx.compose.ui.graphics.vector.ImageVector getFavorite(androidx.compose.material.icons.Icons.Sharp);
+ }
+
+ public final class HomeKt {
+ method public static androidx.compose.ui.graphics.vector.ImageVector getHome(androidx.compose.material.icons.Icons.Sharp);
+ }
+
+ public final class InfoKt {
+ method public static androidx.compose.ui.graphics.vector.ImageVector getInfo(androidx.compose.material.icons.Icons.Sharp);
+ }
+
+ public final class KeyboardArrowDownKt {
+ method public static androidx.compose.ui.graphics.vector.ImageVector getKeyboardArrowDown(androidx.compose.material.icons.Icons.Sharp);
+ }
+
+ public final class KeyboardArrowLeftKt {
+ method public static androidx.compose.ui.graphics.vector.ImageVector getKeyboardArrowLeft(androidx.compose.material.icons.Icons.Sharp);
+ }
+
+ public final class KeyboardArrowRightKt {
+ method public static androidx.compose.ui.graphics.vector.ImageVector getKeyboardArrowRight(androidx.compose.material.icons.Icons.Sharp);
+ }
+
+ public final class KeyboardArrowUpKt {
+ method public static androidx.compose.ui.graphics.vector.ImageVector getKeyboardArrowUp(androidx.compose.material.icons.Icons.Sharp);
+ }
+
+ public final class ListKt {
+ method public static androidx.compose.ui.graphics.vector.ImageVector getList(androidx.compose.material.icons.Icons.Sharp);
+ }
+
+ public final class LocationOnKt {
+ method public static androidx.compose.ui.graphics.vector.ImageVector getLocationOn(androidx.compose.material.icons.Icons.Sharp);
+ }
+
+ public final class LockKt {
+ method public static androidx.compose.ui.graphics.vector.ImageVector getLock(androidx.compose.material.icons.Icons.Sharp);
+ }
+
+ public final class MailOutlineKt {
+ method public static androidx.compose.ui.graphics.vector.ImageVector getMailOutline(androidx.compose.material.icons.Icons.Sharp);
+ }
+
+ public final class MenuKt {
+ method public static androidx.compose.ui.graphics.vector.ImageVector getMenu(androidx.compose.material.icons.Icons.Sharp);
+ }
+
+ public final class MoreVertKt {
+ method public static androidx.compose.ui.graphics.vector.ImageVector getMoreVert(androidx.compose.material.icons.Icons.Sharp);
+ }
+
+ public final class NotificationsKt {
+ method public static androidx.compose.ui.graphics.vector.ImageVector getNotifications(androidx.compose.material.icons.Icons.Sharp);
+ }
+
+ public final class PersonKt {
+ method public static androidx.compose.ui.graphics.vector.ImageVector getPerson(androidx.compose.material.icons.Icons.Sharp);
+ }
+
+ public final class PhoneKt {
+ method public static androidx.compose.ui.graphics.vector.ImageVector getPhone(androidx.compose.material.icons.Icons.Sharp);
+ }
+
+ public final class PlaceKt {
+ method public static androidx.compose.ui.graphics.vector.ImageVector getPlace(androidx.compose.material.icons.Icons.Sharp);
+ }
+
+ public final class PlayArrowKt {
+ method public static androidx.compose.ui.graphics.vector.ImageVector getPlayArrow(androidx.compose.material.icons.Icons.Sharp);
+ }
+
+ public final class RefreshKt {
+ method public static androidx.compose.ui.graphics.vector.ImageVector getRefresh(androidx.compose.material.icons.Icons.Sharp);
+ }
+
+ public final class SearchKt {
+ method public static androidx.compose.ui.graphics.vector.ImageVector getSearch(androidx.compose.material.icons.Icons.Sharp);
+ }
+
+ public final class SendKt {
+ method public static androidx.compose.ui.graphics.vector.ImageVector getSend(androidx.compose.material.icons.Icons.Sharp);
+ }
+
+ public final class SettingsKt {
+ method public static androidx.compose.ui.graphics.vector.ImageVector getSettings(androidx.compose.material.icons.Icons.Sharp);
+ }
+
+ public final class ShareKt {
+ method public static androidx.compose.ui.graphics.vector.ImageVector getShare(androidx.compose.material.icons.Icons.Sharp);
+ }
+
+ public final class ShoppingCartKt {
+ method public static androidx.compose.ui.graphics.vector.ImageVector getShoppingCart(androidx.compose.material.icons.Icons.Sharp);
+ }
+
+ public final class StarKt {
+ method public static androidx.compose.ui.graphics.vector.ImageVector getStar(androidx.compose.material.icons.Icons.Sharp);
+ }
+
+ public final class ThumbUpKt {
+ method public static androidx.compose.ui.graphics.vector.ImageVector getThumbUp(androidx.compose.material.icons.Icons.Sharp);
+ }
+
+ public final class WarningKt {
+ method public static androidx.compose.ui.graphics.vector.ImageVector getWarning(androidx.compose.material.icons.Icons.Sharp);
+ }
+
+}
+
+package androidx.compose.material.icons.twotone {
+
+ public final class AccountBoxKt {
+ method public static androidx.compose.ui.graphics.vector.ImageVector getAccountBox(androidx.compose.material.icons.Icons.TwoTone);
+ }
+
+ public final class AccountCircleKt {
+ method public static androidx.compose.ui.graphics.vector.ImageVector getAccountCircle(androidx.compose.material.icons.Icons.TwoTone);
+ }
+
+ public final class AddCircleKt {
+ method public static androidx.compose.ui.graphics.vector.ImageVector getAddCircle(androidx.compose.material.icons.Icons.TwoTone);
+ }
+
+ public final class AddKt {
+ method public static androidx.compose.ui.graphics.vector.ImageVector getAdd(androidx.compose.material.icons.Icons.TwoTone);
+ }
+
+ public final class ArrowBackKt {
+ method public static androidx.compose.ui.graphics.vector.ImageVector getArrowBack(androidx.compose.material.icons.Icons.TwoTone);
+ }
+
+ public final class ArrowDropDownKt {
+ method public static androidx.compose.ui.graphics.vector.ImageVector getArrowDropDown(androidx.compose.material.icons.Icons.TwoTone);
+ }
+
+ public final class ArrowForwardKt {
+ method public static androidx.compose.ui.graphics.vector.ImageVector getArrowForward(androidx.compose.material.icons.Icons.TwoTone);
+ }
+
+ public final class BuildKt {
+ method public static androidx.compose.ui.graphics.vector.ImageVector getBuild(androidx.compose.material.icons.Icons.TwoTone);
+ }
+
+ public final class CallKt {
+ method public static androidx.compose.ui.graphics.vector.ImageVector getCall(androidx.compose.material.icons.Icons.TwoTone);
+ }
+
+ public final class CheckCircleKt {
+ method public static androidx.compose.ui.graphics.vector.ImageVector getCheckCircle(androidx.compose.material.icons.Icons.TwoTone);
+ }
+
+ public final class CheckKt {
+ method public static androidx.compose.ui.graphics.vector.ImageVector getCheck(androidx.compose.material.icons.Icons.TwoTone);
+ }
+
+ public final class ClearKt {
+ method public static androidx.compose.ui.graphics.vector.ImageVector getClear(androidx.compose.material.icons.Icons.TwoTone);
+ }
+
+ public final class CloseKt {
+ method public static androidx.compose.ui.graphics.vector.ImageVector getClose(androidx.compose.material.icons.Icons.TwoTone);
+ }
+
+ public final class CreateKt {
+ method public static androidx.compose.ui.graphics.vector.ImageVector getCreate(androidx.compose.material.icons.Icons.TwoTone);
+ }
+
+ public final class DateRangeKt {
+ method public static androidx.compose.ui.graphics.vector.ImageVector getDateRange(androidx.compose.material.icons.Icons.TwoTone);
+ }
+
+ public final class DeleteKt {
+ method public static androidx.compose.ui.graphics.vector.ImageVector getDelete(androidx.compose.material.icons.Icons.TwoTone);
+ }
+
+ public final class DoneKt {
+ method public static androidx.compose.ui.graphics.vector.ImageVector getDone(androidx.compose.material.icons.Icons.TwoTone);
+ }
+
+ public final class EditKt {
+ method public static androidx.compose.ui.graphics.vector.ImageVector getEdit(androidx.compose.material.icons.Icons.TwoTone);
+ }
+
+ public final class EmailKt {
+ method public static androidx.compose.ui.graphics.vector.ImageVector getEmail(androidx.compose.material.icons.Icons.TwoTone);
+ }
+
+ public final class ExitToAppKt {
+ method public static androidx.compose.ui.graphics.vector.ImageVector getExitToApp(androidx.compose.material.icons.Icons.TwoTone);
+ }
+
+ public final class FaceKt {
+ method public static androidx.compose.ui.graphics.vector.ImageVector getFace(androidx.compose.material.icons.Icons.TwoTone);
+ }
+
+ public final class FavoriteBorderKt {
+ method public static androidx.compose.ui.graphics.vector.ImageVector getFavoriteBorder(androidx.compose.material.icons.Icons.TwoTone);
+ }
+
+ public final class FavoriteKt {
+ method public static androidx.compose.ui.graphics.vector.ImageVector getFavorite(androidx.compose.material.icons.Icons.TwoTone);
+ }
+
+ public final class HomeKt {
+ method public static androidx.compose.ui.graphics.vector.ImageVector getHome(androidx.compose.material.icons.Icons.TwoTone);
+ }
+
+ public final class InfoKt {
+ method public static androidx.compose.ui.graphics.vector.ImageVector getInfo(androidx.compose.material.icons.Icons.TwoTone);
+ }
+
+ public final class KeyboardArrowDownKt {
+ method public static androidx.compose.ui.graphics.vector.ImageVector getKeyboardArrowDown(androidx.compose.material.icons.Icons.TwoTone);
+ }
+
+ public final class KeyboardArrowLeftKt {
+ method public static androidx.compose.ui.graphics.vector.ImageVector getKeyboardArrowLeft(androidx.compose.material.icons.Icons.TwoTone);
+ }
+
+ public final class KeyboardArrowRightKt {
+ method public static androidx.compose.ui.graphics.vector.ImageVector getKeyboardArrowRight(androidx.compose.material.icons.Icons.TwoTone);
+ }
+
+ public final class KeyboardArrowUpKt {
+ method public static androidx.compose.ui.graphics.vector.ImageVector getKeyboardArrowUp(androidx.compose.material.icons.Icons.TwoTone);
+ }
+
+ public final class ListKt {
+ method public static androidx.compose.ui.graphics.vector.ImageVector getList(androidx.compose.material.icons.Icons.TwoTone);
+ }
+
+ public final class LocationOnKt {
+ method public static androidx.compose.ui.graphics.vector.ImageVector getLocationOn(androidx.compose.material.icons.Icons.TwoTone);
+ }
+
+ public final class LockKt {
+ method public static androidx.compose.ui.graphics.vector.ImageVector getLock(androidx.compose.material.icons.Icons.TwoTone);
+ }
+
+ public final class MailOutlineKt {
+ method public static androidx.compose.ui.graphics.vector.ImageVector getMailOutline(androidx.compose.material.icons.Icons.TwoTone);
+ }
+
+ public final class MenuKt {
+ method public static androidx.compose.ui.graphics.vector.ImageVector getMenu(androidx.compose.material.icons.Icons.TwoTone);
+ }
+
+ public final class MoreVertKt {
+ method public static androidx.compose.ui.graphics.vector.ImageVector getMoreVert(androidx.compose.material.icons.Icons.TwoTone);
+ }
+
+ public final class NotificationsKt {
+ method public static androidx.compose.ui.graphics.vector.ImageVector getNotifications(androidx.compose.material.icons.Icons.TwoTone);
+ }
+
+ public final class PersonKt {
+ method public static androidx.compose.ui.graphics.vector.ImageVector getPerson(androidx.compose.material.icons.Icons.TwoTone);
+ }
+
+ public final class PhoneKt {
+ method public static androidx.compose.ui.graphics.vector.ImageVector getPhone(androidx.compose.material.icons.Icons.TwoTone);
+ }
+
+ public final class PlaceKt {
+ method public static androidx.compose.ui.graphics.vector.ImageVector getPlace(androidx.compose.material.icons.Icons.TwoTone);
+ }
+
+ public final class PlayArrowKt {
+ method public static androidx.compose.ui.graphics.vector.ImageVector getPlayArrow(androidx.compose.material.icons.Icons.TwoTone);
+ }
+
+ public final class RefreshKt {
+ method public static androidx.compose.ui.graphics.vector.ImageVector getRefresh(androidx.compose.material.icons.Icons.TwoTone);
+ }
+
+ public final class SearchKt {
+ method public static androidx.compose.ui.graphics.vector.ImageVector getSearch(androidx.compose.material.icons.Icons.TwoTone);
+ }
+
+ public final class SendKt {
+ method public static androidx.compose.ui.graphics.vector.ImageVector getSend(androidx.compose.material.icons.Icons.TwoTone);
+ }
+
+ public final class SettingsKt {
+ method public static androidx.compose.ui.graphics.vector.ImageVector getSettings(androidx.compose.material.icons.Icons.TwoTone);
+ }
+
+ public final class ShareKt {
+ method public static androidx.compose.ui.graphics.vector.ImageVector getShare(androidx.compose.material.icons.Icons.TwoTone);
+ }
+
+ public final class ShoppingCartKt {
+ method public static androidx.compose.ui.graphics.vector.ImageVector getShoppingCart(androidx.compose.material.icons.Icons.TwoTone);
+ }
+
+ public final class StarKt {
+ method public static androidx.compose.ui.graphics.vector.ImageVector getStar(androidx.compose.material.icons.Icons.TwoTone);
+ }
+
+ public final class ThumbUpKt {
+ method public static androidx.compose.ui.graphics.vector.ImageVector getThumbUp(androidx.compose.material.icons.Icons.TwoTone);
+ }
+
+ public final class WarningKt {
+ method public static androidx.compose.ui.graphics.vector.ImageVector getWarning(androidx.compose.material.icons.Icons.TwoTone);
+ }
+
+}
+
diff --git a/compose/material/material-icons-core/api/public_plus_experimental_1.2.0-beta02.txt b/compose/material/material-icons-core/api/public_plus_experimental_1.2.0-beta02.txt
new file mode 100644
index 0000000..b95d770
--- /dev/null
+++ b/compose/material/material-icons-core/api/public_plus_experimental_1.2.0-beta02.txt
@@ -0,0 +1,1036 @@
+// Signature format: 4.0
+package androidx.compose.material.icons {
+
+ public final class Icons {
+ method public androidx.compose.material.icons.Icons.Filled getDefault();
+ property public final androidx.compose.material.icons.Icons.Filled Default;
+ field public static final androidx.compose.material.icons.Icons INSTANCE;
+ }
+
+ public static final class Icons.Filled {
+ field public static final androidx.compose.material.icons.Icons.Filled INSTANCE;
+ }
+
+ public static final class Icons.Outlined {
+ field public static final androidx.compose.material.icons.Icons.Outlined INSTANCE;
+ }
+
+ public static final class Icons.Rounded {
+ field public static final androidx.compose.material.icons.Icons.Rounded INSTANCE;
+ }
+
+ public static final class Icons.Sharp {
+ field public static final androidx.compose.material.icons.Icons.Sharp INSTANCE;
+ }
+
+ public static final class Icons.TwoTone {
+ field public static final androidx.compose.material.icons.Icons.TwoTone INSTANCE;
+ }
+
+ public final class IconsKt {
+ method public static inline androidx.compose.ui.graphics.vector.ImageVector materialIcon(String name, kotlin.jvm.functions.Function1<? super androidx.compose.ui.graphics.vector.ImageVector.Builder,androidx.compose.ui.graphics.vector.ImageVector.Builder> block);
+ method public static inline androidx.compose.ui.graphics.vector.ImageVector.Builder materialPath(androidx.compose.ui.graphics.vector.ImageVector.Builder, optional float fillAlpha, optional float strokeAlpha, optional int pathFillType, kotlin.jvm.functions.Function1<? super androidx.compose.ui.graphics.vector.PathBuilder,kotlin.Unit> pathBuilder);
+ }
+
+}
+
+package androidx.compose.material.icons.filled {
+
+ public final class AccountBoxKt {
+ method public static androidx.compose.ui.graphics.vector.ImageVector getAccountBox(androidx.compose.material.icons.Icons.Filled);
+ }
+
+ public final class AccountCircleKt {
+ method public static androidx.compose.ui.graphics.vector.ImageVector getAccountCircle(androidx.compose.material.icons.Icons.Filled);
+ }
+
+ public final class AddCircleKt {
+ method public static androidx.compose.ui.graphics.vector.ImageVector getAddCircle(androidx.compose.material.icons.Icons.Filled);
+ }
+
+ public final class AddKt {
+ method public static androidx.compose.ui.graphics.vector.ImageVector getAdd(androidx.compose.material.icons.Icons.Filled);
+ }
+
+ public final class ArrowBackKt {
+ method public static androidx.compose.ui.graphics.vector.ImageVector getArrowBack(androidx.compose.material.icons.Icons.Filled);
+ }
+
+ public final class ArrowDropDownKt {
+ method public static androidx.compose.ui.graphics.vector.ImageVector getArrowDropDown(androidx.compose.material.icons.Icons.Filled);
+ }
+
+ public final class ArrowForwardKt {
+ method public static androidx.compose.ui.graphics.vector.ImageVector getArrowForward(androidx.compose.material.icons.Icons.Filled);
+ }
+
+ public final class BuildKt {
+ method public static androidx.compose.ui.graphics.vector.ImageVector getBuild(androidx.compose.material.icons.Icons.Filled);
+ }
+
+ public final class CallKt {
+ method public static androidx.compose.ui.graphics.vector.ImageVector getCall(androidx.compose.material.icons.Icons.Filled);
+ }
+
+ public final class CheckCircleKt {
+ method public static androidx.compose.ui.graphics.vector.ImageVector getCheckCircle(androidx.compose.material.icons.Icons.Filled);
+ }
+
+ public final class CheckKt {
+ method public static androidx.compose.ui.graphics.vector.ImageVector getCheck(androidx.compose.material.icons.Icons.Filled);
+ }
+
+ public final class ClearKt {
+ method public static androidx.compose.ui.graphics.vector.ImageVector getClear(androidx.compose.material.icons.Icons.Filled);
+ }
+
+ public final class CloseKt {
+ method public static androidx.compose.ui.graphics.vector.ImageVector getClose(androidx.compose.material.icons.Icons.Filled);
+ }
+
+ public final class CreateKt {
+ method public static androidx.compose.ui.graphics.vector.ImageVector getCreate(androidx.compose.material.icons.Icons.Filled);
+ }
+
+ public final class DateRangeKt {
+ method public static androidx.compose.ui.graphics.vector.ImageVector getDateRange(androidx.compose.material.icons.Icons.Filled);
+ }
+
+ public final class DeleteKt {
+ method public static androidx.compose.ui.graphics.vector.ImageVector getDelete(androidx.compose.material.icons.Icons.Filled);
+ }
+
+ public final class DoneKt {
+ method public static androidx.compose.ui.graphics.vector.ImageVector getDone(androidx.compose.material.icons.Icons.Filled);
+ }
+
+ public final class EditKt {
+ method public static androidx.compose.ui.graphics.vector.ImageVector getEdit(androidx.compose.material.icons.Icons.Filled);
+ }
+
+ public final class EmailKt {
+ method public static androidx.compose.ui.graphics.vector.ImageVector getEmail(androidx.compose.material.icons.Icons.Filled);
+ }
+
+ public final class ExitToAppKt {
+ method public static androidx.compose.ui.graphics.vector.ImageVector getExitToApp(androidx.compose.material.icons.Icons.Filled);
+ }
+
+ public final class FaceKt {
+ method public static androidx.compose.ui.graphics.vector.ImageVector getFace(androidx.compose.material.icons.Icons.Filled);
+ }
+
+ public final class FavoriteBorderKt {
+ method public static androidx.compose.ui.graphics.vector.ImageVector getFavoriteBorder(androidx.compose.material.icons.Icons.Filled);
+ }
+
+ public final class FavoriteKt {
+ method public static androidx.compose.ui.graphics.vector.ImageVector getFavorite(androidx.compose.material.icons.Icons.Filled);
+ }
+
+ public final class HomeKt {
+ method public static androidx.compose.ui.graphics.vector.ImageVector getHome(androidx.compose.material.icons.Icons.Filled);
+ }
+
+ public final class InfoKt {
+ method public static androidx.compose.ui.graphics.vector.ImageVector getInfo(androidx.compose.material.icons.Icons.Filled);
+ }
+
+ public final class KeyboardArrowDownKt {
+ method public static androidx.compose.ui.graphics.vector.ImageVector getKeyboardArrowDown(androidx.compose.material.icons.Icons.Filled);
+ }
+
+ public final class KeyboardArrowLeftKt {
+ method public static androidx.compose.ui.graphics.vector.ImageVector getKeyboardArrowLeft(androidx.compose.material.icons.Icons.Filled);
+ }
+
+ public final class KeyboardArrowRightKt {
+ method public static androidx.compose.ui.graphics.vector.ImageVector getKeyboardArrowRight(androidx.compose.material.icons.Icons.Filled);
+ }
+
+ public final class KeyboardArrowUpKt {
+ method public static androidx.compose.ui.graphics.vector.ImageVector getKeyboardArrowUp(androidx.compose.material.icons.Icons.Filled);
+ }
+
+ public final class ListKt {
+ method public static androidx.compose.ui.graphics.vector.ImageVector getList(androidx.compose.material.icons.Icons.Filled);
+ }
+
+ public final class LocationOnKt {
+ method public static androidx.compose.ui.graphics.vector.ImageVector getLocationOn(androidx.compose.material.icons.Icons.Filled);
+ }
+
+ public final class LockKt {
+ method public static androidx.compose.ui.graphics.vector.ImageVector getLock(androidx.compose.material.icons.Icons.Filled);
+ }
+
+ public final class MailOutlineKt {
+ method public static androidx.compose.ui.graphics.vector.ImageVector getMailOutline(androidx.compose.material.icons.Icons.Filled);
+ }
+
+ public final class MenuKt {
+ method public static androidx.compose.ui.graphics.vector.ImageVector getMenu(androidx.compose.material.icons.Icons.Filled);
+ }
+
+ public final class MoreVertKt {
+ method public static androidx.compose.ui.graphics.vector.ImageVector getMoreVert(androidx.compose.material.icons.Icons.Filled);
+ }
+
+ public final class NotificationsKt {
+ method public static androidx.compose.ui.graphics.vector.ImageVector getNotifications(androidx.compose.material.icons.Icons.Filled);
+ }
+
+ public final class PersonKt {
+ method public static androidx.compose.ui.graphics.vector.ImageVector getPerson(androidx.compose.material.icons.Icons.Filled);
+ }
+
+ public final class PhoneKt {
+ method public static androidx.compose.ui.graphics.vector.ImageVector getPhone(androidx.compose.material.icons.Icons.Filled);
+ }
+
+ public final class PlaceKt {
+ method public static androidx.compose.ui.graphics.vector.ImageVector getPlace(androidx.compose.material.icons.Icons.Filled);
+ }
+
+ public final class PlayArrowKt {
+ method public static androidx.compose.ui.graphics.vector.ImageVector getPlayArrow(androidx.compose.material.icons.Icons.Filled);
+ }
+
+ public final class RefreshKt {
+ method public static androidx.compose.ui.graphics.vector.ImageVector getRefresh(androidx.compose.material.icons.Icons.Filled);
+ }
+
+ public final class SearchKt {
+ method public static androidx.compose.ui.graphics.vector.ImageVector getSearch(androidx.compose.material.icons.Icons.Filled);
+ }
+
+ public final class SendKt {
+ method public static androidx.compose.ui.graphics.vector.ImageVector getSend(androidx.compose.material.icons.Icons.Filled);
+ }
+
+ public final class SettingsKt {
+ method public static androidx.compose.ui.graphics.vector.ImageVector getSettings(androidx.compose.material.icons.Icons.Filled);
+ }
+
+ public final class ShareKt {
+ method public static androidx.compose.ui.graphics.vector.ImageVector getShare(androidx.compose.material.icons.Icons.Filled);
+ }
+
+ public final class ShoppingCartKt {
+ method public static androidx.compose.ui.graphics.vector.ImageVector getShoppingCart(androidx.compose.material.icons.Icons.Filled);
+ }
+
+ public final class StarKt {
+ method public static androidx.compose.ui.graphics.vector.ImageVector getStar(androidx.compose.material.icons.Icons.Filled);
+ }
+
+ public final class ThumbUpKt {
+ method public static androidx.compose.ui.graphics.vector.ImageVector getThumbUp(androidx.compose.material.icons.Icons.Filled);
+ }
+
+ public final class WarningKt {
+ method public static androidx.compose.ui.graphics.vector.ImageVector getWarning(androidx.compose.material.icons.Icons.Filled);
+ }
+
+}
+
+package androidx.compose.material.icons.outlined {
+
+ public final class AccountBoxKt {
+ method public static androidx.compose.ui.graphics.vector.ImageVector getAccountBox(androidx.compose.material.icons.Icons.Outlined);
+ }
+
+ public final class AccountCircleKt {
+ method public static androidx.compose.ui.graphics.vector.ImageVector getAccountCircle(androidx.compose.material.icons.Icons.Outlined);
+ }
+
+ public final class AddCircleKt {
+ method public static androidx.compose.ui.graphics.vector.ImageVector getAddCircle(androidx.compose.material.icons.Icons.Outlined);
+ }
+
+ public final class AddKt {
+ method public static androidx.compose.ui.graphics.vector.ImageVector getAdd(androidx.compose.material.icons.Icons.Outlined);
+ }
+
+ public final class ArrowBackKt {
+ method public static androidx.compose.ui.graphics.vector.ImageVector getArrowBack(androidx.compose.material.icons.Icons.Outlined);
+ }
+
+ public final class ArrowDropDownKt {
+ method public static androidx.compose.ui.graphics.vector.ImageVector getArrowDropDown(androidx.compose.material.icons.Icons.Outlined);
+ }
+
+ public final class ArrowForwardKt {
+ method public static androidx.compose.ui.graphics.vector.ImageVector getArrowForward(androidx.compose.material.icons.Icons.Outlined);
+ }
+
+ public final class BuildKt {
+ method public static androidx.compose.ui.graphics.vector.ImageVector getBuild(androidx.compose.material.icons.Icons.Outlined);
+ }
+
+ public final class CallKt {
+ method public static androidx.compose.ui.graphics.vector.ImageVector getCall(androidx.compose.material.icons.Icons.Outlined);
+ }
+
+ public final class CheckCircleKt {
+ method public static androidx.compose.ui.graphics.vector.ImageVector getCheckCircle(androidx.compose.material.icons.Icons.Outlined);
+ }
+
+ public final class CheckKt {
+ method public static androidx.compose.ui.graphics.vector.ImageVector getCheck(androidx.compose.material.icons.Icons.Outlined);
+ }
+
+ public final class ClearKt {
+ method public static androidx.compose.ui.graphics.vector.ImageVector getClear(androidx.compose.material.icons.Icons.Outlined);
+ }
+
+ public final class CloseKt {
+ method public static androidx.compose.ui.graphics.vector.ImageVector getClose(androidx.compose.material.icons.Icons.Outlined);
+ }
+
+ public final class CreateKt {
+ method public static androidx.compose.ui.graphics.vector.ImageVector getCreate(androidx.compose.material.icons.Icons.Outlined);
+ }
+
+ public final class DateRangeKt {
+ method public static androidx.compose.ui.graphics.vector.ImageVector getDateRange(androidx.compose.material.icons.Icons.Outlined);
+ }
+
+ public final class DeleteKt {
+ method public static androidx.compose.ui.graphics.vector.ImageVector getDelete(androidx.compose.material.icons.Icons.Outlined);
+ }
+
+ public final class DoneKt {
+ method public static androidx.compose.ui.graphics.vector.ImageVector getDone(androidx.compose.material.icons.Icons.Outlined);
+ }
+
+ public final class EditKt {
+ method public static androidx.compose.ui.graphics.vector.ImageVector getEdit(androidx.compose.material.icons.Icons.Outlined);
+ }
+
+ public final class EmailKt {
+ method public static androidx.compose.ui.graphics.vector.ImageVector getEmail(androidx.compose.material.icons.Icons.Outlined);
+ }
+
+ public final class ExitToAppKt {
+ method public static androidx.compose.ui.graphics.vector.ImageVector getExitToApp(androidx.compose.material.icons.Icons.Outlined);
+ }
+
+ public final class FaceKt {
+ method public static androidx.compose.ui.graphics.vector.ImageVector getFace(androidx.compose.material.icons.Icons.Outlined);
+ }
+
+ public final class FavoriteBorderKt {
+ method public static androidx.compose.ui.graphics.vector.ImageVector getFavoriteBorder(androidx.compose.material.icons.Icons.Outlined);
+ }
+
+ public final class FavoriteKt {
+ method public static androidx.compose.ui.graphics.vector.ImageVector getFavorite(androidx.compose.material.icons.Icons.Outlined);
+ }
+
+ public final class HomeKt {
+ method public static androidx.compose.ui.graphics.vector.ImageVector getHome(androidx.compose.material.icons.Icons.Outlined);
+ }
+
+ public final class InfoKt {
+ method public static androidx.compose.ui.graphics.vector.ImageVector getInfo(androidx.compose.material.icons.Icons.Outlined);
+ }
+
+ public final class KeyboardArrowDownKt {
+ method public static androidx.compose.ui.graphics.vector.ImageVector getKeyboardArrowDown(androidx.compose.material.icons.Icons.Outlined);
+ }
+
+ public final class KeyboardArrowLeftKt {
+ method public static androidx.compose.ui.graphics.vector.ImageVector getKeyboardArrowLeft(androidx.compose.material.icons.Icons.Outlined);
+ }
+
+ public final class KeyboardArrowRightKt {
+ method public static androidx.compose.ui.graphics.vector.ImageVector getKeyboardArrowRight(androidx.compose.material.icons.Icons.Outlined);
+ }
+
+ public final class KeyboardArrowUpKt {
+ method public static androidx.compose.ui.graphics.vector.ImageVector getKeyboardArrowUp(androidx.compose.material.icons.Icons.Outlined);
+ }
+
+ public final class ListKt {
+ method public static androidx.compose.ui.graphics.vector.ImageVector getList(androidx.compose.material.icons.Icons.Outlined);
+ }
+
+ public final class LocationOnKt {
+ method public static androidx.compose.ui.graphics.vector.ImageVector getLocationOn(androidx.compose.material.icons.Icons.Outlined);
+ }
+
+ public final class LockKt {
+ method public static androidx.compose.ui.graphics.vector.ImageVector getLock(androidx.compose.material.icons.Icons.Outlined);
+ }
+
+ public final class MailOutlineKt {
+ method public static androidx.compose.ui.graphics.vector.ImageVector getMailOutline(androidx.compose.material.icons.Icons.Outlined);
+ }
+
+ public final class MenuKt {
+ method public static androidx.compose.ui.graphics.vector.ImageVector getMenu(androidx.compose.material.icons.Icons.Outlined);
+ }
+
+ public final class MoreVertKt {
+ method public static androidx.compose.ui.graphics.vector.ImageVector getMoreVert(androidx.compose.material.icons.Icons.Outlined);
+ }
+
+ public final class NotificationsKt {
+ method public static androidx.compose.ui.graphics.vector.ImageVector getNotifications(androidx.compose.material.icons.Icons.Outlined);
+ }
+
+ public final class PersonKt {
+ method public static androidx.compose.ui.graphics.vector.ImageVector getPerson(androidx.compose.material.icons.Icons.Outlined);
+ }
+
+ public final class PhoneKt {
+ method public static androidx.compose.ui.graphics.vector.ImageVector getPhone(androidx.compose.material.icons.Icons.Outlined);
+ }
+
+ public final class PlaceKt {
+ method public static androidx.compose.ui.graphics.vector.ImageVector getPlace(androidx.compose.material.icons.Icons.Outlined);
+ }
+
+ public final class PlayArrowKt {
+ method public static androidx.compose.ui.graphics.vector.ImageVector getPlayArrow(androidx.compose.material.icons.Icons.Outlined);
+ }
+
+ public final class RefreshKt {
+ method public static androidx.compose.ui.graphics.vector.ImageVector getRefresh(androidx.compose.material.icons.Icons.Outlined);
+ }
+
+ public final class SearchKt {
+ method public static androidx.compose.ui.graphics.vector.ImageVector getSearch(androidx.compose.material.icons.Icons.Outlined);
+ }
+
+ public final class SendKt {
+ method public static androidx.compose.ui.graphics.vector.ImageVector getSend(androidx.compose.material.icons.Icons.Outlined);
+ }
+
+ public final class SettingsKt {
+ method public static androidx.compose.ui.graphics.vector.ImageVector getSettings(androidx.compose.material.icons.Icons.Outlined);
+ }
+
+ public final class ShareKt {
+ method public static androidx.compose.ui.graphics.vector.ImageVector getShare(androidx.compose.material.icons.Icons.Outlined);
+ }
+
+ public final class ShoppingCartKt {
+ method public static androidx.compose.ui.graphics.vector.ImageVector getShoppingCart(androidx.compose.material.icons.Icons.Outlined);
+ }
+
+ public final class StarKt {
+ method public static androidx.compose.ui.graphics.vector.ImageVector getStar(androidx.compose.material.icons.Icons.Outlined);
+ }
+
+ public final class ThumbUpKt {
+ method public static androidx.compose.ui.graphics.vector.ImageVector getThumbUp(androidx.compose.material.icons.Icons.Outlined);
+ }
+
+ public final class WarningKt {
+ method public static androidx.compose.ui.graphics.vector.ImageVector getWarning(androidx.compose.material.icons.Icons.Outlined);
+ }
+
+}
+
+package androidx.compose.material.icons.rounded {
+
+ public final class AccountBoxKt {
+ method public static androidx.compose.ui.graphics.vector.ImageVector getAccountBox(androidx.compose.material.icons.Icons.Rounded);
+ }
+
+ public final class AccountCircleKt {
+ method public static androidx.compose.ui.graphics.vector.ImageVector getAccountCircle(androidx.compose.material.icons.Icons.Rounded);
+ }
+
+ public final class AddCircleKt {
+ method public static androidx.compose.ui.graphics.vector.ImageVector getAddCircle(androidx.compose.material.icons.Icons.Rounded);
+ }
+
+ public final class AddKt {
+ method public static androidx.compose.ui.graphics.vector.ImageVector getAdd(androidx.compose.material.icons.Icons.Rounded);
+ }
+
+ public final class ArrowBackKt {
+ method public static androidx.compose.ui.graphics.vector.ImageVector getArrowBack(androidx.compose.material.icons.Icons.Rounded);
+ }
+
+ public final class ArrowDropDownKt {
+ method public static androidx.compose.ui.graphics.vector.ImageVector getArrowDropDown(androidx.compose.material.icons.Icons.Rounded);
+ }
+
+ public final class ArrowForwardKt {
+ method public static androidx.compose.ui.graphics.vector.ImageVector getArrowForward(androidx.compose.material.icons.Icons.Rounded);
+ }
+
+ public final class BuildKt {
+ method public static androidx.compose.ui.graphics.vector.ImageVector getBuild(androidx.compose.material.icons.Icons.Rounded);
+ }
+
+ public final class CallKt {
+ method public static androidx.compose.ui.graphics.vector.ImageVector getCall(androidx.compose.material.icons.Icons.Rounded);
+ }
+
+ public final class CheckCircleKt {
+ method public static androidx.compose.ui.graphics.vector.ImageVector getCheckCircle(androidx.compose.material.icons.Icons.Rounded);
+ }
+
+ public final class CheckKt {
+ method public static androidx.compose.ui.graphics.vector.ImageVector getCheck(androidx.compose.material.icons.Icons.Rounded);
+ }
+
+ public final class ClearKt {
+ method public static androidx.compose.ui.graphics.vector.ImageVector getClear(androidx.compose.material.icons.Icons.Rounded);
+ }
+
+ public final class CloseKt {
+ method public static androidx.compose.ui.graphics.vector.ImageVector getClose(androidx.compose.material.icons.Icons.Rounded);
+ }
+
+ public final class CreateKt {
+ method public static androidx.compose.ui.graphics.vector.ImageVector getCreate(androidx.compose.material.icons.Icons.Rounded);
+ }
+
+ public final class DateRangeKt {
+ method public static androidx.compose.ui.graphics.vector.ImageVector getDateRange(androidx.compose.material.icons.Icons.Rounded);
+ }
+
+ public final class DeleteKt {
+ method public static androidx.compose.ui.graphics.vector.ImageVector getDelete(androidx.compose.material.icons.Icons.Rounded);
+ }
+
+ public final class DoneKt {
+ method public static androidx.compose.ui.graphics.vector.ImageVector getDone(androidx.compose.material.icons.Icons.Rounded);
+ }
+
+ public final class EditKt {
+ method public static androidx.compose.ui.graphics.vector.ImageVector getEdit(androidx.compose.material.icons.Icons.Rounded);
+ }
+
+ public final class EmailKt {
+ method public static androidx.compose.ui.graphics.vector.ImageVector getEmail(androidx.compose.material.icons.Icons.Rounded);
+ }
+
+ public final class ExitToAppKt {
+ method public static androidx.compose.ui.graphics.vector.ImageVector getExitToApp(androidx.compose.material.icons.Icons.Rounded);
+ }
+
+ public final class FaceKt {
+ method public static androidx.compose.ui.graphics.vector.ImageVector getFace(androidx.compose.material.icons.Icons.Rounded);
+ }
+
+ public final class FavoriteBorderKt {
+ method public static androidx.compose.ui.graphics.vector.ImageVector getFavoriteBorder(androidx.compose.material.icons.Icons.Rounded);
+ }
+
+ public final class FavoriteKt {
+ method public static androidx.compose.ui.graphics.vector.ImageVector getFavorite(androidx.compose.material.icons.Icons.Rounded);
+ }
+
+ public final class HomeKt {
+ method public static androidx.compose.ui.graphics.vector.ImageVector getHome(androidx.compose.material.icons.Icons.Rounded);
+ }
+
+ public final class InfoKt {
+ method public static androidx.compose.ui.graphics.vector.ImageVector getInfo(androidx.compose.material.icons.Icons.Rounded);
+ }
+
+ public final class KeyboardArrowDownKt {
+ method public static androidx.compose.ui.graphics.vector.ImageVector getKeyboardArrowDown(androidx.compose.material.icons.Icons.Rounded);
+ }
+
+ public final class KeyboardArrowLeftKt {
+ method public static androidx.compose.ui.graphics.vector.ImageVector getKeyboardArrowLeft(androidx.compose.material.icons.Icons.Rounded);
+ }
+
+ public final class KeyboardArrowRightKt {
+ method public static androidx.compose.ui.graphics.vector.ImageVector getKeyboardArrowRight(androidx.compose.material.icons.Icons.Rounded);
+ }
+
+ public final class KeyboardArrowUpKt {
+ method public static androidx.compose.ui.graphics.vector.ImageVector getKeyboardArrowUp(androidx.compose.material.icons.Icons.Rounded);
+ }
+
+ public final class ListKt {
+ method public static androidx.compose.ui.graphics.vector.ImageVector getList(androidx.compose.material.icons.Icons.Rounded);
+ }
+
+ public final class LocationOnKt {
+ method public static androidx.compose.ui.graphics.vector.ImageVector getLocationOn(androidx.compose.material.icons.Icons.Rounded);
+ }
+
+ public final class LockKt {
+ method public static androidx.compose.ui.graphics.vector.ImageVector getLock(androidx.compose.material.icons.Icons.Rounded);
+ }
+
+ public final class MailOutlineKt {
+ method public static androidx.compose.ui.graphics.vector.ImageVector getMailOutline(androidx.compose.material.icons.Icons.Rounded);
+ }
+
+ public final class MenuKt {
+ method public static androidx.compose.ui.graphics.vector.ImageVector getMenu(androidx.compose.material.icons.Icons.Rounded);
+ }
+
+ public final class MoreVertKt {
+ method public static androidx.compose.ui.graphics.vector.ImageVector getMoreVert(androidx.compose.material.icons.Icons.Rounded);
+ }
+
+ public final class NotificationsKt {
+ method public static androidx.compose.ui.graphics.vector.ImageVector getNotifications(androidx.compose.material.icons.Icons.Rounded);
+ }
+
+ public final class PersonKt {
+ method public static androidx.compose.ui.graphics.vector.ImageVector getPerson(androidx.compose.material.icons.Icons.Rounded);
+ }
+
+ public final class PhoneKt {
+ method public static androidx.compose.ui.graphics.vector.ImageVector getPhone(androidx.compose.material.icons.Icons.Rounded);
+ }
+
+ public final class PlaceKt {
+ method public static androidx.compose.ui.graphics.vector.ImageVector getPlace(androidx.compose.material.icons.Icons.Rounded);
+ }
+
+ public final class PlayArrowKt {
+ method public static androidx.compose.ui.graphics.vector.ImageVector getPlayArrow(androidx.compose.material.icons.Icons.Rounded);
+ }
+
+ public final class RefreshKt {
+ method public static androidx.compose.ui.graphics.vector.ImageVector getRefresh(androidx.compose.material.icons.Icons.Rounded);
+ }
+
+ public final class SearchKt {
+ method public static androidx.compose.ui.graphics.vector.ImageVector getSearch(androidx.compose.material.icons.Icons.Rounded);
+ }
+
+ public final class SendKt {
+ method public static androidx.compose.ui.graphics.vector.ImageVector getSend(androidx.compose.material.icons.Icons.Rounded);
+ }
+
+ public final class SettingsKt {
+ method public static androidx.compose.ui.graphics.vector.ImageVector getSettings(androidx.compose.material.icons.Icons.Rounded);
+ }
+
+ public final class ShareKt {
+ method public static androidx.compose.ui.graphics.vector.ImageVector getShare(androidx.compose.material.icons.Icons.Rounded);
+ }
+
+ public final class ShoppingCartKt {
+ method public static androidx.compose.ui.graphics.vector.ImageVector getShoppingCart(androidx.compose.material.icons.Icons.Rounded);
+ }
+
+ public final class StarKt {
+ method public static androidx.compose.ui.graphics.vector.ImageVector getStar(androidx.compose.material.icons.Icons.Rounded);
+ }
+
+ public final class ThumbUpKt {
+ method public static androidx.compose.ui.graphics.vector.ImageVector getThumbUp(androidx.compose.material.icons.Icons.Rounded);
+ }
+
+ public final class WarningKt {
+ method public static androidx.compose.ui.graphics.vector.ImageVector getWarning(androidx.compose.material.icons.Icons.Rounded);
+ }
+
+}
+
+package androidx.compose.material.icons.sharp {
+
+ public final class AccountBoxKt {
+ method public static androidx.compose.ui.graphics.vector.ImageVector getAccountBox(androidx.compose.material.icons.Icons.Sharp);
+ }
+
+ public final class AccountCircleKt {
+ method public static androidx.compose.ui.graphics.vector.ImageVector getAccountCircle(androidx.compose.material.icons.Icons.Sharp);
+ }
+
+ public final class AddCircleKt {
+ method public static androidx.compose.ui.graphics.vector.ImageVector getAddCircle(androidx.compose.material.icons.Icons.Sharp);
+ }
+
+ public final class AddKt {
+ method public static androidx.compose.ui.graphics.vector.ImageVector getAdd(androidx.compose.material.icons.Icons.Sharp);
+ }
+
+ public final class ArrowBackKt {
+ method public static androidx.compose.ui.graphics.vector.ImageVector getArrowBack(androidx.compose.material.icons.Icons.Sharp);
+ }
+
+ public final class ArrowDropDownKt {
+ method public static androidx.compose.ui.graphics.vector.ImageVector getArrowDropDown(androidx.compose.material.icons.Icons.Sharp);
+ }
+
+ public final class ArrowForwardKt {
+ method public static androidx.compose.ui.graphics.vector.ImageVector getArrowForward(androidx.compose.material.icons.Icons.Sharp);
+ }
+
+ public final class BuildKt {
+ method public static androidx.compose.ui.graphics.vector.ImageVector getBuild(androidx.compose.material.icons.Icons.Sharp);
+ }
+
+ public final class CallKt {
+ method public static androidx.compose.ui.graphics.vector.ImageVector getCall(androidx.compose.material.icons.Icons.Sharp);
+ }
+
+ public final class CheckCircleKt {
+ method public static androidx.compose.ui.graphics.vector.ImageVector getCheckCircle(androidx.compose.material.icons.Icons.Sharp);
+ }
+
+ public final class CheckKt {
+ method public static androidx.compose.ui.graphics.vector.ImageVector getCheck(androidx.compose.material.icons.Icons.Sharp);
+ }
+
+ public final class ClearKt {
+ method public static androidx.compose.ui.graphics.vector.ImageVector getClear(androidx.compose.material.icons.Icons.Sharp);
+ }
+
+ public final class CloseKt {
+ method public static androidx.compose.ui.graphics.vector.ImageVector getClose(androidx.compose.material.icons.Icons.Sharp);
+ }
+
+ public final class CreateKt {
+ method public static androidx.compose.ui.graphics.vector.ImageVector getCreate(androidx.compose.material.icons.Icons.Sharp);
+ }
+
+ public final class DateRangeKt {
+ method public static androidx.compose.ui.graphics.vector.ImageVector getDateRange(androidx.compose.material.icons.Icons.Sharp);
+ }
+
+ public final class DeleteKt {
+ method public static androidx.compose.ui.graphics.vector.ImageVector getDelete(androidx.compose.material.icons.Icons.Sharp);
+ }
+
+ public final class DoneKt {
+ method public static androidx.compose.ui.graphics.vector.ImageVector getDone(androidx.compose.material.icons.Icons.Sharp);
+ }
+
+ public final class EditKt {
+ method public static androidx.compose.ui.graphics.vector.ImageVector getEdit(androidx.compose.material.icons.Icons.Sharp);
+ }
+
+ public final class EmailKt {
+ method public static androidx.compose.ui.graphics.vector.ImageVector getEmail(androidx.compose.material.icons.Icons.Sharp);
+ }
+
+ public final class ExitToAppKt {
+ method public static androidx.compose.ui.graphics.vector.ImageVector getExitToApp(androidx.compose.material.icons.Icons.Sharp);
+ }
+
+ public final class FaceKt {
+ method public static androidx.compose.ui.graphics.vector.ImageVector getFace(androidx.compose.material.icons.Icons.Sharp);
+ }
+
+ public final class FavoriteBorderKt {
+ method public static androidx.compose.ui.graphics.vector.ImageVector getFavoriteBorder(androidx.compose.material.icons.Icons.Sharp);
+ }
+
+ public final class FavoriteKt {
+ method public static androidx.compose.ui.graphics.vector.ImageVector getFavorite(androidx.compose.material.icons.Icons.Sharp);
+ }
+
+ public final class HomeKt {
+ method public static androidx.compose.ui.graphics.vector.ImageVector getHome(androidx.compose.material.icons.Icons.Sharp);
+ }
+
+ public final class InfoKt {
+ method public static androidx.compose.ui.graphics.vector.ImageVector getInfo(androidx.compose.material.icons.Icons.Sharp);
+ }
+
+ public final class KeyboardArrowDownKt {
+ method public static androidx.compose.ui.graphics.vector.ImageVector getKeyboardArrowDown(androidx.compose.material.icons.Icons.Sharp);
+ }
+
+ public final class KeyboardArrowLeftKt {
+ method public static androidx.compose.ui.graphics.vector.ImageVector getKeyboardArrowLeft(androidx.compose.material.icons.Icons.Sharp);
+ }
+
+ public final class KeyboardArrowRightKt {
+ method public static androidx.compose.ui.graphics.vector.ImageVector getKeyboardArrowRight(androidx.compose.material.icons.Icons.Sharp);
+ }
+
+ public final class KeyboardArrowUpKt {
+ method public static androidx.compose.ui.graphics.vector.ImageVector getKeyboardArrowUp(androidx.compose.material.icons.Icons.Sharp);
+ }
+
+ public final class ListKt {
+ method public static androidx.compose.ui.graphics.vector.ImageVector getList(androidx.compose.material.icons.Icons.Sharp);
+ }
+
+ public final class LocationOnKt {
+ method public static androidx.compose.ui.graphics.vector.ImageVector getLocationOn(androidx.compose.material.icons.Icons.Sharp);
+ }
+
+ public final class LockKt {
+ method public static androidx.compose.ui.graphics.vector.ImageVector getLock(androidx.compose.material.icons.Icons.Sharp);
+ }
+
+ public final class MailOutlineKt {
+ method public static androidx.compose.ui.graphics.vector.ImageVector getMailOutline(androidx.compose.material.icons.Icons.Sharp);
+ }
+
+ public final class MenuKt {
+ method public static androidx.compose.ui.graphics.vector.ImageVector getMenu(androidx.compose.material.icons.Icons.Sharp);
+ }
+
+ public final class MoreVertKt {
+ method public static androidx.compose.ui.graphics.vector.ImageVector getMoreVert(androidx.compose.material.icons.Icons.Sharp);
+ }
+
+ public final class NotificationsKt {
+ method public static androidx.compose.ui.graphics.vector.ImageVector getNotifications(androidx.compose.material.icons.Icons.Sharp);
+ }
+
+ public final class PersonKt {
+ method public static androidx.compose.ui.graphics.vector.ImageVector getPerson(androidx.compose.material.icons.Icons.Sharp);
+ }
+
+ public final class PhoneKt {
+ method public static androidx.compose.ui.graphics.vector.ImageVector getPhone(androidx.compose.material.icons.Icons.Sharp);
+ }
+
+ public final class PlaceKt {
+ method public static androidx.compose.ui.graphics.vector.ImageVector getPlace(androidx.compose.material.icons.Icons.Sharp);
+ }
+
+ public final class PlayArrowKt {
+ method public static androidx.compose.ui.graphics.vector.ImageVector getPlayArrow(androidx.compose.material.icons.Icons.Sharp);
+ }
+
+ public final class RefreshKt {
+ method public static androidx.compose.ui.graphics.vector.ImageVector getRefresh(androidx.compose.material.icons.Icons.Sharp);
+ }
+
+ public final class SearchKt {
+ method public static androidx.compose.ui.graphics.vector.ImageVector getSearch(androidx.compose.material.icons.Icons.Sharp);
+ }
+
+ public final class SendKt {
+ method public static androidx.compose.ui.graphics.vector.ImageVector getSend(androidx.compose.material.icons.Icons.Sharp);
+ }
+
+ public final class SettingsKt {
+ method public static androidx.compose.ui.graphics.vector.ImageVector getSettings(androidx.compose.material.icons.Icons.Sharp);
+ }
+
+ public final class ShareKt {
+ method public static androidx.compose.ui.graphics.vector.ImageVector getShare(androidx.compose.material.icons.Icons.Sharp);
+ }
+
+ public final class ShoppingCartKt {
+ method public static androidx.compose.ui.graphics.vector.ImageVector getShoppingCart(androidx.compose.material.icons.Icons.Sharp);
+ }
+
+ public final class StarKt {
+ method public static androidx.compose.ui.graphics.vector.ImageVector getStar(androidx.compose.material.icons.Icons.Sharp);
+ }
+
+ public final class ThumbUpKt {
+ method public static androidx.compose.ui.graphics.vector.ImageVector getThumbUp(androidx.compose.material.icons.Icons.Sharp);
+ }
+
+ public final class WarningKt {
+ method public static androidx.compose.ui.graphics.vector.ImageVector getWarning(androidx.compose.material.icons.Icons.Sharp);
+ }
+
+}
+
+package androidx.compose.material.icons.twotone {
+
+ public final class AccountBoxKt {
+ method public static androidx.compose.ui.graphics.vector.ImageVector getAccountBox(androidx.compose.material.icons.Icons.TwoTone);
+ }
+
+ public final class AccountCircleKt {
+ method public static androidx.compose.ui.graphics.vector.ImageVector getAccountCircle(androidx.compose.material.icons.Icons.TwoTone);
+ }
+
+ public final class AddCircleKt {
+ method public static androidx.compose.ui.graphics.vector.ImageVector getAddCircle(androidx.compose.material.icons.Icons.TwoTone);
+ }
+
+ public final class AddKt {
+ method public static androidx.compose.ui.graphics.vector.ImageVector getAdd(androidx.compose.material.icons.Icons.TwoTone);
+ }
+
+ public final class ArrowBackKt {
+ method public static androidx.compose.ui.graphics.vector.ImageVector getArrowBack(androidx.compose.material.icons.Icons.TwoTone);
+ }
+
+ public final class ArrowDropDownKt {
+ method public static androidx.compose.ui.graphics.vector.ImageVector getArrowDropDown(androidx.compose.material.icons.Icons.TwoTone);
+ }
+
+ public final class ArrowForwardKt {
+ method public static androidx.compose.ui.graphics.vector.ImageVector getArrowForward(androidx.compose.material.icons.Icons.TwoTone);
+ }
+
+ public final class BuildKt {
+ method public static androidx.compose.ui.graphics.vector.ImageVector getBuild(androidx.compose.material.icons.Icons.TwoTone);
+ }
+
+ public final class CallKt {
+ method public static androidx.compose.ui.graphics.vector.ImageVector getCall(androidx.compose.material.icons.Icons.TwoTone);
+ }
+
+ public final class CheckCircleKt {
+ method public static androidx.compose.ui.graphics.vector.ImageVector getCheckCircle(androidx.compose.material.icons.Icons.TwoTone);
+ }
+
+ public final class CheckKt {
+ method public static androidx.compose.ui.graphics.vector.ImageVector getCheck(androidx.compose.material.icons.Icons.TwoTone);
+ }
+
+ public final class ClearKt {
+ method public static androidx.compose.ui.graphics.vector.ImageVector getClear(androidx.compose.material.icons.Icons.TwoTone);
+ }
+
+ public final class CloseKt {
+ method public static androidx.compose.ui.graphics.vector.ImageVector getClose(androidx.compose.material.icons.Icons.TwoTone);
+ }
+
+ public final class CreateKt {
+ method public static androidx.compose.ui.graphics.vector.ImageVector getCreate(androidx.compose.material.icons.Icons.TwoTone);
+ }
+
+ public final class DateRangeKt {
+ method public static androidx.compose.ui.graphics.vector.ImageVector getDateRange(androidx.compose.material.icons.Icons.TwoTone);
+ }
+
+ public final class DeleteKt {
+ method public static androidx.compose.ui.graphics.vector.ImageVector getDelete(androidx.compose.material.icons.Icons.TwoTone);
+ }
+
+ public final class DoneKt {
+ method public static androidx.compose.ui.graphics.vector.ImageVector getDone(androidx.compose.material.icons.Icons.TwoTone);
+ }
+
+ public final class EditKt {
+ method public static androidx.compose.ui.graphics.vector.ImageVector getEdit(androidx.compose.material.icons.Icons.TwoTone);
+ }
+
+ public final class EmailKt {
+ method public static androidx.compose.ui.graphics.vector.ImageVector getEmail(androidx.compose.material.icons.Icons.TwoTone);
+ }
+
+ public final class ExitToAppKt {
+ method public static androidx.compose.ui.graphics.vector.ImageVector getExitToApp(androidx.compose.material.icons.Icons.TwoTone);
+ }
+
+ public final class FaceKt {
+ method public static androidx.compose.ui.graphics.vector.ImageVector getFace(androidx.compose.material.icons.Icons.TwoTone);
+ }
+
+ public final class FavoriteBorderKt {
+ method public static androidx.compose.ui.graphics.vector.ImageVector getFavoriteBorder(androidx.compose.material.icons.Icons.TwoTone);
+ }
+
+ public final class FavoriteKt {
+ method public static androidx.compose.ui.graphics.vector.ImageVector getFavorite(androidx.compose.material.icons.Icons.TwoTone);
+ }
+
+ public final class HomeKt {
+ method public static androidx.compose.ui.graphics.vector.ImageVector getHome(androidx.compose.material.icons.Icons.TwoTone);
+ }
+
+ public final class InfoKt {
+ method public static androidx.compose.ui.graphics.vector.ImageVector getInfo(androidx.compose.material.icons.Icons.TwoTone);
+ }
+
+ public final class KeyboardArrowDownKt {
+ method public static androidx.compose.ui.graphics.vector.ImageVector getKeyboardArrowDown(androidx.compose.material.icons.Icons.TwoTone);
+ }
+
+ public final class KeyboardArrowLeftKt {
+ method public static androidx.compose.ui.graphics.vector.ImageVector getKeyboardArrowLeft(androidx.compose.material.icons.Icons.TwoTone);
+ }
+
+ public final class KeyboardArrowRightKt {
+ method public static androidx.compose.ui.graphics.vector.ImageVector getKeyboardArrowRight(androidx.compose.material.icons.Icons.TwoTone);
+ }
+
+ public final class KeyboardArrowUpKt {
+ method public static androidx.compose.ui.graphics.vector.ImageVector getKeyboardArrowUp(androidx.compose.material.icons.Icons.TwoTone);
+ }
+
+ public final class ListKt {
+ method public static androidx.compose.ui.graphics.vector.ImageVector getList(androidx.compose.material.icons.Icons.TwoTone);
+ }
+
+ public final class LocationOnKt {
+ method public static androidx.compose.ui.graphics.vector.ImageVector getLocationOn(androidx.compose.material.icons.Icons.TwoTone);
+ }
+
+ public final class LockKt {
+ method public static androidx.compose.ui.graphics.vector.ImageVector getLock(androidx.compose.material.icons.Icons.TwoTone);
+ }
+
+ public final class MailOutlineKt {
+ method public static androidx.compose.ui.graphics.vector.ImageVector getMailOutline(androidx.compose.material.icons.Icons.TwoTone);
+ }
+
+ public final class MenuKt {
+ method public static androidx.compose.ui.graphics.vector.ImageVector getMenu(androidx.compose.material.icons.Icons.TwoTone);
+ }
+
+ public final class MoreVertKt {
+ method public static androidx.compose.ui.graphics.vector.ImageVector getMoreVert(androidx.compose.material.icons.Icons.TwoTone);
+ }
+
+ public final class NotificationsKt {
+ method public static androidx.compose.ui.graphics.vector.ImageVector getNotifications(androidx.compose.material.icons.Icons.TwoTone);
+ }
+
+ public final class PersonKt {
+ method public static androidx.compose.ui.graphics.vector.ImageVector getPerson(androidx.compose.material.icons.Icons.TwoTone);
+ }
+
+ public final class PhoneKt {
+ method public static androidx.compose.ui.graphics.vector.ImageVector getPhone(androidx.compose.material.icons.Icons.TwoTone);
+ }
+
+ public final class PlaceKt {
+ method public static androidx.compose.ui.graphics.vector.ImageVector getPlace(androidx.compose.material.icons.Icons.TwoTone);
+ }
+
+ public final class PlayArrowKt {
+ method public static androidx.compose.ui.graphics.vector.ImageVector getPlayArrow(androidx.compose.material.icons.Icons.TwoTone);
+ }
+
+ public final class RefreshKt {
+ method public static androidx.compose.ui.graphics.vector.ImageVector getRefresh(androidx.compose.material.icons.Icons.TwoTone);
+ }
+
+ public final class SearchKt {
+ method public static androidx.compose.ui.graphics.vector.ImageVector getSearch(androidx.compose.material.icons.Icons.TwoTone);
+ }
+
+ public final class SendKt {
+ method public static androidx.compose.ui.graphics.vector.ImageVector getSend(androidx.compose.material.icons.Icons.TwoTone);
+ }
+
+ public final class SettingsKt {
+ method public static androidx.compose.ui.graphics.vector.ImageVector getSettings(androidx.compose.material.icons.Icons.TwoTone);
+ }
+
+ public final class ShareKt {
+ method public static androidx.compose.ui.graphics.vector.ImageVector getShare(androidx.compose.material.icons.Icons.TwoTone);
+ }
+
+ public final class ShoppingCartKt {
+ method public static androidx.compose.ui.graphics.vector.ImageVector getShoppingCart(androidx.compose.material.icons.Icons.TwoTone);
+ }
+
+ public final class StarKt {
+ method public static androidx.compose.ui.graphics.vector.ImageVector getStar(androidx.compose.material.icons.Icons.TwoTone);
+ }
+
+ public final class ThumbUpKt {
+ method public static androidx.compose.ui.graphics.vector.ImageVector getThumbUp(androidx.compose.material.icons.Icons.TwoTone);
+ }
+
+ public final class WarningKt {
+ method public static androidx.compose.ui.graphics.vector.ImageVector getWarning(androidx.compose.material.icons.Icons.TwoTone);
+ }
+
+}
+
diff --git a/compose/material/material-icons-core/api/res-1.2.0-beta02.txt b/compose/material/material-icons-core/api/res-1.2.0-beta02.txt
new file mode 100644
index 0000000..e69de29
--- /dev/null
+++ b/compose/material/material-icons-core/api/res-1.2.0-beta02.txt
diff --git a/compose/material/material-icons-core/api/restricted_1.2.0-beta02.txt b/compose/material/material-icons-core/api/restricted_1.2.0-beta02.txt
new file mode 100644
index 0000000..619d449
--- /dev/null
+++ b/compose/material/material-icons-core/api/restricted_1.2.0-beta02.txt
@@ -0,0 +1,1037 @@
+// Signature format: 4.0
+package androidx.compose.material.icons {
+
+ public final class Icons {
+ method public androidx.compose.material.icons.Icons.Filled getDefault();
+ property public final androidx.compose.material.icons.Icons.Filled Default;
+ field public static final androidx.compose.material.icons.Icons INSTANCE;
+ }
+
+ public static final class Icons.Filled {
+ field public static final androidx.compose.material.icons.Icons.Filled INSTANCE;
+ }
+
+ public static final class Icons.Outlined {
+ field public static final androidx.compose.material.icons.Icons.Outlined INSTANCE;
+ }
+
+ public static final class Icons.Rounded {
+ field public static final androidx.compose.material.icons.Icons.Rounded INSTANCE;
+ }
+
+ public static final class Icons.Sharp {
+ field public static final androidx.compose.material.icons.Icons.Sharp INSTANCE;
+ }
+
+ public static final class Icons.TwoTone {
+ field public static final androidx.compose.material.icons.Icons.TwoTone INSTANCE;
+ }
+
+ public final class IconsKt {
+ method public static inline androidx.compose.ui.graphics.vector.ImageVector materialIcon(String name, kotlin.jvm.functions.Function1<? super androidx.compose.ui.graphics.vector.ImageVector.Builder,androidx.compose.ui.graphics.vector.ImageVector.Builder> block);
+ method public static inline androidx.compose.ui.graphics.vector.ImageVector.Builder materialPath(androidx.compose.ui.graphics.vector.ImageVector.Builder, optional float fillAlpha, optional float strokeAlpha, optional int pathFillType, kotlin.jvm.functions.Function1<? super androidx.compose.ui.graphics.vector.PathBuilder,kotlin.Unit> pathBuilder);
+ field @kotlin.PublishedApi internal static final float MaterialIconDimension = 24.0f;
+ }
+
+}
+
+package androidx.compose.material.icons.filled {
+
+ public final class AccountBoxKt {
+ method public static androidx.compose.ui.graphics.vector.ImageVector getAccountBox(androidx.compose.material.icons.Icons.Filled);
+ }
+
+ public final class AccountCircleKt {
+ method public static androidx.compose.ui.graphics.vector.ImageVector getAccountCircle(androidx.compose.material.icons.Icons.Filled);
+ }
+
+ public final class AddCircleKt {
+ method public static androidx.compose.ui.graphics.vector.ImageVector getAddCircle(androidx.compose.material.icons.Icons.Filled);
+ }
+
+ public final class AddKt {
+ method public static androidx.compose.ui.graphics.vector.ImageVector getAdd(androidx.compose.material.icons.Icons.Filled);
+ }
+
+ public final class ArrowBackKt {
+ method public static androidx.compose.ui.graphics.vector.ImageVector getArrowBack(androidx.compose.material.icons.Icons.Filled);
+ }
+
+ public final class ArrowDropDownKt {
+ method public static androidx.compose.ui.graphics.vector.ImageVector getArrowDropDown(androidx.compose.material.icons.Icons.Filled);
+ }
+
+ public final class ArrowForwardKt {
+ method public static androidx.compose.ui.graphics.vector.ImageVector getArrowForward(androidx.compose.material.icons.Icons.Filled);
+ }
+
+ public final class BuildKt {
+ method public static androidx.compose.ui.graphics.vector.ImageVector getBuild(androidx.compose.material.icons.Icons.Filled);
+ }
+
+ public final class CallKt {
+ method public static androidx.compose.ui.graphics.vector.ImageVector getCall(androidx.compose.material.icons.Icons.Filled);
+ }
+
+ public final class CheckCircleKt {
+ method public static androidx.compose.ui.graphics.vector.ImageVector getCheckCircle(androidx.compose.material.icons.Icons.Filled);
+ }
+
+ public final class CheckKt {
+ method public static androidx.compose.ui.graphics.vector.ImageVector getCheck(androidx.compose.material.icons.Icons.Filled);
+ }
+
+ public final class ClearKt {
+ method public static androidx.compose.ui.graphics.vector.ImageVector getClear(androidx.compose.material.icons.Icons.Filled);
+ }
+
+ public final class CloseKt {
+ method public static androidx.compose.ui.graphics.vector.ImageVector getClose(androidx.compose.material.icons.Icons.Filled);
+ }
+
+ public final class CreateKt {
+ method public static androidx.compose.ui.graphics.vector.ImageVector getCreate(androidx.compose.material.icons.Icons.Filled);
+ }
+
+ public final class DateRangeKt {
+ method public static androidx.compose.ui.graphics.vector.ImageVector getDateRange(androidx.compose.material.icons.Icons.Filled);
+ }
+
+ public final class DeleteKt {
+ method public static androidx.compose.ui.graphics.vector.ImageVector getDelete(androidx.compose.material.icons.Icons.Filled);
+ }
+
+ public final class DoneKt {
+ method public static androidx.compose.ui.graphics.vector.ImageVector getDone(androidx.compose.material.icons.Icons.Filled);
+ }
+
+ public final class EditKt {
+ method public static androidx.compose.ui.graphics.vector.ImageVector getEdit(androidx.compose.material.icons.Icons.Filled);
+ }
+
+ public final class EmailKt {
+ method public static androidx.compose.ui.graphics.vector.ImageVector getEmail(androidx.compose.material.icons.Icons.Filled);
+ }
+
+ public final class ExitToAppKt {
+ method public static androidx.compose.ui.graphics.vector.ImageVector getExitToApp(androidx.compose.material.icons.Icons.Filled);
+ }
+
+ public final class FaceKt {
+ method public static androidx.compose.ui.graphics.vector.ImageVector getFace(androidx.compose.material.icons.Icons.Filled);
+ }
+
+ public final class FavoriteBorderKt {
+ method public static androidx.compose.ui.graphics.vector.ImageVector getFavoriteBorder(androidx.compose.material.icons.Icons.Filled);
+ }
+
+ public final class FavoriteKt {
+ method public static androidx.compose.ui.graphics.vector.ImageVector getFavorite(androidx.compose.material.icons.Icons.Filled);
+ }
+
+ public final class HomeKt {
+ method public static androidx.compose.ui.graphics.vector.ImageVector getHome(androidx.compose.material.icons.Icons.Filled);
+ }
+
+ public final class InfoKt {
+ method public static androidx.compose.ui.graphics.vector.ImageVector getInfo(androidx.compose.material.icons.Icons.Filled);
+ }
+
+ public final class KeyboardArrowDownKt {
+ method public static androidx.compose.ui.graphics.vector.ImageVector getKeyboardArrowDown(androidx.compose.material.icons.Icons.Filled);
+ }
+
+ public final class KeyboardArrowLeftKt {
+ method public static androidx.compose.ui.graphics.vector.ImageVector getKeyboardArrowLeft(androidx.compose.material.icons.Icons.Filled);
+ }
+
+ public final class KeyboardArrowRightKt {
+ method public static androidx.compose.ui.graphics.vector.ImageVector getKeyboardArrowRight(androidx.compose.material.icons.Icons.Filled);
+ }
+
+ public final class KeyboardArrowUpKt {
+ method public static androidx.compose.ui.graphics.vector.ImageVector getKeyboardArrowUp(androidx.compose.material.icons.Icons.Filled);
+ }
+
+ public final class ListKt {
+ method public static androidx.compose.ui.graphics.vector.ImageVector getList(androidx.compose.material.icons.Icons.Filled);
+ }
+
+ public final class LocationOnKt {
+ method public static androidx.compose.ui.graphics.vector.ImageVector getLocationOn(androidx.compose.material.icons.Icons.Filled);
+ }
+
+ public final class LockKt {
+ method public static androidx.compose.ui.graphics.vector.ImageVector getLock(androidx.compose.material.icons.Icons.Filled);
+ }
+
+ public final class MailOutlineKt {
+ method public static androidx.compose.ui.graphics.vector.ImageVector getMailOutline(androidx.compose.material.icons.Icons.Filled);
+ }
+
+ public final class MenuKt {
+ method public static androidx.compose.ui.graphics.vector.ImageVector getMenu(androidx.compose.material.icons.Icons.Filled);
+ }
+
+ public final class MoreVertKt {
+ method public static androidx.compose.ui.graphics.vector.ImageVector getMoreVert(androidx.compose.material.icons.Icons.Filled);
+ }
+
+ public final class NotificationsKt {
+ method public static androidx.compose.ui.graphics.vector.ImageVector getNotifications(androidx.compose.material.icons.Icons.Filled);
+ }
+
+ public final class PersonKt {
+ method public static androidx.compose.ui.graphics.vector.ImageVector getPerson(androidx.compose.material.icons.Icons.Filled);
+ }
+
+ public final class PhoneKt {
+ method public static androidx.compose.ui.graphics.vector.ImageVector getPhone(androidx.compose.material.icons.Icons.Filled);
+ }
+
+ public final class PlaceKt {
+ method public static androidx.compose.ui.graphics.vector.ImageVector getPlace(androidx.compose.material.icons.Icons.Filled);
+ }
+
+ public final class PlayArrowKt {
+ method public static androidx.compose.ui.graphics.vector.ImageVector getPlayArrow(androidx.compose.material.icons.Icons.Filled);
+ }
+
+ public final class RefreshKt {
+ method public static androidx.compose.ui.graphics.vector.ImageVector getRefresh(androidx.compose.material.icons.Icons.Filled);
+ }
+
+ public final class SearchKt {
+ method public static androidx.compose.ui.graphics.vector.ImageVector getSearch(androidx.compose.material.icons.Icons.Filled);
+ }
+
+ public final class SendKt {
+ method public static androidx.compose.ui.graphics.vector.ImageVector getSend(androidx.compose.material.icons.Icons.Filled);
+ }
+
+ public final class SettingsKt {
+ method public static androidx.compose.ui.graphics.vector.ImageVector getSettings(androidx.compose.material.icons.Icons.Filled);
+ }
+
+ public final class ShareKt {
+ method public static androidx.compose.ui.graphics.vector.ImageVector getShare(androidx.compose.material.icons.Icons.Filled);
+ }
+
+ public final class ShoppingCartKt {
+ method public static androidx.compose.ui.graphics.vector.ImageVector getShoppingCart(androidx.compose.material.icons.Icons.Filled);
+ }
+
+ public final class StarKt {
+ method public static androidx.compose.ui.graphics.vector.ImageVector getStar(androidx.compose.material.icons.Icons.Filled);
+ }
+
+ public final class ThumbUpKt {
+ method public static androidx.compose.ui.graphics.vector.ImageVector getThumbUp(androidx.compose.material.icons.Icons.Filled);
+ }
+
+ public final class WarningKt {
+ method public static androidx.compose.ui.graphics.vector.ImageVector getWarning(androidx.compose.material.icons.Icons.Filled);
+ }
+
+}
+
+package androidx.compose.material.icons.outlined {
+
+ public final class AccountBoxKt {
+ method public static androidx.compose.ui.graphics.vector.ImageVector getAccountBox(androidx.compose.material.icons.Icons.Outlined);
+ }
+
+ public final class AccountCircleKt {
+ method public static androidx.compose.ui.graphics.vector.ImageVector getAccountCircle(androidx.compose.material.icons.Icons.Outlined);
+ }
+
+ public final class AddCircleKt {
+ method public static androidx.compose.ui.graphics.vector.ImageVector getAddCircle(androidx.compose.material.icons.Icons.Outlined);
+ }
+
+ public final class AddKt {
+ method public static androidx.compose.ui.graphics.vector.ImageVector getAdd(androidx.compose.material.icons.Icons.Outlined);
+ }
+
+ public final class ArrowBackKt {
+ method public static androidx.compose.ui.graphics.vector.ImageVector getArrowBack(androidx.compose.material.icons.Icons.Outlined);
+ }
+
+ public final class ArrowDropDownKt {
+ method public static androidx.compose.ui.graphics.vector.ImageVector getArrowDropDown(androidx.compose.material.icons.Icons.Outlined);
+ }
+
+ public final class ArrowForwardKt {
+ method public static androidx.compose.ui.graphics.vector.ImageVector getArrowForward(androidx.compose.material.icons.Icons.Outlined);
+ }
+
+ public final class BuildKt {
+ method public static androidx.compose.ui.graphics.vector.ImageVector getBuild(androidx.compose.material.icons.Icons.Outlined);
+ }
+
+ public final class CallKt {
+ method public static androidx.compose.ui.graphics.vector.ImageVector getCall(androidx.compose.material.icons.Icons.Outlined);
+ }
+
+ public final class CheckCircleKt {
+ method public static androidx.compose.ui.graphics.vector.ImageVector getCheckCircle(androidx.compose.material.icons.Icons.Outlined);
+ }
+
+ public final class CheckKt {
+ method public static androidx.compose.ui.graphics.vector.ImageVector getCheck(androidx.compose.material.icons.Icons.Outlined);
+ }
+
+ public final class ClearKt {
+ method public static androidx.compose.ui.graphics.vector.ImageVector getClear(androidx.compose.material.icons.Icons.Outlined);
+ }
+
+ public final class CloseKt {
+ method public static androidx.compose.ui.graphics.vector.ImageVector getClose(androidx.compose.material.icons.Icons.Outlined);
+ }
+
+ public final class CreateKt {
+ method public static androidx.compose.ui.graphics.vector.ImageVector getCreate(androidx.compose.material.icons.Icons.Outlined);
+ }
+
+ public final class DateRangeKt {
+ method public static androidx.compose.ui.graphics.vector.ImageVector getDateRange(androidx.compose.material.icons.Icons.Outlined);
+ }
+
+ public final class DeleteKt {
+ method public static androidx.compose.ui.graphics.vector.ImageVector getDelete(androidx.compose.material.icons.Icons.Outlined);
+ }
+
+ public final class DoneKt {
+ method public static androidx.compose.ui.graphics.vector.ImageVector getDone(androidx.compose.material.icons.Icons.Outlined);
+ }
+
+ public final class EditKt {
+ method public static androidx.compose.ui.graphics.vector.ImageVector getEdit(androidx.compose.material.icons.Icons.Outlined);
+ }
+
+ public final class EmailKt {
+ method public static androidx.compose.ui.graphics.vector.ImageVector getEmail(androidx.compose.material.icons.Icons.Outlined);
+ }
+
+ public final class ExitToAppKt {
+ method public static androidx.compose.ui.graphics.vector.ImageVector getExitToApp(androidx.compose.material.icons.Icons.Outlined);
+ }
+
+ public final class FaceKt {
+ method public static androidx.compose.ui.graphics.vector.ImageVector getFace(androidx.compose.material.icons.Icons.Outlined);
+ }
+
+ public final class FavoriteBorderKt {
+ method public static androidx.compose.ui.graphics.vector.ImageVector getFavoriteBorder(androidx.compose.material.icons.Icons.Outlined);
+ }
+
+ public final class FavoriteKt {
+ method public static androidx.compose.ui.graphics.vector.ImageVector getFavorite(androidx.compose.material.icons.Icons.Outlined);
+ }
+
+ public final class HomeKt {
+ method public static androidx.compose.ui.graphics.vector.ImageVector getHome(androidx.compose.material.icons.Icons.Outlined);
+ }
+
+ public final class InfoKt {
+ method public static androidx.compose.ui.graphics.vector.ImageVector getInfo(androidx.compose.material.icons.Icons.Outlined);
+ }
+
+ public final class KeyboardArrowDownKt {
+ method public static androidx.compose.ui.graphics.vector.ImageVector getKeyboardArrowDown(androidx.compose.material.icons.Icons.Outlined);
+ }
+
+ public final class KeyboardArrowLeftKt {
+ method public static androidx.compose.ui.graphics.vector.ImageVector getKeyboardArrowLeft(androidx.compose.material.icons.Icons.Outlined);
+ }
+
+ public final class KeyboardArrowRightKt {
+ method public static androidx.compose.ui.graphics.vector.ImageVector getKeyboardArrowRight(androidx.compose.material.icons.Icons.Outlined);
+ }
+
+ public final class KeyboardArrowUpKt {
+ method public static androidx.compose.ui.graphics.vector.ImageVector getKeyboardArrowUp(androidx.compose.material.icons.Icons.Outlined);
+ }
+
+ public final class ListKt {
+ method public static androidx.compose.ui.graphics.vector.ImageVector getList(androidx.compose.material.icons.Icons.Outlined);
+ }
+
+ public final class LocationOnKt {
+ method public static androidx.compose.ui.graphics.vector.ImageVector getLocationOn(androidx.compose.material.icons.Icons.Outlined);
+ }
+
+ public final class LockKt {
+ method public static androidx.compose.ui.graphics.vector.ImageVector getLock(androidx.compose.material.icons.Icons.Outlined);
+ }
+
+ public final class MailOutlineKt {
+ method public static androidx.compose.ui.graphics.vector.ImageVector getMailOutline(androidx.compose.material.icons.Icons.Outlined);
+ }
+
+ public final class MenuKt {
+ method public static androidx.compose.ui.graphics.vector.ImageVector getMenu(androidx.compose.material.icons.Icons.Outlined);
+ }
+
+ public final class MoreVertKt {
+ method public static androidx.compose.ui.graphics.vector.ImageVector getMoreVert(androidx.compose.material.icons.Icons.Outlined);
+ }
+
+ public final class NotificationsKt {
+ method public static androidx.compose.ui.graphics.vector.ImageVector getNotifications(androidx.compose.material.icons.Icons.Outlined);
+ }
+
+ public final class PersonKt {
+ method public static androidx.compose.ui.graphics.vector.ImageVector getPerson(androidx.compose.material.icons.Icons.Outlined);
+ }
+
+ public final class PhoneKt {
+ method public static androidx.compose.ui.graphics.vector.ImageVector getPhone(androidx.compose.material.icons.Icons.Outlined);
+ }
+
+ public final class PlaceKt {
+ method public static androidx.compose.ui.graphics.vector.ImageVector getPlace(androidx.compose.material.icons.Icons.Outlined);
+ }
+
+ public final class PlayArrowKt {
+ method public static androidx.compose.ui.graphics.vector.ImageVector getPlayArrow(androidx.compose.material.icons.Icons.Outlined);
+ }
+
+ public final class RefreshKt {
+ method public static androidx.compose.ui.graphics.vector.ImageVector getRefresh(androidx.compose.material.icons.Icons.Outlined);
+ }
+
+ public final class SearchKt {
+ method public static androidx.compose.ui.graphics.vector.ImageVector getSearch(androidx.compose.material.icons.Icons.Outlined);
+ }
+
+ public final class SendKt {
+ method public static androidx.compose.ui.graphics.vector.ImageVector getSend(androidx.compose.material.icons.Icons.Outlined);
+ }
+
+ public final class SettingsKt {
+ method public static androidx.compose.ui.graphics.vector.ImageVector getSettings(androidx.compose.material.icons.Icons.Outlined);
+ }
+
+ public final class ShareKt {
+ method public static androidx.compose.ui.graphics.vector.ImageVector getShare(androidx.compose.material.icons.Icons.Outlined);
+ }
+
+ public final class ShoppingCartKt {
+ method public static androidx.compose.ui.graphics.vector.ImageVector getShoppingCart(androidx.compose.material.icons.Icons.Outlined);
+ }
+
+ public final class StarKt {
+ method public static androidx.compose.ui.graphics.vector.ImageVector getStar(androidx.compose.material.icons.Icons.Outlined);
+ }
+
+ public final class ThumbUpKt {
+ method public static androidx.compose.ui.graphics.vector.ImageVector getThumbUp(androidx.compose.material.icons.Icons.Outlined);
+ }
+
+ public final class WarningKt {
+ method public static androidx.compose.ui.graphics.vector.ImageVector getWarning(androidx.compose.material.icons.Icons.Outlined);
+ }
+
+}
+
+package androidx.compose.material.icons.rounded {
+
+ public final class AccountBoxKt {
+ method public static androidx.compose.ui.graphics.vector.ImageVector getAccountBox(androidx.compose.material.icons.Icons.Rounded);
+ }
+
+ public final class AccountCircleKt {
+ method public static androidx.compose.ui.graphics.vector.ImageVector getAccountCircle(androidx.compose.material.icons.Icons.Rounded);
+ }
+
+ public final class AddCircleKt {
+ method public static androidx.compose.ui.graphics.vector.ImageVector getAddCircle(androidx.compose.material.icons.Icons.Rounded);
+ }
+
+ public final class AddKt {
+ method public static androidx.compose.ui.graphics.vector.ImageVector getAdd(androidx.compose.material.icons.Icons.Rounded);
+ }
+
+ public final class ArrowBackKt {
+ method public static androidx.compose.ui.graphics.vector.ImageVector getArrowBack(androidx.compose.material.icons.Icons.Rounded);
+ }
+
+ public final class ArrowDropDownKt {
+ method public static androidx.compose.ui.graphics.vector.ImageVector getArrowDropDown(androidx.compose.material.icons.Icons.Rounded);
+ }
+
+ public final class ArrowForwardKt {
+ method public static androidx.compose.ui.graphics.vector.ImageVector getArrowForward(androidx.compose.material.icons.Icons.Rounded);
+ }
+
+ public final class BuildKt {
+ method public static androidx.compose.ui.graphics.vector.ImageVector getBuild(androidx.compose.material.icons.Icons.Rounded);
+ }
+
+ public final class CallKt {
+ method public static androidx.compose.ui.graphics.vector.ImageVector getCall(androidx.compose.material.icons.Icons.Rounded);
+ }
+
+ public final class CheckCircleKt {
+ method public static androidx.compose.ui.graphics.vector.ImageVector getCheckCircle(androidx.compose.material.icons.Icons.Rounded);
+ }
+
+ public final class CheckKt {
+ method public static androidx.compose.ui.graphics.vector.ImageVector getCheck(androidx.compose.material.icons.Icons.Rounded);
+ }
+
+ public final class ClearKt {
+ method public static androidx.compose.ui.graphics.vector.ImageVector getClear(androidx.compose.material.icons.Icons.Rounded);
+ }
+
+ public final class CloseKt {
+ method public static androidx.compose.ui.graphics.vector.ImageVector getClose(androidx.compose.material.icons.Icons.Rounded);
+ }
+
+ public final class CreateKt {
+ method public static androidx.compose.ui.graphics.vector.ImageVector getCreate(androidx.compose.material.icons.Icons.Rounded);
+ }
+
+ public final class DateRangeKt {
+ method public static androidx.compose.ui.graphics.vector.ImageVector getDateRange(androidx.compose.material.icons.Icons.Rounded);
+ }
+
+ public final class DeleteKt {
+ method public static androidx.compose.ui.graphics.vector.ImageVector getDelete(androidx.compose.material.icons.Icons.Rounded);
+ }
+
+ public final class DoneKt {
+ method public static androidx.compose.ui.graphics.vector.ImageVector getDone(androidx.compose.material.icons.Icons.Rounded);
+ }
+
+ public final class EditKt {
+ method public static androidx.compose.ui.graphics.vector.ImageVector getEdit(androidx.compose.material.icons.Icons.Rounded);
+ }
+
+ public final class EmailKt {
+ method public static androidx.compose.ui.graphics.vector.ImageVector getEmail(androidx.compose.material.icons.Icons.Rounded);
+ }
+
+ public final class ExitToAppKt {
+ method public static androidx.compose.ui.graphics.vector.ImageVector getExitToApp(androidx.compose.material.icons.Icons.Rounded);
+ }
+
+ public final class FaceKt {
+ method public static androidx.compose.ui.graphics.vector.ImageVector getFace(androidx.compose.material.icons.Icons.Rounded);
+ }
+
+ public final class FavoriteBorderKt {
+ method public static androidx.compose.ui.graphics.vector.ImageVector getFavoriteBorder(androidx.compose.material.icons.Icons.Rounded);
+ }
+
+ public final class FavoriteKt {
+ method public static androidx.compose.ui.graphics.vector.ImageVector getFavorite(androidx.compose.material.icons.Icons.Rounded);
+ }
+
+ public final class HomeKt {
+ method public static androidx.compose.ui.graphics.vector.ImageVector getHome(androidx.compose.material.icons.Icons.Rounded);
+ }
+
+ public final class InfoKt {
+ method public static androidx.compose.ui.graphics.vector.ImageVector getInfo(androidx.compose.material.icons.Icons.Rounded);
+ }
+
+ public final class KeyboardArrowDownKt {
+ method public static androidx.compose.ui.graphics.vector.ImageVector getKeyboardArrowDown(androidx.compose.material.icons.Icons.Rounded);
+ }
+
+ public final class KeyboardArrowLeftKt {
+ method public static androidx.compose.ui.graphics.vector.ImageVector getKeyboardArrowLeft(androidx.compose.material.icons.Icons.Rounded);
+ }
+
+ public final class KeyboardArrowRightKt {
+ method public static androidx.compose.ui.graphics.vector.ImageVector getKeyboardArrowRight(androidx.compose.material.icons.Icons.Rounded);
+ }
+
+ public final class KeyboardArrowUpKt {
+ method public static androidx.compose.ui.graphics.vector.ImageVector getKeyboardArrowUp(androidx.compose.material.icons.Icons.Rounded);
+ }
+
+ public final class ListKt {
+ method public static androidx.compose.ui.graphics.vector.ImageVector getList(androidx.compose.material.icons.Icons.Rounded);
+ }
+
+ public final class LocationOnKt {
+ method public static androidx.compose.ui.graphics.vector.ImageVector getLocationOn(androidx.compose.material.icons.Icons.Rounded);
+ }
+
+ public final class LockKt {
+ method public static androidx.compose.ui.graphics.vector.ImageVector getLock(androidx.compose.material.icons.Icons.Rounded);
+ }
+
+ public final class MailOutlineKt {
+ method public static androidx.compose.ui.graphics.vector.ImageVector getMailOutline(androidx.compose.material.icons.Icons.Rounded);
+ }
+
+ public final class MenuKt {
+ method public static androidx.compose.ui.graphics.vector.ImageVector getMenu(androidx.compose.material.icons.Icons.Rounded);
+ }
+
+ public final class MoreVertKt {
+ method public static androidx.compose.ui.graphics.vector.ImageVector getMoreVert(androidx.compose.material.icons.Icons.Rounded);
+ }
+
+ public final class NotificationsKt {
+ method public static androidx.compose.ui.graphics.vector.ImageVector getNotifications(androidx.compose.material.icons.Icons.Rounded);
+ }
+
+ public final class PersonKt {
+ method public static androidx.compose.ui.graphics.vector.ImageVector getPerson(androidx.compose.material.icons.Icons.Rounded);
+ }
+
+ public final class PhoneKt {
+ method public static androidx.compose.ui.graphics.vector.ImageVector getPhone(androidx.compose.material.icons.Icons.Rounded);
+ }
+
+ public final class PlaceKt {
+ method public static androidx.compose.ui.graphics.vector.ImageVector getPlace(androidx.compose.material.icons.Icons.Rounded);
+ }
+
+ public final class PlayArrowKt {
+ method public static androidx.compose.ui.graphics.vector.ImageVector getPlayArrow(androidx.compose.material.icons.Icons.Rounded);
+ }
+
+ public final class RefreshKt {
+ method public static androidx.compose.ui.graphics.vector.ImageVector getRefresh(androidx.compose.material.icons.Icons.Rounded);
+ }
+
+ public final class SearchKt {
+ method public static androidx.compose.ui.graphics.vector.ImageVector getSearch(androidx.compose.material.icons.Icons.Rounded);
+ }
+
+ public final class SendKt {
+ method public static androidx.compose.ui.graphics.vector.ImageVector getSend(androidx.compose.material.icons.Icons.Rounded);
+ }
+
+ public final class SettingsKt {
+ method public static androidx.compose.ui.graphics.vector.ImageVector getSettings(androidx.compose.material.icons.Icons.Rounded);
+ }
+
+ public final class ShareKt {
+ method public static androidx.compose.ui.graphics.vector.ImageVector getShare(androidx.compose.material.icons.Icons.Rounded);
+ }
+
+ public final class ShoppingCartKt {
+ method public static androidx.compose.ui.graphics.vector.ImageVector getShoppingCart(androidx.compose.material.icons.Icons.Rounded);
+ }
+
+ public final class StarKt {
+ method public static androidx.compose.ui.graphics.vector.ImageVector getStar(androidx.compose.material.icons.Icons.Rounded);
+ }
+
+ public final class ThumbUpKt {
+ method public static androidx.compose.ui.graphics.vector.ImageVector getThumbUp(androidx.compose.material.icons.Icons.Rounded);
+ }
+
+ public final class WarningKt {
+ method public static androidx.compose.ui.graphics.vector.ImageVector getWarning(androidx.compose.material.icons.Icons.Rounded);
+ }
+
+}
+
+package androidx.compose.material.icons.sharp {
+
+ public final class AccountBoxKt {
+ method public static androidx.compose.ui.graphics.vector.ImageVector getAccountBox(androidx.compose.material.icons.Icons.Sharp);
+ }
+
+ public final class AccountCircleKt {
+ method public static androidx.compose.ui.graphics.vector.ImageVector getAccountCircle(androidx.compose.material.icons.Icons.Sharp);
+ }
+
+ public final class AddCircleKt {
+ method public static androidx.compose.ui.graphics.vector.ImageVector getAddCircle(androidx.compose.material.icons.Icons.Sharp);
+ }
+
+ public final class AddKt {
+ method public static androidx.compose.ui.graphics.vector.ImageVector getAdd(androidx.compose.material.icons.Icons.Sharp);
+ }
+
+ public final class ArrowBackKt {
+ method public static androidx.compose.ui.graphics.vector.ImageVector getArrowBack(androidx.compose.material.icons.Icons.Sharp);
+ }
+
+ public final class ArrowDropDownKt {
+ method public static androidx.compose.ui.graphics.vector.ImageVector getArrowDropDown(androidx.compose.material.icons.Icons.Sharp);
+ }
+
+ public final class ArrowForwardKt {
+ method public static androidx.compose.ui.graphics.vector.ImageVector getArrowForward(androidx.compose.material.icons.Icons.Sharp);
+ }
+
+ public final class BuildKt {
+ method public static androidx.compose.ui.graphics.vector.ImageVector getBuild(androidx.compose.material.icons.Icons.Sharp);
+ }
+
+ public final class CallKt {
+ method public static androidx.compose.ui.graphics.vector.ImageVector getCall(androidx.compose.material.icons.Icons.Sharp);
+ }
+
+ public final class CheckCircleKt {
+ method public static androidx.compose.ui.graphics.vector.ImageVector getCheckCircle(androidx.compose.material.icons.Icons.Sharp);
+ }
+
+ public final class CheckKt {
+ method public static androidx.compose.ui.graphics.vector.ImageVector getCheck(androidx.compose.material.icons.Icons.Sharp);
+ }
+
+ public final class ClearKt {
+ method public static androidx.compose.ui.graphics.vector.ImageVector getClear(androidx.compose.material.icons.Icons.Sharp);
+ }
+
+ public final class CloseKt {
+ method public static androidx.compose.ui.graphics.vector.ImageVector getClose(androidx.compose.material.icons.Icons.Sharp);
+ }
+
+ public final class CreateKt {
+ method public static androidx.compose.ui.graphics.vector.ImageVector getCreate(androidx.compose.material.icons.Icons.Sharp);
+ }
+
+ public final class DateRangeKt {
+ method public static androidx.compose.ui.graphics.vector.ImageVector getDateRange(androidx.compose.material.icons.Icons.Sharp);
+ }
+
+ public final class DeleteKt {
+ method public static androidx.compose.ui.graphics.vector.ImageVector getDelete(androidx.compose.material.icons.Icons.Sharp);
+ }
+
+ public final class DoneKt {
+ method public static androidx.compose.ui.graphics.vector.ImageVector getDone(androidx.compose.material.icons.Icons.Sharp);
+ }
+
+ public final class EditKt {
+ method public static androidx.compose.ui.graphics.vector.ImageVector getEdit(androidx.compose.material.icons.Icons.Sharp);
+ }
+
+ public final class EmailKt {
+ method public static androidx.compose.ui.graphics.vector.ImageVector getEmail(androidx.compose.material.icons.Icons.Sharp);
+ }
+
+ public final class ExitToAppKt {
+ method public static androidx.compose.ui.graphics.vector.ImageVector getExitToApp(androidx.compose.material.icons.Icons.Sharp);
+ }
+
+ public final class FaceKt {
+ method public static androidx.compose.ui.graphics.vector.ImageVector getFace(androidx.compose.material.icons.Icons.Sharp);
+ }
+
+ public final class FavoriteBorderKt {
+ method public static androidx.compose.ui.graphics.vector.ImageVector getFavoriteBorder(androidx.compose.material.icons.Icons.Sharp);
+ }
+
+ public final class FavoriteKt {
+ method public static androidx.compose.ui.graphics.vector.ImageVector getFavorite(androidx.compose.material.icons.Icons.Sharp);
+ }
+
+ public final class HomeKt {
+ method public static androidx.compose.ui.graphics.vector.ImageVector getHome(androidx.compose.material.icons.Icons.Sharp);
+ }
+
+ public final class InfoKt {
+ method public static androidx.compose.ui.graphics.vector.ImageVector getInfo(androidx.compose.material.icons.Icons.Sharp);
+ }
+
+ public final class KeyboardArrowDownKt {
+ method public static androidx.compose.ui.graphics.vector.ImageVector getKeyboardArrowDown(androidx.compose.material.icons.Icons.Sharp);
+ }
+
+ public final class KeyboardArrowLeftKt {
+ method public static androidx.compose.ui.graphics.vector.ImageVector getKeyboardArrowLeft(androidx.compose.material.icons.Icons.Sharp);
+ }
+
+ public final class KeyboardArrowRightKt {
+ method public static androidx.compose.ui.graphics.vector.ImageVector getKeyboardArrowRight(androidx.compose.material.icons.Icons.Sharp);
+ }
+
+ public final class KeyboardArrowUpKt {
+ method public static androidx.compose.ui.graphics.vector.ImageVector getKeyboardArrowUp(androidx.compose.material.icons.Icons.Sharp);
+ }
+
+ public final class ListKt {
+ method public static androidx.compose.ui.graphics.vector.ImageVector getList(androidx.compose.material.icons.Icons.Sharp);
+ }
+
+ public final class LocationOnKt {
+ method public static androidx.compose.ui.graphics.vector.ImageVector getLocationOn(androidx.compose.material.icons.Icons.Sharp);
+ }
+
+ public final class LockKt {
+ method public static androidx.compose.ui.graphics.vector.ImageVector getLock(androidx.compose.material.icons.Icons.Sharp);
+ }
+
+ public final class MailOutlineKt {
+ method public static androidx.compose.ui.graphics.vector.ImageVector getMailOutline(androidx.compose.material.icons.Icons.Sharp);
+ }
+
+ public final class MenuKt {
+ method public static androidx.compose.ui.graphics.vector.ImageVector getMenu(androidx.compose.material.icons.Icons.Sharp);
+ }
+
+ public final class MoreVertKt {
+ method public static androidx.compose.ui.graphics.vector.ImageVector getMoreVert(androidx.compose.material.icons.Icons.Sharp);
+ }
+
+ public final class NotificationsKt {
+ method public static androidx.compose.ui.graphics.vector.ImageVector getNotifications(androidx.compose.material.icons.Icons.Sharp);
+ }
+
+ public final class PersonKt {
+ method public static androidx.compose.ui.graphics.vector.ImageVector getPerson(androidx.compose.material.icons.Icons.Sharp);
+ }
+
+ public final class PhoneKt {
+ method public static androidx.compose.ui.graphics.vector.ImageVector getPhone(androidx.compose.material.icons.Icons.Sharp);
+ }
+
+ public final class PlaceKt {
+ method public static androidx.compose.ui.graphics.vector.ImageVector getPlace(androidx.compose.material.icons.Icons.Sharp);
+ }
+
+ public final class PlayArrowKt {
+ method public static androidx.compose.ui.graphics.vector.ImageVector getPlayArrow(androidx.compose.material.icons.Icons.Sharp);
+ }
+
+ public final class RefreshKt {
+ method public static androidx.compose.ui.graphics.vector.ImageVector getRefresh(androidx.compose.material.icons.Icons.Sharp);
+ }
+
+ public final class SearchKt {
+ method public static androidx.compose.ui.graphics.vector.ImageVector getSearch(androidx.compose.material.icons.Icons.Sharp);
+ }
+
+ public final class SendKt {
+ method public static androidx.compose.ui.graphics.vector.ImageVector getSend(androidx.compose.material.icons.Icons.Sharp);
+ }
+
+ public final class SettingsKt {
+ method public static androidx.compose.ui.graphics.vector.ImageVector getSettings(androidx.compose.material.icons.Icons.Sharp);
+ }
+
+ public final class ShareKt {
+ method public static androidx.compose.ui.graphics.vector.ImageVector getShare(androidx.compose.material.icons.Icons.Sharp);
+ }
+
+ public final class ShoppingCartKt {
+ method public static androidx.compose.ui.graphics.vector.ImageVector getShoppingCart(androidx.compose.material.icons.Icons.Sharp);
+ }
+
+ public final class StarKt {
+ method public static androidx.compose.ui.graphics.vector.ImageVector getStar(androidx.compose.material.icons.Icons.Sharp);
+ }
+
+ public final class ThumbUpKt {
+ method public static androidx.compose.ui.graphics.vector.ImageVector getThumbUp(androidx.compose.material.icons.Icons.Sharp);
+ }
+
+ public final class WarningKt {
+ method public static androidx.compose.ui.graphics.vector.ImageVector getWarning(androidx.compose.material.icons.Icons.Sharp);
+ }
+
+}
+
+package androidx.compose.material.icons.twotone {
+
+ public final class AccountBoxKt {
+ method public static androidx.compose.ui.graphics.vector.ImageVector getAccountBox(androidx.compose.material.icons.Icons.TwoTone);
+ }
+
+ public final class AccountCircleKt {
+ method public static androidx.compose.ui.graphics.vector.ImageVector getAccountCircle(androidx.compose.material.icons.Icons.TwoTone);
+ }
+
+ public final class AddCircleKt {
+ method public static androidx.compose.ui.graphics.vector.ImageVector getAddCircle(androidx.compose.material.icons.Icons.TwoTone);
+ }
+
+ public final class AddKt {
+ method public static androidx.compose.ui.graphics.vector.ImageVector getAdd(androidx.compose.material.icons.Icons.TwoTone);
+ }
+
+ public final class ArrowBackKt {
+ method public static androidx.compose.ui.graphics.vector.ImageVector getArrowBack(androidx.compose.material.icons.Icons.TwoTone);
+ }
+
+ public final class ArrowDropDownKt {
+ method public static androidx.compose.ui.graphics.vector.ImageVector getArrowDropDown(androidx.compose.material.icons.Icons.TwoTone);
+ }
+
+ public final class ArrowForwardKt {
+ method public static androidx.compose.ui.graphics.vector.ImageVector getArrowForward(androidx.compose.material.icons.Icons.TwoTone);
+ }
+
+ public final class BuildKt {
+ method public static androidx.compose.ui.graphics.vector.ImageVector getBuild(androidx.compose.material.icons.Icons.TwoTone);
+ }
+
+ public final class CallKt {
+ method public static androidx.compose.ui.graphics.vector.ImageVector getCall(androidx.compose.material.icons.Icons.TwoTone);
+ }
+
+ public final class CheckCircleKt {
+ method public static androidx.compose.ui.graphics.vector.ImageVector getCheckCircle(androidx.compose.material.icons.Icons.TwoTone);
+ }
+
+ public final class CheckKt {
+ method public static androidx.compose.ui.graphics.vector.ImageVector getCheck(androidx.compose.material.icons.Icons.TwoTone);
+ }
+
+ public final class ClearKt {
+ method public static androidx.compose.ui.graphics.vector.ImageVector getClear(androidx.compose.material.icons.Icons.TwoTone);
+ }
+
+ public final class CloseKt {
+ method public static androidx.compose.ui.graphics.vector.ImageVector getClose(androidx.compose.material.icons.Icons.TwoTone);
+ }
+
+ public final class CreateKt {
+ method public static androidx.compose.ui.graphics.vector.ImageVector getCreate(androidx.compose.material.icons.Icons.TwoTone);
+ }
+
+ public final class DateRangeKt {
+ method public static androidx.compose.ui.graphics.vector.ImageVector getDateRange(androidx.compose.material.icons.Icons.TwoTone);
+ }
+
+ public final class DeleteKt {
+ method public static androidx.compose.ui.graphics.vector.ImageVector getDelete(androidx.compose.material.icons.Icons.TwoTone);
+ }
+
+ public final class DoneKt {
+ method public static androidx.compose.ui.graphics.vector.ImageVector getDone(androidx.compose.material.icons.Icons.TwoTone);
+ }
+
+ public final class EditKt {
+ method public static androidx.compose.ui.graphics.vector.ImageVector getEdit(androidx.compose.material.icons.Icons.TwoTone);
+ }
+
+ public final class EmailKt {
+ method public static androidx.compose.ui.graphics.vector.ImageVector getEmail(androidx.compose.material.icons.Icons.TwoTone);
+ }
+
+ public final class ExitToAppKt {
+ method public static androidx.compose.ui.graphics.vector.ImageVector getExitToApp(androidx.compose.material.icons.Icons.TwoTone);
+ }
+
+ public final class FaceKt {
+ method public static androidx.compose.ui.graphics.vector.ImageVector getFace(androidx.compose.material.icons.Icons.TwoTone);
+ }
+
+ public final class FavoriteBorderKt {
+ method public static androidx.compose.ui.graphics.vector.ImageVector getFavoriteBorder(androidx.compose.material.icons.Icons.TwoTone);
+ }
+
+ public final class FavoriteKt {
+ method public static androidx.compose.ui.graphics.vector.ImageVector getFavorite(androidx.compose.material.icons.Icons.TwoTone);
+ }
+
+ public final class HomeKt {
+ method public static androidx.compose.ui.graphics.vector.ImageVector getHome(androidx.compose.material.icons.Icons.TwoTone);
+ }
+
+ public final class InfoKt {
+ method public static androidx.compose.ui.graphics.vector.ImageVector getInfo(androidx.compose.material.icons.Icons.TwoTone);
+ }
+
+ public final class KeyboardArrowDownKt {
+ method public static androidx.compose.ui.graphics.vector.ImageVector getKeyboardArrowDown(androidx.compose.material.icons.Icons.TwoTone);
+ }
+
+ public final class KeyboardArrowLeftKt {
+ method public static androidx.compose.ui.graphics.vector.ImageVector getKeyboardArrowLeft(androidx.compose.material.icons.Icons.TwoTone);
+ }
+
+ public final class KeyboardArrowRightKt {
+ method public static androidx.compose.ui.graphics.vector.ImageVector getKeyboardArrowRight(androidx.compose.material.icons.Icons.TwoTone);
+ }
+
+ public final class KeyboardArrowUpKt {
+ method public static androidx.compose.ui.graphics.vector.ImageVector getKeyboardArrowUp(androidx.compose.material.icons.Icons.TwoTone);
+ }
+
+ public final class ListKt {
+ method public static androidx.compose.ui.graphics.vector.ImageVector getList(androidx.compose.material.icons.Icons.TwoTone);
+ }
+
+ public final class LocationOnKt {
+ method public static androidx.compose.ui.graphics.vector.ImageVector getLocationOn(androidx.compose.material.icons.Icons.TwoTone);
+ }
+
+ public final class LockKt {
+ method public static androidx.compose.ui.graphics.vector.ImageVector getLock(androidx.compose.material.icons.Icons.TwoTone);
+ }
+
+ public final class MailOutlineKt {
+ method public static androidx.compose.ui.graphics.vector.ImageVector getMailOutline(androidx.compose.material.icons.Icons.TwoTone);
+ }
+
+ public final class MenuKt {
+ method public static androidx.compose.ui.graphics.vector.ImageVector getMenu(androidx.compose.material.icons.Icons.TwoTone);
+ }
+
+ public final class MoreVertKt {
+ method public static androidx.compose.ui.graphics.vector.ImageVector getMoreVert(androidx.compose.material.icons.Icons.TwoTone);
+ }
+
+ public final class NotificationsKt {
+ method public static androidx.compose.ui.graphics.vector.ImageVector getNotifications(androidx.compose.material.icons.Icons.TwoTone);
+ }
+
+ public final class PersonKt {
+ method public static androidx.compose.ui.graphics.vector.ImageVector getPerson(androidx.compose.material.icons.Icons.TwoTone);
+ }
+
+ public final class PhoneKt {
+ method public static androidx.compose.ui.graphics.vector.ImageVector getPhone(androidx.compose.material.icons.Icons.TwoTone);
+ }
+
+ public final class PlaceKt {
+ method public static androidx.compose.ui.graphics.vector.ImageVector getPlace(androidx.compose.material.icons.Icons.TwoTone);
+ }
+
+ public final class PlayArrowKt {
+ method public static androidx.compose.ui.graphics.vector.ImageVector getPlayArrow(androidx.compose.material.icons.Icons.TwoTone);
+ }
+
+ public final class RefreshKt {
+ method public static androidx.compose.ui.graphics.vector.ImageVector getRefresh(androidx.compose.material.icons.Icons.TwoTone);
+ }
+
+ public final class SearchKt {
+ method public static androidx.compose.ui.graphics.vector.ImageVector getSearch(androidx.compose.material.icons.Icons.TwoTone);
+ }
+
+ public final class SendKt {
+ method public static androidx.compose.ui.graphics.vector.ImageVector getSend(androidx.compose.material.icons.Icons.TwoTone);
+ }
+
+ public final class SettingsKt {
+ method public static androidx.compose.ui.graphics.vector.ImageVector getSettings(androidx.compose.material.icons.Icons.TwoTone);
+ }
+
+ public final class ShareKt {
+ method public static androidx.compose.ui.graphics.vector.ImageVector getShare(androidx.compose.material.icons.Icons.TwoTone);
+ }
+
+ public final class ShoppingCartKt {
+ method public static androidx.compose.ui.graphics.vector.ImageVector getShoppingCart(androidx.compose.material.icons.Icons.TwoTone);
+ }
+
+ public final class StarKt {
+ method public static androidx.compose.ui.graphics.vector.ImageVector getStar(androidx.compose.material.icons.Icons.TwoTone);
+ }
+
+ public final class ThumbUpKt {
+ method public static androidx.compose.ui.graphics.vector.ImageVector getThumbUp(androidx.compose.material.icons.Icons.TwoTone);
+ }
+
+ public final class WarningKt {
+ method public static androidx.compose.ui.graphics.vector.ImageVector getWarning(androidx.compose.material.icons.Icons.TwoTone);
+ }
+
+}
+
diff --git a/compose/material/material-ripple/api/1.2.0-beta02.txt b/compose/material/material-ripple/api/1.2.0-beta02.txt
new file mode 100644
index 0000000..32f4093
--- /dev/null
+++ b/compose/material/material-ripple/api/1.2.0-beta02.txt
@@ -0,0 +1,40 @@
+// Signature format: 4.0
+package androidx.compose.material.ripple {
+
+ @androidx.compose.runtime.Immutable public final class RippleAlpha {
+ ctor public RippleAlpha(float draggedAlpha, float focusedAlpha, float hoveredAlpha, float pressedAlpha);
+ method public float getDraggedAlpha();
+ method public float getFocusedAlpha();
+ method public float getHoveredAlpha();
+ method public float getPressedAlpha();
+ property public final float draggedAlpha;
+ property public final float focusedAlpha;
+ property public final float hoveredAlpha;
+ property public final float pressedAlpha;
+ }
+
+ public final class RippleAnimationKt {
+ }
+
+ public final class RippleKt {
+ method @androidx.compose.runtime.Composable public static androidx.compose.foundation.Indication rememberRipple(optional boolean bounded, optional float radius, optional long color);
+ }
+
+ public interface RippleTheme {
+ method @androidx.compose.runtime.Composable public long defaultColor();
+ method @androidx.compose.runtime.Composable public androidx.compose.material.ripple.RippleAlpha rippleAlpha();
+ field public static final androidx.compose.material.ripple.RippleTheme.Companion Companion;
+ }
+
+ public static final class RippleTheme.Companion {
+ method public androidx.compose.material.ripple.RippleAlpha defaultRippleAlpha(long contentColor, boolean lightTheme);
+ method public long defaultRippleColor(long contentColor, boolean lightTheme);
+ }
+
+ public final class RippleThemeKt {
+ method public static androidx.compose.runtime.ProvidableCompositionLocal<androidx.compose.material.ripple.RippleTheme> getLocalRippleTheme();
+ property public static final androidx.compose.runtime.ProvidableCompositionLocal<androidx.compose.material.ripple.RippleTheme> LocalRippleTheme;
+ }
+
+}
+
diff --git a/compose/material/material-ripple/api/public_plus_experimental_1.2.0-beta02.txt b/compose/material/material-ripple/api/public_plus_experimental_1.2.0-beta02.txt
new file mode 100644
index 0000000..32f4093
--- /dev/null
+++ b/compose/material/material-ripple/api/public_plus_experimental_1.2.0-beta02.txt
@@ -0,0 +1,40 @@
+// Signature format: 4.0
+package androidx.compose.material.ripple {
+
+ @androidx.compose.runtime.Immutable public final class RippleAlpha {
+ ctor public RippleAlpha(float draggedAlpha, float focusedAlpha, float hoveredAlpha, float pressedAlpha);
+ method public float getDraggedAlpha();
+ method public float getFocusedAlpha();
+ method public float getHoveredAlpha();
+ method public float getPressedAlpha();
+ property public final float draggedAlpha;
+ property public final float focusedAlpha;
+ property public final float hoveredAlpha;
+ property public final float pressedAlpha;
+ }
+
+ public final class RippleAnimationKt {
+ }
+
+ public final class RippleKt {
+ method @androidx.compose.runtime.Composable public static androidx.compose.foundation.Indication rememberRipple(optional boolean bounded, optional float radius, optional long color);
+ }
+
+ public interface RippleTheme {
+ method @androidx.compose.runtime.Composable public long defaultColor();
+ method @androidx.compose.runtime.Composable public androidx.compose.material.ripple.RippleAlpha rippleAlpha();
+ field public static final androidx.compose.material.ripple.RippleTheme.Companion Companion;
+ }
+
+ public static final class RippleTheme.Companion {
+ method public androidx.compose.material.ripple.RippleAlpha defaultRippleAlpha(long contentColor, boolean lightTheme);
+ method public long defaultRippleColor(long contentColor, boolean lightTheme);
+ }
+
+ public final class RippleThemeKt {
+ method public static androidx.compose.runtime.ProvidableCompositionLocal<androidx.compose.material.ripple.RippleTheme> getLocalRippleTheme();
+ property public static final androidx.compose.runtime.ProvidableCompositionLocal<androidx.compose.material.ripple.RippleTheme> LocalRippleTheme;
+ }
+
+}
+
diff --git a/compose/material/material-ripple/api/res-1.2.0-beta02.txt b/compose/material/material-ripple/api/res-1.2.0-beta02.txt
new file mode 100644
index 0000000..e69de29
--- /dev/null
+++ b/compose/material/material-ripple/api/res-1.2.0-beta02.txt
diff --git a/compose/material/material-ripple/api/restricted_1.2.0-beta02.txt b/compose/material/material-ripple/api/restricted_1.2.0-beta02.txt
new file mode 100644
index 0000000..32f4093
--- /dev/null
+++ b/compose/material/material-ripple/api/restricted_1.2.0-beta02.txt
@@ -0,0 +1,40 @@
+// Signature format: 4.0
+package androidx.compose.material.ripple {
+
+ @androidx.compose.runtime.Immutable public final class RippleAlpha {
+ ctor public RippleAlpha(float draggedAlpha, float focusedAlpha, float hoveredAlpha, float pressedAlpha);
+ method public float getDraggedAlpha();
+ method public float getFocusedAlpha();
+ method public float getHoveredAlpha();
+ method public float getPressedAlpha();
+ property public final float draggedAlpha;
+ property public final float focusedAlpha;
+ property public final float hoveredAlpha;
+ property public final float pressedAlpha;
+ }
+
+ public final class RippleAnimationKt {
+ }
+
+ public final class RippleKt {
+ method @androidx.compose.runtime.Composable public static androidx.compose.foundation.Indication rememberRipple(optional boolean bounded, optional float radius, optional long color);
+ }
+
+ public interface RippleTheme {
+ method @androidx.compose.runtime.Composable public long defaultColor();
+ method @androidx.compose.runtime.Composable public androidx.compose.material.ripple.RippleAlpha rippleAlpha();
+ field public static final androidx.compose.material.ripple.RippleTheme.Companion Companion;
+ }
+
+ public static final class RippleTheme.Companion {
+ method public androidx.compose.material.ripple.RippleAlpha defaultRippleAlpha(long contentColor, boolean lightTheme);
+ method public long defaultRippleColor(long contentColor, boolean lightTheme);
+ }
+
+ public final class RippleThemeKt {
+ method public static androidx.compose.runtime.ProvidableCompositionLocal<androidx.compose.material.ripple.RippleTheme> getLocalRippleTheme();
+ property public static final androidx.compose.runtime.ProvidableCompositionLocal<androidx.compose.material.ripple.RippleTheme> LocalRippleTheme;
+ }
+
+}
+
diff --git a/compose/material/material/api/1.2.0-beta02.txt b/compose/material/material/api/1.2.0-beta02.txt
new file mode 100644
index 0000000..b5ba87a
--- /dev/null
+++ b/compose/material/material/api/1.2.0-beta02.txt
@@ -0,0 +1,670 @@
+// Signature format: 4.0
+package androidx.compose.material {
+
+ public final class AlertDialogKt {
+ }
+
+ public final class AndroidAlertDialog_androidKt {
+ method @androidx.compose.runtime.Composable public static void AlertDialog(kotlin.jvm.functions.Function0<kotlin.Unit> onDismissRequest, kotlin.jvm.functions.Function0<kotlin.Unit> confirmButton, optional androidx.compose.ui.Modifier modifier, optional kotlin.jvm.functions.Function0<kotlin.Unit>? dismissButton, optional kotlin.jvm.functions.Function0<kotlin.Unit>? title, optional kotlin.jvm.functions.Function0<kotlin.Unit>? text, optional androidx.compose.ui.graphics.Shape shape, optional long backgroundColor, optional long contentColor, optional androidx.compose.ui.window.DialogProperties properties);
+ method @androidx.compose.runtime.Composable public static void AlertDialog(kotlin.jvm.functions.Function0<kotlin.Unit> onDismissRequest, kotlin.jvm.functions.Function0<kotlin.Unit> buttons, optional androidx.compose.ui.Modifier modifier, optional kotlin.jvm.functions.Function0<kotlin.Unit>? title, optional kotlin.jvm.functions.Function0<kotlin.Unit>? text, optional androidx.compose.ui.graphics.Shape shape, optional long backgroundColor, optional long contentColor, optional androidx.compose.ui.window.DialogProperties properties);
+ }
+
+ public final class AndroidMenu_androidKt {
+ method @androidx.compose.runtime.Composable public static void DropdownMenu(boolean expanded, kotlin.jvm.functions.Function0<kotlin.Unit> onDismissRequest, optional androidx.compose.ui.Modifier modifier, optional long offset, optional androidx.compose.ui.window.PopupProperties properties, kotlin.jvm.functions.Function1<? super androidx.compose.foundation.layout.ColumnScope,kotlin.Unit> content);
+ method @androidx.compose.runtime.Composable public static void DropdownMenuItem(kotlin.jvm.functions.Function0<kotlin.Unit> onClick, optional androidx.compose.ui.Modifier modifier, optional boolean enabled, optional androidx.compose.foundation.layout.PaddingValues contentPadding, optional androidx.compose.foundation.interaction.MutableInteractionSource interactionSource, kotlin.jvm.functions.Function1<? super androidx.compose.foundation.layout.RowScope,kotlin.Unit> content);
+ }
+
+ public final class AppBarDefaults {
+ method public float getBottomAppBarElevation();
+ method public androidx.compose.foundation.layout.PaddingValues getContentPadding();
+ method public float getTopAppBarElevation();
+ property public final float BottomAppBarElevation;
+ property public final androidx.compose.foundation.layout.PaddingValues ContentPadding;
+ property public final float TopAppBarElevation;
+ field public static final androidx.compose.material.AppBarDefaults INSTANCE;
+ }
+
+ public final class AppBarKt {
+ method @androidx.compose.runtime.Composable public static void BottomAppBar(optional androidx.compose.ui.Modifier modifier, optional long backgroundColor, optional long contentColor, optional androidx.compose.ui.graphics.Shape? cutoutShape, optional float elevation, optional androidx.compose.foundation.layout.PaddingValues contentPadding, kotlin.jvm.functions.Function1<? super androidx.compose.foundation.layout.RowScope,kotlin.Unit> content);
+ method @androidx.compose.runtime.Composable public static void TopAppBar(kotlin.jvm.functions.Function0<kotlin.Unit> title, optional androidx.compose.ui.Modifier modifier, optional kotlin.jvm.functions.Function0<kotlin.Unit>? navigationIcon, optional kotlin.jvm.functions.Function1<? super androidx.compose.foundation.layout.RowScope,kotlin.Unit> actions, optional long backgroundColor, optional long contentColor, optional float elevation);
+ method @androidx.compose.runtime.Composable public static void TopAppBar(optional androidx.compose.ui.Modifier modifier, optional long backgroundColor, optional long contentColor, optional float elevation, optional androidx.compose.foundation.layout.PaddingValues contentPadding, kotlin.jvm.functions.Function1<? super androidx.compose.foundation.layout.RowScope,kotlin.Unit> content);
+ }
+
+ public final class BackdropScaffoldDefaults {
+ method public float getFrontLayerElevation();
+ method @androidx.compose.runtime.Composable public long getFrontLayerScrimColor();
+ method @androidx.compose.runtime.Composable public androidx.compose.ui.graphics.Shape getFrontLayerShape();
+ method public float getHeaderHeight();
+ method public float getPeekHeight();
+ property public final float FrontLayerElevation;
+ property public final float HeaderHeight;
+ property public final float PeekHeight;
+ property @androidx.compose.runtime.Composable public final long frontLayerScrimColor;
+ property @androidx.compose.runtime.Composable public final androidx.compose.ui.graphics.Shape frontLayerShape;
+ field public static final androidx.compose.material.BackdropScaffoldDefaults INSTANCE;
+ }
+
+ public final class BackdropScaffoldKt {
+ }
+
+ public final class BadgeKt {
+ method @androidx.compose.runtime.Composable public static void Badge(optional androidx.compose.ui.Modifier modifier, optional long backgroundColor, optional long contentColor, optional kotlin.jvm.functions.Function1<? super androidx.compose.foundation.layout.RowScope,kotlin.Unit>? content);
+ method @androidx.compose.runtime.Composable public static void BadgedBox(kotlin.jvm.functions.Function1<? super androidx.compose.foundation.layout.BoxScope,kotlin.Unit> badge, optional androidx.compose.ui.Modifier modifier, kotlin.jvm.functions.Function1<? super androidx.compose.foundation.layout.BoxScope,kotlin.Unit> content);
+ }
+
+ public final class BottomNavigationDefaults {
+ method public float getElevation();
+ property public final float Elevation;
+ field public static final androidx.compose.material.BottomNavigationDefaults INSTANCE;
+ }
+
+ public final class BottomNavigationKt {
+ method @androidx.compose.runtime.Composable public static void BottomNavigation(optional androidx.compose.ui.Modifier modifier, optional long backgroundColor, optional long contentColor, optional float elevation, kotlin.jvm.functions.Function1<? super androidx.compose.foundation.layout.RowScope,kotlin.Unit> content);
+ method @androidx.compose.runtime.Composable public static void BottomNavigationItem(androidx.compose.foundation.layout.RowScope, boolean selected, kotlin.jvm.functions.Function0<kotlin.Unit> onClick, kotlin.jvm.functions.Function0<kotlin.Unit> icon, optional androidx.compose.ui.Modifier modifier, optional boolean enabled, optional kotlin.jvm.functions.Function0<kotlin.Unit>? label, optional boolean alwaysShowLabel, optional androidx.compose.foundation.interaction.MutableInteractionSource interactionSource, optional long selectedContentColor, optional long unselectedContentColor);
+ }
+
+ public final class BottomSheetScaffoldDefaults {
+ method public float getSheetElevation();
+ method public float getSheetPeekHeight();
+ property public final float SheetElevation;
+ property public final float SheetPeekHeight;
+ field public static final androidx.compose.material.BottomSheetScaffoldDefaults INSTANCE;
+ }
+
+ public final class BottomSheetScaffoldKt {
+ }
+
+ @androidx.compose.runtime.Stable public interface ButtonColors {
+ method @androidx.compose.runtime.Composable public androidx.compose.runtime.State<androidx.compose.ui.graphics.Color> backgroundColor(boolean enabled);
+ method @androidx.compose.runtime.Composable public androidx.compose.runtime.State<androidx.compose.ui.graphics.Color> contentColor(boolean enabled);
+ }
+
+ public final class ButtonDefaults {
+ method @androidx.compose.runtime.Composable public androidx.compose.material.ButtonColors buttonColors(optional long backgroundColor, optional long contentColor, optional long disabledBackgroundColor, optional long disabledContentColor);
+ method @androidx.compose.runtime.Composable public androidx.compose.material.ButtonElevation elevation(optional float defaultElevation, optional float pressedElevation, optional float disabledElevation, optional float hoveredElevation, optional float focusedElevation);
+ method @Deprecated @androidx.compose.runtime.Composable public androidx.compose.material.ButtonElevation! elevation(optional float defaultElevation, optional float pressedElevation, optional float disabledElevation);
+ method public androidx.compose.foundation.layout.PaddingValues getContentPadding();
+ method public float getIconSize();
+ method public float getIconSpacing();
+ method public float getMinHeight();
+ method public float getMinWidth();
+ method @androidx.compose.runtime.Composable public androidx.compose.foundation.BorderStroke getOutlinedBorder();
+ method public float getOutlinedBorderSize();
+ method public androidx.compose.foundation.layout.PaddingValues getTextButtonContentPadding();
+ method @androidx.compose.runtime.Composable public androidx.compose.material.ButtonColors outlinedButtonColors(optional long backgroundColor, optional long contentColor, optional long disabledContentColor);
+ method @androidx.compose.runtime.Composable public androidx.compose.material.ButtonColors textButtonColors(optional long backgroundColor, optional long contentColor, optional long disabledContentColor);
+ property public final androidx.compose.foundation.layout.PaddingValues ContentPadding;
+ property public final float IconSize;
+ property public final float IconSpacing;
+ property public final float MinHeight;
+ property public final float MinWidth;
+ property public final float OutlinedBorderSize;
+ property public final androidx.compose.foundation.layout.PaddingValues TextButtonContentPadding;
+ property @androidx.compose.runtime.Composable public final androidx.compose.foundation.BorderStroke outlinedBorder;
+ field public static final androidx.compose.material.ButtonDefaults INSTANCE;
+ field public static final float OutlinedBorderOpacity = 0.12f;
+ }
+
+ @androidx.compose.runtime.Stable public interface ButtonElevation {
+ method @androidx.compose.runtime.Composable public androidx.compose.runtime.State<androidx.compose.ui.unit.Dp> elevation(boolean enabled, androidx.compose.foundation.interaction.InteractionSource interactionSource);
+ }
+
+ public final class ButtonKt {
+ method @androidx.compose.runtime.Composable public static void Button(kotlin.jvm.functions.Function0<kotlin.Unit> onClick, optional androidx.compose.ui.Modifier modifier, optional boolean enabled, optional androidx.compose.foundation.interaction.MutableInteractionSource interactionSource, optional androidx.compose.material.ButtonElevation? elevation, optional androidx.compose.ui.graphics.Shape shape, optional androidx.compose.foundation.BorderStroke? border, optional androidx.compose.material.ButtonColors colors, optional androidx.compose.foundation.layout.PaddingValues contentPadding, kotlin.jvm.functions.Function1<? super androidx.compose.foundation.layout.RowScope,kotlin.Unit> content);
+ method @androidx.compose.runtime.Composable @androidx.compose.runtime.NonRestartableComposable public static void OutlinedButton(kotlin.jvm.functions.Function0<kotlin.Unit> onClick, optional androidx.compose.ui.Modifier modifier, optional boolean enabled, optional androidx.compose.foundation.interaction.MutableInteractionSource interactionSource, optional androidx.compose.material.ButtonElevation? elevation, optional androidx.compose.ui.graphics.Shape shape, optional androidx.compose.foundation.BorderStroke? border, optional androidx.compose.material.ButtonColors colors, optional androidx.compose.foundation.layout.PaddingValues contentPadding, kotlin.jvm.functions.Function1<? super androidx.compose.foundation.layout.RowScope,kotlin.Unit> content);
+ method @androidx.compose.runtime.Composable @androidx.compose.runtime.NonRestartableComposable public static void TextButton(kotlin.jvm.functions.Function0<kotlin.Unit> onClick, optional androidx.compose.ui.Modifier modifier, optional boolean enabled, optional androidx.compose.foundation.interaction.MutableInteractionSource interactionSource, optional androidx.compose.material.ButtonElevation? elevation, optional androidx.compose.ui.graphics.Shape shape, optional androidx.compose.foundation.BorderStroke? border, optional androidx.compose.material.ButtonColors colors, optional androidx.compose.foundation.layout.PaddingValues contentPadding, kotlin.jvm.functions.Function1<? super androidx.compose.foundation.layout.RowScope,kotlin.Unit> content);
+ }
+
+ public final class CardKt {
+ method @androidx.compose.runtime.Composable @androidx.compose.runtime.NonRestartableComposable public static void Card(optional androidx.compose.ui.Modifier modifier, optional androidx.compose.ui.graphics.Shape shape, optional long backgroundColor, optional long contentColor, optional androidx.compose.foundation.BorderStroke? border, optional float elevation, kotlin.jvm.functions.Function0<kotlin.Unit> content);
+ }
+
+ @androidx.compose.runtime.Stable public interface CheckboxColors {
+ method @androidx.compose.runtime.Composable public androidx.compose.runtime.State<androidx.compose.ui.graphics.Color> borderColor(boolean enabled, androidx.compose.ui.state.ToggleableState state);
+ method @androidx.compose.runtime.Composable public androidx.compose.runtime.State<androidx.compose.ui.graphics.Color> boxColor(boolean enabled, androidx.compose.ui.state.ToggleableState state);
+ method @androidx.compose.runtime.Composable public androidx.compose.runtime.State<androidx.compose.ui.graphics.Color> checkmarkColor(androidx.compose.ui.state.ToggleableState state);
+ }
+
+ public final class CheckboxDefaults {
+ method @androidx.compose.runtime.Composable public androidx.compose.material.CheckboxColors colors(optional long checkedColor, optional long uncheckedColor, optional long checkmarkColor, optional long disabledColor, optional long disabledIndeterminateColor);
+ field public static final androidx.compose.material.CheckboxDefaults INSTANCE;
+ }
+
+ public final class CheckboxKt {
+ method @androidx.compose.runtime.Composable public static void Checkbox(boolean checked, kotlin.jvm.functions.Function1<? super java.lang.Boolean,kotlin.Unit>? onCheckedChange, optional androidx.compose.ui.Modifier modifier, optional boolean enabled, optional androidx.compose.foundation.interaction.MutableInteractionSource interactionSource, optional androidx.compose.material.CheckboxColors colors);
+ method @androidx.compose.runtime.Composable public static void TriStateCheckbox(androidx.compose.ui.state.ToggleableState state, kotlin.jvm.functions.Function0<kotlin.Unit>? onClick, optional androidx.compose.ui.Modifier modifier, optional boolean enabled, optional androidx.compose.foundation.interaction.MutableInteractionSource interactionSource, optional androidx.compose.material.CheckboxColors colors);
+ }
+
+ public final class ChipKt {
+ }
+
+ @androidx.compose.runtime.Stable public final class Colors {
+ ctor public Colors(long primary, long primaryVariant, long secondary, long secondaryVariant, long background, long surface, long error, long onPrimary, long onSecondary, long onBackground, long onSurface, long onError, boolean isLight);
+ method public androidx.compose.material.Colors copy(optional long primary, optional long primaryVariant, optional long secondary, optional long secondaryVariant, optional long background, optional long surface, optional long error, optional long onPrimary, optional long onSecondary, optional long onBackground, optional long onSurface, optional long onError, optional boolean isLight);
+ method public long getBackground();
+ 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 final long background;
+ property public final long error;
+ property public final boolean isLight;
+ property public final long onBackground;
+ property public final long onError;
+ property public final long onPrimary;
+ property public final long onSecondary;
+ property public final long onSurface;
+ property public final long primary;
+ property public final long primaryVariant;
+ property public final long secondary;
+ property public final long secondaryVariant;
+ property public final long surface;
+ }
+
+ public final class ColorsKt {
+ method public static long contentColorFor(androidx.compose.material.Colors, long backgroundColor);
+ method @androidx.compose.runtime.Composable @androidx.compose.runtime.ReadOnlyComposable public static long contentColorFor(long backgroundColor);
+ method public static androidx.compose.material.Colors darkColors(optional long primary, optional long primaryVariant, optional long secondary, optional long secondaryVariant, optional long background, optional long surface, optional long error, optional long onPrimary, optional long onSecondary, optional long onBackground, optional long onSurface, optional long onError);
+ method public static long getPrimarySurface(androidx.compose.material.Colors);
+ method public static androidx.compose.material.Colors lightColors(optional long primary, optional long primaryVariant, optional long secondary, optional long secondaryVariant, optional long background, optional long surface, optional long error, optional long onPrimary, optional long onSecondary, optional long onBackground, optional long onSurface, optional long onError);
+ }
+
+ public final class ContentAlpha {
+ method @androidx.compose.runtime.Composable public float getDisabled();
+ method @androidx.compose.runtime.Composable public float getHigh();
+ method @androidx.compose.runtime.Composable public float getMedium();
+ property @androidx.compose.runtime.Composable public final float disabled;
+ property @androidx.compose.runtime.Composable public final float high;
+ property @androidx.compose.runtime.Composable public final float medium;
+ field public static final androidx.compose.material.ContentAlpha INSTANCE;
+ }
+
+ public final class ContentAlphaKt {
+ method public static androidx.compose.runtime.ProvidableCompositionLocal<java.lang.Float> getLocalContentAlpha();
+ property public static final androidx.compose.runtime.ProvidableCompositionLocal<java.lang.Float> LocalContentAlpha;
+ }
+
+ public final class ContentColorKt {
+ method public static androidx.compose.runtime.ProvidableCompositionLocal<androidx.compose.ui.graphics.Color> getLocalContentColor();
+ property public static final androidx.compose.runtime.ProvidableCompositionLocal<androidx.compose.ui.graphics.Color> LocalContentColor;
+ }
+
+ public enum DismissDirection {
+ enum_constant public static final androidx.compose.material.DismissDirection EndToStart;
+ enum_constant public static final androidx.compose.material.DismissDirection StartToEnd;
+ }
+
+ public enum DismissValue {
+ enum_constant public static final androidx.compose.material.DismissValue Default;
+ enum_constant public static final androidx.compose.material.DismissValue DismissedToEnd;
+ enum_constant public static final androidx.compose.material.DismissValue DismissedToStart;
+ }
+
+ public final class DividerKt {
+ method @androidx.compose.runtime.Composable public static void Divider(optional androidx.compose.ui.Modifier modifier, optional long color, optional float thickness, optional float startIndent);
+ }
+
+ public final class DragGestureDetectorCopyKt {
+ }
+
+ public final class DrawerDefaults {
+ method public float getElevation();
+ method @androidx.compose.runtime.Composable public long getScrimColor();
+ property public final float Elevation;
+ property @androidx.compose.runtime.Composable public final long scrimColor;
+ field public static final androidx.compose.material.DrawerDefaults INSTANCE;
+ field public static final float ScrimOpacity = 0.32f;
+ }
+
+ public final class DrawerKt {
+ method @androidx.compose.runtime.Composable public static void ModalDrawer(kotlin.jvm.functions.Function1<? super androidx.compose.foundation.layout.ColumnScope,kotlin.Unit> drawerContent, optional androidx.compose.ui.Modifier modifier, optional androidx.compose.material.DrawerState drawerState, optional boolean gesturesEnabled, optional androidx.compose.ui.graphics.Shape drawerShape, optional float drawerElevation, optional long drawerBackgroundColor, optional long drawerContentColor, optional long scrimColor, kotlin.jvm.functions.Function0<kotlin.Unit> content);
+ method @androidx.compose.runtime.Composable public static androidx.compose.material.DrawerState rememberDrawerState(androidx.compose.material.DrawerValue initialValue, optional kotlin.jvm.functions.Function1<? super androidx.compose.material.DrawerValue,java.lang.Boolean> confirmStateChange);
+ }
+
+ @androidx.compose.runtime.Stable public final class DrawerState {
+ ctor public DrawerState(androidx.compose.material.DrawerValue initialValue, optional kotlin.jvm.functions.Function1<? super androidx.compose.material.DrawerValue,java.lang.Boolean> confirmStateChange);
+ method public suspend Object? close(kotlin.coroutines.Continuation<? super kotlin.Unit>);
+ method public androidx.compose.material.DrawerValue getCurrentValue();
+ method public boolean isAnimationRunning();
+ method public boolean isClosed();
+ method public boolean isOpen();
+ method public suspend Object? open(kotlin.coroutines.Continuation<? super kotlin.Unit>);
+ property public final androidx.compose.material.DrawerValue currentValue;
+ property public final boolean isAnimationRunning;
+ property public final boolean isClosed;
+ property public final boolean isOpen;
+ field public static final androidx.compose.material.DrawerState.Companion Companion;
+ }
+
+ public static final class DrawerState.Companion {
+ method public androidx.compose.runtime.saveable.Saver<androidx.compose.material.DrawerState,androidx.compose.material.DrawerValue> Saver(kotlin.jvm.functions.Function1<? super androidx.compose.material.DrawerValue,java.lang.Boolean> confirmStateChange);
+ }
+
+ public enum DrawerValue {
+ enum_constant public static final androidx.compose.material.DrawerValue Closed;
+ enum_constant public static final androidx.compose.material.DrawerValue Open;
+ }
+
+ public final class ElevationKt {
+ }
+
+ public interface ElevationOverlay {
+ method @androidx.compose.runtime.Composable public long apply(long color, float elevation);
+ }
+
+ public final class ElevationOverlayKt {
+ method public static androidx.compose.runtime.ProvidableCompositionLocal<androidx.compose.ui.unit.Dp> getLocalAbsoluteElevation();
+ method public static androidx.compose.runtime.ProvidableCompositionLocal<androidx.compose.material.ElevationOverlay> getLocalElevationOverlay();
+ property public static final androidx.compose.runtime.ProvidableCompositionLocal<androidx.compose.ui.unit.Dp> LocalAbsoluteElevation;
+ property public static final androidx.compose.runtime.ProvidableCompositionLocal<androidx.compose.material.ElevationOverlay> LocalElevationOverlay;
+ }
+
+ public final class ExposedDropdownMenuKt {
+ }
+
+ @kotlin.jvm.JvmInline public final value class FabPosition {
+ field public static final androidx.compose.material.FabPosition.Companion Companion;
+ }
+
+ public static final class FabPosition.Companion {
+ method public int getCenter();
+ method public int getEnd();
+ property public final int Center;
+ property public final int End;
+ }
+
+ public final class FloatingActionButtonDefaults {
+ method @androidx.compose.runtime.Composable public androidx.compose.material.FloatingActionButtonElevation elevation(optional float defaultElevation, optional float pressedElevation, optional float hoveredElevation, optional float focusedElevation);
+ method @Deprecated @androidx.compose.runtime.Composable public androidx.compose.material.FloatingActionButtonElevation! elevation(optional float defaultElevation, optional float pressedElevation);
+ field public static final androidx.compose.material.FloatingActionButtonDefaults INSTANCE;
+ }
+
+ @androidx.compose.runtime.Stable public interface FloatingActionButtonElevation {
+ method @androidx.compose.runtime.Composable public androidx.compose.runtime.State<androidx.compose.ui.unit.Dp> elevation(androidx.compose.foundation.interaction.InteractionSource interactionSource);
+ }
+
+ public final class FloatingActionButtonKt {
+ method @androidx.compose.runtime.Composable public static void ExtendedFloatingActionButton(kotlin.jvm.functions.Function0<kotlin.Unit> text, kotlin.jvm.functions.Function0<kotlin.Unit> onClick, optional androidx.compose.ui.Modifier modifier, optional kotlin.jvm.functions.Function0<kotlin.Unit>? icon, optional androidx.compose.foundation.interaction.MutableInteractionSource interactionSource, optional androidx.compose.ui.graphics.Shape shape, optional long backgroundColor, optional long contentColor, optional androidx.compose.material.FloatingActionButtonElevation elevation);
+ method @androidx.compose.runtime.Composable public static void FloatingActionButton(kotlin.jvm.functions.Function0<kotlin.Unit> onClick, optional androidx.compose.ui.Modifier modifier, optional androidx.compose.foundation.interaction.MutableInteractionSource interactionSource, optional androidx.compose.ui.graphics.Shape shape, optional long backgroundColor, optional long contentColor, optional androidx.compose.material.FloatingActionButtonElevation elevation, kotlin.jvm.functions.Function0<kotlin.Unit> content);
+ }
+
+ public final class IconButtonKt {
+ method @androidx.compose.runtime.Composable public static void IconButton(kotlin.jvm.functions.Function0<kotlin.Unit> onClick, optional androidx.compose.ui.Modifier modifier, optional boolean enabled, optional androidx.compose.foundation.interaction.MutableInteractionSource interactionSource, kotlin.jvm.functions.Function0<kotlin.Unit> content);
+ method @androidx.compose.runtime.Composable public static void IconToggleButton(boolean checked, kotlin.jvm.functions.Function1<? super java.lang.Boolean,kotlin.Unit> onCheckedChange, optional androidx.compose.ui.Modifier modifier, optional boolean enabled, optional androidx.compose.foundation.interaction.MutableInteractionSource interactionSource, kotlin.jvm.functions.Function0<kotlin.Unit> content);
+ }
+
+ public final class IconKt {
+ method @androidx.compose.runtime.Composable @androidx.compose.runtime.NonRestartableComposable public static void Icon(androidx.compose.ui.graphics.vector.ImageVector imageVector, String? contentDescription, optional androidx.compose.ui.Modifier modifier, optional long tint);
+ method @androidx.compose.runtime.Composable @androidx.compose.runtime.NonRestartableComposable public static void Icon(androidx.compose.ui.graphics.ImageBitmap bitmap, String? contentDescription, optional androidx.compose.ui.Modifier modifier, optional long tint);
+ method @androidx.compose.runtime.Composable public static void Icon(androidx.compose.ui.graphics.painter.Painter painter, String? contentDescription, optional androidx.compose.ui.Modifier modifier, optional long tint);
+ }
+
+ public final class ListItemKt {
+ }
+
+ public final class MaterialTextSelectionColorsKt {
+ }
+
+ public final class MaterialTheme {
+ method @androidx.compose.runtime.Composable @androidx.compose.runtime.ReadOnlyComposable public androidx.compose.material.Colors getColors();
+ method @androidx.compose.runtime.Composable @androidx.compose.runtime.ReadOnlyComposable public androidx.compose.material.Shapes getShapes();
+ method @androidx.compose.runtime.Composable @androidx.compose.runtime.ReadOnlyComposable public androidx.compose.material.Typography getTypography();
+ property @androidx.compose.runtime.Composable @androidx.compose.runtime.ReadOnlyComposable public final androidx.compose.material.Colors colors;
+ property @androidx.compose.runtime.Composable @androidx.compose.runtime.ReadOnlyComposable public final androidx.compose.material.Shapes shapes;
+ property @androidx.compose.runtime.Composable @androidx.compose.runtime.ReadOnlyComposable public final androidx.compose.material.Typography typography;
+ field public static final androidx.compose.material.MaterialTheme INSTANCE;
+ }
+
+ public final class MaterialThemeKt {
+ method @androidx.compose.runtime.Composable public static void MaterialTheme(optional androidx.compose.material.Colors colors, optional androidx.compose.material.Typography typography, optional androidx.compose.material.Shapes shapes, kotlin.jvm.functions.Function0<kotlin.Unit> content);
+ }
+
+ public final class MaterialTheme_androidKt {
+ }
+
+ public final class MenuDefaults {
+ method public androidx.compose.foundation.layout.PaddingValues getDropdownMenuItemContentPadding();
+ property public final androidx.compose.foundation.layout.PaddingValues DropdownMenuItemContentPadding;
+ field public static final androidx.compose.material.MenuDefaults INSTANCE;
+ }
+
+ public final class MenuKt {
+ }
+
+ public final class ModalBottomSheetDefaults {
+ method public float getElevation();
+ method @androidx.compose.runtime.Composable public long getScrimColor();
+ property public final float Elevation;
+ property @androidx.compose.runtime.Composable public final long scrimColor;
+ field public static final androidx.compose.material.ModalBottomSheetDefaults INSTANCE;
+ }
+
+ public final class ModalBottomSheetKt {
+ }
+
+ public final class NavigationRailDefaults {
+ method public float getElevation();
+ property public final float Elevation;
+ field public static final androidx.compose.material.NavigationRailDefaults INSTANCE;
+ }
+
+ public final class NavigationRailKt {
+ method @androidx.compose.runtime.Composable public static void NavigationRail(optional androidx.compose.ui.Modifier modifier, optional long backgroundColor, optional long contentColor, optional float elevation, optional kotlin.jvm.functions.Function1<? super androidx.compose.foundation.layout.ColumnScope,kotlin.Unit>? header, kotlin.jvm.functions.Function1<? super androidx.compose.foundation.layout.ColumnScope,kotlin.Unit> content);
+ method @androidx.compose.runtime.Composable public static void NavigationRailItem(boolean selected, kotlin.jvm.functions.Function0<kotlin.Unit> onClick, kotlin.jvm.functions.Function0<kotlin.Unit> icon, optional androidx.compose.ui.Modifier modifier, optional boolean enabled, optional kotlin.jvm.functions.Function0<kotlin.Unit>? label, optional boolean alwaysShowLabel, optional androidx.compose.foundation.interaction.MutableInteractionSource interactionSource, optional long selectedContentColor, optional long unselectedContentColor);
+ }
+
+ public final class OutlinedTextFieldKt {
+ method @androidx.compose.runtime.Composable public static void OutlinedTextField(String value, kotlin.jvm.functions.Function1<? super java.lang.String,kotlin.Unit> onValueChange, optional androidx.compose.ui.Modifier modifier, optional boolean enabled, optional boolean readOnly, optional androidx.compose.ui.text.TextStyle textStyle, optional kotlin.jvm.functions.Function0<kotlin.Unit>? label, optional kotlin.jvm.functions.Function0<kotlin.Unit>? placeholder, optional kotlin.jvm.functions.Function0<kotlin.Unit>? leadingIcon, optional kotlin.jvm.functions.Function0<kotlin.Unit>? trailingIcon, optional boolean isError, optional androidx.compose.ui.text.input.VisualTransformation visualTransformation, optional androidx.compose.foundation.text.KeyboardOptions keyboardOptions, optional androidx.compose.foundation.text.KeyboardActions keyboardActions, optional boolean singleLine, optional int maxLines, optional androidx.compose.foundation.interaction.MutableInteractionSource interactionSource, optional androidx.compose.ui.graphics.Shape shape, optional androidx.compose.material.TextFieldColors colors);
+ method @androidx.compose.runtime.Composable public static void OutlinedTextField(androidx.compose.ui.text.input.TextFieldValue value, kotlin.jvm.functions.Function1<? super androidx.compose.ui.text.input.TextFieldValue,kotlin.Unit> onValueChange, optional androidx.compose.ui.Modifier modifier, optional boolean enabled, optional boolean readOnly, optional androidx.compose.ui.text.TextStyle textStyle, optional kotlin.jvm.functions.Function0<kotlin.Unit>? label, optional kotlin.jvm.functions.Function0<kotlin.Unit>? placeholder, optional kotlin.jvm.functions.Function0<kotlin.Unit>? leadingIcon, optional kotlin.jvm.functions.Function0<kotlin.Unit>? trailingIcon, optional boolean isError, optional androidx.compose.ui.text.input.VisualTransformation visualTransformation, optional androidx.compose.foundation.text.KeyboardOptions keyboardOptions, optional androidx.compose.foundation.text.KeyboardActions keyboardActions, optional boolean singleLine, optional int maxLines, optional androidx.compose.foundation.interaction.MutableInteractionSource interactionSource, optional androidx.compose.ui.graphics.Shape shape, optional androidx.compose.material.TextFieldColors colors);
+ }
+
+ public final class ProgressIndicatorDefaults {
+ method public androidx.compose.animation.core.SpringSpec<java.lang.Float> getProgressAnimationSpec();
+ method public float getStrokeWidth();
+ property public final androidx.compose.animation.core.SpringSpec<java.lang.Float> ProgressAnimationSpec;
+ property public final float StrokeWidth;
+ field public static final androidx.compose.material.ProgressIndicatorDefaults INSTANCE;
+ field public static final float IndicatorBackgroundOpacity = 0.24f;
+ }
+
+ public final class ProgressIndicatorKt {
+ method @androidx.compose.runtime.Composable public static void CircularProgressIndicator(float progress, optional androidx.compose.ui.Modifier modifier, optional long color, optional float strokeWidth);
+ method @androidx.compose.runtime.Composable public static void CircularProgressIndicator(optional androidx.compose.ui.Modifier modifier, optional long color, optional float strokeWidth);
+ method @androidx.compose.runtime.Composable public static void LinearProgressIndicator(float progress, optional androidx.compose.ui.Modifier modifier, optional long color, optional long backgroundColor);
+ method @androidx.compose.runtime.Composable public static void LinearProgressIndicator(optional androidx.compose.ui.Modifier modifier, optional long color, optional long backgroundColor);
+ }
+
+ @androidx.compose.runtime.Stable public interface RadioButtonColors {
+ method @androidx.compose.runtime.Composable public androidx.compose.runtime.State<androidx.compose.ui.graphics.Color> radioColor(boolean enabled, boolean selected);
+ }
+
+ public final class RadioButtonDefaults {
+ method @androidx.compose.runtime.Composable public androidx.compose.material.RadioButtonColors colors(optional long selectedColor, optional long unselectedColor, optional long disabledColor);
+ field public static final androidx.compose.material.RadioButtonDefaults INSTANCE;
+ }
+
+ public final class RadioButtonKt {
+ method @androidx.compose.runtime.Composable public static void RadioButton(boolean selected, kotlin.jvm.functions.Function0<kotlin.Unit>? onClick, optional androidx.compose.ui.Modifier modifier, optional boolean enabled, optional androidx.compose.foundation.interaction.MutableInteractionSource interactionSource, optional androidx.compose.material.RadioButtonColors colors);
+ }
+
+ @androidx.compose.runtime.Immutable public final class ResistanceConfig {
+ ctor public ResistanceConfig(float basis, optional float factorAtMin, optional float factorAtMax);
+ method public float computeResistance(float overflow);
+ method public float getBasis();
+ method public float getFactorAtMax();
+ method public float getFactorAtMin();
+ property public final float basis;
+ property public final float factorAtMax;
+ property public final float factorAtMin;
+ }
+
+ public final class ScaffoldKt {
+ method @androidx.compose.runtime.Composable public static void Scaffold(optional androidx.compose.ui.Modifier modifier, optional androidx.compose.material.ScaffoldState scaffoldState, optional kotlin.jvm.functions.Function0<kotlin.Unit> topBar, optional kotlin.jvm.functions.Function0<kotlin.Unit> bottomBar, optional kotlin.jvm.functions.Function1<? super androidx.compose.material.SnackbarHostState,kotlin.Unit> snackbarHost, optional kotlin.jvm.functions.Function0<kotlin.Unit> floatingActionButton, optional int floatingActionButtonPosition, optional boolean isFloatingActionButtonDocked, optional kotlin.jvm.functions.Function1<? super androidx.compose.foundation.layout.ColumnScope,kotlin.Unit>? drawerContent, optional boolean drawerGesturesEnabled, optional androidx.compose.ui.graphics.Shape drawerShape, optional float drawerElevation, optional long drawerBackgroundColor, optional long drawerContentColor, optional long drawerScrimColor, optional long backgroundColor, optional long contentColor, kotlin.jvm.functions.Function1<? super androidx.compose.foundation.layout.PaddingValues,kotlin.Unit> content);
+ method @androidx.compose.runtime.Composable public static androidx.compose.material.ScaffoldState rememberScaffoldState(optional androidx.compose.material.DrawerState drawerState, optional androidx.compose.material.SnackbarHostState snackbarHostState);
+ }
+
+ @androidx.compose.runtime.Stable public final class ScaffoldState {
+ ctor public ScaffoldState(androidx.compose.material.DrawerState drawerState, androidx.compose.material.SnackbarHostState snackbarHostState);
+ method public androidx.compose.material.DrawerState getDrawerState();
+ method public androidx.compose.material.SnackbarHostState getSnackbarHostState();
+ property public final androidx.compose.material.DrawerState drawerState;
+ property public final androidx.compose.material.SnackbarHostState snackbarHostState;
+ }
+
+ @androidx.compose.runtime.Immutable public final class Shapes {
+ ctor public Shapes(optional androidx.compose.foundation.shape.CornerBasedShape small, optional androidx.compose.foundation.shape.CornerBasedShape medium, optional androidx.compose.foundation.shape.CornerBasedShape large);
+ method public androidx.compose.material.Shapes copy(optional androidx.compose.foundation.shape.CornerBasedShape small, optional androidx.compose.foundation.shape.CornerBasedShape medium, optional androidx.compose.foundation.shape.CornerBasedShape large);
+ method public androidx.compose.foundation.shape.CornerBasedShape getLarge();
+ method public androidx.compose.foundation.shape.CornerBasedShape getMedium();
+ method public androidx.compose.foundation.shape.CornerBasedShape getSmall();
+ property public final androidx.compose.foundation.shape.CornerBasedShape large;
+ property public final androidx.compose.foundation.shape.CornerBasedShape medium;
+ property public final androidx.compose.foundation.shape.CornerBasedShape small;
+ }
+
+ public final class ShapesKt {
+ }
+
+ @androidx.compose.runtime.Stable public interface SliderColors {
+ method @androidx.compose.runtime.Composable public androidx.compose.runtime.State<androidx.compose.ui.graphics.Color> thumbColor(boolean enabled);
+ method @androidx.compose.runtime.Composable public androidx.compose.runtime.State<androidx.compose.ui.graphics.Color> tickColor(boolean enabled, boolean active);
+ method @androidx.compose.runtime.Composable public androidx.compose.runtime.State<androidx.compose.ui.graphics.Color> trackColor(boolean enabled, boolean active);
+ }
+
+ public final class SliderDefaults {
+ method @androidx.compose.runtime.Composable public androidx.compose.material.SliderColors colors(optional long thumbColor, optional long disabledThumbColor, optional long activeTrackColor, optional long inactiveTrackColor, optional long disabledActiveTrackColor, optional long disabledInactiveTrackColor, optional long activeTickColor, optional long inactiveTickColor, optional long disabledActiveTickColor, optional long disabledInactiveTickColor);
+ field public static final float DisabledActiveTrackAlpha = 0.32f;
+ field public static final float DisabledInactiveTrackAlpha = 0.12f;
+ field public static final float DisabledTickAlpha = 0.12f;
+ field public static final androidx.compose.material.SliderDefaults INSTANCE;
+ field public static final float InactiveTrackAlpha = 0.24f;
+ field public static final float TickAlpha = 0.54f;
+ }
+
+ public final class SliderKt {
+ method @androidx.compose.runtime.Composable public static void Slider(float value, kotlin.jvm.functions.Function1<? super java.lang.Float,kotlin.Unit> onValueChange, optional androidx.compose.ui.Modifier modifier, optional boolean enabled, optional kotlin.ranges.ClosedFloatingPointRange<java.lang.Float> valueRange, optional int steps, optional kotlin.jvm.functions.Function0<kotlin.Unit>? onValueChangeFinished, optional androidx.compose.foundation.interaction.MutableInteractionSource interactionSource, optional androidx.compose.material.SliderColors colors);
+ }
+
+ public interface SnackbarData {
+ method public void dismiss();
+ method public String? getActionLabel();
+ method public androidx.compose.material.SnackbarDuration getDuration();
+ method public String getMessage();
+ method public void performAction();
+ property public abstract String? actionLabel;
+ property public abstract androidx.compose.material.SnackbarDuration duration;
+ property public abstract String message;
+ }
+
+ public final class SnackbarDefaults {
+ method @androidx.compose.runtime.Composable public long getBackgroundColor();
+ method @androidx.compose.runtime.Composable public long getPrimaryActionColor();
+ property @androidx.compose.runtime.Composable public final long backgroundColor;
+ property @androidx.compose.runtime.Composable public final long primaryActionColor;
+ field public static final androidx.compose.material.SnackbarDefaults INSTANCE;
+ }
+
+ public enum SnackbarDuration {
+ enum_constant public static final androidx.compose.material.SnackbarDuration Indefinite;
+ enum_constant public static final androidx.compose.material.SnackbarDuration Long;
+ enum_constant public static final androidx.compose.material.SnackbarDuration Short;
+ }
+
+ public final class SnackbarHostKt {
+ method @androidx.compose.runtime.Composable public static void SnackbarHost(androidx.compose.material.SnackbarHostState hostState, optional androidx.compose.ui.Modifier modifier, optional kotlin.jvm.functions.Function1<? super androidx.compose.material.SnackbarData,kotlin.Unit> snackbar);
+ }
+
+ @androidx.compose.runtime.Stable public final class SnackbarHostState {
+ ctor public SnackbarHostState();
+ method public androidx.compose.material.SnackbarData? getCurrentSnackbarData();
+ method public suspend Object? showSnackbar(String message, optional String? actionLabel, optional androidx.compose.material.SnackbarDuration duration, optional kotlin.coroutines.Continuation<? super androidx.compose.material.SnackbarResult>);
+ property public final androidx.compose.material.SnackbarData? currentSnackbarData;
+ }
+
+ public final class SnackbarKt {
+ method @androidx.compose.runtime.Composable public static void Snackbar(optional androidx.compose.ui.Modifier modifier, optional kotlin.jvm.functions.Function0<kotlin.Unit>? action, optional boolean actionOnNewLine, optional androidx.compose.ui.graphics.Shape shape, optional long backgroundColor, optional long contentColor, optional float elevation, kotlin.jvm.functions.Function0<kotlin.Unit> content);
+ method @androidx.compose.runtime.Composable public static void Snackbar(androidx.compose.material.SnackbarData snackbarData, optional androidx.compose.ui.Modifier modifier, optional boolean actionOnNewLine, optional androidx.compose.ui.graphics.Shape shape, optional long backgroundColor, optional long contentColor, optional long actionColor, optional float elevation);
+ }
+
+ public enum SnackbarResult {
+ enum_constant public static final androidx.compose.material.SnackbarResult ActionPerformed;
+ enum_constant public static final androidx.compose.material.SnackbarResult Dismissed;
+ }
+
+ public final class Strings_androidKt {
+ }
+
+ public final class SurfaceKt {
+ method @androidx.compose.runtime.Composable public static void Surface(optional androidx.compose.ui.Modifier modifier, optional androidx.compose.ui.graphics.Shape shape, optional long color, optional long contentColor, optional androidx.compose.foundation.BorderStroke? border, optional float elevation, kotlin.jvm.functions.Function0<kotlin.Unit> content);
+ }
+
+ public final class SwipeToDismissKt {
+ }
+
+ public final class SwipeableDefaults {
+ method public androidx.compose.animation.core.SpringSpec<java.lang.Float> getAnimationSpec();
+ method public float getVelocityThreshold();
+ method public androidx.compose.material.ResistanceConfig? resistanceConfig(java.util.Set<java.lang.Float> anchors, optional float factorAtMin, optional float factorAtMax);
+ property public final androidx.compose.animation.core.SpringSpec<java.lang.Float> AnimationSpec;
+ property public final float VelocityThreshold;
+ field public static final androidx.compose.material.SwipeableDefaults INSTANCE;
+ field public static final float StandardResistanceFactor = 10.0f;
+ field public static final float StiffResistanceFactor = 20.0f;
+ }
+
+ public final class SwipeableKt {
+ }
+
+ @androidx.compose.runtime.Stable public interface SwitchColors {
+ method @androidx.compose.runtime.Composable public androidx.compose.runtime.State<androidx.compose.ui.graphics.Color> thumbColor(boolean enabled, boolean checked);
+ method @androidx.compose.runtime.Composable public androidx.compose.runtime.State<androidx.compose.ui.graphics.Color> trackColor(boolean enabled, boolean checked);
+ }
+
+ public final class SwitchDefaults {
+ method @androidx.compose.runtime.Composable public androidx.compose.material.SwitchColors colors(optional long checkedThumbColor, optional long checkedTrackColor, optional float checkedTrackAlpha, optional long uncheckedThumbColor, optional long uncheckedTrackColor, optional float uncheckedTrackAlpha, optional long disabledCheckedThumbColor, optional long disabledCheckedTrackColor, optional long disabledUncheckedThumbColor, optional long disabledUncheckedTrackColor);
+ field public static final androidx.compose.material.SwitchDefaults INSTANCE;
+ }
+
+ public final class SwitchKt {
+ method @androidx.compose.runtime.Composable public static void Switch(boolean checked, kotlin.jvm.functions.Function1<? super java.lang.Boolean,kotlin.Unit>? onCheckedChange, optional androidx.compose.ui.Modifier modifier, optional boolean enabled, optional androidx.compose.foundation.interaction.MutableInteractionSource interactionSource, optional androidx.compose.material.SwitchColors colors);
+ }
+
+ public final class TabKt {
+ method @androidx.compose.runtime.Composable public static void LeadingIconTab(boolean selected, kotlin.jvm.functions.Function0<kotlin.Unit> onClick, kotlin.jvm.functions.Function0<kotlin.Unit> text, kotlin.jvm.functions.Function0<kotlin.Unit> icon, optional androidx.compose.ui.Modifier modifier, optional boolean enabled, optional androidx.compose.foundation.interaction.MutableInteractionSource interactionSource, optional long selectedContentColor, optional long unselectedContentColor);
+ method @androidx.compose.runtime.Composable public static void Tab(boolean selected, kotlin.jvm.functions.Function0<kotlin.Unit> onClick, optional androidx.compose.ui.Modifier modifier, optional boolean enabled, optional kotlin.jvm.functions.Function0<kotlin.Unit>? text, optional kotlin.jvm.functions.Function0<kotlin.Unit>? icon, optional androidx.compose.foundation.interaction.MutableInteractionSource interactionSource, optional long selectedContentColor, optional long unselectedContentColor);
+ method @androidx.compose.runtime.Composable public static void Tab(boolean selected, kotlin.jvm.functions.Function0<kotlin.Unit> onClick, optional androidx.compose.ui.Modifier modifier, optional boolean enabled, optional androidx.compose.foundation.interaction.MutableInteractionSource interactionSource, optional long selectedContentColor, optional long unselectedContentColor, kotlin.jvm.functions.Function1<? super androidx.compose.foundation.layout.ColumnScope,kotlin.Unit> content);
+ }
+
+ @androidx.compose.runtime.Immutable public final class TabPosition {
+ method public float getLeft();
+ method public float getRight();
+ method public float getWidth();
+ property public final float left;
+ property public final float right;
+ property public final float width;
+ }
+
+ public final class TabRowDefaults {
+ method @androidx.compose.runtime.Composable public void Divider(optional androidx.compose.ui.Modifier modifier, optional float thickness, optional long color);
+ method @androidx.compose.runtime.Composable public void Indicator(optional androidx.compose.ui.Modifier modifier, optional float height, optional long color);
+ method public float getDividerThickness();
+ method public float getIndicatorHeight();
+ method public float getScrollableTabRowPadding();
+ method public androidx.compose.ui.Modifier tabIndicatorOffset(androidx.compose.ui.Modifier, androidx.compose.material.TabPosition currentTabPosition);
+ property public final float DividerThickness;
+ property public final float IndicatorHeight;
+ property public final float ScrollableTabRowPadding;
+ field public static final float DividerOpacity = 0.12f;
+ field public static final androidx.compose.material.TabRowDefaults INSTANCE;
+ }
+
+ public final class TabRowKt {
+ method @androidx.compose.runtime.Composable @androidx.compose.ui.UiComposable public static void ScrollableTabRow(int selectedTabIndex, optional androidx.compose.ui.Modifier modifier, optional long backgroundColor, optional long contentColor, optional float edgePadding, optional kotlin.jvm.functions.Function1<? super java.util.List<androidx.compose.material.TabPosition>,kotlin.Unit> indicator, optional kotlin.jvm.functions.Function0<kotlin.Unit> divider, kotlin.jvm.functions.Function0<kotlin.Unit> tabs);
+ method @androidx.compose.runtime.Composable @androidx.compose.ui.UiComposable public static void TabRow(int selectedTabIndex, optional androidx.compose.ui.Modifier modifier, optional long backgroundColor, optional long contentColor, optional kotlin.jvm.functions.Function1<? super java.util.List<androidx.compose.material.TabPosition>,kotlin.Unit> indicator, optional kotlin.jvm.functions.Function0<kotlin.Unit> divider, kotlin.jvm.functions.Function0<kotlin.Unit> tabs);
+ }
+
+ @androidx.compose.runtime.Stable public interface TextFieldColors {
+ method @androidx.compose.runtime.Composable public androidx.compose.runtime.State<androidx.compose.ui.graphics.Color> backgroundColor(boolean enabled);
+ method @androidx.compose.runtime.Composable public androidx.compose.runtime.State<androidx.compose.ui.graphics.Color> cursorColor(boolean isError);
+ method @androidx.compose.runtime.Composable public androidx.compose.runtime.State<androidx.compose.ui.graphics.Color> indicatorColor(boolean enabled, boolean isError, androidx.compose.foundation.interaction.InteractionSource interactionSource);
+ method @androidx.compose.runtime.Composable public androidx.compose.runtime.State<androidx.compose.ui.graphics.Color> labelColor(boolean enabled, boolean error, androidx.compose.foundation.interaction.InteractionSource interactionSource);
+ method @androidx.compose.runtime.Composable public androidx.compose.runtime.State<androidx.compose.ui.graphics.Color> leadingIconColor(boolean enabled, boolean isError);
+ method @androidx.compose.runtime.Composable public androidx.compose.runtime.State<androidx.compose.ui.graphics.Color> placeholderColor(boolean enabled);
+ method @androidx.compose.runtime.Composable public androidx.compose.runtime.State<androidx.compose.ui.graphics.Color> textColor(boolean enabled);
+ method @androidx.compose.runtime.Composable public androidx.compose.runtime.State<androidx.compose.ui.graphics.Color> trailingIconColor(boolean enabled, boolean isError);
+ }
+
+ @androidx.compose.runtime.Immutable public final class TextFieldDefaults {
+ method public float getFocusedBorderThickness();
+ method public float getMinHeight();
+ method public float getMinWidth();
+ method @androidx.compose.runtime.Composable @androidx.compose.runtime.ReadOnlyComposable public androidx.compose.ui.graphics.Shape getOutlinedTextFieldShape();
+ method @androidx.compose.runtime.Composable @androidx.compose.runtime.ReadOnlyComposable public androidx.compose.ui.graphics.Shape getTextFieldShape();
+ method public float getUnfocusedBorderThickness();
+ method @androidx.compose.runtime.Composable public androidx.compose.material.TextFieldColors outlinedTextFieldColors(optional long textColor, optional long disabledTextColor, optional long backgroundColor, optional long cursorColor, optional long errorCursorColor, optional long focusedBorderColor, optional long unfocusedBorderColor, optional long disabledBorderColor, optional long errorBorderColor, optional long leadingIconColor, optional long disabledLeadingIconColor, optional long errorLeadingIconColor, optional long trailingIconColor, optional long disabledTrailingIconColor, optional long errorTrailingIconColor, optional long focusedLabelColor, optional long unfocusedLabelColor, optional long disabledLabelColor, optional long errorLabelColor, optional long placeholderColor, optional long disabledPlaceholderColor);
+ method @androidx.compose.runtime.Composable public androidx.compose.material.TextFieldColors textFieldColors(optional long textColor, optional long disabledTextColor, optional long backgroundColor, optional long cursorColor, optional long errorCursorColor, optional long focusedIndicatorColor, optional long unfocusedIndicatorColor, optional long disabledIndicatorColor, optional long errorIndicatorColor, optional long leadingIconColor, optional long disabledLeadingIconColor, optional long errorLeadingIconColor, optional long trailingIconColor, optional long disabledTrailingIconColor, optional long errorTrailingIconColor, optional long focusedLabelColor, optional long unfocusedLabelColor, optional long disabledLabelColor, optional long errorLabelColor, optional long placeholderColor, optional long disabledPlaceholderColor);
+ property public final float FocusedBorderThickness;
+ property public final float MinHeight;
+ property public final float MinWidth;
+ property @androidx.compose.runtime.Composable @androidx.compose.runtime.ReadOnlyComposable public final androidx.compose.ui.graphics.Shape OutlinedTextFieldShape;
+ property @androidx.compose.runtime.Composable @androidx.compose.runtime.ReadOnlyComposable public final androidx.compose.ui.graphics.Shape TextFieldShape;
+ property public final float UnfocusedBorderThickness;
+ field public static final float BackgroundOpacity = 0.12f;
+ field public static final androidx.compose.material.TextFieldDefaults INSTANCE;
+ field public static final float IconOpacity = 0.54f;
+ field public static final float UnfocusedIndicatorLineOpacity = 0.42f;
+ }
+
+ public final class TextFieldDefaultsKt {
+ }
+
+ public final class TextFieldImplKt {
+ }
+
+ public final class TextFieldKt {
+ method @androidx.compose.runtime.Composable public static void TextField(String value, kotlin.jvm.functions.Function1<? super java.lang.String,kotlin.Unit> onValueChange, optional androidx.compose.ui.Modifier modifier, optional boolean enabled, optional boolean readOnly, optional androidx.compose.ui.text.TextStyle textStyle, optional kotlin.jvm.functions.Function0<kotlin.Unit>? label, optional kotlin.jvm.functions.Function0<kotlin.Unit>? placeholder, optional kotlin.jvm.functions.Function0<kotlin.Unit>? leadingIcon, optional kotlin.jvm.functions.Function0<kotlin.Unit>? trailingIcon, optional boolean isError, optional androidx.compose.ui.text.input.VisualTransformation visualTransformation, optional androidx.compose.foundation.text.KeyboardOptions keyboardOptions, optional androidx.compose.foundation.text.KeyboardActions keyboardActions, optional boolean singleLine, optional int maxLines, optional androidx.compose.foundation.interaction.MutableInteractionSource interactionSource, optional androidx.compose.ui.graphics.Shape shape, optional androidx.compose.material.TextFieldColors colors);
+ method @androidx.compose.runtime.Composable public static void TextField(androidx.compose.ui.text.input.TextFieldValue value, kotlin.jvm.functions.Function1<? super androidx.compose.ui.text.input.TextFieldValue,kotlin.Unit> onValueChange, optional androidx.compose.ui.Modifier modifier, optional boolean enabled, optional boolean readOnly, optional androidx.compose.ui.text.TextStyle textStyle, optional kotlin.jvm.functions.Function0<kotlin.Unit>? label, optional kotlin.jvm.functions.Function0<kotlin.Unit>? placeholder, optional kotlin.jvm.functions.Function0<kotlin.Unit>? leadingIcon, optional kotlin.jvm.functions.Function0<kotlin.Unit>? trailingIcon, optional boolean isError, optional androidx.compose.ui.text.input.VisualTransformation visualTransformation, optional androidx.compose.foundation.text.KeyboardOptions keyboardOptions, optional androidx.compose.foundation.text.KeyboardActions keyboardActions, optional boolean singleLine, optional int maxLines, optional androidx.compose.foundation.interaction.MutableInteractionSource interactionSource, optional androidx.compose.ui.graphics.Shape shape, optional androidx.compose.material.TextFieldColors colors);
+ }
+
+ public final class TextKt {
+ method @androidx.compose.runtime.Composable public static void ProvideTextStyle(androidx.compose.ui.text.TextStyle value, kotlin.jvm.functions.Function0<kotlin.Unit> content);
+ method @androidx.compose.runtime.Composable public static void Text(String text, optional androidx.compose.ui.Modifier modifier, optional long color, optional long fontSize, optional androidx.compose.ui.text.font.FontStyle? fontStyle, optional androidx.compose.ui.text.font.FontWeight? fontWeight, optional androidx.compose.ui.text.font.FontFamily? fontFamily, optional long letterSpacing, optional androidx.compose.ui.text.style.TextDecoration? textDecoration, optional androidx.compose.ui.text.style.TextAlign? textAlign, optional long lineHeight, optional int overflow, optional boolean softWrap, optional int maxLines, optional kotlin.jvm.functions.Function1<? super androidx.compose.ui.text.TextLayoutResult,kotlin.Unit> onTextLayout, optional androidx.compose.ui.text.TextStyle style);
+ method @androidx.compose.runtime.Composable public static void Text(androidx.compose.ui.text.AnnotatedString text, optional androidx.compose.ui.Modifier modifier, optional long color, optional long fontSize, optional androidx.compose.ui.text.font.FontStyle? fontStyle, optional androidx.compose.ui.text.font.FontWeight? fontWeight, optional androidx.compose.ui.text.font.FontFamily? fontFamily, optional long letterSpacing, optional androidx.compose.ui.text.style.TextDecoration? textDecoration, optional androidx.compose.ui.text.style.TextAlign? textAlign, optional long lineHeight, optional int overflow, optional boolean softWrap, optional int maxLines, optional java.util.Map<java.lang.String,androidx.compose.foundation.text.InlineTextContent> inlineContent, optional kotlin.jvm.functions.Function1<? super androidx.compose.ui.text.TextLayoutResult,kotlin.Unit> onTextLayout, optional androidx.compose.ui.text.TextStyle style);
+ method public static androidx.compose.runtime.ProvidableCompositionLocal<androidx.compose.ui.text.TextStyle> getLocalTextStyle();
+ property public static final androidx.compose.runtime.ProvidableCompositionLocal<androidx.compose.ui.text.TextStyle> LocalTextStyle;
+ }
+
+ public final class TouchTargetKt {
+ }
+
+ @androidx.compose.runtime.Immutable public final class Typography {
+ ctor public Typography(optional androidx.compose.ui.text.font.FontFamily defaultFontFamily, optional androidx.compose.ui.text.TextStyle h1, optional androidx.compose.ui.text.TextStyle h2, optional androidx.compose.ui.text.TextStyle h3, optional androidx.compose.ui.text.TextStyle h4, optional androidx.compose.ui.text.TextStyle h5, optional androidx.compose.ui.text.TextStyle h6, optional androidx.compose.ui.text.TextStyle subtitle1, optional androidx.compose.ui.text.TextStyle subtitle2, optional androidx.compose.ui.text.TextStyle body1, optional androidx.compose.ui.text.TextStyle body2, optional androidx.compose.ui.text.TextStyle button, optional androidx.compose.ui.text.TextStyle caption, optional androidx.compose.ui.text.TextStyle overline);
+ method public androidx.compose.material.Typography copy(optional androidx.compose.ui.text.TextStyle h1, optional androidx.compose.ui.text.TextStyle h2, optional androidx.compose.ui.text.TextStyle h3, optional androidx.compose.ui.text.TextStyle h4, optional androidx.compose.ui.text.TextStyle h5, optional androidx.compose.ui.text.TextStyle h6, optional androidx.compose.ui.text.TextStyle subtitle1, optional androidx.compose.ui.text.TextStyle subtitle2, optional androidx.compose.ui.text.TextStyle body1, optional androidx.compose.ui.text.TextStyle body2, optional androidx.compose.ui.text.TextStyle button, optional androidx.compose.ui.text.TextStyle caption, optional androidx.compose.ui.text.TextStyle overline);
+ method public androidx.compose.ui.text.TextStyle getBody1();
+ method public androidx.compose.ui.text.TextStyle getBody2();
+ method public androidx.compose.ui.text.TextStyle getButton();
+ method public androidx.compose.ui.text.TextStyle getCaption();
+ method public androidx.compose.ui.text.TextStyle getH1();
+ method public androidx.compose.ui.text.TextStyle getH2();
+ method public androidx.compose.ui.text.TextStyle getH3();
+ method public androidx.compose.ui.text.TextStyle getH4();
+ method public androidx.compose.ui.text.TextStyle getH5();
+ method public androidx.compose.ui.text.TextStyle getH6();
+ method public androidx.compose.ui.text.TextStyle getOverline();
+ method public androidx.compose.ui.text.TextStyle getSubtitle1();
+ method public androidx.compose.ui.text.TextStyle getSubtitle2();
+ property public final androidx.compose.ui.text.TextStyle body1;
+ property public final androidx.compose.ui.text.TextStyle body2;
+ property public final androidx.compose.ui.text.TextStyle button;
+ property public final androidx.compose.ui.text.TextStyle caption;
+ property public final androidx.compose.ui.text.TextStyle h1;
+ property public final androidx.compose.ui.text.TextStyle h2;
+ property public final androidx.compose.ui.text.TextStyle h3;
+ property public final androidx.compose.ui.text.TextStyle h4;
+ property public final androidx.compose.ui.text.TextStyle h5;
+ property public final androidx.compose.ui.text.TextStyle h6;
+ property public final androidx.compose.ui.text.TextStyle overline;
+ property public final androidx.compose.ui.text.TextStyle subtitle1;
+ property public final androidx.compose.ui.text.TextStyle subtitle2;
+ }
+
+ public final class TypographyKt {
+ }
+
+}
+
+package androidx.compose.material.internal {
+
+ public final class ExposedDropdownMenuPopupKt {
+ }
+
+}
+
diff --git a/compose/material/material/api/public_plus_experimental_1.2.0-beta02.txt b/compose/material/material/api/public_plus_experimental_1.2.0-beta02.txt
new file mode 100644
index 0000000..b10467c
--- /dev/null
+++ b/compose/material/material/api/public_plus_experimental_1.2.0-beta02.txt
@@ -0,0 +1,927 @@
+// Signature format: 4.0
+package androidx.compose.material {
+
+ public final class AlertDialogKt {
+ }
+
+ public final class AndroidAlertDialog_androidKt {
+ method @androidx.compose.runtime.Composable public static void AlertDialog(kotlin.jvm.functions.Function0<kotlin.Unit> onDismissRequest, kotlin.jvm.functions.Function0<kotlin.Unit> confirmButton, optional androidx.compose.ui.Modifier modifier, optional kotlin.jvm.functions.Function0<kotlin.Unit>? dismissButton, optional kotlin.jvm.functions.Function0<kotlin.Unit>? title, optional kotlin.jvm.functions.Function0<kotlin.Unit>? text, optional androidx.compose.ui.graphics.Shape shape, optional long backgroundColor, optional long contentColor, optional androidx.compose.ui.window.DialogProperties properties);
+ method @androidx.compose.runtime.Composable public static void AlertDialog(kotlin.jvm.functions.Function0<kotlin.Unit> onDismissRequest, kotlin.jvm.functions.Function0<kotlin.Unit> buttons, optional androidx.compose.ui.Modifier modifier, optional kotlin.jvm.functions.Function0<kotlin.Unit>? title, optional kotlin.jvm.functions.Function0<kotlin.Unit>? text, optional androidx.compose.ui.graphics.Shape shape, optional long backgroundColor, optional long contentColor, optional androidx.compose.ui.window.DialogProperties properties);
+ }
+
+ public final class AndroidMenu_androidKt {
+ method @androidx.compose.runtime.Composable public static void DropdownMenu(boolean expanded, kotlin.jvm.functions.Function0<kotlin.Unit> onDismissRequest, optional androidx.compose.ui.Modifier modifier, optional long offset, optional androidx.compose.ui.window.PopupProperties properties, kotlin.jvm.functions.Function1<? super androidx.compose.foundation.layout.ColumnScope,kotlin.Unit> content);
+ method @androidx.compose.runtime.Composable public static void DropdownMenuItem(kotlin.jvm.functions.Function0<kotlin.Unit> onClick, optional androidx.compose.ui.Modifier modifier, optional boolean enabled, optional androidx.compose.foundation.layout.PaddingValues contentPadding, optional androidx.compose.foundation.interaction.MutableInteractionSource interactionSource, kotlin.jvm.functions.Function1<? super androidx.compose.foundation.layout.RowScope,kotlin.Unit> content);
+ }
+
+ public final class AppBarDefaults {
+ method public float getBottomAppBarElevation();
+ method public androidx.compose.foundation.layout.PaddingValues getContentPadding();
+ method public float getTopAppBarElevation();
+ property public final float BottomAppBarElevation;
+ property public final androidx.compose.foundation.layout.PaddingValues ContentPadding;
+ property public final float TopAppBarElevation;
+ field public static final androidx.compose.material.AppBarDefaults INSTANCE;
+ }
+
+ public final class AppBarKt {
+ method @androidx.compose.runtime.Composable public static void BottomAppBar(optional androidx.compose.ui.Modifier modifier, optional long backgroundColor, optional long contentColor, optional androidx.compose.ui.graphics.Shape? cutoutShape, optional float elevation, optional androidx.compose.foundation.layout.PaddingValues contentPadding, kotlin.jvm.functions.Function1<? super androidx.compose.foundation.layout.RowScope,kotlin.Unit> content);
+ method @androidx.compose.runtime.Composable public static void TopAppBar(kotlin.jvm.functions.Function0<kotlin.Unit> title, optional androidx.compose.ui.Modifier modifier, optional kotlin.jvm.functions.Function0<kotlin.Unit>? navigationIcon, optional kotlin.jvm.functions.Function1<? super androidx.compose.foundation.layout.RowScope,kotlin.Unit> actions, optional long backgroundColor, optional long contentColor, optional float elevation);
+ method @androidx.compose.runtime.Composable public static void TopAppBar(optional androidx.compose.ui.Modifier modifier, optional long backgroundColor, optional long contentColor, optional float elevation, optional androidx.compose.foundation.layout.PaddingValues contentPadding, kotlin.jvm.functions.Function1<? super androidx.compose.foundation.layout.RowScope,kotlin.Unit> content);
+ }
+
+ public final class BackdropScaffoldDefaults {
+ method public float getFrontLayerElevation();
+ method @androidx.compose.runtime.Composable public long getFrontLayerScrimColor();
+ method @androidx.compose.runtime.Composable public androidx.compose.ui.graphics.Shape getFrontLayerShape();
+ method public float getHeaderHeight();
+ method public float getPeekHeight();
+ property public final float FrontLayerElevation;
+ property public final float HeaderHeight;
+ property public final float PeekHeight;
+ property @androidx.compose.runtime.Composable public final long frontLayerScrimColor;
+ property @androidx.compose.runtime.Composable public final androidx.compose.ui.graphics.Shape frontLayerShape;
+ field public static final androidx.compose.material.BackdropScaffoldDefaults INSTANCE;
+ }
+
+ public final class BackdropScaffoldKt {
+ method @androidx.compose.material.ExperimentalMaterialApi @androidx.compose.runtime.Composable public static void BackdropScaffold(kotlin.jvm.functions.Function0<kotlin.Unit> appBar, kotlin.jvm.functions.Function0<kotlin.Unit> backLayerContent, kotlin.jvm.functions.Function0<kotlin.Unit> frontLayerContent, optional androidx.compose.ui.Modifier modifier, optional androidx.compose.material.BackdropScaffoldState scaffoldState, optional boolean gesturesEnabled, optional float peekHeight, optional float headerHeight, optional boolean persistentAppBar, optional boolean stickyFrontLayer, optional long backLayerBackgroundColor, optional long backLayerContentColor, optional androidx.compose.ui.graphics.Shape frontLayerShape, optional float frontLayerElevation, optional long frontLayerBackgroundColor, optional long frontLayerContentColor, optional long frontLayerScrimColor, optional kotlin.jvm.functions.Function1<? super androidx.compose.material.SnackbarHostState,kotlin.Unit> snackbarHost);
+ method @androidx.compose.material.ExperimentalMaterialApi @androidx.compose.runtime.Composable public static androidx.compose.material.BackdropScaffoldState rememberBackdropScaffoldState(androidx.compose.material.BackdropValue initialValue, optional androidx.compose.animation.core.AnimationSpec<java.lang.Float> animationSpec, optional kotlin.jvm.functions.Function1<? super androidx.compose.material.BackdropValue,java.lang.Boolean> confirmStateChange, optional androidx.compose.material.SnackbarHostState snackbarHostState);
+ }
+
+ @androidx.compose.material.ExperimentalMaterialApi @androidx.compose.runtime.Stable public final class BackdropScaffoldState extends androidx.compose.material.SwipeableState<androidx.compose.material.BackdropValue> {
+ ctor public BackdropScaffoldState(androidx.compose.material.BackdropValue initialValue, optional androidx.compose.animation.core.AnimationSpec<java.lang.Float> animationSpec, optional kotlin.jvm.functions.Function1<? super androidx.compose.material.BackdropValue,java.lang.Boolean> confirmStateChange, optional androidx.compose.material.SnackbarHostState snackbarHostState);
+ method public suspend Object? conceal(kotlin.coroutines.Continuation<? super kotlin.Unit>);
+ method public androidx.compose.material.SnackbarHostState getSnackbarHostState();
+ method public boolean isConcealed();
+ method public boolean isRevealed();
+ method public suspend Object? reveal(kotlin.coroutines.Continuation<? super kotlin.Unit>);
+ property public final boolean isConcealed;
+ property public final boolean isRevealed;
+ property public final androidx.compose.material.SnackbarHostState snackbarHostState;
+ field public static final androidx.compose.material.BackdropScaffoldState.Companion Companion;
+ }
+
+ public static final class BackdropScaffoldState.Companion {
+ method public androidx.compose.runtime.saveable.Saver<androidx.compose.material.BackdropScaffoldState,?> Saver(androidx.compose.animation.core.AnimationSpec<java.lang.Float> animationSpec, kotlin.jvm.functions.Function1<? super androidx.compose.material.BackdropValue,java.lang.Boolean> confirmStateChange, androidx.compose.material.SnackbarHostState snackbarHostState);
+ }
+
+ @androidx.compose.material.ExperimentalMaterialApi public enum BackdropValue {
+ enum_constant public static final androidx.compose.material.BackdropValue Concealed;
+ enum_constant public static final androidx.compose.material.BackdropValue Revealed;
+ }
+
+ public final class BadgeKt {
+ method @androidx.compose.runtime.Composable public static void Badge(optional androidx.compose.ui.Modifier modifier, optional long backgroundColor, optional long contentColor, optional kotlin.jvm.functions.Function1<? super androidx.compose.foundation.layout.RowScope,kotlin.Unit>? content);
+ method @androidx.compose.runtime.Composable public static void BadgedBox(kotlin.jvm.functions.Function1<? super androidx.compose.foundation.layout.BoxScope,kotlin.Unit> badge, optional androidx.compose.ui.Modifier modifier, kotlin.jvm.functions.Function1<? super androidx.compose.foundation.layout.BoxScope,kotlin.Unit> content);
+ }
+
+ @androidx.compose.material.ExperimentalMaterialApi public final class BottomDrawerState extends androidx.compose.material.SwipeableState<androidx.compose.material.BottomDrawerValue> {
+ ctor public BottomDrawerState(androidx.compose.material.BottomDrawerValue initialValue, optional kotlin.jvm.functions.Function1<? super androidx.compose.material.BottomDrawerValue,java.lang.Boolean> confirmStateChange);
+ method public suspend Object? close(kotlin.coroutines.Continuation<? super kotlin.Unit>);
+ method public suspend Object? expand(kotlin.coroutines.Continuation<? super kotlin.Unit>);
+ method public boolean isClosed();
+ method public boolean isExpanded();
+ method public boolean isOpen();
+ method public suspend Object? open(kotlin.coroutines.Continuation<? super kotlin.Unit>);
+ property public final boolean isClosed;
+ property public final boolean isExpanded;
+ property public final boolean isOpen;
+ field public static final androidx.compose.material.BottomDrawerState.Companion Companion;
+ }
+
+ public static final class BottomDrawerState.Companion {
+ method public androidx.compose.runtime.saveable.Saver<androidx.compose.material.BottomDrawerState,androidx.compose.material.BottomDrawerValue> Saver(kotlin.jvm.functions.Function1<? super androidx.compose.material.BottomDrawerValue,java.lang.Boolean> confirmStateChange);
+ }
+
+ @androidx.compose.material.ExperimentalMaterialApi public enum BottomDrawerValue {
+ enum_constant public static final androidx.compose.material.BottomDrawerValue Closed;
+ enum_constant public static final androidx.compose.material.BottomDrawerValue Expanded;
+ enum_constant public static final androidx.compose.material.BottomDrawerValue Open;
+ }
+
+ public final class BottomNavigationDefaults {
+ method public float getElevation();
+ property public final float Elevation;
+ field public static final androidx.compose.material.BottomNavigationDefaults INSTANCE;
+ }
+
+ public final class BottomNavigationKt {
+ method @androidx.compose.runtime.Composable public static void BottomNavigation(optional androidx.compose.ui.Modifier modifier, optional long backgroundColor, optional long contentColor, optional float elevation, kotlin.jvm.functions.Function1<? super androidx.compose.foundation.layout.RowScope,kotlin.Unit> content);
+ method @androidx.compose.runtime.Composable public static void BottomNavigationItem(androidx.compose.foundation.layout.RowScope, boolean selected, kotlin.jvm.functions.Function0<kotlin.Unit> onClick, kotlin.jvm.functions.Function0<kotlin.Unit> icon, optional androidx.compose.ui.Modifier modifier, optional boolean enabled, optional kotlin.jvm.functions.Function0<kotlin.Unit>? label, optional boolean alwaysShowLabel, optional androidx.compose.foundation.interaction.MutableInteractionSource interactionSource, optional long selectedContentColor, optional long unselectedContentColor);
+ }
+
+ public final class BottomSheetScaffoldDefaults {
+ method public float getSheetElevation();
+ method public float getSheetPeekHeight();
+ property public final float SheetElevation;
+ property public final float SheetPeekHeight;
+ field public static final androidx.compose.material.BottomSheetScaffoldDefaults INSTANCE;
+ }
+
+ public final class BottomSheetScaffoldKt {
+ method @androidx.compose.material.ExperimentalMaterialApi @androidx.compose.runtime.Composable public static void BottomSheetScaffold(kotlin.jvm.functions.Function1<? super androidx.compose.foundation.layout.ColumnScope,kotlin.Unit> sheetContent, optional androidx.compose.ui.Modifier modifier, optional androidx.compose.material.BottomSheetScaffoldState scaffoldState, optional kotlin.jvm.functions.Function0<kotlin.Unit>? topBar, optional kotlin.jvm.functions.Function1<? super androidx.compose.material.SnackbarHostState,kotlin.Unit> snackbarHost, optional kotlin.jvm.functions.Function0<kotlin.Unit>? floatingActionButton, optional int floatingActionButtonPosition, optional boolean sheetGesturesEnabled, optional androidx.compose.ui.graphics.Shape sheetShape, optional float sheetElevation, optional long sheetBackgroundColor, optional long sheetContentColor, optional float sheetPeekHeight, optional kotlin.jvm.functions.Function1<? super androidx.compose.foundation.layout.ColumnScope,kotlin.Unit>? drawerContent, optional boolean drawerGesturesEnabled, optional androidx.compose.ui.graphics.Shape drawerShape, optional float drawerElevation, optional long drawerBackgroundColor, optional long drawerContentColor, optional long drawerScrimColor, optional long backgroundColor, optional long contentColor, kotlin.jvm.functions.Function1<? super androidx.compose.foundation.layout.PaddingValues,kotlin.Unit> content);
+ method @androidx.compose.material.ExperimentalMaterialApi @androidx.compose.runtime.Composable public static androidx.compose.material.BottomSheetScaffoldState rememberBottomSheetScaffoldState(optional androidx.compose.material.DrawerState drawerState, optional androidx.compose.material.BottomSheetState bottomSheetState, optional androidx.compose.material.SnackbarHostState snackbarHostState);
+ method @androidx.compose.material.ExperimentalMaterialApi @androidx.compose.runtime.Composable public static androidx.compose.material.BottomSheetState rememberBottomSheetState(androidx.compose.material.BottomSheetValue initialValue, optional androidx.compose.animation.core.AnimationSpec<java.lang.Float> animationSpec, optional kotlin.jvm.functions.Function1<? super androidx.compose.material.BottomSheetValue,java.lang.Boolean> confirmStateChange);
+ }
+
+ @androidx.compose.material.ExperimentalMaterialApi @androidx.compose.runtime.Stable public final class BottomSheetScaffoldState {
+ ctor public BottomSheetScaffoldState(androidx.compose.material.DrawerState drawerState, androidx.compose.material.BottomSheetState bottomSheetState, androidx.compose.material.SnackbarHostState snackbarHostState);
+ method public androidx.compose.material.BottomSheetState getBottomSheetState();
+ method public androidx.compose.material.DrawerState getDrawerState();
+ method public androidx.compose.material.SnackbarHostState getSnackbarHostState();
+ property public final androidx.compose.material.BottomSheetState bottomSheetState;
+ property public final androidx.compose.material.DrawerState drawerState;
+ property public final androidx.compose.material.SnackbarHostState snackbarHostState;
+ }
+
+ @androidx.compose.material.ExperimentalMaterialApi @androidx.compose.runtime.Stable public final class BottomSheetState extends androidx.compose.material.SwipeableState<androidx.compose.material.BottomSheetValue> {
+ ctor public BottomSheetState(androidx.compose.material.BottomSheetValue initialValue, optional androidx.compose.animation.core.AnimationSpec<java.lang.Float> animationSpec, optional kotlin.jvm.functions.Function1<? super androidx.compose.material.BottomSheetValue,java.lang.Boolean> confirmStateChange);
+ method public suspend Object? collapse(kotlin.coroutines.Continuation<? super kotlin.Unit>);
+ method public suspend Object? expand(kotlin.coroutines.Continuation<? super kotlin.Unit>);
+ method public boolean isCollapsed();
+ method public boolean isExpanded();
+ property public final boolean isCollapsed;
+ property public final boolean isExpanded;
+ field public static final androidx.compose.material.BottomSheetState.Companion Companion;
+ }
+
+ public static final class BottomSheetState.Companion {
+ method public androidx.compose.runtime.saveable.Saver<androidx.compose.material.BottomSheetState,?> Saver(androidx.compose.animation.core.AnimationSpec<java.lang.Float> animationSpec, kotlin.jvm.functions.Function1<? super androidx.compose.material.BottomSheetValue,java.lang.Boolean> confirmStateChange);
+ }
+
+ @androidx.compose.material.ExperimentalMaterialApi public enum BottomSheetValue {
+ enum_constant public static final androidx.compose.material.BottomSheetValue Collapsed;
+ enum_constant public static final androidx.compose.material.BottomSheetValue Expanded;
+ }
+
+ @androidx.compose.runtime.Stable public interface ButtonColors {
+ method @androidx.compose.runtime.Composable public androidx.compose.runtime.State<androidx.compose.ui.graphics.Color> backgroundColor(boolean enabled);
+ method @androidx.compose.runtime.Composable public androidx.compose.runtime.State<androidx.compose.ui.graphics.Color> contentColor(boolean enabled);
+ }
+
+ public final class ButtonDefaults {
+ method @androidx.compose.runtime.Composable public androidx.compose.material.ButtonColors buttonColors(optional long backgroundColor, optional long contentColor, optional long disabledBackgroundColor, optional long disabledContentColor);
+ method @androidx.compose.runtime.Composable public androidx.compose.material.ButtonElevation elevation(optional float defaultElevation, optional float pressedElevation, optional float disabledElevation, optional float hoveredElevation, optional float focusedElevation);
+ method @Deprecated @androidx.compose.runtime.Composable public androidx.compose.material.ButtonElevation! elevation(optional float defaultElevation, optional float pressedElevation, optional float disabledElevation);
+ method public androidx.compose.foundation.layout.PaddingValues getContentPadding();
+ method public float getIconSize();
+ method public float getIconSpacing();
+ method public float getMinHeight();
+ method public float getMinWidth();
+ method @androidx.compose.runtime.Composable public androidx.compose.foundation.BorderStroke getOutlinedBorder();
+ method public float getOutlinedBorderSize();
+ method public androidx.compose.foundation.layout.PaddingValues getTextButtonContentPadding();
+ method @androidx.compose.runtime.Composable public androidx.compose.material.ButtonColors outlinedButtonColors(optional long backgroundColor, optional long contentColor, optional long disabledContentColor);
+ method @androidx.compose.runtime.Composable public androidx.compose.material.ButtonColors textButtonColors(optional long backgroundColor, optional long contentColor, optional long disabledContentColor);
+ property public final androidx.compose.foundation.layout.PaddingValues ContentPadding;
+ property public final float IconSize;
+ property public final float IconSpacing;
+ property public final float MinHeight;
+ property public final float MinWidth;
+ property public final float OutlinedBorderSize;
+ property public final androidx.compose.foundation.layout.PaddingValues TextButtonContentPadding;
+ property @androidx.compose.runtime.Composable public final androidx.compose.foundation.BorderStroke outlinedBorder;
+ field public static final androidx.compose.material.ButtonDefaults INSTANCE;
+ field public static final float OutlinedBorderOpacity = 0.12f;
+ }
+
+ @androidx.compose.runtime.Stable public interface ButtonElevation {
+ method @androidx.compose.runtime.Composable public androidx.compose.runtime.State<androidx.compose.ui.unit.Dp> elevation(boolean enabled, androidx.compose.foundation.interaction.InteractionSource interactionSource);
+ }
+
+ public final class ButtonKt {
+ method @androidx.compose.runtime.Composable public static void Button(kotlin.jvm.functions.Function0<kotlin.Unit> onClick, optional androidx.compose.ui.Modifier modifier, optional boolean enabled, optional androidx.compose.foundation.interaction.MutableInteractionSource interactionSource, optional androidx.compose.material.ButtonElevation? elevation, optional androidx.compose.ui.graphics.Shape shape, optional androidx.compose.foundation.BorderStroke? border, optional androidx.compose.material.ButtonColors colors, optional androidx.compose.foundation.layout.PaddingValues contentPadding, kotlin.jvm.functions.Function1<? super androidx.compose.foundation.layout.RowScope,kotlin.Unit> content);
+ method @androidx.compose.runtime.Composable @androidx.compose.runtime.NonRestartableComposable public static void OutlinedButton(kotlin.jvm.functions.Function0<kotlin.Unit> onClick, optional androidx.compose.ui.Modifier modifier, optional boolean enabled, optional androidx.compose.foundation.interaction.MutableInteractionSource interactionSource, optional androidx.compose.material.ButtonElevation? elevation, optional androidx.compose.ui.graphics.Shape shape, optional androidx.compose.foundation.BorderStroke? border, optional androidx.compose.material.ButtonColors colors, optional androidx.compose.foundation.layout.PaddingValues contentPadding, kotlin.jvm.functions.Function1<? super androidx.compose.foundation.layout.RowScope,kotlin.Unit> content);
+ method @androidx.compose.runtime.Composable @androidx.compose.runtime.NonRestartableComposable public static void TextButton(kotlin.jvm.functions.Function0<kotlin.Unit> onClick, optional androidx.compose.ui.Modifier modifier, optional boolean enabled, optional androidx.compose.foundation.interaction.MutableInteractionSource interactionSource, optional androidx.compose.material.ButtonElevation? elevation, optional androidx.compose.ui.graphics.Shape shape, optional androidx.compose.foundation.BorderStroke? border, optional androidx.compose.material.ButtonColors colors, optional androidx.compose.foundation.layout.PaddingValues contentPadding, kotlin.jvm.functions.Function1<? super androidx.compose.foundation.layout.RowScope,kotlin.Unit> content);
+ }
+
+ public final class CardKt {
+ method @androidx.compose.runtime.Composable @androidx.compose.runtime.NonRestartableComposable public static void Card(optional androidx.compose.ui.Modifier modifier, optional androidx.compose.ui.graphics.Shape shape, optional long backgroundColor, optional long contentColor, optional androidx.compose.foundation.BorderStroke? border, optional float elevation, kotlin.jvm.functions.Function0<kotlin.Unit> content);
+ method @androidx.compose.material.ExperimentalMaterialApi @androidx.compose.runtime.Composable @androidx.compose.runtime.NonRestartableComposable public static void Card(kotlin.jvm.functions.Function0<kotlin.Unit> onClick, optional androidx.compose.ui.Modifier modifier, optional boolean enabled, optional androidx.compose.ui.graphics.Shape shape, optional long backgroundColor, optional long contentColor, optional androidx.compose.foundation.BorderStroke? border, optional float elevation, optional androidx.compose.foundation.interaction.MutableInteractionSource interactionSource, kotlin.jvm.functions.Function0<kotlin.Unit> content);
+ method @Deprecated @androidx.compose.material.ExperimentalMaterialApi @androidx.compose.runtime.Composable @androidx.compose.runtime.NonRestartableComposable public static void Card(kotlin.jvm.functions.Function0<kotlin.Unit> onClick, optional androidx.compose.ui.Modifier modifier, optional androidx.compose.ui.graphics.Shape shape, optional long backgroundColor, optional long contentColor, optional androidx.compose.foundation.BorderStroke? border, optional float elevation, optional androidx.compose.foundation.interaction.MutableInteractionSource interactionSource, optional androidx.compose.foundation.Indication? indication, optional boolean enabled, optional String? onClickLabel, optional androidx.compose.ui.semantics.Role? role, kotlin.jvm.functions.Function0<kotlin.Unit> content);
+ }
+
+ @androidx.compose.runtime.Stable public interface CheckboxColors {
+ method @androidx.compose.runtime.Composable public androidx.compose.runtime.State<androidx.compose.ui.graphics.Color> borderColor(boolean enabled, androidx.compose.ui.state.ToggleableState state);
+ method @androidx.compose.runtime.Composable public androidx.compose.runtime.State<androidx.compose.ui.graphics.Color> boxColor(boolean enabled, androidx.compose.ui.state.ToggleableState state);
+ method @androidx.compose.runtime.Composable public androidx.compose.runtime.State<androidx.compose.ui.graphics.Color> checkmarkColor(androidx.compose.ui.state.ToggleableState state);
+ }
+
+ public final class CheckboxDefaults {
+ method @androidx.compose.runtime.Composable public androidx.compose.material.CheckboxColors colors(optional long checkedColor, optional long uncheckedColor, optional long checkmarkColor, optional long disabledColor, optional long disabledIndeterminateColor);
+ field public static final androidx.compose.material.CheckboxDefaults INSTANCE;
+ }
+
+ public final class CheckboxKt {
+ method @androidx.compose.runtime.Composable public static void Checkbox(boolean checked, kotlin.jvm.functions.Function1<? super java.lang.Boolean,kotlin.Unit>? onCheckedChange, optional androidx.compose.ui.Modifier modifier, optional boolean enabled, optional androidx.compose.foundation.interaction.MutableInteractionSource interactionSource, optional androidx.compose.material.CheckboxColors colors);
+ method @androidx.compose.runtime.Composable public static void TriStateCheckbox(androidx.compose.ui.state.ToggleableState state, kotlin.jvm.functions.Function0<kotlin.Unit>? onClick, optional androidx.compose.ui.Modifier modifier, optional boolean enabled, optional androidx.compose.foundation.interaction.MutableInteractionSource interactionSource, optional androidx.compose.material.CheckboxColors colors);
+ }
+
+ @androidx.compose.material.ExperimentalMaterialApi @androidx.compose.runtime.Stable public interface ChipColors {
+ method @androidx.compose.runtime.Composable public androidx.compose.runtime.State<androidx.compose.ui.graphics.Color> backgroundColor(boolean enabled);
+ method @androidx.compose.runtime.Composable public androidx.compose.runtime.State<androidx.compose.ui.graphics.Color> contentColor(boolean enabled);
+ method @androidx.compose.runtime.Composable public androidx.compose.runtime.State<androidx.compose.ui.graphics.Color> leadingIconContentColor(boolean enabled);
+ }
+
+ @androidx.compose.material.ExperimentalMaterialApi public final class ChipDefaults {
+ method @androidx.compose.runtime.Composable public androidx.compose.material.ChipColors chipColors(optional long backgroundColor, optional long contentColor, optional long leadingIconContentColor, optional long disabledBackgroundColor, optional long disabledContentColor, optional long disabledLeadingIconContentColor);
+ method @androidx.compose.runtime.Composable public androidx.compose.material.SelectableChipColors filterChipColors(optional long backgroundColor, optional long contentColor, optional long leadingIconColor, optional long disabledBackgroundColor, optional long disabledContentColor, optional long disabledLeadingIconColor, optional long selectedBackgroundColor, optional long selectedContentColor, optional long selectedLeadingIconColor);
+ method public float getLeadingIconSize();
+ method public float getMinHeight();
+ method @androidx.compose.runtime.Composable public androidx.compose.foundation.BorderStroke getOutlinedBorder();
+ method public float getOutlinedBorderSize();
+ method public float getSelectedIconSize();
+ method @androidx.compose.runtime.Composable public androidx.compose.material.ChipColors outlinedChipColors(optional long backgroundColor, optional long contentColor, optional long leadingIconContentColor, optional long disabledBackgroundColor, optional long disabledContentColor, optional long disabledLeadingIconContentColor);
+ method @androidx.compose.runtime.Composable public androidx.compose.material.SelectableChipColors outlinedFilterChipColors(optional long backgroundColor, optional long contentColor, optional long leadingIconColor, optional long disabledBackgroundColor, optional long disabledContentColor, optional long disabledLeadingIconColor, optional long selectedBackgroundColor, optional long selectedContentColor, optional long selectedLeadingIconColor);
+ property public final float LeadingIconSize;
+ property public final float MinHeight;
+ property public final float OutlinedBorderSize;
+ property public final float SelectedIconSize;
+ property @androidx.compose.runtime.Composable public final androidx.compose.foundation.BorderStroke outlinedBorder;
+ field public static final float ContentOpacity = 0.87f;
+ field public static final androidx.compose.material.ChipDefaults INSTANCE;
+ field public static final float LeadingIconOpacity = 0.54f;
+ field public static final float OutlinedBorderOpacity = 0.12f;
+ }
+
+ public final class ChipKt {
+ method @androidx.compose.material.ExperimentalMaterialApi @androidx.compose.runtime.Composable public static void Chip(kotlin.jvm.functions.Function0<kotlin.Unit> onClick, optional androidx.compose.ui.Modifier modifier, optional boolean enabled, optional androidx.compose.foundation.interaction.MutableInteractionSource interactionSource, optional androidx.compose.ui.graphics.Shape shape, optional androidx.compose.foundation.BorderStroke? border, optional androidx.compose.material.ChipColors colors, optional kotlin.jvm.functions.Function0<kotlin.Unit>? leadingIcon, kotlin.jvm.functions.Function1<? super androidx.compose.foundation.layout.RowScope,kotlin.Unit> content);
+ method @androidx.compose.material.ExperimentalMaterialApi @androidx.compose.runtime.Composable public static void FilterChip(boolean selected, kotlin.jvm.functions.Function0<kotlin.Unit> onClick, optional androidx.compose.ui.Modifier modifier, optional boolean enabled, optional androidx.compose.foundation.interaction.MutableInteractionSource interactionSource, optional androidx.compose.ui.graphics.Shape shape, optional androidx.compose.foundation.BorderStroke? border, optional androidx.compose.material.SelectableChipColors colors, optional kotlin.jvm.functions.Function0<kotlin.Unit>? leadingIcon, optional kotlin.jvm.functions.Function0<kotlin.Unit>? selectedIcon, optional kotlin.jvm.functions.Function0<kotlin.Unit>? trailingIcon, kotlin.jvm.functions.Function1<? super androidx.compose.foundation.layout.RowScope,kotlin.Unit> content);
+ }
+
+ @androidx.compose.runtime.Stable public final class Colors {
+ ctor public Colors(long primary, long primaryVariant, long secondary, long secondaryVariant, long background, long surface, long error, long onPrimary, long onSecondary, long onBackground, long onSurface, long onError, boolean isLight);
+ method public androidx.compose.material.Colors copy(optional long primary, optional long primaryVariant, optional long secondary, optional long secondaryVariant, optional long background, optional long surface, optional long error, optional long onPrimary, optional long onSecondary, optional long onBackground, optional long onSurface, optional long onError, optional boolean isLight);
+ method public long getBackground();
+ 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 final long background;
+ property public final long error;
+ property public final boolean isLight;
+ property public final long onBackground;
+ property public final long onError;
+ property public final long onPrimary;
+ property public final long onSecondary;
+ property public final long onSurface;
+ property public final long primary;
+ property public final long primaryVariant;
+ property public final long secondary;
+ property public final long secondaryVariant;
+ property public final long surface;
+ }
+
+ public final class ColorsKt {
+ method public static long contentColorFor(androidx.compose.material.Colors, long backgroundColor);
+ method @androidx.compose.runtime.Composable @androidx.compose.runtime.ReadOnlyComposable public static long contentColorFor(long backgroundColor);
+ method public static androidx.compose.material.Colors darkColors(optional long primary, optional long primaryVariant, optional long secondary, optional long secondaryVariant, optional long background, optional long surface, optional long error, optional long onPrimary, optional long onSecondary, optional long onBackground, optional long onSurface, optional long onError);
+ method public static long getPrimarySurface(androidx.compose.material.Colors);
+ method public static androidx.compose.material.Colors lightColors(optional long primary, optional long primaryVariant, optional long secondary, optional long secondaryVariant, optional long background, optional long surface, optional long error, optional long onPrimary, optional long onSecondary, optional long onBackground, optional long onSurface, optional long onError);
+ }
+
+ public final class ContentAlpha {
+ method @androidx.compose.runtime.Composable public float getDisabled();
+ method @androidx.compose.runtime.Composable public float getHigh();
+ method @androidx.compose.runtime.Composable public float getMedium();
+ property @androidx.compose.runtime.Composable public final float disabled;
+ property @androidx.compose.runtime.Composable public final float high;
+ property @androidx.compose.runtime.Composable public final float medium;
+ field public static final androidx.compose.material.ContentAlpha INSTANCE;
+ }
+
+ public final class ContentAlphaKt {
+ method public static androidx.compose.runtime.ProvidableCompositionLocal<java.lang.Float> getLocalContentAlpha();
+ property public static final androidx.compose.runtime.ProvidableCompositionLocal<java.lang.Float> LocalContentAlpha;
+ }
+
+ public final class ContentColorKt {
+ method public static androidx.compose.runtime.ProvidableCompositionLocal<androidx.compose.ui.graphics.Color> getLocalContentColor();
+ property public static final androidx.compose.runtime.ProvidableCompositionLocal<androidx.compose.ui.graphics.Color> LocalContentColor;
+ }
+
+ public enum DismissDirection {
+ enum_constant public static final androidx.compose.material.DismissDirection EndToStart;
+ enum_constant public static final androidx.compose.material.DismissDirection StartToEnd;
+ }
+
+ @androidx.compose.material.ExperimentalMaterialApi public final class DismissState extends androidx.compose.material.SwipeableState<androidx.compose.material.DismissValue> {
+ ctor public DismissState(androidx.compose.material.DismissValue initialValue, optional kotlin.jvm.functions.Function1<? super androidx.compose.material.DismissValue,java.lang.Boolean> confirmStateChange);
+ method public suspend Object? dismiss(androidx.compose.material.DismissDirection direction, kotlin.coroutines.Continuation<? super kotlin.Unit>);
+ method public androidx.compose.material.DismissDirection? getDismissDirection();
+ method public boolean isDismissed(androidx.compose.material.DismissDirection direction);
+ method public suspend Object? reset(kotlin.coroutines.Continuation<? super kotlin.Unit>);
+ property public final androidx.compose.material.DismissDirection? dismissDirection;
+ field public static final androidx.compose.material.DismissState.Companion Companion;
+ }
+
+ public static final class DismissState.Companion {
+ method public androidx.compose.runtime.saveable.Saver<androidx.compose.material.DismissState,androidx.compose.material.DismissValue> Saver(kotlin.jvm.functions.Function1<? super androidx.compose.material.DismissValue,java.lang.Boolean> confirmStateChange);
+ }
+
+ public enum DismissValue {
+ enum_constant public static final androidx.compose.material.DismissValue Default;
+ enum_constant public static final androidx.compose.material.DismissValue DismissedToEnd;
+ enum_constant public static final androidx.compose.material.DismissValue DismissedToStart;
+ }
+
+ public final class DividerKt {
+ method @androidx.compose.runtime.Composable public static void Divider(optional androidx.compose.ui.Modifier modifier, optional long color, optional float thickness, optional float startIndent);
+ }
+
+ public final class DragGestureDetectorCopyKt {
+ }
+
+ public final class DrawerDefaults {
+ method public float getElevation();
+ method @androidx.compose.runtime.Composable public long getScrimColor();
+ property public final float Elevation;
+ property @androidx.compose.runtime.Composable public final long scrimColor;
+ field public static final androidx.compose.material.DrawerDefaults INSTANCE;
+ field public static final float ScrimOpacity = 0.32f;
+ }
+
+ public final class DrawerKt {
+ method @androidx.compose.material.ExperimentalMaterialApi @androidx.compose.runtime.Composable public static void BottomDrawer(kotlin.jvm.functions.Function1<? super androidx.compose.foundation.layout.ColumnScope,kotlin.Unit> drawerContent, optional androidx.compose.ui.Modifier modifier, optional androidx.compose.material.BottomDrawerState drawerState, optional boolean gesturesEnabled, optional androidx.compose.ui.graphics.Shape drawerShape, optional float drawerElevation, optional long drawerBackgroundColor, optional long drawerContentColor, optional long scrimColor, kotlin.jvm.functions.Function0<kotlin.Unit> content);
+ method @androidx.compose.runtime.Composable public static void ModalDrawer(kotlin.jvm.functions.Function1<? super androidx.compose.foundation.layout.ColumnScope,kotlin.Unit> drawerContent, optional androidx.compose.ui.Modifier modifier, optional androidx.compose.material.DrawerState drawerState, optional boolean gesturesEnabled, optional androidx.compose.ui.graphics.Shape drawerShape, optional float drawerElevation, optional long drawerBackgroundColor, optional long drawerContentColor, optional long scrimColor, kotlin.jvm.functions.Function0<kotlin.Unit> content);
+ method @androidx.compose.material.ExperimentalMaterialApi @androidx.compose.runtime.Composable public static androidx.compose.material.BottomDrawerState rememberBottomDrawerState(androidx.compose.material.BottomDrawerValue initialValue, optional kotlin.jvm.functions.Function1<? super androidx.compose.material.BottomDrawerValue,java.lang.Boolean> confirmStateChange);
+ method @androidx.compose.runtime.Composable public static androidx.compose.material.DrawerState rememberDrawerState(androidx.compose.material.DrawerValue initialValue, optional kotlin.jvm.functions.Function1<? super androidx.compose.material.DrawerValue,java.lang.Boolean> confirmStateChange);
+ }
+
+ @androidx.compose.runtime.Stable public final class DrawerState {
+ ctor public DrawerState(androidx.compose.material.DrawerValue initialValue, optional kotlin.jvm.functions.Function1<? super androidx.compose.material.DrawerValue,java.lang.Boolean> confirmStateChange);
+ method @androidx.compose.material.ExperimentalMaterialApi public suspend Object? animateTo(androidx.compose.material.DrawerValue targetValue, androidx.compose.animation.core.AnimationSpec<java.lang.Float> anim, kotlin.coroutines.Continuation<? super kotlin.Unit>);
+ method public suspend Object? close(kotlin.coroutines.Continuation<? super kotlin.Unit>);
+ method public androidx.compose.material.DrawerValue getCurrentValue();
+ method @androidx.compose.material.ExperimentalMaterialApi public androidx.compose.runtime.State<java.lang.Float> getOffset();
+ method @androidx.compose.material.ExperimentalMaterialApi public androidx.compose.material.DrawerValue getTargetValue();
+ method public boolean isAnimationRunning();
+ method public boolean isClosed();
+ method public boolean isOpen();
+ method public suspend Object? open(kotlin.coroutines.Continuation<? super kotlin.Unit>);
+ method @androidx.compose.material.ExperimentalMaterialApi public suspend Object? snapTo(androidx.compose.material.DrawerValue targetValue, kotlin.coroutines.Continuation<? super kotlin.Unit>);
+ property public final androidx.compose.material.DrawerValue currentValue;
+ property public final boolean isAnimationRunning;
+ property public final boolean isClosed;
+ property public final boolean isOpen;
+ property @androidx.compose.material.ExperimentalMaterialApi public final androidx.compose.runtime.State<java.lang.Float> offset;
+ property @androidx.compose.material.ExperimentalMaterialApi public final androidx.compose.material.DrawerValue targetValue;
+ field public static final androidx.compose.material.DrawerState.Companion Companion;
+ }
+
+ public static final class DrawerState.Companion {
+ method public androidx.compose.runtime.saveable.Saver<androidx.compose.material.DrawerState,androidx.compose.material.DrawerValue> Saver(kotlin.jvm.functions.Function1<? super androidx.compose.material.DrawerValue,java.lang.Boolean> confirmStateChange);
+ }
+
+ public enum DrawerValue {
+ enum_constant public static final androidx.compose.material.DrawerValue Closed;
+ enum_constant public static final androidx.compose.material.DrawerValue Open;
+ }
+
+ public final class ElevationKt {
+ }
+
+ public interface ElevationOverlay {
+ method @androidx.compose.runtime.Composable public long apply(long color, float elevation);
+ }
+
+ public final class ElevationOverlayKt {
+ method public static androidx.compose.runtime.ProvidableCompositionLocal<androidx.compose.ui.unit.Dp> getLocalAbsoluteElevation();
+ method public static androidx.compose.runtime.ProvidableCompositionLocal<androidx.compose.material.ElevationOverlay> getLocalElevationOverlay();
+ property public static final androidx.compose.runtime.ProvidableCompositionLocal<androidx.compose.ui.unit.Dp> LocalAbsoluteElevation;
+ property public static final androidx.compose.runtime.ProvidableCompositionLocal<androidx.compose.material.ElevationOverlay> LocalElevationOverlay;
+ }
+
+ @kotlin.RequiresOptIn(message="This material API is experimental and is likely to change or to be removed in" + " the future.") public @interface ExperimentalMaterialApi {
+ }
+
+ @androidx.compose.material.ExperimentalMaterialApi public interface ExposedDropdownMenuBoxScope {
+ method @androidx.compose.runtime.Composable public default void ExposedDropdownMenu(boolean expanded, kotlin.jvm.functions.Function0<kotlin.Unit> onDismissRequest, optional androidx.compose.ui.Modifier modifier, kotlin.jvm.functions.Function1<? super androidx.compose.foundation.layout.ColumnScope,kotlin.Unit> content);
+ method public androidx.compose.ui.Modifier exposedDropdownSize(androidx.compose.ui.Modifier, optional boolean matchTextFieldWidth);
+ }
+
+ @androidx.compose.material.ExperimentalMaterialApi public final class ExposedDropdownMenuDefaults {
+ method @androidx.compose.material.ExperimentalMaterialApi @androidx.compose.runtime.Composable public void TrailingIcon(boolean expanded, optional kotlin.jvm.functions.Function0<kotlin.Unit> onIconClick);
+ method @androidx.compose.runtime.Composable public androidx.compose.material.TextFieldColors outlinedTextFieldColors(optional long textColor, optional long disabledTextColor, optional long backgroundColor, optional long cursorColor, optional long errorCursorColor, optional long focusedBorderColor, optional long unfocusedBorderColor, optional long disabledBorderColor, optional long errorBorderColor, optional long leadingIconColor, optional long disabledLeadingIconColor, optional long errorLeadingIconColor, optional long trailingIconColor, optional long focusedTrailingIconColor, optional long disabledTrailingIconColor, optional long errorTrailingIconColor, optional long focusedLabelColor, optional long unfocusedLabelColor, optional long disabledLabelColor, optional long errorLabelColor, optional long placeholderColor, optional long disabledPlaceholderColor);
+ method @androidx.compose.runtime.Composable public androidx.compose.material.TextFieldColors textFieldColors(optional long textColor, optional long disabledTextColor, optional long backgroundColor, optional long cursorColor, optional long errorCursorColor, optional long focusedIndicatorColor, optional long unfocusedIndicatorColor, optional long disabledIndicatorColor, optional long errorIndicatorColor, optional long leadingIconColor, optional long disabledLeadingIconColor, optional long errorLeadingIconColor, optional long trailingIconColor, optional long focusedTrailingIconColor, optional long disabledTrailingIconColor, optional long errorTrailingIconColor, optional long focusedLabelColor, optional long unfocusedLabelColor, optional long disabledLabelColor, optional long errorLabelColor, optional long placeholderColor, optional long disabledPlaceholderColor);
+ field public static final androidx.compose.material.ExposedDropdownMenuDefaults INSTANCE;
+ }
+
+ public final class ExposedDropdownMenuKt {
+ method @androidx.compose.material.ExperimentalMaterialApi @androidx.compose.runtime.Composable public static void ExposedDropdownMenuBox(boolean expanded, kotlin.jvm.functions.Function1<? super java.lang.Boolean,kotlin.Unit> onExpandedChange, optional androidx.compose.ui.Modifier modifier, kotlin.jvm.functions.Function1<? super androidx.compose.material.ExposedDropdownMenuBoxScope,kotlin.Unit> content);
+ }
+
+ @kotlin.jvm.JvmInline public final value class FabPosition {
+ field public static final androidx.compose.material.FabPosition.Companion Companion;
+ }
+
+ public static final class FabPosition.Companion {
+ method public int getCenter();
+ method public int getEnd();
+ property public final int Center;
+ property public final int End;
+ }
+
+ @androidx.compose.material.ExperimentalMaterialApi @androidx.compose.runtime.Immutable public final class FixedThreshold implements androidx.compose.material.ThresholdConfig {
+ ctor public FixedThreshold(float offset);
+ method public float computeThreshold(androidx.compose.ui.unit.Density, float fromValue, float toValue);
+ method public androidx.compose.material.FixedThreshold copy-0680j_4(float offset);
+ }
+
+ public final class FloatingActionButtonDefaults {
+ method @androidx.compose.runtime.Composable public androidx.compose.material.FloatingActionButtonElevation elevation(optional float defaultElevation, optional float pressedElevation, optional float hoveredElevation, optional float focusedElevation);
+ method @Deprecated @androidx.compose.runtime.Composable public androidx.compose.material.FloatingActionButtonElevation! elevation(optional float defaultElevation, optional float pressedElevation);
+ field public static final androidx.compose.material.FloatingActionButtonDefaults INSTANCE;
+ }
+
+ @androidx.compose.runtime.Stable public interface FloatingActionButtonElevation {
+ method @androidx.compose.runtime.Composable public androidx.compose.runtime.State<androidx.compose.ui.unit.Dp> elevation(androidx.compose.foundation.interaction.InteractionSource interactionSource);
+ }
+
+ public final class FloatingActionButtonKt {
+ method @androidx.compose.runtime.Composable public static void ExtendedFloatingActionButton(kotlin.jvm.functions.Function0<kotlin.Unit> text, kotlin.jvm.functions.Function0<kotlin.Unit> onClick, optional androidx.compose.ui.Modifier modifier, optional kotlin.jvm.functions.Function0<kotlin.Unit>? icon, optional androidx.compose.foundation.interaction.MutableInteractionSource interactionSource, optional androidx.compose.ui.graphics.Shape shape, optional long backgroundColor, optional long contentColor, optional androidx.compose.material.FloatingActionButtonElevation elevation);
+ method @androidx.compose.runtime.Composable public static void FloatingActionButton(kotlin.jvm.functions.Function0<kotlin.Unit> onClick, optional androidx.compose.ui.Modifier modifier, optional androidx.compose.foundation.interaction.MutableInteractionSource interactionSource, optional androidx.compose.ui.graphics.Shape shape, optional long backgroundColor, optional long contentColor, optional androidx.compose.material.FloatingActionButtonElevation elevation, kotlin.jvm.functions.Function0<kotlin.Unit> content);
+ }
+
+ @androidx.compose.material.ExperimentalMaterialApi @androidx.compose.runtime.Immutable public final class FractionalThreshold implements androidx.compose.material.ThresholdConfig {
+ ctor public FractionalThreshold(float fraction);
+ method public float computeThreshold(androidx.compose.ui.unit.Density, float fromValue, float toValue);
+ method public androidx.compose.material.FractionalThreshold copy(float fraction);
+ }
+
+ public final class IconButtonKt {
+ method @androidx.compose.runtime.Composable public static void IconButton(kotlin.jvm.functions.Function0<kotlin.Unit> onClick, optional androidx.compose.ui.Modifier modifier, optional boolean enabled, optional androidx.compose.foundation.interaction.MutableInteractionSource interactionSource, kotlin.jvm.functions.Function0<kotlin.Unit> content);
+ method @androidx.compose.runtime.Composable public static void IconToggleButton(boolean checked, kotlin.jvm.functions.Function1<? super java.lang.Boolean,kotlin.Unit> onCheckedChange, optional androidx.compose.ui.Modifier modifier, optional boolean enabled, optional androidx.compose.foundation.interaction.MutableInteractionSource interactionSource, kotlin.jvm.functions.Function0<kotlin.Unit> content);
+ }
+
+ public final class IconKt {
+ method @androidx.compose.runtime.Composable @androidx.compose.runtime.NonRestartableComposable public static void Icon(androidx.compose.ui.graphics.vector.ImageVector imageVector, String? contentDescription, optional androidx.compose.ui.Modifier modifier, optional long tint);
+ method @androidx.compose.runtime.Composable @androidx.compose.runtime.NonRestartableComposable public static void Icon(androidx.compose.ui.graphics.ImageBitmap bitmap, String? contentDescription, optional androidx.compose.ui.Modifier modifier, optional long tint);
+ method @androidx.compose.runtime.Composable public static void Icon(androidx.compose.ui.graphics.painter.Painter painter, String? contentDescription, optional androidx.compose.ui.Modifier modifier, optional long tint);
+ }
+
+ public final class ListItemKt {
+ method @androidx.compose.material.ExperimentalMaterialApi @androidx.compose.runtime.Composable public static void ListItem(optional androidx.compose.ui.Modifier modifier, optional kotlin.jvm.functions.Function0<kotlin.Unit>? icon, optional kotlin.jvm.functions.Function0<kotlin.Unit>? secondaryText, optional boolean singleLineSecondaryText, optional kotlin.jvm.functions.Function0<kotlin.Unit>? overlineText, optional kotlin.jvm.functions.Function0<kotlin.Unit>? trailing, kotlin.jvm.functions.Function0<kotlin.Unit> text);
+ }
+
+ public final class MaterialTextSelectionColorsKt {
+ }
+
+ public final class MaterialTheme {
+ method @androidx.compose.runtime.Composable @androidx.compose.runtime.ReadOnlyComposable public androidx.compose.material.Colors getColors();
+ method @androidx.compose.runtime.Composable @androidx.compose.runtime.ReadOnlyComposable public androidx.compose.material.Shapes getShapes();
+ method @androidx.compose.runtime.Composable @androidx.compose.runtime.ReadOnlyComposable public androidx.compose.material.Typography getTypography();
+ property @androidx.compose.runtime.Composable @androidx.compose.runtime.ReadOnlyComposable public final androidx.compose.material.Colors colors;
+ property @androidx.compose.runtime.Composable @androidx.compose.runtime.ReadOnlyComposable public final androidx.compose.material.Shapes shapes;
+ property @androidx.compose.runtime.Composable @androidx.compose.runtime.ReadOnlyComposable public final androidx.compose.material.Typography typography;
+ field public static final androidx.compose.material.MaterialTheme INSTANCE;
+ }
+
+ public final class MaterialThemeKt {
+ method @androidx.compose.runtime.Composable public static void MaterialTheme(optional androidx.compose.material.Colors colors, optional androidx.compose.material.Typography typography, optional androidx.compose.material.Shapes shapes, kotlin.jvm.functions.Function0<kotlin.Unit> content);
+ }
+
+ public final class MaterialTheme_androidKt {
+ }
+
+ public final class MenuDefaults {
+ method public androidx.compose.foundation.layout.PaddingValues getDropdownMenuItemContentPadding();
+ property public final androidx.compose.foundation.layout.PaddingValues DropdownMenuItemContentPadding;
+ field public static final androidx.compose.material.MenuDefaults INSTANCE;
+ }
+
+ public final class MenuKt {
+ }
+
+ public final class ModalBottomSheetDefaults {
+ method public float getElevation();
+ method @androidx.compose.runtime.Composable public long getScrimColor();
+ property public final float Elevation;
+ property @androidx.compose.runtime.Composable public final long scrimColor;
+ field public static final androidx.compose.material.ModalBottomSheetDefaults INSTANCE;
+ }
+
+ public final class ModalBottomSheetKt {
+ method @androidx.compose.material.ExperimentalMaterialApi @androidx.compose.runtime.Composable public static void ModalBottomSheetLayout(kotlin.jvm.functions.Function1<? super androidx.compose.foundation.layout.ColumnScope,kotlin.Unit> sheetContent, optional androidx.compose.ui.Modifier modifier, optional androidx.compose.material.ModalBottomSheetState sheetState, optional androidx.compose.ui.graphics.Shape sheetShape, optional float sheetElevation, optional long sheetBackgroundColor, optional long sheetContentColor, optional long scrimColor, kotlin.jvm.functions.Function0<kotlin.Unit> content);
+ method @androidx.compose.material.ExperimentalMaterialApi @androidx.compose.runtime.Composable public static androidx.compose.material.ModalBottomSheetState rememberModalBottomSheetState(androidx.compose.material.ModalBottomSheetValue initialValue, optional androidx.compose.animation.core.AnimationSpec<java.lang.Float> animationSpec, boolean skipHalfExpanded, optional kotlin.jvm.functions.Function1<? super androidx.compose.material.ModalBottomSheetValue,java.lang.Boolean> confirmStateChange);
+ method @androidx.compose.material.ExperimentalMaterialApi @androidx.compose.runtime.Composable public static androidx.compose.material.ModalBottomSheetState rememberModalBottomSheetState(androidx.compose.material.ModalBottomSheetValue initialValue, optional androidx.compose.animation.core.AnimationSpec<java.lang.Float> animationSpec, optional kotlin.jvm.functions.Function1<? super androidx.compose.material.ModalBottomSheetValue,java.lang.Boolean> confirmStateChange);
+ }
+
+ @androidx.compose.material.ExperimentalMaterialApi public final class ModalBottomSheetState extends androidx.compose.material.SwipeableState<androidx.compose.material.ModalBottomSheetValue> {
+ ctor public ModalBottomSheetState(androidx.compose.material.ModalBottomSheetValue initialValue, optional androidx.compose.animation.core.AnimationSpec<java.lang.Float> animationSpec, boolean isSkipHalfExpanded, optional kotlin.jvm.functions.Function1<? super androidx.compose.material.ModalBottomSheetValue,java.lang.Boolean> confirmStateChange);
+ ctor public ModalBottomSheetState(androidx.compose.material.ModalBottomSheetValue initialValue, optional androidx.compose.animation.core.AnimationSpec<java.lang.Float> animationSpec, optional kotlin.jvm.functions.Function1<? super androidx.compose.material.ModalBottomSheetValue,java.lang.Boolean> confirmStateChange);
+ method public suspend Object? hide(kotlin.coroutines.Continuation<? super kotlin.Unit>);
+ method public boolean isVisible();
+ method public suspend Object? show(kotlin.coroutines.Continuation<? super kotlin.Unit>);
+ property public final boolean isVisible;
+ field public static final androidx.compose.material.ModalBottomSheetState.Companion Companion;
+ }
+
+ public static final class ModalBottomSheetState.Companion {
+ method public androidx.compose.runtime.saveable.Saver<androidx.compose.material.ModalBottomSheetState,?> Saver(androidx.compose.animation.core.AnimationSpec<java.lang.Float> animationSpec, boolean skipHalfExpanded, kotlin.jvm.functions.Function1<? super androidx.compose.material.ModalBottomSheetValue,java.lang.Boolean> confirmStateChange);
+ method @Deprecated public androidx.compose.runtime.saveable.Saver<androidx.compose.material.ModalBottomSheetState,?> Saver(androidx.compose.animation.core.AnimationSpec<java.lang.Float> animationSpec, kotlin.jvm.functions.Function1<? super androidx.compose.material.ModalBottomSheetValue,java.lang.Boolean> confirmStateChange);
+ }
+
+ @androidx.compose.material.ExperimentalMaterialApi public enum ModalBottomSheetValue {
+ enum_constant public static final androidx.compose.material.ModalBottomSheetValue Expanded;
+ enum_constant public static final androidx.compose.material.ModalBottomSheetValue HalfExpanded;
+ enum_constant public static final androidx.compose.material.ModalBottomSheetValue Hidden;
+ }
+
+ public final class NavigationRailDefaults {
+ method public float getElevation();
+ property public final float Elevation;
+ field public static final androidx.compose.material.NavigationRailDefaults INSTANCE;
+ }
+
+ public final class NavigationRailKt {
+ method @androidx.compose.runtime.Composable public static void NavigationRail(optional androidx.compose.ui.Modifier modifier, optional long backgroundColor, optional long contentColor, optional float elevation, optional kotlin.jvm.functions.Function1<? super androidx.compose.foundation.layout.ColumnScope,kotlin.Unit>? header, kotlin.jvm.functions.Function1<? super androidx.compose.foundation.layout.ColumnScope,kotlin.Unit> content);
+ method @androidx.compose.runtime.Composable public static void NavigationRailItem(boolean selected, kotlin.jvm.functions.Function0<kotlin.Unit> onClick, kotlin.jvm.functions.Function0<kotlin.Unit> icon, optional androidx.compose.ui.Modifier modifier, optional boolean enabled, optional kotlin.jvm.functions.Function0<kotlin.Unit>? label, optional boolean alwaysShowLabel, optional androidx.compose.foundation.interaction.MutableInteractionSource interactionSource, optional long selectedContentColor, optional long unselectedContentColor);
+ }
+
+ public final class OutlinedTextFieldKt {
+ method @androidx.compose.runtime.Composable public static void OutlinedTextField(String value, kotlin.jvm.functions.Function1<? super java.lang.String,kotlin.Unit> onValueChange, optional androidx.compose.ui.Modifier modifier, optional boolean enabled, optional boolean readOnly, optional androidx.compose.ui.text.TextStyle textStyle, optional kotlin.jvm.functions.Function0<kotlin.Unit>? label, optional kotlin.jvm.functions.Function0<kotlin.Unit>? placeholder, optional kotlin.jvm.functions.Function0<kotlin.Unit>? leadingIcon, optional kotlin.jvm.functions.Function0<kotlin.Unit>? trailingIcon, optional boolean isError, optional androidx.compose.ui.text.input.VisualTransformation visualTransformation, optional androidx.compose.foundation.text.KeyboardOptions keyboardOptions, optional androidx.compose.foundation.text.KeyboardActions keyboardActions, optional boolean singleLine, optional int maxLines, optional androidx.compose.foundation.interaction.MutableInteractionSource interactionSource, optional androidx.compose.ui.graphics.Shape shape, optional androidx.compose.material.TextFieldColors colors);
+ method @androidx.compose.runtime.Composable public static void OutlinedTextField(androidx.compose.ui.text.input.TextFieldValue value, kotlin.jvm.functions.Function1<? super androidx.compose.ui.text.input.TextFieldValue,kotlin.Unit> onValueChange, optional androidx.compose.ui.Modifier modifier, optional boolean enabled, optional boolean readOnly, optional androidx.compose.ui.text.TextStyle textStyle, optional kotlin.jvm.functions.Function0<kotlin.Unit>? label, optional kotlin.jvm.functions.Function0<kotlin.Unit>? placeholder, optional kotlin.jvm.functions.Function0<kotlin.Unit>? leadingIcon, optional kotlin.jvm.functions.Function0<kotlin.Unit>? trailingIcon, optional boolean isError, optional androidx.compose.ui.text.input.VisualTransformation visualTransformation, optional androidx.compose.foundation.text.KeyboardOptions keyboardOptions, optional androidx.compose.foundation.text.KeyboardActions keyboardActions, optional boolean singleLine, optional int maxLines, optional androidx.compose.foundation.interaction.MutableInteractionSource interactionSource, optional androidx.compose.ui.graphics.Shape shape, optional androidx.compose.material.TextFieldColors colors);
+ }
+
+ public final class ProgressIndicatorDefaults {
+ method public androidx.compose.animation.core.SpringSpec<java.lang.Float> getProgressAnimationSpec();
+ method public float getStrokeWidth();
+ property public final androidx.compose.animation.core.SpringSpec<java.lang.Float> ProgressAnimationSpec;
+ property public final float StrokeWidth;
+ field public static final androidx.compose.material.ProgressIndicatorDefaults INSTANCE;
+ field public static final float IndicatorBackgroundOpacity = 0.24f;
+ }
+
+ public final class ProgressIndicatorKt {
+ method @androidx.compose.runtime.Composable public static void CircularProgressIndicator(float progress, optional androidx.compose.ui.Modifier modifier, optional long color, optional float strokeWidth);
+ method @androidx.compose.runtime.Composable public static void CircularProgressIndicator(optional androidx.compose.ui.Modifier modifier, optional long color, optional float strokeWidth);
+ method @androidx.compose.runtime.Composable public static void LinearProgressIndicator(float progress, optional androidx.compose.ui.Modifier modifier, optional long color, optional long backgroundColor);
+ method @androidx.compose.runtime.Composable public static void LinearProgressIndicator(optional androidx.compose.ui.Modifier modifier, optional long color, optional long backgroundColor);
+ }
+
+ @androidx.compose.runtime.Stable public interface RadioButtonColors {
+ method @androidx.compose.runtime.Composable public androidx.compose.runtime.State<androidx.compose.ui.graphics.Color> radioColor(boolean enabled, boolean selected);
+ }
+
+ public final class RadioButtonDefaults {
+ method @androidx.compose.runtime.Composable public androidx.compose.material.RadioButtonColors colors(optional long selectedColor, optional long unselectedColor, optional long disabledColor);
+ field public static final androidx.compose.material.RadioButtonDefaults INSTANCE;
+ }
+
+ public final class RadioButtonKt {
+ method @androidx.compose.runtime.Composable public static void RadioButton(boolean selected, kotlin.jvm.functions.Function0<kotlin.Unit>? onClick, optional androidx.compose.ui.Modifier modifier, optional boolean enabled, optional androidx.compose.foundation.interaction.MutableInteractionSource interactionSource, optional androidx.compose.material.RadioButtonColors colors);
+ }
+
+ @androidx.compose.runtime.Immutable public final class ResistanceConfig {
+ ctor public ResistanceConfig(float basis, optional float factorAtMin, optional float factorAtMax);
+ method public float computeResistance(float overflow);
+ method public float getBasis();
+ method public float getFactorAtMax();
+ method public float getFactorAtMin();
+ property public final float basis;
+ property public final float factorAtMax;
+ property public final float factorAtMin;
+ }
+
+ public final class ScaffoldKt {
+ method @androidx.compose.runtime.Composable public static void Scaffold(optional androidx.compose.ui.Modifier modifier, optional androidx.compose.material.ScaffoldState scaffoldState, optional kotlin.jvm.functions.Function0<kotlin.Unit> topBar, optional kotlin.jvm.functions.Function0<kotlin.Unit> bottomBar, optional kotlin.jvm.functions.Function1<? super androidx.compose.material.SnackbarHostState,kotlin.Unit> snackbarHost, optional kotlin.jvm.functions.Function0<kotlin.Unit> floatingActionButton, optional int floatingActionButtonPosition, optional boolean isFloatingActionButtonDocked, optional kotlin.jvm.functions.Function1<? super androidx.compose.foundation.layout.ColumnScope,kotlin.Unit>? drawerContent, optional boolean drawerGesturesEnabled, optional androidx.compose.ui.graphics.Shape drawerShape, optional float drawerElevation, optional long drawerBackgroundColor, optional long drawerContentColor, optional long drawerScrimColor, optional long backgroundColor, optional long contentColor, kotlin.jvm.functions.Function1<? super androidx.compose.foundation.layout.PaddingValues,kotlin.Unit> content);
+ method @androidx.compose.runtime.Composable public static androidx.compose.material.ScaffoldState rememberScaffoldState(optional androidx.compose.material.DrawerState drawerState, optional androidx.compose.material.SnackbarHostState snackbarHostState);
+ }
+
+ @androidx.compose.runtime.Stable public final class ScaffoldState {
+ ctor public ScaffoldState(androidx.compose.material.DrawerState drawerState, androidx.compose.material.SnackbarHostState snackbarHostState);
+ method public androidx.compose.material.DrawerState getDrawerState();
+ method public androidx.compose.material.SnackbarHostState getSnackbarHostState();
+ property public final androidx.compose.material.DrawerState drawerState;
+ property public final androidx.compose.material.SnackbarHostState snackbarHostState;
+ }
+
+ @androidx.compose.material.ExperimentalMaterialApi public interface SelectableChipColors {
+ method @androidx.compose.runtime.Composable public androidx.compose.runtime.State<androidx.compose.ui.graphics.Color> backgroundColor(boolean enabled, boolean selected);
+ method @androidx.compose.runtime.Composable public androidx.compose.runtime.State<androidx.compose.ui.graphics.Color> contentColor(boolean enabled, boolean selected);
+ method @androidx.compose.runtime.Composable public androidx.compose.runtime.State<androidx.compose.ui.graphics.Color> leadingIconColor(boolean enabled, boolean selected);
+ }
+
+ @androidx.compose.runtime.Immutable public final class Shapes {
+ ctor public Shapes(optional androidx.compose.foundation.shape.CornerBasedShape small, optional androidx.compose.foundation.shape.CornerBasedShape medium, optional androidx.compose.foundation.shape.CornerBasedShape large);
+ method public androidx.compose.material.Shapes copy(optional androidx.compose.foundation.shape.CornerBasedShape small, optional androidx.compose.foundation.shape.CornerBasedShape medium, optional androidx.compose.foundation.shape.CornerBasedShape large);
+ method public androidx.compose.foundation.shape.CornerBasedShape getLarge();
+ method public androidx.compose.foundation.shape.CornerBasedShape getMedium();
+ method public androidx.compose.foundation.shape.CornerBasedShape getSmall();
+ property public final androidx.compose.foundation.shape.CornerBasedShape large;
+ property public final androidx.compose.foundation.shape.CornerBasedShape medium;
+ property public final androidx.compose.foundation.shape.CornerBasedShape small;
+ }
+
+ public final class ShapesKt {
+ }
+
+ @androidx.compose.runtime.Stable public interface SliderColors {
+ method @androidx.compose.runtime.Composable public androidx.compose.runtime.State<androidx.compose.ui.graphics.Color> thumbColor(boolean enabled);
+ method @androidx.compose.runtime.Composable public androidx.compose.runtime.State<androidx.compose.ui.graphics.Color> tickColor(boolean enabled, boolean active);
+ method @androidx.compose.runtime.Composable public androidx.compose.runtime.State<androidx.compose.ui.graphics.Color> trackColor(boolean enabled, boolean active);
+ }
+
+ public final class SliderDefaults {
+ method @androidx.compose.runtime.Composable public androidx.compose.material.SliderColors colors(optional long thumbColor, optional long disabledThumbColor, optional long activeTrackColor, optional long inactiveTrackColor, optional long disabledActiveTrackColor, optional long disabledInactiveTrackColor, optional long activeTickColor, optional long inactiveTickColor, optional long disabledActiveTickColor, optional long disabledInactiveTickColor);
+ field public static final float DisabledActiveTrackAlpha = 0.32f;
+ field public static final float DisabledInactiveTrackAlpha = 0.12f;
+ field public static final float DisabledTickAlpha = 0.12f;
+ field public static final androidx.compose.material.SliderDefaults INSTANCE;
+ field public static final float InactiveTrackAlpha = 0.24f;
+ field public static final float TickAlpha = 0.54f;
+ }
+
+ public final class SliderKt {
+ method @androidx.compose.material.ExperimentalMaterialApi @androidx.compose.runtime.Composable public static void RangeSlider(kotlin.ranges.ClosedFloatingPointRange<java.lang.Float> values, kotlin.jvm.functions.Function1<? super kotlin.ranges.ClosedFloatingPointRange<java.lang.Float>,kotlin.Unit> onValueChange, optional androidx.compose.ui.Modifier modifier, optional boolean enabled, optional kotlin.ranges.ClosedFloatingPointRange<java.lang.Float> valueRange, optional int steps, optional kotlin.jvm.functions.Function0<kotlin.Unit>? onValueChangeFinished, optional androidx.compose.material.SliderColors colors);
+ method @androidx.compose.runtime.Composable public static void Slider(float value, kotlin.jvm.functions.Function1<? super java.lang.Float,kotlin.Unit> onValueChange, optional androidx.compose.ui.Modifier modifier, optional boolean enabled, optional kotlin.ranges.ClosedFloatingPointRange<java.lang.Float> valueRange, optional int steps, optional kotlin.jvm.functions.Function0<kotlin.Unit>? onValueChangeFinished, optional androidx.compose.foundation.interaction.MutableInteractionSource interactionSource, optional androidx.compose.material.SliderColors colors);
+ }
+
+ public interface SnackbarData {
+ method public void dismiss();
+ method public String? getActionLabel();
+ method public androidx.compose.material.SnackbarDuration getDuration();
+ method public String getMessage();
+ method public void performAction();
+ property public abstract String? actionLabel;
+ property public abstract androidx.compose.material.SnackbarDuration duration;
+ property public abstract String message;
+ }
+
+ public final class SnackbarDefaults {
+ method @androidx.compose.runtime.Composable public long getBackgroundColor();
+ method @androidx.compose.runtime.Composable public long getPrimaryActionColor();
+ property @androidx.compose.runtime.Composable public final long backgroundColor;
+ property @androidx.compose.runtime.Composable public final long primaryActionColor;
+ field public static final androidx.compose.material.SnackbarDefaults INSTANCE;
+ }
+
+ public enum SnackbarDuration {
+ enum_constant public static final androidx.compose.material.SnackbarDuration Indefinite;
+ enum_constant public static final androidx.compose.material.SnackbarDuration Long;
+ enum_constant public static final androidx.compose.material.SnackbarDuration Short;
+ }
+
+ public final class SnackbarHostKt {
+ method @androidx.compose.runtime.Composable public static void SnackbarHost(androidx.compose.material.SnackbarHostState hostState, optional androidx.compose.ui.Modifier modifier, optional kotlin.jvm.functions.Function1<? super androidx.compose.material.SnackbarData,kotlin.Unit> snackbar);
+ }
+
+ @androidx.compose.runtime.Stable public final class SnackbarHostState {
+ ctor public SnackbarHostState();
+ method public androidx.compose.material.SnackbarData? getCurrentSnackbarData();
+ method public suspend Object? showSnackbar(String message, optional String? actionLabel, optional androidx.compose.material.SnackbarDuration duration, optional kotlin.coroutines.Continuation<? super androidx.compose.material.SnackbarResult>);
+ property public final androidx.compose.material.SnackbarData? currentSnackbarData;
+ }
+
+ public final class SnackbarKt {
+ method @androidx.compose.runtime.Composable public static void Snackbar(optional androidx.compose.ui.Modifier modifier, optional kotlin.jvm.functions.Function0<kotlin.Unit>? action, optional boolean actionOnNewLine, optional androidx.compose.ui.graphics.Shape shape, optional long backgroundColor, optional long contentColor, optional float elevation, kotlin.jvm.functions.Function0<kotlin.Unit> content);
+ method @androidx.compose.runtime.Composable public static void Snackbar(androidx.compose.material.SnackbarData snackbarData, optional androidx.compose.ui.Modifier modifier, optional boolean actionOnNewLine, optional androidx.compose.ui.graphics.Shape shape, optional long backgroundColor, optional long contentColor, optional long actionColor, optional float elevation);
+ }
+
+ public enum SnackbarResult {
+ enum_constant public static final androidx.compose.material.SnackbarResult ActionPerformed;
+ enum_constant public static final androidx.compose.material.SnackbarResult Dismissed;
+ }
+
+ public final class Strings_androidKt {
+ }
+
+ public final class SurfaceKt {
+ method @androidx.compose.runtime.Composable public static void Surface(optional androidx.compose.ui.Modifier modifier, optional androidx.compose.ui.graphics.Shape shape, optional long color, optional long contentColor, optional androidx.compose.foundation.BorderStroke? border, optional float elevation, kotlin.jvm.functions.Function0<kotlin.Unit> content);
+ method @androidx.compose.material.ExperimentalMaterialApi @androidx.compose.runtime.Composable public static void Surface(kotlin.jvm.functions.Function0<kotlin.Unit> onClick, optional androidx.compose.ui.Modifier modifier, optional boolean enabled, optional androidx.compose.ui.graphics.Shape shape, optional long color, optional long contentColor, optional androidx.compose.foundation.BorderStroke? border, optional float elevation, optional androidx.compose.foundation.interaction.MutableInteractionSource interactionSource, kotlin.jvm.functions.Function0<kotlin.Unit> content);
+ method @androidx.compose.material.ExperimentalMaterialApi @androidx.compose.runtime.Composable public static void Surface(boolean selected, kotlin.jvm.functions.Function0<kotlin.Unit> onClick, optional androidx.compose.ui.Modifier modifier, optional boolean enabled, optional androidx.compose.ui.graphics.Shape shape, optional long color, optional long contentColor, optional androidx.compose.foundation.BorderStroke? border, optional float elevation, optional androidx.compose.foundation.interaction.MutableInteractionSource interactionSource, kotlin.jvm.functions.Function0<kotlin.Unit> content);
+ method @androidx.compose.material.ExperimentalMaterialApi @androidx.compose.runtime.Composable public static void Surface(boolean checked, kotlin.jvm.functions.Function1<? super java.lang.Boolean,kotlin.Unit> onCheckedChange, optional androidx.compose.ui.Modifier modifier, optional boolean enabled, optional androidx.compose.ui.graphics.Shape shape, optional long color, optional long contentColor, optional androidx.compose.foundation.BorderStroke? border, optional float elevation, optional androidx.compose.foundation.interaction.MutableInteractionSource interactionSource, kotlin.jvm.functions.Function0<kotlin.Unit> content);
+ method @Deprecated @androidx.compose.material.ExperimentalMaterialApi @androidx.compose.runtime.Composable public static void Surface(kotlin.jvm.functions.Function0<kotlin.Unit> onClick, optional androidx.compose.ui.Modifier modifier, optional androidx.compose.ui.graphics.Shape shape, optional long color, optional long contentColor, optional androidx.compose.foundation.BorderStroke? border, optional float elevation, optional androidx.compose.foundation.interaction.MutableInteractionSource interactionSource, optional androidx.compose.foundation.Indication? indication, optional boolean enabled, optional String? onClickLabel, optional androidx.compose.ui.semantics.Role? role, kotlin.jvm.functions.Function0<kotlin.Unit> content);
+ }
+
+ @androidx.compose.material.ExperimentalMaterialApi @androidx.compose.runtime.Immutable public final class SwipeProgress<T> {
+ ctor public SwipeProgress(T? from, T? to, float fraction);
+ method public float getFraction();
+ method public T! getFrom();
+ method public T! getTo();
+ property public final float fraction;
+ property public final T! from;
+ property public final T! to;
+ }
+
+ public final class SwipeToDismissKt {
+ method @androidx.compose.material.ExperimentalMaterialApi @androidx.compose.runtime.Composable public static void SwipeToDismiss(androidx.compose.material.DismissState state, optional androidx.compose.ui.Modifier modifier, optional java.util.Set<? extends androidx.compose.material.DismissDirection> directions, optional kotlin.jvm.functions.Function1<? super androidx.compose.material.DismissDirection,? extends androidx.compose.material.ThresholdConfig> dismissThresholds, kotlin.jvm.functions.Function1<? super androidx.compose.foundation.layout.RowScope,kotlin.Unit> background, kotlin.jvm.functions.Function1<? super androidx.compose.foundation.layout.RowScope,kotlin.Unit> dismissContent);
+ method @androidx.compose.material.ExperimentalMaterialApi @androidx.compose.runtime.Composable public static androidx.compose.material.DismissState rememberDismissState(optional androidx.compose.material.DismissValue initialValue, optional kotlin.jvm.functions.Function1<? super androidx.compose.material.DismissValue,java.lang.Boolean> confirmStateChange);
+ }
+
+ public final class SwipeableDefaults {
+ method public androidx.compose.animation.core.SpringSpec<java.lang.Float> getAnimationSpec();
+ method public float getVelocityThreshold();
+ method public androidx.compose.material.ResistanceConfig? resistanceConfig(java.util.Set<java.lang.Float> anchors, optional float factorAtMin, optional float factorAtMax);
+ property public final androidx.compose.animation.core.SpringSpec<java.lang.Float> AnimationSpec;
+ property public final float VelocityThreshold;
+ field public static final androidx.compose.material.SwipeableDefaults INSTANCE;
+ field public static final float StandardResistanceFactor = 10.0f;
+ field public static final float StiffResistanceFactor = 20.0f;
+ }
+
+ public final class SwipeableKt {
+ method @androidx.compose.material.ExperimentalMaterialApi @androidx.compose.runtime.Composable public static <T> androidx.compose.material.SwipeableState<T> rememberSwipeableState(T initialValue, optional androidx.compose.animation.core.AnimationSpec<java.lang.Float> animationSpec, optional kotlin.jvm.functions.Function1<? super T,java.lang.Boolean> confirmStateChange);
+ method @androidx.compose.material.ExperimentalMaterialApi public static <T> androidx.compose.ui.Modifier swipeable(androidx.compose.ui.Modifier, androidx.compose.material.SwipeableState<T> state, java.util.Map<java.lang.Float,? extends T> anchors, androidx.compose.foundation.gestures.Orientation orientation, optional boolean enabled, optional boolean reverseDirection, optional androidx.compose.foundation.interaction.MutableInteractionSource? interactionSource, optional kotlin.jvm.functions.Function2<? super T,? super T,? extends androidx.compose.material.ThresholdConfig> thresholds, optional androidx.compose.material.ResistanceConfig? resistance, optional float velocityThreshold);
+ }
+
+ @androidx.compose.material.ExperimentalMaterialApi @androidx.compose.runtime.Stable public class SwipeableState<T> {
+ ctor public SwipeableState(T? initialValue, optional androidx.compose.animation.core.AnimationSpec<java.lang.Float> animationSpec, optional kotlin.jvm.functions.Function1<? super T,java.lang.Boolean> confirmStateChange);
+ method @androidx.compose.material.ExperimentalMaterialApi public final suspend Object? animateTo(T? targetValue, optional androidx.compose.animation.core.AnimationSpec<java.lang.Float> anim, optional kotlin.coroutines.Continuation<? super kotlin.Unit>);
+ method public final T! getCurrentValue();
+ method public final float getDirection();
+ method public final androidx.compose.runtime.State<java.lang.Float> getOffset();
+ method public final androidx.compose.runtime.State<java.lang.Float> getOverflow();
+ method public final androidx.compose.material.SwipeProgress<T> getProgress();
+ method public final T! getTargetValue();
+ method public final boolean isAnimationRunning();
+ method public final float performDrag(float delta);
+ method public final suspend Object? performFling(float velocity, kotlin.coroutines.Continuation<? super kotlin.Unit>);
+ method @androidx.compose.material.ExperimentalMaterialApi public final suspend Object? snapTo(T? targetValue, kotlin.coroutines.Continuation<? super kotlin.Unit>);
+ property public final T! currentValue;
+ property public final float direction;
+ property public final boolean isAnimationRunning;
+ property public final androidx.compose.runtime.State<java.lang.Float> offset;
+ property public final androidx.compose.runtime.State<java.lang.Float> overflow;
+ property public final androidx.compose.material.SwipeProgress<T> progress;
+ property public final T! targetValue;
+ field public static final androidx.compose.material.SwipeableState.Companion Companion;
+ }
+
+ public static final class SwipeableState.Companion {
+ method public <T> androidx.compose.runtime.saveable.Saver<androidx.compose.material.SwipeableState<T>,T> Saver(androidx.compose.animation.core.AnimationSpec<java.lang.Float> animationSpec, kotlin.jvm.functions.Function1<? super T,java.lang.Boolean> confirmStateChange);
+ }
+
+ @androidx.compose.runtime.Stable public interface SwitchColors {
+ method @androidx.compose.runtime.Composable public androidx.compose.runtime.State<androidx.compose.ui.graphics.Color> thumbColor(boolean enabled, boolean checked);
+ method @androidx.compose.runtime.Composable public androidx.compose.runtime.State<androidx.compose.ui.graphics.Color> trackColor(boolean enabled, boolean checked);
+ }
+
+ public final class SwitchDefaults {
+ method @androidx.compose.runtime.Composable public androidx.compose.material.SwitchColors colors(optional long checkedThumbColor, optional long checkedTrackColor, optional float checkedTrackAlpha, optional long uncheckedThumbColor, optional long uncheckedTrackColor, optional float uncheckedTrackAlpha, optional long disabledCheckedThumbColor, optional long disabledCheckedTrackColor, optional long disabledUncheckedThumbColor, optional long disabledUncheckedTrackColor);
+ field public static final androidx.compose.material.SwitchDefaults INSTANCE;
+ }
+
+ public final class SwitchKt {
+ method @androidx.compose.runtime.Composable public static void Switch(boolean checked, kotlin.jvm.functions.Function1<? super java.lang.Boolean,kotlin.Unit>? onCheckedChange, optional androidx.compose.ui.Modifier modifier, optional boolean enabled, optional androidx.compose.foundation.interaction.MutableInteractionSource interactionSource, optional androidx.compose.material.SwitchColors colors);
+ }
+
+ public final class TabKt {
+ method @androidx.compose.runtime.Composable public static void LeadingIconTab(boolean selected, kotlin.jvm.functions.Function0<kotlin.Unit> onClick, kotlin.jvm.functions.Function0<kotlin.Unit> text, kotlin.jvm.functions.Function0<kotlin.Unit> icon, optional androidx.compose.ui.Modifier modifier, optional boolean enabled, optional androidx.compose.foundation.interaction.MutableInteractionSource interactionSource, optional long selectedContentColor, optional long unselectedContentColor);
+ method @androidx.compose.runtime.Composable public static void Tab(boolean selected, kotlin.jvm.functions.Function0<kotlin.Unit> onClick, optional androidx.compose.ui.Modifier modifier, optional boolean enabled, optional kotlin.jvm.functions.Function0<kotlin.Unit>? text, optional kotlin.jvm.functions.Function0<kotlin.Unit>? icon, optional androidx.compose.foundation.interaction.MutableInteractionSource interactionSource, optional long selectedContentColor, optional long unselectedContentColor);
+ method @androidx.compose.runtime.Composable public static void Tab(boolean selected, kotlin.jvm.functions.Function0<kotlin.Unit> onClick, optional androidx.compose.ui.Modifier modifier, optional boolean enabled, optional androidx.compose.foundation.interaction.MutableInteractionSource interactionSource, optional long selectedContentColor, optional long unselectedContentColor, kotlin.jvm.functions.Function1<? super androidx.compose.foundation.layout.ColumnScope,kotlin.Unit> content);
+ }
+
+ @androidx.compose.runtime.Immutable public final class TabPosition {
+ method public float getLeft();
+ method public float getRight();
+ method public float getWidth();
+ property public final float left;
+ property public final float right;
+ property public final float width;
+ }
+
+ public final class TabRowDefaults {
+ method @androidx.compose.runtime.Composable public void Divider(optional androidx.compose.ui.Modifier modifier, optional float thickness, optional long color);
+ method @androidx.compose.runtime.Composable public void Indicator(optional androidx.compose.ui.Modifier modifier, optional float height, optional long color);
+ method public float getDividerThickness();
+ method public float getIndicatorHeight();
+ method public float getScrollableTabRowPadding();
+ method public androidx.compose.ui.Modifier tabIndicatorOffset(androidx.compose.ui.Modifier, androidx.compose.material.TabPosition currentTabPosition);
+ property public final float DividerThickness;
+ property public final float IndicatorHeight;
+ property public final float ScrollableTabRowPadding;
+ field public static final float DividerOpacity = 0.12f;
+ field public static final androidx.compose.material.TabRowDefaults INSTANCE;
+ }
+
+ public final class TabRowKt {
+ method @androidx.compose.runtime.Composable @androidx.compose.ui.UiComposable public static void ScrollableTabRow(int selectedTabIndex, optional androidx.compose.ui.Modifier modifier, optional long backgroundColor, optional long contentColor, optional float edgePadding, optional kotlin.jvm.functions.Function1<? super java.util.List<androidx.compose.material.TabPosition>,kotlin.Unit> indicator, optional kotlin.jvm.functions.Function0<kotlin.Unit> divider, kotlin.jvm.functions.Function0<kotlin.Unit> tabs);
+ method @androidx.compose.runtime.Composable @androidx.compose.ui.UiComposable public static void TabRow(int selectedTabIndex, optional androidx.compose.ui.Modifier modifier, optional long backgroundColor, optional long contentColor, optional kotlin.jvm.functions.Function1<? super java.util.List<androidx.compose.material.TabPosition>,kotlin.Unit> indicator, optional kotlin.jvm.functions.Function0<kotlin.Unit> divider, kotlin.jvm.functions.Function0<kotlin.Unit> tabs);
+ }
+
+ @androidx.compose.runtime.Stable public interface TextFieldColors {
+ method @androidx.compose.runtime.Composable public androidx.compose.runtime.State<androidx.compose.ui.graphics.Color> backgroundColor(boolean enabled);
+ method @androidx.compose.runtime.Composable public androidx.compose.runtime.State<androidx.compose.ui.graphics.Color> cursorColor(boolean isError);
+ method @androidx.compose.runtime.Composable public androidx.compose.runtime.State<androidx.compose.ui.graphics.Color> indicatorColor(boolean enabled, boolean isError, androidx.compose.foundation.interaction.InteractionSource interactionSource);
+ method @androidx.compose.runtime.Composable public androidx.compose.runtime.State<androidx.compose.ui.graphics.Color> labelColor(boolean enabled, boolean error, androidx.compose.foundation.interaction.InteractionSource interactionSource);
+ method @androidx.compose.runtime.Composable public androidx.compose.runtime.State<androidx.compose.ui.graphics.Color> leadingIconColor(boolean enabled, boolean isError);
+ method @androidx.compose.runtime.Composable public androidx.compose.runtime.State<androidx.compose.ui.graphics.Color> placeholderColor(boolean enabled);
+ method @androidx.compose.runtime.Composable public androidx.compose.runtime.State<androidx.compose.ui.graphics.Color> textColor(boolean enabled);
+ method @androidx.compose.runtime.Composable public androidx.compose.runtime.State<androidx.compose.ui.graphics.Color> trailingIconColor(boolean enabled, boolean isError);
+ }
+
+ @androidx.compose.material.ExperimentalMaterialApi public interface TextFieldColorsWithIcons extends androidx.compose.material.TextFieldColors {
+ method @androidx.compose.runtime.Composable public default androidx.compose.runtime.State<androidx.compose.ui.graphics.Color> leadingIconColor(boolean enabled, boolean isError, androidx.compose.foundation.interaction.InteractionSource interactionSource);
+ method @androidx.compose.runtime.Composable public default androidx.compose.runtime.State<androidx.compose.ui.graphics.Color> trailingIconColor(boolean enabled, boolean isError, androidx.compose.foundation.interaction.InteractionSource interactionSource);
+ }
+
+ @androidx.compose.runtime.Immutable public final class TextFieldDefaults {
+ method @androidx.compose.material.ExperimentalMaterialApi @androidx.compose.runtime.Composable public void BorderBox(boolean enabled, boolean isError, androidx.compose.foundation.interaction.InteractionSource interactionSource, androidx.compose.material.TextFieldColors colors, optional androidx.compose.ui.graphics.Shape shape, optional float focusedBorderThickness, optional float unfocusedBorderThickness);
+ method @androidx.compose.material.ExperimentalMaterialApi @androidx.compose.runtime.Composable public void OutlinedTextFieldDecorationBox(String value, kotlin.jvm.functions.Function0<kotlin.Unit> innerTextField, boolean enabled, boolean singleLine, androidx.compose.ui.text.input.VisualTransformation visualTransformation, androidx.compose.foundation.interaction.InteractionSource interactionSource, optional boolean isError, optional kotlin.jvm.functions.Function0<kotlin.Unit>? label, optional kotlin.jvm.functions.Function0<kotlin.Unit>? placeholder, optional kotlin.jvm.functions.Function0<kotlin.Unit>? leadingIcon, optional kotlin.jvm.functions.Function0<kotlin.Unit>? trailingIcon, optional androidx.compose.material.TextFieldColors colors, optional androidx.compose.foundation.layout.PaddingValues contentPadding, optional kotlin.jvm.functions.Function0<kotlin.Unit> border);
+ method @androidx.compose.material.ExperimentalMaterialApi @androidx.compose.runtime.Composable public void TextFieldDecorationBox(String value, kotlin.jvm.functions.Function0<kotlin.Unit> innerTextField, boolean enabled, boolean singleLine, androidx.compose.ui.text.input.VisualTransformation visualTransformation, androidx.compose.foundation.interaction.InteractionSource interactionSource, optional boolean isError, optional kotlin.jvm.functions.Function0<kotlin.Unit>? label, optional kotlin.jvm.functions.Function0<kotlin.Unit>? placeholder, optional kotlin.jvm.functions.Function0<kotlin.Unit>? leadingIcon, optional kotlin.jvm.functions.Function0<kotlin.Unit>? trailingIcon, optional androidx.compose.material.TextFieldColors colors, optional androidx.compose.foundation.layout.PaddingValues contentPadding);
+ method public float getFocusedBorderThickness();
+ method public float getMinHeight();
+ method public float getMinWidth();
+ method @androidx.compose.runtime.Composable @androidx.compose.runtime.ReadOnlyComposable public androidx.compose.ui.graphics.Shape getOutlinedTextFieldShape();
+ method @androidx.compose.runtime.Composable @androidx.compose.runtime.ReadOnlyComposable public androidx.compose.ui.graphics.Shape getTextFieldShape();
+ method public float getUnfocusedBorderThickness();
+ method @androidx.compose.material.ExperimentalMaterialApi public androidx.compose.ui.Modifier indicatorLine(androidx.compose.ui.Modifier, boolean enabled, boolean isError, androidx.compose.foundation.interaction.InteractionSource interactionSource, androidx.compose.material.TextFieldColors colors, optional float focusedIndicatorLineThickness, optional float unfocusedIndicatorLineThickness);
+ method @androidx.compose.runtime.Composable public androidx.compose.material.TextFieldColors outlinedTextFieldColors(optional long textColor, optional long disabledTextColor, optional long backgroundColor, optional long cursorColor, optional long errorCursorColor, optional long focusedBorderColor, optional long unfocusedBorderColor, optional long disabledBorderColor, optional long errorBorderColor, optional long leadingIconColor, optional long disabledLeadingIconColor, optional long errorLeadingIconColor, optional long trailingIconColor, optional long disabledTrailingIconColor, optional long errorTrailingIconColor, optional long focusedLabelColor, optional long unfocusedLabelColor, optional long disabledLabelColor, optional long errorLabelColor, optional long placeholderColor, optional long disabledPlaceholderColor);
+ method @androidx.compose.material.ExperimentalMaterialApi public androidx.compose.foundation.layout.PaddingValues outlinedTextFieldPadding(optional float start, optional float top, optional float end, optional float bottom);
+ method @androidx.compose.runtime.Composable public androidx.compose.material.TextFieldColors textFieldColors(optional long textColor, optional long disabledTextColor, optional long backgroundColor, optional long cursorColor, optional long errorCursorColor, optional long focusedIndicatorColor, optional long unfocusedIndicatorColor, optional long disabledIndicatorColor, optional long errorIndicatorColor, optional long leadingIconColor, optional long disabledLeadingIconColor, optional long errorLeadingIconColor, optional long trailingIconColor, optional long disabledTrailingIconColor, optional long errorTrailingIconColor, optional long focusedLabelColor, optional long unfocusedLabelColor, optional long disabledLabelColor, optional long errorLabelColor, optional long placeholderColor, optional long disabledPlaceholderColor);
+ method @androidx.compose.material.ExperimentalMaterialApi public androidx.compose.foundation.layout.PaddingValues textFieldWithLabelPadding(optional float start, optional float end, optional float top, optional float bottom);
+ method @androidx.compose.material.ExperimentalMaterialApi public androidx.compose.foundation.layout.PaddingValues textFieldWithoutLabelPadding(optional float start, optional float top, optional float end, optional float bottom);
+ property public final float FocusedBorderThickness;
+ property public final float MinHeight;
+ property public final float MinWidth;
+ property @androidx.compose.runtime.Composable @androidx.compose.runtime.ReadOnlyComposable public final androidx.compose.ui.graphics.Shape OutlinedTextFieldShape;
+ property @androidx.compose.runtime.Composable @androidx.compose.runtime.ReadOnlyComposable public final androidx.compose.ui.graphics.Shape TextFieldShape;
+ property public final float UnfocusedBorderThickness;
+ field public static final float BackgroundOpacity = 0.12f;
+ field public static final androidx.compose.material.TextFieldDefaults INSTANCE;
+ field public static final float IconOpacity = 0.54f;
+ field public static final float UnfocusedIndicatorLineOpacity = 0.42f;
+ }
+
+ public final class TextFieldDefaultsKt {
+ }
+
+ public final class TextFieldImplKt {
+ }
+
+ public final class TextFieldKt {
+ method @androidx.compose.runtime.Composable public static void TextField(String value, kotlin.jvm.functions.Function1<? super java.lang.String,kotlin.Unit> onValueChange, optional androidx.compose.ui.Modifier modifier, optional boolean enabled, optional boolean readOnly, optional androidx.compose.ui.text.TextStyle textStyle, optional kotlin.jvm.functions.Function0<kotlin.Unit>? label, optional kotlin.jvm.functions.Function0<kotlin.Unit>? placeholder, optional kotlin.jvm.functions.Function0<kotlin.Unit>? leadingIcon, optional kotlin.jvm.functions.Function0<kotlin.Unit>? trailingIcon, optional boolean isError, optional androidx.compose.ui.text.input.VisualTransformation visualTransformation, optional androidx.compose.foundation.text.KeyboardOptions keyboardOptions, optional androidx.compose.foundation.text.KeyboardActions keyboardActions, optional boolean singleLine, optional int maxLines, optional androidx.compose.foundation.interaction.MutableInteractionSource interactionSource, optional androidx.compose.ui.graphics.Shape shape, optional androidx.compose.material.TextFieldColors colors);
+ method @androidx.compose.runtime.Composable public static void TextField(androidx.compose.ui.text.input.TextFieldValue value, kotlin.jvm.functions.Function1<? super androidx.compose.ui.text.input.TextFieldValue,kotlin.Unit> onValueChange, optional androidx.compose.ui.Modifier modifier, optional boolean enabled, optional boolean readOnly, optional androidx.compose.ui.text.TextStyle textStyle, optional kotlin.jvm.functions.Function0<kotlin.Unit>? label, optional kotlin.jvm.functions.Function0<kotlin.Unit>? placeholder, optional kotlin.jvm.functions.Function0<kotlin.Unit>? leadingIcon, optional kotlin.jvm.functions.Function0<kotlin.Unit>? trailingIcon, optional boolean isError, optional androidx.compose.ui.text.input.VisualTransformation visualTransformation, optional androidx.compose.foundation.text.KeyboardOptions keyboardOptions, optional androidx.compose.foundation.text.KeyboardActions keyboardActions, optional boolean singleLine, optional int maxLines, optional androidx.compose.foundation.interaction.MutableInteractionSource interactionSource, optional androidx.compose.ui.graphics.Shape shape, optional androidx.compose.material.TextFieldColors colors);
+ }
+
+ public final class TextKt {
+ method @androidx.compose.runtime.Composable public static void ProvideTextStyle(androidx.compose.ui.text.TextStyle value, kotlin.jvm.functions.Function0<kotlin.Unit> content);
+ method @androidx.compose.runtime.Composable public static void Text(String text, optional androidx.compose.ui.Modifier modifier, optional long color, optional long fontSize, optional androidx.compose.ui.text.font.FontStyle? fontStyle, optional androidx.compose.ui.text.font.FontWeight? fontWeight, optional androidx.compose.ui.text.font.FontFamily? fontFamily, optional long letterSpacing, optional androidx.compose.ui.text.style.TextDecoration? textDecoration, optional androidx.compose.ui.text.style.TextAlign? textAlign, optional long lineHeight, optional int overflow, optional boolean softWrap, optional int maxLines, optional kotlin.jvm.functions.Function1<? super androidx.compose.ui.text.TextLayoutResult,kotlin.Unit> onTextLayout, optional androidx.compose.ui.text.TextStyle style);
+ method @androidx.compose.runtime.Composable public static void Text(androidx.compose.ui.text.AnnotatedString text, optional androidx.compose.ui.Modifier modifier, optional long color, optional long fontSize, optional androidx.compose.ui.text.font.FontStyle? fontStyle, optional androidx.compose.ui.text.font.FontWeight? fontWeight, optional androidx.compose.ui.text.font.FontFamily? fontFamily, optional long letterSpacing, optional androidx.compose.ui.text.style.TextDecoration? textDecoration, optional androidx.compose.ui.text.style.TextAlign? textAlign, optional long lineHeight, optional int overflow, optional boolean softWrap, optional int maxLines, optional java.util.Map<java.lang.String,androidx.compose.foundation.text.InlineTextContent> inlineContent, optional kotlin.jvm.functions.Function1<? super androidx.compose.ui.text.TextLayoutResult,kotlin.Unit> onTextLayout, optional androidx.compose.ui.text.TextStyle style);
+ method public static androidx.compose.runtime.ProvidableCompositionLocal<androidx.compose.ui.text.TextStyle> getLocalTextStyle();
+ property public static final androidx.compose.runtime.ProvidableCompositionLocal<androidx.compose.ui.text.TextStyle> LocalTextStyle;
+ }
+
+ @androidx.compose.material.ExperimentalMaterialApi @androidx.compose.runtime.Stable public interface ThresholdConfig {
+ method public float computeThreshold(androidx.compose.ui.unit.Density, float fromValue, float toValue);
+ }
+
+ public final class TouchTargetKt {
+ method @androidx.compose.material.ExperimentalMaterialApi public static androidx.compose.runtime.ProvidableCompositionLocal<java.lang.Boolean> getLocalMinimumTouchTargetEnforcement();
+ property @androidx.compose.material.ExperimentalMaterialApi public static final androidx.compose.runtime.ProvidableCompositionLocal<java.lang.Boolean> LocalMinimumTouchTargetEnforcement;
+ }
+
+ @androidx.compose.runtime.Immutable public final class Typography {
+ ctor public Typography(optional androidx.compose.ui.text.font.FontFamily defaultFontFamily, optional androidx.compose.ui.text.TextStyle h1, optional androidx.compose.ui.text.TextStyle h2, optional androidx.compose.ui.text.TextStyle h3, optional androidx.compose.ui.text.TextStyle h4, optional androidx.compose.ui.text.TextStyle h5, optional androidx.compose.ui.text.TextStyle h6, optional androidx.compose.ui.text.TextStyle subtitle1, optional androidx.compose.ui.text.TextStyle subtitle2, optional androidx.compose.ui.text.TextStyle body1, optional androidx.compose.ui.text.TextStyle body2, optional androidx.compose.ui.text.TextStyle button, optional androidx.compose.ui.text.TextStyle caption, optional androidx.compose.ui.text.TextStyle overline);
+ method public androidx.compose.material.Typography copy(optional androidx.compose.ui.text.TextStyle h1, optional androidx.compose.ui.text.TextStyle h2, optional androidx.compose.ui.text.TextStyle h3, optional androidx.compose.ui.text.TextStyle h4, optional androidx.compose.ui.text.TextStyle h5, optional androidx.compose.ui.text.TextStyle h6, optional androidx.compose.ui.text.TextStyle subtitle1, optional androidx.compose.ui.text.TextStyle subtitle2, optional androidx.compose.ui.text.TextStyle body1, optional androidx.compose.ui.text.TextStyle body2, optional androidx.compose.ui.text.TextStyle button, optional androidx.compose.ui.text.TextStyle caption, optional androidx.compose.ui.text.TextStyle overline);
+ method public androidx.compose.ui.text.TextStyle getBody1();
+ method public androidx.compose.ui.text.TextStyle getBody2();
+ method public androidx.compose.ui.text.TextStyle getButton();
+ method public androidx.compose.ui.text.TextStyle getCaption();
+ method public androidx.compose.ui.text.TextStyle getH1();
+ method public androidx.compose.ui.text.TextStyle getH2();
+ method public androidx.compose.ui.text.TextStyle getH3();
+ method public androidx.compose.ui.text.TextStyle getH4();
+ method public androidx.compose.ui.text.TextStyle getH5();
+ method public androidx.compose.ui.text.TextStyle getH6();
+ method public androidx.compose.ui.text.TextStyle getOverline();
+ method public androidx.compose.ui.text.TextStyle getSubtitle1();
+ method public androidx.compose.ui.text.TextStyle getSubtitle2();
+ property public final androidx.compose.ui.text.TextStyle body1;
+ property public final androidx.compose.ui.text.TextStyle body2;
+ property public final androidx.compose.ui.text.TextStyle button;
+ property public final androidx.compose.ui.text.TextStyle caption;
+ property public final androidx.compose.ui.text.TextStyle h1;
+ property public final androidx.compose.ui.text.TextStyle h2;
+ property public final androidx.compose.ui.text.TextStyle h3;
+ property public final androidx.compose.ui.text.TextStyle h4;
+ property public final androidx.compose.ui.text.TextStyle h5;
+ property public final androidx.compose.ui.text.TextStyle h6;
+ property public final androidx.compose.ui.text.TextStyle overline;
+ property public final androidx.compose.ui.text.TextStyle subtitle1;
+ property public final androidx.compose.ui.text.TextStyle subtitle2;
+ }
+
+ public final class TypographyKt {
+ }
+
+}
+
+package androidx.compose.material.internal {
+
+ public final class ExposedDropdownMenuPopupKt {
+ }
+
+}
+
diff --git a/compose/material/material/api/res-1.2.0-beta02.txt b/compose/material/material/api/res-1.2.0-beta02.txt
new file mode 100644
index 0000000..e69de29
--- /dev/null
+++ b/compose/material/material/api/res-1.2.0-beta02.txt
diff --git a/compose/material/material/api/restricted_1.2.0-beta02.txt b/compose/material/material/api/restricted_1.2.0-beta02.txt
new file mode 100644
index 0000000..b5ba87a
--- /dev/null
+++ b/compose/material/material/api/restricted_1.2.0-beta02.txt
@@ -0,0 +1,670 @@
+// Signature format: 4.0
+package androidx.compose.material {
+
+ public final class AlertDialogKt {
+ }
+
+ public final class AndroidAlertDialog_androidKt {
+ method @androidx.compose.runtime.Composable public static void AlertDialog(kotlin.jvm.functions.Function0<kotlin.Unit> onDismissRequest, kotlin.jvm.functions.Function0<kotlin.Unit> confirmButton, optional androidx.compose.ui.Modifier modifier, optional kotlin.jvm.functions.Function0<kotlin.Unit>? dismissButton, optional kotlin.jvm.functions.Function0<kotlin.Unit>? title, optional kotlin.jvm.functions.Function0<kotlin.Unit>? text, optional androidx.compose.ui.graphics.Shape shape, optional long backgroundColor, optional long contentColor, optional androidx.compose.ui.window.DialogProperties properties);
+ method @androidx.compose.runtime.Composable public static void AlertDialog(kotlin.jvm.functions.Function0<kotlin.Unit> onDismissRequest, kotlin.jvm.functions.Function0<kotlin.Unit> buttons, optional androidx.compose.ui.Modifier modifier, optional kotlin.jvm.functions.Function0<kotlin.Unit>? title, optional kotlin.jvm.functions.Function0<kotlin.Unit>? text, optional androidx.compose.ui.graphics.Shape shape, optional long backgroundColor, optional long contentColor, optional androidx.compose.ui.window.DialogProperties properties);
+ }
+
+ public final class AndroidMenu_androidKt {
+ method @androidx.compose.runtime.Composable public static void DropdownMenu(boolean expanded, kotlin.jvm.functions.Function0<kotlin.Unit> onDismissRequest, optional androidx.compose.ui.Modifier modifier, optional long offset, optional androidx.compose.ui.window.PopupProperties properties, kotlin.jvm.functions.Function1<? super androidx.compose.foundation.layout.ColumnScope,kotlin.Unit> content);
+ method @androidx.compose.runtime.Composable public static void DropdownMenuItem(kotlin.jvm.functions.Function0<kotlin.Unit> onClick, optional androidx.compose.ui.Modifier modifier, optional boolean enabled, optional androidx.compose.foundation.layout.PaddingValues contentPadding, optional androidx.compose.foundation.interaction.MutableInteractionSource interactionSource, kotlin.jvm.functions.Function1<? super androidx.compose.foundation.layout.RowScope,kotlin.Unit> content);
+ }
+
+ public final class AppBarDefaults {
+ method public float getBottomAppBarElevation();
+ method public androidx.compose.foundation.layout.PaddingValues getContentPadding();
+ method public float getTopAppBarElevation();
+ property public final float BottomAppBarElevation;
+ property public final androidx.compose.foundation.layout.PaddingValues ContentPadding;
+ property public final float TopAppBarElevation;
+ field public static final androidx.compose.material.AppBarDefaults INSTANCE;
+ }
+
+ public final class AppBarKt {
+ method @androidx.compose.runtime.Composable public static void BottomAppBar(optional androidx.compose.ui.Modifier modifier, optional long backgroundColor, optional long contentColor, optional androidx.compose.ui.graphics.Shape? cutoutShape, optional float elevation, optional androidx.compose.foundation.layout.PaddingValues contentPadding, kotlin.jvm.functions.Function1<? super androidx.compose.foundation.layout.RowScope,kotlin.Unit> content);
+ method @androidx.compose.runtime.Composable public static void TopAppBar(kotlin.jvm.functions.Function0<kotlin.Unit> title, optional androidx.compose.ui.Modifier modifier, optional kotlin.jvm.functions.Function0<kotlin.Unit>? navigationIcon, optional kotlin.jvm.functions.Function1<? super androidx.compose.foundation.layout.RowScope,kotlin.Unit> actions, optional long backgroundColor, optional long contentColor, optional float elevation);
+ method @androidx.compose.runtime.Composable public static void TopAppBar(optional androidx.compose.ui.Modifier modifier, optional long backgroundColor, optional long contentColor, optional float elevation, optional androidx.compose.foundation.layout.PaddingValues contentPadding, kotlin.jvm.functions.Function1<? super androidx.compose.foundation.layout.RowScope,kotlin.Unit> content);
+ }
+
+ public final class BackdropScaffoldDefaults {
+ method public float getFrontLayerElevation();
+ method @androidx.compose.runtime.Composable public long getFrontLayerScrimColor();
+ method @androidx.compose.runtime.Composable public androidx.compose.ui.graphics.Shape getFrontLayerShape();
+ method public float getHeaderHeight();
+ method public float getPeekHeight();
+ property public final float FrontLayerElevation;
+ property public final float HeaderHeight;
+ property public final float PeekHeight;
+ property @androidx.compose.runtime.Composable public final long frontLayerScrimColor;
+ property @androidx.compose.runtime.Composable public final androidx.compose.ui.graphics.Shape frontLayerShape;
+ field public static final androidx.compose.material.BackdropScaffoldDefaults INSTANCE;
+ }
+
+ public final class BackdropScaffoldKt {
+ }
+
+ public final class BadgeKt {
+ method @androidx.compose.runtime.Composable public static void Badge(optional androidx.compose.ui.Modifier modifier, optional long backgroundColor, optional long contentColor, optional kotlin.jvm.functions.Function1<? super androidx.compose.foundation.layout.RowScope,kotlin.Unit>? content);
+ method @androidx.compose.runtime.Composable public static void BadgedBox(kotlin.jvm.functions.Function1<? super androidx.compose.foundation.layout.BoxScope,kotlin.Unit> badge, optional androidx.compose.ui.Modifier modifier, kotlin.jvm.functions.Function1<? super androidx.compose.foundation.layout.BoxScope,kotlin.Unit> content);
+ }
+
+ public final class BottomNavigationDefaults {
+ method public float getElevation();
+ property public final float Elevation;
+ field public static final androidx.compose.material.BottomNavigationDefaults INSTANCE;
+ }
+
+ public final class BottomNavigationKt {
+ method @androidx.compose.runtime.Composable public static void BottomNavigation(optional androidx.compose.ui.Modifier modifier, optional long backgroundColor, optional long contentColor, optional float elevation, kotlin.jvm.functions.Function1<? super androidx.compose.foundation.layout.RowScope,kotlin.Unit> content);
+ method @androidx.compose.runtime.Composable public static void BottomNavigationItem(androidx.compose.foundation.layout.RowScope, boolean selected, kotlin.jvm.functions.Function0<kotlin.Unit> onClick, kotlin.jvm.functions.Function0<kotlin.Unit> icon, optional androidx.compose.ui.Modifier modifier, optional boolean enabled, optional kotlin.jvm.functions.Function0<kotlin.Unit>? label, optional boolean alwaysShowLabel, optional androidx.compose.foundation.interaction.MutableInteractionSource interactionSource, optional long selectedContentColor, optional long unselectedContentColor);
+ }
+
+ public final class BottomSheetScaffoldDefaults {
+ method public float getSheetElevation();
+ method public float getSheetPeekHeight();
+ property public final float SheetElevation;
+ property public final float SheetPeekHeight;
+ field public static final androidx.compose.material.BottomSheetScaffoldDefaults INSTANCE;
+ }
+
+ public final class BottomSheetScaffoldKt {
+ }
+
+ @androidx.compose.runtime.Stable public interface ButtonColors {
+ method @androidx.compose.runtime.Composable public androidx.compose.runtime.State<androidx.compose.ui.graphics.Color> backgroundColor(boolean enabled);
+ method @androidx.compose.runtime.Composable public androidx.compose.runtime.State<androidx.compose.ui.graphics.Color> contentColor(boolean enabled);
+ }
+
+ public final class ButtonDefaults {
+ method @androidx.compose.runtime.Composable public androidx.compose.material.ButtonColors buttonColors(optional long backgroundColor, optional long contentColor, optional long disabledBackgroundColor, optional long disabledContentColor);
+ method @androidx.compose.runtime.Composable public androidx.compose.material.ButtonElevation elevation(optional float defaultElevation, optional float pressedElevation, optional float disabledElevation, optional float hoveredElevation, optional float focusedElevation);
+ method @Deprecated @androidx.compose.runtime.Composable public androidx.compose.material.ButtonElevation! elevation(optional float defaultElevation, optional float pressedElevation, optional float disabledElevation);
+ method public androidx.compose.foundation.layout.PaddingValues getContentPadding();
+ method public float getIconSize();
+ method public float getIconSpacing();
+ method public float getMinHeight();
+ method public float getMinWidth();
+ method @androidx.compose.runtime.Composable public androidx.compose.foundation.BorderStroke getOutlinedBorder();
+ method public float getOutlinedBorderSize();
+ method public androidx.compose.foundation.layout.PaddingValues getTextButtonContentPadding();
+ method @androidx.compose.runtime.Composable public androidx.compose.material.ButtonColors outlinedButtonColors(optional long backgroundColor, optional long contentColor, optional long disabledContentColor);
+ method @androidx.compose.runtime.Composable public androidx.compose.material.ButtonColors textButtonColors(optional long backgroundColor, optional long contentColor, optional long disabledContentColor);
+ property public final androidx.compose.foundation.layout.PaddingValues ContentPadding;
+ property public final float IconSize;
+ property public final float IconSpacing;
+ property public final float MinHeight;
+ property public final float MinWidth;
+ property public final float OutlinedBorderSize;
+ property public final androidx.compose.foundation.layout.PaddingValues TextButtonContentPadding;
+ property @androidx.compose.runtime.Composable public final androidx.compose.foundation.BorderStroke outlinedBorder;
+ field public static final androidx.compose.material.ButtonDefaults INSTANCE;
+ field public static final float OutlinedBorderOpacity = 0.12f;
+ }
+
+ @androidx.compose.runtime.Stable public interface ButtonElevation {
+ method @androidx.compose.runtime.Composable public androidx.compose.runtime.State<androidx.compose.ui.unit.Dp> elevation(boolean enabled, androidx.compose.foundation.interaction.InteractionSource interactionSource);
+ }
+
+ public final class ButtonKt {
+ method @androidx.compose.runtime.Composable public static void Button(kotlin.jvm.functions.Function0<kotlin.Unit> onClick, optional androidx.compose.ui.Modifier modifier, optional boolean enabled, optional androidx.compose.foundation.interaction.MutableInteractionSource interactionSource, optional androidx.compose.material.ButtonElevation? elevation, optional androidx.compose.ui.graphics.Shape shape, optional androidx.compose.foundation.BorderStroke? border, optional androidx.compose.material.ButtonColors colors, optional androidx.compose.foundation.layout.PaddingValues contentPadding, kotlin.jvm.functions.Function1<? super androidx.compose.foundation.layout.RowScope,kotlin.Unit> content);
+ method @androidx.compose.runtime.Composable @androidx.compose.runtime.NonRestartableComposable public static void OutlinedButton(kotlin.jvm.functions.Function0<kotlin.Unit> onClick, optional androidx.compose.ui.Modifier modifier, optional boolean enabled, optional androidx.compose.foundation.interaction.MutableInteractionSource interactionSource, optional androidx.compose.material.ButtonElevation? elevation, optional androidx.compose.ui.graphics.Shape shape, optional androidx.compose.foundation.BorderStroke? border, optional androidx.compose.material.ButtonColors colors, optional androidx.compose.foundation.layout.PaddingValues contentPadding, kotlin.jvm.functions.Function1<? super androidx.compose.foundation.layout.RowScope,kotlin.Unit> content);
+ method @androidx.compose.runtime.Composable @androidx.compose.runtime.NonRestartableComposable public static void TextButton(kotlin.jvm.functions.Function0<kotlin.Unit> onClick, optional androidx.compose.ui.Modifier modifier, optional boolean enabled, optional androidx.compose.foundation.interaction.MutableInteractionSource interactionSource, optional androidx.compose.material.ButtonElevation? elevation, optional androidx.compose.ui.graphics.Shape shape, optional androidx.compose.foundation.BorderStroke? border, optional androidx.compose.material.ButtonColors colors, optional androidx.compose.foundation.layout.PaddingValues contentPadding, kotlin.jvm.functions.Function1<? super androidx.compose.foundation.layout.RowScope,kotlin.Unit> content);
+ }
+
+ public final class CardKt {
+ method @androidx.compose.runtime.Composable @androidx.compose.runtime.NonRestartableComposable public static void Card(optional androidx.compose.ui.Modifier modifier, optional androidx.compose.ui.graphics.Shape shape, optional long backgroundColor, optional long contentColor, optional androidx.compose.foundation.BorderStroke? border, optional float elevation, kotlin.jvm.functions.Function0<kotlin.Unit> content);
+ }
+
+ @androidx.compose.runtime.Stable public interface CheckboxColors {
+ method @androidx.compose.runtime.Composable public androidx.compose.runtime.State<androidx.compose.ui.graphics.Color> borderColor(boolean enabled, androidx.compose.ui.state.ToggleableState state);
+ method @androidx.compose.runtime.Composable public androidx.compose.runtime.State<androidx.compose.ui.graphics.Color> boxColor(boolean enabled, androidx.compose.ui.state.ToggleableState state);
+ method @androidx.compose.runtime.Composable public androidx.compose.runtime.State<androidx.compose.ui.graphics.Color> checkmarkColor(androidx.compose.ui.state.ToggleableState state);
+ }
+
+ public final class CheckboxDefaults {
+ method @androidx.compose.runtime.Composable public androidx.compose.material.CheckboxColors colors(optional long checkedColor, optional long uncheckedColor, optional long checkmarkColor, optional long disabledColor, optional long disabledIndeterminateColor);
+ field public static final androidx.compose.material.CheckboxDefaults INSTANCE;
+ }
+
+ public final class CheckboxKt {
+ method @androidx.compose.runtime.Composable public static void Checkbox(boolean checked, kotlin.jvm.functions.Function1<? super java.lang.Boolean,kotlin.Unit>? onCheckedChange, optional androidx.compose.ui.Modifier modifier, optional boolean enabled, optional androidx.compose.foundation.interaction.MutableInteractionSource interactionSource, optional androidx.compose.material.CheckboxColors colors);
+ method @androidx.compose.runtime.Composable public static void TriStateCheckbox(androidx.compose.ui.state.ToggleableState state, kotlin.jvm.functions.Function0<kotlin.Unit>? onClick, optional androidx.compose.ui.Modifier modifier, optional boolean enabled, optional androidx.compose.foundation.interaction.MutableInteractionSource interactionSource, optional androidx.compose.material.CheckboxColors colors);
+ }
+
+ public final class ChipKt {
+ }
+
+ @androidx.compose.runtime.Stable public final class Colors {
+ ctor public Colors(long primary, long primaryVariant, long secondary, long secondaryVariant, long background, long surface, long error, long onPrimary, long onSecondary, long onBackground, long onSurface, long onError, boolean isLight);
+ method public androidx.compose.material.Colors copy(optional long primary, optional long primaryVariant, optional long secondary, optional long secondaryVariant, optional long background, optional long surface, optional long error, optional long onPrimary, optional long onSecondary, optional long onBackground, optional long onSurface, optional long onError, optional boolean isLight);
+ method public long getBackground();
+ 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 final long background;
+ property public final long error;
+ property public final boolean isLight;
+ property public final long onBackground;
+ property public final long onError;
+ property public final long onPrimary;
+ property public final long onSecondary;
+ property public final long onSurface;
+ property public final long primary;
+ property public final long primaryVariant;
+ property public final long secondary;
+ property public final long secondaryVariant;
+ property public final long surface;
+ }
+
+ public final class ColorsKt {
+ method public static long contentColorFor(androidx.compose.material.Colors, long backgroundColor);
+ method @androidx.compose.runtime.Composable @androidx.compose.runtime.ReadOnlyComposable public static long contentColorFor(long backgroundColor);
+ method public static androidx.compose.material.Colors darkColors(optional long primary, optional long primaryVariant, optional long secondary, optional long secondaryVariant, optional long background, optional long surface, optional long error, optional long onPrimary, optional long onSecondary, optional long onBackground, optional long onSurface, optional long onError);
+ method public static long getPrimarySurface(androidx.compose.material.Colors);
+ method public static androidx.compose.material.Colors lightColors(optional long primary, optional long primaryVariant, optional long secondary, optional long secondaryVariant, optional long background, optional long surface, optional long error, optional long onPrimary, optional long onSecondary, optional long onBackground, optional long onSurface, optional long onError);
+ }
+
+ public final class ContentAlpha {
+ method @androidx.compose.runtime.Composable public float getDisabled();
+ method @androidx.compose.runtime.Composable public float getHigh();
+ method @androidx.compose.runtime.Composable public float getMedium();
+ property @androidx.compose.runtime.Composable public final float disabled;
+ property @androidx.compose.runtime.Composable public final float high;
+ property @androidx.compose.runtime.Composable public final float medium;
+ field public static final androidx.compose.material.ContentAlpha INSTANCE;
+ }
+
+ public final class ContentAlphaKt {
+ method public static androidx.compose.runtime.ProvidableCompositionLocal<java.lang.Float> getLocalContentAlpha();
+ property public static final androidx.compose.runtime.ProvidableCompositionLocal<java.lang.Float> LocalContentAlpha;
+ }
+
+ public final class ContentColorKt {
+ method public static androidx.compose.runtime.ProvidableCompositionLocal<androidx.compose.ui.graphics.Color> getLocalContentColor();
+ property public static final androidx.compose.runtime.ProvidableCompositionLocal<androidx.compose.ui.graphics.Color> LocalContentColor;
+ }
+
+ public enum DismissDirection {
+ enum_constant public static final androidx.compose.material.DismissDirection EndToStart;
+ enum_constant public static final androidx.compose.material.DismissDirection StartToEnd;
+ }
+
+ public enum DismissValue {
+ enum_constant public static final androidx.compose.material.DismissValue Default;
+ enum_constant public static final androidx.compose.material.DismissValue DismissedToEnd;
+ enum_constant public static final androidx.compose.material.DismissValue DismissedToStart;
+ }
+
+ public final class DividerKt {
+ method @androidx.compose.runtime.Composable public static void Divider(optional androidx.compose.ui.Modifier modifier, optional long color, optional float thickness, optional float startIndent);
+ }
+
+ public final class DragGestureDetectorCopyKt {
+ }
+
+ public final class DrawerDefaults {
+ method public float getElevation();
+ method @androidx.compose.runtime.Composable public long getScrimColor();
+ property public final float Elevation;
+ property @androidx.compose.runtime.Composable public final long scrimColor;
+ field public static final androidx.compose.material.DrawerDefaults INSTANCE;
+ field public static final float ScrimOpacity = 0.32f;
+ }
+
+ public final class DrawerKt {
+ method @androidx.compose.runtime.Composable public static void ModalDrawer(kotlin.jvm.functions.Function1<? super androidx.compose.foundation.layout.ColumnScope,kotlin.Unit> drawerContent, optional androidx.compose.ui.Modifier modifier, optional androidx.compose.material.DrawerState drawerState, optional boolean gesturesEnabled, optional androidx.compose.ui.graphics.Shape drawerShape, optional float drawerElevation, optional long drawerBackgroundColor, optional long drawerContentColor, optional long scrimColor, kotlin.jvm.functions.Function0<kotlin.Unit> content);
+ method @androidx.compose.runtime.Composable public static androidx.compose.material.DrawerState rememberDrawerState(androidx.compose.material.DrawerValue initialValue, optional kotlin.jvm.functions.Function1<? super androidx.compose.material.DrawerValue,java.lang.Boolean> confirmStateChange);
+ }
+
+ @androidx.compose.runtime.Stable public final class DrawerState {
+ ctor public DrawerState(androidx.compose.material.DrawerValue initialValue, optional kotlin.jvm.functions.Function1<? super androidx.compose.material.DrawerValue,java.lang.Boolean> confirmStateChange);
+ method public suspend Object? close(kotlin.coroutines.Continuation<? super kotlin.Unit>);
+ method public androidx.compose.material.DrawerValue getCurrentValue();
+ method public boolean isAnimationRunning();
+ method public boolean isClosed();
+ method public boolean isOpen();
+ method public suspend Object? open(kotlin.coroutines.Continuation<? super kotlin.Unit>);
+ property public final androidx.compose.material.DrawerValue currentValue;
+ property public final boolean isAnimationRunning;
+ property public final boolean isClosed;
+ property public final boolean isOpen;
+ field public static final androidx.compose.material.DrawerState.Companion Companion;
+ }
+
+ public static final class DrawerState.Companion {
+ method public androidx.compose.runtime.saveable.Saver<androidx.compose.material.DrawerState,androidx.compose.material.DrawerValue> Saver(kotlin.jvm.functions.Function1<? super androidx.compose.material.DrawerValue,java.lang.Boolean> confirmStateChange);
+ }
+
+ public enum DrawerValue {
+ enum_constant public static final androidx.compose.material.DrawerValue Closed;
+ enum_constant public static final androidx.compose.material.DrawerValue Open;
+ }
+
+ public final class ElevationKt {
+ }
+
+ public interface ElevationOverlay {
+ method @androidx.compose.runtime.Composable public long apply(long color, float elevation);
+ }
+
+ public final class ElevationOverlayKt {
+ method public static androidx.compose.runtime.ProvidableCompositionLocal<androidx.compose.ui.unit.Dp> getLocalAbsoluteElevation();
+ method public static androidx.compose.runtime.ProvidableCompositionLocal<androidx.compose.material.ElevationOverlay> getLocalElevationOverlay();
+ property public static final androidx.compose.runtime.ProvidableCompositionLocal<androidx.compose.ui.unit.Dp> LocalAbsoluteElevation;
+ property public static final androidx.compose.runtime.ProvidableCompositionLocal<androidx.compose.material.ElevationOverlay> LocalElevationOverlay;
+ }
+
+ public final class ExposedDropdownMenuKt {
+ }
+
+ @kotlin.jvm.JvmInline public final value class FabPosition {
+ field public static final androidx.compose.material.FabPosition.Companion Companion;
+ }
+
+ public static final class FabPosition.Companion {
+ method public int getCenter();
+ method public int getEnd();
+ property public final int Center;
+ property public final int End;
+ }
+
+ public final class FloatingActionButtonDefaults {
+ method @androidx.compose.runtime.Composable public androidx.compose.material.FloatingActionButtonElevation elevation(optional float defaultElevation, optional float pressedElevation, optional float hoveredElevation, optional float focusedElevation);
+ method @Deprecated @androidx.compose.runtime.Composable public androidx.compose.material.FloatingActionButtonElevation! elevation(optional float defaultElevation, optional float pressedElevation);
+ field public static final androidx.compose.material.FloatingActionButtonDefaults INSTANCE;
+ }
+
+ @androidx.compose.runtime.Stable public interface FloatingActionButtonElevation {
+ method @androidx.compose.runtime.Composable public androidx.compose.runtime.State<androidx.compose.ui.unit.Dp> elevation(androidx.compose.foundation.interaction.InteractionSource interactionSource);
+ }
+
+ public final class FloatingActionButtonKt {
+ method @androidx.compose.runtime.Composable public static void ExtendedFloatingActionButton(kotlin.jvm.functions.Function0<kotlin.Unit> text, kotlin.jvm.functions.Function0<kotlin.Unit> onClick, optional androidx.compose.ui.Modifier modifier, optional kotlin.jvm.functions.Function0<kotlin.Unit>? icon, optional androidx.compose.foundation.interaction.MutableInteractionSource interactionSource, optional androidx.compose.ui.graphics.Shape shape, optional long backgroundColor, optional long contentColor, optional androidx.compose.material.FloatingActionButtonElevation elevation);
+ method @androidx.compose.runtime.Composable public static void FloatingActionButton(kotlin.jvm.functions.Function0<kotlin.Unit> onClick, optional androidx.compose.ui.Modifier modifier, optional androidx.compose.foundation.interaction.MutableInteractionSource interactionSource, optional androidx.compose.ui.graphics.Shape shape, optional long backgroundColor, optional long contentColor, optional androidx.compose.material.FloatingActionButtonElevation elevation, kotlin.jvm.functions.Function0<kotlin.Unit> content);
+ }
+
+ public final class IconButtonKt {
+ method @androidx.compose.runtime.Composable public static void IconButton(kotlin.jvm.functions.Function0<kotlin.Unit> onClick, optional androidx.compose.ui.Modifier modifier, optional boolean enabled, optional androidx.compose.foundation.interaction.MutableInteractionSource interactionSource, kotlin.jvm.functions.Function0<kotlin.Unit> content);
+ method @androidx.compose.runtime.Composable public static void IconToggleButton(boolean checked, kotlin.jvm.functions.Function1<? super java.lang.Boolean,kotlin.Unit> onCheckedChange, optional androidx.compose.ui.Modifier modifier, optional boolean enabled, optional androidx.compose.foundation.interaction.MutableInteractionSource interactionSource, kotlin.jvm.functions.Function0<kotlin.Unit> content);
+ }
+
+ public final class IconKt {
+ method @androidx.compose.runtime.Composable @androidx.compose.runtime.NonRestartableComposable public static void Icon(androidx.compose.ui.graphics.vector.ImageVector imageVector, String? contentDescription, optional androidx.compose.ui.Modifier modifier, optional long tint);
+ method @androidx.compose.runtime.Composable @androidx.compose.runtime.NonRestartableComposable public static void Icon(androidx.compose.ui.graphics.ImageBitmap bitmap, String? contentDescription, optional androidx.compose.ui.Modifier modifier, optional long tint);
+ method @androidx.compose.runtime.Composable public static void Icon(androidx.compose.ui.graphics.painter.Painter painter, String? contentDescription, optional androidx.compose.ui.Modifier modifier, optional long tint);
+ }
+
+ public final class ListItemKt {
+ }
+
+ public final class MaterialTextSelectionColorsKt {
+ }
+
+ public final class MaterialTheme {
+ method @androidx.compose.runtime.Composable @androidx.compose.runtime.ReadOnlyComposable public androidx.compose.material.Colors getColors();
+ method @androidx.compose.runtime.Composable @androidx.compose.runtime.ReadOnlyComposable public androidx.compose.material.Shapes getShapes();
+ method @androidx.compose.runtime.Composable @androidx.compose.runtime.ReadOnlyComposable public androidx.compose.material.Typography getTypography();
+ property @androidx.compose.runtime.Composable @androidx.compose.runtime.ReadOnlyComposable public final androidx.compose.material.Colors colors;
+ property @androidx.compose.runtime.Composable @androidx.compose.runtime.ReadOnlyComposable public final androidx.compose.material.Shapes shapes;
+ property @androidx.compose.runtime.Composable @androidx.compose.runtime.ReadOnlyComposable public final androidx.compose.material.Typography typography;
+ field public static final androidx.compose.material.MaterialTheme INSTANCE;
+ }
+
+ public final class MaterialThemeKt {
+ method @androidx.compose.runtime.Composable public static void MaterialTheme(optional androidx.compose.material.Colors colors, optional androidx.compose.material.Typography typography, optional androidx.compose.material.Shapes shapes, kotlin.jvm.functions.Function0<kotlin.Unit> content);
+ }
+
+ public final class MaterialTheme_androidKt {
+ }
+
+ public final class MenuDefaults {
+ method public androidx.compose.foundation.layout.PaddingValues getDropdownMenuItemContentPadding();
+ property public final androidx.compose.foundation.layout.PaddingValues DropdownMenuItemContentPadding;
+ field public static final androidx.compose.material.MenuDefaults INSTANCE;
+ }
+
+ public final class MenuKt {
+ }
+
+ public final class ModalBottomSheetDefaults {
+ method public float getElevation();
+ method @androidx.compose.runtime.Composable public long getScrimColor();
+ property public final float Elevation;
+ property @androidx.compose.runtime.Composable public final long scrimColor;
+ field public static final androidx.compose.material.ModalBottomSheetDefaults INSTANCE;
+ }
+
+ public final class ModalBottomSheetKt {
+ }
+
+ public final class NavigationRailDefaults {
+ method public float getElevation();
+ property public final float Elevation;
+ field public static final androidx.compose.material.NavigationRailDefaults INSTANCE;
+ }
+
+ public final class NavigationRailKt {
+ method @androidx.compose.runtime.Composable public static void NavigationRail(optional androidx.compose.ui.Modifier modifier, optional long backgroundColor, optional long contentColor, optional float elevation, optional kotlin.jvm.functions.Function1<? super androidx.compose.foundation.layout.ColumnScope,kotlin.Unit>? header, kotlin.jvm.functions.Function1<? super androidx.compose.foundation.layout.ColumnScope,kotlin.Unit> content);
+ method @androidx.compose.runtime.Composable public static void NavigationRailItem(boolean selected, kotlin.jvm.functions.Function0<kotlin.Unit> onClick, kotlin.jvm.functions.Function0<kotlin.Unit> icon, optional androidx.compose.ui.Modifier modifier, optional boolean enabled, optional kotlin.jvm.functions.Function0<kotlin.Unit>? label, optional boolean alwaysShowLabel, optional androidx.compose.foundation.interaction.MutableInteractionSource interactionSource, optional long selectedContentColor, optional long unselectedContentColor);
+ }
+
+ public final class OutlinedTextFieldKt {
+ method @androidx.compose.runtime.Composable public static void OutlinedTextField(String value, kotlin.jvm.functions.Function1<? super java.lang.String,kotlin.Unit> onValueChange, optional androidx.compose.ui.Modifier modifier, optional boolean enabled, optional boolean readOnly, optional androidx.compose.ui.text.TextStyle textStyle, optional kotlin.jvm.functions.Function0<kotlin.Unit>? label, optional kotlin.jvm.functions.Function0<kotlin.Unit>? placeholder, optional kotlin.jvm.functions.Function0<kotlin.Unit>? leadingIcon, optional kotlin.jvm.functions.Function0<kotlin.Unit>? trailingIcon, optional boolean isError, optional androidx.compose.ui.text.input.VisualTransformation visualTransformation, optional androidx.compose.foundation.text.KeyboardOptions keyboardOptions, optional androidx.compose.foundation.text.KeyboardActions keyboardActions, optional boolean singleLine, optional int maxLines, optional androidx.compose.foundation.interaction.MutableInteractionSource interactionSource, optional androidx.compose.ui.graphics.Shape shape, optional androidx.compose.material.TextFieldColors colors);
+ method @androidx.compose.runtime.Composable public static void OutlinedTextField(androidx.compose.ui.text.input.TextFieldValue value, kotlin.jvm.functions.Function1<? super androidx.compose.ui.text.input.TextFieldValue,kotlin.Unit> onValueChange, optional androidx.compose.ui.Modifier modifier, optional boolean enabled, optional boolean readOnly, optional androidx.compose.ui.text.TextStyle textStyle, optional kotlin.jvm.functions.Function0<kotlin.Unit>? label, optional kotlin.jvm.functions.Function0<kotlin.Unit>? placeholder, optional kotlin.jvm.functions.Function0<kotlin.Unit>? leadingIcon, optional kotlin.jvm.functions.Function0<kotlin.Unit>? trailingIcon, optional boolean isError, optional androidx.compose.ui.text.input.VisualTransformation visualTransformation, optional androidx.compose.foundation.text.KeyboardOptions keyboardOptions, optional androidx.compose.foundation.text.KeyboardActions keyboardActions, optional boolean singleLine, optional int maxLines, optional androidx.compose.foundation.interaction.MutableInteractionSource interactionSource, optional androidx.compose.ui.graphics.Shape shape, optional androidx.compose.material.TextFieldColors colors);
+ }
+
+ public final class ProgressIndicatorDefaults {
+ method public androidx.compose.animation.core.SpringSpec<java.lang.Float> getProgressAnimationSpec();
+ method public float getStrokeWidth();
+ property public final androidx.compose.animation.core.SpringSpec<java.lang.Float> ProgressAnimationSpec;
+ property public final float StrokeWidth;
+ field public static final androidx.compose.material.ProgressIndicatorDefaults INSTANCE;
+ field public static final float IndicatorBackgroundOpacity = 0.24f;
+ }
+
+ public final class ProgressIndicatorKt {
+ method @androidx.compose.runtime.Composable public static void CircularProgressIndicator(float progress, optional androidx.compose.ui.Modifier modifier, optional long color, optional float strokeWidth);
+ method @androidx.compose.runtime.Composable public static void CircularProgressIndicator(optional androidx.compose.ui.Modifier modifier, optional long color, optional float strokeWidth);
+ method @androidx.compose.runtime.Composable public static void LinearProgressIndicator(float progress, optional androidx.compose.ui.Modifier modifier, optional long color, optional long backgroundColor);
+ method @androidx.compose.runtime.Composable public static void LinearProgressIndicator(optional androidx.compose.ui.Modifier modifier, optional long color, optional long backgroundColor);
+ }
+
+ @androidx.compose.runtime.Stable public interface RadioButtonColors {
+ method @androidx.compose.runtime.Composable public androidx.compose.runtime.State<androidx.compose.ui.graphics.Color> radioColor(boolean enabled, boolean selected);
+ }
+
+ public final class RadioButtonDefaults {
+ method @androidx.compose.runtime.Composable public androidx.compose.material.RadioButtonColors colors(optional long selectedColor, optional long unselectedColor, optional long disabledColor);
+ field public static final androidx.compose.material.RadioButtonDefaults INSTANCE;
+ }
+
+ public final class RadioButtonKt {
+ method @androidx.compose.runtime.Composable public static void RadioButton(boolean selected, kotlin.jvm.functions.Function0<kotlin.Unit>? onClick, optional androidx.compose.ui.Modifier modifier, optional boolean enabled, optional androidx.compose.foundation.interaction.MutableInteractionSource interactionSource, optional androidx.compose.material.RadioButtonColors colors);
+ }
+
+ @androidx.compose.runtime.Immutable public final class ResistanceConfig {
+ ctor public ResistanceConfig(float basis, optional float factorAtMin, optional float factorAtMax);
+ method public float computeResistance(float overflow);
+ method public float getBasis();
+ method public float getFactorAtMax();
+ method public float getFactorAtMin();
+ property public final float basis;
+ property public final float factorAtMax;
+ property public final float factorAtMin;
+ }
+
+ public final class ScaffoldKt {
+ method @androidx.compose.runtime.Composable public static void Scaffold(optional androidx.compose.ui.Modifier modifier, optional androidx.compose.material.ScaffoldState scaffoldState, optional kotlin.jvm.functions.Function0<kotlin.Unit> topBar, optional kotlin.jvm.functions.Function0<kotlin.Unit> bottomBar, optional kotlin.jvm.functions.Function1<? super androidx.compose.material.SnackbarHostState,kotlin.Unit> snackbarHost, optional kotlin.jvm.functions.Function0<kotlin.Unit> floatingActionButton, optional int floatingActionButtonPosition, optional boolean isFloatingActionButtonDocked, optional kotlin.jvm.functions.Function1<? super androidx.compose.foundation.layout.ColumnScope,kotlin.Unit>? drawerContent, optional boolean drawerGesturesEnabled, optional androidx.compose.ui.graphics.Shape drawerShape, optional float drawerElevation, optional long drawerBackgroundColor, optional long drawerContentColor, optional long drawerScrimColor, optional long backgroundColor, optional long contentColor, kotlin.jvm.functions.Function1<? super androidx.compose.foundation.layout.PaddingValues,kotlin.Unit> content);
+ method @androidx.compose.runtime.Composable public static androidx.compose.material.ScaffoldState rememberScaffoldState(optional androidx.compose.material.DrawerState drawerState, optional androidx.compose.material.SnackbarHostState snackbarHostState);
+ }
+
+ @androidx.compose.runtime.Stable public final class ScaffoldState {
+ ctor public ScaffoldState(androidx.compose.material.DrawerState drawerState, androidx.compose.material.SnackbarHostState snackbarHostState);
+ method public androidx.compose.material.DrawerState getDrawerState();
+ method public androidx.compose.material.SnackbarHostState getSnackbarHostState();
+ property public final androidx.compose.material.DrawerState drawerState;
+ property public final androidx.compose.material.SnackbarHostState snackbarHostState;
+ }
+
+ @androidx.compose.runtime.Immutable public final class Shapes {
+ ctor public Shapes(optional androidx.compose.foundation.shape.CornerBasedShape small, optional androidx.compose.foundation.shape.CornerBasedShape medium, optional androidx.compose.foundation.shape.CornerBasedShape large);
+ method public androidx.compose.material.Shapes copy(optional androidx.compose.foundation.shape.CornerBasedShape small, optional androidx.compose.foundation.shape.CornerBasedShape medium, optional androidx.compose.foundation.shape.CornerBasedShape large);
+ method public androidx.compose.foundation.shape.CornerBasedShape getLarge();
+ method public androidx.compose.foundation.shape.CornerBasedShape getMedium();
+ method public androidx.compose.foundation.shape.CornerBasedShape getSmall();
+ property public final androidx.compose.foundation.shape.CornerBasedShape large;
+ property public final androidx.compose.foundation.shape.CornerBasedShape medium;
+ property public final androidx.compose.foundation.shape.CornerBasedShape small;
+ }
+
+ public final class ShapesKt {
+ }
+
+ @androidx.compose.runtime.Stable public interface SliderColors {
+ method @androidx.compose.runtime.Composable public androidx.compose.runtime.State<androidx.compose.ui.graphics.Color> thumbColor(boolean enabled);
+ method @androidx.compose.runtime.Composable public androidx.compose.runtime.State<androidx.compose.ui.graphics.Color> tickColor(boolean enabled, boolean active);
+ method @androidx.compose.runtime.Composable public androidx.compose.runtime.State<androidx.compose.ui.graphics.Color> trackColor(boolean enabled, boolean active);
+ }
+
+ public final class SliderDefaults {
+ method @androidx.compose.runtime.Composable public androidx.compose.material.SliderColors colors(optional long thumbColor, optional long disabledThumbColor, optional long activeTrackColor, optional long inactiveTrackColor, optional long disabledActiveTrackColor, optional long disabledInactiveTrackColor, optional long activeTickColor, optional long inactiveTickColor, optional long disabledActiveTickColor, optional long disabledInactiveTickColor);
+ field public static final float DisabledActiveTrackAlpha = 0.32f;
+ field public static final float DisabledInactiveTrackAlpha = 0.12f;
+ field public static final float DisabledTickAlpha = 0.12f;
+ field public static final androidx.compose.material.SliderDefaults INSTANCE;
+ field public static final float InactiveTrackAlpha = 0.24f;
+ field public static final float TickAlpha = 0.54f;
+ }
+
+ public final class SliderKt {
+ method @androidx.compose.runtime.Composable public static void Slider(float value, kotlin.jvm.functions.Function1<? super java.lang.Float,kotlin.Unit> onValueChange, optional androidx.compose.ui.Modifier modifier, optional boolean enabled, optional kotlin.ranges.ClosedFloatingPointRange<java.lang.Float> valueRange, optional int steps, optional kotlin.jvm.functions.Function0<kotlin.Unit>? onValueChangeFinished, optional androidx.compose.foundation.interaction.MutableInteractionSource interactionSource, optional androidx.compose.material.SliderColors colors);
+ }
+
+ public interface SnackbarData {
+ method public void dismiss();
+ method public String? getActionLabel();
+ method public androidx.compose.material.SnackbarDuration getDuration();
+ method public String getMessage();
+ method public void performAction();
+ property public abstract String? actionLabel;
+ property public abstract androidx.compose.material.SnackbarDuration duration;
+ property public abstract String message;
+ }
+
+ public final class SnackbarDefaults {
+ method @androidx.compose.runtime.Composable public long getBackgroundColor();
+ method @androidx.compose.runtime.Composable public long getPrimaryActionColor();
+ property @androidx.compose.runtime.Composable public final long backgroundColor;
+ property @androidx.compose.runtime.Composable public final long primaryActionColor;
+ field public static final androidx.compose.material.SnackbarDefaults INSTANCE;
+ }
+
+ public enum SnackbarDuration {
+ enum_constant public static final androidx.compose.material.SnackbarDuration Indefinite;
+ enum_constant public static final androidx.compose.material.SnackbarDuration Long;
+ enum_constant public static final androidx.compose.material.SnackbarDuration Short;
+ }
+
+ public final class SnackbarHostKt {
+ method @androidx.compose.runtime.Composable public static void SnackbarHost(androidx.compose.material.SnackbarHostState hostState, optional androidx.compose.ui.Modifier modifier, optional kotlin.jvm.functions.Function1<? super androidx.compose.material.SnackbarData,kotlin.Unit> snackbar);
+ }
+
+ @androidx.compose.runtime.Stable public final class SnackbarHostState {
+ ctor public SnackbarHostState();
+ method public androidx.compose.material.SnackbarData? getCurrentSnackbarData();
+ method public suspend Object? showSnackbar(String message, optional String? actionLabel, optional androidx.compose.material.SnackbarDuration duration, optional kotlin.coroutines.Continuation<? super androidx.compose.material.SnackbarResult>);
+ property public final androidx.compose.material.SnackbarData? currentSnackbarData;
+ }
+
+ public final class SnackbarKt {
+ method @androidx.compose.runtime.Composable public static void Snackbar(optional androidx.compose.ui.Modifier modifier, optional kotlin.jvm.functions.Function0<kotlin.Unit>? action, optional boolean actionOnNewLine, optional androidx.compose.ui.graphics.Shape shape, optional long backgroundColor, optional long contentColor, optional float elevation, kotlin.jvm.functions.Function0<kotlin.Unit> content);
+ method @androidx.compose.runtime.Composable public static void Snackbar(androidx.compose.material.SnackbarData snackbarData, optional androidx.compose.ui.Modifier modifier, optional boolean actionOnNewLine, optional androidx.compose.ui.graphics.Shape shape, optional long backgroundColor, optional long contentColor, optional long actionColor, optional float elevation);
+ }
+
+ public enum SnackbarResult {
+ enum_constant public static final androidx.compose.material.SnackbarResult ActionPerformed;
+ enum_constant public static final androidx.compose.material.SnackbarResult Dismissed;
+ }
+
+ public final class Strings_androidKt {
+ }
+
+ public final class SurfaceKt {
+ method @androidx.compose.runtime.Composable public static void Surface(optional androidx.compose.ui.Modifier modifier, optional androidx.compose.ui.graphics.Shape shape, optional long color, optional long contentColor, optional androidx.compose.foundation.BorderStroke? border, optional float elevation, kotlin.jvm.functions.Function0<kotlin.Unit> content);
+ }
+
+ public final class SwipeToDismissKt {
+ }
+
+ public final class SwipeableDefaults {
+ method public androidx.compose.animation.core.SpringSpec<java.lang.Float> getAnimationSpec();
+ method public float getVelocityThreshold();
+ method public androidx.compose.material.ResistanceConfig? resistanceConfig(java.util.Set<java.lang.Float> anchors, optional float factorAtMin, optional float factorAtMax);
+ property public final androidx.compose.animation.core.SpringSpec<java.lang.Float> AnimationSpec;
+ property public final float VelocityThreshold;
+ field public static final androidx.compose.material.SwipeableDefaults INSTANCE;
+ field public static final float StandardResistanceFactor = 10.0f;
+ field public static final float StiffResistanceFactor = 20.0f;
+ }
+
+ public final class SwipeableKt {
+ }
+
+ @androidx.compose.runtime.Stable public interface SwitchColors {
+ method @androidx.compose.runtime.Composable public androidx.compose.runtime.State<androidx.compose.ui.graphics.Color> thumbColor(boolean enabled, boolean checked);
+ method @androidx.compose.runtime.Composable public androidx.compose.runtime.State<androidx.compose.ui.graphics.Color> trackColor(boolean enabled, boolean checked);
+ }
+
+ public final class SwitchDefaults {
+ method @androidx.compose.runtime.Composable public androidx.compose.material.SwitchColors colors(optional long checkedThumbColor, optional long checkedTrackColor, optional float checkedTrackAlpha, optional long uncheckedThumbColor, optional long uncheckedTrackColor, optional float uncheckedTrackAlpha, optional long disabledCheckedThumbColor, optional long disabledCheckedTrackColor, optional long disabledUncheckedThumbColor, optional long disabledUncheckedTrackColor);
+ field public static final androidx.compose.material.SwitchDefaults INSTANCE;
+ }
+
+ public final class SwitchKt {
+ method @androidx.compose.runtime.Composable public static void Switch(boolean checked, kotlin.jvm.functions.Function1<? super java.lang.Boolean,kotlin.Unit>? onCheckedChange, optional androidx.compose.ui.Modifier modifier, optional boolean enabled, optional androidx.compose.foundation.interaction.MutableInteractionSource interactionSource, optional androidx.compose.material.SwitchColors colors);
+ }
+
+ public final class TabKt {
+ method @androidx.compose.runtime.Composable public static void LeadingIconTab(boolean selected, kotlin.jvm.functions.Function0<kotlin.Unit> onClick, kotlin.jvm.functions.Function0<kotlin.Unit> text, kotlin.jvm.functions.Function0<kotlin.Unit> icon, optional androidx.compose.ui.Modifier modifier, optional boolean enabled, optional androidx.compose.foundation.interaction.MutableInteractionSource interactionSource, optional long selectedContentColor, optional long unselectedContentColor);
+ method @androidx.compose.runtime.Composable public static void Tab(boolean selected, kotlin.jvm.functions.Function0<kotlin.Unit> onClick, optional androidx.compose.ui.Modifier modifier, optional boolean enabled, optional kotlin.jvm.functions.Function0<kotlin.Unit>? text, optional kotlin.jvm.functions.Function0<kotlin.Unit>? icon, optional androidx.compose.foundation.interaction.MutableInteractionSource interactionSource, optional long selectedContentColor, optional long unselectedContentColor);
+ method @androidx.compose.runtime.Composable public static void Tab(boolean selected, kotlin.jvm.functions.Function0<kotlin.Unit> onClick, optional androidx.compose.ui.Modifier modifier, optional boolean enabled, optional androidx.compose.foundation.interaction.MutableInteractionSource interactionSource, optional long selectedContentColor, optional long unselectedContentColor, kotlin.jvm.functions.Function1<? super androidx.compose.foundation.layout.ColumnScope,kotlin.Unit> content);
+ }
+
+ @androidx.compose.runtime.Immutable public final class TabPosition {
+ method public float getLeft();
+ method public float getRight();
+ method public float getWidth();
+ property public final float left;
+ property public final float right;
+ property public final float width;
+ }
+
+ public final class TabRowDefaults {
+ method @androidx.compose.runtime.Composable public void Divider(optional androidx.compose.ui.Modifier modifier, optional float thickness, optional long color);
+ method @androidx.compose.runtime.Composable public void Indicator(optional androidx.compose.ui.Modifier modifier, optional float height, optional long color);
+ method public float getDividerThickness();
+ method public float getIndicatorHeight();
+ method public float getScrollableTabRowPadding();
+ method public androidx.compose.ui.Modifier tabIndicatorOffset(androidx.compose.ui.Modifier, androidx.compose.material.TabPosition currentTabPosition);
+ property public final float DividerThickness;
+ property public final float IndicatorHeight;
+ property public final float ScrollableTabRowPadding;
+ field public static final float DividerOpacity = 0.12f;
+ field public static final androidx.compose.material.TabRowDefaults INSTANCE;
+ }
+
+ public final class TabRowKt {
+ method @androidx.compose.runtime.Composable @androidx.compose.ui.UiComposable public static void ScrollableTabRow(int selectedTabIndex, optional androidx.compose.ui.Modifier modifier, optional long backgroundColor, optional long contentColor, optional float edgePadding, optional kotlin.jvm.functions.Function1<? super java.util.List<androidx.compose.material.TabPosition>,kotlin.Unit> indicator, optional kotlin.jvm.functions.Function0<kotlin.Unit> divider, kotlin.jvm.functions.Function0<kotlin.Unit> tabs);
+ method @androidx.compose.runtime.Composable @androidx.compose.ui.UiComposable public static void TabRow(int selectedTabIndex, optional androidx.compose.ui.Modifier modifier, optional long backgroundColor, optional long contentColor, optional kotlin.jvm.functions.Function1<? super java.util.List<androidx.compose.material.TabPosition>,kotlin.Unit> indicator, optional kotlin.jvm.functions.Function0<kotlin.Unit> divider, kotlin.jvm.functions.Function0<kotlin.Unit> tabs);
+ }
+
+ @androidx.compose.runtime.Stable public interface TextFieldColors {
+ method @androidx.compose.runtime.Composable public androidx.compose.runtime.State<androidx.compose.ui.graphics.Color> backgroundColor(boolean enabled);
+ method @androidx.compose.runtime.Composable public androidx.compose.runtime.State<androidx.compose.ui.graphics.Color> cursorColor(boolean isError);
+ method @androidx.compose.runtime.Composable public androidx.compose.runtime.State<androidx.compose.ui.graphics.Color> indicatorColor(boolean enabled, boolean isError, androidx.compose.foundation.interaction.InteractionSource interactionSource);
+ method @androidx.compose.runtime.Composable public androidx.compose.runtime.State<androidx.compose.ui.graphics.Color> labelColor(boolean enabled, boolean error, androidx.compose.foundation.interaction.InteractionSource interactionSource);
+ method @androidx.compose.runtime.Composable public androidx.compose.runtime.State<androidx.compose.ui.graphics.Color> leadingIconColor(boolean enabled, boolean isError);
+ method @androidx.compose.runtime.Composable public androidx.compose.runtime.State<androidx.compose.ui.graphics.Color> placeholderColor(boolean enabled);
+ method @androidx.compose.runtime.Composable public androidx.compose.runtime.State<androidx.compose.ui.graphics.Color> textColor(boolean enabled);
+ method @androidx.compose.runtime.Composable public androidx.compose.runtime.State<androidx.compose.ui.graphics.Color> trailingIconColor(boolean enabled, boolean isError);
+ }
+
+ @androidx.compose.runtime.Immutable public final class TextFieldDefaults {
+ method public float getFocusedBorderThickness();
+ method public float getMinHeight();
+ method public float getMinWidth();
+ method @androidx.compose.runtime.Composable @androidx.compose.runtime.ReadOnlyComposable public androidx.compose.ui.graphics.Shape getOutlinedTextFieldShape();
+ method @androidx.compose.runtime.Composable @androidx.compose.runtime.ReadOnlyComposable public androidx.compose.ui.graphics.Shape getTextFieldShape();
+ method public float getUnfocusedBorderThickness();
+ method @androidx.compose.runtime.Composable public androidx.compose.material.TextFieldColors outlinedTextFieldColors(optional long textColor, optional long disabledTextColor, optional long backgroundColor, optional long cursorColor, optional long errorCursorColor, optional long focusedBorderColor, optional long unfocusedBorderColor, optional long disabledBorderColor, optional long errorBorderColor, optional long leadingIconColor, optional long disabledLeadingIconColor, optional long errorLeadingIconColor, optional long trailingIconColor, optional long disabledTrailingIconColor, optional long errorTrailingIconColor, optional long focusedLabelColor, optional long unfocusedLabelColor, optional long disabledLabelColor, optional long errorLabelColor, optional long placeholderColor, optional long disabledPlaceholderColor);
+ method @androidx.compose.runtime.Composable public androidx.compose.material.TextFieldColors textFieldColors(optional long textColor, optional long disabledTextColor, optional long backgroundColor, optional long cursorColor, optional long errorCursorColor, optional long focusedIndicatorColor, optional long unfocusedIndicatorColor, optional long disabledIndicatorColor, optional long errorIndicatorColor, optional long leadingIconColor, optional long disabledLeadingIconColor, optional long errorLeadingIconColor, optional long trailingIconColor, optional long disabledTrailingIconColor, optional long errorTrailingIconColor, optional long focusedLabelColor, optional long unfocusedLabelColor, optional long disabledLabelColor, optional long errorLabelColor, optional long placeholderColor, optional long disabledPlaceholderColor);
+ property public final float FocusedBorderThickness;
+ property public final float MinHeight;
+ property public final float MinWidth;
+ property @androidx.compose.runtime.Composable @androidx.compose.runtime.ReadOnlyComposable public final androidx.compose.ui.graphics.Shape OutlinedTextFieldShape;
+ property @androidx.compose.runtime.Composable @androidx.compose.runtime.ReadOnlyComposable public final androidx.compose.ui.graphics.Shape TextFieldShape;
+ property public final float UnfocusedBorderThickness;
+ field public static final float BackgroundOpacity = 0.12f;
+ field public static final androidx.compose.material.TextFieldDefaults INSTANCE;
+ field public static final float IconOpacity = 0.54f;
+ field public static final float UnfocusedIndicatorLineOpacity = 0.42f;
+ }
+
+ public final class TextFieldDefaultsKt {
+ }
+
+ public final class TextFieldImplKt {
+ }
+
+ public final class TextFieldKt {
+ method @androidx.compose.runtime.Composable public static void TextField(String value, kotlin.jvm.functions.Function1<? super java.lang.String,kotlin.Unit> onValueChange, optional androidx.compose.ui.Modifier modifier, optional boolean enabled, optional boolean readOnly, optional androidx.compose.ui.text.TextStyle textStyle, optional kotlin.jvm.functions.Function0<kotlin.Unit>? label, optional kotlin.jvm.functions.Function0<kotlin.Unit>? placeholder, optional kotlin.jvm.functions.Function0<kotlin.Unit>? leadingIcon, optional kotlin.jvm.functions.Function0<kotlin.Unit>? trailingIcon, optional boolean isError, optional androidx.compose.ui.text.input.VisualTransformation visualTransformation, optional androidx.compose.foundation.text.KeyboardOptions keyboardOptions, optional androidx.compose.foundation.text.KeyboardActions keyboardActions, optional boolean singleLine, optional int maxLines, optional androidx.compose.foundation.interaction.MutableInteractionSource interactionSource, optional androidx.compose.ui.graphics.Shape shape, optional androidx.compose.material.TextFieldColors colors);
+ method @androidx.compose.runtime.Composable public static void TextField(androidx.compose.ui.text.input.TextFieldValue value, kotlin.jvm.functions.Function1<? super androidx.compose.ui.text.input.TextFieldValue,kotlin.Unit> onValueChange, optional androidx.compose.ui.Modifier modifier, optional boolean enabled, optional boolean readOnly, optional androidx.compose.ui.text.TextStyle textStyle, optional kotlin.jvm.functions.Function0<kotlin.Unit>? label, optional kotlin.jvm.functions.Function0<kotlin.Unit>? placeholder, optional kotlin.jvm.functions.Function0<kotlin.Unit>? leadingIcon, optional kotlin.jvm.functions.Function0<kotlin.Unit>? trailingIcon, optional boolean isError, optional androidx.compose.ui.text.input.VisualTransformation visualTransformation, optional androidx.compose.foundation.text.KeyboardOptions keyboardOptions, optional androidx.compose.foundation.text.KeyboardActions keyboardActions, optional boolean singleLine, optional int maxLines, optional androidx.compose.foundation.interaction.MutableInteractionSource interactionSource, optional androidx.compose.ui.graphics.Shape shape, optional androidx.compose.material.TextFieldColors colors);
+ }
+
+ public final class TextKt {
+ method @androidx.compose.runtime.Composable public static void ProvideTextStyle(androidx.compose.ui.text.TextStyle value, kotlin.jvm.functions.Function0<kotlin.Unit> content);
+ method @androidx.compose.runtime.Composable public static void Text(String text, optional androidx.compose.ui.Modifier modifier, optional long color, optional long fontSize, optional androidx.compose.ui.text.font.FontStyle? fontStyle, optional androidx.compose.ui.text.font.FontWeight? fontWeight, optional androidx.compose.ui.text.font.FontFamily? fontFamily, optional long letterSpacing, optional androidx.compose.ui.text.style.TextDecoration? textDecoration, optional androidx.compose.ui.text.style.TextAlign? textAlign, optional long lineHeight, optional int overflow, optional boolean softWrap, optional int maxLines, optional kotlin.jvm.functions.Function1<? super androidx.compose.ui.text.TextLayoutResult,kotlin.Unit> onTextLayout, optional androidx.compose.ui.text.TextStyle style);
+ method @androidx.compose.runtime.Composable public static void Text(androidx.compose.ui.text.AnnotatedString text, optional androidx.compose.ui.Modifier modifier, optional long color, optional long fontSize, optional androidx.compose.ui.text.font.FontStyle? fontStyle, optional androidx.compose.ui.text.font.FontWeight? fontWeight, optional androidx.compose.ui.text.font.FontFamily? fontFamily, optional long letterSpacing, optional androidx.compose.ui.text.style.TextDecoration? textDecoration, optional androidx.compose.ui.text.style.TextAlign? textAlign, optional long lineHeight, optional int overflow, optional boolean softWrap, optional int maxLines, optional java.util.Map<java.lang.String,androidx.compose.foundation.text.InlineTextContent> inlineContent, optional kotlin.jvm.functions.Function1<? super androidx.compose.ui.text.TextLayoutResult,kotlin.Unit> onTextLayout, optional androidx.compose.ui.text.TextStyle style);
+ method public static androidx.compose.runtime.ProvidableCompositionLocal<androidx.compose.ui.text.TextStyle> getLocalTextStyle();
+ property public static final androidx.compose.runtime.ProvidableCompositionLocal<androidx.compose.ui.text.TextStyle> LocalTextStyle;
+ }
+
+ public final class TouchTargetKt {
+ }
+
+ @androidx.compose.runtime.Immutable public final class Typography {
+ ctor public Typography(optional androidx.compose.ui.text.font.FontFamily defaultFontFamily, optional androidx.compose.ui.text.TextStyle h1, optional androidx.compose.ui.text.TextStyle h2, optional androidx.compose.ui.text.TextStyle h3, optional androidx.compose.ui.text.TextStyle h4, optional androidx.compose.ui.text.TextStyle h5, optional androidx.compose.ui.text.TextStyle h6, optional androidx.compose.ui.text.TextStyle subtitle1, optional androidx.compose.ui.text.TextStyle subtitle2, optional androidx.compose.ui.text.TextStyle body1, optional androidx.compose.ui.text.TextStyle body2, optional androidx.compose.ui.text.TextStyle button, optional androidx.compose.ui.text.TextStyle caption, optional androidx.compose.ui.text.TextStyle overline);
+ method public androidx.compose.material.Typography copy(optional androidx.compose.ui.text.TextStyle h1, optional androidx.compose.ui.text.TextStyle h2, optional androidx.compose.ui.text.TextStyle h3, optional androidx.compose.ui.text.TextStyle h4, optional androidx.compose.ui.text.TextStyle h5, optional androidx.compose.ui.text.TextStyle h6, optional androidx.compose.ui.text.TextStyle subtitle1, optional androidx.compose.ui.text.TextStyle subtitle2, optional androidx.compose.ui.text.TextStyle body1, optional androidx.compose.ui.text.TextStyle body2, optional androidx.compose.ui.text.TextStyle button, optional androidx.compose.ui.text.TextStyle caption, optional androidx.compose.ui.text.TextStyle overline);
+ method public androidx.compose.ui.text.TextStyle getBody1();
+ method public androidx.compose.ui.text.TextStyle getBody2();
+ method public androidx.compose.ui.text.TextStyle getButton();
+ method public androidx.compose.ui.text.TextStyle getCaption();
+ method public androidx.compose.ui.text.TextStyle getH1();
+ method public androidx.compose.ui.text.TextStyle getH2();
+ method public androidx.compose.ui.text.TextStyle getH3();
+ method public androidx.compose.ui.text.TextStyle getH4();
+ method public androidx.compose.ui.text.TextStyle getH5();
+ method public androidx.compose.ui.text.TextStyle getH6();
+ method public androidx.compose.ui.text.TextStyle getOverline();
+ method public androidx.compose.ui.text.TextStyle getSubtitle1();
+ method public androidx.compose.ui.text.TextStyle getSubtitle2();
+ property public final androidx.compose.ui.text.TextStyle body1;
+ property public final androidx.compose.ui.text.TextStyle body2;
+ property public final androidx.compose.ui.text.TextStyle button;
+ property public final androidx.compose.ui.text.TextStyle caption;
+ property public final androidx.compose.ui.text.TextStyle h1;
+ property public final androidx.compose.ui.text.TextStyle h2;
+ property public final androidx.compose.ui.text.TextStyle h3;
+ property public final androidx.compose.ui.text.TextStyle h4;
+ property public final androidx.compose.ui.text.TextStyle h5;
+ property public final androidx.compose.ui.text.TextStyle h6;
+ property public final androidx.compose.ui.text.TextStyle overline;
+ property public final androidx.compose.ui.text.TextStyle subtitle1;
+ property public final androidx.compose.ui.text.TextStyle subtitle2;
+ }
+
+ public final class TypographyKt {
+ }
+
+}
+
+package androidx.compose.material.internal {
+
+ public final class ExposedDropdownMenuPopupKt {
+ }
+
+}
+
diff --git a/compose/material/material/benchmark/src/androidTest/java/androidx/compose/material/benchmark/CheckboxesInRowsTestCase.kt b/compose/material/material/benchmark/src/androidTest/java/androidx/compose/material/benchmark/CheckboxesInRowsTestCase.kt
index cff4cc2..b590874 100644
--- a/compose/material/material/benchmark/src/androidTest/java/androidx/compose/material/benchmark/CheckboxesInRowsTestCase.kt
+++ b/compose/material/material/benchmark/src/androidTest/java/androidx/compose/material/benchmark/CheckboxesInRowsTestCase.kt
@@ -57,7 +57,7 @@
}
@Composable
- override fun ContentWrappers(content: () -> Unit) {
+ override fun ContentWrappers(content: @Composable () -> Unit) {
MaterialTheme {
Surface {
content()
diff --git a/compose/material/material/src/androidAndroidTest/kotlin/androidx/compose/material/SwipeableTest.kt b/compose/material/material/src/androidAndroidTest/kotlin/androidx/compose/material/SwipeableTest.kt
index 126b642..305e89a 100644
--- a/compose/material/material/src/androidAndroidTest/kotlin/androidx/compose/material/SwipeableTest.kt
+++ b/compose/material/material/src/androidAndroidTest/kotlin/androidx/compose/material/SwipeableTest.kt
@@ -1666,6 +1666,8 @@
assertThat(swipeableState.currentValue).isEqualTo("A")
+ // This actually produces a velocity of 300,000 (1500 px moved in 5 ms), but we are
+ // relying on the compatibility behaviour that 2 points produce a zero velocity.
rule.onNodeWithTag(swipeableTag)
.performTouchInput {
down(Offset(x = 10f, y = 10f))
diff --git a/compose/material/material/src/commonMain/kotlin/androidx/compose/material/Slider.kt b/compose/material/material/src/commonMain/kotlin/androidx/compose/material/Slider.kt
index 658e0ad..fd26414 100644
--- a/compose/material/material/src/commonMain/kotlin/androidx/compose/material/Slider.kt
+++ b/compose/material/material/src/commonMain/kotlin/androidx/compose/material/Slider.kt
@@ -93,6 +93,8 @@
import androidx.compose.ui.unit.dp
import androidx.compose.ui.util.lerp
import kotlin.math.abs
+import kotlin.math.max
+import kotlin.math.min
import kotlinx.coroutines.CancellationException
import kotlinx.coroutines.CoroutineScope
import kotlinx.coroutines.coroutineScope
@@ -169,8 +171,8 @@
val minPx: Float
with(LocalDensity.current) {
- maxPx = widthPx - ThumbRadius.toPx()
- minPx = ThumbRadius.toPx()
+ maxPx = max(widthPx - ThumbRadius.toPx(), 0f)
+ minPx = min(ThumbRadius.toPx(), maxPx)
}
fun scaleToUserValue(offset: Float) =
diff --git a/compose/material3/material3/integration-tests/material3-catalog/src/main/java/androidx/compose/material3/catalog/library/model/Components.kt b/compose/material3/material3/integration-tests/material3-catalog/src/main/java/androidx/compose/material3/catalog/library/model/Components.kt
index 603a9a5..9606d9a 100644
--- a/compose/material3/material3/integration-tests/material3-catalog/src/main/java/androidx/compose/material3/catalog/library/model/Components.kt
+++ b/compose/material3/material3/integration-tests/material3-catalog/src/main/java/androidx/compose/material3/catalog/library/model/Components.kt
@@ -30,7 +30,7 @@
val description: String,
@DrawableRes
val icon: Int = R.drawable.ic_component,
- val tintIcon: Boolean = false,
+ val tintIcon: Boolean = true,
val guidelinesUrl: String,
val docsUrl: String,
val sourceUrl: String,
@@ -48,7 +48,6 @@
description = "A bottom app bar displays navigation and key actions at the bottom of mobile " +
"screens.",
// No bottom app bar icon
- tintIcon = true,
guidelinesUrl = "$ComponentGuidelinesUrl/bottom-app-bars",
docsUrl = "$DocsUrl#bottomappbar",
sourceUrl = "$Material3SourceUrl/AppBar.kt",
@@ -61,7 +60,6 @@
description = "Buttons help people initiate actions, from sending an email, to sharing a " +
"document, to liking a post.",
// No buttons icon
- tintIcon = true,
guidelinesUrl = "$ComponentGuidelinesUrl/buttons",
docsUrl = "$PackageSummaryUrl#button",
sourceUrl = "$Material3SourceUrl/Button.kt",
@@ -73,7 +71,6 @@
name = "Card",
description = "Cards contain content and actions that relate information about a subject.",
// No card icon
- tintIcon = true,
guidelinesUrl = "$StyleGuidelinesUrl/cards",
docsUrl = "$PackageSummaryUrl#card",
sourceUrl = "$Material3SourceUrl/Card.kt",
@@ -86,7 +83,6 @@
description = "Checkboxes allow the user to select one or more items from a set or turn an " +
"option on or off.",
// No checkbox icon
- tintIcon = true,
guidelinesUrl = "$ComponentGuidelinesUrl/checkboxes",
docsUrl = "$DocsUrl#checkbox",
sourceUrl = "$Material3SourceUrl/Checkbox.kt",
@@ -99,7 +95,6 @@
description = "Chips allow users to enter information, make selections, filter content, or" +
" trigger actions.",
// No chip icon
- tintIcon = true,
guidelinesUrl = "$ComponentGuidelinesUrl/chips",
docsUrl = "$DocsUrl#chips",
sourceUrl = "$Material3SourceUrl/Chip.kt",
@@ -112,7 +107,6 @@
description = "Dialogs provide important prompts in a user flow. They can require an action, " +
"communicate information, or help users accomplish a task.",
// No dialogs icon
- tintIcon = true,
guidelinesUrl = "$ComponentGuidelinesUrl/dialogs",
docsUrl = "$PackageSummaryUrl#alertdialog",
sourceUrl = "$Material3SourceUrl/AlertDialog.kt",
@@ -125,7 +119,6 @@
description = "Extended FABs help people take primary actions. They're wider than FABs to " +
"accommodate a text label and larger target area.",
// No extended FAB icon
- tintIcon = true,
guidelinesUrl = "$ComponentGuidelinesUrl/extended-fab",
docsUrl = "$PackageSummaryUrl#extendedfloatingactionbutton",
sourceUrl = "$Material3SourceUrl/FloatingActionButton.kt",
@@ -138,7 +131,6 @@
description = "The FAB represents the most important action on a screen. It puts key actions " +
"within reach.",
// No FABs icon
- tintIcon = true,
guidelinesUrl = "$ComponentGuidelinesUrl/floating-action-button",
docsUrl = "$PackageSummaryUrl#floatingactionbutton",
sourceUrl = "$Material3SourceUrl/FloatingActionButton.kt",
@@ -150,7 +142,6 @@
name = "Icon buttons",
description = "Icon buttons allow users to take actions and make choices with a single tap.",
// No icon-button icon
- tintIcon = true,
guidelinesUrl = "$ComponentGuidelinesUrl/icon-button",
docsUrl = "$PackageSummaryUrl#iconbutton",
sourceUrl = "$Material3SourceUrl/IconButton.kt",
@@ -162,7 +153,6 @@
name = "Menus",
description = "Menus display a list of choices on temporary surfaces.",
// No menu icon
- tintIcon = true,
guidelinesUrl = "$ComponentGuidelinesUrl/menus",
docsUrl = "$PackageSummaryUrl#dropdownmenu",
sourceUrl = "$Material3SourceUrl/Menu.kt",
@@ -175,7 +165,6 @@
description = "Navigation bars offer a persistent and convenient way to switch between " +
"primary destinations in an app.",
// No navigation bar icon
- tintIcon = true,
guidelinesUrl = "$ComponentGuidelinesUrl/navigation-bar",
docsUrl = "$PackageSummaryUrl#navigationbar",
sourceUrl = "$Material3SourceUrl/NavigationBar.kt",
@@ -187,7 +176,6 @@
name = "Navigation drawer",
description = "Navigation drawers provide ergonomic access to destinations in an app.",
// No navigation drawer icon
- tintIcon = true,
guidelinesUrl = "$ComponentGuidelinesUrl/navigation-drawer",
docsUrl = "$PackageSummaryUrl#navigationdrawer",
sourceUrl = "$Material3SourceUrl/NavigationDrawer.kt",
@@ -200,7 +188,6 @@
description = "Navigation rails provide access to primary destinations in apps when using " +
"tablet and desktop screens.",
// No navigation rail icon
- tintIcon = true,
guidelinesUrl = "$ComponentGuidelinesUrl/navigation-rail",
docsUrl = "$PackageSummaryUrl#navigationrail",
sourceUrl = "$Material3SourceUrl/NavigationRail.kt",
@@ -213,7 +200,6 @@
description = "Progress indicators express an unspecified wait time or display the length of " +
"a process.",
// No progress indicator icon
- tintIcon = true,
guidelinesUrl = "$ComponentGuidelinesUrl/progress-indicators",
docsUrl = "$DocsUrl#circularprogressindicator",
sourceUrl = "$Material3SourceUrl/ProgressIndicator.kt",
@@ -225,7 +211,6 @@
name = "Radio buttons",
description = "Radio buttons allow the user to select one option from a set.",
// No radio-button icon
- tintIcon = true,
guidelinesUrl = "$ComponentGuidelinesUrl/radio-buttons",
docsUrl = "$DocsUrl#radiobutton",
sourceUrl = "$Material3SourceUrl/RadioButton.kt",
@@ -237,7 +222,6 @@
name = "Sliders",
description = "Sliders allow users to make selections from a range of values.",
// No slider icon
- tintIcon = true,
guidelinesUrl = "", // No guidelines yet
docsUrl = "", // No docs yet
sourceUrl = "$Material3SourceUrl/Slider.kt",
@@ -250,7 +234,6 @@
description = "Snackbars provide brief messages about app processes at the bottom of the " +
"screen.",
// No snackbar icon
- tintIcon = true,
guidelinesUrl = "$ComponentGuidelinesUrl/snackbars",
docsUrl = "$DocsUrl#snackbar",
sourceUrl = "$Material3SourceUrl/Snackbar.kt",
@@ -263,7 +246,6 @@
description = "Switches toggle the state of a single setting on or off.",
// No switch icon
// No guidelines yet
- tintIcon = true,
guidelinesUrl = "",
docsUrl = "",
sourceUrl = "$Material3SourceUrl/Switch.kt",
@@ -298,7 +280,6 @@
name = "Top app bar",
description = "Top app bars display information and actions at the top of a screen.",
// No top app bar icon
- tintIcon = true,
guidelinesUrl = "$ComponentGuidelinesUrl/top-app-bar",
docsUrl = "$PackageSummaryUrl#smalltopappbar",
sourceUrl = "$Material3SourceUrl/AppBar.kt",
diff --git a/compose/material3/material3/src/androidAndroidTest/kotlin/androidx/compose/material3/SliderTest.kt b/compose/material3/material3/src/androidAndroidTest/kotlin/androidx/compose/material3/SliderTest.kt
index 4ed02e4..23fa0ed 100644
--- a/compose/material3/material3/src/androidAndroidTest/kotlin/androidx/compose/material3/SliderTest.kt
+++ b/compose/material3/material3/src/androidAndroidTest/kotlin/androidx/compose/material3/SliderTest.kt
@@ -599,6 +599,16 @@
}
}
+ @Test
+ fun slider_zero_width() {
+ rule.setMaterialContentForSizeAssertions(
+ parentMaxHeight = 0.dp,
+ parentMaxWidth = 0.dp
+ ) { Slider(value = 1f, onValueChange = {}) }
+ .assertHeightIsEqualTo(0.dp)
+ .assertWidthIsEqualTo(0.dp)
+ }
+
@OptIn(ExperimentalMaterial3Api::class)
@Test
fun rangeSlider_dragThumb() {
diff --git a/compose/material3/material3/src/commonMain/kotlin/androidx/compose/material3/Slider.kt b/compose/material3/material3/src/commonMain/kotlin/androidx/compose/material3/Slider.kt
index 3e78471..30ad33d 100644
--- a/compose/material3/material3/src/commonMain/kotlin/androidx/compose/material3/Slider.kt
+++ b/compose/material3/material3/src/commonMain/kotlin/androidx/compose/material3/Slider.kt
@@ -95,6 +95,8 @@
import androidx.compose.ui.unit.dp
import androidx.compose.ui.util.lerp
import kotlin.math.abs
+import kotlin.math.max
+import kotlin.math.min
import kotlinx.coroutines.CancellationException
import kotlinx.coroutines.CoroutineScope
import kotlinx.coroutines.coroutineScope
@@ -177,8 +179,8 @@
val thumbRadius = ThumbDiameter / 2
with(LocalDensity.current) {
- maxPx = widthPx - thumbRadius.toPx()
- minPx = thumbRadius.toPx()
+ maxPx = max(widthPx - thumbRadius.toPx(), 0f)
+ minPx = min(thumbRadius.toPx(), maxPx)
}
fun scaleToUserValue(offset: Float) =
diff --git a/compose/material3/material3/src/commonMain/kotlin/androidx/compose/material3/compose-material-3-documentation.md b/compose/material3/material3/src/commonMain/kotlin/androidx/compose/material3/compose-material-3-documentation.md
index 56f2f43..295a3b5 100644
--- a/compose/material3/material3/src/commonMain/kotlin/androidx/compose/material3/compose-material-3-documentation.md
+++ b/compose/material3/material3/src/commonMain/kotlin/androidx/compose/material3/compose-material-3-documentation.md
@@ -16,25 +16,22 @@
### Theming
-Material 3 makes brand expression in an interface simpler and more beautiful than ever before, with <a href="https://m3.material.io/styles/color/overview" class="external" target="_blank">color</a> and <a href="https://m3.material.io/styles/typography/overview" class="external" target="_blank">typography</a> theming.
-
| | **APIs** | **Description** |
| ---- | -------- | --------------- |
| **Material Theming** | [MaterialTheme] | M3 theme |
| **Color scheme** | [ColorScheme] | M3 color scheme |
-| | [lightColorScheme] | Light color scheme |
-| | [darkColorScheme] | Dark color scheme |
-| **Dynamic color** | [dynamicLightColorScheme] | Dynamic light color scheme |
-| | [dynamicDarkColorScheme] | Dynamic dark color scheme |
-| **Typography** | [Typography] | M3 type scale |
+| | [lightColorScheme] | M3 light color scheme |
+| | [darkColorScheme] | M3 dark color scheme |
+| **Dynamic color** | [dynamicLightColorScheme] | M3 dynamic light color scheme |
+| | [dynamicDarkColorScheme] | M3 dynamic dark color scheme |
+| **Typography** | [Typography] | M3 typography |
+| **Shape** | [Shapes] | M3 shape |
### Components
-Material 3 Components are interactive building blocks for creating a user interface.
-
| | **APIs** | **Description** |
| ---- | -------- | --------------- |
-| **Badges** | [Badge] | M3 badge |
+| **Badge** | [Badge] | M3 badge |
| | [BadgedBox] | M3 badged box |
| **Bottom app bar** | [BottomAppBar] | M3 bottom app bar |
| **Buttons** | [Button] | M3 filled button |
@@ -42,58 +39,73 @@
| | [FilledTonalButton] | M3 filled tonal button |
| | [OutlinedButton] | M3 outlined button |
| | [TextButton] | M3 text button |
-| **Cards** | [Card] | M3 card |
+| **Cards** | [Card] | M3 filled card |
| | [ElevatedCard] | M3 elevated card |
| | [OutlinedCard] | M3 outlined card |
-| **Checkboxes** | [Checkbox] | M3 checkbox |
-| | [TriStateCheckbox] | M3 parent checkbox |
+| **Checkbox** | [Checkbox] | M3 checkbox |
+| | [TriStateCheckbox] | M3 indeterminate checkbox |
+| **Chips** | [AssistChip] | M3 assist chip |
+| | [ElevatedAssistChip] | M3 elevated assist chip |
+| | [FilterChip] | M3 filter chip |
+| | [ElevatedFilterChip] | M3 elevated filter chip |
+| | [InputChip] | M3 input chip |
+| | [SuggestionChip] | M3 suggestion chip |
+| | [ElevatedSuggestionChip] | M3 elevated suggestion chip |
| **Dialogs** | [AlertDialog] | M3 basic dialog |
| **Dividers** | [Divider] | M3 divider |
| **Extended FAB** | [ExtendedFloatingActionButton] | M3 extended FAB |
| **FAB** | [FloatingActionButton] | M3 FAB |
| | [SmallFloatingActionButton] | M3 small FAB |
| | [LargeFloatingActionButton] | M3 large FAB |
-| **Menus** | [DropdownMenu] | M3 dropdown menu |
-| | [DropdownMenuItem] | M3 dropdown menu item |
+| **Icon button** | [IconButton] | M3 standard icon button |
+| | [IconToggleButton] | M3 standard icon toggle button |
+| | [FilledIconButton] | M3 filled icon button |
+| | [FilledIconToggleButton] | M3 filled icon toggle button |
+| | [FilledTonalIconButton] | M3 filled tonal icon button |
+| | [FilledTonalIconToggleButton] | M3 filled tonal icon toggle button |
+| | [OutlinedIconButton] | M3 outlined icon button |
+| | [OutlinedIconToggleButton] | M3 outlined icon toggle button |
+| **Menus** | [DropdownMenu] | M3 menu |
+| | [DropdownMenuItem] | M3 menu item |
+| | [ExposedDropdownMenuBox] | M3 exposed dropdown menu |
| **Navigation bar** | [NavigationBar] | M3 navigation bar |
| | [NavigationBarItem] | M3 navigation bar item |
-| **Navigation drawer** | [DismissableNavigationDrawer] | M3 dismissable navigation drawer |
-| | [ModalNavigationDrawer] | M3 modal navigation drawer |
-| | [PermanentNavigationDrawer] | M3 permanent navigation drawer |
+| **Navigation drawer** | [ModalNavigationDrawer] | M3 modal navigation drawer |
+| | [PermanentNavigationDrawer] | M3 permanent standard navigation drawer |
+| | [DismissibleNavigationDrawer] | M3 dismissible standard navigation drawer |
| | [NavigationDrawerItem] | M3 navigation drawer item |
| **Navigation rail** | [NavigationRail] | M3 navigation rail |
| | [NavigationRailItem] | M3 navigation rail item |
-| **Progress indicators** | [CircularProgressIndicator] | M3 circular progress indicator |
-| | [LinearProgressIndicator] | M3 linear progress indicator |
-| **Radio buttons** | [RadioButton] | M3 radio button |
+| **Progress indicators** | [LinearProgressIndicator] | M3 linear progress indicator |
+| | [CircularProgressIndicator] | M3 circular progress indicator |
+| **Radio button** | [RadioButton] | M3 radio button |
| **Sliders** | [Slider] | M3 slider |
+| | [RangeSlider] | M3 range slider |
| **Snackbars** | [Snackbar] | M3 snackbar |
+| **Switch** | [Switch] | M3 switch |
| **Tabs** | [Tab] | M3 tab |
| | [LeadingIconTab] | M3 leading icon tab |
| | [TabRow] | M3 tab row |
| | [ScrollableTabRow] | M3 scrollable tab row |
-| **Text fields** | [TextField] | M3 text field |
+| **Text fields** | [TextField] | M3 filled text field |
| | [OutlinedTextField] | M3 outlined text field |
-| **Top app bar** | [SmallTopAppBar] | M3 small top app bar |
-| | [CenterAlignedTopAppBar] | M3 center-aligned top app bar |
+| **Top app bar** | [CenterAlignedTopAppBar] | M3 center-aligned top app bar |
+| | [SmallTopAppBar] | M3 small top app bar |
| | [MediumTopAppBar] | M3 medium top app bar |
| | [LargeTopAppBar] | M3 large top app bar |
### Surfaces and layout
-Material 3 defines the qualities that can be expressed by UI regions, surfaces, and components.
-
| | **APIs** | **Description** |
| ---- | -------- | --------------- |
| **Surfaces** | [Surface] | M3 surface |
-| **Layout** | [Scaffold] | Basic M3 visual layout structure |
+| **Scaffold** | [Scaffold] | M3 layout |
-### Icons
+### Icons and text
| | **APIs** | **Description** |
| ---- | -------- | --------------- |
| **Icon** | [Icon] | M3 icon |
-| **Icon button** | [IconButton] | M3 icon button |
-| **Icon toggle button** | [IconToggleButton] | M3 icon toggle button |
+| **Text** | [Text] | M3 text |
Also check out the `androidx.compose.material.icons` [package](/reference/kotlin/androidx/compose/material/icons/package-summary).
diff --git a/compose/runtime/runtime-livedata/api/1.2.0-beta02.txt b/compose/runtime/runtime-livedata/api/1.2.0-beta02.txt
new file mode 100644
index 0000000..e004a29
--- /dev/null
+++ b/compose/runtime/runtime-livedata/api/1.2.0-beta02.txt
@@ -0,0 +1,10 @@
+// Signature format: 4.0
+package androidx.compose.runtime.livedata {
+
+ public final class LiveDataAdapterKt {
+ method @androidx.compose.runtime.Composable public static <T> androidx.compose.runtime.State<T> observeAsState(androidx.lifecycle.LiveData<T>);
+ method @androidx.compose.runtime.Composable public static <R, T extends R> androidx.compose.runtime.State<R> observeAsState(androidx.lifecycle.LiveData<T>, R? initial);
+ }
+
+}
+
diff --git a/compose/runtime/runtime-livedata/api/public_plus_experimental_1.2.0-beta02.txt b/compose/runtime/runtime-livedata/api/public_plus_experimental_1.2.0-beta02.txt
new file mode 100644
index 0000000..e004a29
--- /dev/null
+++ b/compose/runtime/runtime-livedata/api/public_plus_experimental_1.2.0-beta02.txt
@@ -0,0 +1,10 @@
+// Signature format: 4.0
+package androidx.compose.runtime.livedata {
+
+ public final class LiveDataAdapterKt {
+ method @androidx.compose.runtime.Composable public static <T> androidx.compose.runtime.State<T> observeAsState(androidx.lifecycle.LiveData<T>);
+ method @androidx.compose.runtime.Composable public static <R, T extends R> androidx.compose.runtime.State<R> observeAsState(androidx.lifecycle.LiveData<T>, R? initial);
+ }
+
+}
+
diff --git a/compose/runtime/runtime-livedata/api/res-1.2.0-beta02.txt b/compose/runtime/runtime-livedata/api/res-1.2.0-beta02.txt
new file mode 100644
index 0000000..e69de29
--- /dev/null
+++ b/compose/runtime/runtime-livedata/api/res-1.2.0-beta02.txt
diff --git a/compose/runtime/runtime-livedata/api/restricted_1.2.0-beta02.txt b/compose/runtime/runtime-livedata/api/restricted_1.2.0-beta02.txt
new file mode 100644
index 0000000..e004a29
--- /dev/null
+++ b/compose/runtime/runtime-livedata/api/restricted_1.2.0-beta02.txt
@@ -0,0 +1,10 @@
+// Signature format: 4.0
+package androidx.compose.runtime.livedata {
+
+ public final class LiveDataAdapterKt {
+ method @androidx.compose.runtime.Composable public static <T> androidx.compose.runtime.State<T> observeAsState(androidx.lifecycle.LiveData<T>);
+ method @androidx.compose.runtime.Composable public static <R, T extends R> androidx.compose.runtime.State<R> observeAsState(androidx.lifecycle.LiveData<T>, R? initial);
+ }
+
+}
+
diff --git a/compose/runtime/runtime-rxjava2/api/1.2.0-beta02.txt b/compose/runtime/runtime-rxjava2/api/1.2.0-beta02.txt
new file mode 100644
index 0000000..fb30f38
--- /dev/null
+++ b/compose/runtime/runtime-rxjava2/api/1.2.0-beta02.txt
@@ -0,0 +1,13 @@
+// Signature format: 4.0
+package androidx.compose.runtime.rxjava2 {
+
+ public final class RxJava2AdapterKt {
+ method @androidx.compose.runtime.Composable public static <R, T extends R> androidx.compose.runtime.State<R> subscribeAsState(io.reactivex.Observable<T>, R? initial);
+ method @androidx.compose.runtime.Composable public static <R, T extends R> androidx.compose.runtime.State<R> subscribeAsState(io.reactivex.Flowable<T>, R? initial);
+ method @androidx.compose.runtime.Composable public static <R, T extends R> androidx.compose.runtime.State<R> subscribeAsState(io.reactivex.Single<T>, R? initial);
+ method @androidx.compose.runtime.Composable public static <R, T extends R> androidx.compose.runtime.State<R> subscribeAsState(io.reactivex.Maybe<T>, R? initial);
+ method @androidx.compose.runtime.Composable public static androidx.compose.runtime.State<java.lang.Boolean> subscribeAsState(io.reactivex.Completable);
+ }
+
+}
+
diff --git a/compose/runtime/runtime-rxjava2/api/public_plus_experimental_1.2.0-beta02.txt b/compose/runtime/runtime-rxjava2/api/public_plus_experimental_1.2.0-beta02.txt
new file mode 100644
index 0000000..fb30f38
--- /dev/null
+++ b/compose/runtime/runtime-rxjava2/api/public_plus_experimental_1.2.0-beta02.txt
@@ -0,0 +1,13 @@
+// Signature format: 4.0
+package androidx.compose.runtime.rxjava2 {
+
+ public final class RxJava2AdapterKt {
+ method @androidx.compose.runtime.Composable public static <R, T extends R> androidx.compose.runtime.State<R> subscribeAsState(io.reactivex.Observable<T>, R? initial);
+ method @androidx.compose.runtime.Composable public static <R, T extends R> androidx.compose.runtime.State<R> subscribeAsState(io.reactivex.Flowable<T>, R? initial);
+ method @androidx.compose.runtime.Composable public static <R, T extends R> androidx.compose.runtime.State<R> subscribeAsState(io.reactivex.Single<T>, R? initial);
+ method @androidx.compose.runtime.Composable public static <R, T extends R> androidx.compose.runtime.State<R> subscribeAsState(io.reactivex.Maybe<T>, R? initial);
+ method @androidx.compose.runtime.Composable public static androidx.compose.runtime.State<java.lang.Boolean> subscribeAsState(io.reactivex.Completable);
+ }
+
+}
+
diff --git a/compose/runtime/runtime-rxjava2/api/res-1.2.0-beta02.txt b/compose/runtime/runtime-rxjava2/api/res-1.2.0-beta02.txt
new file mode 100644
index 0000000..e69de29
--- /dev/null
+++ b/compose/runtime/runtime-rxjava2/api/res-1.2.0-beta02.txt
diff --git a/compose/runtime/runtime-rxjava2/api/restricted_1.2.0-beta02.txt b/compose/runtime/runtime-rxjava2/api/restricted_1.2.0-beta02.txt
new file mode 100644
index 0000000..fb30f38
--- /dev/null
+++ b/compose/runtime/runtime-rxjava2/api/restricted_1.2.0-beta02.txt
@@ -0,0 +1,13 @@
+// Signature format: 4.0
+package androidx.compose.runtime.rxjava2 {
+
+ public final class RxJava2AdapterKt {
+ method @androidx.compose.runtime.Composable public static <R, T extends R> androidx.compose.runtime.State<R> subscribeAsState(io.reactivex.Observable<T>, R? initial);
+ method @androidx.compose.runtime.Composable public static <R, T extends R> androidx.compose.runtime.State<R> subscribeAsState(io.reactivex.Flowable<T>, R? initial);
+ method @androidx.compose.runtime.Composable public static <R, T extends R> androidx.compose.runtime.State<R> subscribeAsState(io.reactivex.Single<T>, R? initial);
+ method @androidx.compose.runtime.Composable public static <R, T extends R> androidx.compose.runtime.State<R> subscribeAsState(io.reactivex.Maybe<T>, R? initial);
+ method @androidx.compose.runtime.Composable public static androidx.compose.runtime.State<java.lang.Boolean> subscribeAsState(io.reactivex.Completable);
+ }
+
+}
+
diff --git a/compose/runtime/runtime-rxjava3/api/1.2.0-beta02.txt b/compose/runtime/runtime-rxjava3/api/1.2.0-beta02.txt
new file mode 100644
index 0000000..1930cc8
--- /dev/null
+++ b/compose/runtime/runtime-rxjava3/api/1.2.0-beta02.txt
@@ -0,0 +1,13 @@
+// Signature format: 4.0
+package androidx.compose.runtime.rxjava3 {
+
+ public final class RxJava3AdapterKt {
+ method @androidx.compose.runtime.Composable public static <R, T extends R> androidx.compose.runtime.State<R> subscribeAsState(io.reactivex.rxjava3.core.Observable<T>, R? initial);
+ method @androidx.compose.runtime.Composable public static <R, T extends R> androidx.compose.runtime.State<R> subscribeAsState(io.reactivex.rxjava3.core.Flowable<T>, R? initial);
+ method @androidx.compose.runtime.Composable public static <R, T extends R> androidx.compose.runtime.State<R> subscribeAsState(io.reactivex.rxjava3.core.Single<T>, R? initial);
+ method @androidx.compose.runtime.Composable public static <R, T extends R> androidx.compose.runtime.State<R> subscribeAsState(io.reactivex.rxjava3.core.Maybe<T>, R? initial);
+ method @androidx.compose.runtime.Composable public static androidx.compose.runtime.State<java.lang.Boolean> subscribeAsState(io.reactivex.rxjava3.core.Completable);
+ }
+
+}
+
diff --git a/compose/runtime/runtime-rxjava3/api/public_plus_experimental_1.2.0-beta02.txt b/compose/runtime/runtime-rxjava3/api/public_plus_experimental_1.2.0-beta02.txt
new file mode 100644
index 0000000..1930cc8
--- /dev/null
+++ b/compose/runtime/runtime-rxjava3/api/public_plus_experimental_1.2.0-beta02.txt
@@ -0,0 +1,13 @@
+// Signature format: 4.0
+package androidx.compose.runtime.rxjava3 {
+
+ public final class RxJava3AdapterKt {
+ method @androidx.compose.runtime.Composable public static <R, T extends R> androidx.compose.runtime.State<R> subscribeAsState(io.reactivex.rxjava3.core.Observable<T>, R? initial);
+ method @androidx.compose.runtime.Composable public static <R, T extends R> androidx.compose.runtime.State<R> subscribeAsState(io.reactivex.rxjava3.core.Flowable<T>, R? initial);
+ method @androidx.compose.runtime.Composable public static <R, T extends R> androidx.compose.runtime.State<R> subscribeAsState(io.reactivex.rxjava3.core.Single<T>, R? initial);
+ method @androidx.compose.runtime.Composable public static <R, T extends R> androidx.compose.runtime.State<R> subscribeAsState(io.reactivex.rxjava3.core.Maybe<T>, R? initial);
+ method @androidx.compose.runtime.Composable public static androidx.compose.runtime.State<java.lang.Boolean> subscribeAsState(io.reactivex.rxjava3.core.Completable);
+ }
+
+}
+
diff --git a/compose/runtime/runtime-rxjava3/api/res-1.2.0-beta02.txt b/compose/runtime/runtime-rxjava3/api/res-1.2.0-beta02.txt
new file mode 100644
index 0000000..e69de29
--- /dev/null
+++ b/compose/runtime/runtime-rxjava3/api/res-1.2.0-beta02.txt
diff --git a/compose/runtime/runtime-rxjava3/api/restricted_1.2.0-beta02.txt b/compose/runtime/runtime-rxjava3/api/restricted_1.2.0-beta02.txt
new file mode 100644
index 0000000..1930cc8
--- /dev/null
+++ b/compose/runtime/runtime-rxjava3/api/restricted_1.2.0-beta02.txt
@@ -0,0 +1,13 @@
+// Signature format: 4.0
+package androidx.compose.runtime.rxjava3 {
+
+ public final class RxJava3AdapterKt {
+ method @androidx.compose.runtime.Composable public static <R, T extends R> androidx.compose.runtime.State<R> subscribeAsState(io.reactivex.rxjava3.core.Observable<T>, R? initial);
+ method @androidx.compose.runtime.Composable public static <R, T extends R> androidx.compose.runtime.State<R> subscribeAsState(io.reactivex.rxjava3.core.Flowable<T>, R? initial);
+ method @androidx.compose.runtime.Composable public static <R, T extends R> androidx.compose.runtime.State<R> subscribeAsState(io.reactivex.rxjava3.core.Single<T>, R? initial);
+ method @androidx.compose.runtime.Composable public static <R, T extends R> androidx.compose.runtime.State<R> subscribeAsState(io.reactivex.rxjava3.core.Maybe<T>, R? initial);
+ method @androidx.compose.runtime.Composable public static androidx.compose.runtime.State<java.lang.Boolean> subscribeAsState(io.reactivex.rxjava3.core.Completable);
+ }
+
+}
+
diff --git a/compose/runtime/runtime-saveable/api/1.2.0-beta02.txt b/compose/runtime/runtime-saveable/api/1.2.0-beta02.txt
new file mode 100644
index 0000000..ce5d51b
--- /dev/null
+++ b/compose/runtime/runtime-saveable/api/1.2.0-beta02.txt
@@ -0,0 +1,58 @@
+// Signature format: 4.0
+package androidx.compose.runtime.saveable {
+
+ public final class ListSaverKt {
+ method public static <Original, Saveable> androidx.compose.runtime.saveable.Saver<Original,java.lang.Object> listSaver(kotlin.jvm.functions.Function2<? super androidx.compose.runtime.saveable.SaverScope,? super Original,? extends java.util.List<? extends Saveable>> save, kotlin.jvm.functions.Function1<? super java.util.List<? extends Saveable>,? extends Original> restore);
+ }
+
+ public final class MapSaverKt {
+ method public static <T> androidx.compose.runtime.saveable.Saver<T,java.lang.Object> mapSaver(kotlin.jvm.functions.Function2<? super androidx.compose.runtime.saveable.SaverScope,? super T,? extends java.util.Map<java.lang.String,?>> save, kotlin.jvm.functions.Function1<? super java.util.Map<java.lang.String,?>,? extends T> restore);
+ }
+
+ public final class RememberSaveableKt {
+ method @androidx.compose.runtime.Composable public static <T> T rememberSaveable(Object![]? inputs, optional androidx.compose.runtime.saveable.Saver<T,?> saver, optional String? key, kotlin.jvm.functions.Function0<? extends T> init);
+ method @androidx.compose.runtime.Composable public static <T> androidx.compose.runtime.MutableState<T> rememberSaveable(Object![]? inputs, androidx.compose.runtime.saveable.Saver<T,?> stateSaver, optional String? key, kotlin.jvm.functions.Function0<? extends androidx.compose.runtime.MutableState<T>> init);
+ }
+
+ public interface SaveableStateHolder {
+ method @androidx.compose.runtime.Composable public void SaveableStateProvider(Object key, kotlin.jvm.functions.Function0<kotlin.Unit> content);
+ method public void removeState(Object key);
+ }
+
+ public final class SaveableStateHolderKt {
+ method @androidx.compose.runtime.Composable public static androidx.compose.runtime.saveable.SaveableStateHolder rememberSaveableStateHolder();
+ }
+
+ public interface SaveableStateRegistry {
+ method public boolean canBeSaved(Object value);
+ method public Object? consumeRestored(String key);
+ method public java.util.Map<java.lang.String,java.util.List<java.lang.Object>> performSave();
+ method public androidx.compose.runtime.saveable.SaveableStateRegistry.Entry registerProvider(String key, kotlin.jvm.functions.Function0<?> valueProvider);
+ }
+
+ public static interface SaveableStateRegistry.Entry {
+ method public void unregister();
+ }
+
+ public final class SaveableStateRegistryKt {
+ method public static androidx.compose.runtime.saveable.SaveableStateRegistry SaveableStateRegistry(java.util.Map<java.lang.String,? extends java.util.List<?>>? restoredValues, kotlin.jvm.functions.Function1<java.lang.Object,java.lang.Boolean> canBeSaved);
+ method public static androidx.compose.runtime.ProvidableCompositionLocal<androidx.compose.runtime.saveable.SaveableStateRegistry> getLocalSaveableStateRegistry();
+ property public static final androidx.compose.runtime.ProvidableCompositionLocal<androidx.compose.runtime.saveable.SaveableStateRegistry> LocalSaveableStateRegistry;
+ }
+
+ public interface Saver<Original, Saveable> {
+ method public Original? restore(Saveable value);
+ method public Saveable? save(androidx.compose.runtime.saveable.SaverScope, Original? value);
+ }
+
+ public final class SaverKt {
+ method public static <Original, Saveable> androidx.compose.runtime.saveable.Saver<Original,Saveable> Saver(kotlin.jvm.functions.Function2<? super androidx.compose.runtime.saveable.SaverScope,? super Original,? extends Saveable> save, kotlin.jvm.functions.Function1<? super Saveable,? extends Original> restore);
+ method public static <T> androidx.compose.runtime.saveable.Saver<T,java.lang.Object> autoSaver();
+ }
+
+ public fun interface SaverScope {
+ method public boolean canBeSaved(Object value);
+ }
+
+}
+
diff --git a/compose/runtime/runtime-saveable/api/public_plus_experimental_1.2.0-beta02.txt b/compose/runtime/runtime-saveable/api/public_plus_experimental_1.2.0-beta02.txt
new file mode 100644
index 0000000..ce5d51b
--- /dev/null
+++ b/compose/runtime/runtime-saveable/api/public_plus_experimental_1.2.0-beta02.txt
@@ -0,0 +1,58 @@
+// Signature format: 4.0
+package androidx.compose.runtime.saveable {
+
+ public final class ListSaverKt {
+ method public static <Original, Saveable> androidx.compose.runtime.saveable.Saver<Original,java.lang.Object> listSaver(kotlin.jvm.functions.Function2<? super androidx.compose.runtime.saveable.SaverScope,? super Original,? extends java.util.List<? extends Saveable>> save, kotlin.jvm.functions.Function1<? super java.util.List<? extends Saveable>,? extends Original> restore);
+ }
+
+ public final class MapSaverKt {
+ method public static <T> androidx.compose.runtime.saveable.Saver<T,java.lang.Object> mapSaver(kotlin.jvm.functions.Function2<? super androidx.compose.runtime.saveable.SaverScope,? super T,? extends java.util.Map<java.lang.String,?>> save, kotlin.jvm.functions.Function1<? super java.util.Map<java.lang.String,?>,? extends T> restore);
+ }
+
+ public final class RememberSaveableKt {
+ method @androidx.compose.runtime.Composable public static <T> T rememberSaveable(Object![]? inputs, optional androidx.compose.runtime.saveable.Saver<T,?> saver, optional String? key, kotlin.jvm.functions.Function0<? extends T> init);
+ method @androidx.compose.runtime.Composable public static <T> androidx.compose.runtime.MutableState<T> rememberSaveable(Object![]? inputs, androidx.compose.runtime.saveable.Saver<T,?> stateSaver, optional String? key, kotlin.jvm.functions.Function0<? extends androidx.compose.runtime.MutableState<T>> init);
+ }
+
+ public interface SaveableStateHolder {
+ method @androidx.compose.runtime.Composable public void SaveableStateProvider(Object key, kotlin.jvm.functions.Function0<kotlin.Unit> content);
+ method public void removeState(Object key);
+ }
+
+ public final class SaveableStateHolderKt {
+ method @androidx.compose.runtime.Composable public static androidx.compose.runtime.saveable.SaveableStateHolder rememberSaveableStateHolder();
+ }
+
+ public interface SaveableStateRegistry {
+ method public boolean canBeSaved(Object value);
+ method public Object? consumeRestored(String key);
+ method public java.util.Map<java.lang.String,java.util.List<java.lang.Object>> performSave();
+ method public androidx.compose.runtime.saveable.SaveableStateRegistry.Entry registerProvider(String key, kotlin.jvm.functions.Function0<?> valueProvider);
+ }
+
+ public static interface SaveableStateRegistry.Entry {
+ method public void unregister();
+ }
+
+ public final class SaveableStateRegistryKt {
+ method public static androidx.compose.runtime.saveable.SaveableStateRegistry SaveableStateRegistry(java.util.Map<java.lang.String,? extends java.util.List<?>>? restoredValues, kotlin.jvm.functions.Function1<java.lang.Object,java.lang.Boolean> canBeSaved);
+ method public static androidx.compose.runtime.ProvidableCompositionLocal<androidx.compose.runtime.saveable.SaveableStateRegistry> getLocalSaveableStateRegistry();
+ property public static final androidx.compose.runtime.ProvidableCompositionLocal<androidx.compose.runtime.saveable.SaveableStateRegistry> LocalSaveableStateRegistry;
+ }
+
+ public interface Saver<Original, Saveable> {
+ method public Original? restore(Saveable value);
+ method public Saveable? save(androidx.compose.runtime.saveable.SaverScope, Original? value);
+ }
+
+ public final class SaverKt {
+ method public static <Original, Saveable> androidx.compose.runtime.saveable.Saver<Original,Saveable> Saver(kotlin.jvm.functions.Function2<? super androidx.compose.runtime.saveable.SaverScope,? super Original,? extends Saveable> save, kotlin.jvm.functions.Function1<? super Saveable,? extends Original> restore);
+ method public static <T> androidx.compose.runtime.saveable.Saver<T,java.lang.Object> autoSaver();
+ }
+
+ public fun interface SaverScope {
+ method public boolean canBeSaved(Object value);
+ }
+
+}
+
diff --git a/compose/runtime/runtime-saveable/api/res-1.2.0-beta02.txt b/compose/runtime/runtime-saveable/api/res-1.2.0-beta02.txt
new file mode 100644
index 0000000..e69de29
--- /dev/null
+++ b/compose/runtime/runtime-saveable/api/res-1.2.0-beta02.txt
diff --git a/compose/runtime/runtime-saveable/api/restricted_1.2.0-beta02.txt b/compose/runtime/runtime-saveable/api/restricted_1.2.0-beta02.txt
new file mode 100644
index 0000000..ce5d51b
--- /dev/null
+++ b/compose/runtime/runtime-saveable/api/restricted_1.2.0-beta02.txt
@@ -0,0 +1,58 @@
+// Signature format: 4.0
+package androidx.compose.runtime.saveable {
+
+ public final class ListSaverKt {
+ method public static <Original, Saveable> androidx.compose.runtime.saveable.Saver<Original,java.lang.Object> listSaver(kotlin.jvm.functions.Function2<? super androidx.compose.runtime.saveable.SaverScope,? super Original,? extends java.util.List<? extends Saveable>> save, kotlin.jvm.functions.Function1<? super java.util.List<? extends Saveable>,? extends Original> restore);
+ }
+
+ public final class MapSaverKt {
+ method public static <T> androidx.compose.runtime.saveable.Saver<T,java.lang.Object> mapSaver(kotlin.jvm.functions.Function2<? super androidx.compose.runtime.saveable.SaverScope,? super T,? extends java.util.Map<java.lang.String,?>> save, kotlin.jvm.functions.Function1<? super java.util.Map<java.lang.String,?>,? extends T> restore);
+ }
+
+ public final class RememberSaveableKt {
+ method @androidx.compose.runtime.Composable public static <T> T rememberSaveable(Object![]? inputs, optional androidx.compose.runtime.saveable.Saver<T,?> saver, optional String? key, kotlin.jvm.functions.Function0<? extends T> init);
+ method @androidx.compose.runtime.Composable public static <T> androidx.compose.runtime.MutableState<T> rememberSaveable(Object![]? inputs, androidx.compose.runtime.saveable.Saver<T,?> stateSaver, optional String? key, kotlin.jvm.functions.Function0<? extends androidx.compose.runtime.MutableState<T>> init);
+ }
+
+ public interface SaveableStateHolder {
+ method @androidx.compose.runtime.Composable public void SaveableStateProvider(Object key, kotlin.jvm.functions.Function0<kotlin.Unit> content);
+ method public void removeState(Object key);
+ }
+
+ public final class SaveableStateHolderKt {
+ method @androidx.compose.runtime.Composable public static androidx.compose.runtime.saveable.SaveableStateHolder rememberSaveableStateHolder();
+ }
+
+ public interface SaveableStateRegistry {
+ method public boolean canBeSaved(Object value);
+ method public Object? consumeRestored(String key);
+ method public java.util.Map<java.lang.String,java.util.List<java.lang.Object>> performSave();
+ method public androidx.compose.runtime.saveable.SaveableStateRegistry.Entry registerProvider(String key, kotlin.jvm.functions.Function0<?> valueProvider);
+ }
+
+ public static interface SaveableStateRegistry.Entry {
+ method public void unregister();
+ }
+
+ public final class SaveableStateRegistryKt {
+ method public static androidx.compose.runtime.saveable.SaveableStateRegistry SaveableStateRegistry(java.util.Map<java.lang.String,? extends java.util.List<?>>? restoredValues, kotlin.jvm.functions.Function1<java.lang.Object,java.lang.Boolean> canBeSaved);
+ method public static androidx.compose.runtime.ProvidableCompositionLocal<androidx.compose.runtime.saveable.SaveableStateRegistry> getLocalSaveableStateRegistry();
+ property public static final androidx.compose.runtime.ProvidableCompositionLocal<androidx.compose.runtime.saveable.SaveableStateRegistry> LocalSaveableStateRegistry;
+ }
+
+ public interface Saver<Original, Saveable> {
+ method public Original? restore(Saveable value);
+ method public Saveable? save(androidx.compose.runtime.saveable.SaverScope, Original? value);
+ }
+
+ public final class SaverKt {
+ method public static <Original, Saveable> androidx.compose.runtime.saveable.Saver<Original,Saveable> Saver(kotlin.jvm.functions.Function2<? super androidx.compose.runtime.saveable.SaverScope,? super Original,? extends Saveable> save, kotlin.jvm.functions.Function1<? super Saveable,? extends Original> restore);
+ method public static <T> androidx.compose.runtime.saveable.Saver<T,java.lang.Object> autoSaver();
+ }
+
+ public fun interface SaverScope {
+ method public boolean canBeSaved(Object value);
+ }
+
+}
+
diff --git a/compose/runtime/runtime-tracing/build.gradle b/compose/runtime/runtime-tracing/build.gradle
new file mode 100644
index 0000000..4ed47d9
--- /dev/null
+++ b/compose/runtime/runtime-tracing/build.gradle
@@ -0,0 +1,58 @@
+/*
+ * Copyright (C) 2022 The Android Open Source Project
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+import androidx.build.Publish
+import androidx.build.RunApiTasks
+import org.jetbrains.kotlin.gradle.tasks.KotlinCompile
+
+plugins {
+ id("AndroidXPlugin")
+ id("com.android.library")
+ id("kotlin-android")
+}
+
+android {
+ defaultConfig {
+ minSdkVersion 21
+ }
+}
+
+dependencies {
+ api("androidx.annotation:annotation:1.3.0")
+ implementation(libs.kotlinStdlib)
+ implementation(projectOrArtifact(":compose:runtime:runtime"))
+ implementation(projectOrArtifact(":tracing:tracing-perfetto"))
+ implementation("androidx.startup:startup-runtime:1.1.1")
+ androidTestImplementation(libs.testExtJunit)
+ androidTestImplementation(libs.testRunner)
+ androidTestImplementation(libs.truth)
+}
+
+tasks.withType(KotlinCompile).configureEach {
+ kotlinOptions {
+ freeCompilerArgs += "-opt-in=kotlin.RequiresOptIn"
+ }
+}
+
+androidx {
+ name = "Compose Runtime: Tracing"
+ runApiTasks= new RunApiTasks.No("The API is still evolving") // TODO(b/231444429)
+ publish = Publish.SNAPSHOT_AND_RELEASE
+ mavenVersion = LibraryVersions.COMPOSE_RUNTIME_TRACING
+ mavenGroup = LibraryGroups.COMPOSE_RUNTIME
+ inceptionYear = "2022"
+ description = "Allows for additional tracing in a Compose app (e.g. tracing of Composables taking part in a Recomposition"
+}
diff --git a/compose/runtime/runtime-tracing/src/androidTest/AndroidManifest.xml b/compose/runtime/runtime-tracing/src/androidTest/AndroidManifest.xml
new file mode 100644
index 0000000..0b0410b
--- /dev/null
+++ b/compose/runtime/runtime-tracing/src/androidTest/AndroidManifest.xml
@@ -0,0 +1,36 @@
+<!--
+ Copyright 2022 The Android Open Source Project
+
+ Licensed under the Apache License, Version 2.0 (the "License");
+ you may not use this file except in compliance with the License.
+ You may obtain a copy of the License at
+
+ http://www.apache.org/licenses/LICENSE-2.0
+
+ Unless required by applicable law or agreed to in writing, software
+ distributed under the License is distributed on an "AS IS" BASIS,
+ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ See the License for the specific language governing permissions and
+ limitations under the License.
+ -->
+
+<!--
+ ~ Copyright (C) 2022 The Android Open Source Project
+ ~
+ ~ Licensed under the Apache License, Version 2.0 (the "License");
+ ~ you may not use this file except in compliance with the License.
+ ~ You may obtain a copy of the License at
+ ~
+ ~ http://www.apache.org/licenses/LICENSE-2.0
+ ~
+ ~ Unless required by applicable law or agreed to in writing, software
+ ~ distributed under the License is distributed on an "AS IS" BASIS,
+ ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ ~ See the License for the specific language governing permissions and
+ ~ limitations under the License.
+ -->
+
+<manifest xmlns:android="http://schemas.android.com/apk/res/android"
+ package="androidx.compose.runtime.tracing.test">
+
+</manifest>
diff --git a/compose/runtime/runtime-tracing/src/androidTest/java/androidx/compose/runtime/tracing/test/TracingInitializerTest.kt b/compose/runtime/runtime-tracing/src/androidTest/java/androidx/compose/runtime/tracing/test/TracingInitializerTest.kt
new file mode 100644
index 0000000..93af8de
--- /dev/null
+++ b/compose/runtime/runtime-tracing/src/androidTest/java/androidx/compose/runtime/tracing/test/TracingInitializerTest.kt
@@ -0,0 +1,52 @@
+/*
+ * Copyright 2022 The Android Open Source Project
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+/*
+ * Copyright 2022 The Android Open Source Project
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package androidx.compose.runtime.tracing.test
+
+import androidx.test.ext.junit.runners.AndroidJUnit4
+import androidx.test.filters.SmallTest
+import com.google.common.truth.Truth.assertThat
+import org.junit.Test
+import org.junit.runner.RunWith
+
+@SmallTest
+@RunWith(AndroidJUnit4::class)
+/**
+ * Fake test. The module is actually tested inside
+ * [androidx.compose.integration.macrobenchmark.TrivialTracingBenchmark].
+ */
+class TracingInitializerTest {
+ @Test
+ fun two_plus_two() {
+ assertThat<Int>(2 + 2).isEqualTo(4)
+ }
+}
diff --git a/compose/runtime/runtime-tracing/src/main/AndroidManifest.xml b/compose/runtime/runtime-tracing/src/main/AndroidManifest.xml
new file mode 100644
index 0000000..b3f90e5
--- /dev/null
+++ b/compose/runtime/runtime-tracing/src/main/AndroidManifest.xml
@@ -0,0 +1,49 @@
+<!--
+ Copyright 2022 The Android Open Source Project
+
+ Licensed under the Apache License, Version 2.0 (the "License");
+ you may not use this file except in compliance with the License.
+ You may obtain a copy of the License at
+
+ http://www.apache.org/licenses/LICENSE-2.0
+
+ Unless required by applicable law or agreed to in writing, software
+ distributed under the License is distributed on an "AS IS" BASIS,
+ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ See the License for the specific language governing permissions and
+ limitations under the License.
+ -->
+
+<!--
+ ~ Copyright (C) 2022 The Android Open Source Project
+ ~
+ ~ Licensed under the Apache License, Version 2.0 (the "License");
+ ~ you may not use this file except in compliance with the License.
+ ~ You may obtain a copy of the License at
+ ~
+ ~ http://www.apache.org/licenses/LICENSE-2.0
+ ~
+ ~ Unless required by applicable law or agreed to in writing, software
+ ~ distributed under the License is distributed on an "AS IS" BASIS,
+ ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ ~ See the License for the specific language governing permissions and
+ ~ limitations under the License.
+ -->
+
+<manifest xmlns:android="http://schemas.android.com/apk/res/android"
+ xmlns:tools="http://schemas.android.com/tools"
+ package="androidx.compose.runtime.tracing">
+
+ <application>
+ <provider
+ android:name="androidx.startup.InitializationProvider"
+ android:authorities="${applicationId}.androidx-startup"
+ android:exported="false"
+ tools:node="merge">
+ <meta-data
+ android:name="androidx.compose.runtime.tracing.TracingInitializer"
+ android:value="androidx.startup" />
+ </provider>
+ </application>
+
+</manifest>
diff --git a/compose/runtime/runtime-tracing/src/main/java/androidx/compose/runtime/tracing/TracingInitializer.kt b/compose/runtime/runtime-tracing/src/main/java/androidx/compose/runtime/tracing/TracingInitializer.kt
new file mode 100644
index 0000000..3721077
--- /dev/null
+++ b/compose/runtime/runtime-tracing/src/main/java/androidx/compose/runtime/tracing/TracingInitializer.kt
@@ -0,0 +1,55 @@
+/*
+ * Copyright 2022 The Android Open Source Project
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+/*
+ * Copyright 2022 The Android Open Source Project
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package androidx.compose.runtime.tracing
+
+import android.content.Context
+import androidx.compose.runtime.Composer
+import androidx.compose.runtime.CompositionTracer
+import androidx.compose.runtime.InternalComposeTracingApi
+import androidx.startup.Initializer
+import androidx.tracing.perfetto.Tracing
+
+@OptIn(InternalComposeTracingApi::class)
+class TracingInitializer : Initializer<Unit> {
+ override fun create(context: Context) {
+ Composer.setTracer(object : CompositionTracer {
+ override fun traceEventStart(key: Int, dirty1: Int, dirty2: Int, info: String) =
+ Tracing.traceEventStart(key, info)
+
+ override fun traceEventEnd() = Tracing.traceEventEnd()
+
+ override fun isTraceInProgress(): Boolean = Tracing.isEnabled
+ })
+ }
+
+ override fun dependencies(): List<Class<out Initializer<*>>> = emptyList()
+}
diff --git a/compose/runtime/runtime/api/1.2.0-beta02.txt b/compose/runtime/runtime/api/1.2.0-beta02.txt
new file mode 100644
index 0000000..f536737
--- /dev/null
+++ b/compose/runtime/runtime/api/1.2.0-beta02.txt
@@ -0,0 +1,968 @@
+// Signature format: 4.0
+package androidx.compose.runtime {
+
+ public abstract class AbstractApplier<T> implements androidx.compose.runtime.Applier<T> {
+ ctor public AbstractApplier(T? root);
+ method public final void clear();
+ method public void down(T? node);
+ method public T! getCurrent();
+ method public final T! getRoot();
+ method protected final void move(java.util.List<T>, int from, int to, int count);
+ method protected abstract void onClear();
+ method protected final void remove(java.util.List<T>, int index, int count);
+ method protected void setCurrent(T!);
+ method public void up();
+ property public T! current;
+ property public final T! root;
+ }
+
+ public final class ActualAndroid_androidKt {
+ method @Deprecated public static androidx.compose.runtime.MonotonicFrameClock getDefaultMonotonicFrameClock();
+ property @Deprecated public static final androidx.compose.runtime.MonotonicFrameClock DefaultMonotonicFrameClock;
+ }
+
+ public final class ActualJvm_jvmKt {
+ }
+
+ public interface Applier<N> {
+ method public void clear();
+ method public void down(N? node);
+ method public N! getCurrent();
+ method public void insertBottomUp(int index, N? instance);
+ method public void insertTopDown(int index, N? instance);
+ method public void move(int from, int to, int count);
+ method public default void onBeginChanges();
+ method public default void onEndChanges();
+ method public void remove(int index, int count);
+ method public void up();
+ property public abstract N! current;
+ }
+
+ public final class BitwiseOperatorsKt {
+ }
+
+ public final class BroadcastFrameClock implements androidx.compose.runtime.MonotonicFrameClock {
+ ctor public BroadcastFrameClock(optional kotlin.jvm.functions.Function0<kotlin.Unit>? onNewAwaiters);
+ method public void cancel(optional java.util.concurrent.CancellationException cancellationException);
+ method public boolean getHasAwaiters();
+ method public void sendFrame(long timeNanos);
+ method public suspend <R> Object? withFrameNanos(kotlin.jvm.functions.Function1<? super java.lang.Long,? extends R> onFrame, kotlin.coroutines.Continuation<? super R>);
+ property public final boolean hasAwaiters;
+ }
+
+ @kotlin.annotation.MustBeDocumented @kotlin.annotation.Retention(kotlin.annotation.AnnotationRetention.BINARY) @kotlin.annotation.Target(allowedTargets={kotlin.annotation.AnnotationTarget.FUNCTION, kotlin.annotation.AnnotationTarget.TYPE, kotlin.annotation.AnnotationTarget.TYPE_PARAMETER, kotlin.annotation.AnnotationTarget.PROPERTY_GETTER}) public @interface Composable {
+ }
+
+ @kotlin.annotation.Retention(kotlin.annotation.AnnotationRetention.BINARY) @kotlin.annotation.Target(allowedTargets={kotlin.annotation.AnnotationTarget.FUNCTION, kotlin.annotation.AnnotationTarget.PROPERTY_GETTER, kotlin.annotation.AnnotationTarget.TYPE, kotlin.annotation.AnnotationTarget.TYPE_PARAMETER}) public @interface ComposableOpenTarget {
+ method public abstract int index();
+ property public abstract int index;
+ }
+
+ @kotlin.annotation.Retention(kotlin.annotation.AnnotationRetention.BINARY) @kotlin.annotation.Target(allowedTargets={kotlin.annotation.AnnotationTarget.FILE, kotlin.annotation.AnnotationTarget.CLASS, kotlin.annotation.AnnotationTarget.FUNCTION, kotlin.annotation.AnnotationTarget.PROPERTY_GETTER, kotlin.annotation.AnnotationTarget.TYPE, kotlin.annotation.AnnotationTarget.TYPE_PARAMETER}) public @interface ComposableTarget {
+ method public abstract String applier();
+ property public abstract String applier;
+ }
+
+ @kotlin.annotation.Retention(kotlin.annotation.AnnotationRetention.BINARY) @kotlin.annotation.Target(allowedTargets=kotlin.annotation.AnnotationTarget.ANNOTATION_CLASS) public @interface ComposableTargetMarker {
+ method public abstract String description() default "";
+ property public abstract String description;
+ }
+
+ public final class ComposablesKt {
+ method @androidx.compose.runtime.Composable public static inline <T extends java.lang.Object, reified E extends androidx.compose.runtime.Applier<?>> void ComposeNode(kotlin.jvm.functions.Function0<? extends T> factory, kotlin.jvm.functions.Function1<? super androidx.compose.runtime.Updater<T>,? extends kotlin.Unit> update);
+ method @androidx.compose.runtime.Composable public static inline <T extends java.lang.Object, reified E extends androidx.compose.runtime.Applier<?>> void ComposeNode(kotlin.jvm.functions.Function0<? extends T> factory, kotlin.jvm.functions.Function1<? super androidx.compose.runtime.Updater<T>,? extends kotlin.Unit> update, kotlin.jvm.functions.Function0<? extends kotlin.Unit> content);
+ method @androidx.compose.runtime.Composable @androidx.compose.runtime.ExplicitGroupsComposable public static inline <T, reified E extends androidx.compose.runtime.Applier<?>> void ComposeNode(kotlin.jvm.functions.Function0<? extends T> factory, kotlin.jvm.functions.Function1<? super androidx.compose.runtime.Updater<T>,? extends kotlin.Unit> update, kotlin.jvm.functions.Function1<? super androidx.compose.runtime.SkippableUpdater<T>,? extends kotlin.Unit> skippableUpdate, kotlin.jvm.functions.Function0<? extends kotlin.Unit> content);
+ method @androidx.compose.runtime.Composable public static inline <T extends java.lang.Object, reified E extends androidx.compose.runtime.Applier<?>> void ReusableComposeNode(kotlin.jvm.functions.Function0<? extends T> factory, kotlin.jvm.functions.Function1<? super androidx.compose.runtime.Updater<T>,? extends kotlin.Unit> update);
+ method @androidx.compose.runtime.Composable public static inline <T extends java.lang.Object, reified E extends androidx.compose.runtime.Applier<?>> void ReusableComposeNode(kotlin.jvm.functions.Function0<? extends T> factory, kotlin.jvm.functions.Function1<? super androidx.compose.runtime.Updater<T>,? extends kotlin.Unit> update, kotlin.jvm.functions.Function0<? extends kotlin.Unit> content);
+ method @androidx.compose.runtime.Composable @androidx.compose.runtime.ExplicitGroupsComposable public static inline <T, reified E extends androidx.compose.runtime.Applier<?>> void ReusableComposeNode(kotlin.jvm.functions.Function0<? extends T> factory, kotlin.jvm.functions.Function1<? super androidx.compose.runtime.Updater<T>,? extends kotlin.Unit> update, kotlin.jvm.functions.Function1<? super androidx.compose.runtime.SkippableUpdater<T>,? extends kotlin.Unit> skippableUpdate, kotlin.jvm.functions.Function0<? extends kotlin.Unit> content);
+ method @androidx.compose.runtime.Composable public static inline void ReusableContent(Object? key, kotlin.jvm.functions.Function0<kotlin.Unit> content);
+ method @androidx.compose.runtime.Composable @androidx.compose.runtime.ExplicitGroupsComposable public static inline void ReusableContentHost(boolean active, kotlin.jvm.functions.Function0<kotlin.Unit> content);
+ method @androidx.compose.runtime.Composable @androidx.compose.runtime.ReadOnlyComposable public static androidx.compose.runtime.Composer getCurrentComposer();
+ method @androidx.compose.runtime.Composable @androidx.compose.runtime.ExplicitGroupsComposable public static int getCurrentCompositeKeyHash();
+ method @androidx.compose.runtime.Composable public static androidx.compose.runtime.CompositionLocalContext getCurrentCompositionLocalContext();
+ method @androidx.compose.runtime.Composable @androidx.compose.runtime.ReadOnlyComposable public static androidx.compose.runtime.RecomposeScope getCurrentRecomposeScope();
+ method @androidx.compose.runtime.Composable public static inline <T> T! key(Object![]? keys, kotlin.jvm.functions.Function0<? extends T> block);
+ method @androidx.compose.runtime.Composable public static inline <T> T! remember(kotlin.jvm.functions.Function0<? extends T> calculation);
+ method @androidx.compose.runtime.Composable public static inline <T> T! remember(Object? key1, kotlin.jvm.functions.Function0<? extends T> calculation);
+ method @androidx.compose.runtime.Composable public static inline <T> T! remember(Object? key1, Object? key2, kotlin.jvm.functions.Function0<? extends T> calculation);
+ method @androidx.compose.runtime.Composable public static inline <T> T! remember(Object? key1, Object? key2, Object? key3, kotlin.jvm.functions.Function0<? extends T> calculation);
+ method @androidx.compose.runtime.Composable public static inline <T> T! remember(Object![]? keys, kotlin.jvm.functions.Function0<? extends T> calculation);
+ method @androidx.compose.runtime.Composable public static androidx.compose.runtime.CompositionContext rememberCompositionContext();
+ property @androidx.compose.runtime.Composable @androidx.compose.runtime.ReadOnlyComposable public static final androidx.compose.runtime.Composer currentComposer;
+ property @androidx.compose.runtime.Composable @androidx.compose.runtime.ExplicitGroupsComposable public static final int currentCompositeKeyHash;
+ property @androidx.compose.runtime.Composable public static final androidx.compose.runtime.CompositionLocalContext currentCompositionLocalContext;
+ property @androidx.compose.runtime.Composable @androidx.compose.runtime.ReadOnlyComposable public static final androidx.compose.runtime.RecomposeScope currentRecomposeScope;
+ }
+
+ @kotlin.annotation.Target(allowedTargets={kotlin.annotation.AnnotationTarget.CLASS, kotlin.annotation.AnnotationTarget.FUNCTION, kotlin.annotation.AnnotationTarget.PROPERTY, kotlin.annotation.AnnotationTarget.TYPEALIAS}) public @interface ComposeCompilerApi {
+ }
+
+ public sealed interface Composer {
+ method @androidx.compose.runtime.ComposeCompilerApi public <V, T> void apply(V? value, kotlin.jvm.functions.Function2<? super T,? super V,kotlin.Unit> block);
+ method @androidx.compose.runtime.ComposeCompilerApi public boolean changed(Object? value);
+ method @androidx.compose.runtime.ComposeCompilerApi public default boolean changed(boolean value);
+ method @androidx.compose.runtime.ComposeCompilerApi public default boolean changed(char value);
+ method @androidx.compose.runtime.ComposeCompilerApi public default boolean changed(byte value);
+ method @androidx.compose.runtime.ComposeCompilerApi public default boolean changed(short value);
+ method @androidx.compose.runtime.ComposeCompilerApi public default boolean changed(int value);
+ method @androidx.compose.runtime.ComposeCompilerApi public default boolean changed(float value);
+ method @androidx.compose.runtime.ComposeCompilerApi public default boolean changed(long value);
+ method @androidx.compose.runtime.ComposeCompilerApi public default boolean changed(double value);
+ method public void collectParameterInformation();
+ method @androidx.compose.runtime.ComposeCompilerApi public <T> void createNode(kotlin.jvm.functions.Function0<? extends T> factory);
+ method @androidx.compose.runtime.ComposeCompilerApi public void deactivateToEndGroup(boolean changed);
+ method @androidx.compose.runtime.ComposeCompilerApi public void disableReusing();
+ method @androidx.compose.runtime.ComposeCompilerApi public void enableReusing();
+ method @androidx.compose.runtime.ComposeCompilerApi public void endDefaults();
+ method @androidx.compose.runtime.ComposeCompilerApi public void endMovableGroup();
+ method @androidx.compose.runtime.ComposeCompilerApi public void endNode();
+ method @androidx.compose.runtime.ComposeCompilerApi public void endReplaceableGroup();
+ method @androidx.compose.runtime.ComposeCompilerApi public androidx.compose.runtime.ScopeUpdateScope? endRestartGroup();
+ method @androidx.compose.runtime.ComposeCompilerApi public void endReusableGroup();
+ method public androidx.compose.runtime.Applier<?> getApplier();
+ method @org.jetbrains.annotations.TestOnly public kotlin.coroutines.CoroutineContext getApplyCoroutineContext();
+ method @org.jetbrains.annotations.TestOnly public androidx.compose.runtime.ControlledComposition getComposition();
+ method public androidx.compose.runtime.tooling.CompositionData getCompositionData();
+ method public int getCompoundKeyHash();
+ method public boolean getDefaultsInvalid();
+ method public boolean getInserting();
+ method public androidx.compose.runtime.RecomposeScope? getRecomposeScope();
+ method public Object? getRecomposeScopeIdentity();
+ method public boolean getSkipping();
+ method @androidx.compose.runtime.ComposeCompilerApi public Object joinKey(Object? left, Object? right);
+ method @androidx.compose.runtime.ComposeCompilerApi public Object? rememberedValue();
+ method @androidx.compose.runtime.ComposeCompilerApi public void skipCurrentGroup();
+ method @androidx.compose.runtime.ComposeCompilerApi public void skipToGroupEnd();
+ method public void sourceInformation(String sourceInformation);
+ method public void sourceInformationMarkerEnd();
+ method public void sourceInformationMarkerStart(int key, String sourceInformation);
+ method @androidx.compose.runtime.ComposeCompilerApi public void startDefaults();
+ method @androidx.compose.runtime.ComposeCompilerApi public void startMovableGroup(int key, Object? dataKey);
+ method @androidx.compose.runtime.ComposeCompilerApi public void startNode();
+ method @androidx.compose.runtime.ComposeCompilerApi public void startReplaceableGroup(int key);
+ method @androidx.compose.runtime.ComposeCompilerApi public androidx.compose.runtime.Composer startRestartGroup(int key);
+ method @androidx.compose.runtime.ComposeCompilerApi public void startReusableGroup(int key, Object? dataKey);
+ method @androidx.compose.runtime.ComposeCompilerApi public void startReusableNode();
+ method @androidx.compose.runtime.ComposeCompilerApi public void updateRememberedValue(Object? value);
+ method @androidx.compose.runtime.ComposeCompilerApi public void useNode();
+ property public abstract androidx.compose.runtime.Applier<?> applier;
+ property @org.jetbrains.annotations.TestOnly public abstract kotlin.coroutines.CoroutineContext applyCoroutineContext;
+ property @org.jetbrains.annotations.TestOnly public abstract androidx.compose.runtime.ControlledComposition composition;
+ property public abstract androidx.compose.runtime.tooling.CompositionData compositionData;
+ property public abstract int compoundKeyHash;
+ property public abstract boolean defaultsInvalid;
+ property public abstract boolean inserting;
+ property public abstract androidx.compose.runtime.RecomposeScope? recomposeScope;
+ property public abstract Object? recomposeScopeIdentity;
+ property public abstract boolean skipping;
+ field public static final androidx.compose.runtime.Composer.Companion Companion;
+ }
+
+ public static final class Composer.Companion {
+ method public Object getEmpty();
+ property public final Object Empty;
+ }
+
+ public final class ComposerKt {
+ method @androidx.compose.runtime.ComposeCompilerApi public static inline <T> T! cache(androidx.compose.runtime.Composer, boolean invalid, kotlin.jvm.functions.Function0<? extends T> block);
+ method @androidx.compose.runtime.ComposeCompilerApi public static boolean isTraceInProgress();
+ method @androidx.compose.runtime.ComposeCompilerApi public static void sourceInformation(androidx.compose.runtime.Composer composer, String sourceInformation);
+ method @androidx.compose.runtime.ComposeCompilerApi public static void sourceInformationMarkerEnd(androidx.compose.runtime.Composer composer);
+ method @androidx.compose.runtime.ComposeCompilerApi public static void sourceInformationMarkerStart(androidx.compose.runtime.Composer composer, int key, String sourceInformation);
+ method @androidx.compose.runtime.ComposeCompilerApi public static void traceEventEnd();
+ method @androidx.compose.runtime.ComposeCompilerApi public static void traceEventStart(int key, int dirty1, int dirty2, String info);
+ }
+
+ public interface Composition {
+ method public void dispose();
+ method public boolean getHasInvalidations();
+ method public boolean isDisposed();
+ method public void setContent(kotlin.jvm.functions.Function0<kotlin.Unit> content);
+ property public abstract boolean hasInvalidations;
+ property public abstract boolean isDisposed;
+ }
+
+ public abstract class CompositionContext {
+ }
+
+ public final class CompositionContextKt {
+ }
+
+ public final class CompositionKt {
+ method public static androidx.compose.runtime.Composition Composition(androidx.compose.runtime.Applier<?> applier, androidx.compose.runtime.CompositionContext parent);
+ method @org.jetbrains.annotations.TestOnly public static androidx.compose.runtime.ControlledComposition ControlledComposition(androidx.compose.runtime.Applier<?> applier, androidx.compose.runtime.CompositionContext parent);
+ }
+
+ @androidx.compose.runtime.Stable public abstract sealed class CompositionLocal<T> {
+ method @androidx.compose.runtime.Composable @androidx.compose.runtime.ReadOnlyComposable public final inline T! getCurrent();
+ property @androidx.compose.runtime.Composable @androidx.compose.runtime.ReadOnlyComposable public final inline T! current;
+ }
+
+ @androidx.compose.runtime.Stable public final class CompositionLocalContext {
+ }
+
+ public final class CompositionLocalKt {
+ method @androidx.compose.runtime.Composable public static void CompositionLocalProvider(androidx.compose.runtime.ProvidedValue<?>![] values, kotlin.jvm.functions.Function0<kotlin.Unit> content);
+ method @androidx.compose.runtime.Composable public static void CompositionLocalProvider(androidx.compose.runtime.CompositionLocalContext context, kotlin.jvm.functions.Function0<kotlin.Unit> content);
+ method public static <T> androidx.compose.runtime.ProvidableCompositionLocal<T> compositionLocalOf(optional androidx.compose.runtime.SnapshotMutationPolicy<T> policy, kotlin.jvm.functions.Function0<? extends T> defaultFactory);
+ method public static <T> androidx.compose.runtime.ProvidableCompositionLocal<T> staticCompositionLocalOf(kotlin.jvm.functions.Function0<? extends T> defaultFactory);
+ }
+
+ public sealed interface ControlledComposition extends androidx.compose.runtime.Composition {
+ method public void applyChanges();
+ method public void applyLateChanges();
+ method public void changesApplied();
+ method public void composeContent(kotlin.jvm.functions.Function0<kotlin.Unit> content);
+ method public <R> R! delegateInvalidations(androidx.compose.runtime.ControlledComposition? to, int groupIndex, kotlin.jvm.functions.Function0<? extends R> block);
+ method public boolean getHasPendingChanges();
+ method public void invalidateAll();
+ method public boolean isComposing();
+ method public boolean observesAnyOf(java.util.Set<?> values);
+ method public void prepareCompose(kotlin.jvm.functions.Function0<kotlin.Unit> block);
+ method public boolean recompose();
+ method public void recordModificationsOf(java.util.Set<?> values);
+ method public void recordReadOf(Object value);
+ method public void recordWriteOf(Object value);
+ property public abstract boolean hasPendingChanges;
+ property public abstract boolean isComposing;
+ }
+
+ @kotlin.annotation.MustBeDocumented @kotlin.annotation.Retention(kotlin.annotation.AnnotationRetention.BINARY) @kotlin.annotation.Target(allowedTargets=kotlin.annotation.AnnotationTarget.TYPE) public @interface DisallowComposableCalls {
+ }
+
+ public interface DisposableEffectResult {
+ method public void dispose();
+ }
+
+ public final class DisposableEffectScope {
+ ctor public DisposableEffectScope();
+ method public inline androidx.compose.runtime.DisposableEffectResult onDispose(kotlin.jvm.functions.Function0<kotlin.Unit> onDisposeEffect);
+ }
+
+ public final class EffectsKt {
+ method @Deprecated @androidx.compose.runtime.Composable @androidx.compose.runtime.NonRestartableComposable public static void DisposableEffect(kotlin.jvm.functions.Function1<? super androidx.compose.runtime.DisposableEffectScope,? extends androidx.compose.runtime.DisposableEffectResult> effect);
+ method @androidx.compose.runtime.Composable @androidx.compose.runtime.NonRestartableComposable public static void DisposableEffect(Object? key1, kotlin.jvm.functions.Function1<? super androidx.compose.runtime.DisposableEffectScope,? extends androidx.compose.runtime.DisposableEffectResult> effect);
+ method @androidx.compose.runtime.Composable @androidx.compose.runtime.NonRestartableComposable public static void DisposableEffect(Object? key1, Object? key2, kotlin.jvm.functions.Function1<? super androidx.compose.runtime.DisposableEffectScope,? extends androidx.compose.runtime.DisposableEffectResult> effect);
+ method @androidx.compose.runtime.Composable @androidx.compose.runtime.NonRestartableComposable public static void DisposableEffect(Object? key1, Object? key2, Object? key3, kotlin.jvm.functions.Function1<? super androidx.compose.runtime.DisposableEffectScope,? extends androidx.compose.runtime.DisposableEffectResult> effect);
+ method @androidx.compose.runtime.Composable @androidx.compose.runtime.NonRestartableComposable public static void DisposableEffect(Object![]? keys, kotlin.jvm.functions.Function1<? super androidx.compose.runtime.DisposableEffectScope,? extends androidx.compose.runtime.DisposableEffectResult> effect);
+ method @Deprecated @androidx.compose.runtime.Composable public static void LaunchedEffect(kotlin.jvm.functions.Function2<? super kotlinx.coroutines.CoroutineScope,? super kotlin.coroutines.Continuation<? super kotlin.Unit>,?> block);
+ method @androidx.compose.runtime.Composable @androidx.compose.runtime.NonRestartableComposable public static void LaunchedEffect(Object? key1, kotlin.jvm.functions.Function2<? super kotlinx.coroutines.CoroutineScope,? super kotlin.coroutines.Continuation<? super kotlin.Unit>,?> block);
+ method @androidx.compose.runtime.Composable @androidx.compose.runtime.NonRestartableComposable public static void LaunchedEffect(Object? key1, Object? key2, kotlin.jvm.functions.Function2<? super kotlinx.coroutines.CoroutineScope,? super kotlin.coroutines.Continuation<? super kotlin.Unit>,?> block);
+ method @androidx.compose.runtime.Composable @androidx.compose.runtime.NonRestartableComposable public static void LaunchedEffect(Object? key1, Object? key2, Object? key3, kotlin.jvm.functions.Function2<? super kotlinx.coroutines.CoroutineScope,? super kotlin.coroutines.Continuation<? super kotlin.Unit>,?> block);
+ method @androidx.compose.runtime.Composable @androidx.compose.runtime.NonRestartableComposable public static void LaunchedEffect(Object![]? keys, kotlin.jvm.functions.Function2<? super kotlinx.coroutines.CoroutineScope,? super kotlin.coroutines.Continuation<? super kotlin.Unit>,?> block);
+ method @androidx.compose.runtime.Composable @androidx.compose.runtime.NonRestartableComposable public static void SideEffect(kotlin.jvm.functions.Function0<kotlin.Unit> effect);
+ method @androidx.compose.runtime.Composable public static inline kotlinx.coroutines.CoroutineScope rememberCoroutineScope(optional kotlin.jvm.functions.Function0<? extends kotlin.coroutines.CoroutineContext> getContext);
+ }
+
+ public final class ExpectKt {
+ }
+
+ @kotlin.annotation.Retention(kotlin.annotation.AnnotationRetention.SOURCE) @kotlin.annotation.Target(allowedTargets={kotlin.annotation.AnnotationTarget.FUNCTION, kotlin.annotation.AnnotationTarget.PROPERTY_GETTER}) public @interface ExplicitGroupsComposable {
+ }
+
+ @androidx.compose.runtime.StableMarker @kotlin.annotation.MustBeDocumented @kotlin.annotation.Retention(kotlin.annotation.AnnotationRetention.BINARY) @kotlin.annotation.Target(allowedTargets=kotlin.annotation.AnnotationTarget.CLASS) public @interface Immutable {
+ }
+
+ public interface MonotonicFrameClock extends kotlin.coroutines.CoroutineContext.Element {
+ method public default kotlin.coroutines.CoroutineContext.Key<?> getKey();
+ method public suspend <R> Object? withFrameNanos(kotlin.jvm.functions.Function1<? super java.lang.Long,? extends R> onFrame, kotlin.coroutines.Continuation<? super R>);
+ property public default kotlin.coroutines.CoroutineContext.Key<?> key;
+ field public static final androidx.compose.runtime.MonotonicFrameClock.Key Key;
+ }
+
+ public static final class MonotonicFrameClock.Key implements kotlin.coroutines.CoroutineContext.Key<androidx.compose.runtime.MonotonicFrameClock> {
+ }
+
+ public final class MonotonicFrameClockKt {
+ method public static androidx.compose.runtime.MonotonicFrameClock getMonotonicFrameClock(kotlin.coroutines.CoroutineContext);
+ method public static suspend inline <R> Object? withFrameMillis(androidx.compose.runtime.MonotonicFrameClock, kotlin.jvm.functions.Function1<? super java.lang.Long,? extends R> onFrame, kotlin.coroutines.Continuation<? super R>);
+ method public static suspend <R> Object? withFrameMillis(kotlin.jvm.functions.Function1<? super java.lang.Long,? extends R> onFrame, kotlin.coroutines.Continuation<? super R>);
+ method public static suspend <R> Object? withFrameNanos(kotlin.jvm.functions.Function1<? super java.lang.Long,? extends R> onFrame, kotlin.coroutines.Continuation<? super R>);
+ }
+
+ public final class MovableContentKt {
+ method public static kotlin.jvm.functions.Function0<kotlin.Unit> movableContentOf(kotlin.jvm.functions.Function0<kotlin.Unit> content);
+ method public static <P> kotlin.jvm.functions.Function1<P,kotlin.Unit> movableContentOf(kotlin.jvm.functions.Function1<? super P,kotlin.Unit> content);
+ method public static <P1, P2> kotlin.jvm.functions.Function2<P1,P2,kotlin.Unit> movableContentOf(kotlin.jvm.functions.Function2<? super P1,? super P2,kotlin.Unit> content);
+ method public static <P1, P2, P3> kotlin.jvm.functions.Function3<P1,P2,P3,kotlin.Unit> movableContentOf(kotlin.jvm.functions.Function3<? super P1,? super P2,? super P3,kotlin.Unit> content);
+ method public static <P1, P2, P3, P4> kotlin.jvm.functions.Function4<P1,P2,P3,P4,kotlin.Unit> movableContentOf(kotlin.jvm.functions.Function4<? super P1,? super P2,? super P3,? super P4,kotlin.Unit> content);
+ method public static <R> kotlin.jvm.functions.Function1<R,kotlin.Unit> movableContentWithReceiverOf(kotlin.jvm.functions.Function1<? super R,kotlin.Unit> content);
+ method public static <R, P> kotlin.jvm.functions.Function2<R,P,kotlin.Unit> movableContentWithReceiverOf(kotlin.jvm.functions.Function2<? super R,? super P,kotlin.Unit> content);
+ method public static <R, P1, P2> kotlin.jvm.functions.Function3<R,P1,P2,kotlin.Unit> movableContentWithReceiverOf(kotlin.jvm.functions.Function3<? super R,? super P1,? super P2,kotlin.Unit> content);
+ method public static <R, P1, P2, P3> kotlin.jvm.functions.Function4<R,P1,P2,P3,kotlin.Unit> movableContentWithReceiverOf(kotlin.jvm.functions.Function4<? super R,? super P1,? super P2,? super P3,kotlin.Unit> content);
+ }
+
+ @androidx.compose.runtime.Stable public interface MutableState<T> extends androidx.compose.runtime.State<T> {
+ method public operator T! component1();
+ method public operator kotlin.jvm.functions.Function1<T,kotlin.Unit> component2();
+ method public void setValue(T!);
+ property public abstract T! value;
+ }
+
+ @kotlin.annotation.Retention(kotlin.annotation.AnnotationRetention.SOURCE) @kotlin.annotation.Target(allowedTargets={kotlin.annotation.AnnotationTarget.PROPERTY, kotlin.annotation.AnnotationTarget.FUNCTION, kotlin.annotation.AnnotationTarget.CLASS, kotlin.annotation.AnnotationTarget.FILE}) public @interface NoLiveLiterals {
+ }
+
+ @kotlin.annotation.Retention(kotlin.annotation.AnnotationRetention.SOURCE) @kotlin.annotation.Target(allowedTargets={kotlin.annotation.AnnotationTarget.FUNCTION, kotlin.annotation.AnnotationTarget.PROPERTY_GETTER}) public @interface NonRestartableComposable {
+ }
+
+ public final class PausableMonotonicFrameClock implements androidx.compose.runtime.MonotonicFrameClock {
+ ctor public PausableMonotonicFrameClock(androidx.compose.runtime.MonotonicFrameClock frameClock);
+ method public boolean isPaused();
+ method public void pause();
+ method public void resume();
+ method public suspend <R> Object? withFrameNanos(kotlin.jvm.functions.Function1<? super java.lang.Long,? extends R> onFrame, kotlin.coroutines.Continuation<? super R>);
+ property public final boolean isPaused;
+ }
+
+ public interface ProduceStateScope<T> extends androidx.compose.runtime.MutableState<T> kotlinx.coroutines.CoroutineScope {
+ method public suspend Object? awaitDispose(kotlin.jvm.functions.Function0<kotlin.Unit> onDispose, kotlin.coroutines.Continuation<?>);
+ }
+
+ @androidx.compose.runtime.Stable public abstract class ProvidableCompositionLocal<T> extends androidx.compose.runtime.CompositionLocal<T> {
+ method public final infix androidx.compose.runtime.ProvidedValue<T> provides(T? value);
+ method public final infix androidx.compose.runtime.ProvidedValue<T> providesDefault(T? value);
+ }
+
+ public final class ProvidedValue<T> {
+ method public boolean getCanOverride();
+ method public androidx.compose.runtime.CompositionLocal<T> getCompositionLocal();
+ method public T! getValue();
+ property public final boolean canOverride;
+ property public final androidx.compose.runtime.CompositionLocal<T> compositionLocal;
+ property public final T! value;
+ }
+
+ @kotlin.annotation.MustBeDocumented @kotlin.annotation.Retention(kotlin.annotation.AnnotationRetention.BINARY) @kotlin.annotation.Target(allowedTargets={kotlin.annotation.AnnotationTarget.FUNCTION, kotlin.annotation.AnnotationTarget.PROPERTY_GETTER}) public @interface ReadOnlyComposable {
+ }
+
+ public interface RecomposeScope {
+ method public void invalidate();
+ }
+
+ public final class RecomposeScopeImplKt {
+ }
+
+ public final class Recomposer extends androidx.compose.runtime.CompositionContext {
+ ctor public Recomposer(kotlin.coroutines.CoroutineContext effectCoroutineContext);
+ method public androidx.compose.runtime.RecomposerInfo asRecomposerInfo();
+ method public suspend Object? awaitIdle(kotlin.coroutines.Continuation<? super kotlin.Unit>);
+ method public void cancel();
+ method public void close();
+ method public long getChangeCount();
+ method public kotlinx.coroutines.flow.StateFlow<androidx.compose.runtime.Recomposer.State> getCurrentState();
+ method public boolean getHasPendingWork();
+ method @Deprecated public kotlinx.coroutines.flow.Flow<androidx.compose.runtime.Recomposer.State> getState();
+ method public suspend Object? join(kotlin.coroutines.Continuation<? super kotlin.Unit>);
+ method public suspend Object? runRecomposeAndApplyChanges(kotlin.coroutines.Continuation<? super kotlin.Unit>);
+ property public final long changeCount;
+ property public final kotlinx.coroutines.flow.StateFlow<androidx.compose.runtime.Recomposer.State> currentState;
+ property public final boolean hasPendingWork;
+ property @Deprecated public final kotlinx.coroutines.flow.Flow<androidx.compose.runtime.Recomposer.State> state;
+ field public static final androidx.compose.runtime.Recomposer.Companion Companion;
+ }
+
+ public static final class Recomposer.Companion {
+ method public kotlinx.coroutines.flow.StateFlow<java.util.Set<androidx.compose.runtime.RecomposerInfo>> getRunningRecomposers();
+ property public final kotlinx.coroutines.flow.StateFlow<java.util.Set<androidx.compose.runtime.RecomposerInfo>> runningRecomposers;
+ }
+
+ public enum Recomposer.State {
+ enum_constant public static final androidx.compose.runtime.Recomposer.State Idle;
+ enum_constant public static final androidx.compose.runtime.Recomposer.State Inactive;
+ enum_constant public static final androidx.compose.runtime.Recomposer.State InactivePendingWork;
+ enum_constant public static final androidx.compose.runtime.Recomposer.State PendingWork;
+ enum_constant public static final androidx.compose.runtime.Recomposer.State ShutDown;
+ enum_constant public static final androidx.compose.runtime.Recomposer.State ShuttingDown;
+ }
+
+ public interface RecomposerInfo {
+ method public long getChangeCount();
+ method public boolean getHasPendingWork();
+ method public kotlinx.coroutines.flow.Flow<androidx.compose.runtime.Recomposer.State> getState();
+ property public abstract long changeCount;
+ property public abstract boolean hasPendingWork;
+ property public abstract kotlinx.coroutines.flow.Flow<androidx.compose.runtime.Recomposer.State> state;
+ }
+
+ public final class RecomposerKt {
+ method public static suspend <R> Object? withRunningRecomposer(kotlin.jvm.functions.Function3<? super kotlinx.coroutines.CoroutineScope,? super androidx.compose.runtime.Recomposer,? super kotlin.coroutines.Continuation<? super R>,?> block, kotlin.coroutines.Continuation<? super R>);
+ }
+
+ public interface RememberObserver {
+ method public void onAbandoned();
+ method public void onForgotten();
+ method public void onRemembered();
+ }
+
+ @androidx.compose.runtime.ComposeCompilerApi public interface ScopeUpdateScope {
+ method public void updateScope(kotlin.jvm.functions.Function2<? super androidx.compose.runtime.Composer,? super java.lang.Integer,kotlin.Unit> block);
+ }
+
+ @kotlin.jvm.JvmInline public final value class SkippableUpdater<T> {
+ ctor public SkippableUpdater(@kotlin.PublishedApi androidx.compose.runtime.Composer composer);
+ method public inline void update(kotlin.jvm.functions.Function1<? super androidx.compose.runtime.Updater<T>,kotlin.Unit> block);
+ }
+
+ public final class SlotTableKt {
+ }
+
+ public interface SnapshotMutationPolicy<T> {
+ method public boolean equivalent(T? a, T? b);
+ method public default T? merge(T? previous, T? current, T? applied);
+ }
+
+ public final class SnapshotStateKt {
+ method @androidx.compose.runtime.Composable public static <T> androidx.compose.runtime.State<T> collectAsState(kotlinx.coroutines.flow.StateFlow<? extends T>, optional kotlin.coroutines.CoroutineContext context);
+ method @androidx.compose.runtime.Composable public static <T extends R, R> androidx.compose.runtime.State<R> collectAsState(kotlinx.coroutines.flow.Flow<? extends T>, R? initial, optional kotlin.coroutines.CoroutineContext context);
+ method public static <T> androidx.compose.runtime.State<T> derivedStateOf(kotlin.jvm.functions.Function0<? extends T> calculation);
+ method public static inline operator <T> T! getValue(androidx.compose.runtime.State<? extends T>, Object? thisObj, kotlin.reflect.KProperty<?> property);
+ method public static <T> androidx.compose.runtime.snapshots.SnapshotStateList<T> mutableStateListOf();
+ method public static <T> androidx.compose.runtime.snapshots.SnapshotStateList<T> mutableStateListOf(T?... elements);
+ method public static <K, V> androidx.compose.runtime.snapshots.SnapshotStateMap<K,V> mutableStateMapOf();
+ method public static <K, V> androidx.compose.runtime.snapshots.SnapshotStateMap<K,V> mutableStateMapOf(kotlin.Pair<? extends K,? extends V>... pairs);
+ method public static <T> androidx.compose.runtime.MutableState<T> mutableStateOf(T? value, optional androidx.compose.runtime.SnapshotMutationPolicy<T> policy);
+ method public static <T> androidx.compose.runtime.SnapshotMutationPolicy<T> neverEqualPolicy();
+ method @androidx.compose.runtime.Composable public static <T> androidx.compose.runtime.State<T> produceState(T? initialValue, kotlin.jvm.functions.Function2<? super androidx.compose.runtime.ProduceStateScope<T>,? super kotlin.coroutines.Continuation<? super kotlin.Unit>,?> producer);
+ method @androidx.compose.runtime.Composable public static <T> androidx.compose.runtime.State<T> produceState(T? initialValue, Object? key1, kotlin.jvm.functions.Function2<? super androidx.compose.runtime.ProduceStateScope<T>,? super kotlin.coroutines.Continuation<? super kotlin.Unit>,?> producer);
+ method @androidx.compose.runtime.Composable public static <T> androidx.compose.runtime.State<T> produceState(T? initialValue, Object? key1, Object? key2, kotlin.jvm.functions.Function2<? super androidx.compose.runtime.ProduceStateScope<T>,? super kotlin.coroutines.Continuation<? super kotlin.Unit>,?> producer);
+ method @androidx.compose.runtime.Composable public static <T> androidx.compose.runtime.State<T> produceState(T? initialValue, Object? key1, Object? key2, Object? key3, kotlin.jvm.functions.Function2<? super androidx.compose.runtime.ProduceStateScope<T>,? super kotlin.coroutines.Continuation<? super kotlin.Unit>,?> producer);
+ method @androidx.compose.runtime.Composable public static <T> androidx.compose.runtime.State<T> produceState(T? initialValue, Object![]? keys, kotlin.jvm.functions.Function2<? super androidx.compose.runtime.ProduceStateScope<T>,? super kotlin.coroutines.Continuation<? super kotlin.Unit>,?> producer);
+ method public static <T> androidx.compose.runtime.SnapshotMutationPolicy<T> referentialEqualityPolicy();
+ method @androidx.compose.runtime.Composable public static <T> androidx.compose.runtime.State<T> rememberUpdatedState(T? newValue);
+ method public static inline operator <T> void setValue(androidx.compose.runtime.MutableState<T>, Object? thisObj, kotlin.reflect.KProperty<?> property, T? value);
+ method public static <T> kotlinx.coroutines.flow.Flow<T> snapshotFlow(kotlin.jvm.functions.Function0<? extends T> block);
+ method public static <T> androidx.compose.runtime.SnapshotMutationPolicy<T> structuralEqualityPolicy();
+ method public static <T> androidx.compose.runtime.snapshots.SnapshotStateList<T> toMutableStateList(java.util.Collection<? extends T>);
+ method public static <K, V> androidx.compose.runtime.snapshots.SnapshotStateMap<K,V> toMutableStateMap(Iterable<? extends kotlin.Pair<? extends K,? extends V>>);
+ }
+
+ public final class SnapshotStateKt {
+ method @androidx.compose.runtime.Composable public static <T> androidx.compose.runtime.State<T> collectAsState(kotlinx.coroutines.flow.StateFlow<? extends T>, optional kotlin.coroutines.CoroutineContext context);
+ method @androidx.compose.runtime.Composable public static <T extends R, R> androidx.compose.runtime.State<R> collectAsState(kotlinx.coroutines.flow.Flow<? extends T>, R? initial, optional kotlin.coroutines.CoroutineContext context);
+ method public static <T> androidx.compose.runtime.State<T> derivedStateOf(kotlin.jvm.functions.Function0<? extends T> calculation);
+ method public static inline operator <T> T! getValue(androidx.compose.runtime.State<? extends T>, Object? thisObj, kotlin.reflect.KProperty<?> property);
+ method public static <T> androidx.compose.runtime.snapshots.SnapshotStateList<T> mutableStateListOf();
+ method public static <T> androidx.compose.runtime.snapshots.SnapshotStateList<T> mutableStateListOf(T?... elements);
+ method public static <K, V> androidx.compose.runtime.snapshots.SnapshotStateMap<K,V> mutableStateMapOf();
+ method public static <K, V> androidx.compose.runtime.snapshots.SnapshotStateMap<K,V> mutableStateMapOf(kotlin.Pair<? extends K,? extends V>... pairs);
+ method public static <T> androidx.compose.runtime.MutableState<T> mutableStateOf(T? value, optional androidx.compose.runtime.SnapshotMutationPolicy<T> policy);
+ method public static <T> androidx.compose.runtime.SnapshotMutationPolicy<T> neverEqualPolicy();
+ method @androidx.compose.runtime.Composable public static <T> androidx.compose.runtime.State<T> produceState(T? initialValue, kotlin.jvm.functions.Function2<? super androidx.compose.runtime.ProduceStateScope<T>,? super kotlin.coroutines.Continuation<? super kotlin.Unit>,?> producer);
+ method @androidx.compose.runtime.Composable public static <T> androidx.compose.runtime.State<T> produceState(T? initialValue, Object? key1, kotlin.jvm.functions.Function2<? super androidx.compose.runtime.ProduceStateScope<T>,? super kotlin.coroutines.Continuation<? super kotlin.Unit>,?> producer);
+ method @androidx.compose.runtime.Composable public static <T> androidx.compose.runtime.State<T> produceState(T? initialValue, Object? key1, Object? key2, kotlin.jvm.functions.Function2<? super androidx.compose.runtime.ProduceStateScope<T>,? super kotlin.coroutines.Continuation<? super kotlin.Unit>,?> producer);
+ method @androidx.compose.runtime.Composable public static <T> androidx.compose.runtime.State<T> produceState(T? initialValue, Object? key1, Object? key2, Object? key3, kotlin.jvm.functions.Function2<? super androidx.compose.runtime.ProduceStateScope<T>,? super kotlin.coroutines.Continuation<? super kotlin.Unit>,?> producer);
+ method @androidx.compose.runtime.Composable public static <T> androidx.compose.runtime.State<T> produceState(T? initialValue, Object![]? keys, kotlin.jvm.functions.Function2<? super androidx.compose.runtime.ProduceStateScope<T>,? super kotlin.coroutines.Continuation<? super kotlin.Unit>,?> producer);
+ method public static <T> androidx.compose.runtime.SnapshotMutationPolicy<T> referentialEqualityPolicy();
+ method @androidx.compose.runtime.Composable public static <T> androidx.compose.runtime.State<T> rememberUpdatedState(T? newValue);
+ method public static inline operator <T> void setValue(androidx.compose.runtime.MutableState<T>, Object? thisObj, kotlin.reflect.KProperty<?> property, T? value);
+ method public static <T> kotlinx.coroutines.flow.Flow<T> snapshotFlow(kotlin.jvm.functions.Function0<? extends T> block);
+ method public static <T> androidx.compose.runtime.SnapshotMutationPolicy<T> structuralEqualityPolicy();
+ method public static <T> androidx.compose.runtime.snapshots.SnapshotStateList<T> toMutableStateList(java.util.Collection<? extends T>);
+ method public static <K, V> androidx.compose.runtime.snapshots.SnapshotStateMap<K,V> toMutableStateMap(Iterable<? extends kotlin.Pair<? extends K,? extends V>>);
+ }
+
+ public final class SnapshotStateKt {
+ method @androidx.compose.runtime.Composable public static <T> androidx.compose.runtime.State<T> collectAsState(kotlinx.coroutines.flow.StateFlow<? extends T>, optional kotlin.coroutines.CoroutineContext context);
+ method @androidx.compose.runtime.Composable public static <T extends R, R> androidx.compose.runtime.State<R> collectAsState(kotlinx.coroutines.flow.Flow<? extends T>, R? initial, optional kotlin.coroutines.CoroutineContext context);
+ method public static <T> androidx.compose.runtime.State<T> derivedStateOf(kotlin.jvm.functions.Function0<? extends T> calculation);
+ method public static inline operator <T> T! getValue(androidx.compose.runtime.State<? extends T>, Object? thisObj, kotlin.reflect.KProperty<?> property);
+ method public static <T> androidx.compose.runtime.snapshots.SnapshotStateList<T> mutableStateListOf();
+ method public static <T> androidx.compose.runtime.snapshots.SnapshotStateList<T> mutableStateListOf(T?... elements);
+ method public static <K, V> androidx.compose.runtime.snapshots.SnapshotStateMap<K,V> mutableStateMapOf();
+ method public static <K, V> androidx.compose.runtime.snapshots.SnapshotStateMap<K,V> mutableStateMapOf(kotlin.Pair<? extends K,? extends V>... pairs);
+ method public static <T> androidx.compose.runtime.MutableState<T> mutableStateOf(T? value, optional androidx.compose.runtime.SnapshotMutationPolicy<T> policy);
+ method public static <T> androidx.compose.runtime.SnapshotMutationPolicy<T> neverEqualPolicy();
+ method @androidx.compose.runtime.Composable public static <T> androidx.compose.runtime.State<T> produceState(T? initialValue, kotlin.jvm.functions.Function2<? super androidx.compose.runtime.ProduceStateScope<T>,? super kotlin.coroutines.Continuation<? super kotlin.Unit>,?> producer);
+ method @androidx.compose.runtime.Composable public static <T> androidx.compose.runtime.State<T> produceState(T? initialValue, Object? key1, kotlin.jvm.functions.Function2<? super androidx.compose.runtime.ProduceStateScope<T>,? super kotlin.coroutines.Continuation<? super kotlin.Unit>,?> producer);
+ method @androidx.compose.runtime.Composable public static <T> androidx.compose.runtime.State<T> produceState(T? initialValue, Object? key1, Object? key2, kotlin.jvm.functions.Function2<? super androidx.compose.runtime.ProduceStateScope<T>,? super kotlin.coroutines.Continuation<? super kotlin.Unit>,?> producer);
+ method @androidx.compose.runtime.Composable public static <T> androidx.compose.runtime.State<T> produceState(T? initialValue, Object? key1, Object? key2, Object? key3, kotlin.jvm.functions.Function2<? super androidx.compose.runtime.ProduceStateScope<T>,? super kotlin.coroutines.Continuation<? super kotlin.Unit>,?> producer);
+ method @androidx.compose.runtime.Composable public static <T> androidx.compose.runtime.State<T> produceState(T? initialValue, Object![]? keys, kotlin.jvm.functions.Function2<? super androidx.compose.runtime.ProduceStateScope<T>,? super kotlin.coroutines.Continuation<? super kotlin.Unit>,?> producer);
+ method public static <T> androidx.compose.runtime.SnapshotMutationPolicy<T> referentialEqualityPolicy();
+ method @androidx.compose.runtime.Composable public static <T> androidx.compose.runtime.State<T> rememberUpdatedState(T? newValue);
+ method public static inline operator <T> void setValue(androidx.compose.runtime.MutableState<T>, Object? thisObj, kotlin.reflect.KProperty<?> property, T? value);
+ method public static <T> kotlinx.coroutines.flow.Flow<T> snapshotFlow(kotlin.jvm.functions.Function0<? extends T> block);
+ method public static <T> androidx.compose.runtime.SnapshotMutationPolicy<T> structuralEqualityPolicy();
+ method public static <T> androidx.compose.runtime.snapshots.SnapshotStateList<T> toMutableStateList(java.util.Collection<? extends T>);
+ method public static <K, V> androidx.compose.runtime.snapshots.SnapshotStateMap<K,V> toMutableStateMap(Iterable<? extends kotlin.Pair<? extends K,? extends V>>);
+ }
+
+ public final class SnapshotStateKt {
+ method @androidx.compose.runtime.Composable public static <T> androidx.compose.runtime.State<T> collectAsState(kotlinx.coroutines.flow.StateFlow<? extends T>, optional kotlin.coroutines.CoroutineContext context);
+ method @androidx.compose.runtime.Composable public static <T extends R, R> androidx.compose.runtime.State<R> collectAsState(kotlinx.coroutines.flow.Flow<? extends T>, R? initial, optional kotlin.coroutines.CoroutineContext context);
+ method public static <T> androidx.compose.runtime.State<T> derivedStateOf(kotlin.jvm.functions.Function0<? extends T> calculation);
+ method public static inline operator <T> T! getValue(androidx.compose.runtime.State<? extends T>, Object? thisObj, kotlin.reflect.KProperty<?> property);
+ method public static <T> androidx.compose.runtime.snapshots.SnapshotStateList<T> mutableStateListOf();
+ method public static <T> androidx.compose.runtime.snapshots.SnapshotStateList<T> mutableStateListOf(T?... elements);
+ method public static <K, V> androidx.compose.runtime.snapshots.SnapshotStateMap<K,V> mutableStateMapOf();
+ method public static <K, V> androidx.compose.runtime.snapshots.SnapshotStateMap<K,V> mutableStateMapOf(kotlin.Pair<? extends K,? extends V>... pairs);
+ method public static <T> androidx.compose.runtime.MutableState<T> mutableStateOf(T? value, optional androidx.compose.runtime.SnapshotMutationPolicy<T> policy);
+ method public static <T> androidx.compose.runtime.SnapshotMutationPolicy<T> neverEqualPolicy();
+ method @androidx.compose.runtime.Composable public static <T> androidx.compose.runtime.State<T> produceState(T? initialValue, kotlin.jvm.functions.Function2<? super androidx.compose.runtime.ProduceStateScope<T>,? super kotlin.coroutines.Continuation<? super kotlin.Unit>,?> producer);
+ method @androidx.compose.runtime.Composable public static <T> androidx.compose.runtime.State<T> produceState(T? initialValue, Object? key1, kotlin.jvm.functions.Function2<? super androidx.compose.runtime.ProduceStateScope<T>,? super kotlin.coroutines.Continuation<? super kotlin.Unit>,?> producer);
+ method @androidx.compose.runtime.Composable public static <T> androidx.compose.runtime.State<T> produceState(T? initialValue, Object? key1, Object? key2, kotlin.jvm.functions.Function2<? super androidx.compose.runtime.ProduceStateScope<T>,? super kotlin.coroutines.Continuation<? super kotlin.Unit>,?> producer);
+ method @androidx.compose.runtime.Composable public static <T> androidx.compose.runtime.State<T> produceState(T? initialValue, Object? key1, Object? key2, Object? key3, kotlin.jvm.functions.Function2<? super androidx.compose.runtime.ProduceStateScope<T>,? super kotlin.coroutines.Continuation<? super kotlin.Unit>,?> producer);
+ method @androidx.compose.runtime.Composable public static <T> androidx.compose.runtime.State<T> produceState(T? initialValue, Object![]? keys, kotlin.jvm.functions.Function2<? super androidx.compose.runtime.ProduceStateScope<T>,? super kotlin.coroutines.Continuation<? super kotlin.Unit>,?> producer);
+ method public static <T> androidx.compose.runtime.SnapshotMutationPolicy<T> referentialEqualityPolicy();
+ method @androidx.compose.runtime.Composable public static <T> androidx.compose.runtime.State<T> rememberUpdatedState(T? newValue);
+ method public static inline operator <T> void setValue(androidx.compose.runtime.MutableState<T>, Object? thisObj, kotlin.reflect.KProperty<?> property, T? value);
+ method public static <T> kotlinx.coroutines.flow.Flow<T> snapshotFlow(kotlin.jvm.functions.Function0<? extends T> block);
+ method public static <T> androidx.compose.runtime.SnapshotMutationPolicy<T> structuralEqualityPolicy();
+ method public static <T> androidx.compose.runtime.snapshots.SnapshotStateList<T> toMutableStateList(java.util.Collection<? extends T>);
+ method public static <K, V> androidx.compose.runtime.snapshots.SnapshotStateMap<K,V> toMutableStateMap(Iterable<? extends kotlin.Pair<? extends K,? extends V>>);
+ }
+
+ public final class SnapshotStateKt {
+ method @androidx.compose.runtime.Composable public static <T> androidx.compose.runtime.State<T> collectAsState(kotlinx.coroutines.flow.StateFlow<? extends T>, optional kotlin.coroutines.CoroutineContext context);
+ method @androidx.compose.runtime.Composable public static <T extends R, R> androidx.compose.runtime.State<R> collectAsState(kotlinx.coroutines.flow.Flow<? extends T>, R? initial, optional kotlin.coroutines.CoroutineContext context);
+ method public static <T> androidx.compose.runtime.State<T> derivedStateOf(kotlin.jvm.functions.Function0<? extends T> calculation);
+ method public static inline operator <T> T! getValue(androidx.compose.runtime.State<? extends T>, Object? thisObj, kotlin.reflect.KProperty<?> property);
+ method public static <T> androidx.compose.runtime.snapshots.SnapshotStateList<T> mutableStateListOf();
+ method public static <T> androidx.compose.runtime.snapshots.SnapshotStateList<T> mutableStateListOf(T?... elements);
+ method public static <K, V> androidx.compose.runtime.snapshots.SnapshotStateMap<K,V> mutableStateMapOf();
+ method public static <K, V> androidx.compose.runtime.snapshots.SnapshotStateMap<K,V> mutableStateMapOf(kotlin.Pair<? extends K,? extends V>... pairs);
+ method public static <T> androidx.compose.runtime.MutableState<T> mutableStateOf(T? value, optional androidx.compose.runtime.SnapshotMutationPolicy<T> policy);
+ method public static <T> androidx.compose.runtime.SnapshotMutationPolicy<T> neverEqualPolicy();
+ method @androidx.compose.runtime.Composable public static <T> androidx.compose.runtime.State<T> produceState(T? initialValue, kotlin.jvm.functions.Function2<? super androidx.compose.runtime.ProduceStateScope<T>,? super kotlin.coroutines.Continuation<? super kotlin.Unit>,?> producer);
+ method @androidx.compose.runtime.Composable public static <T> androidx.compose.runtime.State<T> produceState(T? initialValue, Object? key1, kotlin.jvm.functions.Function2<? super androidx.compose.runtime.ProduceStateScope<T>,? super kotlin.coroutines.Continuation<? super kotlin.Unit>,?> producer);
+ method @androidx.compose.runtime.Composable public static <T> androidx.compose.runtime.State<T> produceState(T? initialValue, Object? key1, Object? key2, kotlin.jvm.functions.Function2<? super androidx.compose.runtime.ProduceStateScope<T>,? super kotlin.coroutines.Continuation<? super kotlin.Unit>,?> producer);
+ method @androidx.compose.runtime.Composable public static <T> androidx.compose.runtime.State<T> produceState(T? initialValue, Object? key1, Object? key2, Object? key3, kotlin.jvm.functions.Function2<? super androidx.compose.runtime.ProduceStateScope<T>,? super kotlin.coroutines.Continuation<? super kotlin.Unit>,?> producer);
+ method @androidx.compose.runtime.Composable public static <T> androidx.compose.runtime.State<T> produceState(T? initialValue, Object![]? keys, kotlin.jvm.functions.Function2<? super androidx.compose.runtime.ProduceStateScope<T>,? super kotlin.coroutines.Continuation<? super kotlin.Unit>,?> producer);
+ method public static <T> androidx.compose.runtime.SnapshotMutationPolicy<T> referentialEqualityPolicy();
+ method @androidx.compose.runtime.Composable public static <T> androidx.compose.runtime.State<T> rememberUpdatedState(T? newValue);
+ method public static inline operator <T> void setValue(androidx.compose.runtime.MutableState<T>, Object? thisObj, kotlin.reflect.KProperty<?> property, T? value);
+ method public static <T> kotlinx.coroutines.flow.Flow<T> snapshotFlow(kotlin.jvm.functions.Function0<? extends T> block);
+ method public static <T> androidx.compose.runtime.SnapshotMutationPolicy<T> structuralEqualityPolicy();
+ method public static <T> androidx.compose.runtime.snapshots.SnapshotStateList<T> toMutableStateList(java.util.Collection<? extends T>);
+ method public static <K, V> androidx.compose.runtime.snapshots.SnapshotStateMap<K,V> toMutableStateMap(Iterable<? extends kotlin.Pair<? extends K,? extends V>>);
+ }
+
+ @androidx.compose.runtime.StableMarker @kotlin.annotation.MustBeDocumented @kotlin.annotation.Retention(kotlin.annotation.AnnotationRetention.BINARY) @kotlin.annotation.Target(allowedTargets={kotlin.annotation.AnnotationTarget.CLASS, kotlin.annotation.AnnotationTarget.FUNCTION, kotlin.annotation.AnnotationTarget.PROPERTY_GETTER, kotlin.annotation.AnnotationTarget.PROPERTY}) public @interface Stable {
+ }
+
+ @kotlin.annotation.MustBeDocumented @kotlin.annotation.Retention(kotlin.annotation.AnnotationRetention.BINARY) @kotlin.annotation.Target(allowedTargets={kotlin.annotation.AnnotationTarget.ANNOTATION_CLASS, kotlin.annotation.AnnotationTarget.CLASS}) public @interface StableMarker {
+ }
+
+ @androidx.compose.runtime.Stable public interface State<T> {
+ method public T! getValue();
+ property public abstract T! value;
+ }
+
+ public final class TraceKt {
+ }
+
+ @kotlin.jvm.JvmInline public final value class Updater<T> {
+ ctor public Updater(@kotlin.PublishedApi androidx.compose.runtime.Composer composer);
+ method public void init(kotlin.jvm.functions.Function1<? super T,kotlin.Unit> block);
+ method public void reconcile(kotlin.jvm.functions.Function1<? super T,kotlin.Unit> block);
+ method public inline void set(int value, kotlin.jvm.functions.Function2<? super T,? super java.lang.Integer,kotlin.Unit> block);
+ method public <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 <V> void update(V? value, kotlin.jvm.functions.Function2<? super T,? super V,kotlin.Unit> block);
+ }
+
+}
+
+package androidx.compose.runtime.collection {
+
+ public final class MutableVector<T> implements java.util.RandomAccess {
+ method public boolean add(T? element);
+ method public void add(int index, T? element);
+ method public boolean addAll(int index, java.util.List<? extends T> elements);
+ method public boolean addAll(int index, androidx.compose.runtime.collection.MutableVector<T> elements);
+ method public inline boolean addAll(java.util.List<? extends T> elements);
+ method public inline boolean addAll(androidx.compose.runtime.collection.MutableVector<T> elements);
+ method public boolean addAll(T![] elements);
+ method public boolean addAll(int index, java.util.Collection<? extends T> elements);
+ method public boolean addAll(java.util.Collection<? extends T> elements);
+ method public inline boolean any(kotlin.jvm.functions.Function1<? super T,java.lang.Boolean> predicate);
+ method public java.util.List<T> asMutableList();
+ method public void clear();
+ method public operator boolean contains(T? element);
+ method public boolean containsAll(java.util.List<? extends T> elements);
+ method public boolean containsAll(java.util.Collection<? extends T> elements);
+ method public boolean containsAll(androidx.compose.runtime.collection.MutableVector<T> elements);
+ method public boolean contentEquals(androidx.compose.runtime.collection.MutableVector<T> other);
+ method public void ensureCapacity(int capacity);
+ method public T! first();
+ method public inline T! first(kotlin.jvm.functions.Function1<? super T,java.lang.Boolean> predicate);
+ method public inline T? firstOrNull();
+ method public inline T? firstOrNull(kotlin.jvm.functions.Function1<? super T,java.lang.Boolean> predicate);
+ method public inline <R> R! fold(R? initial, kotlin.jvm.functions.Function2<? super R,? super T,? extends R> operation);
+ method public inline <R> R! foldIndexed(R? initial, kotlin.jvm.functions.Function3<? super java.lang.Integer,? super R,? super T,? extends R> operation);
+ method public inline <R> R! foldRight(R? initial, kotlin.jvm.functions.Function2<? super T,? super R,? extends R> operation);
+ method public inline <R> R! foldRightIndexed(R? initial, kotlin.jvm.functions.Function3<? super java.lang.Integer,? super T,? super R,? extends R> operation);
+ method public inline void forEach(kotlin.jvm.functions.Function1<? super T,kotlin.Unit> block);
+ method public inline void forEachIndexed(kotlin.jvm.functions.Function2<? super java.lang.Integer,? super T,kotlin.Unit> block);
+ method public inline void forEachReversed(kotlin.jvm.functions.Function1<? super T,kotlin.Unit> block);
+ method public inline void forEachReversedIndexed(kotlin.jvm.functions.Function2<? super java.lang.Integer,? super T,kotlin.Unit> block);
+ method public inline operator T! get(int index);
+ method public inline kotlin.ranges.IntRange getIndices();
+ method public inline int getLastIndex();
+ method public int getSize();
+ method public int indexOf(T? element);
+ method public inline int indexOfFirst(kotlin.jvm.functions.Function1<? super T,java.lang.Boolean> predicate);
+ method public inline int indexOfLast(kotlin.jvm.functions.Function1<? super T,java.lang.Boolean> predicate);
+ method public boolean isEmpty();
+ method public boolean isNotEmpty();
+ method public T! last();
+ method public inline T! last(kotlin.jvm.functions.Function1<? super T,java.lang.Boolean> predicate);
+ method public int lastIndexOf(T? element);
+ method public inline T? lastOrNull();
+ method public inline T? lastOrNull(kotlin.jvm.functions.Function1<? super T,java.lang.Boolean> predicate);
+ method public inline <reified R> R![]! map(kotlin.jvm.functions.Function1<? super T,? extends R> transform);
+ method public inline <reified R> R![]! mapIndexed(kotlin.jvm.functions.Function2<? super java.lang.Integer,? super T,? extends R> transform);
+ method public inline <reified R> androidx.compose.runtime.collection.MutableVector<R>! mapIndexedNotNull(kotlin.jvm.functions.Function2<? super java.lang.Integer,? super T,? extends R> transform);
+ method public inline <reified R> androidx.compose.runtime.collection.MutableVector<R>! mapNotNull(kotlin.jvm.functions.Function1<? super T,? extends R> transform);
+ method public inline operator void minusAssign(T? element);
+ method public inline operator void plusAssign(T? element);
+ method public boolean remove(T? element);
+ method public boolean removeAll(java.util.List<? extends T> elements);
+ method public boolean removeAll(androidx.compose.runtime.collection.MutableVector<T> elements);
+ method public boolean removeAll(java.util.Collection<? extends T> elements);
+ method public T! removeAt(int index);
+ method public void removeRange(int start, int end);
+ method public boolean retainAll(java.util.Collection<? extends T> elements);
+ method public inline boolean reversedAny(kotlin.jvm.functions.Function1<? super T,java.lang.Boolean> predicate);
+ method public operator T! set(int index, T? element);
+ method public void sortWith(java.util.Comparator<T> comparator);
+ method public inline int sumBy(kotlin.jvm.functions.Function1<? super T,java.lang.Integer> selector);
+ property public final inline kotlin.ranges.IntRange indices;
+ property public final inline int lastIndex;
+ property public final int size;
+ }
+
+ public final class MutableVectorKt {
+ method public static inline <reified T> androidx.compose.runtime.collection.MutableVector<T>! MutableVector(optional int capacity);
+ method public static inline <reified T> androidx.compose.runtime.collection.MutableVector<T>! MutableVector(int size, kotlin.jvm.functions.Function1<? super java.lang.Integer,? extends T> init);
+ method public static inline <reified T> androidx.compose.runtime.collection.MutableVector<T>! mutableVectorOf();
+ method public static inline <reified T> androidx.compose.runtime.collection.MutableVector<T>! mutableVectorOf(T? elements);
+ }
+
+}
+
+package androidx.compose.runtime.external.kotlinx.collections.immutable {
+
+ public final class ExtensionsKt {
+ }
+
+}
+
+package androidx.compose.runtime.external.kotlinx.collections.immutable.implementations.immutableList {
+
+ public final class UtilsKt {
+ }
+
+}
+
+package androidx.compose.runtime.external.kotlinx.collections.immutable.implementations.immutableMap {
+
+ public final class PersistentHashMapContentIteratorsKt {
+ }
+
+ public final class TrieNodeKt {
+ }
+
+}
+
+package androidx.compose.runtime.external.kotlinx.collections.immutable.implementations.immutableSet {
+
+ public final class TrieNodeKt {
+ }
+
+}
+
+package androidx.compose.runtime.external.kotlinx.collections.immutable.internal {
+
+ public final class CommonFunctionsKt {
+ }
+
+ public final class ForEachOneBitKt {
+ }
+
+}
+
+package androidx.compose.runtime.internal {
+
+ @androidx.compose.runtime.ComposeCompilerApi @androidx.compose.runtime.Stable public interface ComposableLambda extends kotlin.jvm.functions.Function2<androidx.compose.runtime.Composer,java.lang.Integer,java.lang.Object> kotlin.jvm.functions.Function10<java.lang.Object,java.lang.Object,java.lang.Object,java.lang.Object,java.lang.Object,java.lang.Object,java.lang.Object,java.lang.Object,androidx.compose.runtime.Composer,java.lang.Integer,java.lang.Object> kotlin.jvm.functions.Function11<java.lang.Object,java.lang.Object,java.lang.Object,java.lang.Object,java.lang.Object,java.lang.Object,java.lang.Object,java.lang.Object,java.lang.Object,androidx.compose.runtime.Composer,java.lang.Integer,java.lang.Object> kotlin.jvm.functions.Function13<java.lang.Object,java.lang.Object,java.lang.Object,java.lang.Object,java.lang.Object,java.lang.Object,java.lang.Object,java.lang.Object,java.lang.Object,java.lang.Object,androidx.compose.runtime.Composer,java.lang.Integer,java.lang.Integer,java.lang.Object> kotlin.jvm.functions.Function14<java.lang.Object,java.lang.Object,java.lang.Object,java.lang.Object,java.lang.Object,java.lang.Object,java.lang.Object,java.lang.Object,java.lang.Object,java.lang.Object,java.lang.Object,androidx.compose.runtime.Composer,java.lang.Integer,java.lang.Integer,java.lang.Object> kotlin.jvm.functions.Function15<java.lang.Object,java.lang.Object,java.lang.Object,java.lang.Object,java.lang.Object,java.lang.Object,java.lang.Object,java.lang.Object,java.lang.Object,java.lang.Object,java.lang.Object,java.lang.Object,androidx.compose.runtime.Composer,java.lang.Integer,java.lang.Integer,java.lang.Object> kotlin.jvm.functions.Function16<java.lang.Object,java.lang.Object,java.lang.Object,java.lang.Object,java.lang.Object,java.lang.Object,java.lang.Object,java.lang.Object,java.lang.Object,java.lang.Object,java.lang.Object,java.lang.Object,java.lang.Object,androidx.compose.runtime.Composer,java.lang.Integer,java.lang.Integer,java.lang.Object> kotlin.jvm.functions.Function17<java.lang.Object,java.lang.Object,java.lang.Object,java.lang.Object,java.lang.Object,java.lang.Object,java.lang.Object,java.lang.Object,java.lang.Object,java.lang.Object,java.lang.Object,java.lang.Object,java.lang.Object,java.lang.Object,androidx.compose.runtime.Composer,java.lang.Integer,java.lang.Integer,java.lang.Object> kotlin.jvm.functions.Function18<java.lang.Object,java.lang.Object,java.lang.Object,java.lang.Object,java.lang.Object,java.lang.Object,java.lang.Object,java.lang.Object,java.lang.Object,java.lang.Object,java.lang.Object,java.lang.Object,java.lang.Object,java.lang.Object,java.lang.Object,androidx.compose.runtime.Composer,java.lang.Integer,java.lang.Integer,java.lang.Object> kotlin.jvm.functions.Function19<java.lang.Object,java.lang.Object,java.lang.Object,java.lang.Object,java.lang.Object,java.lang.Object,java.lang.Object,java.lang.Object,java.lang.Object,java.lang.Object,java.lang.Object,java.lang.Object,java.lang.Object,java.lang.Object,java.lang.Object,java.lang.Object,androidx.compose.runtime.Composer,java.lang.Integer,java.lang.Integer,java.lang.Object> kotlin.jvm.functions.Function20<java.lang.Object,java.lang.Object,java.lang.Object,java.lang.Object,java.lang.Object,java.lang.Object,java.lang.Object,java.lang.Object,java.lang.Object,java.lang.Object,java.lang.Object,java.lang.Object,java.lang.Object,java.lang.Object,java.lang.Object,java.lang.Object,java.lang.Object,androidx.compose.runtime.Composer,java.lang.Integer,java.lang.Integer,java.lang.Object> kotlin.jvm.functions.Function21<java.lang.Object,java.lang.Object,java.lang.Object,java.lang.Object,java.lang.Object,java.lang.Object,java.lang.Object,java.lang.Object,java.lang.Object,java.lang.Object,java.lang.Object,java.lang.Object,java.lang.Object,java.lang.Object,java.lang.Object,java.lang.Object,java.lang.Object,java.lang.Object,androidx.compose.runtime.Composer,java.lang.Integer,java.lang.Integer,java.lang.Object> kotlin.jvm.functions.Function3<java.lang.Object,androidx.compose.runtime.Composer,java.lang.Integer,java.lang.Object> kotlin.jvm.functions.Function4<java.lang.Object,java.lang.Object,androidx.compose.runtime.Composer,java.lang.Integer,java.lang.Object> kotlin.jvm.functions.Function5<java.lang.Object,java.lang.Object,java.lang.Object,androidx.compose.runtime.Composer,java.lang.Integer,java.lang.Object> kotlin.jvm.functions.Function6<java.lang.Object,java.lang.Object,java.lang.Object,java.lang.Object,androidx.compose.runtime.Composer,java.lang.Integer,java.lang.Object> kotlin.jvm.functions.Function7<java.lang.Object,java.lang.Object,java.lang.Object,java.lang.Object,java.lang.Object,androidx.compose.runtime.Composer,java.lang.Integer,java.lang.Object> kotlin.jvm.functions.Function8<java.lang.Object,java.lang.Object,java.lang.Object,java.lang.Object,java.lang.Object,java.lang.Object,androidx.compose.runtime.Composer,java.lang.Integer,java.lang.Object> kotlin.jvm.functions.Function9<java.lang.Object,java.lang.Object,java.lang.Object,java.lang.Object,java.lang.Object,java.lang.Object,java.lang.Object,androidx.compose.runtime.Composer,java.lang.Integer,java.lang.Object> {
+ }
+
+ public final class ComposableLambdaKt {
+ method @androidx.compose.runtime.ComposeCompilerApi public static androidx.compose.runtime.internal.ComposableLambda composableLambda(androidx.compose.runtime.Composer composer, int key, boolean tracked, Object block);
+ method @androidx.compose.runtime.ComposeCompilerApi public static androidx.compose.runtime.internal.ComposableLambda composableLambdaInstance(int key, boolean tracked, Object block);
+ }
+
+ @androidx.compose.runtime.ComposeCompilerApi @androidx.compose.runtime.Stable public interface ComposableLambdaN extends kotlin.jvm.functions.FunctionN<java.lang.Object> {
+ }
+
+ public final class ComposableLambdaN_jvmKt {
+ method @androidx.compose.runtime.ComposeCompilerApi public static androidx.compose.runtime.internal.ComposableLambdaN composableLambdaN(androidx.compose.runtime.Composer composer, int key, boolean tracked, int arity, Object block);
+ method @androidx.compose.runtime.ComposeCompilerApi public static androidx.compose.runtime.internal.ComposableLambdaN composableLambdaNInstance(int key, boolean tracked, int arity, Object block);
+ }
+
+ public final class DecoyKt {
+ method @androidx.compose.runtime.ComposeCompilerApi public static Void illegalDecoyCallException(String fName);
+ }
+
+ @androidx.compose.runtime.ComposeCompilerApi @kotlin.annotation.Repeatable @kotlin.annotation.Retention(kotlin.annotation.AnnotationRetention.RUNTIME) @kotlin.annotation.Target(allowedTargets=kotlin.annotation.AnnotationTarget.CLASS) public @interface FunctionKeyMeta {
+ method public abstract int endOffset();
+ method public abstract int key();
+ method public abstract int startOffset();
+ property public abstract int endOffset;
+ property public abstract int key;
+ property public abstract int startOffset;
+ }
+
+ @androidx.compose.runtime.ComposeCompilerApi @kotlin.annotation.Repeatable @kotlin.annotation.Retention(kotlin.annotation.AnnotationRetention.RUNTIME) @kotlin.annotation.Target(allowedTargets=kotlin.annotation.AnnotationTarget.CLASS) public static @interface FunctionKeyMeta.Container {
+ method public abstract androidx.compose.runtime.internal.FunctionKeyMeta[] value();
+ }
+
+ @androidx.compose.runtime.ComposeCompilerApi @kotlin.annotation.Retention(kotlin.annotation.AnnotationRetention.RUNTIME) @kotlin.annotation.Target(allowedTargets=kotlin.annotation.AnnotationTarget.CLASS) public @interface FunctionKeyMetaClass {
+ method public abstract String file();
+ property public abstract String file;
+ }
+
+ @androidx.compose.runtime.ComposeCompilerApi @kotlin.annotation.Retention(kotlin.annotation.AnnotationRetention.RUNTIME) @kotlin.annotation.Target(allowedTargets=kotlin.annotation.AnnotationTarget.CLASS) public @interface LiveLiteralFileInfo {
+ method public abstract String file();
+ property public abstract String file;
+ }
+
+ @androidx.compose.runtime.ComposeCompilerApi @kotlin.annotation.Retention(kotlin.annotation.AnnotationRetention.RUNTIME) @kotlin.annotation.Target(allowedTargets=kotlin.annotation.AnnotationTarget.FUNCTION) public @interface LiveLiteralInfo {
+ method public abstract String key();
+ method public abstract int offset();
+ property public abstract String key;
+ property public abstract int offset;
+ }
+
+ public final class LiveLiteralKt {
+ method public static boolean isLiveLiteralsEnabled();
+ property public static final boolean isLiveLiteralsEnabled;
+ }
+
+ @androidx.compose.runtime.ComposeCompilerApi @kotlin.annotation.Retention(kotlin.annotation.AnnotationRetention.BINARY) @kotlin.annotation.Target(allowedTargets=kotlin.annotation.AnnotationTarget.CLASS) public @interface StabilityInferred {
+ method public abstract int parameters();
+ property public abstract int parameters;
+ }
+
+ public final class ThreadMapKt {
+ }
+
+}
+
+package androidx.compose.runtime.snapshots {
+
+ public final class ListUtilsKt {
+ }
+
+ public class MutableSnapshot extends androidx.compose.runtime.snapshots.Snapshot {
+ method public androidx.compose.runtime.snapshots.SnapshotApplyResult apply();
+ method public kotlin.jvm.functions.Function1<java.lang.Object,kotlin.Unit>? getReadObserver();
+ method public boolean getReadOnly();
+ method public androidx.compose.runtime.snapshots.Snapshot getRoot();
+ method public kotlin.jvm.functions.Function1<java.lang.Object,kotlin.Unit>? getWriteObserver();
+ method public boolean hasPendingChanges();
+ method public androidx.compose.runtime.snapshots.MutableSnapshot takeNestedMutableSnapshot(optional kotlin.jvm.functions.Function1<java.lang.Object,kotlin.Unit>? readObserver, optional kotlin.jvm.functions.Function1<java.lang.Object,kotlin.Unit>? writeObserver);
+ method public androidx.compose.runtime.snapshots.Snapshot takeNestedSnapshot(kotlin.jvm.functions.Function1<java.lang.Object,kotlin.Unit>? readObserver);
+ property public kotlin.jvm.functions.Function1<java.lang.Object,kotlin.Unit>? readObserver;
+ property public boolean readOnly;
+ property public androidx.compose.runtime.snapshots.Snapshot root;
+ property public kotlin.jvm.functions.Function1<java.lang.Object,kotlin.Unit>? writeObserver;
+ }
+
+ public fun interface ObserverHandle {
+ method public void dispose();
+ }
+
+ public abstract sealed class Snapshot {
+ method public void dispose();
+ method public final inline <T> T! enter(kotlin.jvm.functions.Function0<? extends T> block);
+ method public int getId();
+ method public abstract boolean getReadOnly();
+ method public abstract androidx.compose.runtime.snapshots.Snapshot getRoot();
+ method public abstract boolean hasPendingChanges();
+ method public abstract androidx.compose.runtime.snapshots.Snapshot takeNestedSnapshot(optional kotlin.jvm.functions.Function1<java.lang.Object,kotlin.Unit>? readObserver);
+ property public int id;
+ property public abstract boolean readOnly;
+ property public abstract androidx.compose.runtime.snapshots.Snapshot root;
+ field public static final androidx.compose.runtime.snapshots.Snapshot.Companion Companion;
+ }
+
+ public static final class Snapshot.Companion {
+ method public androidx.compose.runtime.snapshots.Snapshot getCurrent();
+ method public inline <T> T! global(kotlin.jvm.functions.Function0<? extends T> block);
+ method public void notifyObjectsInitialized();
+ method public <T> T! observe(optional kotlin.jvm.functions.Function1<java.lang.Object,kotlin.Unit>? readObserver, optional kotlin.jvm.functions.Function1<java.lang.Object,kotlin.Unit>? writeObserver, kotlin.jvm.functions.Function0<? extends T> block);
+ method public androidx.compose.runtime.snapshots.ObserverHandle registerApplyObserver(kotlin.jvm.functions.Function2<? super java.util.Set<?>,? super androidx.compose.runtime.snapshots.Snapshot,kotlin.Unit> observer);
+ method public androidx.compose.runtime.snapshots.ObserverHandle registerGlobalWriteObserver(kotlin.jvm.functions.Function1<java.lang.Object,kotlin.Unit> observer);
+ method public void sendApplyNotifications();
+ method public androidx.compose.runtime.snapshots.MutableSnapshot takeMutableSnapshot(optional kotlin.jvm.functions.Function1<java.lang.Object,kotlin.Unit>? readObserver, optional kotlin.jvm.functions.Function1<java.lang.Object,kotlin.Unit>? writeObserver);
+ method public androidx.compose.runtime.snapshots.Snapshot takeSnapshot(optional kotlin.jvm.functions.Function1<java.lang.Object,kotlin.Unit>? readObserver);
+ method public inline <R> R! withMutableSnapshot(kotlin.jvm.functions.Function0<? extends R> block);
+ method public inline <T> T! withoutReadObservation(kotlin.jvm.functions.Function0<? extends T> block);
+ property public final androidx.compose.runtime.snapshots.Snapshot current;
+ }
+
+ public final class SnapshotApplyConflictException extends java.lang.Exception {
+ ctor public SnapshotApplyConflictException(androidx.compose.runtime.snapshots.Snapshot snapshot);
+ method public androidx.compose.runtime.snapshots.Snapshot getSnapshot();
+ property public final androidx.compose.runtime.snapshots.Snapshot snapshot;
+ }
+
+ public abstract sealed class SnapshotApplyResult {
+ method public abstract void check();
+ method public abstract boolean getSucceeded();
+ property public abstract boolean succeeded;
+ }
+
+ public static final class SnapshotApplyResult.Failure extends androidx.compose.runtime.snapshots.SnapshotApplyResult {
+ ctor public SnapshotApplyResult.Failure(androidx.compose.runtime.snapshots.Snapshot snapshot);
+ method public void check();
+ method public androidx.compose.runtime.snapshots.Snapshot getSnapshot();
+ method public boolean getSucceeded();
+ property public final androidx.compose.runtime.snapshots.Snapshot snapshot;
+ property public boolean succeeded;
+ }
+
+ public static final class SnapshotApplyResult.Success extends androidx.compose.runtime.snapshots.SnapshotApplyResult {
+ method public void check();
+ method public boolean getSucceeded();
+ property public boolean succeeded;
+ field public static final androidx.compose.runtime.snapshots.SnapshotApplyResult.Success INSTANCE;
+ }
+
+ public final class SnapshotContextElementKt {
+ }
+
+ public final class SnapshotDoubleIndexHeapKt {
+ }
+
+ public final class SnapshotIdSetKt {
+ }
+
+ public final class SnapshotKt {
+ method public static <T extends androidx.compose.runtime.snapshots.StateRecord> T readable(T, androidx.compose.runtime.snapshots.StateObject state);
+ method public static <T extends androidx.compose.runtime.snapshots.StateRecord> T readable(T, androidx.compose.runtime.snapshots.StateObject state, androidx.compose.runtime.snapshots.Snapshot snapshot);
+ method public static inline <T extends androidx.compose.runtime.snapshots.StateRecord, R> R! withCurrent(T, kotlin.jvm.functions.Function1<? super T,? extends R> block);
+ method public static inline <T extends androidx.compose.runtime.snapshots.StateRecord, R> R! writable(T, androidx.compose.runtime.snapshots.StateObject state, androidx.compose.runtime.snapshots.Snapshot snapshot, kotlin.jvm.functions.Function1<? super T,? extends R> block);
+ method public static inline <T extends androidx.compose.runtime.snapshots.StateRecord, R> R! writable(T, androidx.compose.runtime.snapshots.StateObject state, kotlin.jvm.functions.Function1<? super T,? extends R> block);
+ }
+
+ public interface SnapshotMutableState<T> extends androidx.compose.runtime.MutableState<T> {
+ method public androidx.compose.runtime.SnapshotMutationPolicy<T> getPolicy();
+ property public abstract androidx.compose.runtime.SnapshotMutationPolicy<T> policy;
+ }
+
+ @androidx.compose.runtime.Stable public final class SnapshotStateList<T> implements kotlin.jvm.internal.markers.KMutableList java.util.List<T> androidx.compose.runtime.snapshots.StateObject {
+ ctor public SnapshotStateList();
+ method public boolean add(T? element);
+ method public void add(int index, T? element);
+ method public boolean addAll(int index, java.util.Collection<? extends T> elements);
+ method public boolean addAll(java.util.Collection<? extends T> elements);
+ method public void clear();
+ method public boolean contains(T? element);
+ method public boolean containsAll(java.util.Collection<E!> elements);
+ method public T! get(int index);
+ method public androidx.compose.runtime.snapshots.StateRecord getFirstStateRecord();
+ method public int getSize();
+ method public int indexOf(T? element);
+ method public boolean isEmpty();
+ method public java.util.Iterator<T> iterator();
+ method public int lastIndexOf(T? element);
+ method public java.util.ListIterator<T> listIterator();
+ method public java.util.ListIterator<T> listIterator(int index);
+ method public void prependStateRecord(androidx.compose.runtime.snapshots.StateRecord value);
+ method public boolean remove(T? element);
+ method public boolean removeAll(java.util.Collection<E!> elements);
+ method public T! removeAt(int index);
+ method public void removeRange(int fromIndex, int toIndex);
+ method public boolean retainAll(java.util.Collection<E!> elements);
+ method public T! set(int index, T? element);
+ method public java.util.List<T> subList(int fromIndex, int toIndex);
+ property public androidx.compose.runtime.snapshots.StateRecord firstStateRecord;
+ property public int size;
+ }
+
+ public final class SnapshotStateListKt {
+ }
+
+ @androidx.compose.runtime.Stable public final class SnapshotStateMap<K, V> implements kotlin.jvm.internal.markers.KMutableMap java.util.Map<K,V> androidx.compose.runtime.snapshots.StateObject {
+ ctor public SnapshotStateMap();
+ method public void clear();
+ method public boolean containsKey(K? key);
+ method public boolean containsValue(V? value);
+ method public V? get(Object? key);
+ method public java.util.Set<java.util.Map.Entry<K,V>> getEntries();
+ method public androidx.compose.runtime.snapshots.StateRecord getFirstStateRecord();
+ method public java.util.Set<K> getKeys();
+ method public int getSize();
+ method public java.util.Collection<V> getValues();
+ method public boolean isEmpty();
+ method public void prependStateRecord(androidx.compose.runtime.snapshots.StateRecord value);
+ method public V? put(K? key, V? value);
+ method public void putAll(java.util.Map<? extends K,? extends V> from);
+ method public V? remove(Object? key);
+ property public java.util.Set<java.util.Map.Entry<K,V>> entries;
+ property public androidx.compose.runtime.snapshots.StateRecord firstStateRecord;
+ property public java.util.Set<K> keys;
+ property public int size;
+ property public java.util.Collection<V> values;
+ }
+
+ public final class SnapshotStateMapKt {
+ }
+
+ public final class SnapshotStateObserver {
+ ctor public SnapshotStateObserver(kotlin.jvm.functions.Function1<? super kotlin.jvm.functions.Function0<kotlin.Unit>,kotlin.Unit> onChangedExecutor);
+ method public void clear(Object scope);
+ method public void clear();
+ method public void clearIf(kotlin.jvm.functions.Function1<java.lang.Object,java.lang.Boolean> predicate);
+ method @org.jetbrains.annotations.TestOnly public void notifyChanges(java.util.Set<?> changes, androidx.compose.runtime.snapshots.Snapshot snapshot);
+ method public <T> void observeReads(T scope, kotlin.jvm.functions.Function1<? super T,kotlin.Unit> onValueChangedForScope, kotlin.jvm.functions.Function0<kotlin.Unit> block);
+ method public void start();
+ method public void stop();
+ method @Deprecated public void withNoObservations(kotlin.jvm.functions.Function0<kotlin.Unit> block);
+ }
+
+ public interface StateObject {
+ method public androidx.compose.runtime.snapshots.StateRecord getFirstStateRecord();
+ method public default androidx.compose.runtime.snapshots.StateRecord? mergeRecords(androidx.compose.runtime.snapshots.StateRecord previous, androidx.compose.runtime.snapshots.StateRecord current, androidx.compose.runtime.snapshots.StateRecord applied);
+ method public void prependStateRecord(androidx.compose.runtime.snapshots.StateRecord value);
+ property public abstract androidx.compose.runtime.snapshots.StateRecord firstStateRecord;
+ }
+
+ public abstract class StateRecord {
+ ctor public StateRecord();
+ method public abstract void assign(androidx.compose.runtime.snapshots.StateRecord value);
+ method public abstract androidx.compose.runtime.snapshots.StateRecord create();
+ }
+
+}
+
+package androidx.compose.runtime.tooling {
+
+ public interface CompositionData {
+ method public Iterable<androidx.compose.runtime.tooling.CompositionGroup> getCompositionGroups();
+ method public boolean isEmpty();
+ property public abstract Iterable<androidx.compose.runtime.tooling.CompositionGroup> compositionGroups;
+ property public abstract boolean isEmpty;
+ }
+
+ public interface CompositionGroup extends androidx.compose.runtime.tooling.CompositionData {
+ method public Iterable<java.lang.Object> getData();
+ method public default Object? getIdentity();
+ method public Object getKey();
+ method public Object? getNode();
+ method public String? getSourceInfo();
+ property public abstract Iterable<java.lang.Object> data;
+ property public default Object? identity;
+ property public abstract Object key;
+ property public abstract Object? node;
+ property public abstract String? sourceInfo;
+ }
+
+ public final class InspectionTablesKt {
+ method public static androidx.compose.runtime.ProvidableCompositionLocal<java.util.Set<androidx.compose.runtime.tooling.CompositionData>> getLocalInspectionTables();
+ property public static final androidx.compose.runtime.ProvidableCompositionLocal<java.util.Set<androidx.compose.runtime.tooling.CompositionData>> LocalInspectionTables;
+ }
+
+}
+
diff --git a/compose/runtime/runtime/api/public_plus_experimental_1.2.0-beta02.txt b/compose/runtime/runtime/api/public_plus_experimental_1.2.0-beta02.txt
new file mode 100644
index 0000000..4a2b67c
--- /dev/null
+++ b/compose/runtime/runtime/api/public_plus_experimental_1.2.0-beta02.txt
@@ -0,0 +1,1044 @@
+// Signature format: 4.0
+package androidx.compose.runtime {
+
+ public abstract class AbstractApplier<T> implements androidx.compose.runtime.Applier<T> {
+ ctor public AbstractApplier(T? root);
+ method public final void clear();
+ method public void down(T? node);
+ method public T! getCurrent();
+ method public final T! getRoot();
+ method protected final void move(java.util.List<T>, int from, int to, int count);
+ method protected abstract void onClear();
+ method protected final void remove(java.util.List<T>, int index, int count);
+ method protected void setCurrent(T!);
+ method public void up();
+ property public T! current;
+ property public final T! root;
+ }
+
+ public final class ActualAndroid_androidKt {
+ method @Deprecated public static androidx.compose.runtime.MonotonicFrameClock getDefaultMonotonicFrameClock();
+ property @Deprecated public static final androidx.compose.runtime.MonotonicFrameClock DefaultMonotonicFrameClock;
+ }
+
+ public final class ActualJvm_jvmKt {
+ }
+
+ public interface Applier<N> {
+ method public void clear();
+ method public void down(N? node);
+ method public N! getCurrent();
+ method public void insertBottomUp(int index, N? instance);
+ method public void insertTopDown(int index, N? instance);
+ method public void move(int from, int to, int count);
+ method public default void onBeginChanges();
+ method public default void onEndChanges();
+ method public void remove(int index, int count);
+ method public void up();
+ property public abstract N! current;
+ }
+
+ public final class BitwiseOperatorsKt {
+ }
+
+ public final class BroadcastFrameClock implements androidx.compose.runtime.MonotonicFrameClock {
+ ctor public BroadcastFrameClock(optional kotlin.jvm.functions.Function0<kotlin.Unit>? onNewAwaiters);
+ method public void cancel(optional java.util.concurrent.CancellationException cancellationException);
+ method public boolean getHasAwaiters();
+ method public void sendFrame(long timeNanos);
+ method public suspend <R> Object? withFrameNanos(kotlin.jvm.functions.Function1<? super java.lang.Long,? extends R> onFrame, kotlin.coroutines.Continuation<? super R>);
+ property public final boolean hasAwaiters;
+ }
+
+ @kotlin.annotation.MustBeDocumented @kotlin.annotation.Retention(kotlin.annotation.AnnotationRetention.BINARY) @kotlin.annotation.Target(allowedTargets={kotlin.annotation.AnnotationTarget.FUNCTION, kotlin.annotation.AnnotationTarget.TYPE, kotlin.annotation.AnnotationTarget.TYPE_PARAMETER, kotlin.annotation.AnnotationTarget.PROPERTY_GETTER}) public @interface Composable {
+ }
+
+ @androidx.compose.runtime.InternalComposeApi @kotlin.annotation.Retention(kotlin.annotation.AnnotationRetention.BINARY) @kotlin.annotation.Target(allowedTargets={kotlin.annotation.AnnotationTarget.FUNCTION, kotlin.annotation.AnnotationTarget.PROPERTY_GETTER}) public @interface ComposableInferredTarget {
+ method public abstract String scheme();
+ property public abstract String scheme;
+ }
+
+ @kotlin.annotation.Retention(kotlin.annotation.AnnotationRetention.BINARY) @kotlin.annotation.Target(allowedTargets={kotlin.annotation.AnnotationTarget.FUNCTION, kotlin.annotation.AnnotationTarget.PROPERTY_GETTER, kotlin.annotation.AnnotationTarget.TYPE, kotlin.annotation.AnnotationTarget.TYPE_PARAMETER}) public @interface ComposableOpenTarget {
+ method public abstract int index();
+ property public abstract int index;
+ }
+
+ @kotlin.annotation.Retention(kotlin.annotation.AnnotationRetention.BINARY) @kotlin.annotation.Target(allowedTargets={kotlin.annotation.AnnotationTarget.FILE, kotlin.annotation.AnnotationTarget.CLASS, kotlin.annotation.AnnotationTarget.FUNCTION, kotlin.annotation.AnnotationTarget.PROPERTY_GETTER, kotlin.annotation.AnnotationTarget.TYPE, kotlin.annotation.AnnotationTarget.TYPE_PARAMETER}) public @interface ComposableTarget {
+ method public abstract String applier();
+ property public abstract String applier;
+ }
+
+ @kotlin.annotation.Retention(kotlin.annotation.AnnotationRetention.BINARY) @kotlin.annotation.Target(allowedTargets=kotlin.annotation.AnnotationTarget.ANNOTATION_CLASS) public @interface ComposableTargetMarker {
+ method public abstract String description() default "";
+ property public abstract String description;
+ }
+
+ public final class ComposablesKt {
+ method @androidx.compose.runtime.Composable public static inline <T extends java.lang.Object, reified E extends androidx.compose.runtime.Applier<?>> void ComposeNode(kotlin.jvm.functions.Function0<? extends T> factory, kotlin.jvm.functions.Function1<? super androidx.compose.runtime.Updater<T>,? extends kotlin.Unit> update);
+ method @androidx.compose.runtime.Composable public static inline <T extends java.lang.Object, reified E extends androidx.compose.runtime.Applier<?>> void ComposeNode(kotlin.jvm.functions.Function0<? extends T> factory, kotlin.jvm.functions.Function1<? super androidx.compose.runtime.Updater<T>,? extends kotlin.Unit> update, kotlin.jvm.functions.Function0<? extends kotlin.Unit> content);
+ method @androidx.compose.runtime.Composable @androidx.compose.runtime.ExplicitGroupsComposable public static inline <T, reified E extends androidx.compose.runtime.Applier<?>> void ComposeNode(kotlin.jvm.functions.Function0<? extends T> factory, kotlin.jvm.functions.Function1<? super androidx.compose.runtime.Updater<T>,? extends kotlin.Unit> update, kotlin.jvm.functions.Function1<? super androidx.compose.runtime.SkippableUpdater<T>,? extends kotlin.Unit> skippableUpdate, kotlin.jvm.functions.Function0<? extends kotlin.Unit> content);
+ method @androidx.compose.runtime.Composable public static inline <T extends java.lang.Object, reified E extends androidx.compose.runtime.Applier<?>> void ReusableComposeNode(kotlin.jvm.functions.Function0<? extends T> factory, kotlin.jvm.functions.Function1<? super androidx.compose.runtime.Updater<T>,? extends kotlin.Unit> update);
+ method @androidx.compose.runtime.Composable public static inline <T extends java.lang.Object, reified E extends androidx.compose.runtime.Applier<?>> void ReusableComposeNode(kotlin.jvm.functions.Function0<? extends T> factory, kotlin.jvm.functions.Function1<? super androidx.compose.runtime.Updater<T>,? extends kotlin.Unit> update, kotlin.jvm.functions.Function0<? extends kotlin.Unit> content);
+ method @androidx.compose.runtime.Composable @androidx.compose.runtime.ExplicitGroupsComposable public static inline <T, reified E extends androidx.compose.runtime.Applier<?>> void ReusableComposeNode(kotlin.jvm.functions.Function0<? extends T> factory, kotlin.jvm.functions.Function1<? super androidx.compose.runtime.Updater<T>,? extends kotlin.Unit> update, kotlin.jvm.functions.Function1<? super androidx.compose.runtime.SkippableUpdater<T>,? extends kotlin.Unit> skippableUpdate, kotlin.jvm.functions.Function0<? extends kotlin.Unit> content);
+ method @androidx.compose.runtime.Composable public static inline void ReusableContent(Object? key, kotlin.jvm.functions.Function0<kotlin.Unit> content);
+ method @androidx.compose.runtime.Composable @androidx.compose.runtime.ExplicitGroupsComposable public static inline void ReusableContentHost(boolean active, kotlin.jvm.functions.Function0<kotlin.Unit> content);
+ method @androidx.compose.runtime.Composable @androidx.compose.runtime.ReadOnlyComposable public static androidx.compose.runtime.Composer getCurrentComposer();
+ method @androidx.compose.runtime.Composable @androidx.compose.runtime.ExplicitGroupsComposable public static int getCurrentCompositeKeyHash();
+ method @androidx.compose.runtime.Composable public static androidx.compose.runtime.CompositionLocalContext getCurrentCompositionLocalContext();
+ method @androidx.compose.runtime.Composable @androidx.compose.runtime.ReadOnlyComposable public static androidx.compose.runtime.RecomposeScope getCurrentRecomposeScope();
+ method @androidx.compose.runtime.Composable public static inline <T> T! key(Object![]? keys, kotlin.jvm.functions.Function0<? extends T> block);
+ method @androidx.compose.runtime.Composable public static inline <T> T! remember(kotlin.jvm.functions.Function0<? extends T> calculation);
+ method @androidx.compose.runtime.Composable public static inline <T> T! remember(Object? key1, kotlin.jvm.functions.Function0<? extends T> calculation);
+ method @androidx.compose.runtime.Composable public static inline <T> T! remember(Object? key1, Object? key2, kotlin.jvm.functions.Function0<? extends T> calculation);
+ method @androidx.compose.runtime.Composable public static inline <T> T! remember(Object? key1, Object? key2, Object? key3, kotlin.jvm.functions.Function0<? extends T> calculation);
+ method @androidx.compose.runtime.Composable public static inline <T> T! remember(Object![]? keys, kotlin.jvm.functions.Function0<? extends T> calculation);
+ method @androidx.compose.runtime.Composable public static androidx.compose.runtime.CompositionContext rememberCompositionContext();
+ property @androidx.compose.runtime.Composable @androidx.compose.runtime.ReadOnlyComposable public static final androidx.compose.runtime.Composer currentComposer;
+ property @androidx.compose.runtime.Composable @androidx.compose.runtime.ExplicitGroupsComposable public static final int currentCompositeKeyHash;
+ property @androidx.compose.runtime.Composable public static final androidx.compose.runtime.CompositionLocalContext currentCompositionLocalContext;
+ property @androidx.compose.runtime.Composable @androidx.compose.runtime.ReadOnlyComposable public static final androidx.compose.runtime.RecomposeScope currentRecomposeScope;
+ }
+
+ @kotlin.annotation.Target(allowedTargets={kotlin.annotation.AnnotationTarget.CLASS, kotlin.annotation.AnnotationTarget.FUNCTION, kotlin.annotation.AnnotationTarget.PROPERTY, kotlin.annotation.AnnotationTarget.TYPEALIAS}) public @interface ComposeCompilerApi {
+ }
+
+ public sealed interface Composer {
+ method @androidx.compose.runtime.ComposeCompilerApi public <V, T> void apply(V? value, kotlin.jvm.functions.Function2<? super T,? super V,kotlin.Unit> block);
+ method @androidx.compose.runtime.InternalComposeApi public androidx.compose.runtime.CompositionContext buildContext();
+ method @androidx.compose.runtime.ComposeCompilerApi public boolean changed(Object? value);
+ method @androidx.compose.runtime.ComposeCompilerApi public default boolean changed(boolean value);
+ method @androidx.compose.runtime.ComposeCompilerApi public default boolean changed(char value);
+ method @androidx.compose.runtime.ComposeCompilerApi public default boolean changed(byte value);
+ method @androidx.compose.runtime.ComposeCompilerApi public default boolean changed(short value);
+ method @androidx.compose.runtime.ComposeCompilerApi public default boolean changed(int value);
+ method @androidx.compose.runtime.ComposeCompilerApi public default boolean changed(float value);
+ method @androidx.compose.runtime.ComposeCompilerApi public default boolean changed(long value);
+ method @androidx.compose.runtime.ComposeCompilerApi public default boolean changed(double value);
+ method public void collectParameterInformation();
+ method @androidx.compose.runtime.InternalComposeApi public <T> T! consume(androidx.compose.runtime.CompositionLocal<T> key);
+ method @androidx.compose.runtime.ComposeCompilerApi public <T> void createNode(kotlin.jvm.functions.Function0<? extends T> factory);
+ method @androidx.compose.runtime.ComposeCompilerApi public void deactivateToEndGroup(boolean changed);
+ method @androidx.compose.runtime.ComposeCompilerApi public void disableReusing();
+ method @androidx.compose.runtime.ComposeCompilerApi public void enableReusing();
+ method @androidx.compose.runtime.ComposeCompilerApi public void endDefaults();
+ method @androidx.compose.runtime.ComposeCompilerApi public void endMovableGroup();
+ method @androidx.compose.runtime.ComposeCompilerApi public void endNode();
+ method @androidx.compose.runtime.InternalComposeApi public void endProviders();
+ method @androidx.compose.runtime.ComposeCompilerApi public void endReplaceableGroup();
+ method @androidx.compose.runtime.ComposeCompilerApi public androidx.compose.runtime.ScopeUpdateScope? endRestartGroup();
+ method @androidx.compose.runtime.ComposeCompilerApi public void endReusableGroup();
+ method public androidx.compose.runtime.Applier<?> getApplier();
+ method @org.jetbrains.annotations.TestOnly public kotlin.coroutines.CoroutineContext getApplyCoroutineContext();
+ method @org.jetbrains.annotations.TestOnly public androidx.compose.runtime.ControlledComposition getComposition();
+ method public androidx.compose.runtime.tooling.CompositionData getCompositionData();
+ method public int getCompoundKeyHash();
+ method public boolean getDefaultsInvalid();
+ method public boolean getInserting();
+ method public androidx.compose.runtime.RecomposeScope? getRecomposeScope();
+ method public Object? getRecomposeScopeIdentity();
+ method public boolean getSkipping();
+ method @androidx.compose.runtime.InternalComposeApi public void insertMovableContent(androidx.compose.runtime.MovableContent<?> value, Object? parameter);
+ method @androidx.compose.runtime.InternalComposeApi public void insertMovableContentReferences(java.util.List<kotlin.Pair<androidx.compose.runtime.MovableContentStateReference,androidx.compose.runtime.MovableContentStateReference>> references);
+ method @androidx.compose.runtime.ComposeCompilerApi public Object joinKey(Object? left, Object? right);
+ method @androidx.compose.runtime.InternalComposeApi public void recordSideEffect(kotlin.jvm.functions.Function0<kotlin.Unit> effect);
+ method @androidx.compose.runtime.InternalComposeApi public void recordUsed(androidx.compose.runtime.RecomposeScope scope);
+ method @androidx.compose.runtime.ComposeCompilerApi public Object? rememberedValue();
+ method @androidx.compose.runtime.ComposeCompilerApi public void skipCurrentGroup();
+ method @androidx.compose.runtime.ComposeCompilerApi public void skipToGroupEnd();
+ method public void sourceInformation(String sourceInformation);
+ method public void sourceInformationMarkerEnd();
+ method public void sourceInformationMarkerStart(int key, String sourceInformation);
+ method @androidx.compose.runtime.ComposeCompilerApi public void startDefaults();
+ method @androidx.compose.runtime.ComposeCompilerApi public void startMovableGroup(int key, Object? dataKey);
+ method @androidx.compose.runtime.ComposeCompilerApi public void startNode();
+ method @androidx.compose.runtime.InternalComposeApi public void startProviders(androidx.compose.runtime.ProvidedValue<?>![] values);
+ method @androidx.compose.runtime.ComposeCompilerApi public void startReplaceableGroup(int key);
+ method @androidx.compose.runtime.ComposeCompilerApi public androidx.compose.runtime.Composer startRestartGroup(int key);
+ method @androidx.compose.runtime.ComposeCompilerApi public void startReusableGroup(int key, Object? dataKey);
+ method @androidx.compose.runtime.ComposeCompilerApi public void startReusableNode();
+ method @androidx.compose.runtime.ComposeCompilerApi public void updateRememberedValue(Object? value);
+ method @androidx.compose.runtime.ComposeCompilerApi public void useNode();
+ property public abstract androidx.compose.runtime.Applier<?> applier;
+ property @org.jetbrains.annotations.TestOnly public abstract kotlin.coroutines.CoroutineContext applyCoroutineContext;
+ property @org.jetbrains.annotations.TestOnly public abstract androidx.compose.runtime.ControlledComposition composition;
+ property public abstract androidx.compose.runtime.tooling.CompositionData compositionData;
+ property public abstract int compoundKeyHash;
+ property public abstract boolean defaultsInvalid;
+ property public abstract boolean inserting;
+ property public abstract androidx.compose.runtime.RecomposeScope? recomposeScope;
+ property public abstract Object? recomposeScopeIdentity;
+ property public abstract boolean skipping;
+ field public static final androidx.compose.runtime.Composer.Companion Companion;
+ }
+
+ public static final class Composer.Companion {
+ method public Object getEmpty();
+ method @androidx.compose.runtime.InternalComposeTracingApi public void setTracer(androidx.compose.runtime.CompositionTracer tracer);
+ property public final Object Empty;
+ }
+
+ public final class ComposerKt {
+ method @androidx.compose.runtime.ComposeCompilerApi public static inline <T> T! cache(androidx.compose.runtime.Composer, boolean invalid, kotlin.jvm.functions.Function0<? extends T> block);
+ method @androidx.compose.runtime.ComposeCompilerApi public static boolean isTraceInProgress();
+ method @androidx.compose.runtime.ComposeCompilerApi public static void sourceInformation(androidx.compose.runtime.Composer composer, String sourceInformation);
+ method @androidx.compose.runtime.ComposeCompilerApi public static void sourceInformationMarkerEnd(androidx.compose.runtime.Composer composer);
+ method @androidx.compose.runtime.ComposeCompilerApi public static void sourceInformationMarkerStart(androidx.compose.runtime.Composer composer, int key, String sourceInformation);
+ method @androidx.compose.runtime.ComposeCompilerApi public static void traceEventEnd();
+ method @androidx.compose.runtime.ComposeCompilerApi public static void traceEventStart(int key, int dirty1, int dirty2, String info);
+ }
+
+ public interface Composition {
+ method public void dispose();
+ method public boolean getHasInvalidations();
+ method public boolean isDisposed();
+ method public void setContent(kotlin.jvm.functions.Function0<kotlin.Unit> content);
+ property public abstract boolean hasInvalidations;
+ property public abstract boolean isDisposed;
+ }
+
+ public abstract class CompositionContext {
+ }
+
+ public final class CompositionContextKt {
+ }
+
+ public final class CompositionKt {
+ method public static androidx.compose.runtime.Composition Composition(androidx.compose.runtime.Applier<?> applier, androidx.compose.runtime.CompositionContext parent);
+ method @androidx.compose.runtime.ExperimentalComposeApi public static androidx.compose.runtime.Composition Composition(androidx.compose.runtime.Applier<?> applier, androidx.compose.runtime.CompositionContext parent, kotlin.coroutines.CoroutineContext recomposeCoroutineContext);
+ method @org.jetbrains.annotations.TestOnly public static androidx.compose.runtime.ControlledComposition ControlledComposition(androidx.compose.runtime.Applier<?> applier, androidx.compose.runtime.CompositionContext parent);
+ method @androidx.compose.runtime.ExperimentalComposeApi @org.jetbrains.annotations.TestOnly public static androidx.compose.runtime.ControlledComposition ControlledComposition(androidx.compose.runtime.Applier<?> applier, androidx.compose.runtime.CompositionContext parent, kotlin.coroutines.CoroutineContext recomposeCoroutineContext);
+ method @androidx.compose.runtime.ExperimentalComposeApi public static kotlin.coroutines.CoroutineContext getRecomposeCoroutineContext(androidx.compose.runtime.ControlledComposition);
+ }
+
+ @androidx.compose.runtime.Stable public abstract sealed class CompositionLocal<T> {
+ method @androidx.compose.runtime.Composable @androidx.compose.runtime.ReadOnlyComposable public final inline T! getCurrent();
+ property @androidx.compose.runtime.Composable @androidx.compose.runtime.ReadOnlyComposable public final inline T! current;
+ }
+
+ @androidx.compose.runtime.Stable public final class CompositionLocalContext {
+ }
+
+ public final class CompositionLocalKt {
+ method @androidx.compose.runtime.Composable public static void CompositionLocalProvider(androidx.compose.runtime.ProvidedValue<?>![] values, kotlin.jvm.functions.Function0<kotlin.Unit> content);
+ method @androidx.compose.runtime.Composable public static void CompositionLocalProvider(androidx.compose.runtime.CompositionLocalContext context, kotlin.jvm.functions.Function0<kotlin.Unit> content);
+ method public static <T> androidx.compose.runtime.ProvidableCompositionLocal<T> compositionLocalOf(optional androidx.compose.runtime.SnapshotMutationPolicy<T> policy, kotlin.jvm.functions.Function0<? extends T> defaultFactory);
+ method public static <T> androidx.compose.runtime.ProvidableCompositionLocal<T> staticCompositionLocalOf(kotlin.jvm.functions.Function0<? extends T> defaultFactory);
+ }
+
+ @androidx.compose.runtime.InternalComposeTracingApi public interface CompositionTracer {
+ method public boolean isTraceInProgress();
+ method public void traceEventEnd();
+ method public void traceEventStart(int key, int dirty1, int dirty2, String info);
+ }
+
+ public sealed interface ControlledComposition extends androidx.compose.runtime.Composition {
+ method public void applyChanges();
+ method public void applyLateChanges();
+ method public void changesApplied();
+ method public void composeContent(kotlin.jvm.functions.Function0<kotlin.Unit> content);
+ method public <R> R! delegateInvalidations(androidx.compose.runtime.ControlledComposition? to, int groupIndex, kotlin.jvm.functions.Function0<? extends R> block);
+ method @androidx.compose.runtime.InternalComposeApi public void disposeUnusedMovableContent(androidx.compose.runtime.MovableContentState state);
+ method public boolean getHasPendingChanges();
+ method @androidx.compose.runtime.InternalComposeApi public void insertMovableContent(java.util.List<kotlin.Pair<androidx.compose.runtime.MovableContentStateReference,androidx.compose.runtime.MovableContentStateReference>> references);
+ method public void invalidateAll();
+ method public boolean isComposing();
+ method public boolean observesAnyOf(java.util.Set<?> values);
+ method public void prepareCompose(kotlin.jvm.functions.Function0<kotlin.Unit> block);
+ method public boolean recompose();
+ method public void recordModificationsOf(java.util.Set<?> values);
+ method public void recordReadOf(Object value);
+ method public void recordWriteOf(Object value);
+ method @androidx.compose.runtime.InternalComposeApi public void verifyConsistent();
+ property public abstract boolean hasPendingChanges;
+ property public abstract boolean isComposing;
+ }
+
+ @kotlin.annotation.MustBeDocumented @kotlin.annotation.Retention(kotlin.annotation.AnnotationRetention.BINARY) @kotlin.annotation.Target(allowedTargets=kotlin.annotation.AnnotationTarget.TYPE) public @interface DisallowComposableCalls {
+ }
+
+ public interface DisposableEffectResult {
+ method public void dispose();
+ }
+
+ public final class DisposableEffectScope {
+ ctor public DisposableEffectScope();
+ method public inline androidx.compose.runtime.DisposableEffectResult onDispose(kotlin.jvm.functions.Function0<kotlin.Unit> onDisposeEffect);
+ }
+
+ public final class EffectsKt {
+ method @Deprecated @androidx.compose.runtime.Composable @androidx.compose.runtime.NonRestartableComposable public static void DisposableEffect(kotlin.jvm.functions.Function1<? super androidx.compose.runtime.DisposableEffectScope,? extends androidx.compose.runtime.DisposableEffectResult> effect);
+ method @androidx.compose.runtime.Composable @androidx.compose.runtime.NonRestartableComposable public static void DisposableEffect(Object? key1, kotlin.jvm.functions.Function1<? super androidx.compose.runtime.DisposableEffectScope,? extends androidx.compose.runtime.DisposableEffectResult> effect);
+ method @androidx.compose.runtime.Composable @androidx.compose.runtime.NonRestartableComposable public static void DisposableEffect(Object? key1, Object? key2, kotlin.jvm.functions.Function1<? super androidx.compose.runtime.DisposableEffectScope,? extends androidx.compose.runtime.DisposableEffectResult> effect);
+ method @androidx.compose.runtime.Composable @androidx.compose.runtime.NonRestartableComposable public static void DisposableEffect(Object? key1, Object? key2, Object? key3, kotlin.jvm.functions.Function1<? super androidx.compose.runtime.DisposableEffectScope,? extends androidx.compose.runtime.DisposableEffectResult> effect);
+ method @androidx.compose.runtime.Composable @androidx.compose.runtime.NonRestartableComposable public static void DisposableEffect(Object![]? keys, kotlin.jvm.functions.Function1<? super androidx.compose.runtime.DisposableEffectScope,? extends androidx.compose.runtime.DisposableEffectResult> effect);
+ method @Deprecated @androidx.compose.runtime.Composable public static void LaunchedEffect(kotlin.jvm.functions.Function2<? super kotlinx.coroutines.CoroutineScope,? super kotlin.coroutines.Continuation<? super kotlin.Unit>,?> block);
+ method @androidx.compose.runtime.Composable @androidx.compose.runtime.NonRestartableComposable public static void LaunchedEffect(Object? key1, kotlin.jvm.functions.Function2<? super kotlinx.coroutines.CoroutineScope,? super kotlin.coroutines.Continuation<? super kotlin.Unit>,?> block);
+ method @androidx.compose.runtime.Composable @androidx.compose.runtime.NonRestartableComposable public static void LaunchedEffect(Object? key1, Object? key2, kotlin.jvm.functions.Function2<? super kotlinx.coroutines.CoroutineScope,? super kotlin.coroutines.Continuation<? super kotlin.Unit>,?> block);
+ method @androidx.compose.runtime.Composable @androidx.compose.runtime.NonRestartableComposable public static void LaunchedEffect(Object? key1, Object? key2, Object? key3, kotlin.jvm.functions.Function2<? super kotlinx.coroutines.CoroutineScope,? super kotlin.coroutines.Continuation<? super kotlin.Unit>,?> block);
+ method @androidx.compose.runtime.Composable @androidx.compose.runtime.NonRestartableComposable public static void LaunchedEffect(Object![]? keys, kotlin.jvm.functions.Function2<? super kotlinx.coroutines.CoroutineScope,? super kotlin.coroutines.Continuation<? super kotlin.Unit>,?> block);
+ method @androidx.compose.runtime.Composable @androidx.compose.runtime.NonRestartableComposable public static void SideEffect(kotlin.jvm.functions.Function0<kotlin.Unit> effect);
+ method @androidx.compose.runtime.Composable public static inline kotlinx.coroutines.CoroutineScope rememberCoroutineScope(optional kotlin.jvm.functions.Function0<? extends kotlin.coroutines.CoroutineContext> getContext);
+ }
+
+ public final class ExpectKt {
+ }
+
+ @kotlin.RequiresOptIn(level=kotlin.RequiresOptIn.Level.ERROR, message="This is an experimental API for Compose and is likely to change before becoming " + "stable.") @kotlin.annotation.Target(allowedTargets={kotlin.annotation.AnnotationTarget.CLASS, kotlin.annotation.AnnotationTarget.FUNCTION, kotlin.annotation.AnnotationTarget.PROPERTY, kotlin.annotation.AnnotationTarget.PROPERTY_GETTER}) public @interface ExperimentalComposeApi {
+ }
+
+ @kotlin.annotation.Retention(kotlin.annotation.AnnotationRetention.SOURCE) @kotlin.annotation.Target(allowedTargets={kotlin.annotation.AnnotationTarget.FUNCTION, kotlin.annotation.AnnotationTarget.PROPERTY_GETTER}) public @interface ExplicitGroupsComposable {
+ }
+
+ @androidx.compose.runtime.StableMarker @kotlin.annotation.MustBeDocumented @kotlin.annotation.Retention(kotlin.annotation.AnnotationRetention.BINARY) @kotlin.annotation.Target(allowedTargets=kotlin.annotation.AnnotationTarget.CLASS) public @interface Immutable {
+ }
+
+ @kotlin.RequiresOptIn(level=kotlin.RequiresOptIn.Level.ERROR, message="This is internal API for Compose modules that may change frequently " + "and without warning.") @kotlin.annotation.Target(allowedTargets={kotlin.annotation.AnnotationTarget.CLASS, kotlin.annotation.AnnotationTarget.FUNCTION, kotlin.annotation.AnnotationTarget.PROPERTY}) public @interface InternalComposeApi {
+ }
+
+ @kotlin.RequiresOptIn(level=kotlin.RequiresOptIn.Level.ERROR, message="This is internal API that may change frequently and without warning.") public @interface InternalComposeTracingApi {
+ }
+
+ public interface MonotonicFrameClock extends kotlin.coroutines.CoroutineContext.Element {
+ method public default kotlin.coroutines.CoroutineContext.Key<?> getKey();
+ method public suspend <R> Object? withFrameNanos(kotlin.jvm.functions.Function1<? super java.lang.Long,? extends R> onFrame, kotlin.coroutines.Continuation<? super R>);
+ property public default kotlin.coroutines.CoroutineContext.Key<?> key;
+ field public static final androidx.compose.runtime.MonotonicFrameClock.Key Key;
+ }
+
+ public static final class MonotonicFrameClock.Key implements kotlin.coroutines.CoroutineContext.Key<androidx.compose.runtime.MonotonicFrameClock> {
+ }
+
+ public final class MonotonicFrameClockKt {
+ method public static androidx.compose.runtime.MonotonicFrameClock getMonotonicFrameClock(kotlin.coroutines.CoroutineContext);
+ method public static suspend inline <R> Object? withFrameMillis(androidx.compose.runtime.MonotonicFrameClock, kotlin.jvm.functions.Function1<? super java.lang.Long,? extends R> onFrame, kotlin.coroutines.Continuation<? super R>);
+ method public static suspend <R> Object? withFrameMillis(kotlin.jvm.functions.Function1<? super java.lang.Long,? extends R> onFrame, kotlin.coroutines.Continuation<? super R>);
+ method public static suspend <R> Object? withFrameNanos(kotlin.jvm.functions.Function1<? super java.lang.Long,? extends R> onFrame, kotlin.coroutines.Continuation<? super R>);
+ }
+
+ @androidx.compose.runtime.InternalComposeApi public final class MovableContent<P> {
+ ctor public MovableContent(kotlin.jvm.functions.Function1<? super P,kotlin.Unit> content);
+ method public kotlin.jvm.functions.Function1<P,kotlin.Unit> getContent();
+ property public final kotlin.jvm.functions.Function1<P,kotlin.Unit> content;
+ }
+
+ public final class MovableContentKt {
+ method public static kotlin.jvm.functions.Function0<kotlin.Unit> movableContentOf(kotlin.jvm.functions.Function0<kotlin.Unit> content);
+ method public static <P> kotlin.jvm.functions.Function1<P,kotlin.Unit> movableContentOf(kotlin.jvm.functions.Function1<? super P,kotlin.Unit> content);
+ method public static <P1, P2> kotlin.jvm.functions.Function2<P1,P2,kotlin.Unit> movableContentOf(kotlin.jvm.functions.Function2<? super P1,? super P2,kotlin.Unit> content);
+ method public static <P1, P2, P3> kotlin.jvm.functions.Function3<P1,P2,P3,kotlin.Unit> movableContentOf(kotlin.jvm.functions.Function3<? super P1,? super P2,? super P3,kotlin.Unit> content);
+ method public static <P1, P2, P3, P4> kotlin.jvm.functions.Function4<P1,P2,P3,P4,kotlin.Unit> movableContentOf(kotlin.jvm.functions.Function4<? super P1,? super P2,? super P3,? super P4,kotlin.Unit> content);
+ method public static <R> kotlin.jvm.functions.Function1<R,kotlin.Unit> movableContentWithReceiverOf(kotlin.jvm.functions.Function1<? super R,kotlin.Unit> content);
+ method public static <R, P> kotlin.jvm.functions.Function2<R,P,kotlin.Unit> movableContentWithReceiverOf(kotlin.jvm.functions.Function2<? super R,? super P,kotlin.Unit> content);
+ method public static <R, P1, P2> kotlin.jvm.functions.Function3<R,P1,P2,kotlin.Unit> movableContentWithReceiverOf(kotlin.jvm.functions.Function3<? super R,? super P1,? super P2,kotlin.Unit> content);
+ method public static <R, P1, P2, P3> kotlin.jvm.functions.Function4<R,P1,P2,P3,kotlin.Unit> movableContentWithReceiverOf(kotlin.jvm.functions.Function4<? super R,? super P1,? super P2,? super P3,kotlin.Unit> content);
+ }
+
+ @androidx.compose.runtime.InternalComposeApi public final class MovableContentState {
+ }
+
+ @androidx.compose.runtime.InternalComposeApi public final class MovableContentStateReference {
+ }
+
+ @androidx.compose.runtime.Stable public interface MutableState<T> extends androidx.compose.runtime.State<T> {
+ method public operator T! component1();
+ method public operator kotlin.jvm.functions.Function1<T,kotlin.Unit> component2();
+ method public void setValue(T!);
+ property public abstract T! value;
+ }
+
+ @kotlin.annotation.Retention(kotlin.annotation.AnnotationRetention.SOURCE) @kotlin.annotation.Target(allowedTargets={kotlin.annotation.AnnotationTarget.PROPERTY, kotlin.annotation.AnnotationTarget.FUNCTION, kotlin.annotation.AnnotationTarget.CLASS, kotlin.annotation.AnnotationTarget.FILE}) public @interface NoLiveLiterals {
+ }
+
+ @kotlin.annotation.Retention(kotlin.annotation.AnnotationRetention.SOURCE) @kotlin.annotation.Target(allowedTargets={kotlin.annotation.AnnotationTarget.FUNCTION, kotlin.annotation.AnnotationTarget.PROPERTY_GETTER}) public @interface NonRestartableComposable {
+ }
+
+ public final class PausableMonotonicFrameClock implements androidx.compose.runtime.MonotonicFrameClock {
+ ctor public PausableMonotonicFrameClock(androidx.compose.runtime.MonotonicFrameClock frameClock);
+ method public boolean isPaused();
+ method public void pause();
+ method public void resume();
+ method public suspend <R> Object? withFrameNanos(kotlin.jvm.functions.Function1<? super java.lang.Long,? extends R> onFrame, kotlin.coroutines.Continuation<? super R>);
+ property public final boolean isPaused;
+ }
+
+ public interface ProduceStateScope<T> extends androidx.compose.runtime.MutableState<T> kotlinx.coroutines.CoroutineScope {
+ method public suspend Object? awaitDispose(kotlin.jvm.functions.Function0<kotlin.Unit> onDispose, kotlin.coroutines.Continuation<?>);
+ }
+
+ @androidx.compose.runtime.Stable public abstract class ProvidableCompositionLocal<T> extends androidx.compose.runtime.CompositionLocal<T> {
+ method public final infix androidx.compose.runtime.ProvidedValue<T> provides(T? value);
+ method public final infix androidx.compose.runtime.ProvidedValue<T> providesDefault(T? value);
+ }
+
+ public final class ProvidedValue<T> {
+ method public boolean getCanOverride();
+ method public androidx.compose.runtime.CompositionLocal<T> getCompositionLocal();
+ method public T! getValue();
+ property public final boolean canOverride;
+ property public final androidx.compose.runtime.CompositionLocal<T> compositionLocal;
+ property public final T! value;
+ }
+
+ @kotlin.annotation.MustBeDocumented @kotlin.annotation.Retention(kotlin.annotation.AnnotationRetention.BINARY) @kotlin.annotation.Target(allowedTargets={kotlin.annotation.AnnotationTarget.FUNCTION, kotlin.annotation.AnnotationTarget.PROPERTY_GETTER}) public @interface ReadOnlyComposable {
+ }
+
+ public interface RecomposeScope {
+ method public void invalidate();
+ }
+
+ public final class RecomposeScopeImplKt {
+ }
+
+ public final class Recomposer extends androidx.compose.runtime.CompositionContext {
+ ctor public Recomposer(kotlin.coroutines.CoroutineContext effectCoroutineContext);
+ method public androidx.compose.runtime.RecomposerInfo asRecomposerInfo();
+ method public suspend Object? awaitIdle(kotlin.coroutines.Continuation<? super kotlin.Unit>);
+ method public void cancel();
+ method public void close();
+ method public long getChangeCount();
+ method public kotlinx.coroutines.flow.StateFlow<androidx.compose.runtime.Recomposer.State> getCurrentState();
+ method public boolean getHasPendingWork();
+ method @Deprecated public kotlinx.coroutines.flow.Flow<androidx.compose.runtime.Recomposer.State> getState();
+ method public suspend Object? join(kotlin.coroutines.Continuation<? super kotlin.Unit>);
+ method public suspend Object? runRecomposeAndApplyChanges(kotlin.coroutines.Continuation<? super kotlin.Unit>);
+ method @androidx.compose.runtime.ExperimentalComposeApi public suspend Object? runRecomposeConcurrentlyAndApplyChanges(kotlin.coroutines.CoroutineContext recomposeCoroutineContext, kotlin.coroutines.Continuation<? super kotlin.Unit>);
+ property public final long changeCount;
+ property public final kotlinx.coroutines.flow.StateFlow<androidx.compose.runtime.Recomposer.State> currentState;
+ property public final boolean hasPendingWork;
+ property @Deprecated public final kotlinx.coroutines.flow.Flow<androidx.compose.runtime.Recomposer.State> state;
+ field public static final androidx.compose.runtime.Recomposer.Companion Companion;
+ }
+
+ public static final class Recomposer.Companion {
+ method public kotlinx.coroutines.flow.StateFlow<java.util.Set<androidx.compose.runtime.RecomposerInfo>> getRunningRecomposers();
+ property public final kotlinx.coroutines.flow.StateFlow<java.util.Set<androidx.compose.runtime.RecomposerInfo>> runningRecomposers;
+ }
+
+ public enum Recomposer.State {
+ enum_constant public static final androidx.compose.runtime.Recomposer.State Idle;
+ enum_constant public static final androidx.compose.runtime.Recomposer.State Inactive;
+ enum_constant public static final androidx.compose.runtime.Recomposer.State InactivePendingWork;
+ enum_constant public static final androidx.compose.runtime.Recomposer.State PendingWork;
+ enum_constant public static final androidx.compose.runtime.Recomposer.State ShutDown;
+ enum_constant public static final androidx.compose.runtime.Recomposer.State ShuttingDown;
+ }
+
+ public interface RecomposerInfo {
+ method public long getChangeCount();
+ method public boolean getHasPendingWork();
+ method public kotlinx.coroutines.flow.Flow<androidx.compose.runtime.Recomposer.State> getState();
+ property public abstract long changeCount;
+ property public abstract boolean hasPendingWork;
+ property public abstract kotlinx.coroutines.flow.Flow<androidx.compose.runtime.Recomposer.State> state;
+ }
+
+ public final class RecomposerKt {
+ method public static suspend <R> Object? withRunningRecomposer(kotlin.jvm.functions.Function3<? super kotlinx.coroutines.CoroutineScope,? super androidx.compose.runtime.Recomposer,? super kotlin.coroutines.Continuation<? super R>,?> block, kotlin.coroutines.Continuation<? super R>);
+ }
+
+ public interface RememberObserver {
+ method public void onAbandoned();
+ method public void onForgotten();
+ method public void onRemembered();
+ }
+
+ @androidx.compose.runtime.ComposeCompilerApi public interface ScopeUpdateScope {
+ method public void updateScope(kotlin.jvm.functions.Function2<? super androidx.compose.runtime.Composer,? super java.lang.Integer,kotlin.Unit> block);
+ }
+
+ @kotlin.jvm.JvmInline public final value class SkippableUpdater<T> {
+ ctor public SkippableUpdater(@kotlin.PublishedApi androidx.compose.runtime.Composer composer);
+ method public inline void update(kotlin.jvm.functions.Function1<? super androidx.compose.runtime.Updater<T>,kotlin.Unit> block);
+ }
+
+ public final class SlotTableKt {
+ }
+
+ public interface SnapshotMutationPolicy<T> {
+ method public boolean equivalent(T? a, T? b);
+ method public default T? merge(T? previous, T? current, T? applied);
+ }
+
+ public final class SnapshotStateKt {
+ method @androidx.compose.runtime.Composable public static <T> androidx.compose.runtime.State<T> collectAsState(kotlinx.coroutines.flow.StateFlow<? extends T>, optional kotlin.coroutines.CoroutineContext context);
+ method @androidx.compose.runtime.Composable public static <T extends R, R> androidx.compose.runtime.State<R> collectAsState(kotlinx.coroutines.flow.Flow<? extends T>, R? initial, optional kotlin.coroutines.CoroutineContext context);
+ method public static <T> androidx.compose.runtime.State<T> derivedStateOf(kotlin.jvm.functions.Function0<? extends T> calculation);
+ method public static inline operator <T> T! getValue(androidx.compose.runtime.State<? extends T>, Object? thisObj, kotlin.reflect.KProperty<?> property);
+ method public static <T> androidx.compose.runtime.snapshots.SnapshotStateList<T> mutableStateListOf();
+ method public static <T> androidx.compose.runtime.snapshots.SnapshotStateList<T> mutableStateListOf(T?... elements);
+ method public static <K, V> androidx.compose.runtime.snapshots.SnapshotStateMap<K,V> mutableStateMapOf();
+ method public static <K, V> androidx.compose.runtime.snapshots.SnapshotStateMap<K,V> mutableStateMapOf(kotlin.Pair<? extends K,? extends V>... pairs);
+ method public static <T> androidx.compose.runtime.MutableState<T> mutableStateOf(T? value, optional androidx.compose.runtime.SnapshotMutationPolicy<T> policy);
+ method public static <T> androidx.compose.runtime.SnapshotMutationPolicy<T> neverEqualPolicy();
+ method @androidx.compose.runtime.Composable public static <T> androidx.compose.runtime.State<T> produceState(T? initialValue, @kotlin.BuilderInference kotlin.jvm.functions.Function2<? super androidx.compose.runtime.ProduceStateScope<T>,? super kotlin.coroutines.Continuation<? super kotlin.Unit>,?> producer);
+ method @androidx.compose.runtime.Composable public static <T> androidx.compose.runtime.State<T> produceState(T? initialValue, Object? key1, @kotlin.BuilderInference kotlin.jvm.functions.Function2<? super androidx.compose.runtime.ProduceStateScope<T>,? super kotlin.coroutines.Continuation<? super kotlin.Unit>,?> producer);
+ method @androidx.compose.runtime.Composable public static <T> androidx.compose.runtime.State<T> produceState(T? initialValue, Object? key1, Object? key2, @kotlin.BuilderInference kotlin.jvm.functions.Function2<? super androidx.compose.runtime.ProduceStateScope<T>,? super kotlin.coroutines.Continuation<? super kotlin.Unit>,?> producer);
+ method @androidx.compose.runtime.Composable public static <T> androidx.compose.runtime.State<T> produceState(T? initialValue, Object? key1, Object? key2, Object? key3, @kotlin.BuilderInference kotlin.jvm.functions.Function2<? super androidx.compose.runtime.ProduceStateScope<T>,? super kotlin.coroutines.Continuation<? super kotlin.Unit>,?> producer);
+ method @androidx.compose.runtime.Composable public static <T> androidx.compose.runtime.State<T> produceState(T? initialValue, Object![]? keys, @kotlin.BuilderInference kotlin.jvm.functions.Function2<? super androidx.compose.runtime.ProduceStateScope<T>,? super kotlin.coroutines.Continuation<? super kotlin.Unit>,?> producer);
+ method public static <T> androidx.compose.runtime.SnapshotMutationPolicy<T> referentialEqualityPolicy();
+ method @androidx.compose.runtime.Composable public static <T> androidx.compose.runtime.State<T> rememberUpdatedState(T? newValue);
+ method public static inline operator <T> void setValue(androidx.compose.runtime.MutableState<T>, Object? thisObj, kotlin.reflect.KProperty<?> property, T? value);
+ method public static <T> kotlinx.coroutines.flow.Flow<T> snapshotFlow(kotlin.jvm.functions.Function0<? extends T> block);
+ method public static <T> androidx.compose.runtime.SnapshotMutationPolicy<T> structuralEqualityPolicy();
+ method public static <T> androidx.compose.runtime.snapshots.SnapshotStateList<T> toMutableStateList(java.util.Collection<? extends T>);
+ method public static <K, V> androidx.compose.runtime.snapshots.SnapshotStateMap<K,V> toMutableStateMap(Iterable<? extends kotlin.Pair<? extends K,? extends V>>);
+ }
+
+ public final class SnapshotStateKt {
+ method @androidx.compose.runtime.Composable public static <T> androidx.compose.runtime.State<T> collectAsState(kotlinx.coroutines.flow.StateFlow<? extends T>, optional kotlin.coroutines.CoroutineContext context);
+ method @androidx.compose.runtime.Composable public static <T extends R, R> androidx.compose.runtime.State<R> collectAsState(kotlinx.coroutines.flow.Flow<? extends T>, R? initial, optional kotlin.coroutines.CoroutineContext context);
+ method public static <T> androidx.compose.runtime.State<T> derivedStateOf(kotlin.jvm.functions.Function0<? extends T> calculation);
+ method public static inline operator <T> T! getValue(androidx.compose.runtime.State<? extends T>, Object? thisObj, kotlin.reflect.KProperty<?> property);
+ method public static <T> androidx.compose.runtime.snapshots.SnapshotStateList<T> mutableStateListOf();
+ method public static <T> androidx.compose.runtime.snapshots.SnapshotStateList<T> mutableStateListOf(T?... elements);
+ method public static <K, V> androidx.compose.runtime.snapshots.SnapshotStateMap<K,V> mutableStateMapOf();
+ method public static <K, V> androidx.compose.runtime.snapshots.SnapshotStateMap<K,V> mutableStateMapOf(kotlin.Pair<? extends K,? extends V>... pairs);
+ method public static <T> androidx.compose.runtime.MutableState<T> mutableStateOf(T? value, optional androidx.compose.runtime.SnapshotMutationPolicy<T> policy);
+ method public static <T> androidx.compose.runtime.SnapshotMutationPolicy<T> neverEqualPolicy();
+ method @androidx.compose.runtime.Composable public static <T> androidx.compose.runtime.State<T> produceState(T? initialValue, @kotlin.BuilderInference kotlin.jvm.functions.Function2<? super androidx.compose.runtime.ProduceStateScope<T>,? super kotlin.coroutines.Continuation<? super kotlin.Unit>,?> producer);
+ method @androidx.compose.runtime.Composable public static <T> androidx.compose.runtime.State<T> produceState(T? initialValue, Object? key1, @kotlin.BuilderInference kotlin.jvm.functions.Function2<? super androidx.compose.runtime.ProduceStateScope<T>,? super kotlin.coroutines.Continuation<? super kotlin.Unit>,?> producer);
+ method @androidx.compose.runtime.Composable public static <T> androidx.compose.runtime.State<T> produceState(T? initialValue, Object? key1, Object? key2, @kotlin.BuilderInference kotlin.jvm.functions.Function2<? super androidx.compose.runtime.ProduceStateScope<T>,? super kotlin.coroutines.Continuation<? super kotlin.Unit>,?> producer);
+ method @androidx.compose.runtime.Composable public static <T> androidx.compose.runtime.State<T> produceState(T? initialValue, Object? key1, Object? key2, Object? key3, @kotlin.BuilderInference kotlin.jvm.functions.Function2<? super androidx.compose.runtime.ProduceStateScope<T>,? super kotlin.coroutines.Continuation<? super kotlin.Unit>,?> producer);
+ method @androidx.compose.runtime.Composable public static <T> androidx.compose.runtime.State<T> produceState(T? initialValue, Object![]? keys, @kotlin.BuilderInference kotlin.jvm.functions.Function2<? super androidx.compose.runtime.ProduceStateScope<T>,? super kotlin.coroutines.Continuation<? super kotlin.Unit>,?> producer);
+ method public static <T> androidx.compose.runtime.SnapshotMutationPolicy<T> referentialEqualityPolicy();
+ method @androidx.compose.runtime.Composable public static <T> androidx.compose.runtime.State<T> rememberUpdatedState(T? newValue);
+ method public static inline operator <T> void setValue(androidx.compose.runtime.MutableState<T>, Object? thisObj, kotlin.reflect.KProperty<?> property, T? value);
+ method public static <T> kotlinx.coroutines.flow.Flow<T> snapshotFlow(kotlin.jvm.functions.Function0<? extends T> block);
+ method public static <T> androidx.compose.runtime.SnapshotMutationPolicy<T> structuralEqualityPolicy();
+ method public static <T> androidx.compose.runtime.snapshots.SnapshotStateList<T> toMutableStateList(java.util.Collection<? extends T>);
+ method public static <K, V> androidx.compose.runtime.snapshots.SnapshotStateMap<K,V> toMutableStateMap(Iterable<? extends kotlin.Pair<? extends K,? extends V>>);
+ }
+
+ public final class SnapshotStateKt {
+ method @androidx.compose.runtime.Composable public static <T> androidx.compose.runtime.State<T> collectAsState(kotlinx.coroutines.flow.StateFlow<? extends T>, optional kotlin.coroutines.CoroutineContext context);
+ method @androidx.compose.runtime.Composable public static <T extends R, R> androidx.compose.runtime.State<R> collectAsState(kotlinx.coroutines.flow.Flow<? extends T>, R? initial, optional kotlin.coroutines.CoroutineContext context);
+ method public static <T> androidx.compose.runtime.State<T> derivedStateOf(kotlin.jvm.functions.Function0<? extends T> calculation);
+ method public static inline operator <T> T! getValue(androidx.compose.runtime.State<? extends T>, Object? thisObj, kotlin.reflect.KProperty<?> property);
+ method public static <T> androidx.compose.runtime.snapshots.SnapshotStateList<T> mutableStateListOf();
+ method public static <T> androidx.compose.runtime.snapshots.SnapshotStateList<T> mutableStateListOf(T?... elements);
+ method public static <K, V> androidx.compose.runtime.snapshots.SnapshotStateMap<K,V> mutableStateMapOf();
+ method public static <K, V> androidx.compose.runtime.snapshots.SnapshotStateMap<K,V> mutableStateMapOf(kotlin.Pair<? extends K,? extends V>... pairs);
+ method public static <T> androidx.compose.runtime.MutableState<T> mutableStateOf(T? value, optional androidx.compose.runtime.SnapshotMutationPolicy<T> policy);
+ method public static <T> androidx.compose.runtime.SnapshotMutationPolicy<T> neverEqualPolicy();
+ method @androidx.compose.runtime.Composable public static <T> androidx.compose.runtime.State<T> produceState(T? initialValue, @kotlin.BuilderInference kotlin.jvm.functions.Function2<? super androidx.compose.runtime.ProduceStateScope<T>,? super kotlin.coroutines.Continuation<? super kotlin.Unit>,?> producer);
+ method @androidx.compose.runtime.Composable public static <T> androidx.compose.runtime.State<T> produceState(T? initialValue, Object? key1, @kotlin.BuilderInference kotlin.jvm.functions.Function2<? super androidx.compose.runtime.ProduceStateScope<T>,? super kotlin.coroutines.Continuation<? super kotlin.Unit>,?> producer);
+ method @androidx.compose.runtime.Composable public static <T> androidx.compose.runtime.State<T> produceState(T? initialValue, Object? key1, Object? key2, @kotlin.BuilderInference kotlin.jvm.functions.Function2<? super androidx.compose.runtime.ProduceStateScope<T>,? super kotlin.coroutines.Continuation<? super kotlin.Unit>,?> producer);
+ method @androidx.compose.runtime.Composable public static <T> androidx.compose.runtime.State<T> produceState(T? initialValue, Object? key1, Object? key2, Object? key3, @kotlin.BuilderInference kotlin.jvm.functions.Function2<? super androidx.compose.runtime.ProduceStateScope<T>,? super kotlin.coroutines.Continuation<? super kotlin.Unit>,?> producer);
+ method @androidx.compose.runtime.Composable public static <T> androidx.compose.runtime.State<T> produceState(T? initialValue, Object![]? keys, @kotlin.BuilderInference kotlin.jvm.functions.Function2<? super androidx.compose.runtime.ProduceStateScope<T>,? super kotlin.coroutines.Continuation<? super kotlin.Unit>,?> producer);
+ method public static <T> androidx.compose.runtime.SnapshotMutationPolicy<T> referentialEqualityPolicy();
+ method @androidx.compose.runtime.Composable public static <T> androidx.compose.runtime.State<T> rememberUpdatedState(T? newValue);
+ method public static inline operator <T> void setValue(androidx.compose.runtime.MutableState<T>, Object? thisObj, kotlin.reflect.KProperty<?> property, T? value);
+ method public static <T> kotlinx.coroutines.flow.Flow<T> snapshotFlow(kotlin.jvm.functions.Function0<? extends T> block);
+ method public static <T> androidx.compose.runtime.SnapshotMutationPolicy<T> structuralEqualityPolicy();
+ method public static <T> androidx.compose.runtime.snapshots.SnapshotStateList<T> toMutableStateList(java.util.Collection<? extends T>);
+ method public static <K, V> androidx.compose.runtime.snapshots.SnapshotStateMap<K,V> toMutableStateMap(Iterable<? extends kotlin.Pair<? extends K,? extends V>>);
+ }
+
+ public final class SnapshotStateKt {
+ method @androidx.compose.runtime.Composable public static <T> androidx.compose.runtime.State<T> collectAsState(kotlinx.coroutines.flow.StateFlow<? extends T>, optional kotlin.coroutines.CoroutineContext context);
+ method @androidx.compose.runtime.Composable public static <T extends R, R> androidx.compose.runtime.State<R> collectAsState(kotlinx.coroutines.flow.Flow<? extends T>, R? initial, optional kotlin.coroutines.CoroutineContext context);
+ method public static <T> androidx.compose.runtime.State<T> derivedStateOf(kotlin.jvm.functions.Function0<? extends T> calculation);
+ method public static inline operator <T> T! getValue(androidx.compose.runtime.State<? extends T>, Object? thisObj, kotlin.reflect.KProperty<?> property);
+ method public static <T> androidx.compose.runtime.snapshots.SnapshotStateList<T> mutableStateListOf();
+ method public static <T> androidx.compose.runtime.snapshots.SnapshotStateList<T> mutableStateListOf(T?... elements);
+ method public static <K, V> androidx.compose.runtime.snapshots.SnapshotStateMap<K,V> mutableStateMapOf();
+ method public static <K, V> androidx.compose.runtime.snapshots.SnapshotStateMap<K,V> mutableStateMapOf(kotlin.Pair<? extends K,? extends V>... pairs);
+ method public static <T> androidx.compose.runtime.MutableState<T> mutableStateOf(T? value, optional androidx.compose.runtime.SnapshotMutationPolicy<T> policy);
+ method public static <T> androidx.compose.runtime.SnapshotMutationPolicy<T> neverEqualPolicy();
+ method @androidx.compose.runtime.Composable public static <T> androidx.compose.runtime.State<T> produceState(T? initialValue, @kotlin.BuilderInference kotlin.jvm.functions.Function2<? super androidx.compose.runtime.ProduceStateScope<T>,? super kotlin.coroutines.Continuation<? super kotlin.Unit>,?> producer);
+ method @androidx.compose.runtime.Composable public static <T> androidx.compose.runtime.State<T> produceState(T? initialValue, Object? key1, @kotlin.BuilderInference kotlin.jvm.functions.Function2<? super androidx.compose.runtime.ProduceStateScope<T>,? super kotlin.coroutines.Continuation<? super kotlin.Unit>,?> producer);
+ method @androidx.compose.runtime.Composable public static <T> androidx.compose.runtime.State<T> produceState(T? initialValue, Object? key1, Object? key2, @kotlin.BuilderInference kotlin.jvm.functions.Function2<? super androidx.compose.runtime.ProduceStateScope<T>,? super kotlin.coroutines.Continuation<? super kotlin.Unit>,?> producer);
+ method @androidx.compose.runtime.Composable public static <T> androidx.compose.runtime.State<T> produceState(T? initialValue, Object? key1, Object? key2, Object? key3, @kotlin.BuilderInference kotlin.jvm.functions.Function2<? super androidx.compose.runtime.ProduceStateScope<T>,? super kotlin.coroutines.Continuation<? super kotlin.Unit>,?> producer);
+ method @androidx.compose.runtime.Composable public static <T> androidx.compose.runtime.State<T> produceState(T? initialValue, Object![]? keys, @kotlin.BuilderInference kotlin.jvm.functions.Function2<? super androidx.compose.runtime.ProduceStateScope<T>,? super kotlin.coroutines.Continuation<? super kotlin.Unit>,?> producer);
+ method public static <T> androidx.compose.runtime.SnapshotMutationPolicy<T> referentialEqualityPolicy();
+ method @androidx.compose.runtime.Composable public static <T> androidx.compose.runtime.State<T> rememberUpdatedState(T? newValue);
+ method public static inline operator <T> void setValue(androidx.compose.runtime.MutableState<T>, Object? thisObj, kotlin.reflect.KProperty<?> property, T? value);
+ method public static <T> kotlinx.coroutines.flow.Flow<T> snapshotFlow(kotlin.jvm.functions.Function0<? extends T> block);
+ method public static <T> androidx.compose.runtime.SnapshotMutationPolicy<T> structuralEqualityPolicy();
+ method public static <T> androidx.compose.runtime.snapshots.SnapshotStateList<T> toMutableStateList(java.util.Collection<? extends T>);
+ method public static <K, V> androidx.compose.runtime.snapshots.SnapshotStateMap<K,V> toMutableStateMap(Iterable<? extends kotlin.Pair<? extends K,? extends V>>);
+ }
+
+ public final class SnapshotStateKt {
+ method @androidx.compose.runtime.Composable public static <T> androidx.compose.runtime.State<T> collectAsState(kotlinx.coroutines.flow.StateFlow<? extends T>, optional kotlin.coroutines.CoroutineContext context);
+ method @androidx.compose.runtime.Composable public static <T extends R, R> androidx.compose.runtime.State<R> collectAsState(kotlinx.coroutines.flow.Flow<? extends T>, R? initial, optional kotlin.coroutines.CoroutineContext context);
+ method public static <T> androidx.compose.runtime.State<T> derivedStateOf(kotlin.jvm.functions.Function0<? extends T> calculation);
+ method public static inline operator <T> T! getValue(androidx.compose.runtime.State<? extends T>, Object? thisObj, kotlin.reflect.KProperty<?> property);
+ method public static <T> androidx.compose.runtime.snapshots.SnapshotStateList<T> mutableStateListOf();
+ method public static <T> androidx.compose.runtime.snapshots.SnapshotStateList<T> mutableStateListOf(T?... elements);
+ method public static <K, V> androidx.compose.runtime.snapshots.SnapshotStateMap<K,V> mutableStateMapOf();
+ method public static <K, V> androidx.compose.runtime.snapshots.SnapshotStateMap<K,V> mutableStateMapOf(kotlin.Pair<? extends K,? extends V>... pairs);
+ method public static <T> androidx.compose.runtime.MutableState<T> mutableStateOf(T? value, optional androidx.compose.runtime.SnapshotMutationPolicy<T> policy);
+ method public static <T> androidx.compose.runtime.SnapshotMutationPolicy<T> neverEqualPolicy();
+ method @androidx.compose.runtime.Composable public static <T> androidx.compose.runtime.State<T> produceState(T? initialValue, @kotlin.BuilderInference kotlin.jvm.functions.Function2<? super androidx.compose.runtime.ProduceStateScope<T>,? super kotlin.coroutines.Continuation<? super kotlin.Unit>,?> producer);
+ method @androidx.compose.runtime.Composable public static <T> androidx.compose.runtime.State<T> produceState(T? initialValue, Object? key1, @kotlin.BuilderInference kotlin.jvm.functions.Function2<? super androidx.compose.runtime.ProduceStateScope<T>,? super kotlin.coroutines.Continuation<? super kotlin.Unit>,?> producer);
+ method @androidx.compose.runtime.Composable public static <T> androidx.compose.runtime.State<T> produceState(T? initialValue, Object? key1, Object? key2, @kotlin.BuilderInference kotlin.jvm.functions.Function2<? super androidx.compose.runtime.ProduceStateScope<T>,? super kotlin.coroutines.Continuation<? super kotlin.Unit>,?> producer);
+ method @androidx.compose.runtime.Composable public static <T> androidx.compose.runtime.State<T> produceState(T? initialValue, Object? key1, Object? key2, Object? key3, @kotlin.BuilderInference kotlin.jvm.functions.Function2<? super androidx.compose.runtime.ProduceStateScope<T>,? super kotlin.coroutines.Continuation<? super kotlin.Unit>,?> producer);
+ method @androidx.compose.runtime.Composable public static <T> androidx.compose.runtime.State<T> produceState(T? initialValue, Object![]? keys, @kotlin.BuilderInference kotlin.jvm.functions.Function2<? super androidx.compose.runtime.ProduceStateScope<T>,? super kotlin.coroutines.Continuation<? super kotlin.Unit>,?> producer);
+ method public static <T> androidx.compose.runtime.SnapshotMutationPolicy<T> referentialEqualityPolicy();
+ method @androidx.compose.runtime.Composable public static <T> androidx.compose.runtime.State<T> rememberUpdatedState(T? newValue);
+ method public static inline operator <T> void setValue(androidx.compose.runtime.MutableState<T>, Object? thisObj, kotlin.reflect.KProperty<?> property, T? value);
+ method public static <T> kotlinx.coroutines.flow.Flow<T> snapshotFlow(kotlin.jvm.functions.Function0<? extends T> block);
+ method public static <T> androidx.compose.runtime.SnapshotMutationPolicy<T> structuralEqualityPolicy();
+ method public static <T> androidx.compose.runtime.snapshots.SnapshotStateList<T> toMutableStateList(java.util.Collection<? extends T>);
+ method public static <K, V> androidx.compose.runtime.snapshots.SnapshotStateMap<K,V> toMutableStateMap(Iterable<? extends kotlin.Pair<? extends K,? extends V>>);
+ }
+
+ @androidx.compose.runtime.StableMarker @kotlin.annotation.MustBeDocumented @kotlin.annotation.Retention(kotlin.annotation.AnnotationRetention.BINARY) @kotlin.annotation.Target(allowedTargets={kotlin.annotation.AnnotationTarget.CLASS, kotlin.annotation.AnnotationTarget.FUNCTION, kotlin.annotation.AnnotationTarget.PROPERTY_GETTER, kotlin.annotation.AnnotationTarget.PROPERTY}) public @interface Stable {
+ }
+
+ @kotlin.annotation.MustBeDocumented @kotlin.annotation.Retention(kotlin.annotation.AnnotationRetention.BINARY) @kotlin.annotation.Target(allowedTargets={kotlin.annotation.AnnotationTarget.ANNOTATION_CLASS, kotlin.annotation.AnnotationTarget.CLASS}) public @interface StableMarker {
+ }
+
+ @androidx.compose.runtime.Stable public interface State<T> {
+ method public T! getValue();
+ property public abstract T! value;
+ }
+
+ public final class TraceKt {
+ }
+
+ @kotlin.jvm.JvmInline public final value class Updater<T> {
+ ctor public Updater(@kotlin.PublishedApi androidx.compose.runtime.Composer composer);
+ method public void init(kotlin.jvm.functions.Function1<? super T,kotlin.Unit> block);
+ method public void reconcile(kotlin.jvm.functions.Function1<? super T,kotlin.Unit> block);
+ method public inline void set(int value, kotlin.jvm.functions.Function2<? super T,? super java.lang.Integer,kotlin.Unit> block);
+ method public <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 <V> void update(V? value, kotlin.jvm.functions.Function2<? super T,? super V,kotlin.Unit> block);
+ }
+
+}
+
+package androidx.compose.runtime.collection {
+
+ public final class MutableVector<T> implements java.util.RandomAccess {
+ method public boolean add(T? element);
+ method public void add(int index, T? element);
+ method public boolean addAll(int index, java.util.List<? extends T> elements);
+ method public boolean addAll(int index, androidx.compose.runtime.collection.MutableVector<T> elements);
+ method public inline boolean addAll(java.util.List<? extends T> elements);
+ method public inline boolean addAll(androidx.compose.runtime.collection.MutableVector<T> elements);
+ method public boolean addAll(T![] elements);
+ method public boolean addAll(int index, java.util.Collection<? extends T> elements);
+ method public boolean addAll(java.util.Collection<? extends T> elements);
+ method public inline boolean any(kotlin.jvm.functions.Function1<? super T,java.lang.Boolean> predicate);
+ method public java.util.List<T> asMutableList();
+ method public void clear();
+ method public operator boolean contains(T? element);
+ method public boolean containsAll(java.util.List<? extends T> elements);
+ method public boolean containsAll(java.util.Collection<? extends T> elements);
+ method public boolean containsAll(androidx.compose.runtime.collection.MutableVector<T> elements);
+ method public boolean contentEquals(androidx.compose.runtime.collection.MutableVector<T> other);
+ method public void ensureCapacity(int capacity);
+ method public T! first();
+ method public inline T! first(kotlin.jvm.functions.Function1<? super T,java.lang.Boolean> predicate);
+ method public inline T? firstOrNull();
+ method public inline T? firstOrNull(kotlin.jvm.functions.Function1<? super T,java.lang.Boolean> predicate);
+ method public inline <R> R! fold(R? initial, kotlin.jvm.functions.Function2<? super R,? super T,? extends R> operation);
+ method public inline <R> R! foldIndexed(R? initial, kotlin.jvm.functions.Function3<? super java.lang.Integer,? super R,? super T,? extends R> operation);
+ method public inline <R> R! foldRight(R? initial, kotlin.jvm.functions.Function2<? super T,? super R,? extends R> operation);
+ method public inline <R> R! foldRightIndexed(R? initial, kotlin.jvm.functions.Function3<? super java.lang.Integer,? super T,? super R,? extends R> operation);
+ method public inline void forEach(kotlin.jvm.functions.Function1<? super T,kotlin.Unit> block);
+ method public inline void forEachIndexed(kotlin.jvm.functions.Function2<? super java.lang.Integer,? super T,kotlin.Unit> block);
+ method public inline void forEachReversed(kotlin.jvm.functions.Function1<? super T,kotlin.Unit> block);
+ method public inline void forEachReversedIndexed(kotlin.jvm.functions.Function2<? super java.lang.Integer,? super T,kotlin.Unit> block);
+ method public inline operator T! get(int index);
+ method public inline kotlin.ranges.IntRange getIndices();
+ method public inline int getLastIndex();
+ method public int getSize();
+ method public int indexOf(T? element);
+ method public inline int indexOfFirst(kotlin.jvm.functions.Function1<? super T,java.lang.Boolean> predicate);
+ method public inline int indexOfLast(kotlin.jvm.functions.Function1<? super T,java.lang.Boolean> predicate);
+ method public boolean isEmpty();
+ method public boolean isNotEmpty();
+ method public T! last();
+ method public inline T! last(kotlin.jvm.functions.Function1<? super T,java.lang.Boolean> predicate);
+ method public int lastIndexOf(T? element);
+ method public inline T? lastOrNull();
+ method public inline T? lastOrNull(kotlin.jvm.functions.Function1<? super T,java.lang.Boolean> predicate);
+ method public inline <reified R> R![]! map(kotlin.jvm.functions.Function1<? super T,? extends R> transform);
+ method public inline <reified R> R![]! mapIndexed(kotlin.jvm.functions.Function2<? super java.lang.Integer,? super T,? extends R> transform);
+ method public inline <reified R> androidx.compose.runtime.collection.MutableVector<R>! mapIndexedNotNull(kotlin.jvm.functions.Function2<? super java.lang.Integer,? super T,? extends R> transform);
+ method public inline <reified R> androidx.compose.runtime.collection.MutableVector<R>! mapNotNull(kotlin.jvm.functions.Function1<? super T,? extends R> transform);
+ method public inline operator void minusAssign(T? element);
+ method public inline operator void plusAssign(T? element);
+ method public boolean remove(T? element);
+ method public boolean removeAll(java.util.List<? extends T> elements);
+ method public boolean removeAll(androidx.compose.runtime.collection.MutableVector<T> elements);
+ method public boolean removeAll(java.util.Collection<? extends T> elements);
+ method public T! removeAt(int index);
+ method public void removeRange(int start, int end);
+ method public boolean retainAll(java.util.Collection<? extends T> elements);
+ method public inline boolean reversedAny(kotlin.jvm.functions.Function1<? super T,java.lang.Boolean> predicate);
+ method public operator T! set(int index, T? element);
+ method public void sortWith(java.util.Comparator<T> comparator);
+ method public inline int sumBy(kotlin.jvm.functions.Function1<? super T,java.lang.Integer> selector);
+ property public final inline kotlin.ranges.IntRange indices;
+ property public final inline int lastIndex;
+ property public final int size;
+ }
+
+ public final class MutableVectorKt {
+ method public static inline <reified T> androidx.compose.runtime.collection.MutableVector<T>! MutableVector(optional int capacity);
+ method public static inline <reified T> androidx.compose.runtime.collection.MutableVector<T>! MutableVector(int size, kotlin.jvm.functions.Function1<? super java.lang.Integer,? extends T> init);
+ method public static inline <reified T> androidx.compose.runtime.collection.MutableVector<T>! mutableVectorOf();
+ method public static inline <reified T> androidx.compose.runtime.collection.MutableVector<T>! mutableVectorOf(T? elements);
+ }
+
+}
+
+package androidx.compose.runtime.external.kotlinx.collections.immutable {
+
+ public final class ExtensionsKt {
+ }
+
+}
+
+package androidx.compose.runtime.external.kotlinx.collections.immutable.implementations.immutableList {
+
+ public final class UtilsKt {
+ }
+
+}
+
+package androidx.compose.runtime.external.kotlinx.collections.immutable.implementations.immutableMap {
+
+ public final class PersistentHashMapContentIteratorsKt {
+ }
+
+ public final class TrieNodeKt {
+ }
+
+}
+
+package androidx.compose.runtime.external.kotlinx.collections.immutable.implementations.immutableSet {
+
+ public final class TrieNodeKt {
+ }
+
+}
+
+package androidx.compose.runtime.external.kotlinx.collections.immutable.internal {
+
+ public final class CommonFunctionsKt {
+ }
+
+ public final class ForEachOneBitKt {
+ }
+
+}
+
+package androidx.compose.runtime.internal {
+
+ @androidx.compose.runtime.ComposeCompilerApi @androidx.compose.runtime.Stable public interface ComposableLambda extends kotlin.jvm.functions.Function2<androidx.compose.runtime.Composer,java.lang.Integer,java.lang.Object> kotlin.jvm.functions.Function10<java.lang.Object,java.lang.Object,java.lang.Object,java.lang.Object,java.lang.Object,java.lang.Object,java.lang.Object,java.lang.Object,androidx.compose.runtime.Composer,java.lang.Integer,java.lang.Object> kotlin.jvm.functions.Function11<java.lang.Object,java.lang.Object,java.lang.Object,java.lang.Object,java.lang.Object,java.lang.Object,java.lang.Object,java.lang.Object,java.lang.Object,androidx.compose.runtime.Composer,java.lang.Integer,java.lang.Object> kotlin.jvm.functions.Function13<java.lang.Object,java.lang.Object,java.lang.Object,java.lang.Object,java.lang.Object,java.lang.Object,java.lang.Object,java.lang.Object,java.lang.Object,java.lang.Object,androidx.compose.runtime.Composer,java.lang.Integer,java.lang.Integer,java.lang.Object> kotlin.jvm.functions.Function14<java.lang.Object,java.lang.Object,java.lang.Object,java.lang.Object,java.lang.Object,java.lang.Object,java.lang.Object,java.lang.Object,java.lang.Object,java.lang.Object,java.lang.Object,androidx.compose.runtime.Composer,java.lang.Integer,java.lang.Integer,java.lang.Object> kotlin.jvm.functions.Function15<java.lang.Object,java.lang.Object,java.lang.Object,java.lang.Object,java.lang.Object,java.lang.Object,java.lang.Object,java.lang.Object,java.lang.Object,java.lang.Object,java.lang.Object,java.lang.Object,androidx.compose.runtime.Composer,java.lang.Integer,java.lang.Integer,java.lang.Object> kotlin.jvm.functions.Function16<java.lang.Object,java.lang.Object,java.lang.Object,java.lang.Object,java.lang.Object,java.lang.Object,java.lang.Object,java.lang.Object,java.lang.Object,java.lang.Object,java.lang.Object,java.lang.Object,java.lang.Object,androidx.compose.runtime.Composer,java.lang.Integer,java.lang.Integer,java.lang.Object> kotlin.jvm.functions.Function17<java.lang.Object,java.lang.Object,java.lang.Object,java.lang.Object,java.lang.Object,java.lang.Object,java.lang.Object,java.lang.Object,java.lang.Object,java.lang.Object,java.lang.Object,java.lang.Object,java.lang.Object,java.lang.Object,androidx.compose.runtime.Composer,java.lang.Integer,java.lang.Integer,java.lang.Object> kotlin.jvm.functions.Function18<java.lang.Object,java.lang.Object,java.lang.Object,java.lang.Object,java.lang.Object,java.lang.Object,java.lang.Object,java.lang.Object,java.lang.Object,java.lang.Object,java.lang.Object,java.lang.Object,java.lang.Object,java.lang.Object,java.lang.Object,androidx.compose.runtime.Composer,java.lang.Integer,java.lang.Integer,java.lang.Object> kotlin.jvm.functions.Function19<java.lang.Object,java.lang.Object,java.lang.Object,java.lang.Object,java.lang.Object,java.lang.Object,java.lang.Object,java.lang.Object,java.lang.Object,java.lang.Object,java.lang.Object,java.lang.Object,java.lang.Object,java.lang.Object,java.lang.Object,java.lang.Object,androidx.compose.runtime.Composer,java.lang.Integer,java.lang.Integer,java.lang.Object> kotlin.jvm.functions.Function20<java.lang.Object,java.lang.Object,java.lang.Object,java.lang.Object,java.lang.Object,java.lang.Object,java.lang.Object,java.lang.Object,java.lang.Object,java.lang.Object,java.lang.Object,java.lang.Object,java.lang.Object,java.lang.Object,java.lang.Object,java.lang.Object,java.lang.Object,androidx.compose.runtime.Composer,java.lang.Integer,java.lang.Integer,java.lang.Object> kotlin.jvm.functions.Function21<java.lang.Object,java.lang.Object,java.lang.Object,java.lang.Object,java.lang.Object,java.lang.Object,java.lang.Object,java.lang.Object,java.lang.Object,java.lang.Object,java.lang.Object,java.lang.Object,java.lang.Object,java.lang.Object,java.lang.Object,java.lang.Object,java.lang.Object,java.lang.Object,androidx.compose.runtime.Composer,java.lang.Integer,java.lang.Integer,java.lang.Object> kotlin.jvm.functions.Function3<java.lang.Object,androidx.compose.runtime.Composer,java.lang.Integer,java.lang.Object> kotlin.jvm.functions.Function4<java.lang.Object,java.lang.Object,androidx.compose.runtime.Composer,java.lang.Integer,java.lang.Object> kotlin.jvm.functions.Function5<java.lang.Object,java.lang.Object,java.lang.Object,androidx.compose.runtime.Composer,java.lang.Integer,java.lang.Object> kotlin.jvm.functions.Function6<java.lang.Object,java.lang.Object,java.lang.Object,java.lang.Object,androidx.compose.runtime.Composer,java.lang.Integer,java.lang.Object> kotlin.jvm.functions.Function7<java.lang.Object,java.lang.Object,java.lang.Object,java.lang.Object,java.lang.Object,androidx.compose.runtime.Composer,java.lang.Integer,java.lang.Object> kotlin.jvm.functions.Function8<java.lang.Object,java.lang.Object,java.lang.Object,java.lang.Object,java.lang.Object,java.lang.Object,androidx.compose.runtime.Composer,java.lang.Integer,java.lang.Object> kotlin.jvm.functions.Function9<java.lang.Object,java.lang.Object,java.lang.Object,java.lang.Object,java.lang.Object,java.lang.Object,java.lang.Object,androidx.compose.runtime.Composer,java.lang.Integer,java.lang.Object> {
+ }
+
+ public final class ComposableLambdaKt {
+ method @androidx.compose.runtime.ComposeCompilerApi public static androidx.compose.runtime.internal.ComposableLambda composableLambda(androidx.compose.runtime.Composer composer, int key, boolean tracked, Object block);
+ method @androidx.compose.runtime.ComposeCompilerApi public static androidx.compose.runtime.internal.ComposableLambda composableLambdaInstance(int key, boolean tracked, Object block);
+ }
+
+ @androidx.compose.runtime.ComposeCompilerApi @androidx.compose.runtime.Stable public interface ComposableLambdaN extends kotlin.jvm.functions.FunctionN<java.lang.Object> {
+ }
+
+ public final class ComposableLambdaN_jvmKt {
+ method @androidx.compose.runtime.ComposeCompilerApi public static androidx.compose.runtime.internal.ComposableLambdaN composableLambdaN(androidx.compose.runtime.Composer composer, int key, boolean tracked, int arity, Object block);
+ method @androidx.compose.runtime.ComposeCompilerApi public static androidx.compose.runtime.internal.ComposableLambdaN composableLambdaNInstance(int key, boolean tracked, int arity, Object block);
+ }
+
+ @androidx.compose.runtime.ExperimentalComposeApi @kotlin.annotation.Target(allowedTargets={kotlin.annotation.AnnotationTarget.FUNCTION, kotlin.annotation.AnnotationTarget.CONSTRUCTOR}) public @interface Decoy {
+ method public abstract String[] signature();
+ method public abstract String targetName();
+ property public abstract String[] signature;
+ property public abstract String targetName;
+ }
+
+ @androidx.compose.runtime.ExperimentalComposeApi @kotlin.annotation.Target(allowedTargets={kotlin.annotation.AnnotationTarget.FUNCTION, kotlin.annotation.AnnotationTarget.CONSTRUCTOR}) public @interface DecoyImplementation {
+ method public abstract long id();
+ method public abstract String name();
+ property public abstract long id;
+ property public abstract String name;
+ }
+
+ public final class DecoyKt {
+ method @androidx.compose.runtime.ComposeCompilerApi public static Void illegalDecoyCallException(String fName);
+ }
+
+ @androidx.compose.runtime.ComposeCompilerApi @kotlin.annotation.Repeatable @kotlin.annotation.Retention(kotlin.annotation.AnnotationRetention.RUNTIME) @kotlin.annotation.Target(allowedTargets=kotlin.annotation.AnnotationTarget.CLASS) public @interface FunctionKeyMeta {
+ method public abstract int endOffset();
+ method public abstract int key();
+ method public abstract int startOffset();
+ property public abstract int endOffset;
+ property public abstract int key;
+ property public abstract int startOffset;
+ }
+
+ @androidx.compose.runtime.ComposeCompilerApi @kotlin.annotation.Repeatable @kotlin.annotation.Retention(kotlin.annotation.AnnotationRetention.RUNTIME) @kotlin.annotation.Target(allowedTargets=kotlin.annotation.AnnotationTarget.CLASS) public static @interface FunctionKeyMeta.Container {
+ method public abstract androidx.compose.runtime.internal.FunctionKeyMeta[] value();
+ }
+
+ @androidx.compose.runtime.ComposeCompilerApi @kotlin.annotation.Retention(kotlin.annotation.AnnotationRetention.RUNTIME) @kotlin.annotation.Target(allowedTargets=kotlin.annotation.AnnotationTarget.CLASS) public @interface FunctionKeyMetaClass {
+ method public abstract String file();
+ property public abstract String file;
+ }
+
+ @androidx.compose.runtime.ComposeCompilerApi @kotlin.annotation.Retention(kotlin.annotation.AnnotationRetention.RUNTIME) @kotlin.annotation.Target(allowedTargets=kotlin.annotation.AnnotationTarget.CLASS) public @interface LiveLiteralFileInfo {
+ method public abstract String file();
+ property public abstract String file;
+ }
+
+ @androidx.compose.runtime.ComposeCompilerApi @kotlin.annotation.Retention(kotlin.annotation.AnnotationRetention.RUNTIME) @kotlin.annotation.Target(allowedTargets=kotlin.annotation.AnnotationTarget.FUNCTION) public @interface LiveLiteralInfo {
+ method public abstract String key();
+ method public abstract int offset();
+ property public abstract String key;
+ property public abstract int offset;
+ }
+
+ public final class LiveLiteralKt {
+ method @androidx.compose.runtime.InternalComposeApi public static void enableLiveLiterals();
+ method public static boolean isLiveLiteralsEnabled();
+ method @androidx.compose.runtime.ComposeCompilerApi @androidx.compose.runtime.InternalComposeApi public static <T> androidx.compose.runtime.State<T> liveLiteral(String key, T? value);
+ method @androidx.compose.runtime.InternalComposeApi public static void updateLiveLiteralValue(String key, Object? value);
+ property public static final boolean isLiveLiteralsEnabled;
+ }
+
+ @androidx.compose.runtime.ComposeCompilerApi @kotlin.annotation.Retention(kotlin.annotation.AnnotationRetention.BINARY) @kotlin.annotation.Target(allowedTargets=kotlin.annotation.AnnotationTarget.CLASS) public @interface StabilityInferred {
+ method public abstract int parameters();
+ property public abstract int parameters;
+ }
+
+ public final class ThreadMapKt {
+ }
+
+}
+
+package androidx.compose.runtime.snapshots {
+
+ public final class ListUtilsKt {
+ }
+
+ public class MutableSnapshot extends androidx.compose.runtime.snapshots.Snapshot {
+ method public androidx.compose.runtime.snapshots.SnapshotApplyResult apply();
+ method public kotlin.jvm.functions.Function1<java.lang.Object,kotlin.Unit>? getReadObserver();
+ method public boolean getReadOnly();
+ method public androidx.compose.runtime.snapshots.Snapshot getRoot();
+ method public kotlin.jvm.functions.Function1<java.lang.Object,kotlin.Unit>? getWriteObserver();
+ method public boolean hasPendingChanges();
+ method public androidx.compose.runtime.snapshots.MutableSnapshot takeNestedMutableSnapshot(optional kotlin.jvm.functions.Function1<java.lang.Object,kotlin.Unit>? readObserver, optional kotlin.jvm.functions.Function1<java.lang.Object,kotlin.Unit>? writeObserver);
+ method public androidx.compose.runtime.snapshots.Snapshot takeNestedSnapshot(kotlin.jvm.functions.Function1<java.lang.Object,kotlin.Unit>? readObserver);
+ property public kotlin.jvm.functions.Function1<java.lang.Object,kotlin.Unit>? readObserver;
+ property public boolean readOnly;
+ property public androidx.compose.runtime.snapshots.Snapshot root;
+ property public kotlin.jvm.functions.Function1<java.lang.Object,kotlin.Unit>? writeObserver;
+ }
+
+ public fun interface ObserverHandle {
+ method public void dispose();
+ }
+
+ public abstract sealed class Snapshot {
+ method public void dispose();
+ method public final inline <T> T! enter(kotlin.jvm.functions.Function0<? extends T> block);
+ method public int getId();
+ method public abstract boolean getReadOnly();
+ method public abstract androidx.compose.runtime.snapshots.Snapshot getRoot();
+ method public abstract boolean hasPendingChanges();
+ method public abstract androidx.compose.runtime.snapshots.Snapshot takeNestedSnapshot(optional kotlin.jvm.functions.Function1<java.lang.Object,kotlin.Unit>? readObserver);
+ method @androidx.compose.runtime.ExperimentalComposeApi public final androidx.compose.runtime.snapshots.Snapshot? unsafeEnter();
+ method @androidx.compose.runtime.ExperimentalComposeApi public final void unsafeLeave(androidx.compose.runtime.snapshots.Snapshot? oldSnapshot);
+ property public int id;
+ property public abstract boolean readOnly;
+ property public abstract androidx.compose.runtime.snapshots.Snapshot root;
+ field public static final androidx.compose.runtime.snapshots.Snapshot.Companion Companion;
+ }
+
+ public static final class Snapshot.Companion {
+ method public androidx.compose.runtime.snapshots.Snapshot getCurrent();
+ method public inline <T> T! global(kotlin.jvm.functions.Function0<? extends T> block);
+ method public void notifyObjectsInitialized();
+ method public <T> T! observe(optional kotlin.jvm.functions.Function1<java.lang.Object,kotlin.Unit>? readObserver, optional kotlin.jvm.functions.Function1<java.lang.Object,kotlin.Unit>? writeObserver, kotlin.jvm.functions.Function0<? extends T> block);
+ method @androidx.compose.runtime.InternalComposeApi public int openSnapshotCount();
+ method public androidx.compose.runtime.snapshots.ObserverHandle registerApplyObserver(kotlin.jvm.functions.Function2<? super java.util.Set<?>,? super androidx.compose.runtime.snapshots.Snapshot,kotlin.Unit> observer);
+ method public androidx.compose.runtime.snapshots.ObserverHandle registerGlobalWriteObserver(kotlin.jvm.functions.Function1<java.lang.Object,kotlin.Unit> observer);
+ method public void sendApplyNotifications();
+ method public androidx.compose.runtime.snapshots.MutableSnapshot takeMutableSnapshot(optional kotlin.jvm.functions.Function1<java.lang.Object,kotlin.Unit>? readObserver, optional kotlin.jvm.functions.Function1<java.lang.Object,kotlin.Unit>? writeObserver);
+ method public androidx.compose.runtime.snapshots.Snapshot takeSnapshot(optional kotlin.jvm.functions.Function1<java.lang.Object,kotlin.Unit>? readObserver);
+ method public inline <R> R! withMutableSnapshot(kotlin.jvm.functions.Function0<? extends R> block);
+ method public inline <T> T! withoutReadObservation(kotlin.jvm.functions.Function0<? extends T> block);
+ property public final androidx.compose.runtime.snapshots.Snapshot current;
+ }
+
+ public final class SnapshotApplyConflictException extends java.lang.Exception {
+ ctor public SnapshotApplyConflictException(androidx.compose.runtime.snapshots.Snapshot snapshot);
+ method public androidx.compose.runtime.snapshots.Snapshot getSnapshot();
+ property public final androidx.compose.runtime.snapshots.Snapshot snapshot;
+ }
+
+ public abstract sealed class SnapshotApplyResult {
+ method public abstract void check();
+ method public abstract boolean getSucceeded();
+ property public abstract boolean succeeded;
+ }
+
+ public static final class SnapshotApplyResult.Failure extends androidx.compose.runtime.snapshots.SnapshotApplyResult {
+ ctor public SnapshotApplyResult.Failure(androidx.compose.runtime.snapshots.Snapshot snapshot);
+ method public void check();
+ method public androidx.compose.runtime.snapshots.Snapshot getSnapshot();
+ method public boolean getSucceeded();
+ property public final androidx.compose.runtime.snapshots.Snapshot snapshot;
+ property public boolean succeeded;
+ }
+
+ public static final class SnapshotApplyResult.Success extends androidx.compose.runtime.snapshots.SnapshotApplyResult {
+ method public void check();
+ method public boolean getSucceeded();
+ property public boolean succeeded;
+ field public static final androidx.compose.runtime.snapshots.SnapshotApplyResult.Success INSTANCE;
+ }
+
+ @androidx.compose.runtime.ExperimentalComposeApi public interface SnapshotContextElement extends kotlin.coroutines.CoroutineContext.Element {
+ field public static final androidx.compose.runtime.snapshots.SnapshotContextElement.Key Key;
+ }
+
+ public static final class SnapshotContextElement.Key implements kotlin.coroutines.CoroutineContext.Key<androidx.compose.runtime.snapshots.SnapshotContextElement> {
+ }
+
+ public final class SnapshotContextElementKt {
+ method @androidx.compose.runtime.ExperimentalComposeApi public static androidx.compose.runtime.snapshots.SnapshotContextElement asContextElement(androidx.compose.runtime.snapshots.Snapshot);
+ }
+
+ public final class SnapshotDoubleIndexHeapKt {
+ }
+
+ public final class SnapshotIdSetKt {
+ }
+
+ public final class SnapshotKt {
+ method public static <T extends androidx.compose.runtime.snapshots.StateRecord> T readable(T, androidx.compose.runtime.snapshots.StateObject state);
+ method public static <T extends androidx.compose.runtime.snapshots.StateRecord> T readable(T, androidx.compose.runtime.snapshots.StateObject state, androidx.compose.runtime.snapshots.Snapshot snapshot);
+ method public static inline <T extends androidx.compose.runtime.snapshots.StateRecord, R> R! withCurrent(T, kotlin.jvm.functions.Function1<? super T,? extends R> block);
+ method public static inline <T extends androidx.compose.runtime.snapshots.StateRecord, R> R! writable(T, androidx.compose.runtime.snapshots.StateObject state, androidx.compose.runtime.snapshots.Snapshot snapshot, kotlin.jvm.functions.Function1<? super T,? extends R> block);
+ method public static inline <T extends androidx.compose.runtime.snapshots.StateRecord, R> R! writable(T, androidx.compose.runtime.snapshots.StateObject state, kotlin.jvm.functions.Function1<? super T,? extends R> block);
+ }
+
+ public interface SnapshotMutableState<T> extends androidx.compose.runtime.MutableState<T> {
+ method public androidx.compose.runtime.SnapshotMutationPolicy<T> getPolicy();
+ property public abstract androidx.compose.runtime.SnapshotMutationPolicy<T> policy;
+ }
+
+ @androidx.compose.runtime.Stable public final class SnapshotStateList<T> implements kotlin.jvm.internal.markers.KMutableList java.util.List<T> androidx.compose.runtime.snapshots.StateObject {
+ ctor public SnapshotStateList();
+ method public boolean add(T? element);
+ method public void add(int index, T? element);
+ method public boolean addAll(int index, java.util.Collection<? extends T> elements);
+ method public boolean addAll(java.util.Collection<? extends T> elements);
+ method public void clear();
+ method public boolean contains(T? element);
+ method public boolean containsAll(java.util.Collection<E!> elements);
+ method public T! get(int index);
+ method public androidx.compose.runtime.snapshots.StateRecord getFirstStateRecord();
+ method public int getSize();
+ method public int indexOf(T? element);
+ method public boolean isEmpty();
+ method public java.util.Iterator<T> iterator();
+ method public int lastIndexOf(T? element);
+ method public java.util.ListIterator<T> listIterator();
+ method public java.util.ListIterator<T> listIterator(int index);
+ method public void prependStateRecord(androidx.compose.runtime.snapshots.StateRecord value);
+ method public boolean remove(T? element);
+ method public boolean removeAll(java.util.Collection<E!> elements);
+ method public T! removeAt(int index);
+ method public void removeRange(int fromIndex, int toIndex);
+ method public boolean retainAll(java.util.Collection<E!> elements);
+ method public T! set(int index, T? element);
+ method public java.util.List<T> subList(int fromIndex, int toIndex);
+ property public androidx.compose.runtime.snapshots.StateRecord firstStateRecord;
+ property public int size;
+ }
+
+ public final class SnapshotStateListKt {
+ }
+
+ @androidx.compose.runtime.Stable public final class SnapshotStateMap<K, V> implements kotlin.jvm.internal.markers.KMutableMap java.util.Map<K,V> androidx.compose.runtime.snapshots.StateObject {
+ ctor public SnapshotStateMap();
+ method public void clear();
+ method public boolean containsKey(K? key);
+ method public boolean containsValue(V? value);
+ method public V? get(Object? key);
+ method public java.util.Set<java.util.Map.Entry<K,V>> getEntries();
+ method public androidx.compose.runtime.snapshots.StateRecord getFirstStateRecord();
+ method public java.util.Set<K> getKeys();
+ method public int getSize();
+ method public java.util.Collection<V> getValues();
+ method public boolean isEmpty();
+ method public void prependStateRecord(androidx.compose.runtime.snapshots.StateRecord value);
+ method public V? put(K? key, V? value);
+ method public void putAll(java.util.Map<? extends K,? extends V> from);
+ method public V? remove(Object? key);
+ property public java.util.Set<java.util.Map.Entry<K,V>> entries;
+ property public androidx.compose.runtime.snapshots.StateRecord firstStateRecord;
+ property public java.util.Set<K> keys;
+ property public int size;
+ property public java.util.Collection<V> values;
+ }
+
+ public final class SnapshotStateMapKt {
+ }
+
+ public final class SnapshotStateObserver {
+ ctor public SnapshotStateObserver(kotlin.jvm.functions.Function1<? super kotlin.jvm.functions.Function0<kotlin.Unit>,kotlin.Unit> onChangedExecutor);
+ method public void clear(Object scope);
+ method public void clear();
+ method public void clearIf(kotlin.jvm.functions.Function1<java.lang.Object,java.lang.Boolean> predicate);
+ method @org.jetbrains.annotations.TestOnly public void notifyChanges(java.util.Set<?> changes, androidx.compose.runtime.snapshots.Snapshot snapshot);
+ method public <T> void observeReads(T scope, kotlin.jvm.functions.Function1<? super T,kotlin.Unit> onValueChangedForScope, kotlin.jvm.functions.Function0<kotlin.Unit> block);
+ method public void start();
+ method public void stop();
+ method @Deprecated public void withNoObservations(kotlin.jvm.functions.Function0<kotlin.Unit> block);
+ }
+
+ public interface StateObject {
+ method public androidx.compose.runtime.snapshots.StateRecord getFirstStateRecord();
+ method public default androidx.compose.runtime.snapshots.StateRecord? mergeRecords(androidx.compose.runtime.snapshots.StateRecord previous, androidx.compose.runtime.snapshots.StateRecord current, androidx.compose.runtime.snapshots.StateRecord applied);
+ method public void prependStateRecord(androidx.compose.runtime.snapshots.StateRecord value);
+ property public abstract androidx.compose.runtime.snapshots.StateRecord firstStateRecord;
+ }
+
+ public abstract class StateRecord {
+ ctor public StateRecord();
+ method public abstract void assign(androidx.compose.runtime.snapshots.StateRecord value);
+ method public abstract androidx.compose.runtime.snapshots.StateRecord create();
+ }
+
+}
+
+package androidx.compose.runtime.tooling {
+
+ public interface CompositionData {
+ method public Iterable<androidx.compose.runtime.tooling.CompositionGroup> getCompositionGroups();
+ method public boolean isEmpty();
+ property public abstract Iterable<androidx.compose.runtime.tooling.CompositionGroup> compositionGroups;
+ property public abstract boolean isEmpty;
+ }
+
+ public interface CompositionGroup extends androidx.compose.runtime.tooling.CompositionData {
+ method public Iterable<java.lang.Object> getData();
+ method public default Object? getIdentity();
+ method public Object getKey();
+ method public Object? getNode();
+ method public String? getSourceInfo();
+ property public abstract Iterable<java.lang.Object> data;
+ property public default Object? identity;
+ property public abstract Object key;
+ property public abstract Object? node;
+ property public abstract String? sourceInfo;
+ }
+
+ public final class InspectionTablesKt {
+ method public static androidx.compose.runtime.ProvidableCompositionLocal<java.util.Set<androidx.compose.runtime.tooling.CompositionData>> getLocalInspectionTables();
+ property public static final androidx.compose.runtime.ProvidableCompositionLocal<java.util.Set<androidx.compose.runtime.tooling.CompositionData>> LocalInspectionTables;
+ }
+
+}
+
diff --git a/compose/runtime/runtime/api/res-1.2.0-beta02.txt b/compose/runtime/runtime/api/res-1.2.0-beta02.txt
new file mode 100644
index 0000000..e69de29
--- /dev/null
+++ b/compose/runtime/runtime/api/res-1.2.0-beta02.txt
diff --git a/compose/runtime/runtime/api/restricted_1.2.0-beta02.txt b/compose/runtime/runtime/api/restricted_1.2.0-beta02.txt
new file mode 100644
index 0000000..1ea8a29
--- /dev/null
+++ b/compose/runtime/runtime/api/restricted_1.2.0-beta02.txt
@@ -0,0 +1,1007 @@
+// Signature format: 4.0
+package androidx.compose.runtime {
+
+ public abstract class AbstractApplier<T> implements androidx.compose.runtime.Applier<T> {
+ ctor public AbstractApplier(T? root);
+ method public final void clear();
+ method public void down(T? node);
+ method public T! getCurrent();
+ method public final T! getRoot();
+ method protected final void move(java.util.List<T>, int from, int to, int count);
+ method protected abstract void onClear();
+ method protected final void remove(java.util.List<T>, int index, int count);
+ method protected void setCurrent(T!);
+ method public void up();
+ property public T! current;
+ property public final T! root;
+ }
+
+ public final class ActualAndroid_androidKt {
+ method @Deprecated public static androidx.compose.runtime.MonotonicFrameClock getDefaultMonotonicFrameClock();
+ property @Deprecated public static final androidx.compose.runtime.MonotonicFrameClock DefaultMonotonicFrameClock;
+ }
+
+ public final class ActualJvm_jvmKt {
+ method @kotlin.PublishedApi internal static inline <R> R! synchronized(Object lock, kotlin.jvm.functions.Function0<? extends R> block);
+ }
+
+ public interface Applier<N> {
+ method public void clear();
+ method public void down(N? node);
+ method public N! getCurrent();
+ method public void insertBottomUp(int index, N? instance);
+ method public void insertTopDown(int index, N? instance);
+ method public void move(int from, int to, int count);
+ method public default void onBeginChanges();
+ method public default void onEndChanges();
+ method public void remove(int index, int count);
+ method public void up();
+ property public abstract N! current;
+ }
+
+ public final class BitwiseOperatorsKt {
+ }
+
+ public final class BroadcastFrameClock implements androidx.compose.runtime.MonotonicFrameClock {
+ ctor public BroadcastFrameClock(optional kotlin.jvm.functions.Function0<kotlin.Unit>? onNewAwaiters);
+ method public void cancel(optional java.util.concurrent.CancellationException cancellationException);
+ method public boolean getHasAwaiters();
+ method public void sendFrame(long timeNanos);
+ method public suspend <R> Object? withFrameNanos(kotlin.jvm.functions.Function1<? super java.lang.Long,? extends R> onFrame, kotlin.coroutines.Continuation<? super R>);
+ property public final boolean hasAwaiters;
+ }
+
+ @kotlin.annotation.MustBeDocumented @kotlin.annotation.Retention(kotlin.annotation.AnnotationRetention.BINARY) @kotlin.annotation.Target(allowedTargets={kotlin.annotation.AnnotationTarget.FUNCTION, kotlin.annotation.AnnotationTarget.TYPE, kotlin.annotation.AnnotationTarget.TYPE_PARAMETER, kotlin.annotation.AnnotationTarget.PROPERTY_GETTER}) public @interface Composable {
+ }
+
+ @kotlin.annotation.Retention(kotlin.annotation.AnnotationRetention.BINARY) @kotlin.annotation.Target(allowedTargets={kotlin.annotation.AnnotationTarget.FUNCTION, kotlin.annotation.AnnotationTarget.PROPERTY_GETTER, kotlin.annotation.AnnotationTarget.TYPE, kotlin.annotation.AnnotationTarget.TYPE_PARAMETER}) public @interface ComposableOpenTarget {
+ method public abstract int index();
+ property public abstract int index;
+ }
+
+ @kotlin.annotation.Retention(kotlin.annotation.AnnotationRetention.BINARY) @kotlin.annotation.Target(allowedTargets={kotlin.annotation.AnnotationTarget.FILE, kotlin.annotation.AnnotationTarget.CLASS, kotlin.annotation.AnnotationTarget.FUNCTION, kotlin.annotation.AnnotationTarget.PROPERTY_GETTER, kotlin.annotation.AnnotationTarget.TYPE, kotlin.annotation.AnnotationTarget.TYPE_PARAMETER}) public @interface ComposableTarget {
+ method public abstract String applier();
+ property public abstract String applier;
+ }
+
+ @kotlin.annotation.Retention(kotlin.annotation.AnnotationRetention.BINARY) @kotlin.annotation.Target(allowedTargets=kotlin.annotation.AnnotationTarget.ANNOTATION_CLASS) public @interface ComposableTargetMarker {
+ method public abstract String description() default "";
+ property public abstract String description;
+ }
+
+ public final class ComposablesKt {
+ method @androidx.compose.runtime.Composable public static inline <T extends java.lang.Object, reified E extends androidx.compose.runtime.Applier<?>> void ComposeNode(kotlin.jvm.functions.Function0<? extends T> factory, kotlin.jvm.functions.Function1<? super androidx.compose.runtime.Updater<T>,? extends kotlin.Unit> update);
+ method @androidx.compose.runtime.Composable public static inline <T extends java.lang.Object, reified E extends androidx.compose.runtime.Applier<?>> void ComposeNode(kotlin.jvm.functions.Function0<? extends T> factory, kotlin.jvm.functions.Function1<? super androidx.compose.runtime.Updater<T>,? extends kotlin.Unit> update, kotlin.jvm.functions.Function0<? extends kotlin.Unit> content);
+ method @androidx.compose.runtime.Composable @androidx.compose.runtime.ExplicitGroupsComposable public static inline <T, reified E extends androidx.compose.runtime.Applier<?>> void ComposeNode(kotlin.jvm.functions.Function0<? extends T> factory, kotlin.jvm.functions.Function1<? super androidx.compose.runtime.Updater<T>,? extends kotlin.Unit> update, kotlin.jvm.functions.Function1<? super androidx.compose.runtime.SkippableUpdater<T>,? extends kotlin.Unit> skippableUpdate, kotlin.jvm.functions.Function0<? extends kotlin.Unit> content);
+ method @androidx.compose.runtime.Composable public static inline <T extends java.lang.Object, reified E extends androidx.compose.runtime.Applier<?>> void ReusableComposeNode(kotlin.jvm.functions.Function0<? extends T> factory, kotlin.jvm.functions.Function1<? super androidx.compose.runtime.Updater<T>,? extends kotlin.Unit> update);
+ method @androidx.compose.runtime.Composable public static inline <T extends java.lang.Object, reified E extends androidx.compose.runtime.Applier<?>> void ReusableComposeNode(kotlin.jvm.functions.Function0<? extends T> factory, kotlin.jvm.functions.Function1<? super androidx.compose.runtime.Updater<T>,? extends kotlin.Unit> update, kotlin.jvm.functions.Function0<? extends kotlin.Unit> content);
+ method @androidx.compose.runtime.Composable @androidx.compose.runtime.ExplicitGroupsComposable public static inline <T, reified E extends androidx.compose.runtime.Applier<?>> void ReusableComposeNode(kotlin.jvm.functions.Function0<? extends T> factory, kotlin.jvm.functions.Function1<? super androidx.compose.runtime.Updater<T>,? extends kotlin.Unit> update, kotlin.jvm.functions.Function1<? super androidx.compose.runtime.SkippableUpdater<T>,? extends kotlin.Unit> skippableUpdate, kotlin.jvm.functions.Function0<? extends kotlin.Unit> content);
+ method @androidx.compose.runtime.Composable public static inline void ReusableContent(Object? key, kotlin.jvm.functions.Function0<kotlin.Unit> content);
+ method @androidx.compose.runtime.Composable @androidx.compose.runtime.ExplicitGroupsComposable public static inline void ReusableContentHost(boolean active, kotlin.jvm.functions.Function0<kotlin.Unit> content);
+ method @androidx.compose.runtime.Composable @androidx.compose.runtime.ReadOnlyComposable public static androidx.compose.runtime.Composer getCurrentComposer();
+ method @androidx.compose.runtime.Composable @androidx.compose.runtime.ExplicitGroupsComposable public static int getCurrentCompositeKeyHash();
+ method @androidx.compose.runtime.Composable public static androidx.compose.runtime.CompositionLocalContext getCurrentCompositionLocalContext();
+ method @androidx.compose.runtime.Composable @androidx.compose.runtime.ReadOnlyComposable public static androidx.compose.runtime.RecomposeScope getCurrentRecomposeScope();
+ method @kotlin.PublishedApi internal static void invalidApplier();
+ method @androidx.compose.runtime.Composable public static inline <T> T! key(Object![]? keys, kotlin.jvm.functions.Function0<? extends T> block);
+ method @androidx.compose.runtime.Composable public static inline <T> T! remember(kotlin.jvm.functions.Function0<? extends T> calculation);
+ method @androidx.compose.runtime.Composable public static inline <T> T! remember(Object? key1, kotlin.jvm.functions.Function0<? extends T> calculation);
+ method @androidx.compose.runtime.Composable public static inline <T> T! remember(Object? key1, Object? key2, kotlin.jvm.functions.Function0<? extends T> calculation);
+ method @androidx.compose.runtime.Composable public static inline <T> T! remember(Object? key1, Object? key2, Object? key3, kotlin.jvm.functions.Function0<? extends T> calculation);
+ method @androidx.compose.runtime.Composable public static inline <T> T! remember(Object![]? keys, kotlin.jvm.functions.Function0<? extends T> calculation);
+ method @androidx.compose.runtime.Composable public static androidx.compose.runtime.CompositionContext rememberCompositionContext();
+ property @androidx.compose.runtime.Composable @androidx.compose.runtime.ReadOnlyComposable public static final androidx.compose.runtime.Composer currentComposer;
+ property @androidx.compose.runtime.Composable @androidx.compose.runtime.ExplicitGroupsComposable public static final int currentCompositeKeyHash;
+ property @androidx.compose.runtime.Composable public static final androidx.compose.runtime.CompositionLocalContext currentCompositionLocalContext;
+ property @androidx.compose.runtime.Composable @androidx.compose.runtime.ReadOnlyComposable public static final androidx.compose.runtime.RecomposeScope currentRecomposeScope;
+ }
+
+ @kotlin.annotation.Target(allowedTargets={kotlin.annotation.AnnotationTarget.CLASS, kotlin.annotation.AnnotationTarget.FUNCTION, kotlin.annotation.AnnotationTarget.PROPERTY, kotlin.annotation.AnnotationTarget.TYPEALIAS}) public @interface ComposeCompilerApi {
+ }
+
+ public sealed interface Composer {
+ method @androidx.compose.runtime.ComposeCompilerApi public <V, T> void apply(V? value, kotlin.jvm.functions.Function2<? super T,? super V,kotlin.Unit> block);
+ method @androidx.compose.runtime.ComposeCompilerApi public boolean changed(Object? value);
+ method @androidx.compose.runtime.ComposeCompilerApi public default boolean changed(boolean value);
+ method @androidx.compose.runtime.ComposeCompilerApi public default boolean changed(char value);
+ method @androidx.compose.runtime.ComposeCompilerApi public default boolean changed(byte value);
+ method @androidx.compose.runtime.ComposeCompilerApi public default boolean changed(short value);
+ method @androidx.compose.runtime.ComposeCompilerApi public default boolean changed(int value);
+ method @androidx.compose.runtime.ComposeCompilerApi public default boolean changed(float value);
+ method @androidx.compose.runtime.ComposeCompilerApi public default boolean changed(long value);
+ method @androidx.compose.runtime.ComposeCompilerApi public default boolean changed(double value);
+ method public void collectParameterInformation();
+ method @androidx.compose.runtime.ComposeCompilerApi public <T> void createNode(kotlin.jvm.functions.Function0<? extends T> factory);
+ method @androidx.compose.runtime.ComposeCompilerApi public void deactivateToEndGroup(boolean changed);
+ method @androidx.compose.runtime.ComposeCompilerApi public void disableReusing();
+ method @androidx.compose.runtime.ComposeCompilerApi public void enableReusing();
+ method @androidx.compose.runtime.ComposeCompilerApi public void endDefaults();
+ method @androidx.compose.runtime.ComposeCompilerApi public void endMovableGroup();
+ method @androidx.compose.runtime.ComposeCompilerApi public void endNode();
+ method @androidx.compose.runtime.ComposeCompilerApi public void endReplaceableGroup();
+ method @androidx.compose.runtime.ComposeCompilerApi public androidx.compose.runtime.ScopeUpdateScope? endRestartGroup();
+ method @androidx.compose.runtime.ComposeCompilerApi public void endReusableGroup();
+ method public androidx.compose.runtime.Applier<?> getApplier();
+ method @org.jetbrains.annotations.TestOnly public kotlin.coroutines.CoroutineContext getApplyCoroutineContext();
+ method @org.jetbrains.annotations.TestOnly public androidx.compose.runtime.ControlledComposition getComposition();
+ method public androidx.compose.runtime.tooling.CompositionData getCompositionData();
+ method public int getCompoundKeyHash();
+ method public boolean getDefaultsInvalid();
+ method public boolean getInserting();
+ method public androidx.compose.runtime.RecomposeScope? getRecomposeScope();
+ method public Object? getRecomposeScopeIdentity();
+ method public boolean getSkipping();
+ method @androidx.compose.runtime.ComposeCompilerApi public Object joinKey(Object? left, Object? right);
+ method @androidx.compose.runtime.ComposeCompilerApi public Object? rememberedValue();
+ method @androidx.compose.runtime.ComposeCompilerApi public void skipCurrentGroup();
+ method @androidx.compose.runtime.ComposeCompilerApi public void skipToGroupEnd();
+ method public void sourceInformation(String sourceInformation);
+ method public void sourceInformationMarkerEnd();
+ method public void sourceInformationMarkerStart(int key, String sourceInformation);
+ method @androidx.compose.runtime.ComposeCompilerApi public void startDefaults();
+ method @androidx.compose.runtime.ComposeCompilerApi public void startMovableGroup(int key, Object? dataKey);
+ method @androidx.compose.runtime.ComposeCompilerApi public void startNode();
+ method @androidx.compose.runtime.ComposeCompilerApi public void startReplaceableGroup(int key);
+ method @androidx.compose.runtime.ComposeCompilerApi public androidx.compose.runtime.Composer startRestartGroup(int key);
+ method @androidx.compose.runtime.ComposeCompilerApi public void startReusableGroup(int key, Object? dataKey);
+ method @androidx.compose.runtime.ComposeCompilerApi public void startReusableNode();
+ method @androidx.compose.runtime.ComposeCompilerApi public void updateRememberedValue(Object? value);
+ method @androidx.compose.runtime.ComposeCompilerApi public void useNode();
+ property public abstract androidx.compose.runtime.Applier<?> applier;
+ property @org.jetbrains.annotations.TestOnly public abstract kotlin.coroutines.CoroutineContext applyCoroutineContext;
+ property @org.jetbrains.annotations.TestOnly public abstract androidx.compose.runtime.ControlledComposition composition;
+ property public abstract androidx.compose.runtime.tooling.CompositionData compositionData;
+ property public abstract int compoundKeyHash;
+ property public abstract boolean defaultsInvalid;
+ property public abstract boolean inserting;
+ property public abstract androidx.compose.runtime.RecomposeScope? recomposeScope;
+ property public abstract Object? recomposeScopeIdentity;
+ property public abstract boolean skipping;
+ field public static final androidx.compose.runtime.Composer.Companion Companion;
+ }
+
+ public static final class Composer.Companion {
+ method public Object getEmpty();
+ property public final Object Empty;
+ }
+
+ public final class ComposerKt {
+ method @androidx.compose.runtime.ComposeCompilerApi public static inline <T> T! cache(androidx.compose.runtime.Composer, boolean invalid, kotlin.jvm.functions.Function0<? extends T> block);
+ method @androidx.compose.runtime.ComposeCompilerApi public static boolean isTraceInProgress();
+ method @androidx.compose.runtime.ComposeCompilerApi public static void sourceInformation(androidx.compose.runtime.Composer composer, String sourceInformation);
+ method @androidx.compose.runtime.ComposeCompilerApi public static void sourceInformationMarkerEnd(androidx.compose.runtime.Composer composer);
+ method @androidx.compose.runtime.ComposeCompilerApi public static void sourceInformationMarkerStart(androidx.compose.runtime.Composer composer, int key, String sourceInformation);
+ method @androidx.compose.runtime.ComposeCompilerApi public static void traceEventEnd();
+ method @androidx.compose.runtime.ComposeCompilerApi public static void traceEventStart(int key, int dirty1, int dirty2, String info);
+ field @kotlin.PublishedApi internal static final Object compositionLocalMap;
+ field @kotlin.PublishedApi internal static final int compositionLocalMapKey = 202; // 0xca
+ field @kotlin.PublishedApi internal static final Object invocation;
+ field @kotlin.PublishedApi internal static final int invocationKey = 200; // 0xc8
+ field @kotlin.PublishedApi internal static final Object provider;
+ field @kotlin.PublishedApi internal static final int providerKey = 201; // 0xc9
+ field @kotlin.PublishedApi internal static final Object providerMaps;
+ field @kotlin.PublishedApi internal static final int providerMapsKey = 204; // 0xcc
+ field @kotlin.PublishedApi internal static final Object providerValues;
+ field @kotlin.PublishedApi internal static final int providerValuesKey = 203; // 0xcb
+ field @kotlin.PublishedApi internal static final Object reference;
+ field @kotlin.PublishedApi internal static final int referenceKey = 206; // 0xce
+ field @kotlin.PublishedApi internal static final int reuseKey = 207; // 0xcf
+ }
+
+ public interface Composition {
+ method public void dispose();
+ method public boolean getHasInvalidations();
+ method public boolean isDisposed();
+ method public void setContent(kotlin.jvm.functions.Function0<kotlin.Unit> content);
+ property public abstract boolean hasInvalidations;
+ property public abstract boolean isDisposed;
+ }
+
+ public abstract class CompositionContext {
+ }
+
+ public final class CompositionContextKt {
+ }
+
+ public final class CompositionKt {
+ method public static androidx.compose.runtime.Composition Composition(androidx.compose.runtime.Applier<?> applier, androidx.compose.runtime.CompositionContext parent);
+ method @org.jetbrains.annotations.TestOnly public static androidx.compose.runtime.ControlledComposition ControlledComposition(androidx.compose.runtime.Applier<?> applier, androidx.compose.runtime.CompositionContext parent);
+ }
+
+ @androidx.compose.runtime.Stable public abstract sealed class CompositionLocal<T> {
+ method @androidx.compose.runtime.Composable @androidx.compose.runtime.ReadOnlyComposable public final inline T! getCurrent();
+ property @androidx.compose.runtime.Composable @androidx.compose.runtime.ReadOnlyComposable public final inline T! current;
+ }
+
+ @androidx.compose.runtime.Stable public final class CompositionLocalContext {
+ }
+
+ public final class CompositionLocalKt {
+ method @androidx.compose.runtime.Composable public static void CompositionLocalProvider(androidx.compose.runtime.ProvidedValue<?>![] values, kotlin.jvm.functions.Function0<kotlin.Unit> content);
+ method @androidx.compose.runtime.Composable public static void CompositionLocalProvider(androidx.compose.runtime.CompositionLocalContext context, kotlin.jvm.functions.Function0<kotlin.Unit> content);
+ method public static <T> androidx.compose.runtime.ProvidableCompositionLocal<T> compositionLocalOf(optional androidx.compose.runtime.SnapshotMutationPolicy<T> policy, kotlin.jvm.functions.Function0<? extends T> defaultFactory);
+ method public static <T> androidx.compose.runtime.ProvidableCompositionLocal<T> staticCompositionLocalOf(kotlin.jvm.functions.Function0<? extends T> defaultFactory);
+ }
+
+ @kotlin.PublishedApi internal final class CompositionScopedCoroutineScopeCanceller implements androidx.compose.runtime.RememberObserver {
+ ctor public CompositionScopedCoroutineScopeCanceller(kotlinx.coroutines.CoroutineScope coroutineScope);
+ method public kotlinx.coroutines.CoroutineScope getCoroutineScope();
+ method public void onAbandoned();
+ method public void onForgotten();
+ method public void onRemembered();
+ property public final kotlinx.coroutines.CoroutineScope coroutineScope;
+ }
+
+ public sealed interface ControlledComposition extends androidx.compose.runtime.Composition {
+ method public void applyChanges();
+ method public void applyLateChanges();
+ method public void changesApplied();
+ method public void composeContent(kotlin.jvm.functions.Function0<kotlin.Unit> content);
+ method public <R> R! delegateInvalidations(androidx.compose.runtime.ControlledComposition? to, int groupIndex, kotlin.jvm.functions.Function0<? extends R> block);
+ method public boolean getHasPendingChanges();
+ method public void invalidateAll();
+ method public boolean isComposing();
+ method public boolean observesAnyOf(java.util.Set<?> values);
+ method public void prepareCompose(kotlin.jvm.functions.Function0<kotlin.Unit> block);
+ method public boolean recompose();
+ method public void recordModificationsOf(java.util.Set<?> values);
+ method public void recordReadOf(Object value);
+ method public void recordWriteOf(Object value);
+ property public abstract boolean hasPendingChanges;
+ property public abstract boolean isComposing;
+ }
+
+ @kotlin.annotation.MustBeDocumented @kotlin.annotation.Retention(kotlin.annotation.AnnotationRetention.BINARY) @kotlin.annotation.Target(allowedTargets=kotlin.annotation.AnnotationTarget.TYPE) public @interface DisallowComposableCalls {
+ }
+
+ public interface DisposableEffectResult {
+ method public void dispose();
+ }
+
+ public final class DisposableEffectScope {
+ ctor public DisposableEffectScope();
+ method public inline androidx.compose.runtime.DisposableEffectResult onDispose(kotlin.jvm.functions.Function0<kotlin.Unit> onDisposeEffect);
+ }
+
+ public final class EffectsKt {
+ method @Deprecated @androidx.compose.runtime.Composable @androidx.compose.runtime.NonRestartableComposable public static void DisposableEffect(kotlin.jvm.functions.Function1<? super androidx.compose.runtime.DisposableEffectScope,? extends androidx.compose.runtime.DisposableEffectResult> effect);
+ method @androidx.compose.runtime.Composable @androidx.compose.runtime.NonRestartableComposable public static void DisposableEffect(Object? key1, kotlin.jvm.functions.Function1<? super androidx.compose.runtime.DisposableEffectScope,? extends androidx.compose.runtime.DisposableEffectResult> effect);
+ method @androidx.compose.runtime.Composable @androidx.compose.runtime.NonRestartableComposable public static void DisposableEffect(Object? key1, Object? key2, kotlin.jvm.functions.Function1<? super androidx.compose.runtime.DisposableEffectScope,? extends androidx.compose.runtime.DisposableEffectResult> effect);
+ method @androidx.compose.runtime.Composable @androidx.compose.runtime.NonRestartableComposable public static void DisposableEffect(Object? key1, Object? key2, Object? key3, kotlin.jvm.functions.Function1<? super androidx.compose.runtime.DisposableEffectScope,? extends androidx.compose.runtime.DisposableEffectResult> effect);
+ method @androidx.compose.runtime.Composable @androidx.compose.runtime.NonRestartableComposable public static void DisposableEffect(Object![]? keys, kotlin.jvm.functions.Function1<? super androidx.compose.runtime.DisposableEffectScope,? extends androidx.compose.runtime.DisposableEffectResult> effect);
+ method @Deprecated @androidx.compose.runtime.Composable public static void LaunchedEffect(kotlin.jvm.functions.Function2<? super kotlinx.coroutines.CoroutineScope,? super kotlin.coroutines.Continuation<? super kotlin.Unit>,?> block);
+ method @androidx.compose.runtime.Composable @androidx.compose.runtime.NonRestartableComposable public static void LaunchedEffect(Object? key1, kotlin.jvm.functions.Function2<? super kotlinx.coroutines.CoroutineScope,? super kotlin.coroutines.Continuation<? super kotlin.Unit>,?> block);
+ method @androidx.compose.runtime.Composable @androidx.compose.runtime.NonRestartableComposable public static void LaunchedEffect(Object? key1, Object? key2, kotlin.jvm.functions.Function2<? super kotlinx.coroutines.CoroutineScope,? super kotlin.coroutines.Continuation<? super kotlin.Unit>,?> block);
+ method @androidx.compose.runtime.Composable @androidx.compose.runtime.NonRestartableComposable public static void LaunchedEffect(Object? key1, Object? key2, Object? key3, kotlin.jvm.functions.Function2<? super kotlinx.coroutines.CoroutineScope,? super kotlin.coroutines.Continuation<? super kotlin.Unit>,?> block);
+ method @androidx.compose.runtime.Composable @androidx.compose.runtime.NonRestartableComposable public static void LaunchedEffect(Object![]? keys, kotlin.jvm.functions.Function2<? super kotlinx.coroutines.CoroutineScope,? super kotlin.coroutines.Continuation<? super kotlin.Unit>,?> block);
+ method @androidx.compose.runtime.Composable @androidx.compose.runtime.NonRestartableComposable public static void SideEffect(kotlin.jvm.functions.Function0<kotlin.Unit> effect);
+ method @kotlin.PublishedApi internal static kotlinx.coroutines.CoroutineScope createCompositionCoroutineScope(kotlin.coroutines.CoroutineContext coroutineContext, androidx.compose.runtime.Composer composer);
+ method @androidx.compose.runtime.Composable public static inline kotlinx.coroutines.CoroutineScope rememberCoroutineScope(optional kotlin.jvm.functions.Function0<? extends kotlin.coroutines.CoroutineContext> getContext);
+ }
+
+ public final class ExpectKt {
+ method @kotlin.PublishedApi internal static inline <R> R! synchronized(Object lock, kotlin.jvm.functions.Function0<? extends R> block);
+ }
+
+ @kotlin.annotation.Retention(kotlin.annotation.AnnotationRetention.SOURCE) @kotlin.annotation.Target(allowedTargets={kotlin.annotation.AnnotationTarget.FUNCTION, kotlin.annotation.AnnotationTarget.PROPERTY_GETTER}) public @interface ExplicitGroupsComposable {
+ }
+
+ @androidx.compose.runtime.StableMarker @kotlin.annotation.MustBeDocumented @kotlin.annotation.Retention(kotlin.annotation.AnnotationRetention.BINARY) @kotlin.annotation.Target(allowedTargets=kotlin.annotation.AnnotationTarget.CLASS) public @interface Immutable {
+ }
+
+ public interface MonotonicFrameClock extends kotlin.coroutines.CoroutineContext.Element {
+ method public default kotlin.coroutines.CoroutineContext.Key<?> getKey();
+ method public suspend <R> Object? withFrameNanos(kotlin.jvm.functions.Function1<? super java.lang.Long,? extends R> onFrame, kotlin.coroutines.Continuation<? super R>);
+ property public default kotlin.coroutines.CoroutineContext.Key<?> key;
+ field public static final androidx.compose.runtime.MonotonicFrameClock.Key Key;
+ }
+
+ public static final class MonotonicFrameClock.Key implements kotlin.coroutines.CoroutineContext.Key<androidx.compose.runtime.MonotonicFrameClock> {
+ }
+
+ public final class MonotonicFrameClockKt {
+ method public static androidx.compose.runtime.MonotonicFrameClock getMonotonicFrameClock(kotlin.coroutines.CoroutineContext);
+ method public static suspend inline <R> Object? withFrameMillis(androidx.compose.runtime.MonotonicFrameClock, kotlin.jvm.functions.Function1<? super java.lang.Long,? extends R> onFrame, kotlin.coroutines.Continuation<? super R>);
+ method public static suspend <R> Object? withFrameMillis(kotlin.jvm.functions.Function1<? super java.lang.Long,? extends R> onFrame, kotlin.coroutines.Continuation<? super R>);
+ method public static suspend <R> Object? withFrameNanos(kotlin.jvm.functions.Function1<? super java.lang.Long,? extends R> onFrame, kotlin.coroutines.Continuation<? super R>);
+ }
+
+ public final class MovableContentKt {
+ method public static kotlin.jvm.functions.Function0<kotlin.Unit> movableContentOf(kotlin.jvm.functions.Function0<kotlin.Unit> content);
+ method public static <P> kotlin.jvm.functions.Function1<P,kotlin.Unit> movableContentOf(kotlin.jvm.functions.Function1<? super P,kotlin.Unit> content);
+ method public static <P1, P2> kotlin.jvm.functions.Function2<P1,P2,kotlin.Unit> movableContentOf(kotlin.jvm.functions.Function2<? super P1,? super P2,kotlin.Unit> content);
+ method public static <P1, P2, P3> kotlin.jvm.functions.Function3<P1,P2,P3,kotlin.Unit> movableContentOf(kotlin.jvm.functions.Function3<? super P1,? super P2,? super P3,kotlin.Unit> content);
+ method public static <P1, P2, P3, P4> kotlin.jvm.functions.Function4<P1,P2,P3,P4,kotlin.Unit> movableContentOf(kotlin.jvm.functions.Function4<? super P1,? super P2,? super P3,? super P4,kotlin.Unit> content);
+ method public static <R> kotlin.jvm.functions.Function1<R,kotlin.Unit> movableContentWithReceiverOf(kotlin.jvm.functions.Function1<? super R,kotlin.Unit> content);
+ method public static <R, P> kotlin.jvm.functions.Function2<R,P,kotlin.Unit> movableContentWithReceiverOf(kotlin.jvm.functions.Function2<? super R,? super P,kotlin.Unit> content);
+ method public static <R, P1, P2> kotlin.jvm.functions.Function3<R,P1,P2,kotlin.Unit> movableContentWithReceiverOf(kotlin.jvm.functions.Function3<? super R,? super P1,? super P2,kotlin.Unit> content);
+ method public static <R, P1, P2, P3> kotlin.jvm.functions.Function4<R,P1,P2,P3,kotlin.Unit> movableContentWithReceiverOf(kotlin.jvm.functions.Function4<? super R,? super P1,? super P2,? super P3,kotlin.Unit> content);
+ }
+
+ @androidx.compose.runtime.Stable public interface MutableState<T> extends androidx.compose.runtime.State<T> {
+ method public operator T! component1();
+ method public operator kotlin.jvm.functions.Function1<T,kotlin.Unit> component2();
+ method public void setValue(T!);
+ property public abstract T! value;
+ }
+
+ @kotlin.annotation.Retention(kotlin.annotation.AnnotationRetention.SOURCE) @kotlin.annotation.Target(allowedTargets={kotlin.annotation.AnnotationTarget.PROPERTY, kotlin.annotation.AnnotationTarget.FUNCTION, kotlin.annotation.AnnotationTarget.CLASS, kotlin.annotation.AnnotationTarget.FILE}) public @interface NoLiveLiterals {
+ }
+
+ @kotlin.annotation.Retention(kotlin.annotation.AnnotationRetention.SOURCE) @kotlin.annotation.Target(allowedTargets={kotlin.annotation.AnnotationTarget.FUNCTION, kotlin.annotation.AnnotationTarget.PROPERTY_GETTER}) public @interface NonRestartableComposable {
+ }
+
+ public final class PausableMonotonicFrameClock implements androidx.compose.runtime.MonotonicFrameClock {
+ ctor public PausableMonotonicFrameClock(androidx.compose.runtime.MonotonicFrameClock frameClock);
+ method public boolean isPaused();
+ method public void pause();
+ method public void resume();
+ method public suspend <R> Object? withFrameNanos(kotlin.jvm.functions.Function1<? super java.lang.Long,? extends R> onFrame, kotlin.coroutines.Continuation<? super R>);
+ property public final boolean isPaused;
+ }
+
+ public interface ProduceStateScope<T> extends androidx.compose.runtime.MutableState<T> kotlinx.coroutines.CoroutineScope {
+ method public suspend Object? awaitDispose(kotlin.jvm.functions.Function0<kotlin.Unit> onDispose, kotlin.coroutines.Continuation<?>);
+ }
+
+ @androidx.compose.runtime.Stable public abstract class ProvidableCompositionLocal<T> extends androidx.compose.runtime.CompositionLocal<T> {
+ method public final infix androidx.compose.runtime.ProvidedValue<T> provides(T? value);
+ method public final infix androidx.compose.runtime.ProvidedValue<T> providesDefault(T? value);
+ }
+
+ public final class ProvidedValue<T> {
+ method public boolean getCanOverride();
+ method public androidx.compose.runtime.CompositionLocal<T> getCompositionLocal();
+ method public T! getValue();
+ property public final boolean canOverride;
+ property public final androidx.compose.runtime.CompositionLocal<T> compositionLocal;
+ property public final T! value;
+ }
+
+ @kotlin.annotation.MustBeDocumented @kotlin.annotation.Retention(kotlin.annotation.AnnotationRetention.BINARY) @kotlin.annotation.Target(allowedTargets={kotlin.annotation.AnnotationTarget.FUNCTION, kotlin.annotation.AnnotationTarget.PROPERTY_GETTER}) public @interface ReadOnlyComposable {
+ }
+
+ public interface RecomposeScope {
+ method public void invalidate();
+ }
+
+ public final class RecomposeScopeImplKt {
+ }
+
+ public final class Recomposer extends androidx.compose.runtime.CompositionContext {
+ ctor public Recomposer(kotlin.coroutines.CoroutineContext effectCoroutineContext);
+ method public androidx.compose.runtime.RecomposerInfo asRecomposerInfo();
+ method public suspend Object? awaitIdle(kotlin.coroutines.Continuation<? super kotlin.Unit>);
+ method public void cancel();
+ method public void close();
+ method public long getChangeCount();
+ method public kotlinx.coroutines.flow.StateFlow<androidx.compose.runtime.Recomposer.State> getCurrentState();
+ method public boolean getHasPendingWork();
+ method @Deprecated public kotlinx.coroutines.flow.Flow<androidx.compose.runtime.Recomposer.State> getState();
+ method public suspend Object? join(kotlin.coroutines.Continuation<? super kotlin.Unit>);
+ method public suspend Object? runRecomposeAndApplyChanges(kotlin.coroutines.Continuation<? super kotlin.Unit>);
+ property public final long changeCount;
+ property public final kotlinx.coroutines.flow.StateFlow<androidx.compose.runtime.Recomposer.State> currentState;
+ property public final boolean hasPendingWork;
+ property @Deprecated public final kotlinx.coroutines.flow.Flow<androidx.compose.runtime.Recomposer.State> state;
+ field public static final androidx.compose.runtime.Recomposer.Companion Companion;
+ }
+
+ public static final class Recomposer.Companion {
+ method public kotlinx.coroutines.flow.StateFlow<java.util.Set<androidx.compose.runtime.RecomposerInfo>> getRunningRecomposers();
+ property public final kotlinx.coroutines.flow.StateFlow<java.util.Set<androidx.compose.runtime.RecomposerInfo>> runningRecomposers;
+ }
+
+ public enum Recomposer.State {
+ enum_constant public static final androidx.compose.runtime.Recomposer.State Idle;
+ enum_constant public static final androidx.compose.runtime.Recomposer.State Inactive;
+ enum_constant public static final androidx.compose.runtime.Recomposer.State InactivePendingWork;
+ enum_constant public static final androidx.compose.runtime.Recomposer.State PendingWork;
+ enum_constant public static final androidx.compose.runtime.Recomposer.State ShutDown;
+ enum_constant public static final androidx.compose.runtime.Recomposer.State ShuttingDown;
+ }
+
+ public interface RecomposerInfo {
+ method public long getChangeCount();
+ method public boolean getHasPendingWork();
+ method public kotlinx.coroutines.flow.Flow<androidx.compose.runtime.Recomposer.State> getState();
+ property public abstract long changeCount;
+ property public abstract boolean hasPendingWork;
+ property public abstract kotlinx.coroutines.flow.Flow<androidx.compose.runtime.Recomposer.State> state;
+ }
+
+ public final class RecomposerKt {
+ method public static suspend <R> Object? withRunningRecomposer(kotlin.jvm.functions.Function3<? super kotlinx.coroutines.CoroutineScope,? super androidx.compose.runtime.Recomposer,? super kotlin.coroutines.Continuation<? super R>,?> block, kotlin.coroutines.Continuation<? super R>);
+ }
+
+ public interface RememberObserver {
+ method public void onAbandoned();
+ method public void onForgotten();
+ method public void onRemembered();
+ }
+
+ @androidx.compose.runtime.ComposeCompilerApi public interface ScopeUpdateScope {
+ method public void updateScope(kotlin.jvm.functions.Function2<? super androidx.compose.runtime.Composer,? super java.lang.Integer,kotlin.Unit> block);
+ }
+
+ @kotlin.jvm.JvmInline public final value class SkippableUpdater<T> {
+ ctor public SkippableUpdater(@kotlin.PublishedApi androidx.compose.runtime.Composer composer);
+ method public inline void update(kotlin.jvm.functions.Function1<? super androidx.compose.runtime.Updater<T>,kotlin.Unit> block);
+ }
+
+ public final class SlotTableKt {
+ }
+
+ public interface SnapshotMutationPolicy<T> {
+ method public boolean equivalent(T? a, T? b);
+ method public default T? merge(T? previous, T? current, T? applied);
+ }
+
+ public final class SnapshotStateKt {
+ method @androidx.compose.runtime.Composable public static <T> androidx.compose.runtime.State<T> collectAsState(kotlinx.coroutines.flow.StateFlow<? extends T>, optional kotlin.coroutines.CoroutineContext context);
+ method @androidx.compose.runtime.Composable public static <T extends R, R> androidx.compose.runtime.State<R> collectAsState(kotlinx.coroutines.flow.Flow<? extends T>, R? initial, optional kotlin.coroutines.CoroutineContext context);
+ method public static <T> androidx.compose.runtime.State<T> derivedStateOf(kotlin.jvm.functions.Function0<? extends T> calculation);
+ method public static inline operator <T> T! getValue(androidx.compose.runtime.State<? extends T>, Object? thisObj, kotlin.reflect.KProperty<?> property);
+ method public static <T> androidx.compose.runtime.snapshots.SnapshotStateList<T> mutableStateListOf();
+ method public static <T> androidx.compose.runtime.snapshots.SnapshotStateList<T> mutableStateListOf(T?... elements);
+ method public static <K, V> androidx.compose.runtime.snapshots.SnapshotStateMap<K,V> mutableStateMapOf();
+ method public static <K, V> androidx.compose.runtime.snapshots.SnapshotStateMap<K,V> mutableStateMapOf(kotlin.Pair<? extends K,? extends V>... pairs);
+ method public static <T> androidx.compose.runtime.MutableState<T> mutableStateOf(T? value, optional androidx.compose.runtime.SnapshotMutationPolicy<T> policy);
+ method public static <T> androidx.compose.runtime.SnapshotMutationPolicy<T> neverEqualPolicy();
+ method @androidx.compose.runtime.Composable public static <T> androidx.compose.runtime.State<T> produceState(T? initialValue, kotlin.jvm.functions.Function2<? super androidx.compose.runtime.ProduceStateScope<T>,? super kotlin.coroutines.Continuation<? super kotlin.Unit>,?> producer);
+ method @androidx.compose.runtime.Composable public static <T> androidx.compose.runtime.State<T> produceState(T? initialValue, Object? key1, kotlin.jvm.functions.Function2<? super androidx.compose.runtime.ProduceStateScope<T>,? super kotlin.coroutines.Continuation<? super kotlin.Unit>,?> producer);
+ method @androidx.compose.runtime.Composable public static <T> androidx.compose.runtime.State<T> produceState(T? initialValue, Object? key1, Object? key2, kotlin.jvm.functions.Function2<? super androidx.compose.runtime.ProduceStateScope<T>,? super kotlin.coroutines.Continuation<? super kotlin.Unit>,?> producer);
+ method @androidx.compose.runtime.Composable public static <T> androidx.compose.runtime.State<T> produceState(T? initialValue, Object? key1, Object? key2, Object? key3, kotlin.jvm.functions.Function2<? super androidx.compose.runtime.ProduceStateScope<T>,? super kotlin.coroutines.Continuation<? super kotlin.Unit>,?> producer);
+ method @androidx.compose.runtime.Composable public static <T> androidx.compose.runtime.State<T> produceState(T? initialValue, Object![]? keys, kotlin.jvm.functions.Function2<? super androidx.compose.runtime.ProduceStateScope<T>,? super kotlin.coroutines.Continuation<? super kotlin.Unit>,?> producer);
+ method public static <T> androidx.compose.runtime.SnapshotMutationPolicy<T> referentialEqualityPolicy();
+ method @androidx.compose.runtime.Composable public static <T> androidx.compose.runtime.State<T> rememberUpdatedState(T? newValue);
+ method public static inline operator <T> void setValue(androidx.compose.runtime.MutableState<T>, Object? thisObj, kotlin.reflect.KProperty<?> property, T? value);
+ method public static <T> kotlinx.coroutines.flow.Flow<T> snapshotFlow(kotlin.jvm.functions.Function0<? extends T> block);
+ method public static <T> androidx.compose.runtime.SnapshotMutationPolicy<T> structuralEqualityPolicy();
+ method public static <T> androidx.compose.runtime.snapshots.SnapshotStateList<T> toMutableStateList(java.util.Collection<? extends T>);
+ method public static <K, V> androidx.compose.runtime.snapshots.SnapshotStateMap<K,V> toMutableStateMap(Iterable<? extends kotlin.Pair<? extends K,? extends V>>);
+ }
+
+ public final class SnapshotStateKt {
+ method @androidx.compose.runtime.Composable public static <T> androidx.compose.runtime.State<T> collectAsState(kotlinx.coroutines.flow.StateFlow<? extends T>, optional kotlin.coroutines.CoroutineContext context);
+ method @androidx.compose.runtime.Composable public static <T extends R, R> androidx.compose.runtime.State<R> collectAsState(kotlinx.coroutines.flow.Flow<? extends T>, R? initial, optional kotlin.coroutines.CoroutineContext context);
+ method public static <T> androidx.compose.runtime.State<T> derivedStateOf(kotlin.jvm.functions.Function0<? extends T> calculation);
+ method public static inline operator <T> T! getValue(androidx.compose.runtime.State<? extends T>, Object? thisObj, kotlin.reflect.KProperty<?> property);
+ method public static <T> androidx.compose.runtime.snapshots.SnapshotStateList<T> mutableStateListOf();
+ method public static <T> androidx.compose.runtime.snapshots.SnapshotStateList<T> mutableStateListOf(T?... elements);
+ method public static <K, V> androidx.compose.runtime.snapshots.SnapshotStateMap<K,V> mutableStateMapOf();
+ method public static <K, V> androidx.compose.runtime.snapshots.SnapshotStateMap<K,V> mutableStateMapOf(kotlin.Pair<? extends K,? extends V>... pairs);
+ method public static <T> androidx.compose.runtime.MutableState<T> mutableStateOf(T? value, optional androidx.compose.runtime.SnapshotMutationPolicy<T> policy);
+ method public static <T> androidx.compose.runtime.SnapshotMutationPolicy<T> neverEqualPolicy();
+ method @androidx.compose.runtime.Composable public static <T> androidx.compose.runtime.State<T> produceState(T? initialValue, kotlin.jvm.functions.Function2<? super androidx.compose.runtime.ProduceStateScope<T>,? super kotlin.coroutines.Continuation<? super kotlin.Unit>,?> producer);
+ method @androidx.compose.runtime.Composable public static <T> androidx.compose.runtime.State<T> produceState(T? initialValue, Object? key1, kotlin.jvm.functions.Function2<? super androidx.compose.runtime.ProduceStateScope<T>,? super kotlin.coroutines.Continuation<? super kotlin.Unit>,?> producer);
+ method @androidx.compose.runtime.Composable public static <T> androidx.compose.runtime.State<T> produceState(T? initialValue, Object? key1, Object? key2, kotlin.jvm.functions.Function2<? super androidx.compose.runtime.ProduceStateScope<T>,? super kotlin.coroutines.Continuation<? super kotlin.Unit>,?> producer);
+ method @androidx.compose.runtime.Composable public static <T> androidx.compose.runtime.State<T> produceState(T? initialValue, Object? key1, Object? key2, Object? key3, kotlin.jvm.functions.Function2<? super androidx.compose.runtime.ProduceStateScope<T>,? super kotlin.coroutines.Continuation<? super kotlin.Unit>,?> producer);
+ method @androidx.compose.runtime.Composable public static <T> androidx.compose.runtime.State<T> produceState(T? initialValue, Object![]? keys, kotlin.jvm.functions.Function2<? super androidx.compose.runtime.ProduceStateScope<T>,? super kotlin.coroutines.Continuation<? super kotlin.Unit>,?> producer);
+ method public static <T> androidx.compose.runtime.SnapshotMutationPolicy<T> referentialEqualityPolicy();
+ method @androidx.compose.runtime.Composable public static <T> androidx.compose.runtime.State<T> rememberUpdatedState(T? newValue);
+ method public static inline operator <T> void setValue(androidx.compose.runtime.MutableState<T>, Object? thisObj, kotlin.reflect.KProperty<?> property, T? value);
+ method public static <T> kotlinx.coroutines.flow.Flow<T> snapshotFlow(kotlin.jvm.functions.Function0<? extends T> block);
+ method public static <T> androidx.compose.runtime.SnapshotMutationPolicy<T> structuralEqualityPolicy();
+ method public static <T> androidx.compose.runtime.snapshots.SnapshotStateList<T> toMutableStateList(java.util.Collection<? extends T>);
+ method public static <K, V> androidx.compose.runtime.snapshots.SnapshotStateMap<K,V> toMutableStateMap(Iterable<? extends kotlin.Pair<? extends K,? extends V>>);
+ }
+
+ public final class SnapshotStateKt {
+ method @androidx.compose.runtime.Composable public static <T> androidx.compose.runtime.State<T> collectAsState(kotlinx.coroutines.flow.StateFlow<? extends T>, optional kotlin.coroutines.CoroutineContext context);
+ method @androidx.compose.runtime.Composable public static <T extends R, R> androidx.compose.runtime.State<R> collectAsState(kotlinx.coroutines.flow.Flow<? extends T>, R? initial, optional kotlin.coroutines.CoroutineContext context);
+ method public static <T> androidx.compose.runtime.State<T> derivedStateOf(kotlin.jvm.functions.Function0<? extends T> calculation);
+ method public static inline operator <T> T! getValue(androidx.compose.runtime.State<? extends T>, Object? thisObj, kotlin.reflect.KProperty<?> property);
+ method public static <T> androidx.compose.runtime.snapshots.SnapshotStateList<T> mutableStateListOf();
+ method public static <T> androidx.compose.runtime.snapshots.SnapshotStateList<T> mutableStateListOf(T?... elements);
+ method public static <K, V> androidx.compose.runtime.snapshots.SnapshotStateMap<K,V> mutableStateMapOf();
+ method public static <K, V> androidx.compose.runtime.snapshots.SnapshotStateMap<K,V> mutableStateMapOf(kotlin.Pair<? extends K,? extends V>... pairs);
+ method public static <T> androidx.compose.runtime.MutableState<T> mutableStateOf(T? value, optional androidx.compose.runtime.SnapshotMutationPolicy<T> policy);
+ method public static <T> androidx.compose.runtime.SnapshotMutationPolicy<T> neverEqualPolicy();
+ method @androidx.compose.runtime.Composable public static <T> androidx.compose.runtime.State<T> produceState(T? initialValue, kotlin.jvm.functions.Function2<? super androidx.compose.runtime.ProduceStateScope<T>,? super kotlin.coroutines.Continuation<? super kotlin.Unit>,?> producer);
+ method @androidx.compose.runtime.Composable public static <T> androidx.compose.runtime.State<T> produceState(T? initialValue, Object? key1, kotlin.jvm.functions.Function2<? super androidx.compose.runtime.ProduceStateScope<T>,? super kotlin.coroutines.Continuation<? super kotlin.Unit>,?> producer);
+ method @androidx.compose.runtime.Composable public static <T> androidx.compose.runtime.State<T> produceState(T? initialValue, Object? key1, Object? key2, kotlin.jvm.functions.Function2<? super androidx.compose.runtime.ProduceStateScope<T>,? super kotlin.coroutines.Continuation<? super kotlin.Unit>,?> producer);
+ method @androidx.compose.runtime.Composable public static <T> androidx.compose.runtime.State<T> produceState(T? initialValue, Object? key1, Object? key2, Object? key3, kotlin.jvm.functions.Function2<? super androidx.compose.runtime.ProduceStateScope<T>,? super kotlin.coroutines.Continuation<? super kotlin.Unit>,?> producer);
+ method @androidx.compose.runtime.Composable public static <T> androidx.compose.runtime.State<T> produceState(T? initialValue, Object![]? keys, kotlin.jvm.functions.Function2<? super androidx.compose.runtime.ProduceStateScope<T>,? super kotlin.coroutines.Continuation<? super kotlin.Unit>,?> producer);
+ method public static <T> androidx.compose.runtime.SnapshotMutationPolicy<T> referentialEqualityPolicy();
+ method @androidx.compose.runtime.Composable public static <T> androidx.compose.runtime.State<T> rememberUpdatedState(T? newValue);
+ method public static inline operator <T> void setValue(androidx.compose.runtime.MutableState<T>, Object? thisObj, kotlin.reflect.KProperty<?> property, T? value);
+ method public static <T> kotlinx.coroutines.flow.Flow<T> snapshotFlow(kotlin.jvm.functions.Function0<? extends T> block);
+ method public static <T> androidx.compose.runtime.SnapshotMutationPolicy<T> structuralEqualityPolicy();
+ method public static <T> androidx.compose.runtime.snapshots.SnapshotStateList<T> toMutableStateList(java.util.Collection<? extends T>);
+ method public static <K, V> androidx.compose.runtime.snapshots.SnapshotStateMap<K,V> toMutableStateMap(Iterable<? extends kotlin.Pair<? extends K,? extends V>>);
+ }
+
+ public final class SnapshotStateKt {
+ method @androidx.compose.runtime.Composable public static <T> androidx.compose.runtime.State<T> collectAsState(kotlinx.coroutines.flow.StateFlow<? extends T>, optional kotlin.coroutines.CoroutineContext context);
+ method @androidx.compose.runtime.Composable public static <T extends R, R> androidx.compose.runtime.State<R> collectAsState(kotlinx.coroutines.flow.Flow<? extends T>, R? initial, optional kotlin.coroutines.CoroutineContext context);
+ method public static <T> androidx.compose.runtime.State<T> derivedStateOf(kotlin.jvm.functions.Function0<? extends T> calculation);
+ method public static inline operator <T> T! getValue(androidx.compose.runtime.State<? extends T>, Object? thisObj, kotlin.reflect.KProperty<?> property);
+ method public static <T> androidx.compose.runtime.snapshots.SnapshotStateList<T> mutableStateListOf();
+ method public static <T> androidx.compose.runtime.snapshots.SnapshotStateList<T> mutableStateListOf(T?... elements);
+ method public static <K, V> androidx.compose.runtime.snapshots.SnapshotStateMap<K,V> mutableStateMapOf();
+ method public static <K, V> androidx.compose.runtime.snapshots.SnapshotStateMap<K,V> mutableStateMapOf(kotlin.Pair<? extends K,? extends V>... pairs);
+ method public static <T> androidx.compose.runtime.MutableState<T> mutableStateOf(T? value, optional androidx.compose.runtime.SnapshotMutationPolicy<T> policy);
+ method public static <T> androidx.compose.runtime.SnapshotMutationPolicy<T> neverEqualPolicy();
+ method @androidx.compose.runtime.Composable public static <T> androidx.compose.runtime.State<T> produceState(T? initialValue, kotlin.jvm.functions.Function2<? super androidx.compose.runtime.ProduceStateScope<T>,? super kotlin.coroutines.Continuation<? super kotlin.Unit>,?> producer);
+ method @androidx.compose.runtime.Composable public static <T> androidx.compose.runtime.State<T> produceState(T? initialValue, Object? key1, kotlin.jvm.functions.Function2<? super androidx.compose.runtime.ProduceStateScope<T>,? super kotlin.coroutines.Continuation<? super kotlin.Unit>,?> producer);
+ method @androidx.compose.runtime.Composable public static <T> androidx.compose.runtime.State<T> produceState(T? initialValue, Object? key1, Object? key2, kotlin.jvm.functions.Function2<? super androidx.compose.runtime.ProduceStateScope<T>,? super kotlin.coroutines.Continuation<? super kotlin.Unit>,?> producer);
+ method @androidx.compose.runtime.Composable public static <T> androidx.compose.runtime.State<T> produceState(T? initialValue, Object? key1, Object? key2, Object? key3, kotlin.jvm.functions.Function2<? super androidx.compose.runtime.ProduceStateScope<T>,? super kotlin.coroutines.Continuation<? super kotlin.Unit>,?> producer);
+ method @androidx.compose.runtime.Composable public static <T> androidx.compose.runtime.State<T> produceState(T? initialValue, Object![]? keys, kotlin.jvm.functions.Function2<? super androidx.compose.runtime.ProduceStateScope<T>,? super kotlin.coroutines.Continuation<? super kotlin.Unit>,?> producer);
+ method public static <T> androidx.compose.runtime.SnapshotMutationPolicy<T> referentialEqualityPolicy();
+ method @androidx.compose.runtime.Composable public static <T> androidx.compose.runtime.State<T> rememberUpdatedState(T? newValue);
+ method public static inline operator <T> void setValue(androidx.compose.runtime.MutableState<T>, Object? thisObj, kotlin.reflect.KProperty<?> property, T? value);
+ method public static <T> kotlinx.coroutines.flow.Flow<T> snapshotFlow(kotlin.jvm.functions.Function0<? extends T> block);
+ method public static <T> androidx.compose.runtime.SnapshotMutationPolicy<T> structuralEqualityPolicy();
+ method public static <T> androidx.compose.runtime.snapshots.SnapshotStateList<T> toMutableStateList(java.util.Collection<? extends T>);
+ method public static <K, V> androidx.compose.runtime.snapshots.SnapshotStateMap<K,V> toMutableStateMap(Iterable<? extends kotlin.Pair<? extends K,? extends V>>);
+ }
+
+ public final class SnapshotStateKt {
+ method @androidx.compose.runtime.Composable public static <T> androidx.compose.runtime.State<T> collectAsState(kotlinx.coroutines.flow.StateFlow<? extends T>, optional kotlin.coroutines.CoroutineContext context);
+ method @androidx.compose.runtime.Composable public static <T extends R, R> androidx.compose.runtime.State<R> collectAsState(kotlinx.coroutines.flow.Flow<? extends T>, R? initial, optional kotlin.coroutines.CoroutineContext context);
+ method public static <T> androidx.compose.runtime.State<T> derivedStateOf(kotlin.jvm.functions.Function0<? extends T> calculation);
+ method public static inline operator <T> T! getValue(androidx.compose.runtime.State<? extends T>, Object? thisObj, kotlin.reflect.KProperty<?> property);
+ method public static <T> androidx.compose.runtime.snapshots.SnapshotStateList<T> mutableStateListOf();
+ method public static <T> androidx.compose.runtime.snapshots.SnapshotStateList<T> mutableStateListOf(T?... elements);
+ method public static <K, V> androidx.compose.runtime.snapshots.SnapshotStateMap<K,V> mutableStateMapOf();
+ method public static <K, V> androidx.compose.runtime.snapshots.SnapshotStateMap<K,V> mutableStateMapOf(kotlin.Pair<? extends K,? extends V>... pairs);
+ method public static <T> androidx.compose.runtime.MutableState<T> mutableStateOf(T? value, optional androidx.compose.runtime.SnapshotMutationPolicy<T> policy);
+ method public static <T> androidx.compose.runtime.SnapshotMutationPolicy<T> neverEqualPolicy();
+ method @androidx.compose.runtime.Composable public static <T> androidx.compose.runtime.State<T> produceState(T? initialValue, kotlin.jvm.functions.Function2<? super androidx.compose.runtime.ProduceStateScope<T>,? super kotlin.coroutines.Continuation<? super kotlin.Unit>,?> producer);
+ method @androidx.compose.runtime.Composable public static <T> androidx.compose.runtime.State<T> produceState(T? initialValue, Object? key1, kotlin.jvm.functions.Function2<? super androidx.compose.runtime.ProduceStateScope<T>,? super kotlin.coroutines.Continuation<? super kotlin.Unit>,?> producer);
+ method @androidx.compose.runtime.Composable public static <T> androidx.compose.runtime.State<T> produceState(T? initialValue, Object? key1, Object? key2, kotlin.jvm.functions.Function2<? super androidx.compose.runtime.ProduceStateScope<T>,? super kotlin.coroutines.Continuation<? super kotlin.Unit>,?> producer);
+ method @androidx.compose.runtime.Composable public static <T> androidx.compose.runtime.State<T> produceState(T? initialValue, Object? key1, Object? key2, Object? key3, kotlin.jvm.functions.Function2<? super androidx.compose.runtime.ProduceStateScope<T>,? super kotlin.coroutines.Continuation<? super kotlin.Unit>,?> producer);
+ method @androidx.compose.runtime.Composable public static <T> androidx.compose.runtime.State<T> produceState(T? initialValue, Object![]? keys, kotlin.jvm.functions.Function2<? super androidx.compose.runtime.ProduceStateScope<T>,? super kotlin.coroutines.Continuation<? super kotlin.Unit>,?> producer);
+ method public static <T> androidx.compose.runtime.SnapshotMutationPolicy<T> referentialEqualityPolicy();
+ method @androidx.compose.runtime.Composable public static <T> androidx.compose.runtime.State<T> rememberUpdatedState(T? newValue);
+ method public static inline operator <T> void setValue(androidx.compose.runtime.MutableState<T>, Object? thisObj, kotlin.reflect.KProperty<?> property, T? value);
+ method public static <T> kotlinx.coroutines.flow.Flow<T> snapshotFlow(kotlin.jvm.functions.Function0<? extends T> block);
+ method public static <T> androidx.compose.runtime.SnapshotMutationPolicy<T> structuralEqualityPolicy();
+ method public static <T> androidx.compose.runtime.snapshots.SnapshotStateList<T> toMutableStateList(java.util.Collection<? extends T>);
+ method public static <K, V> androidx.compose.runtime.snapshots.SnapshotStateMap<K,V> toMutableStateMap(Iterable<? extends kotlin.Pair<? extends K,? extends V>>);
+ }
+
+ @androidx.compose.runtime.StableMarker @kotlin.annotation.MustBeDocumented @kotlin.annotation.Retention(kotlin.annotation.AnnotationRetention.BINARY) @kotlin.annotation.Target(allowedTargets={kotlin.annotation.AnnotationTarget.CLASS, kotlin.annotation.AnnotationTarget.FUNCTION, kotlin.annotation.AnnotationTarget.PROPERTY_GETTER, kotlin.annotation.AnnotationTarget.PROPERTY}) public @interface Stable {
+ }
+
+ @kotlin.annotation.MustBeDocumented @kotlin.annotation.Retention(kotlin.annotation.AnnotationRetention.BINARY) @kotlin.annotation.Target(allowedTargets={kotlin.annotation.AnnotationTarget.ANNOTATION_CLASS, kotlin.annotation.AnnotationTarget.CLASS}) public @interface StableMarker {
+ }
+
+ @androidx.compose.runtime.Stable public interface State<T> {
+ method public T! getValue();
+ property public abstract T! value;
+ }
+
+ public final class TraceKt {
+ }
+
+ @kotlin.jvm.JvmInline public final value class Updater<T> {
+ ctor public Updater(@kotlin.PublishedApi androidx.compose.runtime.Composer composer);
+ method public void init(kotlin.jvm.functions.Function1<? super T,kotlin.Unit> block);
+ method public void reconcile(kotlin.jvm.functions.Function1<? super T,kotlin.Unit> block);
+ method public inline void set(int value, kotlin.jvm.functions.Function2<? super T,? super java.lang.Integer,kotlin.Unit> block);
+ method public <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 <V> void update(V? value, kotlin.jvm.functions.Function2<? super T,? super V,kotlin.Unit> block);
+ }
+
+}
+
+package androidx.compose.runtime.collection {
+
+ public final class MutableVector<T> implements java.util.RandomAccess {
+ ctor @kotlin.PublishedApi internal MutableVector(@kotlin.PublishedApi T![] content, int size);
+ method public boolean add(T? element);
+ method public void add(int index, T? element);
+ method public boolean addAll(int index, java.util.List<? extends T> elements);
+ method public boolean addAll(int index, androidx.compose.runtime.collection.MutableVector<T> elements);
+ method public inline boolean addAll(java.util.List<? extends T> elements);
+ method public inline boolean addAll(androidx.compose.runtime.collection.MutableVector<T> elements);
+ method public boolean addAll(T![] elements);
+ method public boolean addAll(int index, java.util.Collection<? extends T> elements);
+ method public boolean addAll(java.util.Collection<? extends T> elements);
+ method public inline boolean any(kotlin.jvm.functions.Function1<? super T,java.lang.Boolean> predicate);
+ method public java.util.List<T> asMutableList();
+ method public void clear();
+ method public operator boolean contains(T? element);
+ method public boolean containsAll(java.util.List<? extends T> elements);
+ method public boolean containsAll(java.util.Collection<? extends T> elements);
+ method public boolean containsAll(androidx.compose.runtime.collection.MutableVector<T> elements);
+ method public boolean contentEquals(androidx.compose.runtime.collection.MutableVector<T> other);
+ method public void ensureCapacity(int capacity);
+ method public T! first();
+ method public inline T! first(kotlin.jvm.functions.Function1<? super T,java.lang.Boolean> predicate);
+ method public inline T? firstOrNull();
+ method public inline T? firstOrNull(kotlin.jvm.functions.Function1<? super T,java.lang.Boolean> predicate);
+ method public inline <R> R! fold(R? initial, kotlin.jvm.functions.Function2<? super R,? super T,? extends R> operation);
+ method public inline <R> R! foldIndexed(R? initial, kotlin.jvm.functions.Function3<? super java.lang.Integer,? super R,? super T,? extends R> operation);
+ method public inline <R> R! foldRight(R? initial, kotlin.jvm.functions.Function2<? super T,? super R,? extends R> operation);
+ method public inline <R> R! foldRightIndexed(R? initial, kotlin.jvm.functions.Function3<? super java.lang.Integer,? super T,? super R,? extends R> operation);
+ method public inline void forEach(kotlin.jvm.functions.Function1<? super T,kotlin.Unit> block);
+ method public inline void forEachIndexed(kotlin.jvm.functions.Function2<? super java.lang.Integer,? super T,kotlin.Unit> block);
+ method public inline void forEachReversed(kotlin.jvm.functions.Function1<? super T,kotlin.Unit> block);
+ method public inline void forEachReversedIndexed(kotlin.jvm.functions.Function2<? super java.lang.Integer,? super T,kotlin.Unit> block);
+ method public inline operator T! get(int index);
+ method public inline kotlin.ranges.IntRange getIndices();
+ method public inline int getLastIndex();
+ method public int getSize();
+ method public int indexOf(T? element);
+ method public inline int indexOfFirst(kotlin.jvm.functions.Function1<? super T,java.lang.Boolean> predicate);
+ method public inline int indexOfLast(kotlin.jvm.functions.Function1<? super T,java.lang.Boolean> predicate);
+ method public boolean isEmpty();
+ method public boolean isNotEmpty();
+ method public T! last();
+ method public inline T! last(kotlin.jvm.functions.Function1<? super T,java.lang.Boolean> predicate);
+ method public int lastIndexOf(T? element);
+ method public inline T? lastOrNull();
+ method public inline T? lastOrNull(kotlin.jvm.functions.Function1<? super T,java.lang.Boolean> predicate);
+ method public inline <reified R> R![]! map(kotlin.jvm.functions.Function1<? super T,? extends R> transform);
+ method public inline <reified R> R![]! mapIndexed(kotlin.jvm.functions.Function2<? super java.lang.Integer,? super T,? extends R> transform);
+ method public inline <reified R> androidx.compose.runtime.collection.MutableVector<R>! mapIndexedNotNull(kotlin.jvm.functions.Function2<? super java.lang.Integer,? super T,? extends R> transform);
+ method public inline <reified R> androidx.compose.runtime.collection.MutableVector<R>! mapNotNull(kotlin.jvm.functions.Function1<? super T,? extends R> transform);
+ method public inline operator void minusAssign(T? element);
+ method public inline operator void plusAssign(T? element);
+ method public boolean remove(T? element);
+ method public boolean removeAll(java.util.List<? extends T> elements);
+ method public boolean removeAll(androidx.compose.runtime.collection.MutableVector<T> elements);
+ method public boolean removeAll(java.util.Collection<? extends T> elements);
+ method public T! removeAt(int index);
+ method public void removeRange(int start, int end);
+ method public boolean retainAll(java.util.Collection<? extends T> elements);
+ method public inline boolean reversedAny(kotlin.jvm.functions.Function1<? super T,java.lang.Boolean> predicate);
+ method public operator T! set(int index, T? element);
+ method public void sortWith(java.util.Comparator<T> comparator);
+ method public inline int sumBy(kotlin.jvm.functions.Function1<? super T,java.lang.Integer> selector);
+ method @kotlin.PublishedApi internal Void throwNoSuchElementException();
+ property public final inline kotlin.ranges.IntRange indices;
+ property public final inline int lastIndex;
+ property public final int size;
+ }
+
+ public final class MutableVectorKt {
+ method public static inline <reified T> androidx.compose.runtime.collection.MutableVector<T>! MutableVector(optional int capacity);
+ method public static inline <reified T> androidx.compose.runtime.collection.MutableVector<T>! MutableVector(int size, kotlin.jvm.functions.Function1<? super java.lang.Integer,? extends T> init);
+ method public static inline <reified T> androidx.compose.runtime.collection.MutableVector<T>! mutableVectorOf();
+ method public static inline <reified T> androidx.compose.runtime.collection.MutableVector<T>! mutableVectorOf(T? elements);
+ }
+
+}
+
+package androidx.compose.runtime.external.kotlinx.collections.immutable {
+
+ public final class ExtensionsKt {
+ }
+
+}
+
+package androidx.compose.runtime.external.kotlinx.collections.immutable.implementations.immutableList {
+
+ public final class UtilsKt {
+ }
+
+}
+
+package androidx.compose.runtime.external.kotlinx.collections.immutable.implementations.immutableMap {
+
+ public final class PersistentHashMapContentIteratorsKt {
+ }
+
+ public final class TrieNodeKt {
+ }
+
+}
+
+package androidx.compose.runtime.external.kotlinx.collections.immutable.implementations.immutableSet {
+
+ public final class TrieNodeKt {
+ }
+
+}
+
+package androidx.compose.runtime.external.kotlinx.collections.immutable.internal {
+
+ public final class CommonFunctionsKt {
+ }
+
+ public final class ForEachOneBitKt {
+ }
+
+}
+
+package androidx.compose.runtime.internal {
+
+ @androidx.compose.runtime.ComposeCompilerApi @androidx.compose.runtime.Stable public interface ComposableLambda extends kotlin.jvm.functions.Function2<androidx.compose.runtime.Composer,java.lang.Integer,java.lang.Object> kotlin.jvm.functions.Function10<java.lang.Object,java.lang.Object,java.lang.Object,java.lang.Object,java.lang.Object,java.lang.Object,java.lang.Object,java.lang.Object,androidx.compose.runtime.Composer,java.lang.Integer,java.lang.Object> kotlin.jvm.functions.Function11<java.lang.Object,java.lang.Object,java.lang.Object,java.lang.Object,java.lang.Object,java.lang.Object,java.lang.Object,java.lang.Object,java.lang.Object,androidx.compose.runtime.Composer,java.lang.Integer,java.lang.Object> kotlin.jvm.functions.Function13<java.lang.Object,java.lang.Object,java.lang.Object,java.lang.Object,java.lang.Object,java.lang.Object,java.lang.Object,java.lang.Object,java.lang.Object,java.lang.Object,androidx.compose.runtime.Composer,java.lang.Integer,java.lang.Integer,java.lang.Object> kotlin.jvm.functions.Function14<java.lang.Object,java.lang.Object,java.lang.Object,java.lang.Object,java.lang.Object,java.lang.Object,java.lang.Object,java.lang.Object,java.lang.Object,java.lang.Object,java.lang.Object,androidx.compose.runtime.Composer,java.lang.Integer,java.lang.Integer,java.lang.Object> kotlin.jvm.functions.Function15<java.lang.Object,java.lang.Object,java.lang.Object,java.lang.Object,java.lang.Object,java.lang.Object,java.lang.Object,java.lang.Object,java.lang.Object,java.lang.Object,java.lang.Object,java.lang.Object,androidx.compose.runtime.Composer,java.lang.Integer,java.lang.Integer,java.lang.Object> kotlin.jvm.functions.Function16<java.lang.Object,java.lang.Object,java.lang.Object,java.lang.Object,java.lang.Object,java.lang.Object,java.lang.Object,java.lang.Object,java.lang.Object,java.lang.Object,java.lang.Object,java.lang.Object,java.lang.Object,androidx.compose.runtime.Composer,java.lang.Integer,java.lang.Integer,java.lang.Object> kotlin.jvm.functions.Function17<java.lang.Object,java.lang.Object,java.lang.Object,java.lang.Object,java.lang.Object,java.lang.Object,java.lang.Object,java.lang.Object,java.lang.Object,java.lang.Object,java.lang.Object,java.lang.Object,java.lang.Object,java.lang.Object,androidx.compose.runtime.Composer,java.lang.Integer,java.lang.Integer,java.lang.Object> kotlin.jvm.functions.Function18<java.lang.Object,java.lang.Object,java.lang.Object,java.lang.Object,java.lang.Object,java.lang.Object,java.lang.Object,java.lang.Object,java.lang.Object,java.lang.Object,java.lang.Object,java.lang.Object,java.lang.Object,java.lang.Object,java.lang.Object,androidx.compose.runtime.Composer,java.lang.Integer,java.lang.Integer,java.lang.Object> kotlin.jvm.functions.Function19<java.lang.Object,java.lang.Object,java.lang.Object,java.lang.Object,java.lang.Object,java.lang.Object,java.lang.Object,java.lang.Object,java.lang.Object,java.lang.Object,java.lang.Object,java.lang.Object,java.lang.Object,java.lang.Object,java.lang.Object,java.lang.Object,androidx.compose.runtime.Composer,java.lang.Integer,java.lang.Integer,java.lang.Object> kotlin.jvm.functions.Function20<java.lang.Object,java.lang.Object,java.lang.Object,java.lang.Object,java.lang.Object,java.lang.Object,java.lang.Object,java.lang.Object,java.lang.Object,java.lang.Object,java.lang.Object,java.lang.Object,java.lang.Object,java.lang.Object,java.lang.Object,java.lang.Object,java.lang.Object,androidx.compose.runtime.Composer,java.lang.Integer,java.lang.Integer,java.lang.Object> kotlin.jvm.functions.Function21<java.lang.Object,java.lang.Object,java.lang.Object,java.lang.Object,java.lang.Object,java.lang.Object,java.lang.Object,java.lang.Object,java.lang.Object,java.lang.Object,java.lang.Object,java.lang.Object,java.lang.Object,java.lang.Object,java.lang.Object,java.lang.Object,java.lang.Object,java.lang.Object,androidx.compose.runtime.Composer,java.lang.Integer,java.lang.Integer,java.lang.Object> kotlin.jvm.functions.Function3<java.lang.Object,androidx.compose.runtime.Composer,java.lang.Integer,java.lang.Object> kotlin.jvm.functions.Function4<java.lang.Object,java.lang.Object,androidx.compose.runtime.Composer,java.lang.Integer,java.lang.Object> kotlin.jvm.functions.Function5<java.lang.Object,java.lang.Object,java.lang.Object,androidx.compose.runtime.Composer,java.lang.Integer,java.lang.Object> kotlin.jvm.functions.Function6<java.lang.Object,java.lang.Object,java.lang.Object,java.lang.Object,androidx.compose.runtime.Composer,java.lang.Integer,java.lang.Object> kotlin.jvm.functions.Function7<java.lang.Object,java.lang.Object,java.lang.Object,java.lang.Object,java.lang.Object,androidx.compose.runtime.Composer,java.lang.Integer,java.lang.Object> kotlin.jvm.functions.Function8<java.lang.Object,java.lang.Object,java.lang.Object,java.lang.Object,java.lang.Object,java.lang.Object,androidx.compose.runtime.Composer,java.lang.Integer,java.lang.Object> kotlin.jvm.functions.Function9<java.lang.Object,java.lang.Object,java.lang.Object,java.lang.Object,java.lang.Object,java.lang.Object,java.lang.Object,androidx.compose.runtime.Composer,java.lang.Integer,java.lang.Object> {
+ }
+
+ public final class ComposableLambdaKt {
+ method @androidx.compose.runtime.ComposeCompilerApi public static androidx.compose.runtime.internal.ComposableLambda composableLambda(androidx.compose.runtime.Composer composer, int key, boolean tracked, Object block);
+ method @androidx.compose.runtime.ComposeCompilerApi public static androidx.compose.runtime.internal.ComposableLambda composableLambdaInstance(int key, boolean tracked, Object block);
+ }
+
+ @androidx.compose.runtime.ComposeCompilerApi @androidx.compose.runtime.Stable public interface ComposableLambdaN extends kotlin.jvm.functions.FunctionN<java.lang.Object> {
+ }
+
+ public final class ComposableLambdaN_jvmKt {
+ method @androidx.compose.runtime.ComposeCompilerApi public static androidx.compose.runtime.internal.ComposableLambdaN composableLambdaN(androidx.compose.runtime.Composer composer, int key, boolean tracked, int arity, Object block);
+ method @androidx.compose.runtime.ComposeCompilerApi public static androidx.compose.runtime.internal.ComposableLambdaN composableLambdaNInstance(int key, boolean tracked, int arity, Object block);
+ }
+
+ public final class DecoyKt {
+ method @androidx.compose.runtime.ComposeCompilerApi public static Void illegalDecoyCallException(String fName);
+ }
+
+ @androidx.compose.runtime.ComposeCompilerApi @kotlin.annotation.Repeatable @kotlin.annotation.Retention(kotlin.annotation.AnnotationRetention.RUNTIME) @kotlin.annotation.Target(allowedTargets=kotlin.annotation.AnnotationTarget.CLASS) public @interface FunctionKeyMeta {
+ method public abstract int endOffset();
+ method public abstract int key();
+ method public abstract int startOffset();
+ property public abstract int endOffset;
+ property public abstract int key;
+ property public abstract int startOffset;
+ }
+
+ @androidx.compose.runtime.ComposeCompilerApi @kotlin.annotation.Repeatable @kotlin.annotation.Retention(kotlin.annotation.AnnotationRetention.RUNTIME) @kotlin.annotation.Target(allowedTargets=kotlin.annotation.AnnotationTarget.CLASS) public static @interface FunctionKeyMeta.Container {
+ method public abstract androidx.compose.runtime.internal.FunctionKeyMeta[] value();
+ }
+
+ @androidx.compose.runtime.ComposeCompilerApi @kotlin.annotation.Retention(kotlin.annotation.AnnotationRetention.RUNTIME) @kotlin.annotation.Target(allowedTargets=kotlin.annotation.AnnotationTarget.CLASS) public @interface FunctionKeyMetaClass {
+ method public abstract String file();
+ property public abstract String file;
+ }
+
+ @androidx.compose.runtime.ComposeCompilerApi @kotlin.annotation.Retention(kotlin.annotation.AnnotationRetention.RUNTIME) @kotlin.annotation.Target(allowedTargets=kotlin.annotation.AnnotationTarget.CLASS) public @interface LiveLiteralFileInfo {
+ method public abstract String file();
+ property public abstract String file;
+ }
+
+ @androidx.compose.runtime.ComposeCompilerApi @kotlin.annotation.Retention(kotlin.annotation.AnnotationRetention.RUNTIME) @kotlin.annotation.Target(allowedTargets=kotlin.annotation.AnnotationTarget.FUNCTION) public @interface LiveLiteralInfo {
+ method public abstract String key();
+ method public abstract int offset();
+ property public abstract String key;
+ property public abstract int offset;
+ }
+
+ public final class LiveLiteralKt {
+ method public static boolean isLiveLiteralsEnabled();
+ property public static final boolean isLiveLiteralsEnabled;
+ }
+
+ @androidx.compose.runtime.ComposeCompilerApi @kotlin.annotation.Retention(kotlin.annotation.AnnotationRetention.BINARY) @kotlin.annotation.Target(allowedTargets=kotlin.annotation.AnnotationTarget.CLASS) public @interface StabilityInferred {
+ method public abstract int parameters();
+ property public abstract int parameters;
+ }
+
+ public final class ThreadMapKt {
+ }
+
+}
+
+package androidx.compose.runtime.snapshots {
+
+ public final class ListUtilsKt {
+ }
+
+ public class MutableSnapshot extends androidx.compose.runtime.snapshots.Snapshot {
+ method public androidx.compose.runtime.snapshots.SnapshotApplyResult apply();
+ method public kotlin.jvm.functions.Function1<java.lang.Object,kotlin.Unit>? getReadObserver();
+ method public boolean getReadOnly();
+ method public androidx.compose.runtime.snapshots.Snapshot getRoot();
+ method public kotlin.jvm.functions.Function1<java.lang.Object,kotlin.Unit>? getWriteObserver();
+ method public boolean hasPendingChanges();
+ method public androidx.compose.runtime.snapshots.MutableSnapshot takeNestedMutableSnapshot(optional kotlin.jvm.functions.Function1<java.lang.Object,kotlin.Unit>? readObserver, optional kotlin.jvm.functions.Function1<java.lang.Object,kotlin.Unit>? writeObserver);
+ method public androidx.compose.runtime.snapshots.Snapshot takeNestedSnapshot(kotlin.jvm.functions.Function1<java.lang.Object,kotlin.Unit>? readObserver);
+ property public kotlin.jvm.functions.Function1<java.lang.Object,kotlin.Unit>? readObserver;
+ property public boolean readOnly;
+ property public androidx.compose.runtime.snapshots.Snapshot root;
+ property public kotlin.jvm.functions.Function1<java.lang.Object,kotlin.Unit>? writeObserver;
+ }
+
+ public fun interface ObserverHandle {
+ method public void dispose();
+ }
+
+ public abstract sealed class Snapshot {
+ method public void dispose();
+ method public final inline <T> T! enter(kotlin.jvm.functions.Function0<? extends T> block);
+ method public int getId();
+ method public abstract boolean getReadOnly();
+ method public abstract androidx.compose.runtime.snapshots.Snapshot getRoot();
+ method public abstract boolean hasPendingChanges();
+ method @kotlin.PublishedApi internal androidx.compose.runtime.snapshots.Snapshot? makeCurrent();
+ method @kotlin.PublishedApi internal void restoreCurrent(androidx.compose.runtime.snapshots.Snapshot? snapshot);
+ method public abstract androidx.compose.runtime.snapshots.Snapshot takeNestedSnapshot(optional kotlin.jvm.functions.Function1<java.lang.Object,kotlin.Unit>? readObserver);
+ property public int id;
+ property public abstract boolean readOnly;
+ property public abstract androidx.compose.runtime.snapshots.Snapshot root;
+ field public static final androidx.compose.runtime.snapshots.Snapshot.Companion Companion;
+ }
+
+ public static final class Snapshot.Companion {
+ method @kotlin.PublishedApi internal androidx.compose.runtime.snapshots.Snapshot createNonObservableSnapshot();
+ method public androidx.compose.runtime.snapshots.Snapshot getCurrent();
+ method public inline <T> T! global(kotlin.jvm.functions.Function0<? extends T> block);
+ method public void notifyObjectsInitialized();
+ method public <T> T! observe(optional kotlin.jvm.functions.Function1<java.lang.Object,kotlin.Unit>? readObserver, optional kotlin.jvm.functions.Function1<java.lang.Object,kotlin.Unit>? writeObserver, kotlin.jvm.functions.Function0<? extends T> block);
+ method public androidx.compose.runtime.snapshots.ObserverHandle registerApplyObserver(kotlin.jvm.functions.Function2<? super java.util.Set<?>,? super androidx.compose.runtime.snapshots.Snapshot,kotlin.Unit> observer);
+ method public androidx.compose.runtime.snapshots.ObserverHandle registerGlobalWriteObserver(kotlin.jvm.functions.Function1<java.lang.Object,kotlin.Unit> observer);
+ method @kotlin.PublishedApi internal androidx.compose.runtime.snapshots.Snapshot? removeCurrent();
+ method @kotlin.PublishedApi internal void restoreCurrent(androidx.compose.runtime.snapshots.Snapshot? previous);
+ method public void sendApplyNotifications();
+ method public androidx.compose.runtime.snapshots.MutableSnapshot takeMutableSnapshot(optional kotlin.jvm.functions.Function1<java.lang.Object,kotlin.Unit>? readObserver, optional kotlin.jvm.functions.Function1<java.lang.Object,kotlin.Unit>? writeObserver);
+ method public androidx.compose.runtime.snapshots.Snapshot takeSnapshot(optional kotlin.jvm.functions.Function1<java.lang.Object,kotlin.Unit>? readObserver);
+ method public inline <R> R! withMutableSnapshot(kotlin.jvm.functions.Function0<? extends R> block);
+ method public inline <T> T! withoutReadObservation(kotlin.jvm.functions.Function0<? extends T> block);
+ property public final androidx.compose.runtime.snapshots.Snapshot current;
+ }
+
+ public final class SnapshotApplyConflictException extends java.lang.Exception {
+ ctor public SnapshotApplyConflictException(androidx.compose.runtime.snapshots.Snapshot snapshot);
+ method public androidx.compose.runtime.snapshots.Snapshot getSnapshot();
+ property public final androidx.compose.runtime.snapshots.Snapshot snapshot;
+ }
+
+ public abstract sealed class SnapshotApplyResult {
+ method public abstract void check();
+ method public abstract boolean getSucceeded();
+ property public abstract boolean succeeded;
+ }
+
+ public static final class SnapshotApplyResult.Failure extends androidx.compose.runtime.snapshots.SnapshotApplyResult {
+ ctor public SnapshotApplyResult.Failure(androidx.compose.runtime.snapshots.Snapshot snapshot);
+ method public void check();
+ method public androidx.compose.runtime.snapshots.Snapshot getSnapshot();
+ method public boolean getSucceeded();
+ property public final androidx.compose.runtime.snapshots.Snapshot snapshot;
+ property public boolean succeeded;
+ }
+
+ public static final class SnapshotApplyResult.Success extends androidx.compose.runtime.snapshots.SnapshotApplyResult {
+ method public void check();
+ method public boolean getSucceeded();
+ property public boolean succeeded;
+ field public static final androidx.compose.runtime.snapshots.SnapshotApplyResult.Success INSTANCE;
+ }
+
+ public final class SnapshotContextElementKt {
+ }
+
+ public final class SnapshotDoubleIndexHeapKt {
+ }
+
+ public final class SnapshotIdSetKt {
+ }
+
+ public final class SnapshotKt {
+ method @kotlin.PublishedApi internal static <T extends androidx.compose.runtime.snapshots.StateRecord> T current(T r, androidx.compose.runtime.snapshots.Snapshot snapshot);
+ method @kotlin.PublishedApi internal static void notifyWrite(androidx.compose.runtime.snapshots.Snapshot snapshot, androidx.compose.runtime.snapshots.StateObject state);
+ method public static <T extends androidx.compose.runtime.snapshots.StateRecord> T readable(T, androidx.compose.runtime.snapshots.StateObject state);
+ method public static <T extends androidx.compose.runtime.snapshots.StateRecord> T readable(T, androidx.compose.runtime.snapshots.StateObject state, androidx.compose.runtime.snapshots.Snapshot snapshot);
+ method @kotlin.PublishedApi internal static inline <T> T! sync(kotlin.jvm.functions.Function0<? extends T> block);
+ method public static inline <T extends androidx.compose.runtime.snapshots.StateRecord, R> R! withCurrent(T, kotlin.jvm.functions.Function1<? super T,? extends R> block);
+ method public static inline <T extends androidx.compose.runtime.snapshots.StateRecord, R> R! writable(T, androidx.compose.runtime.snapshots.StateObject state, androidx.compose.runtime.snapshots.Snapshot snapshot, kotlin.jvm.functions.Function1<? super T,? extends R> block);
+ method public static inline <T extends androidx.compose.runtime.snapshots.StateRecord, R> R! writable(T, androidx.compose.runtime.snapshots.StateObject state, kotlin.jvm.functions.Function1<? super T,? extends R> block);
+ method @kotlin.PublishedApi internal static <T extends androidx.compose.runtime.snapshots.StateRecord> T writableRecord(T, androidx.compose.runtime.snapshots.StateObject state, androidx.compose.runtime.snapshots.Snapshot snapshot);
+ field @kotlin.PublishedApi internal static final Object lock;
+ field @kotlin.PublishedApi internal static final androidx.compose.runtime.snapshots.Snapshot snapshotInitializer;
+ }
+
+ public interface SnapshotMutableState<T> extends androidx.compose.runtime.MutableState<T> {
+ method public androidx.compose.runtime.SnapshotMutationPolicy<T> getPolicy();
+ property public abstract androidx.compose.runtime.SnapshotMutationPolicy<T> policy;
+ }
+
+ @androidx.compose.runtime.Stable public final class SnapshotStateList<T> implements kotlin.jvm.internal.markers.KMutableList java.util.List<T> androidx.compose.runtime.snapshots.StateObject {
+ ctor public SnapshotStateList();
+ method public boolean add(T? element);
+ method public void add(int index, T? element);
+ method public boolean addAll(int index, java.util.Collection<? extends T> elements);
+ method public boolean addAll(java.util.Collection<? extends T> elements);
+ method public void clear();
+ method public boolean contains(T? element);
+ method public boolean containsAll(java.util.Collection<E!> elements);
+ method public T! get(int index);
+ method public androidx.compose.runtime.snapshots.StateRecord getFirstStateRecord();
+ method public int getSize();
+ method public int indexOf(T? element);
+ method public boolean isEmpty();
+ method public java.util.Iterator<T> iterator();
+ method public int lastIndexOf(T? element);
+ method public java.util.ListIterator<T> listIterator();
+ method public java.util.ListIterator<T> listIterator(int index);
+ method public void prependStateRecord(androidx.compose.runtime.snapshots.StateRecord value);
+ method public boolean remove(T? element);
+ method public boolean removeAll(java.util.Collection<E!> elements);
+ method public T! removeAt(int index);
+ method public void removeRange(int fromIndex, int toIndex);
+ method public boolean retainAll(java.util.Collection<E!> elements);
+ method public T! set(int index, T? element);
+ method public java.util.List<T> subList(int fromIndex, int toIndex);
+ property public androidx.compose.runtime.snapshots.StateRecord firstStateRecord;
+ property public int size;
+ }
+
+ public final class SnapshotStateListKt {
+ }
+
+ @androidx.compose.runtime.Stable public final class SnapshotStateMap<K, V> implements kotlin.jvm.internal.markers.KMutableMap java.util.Map<K,V> androidx.compose.runtime.snapshots.StateObject {
+ ctor public SnapshotStateMap();
+ method public void clear();
+ method public boolean containsKey(K? key);
+ method public boolean containsValue(V? value);
+ method public V? get(Object? key);
+ method public java.util.Set<java.util.Map.Entry<K,V>> getEntries();
+ method public androidx.compose.runtime.snapshots.StateRecord getFirstStateRecord();
+ method public java.util.Set<K> getKeys();
+ method public int getSize();
+ method public java.util.Collection<V> getValues();
+ method public boolean isEmpty();
+ method public void prependStateRecord(androidx.compose.runtime.snapshots.StateRecord value);
+ method public V? put(K? key, V? value);
+ method public void putAll(java.util.Map<? extends K,? extends V> from);
+ method public V? remove(Object? key);
+ property public java.util.Set<java.util.Map.Entry<K,V>> entries;
+ property public androidx.compose.runtime.snapshots.StateRecord firstStateRecord;
+ property public java.util.Set<K> keys;
+ property public int size;
+ property public java.util.Collection<V> values;
+ }
+
+ public final class SnapshotStateMapKt {
+ }
+
+ public final class SnapshotStateObserver {
+ ctor public SnapshotStateObserver(kotlin.jvm.functions.Function1<? super kotlin.jvm.functions.Function0<kotlin.Unit>,kotlin.Unit> onChangedExecutor);
+ method public void clear(Object scope);
+ method public void clear();
+ method public void clearIf(kotlin.jvm.functions.Function1<java.lang.Object,java.lang.Boolean> predicate);
+ method @org.jetbrains.annotations.TestOnly public void notifyChanges(java.util.Set<?> changes, androidx.compose.runtime.snapshots.Snapshot snapshot);
+ method public <T> void observeReads(T scope, kotlin.jvm.functions.Function1<? super T,kotlin.Unit> onValueChangedForScope, kotlin.jvm.functions.Function0<kotlin.Unit> block);
+ method public void start();
+ method public void stop();
+ method @Deprecated public void withNoObservations(kotlin.jvm.functions.Function0<kotlin.Unit> block);
+ }
+
+ public interface StateObject {
+ method public androidx.compose.runtime.snapshots.StateRecord getFirstStateRecord();
+ method public default androidx.compose.runtime.snapshots.StateRecord? mergeRecords(androidx.compose.runtime.snapshots.StateRecord previous, androidx.compose.runtime.snapshots.StateRecord current, androidx.compose.runtime.snapshots.StateRecord applied);
+ method public void prependStateRecord(androidx.compose.runtime.snapshots.StateRecord value);
+ property public abstract androidx.compose.runtime.snapshots.StateRecord firstStateRecord;
+ }
+
+ public abstract class StateRecord {
+ ctor public StateRecord();
+ method public abstract void assign(androidx.compose.runtime.snapshots.StateRecord value);
+ method public abstract androidx.compose.runtime.snapshots.StateRecord create();
+ }
+
+}
+
+package androidx.compose.runtime.tooling {
+
+ public interface CompositionData {
+ method public Iterable<androidx.compose.runtime.tooling.CompositionGroup> getCompositionGroups();
+ method public boolean isEmpty();
+ property public abstract Iterable<androidx.compose.runtime.tooling.CompositionGroup> compositionGroups;
+ property public abstract boolean isEmpty;
+ }
+
+ public interface CompositionGroup extends androidx.compose.runtime.tooling.CompositionData {
+ method public Iterable<java.lang.Object> getData();
+ method public default Object? getIdentity();
+ method public Object getKey();
+ method public Object? getNode();
+ method public String? getSourceInfo();
+ property public abstract Iterable<java.lang.Object> data;
+ property public default Object? identity;
+ property public abstract Object key;
+ property public abstract Object? node;
+ property public abstract String? sourceInfo;
+ }
+
+ public final class InspectionTablesKt {
+ method public static androidx.compose.runtime.ProvidableCompositionLocal<java.util.Set<androidx.compose.runtime.tooling.CompositionData>> getLocalInspectionTables();
+ property public static final androidx.compose.runtime.ProvidableCompositionLocal<java.util.Set<androidx.compose.runtime.tooling.CompositionData>> LocalInspectionTables;
+ }
+
+}
+
diff --git a/compose/runtime/runtime/src/commonMain/kotlin/androidx/compose/runtime/Composer.kt b/compose/runtime/runtime/src/commonMain/kotlin/androidx/compose/runtime/Composer.kt
index b80e009..d4daadd 100644
--- a/compose/runtime/runtime/src/commonMain/kotlin/androidx/compose/runtime/Composer.kt
+++ b/compose/runtime/runtime/src/commonMain/kotlin/androidx/compose/runtime/Composer.kt
@@ -1052,7 +1052,7 @@
* [remember] when it determines these optimizations are safe.
*/
@ComposeCompilerApi
-inline fun <T> Composer.cache(invalid: Boolean, block: () -> T): T {
+inline fun <T> Composer.cache(invalid: Boolean, block: @DisallowComposableCalls () -> T): T {
@Suppress("UNCHECKED_CAST")
return rememberedValue().let {
if (invalid || it === Composer.Empty) {
@@ -1206,6 +1206,7 @@
private var reusingGroup = -1
private var childrenComposing: Int = 0
private var snapshot = currentSnapshot()
+ private var compositionToken: Int = 0
private val invalidateStack = Stack<RecomposeScopeImpl>()
@@ -2700,7 +2701,7 @@
val scope = RecomposeScopeImpl(composition as CompositionImpl)
invalidateStack.push(scope)
updateValue(scope)
- scope.start(snapshot.id)
+ scope.start(compositionToken)
} else {
val invalidation = invalidations.removeLocation(reader.parent)
val slot = reader.next()
@@ -2713,7 +2714,7 @@
} else slot as RecomposeScopeImpl
scope.requiresRecompose = invalidation != null
invalidateStack.push(scope)
- scope.start(snapshot.id)
+ scope.start(compositionToken)
}
}
@@ -2731,7 +2732,7 @@
val scope = if (invalidateStack.isNotEmpty()) invalidateStack.pop()
else null
scope?.requiresRecompose = false
- scope?.end(snapshot.id)?.let {
+ scope?.end(compositionToken)?.let {
record { _, _, _ -> it(composition) }
}
val result = if (scope != null &&
@@ -3150,6 +3151,7 @@
runtimeCheck(!isComposing) { "Reentrant composition is not supported" }
trace("Compose:recompose") {
snapshot = currentSnapshot()
+ compositionToken = snapshot.id
providerUpdates.clear()
invalidationsRequested.forEach { scope, set ->
val location = scope.anchor?.location ?: return
diff --git a/compose/runtime/runtime/src/commonMain/kotlin/androidx/compose/runtime/Composition.kt b/compose/runtime/runtime/src/commonMain/kotlin/androidx/compose/runtime/Composition.kt
index 9b9d49a..37ef908 100644
--- a/compose/runtime/runtime/src/commonMain/kotlin/androidx/compose/runtime/Composition.kt
+++ b/compose/runtime/runtime/src/commonMain/kotlin/androidx/compose/runtime/Composition.kt
@@ -382,6 +382,11 @@
private val observations = IdentityScopeMap<RecomposeScopeImpl>()
/**
+ * Used for testing. Returns the objects that are observed
+ */
+ internal val observedObjects get() = observations.values.filterNotNull()
+
+ /**
* A set of scopes that were invalidated conditionally (that is they were invalidated by a
* [derivedStateOf] object) by a call from [recordModificationsOf]. They need to be held in the
* [observations] map until invalidations are drained for composition as a later call to
@@ -748,18 +753,20 @@
val manager = RememberEventDispatcher(abandonSet)
try {
if (changes.isEmpty()) return
- applier.onBeginChanges()
+ trace("Compose:applyChanges") {
+ applier.onBeginChanges()
- // Apply all changes
- slotTable.write { slots ->
- val applier = applier
- changes.fastForEach { change ->
- change(applier, slots, manager)
+ // Apply all changes
+ slotTable.write { slots ->
+ val applier = applier
+ changes.fastForEach { change ->
+ change(applier, slots, manager)
+ }
+ changes.clear()
}
- changes.clear()
- }
- applier.onEndChanges()
+ applier.onEndChanges()
+ }
// Side effects run after lifecycle observers so that any remembered objects
// that implement RememberObserver receive onRemembered before a side effect
@@ -768,9 +775,11 @@
manager.dispatchSideEffects()
if (pendingInvalidScopes) {
- pendingInvalidScopes = false
- observations.removeValueIf { scope -> !scope.valid }
- derivedStates.removeValueIf { derivedValue -> derivedValue !in observations }
+ trace("Compose:unobserve") {
+ pendingInvalidScopes = false
+ observations.removeValueIf { scope -> !scope.valid }
+ derivedStates.removeValueIf { derivedValue -> derivedValue !in observations }
+ }
}
} finally {
// Only dispatch abandons if we do not have any late changes. The instances in the
@@ -979,39 +988,47 @@
fun dispatchRememberObservers() {
// Send forgets
if (forgetting.isNotEmpty()) {
- for (i in forgetting.size - 1 downTo 0) {
- val instance = forgetting[i]
- if (instance !in abandoning) {
- instance.onForgotten()
+ trace("Compose:onForgotten") {
+ for (i in forgetting.size - 1 downTo 0) {
+ val instance = forgetting[i]
+ if (instance !in abandoning) {
+ instance.onForgotten()
+ }
}
}
}
// Send remembers
if (remembering.isNotEmpty()) {
- remembering.fastForEach { instance ->
- abandoning.remove(instance)
- instance.onRemembered()
+ trace("Compose:onRemembered") {
+ remembering.fastForEach { instance ->
+ abandoning.remove(instance)
+ instance.onRemembered()
+ }
}
}
}
fun dispatchSideEffects() {
if (sideEffects.isNotEmpty()) {
- sideEffects.fastForEach { sideEffect ->
- sideEffect()
+ trace("Compose:sideeffects") {
+ sideEffects.fastForEach { sideEffect ->
+ sideEffect()
+ }
+ sideEffects.clear()
}
- sideEffects.clear()
}
}
fun dispatchAbandons() {
if (abandoning.isNotEmpty()) {
- val iterator = abandoning.iterator()
- while (iterator.hasNext()) {
- val instance = iterator.next()
- iterator.remove()
- instance.onAbandoned()
+ trace("Compose:abandons") {
+ val iterator = abandoning.iterator()
+ while (iterator.hasNext()) {
+ val instance = iterator.next()
+ iterator.remove()
+ instance.onAbandoned()
+ }
}
}
}
diff --git a/compose/runtime/runtime/src/commonTest/kotlin/androidx/compose/runtime/CompositionAndDerivedStateTests.kt b/compose/runtime/runtime/src/commonTest/kotlin/androidx/compose/runtime/CompositionAndDerivedStateTests.kt
index db77fc2..98e83fb 100644
--- a/compose/runtime/runtime/src/commonTest/kotlin/androidx/compose/runtime/CompositionAndDerivedStateTests.kt
+++ b/compose/runtime/runtime/src/commonTest/kotlin/androidx/compose/runtime/CompositionAndDerivedStateTests.kt
@@ -354,6 +354,37 @@
advance()
revalidate()
}
+
+ @Test
+ fun changingTheDerivedStateInstanceShouldRelease() = compositionTest {
+ var reload by mutableStateOf(0)
+
+ compose {
+ val items = remember(reload) {
+ derivedStateOf {
+ List(10) { it }
+ }
+ }
+
+ Text("List of size ${items.value.size}")
+ }
+
+ validate {
+ Text("List of size 10")
+ }
+
+ repeat(10) {
+ reload++
+ advance()
+ }
+
+ revalidate()
+
+ // Validate there are only 2 observed objectt which should be `reload` and the last
+ // created derivedStateOf instance
+ val observed = (composition as? CompositionImpl)?.observedObjects ?: emptyList()
+ assertEquals(2, observed.count())
+ }
}
@Composable
diff --git a/compose/runtime/runtime/src/commonTest/kotlin/androidx/compose/runtime/mock/CompositionTest.kt b/compose/runtime/runtime/src/commonTest/kotlin/androidx/compose/runtime/mock/CompositionTest.kt
index 774cc09..0cd8df6 100644
--- a/compose/runtime/runtime/src/commonTest/kotlin/androidx/compose/runtime/mock/CompositionTest.kt
+++ b/compose/runtime/runtime/src/commonTest/kotlin/androidx/compose/runtime/mock/CompositionTest.kt
@@ -42,7 +42,7 @@
// Create a test scope for the test using the test scope passed in by runTest
val scope = object : CompositionTestScope, CoroutineScope by this@runTest {
var composed = false
- var composition: Composition? = null
+ override var composition: Composition? = null
override lateinit var root: View
@@ -126,6 +126,11 @@
* The last validator used.
*/
var validator: (MockViewValidator.() -> Unit)?
+
+ /**
+ * Access to the composition created for the call to [compose]
+ */
+ val composition: Composition?
}
/**
diff --git a/compose/ui/ui-android-stubs/api/1.2.0-beta02.txt b/compose/ui/ui-android-stubs/api/1.2.0-beta02.txt
new file mode 100644
index 0000000..8e22228
--- /dev/null
+++ b/compose/ui/ui-android-stubs/api/1.2.0-beta02.txt
@@ -0,0 +1,78 @@
+// Signature format: 4.0
+package android.view {
+
+ public final class DisplayListCanvas extends android.graphics.Canvas {
+ ctor public DisplayListCanvas();
+ method public void drawRenderNode(android.view.RenderNode);
+ }
+
+ public class RenderNode {
+ method public static android.view.RenderNode create(String?, android.view.View?);
+ method public void destroy();
+ method public void destroyDisplayListData();
+ method public void discardDisplayList();
+ method public void end(android.view.DisplayListCanvas);
+ method public float getAlpha();
+ method public int getAmbientShadowColor();
+ method public float getCameraDistance();
+ method public boolean getClipToOutline();
+ method public float getElevation();
+ method public void getInverseMatrix(android.graphics.Matrix);
+ method public void getMatrix(android.graphics.Matrix);
+ method public float getPivotX();
+ method public float getPivotY();
+ method public float getRotation();
+ method public float getRotationX();
+ method public float getRotationY();
+ method public float getScaleX();
+ method public float getScaleY();
+ method public int getSpotShadowColor();
+ method public float getTranslationX();
+ method public float getTranslationY();
+ method public float getTranslationZ();
+ method public boolean hasIdentityMatrix();
+ method public boolean hasOverlappingRendering();
+ method public boolean hasShadow();
+ method public boolean isAttached();
+ method public boolean isPivotExplicitlySet();
+ method public boolean isValid();
+ method public boolean offsetLeftAndRight(int);
+ method public boolean offsetTopAndBottom(int);
+ method public void output();
+ method public boolean setAlpha(float);
+ method public boolean setAmbientShadowColor(int);
+ method public boolean setAnimationMatrix(android.graphics.Matrix);
+ method public boolean setBottom(int);
+ method public boolean setCameraDistance(float);
+ method public boolean setClipBounds(android.graphics.Rect?);
+ method public boolean setClipToBounds(boolean);
+ method public boolean setClipToOutline(boolean);
+ method public boolean setElevation(float);
+ method public boolean setHasOverlappingRendering(boolean);
+ method public boolean setLayerPaint(android.graphics.Paint?);
+ method public boolean setLayerType(int);
+ method public boolean setLeft(int);
+ method public boolean setLeftTopRightBottom(int, int, int, int);
+ method public boolean setOutline(android.graphics.Outline?);
+ method public boolean setPivotX(float);
+ method public boolean setPivotY(float);
+ method public boolean setProjectBackwards(boolean);
+ method public boolean setProjectionReceiver(boolean);
+ method public boolean setRevealClip(boolean, float, float, float);
+ method public boolean setRight(int);
+ method public boolean setRotation(float);
+ method public boolean setRotationX(float);
+ method public boolean setRotationY(float);
+ method public boolean setScaleX(float);
+ method public boolean setScaleY(float);
+ method public boolean setSpotShadowColor(int);
+ method public boolean setStaticMatrix(android.graphics.Matrix);
+ method public boolean setTop(int);
+ method public boolean setTranslationX(float);
+ method public boolean setTranslationY(float);
+ method public boolean setTranslationZ(float);
+ method public android.view.DisplayListCanvas start(int, int);
+ }
+
+}
+
diff --git a/compose/ui/ui-android-stubs/api/public_plus_experimental_1.2.0-beta02.txt b/compose/ui/ui-android-stubs/api/public_plus_experimental_1.2.0-beta02.txt
new file mode 100644
index 0000000..8e22228
--- /dev/null
+++ b/compose/ui/ui-android-stubs/api/public_plus_experimental_1.2.0-beta02.txt
@@ -0,0 +1,78 @@
+// Signature format: 4.0
+package android.view {
+
+ public final class DisplayListCanvas extends android.graphics.Canvas {
+ ctor public DisplayListCanvas();
+ method public void drawRenderNode(android.view.RenderNode);
+ }
+
+ public class RenderNode {
+ method public static android.view.RenderNode create(String?, android.view.View?);
+ method public void destroy();
+ method public void destroyDisplayListData();
+ method public void discardDisplayList();
+ method public void end(android.view.DisplayListCanvas);
+ method public float getAlpha();
+ method public int getAmbientShadowColor();
+ method public float getCameraDistance();
+ method public boolean getClipToOutline();
+ method public float getElevation();
+ method public void getInverseMatrix(android.graphics.Matrix);
+ method public void getMatrix(android.graphics.Matrix);
+ method public float getPivotX();
+ method public float getPivotY();
+ method public float getRotation();
+ method public float getRotationX();
+ method public float getRotationY();
+ method public float getScaleX();
+ method public float getScaleY();
+ method public int getSpotShadowColor();
+ method public float getTranslationX();
+ method public float getTranslationY();
+ method public float getTranslationZ();
+ method public boolean hasIdentityMatrix();
+ method public boolean hasOverlappingRendering();
+ method public boolean hasShadow();
+ method public boolean isAttached();
+ method public boolean isPivotExplicitlySet();
+ method public boolean isValid();
+ method public boolean offsetLeftAndRight(int);
+ method public boolean offsetTopAndBottom(int);
+ method public void output();
+ method public boolean setAlpha(float);
+ method public boolean setAmbientShadowColor(int);
+ method public boolean setAnimationMatrix(android.graphics.Matrix);
+ method public boolean setBottom(int);
+ method public boolean setCameraDistance(float);
+ method public boolean setClipBounds(android.graphics.Rect?);
+ method public boolean setClipToBounds(boolean);
+ method public boolean setClipToOutline(boolean);
+ method public boolean setElevation(float);
+ method public boolean setHasOverlappingRendering(boolean);
+ method public boolean setLayerPaint(android.graphics.Paint?);
+ method public boolean setLayerType(int);
+ method public boolean setLeft(int);
+ method public boolean setLeftTopRightBottom(int, int, int, int);
+ method public boolean setOutline(android.graphics.Outline?);
+ method public boolean setPivotX(float);
+ method public boolean setPivotY(float);
+ method public boolean setProjectBackwards(boolean);
+ method public boolean setProjectionReceiver(boolean);
+ method public boolean setRevealClip(boolean, float, float, float);
+ method public boolean setRight(int);
+ method public boolean setRotation(float);
+ method public boolean setRotationX(float);
+ method public boolean setRotationY(float);
+ method public boolean setScaleX(float);
+ method public boolean setScaleY(float);
+ method public boolean setSpotShadowColor(int);
+ method public boolean setStaticMatrix(android.graphics.Matrix);
+ method public boolean setTop(int);
+ method public boolean setTranslationX(float);
+ method public boolean setTranslationY(float);
+ method public boolean setTranslationZ(float);
+ method public android.view.DisplayListCanvas start(int, int);
+ }
+
+}
+
diff --git a/compose/ui/ui-android-stubs/api/res-1.2.0-beta02.txt b/compose/ui/ui-android-stubs/api/res-1.2.0-beta02.txt
new file mode 100644
index 0000000..e69de29
--- /dev/null
+++ b/compose/ui/ui-android-stubs/api/res-1.2.0-beta02.txt
diff --git a/compose/ui/ui-android-stubs/api/restricted_1.2.0-beta02.txt b/compose/ui/ui-android-stubs/api/restricted_1.2.0-beta02.txt
new file mode 100644
index 0000000..8e22228
--- /dev/null
+++ b/compose/ui/ui-android-stubs/api/restricted_1.2.0-beta02.txt
@@ -0,0 +1,78 @@
+// Signature format: 4.0
+package android.view {
+
+ public final class DisplayListCanvas extends android.graphics.Canvas {
+ ctor public DisplayListCanvas();
+ method public void drawRenderNode(android.view.RenderNode);
+ }
+
+ public class RenderNode {
+ method public static android.view.RenderNode create(String?, android.view.View?);
+ method public void destroy();
+ method public void destroyDisplayListData();
+ method public void discardDisplayList();
+ method public void end(android.view.DisplayListCanvas);
+ method public float getAlpha();
+ method public int getAmbientShadowColor();
+ method public float getCameraDistance();
+ method public boolean getClipToOutline();
+ method public float getElevation();
+ method public void getInverseMatrix(android.graphics.Matrix);
+ method public void getMatrix(android.graphics.Matrix);
+ method public float getPivotX();
+ method public float getPivotY();
+ method public float getRotation();
+ method public float getRotationX();
+ method public float getRotationY();
+ method public float getScaleX();
+ method public float getScaleY();
+ method public int getSpotShadowColor();
+ method public float getTranslationX();
+ method public float getTranslationY();
+ method public float getTranslationZ();
+ method public boolean hasIdentityMatrix();
+ method public boolean hasOverlappingRendering();
+ method public boolean hasShadow();
+ method public boolean isAttached();
+ method public boolean isPivotExplicitlySet();
+ method public boolean isValid();
+ method public boolean offsetLeftAndRight(int);
+ method public boolean offsetTopAndBottom(int);
+ method public void output();
+ method public boolean setAlpha(float);
+ method public boolean setAmbientShadowColor(int);
+ method public boolean setAnimationMatrix(android.graphics.Matrix);
+ method public boolean setBottom(int);
+ method public boolean setCameraDistance(float);
+ method public boolean setClipBounds(android.graphics.Rect?);
+ method public boolean setClipToBounds(boolean);
+ method public boolean setClipToOutline(boolean);
+ method public boolean setElevation(float);
+ method public boolean setHasOverlappingRendering(boolean);
+ method public boolean setLayerPaint(android.graphics.Paint?);
+ method public boolean setLayerType(int);
+ method public boolean setLeft(int);
+ method public boolean setLeftTopRightBottom(int, int, int, int);
+ method public boolean setOutline(android.graphics.Outline?);
+ method public boolean setPivotX(float);
+ method public boolean setPivotY(float);
+ method public boolean setProjectBackwards(boolean);
+ method public boolean setProjectionReceiver(boolean);
+ method public boolean setRevealClip(boolean, float, float, float);
+ method public boolean setRight(int);
+ method public boolean setRotation(float);
+ method public boolean setRotationX(float);
+ method public boolean setRotationY(float);
+ method public boolean setScaleX(float);
+ method public boolean setScaleY(float);
+ method public boolean setSpotShadowColor(int);
+ method public boolean setStaticMatrix(android.graphics.Matrix);
+ method public boolean setTop(int);
+ method public boolean setTranslationX(float);
+ method public boolean setTranslationY(float);
+ method public boolean setTranslationZ(float);
+ method public android.view.DisplayListCanvas start(int, int);
+ }
+
+}
+
diff --git a/compose/ui/ui-geometry/api/1.2.0-beta02.txt b/compose/ui/ui-geometry/api/1.2.0-beta02.txt
new file mode 100644
index 0000000..936778a
--- /dev/null
+++ b/compose/ui/ui-geometry/api/1.2.0-beta02.txt
@@ -0,0 +1,275 @@
+// Signature format: 4.0
+package androidx.compose.ui.geometry {
+
+ @androidx.compose.runtime.Immutable @kotlin.jvm.JvmInline public final value class CornerRadius {
+ method @androidx.compose.runtime.Stable public inline operator float component1();
+ method @androidx.compose.runtime.Stable public inline operator float component2();
+ method public long copy(optional float x, optional float y);
+ method @androidx.compose.runtime.Stable public operator long div(float operand);
+ method public float getX();
+ method public float getY();
+ method @androidx.compose.runtime.Stable public operator long minus(long other);
+ method @androidx.compose.runtime.Stable public operator long plus(long other);
+ method @androidx.compose.runtime.Stable public operator long times(float operand);
+ method @androidx.compose.runtime.Stable public operator long unaryMinus();
+ property public final float x;
+ property public final float y;
+ field public static final androidx.compose.ui.geometry.CornerRadius.Companion Companion;
+ }
+
+ public static final class CornerRadius.Companion {
+ method public long getZero();
+ property public final long Zero;
+ }
+
+ public final class CornerRadiusKt {
+ method @androidx.compose.runtime.Stable public static long CornerRadius(float x, optional float y);
+ method @androidx.compose.runtime.Stable public static long lerp(long start, long stop, float fraction);
+ }
+
+ public final class GeometryUtilsKt {
+ }
+
+ public final class MutableRect {
+ ctor public MutableRect(float left, float top, float right, float bottom);
+ method public boolean contains(long offset);
+ method public float getBottom();
+ method public inline float getHeight();
+ method public float getLeft();
+ method public float getRight();
+ method public long getSize();
+ method public float getTop();
+ method public inline float getWidth();
+ method @androidx.compose.runtime.Stable public void intersect(float left, float top, float right, float bottom);
+ method public boolean isEmpty();
+ method public void set(float left, float top, float right, float bottom);
+ method public void setBottom(float);
+ method public void setLeft(float);
+ method public void setRight(float);
+ method public void setTop(float);
+ property public final float bottom;
+ property public final inline float height;
+ property public final boolean isEmpty;
+ property public final float left;
+ property public final float right;
+ property public final long size;
+ property public final float top;
+ property public final inline float width;
+ }
+
+ public final class MutableRectKt {
+ method public static androidx.compose.ui.geometry.Rect toRect(androidx.compose.ui.geometry.MutableRect);
+ }
+
+ @androidx.compose.runtime.Immutable @kotlin.jvm.JvmInline public final value class Offset {
+ method @androidx.compose.runtime.Stable public operator float component1();
+ method @androidx.compose.runtime.Stable public operator float component2();
+ method public long copy(optional float x, optional float y);
+ method @androidx.compose.runtime.Stable public operator long div(float operand);
+ method @androidx.compose.runtime.Stable public float getDistance();
+ method @androidx.compose.runtime.Stable public float getDistanceSquared();
+ method public float getX();
+ method public float getY();
+ method @androidx.compose.runtime.Stable public boolean isValid();
+ method @androidx.compose.runtime.Stable public operator long minus(long other);
+ method @androidx.compose.runtime.Stable public operator long plus(long other);
+ method @androidx.compose.runtime.Stable public operator long rem(float operand);
+ method @androidx.compose.runtime.Stable public operator long times(float operand);
+ method @androidx.compose.runtime.Stable public operator long unaryMinus();
+ property public final float x;
+ property public final float y;
+ field public static final androidx.compose.ui.geometry.Offset.Companion Companion;
+ }
+
+ public static final class Offset.Companion {
+ method public long getInfinite();
+ method public long getUnspecified();
+ method public long getZero();
+ property public final long Infinite;
+ property public final long Unspecified;
+ property public final long Zero;
+ }
+
+ public final class OffsetKt {
+ method @androidx.compose.runtime.Stable public static long Offset(float x, float y);
+ method public static boolean isFinite(long);
+ method public static boolean isSpecified(long);
+ method public static boolean isUnspecified(long);
+ method @androidx.compose.runtime.Stable public static long lerp(long start, long stop, float fraction);
+ method public static inline long takeOrElse(long, kotlin.jvm.functions.Function0<androidx.compose.ui.geometry.Offset> block);
+ }
+
+ @androidx.compose.runtime.Immutable public final class Rect {
+ ctor public Rect(@androidx.compose.runtime.Stable float left, @androidx.compose.runtime.Stable float top, @androidx.compose.runtime.Stable float right, @androidx.compose.runtime.Stable float bottom);
+ method public float component1();
+ method public float component2();
+ method public float component3();
+ method public float component4();
+ method public boolean contains(long offset);
+ method public androidx.compose.ui.geometry.Rect copy(float left, float top, float right, float bottom);
+ method @androidx.compose.runtime.Stable public androidx.compose.ui.geometry.Rect deflate(float delta);
+ method public float getBottom();
+ method public long getBottomCenter();
+ method public long getBottomLeft();
+ method public long getBottomRight();
+ method public long getCenter();
+ method public long getCenterLeft();
+ method public long getCenterRight();
+ method public float getHeight();
+ method public float getLeft();
+ method public float getMaxDimension();
+ method public float getMinDimension();
+ method public float getRight();
+ method public long getSize();
+ method public float getTop();
+ method public long getTopCenter();
+ method public long getTopLeft();
+ method public long getTopRight();
+ method public float getWidth();
+ method @androidx.compose.runtime.Stable public androidx.compose.ui.geometry.Rect inflate(float delta);
+ method @androidx.compose.runtime.Stable public androidx.compose.ui.geometry.Rect intersect(androidx.compose.ui.geometry.Rect other);
+ method public boolean isEmpty();
+ method public boolean isFinite();
+ method public boolean isInfinite();
+ method public boolean overlaps(androidx.compose.ui.geometry.Rect other);
+ method @androidx.compose.runtime.Stable public androidx.compose.ui.geometry.Rect translate(long offset);
+ method @androidx.compose.runtime.Stable public androidx.compose.ui.geometry.Rect translate(float translateX, float translateY);
+ property public final float bottom;
+ property public final long bottomCenter;
+ property public final long bottomLeft;
+ property public final long bottomRight;
+ property public final long center;
+ property public final long centerLeft;
+ property public final long centerRight;
+ property public final float height;
+ property public final boolean isEmpty;
+ property public final boolean isFinite;
+ property public final boolean isInfinite;
+ property public final float left;
+ property public final float maxDimension;
+ property public final float minDimension;
+ property public final float right;
+ property public final long size;
+ property public final float top;
+ property public final long topCenter;
+ property public final long topLeft;
+ property public final long topRight;
+ property public final float width;
+ field public static final androidx.compose.ui.geometry.Rect.Companion Companion;
+ }
+
+ public static final class Rect.Companion {
+ method public androidx.compose.ui.geometry.Rect getZero();
+ property public final androidx.compose.ui.geometry.Rect Zero;
+ }
+
+ public final class RectKt {
+ method @androidx.compose.runtime.Stable public static androidx.compose.ui.geometry.Rect Rect(long offset, long size);
+ method @androidx.compose.runtime.Stable public static androidx.compose.ui.geometry.Rect Rect(long topLeft, long bottomRight);
+ method @androidx.compose.runtime.Stable public static androidx.compose.ui.geometry.Rect Rect(long center, float radius);
+ method @androidx.compose.runtime.Stable public static androidx.compose.ui.geometry.Rect lerp(androidx.compose.ui.geometry.Rect start, androidx.compose.ui.geometry.Rect stop, float fraction);
+ }
+
+ @androidx.compose.runtime.Immutable public final class RoundRect {
+ ctor public RoundRect(float left, float top, float right, float bottom, optional long topLeftCornerRadius, optional long topRightCornerRadius, optional long bottomRightCornerRadius, optional long bottomLeftCornerRadius);
+ method public float component1();
+ method public float component2();
+ method public float component3();
+ method public float component4();
+ method public long component5-kKHJgLs();
+ method public long component6-kKHJgLs();
+ method public long component7-kKHJgLs();
+ method public long component8-kKHJgLs();
+ method public boolean contains(long point);
+ method public androidx.compose.ui.geometry.RoundRect copy-MDFrsts(float left, float top, float right, float bottom, long topLeftCornerRadius, long topRightCornerRadius, long bottomRightCornerRadius, long bottomLeftCornerRadius);
+ method public float getBottom();
+ method public long getBottomLeftCornerRadius();
+ method public long getBottomRightCornerRadius();
+ method public float getHeight();
+ method public float getLeft();
+ method public float getRight();
+ method public float getTop();
+ method public long getTopLeftCornerRadius();
+ method public long getTopRightCornerRadius();
+ method public float getWidth();
+ method public static androidx.compose.ui.geometry.RoundRect getZero();
+ property public static final androidx.compose.ui.geometry.RoundRect Zero;
+ property public final float bottom;
+ property public final long bottomLeftCornerRadius;
+ property public final long bottomRightCornerRadius;
+ property public final float height;
+ property public final float left;
+ property public final float right;
+ property public final float top;
+ property public final long topLeftCornerRadius;
+ property public final long topRightCornerRadius;
+ property public final float width;
+ field public static final androidx.compose.ui.geometry.RoundRect.Companion Companion;
+ }
+
+ public static final class RoundRect.Companion {
+ method public androidx.compose.ui.geometry.RoundRect getZero();
+ property public final androidx.compose.ui.geometry.RoundRect Zero;
+ }
+
+ public final class RoundRectKt {
+ method public static androidx.compose.ui.geometry.RoundRect RoundRect(float left, float top, float right, float bottom, float radiusX, float radiusY);
+ method public static androidx.compose.ui.geometry.RoundRect RoundRect(float left, float top, float right, float bottom, long cornerRadius);
+ method public static androidx.compose.ui.geometry.RoundRect RoundRect(androidx.compose.ui.geometry.Rect rect, float radiusX, float radiusY);
+ method public static androidx.compose.ui.geometry.RoundRect RoundRect(androidx.compose.ui.geometry.Rect rect, long cornerRadius);
+ method public static androidx.compose.ui.geometry.RoundRect RoundRect(androidx.compose.ui.geometry.Rect rect, optional long topLeft, optional long topRight, optional long bottomRight, optional long bottomLeft);
+ method public static androidx.compose.ui.geometry.Rect getBoundingRect(androidx.compose.ui.geometry.RoundRect);
+ method public static long getCenter(androidx.compose.ui.geometry.RoundRect);
+ method public static float getMaxDimension(androidx.compose.ui.geometry.RoundRect);
+ method public static float getMinDimension(androidx.compose.ui.geometry.RoundRect);
+ method public static androidx.compose.ui.geometry.Rect getSafeInnerRect(androidx.compose.ui.geometry.RoundRect);
+ method public static boolean isCircle(androidx.compose.ui.geometry.RoundRect);
+ method public static boolean isEllipse(androidx.compose.ui.geometry.RoundRect);
+ method public static boolean isEmpty(androidx.compose.ui.geometry.RoundRect);
+ method public static boolean isFinite(androidx.compose.ui.geometry.RoundRect);
+ method public static boolean isRect(androidx.compose.ui.geometry.RoundRect);
+ method public static boolean isSimple(androidx.compose.ui.geometry.RoundRect);
+ method public static androidx.compose.ui.geometry.RoundRect lerp(androidx.compose.ui.geometry.RoundRect start, androidx.compose.ui.geometry.RoundRect stop, float fraction);
+ method public static androidx.compose.ui.geometry.RoundRect translate(androidx.compose.ui.geometry.RoundRect, long offset);
+ }
+
+ @androidx.compose.runtime.Immutable @kotlin.jvm.JvmInline public final value class Size {
+ method @androidx.compose.runtime.Stable public inline operator float component1();
+ method @androidx.compose.runtime.Stable public inline operator float component2();
+ method public long copy(optional float width, optional float height);
+ method @androidx.compose.runtime.Stable public operator long div(float operand);
+ method public float getHeight();
+ method public float getMaxDimension();
+ method public float getMinDimension();
+ method public float getWidth();
+ method @androidx.compose.runtime.Stable public boolean isEmpty();
+ method @androidx.compose.runtime.Stable public operator long times(float operand);
+ property public final float height;
+ property public final float maxDimension;
+ property public final float minDimension;
+ property public final float width;
+ field public static final androidx.compose.ui.geometry.Size.Companion Companion;
+ }
+
+ public static final class Size.Companion {
+ method public long getUnspecified();
+ method public long getZero();
+ property public final long Unspecified;
+ property public final long Zero;
+ }
+
+ public final class SizeKt {
+ method @androidx.compose.runtime.Stable public static long Size(float width, float height);
+ method public static long getCenter(long);
+ method public static inline boolean isSpecified(long);
+ method public static inline boolean isUnspecified(long);
+ method @androidx.compose.runtime.Stable public static long lerp(long start, long stop, float fraction);
+ method public static inline long takeOrElse(long, kotlin.jvm.functions.Function0<androidx.compose.ui.geometry.Size> block);
+ method @androidx.compose.runtime.Stable public static inline operator long times(int, long size);
+ method @androidx.compose.runtime.Stable public static inline operator long times(double, long size);
+ method @androidx.compose.runtime.Stable public static inline operator long times(float, long size);
+ method @androidx.compose.runtime.Stable public static androidx.compose.ui.geometry.Rect toRect(long);
+ }
+
+}
+
diff --git a/compose/ui/ui-geometry/api/public_plus_experimental_1.2.0-beta02.txt b/compose/ui/ui-geometry/api/public_plus_experimental_1.2.0-beta02.txt
new file mode 100644
index 0000000..936778a
--- /dev/null
+++ b/compose/ui/ui-geometry/api/public_plus_experimental_1.2.0-beta02.txt
@@ -0,0 +1,275 @@
+// Signature format: 4.0
+package androidx.compose.ui.geometry {
+
+ @androidx.compose.runtime.Immutable @kotlin.jvm.JvmInline public final value class CornerRadius {
+ method @androidx.compose.runtime.Stable public inline operator float component1();
+ method @androidx.compose.runtime.Stable public inline operator float component2();
+ method public long copy(optional float x, optional float y);
+ method @androidx.compose.runtime.Stable public operator long div(float operand);
+ method public float getX();
+ method public float getY();
+ method @androidx.compose.runtime.Stable public operator long minus(long other);
+ method @androidx.compose.runtime.Stable public operator long plus(long other);
+ method @androidx.compose.runtime.Stable public operator long times(float operand);
+ method @androidx.compose.runtime.Stable public operator long unaryMinus();
+ property public final float x;
+ property public final float y;
+ field public static final androidx.compose.ui.geometry.CornerRadius.Companion Companion;
+ }
+
+ public static final class CornerRadius.Companion {
+ method public long getZero();
+ property public final long Zero;
+ }
+
+ public final class CornerRadiusKt {
+ method @androidx.compose.runtime.Stable public static long CornerRadius(float x, optional float y);
+ method @androidx.compose.runtime.Stable public static long lerp(long start, long stop, float fraction);
+ }
+
+ public final class GeometryUtilsKt {
+ }
+
+ public final class MutableRect {
+ ctor public MutableRect(float left, float top, float right, float bottom);
+ method public boolean contains(long offset);
+ method public float getBottom();
+ method public inline float getHeight();
+ method public float getLeft();
+ method public float getRight();
+ method public long getSize();
+ method public float getTop();
+ method public inline float getWidth();
+ method @androidx.compose.runtime.Stable public void intersect(float left, float top, float right, float bottom);
+ method public boolean isEmpty();
+ method public void set(float left, float top, float right, float bottom);
+ method public void setBottom(float);
+ method public void setLeft(float);
+ method public void setRight(float);
+ method public void setTop(float);
+ property public final float bottom;
+ property public final inline float height;
+ property public final boolean isEmpty;
+ property public final float left;
+ property public final float right;
+ property public final long size;
+ property public final float top;
+ property public final inline float width;
+ }
+
+ public final class MutableRectKt {
+ method public static androidx.compose.ui.geometry.Rect toRect(androidx.compose.ui.geometry.MutableRect);
+ }
+
+ @androidx.compose.runtime.Immutable @kotlin.jvm.JvmInline public final value class Offset {
+ method @androidx.compose.runtime.Stable public operator float component1();
+ method @androidx.compose.runtime.Stable public operator float component2();
+ method public long copy(optional float x, optional float y);
+ method @androidx.compose.runtime.Stable public operator long div(float operand);
+ method @androidx.compose.runtime.Stable public float getDistance();
+ method @androidx.compose.runtime.Stable public float getDistanceSquared();
+ method public float getX();
+ method public float getY();
+ method @androidx.compose.runtime.Stable public boolean isValid();
+ method @androidx.compose.runtime.Stable public operator long minus(long other);
+ method @androidx.compose.runtime.Stable public operator long plus(long other);
+ method @androidx.compose.runtime.Stable public operator long rem(float operand);
+ method @androidx.compose.runtime.Stable public operator long times(float operand);
+ method @androidx.compose.runtime.Stable public operator long unaryMinus();
+ property public final float x;
+ property public final float y;
+ field public static final androidx.compose.ui.geometry.Offset.Companion Companion;
+ }
+
+ public static final class Offset.Companion {
+ method public long getInfinite();
+ method public long getUnspecified();
+ method public long getZero();
+ property public final long Infinite;
+ property public final long Unspecified;
+ property public final long Zero;
+ }
+
+ public final class OffsetKt {
+ method @androidx.compose.runtime.Stable public static long Offset(float x, float y);
+ method public static boolean isFinite(long);
+ method public static boolean isSpecified(long);
+ method public static boolean isUnspecified(long);
+ method @androidx.compose.runtime.Stable public static long lerp(long start, long stop, float fraction);
+ method public static inline long takeOrElse(long, kotlin.jvm.functions.Function0<androidx.compose.ui.geometry.Offset> block);
+ }
+
+ @androidx.compose.runtime.Immutable public final class Rect {
+ ctor public Rect(@androidx.compose.runtime.Stable float left, @androidx.compose.runtime.Stable float top, @androidx.compose.runtime.Stable float right, @androidx.compose.runtime.Stable float bottom);
+ method public float component1();
+ method public float component2();
+ method public float component3();
+ method public float component4();
+ method public boolean contains(long offset);
+ method public androidx.compose.ui.geometry.Rect copy(float left, float top, float right, float bottom);
+ method @androidx.compose.runtime.Stable public androidx.compose.ui.geometry.Rect deflate(float delta);
+ method public float getBottom();
+ method public long getBottomCenter();
+ method public long getBottomLeft();
+ method public long getBottomRight();
+ method public long getCenter();
+ method public long getCenterLeft();
+ method public long getCenterRight();
+ method public float getHeight();
+ method public float getLeft();
+ method public float getMaxDimension();
+ method public float getMinDimension();
+ method public float getRight();
+ method public long getSize();
+ method public float getTop();
+ method public long getTopCenter();
+ method public long getTopLeft();
+ method public long getTopRight();
+ method public float getWidth();
+ method @androidx.compose.runtime.Stable public androidx.compose.ui.geometry.Rect inflate(float delta);
+ method @androidx.compose.runtime.Stable public androidx.compose.ui.geometry.Rect intersect(androidx.compose.ui.geometry.Rect other);
+ method public boolean isEmpty();
+ method public boolean isFinite();
+ method public boolean isInfinite();
+ method public boolean overlaps(androidx.compose.ui.geometry.Rect other);
+ method @androidx.compose.runtime.Stable public androidx.compose.ui.geometry.Rect translate(long offset);
+ method @androidx.compose.runtime.Stable public androidx.compose.ui.geometry.Rect translate(float translateX, float translateY);
+ property public final float bottom;
+ property public final long bottomCenter;
+ property public final long bottomLeft;
+ property public final long bottomRight;
+ property public final long center;
+ property public final long centerLeft;
+ property public final long centerRight;
+ property public final float height;
+ property public final boolean isEmpty;
+ property public final boolean isFinite;
+ property public final boolean isInfinite;
+ property public final float left;
+ property public final float maxDimension;
+ property public final float minDimension;
+ property public final float right;
+ property public final long size;
+ property public final float top;
+ property public final long topCenter;
+ property public final long topLeft;
+ property public final long topRight;
+ property public final float width;
+ field public static final androidx.compose.ui.geometry.Rect.Companion Companion;
+ }
+
+ public static final class Rect.Companion {
+ method public androidx.compose.ui.geometry.Rect getZero();
+ property public final androidx.compose.ui.geometry.Rect Zero;
+ }
+
+ public final class RectKt {
+ method @androidx.compose.runtime.Stable public static androidx.compose.ui.geometry.Rect Rect(long offset, long size);
+ method @androidx.compose.runtime.Stable public static androidx.compose.ui.geometry.Rect Rect(long topLeft, long bottomRight);
+ method @androidx.compose.runtime.Stable public static androidx.compose.ui.geometry.Rect Rect(long center, float radius);
+ method @androidx.compose.runtime.Stable public static androidx.compose.ui.geometry.Rect lerp(androidx.compose.ui.geometry.Rect start, androidx.compose.ui.geometry.Rect stop, float fraction);
+ }
+
+ @androidx.compose.runtime.Immutable public final class RoundRect {
+ ctor public RoundRect(float left, float top, float right, float bottom, optional long topLeftCornerRadius, optional long topRightCornerRadius, optional long bottomRightCornerRadius, optional long bottomLeftCornerRadius);
+ method public float component1();
+ method public float component2();
+ method public float component3();
+ method public float component4();
+ method public long component5-kKHJgLs();
+ method public long component6-kKHJgLs();
+ method public long component7-kKHJgLs();
+ method public long component8-kKHJgLs();
+ method public boolean contains(long point);
+ method public androidx.compose.ui.geometry.RoundRect copy-MDFrsts(float left, float top, float right, float bottom, long topLeftCornerRadius, long topRightCornerRadius, long bottomRightCornerRadius, long bottomLeftCornerRadius);
+ method public float getBottom();
+ method public long getBottomLeftCornerRadius();
+ method public long getBottomRightCornerRadius();
+ method public float getHeight();
+ method public float getLeft();
+ method public float getRight();
+ method public float getTop();
+ method public long getTopLeftCornerRadius();
+ method public long getTopRightCornerRadius();
+ method public float getWidth();
+ method public static androidx.compose.ui.geometry.RoundRect getZero();
+ property public static final androidx.compose.ui.geometry.RoundRect Zero;
+ property public final float bottom;
+ property public final long bottomLeftCornerRadius;
+ property public final long bottomRightCornerRadius;
+ property public final float height;
+ property public final float left;
+ property public final float right;
+ property public final float top;
+ property public final long topLeftCornerRadius;
+ property public final long topRightCornerRadius;
+ property public final float width;
+ field public static final androidx.compose.ui.geometry.RoundRect.Companion Companion;
+ }
+
+ public static final class RoundRect.Companion {
+ method public androidx.compose.ui.geometry.RoundRect getZero();
+ property public final androidx.compose.ui.geometry.RoundRect Zero;
+ }
+
+ public final class RoundRectKt {
+ method public static androidx.compose.ui.geometry.RoundRect RoundRect(float left, float top, float right, float bottom, float radiusX, float radiusY);
+ method public static androidx.compose.ui.geometry.RoundRect RoundRect(float left, float top, float right, float bottom, long cornerRadius);
+ method public static androidx.compose.ui.geometry.RoundRect RoundRect(androidx.compose.ui.geometry.Rect rect, float radiusX, float radiusY);
+ method public static androidx.compose.ui.geometry.RoundRect RoundRect(androidx.compose.ui.geometry.Rect rect, long cornerRadius);
+ method public static androidx.compose.ui.geometry.RoundRect RoundRect(androidx.compose.ui.geometry.Rect rect, optional long topLeft, optional long topRight, optional long bottomRight, optional long bottomLeft);
+ method public static androidx.compose.ui.geometry.Rect getBoundingRect(androidx.compose.ui.geometry.RoundRect);
+ method public static long getCenter(androidx.compose.ui.geometry.RoundRect);
+ method public static float getMaxDimension(androidx.compose.ui.geometry.RoundRect);
+ method public static float getMinDimension(androidx.compose.ui.geometry.RoundRect);
+ method public static androidx.compose.ui.geometry.Rect getSafeInnerRect(androidx.compose.ui.geometry.RoundRect);
+ method public static boolean isCircle(androidx.compose.ui.geometry.RoundRect);
+ method public static boolean isEllipse(androidx.compose.ui.geometry.RoundRect);
+ method public static boolean isEmpty(androidx.compose.ui.geometry.RoundRect);
+ method public static boolean isFinite(androidx.compose.ui.geometry.RoundRect);
+ method public static boolean isRect(androidx.compose.ui.geometry.RoundRect);
+ method public static boolean isSimple(androidx.compose.ui.geometry.RoundRect);
+ method public static androidx.compose.ui.geometry.RoundRect lerp(androidx.compose.ui.geometry.RoundRect start, androidx.compose.ui.geometry.RoundRect stop, float fraction);
+ method public static androidx.compose.ui.geometry.RoundRect translate(androidx.compose.ui.geometry.RoundRect, long offset);
+ }
+
+ @androidx.compose.runtime.Immutable @kotlin.jvm.JvmInline public final value class Size {
+ method @androidx.compose.runtime.Stable public inline operator float component1();
+ method @androidx.compose.runtime.Stable public inline operator float component2();
+ method public long copy(optional float width, optional float height);
+ method @androidx.compose.runtime.Stable public operator long div(float operand);
+ method public float getHeight();
+ method public float getMaxDimension();
+ method public float getMinDimension();
+ method public float getWidth();
+ method @androidx.compose.runtime.Stable public boolean isEmpty();
+ method @androidx.compose.runtime.Stable public operator long times(float operand);
+ property public final float height;
+ property public final float maxDimension;
+ property public final float minDimension;
+ property public final float width;
+ field public static final androidx.compose.ui.geometry.Size.Companion Companion;
+ }
+
+ public static final class Size.Companion {
+ method public long getUnspecified();
+ method public long getZero();
+ property public final long Unspecified;
+ property public final long Zero;
+ }
+
+ public final class SizeKt {
+ method @androidx.compose.runtime.Stable public static long Size(float width, float height);
+ method public static long getCenter(long);
+ method public static inline boolean isSpecified(long);
+ method public static inline boolean isUnspecified(long);
+ method @androidx.compose.runtime.Stable public static long lerp(long start, long stop, float fraction);
+ method public static inline long takeOrElse(long, kotlin.jvm.functions.Function0<androidx.compose.ui.geometry.Size> block);
+ method @androidx.compose.runtime.Stable public static inline operator long times(int, long size);
+ method @androidx.compose.runtime.Stable public static inline operator long times(double, long size);
+ method @androidx.compose.runtime.Stable public static inline operator long times(float, long size);
+ method @androidx.compose.runtime.Stable public static androidx.compose.ui.geometry.Rect toRect(long);
+ }
+
+}
+
diff --git a/compose/ui/ui-geometry/api/res-1.2.0-beta02.txt b/compose/ui/ui-geometry/api/res-1.2.0-beta02.txt
new file mode 100644
index 0000000..e69de29
--- /dev/null
+++ b/compose/ui/ui-geometry/api/res-1.2.0-beta02.txt
diff --git a/compose/ui/ui-geometry/api/restricted_1.2.0-beta02.txt b/compose/ui/ui-geometry/api/restricted_1.2.0-beta02.txt
new file mode 100644
index 0000000..936778a
--- /dev/null
+++ b/compose/ui/ui-geometry/api/restricted_1.2.0-beta02.txt
@@ -0,0 +1,275 @@
+// Signature format: 4.0
+package androidx.compose.ui.geometry {
+
+ @androidx.compose.runtime.Immutable @kotlin.jvm.JvmInline public final value class CornerRadius {
+ method @androidx.compose.runtime.Stable public inline operator float component1();
+ method @androidx.compose.runtime.Stable public inline operator float component2();
+ method public long copy(optional float x, optional float y);
+ method @androidx.compose.runtime.Stable public operator long div(float operand);
+ method public float getX();
+ method public float getY();
+ method @androidx.compose.runtime.Stable public operator long minus(long other);
+ method @androidx.compose.runtime.Stable public operator long plus(long other);
+ method @androidx.compose.runtime.Stable public operator long times(float operand);
+ method @androidx.compose.runtime.Stable public operator long unaryMinus();
+ property public final float x;
+ property public final float y;
+ field public static final androidx.compose.ui.geometry.CornerRadius.Companion Companion;
+ }
+
+ public static final class CornerRadius.Companion {
+ method public long getZero();
+ property public final long Zero;
+ }
+
+ public final class CornerRadiusKt {
+ method @androidx.compose.runtime.Stable public static long CornerRadius(float x, optional float y);
+ method @androidx.compose.runtime.Stable public static long lerp(long start, long stop, float fraction);
+ }
+
+ public final class GeometryUtilsKt {
+ }
+
+ public final class MutableRect {
+ ctor public MutableRect(float left, float top, float right, float bottom);
+ method public boolean contains(long offset);
+ method public float getBottom();
+ method public inline float getHeight();
+ method public float getLeft();
+ method public float getRight();
+ method public long getSize();
+ method public float getTop();
+ method public inline float getWidth();
+ method @androidx.compose.runtime.Stable public void intersect(float left, float top, float right, float bottom);
+ method public boolean isEmpty();
+ method public void set(float left, float top, float right, float bottom);
+ method public void setBottom(float);
+ method public void setLeft(float);
+ method public void setRight(float);
+ method public void setTop(float);
+ property public final float bottom;
+ property public final inline float height;
+ property public final boolean isEmpty;
+ property public final float left;
+ property public final float right;
+ property public final long size;
+ property public final float top;
+ property public final inline float width;
+ }
+
+ public final class MutableRectKt {
+ method public static androidx.compose.ui.geometry.Rect toRect(androidx.compose.ui.geometry.MutableRect);
+ }
+
+ @androidx.compose.runtime.Immutable @kotlin.jvm.JvmInline public final value class Offset {
+ method @androidx.compose.runtime.Stable public operator float component1();
+ method @androidx.compose.runtime.Stable public operator float component2();
+ method public long copy(optional float x, optional float y);
+ method @androidx.compose.runtime.Stable public operator long div(float operand);
+ method @androidx.compose.runtime.Stable public float getDistance();
+ method @androidx.compose.runtime.Stable public float getDistanceSquared();
+ method public float getX();
+ method public float getY();
+ method @androidx.compose.runtime.Stable public boolean isValid();
+ method @androidx.compose.runtime.Stable public operator long minus(long other);
+ method @androidx.compose.runtime.Stable public operator long plus(long other);
+ method @androidx.compose.runtime.Stable public operator long rem(float operand);
+ method @androidx.compose.runtime.Stable public operator long times(float operand);
+ method @androidx.compose.runtime.Stable public operator long unaryMinus();
+ property public final float x;
+ property public final float y;
+ field public static final androidx.compose.ui.geometry.Offset.Companion Companion;
+ }
+
+ public static final class Offset.Companion {
+ method public long getInfinite();
+ method public long getUnspecified();
+ method public long getZero();
+ property public final long Infinite;
+ property public final long Unspecified;
+ property public final long Zero;
+ }
+
+ public final class OffsetKt {
+ method @androidx.compose.runtime.Stable public static long Offset(float x, float y);
+ method public static boolean isFinite(long);
+ method public static boolean isSpecified(long);
+ method public static boolean isUnspecified(long);
+ method @androidx.compose.runtime.Stable public static long lerp(long start, long stop, float fraction);
+ method public static inline long takeOrElse(long, kotlin.jvm.functions.Function0<androidx.compose.ui.geometry.Offset> block);
+ }
+
+ @androidx.compose.runtime.Immutable public final class Rect {
+ ctor public Rect(@androidx.compose.runtime.Stable float left, @androidx.compose.runtime.Stable float top, @androidx.compose.runtime.Stable float right, @androidx.compose.runtime.Stable float bottom);
+ method public float component1();
+ method public float component2();
+ method public float component3();
+ method public float component4();
+ method public boolean contains(long offset);
+ method public androidx.compose.ui.geometry.Rect copy(float left, float top, float right, float bottom);
+ method @androidx.compose.runtime.Stable public androidx.compose.ui.geometry.Rect deflate(float delta);
+ method public float getBottom();
+ method public long getBottomCenter();
+ method public long getBottomLeft();
+ method public long getBottomRight();
+ method public long getCenter();
+ method public long getCenterLeft();
+ method public long getCenterRight();
+ method public float getHeight();
+ method public float getLeft();
+ method public float getMaxDimension();
+ method public float getMinDimension();
+ method public float getRight();
+ method public long getSize();
+ method public float getTop();
+ method public long getTopCenter();
+ method public long getTopLeft();
+ method public long getTopRight();
+ method public float getWidth();
+ method @androidx.compose.runtime.Stable public androidx.compose.ui.geometry.Rect inflate(float delta);
+ method @androidx.compose.runtime.Stable public androidx.compose.ui.geometry.Rect intersect(androidx.compose.ui.geometry.Rect other);
+ method public boolean isEmpty();
+ method public boolean isFinite();
+ method public boolean isInfinite();
+ method public boolean overlaps(androidx.compose.ui.geometry.Rect other);
+ method @androidx.compose.runtime.Stable public androidx.compose.ui.geometry.Rect translate(long offset);
+ method @androidx.compose.runtime.Stable public androidx.compose.ui.geometry.Rect translate(float translateX, float translateY);
+ property public final float bottom;
+ property public final long bottomCenter;
+ property public final long bottomLeft;
+ property public final long bottomRight;
+ property public final long center;
+ property public final long centerLeft;
+ property public final long centerRight;
+ property public final float height;
+ property public final boolean isEmpty;
+ property public final boolean isFinite;
+ property public final boolean isInfinite;
+ property public final float left;
+ property public final float maxDimension;
+ property public final float minDimension;
+ property public final float right;
+ property public final long size;
+ property public final float top;
+ property public final long topCenter;
+ property public final long topLeft;
+ property public final long topRight;
+ property public final float width;
+ field public static final androidx.compose.ui.geometry.Rect.Companion Companion;
+ }
+
+ public static final class Rect.Companion {
+ method public androidx.compose.ui.geometry.Rect getZero();
+ property public final androidx.compose.ui.geometry.Rect Zero;
+ }
+
+ public final class RectKt {
+ method @androidx.compose.runtime.Stable public static androidx.compose.ui.geometry.Rect Rect(long offset, long size);
+ method @androidx.compose.runtime.Stable public static androidx.compose.ui.geometry.Rect Rect(long topLeft, long bottomRight);
+ method @androidx.compose.runtime.Stable public static androidx.compose.ui.geometry.Rect Rect(long center, float radius);
+ method @androidx.compose.runtime.Stable public static androidx.compose.ui.geometry.Rect lerp(androidx.compose.ui.geometry.Rect start, androidx.compose.ui.geometry.Rect stop, float fraction);
+ }
+
+ @androidx.compose.runtime.Immutable public final class RoundRect {
+ ctor public RoundRect(float left, float top, float right, float bottom, optional long topLeftCornerRadius, optional long topRightCornerRadius, optional long bottomRightCornerRadius, optional long bottomLeftCornerRadius);
+ method public float component1();
+ method public float component2();
+ method public float component3();
+ method public float component4();
+ method public long component5-kKHJgLs();
+ method public long component6-kKHJgLs();
+ method public long component7-kKHJgLs();
+ method public long component8-kKHJgLs();
+ method public boolean contains(long point);
+ method public androidx.compose.ui.geometry.RoundRect copy-MDFrsts(float left, float top, float right, float bottom, long topLeftCornerRadius, long topRightCornerRadius, long bottomRightCornerRadius, long bottomLeftCornerRadius);
+ method public float getBottom();
+ method public long getBottomLeftCornerRadius();
+ method public long getBottomRightCornerRadius();
+ method public float getHeight();
+ method public float getLeft();
+ method public float getRight();
+ method public float getTop();
+ method public long getTopLeftCornerRadius();
+ method public long getTopRightCornerRadius();
+ method public float getWidth();
+ method public static androidx.compose.ui.geometry.RoundRect getZero();
+ property public static final androidx.compose.ui.geometry.RoundRect Zero;
+ property public final float bottom;
+ property public final long bottomLeftCornerRadius;
+ property public final long bottomRightCornerRadius;
+ property public final float height;
+ property public final float left;
+ property public final float right;
+ property public final float top;
+ property public final long topLeftCornerRadius;
+ property public final long topRightCornerRadius;
+ property public final float width;
+ field public static final androidx.compose.ui.geometry.RoundRect.Companion Companion;
+ }
+
+ public static final class RoundRect.Companion {
+ method public androidx.compose.ui.geometry.RoundRect getZero();
+ property public final androidx.compose.ui.geometry.RoundRect Zero;
+ }
+
+ public final class RoundRectKt {
+ method public static androidx.compose.ui.geometry.RoundRect RoundRect(float left, float top, float right, float bottom, float radiusX, float radiusY);
+ method public static androidx.compose.ui.geometry.RoundRect RoundRect(float left, float top, float right, float bottom, long cornerRadius);
+ method public static androidx.compose.ui.geometry.RoundRect RoundRect(androidx.compose.ui.geometry.Rect rect, float radiusX, float radiusY);
+ method public static androidx.compose.ui.geometry.RoundRect RoundRect(androidx.compose.ui.geometry.Rect rect, long cornerRadius);
+ method public static androidx.compose.ui.geometry.RoundRect RoundRect(androidx.compose.ui.geometry.Rect rect, optional long topLeft, optional long topRight, optional long bottomRight, optional long bottomLeft);
+ method public static androidx.compose.ui.geometry.Rect getBoundingRect(androidx.compose.ui.geometry.RoundRect);
+ method public static long getCenter(androidx.compose.ui.geometry.RoundRect);
+ method public static float getMaxDimension(androidx.compose.ui.geometry.RoundRect);
+ method public static float getMinDimension(androidx.compose.ui.geometry.RoundRect);
+ method public static androidx.compose.ui.geometry.Rect getSafeInnerRect(androidx.compose.ui.geometry.RoundRect);
+ method public static boolean isCircle(androidx.compose.ui.geometry.RoundRect);
+ method public static boolean isEllipse(androidx.compose.ui.geometry.RoundRect);
+ method public static boolean isEmpty(androidx.compose.ui.geometry.RoundRect);
+ method public static boolean isFinite(androidx.compose.ui.geometry.RoundRect);
+ method public static boolean isRect(androidx.compose.ui.geometry.RoundRect);
+ method public static boolean isSimple(androidx.compose.ui.geometry.RoundRect);
+ method public static androidx.compose.ui.geometry.RoundRect lerp(androidx.compose.ui.geometry.RoundRect start, androidx.compose.ui.geometry.RoundRect stop, float fraction);
+ method public static androidx.compose.ui.geometry.RoundRect translate(androidx.compose.ui.geometry.RoundRect, long offset);
+ }
+
+ @androidx.compose.runtime.Immutable @kotlin.jvm.JvmInline public final value class Size {
+ method @androidx.compose.runtime.Stable public inline operator float component1();
+ method @androidx.compose.runtime.Stable public inline operator float component2();
+ method public long copy(optional float width, optional float height);
+ method @androidx.compose.runtime.Stable public operator long div(float operand);
+ method public float getHeight();
+ method public float getMaxDimension();
+ method public float getMinDimension();
+ method public float getWidth();
+ method @androidx.compose.runtime.Stable public boolean isEmpty();
+ method @androidx.compose.runtime.Stable public operator long times(float operand);
+ property public final float height;
+ property public final float maxDimension;
+ property public final float minDimension;
+ property public final float width;
+ field public static final androidx.compose.ui.geometry.Size.Companion Companion;
+ }
+
+ public static final class Size.Companion {
+ method public long getUnspecified();
+ method public long getZero();
+ property public final long Unspecified;
+ property public final long Zero;
+ }
+
+ public final class SizeKt {
+ method @androidx.compose.runtime.Stable public static long Size(float width, float height);
+ method public static long getCenter(long);
+ method public static inline boolean isSpecified(long);
+ method public static inline boolean isUnspecified(long);
+ method @androidx.compose.runtime.Stable public static long lerp(long start, long stop, float fraction);
+ method public static inline long takeOrElse(long, kotlin.jvm.functions.Function0<androidx.compose.ui.geometry.Size> block);
+ method @androidx.compose.runtime.Stable public static inline operator long times(int, long size);
+ method @androidx.compose.runtime.Stable public static inline operator long times(double, long size);
+ method @androidx.compose.runtime.Stable public static inline operator long times(float, long size);
+ method @androidx.compose.runtime.Stable public static androidx.compose.ui.geometry.Rect toRect(long);
+ }
+
+}
+
diff --git a/compose/ui/ui-graphics/api/1.2.0-beta02.txt b/compose/ui/ui-graphics/api/1.2.0-beta02.txt
new file mode 100644
index 0000000..5e2e4d4
--- /dev/null
+++ b/compose/ui/ui-graphics/api/1.2.0-beta02.txt
@@ -0,0 +1,1621 @@
+// Signature format: 4.0
+package androidx.compose.ui.graphics {
+
+ public final class AndroidBlendMode_androidKt {
+ method public static boolean isSupported(int);
+ }
+
+ public final class AndroidCanvas_androidKt {
+ method public static androidx.compose.ui.graphics.Canvas Canvas(android.graphics.Canvas c);
+ method public static android.graphics.Canvas getNativeCanvas(androidx.compose.ui.graphics.Canvas);
+ }
+
+ public final class AndroidColorFilter_androidKt {
+ method public static android.graphics.ColorFilter asAndroidColorFilter(androidx.compose.ui.graphics.ColorFilter);
+ method public static androidx.compose.ui.graphics.ColorFilter asComposeColorFilter(android.graphics.ColorFilter);
+ }
+
+ public final class AndroidImageBitmap_androidKt {
+ method public static android.graphics.Bitmap asAndroidBitmap(androidx.compose.ui.graphics.ImageBitmap);
+ method public static androidx.compose.ui.graphics.ImageBitmap asImageBitmap(android.graphics.Bitmap);
+ }
+
+ public final class AndroidMatrixConversions_androidKt {
+ method public static void setFrom(float[], android.graphics.Matrix matrix);
+ method public static void setFrom(android.graphics.Matrix, float[] matrix);
+ }
+
+ public final class AndroidPaint implements androidx.compose.ui.graphics.Paint {
+ ctor public AndroidPaint();
+ method public android.graphics.Paint asFrameworkPaint();
+ method public float getAlpha();
+ method public int getBlendMode();
+ method public long getColor();
+ method public androidx.compose.ui.graphics.ColorFilter? getColorFilter();
+ method public int getFilterQuality();
+ method public androidx.compose.ui.graphics.PathEffect? getPathEffect();
+ method public android.graphics.Shader? getShader();
+ method public int getStrokeCap();
+ method public int getStrokeJoin();
+ method public float getStrokeMiterLimit();
+ method public float getStrokeWidth();
+ method public int getStyle();
+ method public boolean isAntiAlias();
+ method public void setAlpha(float);
+ method public void setAntiAlias(boolean);
+ method public void setBlendMode(int);
+ method public void setColor(long);
+ method public void setColorFilter(androidx.compose.ui.graphics.ColorFilter?);
+ method public void setFilterQuality(int);
+ method public void setPathEffect(androidx.compose.ui.graphics.PathEffect?);
+ method public void setShader(android.graphics.Shader?);
+ method public void setStrokeCap(int);
+ method public void setStrokeJoin(int);
+ method public void setStrokeMiterLimit(float);
+ method public void setStrokeWidth(float);
+ method public void setStyle(int);
+ property public float alpha;
+ property public int blendMode;
+ property public long color;
+ property public androidx.compose.ui.graphics.ColorFilter? colorFilter;
+ property public int filterQuality;
+ property public boolean isAntiAlias;
+ property public androidx.compose.ui.graphics.PathEffect? pathEffect;
+ property public android.graphics.Shader? shader;
+ property public int strokeCap;
+ property public int strokeJoin;
+ property public float strokeMiterLimit;
+ property public float strokeWidth;
+ property public int style;
+ }
+
+ public final class AndroidPaint_androidKt {
+ method public static androidx.compose.ui.graphics.Paint Paint();
+ }
+
+ public final class AndroidPath implements androidx.compose.ui.graphics.Path {
+ ctor public AndroidPath(optional android.graphics.Path internalPath);
+ method public void addArc(androidx.compose.ui.geometry.Rect oval, float startAngleDegrees, float sweepAngleDegrees);
+ method public void addArcRad(androidx.compose.ui.geometry.Rect oval, float startAngleRadians, float sweepAngleRadians);
+ method public void addOval(androidx.compose.ui.geometry.Rect oval);
+ method public void addPath(androidx.compose.ui.graphics.Path path, long offset);
+ method public void addRect(androidx.compose.ui.geometry.Rect rect);
+ method public void addRoundRect(androidx.compose.ui.geometry.RoundRect roundRect);
+ method public void arcTo(androidx.compose.ui.geometry.Rect rect, float startAngleDegrees, float sweepAngleDegrees, boolean forceMoveTo);
+ method public void close();
+ method public void cubicTo(float x1, float y1, float x2, float y2, float x3, float y3);
+ method public androidx.compose.ui.geometry.Rect getBounds();
+ method public int getFillType();
+ method public android.graphics.Path getInternalPath();
+ method public boolean isConvex();
+ method public boolean isEmpty();
+ method public void lineTo(float x, float y);
+ method public void moveTo(float x, float y);
+ method public boolean op(androidx.compose.ui.graphics.Path path1, androidx.compose.ui.graphics.Path path2, int operation);
+ method public void quadraticBezierTo(float x1, float y1, float x2, float y2);
+ method public void relativeCubicTo(float dx1, float dy1, float dx2, float dy2, float dx3, float dy3);
+ method public void relativeLineTo(float dx, float dy);
+ method public void relativeMoveTo(float dx, float dy);
+ method public void relativeQuadraticBezierTo(float dx1, float dy1, float dx2, float dy2);
+ method public void reset();
+ method public void setFillType(int);
+ method public void translate(long offset);
+ property public int fillType;
+ property public final android.graphics.Path internalPath;
+ property public boolean isConvex;
+ property public boolean isEmpty;
+ }
+
+ public final class AndroidPathEffect_androidKt {
+ method public static android.graphics.PathEffect asAndroidPathEffect(androidx.compose.ui.graphics.PathEffect);
+ method public static androidx.compose.ui.graphics.PathEffect toComposePathEffect(android.graphics.PathEffect);
+ }
+
+ public final class AndroidPathMeasure implements androidx.compose.ui.graphics.PathMeasure {
+ method public float getLength();
+ method public boolean getSegment(float startDistance, float stopDistance, androidx.compose.ui.graphics.Path destination, boolean startWithMoveTo);
+ method public void setPath(androidx.compose.ui.graphics.Path? path, boolean forceClosed);
+ property public float length;
+ }
+
+ public final class AndroidPathMeasure_androidKt {
+ method public static androidx.compose.ui.graphics.PathMeasure PathMeasure();
+ }
+
+ public final class AndroidPath_androidKt {
+ method public static androidx.compose.ui.graphics.Path Path();
+ method public static inline android.graphics.Path asAndroidPath(androidx.compose.ui.graphics.Path);
+ method public static androidx.compose.ui.graphics.Path asComposePath(android.graphics.Path);
+ }
+
+ public final class AndroidRenderEffect_androidKt {
+ method public static androidx.compose.ui.graphics.RenderEffect asComposeRenderEffect(android.graphics.RenderEffect);
+ }
+
+ public final class AndroidShader_androidKt {
+ }
+
+ public final class AndroidTileMode_androidKt {
+ method public static boolean isSupported(int);
+ method public static android.graphics.Shader.TileMode toAndroidTileMode(int);
+ method public static int toComposeTileMode(android.graphics.Shader.TileMode);
+ }
+
+ public final class AndroidVertexMode_androidKt {
+ method public static android.graphics.Canvas.VertexMode toAndroidVertexMode(int);
+ }
+
+ @androidx.compose.runtime.Immutable @kotlin.jvm.JvmInline public final value class BlendMode {
+ field public static final androidx.compose.ui.graphics.BlendMode.Companion Companion;
+ }
+
+ public static final class BlendMode.Companion {
+ method public int getClear();
+ method public int getColor();
+ method public int getColorBurn();
+ method public int getColorDodge();
+ method public int getDarken();
+ method public int getDifference();
+ method public int getDst();
+ method public int getDstAtop();
+ method public int getDstIn();
+ method public int getDstOut();
+ method public int getDstOver();
+ method public int getExclusion();
+ method public int getHardlight();
+ method public int getHue();
+ method public int getLighten();
+ method public int getLuminosity();
+ method public int getModulate();
+ method public int getMultiply();
+ method public int getOverlay();
+ method public int getPlus();
+ method public int getSaturation();
+ method public int getScreen();
+ method public int getSoftlight();
+ method public int getSrc();
+ method public int getSrcAtop();
+ method public int getSrcIn();
+ method public int getSrcOut();
+ method public int getSrcOver();
+ method public int getXor();
+ property public final int Clear;
+ property public final int Color;
+ property public final int ColorBurn;
+ property public final int ColorDodge;
+ property public final int Darken;
+ property public final int Difference;
+ property public final int Dst;
+ property public final int DstAtop;
+ property public final int DstIn;
+ property public final int DstOut;
+ property public final int DstOver;
+ property public final int Exclusion;
+ property public final int Hardlight;
+ property public final int Hue;
+ property public final int Lighten;
+ property public final int Luminosity;
+ property public final int Modulate;
+ property public final int Multiply;
+ property public final int Overlay;
+ property public final int Plus;
+ property public final int Saturation;
+ property public final int Screen;
+ property public final int Softlight;
+ property public final int Src;
+ property public final int SrcAtop;
+ property public final int SrcIn;
+ property public final int SrcOut;
+ property public final int SrcOver;
+ property public final int Xor;
+ }
+
+ @androidx.compose.runtime.Immutable public final class BlurEffect extends androidx.compose.ui.graphics.RenderEffect {
+ ctor public BlurEffect(androidx.compose.ui.graphics.RenderEffect? renderEffect, float radiusX, float radiusY, int edgeTreatment);
+ method @RequiresApi(android.os.Build.VERSION_CODES.S) protected android.graphics.RenderEffect createRenderEffect();
+ }
+
+ @androidx.compose.runtime.Immutable public abstract sealed class Brush {
+ method public abstract void applyTo(long size, androidx.compose.ui.graphics.Paint p, float alpha);
+ method public long getIntrinsicSize();
+ property public long intrinsicSize;
+ field public static final androidx.compose.ui.graphics.Brush.Companion Companion;
+ }
+
+ public static final class Brush.Companion {
+ method @androidx.compose.runtime.Stable public androidx.compose.ui.graphics.Brush horizontalGradient(java.util.List<androidx.compose.ui.graphics.Color> colors, optional float startX, optional float endX, optional int tileMode);
+ method @androidx.compose.runtime.Stable public androidx.compose.ui.graphics.Brush horizontalGradient(kotlin.Pair<java.lang.Float,androidx.compose.ui.graphics.Color>![] colorStops, optional float startX, optional float endX, optional int tileMode);
+ method @androidx.compose.runtime.Stable public androidx.compose.ui.graphics.Brush linearGradient(kotlin.Pair<java.lang.Float,androidx.compose.ui.graphics.Color>![] colorStops, optional long start, optional long end, optional int tileMode);
+ method @androidx.compose.runtime.Stable public androidx.compose.ui.graphics.Brush linearGradient(java.util.List<androidx.compose.ui.graphics.Color> colors, optional long start, optional long end, optional int tileMode);
+ method @androidx.compose.runtime.Stable public androidx.compose.ui.graphics.Brush radialGradient(kotlin.Pair<java.lang.Float,androidx.compose.ui.graphics.Color>![] colorStops, optional long center, optional float radius, optional int tileMode);
+ method @androidx.compose.runtime.Stable public androidx.compose.ui.graphics.Brush radialGradient(java.util.List<androidx.compose.ui.graphics.Color> colors, optional long center, optional float radius, optional int tileMode);
+ method @androidx.compose.runtime.Stable public androidx.compose.ui.graphics.Brush sweepGradient(kotlin.Pair<java.lang.Float,androidx.compose.ui.graphics.Color>![] colorStops, optional long center);
+ method @androidx.compose.runtime.Stable public androidx.compose.ui.graphics.Brush sweepGradient(java.util.List<androidx.compose.ui.graphics.Color> colors, optional long center);
+ method @androidx.compose.runtime.Stable public androidx.compose.ui.graphics.Brush verticalGradient(java.util.List<androidx.compose.ui.graphics.Color> colors, optional float startY, optional float endY, optional int tileMode);
+ method @androidx.compose.runtime.Stable public androidx.compose.ui.graphics.Brush verticalGradient(kotlin.Pair<java.lang.Float,androidx.compose.ui.graphics.Color>![] colorStops, optional float startY, optional float endY, optional int tileMode);
+ }
+
+ public final class BrushKt {
+ method public static androidx.compose.ui.graphics.ShaderBrush ShaderBrush(android.graphics.Shader shader);
+ }
+
+ public interface Canvas {
+ method public void clipPath(androidx.compose.ui.graphics.Path path, optional int clipOp);
+ method public default void clipRect(androidx.compose.ui.geometry.Rect rect, optional int clipOp);
+ method public void clipRect(float left, float top, float right, float bottom, optional int clipOp);
+ method public void concat(float[] matrix);
+ method public void disableZ();
+ method public default void drawArc(androidx.compose.ui.geometry.Rect rect, float startAngle, float sweepAngle, boolean useCenter, androidx.compose.ui.graphics.Paint paint);
+ method public void drawArc(float left, float top, float right, float bottom, float startAngle, float sweepAngle, boolean useCenter, androidx.compose.ui.graphics.Paint paint);
+ method public default void drawArcRad(androidx.compose.ui.geometry.Rect rect, float startAngleRad, float sweepAngleRad, boolean useCenter, androidx.compose.ui.graphics.Paint paint);
+ method public void drawCircle(long center, float radius, androidx.compose.ui.graphics.Paint paint);
+ method public void drawImage(androidx.compose.ui.graphics.ImageBitmap image, long topLeftOffset, androidx.compose.ui.graphics.Paint paint);
+ method public void drawImageRect(androidx.compose.ui.graphics.ImageBitmap image, optional long srcOffset, optional long srcSize, optional long dstOffset, optional long dstSize, androidx.compose.ui.graphics.Paint paint);
+ method public void drawLine(long p1, long p2, androidx.compose.ui.graphics.Paint paint);
+ method public default void drawOval(androidx.compose.ui.geometry.Rect rect, androidx.compose.ui.graphics.Paint paint);
+ method public void drawOval(float left, float top, float right, float bottom, androidx.compose.ui.graphics.Paint paint);
+ method public void drawPath(androidx.compose.ui.graphics.Path path, androidx.compose.ui.graphics.Paint paint);
+ method public void drawPoints(int pointMode, java.util.List<androidx.compose.ui.geometry.Offset> points, androidx.compose.ui.graphics.Paint paint);
+ method public void drawRawPoints(int pointMode, float[] points, androidx.compose.ui.graphics.Paint paint);
+ method public default void drawRect(androidx.compose.ui.geometry.Rect rect, androidx.compose.ui.graphics.Paint paint);
+ method public void drawRect(float left, float top, float right, float bottom, androidx.compose.ui.graphics.Paint paint);
+ method public void drawRoundRect(float left, float top, float right, float bottom, float radiusX, float radiusY, androidx.compose.ui.graphics.Paint paint);
+ method public void drawVertices(androidx.compose.ui.graphics.Vertices vertices, int blendMode, androidx.compose.ui.graphics.Paint paint);
+ method public void enableZ();
+ method public void restore();
+ method public void rotate(float degrees);
+ method public void save();
+ method public void saveLayer(androidx.compose.ui.geometry.Rect bounds, androidx.compose.ui.graphics.Paint paint);
+ method public void scale(float sx, optional float sy);
+ method public void skew(float sx, float sy);
+ method public default void skewRad(float sxRad, float syRad);
+ method public void translate(float dx, float dy);
+ }
+
+ public final class CanvasHolder {
+ ctor public CanvasHolder();
+ method public inline void drawInto(android.graphics.Canvas targetCanvas, kotlin.jvm.functions.Function1<? super androidx.compose.ui.graphics.Canvas,kotlin.Unit> block);
+ }
+
+ public final class CanvasKt {
+ method public static androidx.compose.ui.graphics.Canvas Canvas(androidx.compose.ui.graphics.ImageBitmap image);
+ method public static void rotate(androidx.compose.ui.graphics.Canvas, float degrees, float pivotX, float pivotY);
+ method public static void rotateRad(androidx.compose.ui.graphics.Canvas, float radians, optional float pivotX, optional float pivotY);
+ method public static void scale(androidx.compose.ui.graphics.Canvas, float sx, optional float sy, float pivotX, float pivotY);
+ method public static inline void withSave(androidx.compose.ui.graphics.Canvas, kotlin.jvm.functions.Function0<kotlin.Unit> block);
+ method public static inline void withSaveLayer(androidx.compose.ui.graphics.Canvas, androidx.compose.ui.geometry.Rect bounds, androidx.compose.ui.graphics.Paint paint, kotlin.jvm.functions.Function0<kotlin.Unit> block);
+ }
+
+ @androidx.compose.runtime.Immutable @kotlin.jvm.JvmInline public final value class ClipOp {
+ field public static final androidx.compose.ui.graphics.ClipOp.Companion Companion;
+ }
+
+ public static final class ClipOp.Companion {
+ method public int getDifference();
+ method public int getIntersect();
+ property public final int Difference;
+ property public final int Intersect;
+ }
+
+ @androidx.compose.runtime.Immutable @kotlin.jvm.JvmInline public final value class Color {
+ ctor public Color(long value);
+ method @androidx.compose.runtime.Stable public operator float component1();
+ method @androidx.compose.runtime.Stable public operator float component2();
+ method @androidx.compose.runtime.Stable public operator float component3();
+ method @androidx.compose.runtime.Stable public operator float component4();
+ method @androidx.compose.runtime.Stable public operator androidx.compose.ui.graphics.colorspace.ColorSpace component5();
+ method public long convert(androidx.compose.ui.graphics.colorspace.ColorSpace colorSpace);
+ method @androidx.compose.runtime.Stable public long copy(optional float alpha, optional float red, optional float green, optional float blue);
+ method public float getAlpha();
+ method public float getBlue();
+ method public androidx.compose.ui.graphics.colorspace.ColorSpace getColorSpace();
+ method public float getGreen();
+ method public float getRed();
+ method public long getValue();
+ property public final float alpha;
+ property public final float blue;
+ property public final androidx.compose.ui.graphics.colorspace.ColorSpace colorSpace;
+ property public final float green;
+ property public final float red;
+ property public final long value;
+ field public static final androidx.compose.ui.graphics.Color.Companion Companion;
+ }
+
+ public static final class Color.Companion {
+ method public long getBlack();
+ 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 getUnspecified();
+ method public long getWhite();
+ method public long getYellow();
+ method public long hsl(float hue, float saturation, float lightness, optional float alpha, optional androidx.compose.ui.graphics.colorspace.Rgb colorSpace);
+ method public long hsv(float hue, float saturation, float value, optional float alpha, optional androidx.compose.ui.graphics.colorspace.Rgb colorSpace);
+ property public final long Black;
+ property public final long Blue;
+ property public final long Cyan;
+ property public final long DarkGray;
+ property public final long Gray;
+ property public final long Green;
+ property public final long LightGray;
+ property public final long Magenta;
+ property public final long Red;
+ property public final long Transparent;
+ property public final long Unspecified;
+ property public final long White;
+ property public final long Yellow;
+ }
+
+ @androidx.compose.runtime.Immutable public final class ColorFilter {
+ field public static final androidx.compose.ui.graphics.ColorFilter.Companion Companion;
+ }
+
+ public static final class ColorFilter.Companion {
+ method @androidx.compose.runtime.Stable public androidx.compose.ui.graphics.ColorFilter colorMatrix(float[] colorMatrix);
+ method @androidx.compose.runtime.Stable public androidx.compose.ui.graphics.ColorFilter lighting(long multiply, long add);
+ method @androidx.compose.runtime.Stable public androidx.compose.ui.graphics.ColorFilter tint(long color, optional int blendMode);
+ }
+
+ public final class ColorKt {
+ method @androidx.compose.runtime.Stable public static long Color(float red, float green, float blue, optional float alpha, optional androidx.compose.ui.graphics.colorspace.ColorSpace colorSpace);
+ method @androidx.compose.runtime.Stable public static long Color(int color);
+ method @androidx.compose.runtime.Stable public static long Color(long color);
+ method @androidx.compose.runtime.Stable public static long Color(int red, int green, int blue, optional int alpha);
+ method @androidx.compose.runtime.Stable public static long compositeOver(long, long background);
+ method public static inline boolean isSpecified(long);
+ method public static inline boolean isUnspecified(long);
+ method @androidx.compose.runtime.Stable public static long lerp(long start, long stop, float fraction);
+ method @androidx.compose.runtime.Stable public static float luminance(long);
+ method public static inline long takeOrElse(long, kotlin.jvm.functions.Function0<androidx.compose.ui.graphics.Color> block);
+ method @androidx.compose.runtime.Stable public static int toArgb(long);
+ }
+
+ @kotlin.jvm.JvmInline public final value class ColorMatrix {
+ ctor public ColorMatrix(optional float[] values);
+ method public void convertRgbToYuv();
+ method public void convertYuvToRgb();
+ method public inline operator float get(int row, int column);
+ method public float[] getValues();
+ method public void reset();
+ method public inline operator void set(int row, int column, float v);
+ method public void set(float[] src);
+ method public void setToRotateBlue(float degrees);
+ method public void setToRotateGreen(float degrees);
+ method public void setToRotateRed(float degrees);
+ method public void setToSaturation(float sat);
+ method public void setToScale(float redScale, float greenScale, float blueScale, float alphaScale);
+ method public operator void timesAssign(float[] colorMatrix);
+ property public final float[] values;
+ }
+
+ public final class DegreesKt {
+ }
+
+ @androidx.compose.runtime.Immutable @kotlin.jvm.JvmInline public final value class FilterQuality {
+ method public int getValue();
+ property public final int value;
+ field public static final androidx.compose.ui.graphics.FilterQuality.Companion Companion;
+ }
+
+ public static final class FilterQuality.Companion {
+ method public int getHigh();
+ method public int getLow();
+ method public int getMedium();
+ method public int getNone();
+ property public final int High;
+ property public final int Low;
+ property public final int Medium;
+ property public final int None;
+ }
+
+ public final class Float16Kt {
+ }
+
+ public interface ImageBitmap {
+ method public androidx.compose.ui.graphics.colorspace.ColorSpace getColorSpace();
+ method public int getConfig();
+ method public boolean getHasAlpha();
+ method public int getHeight();
+ method public int getWidth();
+ method public void prepareToDraw();
+ method public void readPixels(int[] buffer, optional int startX, optional int startY, optional int width, optional int height, optional int bufferOffset, optional int stride);
+ property public abstract androidx.compose.ui.graphics.colorspace.ColorSpace colorSpace;
+ property public abstract int config;
+ property public abstract boolean hasAlpha;
+ property public abstract int height;
+ property public abstract int width;
+ field public static final androidx.compose.ui.graphics.ImageBitmap.Companion Companion;
+ }
+
+ public static final class ImageBitmap.Companion {
+ }
+
+ @androidx.compose.runtime.Immutable @kotlin.jvm.JvmInline public final value class ImageBitmapConfig {
+ method public int getValue();
+ property public final int value;
+ field public static final androidx.compose.ui.graphics.ImageBitmapConfig.Companion Companion;
+ }
+
+ public static final class ImageBitmapConfig.Companion {
+ method public int getAlpha8();
+ method public int getArgb8888();
+ method public int getF16();
+ method public int getGpu();
+ method public int getRgb565();
+ property public final int Alpha8;
+ property public final int Argb8888;
+ property public final int F16;
+ property public final int Gpu;
+ property public final int Rgb565;
+ }
+
+ public final class ImageBitmapKt {
+ method public static androidx.compose.ui.graphics.ImageBitmap ImageBitmap(int width, int height, optional int config, optional boolean hasAlpha, optional androidx.compose.ui.graphics.colorspace.ColorSpace colorSpace);
+ method public static androidx.compose.ui.graphics.PixelMap toPixelMap(androidx.compose.ui.graphics.ImageBitmap, optional int startX, optional int startY, optional int width, optional int height, optional int[] buffer, optional int bufferOffset, optional int stride);
+ }
+
+ @androidx.compose.runtime.Immutable public final class LinearGradient extends androidx.compose.ui.graphics.ShaderBrush {
+ method public android.graphics.Shader createShader(long size);
+ property public long intrinsicSize;
+ }
+
+ @kotlin.jvm.JvmInline public final value class Matrix {
+ ctor public Matrix(optional float[] values);
+ method public inline operator float get(int row, int column);
+ method public float[] getValues();
+ method public void invert();
+ method public long map(long point);
+ method public androidx.compose.ui.geometry.Rect map(androidx.compose.ui.geometry.Rect rect);
+ method public void map(androidx.compose.ui.geometry.MutableRect rect);
+ method public void reset();
+ method public void rotateX(float degrees);
+ method public void rotateY(float degrees);
+ method public void rotateZ(float degrees);
+ method public void scale(optional float x, optional float y, optional float z);
+ method public inline operator void set(int row, int column, float v);
+ method public void setFrom(float[] matrix);
+ method public operator void timesAssign(float[] m);
+ method public void translate(optional float x, optional float y, optional float z);
+ property public final float[] values;
+ field public static final androidx.compose.ui.graphics.Matrix.Companion Companion;
+ field public static final int Perspective0 = 3; // 0x3
+ field public static final int Perspective1 = 7; // 0x7
+ field public static final int Perspective2 = 15; // 0xf
+ field public static final int ScaleX = 0; // 0x0
+ field public static final int ScaleY = 5; // 0x5
+ field public static final int ScaleZ = 10; // 0xa
+ field public static final int SkewX = 4; // 0x4
+ field public static final int SkewY = 1; // 0x1
+ field public static final int TranslateX = 12; // 0xc
+ field public static final int TranslateY = 13; // 0xd
+ field public static final int TranslateZ = 14; // 0xe
+ }
+
+ public static final class Matrix.Companion {
+ }
+
+ public final class MatrixKt {
+ method public static boolean isIdentity(float[]);
+ }
+
+ @androidx.compose.runtime.Immutable public final class OffsetEffect extends androidx.compose.ui.graphics.RenderEffect {
+ ctor public OffsetEffect(androidx.compose.ui.graphics.RenderEffect? renderEffect, long offset);
+ method @RequiresApi(android.os.Build.VERSION_CODES.S) protected android.graphics.RenderEffect createRenderEffect();
+ }
+
+ public abstract sealed class Outline {
+ method public abstract androidx.compose.ui.geometry.Rect getBounds();
+ property public abstract androidx.compose.ui.geometry.Rect bounds;
+ }
+
+ public static final class Outline.Generic extends androidx.compose.ui.graphics.Outline {
+ ctor public Outline.Generic(androidx.compose.ui.graphics.Path path);
+ method public androidx.compose.ui.geometry.Rect getBounds();
+ method public androidx.compose.ui.graphics.Path getPath();
+ property public androidx.compose.ui.geometry.Rect bounds;
+ property public final androidx.compose.ui.graphics.Path path;
+ }
+
+ @androidx.compose.runtime.Immutable public static final class Outline.Rectangle extends androidx.compose.ui.graphics.Outline {
+ ctor public Outline.Rectangle(androidx.compose.ui.geometry.Rect rect);
+ method public androidx.compose.ui.geometry.Rect getBounds();
+ method public androidx.compose.ui.geometry.Rect getRect();
+ property public androidx.compose.ui.geometry.Rect bounds;
+ property public final androidx.compose.ui.geometry.Rect rect;
+ }
+
+ @androidx.compose.runtime.Immutable public static final class Outline.Rounded extends androidx.compose.ui.graphics.Outline {
+ ctor public Outline.Rounded(androidx.compose.ui.geometry.RoundRect roundRect);
+ method public androidx.compose.ui.geometry.Rect getBounds();
+ method public androidx.compose.ui.geometry.RoundRect getRoundRect();
+ property public androidx.compose.ui.geometry.Rect bounds;
+ property public final androidx.compose.ui.geometry.RoundRect roundRect;
+ }
+
+ public final class OutlineKt {
+ method public static void addOutline(androidx.compose.ui.graphics.Path, androidx.compose.ui.graphics.Outline outline);
+ method public static void drawOutline(androidx.compose.ui.graphics.drawscope.DrawScope, androidx.compose.ui.graphics.Outline outline, long color, optional float alpha, optional androidx.compose.ui.graphics.drawscope.DrawStyle style, optional androidx.compose.ui.graphics.ColorFilter? colorFilter, optional int blendMode);
+ method public static void drawOutline(androidx.compose.ui.graphics.drawscope.DrawScope, androidx.compose.ui.graphics.Outline outline, androidx.compose.ui.graphics.Brush brush, optional float alpha, optional androidx.compose.ui.graphics.drawscope.DrawStyle style, optional androidx.compose.ui.graphics.ColorFilter? colorFilter, optional int blendMode);
+ method public static void drawOutline(androidx.compose.ui.graphics.Canvas, androidx.compose.ui.graphics.Outline outline, androidx.compose.ui.graphics.Paint paint);
+ }
+
+ public interface Paint {
+ method public android.graphics.Paint asFrameworkPaint();
+ method public float getAlpha();
+ method public int getBlendMode();
+ method public long getColor();
+ method public androidx.compose.ui.graphics.ColorFilter? getColorFilter();
+ method public int getFilterQuality();
+ method public androidx.compose.ui.graphics.PathEffect? getPathEffect();
+ method public android.graphics.Shader? getShader();
+ method public int getStrokeCap();
+ method public int getStrokeJoin();
+ method public float getStrokeMiterLimit();
+ method public float getStrokeWidth();
+ method public int getStyle();
+ method public boolean isAntiAlias();
+ method public void setAlpha(float);
+ method public void setAntiAlias(boolean);
+ method public void setBlendMode(int);
+ method public void setColor(long);
+ method public void setColorFilter(androidx.compose.ui.graphics.ColorFilter?);
+ method public void setFilterQuality(int);
+ method public void setPathEffect(androidx.compose.ui.graphics.PathEffect?);
+ method public void setShader(android.graphics.Shader?);
+ method public void setStrokeCap(int);
+ method public void setStrokeJoin(int);
+ method public void setStrokeMiterLimit(float);
+ method public void setStrokeWidth(float);
+ method public void setStyle(int);
+ property public abstract float alpha;
+ property public abstract int blendMode;
+ property public abstract long color;
+ property public abstract androidx.compose.ui.graphics.ColorFilter? colorFilter;
+ property public abstract int filterQuality;
+ property public abstract boolean isAntiAlias;
+ property public abstract androidx.compose.ui.graphics.PathEffect? pathEffect;
+ property public abstract android.graphics.Shader? shader;
+ property public abstract int strokeCap;
+ property public abstract int strokeJoin;
+ property public abstract float strokeMiterLimit;
+ property public abstract float strokeWidth;
+ property public abstract int style;
+ }
+
+ public final class PaintKt {
+ method public static androidx.compose.ui.graphics.Paint! Paint();
+ field public static final float DefaultAlpha = 1.0f;
+ }
+
+ @androidx.compose.runtime.Immutable @kotlin.jvm.JvmInline public final value class PaintingStyle {
+ field public static final androidx.compose.ui.graphics.PaintingStyle.Companion Companion;
+ }
+
+ public static final class PaintingStyle.Companion {
+ method public int getFill();
+ method public int getStroke();
+ property public final int Fill;
+ property public final int Stroke;
+ }
+
+ public interface Path {
+ method public void addArc(androidx.compose.ui.geometry.Rect oval, float startAngleDegrees, float sweepAngleDegrees);
+ method public void addArcRad(androidx.compose.ui.geometry.Rect oval, float startAngleRadians, float sweepAngleRadians);
+ method public void addOval(androidx.compose.ui.geometry.Rect oval);
+ method public void addPath(androidx.compose.ui.graphics.Path path, optional long offset);
+ method public void addRect(androidx.compose.ui.geometry.Rect rect);
+ method public void addRoundRect(androidx.compose.ui.geometry.RoundRect roundRect);
+ method public void arcTo(androidx.compose.ui.geometry.Rect rect, float startAngleDegrees, float sweepAngleDegrees, boolean forceMoveTo);
+ method public default void arcToRad(androidx.compose.ui.geometry.Rect rect, float startAngleRadians, float sweepAngleRadians, boolean forceMoveTo);
+ method public void close();
+ method public void cubicTo(float x1, float y1, float x2, float y2, float x3, float y3);
+ method public androidx.compose.ui.geometry.Rect getBounds();
+ method public int getFillType();
+ method public boolean isConvex();
+ method public boolean isEmpty();
+ method public void lineTo(float x, float y);
+ method public void moveTo(float x, float y);
+ method public boolean op(androidx.compose.ui.graphics.Path path1, androidx.compose.ui.graphics.Path path2, int operation);
+ method public void quadraticBezierTo(float x1, float y1, float x2, float y2);
+ method public void relativeCubicTo(float dx1, float dy1, float dx2, float dy2, float dx3, float dy3);
+ method public void relativeLineTo(float dx, float dy);
+ method public void relativeMoveTo(float dx, float dy);
+ method public void relativeQuadraticBezierTo(float dx1, float dy1, float dx2, float dy2);
+ method public void reset();
+ method public void setFillType(int);
+ method public void translate(long offset);
+ property public abstract int fillType;
+ property public abstract boolean isConvex;
+ property public abstract boolean isEmpty;
+ field public static final androidx.compose.ui.graphics.Path.Companion Companion;
+ }
+
+ public static final class Path.Companion {
+ method public androidx.compose.ui.graphics.Path combine(int operation, androidx.compose.ui.graphics.Path path1, androidx.compose.ui.graphics.Path path2);
+ }
+
+ public interface PathEffect {
+ field public static final androidx.compose.ui.graphics.PathEffect.Companion Companion;
+ }
+
+ public static final class PathEffect.Companion {
+ method public androidx.compose.ui.graphics.PathEffect chainPathEffect(androidx.compose.ui.graphics.PathEffect outer, androidx.compose.ui.graphics.PathEffect inner);
+ method public androidx.compose.ui.graphics.PathEffect cornerPathEffect(float radius);
+ method public androidx.compose.ui.graphics.PathEffect dashPathEffect(float[] intervals, optional float phase);
+ method public androidx.compose.ui.graphics.PathEffect stampedPathEffect(androidx.compose.ui.graphics.Path shape, float advance, float phase, int style);
+ }
+
+ @androidx.compose.runtime.Immutable @kotlin.jvm.JvmInline public final value class PathFillType {
+ field public static final androidx.compose.ui.graphics.PathFillType.Companion Companion;
+ }
+
+ public static final class PathFillType.Companion {
+ method public int getEvenOdd();
+ method public int getNonZero();
+ property public final int EvenOdd;
+ property public final int NonZero;
+ }
+
+ public interface PathMeasure {
+ method public float getLength();
+ method public boolean getSegment(float startDistance, float stopDistance, androidx.compose.ui.graphics.Path destination, optional boolean startWithMoveTo);
+ method public void setPath(androidx.compose.ui.graphics.Path? path, boolean forceClosed);
+ property public abstract float length;
+ }
+
+ @androidx.compose.runtime.Immutable @kotlin.jvm.JvmInline public final value class PathOperation {
+ field public static final androidx.compose.ui.graphics.PathOperation.Companion Companion;
+ }
+
+ public static final class PathOperation.Companion {
+ method public int getDifference();
+ method public int getIntersect();
+ method public int getReverseDifference();
+ method public int getUnion();
+ method public int getXor();
+ property public final int Difference;
+ property public final int Intersect;
+ property public final int ReverseDifference;
+ property public final int Union;
+ property public final int Xor;
+ }
+
+ public final class PathOperationKt {
+ method @Deprecated public static int getDifference(androidx.compose.ui.graphics.PathOperation.Companion);
+ method @Deprecated public static int getIntersect(androidx.compose.ui.graphics.PathOperation.Companion);
+ method @Deprecated public static int getReverseDifference(androidx.compose.ui.graphics.PathOperation.Companion);
+ method @Deprecated public static int getUnion(androidx.compose.ui.graphics.PathOperation.Companion);
+ method @Deprecated public static int getXor(androidx.compose.ui.graphics.PathOperation.Companion);
+ }
+
+ public final class PixelMap {
+ ctor public PixelMap(int[] buffer, int width, int height, int bufferOffset, int stride);
+ method public operator long get(int x, int y);
+ method public int[] getBuffer();
+ method public int getBufferOffset();
+ method public int getHeight();
+ method public int getStride();
+ method public int getWidth();
+ property public final int[] buffer;
+ property public final int bufferOffset;
+ property public final int height;
+ property public final int stride;
+ property public final int width;
+ }
+
+ @androidx.compose.runtime.Immutable @kotlin.jvm.JvmInline public final value class PointMode {
+ field public static final androidx.compose.ui.graphics.PointMode.Companion Companion;
+ }
+
+ public static final class PointMode.Companion {
+ method public int getLines();
+ method public int getPoints();
+ method public int getPolygon();
+ property public final int Lines;
+ property public final int Points;
+ property public final int Polygon;
+ }
+
+ @androidx.compose.runtime.Immutable public final class RadialGradient extends androidx.compose.ui.graphics.ShaderBrush {
+ method public android.graphics.Shader createShader(long size);
+ property public long intrinsicSize;
+ }
+
+ public final class RectHelper_androidKt {
+ method public static android.graphics.Rect toAndroidRect(androidx.compose.ui.geometry.Rect);
+ method public static android.graphics.RectF toAndroidRectF(androidx.compose.ui.geometry.Rect);
+ method public static androidx.compose.ui.geometry.Rect toComposeRect(android.graphics.Rect);
+ }
+
+ public final class RectangleShapeKt {
+ method public static androidx.compose.ui.graphics.Shape getRectangleShape();
+ property public static final androidx.compose.ui.graphics.Shape RectangleShape;
+ }
+
+ @androidx.compose.runtime.Immutable public abstract sealed class RenderEffect {
+ method @RequiresApi(android.os.Build.VERSION_CODES.S) public final android.graphics.RenderEffect asAndroidRenderEffect();
+ method @RequiresApi(android.os.Build.VERSION_CODES.S) protected abstract android.graphics.RenderEffect createRenderEffect();
+ method public boolean isSupported();
+ }
+
+ public final class RenderEffectKt {
+ method @androidx.compose.runtime.Stable public static androidx.compose.ui.graphics.BlurEffect BlurEffect(float radiusX, float radiusY, optional int edgeTreatment);
+ method @androidx.compose.runtime.Stable public static androidx.compose.ui.graphics.OffsetEffect OffsetEffect(float offsetX, float offsetY);
+ }
+
+ @androidx.compose.runtime.Immutable public abstract class ShaderBrush extends androidx.compose.ui.graphics.Brush {
+ ctor public ShaderBrush();
+ method public final void applyTo(long size, androidx.compose.ui.graphics.Paint p, float alpha);
+ method public abstract android.graphics.Shader createShader(long size);
+ }
+
+ public final class ShaderKt {
+ method public static android.graphics.Shader ImageShader(androidx.compose.ui.graphics.ImageBitmap image, optional int tileModeX, optional int tileModeY);
+ method public static android.graphics.Shader LinearGradientShader(long from, long to, java.util.List<androidx.compose.ui.graphics.Color> colors, optional java.util.List<java.lang.Float>? colorStops, optional int tileMode);
+ method public static android.graphics.Shader RadialGradientShader(long center, float radius, java.util.List<androidx.compose.ui.graphics.Color> colors, optional java.util.List<java.lang.Float>? colorStops, optional int tileMode);
+ method public static android.graphics.Shader SweepGradientShader(long center, java.util.List<androidx.compose.ui.graphics.Color> colors, optional java.util.List<java.lang.Float>? colorStops);
+ }
+
+ @androidx.compose.runtime.Immutable public final class Shadow {
+ ctor public Shadow(optional @androidx.compose.runtime.Stable long color, optional @androidx.compose.runtime.Stable long offset, optional @androidx.compose.runtime.Stable float blurRadius);
+ method public androidx.compose.ui.graphics.Shadow copy(optional long color, optional long offset, optional float blurRadius);
+ method public float getBlurRadius();
+ method public long getColor();
+ method public long getOffset();
+ property public final float blurRadius;
+ property public final long color;
+ property public final long offset;
+ field public static final androidx.compose.ui.graphics.Shadow.Companion Companion;
+ }
+
+ public static final class Shadow.Companion {
+ method public androidx.compose.ui.graphics.Shadow getNone();
+ property public final androidx.compose.ui.graphics.Shadow None;
+ }
+
+ public final class ShadowKt {
+ method @androidx.compose.runtime.Stable public static androidx.compose.ui.graphics.Shadow lerp(androidx.compose.ui.graphics.Shadow start, androidx.compose.ui.graphics.Shadow stop, float fraction);
+ }
+
+ @androidx.compose.runtime.Immutable public interface Shape {
+ method public androidx.compose.ui.graphics.Outline createOutline(long size, androidx.compose.ui.unit.LayoutDirection layoutDirection, androidx.compose.ui.unit.Density density);
+ }
+
+ @androidx.compose.runtime.Immutable public final class SolidColor extends androidx.compose.ui.graphics.Brush {
+ ctor public SolidColor(long value);
+ method public void applyTo(long size, androidx.compose.ui.graphics.Paint p, float alpha);
+ method public long getValue();
+ property public final long value;
+ }
+
+ @androidx.compose.runtime.Immutable @kotlin.jvm.JvmInline public final value class StampedPathEffectStyle {
+ field public static final androidx.compose.ui.graphics.StampedPathEffectStyle.Companion Companion;
+ }
+
+ public static final class StampedPathEffectStyle.Companion {
+ method public int getMorph();
+ method public int getRotate();
+ method public int getTranslate();
+ property public final int Morph;
+ property public final int Rotate;
+ property public final int Translate;
+ }
+
+ @androidx.compose.runtime.Immutable @kotlin.jvm.JvmInline public final value class StrokeCap {
+ field public static final androidx.compose.ui.graphics.StrokeCap.Companion Companion;
+ }
+
+ public static final class StrokeCap.Companion {
+ method public int getButt();
+ method public int getRound();
+ method public int getSquare();
+ property public final int Butt;
+ property public final int Round;
+ property public final int Square;
+ }
+
+ @androidx.compose.runtime.Immutable @kotlin.jvm.JvmInline public final value class StrokeJoin {
+ field public static final androidx.compose.ui.graphics.StrokeJoin.Companion Companion;
+ }
+
+ public static final class StrokeJoin.Companion {
+ method public int getBevel();
+ method public int getMiter();
+ method public int getRound();
+ property public final int Bevel;
+ property public final int Miter;
+ property public final int Round;
+ }
+
+ @androidx.compose.runtime.Immutable public final class SweepGradient extends androidx.compose.ui.graphics.ShaderBrush {
+ method public android.graphics.Shader createShader(long size);
+ }
+
+ @androidx.compose.runtime.Immutable @kotlin.jvm.JvmInline public final value class TileMode {
+ field public static final androidx.compose.ui.graphics.TileMode.Companion Companion;
+ }
+
+ public static final class TileMode.Companion {
+ method public int getClamp();
+ method public int getDecal();
+ method public int getMirror();
+ method public int getRepeated();
+ property public final int Clamp;
+ property public final int Decal;
+ property public final int Mirror;
+ property public final int Repeated;
+ }
+
+ @androidx.compose.runtime.Immutable @kotlin.jvm.JvmInline public final value class VertexMode {
+ field public static final androidx.compose.ui.graphics.VertexMode.Companion Companion;
+ }
+
+ public static final class VertexMode.Companion {
+ method public int getTriangleFan();
+ method public int getTriangleStrip();
+ method public int getTriangles();
+ property public final int TriangleFan;
+ property public final int TriangleStrip;
+ property public final int Triangles;
+ }
+
+ public final class Vertices {
+ ctor public Vertices(int vertexMode, java.util.List<androidx.compose.ui.geometry.Offset> positions, java.util.List<androidx.compose.ui.geometry.Offset> textureCoordinates, java.util.List<androidx.compose.ui.graphics.Color> colors, java.util.List<java.lang.Integer> indices);
+ method public int[] getColors();
+ method public short[] getIndices();
+ method public float[] getPositions();
+ method public float[] getTextureCoordinates();
+ method public int getVertexMode();
+ property public final int[] colors;
+ property public final short[] indices;
+ property public final float[] positions;
+ property public final float[] textureCoordinates;
+ property public final int vertexMode;
+ }
+
+}
+
+package androidx.compose.ui.graphics.colorspace {
+
+ public abstract class Adaptation {
+ field public static final androidx.compose.ui.graphics.colorspace.Adaptation.Companion Companion;
+ }
+
+ public static final class Adaptation.Companion {
+ method public androidx.compose.ui.graphics.colorspace.Adaptation getBradford();
+ method public androidx.compose.ui.graphics.colorspace.Adaptation getCiecat02();
+ method public androidx.compose.ui.graphics.colorspace.Adaptation getVonKries();
+ property public final androidx.compose.ui.graphics.colorspace.Adaptation Bradford;
+ property public final androidx.compose.ui.graphics.colorspace.Adaptation Ciecat02;
+ property public final androidx.compose.ui.graphics.colorspace.Adaptation VonKries;
+ }
+
+ @androidx.compose.runtime.Immutable @kotlin.jvm.JvmInline public final value class ColorModel {
+ method public int getComponentCount();
+ property public final int componentCount;
+ field public static final androidx.compose.ui.graphics.colorspace.ColorModel.Companion Companion;
+ }
+
+ public static final class ColorModel.Companion {
+ method public long getCmyk();
+ method public long getLab();
+ method public long getRgb();
+ method public long getXyz();
+ property public final long Cmyk;
+ property public final long Lab;
+ property public final long Rgb;
+ property public final long Xyz;
+ }
+
+ public abstract class ColorSpace {
+ ctor public ColorSpace(String name, long model);
+ method public final float[] fromXyz(float x, float y, float z);
+ method public abstract float[] fromXyz(float[] v);
+ method public final int getComponentCount();
+ method public abstract float getMaxValue(int component);
+ method public abstract float getMinValue(int component);
+ method public final long getModel();
+ method public final String getName();
+ method public boolean isSrgb();
+ method public abstract boolean isWideGamut();
+ method public final float[] toXyz(float r, float g, float b);
+ method public abstract float[] toXyz(float[] v);
+ property public final int componentCount;
+ property public boolean isSrgb;
+ property public abstract boolean isWideGamut;
+ property public final long model;
+ property public final String name;
+ }
+
+ public final class ColorSpaceKt {
+ method public static androidx.compose.ui.graphics.colorspace.ColorSpace adapt(androidx.compose.ui.graphics.colorspace.ColorSpace, androidx.compose.ui.graphics.colorspace.WhitePoint whitePoint, optional androidx.compose.ui.graphics.colorspace.Adaptation adaptation);
+ method public static androidx.compose.ui.graphics.colorspace.ColorSpace adapt(androidx.compose.ui.graphics.colorspace.ColorSpace, androidx.compose.ui.graphics.colorspace.WhitePoint whitePoint);
+ method public static androidx.compose.ui.graphics.colorspace.Connector connect(androidx.compose.ui.graphics.colorspace.ColorSpace, optional androidx.compose.ui.graphics.colorspace.ColorSpace destination, optional int intent);
+ }
+
+ public final class ColorSpaces {
+ method public androidx.compose.ui.graphics.colorspace.Rgb getAces();
+ method public androidx.compose.ui.graphics.colorspace.Rgb getAcescg();
+ method public androidx.compose.ui.graphics.colorspace.Rgb getAdobeRgb();
+ method public androidx.compose.ui.graphics.colorspace.Rgb getBt2020();
+ method public androidx.compose.ui.graphics.colorspace.Rgb getBt709();
+ method public androidx.compose.ui.graphics.colorspace.ColorSpace getCieLab();
+ method public androidx.compose.ui.graphics.colorspace.ColorSpace getCieXyz();
+ method public androidx.compose.ui.graphics.colorspace.Rgb getDciP3();
+ method public androidx.compose.ui.graphics.colorspace.Rgb getDisplayP3();
+ method public androidx.compose.ui.graphics.colorspace.Rgb getExtendedSrgb();
+ method public androidx.compose.ui.graphics.colorspace.Rgb getLinearExtendedSrgb();
+ method public androidx.compose.ui.graphics.colorspace.Rgb getLinearSrgb();
+ method public androidx.compose.ui.graphics.colorspace.Rgb getNtsc1953();
+ method public androidx.compose.ui.graphics.colorspace.ColorSpace getOklab();
+ method public androidx.compose.ui.graphics.colorspace.Rgb getProPhotoRgb();
+ method public androidx.compose.ui.graphics.colorspace.Rgb getSmpteC();
+ method public androidx.compose.ui.graphics.colorspace.Rgb getSrgb();
+ method public androidx.compose.ui.graphics.colorspace.ColorSpace? match(float[] toXYZD50, androidx.compose.ui.graphics.colorspace.TransferParameters function);
+ property public final androidx.compose.ui.graphics.colorspace.Rgb Aces;
+ property public final androidx.compose.ui.graphics.colorspace.Rgb Acescg;
+ property public final androidx.compose.ui.graphics.colorspace.Rgb AdobeRgb;
+ property public final androidx.compose.ui.graphics.colorspace.Rgb Bt2020;
+ property public final androidx.compose.ui.graphics.colorspace.Rgb Bt709;
+ property public final androidx.compose.ui.graphics.colorspace.ColorSpace CieLab;
+ property public final androidx.compose.ui.graphics.colorspace.ColorSpace CieXyz;
+ property public final androidx.compose.ui.graphics.colorspace.Rgb DciP3;
+ property public final androidx.compose.ui.graphics.colorspace.Rgb DisplayP3;
+ property public final androidx.compose.ui.graphics.colorspace.Rgb ExtendedSrgb;
+ property public final androidx.compose.ui.graphics.colorspace.Rgb LinearExtendedSrgb;
+ property public final androidx.compose.ui.graphics.colorspace.Rgb LinearSrgb;
+ property public final androidx.compose.ui.graphics.colorspace.Rgb Ntsc1953;
+ property public final androidx.compose.ui.graphics.colorspace.ColorSpace Oklab;
+ property public final androidx.compose.ui.graphics.colorspace.Rgb ProPhotoRgb;
+ property public final androidx.compose.ui.graphics.colorspace.Rgb SmpteC;
+ property public final androidx.compose.ui.graphics.colorspace.Rgb Srgb;
+ field public static final androidx.compose.ui.graphics.colorspace.ColorSpaces INSTANCE;
+ }
+
+ public class Connector {
+ method public final androidx.compose.ui.graphics.colorspace.ColorSpace getDestination();
+ method public final int getRenderIntent();
+ method public final androidx.compose.ui.graphics.colorspace.ColorSpace getSource();
+ method public final float[] transform(float r, float g, float b);
+ method public float[] transform(float[] v);
+ property public final androidx.compose.ui.graphics.colorspace.ColorSpace destination;
+ property public final int renderIntent;
+ property public final androidx.compose.ui.graphics.colorspace.ColorSpace source;
+ }
+
+ public final class Illuminant {
+ method public androidx.compose.ui.graphics.colorspace.WhitePoint getA();
+ method public androidx.compose.ui.graphics.colorspace.WhitePoint getB();
+ method public androidx.compose.ui.graphics.colorspace.WhitePoint getC();
+ method public androidx.compose.ui.graphics.colorspace.WhitePoint getD50();
+ method public androidx.compose.ui.graphics.colorspace.WhitePoint getD55();
+ method public androidx.compose.ui.graphics.colorspace.WhitePoint getD60();
+ method public androidx.compose.ui.graphics.colorspace.WhitePoint getD65();
+ method public androidx.compose.ui.graphics.colorspace.WhitePoint getD75();
+ method public androidx.compose.ui.graphics.colorspace.WhitePoint getE();
+ property public final androidx.compose.ui.graphics.colorspace.WhitePoint A;
+ property public final androidx.compose.ui.graphics.colorspace.WhitePoint B;
+ property public final androidx.compose.ui.graphics.colorspace.WhitePoint C;
+ property public final androidx.compose.ui.graphics.colorspace.WhitePoint D50;
+ property public final androidx.compose.ui.graphics.colorspace.WhitePoint D55;
+ property public final androidx.compose.ui.graphics.colorspace.WhitePoint D60;
+ property public final androidx.compose.ui.graphics.colorspace.WhitePoint D65;
+ property public final androidx.compose.ui.graphics.colorspace.WhitePoint D75;
+ property public final androidx.compose.ui.graphics.colorspace.WhitePoint E;
+ field public static final androidx.compose.ui.graphics.colorspace.Illuminant INSTANCE;
+ }
+
+ @androidx.compose.runtime.Immutable @kotlin.jvm.JvmInline public final value class RenderIntent {
+ field public static final androidx.compose.ui.graphics.colorspace.RenderIntent.Companion Companion;
+ }
+
+ public static final class RenderIntent.Companion {
+ method public int getAbsolute();
+ method public int getPerceptual();
+ method public int getRelative();
+ method public int getSaturation();
+ property public final int Absolute;
+ property public final int Perceptual;
+ property public final int Relative;
+ property public final int Saturation;
+ }
+
+ public final class Rgb extends androidx.compose.ui.graphics.colorspace.ColorSpace {
+ ctor public Rgb(String name, float[] toXYZ, kotlin.jvm.functions.Function1<? super java.lang.Double,java.lang.Double> oetf, kotlin.jvm.functions.Function1<? super java.lang.Double,java.lang.Double> eotf);
+ ctor public Rgb(String name, float[] primaries, androidx.compose.ui.graphics.colorspace.WhitePoint whitePoint, kotlin.jvm.functions.Function1<? super java.lang.Double,java.lang.Double> oetf, kotlin.jvm.functions.Function1<? super java.lang.Double,java.lang.Double> eotf, float min, float max);
+ ctor public Rgb(String name, float[] toXYZ, androidx.compose.ui.graphics.colorspace.TransferParameters function);
+ ctor public Rgb(String name, float[] primaries, androidx.compose.ui.graphics.colorspace.WhitePoint whitePoint, androidx.compose.ui.graphics.colorspace.TransferParameters function);
+ ctor public Rgb(String name, float[] toXYZ, double gamma);
+ ctor public Rgb(String name, float[] primaries, androidx.compose.ui.graphics.colorspace.WhitePoint whitePoint, double gamma);
+ method public float[] fromLinear(float r, float g, float b);
+ method public float[] fromLinear(float[] v);
+ method public float[] fromXyz(float[] v);
+ method public kotlin.jvm.functions.Function1<java.lang.Double,java.lang.Double> getEotf();
+ method public float[] getInverseTransform();
+ method public float[] getInverseTransform(float[] inverseTransform);
+ method public float getMaxValue(int component);
+ method public float getMinValue(int component);
+ method public kotlin.jvm.functions.Function1<java.lang.Double,java.lang.Double> getOetf();
+ method public float[] getPrimaries();
+ method public float[] getPrimaries(float[] primaries);
+ method public androidx.compose.ui.graphics.colorspace.TransferParameters? getTransferParameters();
+ method public float[] getTransform();
+ method public float[] getTransform(float[] transform);
+ method public androidx.compose.ui.graphics.colorspace.WhitePoint getWhitePoint();
+ method public boolean isWideGamut();
+ method public float[] toLinear(float r, float g, float b);
+ method public float[] toLinear(float[] v);
+ method public float[] toXyz(float[] v);
+ property public final kotlin.jvm.functions.Function1<java.lang.Double,java.lang.Double> eotf;
+ property public boolean isSrgb;
+ property public boolean isWideGamut;
+ property public final kotlin.jvm.functions.Function1<java.lang.Double,java.lang.Double> oetf;
+ property public final androidx.compose.ui.graphics.colorspace.TransferParameters? transferParameters;
+ property public final androidx.compose.ui.graphics.colorspace.WhitePoint whitePoint;
+ }
+
+ public final class TransferParameters {
+ ctor public TransferParameters(double gamma, double a, double b, double c, double d, optional double e, optional double f);
+ method public double component1();
+ method public double component2();
+ method public double component3();
+ method public double component4();
+ method public double component5();
+ method public double component6();
+ method public double component7();
+ method public androidx.compose.ui.graphics.colorspace.TransferParameters copy(double gamma, double a, double b, double c, double d, double e, double f);
+ method public double getA();
+ method public double getB();
+ method public double getC();
+ method public double getD();
+ method public double getE();
+ method public double getF();
+ method public double getGamma();
+ property public final double a;
+ property public final double b;
+ property public final double c;
+ property public final double d;
+ property public final double e;
+ property public final double f;
+ property public final double gamma;
+ }
+
+ public final class WhitePoint {
+ ctor public WhitePoint(float x, float y);
+ ctor public WhitePoint(float x, float y, float z);
+ method public float component1();
+ method public float component2();
+ method public androidx.compose.ui.graphics.colorspace.WhitePoint copy(float x, float y);
+ method public float getX();
+ method public float getY();
+ property public final float x;
+ property public final float y;
+ }
+
+}
+
+package androidx.compose.ui.graphics.drawscope {
+
+ public final class CanvasDrawScope implements androidx.compose.ui.graphics.drawscope.DrawScope {
+ ctor public CanvasDrawScope();
+ method public inline void draw(androidx.compose.ui.unit.Density density, androidx.compose.ui.unit.LayoutDirection layoutDirection, androidx.compose.ui.graphics.Canvas canvas, long size, kotlin.jvm.functions.Function1<? super androidx.compose.ui.graphics.drawscope.DrawScope,kotlin.Unit> block);
+ method public void drawArc(androidx.compose.ui.graphics.Brush brush, float startAngle, float sweepAngle, boolean useCenter, long topLeft, long size, float alpha, androidx.compose.ui.graphics.drawscope.DrawStyle style, androidx.compose.ui.graphics.ColorFilter? colorFilter, int blendMode);
+ method public void drawArc(long color, float startAngle, float sweepAngle, boolean useCenter, long topLeft, long size, float alpha, androidx.compose.ui.graphics.drawscope.DrawStyle style, androidx.compose.ui.graphics.ColorFilter? colorFilter, int blendMode);
+ method public void drawCircle(androidx.compose.ui.graphics.Brush brush, float radius, long center, float alpha, androidx.compose.ui.graphics.drawscope.DrawStyle style, androidx.compose.ui.graphics.ColorFilter? colorFilter, int blendMode);
+ method public void drawCircle(long color, float radius, long center, float alpha, androidx.compose.ui.graphics.drawscope.DrawStyle style, androidx.compose.ui.graphics.ColorFilter? colorFilter, int blendMode);
+ method public void drawImage(androidx.compose.ui.graphics.ImageBitmap image, long topLeft, float alpha, androidx.compose.ui.graphics.drawscope.DrawStyle style, androidx.compose.ui.graphics.ColorFilter? colorFilter, int blendMode);
+ method @Deprecated public void drawImage(androidx.compose.ui.graphics.ImageBitmap image, long srcOffset, long srcSize, long dstOffset, long dstSize, float alpha, androidx.compose.ui.graphics.drawscope.DrawStyle style, androidx.compose.ui.graphics.ColorFilter? colorFilter, int blendMode);
+ method public void drawLine(androidx.compose.ui.graphics.Brush brush, long start, long end, float strokeWidth, int cap, androidx.compose.ui.graphics.PathEffect? pathEffect, float alpha, androidx.compose.ui.graphics.ColorFilter? colorFilter, int blendMode);
+ method public void drawLine(long color, long start, long end, float strokeWidth, int cap, androidx.compose.ui.graphics.PathEffect? pathEffect, float alpha, androidx.compose.ui.graphics.ColorFilter? colorFilter, int blendMode);
+ method public void drawOval(androidx.compose.ui.graphics.Brush brush, long topLeft, long size, float alpha, androidx.compose.ui.graphics.drawscope.DrawStyle style, androidx.compose.ui.graphics.ColorFilter? colorFilter, int blendMode);
+ method public void drawOval(long color, long topLeft, long size, float alpha, androidx.compose.ui.graphics.drawscope.DrawStyle style, androidx.compose.ui.graphics.ColorFilter? colorFilter, int blendMode);
+ method public void drawPath(androidx.compose.ui.graphics.Path path, long color, float alpha, androidx.compose.ui.graphics.drawscope.DrawStyle style, androidx.compose.ui.graphics.ColorFilter? colorFilter, int blendMode);
+ method public void drawPath(androidx.compose.ui.graphics.Path path, androidx.compose.ui.graphics.Brush brush, float alpha, androidx.compose.ui.graphics.drawscope.DrawStyle style, androidx.compose.ui.graphics.ColorFilter? colorFilter, int blendMode);
+ method public void drawPoints(java.util.List<androidx.compose.ui.geometry.Offset> points, int pointMode, long color, float strokeWidth, int cap, androidx.compose.ui.graphics.PathEffect? pathEffect, float alpha, androidx.compose.ui.graphics.ColorFilter? colorFilter, int blendMode);
+ method public void drawPoints(java.util.List<androidx.compose.ui.geometry.Offset> points, int pointMode, androidx.compose.ui.graphics.Brush brush, float strokeWidth, int cap, androidx.compose.ui.graphics.PathEffect? pathEffect, float alpha, androidx.compose.ui.graphics.ColorFilter? colorFilter, int blendMode);
+ method public void drawRect(androidx.compose.ui.graphics.Brush brush, long topLeft, long size, float alpha, androidx.compose.ui.graphics.drawscope.DrawStyle style, androidx.compose.ui.graphics.ColorFilter? colorFilter, int blendMode);
+ method public void drawRect(long color, long topLeft, long size, float alpha, androidx.compose.ui.graphics.drawscope.DrawStyle style, androidx.compose.ui.graphics.ColorFilter? colorFilter, int blendMode);
+ method public void drawRoundRect(androidx.compose.ui.graphics.Brush brush, long topLeft, long size, long cornerRadius, float alpha, androidx.compose.ui.graphics.drawscope.DrawStyle style, androidx.compose.ui.graphics.ColorFilter? colorFilter, int blendMode);
+ method public void drawRoundRect(long color, long topLeft, long size, long cornerRadius, androidx.compose.ui.graphics.drawscope.DrawStyle style, float alpha, androidx.compose.ui.graphics.ColorFilter? colorFilter, int blendMode);
+ method public float getDensity();
+ method public androidx.compose.ui.graphics.drawscope.DrawContext getDrawContext();
+ method public float getFontScale();
+ method public androidx.compose.ui.unit.LayoutDirection getLayoutDirection();
+ property public float density;
+ property public androidx.compose.ui.graphics.drawscope.DrawContext drawContext;
+ property public float fontScale;
+ property public androidx.compose.ui.unit.LayoutDirection layoutDirection;
+ }
+
+ public final class CanvasDrawScopeKt {
+ }
+
+ public interface ContentDrawScope extends androidx.compose.ui.graphics.drawscope.DrawScope {
+ method public void drawContent();
+ }
+
+ public interface DrawContext {
+ method public androidx.compose.ui.graphics.Canvas getCanvas();
+ method public long getSize();
+ method public androidx.compose.ui.graphics.drawscope.DrawTransform getTransform();
+ method public void setSize(long);
+ property public abstract androidx.compose.ui.graphics.Canvas canvas;
+ property public abstract long size;
+ property public abstract androidx.compose.ui.graphics.drawscope.DrawTransform transform;
+ }
+
+ @androidx.compose.ui.graphics.drawscope.DrawScopeMarker public interface DrawScope extends androidx.compose.ui.unit.Density {
+ method public void drawArc(androidx.compose.ui.graphics.Brush brush, float startAngle, float sweepAngle, boolean useCenter, optional long topLeft, optional long size, optional float alpha, optional androidx.compose.ui.graphics.drawscope.DrawStyle style, optional androidx.compose.ui.graphics.ColorFilter? colorFilter, optional int blendMode);
+ method public void drawArc(long color, float startAngle, float sweepAngle, boolean useCenter, optional long topLeft, optional long size, optional float alpha, optional androidx.compose.ui.graphics.drawscope.DrawStyle style, optional androidx.compose.ui.graphics.ColorFilter? colorFilter, optional int blendMode);
+ method public void drawCircle(androidx.compose.ui.graphics.Brush brush, optional float radius, optional long center, optional float alpha, optional androidx.compose.ui.graphics.drawscope.DrawStyle style, optional androidx.compose.ui.graphics.ColorFilter? colorFilter, optional int blendMode);
+ method public void drawCircle(long color, optional float radius, optional long center, optional float alpha, optional androidx.compose.ui.graphics.drawscope.DrawStyle style, optional androidx.compose.ui.graphics.ColorFilter? colorFilter, optional int blendMode);
+ method public void drawImage(androidx.compose.ui.graphics.ImageBitmap image, optional long topLeft, optional float alpha, optional androidx.compose.ui.graphics.drawscope.DrawStyle style, optional androidx.compose.ui.graphics.ColorFilter? colorFilter, optional int blendMode);
+ method public default void drawImage(androidx.compose.ui.graphics.ImageBitmap image, optional long srcOffset, optional long srcSize, optional long dstOffset, optional long dstSize, optional float alpha, optional androidx.compose.ui.graphics.drawscope.DrawStyle style, optional androidx.compose.ui.graphics.ColorFilter? colorFilter, optional int blendMode, optional int filterQuality);
+ method @Deprecated public void drawImage(androidx.compose.ui.graphics.ImageBitmap image, optional long srcOffset, optional long srcSize, optional long dstOffset, optional long dstSize, optional float alpha, optional androidx.compose.ui.graphics.drawscope.DrawStyle style, optional androidx.compose.ui.graphics.ColorFilter? colorFilter, optional int blendMode);
+ method public void drawLine(androidx.compose.ui.graphics.Brush brush, long start, long end, optional float strokeWidth, optional int cap, optional androidx.compose.ui.graphics.PathEffect? pathEffect, optional float alpha, optional androidx.compose.ui.graphics.ColorFilter? colorFilter, optional int blendMode);
+ method public void drawLine(long color, long start, long end, optional float strokeWidth, optional int cap, optional androidx.compose.ui.graphics.PathEffect? pathEffect, optional float alpha, optional androidx.compose.ui.graphics.ColorFilter? colorFilter, optional int blendMode);
+ method public void drawOval(androidx.compose.ui.graphics.Brush brush, optional long topLeft, optional long size, optional float alpha, optional androidx.compose.ui.graphics.drawscope.DrawStyle style, optional androidx.compose.ui.graphics.ColorFilter? colorFilter, optional int blendMode);
+ method public void drawOval(long color, optional long topLeft, optional long size, optional float alpha, optional androidx.compose.ui.graphics.drawscope.DrawStyle style, optional androidx.compose.ui.graphics.ColorFilter? colorFilter, optional int blendMode);
+ method public void drawPath(androidx.compose.ui.graphics.Path path, long color, optional float alpha, optional androidx.compose.ui.graphics.drawscope.DrawStyle style, optional androidx.compose.ui.graphics.ColorFilter? colorFilter, optional int blendMode);
+ method public void drawPath(androidx.compose.ui.graphics.Path path, androidx.compose.ui.graphics.Brush brush, optional float alpha, optional androidx.compose.ui.graphics.drawscope.DrawStyle style, optional androidx.compose.ui.graphics.ColorFilter? colorFilter, optional int blendMode);
+ method public void drawPoints(java.util.List<androidx.compose.ui.geometry.Offset> points, int pointMode, long color, optional float strokeWidth, optional int cap, optional androidx.compose.ui.graphics.PathEffect? pathEffect, optional float alpha, optional androidx.compose.ui.graphics.ColorFilter? colorFilter, optional int blendMode);
+ method public void drawPoints(java.util.List<androidx.compose.ui.geometry.Offset> points, int pointMode, androidx.compose.ui.graphics.Brush brush, optional float strokeWidth, optional int cap, optional androidx.compose.ui.graphics.PathEffect? pathEffect, optional float alpha, optional androidx.compose.ui.graphics.ColorFilter? colorFilter, optional int blendMode);
+ method public void drawRect(androidx.compose.ui.graphics.Brush brush, optional long topLeft, optional long size, optional float alpha, optional androidx.compose.ui.graphics.drawscope.DrawStyle style, optional androidx.compose.ui.graphics.ColorFilter? colorFilter, optional int blendMode);
+ method public void drawRect(long color, optional long topLeft, optional long size, optional float alpha, optional androidx.compose.ui.graphics.drawscope.DrawStyle style, optional androidx.compose.ui.graphics.ColorFilter? colorFilter, optional int blendMode);
+ method public void drawRoundRect(androidx.compose.ui.graphics.Brush brush, optional long topLeft, optional long size, optional long cornerRadius, optional float alpha, optional androidx.compose.ui.graphics.drawscope.DrawStyle style, optional androidx.compose.ui.graphics.ColorFilter? colorFilter, optional int blendMode);
+ method public void drawRoundRect(long color, optional long topLeft, optional long size, optional long cornerRadius, optional androidx.compose.ui.graphics.drawscope.DrawStyle style, optional float alpha, optional androidx.compose.ui.graphics.ColorFilter? colorFilter, optional int blendMode);
+ method public default long getCenter();
+ method public androidx.compose.ui.graphics.drawscope.DrawContext getDrawContext();
+ method public androidx.compose.ui.unit.LayoutDirection getLayoutDirection();
+ method public default long getSize();
+ property public default long center;
+ property public abstract androidx.compose.ui.graphics.drawscope.DrawContext drawContext;
+ property public abstract androidx.compose.ui.unit.LayoutDirection layoutDirection;
+ property public default long size;
+ field public static final androidx.compose.ui.graphics.drawscope.DrawScope.Companion Companion;
+ }
+
+ public static final class DrawScope.Companion {
+ method public int getDefaultBlendMode();
+ method public int getDefaultFilterQuality();
+ property public final int DefaultBlendMode;
+ property public final int DefaultFilterQuality;
+ }
+
+ public final class DrawScopeKt {
+ method public static inline void clipPath(androidx.compose.ui.graphics.drawscope.DrawScope, androidx.compose.ui.graphics.Path path, optional int clipOp, kotlin.jvm.functions.Function1<? super androidx.compose.ui.graphics.drawscope.DrawScope,kotlin.Unit> block);
+ method public static inline void clipRect(androidx.compose.ui.graphics.drawscope.DrawScope, optional float left, optional float top, optional float right, optional float bottom, optional int clipOp, kotlin.jvm.functions.Function1<? super androidx.compose.ui.graphics.drawscope.DrawScope,kotlin.Unit> block);
+ method public static inline void drawIntoCanvas(androidx.compose.ui.graphics.drawscope.DrawScope, kotlin.jvm.functions.Function1<? super androidx.compose.ui.graphics.Canvas,kotlin.Unit> block);
+ method public static inline void inset(androidx.compose.ui.graphics.drawscope.DrawScope, float left, float top, float right, float bottom, kotlin.jvm.functions.Function1<? super androidx.compose.ui.graphics.drawscope.DrawScope,kotlin.Unit> block);
+ method public static inline void inset(androidx.compose.ui.graphics.drawscope.DrawScope, float inset, kotlin.jvm.functions.Function1<? super androidx.compose.ui.graphics.drawscope.DrawScope,kotlin.Unit> block);
+ method public static inline void inset(androidx.compose.ui.graphics.drawscope.DrawScope, optional float horizontal, optional float vertical, kotlin.jvm.functions.Function1<? super androidx.compose.ui.graphics.drawscope.DrawScope,kotlin.Unit> block);
+ method public static inline void rotate(androidx.compose.ui.graphics.drawscope.DrawScope, float degrees, optional long pivot, kotlin.jvm.functions.Function1<? super androidx.compose.ui.graphics.drawscope.DrawScope,kotlin.Unit> block);
+ method public static inline void rotateRad(androidx.compose.ui.graphics.drawscope.DrawScope, float radians, optional long pivot, kotlin.jvm.functions.Function1<? super androidx.compose.ui.graphics.drawscope.DrawScope,kotlin.Unit> block);
+ method public static inline void scale(androidx.compose.ui.graphics.drawscope.DrawScope, float scaleX, float scaleY, optional long pivot, kotlin.jvm.functions.Function1<? super androidx.compose.ui.graphics.drawscope.DrawScope,kotlin.Unit> block);
+ method public static inline void scale(androidx.compose.ui.graphics.drawscope.DrawScope, float scale, optional long pivot, kotlin.jvm.functions.Function1<? super androidx.compose.ui.graphics.drawscope.DrawScope,kotlin.Unit> block);
+ method public static inline void translate(androidx.compose.ui.graphics.drawscope.DrawScope, optional float left, optional float top, kotlin.jvm.functions.Function1<? super androidx.compose.ui.graphics.drawscope.DrawScope,kotlin.Unit> block);
+ method public static inline void withTransform(androidx.compose.ui.graphics.drawscope.DrawScope, kotlin.jvm.functions.Function1<? super androidx.compose.ui.graphics.drawscope.DrawTransform,kotlin.Unit> transformBlock, kotlin.jvm.functions.Function1<? super androidx.compose.ui.graphics.drawscope.DrawScope,kotlin.Unit> drawBlock);
+ }
+
+ @kotlin.DslMarker public @interface DrawScopeMarker {
+ }
+
+ public abstract sealed class DrawStyle {
+ }
+
+ @androidx.compose.ui.graphics.drawscope.DrawScopeMarker public interface DrawTransform {
+ method public void clipPath(androidx.compose.ui.graphics.Path path, optional int clipOp);
+ method public void clipRect(optional float left, optional float top, optional float right, optional float bottom, optional int clipOp);
+ method public default long getCenter();
+ method public long getSize();
+ method public void inset(float left, float top, float right, float bottom);
+ method public void rotate(float degrees, optional long pivot);
+ method public void scale(float scaleX, float scaleY, optional long pivot);
+ method public void transform(float[] matrix);
+ method public void translate(optional float left, optional float top);
+ property public default long center;
+ property public abstract long size;
+ }
+
+ public final class DrawTransformKt {
+ method public static inline void inset(androidx.compose.ui.graphics.drawscope.DrawTransform, optional float horizontal, optional float vertical);
+ method public static inline void inset(androidx.compose.ui.graphics.drawscope.DrawTransform, float inset);
+ method public static inline void rotateRad(androidx.compose.ui.graphics.drawscope.DrawTransform, float radians, optional long pivot);
+ method public static inline void scale(androidx.compose.ui.graphics.drawscope.DrawTransform, float scale, optional long pivot);
+ }
+
+ public final class Fill extends androidx.compose.ui.graphics.drawscope.DrawStyle {
+ field public static final androidx.compose.ui.graphics.drawscope.Fill INSTANCE;
+ }
+
+ public final class Stroke extends androidx.compose.ui.graphics.drawscope.DrawStyle {
+ ctor public Stroke(optional float width, optional float miter, optional int cap, optional int join, optional androidx.compose.ui.graphics.PathEffect? pathEffect);
+ method public int getCap();
+ method public int getJoin();
+ method public float getMiter();
+ method public androidx.compose.ui.graphics.PathEffect? getPathEffect();
+ method public float getWidth();
+ property public final int cap;
+ property public final int join;
+ property public final float miter;
+ property public final androidx.compose.ui.graphics.PathEffect? pathEffect;
+ property public final float width;
+ field public static final androidx.compose.ui.graphics.drawscope.Stroke.Companion Companion;
+ field public static final float DefaultMiter = 4.0f;
+ field public static final float HairlineWidth = 0.0f;
+ }
+
+ public static final class Stroke.Companion {
+ method public int getDefaultCap();
+ method public int getDefaultJoin();
+ property public final int DefaultCap;
+ property public final int DefaultJoin;
+ }
+
+}
+
+package androidx.compose.ui.graphics.painter {
+
+ public final class BitmapPainter extends androidx.compose.ui.graphics.painter.Painter {
+ ctor public BitmapPainter(androidx.compose.ui.graphics.ImageBitmap image, optional long srcOffset, optional long srcSize);
+ method public long getIntrinsicSize();
+ method protected void onDraw(androidx.compose.ui.graphics.drawscope.DrawScope);
+ property public long intrinsicSize;
+ }
+
+ public final class BitmapPainterKt {
+ method public static androidx.compose.ui.graphics.painter.BitmapPainter BitmapPainter(androidx.compose.ui.graphics.ImageBitmap image, optional long srcOffset, optional long srcSize, optional int filterQuality);
+ }
+
+ public final class BrushPainter extends androidx.compose.ui.graphics.painter.Painter {
+ ctor public BrushPainter(androidx.compose.ui.graphics.Brush brush);
+ method public androidx.compose.ui.graphics.Brush getBrush();
+ method public long getIntrinsicSize();
+ method protected void onDraw(androidx.compose.ui.graphics.drawscope.DrawScope);
+ property public final androidx.compose.ui.graphics.Brush brush;
+ property public long intrinsicSize;
+ }
+
+ public final class ColorPainter extends androidx.compose.ui.graphics.painter.Painter {
+ ctor public ColorPainter(long color);
+ method public long getColor();
+ method public long getIntrinsicSize();
+ method protected void onDraw(androidx.compose.ui.graphics.drawscope.DrawScope);
+ property public final long color;
+ property public long intrinsicSize;
+ }
+
+ public abstract class Painter {
+ ctor public Painter();
+ method protected boolean applyAlpha(float alpha);
+ method protected boolean applyColorFilter(androidx.compose.ui.graphics.ColorFilter? colorFilter);
+ method protected boolean applyLayoutDirection(androidx.compose.ui.unit.LayoutDirection layoutDirection);
+ method public final void draw(androidx.compose.ui.graphics.drawscope.DrawScope, long size, optional float alpha, optional androidx.compose.ui.graphics.ColorFilter? colorFilter);
+ method public abstract long getIntrinsicSize();
+ method protected abstract void onDraw(androidx.compose.ui.graphics.drawscope.DrawScope);
+ property public abstract long intrinsicSize;
+ }
+
+}
+
+package androidx.compose.ui.graphics.vector {
+
+ public final class PathBuilder {
+ ctor public PathBuilder();
+ method public androidx.compose.ui.graphics.vector.PathBuilder arcTo(float horizontalEllipseRadius, float verticalEllipseRadius, float theta, boolean isMoreThanHalf, boolean isPositiveArc, float x1, float y1);
+ method public androidx.compose.ui.graphics.vector.PathBuilder arcToRelative(float a, float b, float theta, boolean isMoreThanHalf, boolean isPositiveArc, float dx1, float dy1);
+ method public androidx.compose.ui.graphics.vector.PathBuilder close();
+ method public androidx.compose.ui.graphics.vector.PathBuilder curveTo(float x1, float y1, float x2, float y2, float x3, float y3);
+ method public androidx.compose.ui.graphics.vector.PathBuilder curveToRelative(float dx1, float dy1, float dx2, float dy2, float dx3, float dy3);
+ method public java.util.List<androidx.compose.ui.graphics.vector.PathNode> getNodes();
+ method public androidx.compose.ui.graphics.vector.PathBuilder horizontalLineTo(float x);
+ method public androidx.compose.ui.graphics.vector.PathBuilder horizontalLineToRelative(float dx);
+ method public androidx.compose.ui.graphics.vector.PathBuilder lineTo(float x, float y);
+ method public androidx.compose.ui.graphics.vector.PathBuilder lineToRelative(float dx, float dy);
+ method public androidx.compose.ui.graphics.vector.PathBuilder moveTo(float x, float y);
+ method public androidx.compose.ui.graphics.vector.PathBuilder moveToRelative(float dx, float dy);
+ method public androidx.compose.ui.graphics.vector.PathBuilder quadTo(float x1, float y1, float x2, float y2);
+ method public androidx.compose.ui.graphics.vector.PathBuilder quadToRelative(float dx1, float dy1, float dx2, float dy2);
+ method public androidx.compose.ui.graphics.vector.PathBuilder reflectiveCurveTo(float x1, float y1, float x2, float y2);
+ method public androidx.compose.ui.graphics.vector.PathBuilder reflectiveCurveToRelative(float dx1, float dy1, float dx2, float dy2);
+ method public androidx.compose.ui.graphics.vector.PathBuilder reflectiveQuadTo(float x1, float y1);
+ method public androidx.compose.ui.graphics.vector.PathBuilder reflectiveQuadToRelative(float dx1, float dy1);
+ method public androidx.compose.ui.graphics.vector.PathBuilder verticalLineTo(float y);
+ method public androidx.compose.ui.graphics.vector.PathBuilder verticalLineToRelative(float dy);
+ }
+
+ @androidx.compose.runtime.Immutable public abstract sealed class PathNode {
+ method public final boolean isCurve();
+ method public final boolean isQuad();
+ property public final boolean isCurve;
+ property public final boolean isQuad;
+ }
+
+ @androidx.compose.runtime.Immutable public static final class PathNode.ArcTo extends androidx.compose.ui.graphics.vector.PathNode {
+ ctor public PathNode.ArcTo(float horizontalEllipseRadius, float verticalEllipseRadius, float theta, boolean isMoreThanHalf, boolean isPositiveArc, float arcStartX, float arcStartY);
+ method public float component1();
+ method public float component2();
+ method public float component3();
+ method public boolean component4();
+ method public boolean component5();
+ method public float component6();
+ method public float component7();
+ method public androidx.compose.ui.graphics.vector.PathNode.ArcTo copy(float horizontalEllipseRadius, float verticalEllipseRadius, float theta, boolean isMoreThanHalf, boolean isPositiveArc, float arcStartX, float arcStartY);
+ method public float getArcStartX();
+ method public float getArcStartY();
+ method public float getHorizontalEllipseRadius();
+ method public float getTheta();
+ method public float getVerticalEllipseRadius();
+ method public boolean isMoreThanHalf();
+ method public boolean isPositiveArc();
+ property public final float arcStartX;
+ property public final float arcStartY;
+ property public final float horizontalEllipseRadius;
+ property public final boolean isMoreThanHalf;
+ property public final boolean isPositiveArc;
+ property public final float theta;
+ property public final float verticalEllipseRadius;
+ }
+
+ @androidx.compose.runtime.Immutable public static final class PathNode.Close extends androidx.compose.ui.graphics.vector.PathNode {
+ field public static final androidx.compose.ui.graphics.vector.PathNode.Close INSTANCE;
+ }
+
+ @androidx.compose.runtime.Immutable public static final class PathNode.CurveTo extends androidx.compose.ui.graphics.vector.PathNode {
+ ctor public PathNode.CurveTo(float x1, float y1, float x2, float y2, float x3, float y3);
+ method public float component1();
+ method public float component2();
+ method public float component3();
+ method public float component4();
+ method public float component5();
+ method public float component6();
+ method public androidx.compose.ui.graphics.vector.PathNode.CurveTo copy(float x1, float y1, float x2, float y2, float x3, float y3);
+ method public float getX1();
+ method public float getX2();
+ method public float getX3();
+ method public float getY1();
+ method public float getY2();
+ method public float getY3();
+ property public final float x1;
+ property public final float x2;
+ property public final float x3;
+ property public final float y1;
+ property public final float y2;
+ property public final float y3;
+ }
+
+ @androidx.compose.runtime.Immutable public static final class PathNode.HorizontalTo extends androidx.compose.ui.graphics.vector.PathNode {
+ ctor public PathNode.HorizontalTo(float x);
+ method public float component1();
+ method public androidx.compose.ui.graphics.vector.PathNode.HorizontalTo copy(float x);
+ method public float getX();
+ property public final float x;
+ }
+
+ @androidx.compose.runtime.Immutable public static final class PathNode.LineTo extends androidx.compose.ui.graphics.vector.PathNode {
+ ctor public PathNode.LineTo(float x, float y);
+ method public float component1();
+ method public float component2();
+ method public androidx.compose.ui.graphics.vector.PathNode.LineTo copy(float x, float y);
+ method public float getX();
+ method public float getY();
+ property public final float x;
+ property public final float y;
+ }
+
+ @androidx.compose.runtime.Immutable public static final class PathNode.MoveTo extends androidx.compose.ui.graphics.vector.PathNode {
+ ctor public PathNode.MoveTo(float x, float y);
+ method public float component1();
+ method public float component2();
+ method public androidx.compose.ui.graphics.vector.PathNode.MoveTo copy(float x, float y);
+ method public float getX();
+ method public float getY();
+ property public final float x;
+ property public final float y;
+ }
+
+ @androidx.compose.runtime.Immutable public static final class PathNode.QuadTo extends androidx.compose.ui.graphics.vector.PathNode {
+ ctor public PathNode.QuadTo(float x1, float y1, float x2, float y2);
+ method public float component1();
+ method public float component2();
+ method public float component3();
+ method public float component4();
+ method public androidx.compose.ui.graphics.vector.PathNode.QuadTo copy(float x1, float y1, float x2, float y2);
+ method public float getX1();
+ method public float getX2();
+ method public float getY1();
+ method public float getY2();
+ property public final float x1;
+ property public final float x2;
+ property public final float y1;
+ property public final float y2;
+ }
+
+ @androidx.compose.runtime.Immutable public static final class PathNode.ReflectiveCurveTo extends androidx.compose.ui.graphics.vector.PathNode {
+ ctor public PathNode.ReflectiveCurveTo(float x1, float y1, float x2, float y2);
+ method public float component1();
+ method public float component2();
+ method public float component3();
+ method public float component4();
+ method public androidx.compose.ui.graphics.vector.PathNode.ReflectiveCurveTo copy(float x1, float y1, float x2, float y2);
+ method public float getX1();
+ method public float getX2();
+ method public float getY1();
+ method public float getY2();
+ property public final float x1;
+ property public final float x2;
+ property public final float y1;
+ property public final float y2;
+ }
+
+ @androidx.compose.runtime.Immutable public static final class PathNode.ReflectiveQuadTo extends androidx.compose.ui.graphics.vector.PathNode {
+ ctor public PathNode.ReflectiveQuadTo(float x, float y);
+ method public float component1();
+ method public float component2();
+ method public androidx.compose.ui.graphics.vector.PathNode.ReflectiveQuadTo copy(float x, float y);
+ method public float getX();
+ method public float getY();
+ property public final float x;
+ property public final float y;
+ }
+
+ @androidx.compose.runtime.Immutable public static final class PathNode.RelativeArcTo extends androidx.compose.ui.graphics.vector.PathNode {
+ ctor public PathNode.RelativeArcTo(float horizontalEllipseRadius, float verticalEllipseRadius, float theta, boolean isMoreThanHalf, boolean isPositiveArc, float arcStartDx, float arcStartDy);
+ method public float component1();
+ method public float component2();
+ method public float component3();
+ method public boolean component4();
+ method public boolean component5();
+ method public float component6();
+ method public float component7();
+ method public androidx.compose.ui.graphics.vector.PathNode.RelativeArcTo copy(float horizontalEllipseRadius, float verticalEllipseRadius, float theta, boolean isMoreThanHalf, boolean isPositiveArc, float arcStartDx, float arcStartDy);
+ method public float getArcStartDx();
+ method public float getArcStartDy();
+ method public float getHorizontalEllipseRadius();
+ method public float getTheta();
+ method public float getVerticalEllipseRadius();
+ method public boolean isMoreThanHalf();
+ method public boolean isPositiveArc();
+ property public final float arcStartDx;
+ property public final float arcStartDy;
+ property public final float horizontalEllipseRadius;
+ property public final boolean isMoreThanHalf;
+ property public final boolean isPositiveArc;
+ property public final float theta;
+ property public final float verticalEllipseRadius;
+ }
+
+ @androidx.compose.runtime.Immutable public static final class PathNode.RelativeCurveTo extends androidx.compose.ui.graphics.vector.PathNode {
+ ctor public PathNode.RelativeCurveTo(float dx1, float dy1, float dx2, float dy2, float dx3, float dy3);
+ method public float component1();
+ method public float component2();
+ method public float component3();
+ method public float component4();
+ method public float component5();
+ method public float component6();
+ method public androidx.compose.ui.graphics.vector.PathNode.RelativeCurveTo copy(float dx1, float dy1, float dx2, float dy2, float dx3, float dy3);
+ method public float getDx1();
+ method public float getDx2();
+ method public float getDx3();
+ method public float getDy1();
+ method public float getDy2();
+ method public float getDy3();
+ property public final float dx1;
+ property public final float dx2;
+ property public final float dx3;
+ property public final float dy1;
+ property public final float dy2;
+ property public final float dy3;
+ }
+
+ @androidx.compose.runtime.Immutable public static final class PathNode.RelativeHorizontalTo extends androidx.compose.ui.graphics.vector.PathNode {
+ ctor public PathNode.RelativeHorizontalTo(float dx);
+ method public float component1();
+ method public androidx.compose.ui.graphics.vector.PathNode.RelativeHorizontalTo copy(float dx);
+ method public float getDx();
+ property public final float dx;
+ }
+
+ @androidx.compose.runtime.Immutable public static final class PathNode.RelativeLineTo extends androidx.compose.ui.graphics.vector.PathNode {
+ ctor public PathNode.RelativeLineTo(float dx, float dy);
+ method public float component1();
+ method public float component2();
+ method public androidx.compose.ui.graphics.vector.PathNode.RelativeLineTo copy(float dx, float dy);
+ method public float getDx();
+ method public float getDy();
+ property public final float dx;
+ property public final float dy;
+ }
+
+ @androidx.compose.runtime.Immutable public static final class PathNode.RelativeMoveTo extends androidx.compose.ui.graphics.vector.PathNode {
+ ctor public PathNode.RelativeMoveTo(float dx, float dy);
+ method public float component1();
+ method public float component2();
+ method public androidx.compose.ui.graphics.vector.PathNode.RelativeMoveTo copy(float dx, float dy);
+ method public float getDx();
+ method public float getDy();
+ property public final float dx;
+ property public final float dy;
+ }
+
+ @androidx.compose.runtime.Immutable public static final class PathNode.RelativeQuadTo extends androidx.compose.ui.graphics.vector.PathNode {
+ ctor public PathNode.RelativeQuadTo(float dx1, float dy1, float dx2, float dy2);
+ method public float component1();
+ method public float component2();
+ method public float component3();
+ method public float component4();
+ method public androidx.compose.ui.graphics.vector.PathNode.RelativeQuadTo copy(float dx1, float dy1, float dx2, float dy2);
+ method public float getDx1();
+ method public float getDx2();
+ method public float getDy1();
+ method public float getDy2();
+ property public final float dx1;
+ property public final float dx2;
+ property public final float dy1;
+ property public final float dy2;
+ }
+
+ @androidx.compose.runtime.Immutable public static final class PathNode.RelativeReflectiveCurveTo extends androidx.compose.ui.graphics.vector.PathNode {
+ ctor public PathNode.RelativeReflectiveCurveTo(float dx1, float dy1, float dx2, float dy2);
+ method public float component1();
+ method public float component2();
+ method public float component3();
+ method public float component4();
+ method public androidx.compose.ui.graphics.vector.PathNode.RelativeReflectiveCurveTo copy(float dx1, float dy1, float dx2, float dy2);
+ method public float getDx1();
+ method public float getDx2();
+ method public float getDy1();
+ method public float getDy2();
+ property public final float dx1;
+ property public final float dx2;
+ property public final float dy1;
+ property public final float dy2;
+ }
+
+ @androidx.compose.runtime.Immutable public static final class PathNode.RelativeReflectiveQuadTo extends androidx.compose.ui.graphics.vector.PathNode {
+ ctor public PathNode.RelativeReflectiveQuadTo(float dx, float dy);
+ method public float component1();
+ method public float component2();
+ method public androidx.compose.ui.graphics.vector.PathNode.RelativeReflectiveQuadTo copy(float dx, float dy);
+ method public float getDx();
+ method public float getDy();
+ property public final float dx;
+ property public final float dy;
+ }
+
+ @androidx.compose.runtime.Immutable public static final class PathNode.RelativeVerticalTo extends androidx.compose.ui.graphics.vector.PathNode {
+ ctor public PathNode.RelativeVerticalTo(float dy);
+ method public float component1();
+ method public androidx.compose.ui.graphics.vector.PathNode.RelativeVerticalTo copy(float dy);
+ method public float getDy();
+ property public final float dy;
+ }
+
+ @androidx.compose.runtime.Immutable public static final class PathNode.VerticalTo extends androidx.compose.ui.graphics.vector.PathNode {
+ ctor public PathNode.VerticalTo(float y);
+ method public float component1();
+ method public androidx.compose.ui.graphics.vector.PathNode.VerticalTo copy(float y);
+ method public float getY();
+ property public final float y;
+ }
+
+ public final class PathNodeKt {
+ }
+
+ public final class PathParser {
+ ctor public PathParser();
+ method public androidx.compose.ui.graphics.vector.PathParser addPathNodes(java.util.List<? extends androidx.compose.ui.graphics.vector.PathNode> nodes);
+ method public void clear();
+ method public androidx.compose.ui.graphics.vector.PathParser parsePathString(String pathData);
+ method public java.util.List<androidx.compose.ui.graphics.vector.PathNode> toNodes();
+ method public androidx.compose.ui.graphics.Path toPath(optional androidx.compose.ui.graphics.Path target);
+ }
+
+}
+
diff --git a/compose/ui/ui-graphics/api/public_plus_experimental_1.2.0-beta02.txt b/compose/ui/ui-graphics/api/public_plus_experimental_1.2.0-beta02.txt
new file mode 100644
index 0000000..f4523c8
--- /dev/null
+++ b/compose/ui/ui-graphics/api/public_plus_experimental_1.2.0-beta02.txt
@@ -0,0 +1,1624 @@
+// Signature format: 4.0
+package androidx.compose.ui.graphics {
+
+ public final class AndroidBlendMode_androidKt {
+ method public static boolean isSupported(int);
+ }
+
+ public final class AndroidCanvas_androidKt {
+ method public static androidx.compose.ui.graphics.Canvas Canvas(android.graphics.Canvas c);
+ method public static android.graphics.Canvas getNativeCanvas(androidx.compose.ui.graphics.Canvas);
+ }
+
+ public final class AndroidColorFilter_androidKt {
+ method public static android.graphics.ColorFilter asAndroidColorFilter(androidx.compose.ui.graphics.ColorFilter);
+ method public static androidx.compose.ui.graphics.ColorFilter asComposeColorFilter(android.graphics.ColorFilter);
+ }
+
+ public final class AndroidImageBitmap_androidKt {
+ method public static android.graphics.Bitmap asAndroidBitmap(androidx.compose.ui.graphics.ImageBitmap);
+ method public static androidx.compose.ui.graphics.ImageBitmap asImageBitmap(android.graphics.Bitmap);
+ }
+
+ public final class AndroidMatrixConversions_androidKt {
+ method public static void setFrom(float[], android.graphics.Matrix matrix);
+ method public static void setFrom(android.graphics.Matrix, float[] matrix);
+ }
+
+ public final class AndroidPaint implements androidx.compose.ui.graphics.Paint {
+ ctor public AndroidPaint();
+ method public android.graphics.Paint asFrameworkPaint();
+ method public float getAlpha();
+ method public int getBlendMode();
+ method public long getColor();
+ method public androidx.compose.ui.graphics.ColorFilter? getColorFilter();
+ method public int getFilterQuality();
+ method public androidx.compose.ui.graphics.PathEffect? getPathEffect();
+ method public android.graphics.Shader? getShader();
+ method public int getStrokeCap();
+ method public int getStrokeJoin();
+ method public float getStrokeMiterLimit();
+ method public float getStrokeWidth();
+ method public int getStyle();
+ method public boolean isAntiAlias();
+ method public void setAlpha(float);
+ method public void setAntiAlias(boolean);
+ method public void setBlendMode(int);
+ method public void setColor(long);
+ method public void setColorFilter(androidx.compose.ui.graphics.ColorFilter?);
+ method public void setFilterQuality(int);
+ method public void setPathEffect(androidx.compose.ui.graphics.PathEffect?);
+ method public void setShader(android.graphics.Shader?);
+ method public void setStrokeCap(int);
+ method public void setStrokeJoin(int);
+ method public void setStrokeMiterLimit(float);
+ method public void setStrokeWidth(float);
+ method public void setStyle(int);
+ property public float alpha;
+ property public int blendMode;
+ property public long color;
+ property public androidx.compose.ui.graphics.ColorFilter? colorFilter;
+ property public int filterQuality;
+ property public boolean isAntiAlias;
+ property public androidx.compose.ui.graphics.PathEffect? pathEffect;
+ property public android.graphics.Shader? shader;
+ property public int strokeCap;
+ property public int strokeJoin;
+ property public float strokeMiterLimit;
+ property public float strokeWidth;
+ property public int style;
+ }
+
+ public final class AndroidPaint_androidKt {
+ method public static androidx.compose.ui.graphics.Paint Paint();
+ }
+
+ public final class AndroidPath implements androidx.compose.ui.graphics.Path {
+ ctor public AndroidPath(optional android.graphics.Path internalPath);
+ method public void addArc(androidx.compose.ui.geometry.Rect oval, float startAngleDegrees, float sweepAngleDegrees);
+ method public void addArcRad(androidx.compose.ui.geometry.Rect oval, float startAngleRadians, float sweepAngleRadians);
+ method public void addOval(androidx.compose.ui.geometry.Rect oval);
+ method public void addPath(androidx.compose.ui.graphics.Path path, long offset);
+ method public void addRect(androidx.compose.ui.geometry.Rect rect);
+ method public void addRoundRect(androidx.compose.ui.geometry.RoundRect roundRect);
+ method public void arcTo(androidx.compose.ui.geometry.Rect rect, float startAngleDegrees, float sweepAngleDegrees, boolean forceMoveTo);
+ method public void close();
+ method public void cubicTo(float x1, float y1, float x2, float y2, float x3, float y3);
+ method public androidx.compose.ui.geometry.Rect getBounds();
+ method public int getFillType();
+ method public android.graphics.Path getInternalPath();
+ method public boolean isConvex();
+ method public boolean isEmpty();
+ method public void lineTo(float x, float y);
+ method public void moveTo(float x, float y);
+ method public boolean op(androidx.compose.ui.graphics.Path path1, androidx.compose.ui.graphics.Path path2, int operation);
+ method public void quadraticBezierTo(float x1, float y1, float x2, float y2);
+ method public void relativeCubicTo(float dx1, float dy1, float dx2, float dy2, float dx3, float dy3);
+ method public void relativeLineTo(float dx, float dy);
+ method public void relativeMoveTo(float dx, float dy);
+ method public void relativeQuadraticBezierTo(float dx1, float dy1, float dx2, float dy2);
+ method public void reset();
+ method public void setFillType(int);
+ method public void translate(long offset);
+ property public int fillType;
+ property public final android.graphics.Path internalPath;
+ property public boolean isConvex;
+ property public boolean isEmpty;
+ }
+
+ public final class AndroidPathEffect_androidKt {
+ method public static android.graphics.PathEffect asAndroidPathEffect(androidx.compose.ui.graphics.PathEffect);
+ method public static androidx.compose.ui.graphics.PathEffect toComposePathEffect(android.graphics.PathEffect);
+ }
+
+ public final class AndroidPathMeasure implements androidx.compose.ui.graphics.PathMeasure {
+ method public float getLength();
+ method public boolean getSegment(float startDistance, float stopDistance, androidx.compose.ui.graphics.Path destination, boolean startWithMoveTo);
+ method public void setPath(androidx.compose.ui.graphics.Path? path, boolean forceClosed);
+ property public float length;
+ }
+
+ public final class AndroidPathMeasure_androidKt {
+ method public static androidx.compose.ui.graphics.PathMeasure PathMeasure();
+ }
+
+ public final class AndroidPath_androidKt {
+ method public static androidx.compose.ui.graphics.Path Path();
+ method public static inline android.graphics.Path asAndroidPath(androidx.compose.ui.graphics.Path);
+ method public static androidx.compose.ui.graphics.Path asComposePath(android.graphics.Path);
+ }
+
+ public final class AndroidRenderEffect_androidKt {
+ method public static androidx.compose.ui.graphics.RenderEffect asComposeRenderEffect(android.graphics.RenderEffect);
+ }
+
+ public final class AndroidShader_androidKt {
+ }
+
+ public final class AndroidTileMode_androidKt {
+ method public static boolean isSupported(int);
+ method public static android.graphics.Shader.TileMode toAndroidTileMode(int);
+ method public static int toComposeTileMode(android.graphics.Shader.TileMode);
+ }
+
+ public final class AndroidVertexMode_androidKt {
+ method public static android.graphics.Canvas.VertexMode toAndroidVertexMode(int);
+ }
+
+ @androidx.compose.runtime.Immutable @kotlin.jvm.JvmInline public final value class BlendMode {
+ field public static final androidx.compose.ui.graphics.BlendMode.Companion Companion;
+ }
+
+ public static final class BlendMode.Companion {
+ method public int getClear();
+ method public int getColor();
+ method public int getColorBurn();
+ method public int getColorDodge();
+ method public int getDarken();
+ method public int getDifference();
+ method public int getDst();
+ method public int getDstAtop();
+ method public int getDstIn();
+ method public int getDstOut();
+ method public int getDstOver();
+ method public int getExclusion();
+ method public int getHardlight();
+ method public int getHue();
+ method public int getLighten();
+ method public int getLuminosity();
+ method public int getModulate();
+ method public int getMultiply();
+ method public int getOverlay();
+ method public int getPlus();
+ method public int getSaturation();
+ method public int getScreen();
+ method public int getSoftlight();
+ method public int getSrc();
+ method public int getSrcAtop();
+ method public int getSrcIn();
+ method public int getSrcOut();
+ method public int getSrcOver();
+ method public int getXor();
+ property public final int Clear;
+ property public final int Color;
+ property public final int ColorBurn;
+ property public final int ColorDodge;
+ property public final int Darken;
+ property public final int Difference;
+ property public final int Dst;
+ property public final int DstAtop;
+ property public final int DstIn;
+ property public final int DstOut;
+ property public final int DstOver;
+ property public final int Exclusion;
+ property public final int Hardlight;
+ property public final int Hue;
+ property public final int Lighten;
+ property public final int Luminosity;
+ property public final int Modulate;
+ property public final int Multiply;
+ property public final int Overlay;
+ property public final int Plus;
+ property public final int Saturation;
+ property public final int Screen;
+ property public final int Softlight;
+ property public final int Src;
+ property public final int SrcAtop;
+ property public final int SrcIn;
+ property public final int SrcOut;
+ property public final int SrcOver;
+ property public final int Xor;
+ }
+
+ @androidx.compose.runtime.Immutable public final class BlurEffect extends androidx.compose.ui.graphics.RenderEffect {
+ ctor public BlurEffect(androidx.compose.ui.graphics.RenderEffect? renderEffect, float radiusX, float radiusY, int edgeTreatment);
+ method @RequiresApi(android.os.Build.VERSION_CODES.S) protected android.graphics.RenderEffect createRenderEffect();
+ }
+
+ @androidx.compose.runtime.Immutable public abstract sealed class Brush {
+ method public abstract void applyTo(long size, androidx.compose.ui.graphics.Paint p, float alpha);
+ method public long getIntrinsicSize();
+ property public long intrinsicSize;
+ field public static final androidx.compose.ui.graphics.Brush.Companion Companion;
+ }
+
+ public static final class Brush.Companion {
+ method @androidx.compose.runtime.Stable public androidx.compose.ui.graphics.Brush horizontalGradient(java.util.List<androidx.compose.ui.graphics.Color> colors, optional float startX, optional float endX, optional int tileMode);
+ method @androidx.compose.runtime.Stable public androidx.compose.ui.graphics.Brush horizontalGradient(kotlin.Pair<java.lang.Float,androidx.compose.ui.graphics.Color>![] colorStops, optional float startX, optional float endX, optional int tileMode);
+ method @androidx.compose.runtime.Stable public androidx.compose.ui.graphics.Brush linearGradient(kotlin.Pair<java.lang.Float,androidx.compose.ui.graphics.Color>![] colorStops, optional long start, optional long end, optional int tileMode);
+ method @androidx.compose.runtime.Stable public androidx.compose.ui.graphics.Brush linearGradient(java.util.List<androidx.compose.ui.graphics.Color> colors, optional long start, optional long end, optional int tileMode);
+ method @androidx.compose.runtime.Stable public androidx.compose.ui.graphics.Brush radialGradient(kotlin.Pair<java.lang.Float,androidx.compose.ui.graphics.Color>![] colorStops, optional long center, optional float radius, optional int tileMode);
+ method @androidx.compose.runtime.Stable public androidx.compose.ui.graphics.Brush radialGradient(java.util.List<androidx.compose.ui.graphics.Color> colors, optional long center, optional float radius, optional int tileMode);
+ method @androidx.compose.runtime.Stable public androidx.compose.ui.graphics.Brush sweepGradient(kotlin.Pair<java.lang.Float,androidx.compose.ui.graphics.Color>![] colorStops, optional long center);
+ method @androidx.compose.runtime.Stable public androidx.compose.ui.graphics.Brush sweepGradient(java.util.List<androidx.compose.ui.graphics.Color> colors, optional long center);
+ method @androidx.compose.runtime.Stable public androidx.compose.ui.graphics.Brush verticalGradient(java.util.List<androidx.compose.ui.graphics.Color> colors, optional float startY, optional float endY, optional int tileMode);
+ method @androidx.compose.runtime.Stable public androidx.compose.ui.graphics.Brush verticalGradient(kotlin.Pair<java.lang.Float,androidx.compose.ui.graphics.Color>![] colorStops, optional float startY, optional float endY, optional int tileMode);
+ }
+
+ public final class BrushKt {
+ method public static androidx.compose.ui.graphics.ShaderBrush ShaderBrush(android.graphics.Shader shader);
+ }
+
+ public interface Canvas {
+ method public void clipPath(androidx.compose.ui.graphics.Path path, optional int clipOp);
+ method public default void clipRect(androidx.compose.ui.geometry.Rect rect, optional int clipOp);
+ method public void clipRect(float left, float top, float right, float bottom, optional int clipOp);
+ method public void concat(float[] matrix);
+ method public void disableZ();
+ method public default void drawArc(androidx.compose.ui.geometry.Rect rect, float startAngle, float sweepAngle, boolean useCenter, androidx.compose.ui.graphics.Paint paint);
+ method public void drawArc(float left, float top, float right, float bottom, float startAngle, float sweepAngle, boolean useCenter, androidx.compose.ui.graphics.Paint paint);
+ method public default void drawArcRad(androidx.compose.ui.geometry.Rect rect, float startAngleRad, float sweepAngleRad, boolean useCenter, androidx.compose.ui.graphics.Paint paint);
+ method public void drawCircle(long center, float radius, androidx.compose.ui.graphics.Paint paint);
+ method public void drawImage(androidx.compose.ui.graphics.ImageBitmap image, long topLeftOffset, androidx.compose.ui.graphics.Paint paint);
+ method public void drawImageRect(androidx.compose.ui.graphics.ImageBitmap image, optional long srcOffset, optional long srcSize, optional long dstOffset, optional long dstSize, androidx.compose.ui.graphics.Paint paint);
+ method public void drawLine(long p1, long p2, androidx.compose.ui.graphics.Paint paint);
+ method public default void drawOval(androidx.compose.ui.geometry.Rect rect, androidx.compose.ui.graphics.Paint paint);
+ method public void drawOval(float left, float top, float right, float bottom, androidx.compose.ui.graphics.Paint paint);
+ method public void drawPath(androidx.compose.ui.graphics.Path path, androidx.compose.ui.graphics.Paint paint);
+ method public void drawPoints(int pointMode, java.util.List<androidx.compose.ui.geometry.Offset> points, androidx.compose.ui.graphics.Paint paint);
+ method public void drawRawPoints(int pointMode, float[] points, androidx.compose.ui.graphics.Paint paint);
+ method public default void drawRect(androidx.compose.ui.geometry.Rect rect, androidx.compose.ui.graphics.Paint paint);
+ method public void drawRect(float left, float top, float right, float bottom, androidx.compose.ui.graphics.Paint paint);
+ method public void drawRoundRect(float left, float top, float right, float bottom, float radiusX, float radiusY, androidx.compose.ui.graphics.Paint paint);
+ method public void drawVertices(androidx.compose.ui.graphics.Vertices vertices, int blendMode, androidx.compose.ui.graphics.Paint paint);
+ method public void enableZ();
+ method public void restore();
+ method public void rotate(float degrees);
+ method public void save();
+ method public void saveLayer(androidx.compose.ui.geometry.Rect bounds, androidx.compose.ui.graphics.Paint paint);
+ method public void scale(float sx, optional float sy);
+ method public void skew(float sx, float sy);
+ method public default void skewRad(float sxRad, float syRad);
+ method public void translate(float dx, float dy);
+ }
+
+ public final class CanvasHolder {
+ ctor public CanvasHolder();
+ method public inline void drawInto(android.graphics.Canvas targetCanvas, kotlin.jvm.functions.Function1<? super androidx.compose.ui.graphics.Canvas,kotlin.Unit> block);
+ }
+
+ public final class CanvasKt {
+ method public static androidx.compose.ui.graphics.Canvas Canvas(androidx.compose.ui.graphics.ImageBitmap image);
+ method public static void rotate(androidx.compose.ui.graphics.Canvas, float degrees, float pivotX, float pivotY);
+ method public static void rotateRad(androidx.compose.ui.graphics.Canvas, float radians, optional float pivotX, optional float pivotY);
+ method public static void scale(androidx.compose.ui.graphics.Canvas, float sx, optional float sy, float pivotX, float pivotY);
+ method public static inline void withSave(androidx.compose.ui.graphics.Canvas, kotlin.jvm.functions.Function0<kotlin.Unit> block);
+ method public static inline void withSaveLayer(androidx.compose.ui.graphics.Canvas, androidx.compose.ui.geometry.Rect bounds, androidx.compose.ui.graphics.Paint paint, kotlin.jvm.functions.Function0<kotlin.Unit> block);
+ }
+
+ @androidx.compose.runtime.Immutable @kotlin.jvm.JvmInline public final value class ClipOp {
+ field public static final androidx.compose.ui.graphics.ClipOp.Companion Companion;
+ }
+
+ public static final class ClipOp.Companion {
+ method public int getDifference();
+ method public int getIntersect();
+ property public final int Difference;
+ property public final int Intersect;
+ }
+
+ @androidx.compose.runtime.Immutable @kotlin.jvm.JvmInline public final value class Color {
+ ctor public Color(long value);
+ method @androidx.compose.runtime.Stable public operator float component1();
+ method @androidx.compose.runtime.Stable public operator float component2();
+ method @androidx.compose.runtime.Stable public operator float component3();
+ method @androidx.compose.runtime.Stable public operator float component4();
+ method @androidx.compose.runtime.Stable public operator androidx.compose.ui.graphics.colorspace.ColorSpace component5();
+ method public long convert(androidx.compose.ui.graphics.colorspace.ColorSpace colorSpace);
+ method @androidx.compose.runtime.Stable public long copy(optional float alpha, optional float red, optional float green, optional float blue);
+ method public float getAlpha();
+ method public float getBlue();
+ method public androidx.compose.ui.graphics.colorspace.ColorSpace getColorSpace();
+ method public float getGreen();
+ method public float getRed();
+ method public long getValue();
+ property public final float alpha;
+ property public final float blue;
+ property public final androidx.compose.ui.graphics.colorspace.ColorSpace colorSpace;
+ property public final float green;
+ property public final float red;
+ property public final long value;
+ field public static final androidx.compose.ui.graphics.Color.Companion Companion;
+ }
+
+ public static final class Color.Companion {
+ method public long getBlack();
+ 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 getUnspecified();
+ method public long getWhite();
+ method public long getYellow();
+ method public long hsl(float hue, float saturation, float lightness, optional float alpha, optional androidx.compose.ui.graphics.colorspace.Rgb colorSpace);
+ method public long hsv(float hue, float saturation, float value, optional float alpha, optional androidx.compose.ui.graphics.colorspace.Rgb colorSpace);
+ property public final long Black;
+ property public final long Blue;
+ property public final long Cyan;
+ property public final long DarkGray;
+ property public final long Gray;
+ property public final long Green;
+ property public final long LightGray;
+ property public final long Magenta;
+ property public final long Red;
+ property public final long Transparent;
+ property public final long Unspecified;
+ property public final long White;
+ property public final long Yellow;
+ }
+
+ @androidx.compose.runtime.Immutable public final class ColorFilter {
+ field public static final androidx.compose.ui.graphics.ColorFilter.Companion Companion;
+ }
+
+ public static final class ColorFilter.Companion {
+ method @androidx.compose.runtime.Stable public androidx.compose.ui.graphics.ColorFilter colorMatrix(float[] colorMatrix);
+ method @androidx.compose.runtime.Stable public androidx.compose.ui.graphics.ColorFilter lighting(long multiply, long add);
+ method @androidx.compose.runtime.Stable public androidx.compose.ui.graphics.ColorFilter tint(long color, optional int blendMode);
+ }
+
+ public final class ColorKt {
+ method @androidx.compose.runtime.Stable public static long Color(float red, float green, float blue, optional float alpha, optional androidx.compose.ui.graphics.colorspace.ColorSpace colorSpace);
+ method @androidx.compose.runtime.Stable public static long Color(int color);
+ method @androidx.compose.runtime.Stable public static long Color(long color);
+ method @androidx.compose.runtime.Stable public static long Color(int red, int green, int blue, optional int alpha);
+ method @androidx.compose.runtime.Stable public static long compositeOver(long, long background);
+ method public static inline boolean isSpecified(long);
+ method public static inline boolean isUnspecified(long);
+ method @androidx.compose.runtime.Stable public static long lerp(long start, long stop, float fraction);
+ method @androidx.compose.runtime.Stable public static float luminance(long);
+ method public static inline long takeOrElse(long, kotlin.jvm.functions.Function0<androidx.compose.ui.graphics.Color> block);
+ method @androidx.compose.runtime.Stable public static int toArgb(long);
+ }
+
+ @kotlin.jvm.JvmInline public final value class ColorMatrix {
+ ctor public ColorMatrix(optional float[] values);
+ method public void convertRgbToYuv();
+ method public void convertYuvToRgb();
+ method public inline operator float get(int row, int column);
+ method public float[] getValues();
+ method public void reset();
+ method public inline operator void set(int row, int column, float v);
+ method public void set(float[] src);
+ method public void setToRotateBlue(float degrees);
+ method public void setToRotateGreen(float degrees);
+ method public void setToRotateRed(float degrees);
+ method public void setToSaturation(float sat);
+ method public void setToScale(float redScale, float greenScale, float blueScale, float alphaScale);
+ method public operator void timesAssign(float[] colorMatrix);
+ property public final float[] values;
+ }
+
+ public final class DegreesKt {
+ }
+
+ @kotlin.RequiresOptIn(message="This API is experimental and is likely to change in the future.") public @interface ExperimentalGraphicsApi {
+ }
+
+ @androidx.compose.runtime.Immutable @kotlin.jvm.JvmInline public final value class FilterQuality {
+ method public int getValue();
+ property public final int value;
+ field public static final androidx.compose.ui.graphics.FilterQuality.Companion Companion;
+ }
+
+ public static final class FilterQuality.Companion {
+ method public int getHigh();
+ method public int getLow();
+ method public int getMedium();
+ method public int getNone();
+ property public final int High;
+ property public final int Low;
+ property public final int Medium;
+ property public final int None;
+ }
+
+ public final class Float16Kt {
+ }
+
+ public interface ImageBitmap {
+ method public androidx.compose.ui.graphics.colorspace.ColorSpace getColorSpace();
+ method public int getConfig();
+ method public boolean getHasAlpha();
+ method public int getHeight();
+ method public int getWidth();
+ method public void prepareToDraw();
+ method public void readPixels(int[] buffer, optional int startX, optional int startY, optional int width, optional int height, optional int bufferOffset, optional int stride);
+ property public abstract androidx.compose.ui.graphics.colorspace.ColorSpace colorSpace;
+ property public abstract int config;
+ property public abstract boolean hasAlpha;
+ property public abstract int height;
+ property public abstract int width;
+ field public static final androidx.compose.ui.graphics.ImageBitmap.Companion Companion;
+ }
+
+ public static final class ImageBitmap.Companion {
+ }
+
+ @androidx.compose.runtime.Immutable @kotlin.jvm.JvmInline public final value class ImageBitmapConfig {
+ method public int getValue();
+ property public final int value;
+ field public static final androidx.compose.ui.graphics.ImageBitmapConfig.Companion Companion;
+ }
+
+ public static final class ImageBitmapConfig.Companion {
+ method public int getAlpha8();
+ method public int getArgb8888();
+ method public int getF16();
+ method public int getGpu();
+ method public int getRgb565();
+ property public final int Alpha8;
+ property public final int Argb8888;
+ property public final int F16;
+ property public final int Gpu;
+ property public final int Rgb565;
+ }
+
+ public final class ImageBitmapKt {
+ method public static androidx.compose.ui.graphics.ImageBitmap ImageBitmap(int width, int height, optional int config, optional boolean hasAlpha, optional androidx.compose.ui.graphics.colorspace.ColorSpace colorSpace);
+ method public static androidx.compose.ui.graphics.PixelMap toPixelMap(androidx.compose.ui.graphics.ImageBitmap, optional int startX, optional int startY, optional int width, optional int height, optional int[] buffer, optional int bufferOffset, optional int stride);
+ }
+
+ @androidx.compose.runtime.Immutable public final class LinearGradient extends androidx.compose.ui.graphics.ShaderBrush {
+ method public android.graphics.Shader createShader(long size);
+ property public long intrinsicSize;
+ }
+
+ @kotlin.jvm.JvmInline public final value class Matrix {
+ ctor public Matrix(optional float[] values);
+ method public inline operator float get(int row, int column);
+ method public float[] getValues();
+ method public void invert();
+ method public long map(long point);
+ method public androidx.compose.ui.geometry.Rect map(androidx.compose.ui.geometry.Rect rect);
+ method public void map(androidx.compose.ui.geometry.MutableRect rect);
+ method public void reset();
+ method public void rotateX(float degrees);
+ method public void rotateY(float degrees);
+ method public void rotateZ(float degrees);
+ method public void scale(optional float x, optional float y, optional float z);
+ method public inline operator void set(int row, int column, float v);
+ method public void setFrom(float[] matrix);
+ method public operator void timesAssign(float[] m);
+ method public void translate(optional float x, optional float y, optional float z);
+ property public final float[] values;
+ field public static final androidx.compose.ui.graphics.Matrix.Companion Companion;
+ field public static final int Perspective0 = 3; // 0x3
+ field public static final int Perspective1 = 7; // 0x7
+ field public static final int Perspective2 = 15; // 0xf
+ field public static final int ScaleX = 0; // 0x0
+ field public static final int ScaleY = 5; // 0x5
+ field public static final int ScaleZ = 10; // 0xa
+ field public static final int SkewX = 4; // 0x4
+ field public static final int SkewY = 1; // 0x1
+ field public static final int TranslateX = 12; // 0xc
+ field public static final int TranslateY = 13; // 0xd
+ field public static final int TranslateZ = 14; // 0xe
+ }
+
+ public static final class Matrix.Companion {
+ }
+
+ public final class MatrixKt {
+ method public static boolean isIdentity(float[]);
+ }
+
+ @androidx.compose.runtime.Immutable public final class OffsetEffect extends androidx.compose.ui.graphics.RenderEffect {
+ ctor public OffsetEffect(androidx.compose.ui.graphics.RenderEffect? renderEffect, long offset);
+ method @RequiresApi(android.os.Build.VERSION_CODES.S) protected android.graphics.RenderEffect createRenderEffect();
+ }
+
+ public abstract sealed class Outline {
+ method public abstract androidx.compose.ui.geometry.Rect getBounds();
+ property public abstract androidx.compose.ui.geometry.Rect bounds;
+ }
+
+ public static final class Outline.Generic extends androidx.compose.ui.graphics.Outline {
+ ctor public Outline.Generic(androidx.compose.ui.graphics.Path path);
+ method public androidx.compose.ui.geometry.Rect getBounds();
+ method public androidx.compose.ui.graphics.Path getPath();
+ property public androidx.compose.ui.geometry.Rect bounds;
+ property public final androidx.compose.ui.graphics.Path path;
+ }
+
+ @androidx.compose.runtime.Immutable public static final class Outline.Rectangle extends androidx.compose.ui.graphics.Outline {
+ ctor public Outline.Rectangle(androidx.compose.ui.geometry.Rect rect);
+ method public androidx.compose.ui.geometry.Rect getBounds();
+ method public androidx.compose.ui.geometry.Rect getRect();
+ property public androidx.compose.ui.geometry.Rect bounds;
+ property public final androidx.compose.ui.geometry.Rect rect;
+ }
+
+ @androidx.compose.runtime.Immutable public static final class Outline.Rounded extends androidx.compose.ui.graphics.Outline {
+ ctor public Outline.Rounded(androidx.compose.ui.geometry.RoundRect roundRect);
+ method public androidx.compose.ui.geometry.Rect getBounds();
+ method public androidx.compose.ui.geometry.RoundRect getRoundRect();
+ property public androidx.compose.ui.geometry.Rect bounds;
+ property public final androidx.compose.ui.geometry.RoundRect roundRect;
+ }
+
+ public final class OutlineKt {
+ method public static void addOutline(androidx.compose.ui.graphics.Path, androidx.compose.ui.graphics.Outline outline);
+ method public static void drawOutline(androidx.compose.ui.graphics.drawscope.DrawScope, androidx.compose.ui.graphics.Outline outline, long color, optional float alpha, optional androidx.compose.ui.graphics.drawscope.DrawStyle style, optional androidx.compose.ui.graphics.ColorFilter? colorFilter, optional int blendMode);
+ method public static void drawOutline(androidx.compose.ui.graphics.drawscope.DrawScope, androidx.compose.ui.graphics.Outline outline, androidx.compose.ui.graphics.Brush brush, optional float alpha, optional androidx.compose.ui.graphics.drawscope.DrawStyle style, optional androidx.compose.ui.graphics.ColorFilter? colorFilter, optional int blendMode);
+ method public static void drawOutline(androidx.compose.ui.graphics.Canvas, androidx.compose.ui.graphics.Outline outline, androidx.compose.ui.graphics.Paint paint);
+ }
+
+ public interface Paint {
+ method public android.graphics.Paint asFrameworkPaint();
+ method public float getAlpha();
+ method public int getBlendMode();
+ method public long getColor();
+ method public androidx.compose.ui.graphics.ColorFilter? getColorFilter();
+ method public int getFilterQuality();
+ method public androidx.compose.ui.graphics.PathEffect? getPathEffect();
+ method public android.graphics.Shader? getShader();
+ method public int getStrokeCap();
+ method public int getStrokeJoin();
+ method public float getStrokeMiterLimit();
+ method public float getStrokeWidth();
+ method public int getStyle();
+ method public boolean isAntiAlias();
+ method public void setAlpha(float);
+ method public void setAntiAlias(boolean);
+ method public void setBlendMode(int);
+ method public void setColor(long);
+ method public void setColorFilter(androidx.compose.ui.graphics.ColorFilter?);
+ method public void setFilterQuality(int);
+ method public void setPathEffect(androidx.compose.ui.graphics.PathEffect?);
+ method public void setShader(android.graphics.Shader?);
+ method public void setStrokeCap(int);
+ method public void setStrokeJoin(int);
+ method public void setStrokeMiterLimit(float);
+ method public void setStrokeWidth(float);
+ method public void setStyle(int);
+ property public abstract float alpha;
+ property public abstract int blendMode;
+ property public abstract long color;
+ property public abstract androidx.compose.ui.graphics.ColorFilter? colorFilter;
+ property public abstract int filterQuality;
+ property public abstract boolean isAntiAlias;
+ property public abstract androidx.compose.ui.graphics.PathEffect? pathEffect;
+ property public abstract android.graphics.Shader? shader;
+ property public abstract int strokeCap;
+ property public abstract int strokeJoin;
+ property public abstract float strokeMiterLimit;
+ property public abstract float strokeWidth;
+ property public abstract int style;
+ }
+
+ public final class PaintKt {
+ method public static androidx.compose.ui.graphics.Paint! Paint();
+ field public static final float DefaultAlpha = 1.0f;
+ }
+
+ @androidx.compose.runtime.Immutable @kotlin.jvm.JvmInline public final value class PaintingStyle {
+ field public static final androidx.compose.ui.graphics.PaintingStyle.Companion Companion;
+ }
+
+ public static final class PaintingStyle.Companion {
+ method public int getFill();
+ method public int getStroke();
+ property public final int Fill;
+ property public final int Stroke;
+ }
+
+ public interface Path {
+ method public void addArc(androidx.compose.ui.geometry.Rect oval, float startAngleDegrees, float sweepAngleDegrees);
+ method public void addArcRad(androidx.compose.ui.geometry.Rect oval, float startAngleRadians, float sweepAngleRadians);
+ method public void addOval(androidx.compose.ui.geometry.Rect oval);
+ method public void addPath(androidx.compose.ui.graphics.Path path, optional long offset);
+ method public void addRect(androidx.compose.ui.geometry.Rect rect);
+ method public void addRoundRect(androidx.compose.ui.geometry.RoundRect roundRect);
+ method public void arcTo(androidx.compose.ui.geometry.Rect rect, float startAngleDegrees, float sweepAngleDegrees, boolean forceMoveTo);
+ method public default void arcToRad(androidx.compose.ui.geometry.Rect rect, float startAngleRadians, float sweepAngleRadians, boolean forceMoveTo);
+ method public void close();
+ method public void cubicTo(float x1, float y1, float x2, float y2, float x3, float y3);
+ method public androidx.compose.ui.geometry.Rect getBounds();
+ method public int getFillType();
+ method public boolean isConvex();
+ method public boolean isEmpty();
+ method public void lineTo(float x, float y);
+ method public void moveTo(float x, float y);
+ method public boolean op(androidx.compose.ui.graphics.Path path1, androidx.compose.ui.graphics.Path path2, int operation);
+ method public void quadraticBezierTo(float x1, float y1, float x2, float y2);
+ method public void relativeCubicTo(float dx1, float dy1, float dx2, float dy2, float dx3, float dy3);
+ method public void relativeLineTo(float dx, float dy);
+ method public void relativeMoveTo(float dx, float dy);
+ method public void relativeQuadraticBezierTo(float dx1, float dy1, float dx2, float dy2);
+ method public void reset();
+ method public void setFillType(int);
+ method public void translate(long offset);
+ property public abstract int fillType;
+ property public abstract boolean isConvex;
+ property public abstract boolean isEmpty;
+ field public static final androidx.compose.ui.graphics.Path.Companion Companion;
+ }
+
+ public static final class Path.Companion {
+ method public androidx.compose.ui.graphics.Path combine(int operation, androidx.compose.ui.graphics.Path path1, androidx.compose.ui.graphics.Path path2);
+ }
+
+ public interface PathEffect {
+ field public static final androidx.compose.ui.graphics.PathEffect.Companion Companion;
+ }
+
+ public static final class PathEffect.Companion {
+ method public androidx.compose.ui.graphics.PathEffect chainPathEffect(androidx.compose.ui.graphics.PathEffect outer, androidx.compose.ui.graphics.PathEffect inner);
+ method public androidx.compose.ui.graphics.PathEffect cornerPathEffect(float radius);
+ method public androidx.compose.ui.graphics.PathEffect dashPathEffect(float[] intervals, optional float phase);
+ method public androidx.compose.ui.graphics.PathEffect stampedPathEffect(androidx.compose.ui.graphics.Path shape, float advance, float phase, int style);
+ }
+
+ @androidx.compose.runtime.Immutable @kotlin.jvm.JvmInline public final value class PathFillType {
+ field public static final androidx.compose.ui.graphics.PathFillType.Companion Companion;
+ }
+
+ public static final class PathFillType.Companion {
+ method public int getEvenOdd();
+ method public int getNonZero();
+ property public final int EvenOdd;
+ property public final int NonZero;
+ }
+
+ public interface PathMeasure {
+ method public float getLength();
+ method public boolean getSegment(float startDistance, float stopDistance, androidx.compose.ui.graphics.Path destination, optional boolean startWithMoveTo);
+ method public void setPath(androidx.compose.ui.graphics.Path? path, boolean forceClosed);
+ property public abstract float length;
+ }
+
+ @androidx.compose.runtime.Immutable @kotlin.jvm.JvmInline public final value class PathOperation {
+ field public static final androidx.compose.ui.graphics.PathOperation.Companion Companion;
+ }
+
+ public static final class PathOperation.Companion {
+ method public int getDifference();
+ method public int getIntersect();
+ method public int getReverseDifference();
+ method public int getUnion();
+ method public int getXor();
+ property public final int Difference;
+ property public final int Intersect;
+ property public final int ReverseDifference;
+ property public final int Union;
+ property public final int Xor;
+ }
+
+ public final class PathOperationKt {
+ method @Deprecated public static int getDifference(androidx.compose.ui.graphics.PathOperation.Companion);
+ method @Deprecated public static int getIntersect(androidx.compose.ui.graphics.PathOperation.Companion);
+ method @Deprecated public static int getReverseDifference(androidx.compose.ui.graphics.PathOperation.Companion);
+ method @Deprecated public static int getUnion(androidx.compose.ui.graphics.PathOperation.Companion);
+ method @Deprecated public static int getXor(androidx.compose.ui.graphics.PathOperation.Companion);
+ }
+
+ public final class PixelMap {
+ ctor public PixelMap(int[] buffer, int width, int height, int bufferOffset, int stride);
+ method public operator long get(int x, int y);
+ method public int[] getBuffer();
+ method public int getBufferOffset();
+ method public int getHeight();
+ method public int getStride();
+ method public int getWidth();
+ property public final int[] buffer;
+ property public final int bufferOffset;
+ property public final int height;
+ property public final int stride;
+ property public final int width;
+ }
+
+ @androidx.compose.runtime.Immutable @kotlin.jvm.JvmInline public final value class PointMode {
+ field public static final androidx.compose.ui.graphics.PointMode.Companion Companion;
+ }
+
+ public static final class PointMode.Companion {
+ method public int getLines();
+ method public int getPoints();
+ method public int getPolygon();
+ property public final int Lines;
+ property public final int Points;
+ property public final int Polygon;
+ }
+
+ @androidx.compose.runtime.Immutable public final class RadialGradient extends androidx.compose.ui.graphics.ShaderBrush {
+ method public android.graphics.Shader createShader(long size);
+ property public long intrinsicSize;
+ }
+
+ public final class RectHelper_androidKt {
+ method public static android.graphics.Rect toAndroidRect(androidx.compose.ui.geometry.Rect);
+ method public static android.graphics.RectF toAndroidRectF(androidx.compose.ui.geometry.Rect);
+ method public static androidx.compose.ui.geometry.Rect toComposeRect(android.graphics.Rect);
+ }
+
+ public final class RectangleShapeKt {
+ method public static androidx.compose.ui.graphics.Shape getRectangleShape();
+ property public static final androidx.compose.ui.graphics.Shape RectangleShape;
+ }
+
+ @androidx.compose.runtime.Immutable public abstract sealed class RenderEffect {
+ method @RequiresApi(android.os.Build.VERSION_CODES.S) public final android.graphics.RenderEffect asAndroidRenderEffect();
+ method @RequiresApi(android.os.Build.VERSION_CODES.S) protected abstract android.graphics.RenderEffect createRenderEffect();
+ method public boolean isSupported();
+ }
+
+ public final class RenderEffectKt {
+ method @androidx.compose.runtime.Stable public static androidx.compose.ui.graphics.BlurEffect BlurEffect(float radiusX, float radiusY, optional int edgeTreatment);
+ method @androidx.compose.runtime.Stable public static androidx.compose.ui.graphics.OffsetEffect OffsetEffect(float offsetX, float offsetY);
+ }
+
+ @androidx.compose.runtime.Immutable public abstract class ShaderBrush extends androidx.compose.ui.graphics.Brush {
+ ctor public ShaderBrush();
+ method public final void applyTo(long size, androidx.compose.ui.graphics.Paint p, float alpha);
+ method public abstract android.graphics.Shader createShader(long size);
+ }
+
+ public final class ShaderKt {
+ method public static android.graphics.Shader ImageShader(androidx.compose.ui.graphics.ImageBitmap image, optional int tileModeX, optional int tileModeY);
+ method public static android.graphics.Shader LinearGradientShader(long from, long to, java.util.List<androidx.compose.ui.graphics.Color> colors, optional java.util.List<java.lang.Float>? colorStops, optional int tileMode);
+ method public static android.graphics.Shader RadialGradientShader(long center, float radius, java.util.List<androidx.compose.ui.graphics.Color> colors, optional java.util.List<java.lang.Float>? colorStops, optional int tileMode);
+ method public static android.graphics.Shader SweepGradientShader(long center, java.util.List<androidx.compose.ui.graphics.Color> colors, optional java.util.List<java.lang.Float>? colorStops);
+ }
+
+ @androidx.compose.runtime.Immutable public final class Shadow {
+ ctor public Shadow(optional @androidx.compose.runtime.Stable long color, optional @androidx.compose.runtime.Stable long offset, optional @androidx.compose.runtime.Stable float blurRadius);
+ method public androidx.compose.ui.graphics.Shadow copy(optional long color, optional long offset, optional float blurRadius);
+ method public float getBlurRadius();
+ method public long getColor();
+ method public long getOffset();
+ property public final float blurRadius;
+ property public final long color;
+ property public final long offset;
+ field public static final androidx.compose.ui.graphics.Shadow.Companion Companion;
+ }
+
+ public static final class Shadow.Companion {
+ method public androidx.compose.ui.graphics.Shadow getNone();
+ property public final androidx.compose.ui.graphics.Shadow None;
+ }
+
+ public final class ShadowKt {
+ method @androidx.compose.runtime.Stable public static androidx.compose.ui.graphics.Shadow lerp(androidx.compose.ui.graphics.Shadow start, androidx.compose.ui.graphics.Shadow stop, float fraction);
+ }
+
+ @androidx.compose.runtime.Immutable public interface Shape {
+ method public androidx.compose.ui.graphics.Outline createOutline(long size, androidx.compose.ui.unit.LayoutDirection layoutDirection, androidx.compose.ui.unit.Density density);
+ }
+
+ @androidx.compose.runtime.Immutable public final class SolidColor extends androidx.compose.ui.graphics.Brush {
+ ctor public SolidColor(long value);
+ method public void applyTo(long size, androidx.compose.ui.graphics.Paint p, float alpha);
+ method public long getValue();
+ property public final long value;
+ }
+
+ @androidx.compose.runtime.Immutable @kotlin.jvm.JvmInline public final value class StampedPathEffectStyle {
+ field public static final androidx.compose.ui.graphics.StampedPathEffectStyle.Companion Companion;
+ }
+
+ public static final class StampedPathEffectStyle.Companion {
+ method public int getMorph();
+ method public int getRotate();
+ method public int getTranslate();
+ property public final int Morph;
+ property public final int Rotate;
+ property public final int Translate;
+ }
+
+ @androidx.compose.runtime.Immutable @kotlin.jvm.JvmInline public final value class StrokeCap {
+ field public static final androidx.compose.ui.graphics.StrokeCap.Companion Companion;
+ }
+
+ public static final class StrokeCap.Companion {
+ method public int getButt();
+ method public int getRound();
+ method public int getSquare();
+ property public final int Butt;
+ property public final int Round;
+ property public final int Square;
+ }
+
+ @androidx.compose.runtime.Immutable @kotlin.jvm.JvmInline public final value class StrokeJoin {
+ field public static final androidx.compose.ui.graphics.StrokeJoin.Companion Companion;
+ }
+
+ public static final class StrokeJoin.Companion {
+ method public int getBevel();
+ method public int getMiter();
+ method public int getRound();
+ property public final int Bevel;
+ property public final int Miter;
+ property public final int Round;
+ }
+
+ @androidx.compose.runtime.Immutable public final class SweepGradient extends androidx.compose.ui.graphics.ShaderBrush {
+ method public android.graphics.Shader createShader(long size);
+ }
+
+ @androidx.compose.runtime.Immutable @kotlin.jvm.JvmInline public final value class TileMode {
+ field public static final androidx.compose.ui.graphics.TileMode.Companion Companion;
+ }
+
+ public static final class TileMode.Companion {
+ method public int getClamp();
+ method public int getDecal();
+ method public int getMirror();
+ method public int getRepeated();
+ property public final int Clamp;
+ property public final int Decal;
+ property public final int Mirror;
+ property public final int Repeated;
+ }
+
+ @androidx.compose.runtime.Immutable @kotlin.jvm.JvmInline public final value class VertexMode {
+ field public static final androidx.compose.ui.graphics.VertexMode.Companion Companion;
+ }
+
+ public static final class VertexMode.Companion {
+ method public int getTriangleFan();
+ method public int getTriangleStrip();
+ method public int getTriangles();
+ property public final int TriangleFan;
+ property public final int TriangleStrip;
+ property public final int Triangles;
+ }
+
+ public final class Vertices {
+ ctor public Vertices(int vertexMode, java.util.List<androidx.compose.ui.geometry.Offset> positions, java.util.List<androidx.compose.ui.geometry.Offset> textureCoordinates, java.util.List<androidx.compose.ui.graphics.Color> colors, java.util.List<java.lang.Integer> indices);
+ method public int[] getColors();
+ method public short[] getIndices();
+ method public float[] getPositions();
+ method public float[] getTextureCoordinates();
+ method public int getVertexMode();
+ property public final int[] colors;
+ property public final short[] indices;
+ property public final float[] positions;
+ property public final float[] textureCoordinates;
+ property public final int vertexMode;
+ }
+
+}
+
+package androidx.compose.ui.graphics.colorspace {
+
+ public abstract class Adaptation {
+ field public static final androidx.compose.ui.graphics.colorspace.Adaptation.Companion Companion;
+ }
+
+ public static final class Adaptation.Companion {
+ method public androidx.compose.ui.graphics.colorspace.Adaptation getBradford();
+ method public androidx.compose.ui.graphics.colorspace.Adaptation getCiecat02();
+ method public androidx.compose.ui.graphics.colorspace.Adaptation getVonKries();
+ property public final androidx.compose.ui.graphics.colorspace.Adaptation Bradford;
+ property public final androidx.compose.ui.graphics.colorspace.Adaptation Ciecat02;
+ property public final androidx.compose.ui.graphics.colorspace.Adaptation VonKries;
+ }
+
+ @androidx.compose.runtime.Immutable @kotlin.jvm.JvmInline public final value class ColorModel {
+ method public int getComponentCount();
+ property public final int componentCount;
+ field public static final androidx.compose.ui.graphics.colorspace.ColorModel.Companion Companion;
+ }
+
+ public static final class ColorModel.Companion {
+ method public long getCmyk();
+ method public long getLab();
+ method public long getRgb();
+ method public long getXyz();
+ property public final long Cmyk;
+ property public final long Lab;
+ property public final long Rgb;
+ property public final long Xyz;
+ }
+
+ public abstract class ColorSpace {
+ ctor public ColorSpace(String name, long model);
+ method public final float[] fromXyz(float x, float y, float z);
+ method public abstract float[] fromXyz(float[] v);
+ method public final int getComponentCount();
+ method public abstract float getMaxValue(int component);
+ method public abstract float getMinValue(int component);
+ method public final long getModel();
+ method public final String getName();
+ method public boolean isSrgb();
+ method public abstract boolean isWideGamut();
+ method public final float[] toXyz(float r, float g, float b);
+ method public abstract float[] toXyz(float[] v);
+ property public final int componentCount;
+ property public boolean isSrgb;
+ property public abstract boolean isWideGamut;
+ property public final long model;
+ property public final String name;
+ }
+
+ public final class ColorSpaceKt {
+ method public static androidx.compose.ui.graphics.colorspace.ColorSpace adapt(androidx.compose.ui.graphics.colorspace.ColorSpace, androidx.compose.ui.graphics.colorspace.WhitePoint whitePoint, optional androidx.compose.ui.graphics.colorspace.Adaptation adaptation);
+ method public static androidx.compose.ui.graphics.colorspace.ColorSpace adapt(androidx.compose.ui.graphics.colorspace.ColorSpace, androidx.compose.ui.graphics.colorspace.WhitePoint whitePoint);
+ method public static androidx.compose.ui.graphics.colorspace.Connector connect(androidx.compose.ui.graphics.colorspace.ColorSpace, optional androidx.compose.ui.graphics.colorspace.ColorSpace destination, optional int intent);
+ }
+
+ public final class ColorSpaces {
+ method public androidx.compose.ui.graphics.colorspace.Rgb getAces();
+ method public androidx.compose.ui.graphics.colorspace.Rgb getAcescg();
+ method public androidx.compose.ui.graphics.colorspace.Rgb getAdobeRgb();
+ method public androidx.compose.ui.graphics.colorspace.Rgb getBt2020();
+ method public androidx.compose.ui.graphics.colorspace.Rgb getBt709();
+ method public androidx.compose.ui.graphics.colorspace.ColorSpace getCieLab();
+ method public androidx.compose.ui.graphics.colorspace.ColorSpace getCieXyz();
+ method public androidx.compose.ui.graphics.colorspace.Rgb getDciP3();
+ method public androidx.compose.ui.graphics.colorspace.Rgb getDisplayP3();
+ method public androidx.compose.ui.graphics.colorspace.Rgb getExtendedSrgb();
+ method public androidx.compose.ui.graphics.colorspace.Rgb getLinearExtendedSrgb();
+ method public androidx.compose.ui.graphics.colorspace.Rgb getLinearSrgb();
+ method public androidx.compose.ui.graphics.colorspace.Rgb getNtsc1953();
+ method public androidx.compose.ui.graphics.colorspace.ColorSpace getOklab();
+ method public androidx.compose.ui.graphics.colorspace.Rgb getProPhotoRgb();
+ method public androidx.compose.ui.graphics.colorspace.Rgb getSmpteC();
+ method public androidx.compose.ui.graphics.colorspace.Rgb getSrgb();
+ method public androidx.compose.ui.graphics.colorspace.ColorSpace? match(float[] toXYZD50, androidx.compose.ui.graphics.colorspace.TransferParameters function);
+ property public final androidx.compose.ui.graphics.colorspace.Rgb Aces;
+ property public final androidx.compose.ui.graphics.colorspace.Rgb Acescg;
+ property public final androidx.compose.ui.graphics.colorspace.Rgb AdobeRgb;
+ property public final androidx.compose.ui.graphics.colorspace.Rgb Bt2020;
+ property public final androidx.compose.ui.graphics.colorspace.Rgb Bt709;
+ property public final androidx.compose.ui.graphics.colorspace.ColorSpace CieLab;
+ property public final androidx.compose.ui.graphics.colorspace.ColorSpace CieXyz;
+ property public final androidx.compose.ui.graphics.colorspace.Rgb DciP3;
+ property public final androidx.compose.ui.graphics.colorspace.Rgb DisplayP3;
+ property public final androidx.compose.ui.graphics.colorspace.Rgb ExtendedSrgb;
+ property public final androidx.compose.ui.graphics.colorspace.Rgb LinearExtendedSrgb;
+ property public final androidx.compose.ui.graphics.colorspace.Rgb LinearSrgb;
+ property public final androidx.compose.ui.graphics.colorspace.Rgb Ntsc1953;
+ property public final androidx.compose.ui.graphics.colorspace.ColorSpace Oklab;
+ property public final androidx.compose.ui.graphics.colorspace.Rgb ProPhotoRgb;
+ property public final androidx.compose.ui.graphics.colorspace.Rgb SmpteC;
+ property public final androidx.compose.ui.graphics.colorspace.Rgb Srgb;
+ field public static final androidx.compose.ui.graphics.colorspace.ColorSpaces INSTANCE;
+ }
+
+ public class Connector {
+ method public final androidx.compose.ui.graphics.colorspace.ColorSpace getDestination();
+ method public final int getRenderIntent();
+ method public final androidx.compose.ui.graphics.colorspace.ColorSpace getSource();
+ method public final float[] transform(float r, float g, float b);
+ method public float[] transform(float[] v);
+ property public final androidx.compose.ui.graphics.colorspace.ColorSpace destination;
+ property public final int renderIntent;
+ property public final androidx.compose.ui.graphics.colorspace.ColorSpace source;
+ }
+
+ public final class Illuminant {
+ method public androidx.compose.ui.graphics.colorspace.WhitePoint getA();
+ method public androidx.compose.ui.graphics.colorspace.WhitePoint getB();
+ method public androidx.compose.ui.graphics.colorspace.WhitePoint getC();
+ method public androidx.compose.ui.graphics.colorspace.WhitePoint getD50();
+ method public androidx.compose.ui.graphics.colorspace.WhitePoint getD55();
+ method public androidx.compose.ui.graphics.colorspace.WhitePoint getD60();
+ method public androidx.compose.ui.graphics.colorspace.WhitePoint getD65();
+ method public androidx.compose.ui.graphics.colorspace.WhitePoint getD75();
+ method public androidx.compose.ui.graphics.colorspace.WhitePoint getE();
+ property public final androidx.compose.ui.graphics.colorspace.WhitePoint A;
+ property public final androidx.compose.ui.graphics.colorspace.WhitePoint B;
+ property public final androidx.compose.ui.graphics.colorspace.WhitePoint C;
+ property public final androidx.compose.ui.graphics.colorspace.WhitePoint D50;
+ property public final androidx.compose.ui.graphics.colorspace.WhitePoint D55;
+ property public final androidx.compose.ui.graphics.colorspace.WhitePoint D60;
+ property public final androidx.compose.ui.graphics.colorspace.WhitePoint D65;
+ property public final androidx.compose.ui.graphics.colorspace.WhitePoint D75;
+ property public final androidx.compose.ui.graphics.colorspace.WhitePoint E;
+ field public static final androidx.compose.ui.graphics.colorspace.Illuminant INSTANCE;
+ }
+
+ @androidx.compose.runtime.Immutable @kotlin.jvm.JvmInline public final value class RenderIntent {
+ field public static final androidx.compose.ui.graphics.colorspace.RenderIntent.Companion Companion;
+ }
+
+ public static final class RenderIntent.Companion {
+ method public int getAbsolute();
+ method public int getPerceptual();
+ method public int getRelative();
+ method public int getSaturation();
+ property public final int Absolute;
+ property public final int Perceptual;
+ property public final int Relative;
+ property public final int Saturation;
+ }
+
+ public final class Rgb extends androidx.compose.ui.graphics.colorspace.ColorSpace {
+ ctor public Rgb(String name, float[] toXYZ, kotlin.jvm.functions.Function1<? super java.lang.Double,java.lang.Double> oetf, kotlin.jvm.functions.Function1<? super java.lang.Double,java.lang.Double> eotf);
+ ctor public Rgb(String name, float[] primaries, androidx.compose.ui.graphics.colorspace.WhitePoint whitePoint, kotlin.jvm.functions.Function1<? super java.lang.Double,java.lang.Double> oetf, kotlin.jvm.functions.Function1<? super java.lang.Double,java.lang.Double> eotf, float min, float max);
+ ctor public Rgb(String name, float[] toXYZ, androidx.compose.ui.graphics.colorspace.TransferParameters function);
+ ctor public Rgb(String name, float[] primaries, androidx.compose.ui.graphics.colorspace.WhitePoint whitePoint, androidx.compose.ui.graphics.colorspace.TransferParameters function);
+ ctor public Rgb(String name, float[] toXYZ, double gamma);
+ ctor public Rgb(String name, float[] primaries, androidx.compose.ui.graphics.colorspace.WhitePoint whitePoint, double gamma);
+ method public float[] fromLinear(float r, float g, float b);
+ method public float[] fromLinear(float[] v);
+ method public float[] fromXyz(float[] v);
+ method public kotlin.jvm.functions.Function1<java.lang.Double,java.lang.Double> getEotf();
+ method public float[] getInverseTransform();
+ method public float[] getInverseTransform(float[] inverseTransform);
+ method public float getMaxValue(int component);
+ method public float getMinValue(int component);
+ method public kotlin.jvm.functions.Function1<java.lang.Double,java.lang.Double> getOetf();
+ method public float[] getPrimaries();
+ method public float[] getPrimaries(float[] primaries);
+ method public androidx.compose.ui.graphics.colorspace.TransferParameters? getTransferParameters();
+ method public float[] getTransform();
+ method public float[] getTransform(float[] transform);
+ method public androidx.compose.ui.graphics.colorspace.WhitePoint getWhitePoint();
+ method public boolean isWideGamut();
+ method public float[] toLinear(float r, float g, float b);
+ method public float[] toLinear(float[] v);
+ method public float[] toXyz(float[] v);
+ property public final kotlin.jvm.functions.Function1<java.lang.Double,java.lang.Double> eotf;
+ property public boolean isSrgb;
+ property public boolean isWideGamut;
+ property public final kotlin.jvm.functions.Function1<java.lang.Double,java.lang.Double> oetf;
+ property public final androidx.compose.ui.graphics.colorspace.TransferParameters? transferParameters;
+ property public final androidx.compose.ui.graphics.colorspace.WhitePoint whitePoint;
+ }
+
+ public final class TransferParameters {
+ ctor public TransferParameters(double gamma, double a, double b, double c, double d, optional double e, optional double f);
+ method public double component1();
+ method public double component2();
+ method public double component3();
+ method public double component4();
+ method public double component5();
+ method public double component6();
+ method public double component7();
+ method public androidx.compose.ui.graphics.colorspace.TransferParameters copy(double gamma, double a, double b, double c, double d, double e, double f);
+ method public double getA();
+ method public double getB();
+ method public double getC();
+ method public double getD();
+ method public double getE();
+ method public double getF();
+ method public double getGamma();
+ property public final double a;
+ property public final double b;
+ property public final double c;
+ property public final double d;
+ property public final double e;
+ property public final double f;
+ property public final double gamma;
+ }
+
+ public final class WhitePoint {
+ ctor public WhitePoint(float x, float y);
+ ctor public WhitePoint(float x, float y, float z);
+ method public float component1();
+ method public float component2();
+ method public androidx.compose.ui.graphics.colorspace.WhitePoint copy(float x, float y);
+ method public float getX();
+ method public float getY();
+ property public final float x;
+ property public final float y;
+ }
+
+}
+
+package androidx.compose.ui.graphics.drawscope {
+
+ public final class CanvasDrawScope implements androidx.compose.ui.graphics.drawscope.DrawScope {
+ ctor public CanvasDrawScope();
+ method public inline void draw(androidx.compose.ui.unit.Density density, androidx.compose.ui.unit.LayoutDirection layoutDirection, androidx.compose.ui.graphics.Canvas canvas, long size, kotlin.jvm.functions.Function1<? super androidx.compose.ui.graphics.drawscope.DrawScope,kotlin.Unit> block);
+ method public void drawArc(androidx.compose.ui.graphics.Brush brush, float startAngle, float sweepAngle, boolean useCenter, long topLeft, long size, float alpha, androidx.compose.ui.graphics.drawscope.DrawStyle style, androidx.compose.ui.graphics.ColorFilter? colorFilter, int blendMode);
+ method public void drawArc(long color, float startAngle, float sweepAngle, boolean useCenter, long topLeft, long size, float alpha, androidx.compose.ui.graphics.drawscope.DrawStyle style, androidx.compose.ui.graphics.ColorFilter? colorFilter, int blendMode);
+ method public void drawCircle(androidx.compose.ui.graphics.Brush brush, float radius, long center, float alpha, androidx.compose.ui.graphics.drawscope.DrawStyle style, androidx.compose.ui.graphics.ColorFilter? colorFilter, int blendMode);
+ method public void drawCircle(long color, float radius, long center, float alpha, androidx.compose.ui.graphics.drawscope.DrawStyle style, androidx.compose.ui.graphics.ColorFilter? colorFilter, int blendMode);
+ method public void drawImage(androidx.compose.ui.graphics.ImageBitmap image, long topLeft, float alpha, androidx.compose.ui.graphics.drawscope.DrawStyle style, androidx.compose.ui.graphics.ColorFilter? colorFilter, int blendMode);
+ method @Deprecated public void drawImage(androidx.compose.ui.graphics.ImageBitmap image, long srcOffset, long srcSize, long dstOffset, long dstSize, float alpha, androidx.compose.ui.graphics.drawscope.DrawStyle style, androidx.compose.ui.graphics.ColorFilter? colorFilter, int blendMode);
+ method public void drawLine(androidx.compose.ui.graphics.Brush brush, long start, long end, float strokeWidth, int cap, androidx.compose.ui.graphics.PathEffect? pathEffect, float alpha, androidx.compose.ui.graphics.ColorFilter? colorFilter, int blendMode);
+ method public void drawLine(long color, long start, long end, float strokeWidth, int cap, androidx.compose.ui.graphics.PathEffect? pathEffect, float alpha, androidx.compose.ui.graphics.ColorFilter? colorFilter, int blendMode);
+ method public void drawOval(androidx.compose.ui.graphics.Brush brush, long topLeft, long size, float alpha, androidx.compose.ui.graphics.drawscope.DrawStyle style, androidx.compose.ui.graphics.ColorFilter? colorFilter, int blendMode);
+ method public void drawOval(long color, long topLeft, long size, float alpha, androidx.compose.ui.graphics.drawscope.DrawStyle style, androidx.compose.ui.graphics.ColorFilter? colorFilter, int blendMode);
+ method public void drawPath(androidx.compose.ui.graphics.Path path, long color, float alpha, androidx.compose.ui.graphics.drawscope.DrawStyle style, androidx.compose.ui.graphics.ColorFilter? colorFilter, int blendMode);
+ method public void drawPath(androidx.compose.ui.graphics.Path path, androidx.compose.ui.graphics.Brush brush, float alpha, androidx.compose.ui.graphics.drawscope.DrawStyle style, androidx.compose.ui.graphics.ColorFilter? colorFilter, int blendMode);
+ method public void drawPoints(java.util.List<androidx.compose.ui.geometry.Offset> points, int pointMode, long color, float strokeWidth, int cap, androidx.compose.ui.graphics.PathEffect? pathEffect, float alpha, androidx.compose.ui.graphics.ColorFilter? colorFilter, int blendMode);
+ method public void drawPoints(java.util.List<androidx.compose.ui.geometry.Offset> points, int pointMode, androidx.compose.ui.graphics.Brush brush, float strokeWidth, int cap, androidx.compose.ui.graphics.PathEffect? pathEffect, float alpha, androidx.compose.ui.graphics.ColorFilter? colorFilter, int blendMode);
+ method public void drawRect(androidx.compose.ui.graphics.Brush brush, long topLeft, long size, float alpha, androidx.compose.ui.graphics.drawscope.DrawStyle style, androidx.compose.ui.graphics.ColorFilter? colorFilter, int blendMode);
+ method public void drawRect(long color, long topLeft, long size, float alpha, androidx.compose.ui.graphics.drawscope.DrawStyle style, androidx.compose.ui.graphics.ColorFilter? colorFilter, int blendMode);
+ method public void drawRoundRect(androidx.compose.ui.graphics.Brush brush, long topLeft, long size, long cornerRadius, float alpha, androidx.compose.ui.graphics.drawscope.DrawStyle style, androidx.compose.ui.graphics.ColorFilter? colorFilter, int blendMode);
+ method public void drawRoundRect(long color, long topLeft, long size, long cornerRadius, androidx.compose.ui.graphics.drawscope.DrawStyle style, float alpha, androidx.compose.ui.graphics.ColorFilter? colorFilter, int blendMode);
+ method public float getDensity();
+ method public androidx.compose.ui.graphics.drawscope.DrawContext getDrawContext();
+ method public float getFontScale();
+ method public androidx.compose.ui.unit.LayoutDirection getLayoutDirection();
+ property public float density;
+ property public androidx.compose.ui.graphics.drawscope.DrawContext drawContext;
+ property public float fontScale;
+ property public androidx.compose.ui.unit.LayoutDirection layoutDirection;
+ }
+
+ public final class CanvasDrawScopeKt {
+ }
+
+ public interface ContentDrawScope extends androidx.compose.ui.graphics.drawscope.DrawScope {
+ method public void drawContent();
+ }
+
+ public interface DrawContext {
+ method public androidx.compose.ui.graphics.Canvas getCanvas();
+ method public long getSize();
+ method public androidx.compose.ui.graphics.drawscope.DrawTransform getTransform();
+ method public void setSize(long);
+ property public abstract androidx.compose.ui.graphics.Canvas canvas;
+ property public abstract long size;
+ property public abstract androidx.compose.ui.graphics.drawscope.DrawTransform transform;
+ }
+
+ @androidx.compose.ui.graphics.drawscope.DrawScopeMarker public interface DrawScope extends androidx.compose.ui.unit.Density {
+ method public void drawArc(androidx.compose.ui.graphics.Brush brush, float startAngle, float sweepAngle, boolean useCenter, optional long topLeft, optional long size, optional float alpha, optional androidx.compose.ui.graphics.drawscope.DrawStyle style, optional androidx.compose.ui.graphics.ColorFilter? colorFilter, optional int blendMode);
+ method public void drawArc(long color, float startAngle, float sweepAngle, boolean useCenter, optional long topLeft, optional long size, optional float alpha, optional androidx.compose.ui.graphics.drawscope.DrawStyle style, optional androidx.compose.ui.graphics.ColorFilter? colorFilter, optional int blendMode);
+ method public void drawCircle(androidx.compose.ui.graphics.Brush brush, optional float radius, optional long center, optional float alpha, optional androidx.compose.ui.graphics.drawscope.DrawStyle style, optional androidx.compose.ui.graphics.ColorFilter? colorFilter, optional int blendMode);
+ method public void drawCircle(long color, optional float radius, optional long center, optional float alpha, optional androidx.compose.ui.graphics.drawscope.DrawStyle style, optional androidx.compose.ui.graphics.ColorFilter? colorFilter, optional int blendMode);
+ method public void drawImage(androidx.compose.ui.graphics.ImageBitmap image, optional long topLeft, optional float alpha, optional androidx.compose.ui.graphics.drawscope.DrawStyle style, optional androidx.compose.ui.graphics.ColorFilter? colorFilter, optional int blendMode);
+ method public default void drawImage(androidx.compose.ui.graphics.ImageBitmap image, optional long srcOffset, optional long srcSize, optional long dstOffset, optional long dstSize, optional float alpha, optional androidx.compose.ui.graphics.drawscope.DrawStyle style, optional androidx.compose.ui.graphics.ColorFilter? colorFilter, optional int blendMode, optional int filterQuality);
+ method @Deprecated public void drawImage(androidx.compose.ui.graphics.ImageBitmap image, optional long srcOffset, optional long srcSize, optional long dstOffset, optional long dstSize, optional float alpha, optional androidx.compose.ui.graphics.drawscope.DrawStyle style, optional androidx.compose.ui.graphics.ColorFilter? colorFilter, optional int blendMode);
+ method public void drawLine(androidx.compose.ui.graphics.Brush brush, long start, long end, optional float strokeWidth, optional int cap, optional androidx.compose.ui.graphics.PathEffect? pathEffect, optional float alpha, optional androidx.compose.ui.graphics.ColorFilter? colorFilter, optional int blendMode);
+ method public void drawLine(long color, long start, long end, optional float strokeWidth, optional int cap, optional androidx.compose.ui.graphics.PathEffect? pathEffect, optional float alpha, optional androidx.compose.ui.graphics.ColorFilter? colorFilter, optional int blendMode);
+ method public void drawOval(androidx.compose.ui.graphics.Brush brush, optional long topLeft, optional long size, optional float alpha, optional androidx.compose.ui.graphics.drawscope.DrawStyle style, optional androidx.compose.ui.graphics.ColorFilter? colorFilter, optional int blendMode);
+ method public void drawOval(long color, optional long topLeft, optional long size, optional float alpha, optional androidx.compose.ui.graphics.drawscope.DrawStyle style, optional androidx.compose.ui.graphics.ColorFilter? colorFilter, optional int blendMode);
+ method public void drawPath(androidx.compose.ui.graphics.Path path, long color, optional float alpha, optional androidx.compose.ui.graphics.drawscope.DrawStyle style, optional androidx.compose.ui.graphics.ColorFilter? colorFilter, optional int blendMode);
+ method public void drawPath(androidx.compose.ui.graphics.Path path, androidx.compose.ui.graphics.Brush brush, optional float alpha, optional androidx.compose.ui.graphics.drawscope.DrawStyle style, optional androidx.compose.ui.graphics.ColorFilter? colorFilter, optional int blendMode);
+ method public void drawPoints(java.util.List<androidx.compose.ui.geometry.Offset> points, int pointMode, long color, optional float strokeWidth, optional int cap, optional androidx.compose.ui.graphics.PathEffect? pathEffect, optional float alpha, optional androidx.compose.ui.graphics.ColorFilter? colorFilter, optional int blendMode);
+ method public void drawPoints(java.util.List<androidx.compose.ui.geometry.Offset> points, int pointMode, androidx.compose.ui.graphics.Brush brush, optional float strokeWidth, optional int cap, optional androidx.compose.ui.graphics.PathEffect? pathEffect, optional float alpha, optional androidx.compose.ui.graphics.ColorFilter? colorFilter, optional int blendMode);
+ method public void drawRect(androidx.compose.ui.graphics.Brush brush, optional long topLeft, optional long size, optional float alpha, optional androidx.compose.ui.graphics.drawscope.DrawStyle style, optional androidx.compose.ui.graphics.ColorFilter? colorFilter, optional int blendMode);
+ method public void drawRect(long color, optional long topLeft, optional long size, optional float alpha, optional androidx.compose.ui.graphics.drawscope.DrawStyle style, optional androidx.compose.ui.graphics.ColorFilter? colorFilter, optional int blendMode);
+ method public void drawRoundRect(androidx.compose.ui.graphics.Brush brush, optional long topLeft, optional long size, optional long cornerRadius, optional float alpha, optional androidx.compose.ui.graphics.drawscope.DrawStyle style, optional androidx.compose.ui.graphics.ColorFilter? colorFilter, optional int blendMode);
+ method public void drawRoundRect(long color, optional long topLeft, optional long size, optional long cornerRadius, optional androidx.compose.ui.graphics.drawscope.DrawStyle style, optional float alpha, optional androidx.compose.ui.graphics.ColorFilter? colorFilter, optional int blendMode);
+ method public default long getCenter();
+ method public androidx.compose.ui.graphics.drawscope.DrawContext getDrawContext();
+ method public androidx.compose.ui.unit.LayoutDirection getLayoutDirection();
+ method public default long getSize();
+ property public default long center;
+ property public abstract androidx.compose.ui.graphics.drawscope.DrawContext drawContext;
+ property public abstract androidx.compose.ui.unit.LayoutDirection layoutDirection;
+ property public default long size;
+ field public static final androidx.compose.ui.graphics.drawscope.DrawScope.Companion Companion;
+ }
+
+ public static final class DrawScope.Companion {
+ method public int getDefaultBlendMode();
+ method public int getDefaultFilterQuality();
+ property public final int DefaultBlendMode;
+ property public final int DefaultFilterQuality;
+ }
+
+ public final class DrawScopeKt {
+ method public static inline void clipPath(androidx.compose.ui.graphics.drawscope.DrawScope, androidx.compose.ui.graphics.Path path, optional int clipOp, kotlin.jvm.functions.Function1<? super androidx.compose.ui.graphics.drawscope.DrawScope,kotlin.Unit> block);
+ method public static inline void clipRect(androidx.compose.ui.graphics.drawscope.DrawScope, optional float left, optional float top, optional float right, optional float bottom, optional int clipOp, kotlin.jvm.functions.Function1<? super androidx.compose.ui.graphics.drawscope.DrawScope,kotlin.Unit> block);
+ method public static inline void drawIntoCanvas(androidx.compose.ui.graphics.drawscope.DrawScope, kotlin.jvm.functions.Function1<? super androidx.compose.ui.graphics.Canvas,kotlin.Unit> block);
+ method public static inline void inset(androidx.compose.ui.graphics.drawscope.DrawScope, float left, float top, float right, float bottom, kotlin.jvm.functions.Function1<? super androidx.compose.ui.graphics.drawscope.DrawScope,kotlin.Unit> block);
+ method public static inline void inset(androidx.compose.ui.graphics.drawscope.DrawScope, float inset, kotlin.jvm.functions.Function1<? super androidx.compose.ui.graphics.drawscope.DrawScope,kotlin.Unit> block);
+ method public static inline void inset(androidx.compose.ui.graphics.drawscope.DrawScope, optional float horizontal, optional float vertical, kotlin.jvm.functions.Function1<? super androidx.compose.ui.graphics.drawscope.DrawScope,kotlin.Unit> block);
+ method public static inline void rotate(androidx.compose.ui.graphics.drawscope.DrawScope, float degrees, optional long pivot, kotlin.jvm.functions.Function1<? super androidx.compose.ui.graphics.drawscope.DrawScope,kotlin.Unit> block);
+ method public static inline void rotateRad(androidx.compose.ui.graphics.drawscope.DrawScope, float radians, optional long pivot, kotlin.jvm.functions.Function1<? super androidx.compose.ui.graphics.drawscope.DrawScope,kotlin.Unit> block);
+ method public static inline void scale(androidx.compose.ui.graphics.drawscope.DrawScope, float scaleX, float scaleY, optional long pivot, kotlin.jvm.functions.Function1<? super androidx.compose.ui.graphics.drawscope.DrawScope,kotlin.Unit> block);
+ method public static inline void scale(androidx.compose.ui.graphics.drawscope.DrawScope, float scale, optional long pivot, kotlin.jvm.functions.Function1<? super androidx.compose.ui.graphics.drawscope.DrawScope,kotlin.Unit> block);
+ method public static inline void translate(androidx.compose.ui.graphics.drawscope.DrawScope, optional float left, optional float top, kotlin.jvm.functions.Function1<? super androidx.compose.ui.graphics.drawscope.DrawScope,kotlin.Unit> block);
+ method public static inline void withTransform(androidx.compose.ui.graphics.drawscope.DrawScope, kotlin.jvm.functions.Function1<? super androidx.compose.ui.graphics.drawscope.DrawTransform,kotlin.Unit> transformBlock, kotlin.jvm.functions.Function1<? super androidx.compose.ui.graphics.drawscope.DrawScope,kotlin.Unit> drawBlock);
+ }
+
+ @kotlin.DslMarker public @interface DrawScopeMarker {
+ }
+
+ public abstract sealed class DrawStyle {
+ }
+
+ @androidx.compose.ui.graphics.drawscope.DrawScopeMarker public interface DrawTransform {
+ method public void clipPath(androidx.compose.ui.graphics.Path path, optional int clipOp);
+ method public void clipRect(optional float left, optional float top, optional float right, optional float bottom, optional int clipOp);
+ method public default long getCenter();
+ method public long getSize();
+ method public void inset(float left, float top, float right, float bottom);
+ method public void rotate(float degrees, optional long pivot);
+ method public void scale(float scaleX, float scaleY, optional long pivot);
+ method public void transform(float[] matrix);
+ method public void translate(optional float left, optional float top);
+ property public default long center;
+ property public abstract long size;
+ }
+
+ public final class DrawTransformKt {
+ method public static inline void inset(androidx.compose.ui.graphics.drawscope.DrawTransform, optional float horizontal, optional float vertical);
+ method public static inline void inset(androidx.compose.ui.graphics.drawscope.DrawTransform, float inset);
+ method public static inline void rotateRad(androidx.compose.ui.graphics.drawscope.DrawTransform, float radians, optional long pivot);
+ method public static inline void scale(androidx.compose.ui.graphics.drawscope.DrawTransform, float scale, optional long pivot);
+ }
+
+ public final class Fill extends androidx.compose.ui.graphics.drawscope.DrawStyle {
+ field public static final androidx.compose.ui.graphics.drawscope.Fill INSTANCE;
+ }
+
+ public final class Stroke extends androidx.compose.ui.graphics.drawscope.DrawStyle {
+ ctor public Stroke(optional float width, optional float miter, optional int cap, optional int join, optional androidx.compose.ui.graphics.PathEffect? pathEffect);
+ method public int getCap();
+ method public int getJoin();
+ method public float getMiter();
+ method public androidx.compose.ui.graphics.PathEffect? getPathEffect();
+ method public float getWidth();
+ property public final int cap;
+ property public final int join;
+ property public final float miter;
+ property public final androidx.compose.ui.graphics.PathEffect? pathEffect;
+ property public final float width;
+ field public static final androidx.compose.ui.graphics.drawscope.Stroke.Companion Companion;
+ field public static final float DefaultMiter = 4.0f;
+ field public static final float HairlineWidth = 0.0f;
+ }
+
+ public static final class Stroke.Companion {
+ method public int getDefaultCap();
+ method public int getDefaultJoin();
+ property public final int DefaultCap;
+ property public final int DefaultJoin;
+ }
+
+}
+
+package androidx.compose.ui.graphics.painter {
+
+ public final class BitmapPainter extends androidx.compose.ui.graphics.painter.Painter {
+ ctor public BitmapPainter(androidx.compose.ui.graphics.ImageBitmap image, optional long srcOffset, optional long srcSize);
+ method public long getIntrinsicSize();
+ method protected void onDraw(androidx.compose.ui.graphics.drawscope.DrawScope);
+ property public long intrinsicSize;
+ }
+
+ public final class BitmapPainterKt {
+ method public static androidx.compose.ui.graphics.painter.BitmapPainter BitmapPainter(androidx.compose.ui.graphics.ImageBitmap image, optional long srcOffset, optional long srcSize, optional int filterQuality);
+ }
+
+ public final class BrushPainter extends androidx.compose.ui.graphics.painter.Painter {
+ ctor public BrushPainter(androidx.compose.ui.graphics.Brush brush);
+ method public androidx.compose.ui.graphics.Brush getBrush();
+ method public long getIntrinsicSize();
+ method protected void onDraw(androidx.compose.ui.graphics.drawscope.DrawScope);
+ property public final androidx.compose.ui.graphics.Brush brush;
+ property public long intrinsicSize;
+ }
+
+ public final class ColorPainter extends androidx.compose.ui.graphics.painter.Painter {
+ ctor public ColorPainter(long color);
+ method public long getColor();
+ method public long getIntrinsicSize();
+ method protected void onDraw(androidx.compose.ui.graphics.drawscope.DrawScope);
+ property public final long color;
+ property public long intrinsicSize;
+ }
+
+ public abstract class Painter {
+ ctor public Painter();
+ method protected boolean applyAlpha(float alpha);
+ method protected boolean applyColorFilter(androidx.compose.ui.graphics.ColorFilter? colorFilter);
+ method protected boolean applyLayoutDirection(androidx.compose.ui.unit.LayoutDirection layoutDirection);
+ method public final void draw(androidx.compose.ui.graphics.drawscope.DrawScope, long size, optional float alpha, optional androidx.compose.ui.graphics.ColorFilter? colorFilter);
+ method public abstract long getIntrinsicSize();
+ method protected abstract void onDraw(androidx.compose.ui.graphics.drawscope.DrawScope);
+ property public abstract long intrinsicSize;
+ }
+
+}
+
+package androidx.compose.ui.graphics.vector {
+
+ public final class PathBuilder {
+ ctor public PathBuilder();
+ method public androidx.compose.ui.graphics.vector.PathBuilder arcTo(float horizontalEllipseRadius, float verticalEllipseRadius, float theta, boolean isMoreThanHalf, boolean isPositiveArc, float x1, float y1);
+ method public androidx.compose.ui.graphics.vector.PathBuilder arcToRelative(float a, float b, float theta, boolean isMoreThanHalf, boolean isPositiveArc, float dx1, float dy1);
+ method public androidx.compose.ui.graphics.vector.PathBuilder close();
+ method public androidx.compose.ui.graphics.vector.PathBuilder curveTo(float x1, float y1, float x2, float y2, float x3, float y3);
+ method public androidx.compose.ui.graphics.vector.PathBuilder curveToRelative(float dx1, float dy1, float dx2, float dy2, float dx3, float dy3);
+ method public java.util.List<androidx.compose.ui.graphics.vector.PathNode> getNodes();
+ method public androidx.compose.ui.graphics.vector.PathBuilder horizontalLineTo(float x);
+ method public androidx.compose.ui.graphics.vector.PathBuilder horizontalLineToRelative(float dx);
+ method public androidx.compose.ui.graphics.vector.PathBuilder lineTo(float x, float y);
+ method public androidx.compose.ui.graphics.vector.PathBuilder lineToRelative(float dx, float dy);
+ method public androidx.compose.ui.graphics.vector.PathBuilder moveTo(float x, float y);
+ method public androidx.compose.ui.graphics.vector.PathBuilder moveToRelative(float dx, float dy);
+ method public androidx.compose.ui.graphics.vector.PathBuilder quadTo(float x1, float y1, float x2, float y2);
+ method public androidx.compose.ui.graphics.vector.PathBuilder quadToRelative(float dx1, float dy1, float dx2, float dy2);
+ method public androidx.compose.ui.graphics.vector.PathBuilder reflectiveCurveTo(float x1, float y1, float x2, float y2);
+ method public androidx.compose.ui.graphics.vector.PathBuilder reflectiveCurveToRelative(float dx1, float dy1, float dx2, float dy2);
+ method public androidx.compose.ui.graphics.vector.PathBuilder reflectiveQuadTo(float x1, float y1);
+ method public androidx.compose.ui.graphics.vector.PathBuilder reflectiveQuadToRelative(float dx1, float dy1);
+ method public androidx.compose.ui.graphics.vector.PathBuilder verticalLineTo(float y);
+ method public androidx.compose.ui.graphics.vector.PathBuilder verticalLineToRelative(float dy);
+ }
+
+ @androidx.compose.runtime.Immutable public abstract sealed class PathNode {
+ method public final boolean isCurve();
+ method public final boolean isQuad();
+ property public final boolean isCurve;
+ property public final boolean isQuad;
+ }
+
+ @androidx.compose.runtime.Immutable public static final class PathNode.ArcTo extends androidx.compose.ui.graphics.vector.PathNode {
+ ctor public PathNode.ArcTo(float horizontalEllipseRadius, float verticalEllipseRadius, float theta, boolean isMoreThanHalf, boolean isPositiveArc, float arcStartX, float arcStartY);
+ method public float component1();
+ method public float component2();
+ method public float component3();
+ method public boolean component4();
+ method public boolean component5();
+ method public float component6();
+ method public float component7();
+ method public androidx.compose.ui.graphics.vector.PathNode.ArcTo copy(float horizontalEllipseRadius, float verticalEllipseRadius, float theta, boolean isMoreThanHalf, boolean isPositiveArc, float arcStartX, float arcStartY);
+ method public float getArcStartX();
+ method public float getArcStartY();
+ method public float getHorizontalEllipseRadius();
+ method public float getTheta();
+ method public float getVerticalEllipseRadius();
+ method public boolean isMoreThanHalf();
+ method public boolean isPositiveArc();
+ property public final float arcStartX;
+ property public final float arcStartY;
+ property public final float horizontalEllipseRadius;
+ property public final boolean isMoreThanHalf;
+ property public final boolean isPositiveArc;
+ property public final float theta;
+ property public final float verticalEllipseRadius;
+ }
+
+ @androidx.compose.runtime.Immutable public static final class PathNode.Close extends androidx.compose.ui.graphics.vector.PathNode {
+ field public static final androidx.compose.ui.graphics.vector.PathNode.Close INSTANCE;
+ }
+
+ @androidx.compose.runtime.Immutable public static final class PathNode.CurveTo extends androidx.compose.ui.graphics.vector.PathNode {
+ ctor public PathNode.CurveTo(float x1, float y1, float x2, float y2, float x3, float y3);
+ method public float component1();
+ method public float component2();
+ method public float component3();
+ method public float component4();
+ method public float component5();
+ method public float component6();
+ method public androidx.compose.ui.graphics.vector.PathNode.CurveTo copy(float x1, float y1, float x2, float y2, float x3, float y3);
+ method public float getX1();
+ method public float getX2();
+ method public float getX3();
+ method public float getY1();
+ method public float getY2();
+ method public float getY3();
+ property public final float x1;
+ property public final float x2;
+ property public final float x3;
+ property public final float y1;
+ property public final float y2;
+ property public final float y3;
+ }
+
+ @androidx.compose.runtime.Immutable public static final class PathNode.HorizontalTo extends androidx.compose.ui.graphics.vector.PathNode {
+ ctor public PathNode.HorizontalTo(float x);
+ method public float component1();
+ method public androidx.compose.ui.graphics.vector.PathNode.HorizontalTo copy(float x);
+ method public float getX();
+ property public final float x;
+ }
+
+ @androidx.compose.runtime.Immutable public static final class PathNode.LineTo extends androidx.compose.ui.graphics.vector.PathNode {
+ ctor public PathNode.LineTo(float x, float y);
+ method public float component1();
+ method public float component2();
+ method public androidx.compose.ui.graphics.vector.PathNode.LineTo copy(float x, float y);
+ method public float getX();
+ method public float getY();
+ property public final float x;
+ property public final float y;
+ }
+
+ @androidx.compose.runtime.Immutable public static final class PathNode.MoveTo extends androidx.compose.ui.graphics.vector.PathNode {
+ ctor public PathNode.MoveTo(float x, float y);
+ method public float component1();
+ method public float component2();
+ method public androidx.compose.ui.graphics.vector.PathNode.MoveTo copy(float x, float y);
+ method public float getX();
+ method public float getY();
+ property public final float x;
+ property public final float y;
+ }
+
+ @androidx.compose.runtime.Immutable public static final class PathNode.QuadTo extends androidx.compose.ui.graphics.vector.PathNode {
+ ctor public PathNode.QuadTo(float x1, float y1, float x2, float y2);
+ method public float component1();
+ method public float component2();
+ method public float component3();
+ method public float component4();
+ method public androidx.compose.ui.graphics.vector.PathNode.QuadTo copy(float x1, float y1, float x2, float y2);
+ method public float getX1();
+ method public float getX2();
+ method public float getY1();
+ method public float getY2();
+ property public final float x1;
+ property public final float x2;
+ property public final float y1;
+ property public final float y2;
+ }
+
+ @androidx.compose.runtime.Immutable public static final class PathNode.ReflectiveCurveTo extends androidx.compose.ui.graphics.vector.PathNode {
+ ctor public PathNode.ReflectiveCurveTo(float x1, float y1, float x2, float y2);
+ method public float component1();
+ method public float component2();
+ method public float component3();
+ method public float component4();
+ method public androidx.compose.ui.graphics.vector.PathNode.ReflectiveCurveTo copy(float x1, float y1, float x2, float y2);
+ method public float getX1();
+ method public float getX2();
+ method public float getY1();
+ method public float getY2();
+ property public final float x1;
+ property public final float x2;
+ property public final float y1;
+ property public final float y2;
+ }
+
+ @androidx.compose.runtime.Immutable public static final class PathNode.ReflectiveQuadTo extends androidx.compose.ui.graphics.vector.PathNode {
+ ctor public PathNode.ReflectiveQuadTo(float x, float y);
+ method public float component1();
+ method public float component2();
+ method public androidx.compose.ui.graphics.vector.PathNode.ReflectiveQuadTo copy(float x, float y);
+ method public float getX();
+ method public float getY();
+ property public final float x;
+ property public final float y;
+ }
+
+ @androidx.compose.runtime.Immutable public static final class PathNode.RelativeArcTo extends androidx.compose.ui.graphics.vector.PathNode {
+ ctor public PathNode.RelativeArcTo(float horizontalEllipseRadius, float verticalEllipseRadius, float theta, boolean isMoreThanHalf, boolean isPositiveArc, float arcStartDx, float arcStartDy);
+ method public float component1();
+ method public float component2();
+ method public float component3();
+ method public boolean component4();
+ method public boolean component5();
+ method public float component6();
+ method public float component7();
+ method public androidx.compose.ui.graphics.vector.PathNode.RelativeArcTo copy(float horizontalEllipseRadius, float verticalEllipseRadius, float theta, boolean isMoreThanHalf, boolean isPositiveArc, float arcStartDx, float arcStartDy);
+ method public float getArcStartDx();
+ method public float getArcStartDy();
+ method public float getHorizontalEllipseRadius();
+ method public float getTheta();
+ method public float getVerticalEllipseRadius();
+ method public boolean isMoreThanHalf();
+ method public boolean isPositiveArc();
+ property public final float arcStartDx;
+ property public final float arcStartDy;
+ property public final float horizontalEllipseRadius;
+ property public final boolean isMoreThanHalf;
+ property public final boolean isPositiveArc;
+ property public final float theta;
+ property public final float verticalEllipseRadius;
+ }
+
+ @androidx.compose.runtime.Immutable public static final class PathNode.RelativeCurveTo extends androidx.compose.ui.graphics.vector.PathNode {
+ ctor public PathNode.RelativeCurveTo(float dx1, float dy1, float dx2, float dy2, float dx3, float dy3);
+ method public float component1();
+ method public float component2();
+ method public float component3();
+ method public float component4();
+ method public float component5();
+ method public float component6();
+ method public androidx.compose.ui.graphics.vector.PathNode.RelativeCurveTo copy(float dx1, float dy1, float dx2, float dy2, float dx3, float dy3);
+ method public float getDx1();
+ method public float getDx2();
+ method public float getDx3();
+ method public float getDy1();
+ method public float getDy2();
+ method public float getDy3();
+ property public final float dx1;
+ property public final float dx2;
+ property public final float dx3;
+ property public final float dy1;
+ property public final float dy2;
+ property public final float dy3;
+ }
+
+ @androidx.compose.runtime.Immutable public static final class PathNode.RelativeHorizontalTo extends androidx.compose.ui.graphics.vector.PathNode {
+ ctor public PathNode.RelativeHorizontalTo(float dx);
+ method public float component1();
+ method public androidx.compose.ui.graphics.vector.PathNode.RelativeHorizontalTo copy(float dx);
+ method public float getDx();
+ property public final float dx;
+ }
+
+ @androidx.compose.runtime.Immutable public static final class PathNode.RelativeLineTo extends androidx.compose.ui.graphics.vector.PathNode {
+ ctor public PathNode.RelativeLineTo(float dx, float dy);
+ method public float component1();
+ method public float component2();
+ method public androidx.compose.ui.graphics.vector.PathNode.RelativeLineTo copy(float dx, float dy);
+ method public float getDx();
+ method public float getDy();
+ property public final float dx;
+ property public final float dy;
+ }
+
+ @androidx.compose.runtime.Immutable public static final class PathNode.RelativeMoveTo extends androidx.compose.ui.graphics.vector.PathNode {
+ ctor public PathNode.RelativeMoveTo(float dx, float dy);
+ method public float component1();
+ method public float component2();
+ method public androidx.compose.ui.graphics.vector.PathNode.RelativeMoveTo copy(float dx, float dy);
+ method public float getDx();
+ method public float getDy();
+ property public final float dx;
+ property public final float dy;
+ }
+
+ @androidx.compose.runtime.Immutable public static final class PathNode.RelativeQuadTo extends androidx.compose.ui.graphics.vector.PathNode {
+ ctor public PathNode.RelativeQuadTo(float dx1, float dy1, float dx2, float dy2);
+ method public float component1();
+ method public float component2();
+ method public float component3();
+ method public float component4();
+ method public androidx.compose.ui.graphics.vector.PathNode.RelativeQuadTo copy(float dx1, float dy1, float dx2, float dy2);
+ method public float getDx1();
+ method public float getDx2();
+ method public float getDy1();
+ method public float getDy2();
+ property public final float dx1;
+ property public final float dx2;
+ property public final float dy1;
+ property public final float dy2;
+ }
+
+ @androidx.compose.runtime.Immutable public static final class PathNode.RelativeReflectiveCurveTo extends androidx.compose.ui.graphics.vector.PathNode {
+ ctor public PathNode.RelativeReflectiveCurveTo(float dx1, float dy1, float dx2, float dy2);
+ method public float component1();
+ method public float component2();
+ method public float component3();
+ method public float component4();
+ method public androidx.compose.ui.graphics.vector.PathNode.RelativeReflectiveCurveTo copy(float dx1, float dy1, float dx2, float dy2);
+ method public float getDx1();
+ method public float getDx2();
+ method public float getDy1();
+ method public float getDy2();
+ property public final float dx1;
+ property public final float dx2;
+ property public final float dy1;
+ property public final float dy2;
+ }
+
+ @androidx.compose.runtime.Immutable public static final class PathNode.RelativeReflectiveQuadTo extends androidx.compose.ui.graphics.vector.PathNode {
+ ctor public PathNode.RelativeReflectiveQuadTo(float dx, float dy);
+ method public float component1();
+ method public float component2();
+ method public androidx.compose.ui.graphics.vector.PathNode.RelativeReflectiveQuadTo copy(float dx, float dy);
+ method public float getDx();
+ method public float getDy();
+ property public final float dx;
+ property public final float dy;
+ }
+
+ @androidx.compose.runtime.Immutable public static final class PathNode.RelativeVerticalTo extends androidx.compose.ui.graphics.vector.PathNode {
+ ctor public PathNode.RelativeVerticalTo(float dy);
+ method public float component1();
+ method public androidx.compose.ui.graphics.vector.PathNode.RelativeVerticalTo copy(float dy);
+ method public float getDy();
+ property public final float dy;
+ }
+
+ @androidx.compose.runtime.Immutable public static final class PathNode.VerticalTo extends androidx.compose.ui.graphics.vector.PathNode {
+ ctor public PathNode.VerticalTo(float y);
+ method public float component1();
+ method public androidx.compose.ui.graphics.vector.PathNode.VerticalTo copy(float y);
+ method public float getY();
+ property public final float y;
+ }
+
+ public final class PathNodeKt {
+ }
+
+ public final class PathParser {
+ ctor public PathParser();
+ method public androidx.compose.ui.graphics.vector.PathParser addPathNodes(java.util.List<? extends androidx.compose.ui.graphics.vector.PathNode> nodes);
+ method public void clear();
+ method public androidx.compose.ui.graphics.vector.PathParser parsePathString(String pathData);
+ method public java.util.List<androidx.compose.ui.graphics.vector.PathNode> toNodes();
+ method public androidx.compose.ui.graphics.Path toPath(optional androidx.compose.ui.graphics.Path target);
+ }
+
+}
+
diff --git a/compose/ui/ui-graphics/api/res-1.2.0-beta02.txt b/compose/ui/ui-graphics/api/res-1.2.0-beta02.txt
new file mode 100644
index 0000000..e69de29
--- /dev/null
+++ b/compose/ui/ui-graphics/api/res-1.2.0-beta02.txt
diff --git a/compose/ui/ui-graphics/api/restricted_1.2.0-beta02.txt b/compose/ui/ui-graphics/api/restricted_1.2.0-beta02.txt
new file mode 100644
index 0000000..c2cfbd2
--- /dev/null
+++ b/compose/ui/ui-graphics/api/restricted_1.2.0-beta02.txt
@@ -0,0 +1,1677 @@
+// Signature format: 4.0
+package androidx.compose.ui.graphics {
+
+ public final class AndroidBlendMode_androidKt {
+ method public static boolean isSupported(int);
+ }
+
+ @kotlin.PublishedApi internal final class AndroidCanvas implements androidx.compose.ui.graphics.Canvas {
+ ctor public AndroidCanvas();
+ method public void clipPath(androidx.compose.ui.graphics.Path path, int clipOp);
+ method public void clipRect(float left, float top, float right, float bottom, int clipOp);
+ method public void concat(float[] matrix);
+ method public void disableZ();
+ method public void drawArc(float left, float top, float right, float bottom, float startAngle, float sweepAngle, boolean useCenter, androidx.compose.ui.graphics.Paint paint);
+ method public void drawCircle(long center, float radius, androidx.compose.ui.graphics.Paint paint);
+ method public void drawImage(androidx.compose.ui.graphics.ImageBitmap image, long topLeftOffset, androidx.compose.ui.graphics.Paint paint);
+ method public void drawImageRect(androidx.compose.ui.graphics.ImageBitmap image, long srcOffset, long srcSize, long dstOffset, long dstSize, androidx.compose.ui.graphics.Paint paint);
+ method public void drawLine(long p1, long p2, androidx.compose.ui.graphics.Paint paint);
+ method public void drawOval(float left, float top, float right, float bottom, androidx.compose.ui.graphics.Paint paint);
+ method public void drawPath(androidx.compose.ui.graphics.Path path, androidx.compose.ui.graphics.Paint paint);
+ method public void drawPoints(int pointMode, java.util.List<androidx.compose.ui.geometry.Offset> points, androidx.compose.ui.graphics.Paint paint);
+ method public void drawRawPoints(int pointMode, float[] points, androidx.compose.ui.graphics.Paint paint);
+ method public void drawRect(float left, float top, float right, float bottom, androidx.compose.ui.graphics.Paint paint);
+ method public void drawRoundRect(float left, float top, float right, float bottom, float radiusX, float radiusY, androidx.compose.ui.graphics.Paint paint);
+ method public void drawVertices(androidx.compose.ui.graphics.Vertices vertices, int blendMode, androidx.compose.ui.graphics.Paint paint);
+ method public void enableZ();
+ method public void restore();
+ method public void rotate(float degrees);
+ method public void save();
+ method public void saveLayer(androidx.compose.ui.geometry.Rect bounds, androidx.compose.ui.graphics.Paint paint);
+ method public void scale(float sx, float sy);
+ method public void skew(float sx, float sy);
+ method public android.graphics.Region.Op toRegionOp(int);
+ method public void translate(float dx, float dy);
+ field @kotlin.PublishedApi internal android.graphics.Canvas internalCanvas;
+ }
+
+ public final class AndroidCanvas_androidKt {
+ method public static androidx.compose.ui.graphics.Canvas Canvas(android.graphics.Canvas c);
+ method public static android.graphics.Canvas getNativeCanvas(androidx.compose.ui.graphics.Canvas);
+ }
+
+ public final class AndroidColorFilter_androidKt {
+ method public static android.graphics.ColorFilter asAndroidColorFilter(androidx.compose.ui.graphics.ColorFilter);
+ method public static androidx.compose.ui.graphics.ColorFilter asComposeColorFilter(android.graphics.ColorFilter);
+ }
+
+ public final class AndroidImageBitmap_androidKt {
+ method public static android.graphics.Bitmap asAndroidBitmap(androidx.compose.ui.graphics.ImageBitmap);
+ method public static androidx.compose.ui.graphics.ImageBitmap asImageBitmap(android.graphics.Bitmap);
+ }
+
+ public final class AndroidMatrixConversions_androidKt {
+ method public static void setFrom(float[], android.graphics.Matrix matrix);
+ method public static void setFrom(android.graphics.Matrix, float[] matrix);
+ }
+
+ public final class AndroidPaint implements androidx.compose.ui.graphics.Paint {
+ ctor public AndroidPaint();
+ method public android.graphics.Paint asFrameworkPaint();
+ method public float getAlpha();
+ method public int getBlendMode();
+ method public long getColor();
+ method public androidx.compose.ui.graphics.ColorFilter? getColorFilter();
+ method public int getFilterQuality();
+ method public androidx.compose.ui.graphics.PathEffect? getPathEffect();
+ method public android.graphics.Shader? getShader();
+ method public int getStrokeCap();
+ method public int getStrokeJoin();
+ method public float getStrokeMiterLimit();
+ method public float getStrokeWidth();
+ method public int getStyle();
+ method public boolean isAntiAlias();
+ method public void setAlpha(float);
+ method public void setAntiAlias(boolean);
+ method public void setBlendMode(int);
+ method public void setColor(long);
+ method public void setColorFilter(androidx.compose.ui.graphics.ColorFilter?);
+ method public void setFilterQuality(int);
+ method public void setPathEffect(androidx.compose.ui.graphics.PathEffect?);
+ method public void setShader(android.graphics.Shader?);
+ method public void setStrokeCap(int);
+ method public void setStrokeJoin(int);
+ method public void setStrokeMiterLimit(float);
+ method public void setStrokeWidth(float);
+ method public void setStyle(int);
+ property public float alpha;
+ property public int blendMode;
+ property public long color;
+ property public androidx.compose.ui.graphics.ColorFilter? colorFilter;
+ property public int filterQuality;
+ property public boolean isAntiAlias;
+ property public androidx.compose.ui.graphics.PathEffect? pathEffect;
+ property public android.graphics.Shader? shader;
+ property public int strokeCap;
+ property public int strokeJoin;
+ property public float strokeMiterLimit;
+ property public float strokeWidth;
+ property public int style;
+ }
+
+ public final class AndroidPaint_androidKt {
+ method public static androidx.compose.ui.graphics.Paint Paint();
+ }
+
+ public final class AndroidPath implements androidx.compose.ui.graphics.Path {
+ ctor public AndroidPath(optional android.graphics.Path internalPath);
+ method public void addArc(androidx.compose.ui.geometry.Rect oval, float startAngleDegrees, float sweepAngleDegrees);
+ method public void addArcRad(androidx.compose.ui.geometry.Rect oval, float startAngleRadians, float sweepAngleRadians);
+ method public void addOval(androidx.compose.ui.geometry.Rect oval);
+ method public void addPath(androidx.compose.ui.graphics.Path path, long offset);
+ method public void addRect(androidx.compose.ui.geometry.Rect rect);
+ method public void addRoundRect(androidx.compose.ui.geometry.RoundRect roundRect);
+ method public void arcTo(androidx.compose.ui.geometry.Rect rect, float startAngleDegrees, float sweepAngleDegrees, boolean forceMoveTo);
+ method public void close();
+ method public void cubicTo(float x1, float y1, float x2, float y2, float x3, float y3);
+ method public androidx.compose.ui.geometry.Rect getBounds();
+ method public int getFillType();
+ method public android.graphics.Path getInternalPath();
+ method public boolean isConvex();
+ method public boolean isEmpty();
+ method public void lineTo(float x, float y);
+ method public void moveTo(float x, float y);
+ method public boolean op(androidx.compose.ui.graphics.Path path1, androidx.compose.ui.graphics.Path path2, int operation);
+ method public void quadraticBezierTo(float x1, float y1, float x2, float y2);
+ method public void relativeCubicTo(float dx1, float dy1, float dx2, float dy2, float dx3, float dy3);
+ method public void relativeLineTo(float dx, float dy);
+ method public void relativeMoveTo(float dx, float dy);
+ method public void relativeQuadraticBezierTo(float dx1, float dy1, float dx2, float dy2);
+ method public void reset();
+ method public void setFillType(int);
+ method public void translate(long offset);
+ property public int fillType;
+ property public final android.graphics.Path internalPath;
+ property public boolean isConvex;
+ property public boolean isEmpty;
+ }
+
+ public final class AndroidPathEffect_androidKt {
+ method public static android.graphics.PathEffect asAndroidPathEffect(androidx.compose.ui.graphics.PathEffect);
+ method public static androidx.compose.ui.graphics.PathEffect toComposePathEffect(android.graphics.PathEffect);
+ }
+
+ public final class AndroidPathMeasure implements androidx.compose.ui.graphics.PathMeasure {
+ method public float getLength();
+ method public boolean getSegment(float startDistance, float stopDistance, androidx.compose.ui.graphics.Path destination, boolean startWithMoveTo);
+ method public void setPath(androidx.compose.ui.graphics.Path? path, boolean forceClosed);
+ property public float length;
+ }
+
+ public final class AndroidPathMeasure_androidKt {
+ method public static androidx.compose.ui.graphics.PathMeasure PathMeasure();
+ }
+
+ public final class AndroidPath_androidKt {
+ method public static androidx.compose.ui.graphics.Path Path();
+ method public static inline android.graphics.Path asAndroidPath(androidx.compose.ui.graphics.Path);
+ method public static androidx.compose.ui.graphics.Path asComposePath(android.graphics.Path);
+ }
+
+ public final class AndroidRenderEffect_androidKt {
+ method public static androidx.compose.ui.graphics.RenderEffect asComposeRenderEffect(android.graphics.RenderEffect);
+ }
+
+ public final class AndroidShader_androidKt {
+ }
+
+ public final class AndroidTileMode_androidKt {
+ method public static boolean isSupported(int);
+ method public static android.graphics.Shader.TileMode toAndroidTileMode(int);
+ method public static int toComposeTileMode(android.graphics.Shader.TileMode);
+ }
+
+ public final class AndroidVertexMode_androidKt {
+ method public static android.graphics.Canvas.VertexMode toAndroidVertexMode(int);
+ }
+
+ @androidx.compose.runtime.Immutable @kotlin.jvm.JvmInline public final value class BlendMode {
+ field public static final androidx.compose.ui.graphics.BlendMode.Companion Companion;
+ }
+
+ public static final class BlendMode.Companion {
+ method public int getClear();
+ method public int getColor();
+ method public int getColorBurn();
+ method public int getColorDodge();
+ method public int getDarken();
+ method public int getDifference();
+ method public int getDst();
+ method public int getDstAtop();
+ method public int getDstIn();
+ method public int getDstOut();
+ method public int getDstOver();
+ method public int getExclusion();
+ method public int getHardlight();
+ method public int getHue();
+ method public int getLighten();
+ method public int getLuminosity();
+ method public int getModulate();
+ method public int getMultiply();
+ method public int getOverlay();
+ method public int getPlus();
+ method public int getSaturation();
+ method public int getScreen();
+ method public int getSoftlight();
+ method public int getSrc();
+ method public int getSrcAtop();
+ method public int getSrcIn();
+ method public int getSrcOut();
+ method public int getSrcOver();
+ method public int getXor();
+ property public final int Clear;
+ property public final int Color;
+ property public final int ColorBurn;
+ property public final int ColorDodge;
+ property public final int Darken;
+ property public final int Difference;
+ property public final int Dst;
+ property public final int DstAtop;
+ property public final int DstIn;
+ property public final int DstOut;
+ property public final int DstOver;
+ property public final int Exclusion;
+ property public final int Hardlight;
+ property public final int Hue;
+ property public final int Lighten;
+ property public final int Luminosity;
+ property public final int Modulate;
+ property public final int Multiply;
+ property public final int Overlay;
+ property public final int Plus;
+ property public final int Saturation;
+ property public final int Screen;
+ property public final int Softlight;
+ property public final int Src;
+ property public final int SrcAtop;
+ property public final int SrcIn;
+ property public final int SrcOut;
+ property public final int SrcOver;
+ property public final int Xor;
+ }
+
+ @androidx.compose.runtime.Immutable public final class BlurEffect extends androidx.compose.ui.graphics.RenderEffect {
+ ctor public BlurEffect(androidx.compose.ui.graphics.RenderEffect? renderEffect, float radiusX, float radiusY, int edgeTreatment);
+ method @RequiresApi(android.os.Build.VERSION_CODES.S) protected android.graphics.RenderEffect createRenderEffect();
+ }
+
+ @androidx.compose.runtime.Immutable public abstract sealed class Brush {
+ method public abstract void applyTo(long size, androidx.compose.ui.graphics.Paint p, float alpha);
+ method public long getIntrinsicSize();
+ property public long intrinsicSize;
+ field public static final androidx.compose.ui.graphics.Brush.Companion Companion;
+ }
+
+ public static final class Brush.Companion {
+ method @androidx.compose.runtime.Stable public androidx.compose.ui.graphics.Brush horizontalGradient(java.util.List<androidx.compose.ui.graphics.Color> colors, optional float startX, optional float endX, optional int tileMode);
+ method @androidx.compose.runtime.Stable public androidx.compose.ui.graphics.Brush horizontalGradient(kotlin.Pair<java.lang.Float,androidx.compose.ui.graphics.Color>![] colorStops, optional float startX, optional float endX, optional int tileMode);
+ method @androidx.compose.runtime.Stable public androidx.compose.ui.graphics.Brush linearGradient(kotlin.Pair<java.lang.Float,androidx.compose.ui.graphics.Color>![] colorStops, optional long start, optional long end, optional int tileMode);
+ method @androidx.compose.runtime.Stable public androidx.compose.ui.graphics.Brush linearGradient(java.util.List<androidx.compose.ui.graphics.Color> colors, optional long start, optional long end, optional int tileMode);
+ method @androidx.compose.runtime.Stable public androidx.compose.ui.graphics.Brush radialGradient(kotlin.Pair<java.lang.Float,androidx.compose.ui.graphics.Color>![] colorStops, optional long center, optional float radius, optional int tileMode);
+ method @androidx.compose.runtime.Stable public androidx.compose.ui.graphics.Brush radialGradient(java.util.List<androidx.compose.ui.graphics.Color> colors, optional long center, optional float radius, optional int tileMode);
+ method @androidx.compose.runtime.Stable public androidx.compose.ui.graphics.Brush sweepGradient(kotlin.Pair<java.lang.Float,androidx.compose.ui.graphics.Color>![] colorStops, optional long center);
+ method @androidx.compose.runtime.Stable public androidx.compose.ui.graphics.Brush sweepGradient(java.util.List<androidx.compose.ui.graphics.Color> colors, optional long center);
+ method @androidx.compose.runtime.Stable public androidx.compose.ui.graphics.Brush verticalGradient(java.util.List<androidx.compose.ui.graphics.Color> colors, optional float startY, optional float endY, optional int tileMode);
+ method @androidx.compose.runtime.Stable public androidx.compose.ui.graphics.Brush verticalGradient(kotlin.Pair<java.lang.Float,androidx.compose.ui.graphics.Color>![] colorStops, optional float startY, optional float endY, optional int tileMode);
+ }
+
+ public final class BrushKt {
+ method public static androidx.compose.ui.graphics.ShaderBrush ShaderBrush(android.graphics.Shader shader);
+ }
+
+ public interface Canvas {
+ method public void clipPath(androidx.compose.ui.graphics.Path path, optional int clipOp);
+ method public default void clipRect(androidx.compose.ui.geometry.Rect rect, optional int clipOp);
+ method public void clipRect(float left, float top, float right, float bottom, optional int clipOp);
+ method public void concat(float[] matrix);
+ method public void disableZ();
+ method public default void drawArc(androidx.compose.ui.geometry.Rect rect, float startAngle, float sweepAngle, boolean useCenter, androidx.compose.ui.graphics.Paint paint);
+ method public void drawArc(float left, float top, float right, float bottom, float startAngle, float sweepAngle, boolean useCenter, androidx.compose.ui.graphics.Paint paint);
+ method public default void drawArcRad(androidx.compose.ui.geometry.Rect rect, float startAngleRad, float sweepAngleRad, boolean useCenter, androidx.compose.ui.graphics.Paint paint);
+ method public void drawCircle(long center, float radius, androidx.compose.ui.graphics.Paint paint);
+ method public void drawImage(androidx.compose.ui.graphics.ImageBitmap image, long topLeftOffset, androidx.compose.ui.graphics.Paint paint);
+ method public void drawImageRect(androidx.compose.ui.graphics.ImageBitmap image, optional long srcOffset, optional long srcSize, optional long dstOffset, optional long dstSize, androidx.compose.ui.graphics.Paint paint);
+ method public void drawLine(long p1, long p2, androidx.compose.ui.graphics.Paint paint);
+ method public default void drawOval(androidx.compose.ui.geometry.Rect rect, androidx.compose.ui.graphics.Paint paint);
+ method public void drawOval(float left, float top, float right, float bottom, androidx.compose.ui.graphics.Paint paint);
+ method public void drawPath(androidx.compose.ui.graphics.Path path, androidx.compose.ui.graphics.Paint paint);
+ method public void drawPoints(int pointMode, java.util.List<androidx.compose.ui.geometry.Offset> points, androidx.compose.ui.graphics.Paint paint);
+ method public void drawRawPoints(int pointMode, float[] points, androidx.compose.ui.graphics.Paint paint);
+ method public default void drawRect(androidx.compose.ui.geometry.Rect rect, androidx.compose.ui.graphics.Paint paint);
+ method public void drawRect(float left, float top, float right, float bottom, androidx.compose.ui.graphics.Paint paint);
+ method public void drawRoundRect(float left, float top, float right, float bottom, float radiusX, float radiusY, androidx.compose.ui.graphics.Paint paint);
+ method public void drawVertices(androidx.compose.ui.graphics.Vertices vertices, int blendMode, androidx.compose.ui.graphics.Paint paint);
+ method public void enableZ();
+ method public void restore();
+ method public void rotate(float degrees);
+ method public void save();
+ method public void saveLayer(androidx.compose.ui.geometry.Rect bounds, androidx.compose.ui.graphics.Paint paint);
+ method public void scale(float sx, optional float sy);
+ method public void skew(float sx, float sy);
+ method public default void skewRad(float sxRad, float syRad);
+ method public void translate(float dx, float dy);
+ }
+
+ public final class CanvasHolder {
+ ctor public CanvasHolder();
+ method public inline void drawInto(android.graphics.Canvas targetCanvas, kotlin.jvm.functions.Function1<? super androidx.compose.ui.graphics.Canvas,kotlin.Unit> block);
+ field @kotlin.PublishedApi internal final androidx.compose.ui.graphics.AndroidCanvas androidCanvas;
+ }
+
+ public final class CanvasKt {
+ method public static androidx.compose.ui.graphics.Canvas Canvas(androidx.compose.ui.graphics.ImageBitmap image);
+ method public static void rotate(androidx.compose.ui.graphics.Canvas, float degrees, float pivotX, float pivotY);
+ method public static void rotateRad(androidx.compose.ui.graphics.Canvas, float radians, optional float pivotX, optional float pivotY);
+ method public static void scale(androidx.compose.ui.graphics.Canvas, float sx, optional float sy, float pivotX, float pivotY);
+ method public static inline void withSave(androidx.compose.ui.graphics.Canvas, kotlin.jvm.functions.Function0<kotlin.Unit> block);
+ method public static inline void withSaveLayer(androidx.compose.ui.graphics.Canvas, androidx.compose.ui.geometry.Rect bounds, androidx.compose.ui.graphics.Paint paint, kotlin.jvm.functions.Function0<kotlin.Unit> block);
+ }
+
+ @androidx.compose.runtime.Immutable @kotlin.jvm.JvmInline public final value class ClipOp {
+ field public static final androidx.compose.ui.graphics.ClipOp.Companion Companion;
+ }
+
+ public static final class ClipOp.Companion {
+ method public int getDifference();
+ method public int getIntersect();
+ property public final int Difference;
+ property public final int Intersect;
+ }
+
+ @androidx.compose.runtime.Immutable @kotlin.jvm.JvmInline public final value class Color {
+ ctor public Color(long value);
+ method @androidx.compose.runtime.Stable public operator float component1();
+ method @androidx.compose.runtime.Stable public operator float component2();
+ method @androidx.compose.runtime.Stable public operator float component3();
+ method @androidx.compose.runtime.Stable public operator float component4();
+ method @androidx.compose.runtime.Stable public operator androidx.compose.ui.graphics.colorspace.ColorSpace component5();
+ method public long convert(androidx.compose.ui.graphics.colorspace.ColorSpace colorSpace);
+ method @androidx.compose.runtime.Stable public long copy(optional float alpha, optional float red, optional float green, optional float blue);
+ method public float getAlpha();
+ method public float getBlue();
+ method public androidx.compose.ui.graphics.colorspace.ColorSpace getColorSpace();
+ method public float getGreen();
+ method public float getRed();
+ method public long getValue();
+ property public final float alpha;
+ property public final float blue;
+ property public final androidx.compose.ui.graphics.colorspace.ColorSpace colorSpace;
+ property public final float green;
+ property public final float red;
+ property public final long value;
+ field public static final androidx.compose.ui.graphics.Color.Companion Companion;
+ }
+
+ public static final class Color.Companion {
+ method public long getBlack();
+ 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 getUnspecified();
+ method public long getWhite();
+ method public long getYellow();
+ method public long hsl(float hue, float saturation, float lightness, optional float alpha, optional androidx.compose.ui.graphics.colorspace.Rgb colorSpace);
+ method public long hsv(float hue, float saturation, float value, optional float alpha, optional androidx.compose.ui.graphics.colorspace.Rgb colorSpace);
+ property public final long Black;
+ property public final long Blue;
+ property public final long Cyan;
+ property public final long DarkGray;
+ property public final long Gray;
+ property public final long Green;
+ property public final long LightGray;
+ property public final long Magenta;
+ property public final long Red;
+ property public final long Transparent;
+ property public final long Unspecified;
+ property public final long White;
+ property public final long Yellow;
+ }
+
+ @androidx.compose.runtime.Immutable public final class ColorFilter {
+ field public static final androidx.compose.ui.graphics.ColorFilter.Companion Companion;
+ }
+
+ public static final class ColorFilter.Companion {
+ method @androidx.compose.runtime.Stable public androidx.compose.ui.graphics.ColorFilter colorMatrix(float[] colorMatrix);
+ method @androidx.compose.runtime.Stable public androidx.compose.ui.graphics.ColorFilter lighting(long multiply, long add);
+ method @androidx.compose.runtime.Stable public androidx.compose.ui.graphics.ColorFilter tint(long color, optional int blendMode);
+ }
+
+ public final class ColorKt {
+ method @androidx.compose.runtime.Stable public static long Color(float red, float green, float blue, optional float alpha, optional androidx.compose.ui.graphics.colorspace.ColorSpace colorSpace);
+ method @androidx.compose.runtime.Stable public static long Color(int color);
+ method @androidx.compose.runtime.Stable public static long Color(long color);
+ method @androidx.compose.runtime.Stable public static long Color(int red, int green, int blue, optional int alpha);
+ method @androidx.compose.runtime.Stable public static long compositeOver(long, long background);
+ method public static inline boolean isSpecified(long);
+ method public static inline boolean isUnspecified(long);
+ method @androidx.compose.runtime.Stable public static long lerp(long start, long stop, float fraction);
+ method @androidx.compose.runtime.Stable public static float luminance(long);
+ method public static inline long takeOrElse(long, kotlin.jvm.functions.Function0<androidx.compose.ui.graphics.Color> block);
+ method @androidx.compose.runtime.Stable public static int toArgb(long);
+ }
+
+ @kotlin.jvm.JvmInline public final value class ColorMatrix {
+ ctor public ColorMatrix(optional float[] values);
+ method public void convertRgbToYuv();
+ method public void convertYuvToRgb();
+ method public inline operator float get(int row, int column);
+ method public float[] getValues();
+ method public void reset();
+ method public inline operator void set(int row, int column, float v);
+ method public void set(float[] src);
+ method public void setToRotateBlue(float degrees);
+ method public void setToRotateGreen(float degrees);
+ method public void setToRotateRed(float degrees);
+ method public void setToSaturation(float sat);
+ method public void setToScale(float redScale, float greenScale, float blueScale, float alphaScale);
+ method public operator void timesAssign(float[] colorMatrix);
+ property public final float[] values;
+ }
+
+ public final class DegreesKt {
+ method @kotlin.PublishedApi internal static float degrees(float radians);
+ }
+
+ @androidx.compose.runtime.Immutable @kotlin.jvm.JvmInline public final value class FilterQuality {
+ method public int getValue();
+ property public final int value;
+ field public static final androidx.compose.ui.graphics.FilterQuality.Companion Companion;
+ }
+
+ public static final class FilterQuality.Companion {
+ method public int getHigh();
+ method public int getLow();
+ method public int getMedium();
+ method public int getNone();
+ property public final int High;
+ property public final int Low;
+ property public final int Medium;
+ property public final int None;
+ }
+
+ public final class Float16Kt {
+ }
+
+ public interface ImageBitmap {
+ method public androidx.compose.ui.graphics.colorspace.ColorSpace getColorSpace();
+ method public int getConfig();
+ method public boolean getHasAlpha();
+ method public int getHeight();
+ method public int getWidth();
+ method public void prepareToDraw();
+ method public void readPixels(int[] buffer, optional int startX, optional int startY, optional int width, optional int height, optional int bufferOffset, optional int stride);
+ property public abstract androidx.compose.ui.graphics.colorspace.ColorSpace colorSpace;
+ property public abstract int config;
+ property public abstract boolean hasAlpha;
+ property public abstract int height;
+ property public abstract int width;
+ field public static final androidx.compose.ui.graphics.ImageBitmap.Companion Companion;
+ }
+
+ public static final class ImageBitmap.Companion {
+ }
+
+ @androidx.compose.runtime.Immutable @kotlin.jvm.JvmInline public final value class ImageBitmapConfig {
+ method public int getValue();
+ property public final int value;
+ field public static final androidx.compose.ui.graphics.ImageBitmapConfig.Companion Companion;
+ }
+
+ public static final class ImageBitmapConfig.Companion {
+ method public int getAlpha8();
+ method public int getArgb8888();
+ method public int getF16();
+ method public int getGpu();
+ method public int getRgb565();
+ property public final int Alpha8;
+ property public final int Argb8888;
+ property public final int F16;
+ property public final int Gpu;
+ property public final int Rgb565;
+ }
+
+ public final class ImageBitmapKt {
+ method public static androidx.compose.ui.graphics.ImageBitmap ImageBitmap(int width, int height, optional int config, optional boolean hasAlpha, optional androidx.compose.ui.graphics.colorspace.ColorSpace colorSpace);
+ method public static androidx.compose.ui.graphics.PixelMap toPixelMap(androidx.compose.ui.graphics.ImageBitmap, optional int startX, optional int startY, optional int width, optional int height, optional int[] buffer, optional int bufferOffset, optional int stride);
+ }
+
+ @androidx.compose.runtime.Immutable public final class LinearGradient extends androidx.compose.ui.graphics.ShaderBrush {
+ method public android.graphics.Shader createShader(long size);
+ property public long intrinsicSize;
+ }
+
+ @kotlin.jvm.JvmInline public final value class Matrix {
+ ctor public Matrix(optional float[] values);
+ method public inline operator float get(int row, int column);
+ method public float[] getValues();
+ method public void invert();
+ method public long map(long point);
+ method public androidx.compose.ui.geometry.Rect map(androidx.compose.ui.geometry.Rect rect);
+ method public void map(androidx.compose.ui.geometry.MutableRect rect);
+ method public void reset();
+ method public void rotateX(float degrees);
+ method public void rotateY(float degrees);
+ method public void rotateZ(float degrees);
+ method public void scale(optional float x, optional float y, optional float z);
+ method public inline operator void set(int row, int column, float v);
+ method public void setFrom(float[] matrix);
+ method public operator void timesAssign(float[] m);
+ method public void translate(optional float x, optional float y, optional float z);
+ property public final float[] values;
+ field public static final androidx.compose.ui.graphics.Matrix.Companion Companion;
+ field public static final int Perspective0 = 3; // 0x3
+ field public static final int Perspective1 = 7; // 0x7
+ field public static final int Perspective2 = 15; // 0xf
+ field public static final int ScaleX = 0; // 0x0
+ field public static final int ScaleY = 5; // 0x5
+ field public static final int ScaleZ = 10; // 0xa
+ field public static final int SkewX = 4; // 0x4
+ field public static final int SkewY = 1; // 0x1
+ field public static final int TranslateX = 12; // 0xc
+ field public static final int TranslateY = 13; // 0xd
+ field public static final int TranslateZ = 14; // 0xe
+ }
+
+ public static final class Matrix.Companion {
+ }
+
+ public final class MatrixKt {
+ method public static boolean isIdentity(float[]);
+ }
+
+ @androidx.compose.runtime.Immutable public final class OffsetEffect extends androidx.compose.ui.graphics.RenderEffect {
+ ctor public OffsetEffect(androidx.compose.ui.graphics.RenderEffect? renderEffect, long offset);
+ method @RequiresApi(android.os.Build.VERSION_CODES.S) protected android.graphics.RenderEffect createRenderEffect();
+ }
+
+ public abstract sealed class Outline {
+ method public abstract androidx.compose.ui.geometry.Rect getBounds();
+ property public abstract androidx.compose.ui.geometry.Rect bounds;
+ }
+
+ public static final class Outline.Generic extends androidx.compose.ui.graphics.Outline {
+ ctor public Outline.Generic(androidx.compose.ui.graphics.Path path);
+ method public androidx.compose.ui.geometry.Rect getBounds();
+ method public androidx.compose.ui.graphics.Path getPath();
+ property public androidx.compose.ui.geometry.Rect bounds;
+ property public final androidx.compose.ui.graphics.Path path;
+ }
+
+ @androidx.compose.runtime.Immutable public static final class Outline.Rectangle extends androidx.compose.ui.graphics.Outline {
+ ctor public Outline.Rectangle(androidx.compose.ui.geometry.Rect rect);
+ method public androidx.compose.ui.geometry.Rect getBounds();
+ method public androidx.compose.ui.geometry.Rect getRect();
+ property public androidx.compose.ui.geometry.Rect bounds;
+ property public final androidx.compose.ui.geometry.Rect rect;
+ }
+
+ @androidx.compose.runtime.Immutable public static final class Outline.Rounded extends androidx.compose.ui.graphics.Outline {
+ ctor public Outline.Rounded(androidx.compose.ui.geometry.RoundRect roundRect);
+ method public androidx.compose.ui.geometry.Rect getBounds();
+ method public androidx.compose.ui.geometry.RoundRect getRoundRect();
+ property public androidx.compose.ui.geometry.Rect bounds;
+ property public final androidx.compose.ui.geometry.RoundRect roundRect;
+ }
+
+ public final class OutlineKt {
+ method public static void addOutline(androidx.compose.ui.graphics.Path, androidx.compose.ui.graphics.Outline outline);
+ method public static void drawOutline(androidx.compose.ui.graphics.drawscope.DrawScope, androidx.compose.ui.graphics.Outline outline, long color, optional float alpha, optional androidx.compose.ui.graphics.drawscope.DrawStyle style, optional androidx.compose.ui.graphics.ColorFilter? colorFilter, optional int blendMode);
+ method public static void drawOutline(androidx.compose.ui.graphics.drawscope.DrawScope, androidx.compose.ui.graphics.Outline outline, androidx.compose.ui.graphics.Brush brush, optional float alpha, optional androidx.compose.ui.graphics.drawscope.DrawStyle style, optional androidx.compose.ui.graphics.ColorFilter? colorFilter, optional int blendMode);
+ method public static void drawOutline(androidx.compose.ui.graphics.Canvas, androidx.compose.ui.graphics.Outline outline, androidx.compose.ui.graphics.Paint paint);
+ }
+
+ public interface Paint {
+ method public android.graphics.Paint asFrameworkPaint();
+ method public float getAlpha();
+ method public int getBlendMode();
+ method public long getColor();
+ method public androidx.compose.ui.graphics.ColorFilter? getColorFilter();
+ method public int getFilterQuality();
+ method public androidx.compose.ui.graphics.PathEffect? getPathEffect();
+ method public android.graphics.Shader? getShader();
+ method public int getStrokeCap();
+ method public int getStrokeJoin();
+ method public float getStrokeMiterLimit();
+ method public float getStrokeWidth();
+ method public int getStyle();
+ method public boolean isAntiAlias();
+ method public void setAlpha(float);
+ method public void setAntiAlias(boolean);
+ method public void setBlendMode(int);
+ method public void setColor(long);
+ method public void setColorFilter(androidx.compose.ui.graphics.ColorFilter?);
+ method public void setFilterQuality(int);
+ method public void setPathEffect(androidx.compose.ui.graphics.PathEffect?);
+ method public void setShader(android.graphics.Shader?);
+ method public void setStrokeCap(int);
+ method public void setStrokeJoin(int);
+ method public void setStrokeMiterLimit(float);
+ method public void setStrokeWidth(float);
+ method public void setStyle(int);
+ property public abstract float alpha;
+ property public abstract int blendMode;
+ property public abstract long color;
+ property public abstract androidx.compose.ui.graphics.ColorFilter? colorFilter;
+ property public abstract int filterQuality;
+ property public abstract boolean isAntiAlias;
+ property public abstract androidx.compose.ui.graphics.PathEffect? pathEffect;
+ property public abstract android.graphics.Shader? shader;
+ property public abstract int strokeCap;
+ property public abstract int strokeJoin;
+ property public abstract float strokeMiterLimit;
+ property public abstract float strokeWidth;
+ property public abstract int style;
+ }
+
+ public final class PaintKt {
+ method public static androidx.compose.ui.graphics.Paint! Paint();
+ field public static final float DefaultAlpha = 1.0f;
+ }
+
+ @androidx.compose.runtime.Immutable @kotlin.jvm.JvmInline public final value class PaintingStyle {
+ field public static final androidx.compose.ui.graphics.PaintingStyle.Companion Companion;
+ }
+
+ public static final class PaintingStyle.Companion {
+ method public int getFill();
+ method public int getStroke();
+ property public final int Fill;
+ property public final int Stroke;
+ }
+
+ public interface Path {
+ method public void addArc(androidx.compose.ui.geometry.Rect oval, float startAngleDegrees, float sweepAngleDegrees);
+ method public void addArcRad(androidx.compose.ui.geometry.Rect oval, float startAngleRadians, float sweepAngleRadians);
+ method public void addOval(androidx.compose.ui.geometry.Rect oval);
+ method public void addPath(androidx.compose.ui.graphics.Path path, optional long offset);
+ method public void addRect(androidx.compose.ui.geometry.Rect rect);
+ method public void addRoundRect(androidx.compose.ui.geometry.RoundRect roundRect);
+ method public void arcTo(androidx.compose.ui.geometry.Rect rect, float startAngleDegrees, float sweepAngleDegrees, boolean forceMoveTo);
+ method public default void arcToRad(androidx.compose.ui.geometry.Rect rect, float startAngleRadians, float sweepAngleRadians, boolean forceMoveTo);
+ method public void close();
+ method public void cubicTo(float x1, float y1, float x2, float y2, float x3, float y3);
+ method public androidx.compose.ui.geometry.Rect getBounds();
+ method public int getFillType();
+ method public boolean isConvex();
+ method public boolean isEmpty();
+ method public void lineTo(float x, float y);
+ method public void moveTo(float x, float y);
+ method public boolean op(androidx.compose.ui.graphics.Path path1, androidx.compose.ui.graphics.Path path2, int operation);
+ method public void quadraticBezierTo(float x1, float y1, float x2, float y2);
+ method public void relativeCubicTo(float dx1, float dy1, float dx2, float dy2, float dx3, float dy3);
+ method public void relativeLineTo(float dx, float dy);
+ method public void relativeMoveTo(float dx, float dy);
+ method public void relativeQuadraticBezierTo(float dx1, float dy1, float dx2, float dy2);
+ method public void reset();
+ method public void setFillType(int);
+ method public void translate(long offset);
+ property public abstract int fillType;
+ property public abstract boolean isConvex;
+ property public abstract boolean isEmpty;
+ field public static final androidx.compose.ui.graphics.Path.Companion Companion;
+ }
+
+ public static final class Path.Companion {
+ method public androidx.compose.ui.graphics.Path combine(int operation, androidx.compose.ui.graphics.Path path1, androidx.compose.ui.graphics.Path path2);
+ }
+
+ public interface PathEffect {
+ field public static final androidx.compose.ui.graphics.PathEffect.Companion Companion;
+ }
+
+ public static final class PathEffect.Companion {
+ method public androidx.compose.ui.graphics.PathEffect chainPathEffect(androidx.compose.ui.graphics.PathEffect outer, androidx.compose.ui.graphics.PathEffect inner);
+ method public androidx.compose.ui.graphics.PathEffect cornerPathEffect(float radius);
+ method public androidx.compose.ui.graphics.PathEffect dashPathEffect(float[] intervals, optional float phase);
+ method public androidx.compose.ui.graphics.PathEffect stampedPathEffect(androidx.compose.ui.graphics.Path shape, float advance, float phase, int style);
+ }
+
+ @androidx.compose.runtime.Immutable @kotlin.jvm.JvmInline public final value class PathFillType {
+ field public static final androidx.compose.ui.graphics.PathFillType.Companion Companion;
+ }
+
+ public static final class PathFillType.Companion {
+ method public int getEvenOdd();
+ method public int getNonZero();
+ property public final int EvenOdd;
+ property public final int NonZero;
+ }
+
+ public interface PathMeasure {
+ method public float getLength();
+ method public boolean getSegment(float startDistance, float stopDistance, androidx.compose.ui.graphics.Path destination, optional boolean startWithMoveTo);
+ method public void setPath(androidx.compose.ui.graphics.Path? path, boolean forceClosed);
+ property public abstract float length;
+ }
+
+ @androidx.compose.runtime.Immutable @kotlin.jvm.JvmInline public final value class PathOperation {
+ field public static final androidx.compose.ui.graphics.PathOperation.Companion Companion;
+ }
+
+ public static final class PathOperation.Companion {
+ method public int getDifference();
+ method public int getIntersect();
+ method public int getReverseDifference();
+ method public int getUnion();
+ method public int getXor();
+ property public final int Difference;
+ property public final int Intersect;
+ property public final int ReverseDifference;
+ property public final int Union;
+ property public final int Xor;
+ }
+
+ public final class PathOperationKt {
+ method @Deprecated public static int getDifference(androidx.compose.ui.graphics.PathOperation.Companion);
+ method @Deprecated public static int getIntersect(androidx.compose.ui.graphics.PathOperation.Companion);
+ method @Deprecated public static int getReverseDifference(androidx.compose.ui.graphics.PathOperation.Companion);
+ method @Deprecated public static int getUnion(androidx.compose.ui.graphics.PathOperation.Companion);
+ method @Deprecated public static int getXor(androidx.compose.ui.graphics.PathOperation.Companion);
+ }
+
+ public final class PixelMap {
+ ctor public PixelMap(int[] buffer, int width, int height, int bufferOffset, int stride);
+ method public operator long get(int x, int y);
+ method public int[] getBuffer();
+ method public int getBufferOffset();
+ method public int getHeight();
+ method public int getStride();
+ method public int getWidth();
+ property public final int[] buffer;
+ property public final int bufferOffset;
+ property public final int height;
+ property public final int stride;
+ property public final int width;
+ }
+
+ @androidx.compose.runtime.Immutable @kotlin.jvm.JvmInline public final value class PointMode {
+ field public static final androidx.compose.ui.graphics.PointMode.Companion Companion;
+ }
+
+ public static final class PointMode.Companion {
+ method public int getLines();
+ method public int getPoints();
+ method public int getPolygon();
+ property public final int Lines;
+ property public final int Points;
+ property public final int Polygon;
+ }
+
+ @androidx.compose.runtime.Immutable public final class RadialGradient extends androidx.compose.ui.graphics.ShaderBrush {
+ method public android.graphics.Shader createShader(long size);
+ property public long intrinsicSize;
+ }
+
+ public final class RectHelper_androidKt {
+ method public static android.graphics.Rect toAndroidRect(androidx.compose.ui.geometry.Rect);
+ method public static android.graphics.RectF toAndroidRectF(androidx.compose.ui.geometry.Rect);
+ method public static androidx.compose.ui.geometry.Rect toComposeRect(android.graphics.Rect);
+ }
+
+ public final class RectangleShapeKt {
+ method public static androidx.compose.ui.graphics.Shape getRectangleShape();
+ property public static final androidx.compose.ui.graphics.Shape RectangleShape;
+ }
+
+ @androidx.compose.runtime.Immutable public abstract sealed class RenderEffect {
+ method @RequiresApi(android.os.Build.VERSION_CODES.S) public final android.graphics.RenderEffect asAndroidRenderEffect();
+ method @RequiresApi(android.os.Build.VERSION_CODES.S) protected abstract android.graphics.RenderEffect createRenderEffect();
+ method public boolean isSupported();
+ }
+
+ public final class RenderEffectKt {
+ method @androidx.compose.runtime.Stable public static androidx.compose.ui.graphics.BlurEffect BlurEffect(float radiusX, float radiusY, optional int edgeTreatment);
+ method @androidx.compose.runtime.Stable public static androidx.compose.ui.graphics.OffsetEffect OffsetEffect(float offsetX, float offsetY);
+ }
+
+ @androidx.compose.runtime.Immutable public abstract class ShaderBrush extends androidx.compose.ui.graphics.Brush {
+ ctor public ShaderBrush();
+ method public final void applyTo(long size, androidx.compose.ui.graphics.Paint p, float alpha);
+ method public abstract android.graphics.Shader createShader(long size);
+ }
+
+ public final class ShaderKt {
+ method public static android.graphics.Shader ImageShader(androidx.compose.ui.graphics.ImageBitmap image, optional int tileModeX, optional int tileModeY);
+ method public static android.graphics.Shader LinearGradientShader(long from, long to, java.util.List<androidx.compose.ui.graphics.Color> colors, optional java.util.List<java.lang.Float>? colorStops, optional int tileMode);
+ method public static android.graphics.Shader RadialGradientShader(long center, float radius, java.util.List<androidx.compose.ui.graphics.Color> colors, optional java.util.List<java.lang.Float>? colorStops, optional int tileMode);
+ method public static android.graphics.Shader SweepGradientShader(long center, java.util.List<androidx.compose.ui.graphics.Color> colors, optional java.util.List<java.lang.Float>? colorStops);
+ }
+
+ @androidx.compose.runtime.Immutable public final class Shadow {
+ ctor public Shadow(optional @androidx.compose.runtime.Stable long color, optional @androidx.compose.runtime.Stable long offset, optional @androidx.compose.runtime.Stable float blurRadius);
+ method public androidx.compose.ui.graphics.Shadow copy(optional long color, optional long offset, optional float blurRadius);
+ method public float getBlurRadius();
+ method public long getColor();
+ method public long getOffset();
+ property public final float blurRadius;
+ property public final long color;
+ property public final long offset;
+ field public static final androidx.compose.ui.graphics.Shadow.Companion Companion;
+ }
+
+ public static final class Shadow.Companion {
+ method public androidx.compose.ui.graphics.Shadow getNone();
+ property public final androidx.compose.ui.graphics.Shadow None;
+ }
+
+ public final class ShadowKt {
+ method @androidx.compose.runtime.Stable public static androidx.compose.ui.graphics.Shadow lerp(androidx.compose.ui.graphics.Shadow start, androidx.compose.ui.graphics.Shadow stop, float fraction);
+ }
+
+ @androidx.compose.runtime.Immutable public interface Shape {
+ method public androidx.compose.ui.graphics.Outline createOutline(long size, androidx.compose.ui.unit.LayoutDirection layoutDirection, androidx.compose.ui.unit.Density density);
+ }
+
+ @androidx.compose.runtime.Immutable public final class SolidColor extends androidx.compose.ui.graphics.Brush {
+ ctor public SolidColor(long value);
+ method public void applyTo(long size, androidx.compose.ui.graphics.Paint p, float alpha);
+ method public long getValue();
+ property public final long value;
+ }
+
+ @androidx.compose.runtime.Immutable @kotlin.jvm.JvmInline public final value class StampedPathEffectStyle {
+ field public static final androidx.compose.ui.graphics.StampedPathEffectStyle.Companion Companion;
+ }
+
+ public static final class StampedPathEffectStyle.Companion {
+ method public int getMorph();
+ method public int getRotate();
+ method public int getTranslate();
+ property public final int Morph;
+ property public final int Rotate;
+ property public final int Translate;
+ }
+
+ @androidx.compose.runtime.Immutable @kotlin.jvm.JvmInline public final value class StrokeCap {
+ field public static final androidx.compose.ui.graphics.StrokeCap.Companion Companion;
+ }
+
+ public static final class StrokeCap.Companion {
+ method public int getButt();
+ method public int getRound();
+ method public int getSquare();
+ property public final int Butt;
+ property public final int Round;
+ property public final int Square;
+ }
+
+ @androidx.compose.runtime.Immutable @kotlin.jvm.JvmInline public final value class StrokeJoin {
+ field public static final androidx.compose.ui.graphics.StrokeJoin.Companion Companion;
+ }
+
+ public static final class StrokeJoin.Companion {
+ method public int getBevel();
+ method public int getMiter();
+ method public int getRound();
+ property public final int Bevel;
+ property public final int Miter;
+ property public final int Round;
+ }
+
+ @androidx.compose.runtime.Immutable public final class SweepGradient extends androidx.compose.ui.graphics.ShaderBrush {
+ method public android.graphics.Shader createShader(long size);
+ }
+
+ @androidx.compose.runtime.Immutable @kotlin.jvm.JvmInline public final value class TileMode {
+ field public static final androidx.compose.ui.graphics.TileMode.Companion Companion;
+ }
+
+ public static final class TileMode.Companion {
+ method public int getClamp();
+ method public int getDecal();
+ method public int getMirror();
+ method public int getRepeated();
+ property public final int Clamp;
+ property public final int Decal;
+ property public final int Mirror;
+ property public final int Repeated;
+ }
+
+ @androidx.compose.runtime.Immutable @kotlin.jvm.JvmInline public final value class VertexMode {
+ field public static final androidx.compose.ui.graphics.VertexMode.Companion Companion;
+ }
+
+ public static final class VertexMode.Companion {
+ method public int getTriangleFan();
+ method public int getTriangleStrip();
+ method public int getTriangles();
+ property public final int TriangleFan;
+ property public final int TriangleStrip;
+ property public final int Triangles;
+ }
+
+ public final class Vertices {
+ ctor public Vertices(int vertexMode, java.util.List<androidx.compose.ui.geometry.Offset> positions, java.util.List<androidx.compose.ui.geometry.Offset> textureCoordinates, java.util.List<androidx.compose.ui.graphics.Color> colors, java.util.List<java.lang.Integer> indices);
+ method public int[] getColors();
+ method public short[] getIndices();
+ method public float[] getPositions();
+ method public float[] getTextureCoordinates();
+ method public int getVertexMode();
+ property public final int[] colors;
+ property public final short[] indices;
+ property public final float[] positions;
+ property public final float[] textureCoordinates;
+ property public final int vertexMode;
+ }
+
+}
+
+package androidx.compose.ui.graphics.colorspace {
+
+ public abstract class Adaptation {
+ field public static final androidx.compose.ui.graphics.colorspace.Adaptation.Companion Companion;
+ }
+
+ public static final class Adaptation.Companion {
+ method public androidx.compose.ui.graphics.colorspace.Adaptation getBradford();
+ method public androidx.compose.ui.graphics.colorspace.Adaptation getCiecat02();
+ method public androidx.compose.ui.graphics.colorspace.Adaptation getVonKries();
+ property public final androidx.compose.ui.graphics.colorspace.Adaptation Bradford;
+ property public final androidx.compose.ui.graphics.colorspace.Adaptation Ciecat02;
+ property public final androidx.compose.ui.graphics.colorspace.Adaptation VonKries;
+ }
+
+ @androidx.compose.runtime.Immutable @kotlin.jvm.JvmInline public final value class ColorModel {
+ method public int getComponentCount();
+ property public final int componentCount;
+ field public static final androidx.compose.ui.graphics.colorspace.ColorModel.Companion Companion;
+ }
+
+ public static final class ColorModel.Companion {
+ method public long getCmyk();
+ method public long getLab();
+ method public long getRgb();
+ method public long getXyz();
+ property public final long Cmyk;
+ property public final long Lab;
+ property public final long Rgb;
+ property public final long Xyz;
+ }
+
+ public abstract class ColorSpace {
+ ctor public ColorSpace(String name, long model);
+ method public final float[] fromXyz(float x, float y, float z);
+ method public abstract float[] fromXyz(float[] v);
+ method public final int getComponentCount();
+ method public abstract float getMaxValue(int component);
+ method public abstract float getMinValue(int component);
+ method public final long getModel();
+ method public final String getName();
+ method public boolean isSrgb();
+ method public abstract boolean isWideGamut();
+ method public final float[] toXyz(float r, float g, float b);
+ method public abstract float[] toXyz(float[] v);
+ property public final int componentCount;
+ property public boolean isSrgb;
+ property public abstract boolean isWideGamut;
+ property public final long model;
+ property public final String name;
+ }
+
+ public final class ColorSpaceKt {
+ method public static androidx.compose.ui.graphics.colorspace.ColorSpace adapt(androidx.compose.ui.graphics.colorspace.ColorSpace, androidx.compose.ui.graphics.colorspace.WhitePoint whitePoint, optional androidx.compose.ui.graphics.colorspace.Adaptation adaptation);
+ method public static androidx.compose.ui.graphics.colorspace.ColorSpace adapt(androidx.compose.ui.graphics.colorspace.ColorSpace, androidx.compose.ui.graphics.colorspace.WhitePoint whitePoint);
+ method public static androidx.compose.ui.graphics.colorspace.Connector connect(androidx.compose.ui.graphics.colorspace.ColorSpace, optional androidx.compose.ui.graphics.colorspace.ColorSpace destination, optional int intent);
+ }
+
+ public final class ColorSpaces {
+ method public androidx.compose.ui.graphics.colorspace.Rgb getAces();
+ method public androidx.compose.ui.graphics.colorspace.Rgb getAcescg();
+ method public androidx.compose.ui.graphics.colorspace.Rgb getAdobeRgb();
+ method public androidx.compose.ui.graphics.colorspace.Rgb getBt2020();
+ method public androidx.compose.ui.graphics.colorspace.Rgb getBt709();
+ method public androidx.compose.ui.graphics.colorspace.ColorSpace getCieLab();
+ method public androidx.compose.ui.graphics.colorspace.ColorSpace getCieXyz();
+ method public androidx.compose.ui.graphics.colorspace.Rgb getDciP3();
+ method public androidx.compose.ui.graphics.colorspace.Rgb getDisplayP3();
+ method public androidx.compose.ui.graphics.colorspace.Rgb getExtendedSrgb();
+ method public androidx.compose.ui.graphics.colorspace.Rgb getLinearExtendedSrgb();
+ method public androidx.compose.ui.graphics.colorspace.Rgb getLinearSrgb();
+ method public androidx.compose.ui.graphics.colorspace.Rgb getNtsc1953();
+ method public androidx.compose.ui.graphics.colorspace.ColorSpace getOklab();
+ method public androidx.compose.ui.graphics.colorspace.Rgb getProPhotoRgb();
+ method public androidx.compose.ui.graphics.colorspace.Rgb getSmpteC();
+ method public androidx.compose.ui.graphics.colorspace.Rgb getSrgb();
+ method public androidx.compose.ui.graphics.colorspace.ColorSpace? match(float[] toXYZD50, androidx.compose.ui.graphics.colorspace.TransferParameters function);
+ property public final androidx.compose.ui.graphics.colorspace.Rgb Aces;
+ property public final androidx.compose.ui.graphics.colorspace.Rgb Acescg;
+ property public final androidx.compose.ui.graphics.colorspace.Rgb AdobeRgb;
+ property public final androidx.compose.ui.graphics.colorspace.Rgb Bt2020;
+ property public final androidx.compose.ui.graphics.colorspace.Rgb Bt709;
+ property public final androidx.compose.ui.graphics.colorspace.ColorSpace CieLab;
+ property public final androidx.compose.ui.graphics.colorspace.ColorSpace CieXyz;
+ property public final androidx.compose.ui.graphics.colorspace.Rgb DciP3;
+ property public final androidx.compose.ui.graphics.colorspace.Rgb DisplayP3;
+ property public final androidx.compose.ui.graphics.colorspace.Rgb ExtendedSrgb;
+ property public final androidx.compose.ui.graphics.colorspace.Rgb LinearExtendedSrgb;
+ property public final androidx.compose.ui.graphics.colorspace.Rgb LinearSrgb;
+ property public final androidx.compose.ui.graphics.colorspace.Rgb Ntsc1953;
+ property public final androidx.compose.ui.graphics.colorspace.ColorSpace Oklab;
+ property public final androidx.compose.ui.graphics.colorspace.Rgb ProPhotoRgb;
+ property public final androidx.compose.ui.graphics.colorspace.Rgb SmpteC;
+ property public final androidx.compose.ui.graphics.colorspace.Rgb Srgb;
+ field public static final androidx.compose.ui.graphics.colorspace.ColorSpaces INSTANCE;
+ }
+
+ public class Connector {
+ method public final androidx.compose.ui.graphics.colorspace.ColorSpace getDestination();
+ method public final int getRenderIntent();
+ method public final androidx.compose.ui.graphics.colorspace.ColorSpace getSource();
+ method public final float[] transform(float r, float g, float b);
+ method public float[] transform(float[] v);
+ property public final androidx.compose.ui.graphics.colorspace.ColorSpace destination;
+ property public final int renderIntent;
+ property public final androidx.compose.ui.graphics.colorspace.ColorSpace source;
+ }
+
+ public final class Illuminant {
+ method public androidx.compose.ui.graphics.colorspace.WhitePoint getA();
+ method public androidx.compose.ui.graphics.colorspace.WhitePoint getB();
+ method public androidx.compose.ui.graphics.colorspace.WhitePoint getC();
+ method public androidx.compose.ui.graphics.colorspace.WhitePoint getD50();
+ method public androidx.compose.ui.graphics.colorspace.WhitePoint getD55();
+ method public androidx.compose.ui.graphics.colorspace.WhitePoint getD60();
+ method public androidx.compose.ui.graphics.colorspace.WhitePoint getD65();
+ method public androidx.compose.ui.graphics.colorspace.WhitePoint getD75();
+ method public androidx.compose.ui.graphics.colorspace.WhitePoint getE();
+ property public final androidx.compose.ui.graphics.colorspace.WhitePoint A;
+ property public final androidx.compose.ui.graphics.colorspace.WhitePoint B;
+ property public final androidx.compose.ui.graphics.colorspace.WhitePoint C;
+ property public final androidx.compose.ui.graphics.colorspace.WhitePoint D50;
+ property public final androidx.compose.ui.graphics.colorspace.WhitePoint D55;
+ property public final androidx.compose.ui.graphics.colorspace.WhitePoint D60;
+ property public final androidx.compose.ui.graphics.colorspace.WhitePoint D65;
+ property public final androidx.compose.ui.graphics.colorspace.WhitePoint D75;
+ property public final androidx.compose.ui.graphics.colorspace.WhitePoint E;
+ field public static final androidx.compose.ui.graphics.colorspace.Illuminant INSTANCE;
+ }
+
+ @androidx.compose.runtime.Immutable @kotlin.jvm.JvmInline public final value class RenderIntent {
+ field public static final androidx.compose.ui.graphics.colorspace.RenderIntent.Companion Companion;
+ }
+
+ public static final class RenderIntent.Companion {
+ method public int getAbsolute();
+ method public int getPerceptual();
+ method public int getRelative();
+ method public int getSaturation();
+ property public final int Absolute;
+ property public final int Perceptual;
+ property public final int Relative;
+ property public final int Saturation;
+ }
+
+ public final class Rgb extends androidx.compose.ui.graphics.colorspace.ColorSpace {
+ ctor public Rgb(String name, float[] toXYZ, kotlin.jvm.functions.Function1<? super java.lang.Double,java.lang.Double> oetf, kotlin.jvm.functions.Function1<? super java.lang.Double,java.lang.Double> eotf);
+ ctor public Rgb(String name, float[] primaries, androidx.compose.ui.graphics.colorspace.WhitePoint whitePoint, kotlin.jvm.functions.Function1<? super java.lang.Double,java.lang.Double> oetf, kotlin.jvm.functions.Function1<? super java.lang.Double,java.lang.Double> eotf, float min, float max);
+ ctor public Rgb(String name, float[] toXYZ, androidx.compose.ui.graphics.colorspace.TransferParameters function);
+ ctor public Rgb(String name, float[] primaries, androidx.compose.ui.graphics.colorspace.WhitePoint whitePoint, androidx.compose.ui.graphics.colorspace.TransferParameters function);
+ ctor public Rgb(String name, float[] toXYZ, double gamma);
+ ctor public Rgb(String name, float[] primaries, androidx.compose.ui.graphics.colorspace.WhitePoint whitePoint, double gamma);
+ method public float[] fromLinear(float r, float g, float b);
+ method public float[] fromLinear(float[] v);
+ method public float[] fromXyz(float[] v);
+ method public kotlin.jvm.functions.Function1<java.lang.Double,java.lang.Double> getEotf();
+ method public float[] getInverseTransform();
+ method public float[] getInverseTransform(float[] inverseTransform);
+ method public float getMaxValue(int component);
+ method public float getMinValue(int component);
+ method public kotlin.jvm.functions.Function1<java.lang.Double,java.lang.Double> getOetf();
+ method public float[] getPrimaries();
+ method public float[] getPrimaries(float[] primaries);
+ method public androidx.compose.ui.graphics.colorspace.TransferParameters? getTransferParameters();
+ method public float[] getTransform();
+ method public float[] getTransform(float[] transform);
+ method public androidx.compose.ui.graphics.colorspace.WhitePoint getWhitePoint();
+ method public boolean isWideGamut();
+ method public float[] toLinear(float r, float g, float b);
+ method public float[] toLinear(float[] v);
+ method public float[] toXyz(float[] v);
+ property public final kotlin.jvm.functions.Function1<java.lang.Double,java.lang.Double> eotf;
+ property public boolean isSrgb;
+ property public boolean isWideGamut;
+ property public final kotlin.jvm.functions.Function1<java.lang.Double,java.lang.Double> oetf;
+ property public final androidx.compose.ui.graphics.colorspace.TransferParameters? transferParameters;
+ property public final androidx.compose.ui.graphics.colorspace.WhitePoint whitePoint;
+ }
+
+ public final class TransferParameters {
+ ctor public TransferParameters(double gamma, double a, double b, double c, double d, optional double e, optional double f);
+ method public double component1();
+ method public double component2();
+ method public double component3();
+ method public double component4();
+ method public double component5();
+ method public double component6();
+ method public double component7();
+ method public androidx.compose.ui.graphics.colorspace.TransferParameters copy(double gamma, double a, double b, double c, double d, double e, double f);
+ method public double getA();
+ method public double getB();
+ method public double getC();
+ method public double getD();
+ method public double getE();
+ method public double getF();
+ method public double getGamma();
+ property public final double a;
+ property public final double b;
+ property public final double c;
+ property public final double d;
+ property public final double e;
+ property public final double f;
+ property public final double gamma;
+ }
+
+ public final class WhitePoint {
+ ctor public WhitePoint(float x, float y);
+ ctor public WhitePoint(float x, float y, float z);
+ method public float component1();
+ method public float component2();
+ method public androidx.compose.ui.graphics.colorspace.WhitePoint copy(float x, float y);
+ method public float getX();
+ method public float getY();
+ property public final float x;
+ property public final float y;
+ }
+
+}
+
+package androidx.compose.ui.graphics.drawscope {
+
+ public final class CanvasDrawScope implements androidx.compose.ui.graphics.drawscope.DrawScope {
+ ctor public CanvasDrawScope();
+ method public inline void draw(androidx.compose.ui.unit.Density density, androidx.compose.ui.unit.LayoutDirection layoutDirection, androidx.compose.ui.graphics.Canvas canvas, long size, kotlin.jvm.functions.Function1<? super androidx.compose.ui.graphics.drawscope.DrawScope,kotlin.Unit> block);
+ method public void drawArc(androidx.compose.ui.graphics.Brush brush, float startAngle, float sweepAngle, boolean useCenter, long topLeft, long size, float alpha, androidx.compose.ui.graphics.drawscope.DrawStyle style, androidx.compose.ui.graphics.ColorFilter? colorFilter, int blendMode);
+ method public void drawArc(long color, float startAngle, float sweepAngle, boolean useCenter, long topLeft, long size, float alpha, androidx.compose.ui.graphics.drawscope.DrawStyle style, androidx.compose.ui.graphics.ColorFilter? colorFilter, int blendMode);
+ method public void drawCircle(androidx.compose.ui.graphics.Brush brush, float radius, long center, float alpha, androidx.compose.ui.graphics.drawscope.DrawStyle style, androidx.compose.ui.graphics.ColorFilter? colorFilter, int blendMode);
+ method public void drawCircle(long color, float radius, long center, float alpha, androidx.compose.ui.graphics.drawscope.DrawStyle style, androidx.compose.ui.graphics.ColorFilter? colorFilter, int blendMode);
+ method public void drawImage(androidx.compose.ui.graphics.ImageBitmap image, long topLeft, float alpha, androidx.compose.ui.graphics.drawscope.DrawStyle style, androidx.compose.ui.graphics.ColorFilter? colorFilter, int blendMode);
+ method @Deprecated public void drawImage(androidx.compose.ui.graphics.ImageBitmap image, long srcOffset, long srcSize, long dstOffset, long dstSize, float alpha, androidx.compose.ui.graphics.drawscope.DrawStyle style, androidx.compose.ui.graphics.ColorFilter? colorFilter, int blendMode);
+ method public void drawLine(androidx.compose.ui.graphics.Brush brush, long start, long end, float strokeWidth, int cap, androidx.compose.ui.graphics.PathEffect? pathEffect, float alpha, androidx.compose.ui.graphics.ColorFilter? colorFilter, int blendMode);
+ method public void drawLine(long color, long start, long end, float strokeWidth, int cap, androidx.compose.ui.graphics.PathEffect? pathEffect, float alpha, androidx.compose.ui.graphics.ColorFilter? colorFilter, int blendMode);
+ method public void drawOval(androidx.compose.ui.graphics.Brush brush, long topLeft, long size, float alpha, androidx.compose.ui.graphics.drawscope.DrawStyle style, androidx.compose.ui.graphics.ColorFilter? colorFilter, int blendMode);
+ method public void drawOval(long color, long topLeft, long size, float alpha, androidx.compose.ui.graphics.drawscope.DrawStyle style, androidx.compose.ui.graphics.ColorFilter? colorFilter, int blendMode);
+ method public void drawPath(androidx.compose.ui.graphics.Path path, long color, float alpha, androidx.compose.ui.graphics.drawscope.DrawStyle style, androidx.compose.ui.graphics.ColorFilter? colorFilter, int blendMode);
+ method public void drawPath(androidx.compose.ui.graphics.Path path, androidx.compose.ui.graphics.Brush brush, float alpha, androidx.compose.ui.graphics.drawscope.DrawStyle style, androidx.compose.ui.graphics.ColorFilter? colorFilter, int blendMode);
+ method public void drawPoints(java.util.List<androidx.compose.ui.geometry.Offset> points, int pointMode, long color, float strokeWidth, int cap, androidx.compose.ui.graphics.PathEffect? pathEffect, float alpha, androidx.compose.ui.graphics.ColorFilter? colorFilter, int blendMode);
+ method public void drawPoints(java.util.List<androidx.compose.ui.geometry.Offset> points, int pointMode, androidx.compose.ui.graphics.Brush brush, float strokeWidth, int cap, androidx.compose.ui.graphics.PathEffect? pathEffect, float alpha, androidx.compose.ui.graphics.ColorFilter? colorFilter, int blendMode);
+ method public void drawRect(androidx.compose.ui.graphics.Brush brush, long topLeft, long size, float alpha, androidx.compose.ui.graphics.drawscope.DrawStyle style, androidx.compose.ui.graphics.ColorFilter? colorFilter, int blendMode);
+ method public void drawRect(long color, long topLeft, long size, float alpha, androidx.compose.ui.graphics.drawscope.DrawStyle style, androidx.compose.ui.graphics.ColorFilter? colorFilter, int blendMode);
+ method public void drawRoundRect(androidx.compose.ui.graphics.Brush brush, long topLeft, long size, long cornerRadius, float alpha, androidx.compose.ui.graphics.drawscope.DrawStyle style, androidx.compose.ui.graphics.ColorFilter? colorFilter, int blendMode);
+ method public void drawRoundRect(long color, long topLeft, long size, long cornerRadius, androidx.compose.ui.graphics.drawscope.DrawStyle style, float alpha, androidx.compose.ui.graphics.ColorFilter? colorFilter, int blendMode);
+ method public float getDensity();
+ method public androidx.compose.ui.graphics.drawscope.DrawContext getDrawContext();
+ method public float getFontScale();
+ method public androidx.compose.ui.unit.LayoutDirection getLayoutDirection();
+ property public float density;
+ property public androidx.compose.ui.graphics.drawscope.DrawContext drawContext;
+ property public float fontScale;
+ property public androidx.compose.ui.unit.LayoutDirection layoutDirection;
+ field @kotlin.PublishedApi internal final androidx.compose.ui.graphics.drawscope.CanvasDrawScope.DrawParams drawParams;
+ }
+
+ @kotlin.PublishedApi internal static final class CanvasDrawScope.DrawParams {
+ ctor public CanvasDrawScope.DrawParams(optional androidx.compose.ui.unit.Density density, optional androidx.compose.ui.unit.LayoutDirection layoutDirection, optional androidx.compose.ui.graphics.Canvas canvas, optional long size);
+ method public androidx.compose.ui.unit.Density component1();
+ method public androidx.compose.ui.unit.LayoutDirection component2();
+ method public androidx.compose.ui.graphics.Canvas component3();
+ method public long component4-NH-jbRc();
+ method internal boolean equals(Object? other);
+ method public androidx.compose.ui.graphics.Canvas getCanvas();
+ method public androidx.compose.ui.unit.Density getDensity();
+ method public androidx.compose.ui.unit.LayoutDirection getLayoutDirection();
+ method public long getSize();
+ method internal int hashCode();
+ method public void setCanvas(androidx.compose.ui.graphics.Canvas);
+ method public void setDensity(androidx.compose.ui.unit.Density);
+ method public void setLayoutDirection(androidx.compose.ui.unit.LayoutDirection);
+ method public void setSize(long);
+ method internal String toString();
+ property public final androidx.compose.ui.graphics.Canvas canvas;
+ property public final androidx.compose.ui.unit.Density density;
+ property public final androidx.compose.ui.unit.LayoutDirection layoutDirection;
+ property public final long size;
+ }
+
+ public final class CanvasDrawScopeKt {
+ }
+
+ public interface ContentDrawScope extends androidx.compose.ui.graphics.drawscope.DrawScope {
+ method public void drawContent();
+ }
+
+ public interface DrawContext {
+ method public androidx.compose.ui.graphics.Canvas getCanvas();
+ method public long getSize();
+ method public androidx.compose.ui.graphics.drawscope.DrawTransform getTransform();
+ method public void setSize(long);
+ property public abstract androidx.compose.ui.graphics.Canvas canvas;
+ property public abstract long size;
+ property public abstract androidx.compose.ui.graphics.drawscope.DrawTransform transform;
+ }
+
+ @androidx.compose.ui.graphics.drawscope.DrawScopeMarker public interface DrawScope extends androidx.compose.ui.unit.Density {
+ method public void drawArc(androidx.compose.ui.graphics.Brush brush, float startAngle, float sweepAngle, boolean useCenter, optional long topLeft, optional long size, optional float alpha, optional androidx.compose.ui.graphics.drawscope.DrawStyle style, optional androidx.compose.ui.graphics.ColorFilter? colorFilter, optional int blendMode);
+ method public void drawArc(long color, float startAngle, float sweepAngle, boolean useCenter, optional long topLeft, optional long size, optional float alpha, optional androidx.compose.ui.graphics.drawscope.DrawStyle style, optional androidx.compose.ui.graphics.ColorFilter? colorFilter, optional int blendMode);
+ method public void drawCircle(androidx.compose.ui.graphics.Brush brush, optional float radius, optional long center, optional float alpha, optional androidx.compose.ui.graphics.drawscope.DrawStyle style, optional androidx.compose.ui.graphics.ColorFilter? colorFilter, optional int blendMode);
+ method public void drawCircle(long color, optional float radius, optional long center, optional float alpha, optional androidx.compose.ui.graphics.drawscope.DrawStyle style, optional androidx.compose.ui.graphics.ColorFilter? colorFilter, optional int blendMode);
+ method public void drawImage(androidx.compose.ui.graphics.ImageBitmap image, optional long topLeft, optional float alpha, optional androidx.compose.ui.graphics.drawscope.DrawStyle style, optional androidx.compose.ui.graphics.ColorFilter? colorFilter, optional int blendMode);
+ method public default void drawImage(androidx.compose.ui.graphics.ImageBitmap image, optional long srcOffset, optional long srcSize, optional long dstOffset, optional long dstSize, optional float alpha, optional androidx.compose.ui.graphics.drawscope.DrawStyle style, optional androidx.compose.ui.graphics.ColorFilter? colorFilter, optional int blendMode, optional int filterQuality);
+ method @Deprecated public void drawImage(androidx.compose.ui.graphics.ImageBitmap image, optional long srcOffset, optional long srcSize, optional long dstOffset, optional long dstSize, optional float alpha, optional androidx.compose.ui.graphics.drawscope.DrawStyle style, optional androidx.compose.ui.graphics.ColorFilter? colorFilter, optional int blendMode);
+ method public void drawLine(androidx.compose.ui.graphics.Brush brush, long start, long end, optional float strokeWidth, optional int cap, optional androidx.compose.ui.graphics.PathEffect? pathEffect, optional float alpha, optional androidx.compose.ui.graphics.ColorFilter? colorFilter, optional int blendMode);
+ method public void drawLine(long color, long start, long end, optional float strokeWidth, optional int cap, optional androidx.compose.ui.graphics.PathEffect? pathEffect, optional float alpha, optional androidx.compose.ui.graphics.ColorFilter? colorFilter, optional int blendMode);
+ method public void drawOval(androidx.compose.ui.graphics.Brush brush, optional long topLeft, optional long size, optional float alpha, optional androidx.compose.ui.graphics.drawscope.DrawStyle style, optional androidx.compose.ui.graphics.ColorFilter? colorFilter, optional int blendMode);
+ method public void drawOval(long color, optional long topLeft, optional long size, optional float alpha, optional androidx.compose.ui.graphics.drawscope.DrawStyle style, optional androidx.compose.ui.graphics.ColorFilter? colorFilter, optional int blendMode);
+ method public void drawPath(androidx.compose.ui.graphics.Path path, long color, optional float alpha, optional androidx.compose.ui.graphics.drawscope.DrawStyle style, optional androidx.compose.ui.graphics.ColorFilter? colorFilter, optional int blendMode);
+ method public void drawPath(androidx.compose.ui.graphics.Path path, androidx.compose.ui.graphics.Brush brush, optional float alpha, optional androidx.compose.ui.graphics.drawscope.DrawStyle style, optional androidx.compose.ui.graphics.ColorFilter? colorFilter, optional int blendMode);
+ method public void drawPoints(java.util.List<androidx.compose.ui.geometry.Offset> points, int pointMode, long color, optional float strokeWidth, optional int cap, optional androidx.compose.ui.graphics.PathEffect? pathEffect, optional float alpha, optional androidx.compose.ui.graphics.ColorFilter? colorFilter, optional int blendMode);
+ method public void drawPoints(java.util.List<androidx.compose.ui.geometry.Offset> points, int pointMode, androidx.compose.ui.graphics.Brush brush, optional float strokeWidth, optional int cap, optional androidx.compose.ui.graphics.PathEffect? pathEffect, optional float alpha, optional androidx.compose.ui.graphics.ColorFilter? colorFilter, optional int blendMode);
+ method public void drawRect(androidx.compose.ui.graphics.Brush brush, optional long topLeft, optional long size, optional float alpha, optional androidx.compose.ui.graphics.drawscope.DrawStyle style, optional androidx.compose.ui.graphics.ColorFilter? colorFilter, optional int blendMode);
+ method public void drawRect(long color, optional long topLeft, optional long size, optional float alpha, optional androidx.compose.ui.graphics.drawscope.DrawStyle style, optional androidx.compose.ui.graphics.ColorFilter? colorFilter, optional int blendMode);
+ method public void drawRoundRect(androidx.compose.ui.graphics.Brush brush, optional long topLeft, optional long size, optional long cornerRadius, optional float alpha, optional androidx.compose.ui.graphics.drawscope.DrawStyle style, optional androidx.compose.ui.graphics.ColorFilter? colorFilter, optional int blendMode);
+ method public void drawRoundRect(long color, optional long topLeft, optional long size, optional long cornerRadius, optional androidx.compose.ui.graphics.drawscope.DrawStyle style, optional float alpha, optional androidx.compose.ui.graphics.ColorFilter? colorFilter, optional int blendMode);
+ method public default long getCenter();
+ method public androidx.compose.ui.graphics.drawscope.DrawContext getDrawContext();
+ method public androidx.compose.ui.unit.LayoutDirection getLayoutDirection();
+ method public default long getSize();
+ property public default long center;
+ property public abstract androidx.compose.ui.graphics.drawscope.DrawContext drawContext;
+ property public abstract androidx.compose.ui.unit.LayoutDirection layoutDirection;
+ property public default long size;
+ field public static final androidx.compose.ui.graphics.drawscope.DrawScope.Companion Companion;
+ }
+
+ public static final class DrawScope.Companion {
+ method public int getDefaultBlendMode();
+ method public int getDefaultFilterQuality();
+ property public final int DefaultBlendMode;
+ property public final int DefaultFilterQuality;
+ }
+
+ public final class DrawScopeKt {
+ method public static inline void clipPath(androidx.compose.ui.graphics.drawscope.DrawScope, androidx.compose.ui.graphics.Path path, optional int clipOp, kotlin.jvm.functions.Function1<? super androidx.compose.ui.graphics.drawscope.DrawScope,kotlin.Unit> block);
+ method public static inline void clipRect(androidx.compose.ui.graphics.drawscope.DrawScope, optional float left, optional float top, optional float right, optional float bottom, optional int clipOp, kotlin.jvm.functions.Function1<? super androidx.compose.ui.graphics.drawscope.DrawScope,kotlin.Unit> block);
+ method public static inline void drawIntoCanvas(androidx.compose.ui.graphics.drawscope.DrawScope, kotlin.jvm.functions.Function1<? super androidx.compose.ui.graphics.Canvas,kotlin.Unit> block);
+ method public static inline void inset(androidx.compose.ui.graphics.drawscope.DrawScope, float left, float top, float right, float bottom, kotlin.jvm.functions.Function1<? super androidx.compose.ui.graphics.drawscope.DrawScope,kotlin.Unit> block);
+ method public static inline void inset(androidx.compose.ui.graphics.drawscope.DrawScope, float inset, kotlin.jvm.functions.Function1<? super androidx.compose.ui.graphics.drawscope.DrawScope,kotlin.Unit> block);
+ method public static inline void inset(androidx.compose.ui.graphics.drawscope.DrawScope, optional float horizontal, optional float vertical, kotlin.jvm.functions.Function1<? super androidx.compose.ui.graphics.drawscope.DrawScope,kotlin.Unit> block);
+ method public static inline void rotate(androidx.compose.ui.graphics.drawscope.DrawScope, float degrees, optional long pivot, kotlin.jvm.functions.Function1<? super androidx.compose.ui.graphics.drawscope.DrawScope,kotlin.Unit> block);
+ method public static inline void rotateRad(androidx.compose.ui.graphics.drawscope.DrawScope, float radians, optional long pivot, kotlin.jvm.functions.Function1<? super androidx.compose.ui.graphics.drawscope.DrawScope,kotlin.Unit> block);
+ method public static inline void scale(androidx.compose.ui.graphics.drawscope.DrawScope, float scaleX, float scaleY, optional long pivot, kotlin.jvm.functions.Function1<? super androidx.compose.ui.graphics.drawscope.DrawScope,kotlin.Unit> block);
+ method public static inline void scale(androidx.compose.ui.graphics.drawscope.DrawScope, float scale, optional long pivot, kotlin.jvm.functions.Function1<? super androidx.compose.ui.graphics.drawscope.DrawScope,kotlin.Unit> block);
+ method public static inline void translate(androidx.compose.ui.graphics.drawscope.DrawScope, optional float left, optional float top, kotlin.jvm.functions.Function1<? super androidx.compose.ui.graphics.drawscope.DrawScope,kotlin.Unit> block);
+ method public static inline void withTransform(androidx.compose.ui.graphics.drawscope.DrawScope, kotlin.jvm.functions.Function1<? super androidx.compose.ui.graphics.drawscope.DrawTransform,kotlin.Unit> transformBlock, kotlin.jvm.functions.Function1<? super androidx.compose.ui.graphics.drawscope.DrawScope,kotlin.Unit> drawBlock);
+ }
+
+ @kotlin.DslMarker public @interface DrawScopeMarker {
+ }
+
+ public abstract sealed class DrawStyle {
+ }
+
+ @androidx.compose.ui.graphics.drawscope.DrawScopeMarker public interface DrawTransform {
+ method public void clipPath(androidx.compose.ui.graphics.Path path, optional int clipOp);
+ method public void clipRect(optional float left, optional float top, optional float right, optional float bottom, optional int clipOp);
+ method public default long getCenter();
+ method public long getSize();
+ method public void inset(float left, float top, float right, float bottom);
+ method public void rotate(float degrees, optional long pivot);
+ method public void scale(float scaleX, float scaleY, optional long pivot);
+ method public void transform(float[] matrix);
+ method public void translate(optional float left, optional float top);
+ property public default long center;
+ property public abstract long size;
+ }
+
+ public final class DrawTransformKt {
+ method public static inline void inset(androidx.compose.ui.graphics.drawscope.DrawTransform, optional float horizontal, optional float vertical);
+ method public static inline void inset(androidx.compose.ui.graphics.drawscope.DrawTransform, float inset);
+ method public static inline void rotateRad(androidx.compose.ui.graphics.drawscope.DrawTransform, float radians, optional long pivot);
+ method public static inline void scale(androidx.compose.ui.graphics.drawscope.DrawTransform, float scale, optional long pivot);
+ }
+
+ public final class Fill extends androidx.compose.ui.graphics.drawscope.DrawStyle {
+ field public static final androidx.compose.ui.graphics.drawscope.Fill INSTANCE;
+ }
+
+ public final class Stroke extends androidx.compose.ui.graphics.drawscope.DrawStyle {
+ ctor public Stroke(optional float width, optional float miter, optional int cap, optional int join, optional androidx.compose.ui.graphics.PathEffect? pathEffect);
+ method public int getCap();
+ method public int getJoin();
+ method public float getMiter();
+ method public androidx.compose.ui.graphics.PathEffect? getPathEffect();
+ method public float getWidth();
+ property public final int cap;
+ property public final int join;
+ property public final float miter;
+ property public final androidx.compose.ui.graphics.PathEffect? pathEffect;
+ property public final float width;
+ field public static final androidx.compose.ui.graphics.drawscope.Stroke.Companion Companion;
+ field public static final float DefaultMiter = 4.0f;
+ field public static final float HairlineWidth = 0.0f;
+ }
+
+ public static final class Stroke.Companion {
+ method public int getDefaultCap();
+ method public int getDefaultJoin();
+ property public final int DefaultCap;
+ property public final int DefaultJoin;
+ }
+
+}
+
+package androidx.compose.ui.graphics.painter {
+
+ public final class BitmapPainter extends androidx.compose.ui.graphics.painter.Painter {
+ ctor public BitmapPainter(androidx.compose.ui.graphics.ImageBitmap image, optional long srcOffset, optional long srcSize);
+ method public long getIntrinsicSize();
+ method protected void onDraw(androidx.compose.ui.graphics.drawscope.DrawScope);
+ property public long intrinsicSize;
+ }
+
+ public final class BitmapPainterKt {
+ method public static androidx.compose.ui.graphics.painter.BitmapPainter BitmapPainter(androidx.compose.ui.graphics.ImageBitmap image, optional long srcOffset, optional long srcSize, optional int filterQuality);
+ }
+
+ public final class BrushPainter extends androidx.compose.ui.graphics.painter.Painter {
+ ctor public BrushPainter(androidx.compose.ui.graphics.Brush brush);
+ method public androidx.compose.ui.graphics.Brush getBrush();
+ method public long getIntrinsicSize();
+ method protected void onDraw(androidx.compose.ui.graphics.drawscope.DrawScope);
+ property public final androidx.compose.ui.graphics.Brush brush;
+ property public long intrinsicSize;
+ }
+
+ public final class ColorPainter extends androidx.compose.ui.graphics.painter.Painter {
+ ctor public ColorPainter(long color);
+ method public long getColor();
+ method public long getIntrinsicSize();
+ method protected void onDraw(androidx.compose.ui.graphics.drawscope.DrawScope);
+ property public final long color;
+ property public long intrinsicSize;
+ }
+
+ public abstract class Painter {
+ ctor public Painter();
+ method protected boolean applyAlpha(float alpha);
+ method protected boolean applyColorFilter(androidx.compose.ui.graphics.ColorFilter? colorFilter);
+ method protected boolean applyLayoutDirection(androidx.compose.ui.unit.LayoutDirection layoutDirection);
+ method public final void draw(androidx.compose.ui.graphics.drawscope.DrawScope, long size, optional float alpha, optional androidx.compose.ui.graphics.ColorFilter? colorFilter);
+ method public abstract long getIntrinsicSize();
+ method protected abstract void onDraw(androidx.compose.ui.graphics.drawscope.DrawScope);
+ property public abstract long intrinsicSize;
+ }
+
+}
+
+package androidx.compose.ui.graphics.vector {
+
+ public final class PathBuilder {
+ ctor public PathBuilder();
+ method public androidx.compose.ui.graphics.vector.PathBuilder arcTo(float horizontalEllipseRadius, float verticalEllipseRadius, float theta, boolean isMoreThanHalf, boolean isPositiveArc, float x1, float y1);
+ method public androidx.compose.ui.graphics.vector.PathBuilder arcToRelative(float a, float b, float theta, boolean isMoreThanHalf, boolean isPositiveArc, float dx1, float dy1);
+ method public androidx.compose.ui.graphics.vector.PathBuilder close();
+ method public androidx.compose.ui.graphics.vector.PathBuilder curveTo(float x1, float y1, float x2, float y2, float x3, float y3);
+ method public androidx.compose.ui.graphics.vector.PathBuilder curveToRelative(float dx1, float dy1, float dx2, float dy2, float dx3, float dy3);
+ method public java.util.List<androidx.compose.ui.graphics.vector.PathNode> getNodes();
+ method public androidx.compose.ui.graphics.vector.PathBuilder horizontalLineTo(float x);
+ method public androidx.compose.ui.graphics.vector.PathBuilder horizontalLineToRelative(float dx);
+ method public androidx.compose.ui.graphics.vector.PathBuilder lineTo(float x, float y);
+ method public androidx.compose.ui.graphics.vector.PathBuilder lineToRelative(float dx, float dy);
+ method public androidx.compose.ui.graphics.vector.PathBuilder moveTo(float x, float y);
+ method public androidx.compose.ui.graphics.vector.PathBuilder moveToRelative(float dx, float dy);
+ method public androidx.compose.ui.graphics.vector.PathBuilder quadTo(float x1, float y1, float x2, float y2);
+ method public androidx.compose.ui.graphics.vector.PathBuilder quadToRelative(float dx1, float dy1, float dx2, float dy2);
+ method public androidx.compose.ui.graphics.vector.PathBuilder reflectiveCurveTo(float x1, float y1, float x2, float y2);
+ method public androidx.compose.ui.graphics.vector.PathBuilder reflectiveCurveToRelative(float dx1, float dy1, float dx2, float dy2);
+ method public androidx.compose.ui.graphics.vector.PathBuilder reflectiveQuadTo(float x1, float y1);
+ method public androidx.compose.ui.graphics.vector.PathBuilder reflectiveQuadToRelative(float dx1, float dy1);
+ method public androidx.compose.ui.graphics.vector.PathBuilder verticalLineTo(float y);
+ method public androidx.compose.ui.graphics.vector.PathBuilder verticalLineToRelative(float dy);
+ }
+
+ @androidx.compose.runtime.Immutable public abstract sealed class PathNode {
+ method public final boolean isCurve();
+ method public final boolean isQuad();
+ property public final boolean isCurve;
+ property public final boolean isQuad;
+ }
+
+ @androidx.compose.runtime.Immutable public static final class PathNode.ArcTo extends androidx.compose.ui.graphics.vector.PathNode {
+ ctor public PathNode.ArcTo(float horizontalEllipseRadius, float verticalEllipseRadius, float theta, boolean isMoreThanHalf, boolean isPositiveArc, float arcStartX, float arcStartY);
+ method public float component1();
+ method public float component2();
+ method public float component3();
+ method public boolean component4();
+ method public boolean component5();
+ method public float component6();
+ method public float component7();
+ method public androidx.compose.ui.graphics.vector.PathNode.ArcTo copy(float horizontalEllipseRadius, float verticalEllipseRadius, float theta, boolean isMoreThanHalf, boolean isPositiveArc, float arcStartX, float arcStartY);
+ method public float getArcStartX();
+ method public float getArcStartY();
+ method public float getHorizontalEllipseRadius();
+ method public float getTheta();
+ method public float getVerticalEllipseRadius();
+ method public boolean isMoreThanHalf();
+ method public boolean isPositiveArc();
+ property public final float arcStartX;
+ property public final float arcStartY;
+ property public final float horizontalEllipseRadius;
+ property public final boolean isMoreThanHalf;
+ property public final boolean isPositiveArc;
+ property public final float theta;
+ property public final float verticalEllipseRadius;
+ }
+
+ @androidx.compose.runtime.Immutable public static final class PathNode.Close extends androidx.compose.ui.graphics.vector.PathNode {
+ field public static final androidx.compose.ui.graphics.vector.PathNode.Close INSTANCE;
+ }
+
+ @androidx.compose.runtime.Immutable public static final class PathNode.CurveTo extends androidx.compose.ui.graphics.vector.PathNode {
+ ctor public PathNode.CurveTo(float x1, float y1, float x2, float y2, float x3, float y3);
+ method public float component1();
+ method public float component2();
+ method public float component3();
+ method public float component4();
+ method public float component5();
+ method public float component6();
+ method public androidx.compose.ui.graphics.vector.PathNode.CurveTo copy(float x1, float y1, float x2, float y2, float x3, float y3);
+ method public float getX1();
+ method public float getX2();
+ method public float getX3();
+ method public float getY1();
+ method public float getY2();
+ method public float getY3();
+ property public final float x1;
+ property public final float x2;
+ property public final float x3;
+ property public final float y1;
+ property public final float y2;
+ property public final float y3;
+ }
+
+ @androidx.compose.runtime.Immutable public static final class PathNode.HorizontalTo extends androidx.compose.ui.graphics.vector.PathNode {
+ ctor public PathNode.HorizontalTo(float x);
+ method public float component1();
+ method public androidx.compose.ui.graphics.vector.PathNode.HorizontalTo copy(float x);
+ method public float getX();
+ property public final float x;
+ }
+
+ @androidx.compose.runtime.Immutable public static final class PathNode.LineTo extends androidx.compose.ui.graphics.vector.PathNode {
+ ctor public PathNode.LineTo(float x, float y);
+ method public float component1();
+ method public float component2();
+ method public androidx.compose.ui.graphics.vector.PathNode.LineTo copy(float x, float y);
+ method public float getX();
+ method public float getY();
+ property public final float x;
+ property public final float y;
+ }
+
+ @androidx.compose.runtime.Immutable public static final class PathNode.MoveTo extends androidx.compose.ui.graphics.vector.PathNode {
+ ctor public PathNode.MoveTo(float x, float y);
+ method public float component1();
+ method public float component2();
+ method public androidx.compose.ui.graphics.vector.PathNode.MoveTo copy(float x, float y);
+ method public float getX();
+ method public float getY();
+ property public final float x;
+ property public final float y;
+ }
+
+ @androidx.compose.runtime.Immutable public static final class PathNode.QuadTo extends androidx.compose.ui.graphics.vector.PathNode {
+ ctor public PathNode.QuadTo(float x1, float y1, float x2, float y2);
+ method public float component1();
+ method public float component2();
+ method public float component3();
+ method public float component4();
+ method public androidx.compose.ui.graphics.vector.PathNode.QuadTo copy(float x1, float y1, float x2, float y2);
+ method public float getX1();
+ method public float getX2();
+ method public float getY1();
+ method public float getY2();
+ property public final float x1;
+ property public final float x2;
+ property public final float y1;
+ property public final float y2;
+ }
+
+ @androidx.compose.runtime.Immutable public static final class PathNode.ReflectiveCurveTo extends androidx.compose.ui.graphics.vector.PathNode {
+ ctor public PathNode.ReflectiveCurveTo(float x1, float y1, float x2, float y2);
+ method public float component1();
+ method public float component2();
+ method public float component3();
+ method public float component4();
+ method public androidx.compose.ui.graphics.vector.PathNode.ReflectiveCurveTo copy(float x1, float y1, float x2, float y2);
+ method public float getX1();
+ method public float getX2();
+ method public float getY1();
+ method public float getY2();
+ property public final float x1;
+ property public final float x2;
+ property public final float y1;
+ property public final float y2;
+ }
+
+ @androidx.compose.runtime.Immutable public static final class PathNode.ReflectiveQuadTo extends androidx.compose.ui.graphics.vector.PathNode {
+ ctor public PathNode.ReflectiveQuadTo(float x, float y);
+ method public float component1();
+ method public float component2();
+ method public androidx.compose.ui.graphics.vector.PathNode.ReflectiveQuadTo copy(float x, float y);
+ method public float getX();
+ method public float getY();
+ property public final float x;
+ property public final float y;
+ }
+
+ @androidx.compose.runtime.Immutable public static final class PathNode.RelativeArcTo extends androidx.compose.ui.graphics.vector.PathNode {
+ ctor public PathNode.RelativeArcTo(float horizontalEllipseRadius, float verticalEllipseRadius, float theta, boolean isMoreThanHalf, boolean isPositiveArc, float arcStartDx, float arcStartDy);
+ method public float component1();
+ method public float component2();
+ method public float component3();
+ method public boolean component4();
+ method public boolean component5();
+ method public float component6();
+ method public float component7();
+ method public androidx.compose.ui.graphics.vector.PathNode.RelativeArcTo copy(float horizontalEllipseRadius, float verticalEllipseRadius, float theta, boolean isMoreThanHalf, boolean isPositiveArc, float arcStartDx, float arcStartDy);
+ method public float getArcStartDx();
+ method public float getArcStartDy();
+ method public float getHorizontalEllipseRadius();
+ method public float getTheta();
+ method public float getVerticalEllipseRadius();
+ method public boolean isMoreThanHalf();
+ method public boolean isPositiveArc();
+ property public final float arcStartDx;
+ property public final float arcStartDy;
+ property public final float horizontalEllipseRadius;
+ property public final boolean isMoreThanHalf;
+ property public final boolean isPositiveArc;
+ property public final float theta;
+ property public final float verticalEllipseRadius;
+ }
+
+ @androidx.compose.runtime.Immutable public static final class PathNode.RelativeCurveTo extends androidx.compose.ui.graphics.vector.PathNode {
+ ctor public PathNode.RelativeCurveTo(float dx1, float dy1, float dx2, float dy2, float dx3, float dy3);
+ method public float component1();
+ method public float component2();
+ method public float component3();
+ method public float component4();
+ method public float component5();
+ method public float component6();
+ method public androidx.compose.ui.graphics.vector.PathNode.RelativeCurveTo copy(float dx1, float dy1, float dx2, float dy2, float dx3, float dy3);
+ method public float getDx1();
+ method public float getDx2();
+ method public float getDx3();
+ method public float getDy1();
+ method public float getDy2();
+ method public float getDy3();
+ property public final float dx1;
+ property public final float dx2;
+ property public final float dx3;
+ property public final float dy1;
+ property public final float dy2;
+ property public final float dy3;
+ }
+
+ @androidx.compose.runtime.Immutable public static final class PathNode.RelativeHorizontalTo extends androidx.compose.ui.graphics.vector.PathNode {
+ ctor public PathNode.RelativeHorizontalTo(float dx);
+ method public float component1();
+ method public androidx.compose.ui.graphics.vector.PathNode.RelativeHorizontalTo copy(float dx);
+ method public float getDx();
+ property public final float dx;
+ }
+
+ @androidx.compose.runtime.Immutable public static final class PathNode.RelativeLineTo extends androidx.compose.ui.graphics.vector.PathNode {
+ ctor public PathNode.RelativeLineTo(float dx, float dy);
+ method public float component1();
+ method public float component2();
+ method public androidx.compose.ui.graphics.vector.PathNode.RelativeLineTo copy(float dx, float dy);
+ method public float getDx();
+ method public float getDy();
+ property public final float dx;
+ property public final float dy;
+ }
+
+ @androidx.compose.runtime.Immutable public static final class PathNode.RelativeMoveTo extends androidx.compose.ui.graphics.vector.PathNode {
+ ctor public PathNode.RelativeMoveTo(float dx, float dy);
+ method public float component1();
+ method public float component2();
+ method public androidx.compose.ui.graphics.vector.PathNode.RelativeMoveTo copy(float dx, float dy);
+ method public float getDx();
+ method public float getDy();
+ property public final float dx;
+ property public final float dy;
+ }
+
+ @androidx.compose.runtime.Immutable public static final class PathNode.RelativeQuadTo extends androidx.compose.ui.graphics.vector.PathNode {
+ ctor public PathNode.RelativeQuadTo(float dx1, float dy1, float dx2, float dy2);
+ method public float component1();
+ method public float component2();
+ method public float component3();
+ method public float component4();
+ method public androidx.compose.ui.graphics.vector.PathNode.RelativeQuadTo copy(float dx1, float dy1, float dx2, float dy2);
+ method public float getDx1();
+ method public float getDx2();
+ method public float getDy1();
+ method public float getDy2();
+ property public final float dx1;
+ property public final float dx2;
+ property public final float dy1;
+ property public final float dy2;
+ }
+
+ @androidx.compose.runtime.Immutable public static final class PathNode.RelativeReflectiveCurveTo extends androidx.compose.ui.graphics.vector.PathNode {
+ ctor public PathNode.RelativeReflectiveCurveTo(float dx1, float dy1, float dx2, float dy2);
+ method public float component1();
+ method public float component2();
+ method public float component3();
+ method public float component4();
+ method public androidx.compose.ui.graphics.vector.PathNode.RelativeReflectiveCurveTo copy(float dx1, float dy1, float dx2, float dy2);
+ method public float getDx1();
+ method public float getDx2();
+ method public float getDy1();
+ method public float getDy2();
+ property public final float dx1;
+ property public final float dx2;
+ property public final float dy1;
+ property public final float dy2;
+ }
+
+ @androidx.compose.runtime.Immutable public static final class PathNode.RelativeReflectiveQuadTo extends androidx.compose.ui.graphics.vector.PathNode {
+ ctor public PathNode.RelativeReflectiveQuadTo(float dx, float dy);
+ method public float component1();
+ method public float component2();
+ method public androidx.compose.ui.graphics.vector.PathNode.RelativeReflectiveQuadTo copy(float dx, float dy);
+ method public float getDx();
+ method public float getDy();
+ property public final float dx;
+ property public final float dy;
+ }
+
+ @androidx.compose.runtime.Immutable public static final class PathNode.RelativeVerticalTo extends androidx.compose.ui.graphics.vector.PathNode {
+ ctor public PathNode.RelativeVerticalTo(float dy);
+ method public float component1();
+ method public androidx.compose.ui.graphics.vector.PathNode.RelativeVerticalTo copy(float dy);
+ method public float getDy();
+ property public final float dy;
+ }
+
+ @androidx.compose.runtime.Immutable public static final class PathNode.VerticalTo extends androidx.compose.ui.graphics.vector.PathNode {
+ ctor public PathNode.VerticalTo(float y);
+ method public float component1();
+ method public androidx.compose.ui.graphics.vector.PathNode.VerticalTo copy(float y);
+ method public float getY();
+ property public final float y;
+ }
+
+ public final class PathNodeKt {
+ }
+
+ public final class PathParser {
+ ctor public PathParser();
+ method public androidx.compose.ui.graphics.vector.PathParser addPathNodes(java.util.List<? extends androidx.compose.ui.graphics.vector.PathNode> nodes);
+ method public void clear();
+ method public androidx.compose.ui.graphics.vector.PathParser parsePathString(String pathData);
+ method public java.util.List<androidx.compose.ui.graphics.vector.PathNode> toNodes();
+ method public androidx.compose.ui.graphics.Path toPath(optional androidx.compose.ui.graphics.Path target);
+ }
+
+}
+
diff --git a/compose/ui/ui-test-font/api/1.2.0-beta02.txt b/compose/ui/ui-test-font/api/1.2.0-beta02.txt
new file mode 100644
index 0000000..e6f50d0
--- /dev/null
+++ b/compose/ui/ui-test-font/api/1.2.0-beta02.txt
@@ -0,0 +1 @@
+// Signature format: 4.0
diff --git a/compose/ui/ui-test-font/api/public_plus_experimental_1.2.0-beta02.txt b/compose/ui/ui-test-font/api/public_plus_experimental_1.2.0-beta02.txt
new file mode 100644
index 0000000..e6f50d0
--- /dev/null
+++ b/compose/ui/ui-test-font/api/public_plus_experimental_1.2.0-beta02.txt
@@ -0,0 +1 @@
+// Signature format: 4.0
diff --git a/compose/ui/ui-test-font/api/res-1.2.0-beta02.txt b/compose/ui/ui-test-font/api/res-1.2.0-beta02.txt
new file mode 100644
index 0000000..e69de29
--- /dev/null
+++ b/compose/ui/ui-test-font/api/res-1.2.0-beta02.txt
diff --git a/compose/ui/ui-test-font/api/restricted_1.2.0-beta02.txt b/compose/ui/ui-test-font/api/restricted_1.2.0-beta02.txt
new file mode 100644
index 0000000..e6f50d0
--- /dev/null
+++ b/compose/ui/ui-test-font/api/restricted_1.2.0-beta02.txt
@@ -0,0 +1 @@
+// Signature format: 4.0
diff --git a/compose/ui/ui-test-junit4/api/1.2.0-beta02.txt b/compose/ui/ui-test-junit4/api/1.2.0-beta02.txt
new file mode 100644
index 0000000..bc83830
--- /dev/null
+++ b/compose/ui/ui-test-junit4/api/1.2.0-beta02.txt
@@ -0,0 +1,94 @@
+// Signature format: 4.0
+package androidx.compose.ui.test {
+
+ public final class ComposeUiTestKt {
+ }
+
+ public final class ComposeUiTest_androidKt {
+ }
+
+}
+
+package androidx.compose.ui.test.junit4 {
+
+ public final class AndroidComposeTestRule<R extends org.junit.rules.TestRule, A extends androidx.activity.ComponentActivity> implements androidx.compose.ui.test.junit4.ComposeContentTestRule {
+ ctor public AndroidComposeTestRule(R activityRule, kotlin.jvm.functions.Function1<? super R,? extends A> activityProvider);
+ method public org.junit.runners.model.Statement apply(org.junit.runners.model.Statement base, org.junit.runner.Description description);
+ method public suspend Object? awaitIdle(kotlin.coroutines.Continuation<? super kotlin.Unit>);
+ method public A getActivity();
+ method public R getActivityRule();
+ method public androidx.compose.ui.unit.Density getDensity();
+ method public androidx.compose.ui.test.MainTestClock getMainClock();
+ method public androidx.compose.ui.test.SemanticsNodeInteractionCollection onAllNodes(androidx.compose.ui.test.SemanticsMatcher matcher, boolean useUnmergedTree);
+ method public androidx.compose.ui.test.SemanticsNodeInteraction onNode(androidx.compose.ui.test.SemanticsMatcher matcher, boolean useUnmergedTree);
+ method public void registerIdlingResource(androidx.compose.ui.test.IdlingResource idlingResource);
+ method public <T> T! runOnIdle(kotlin.jvm.functions.Function0<? extends T> action);
+ method public <T> T! runOnUiThread(kotlin.jvm.functions.Function0<? extends T> action);
+ method public void setContent(kotlin.jvm.functions.Function0<kotlin.Unit> composable);
+ method public void unregisterIdlingResource(androidx.compose.ui.test.IdlingResource idlingResource);
+ method public void waitForIdle();
+ method public void waitUntil(long timeoutMillis, kotlin.jvm.functions.Function0<java.lang.Boolean> condition);
+ property public final A activity;
+ property public final R activityRule;
+ property public androidx.compose.ui.unit.Density density;
+ property public androidx.compose.ui.test.MainTestClock mainClock;
+ }
+
+ @Deprecated public final class AndroidComposeTestRule.AndroidComposeStatement extends org.junit.runners.model.Statement {
+ ctor @Deprecated public AndroidComposeTestRule.AndroidComposeStatement(org.junit.runners.model.Statement base);
+ method @Deprecated public void evaluate();
+ }
+
+ public final class AndroidComposeTestRule_androidKt {
+ method public static <A extends androidx.activity.ComponentActivity> androidx.compose.ui.test.junit4.AndroidComposeTestRule<androidx.test.ext.junit.rules.ActivityScenarioRule<A>,A> createAndroidComposeRule(Class<A> activityClass);
+ method public static inline <reified A extends androidx.activity.ComponentActivity> androidx.compose.ui.test.junit4.AndroidComposeTestRule<androidx.test.ext.junit.rules.ActivityScenarioRule<A>,A>! createAndroidComposeRule();
+ method public static androidx.compose.ui.test.junit4.ComposeContentTestRule createComposeRule();
+ method public static androidx.compose.ui.test.junit4.ComposeTestRule createEmptyComposeRule();
+ }
+
+ public final class AndroidSynchronization_androidKt {
+ }
+
+ public interface ComposeContentTestRule extends androidx.compose.ui.test.junit4.ComposeTestRule {
+ method public void setContent(kotlin.jvm.functions.Function0<kotlin.Unit> composable);
+ }
+
+ public final class ComposeIdlingResource_androidKt {
+ }
+
+ public final class ComposeRootRegistry_androidKt {
+ }
+
+ public interface ComposeTestRule extends org.junit.rules.TestRule androidx.compose.ui.test.SemanticsNodeInteractionsProvider {
+ method public suspend Object? awaitIdle(kotlin.coroutines.Continuation<? super kotlin.Unit>);
+ method public androidx.compose.ui.unit.Density getDensity();
+ method public androidx.compose.ui.test.MainTestClock getMainClock();
+ method public void registerIdlingResource(androidx.compose.ui.test.IdlingResource idlingResource);
+ method public <T> T! runOnIdle(kotlin.jvm.functions.Function0<? extends T> action);
+ method public <T> T! runOnUiThread(kotlin.jvm.functions.Function0<? extends T> action);
+ method public void unregisterIdlingResource(androidx.compose.ui.test.IdlingResource idlingResource);
+ method public void waitForIdle();
+ method public void waitUntil(optional long timeoutMillis, kotlin.jvm.functions.Function0<java.lang.Boolean> condition);
+ property public abstract androidx.compose.ui.unit.Density density;
+ property public abstract androidx.compose.ui.test.MainTestClock mainClock;
+ }
+
+ public final class EspressoLink_androidKt {
+ }
+
+ public final class StateRestorationTester {
+ ctor public StateRestorationTester(androidx.compose.ui.test.junit4.ComposeContentTestRule composeTestRule);
+ method public void emulateSavedInstanceStateRestore();
+ method public void setContent(kotlin.jvm.functions.Function0<kotlin.Unit> composable);
+ }
+
+}
+
+package androidx.compose.ui.test.junit4.android {
+
+ public final class ComposeNotIdleException extends java.lang.Exception {
+ ctor public ComposeNotIdleException(String? message, Throwable? cause);
+ }
+
+}
+
diff --git a/compose/ui/ui-test-junit4/api/public_plus_experimental_1.2.0-beta02.txt b/compose/ui/ui-test-junit4/api/public_plus_experimental_1.2.0-beta02.txt
new file mode 100644
index 0000000..d403fbb
--- /dev/null
+++ b/compose/ui/ui-test-junit4/api/public_plus_experimental_1.2.0-beta02.txt
@@ -0,0 +1,132 @@
+// Signature format: 4.0
+package androidx.compose.ui.test {
+
+ @androidx.compose.ui.test.ExperimentalTestApi public sealed interface AndroidComposeUiTest<A extends androidx.activity.ComponentActivity> extends androidx.compose.ui.test.ComposeUiTest {
+ method public A? getActivity();
+ property public abstract A? activity;
+ }
+
+ @androidx.compose.ui.test.ExperimentalTestApi public final class AndroidComposeUiTestEnvironment<A extends androidx.activity.ComponentActivity> {
+ ctor public AndroidComposeUiTestEnvironment(kotlin.jvm.functions.Function0<? extends A> activityProvider);
+ method public androidx.compose.ui.test.AndroidComposeUiTest<A> getTest();
+ method public <R> R! runTest(kotlin.jvm.functions.Function1<? super androidx.compose.ui.test.AndroidComposeUiTest<A>,? extends R> block);
+ property public final androidx.compose.ui.test.AndroidComposeUiTest<A> test;
+ }
+
+ @androidx.compose.ui.test.ExperimentalTestApi public sealed interface ComposeUiTest extends androidx.compose.ui.test.SemanticsNodeInteractionsProvider {
+ method public suspend Object? awaitIdle(kotlin.coroutines.Continuation<? super kotlin.Unit>);
+ method public androidx.compose.ui.unit.Density getDensity();
+ method public androidx.compose.ui.test.MainTestClock getMainClock();
+ method public void registerIdlingResource(androidx.compose.ui.test.IdlingResource idlingResource);
+ method public <T> T! runOnIdle(kotlin.jvm.functions.Function0<? extends T> action);
+ method public <T> T! runOnUiThread(kotlin.jvm.functions.Function0<? extends T> action);
+ method public void setContent(kotlin.jvm.functions.Function0<kotlin.Unit> composable);
+ method public void unregisterIdlingResource(androidx.compose.ui.test.IdlingResource idlingResource);
+ method public void waitForIdle();
+ method public void waitUntil(long timeoutMillis, kotlin.jvm.functions.Function0<java.lang.Boolean> condition);
+ property public abstract androidx.compose.ui.unit.Density density;
+ property public abstract androidx.compose.ui.test.MainTestClock mainClock;
+ }
+
+ public final class ComposeUiTestKt {
+ method @androidx.compose.ui.test.ExperimentalTestApi public static void runComposeUiTest(kotlin.jvm.functions.Function1<? super androidx.compose.ui.test.ComposeUiTest,? extends kotlin.Unit> block);
+ }
+
+ public final class ComposeUiTest_androidKt {
+ method @androidx.compose.ui.test.ExperimentalTestApi public static <A extends androidx.activity.ComponentActivity> void runAndroidComposeUiTest(Class<A> activityClass, kotlin.jvm.functions.Function1<? super androidx.compose.ui.test.AndroidComposeUiTest<A>,kotlin.Unit> block);
+ method @androidx.compose.ui.test.ExperimentalTestApi public static inline <reified A extends androidx.activity.ComponentActivity> void runAndroidComposeUiTest(kotlin.jvm.functions.Function1<? super androidx.compose.ui.test.AndroidComposeUiTest<A>,? extends kotlin.Unit> block);
+ method @androidx.compose.ui.test.ExperimentalTestApi public static void runComposeUiTest(kotlin.jvm.functions.Function1<? super androidx.compose.ui.test.ComposeUiTest,kotlin.Unit> block);
+ method @androidx.compose.ui.test.ExperimentalTestApi public static void runComposeUiTestWithoutActivity(kotlin.jvm.functions.Function1<? super androidx.compose.ui.test.ComposeUiTest,kotlin.Unit> block);
+ }
+
+ @androidx.compose.ui.test.ExperimentalTestApi public final class StateRestorationTester {
+ ctor public StateRestorationTester(androidx.compose.ui.test.ComposeUiTest composeTest);
+ method public void emulateSavedInstanceStateRestore();
+ method public void setContent(kotlin.jvm.functions.Function0<kotlin.Unit> composable);
+ }
+
+}
+
+package androidx.compose.ui.test.junit4 {
+
+ public final class AndroidComposeTestRule<R extends org.junit.rules.TestRule, A extends androidx.activity.ComponentActivity> implements androidx.compose.ui.test.junit4.ComposeContentTestRule {
+ ctor public AndroidComposeTestRule(R activityRule, kotlin.jvm.functions.Function1<? super R,? extends A> activityProvider);
+ method public org.junit.runners.model.Statement apply(org.junit.runners.model.Statement base, org.junit.runner.Description description);
+ method public suspend Object? awaitIdle(kotlin.coroutines.Continuation<? super kotlin.Unit>);
+ method public A getActivity();
+ method public R getActivityRule();
+ method public androidx.compose.ui.unit.Density getDensity();
+ method public androidx.compose.ui.test.MainTestClock getMainClock();
+ method public androidx.compose.ui.test.SemanticsNodeInteractionCollection onAllNodes(androidx.compose.ui.test.SemanticsMatcher matcher, boolean useUnmergedTree);
+ method public androidx.compose.ui.test.SemanticsNodeInteraction onNode(androidx.compose.ui.test.SemanticsMatcher matcher, boolean useUnmergedTree);
+ method public void registerIdlingResource(androidx.compose.ui.test.IdlingResource idlingResource);
+ method public <T> T! runOnIdle(kotlin.jvm.functions.Function0<? extends T> action);
+ method public <T> T! runOnUiThread(kotlin.jvm.functions.Function0<? extends T> action);
+ method public void setContent(kotlin.jvm.functions.Function0<kotlin.Unit> composable);
+ method public void unregisterIdlingResource(androidx.compose.ui.test.IdlingResource idlingResource);
+ method public void waitForIdle();
+ method public void waitUntil(long timeoutMillis, kotlin.jvm.functions.Function0<java.lang.Boolean> condition);
+ property public final A activity;
+ property public final R activityRule;
+ property public androidx.compose.ui.unit.Density density;
+ property public androidx.compose.ui.test.MainTestClock mainClock;
+ }
+
+ @Deprecated public final class AndroidComposeTestRule.AndroidComposeStatement extends org.junit.runners.model.Statement {
+ ctor @Deprecated public AndroidComposeTestRule.AndroidComposeStatement(org.junit.runners.model.Statement base);
+ method @Deprecated public void evaluate();
+ }
+
+ public final class AndroidComposeTestRule_androidKt {
+ method public static <A extends androidx.activity.ComponentActivity> androidx.compose.ui.test.junit4.AndroidComposeTestRule<androidx.test.ext.junit.rules.ActivityScenarioRule<A>,A> createAndroidComposeRule(Class<A> activityClass);
+ method public static inline <reified A extends androidx.activity.ComponentActivity> androidx.compose.ui.test.junit4.AndroidComposeTestRule<androidx.test.ext.junit.rules.ActivityScenarioRule<A>,A>! createAndroidComposeRule();
+ method public static androidx.compose.ui.test.junit4.ComposeContentTestRule createComposeRule();
+ method public static androidx.compose.ui.test.junit4.ComposeTestRule createEmptyComposeRule();
+ }
+
+ public final class AndroidSynchronization_androidKt {
+ }
+
+ public interface ComposeContentTestRule extends androidx.compose.ui.test.junit4.ComposeTestRule {
+ method public void setContent(kotlin.jvm.functions.Function0<kotlin.Unit> composable);
+ }
+
+ public final class ComposeIdlingResource_androidKt {
+ }
+
+ public final class ComposeRootRegistry_androidKt {
+ }
+
+ public interface ComposeTestRule extends org.junit.rules.TestRule androidx.compose.ui.test.SemanticsNodeInteractionsProvider {
+ method public suspend Object? awaitIdle(kotlin.coroutines.Continuation<? super kotlin.Unit>);
+ method public androidx.compose.ui.unit.Density getDensity();
+ method public androidx.compose.ui.test.MainTestClock getMainClock();
+ method public void registerIdlingResource(androidx.compose.ui.test.IdlingResource idlingResource);
+ method public <T> T! runOnIdle(kotlin.jvm.functions.Function0<? extends T> action);
+ method public <T> T! runOnUiThread(kotlin.jvm.functions.Function0<? extends T> action);
+ method public void unregisterIdlingResource(androidx.compose.ui.test.IdlingResource idlingResource);
+ method public void waitForIdle();
+ method public void waitUntil(optional long timeoutMillis, kotlin.jvm.functions.Function0<java.lang.Boolean> condition);
+ property public abstract androidx.compose.ui.unit.Density density;
+ property public abstract androidx.compose.ui.test.MainTestClock mainClock;
+ }
+
+ public final class EspressoLink_androidKt {
+ }
+
+ public final class StateRestorationTester {
+ ctor public StateRestorationTester(androidx.compose.ui.test.junit4.ComposeContentTestRule composeTestRule);
+ method public void emulateSavedInstanceStateRestore();
+ method public void setContent(kotlin.jvm.functions.Function0<kotlin.Unit> composable);
+ }
+
+}
+
+package androidx.compose.ui.test.junit4.android {
+
+ public final class ComposeNotIdleException extends java.lang.Exception {
+ ctor public ComposeNotIdleException(String? message, Throwable? cause);
+ }
+
+}
+
diff --git a/compose/ui/ui-test-junit4/api/res-1.2.0-beta02.txt b/compose/ui/ui-test-junit4/api/res-1.2.0-beta02.txt
new file mode 100644
index 0000000..e69de29
--- /dev/null
+++ b/compose/ui/ui-test-junit4/api/res-1.2.0-beta02.txt
diff --git a/compose/ui/ui-test-junit4/api/restricted_1.2.0-beta02.txt b/compose/ui/ui-test-junit4/api/restricted_1.2.0-beta02.txt
new file mode 100644
index 0000000..bc83830
--- /dev/null
+++ b/compose/ui/ui-test-junit4/api/restricted_1.2.0-beta02.txt
@@ -0,0 +1,94 @@
+// Signature format: 4.0
+package androidx.compose.ui.test {
+
+ public final class ComposeUiTestKt {
+ }
+
+ public final class ComposeUiTest_androidKt {
+ }
+
+}
+
+package androidx.compose.ui.test.junit4 {
+
+ public final class AndroidComposeTestRule<R extends org.junit.rules.TestRule, A extends androidx.activity.ComponentActivity> implements androidx.compose.ui.test.junit4.ComposeContentTestRule {
+ ctor public AndroidComposeTestRule(R activityRule, kotlin.jvm.functions.Function1<? super R,? extends A> activityProvider);
+ method public org.junit.runners.model.Statement apply(org.junit.runners.model.Statement base, org.junit.runner.Description description);
+ method public suspend Object? awaitIdle(kotlin.coroutines.Continuation<? super kotlin.Unit>);
+ method public A getActivity();
+ method public R getActivityRule();
+ method public androidx.compose.ui.unit.Density getDensity();
+ method public androidx.compose.ui.test.MainTestClock getMainClock();
+ method public androidx.compose.ui.test.SemanticsNodeInteractionCollection onAllNodes(androidx.compose.ui.test.SemanticsMatcher matcher, boolean useUnmergedTree);
+ method public androidx.compose.ui.test.SemanticsNodeInteraction onNode(androidx.compose.ui.test.SemanticsMatcher matcher, boolean useUnmergedTree);
+ method public void registerIdlingResource(androidx.compose.ui.test.IdlingResource idlingResource);
+ method public <T> T! runOnIdle(kotlin.jvm.functions.Function0<? extends T> action);
+ method public <T> T! runOnUiThread(kotlin.jvm.functions.Function0<? extends T> action);
+ method public void setContent(kotlin.jvm.functions.Function0<kotlin.Unit> composable);
+ method public void unregisterIdlingResource(androidx.compose.ui.test.IdlingResource idlingResource);
+ method public void waitForIdle();
+ method public void waitUntil(long timeoutMillis, kotlin.jvm.functions.Function0<java.lang.Boolean> condition);
+ property public final A activity;
+ property public final R activityRule;
+ property public androidx.compose.ui.unit.Density density;
+ property public androidx.compose.ui.test.MainTestClock mainClock;
+ }
+
+ @Deprecated public final class AndroidComposeTestRule.AndroidComposeStatement extends org.junit.runners.model.Statement {
+ ctor @Deprecated public AndroidComposeTestRule.AndroidComposeStatement(org.junit.runners.model.Statement base);
+ method @Deprecated public void evaluate();
+ }
+
+ public final class AndroidComposeTestRule_androidKt {
+ method public static <A extends androidx.activity.ComponentActivity> androidx.compose.ui.test.junit4.AndroidComposeTestRule<androidx.test.ext.junit.rules.ActivityScenarioRule<A>,A> createAndroidComposeRule(Class<A> activityClass);
+ method public static inline <reified A extends androidx.activity.ComponentActivity> androidx.compose.ui.test.junit4.AndroidComposeTestRule<androidx.test.ext.junit.rules.ActivityScenarioRule<A>,A>! createAndroidComposeRule();
+ method public static androidx.compose.ui.test.junit4.ComposeContentTestRule createComposeRule();
+ method public static androidx.compose.ui.test.junit4.ComposeTestRule createEmptyComposeRule();
+ }
+
+ public final class AndroidSynchronization_androidKt {
+ }
+
+ public interface ComposeContentTestRule extends androidx.compose.ui.test.junit4.ComposeTestRule {
+ method public void setContent(kotlin.jvm.functions.Function0<kotlin.Unit> composable);
+ }
+
+ public final class ComposeIdlingResource_androidKt {
+ }
+
+ public final class ComposeRootRegistry_androidKt {
+ }
+
+ public interface ComposeTestRule extends org.junit.rules.TestRule androidx.compose.ui.test.SemanticsNodeInteractionsProvider {
+ method public suspend Object? awaitIdle(kotlin.coroutines.Continuation<? super kotlin.Unit>);
+ method public androidx.compose.ui.unit.Density getDensity();
+ method public androidx.compose.ui.test.MainTestClock getMainClock();
+ method public void registerIdlingResource(androidx.compose.ui.test.IdlingResource idlingResource);
+ method public <T> T! runOnIdle(kotlin.jvm.functions.Function0<? extends T> action);
+ method public <T> T! runOnUiThread(kotlin.jvm.functions.Function0<? extends T> action);
+ method public void unregisterIdlingResource(androidx.compose.ui.test.IdlingResource idlingResource);
+ method public void waitForIdle();
+ method public void waitUntil(optional long timeoutMillis, kotlin.jvm.functions.Function0<java.lang.Boolean> condition);
+ property public abstract androidx.compose.ui.unit.Density density;
+ property public abstract androidx.compose.ui.test.MainTestClock mainClock;
+ }
+
+ public final class EspressoLink_androidKt {
+ }
+
+ public final class StateRestorationTester {
+ ctor public StateRestorationTester(androidx.compose.ui.test.junit4.ComposeContentTestRule composeTestRule);
+ method public void emulateSavedInstanceStateRestore();
+ method public void setContent(kotlin.jvm.functions.Function0<kotlin.Unit> composable);
+ }
+
+}
+
+package androidx.compose.ui.test.junit4.android {
+
+ public final class ComposeNotIdleException extends java.lang.Exception {
+ ctor public ComposeNotIdleException(String? message, Throwable? cause);
+ }
+
+}
+
diff --git a/compose/ui/ui-test-manifest/api/1.2.0-beta02.txt b/compose/ui/ui-test-manifest/api/1.2.0-beta02.txt
new file mode 100644
index 0000000..e6f50d0
--- /dev/null
+++ b/compose/ui/ui-test-manifest/api/1.2.0-beta02.txt
@@ -0,0 +1 @@
+// Signature format: 4.0
diff --git a/compose/ui/ui-test-manifest/api/public_plus_experimental_1.2.0-beta02.txt b/compose/ui/ui-test-manifest/api/public_plus_experimental_1.2.0-beta02.txt
new file mode 100644
index 0000000..e6f50d0
--- /dev/null
+++ b/compose/ui/ui-test-manifest/api/public_plus_experimental_1.2.0-beta02.txt
@@ -0,0 +1 @@
+// Signature format: 4.0
diff --git a/compose/ui/ui-test-manifest/api/res-1.2.0-beta02.txt b/compose/ui/ui-test-manifest/api/res-1.2.0-beta02.txt
new file mode 100644
index 0000000..e69de29
--- /dev/null
+++ b/compose/ui/ui-test-manifest/api/res-1.2.0-beta02.txt
diff --git a/compose/ui/ui-test-manifest/api/restricted_1.2.0-beta02.txt b/compose/ui/ui-test-manifest/api/restricted_1.2.0-beta02.txt
new file mode 100644
index 0000000..e6f50d0
--- /dev/null
+++ b/compose/ui/ui-test-manifest/api/restricted_1.2.0-beta02.txt
@@ -0,0 +1 @@
+// Signature format: 4.0
diff --git a/compose/ui/ui-test/api/1.2.0-beta02.txt b/compose/ui/ui-test/api/1.2.0-beta02.txt
new file mode 100644
index 0000000..0b62099
--- /dev/null
+++ b/compose/ui/ui-test/api/1.2.0-beta02.txt
@@ -0,0 +1,392 @@
+// Signature format: 4.0
+package androidx.compose.ui.test {
+
+ public final class ActionsKt {
+ method public static androidx.compose.ui.test.SemanticsNodeInteraction performClick(androidx.compose.ui.test.SemanticsNodeInteraction);
+ method @Deprecated public static androidx.compose.ui.test.SemanticsNodeInteraction performGesture(androidx.compose.ui.test.SemanticsNodeInteraction, kotlin.jvm.functions.Function1<? super androidx.compose.ui.test.GestureScope,kotlin.Unit> block);
+ method public static androidx.compose.ui.test.SemanticsNodeInteraction performMultiModalInput(androidx.compose.ui.test.SemanticsNodeInteraction, kotlin.jvm.functions.Function1<? super androidx.compose.ui.test.MultiModalInjectionScope,kotlin.Unit> block);
+ method public static androidx.compose.ui.test.SemanticsNodeInteraction performScrollTo(androidx.compose.ui.test.SemanticsNodeInteraction);
+ method public static androidx.compose.ui.test.SemanticsNodeInteraction performScrollToIndex(androidx.compose.ui.test.SemanticsNodeInteraction, int index);
+ method public static androidx.compose.ui.test.SemanticsNodeInteraction performScrollToKey(androidx.compose.ui.test.SemanticsNodeInteraction, Object key);
+ method public static androidx.compose.ui.test.SemanticsNodeInteraction performScrollToNode(androidx.compose.ui.test.SemanticsNodeInteraction, androidx.compose.ui.test.SemanticsMatcher matcher);
+ method public static <T extends kotlin.Function<? extends java.lang.Boolean>> androidx.compose.ui.test.SemanticsNodeInteraction performSemanticsAction(androidx.compose.ui.test.SemanticsNodeInteraction, androidx.compose.ui.semantics.SemanticsPropertyKey<androidx.compose.ui.semantics.AccessibilityAction<T>> key, kotlin.jvm.functions.Function1<? super T,kotlin.Unit> invocation);
+ method public static androidx.compose.ui.test.SemanticsNodeInteraction performSemanticsAction(androidx.compose.ui.test.SemanticsNodeInteraction, androidx.compose.ui.semantics.SemanticsPropertyKey<androidx.compose.ui.semantics.AccessibilityAction<kotlin.jvm.functions.Function0<java.lang.Boolean>>> key);
+ method @Deprecated public static <T extends kotlin.Function<? extends java.lang.Boolean>> void performSemanticsActionUnit(androidx.compose.ui.test.SemanticsNodeInteraction, androidx.compose.ui.semantics.SemanticsPropertyKey<androidx.compose.ui.semantics.AccessibilityAction<T>> key, kotlin.jvm.functions.Function1<? super T,? extends kotlin.Unit> invocation);
+ method @Deprecated public static void performSemanticsActionUnit(androidx.compose.ui.test.SemanticsNodeInteraction, androidx.compose.ui.semantics.SemanticsPropertyKey<androidx.compose.ui.semantics.AccessibilityAction<kotlin.jvm.functions.Function0<? extends java.lang.Boolean>>> key);
+ method public static androidx.compose.ui.test.SemanticsNodeInteraction performTouchInput(androidx.compose.ui.test.SemanticsNodeInteraction, kotlin.jvm.functions.Function1<? super androidx.compose.ui.test.TouchInjectionScope,kotlin.Unit> block);
+ }
+
+ public final class Actions_androidKt {
+ }
+
+ public final class AndroidAssertions_androidKt {
+ }
+
+ public final class AndroidImageHelpers_androidKt {
+ method @RequiresApi(android.os.Build.VERSION_CODES.O) public static androidx.compose.ui.graphics.ImageBitmap captureToImage(androidx.compose.ui.test.SemanticsNodeInteraction);
+ }
+
+ public final class AndroidInputDispatcher_androidKt {
+ }
+
+ public final class AndroidOutput_androidKt {
+ }
+
+ public final class AssertionsKt {
+ method public static androidx.compose.ui.test.SemanticsNodeInteraction assert(androidx.compose.ui.test.SemanticsNodeInteraction, androidx.compose.ui.test.SemanticsMatcher matcher, optional kotlin.jvm.functions.Function0<java.lang.String>? messagePrefixOnError);
+ method public static androidx.compose.ui.test.SemanticsNodeInteractionCollection assertAll(androidx.compose.ui.test.SemanticsNodeInteractionCollection, androidx.compose.ui.test.SemanticsMatcher matcher);
+ method public static androidx.compose.ui.test.SemanticsNodeInteractionCollection assertAny(androidx.compose.ui.test.SemanticsNodeInteractionCollection, androidx.compose.ui.test.SemanticsMatcher matcher);
+ method public static androidx.compose.ui.test.SemanticsNodeInteraction assertContentDescriptionContains(androidx.compose.ui.test.SemanticsNodeInteraction, String value, optional boolean substring, optional boolean ignoreCase);
+ method public static androidx.compose.ui.test.SemanticsNodeInteraction assertContentDescriptionEquals(androidx.compose.ui.test.SemanticsNodeInteraction, java.lang.String... values);
+ method public static androidx.compose.ui.test.SemanticsNodeInteractionCollection assertCountEquals(androidx.compose.ui.test.SemanticsNodeInteractionCollection, int expectedSize);
+ method public static androidx.compose.ui.test.SemanticsNodeInteraction assertHasClickAction(androidx.compose.ui.test.SemanticsNodeInteraction);
+ method public static androidx.compose.ui.test.SemanticsNodeInteraction assertHasNoClickAction(androidx.compose.ui.test.SemanticsNodeInteraction);
+ method public static androidx.compose.ui.test.SemanticsNodeInteraction assertIsDisplayed(androidx.compose.ui.test.SemanticsNodeInteraction);
+ method public static androidx.compose.ui.test.SemanticsNodeInteraction assertIsEnabled(androidx.compose.ui.test.SemanticsNodeInteraction);
+ method public static androidx.compose.ui.test.SemanticsNodeInteraction assertIsFocused(androidx.compose.ui.test.SemanticsNodeInteraction);
+ method public static androidx.compose.ui.test.SemanticsNodeInteraction assertIsNotDisplayed(androidx.compose.ui.test.SemanticsNodeInteraction);
+ method public static androidx.compose.ui.test.SemanticsNodeInteraction assertIsNotEnabled(androidx.compose.ui.test.SemanticsNodeInteraction);
+ method public static androidx.compose.ui.test.SemanticsNodeInteraction assertIsNotFocused(androidx.compose.ui.test.SemanticsNodeInteraction);
+ method public static androidx.compose.ui.test.SemanticsNodeInteraction assertIsNotSelected(androidx.compose.ui.test.SemanticsNodeInteraction);
+ method public static androidx.compose.ui.test.SemanticsNodeInteraction assertIsOff(androidx.compose.ui.test.SemanticsNodeInteraction);
+ method public static androidx.compose.ui.test.SemanticsNodeInteraction assertIsOn(androidx.compose.ui.test.SemanticsNodeInteraction);
+ method public static androidx.compose.ui.test.SemanticsNodeInteraction assertIsSelectable(androidx.compose.ui.test.SemanticsNodeInteraction);
+ method public static androidx.compose.ui.test.SemanticsNodeInteraction assertIsSelected(androidx.compose.ui.test.SemanticsNodeInteraction);
+ method public static androidx.compose.ui.test.SemanticsNodeInteraction assertIsToggleable(androidx.compose.ui.test.SemanticsNodeInteraction);
+ method public static androidx.compose.ui.test.SemanticsNodeInteraction assertRangeInfoEquals(androidx.compose.ui.test.SemanticsNodeInteraction, androidx.compose.ui.semantics.ProgressBarRangeInfo value);
+ method public static androidx.compose.ui.test.SemanticsNodeInteraction assertTextContains(androidx.compose.ui.test.SemanticsNodeInteraction, String value, optional boolean substring, optional boolean ignoreCase);
+ method public static androidx.compose.ui.test.SemanticsNodeInteraction assertTextEquals(androidx.compose.ui.test.SemanticsNodeInteraction, String![] values, optional boolean includeEditableText);
+ method public static androidx.compose.ui.test.SemanticsNodeInteraction assertValueEquals(androidx.compose.ui.test.SemanticsNodeInteraction, String value);
+ }
+
+ public final class BoundsAssertionsKt {
+ method public static androidx.compose.ui.test.SemanticsNodeInteraction assertHeightIsAtLeast(androidx.compose.ui.test.SemanticsNodeInteraction, float expectedMinHeight);
+ method public static androidx.compose.ui.test.SemanticsNodeInteraction assertHeightIsEqualTo(androidx.compose.ui.test.SemanticsNodeInteraction, float expectedHeight);
+ method public static void assertIsEqualTo(float, float expected, String subject, optional float tolerance);
+ method public static androidx.compose.ui.test.SemanticsNodeInteraction assertLeftPositionInRootIsEqualTo(androidx.compose.ui.test.SemanticsNodeInteraction, float expectedLeft);
+ method public static androidx.compose.ui.test.SemanticsNodeInteraction assertPositionInRootIsEqualTo(androidx.compose.ui.test.SemanticsNodeInteraction, float expectedLeft, float expectedTop);
+ method public static androidx.compose.ui.test.SemanticsNodeInteraction assertTopPositionInRootIsEqualTo(androidx.compose.ui.test.SemanticsNodeInteraction, float expectedTop);
+ method public static androidx.compose.ui.test.SemanticsNodeInteraction assertTouchHeightIsEqualTo(androidx.compose.ui.test.SemanticsNodeInteraction, float expectedHeight);
+ method public static androidx.compose.ui.test.SemanticsNodeInteraction assertTouchWidthIsEqualTo(androidx.compose.ui.test.SemanticsNodeInteraction, float expectedWidth);
+ method public static androidx.compose.ui.test.SemanticsNodeInteraction assertWidthIsAtLeast(androidx.compose.ui.test.SemanticsNodeInteraction, float expectedMinWidth);
+ method public static androidx.compose.ui.test.SemanticsNodeInteraction assertWidthIsEqualTo(androidx.compose.ui.test.SemanticsNodeInteraction, float expectedWidth);
+ method public static float getAlignmentLinePosition(androidx.compose.ui.test.SemanticsNodeInteraction, androidx.compose.ui.layout.AlignmentLine alignmentLine);
+ method public static androidx.compose.ui.unit.DpRect getBoundsInRoot(androidx.compose.ui.test.SemanticsNodeInteraction);
+ method public static androidx.compose.ui.unit.DpRect getUnclippedBoundsInRoot(androidx.compose.ui.test.SemanticsNodeInteraction);
+ }
+
+ public final class ComposeTimeoutException extends java.lang.Throwable {
+ ctor public ComposeTimeoutException(String? message);
+ }
+
+ public final class ErrorMessagesKt {
+ }
+
+ public final class Expect_jvmKt {
+ }
+
+ public final class FiltersKt {
+ method public static androidx.compose.ui.test.SemanticsMatcher hasAnyAncestor(androidx.compose.ui.test.SemanticsMatcher matcher);
+ method public static androidx.compose.ui.test.SemanticsMatcher hasAnyChild(androidx.compose.ui.test.SemanticsMatcher matcher);
+ method public static androidx.compose.ui.test.SemanticsMatcher hasAnyDescendant(androidx.compose.ui.test.SemanticsMatcher matcher);
+ method public static androidx.compose.ui.test.SemanticsMatcher hasAnySibling(androidx.compose.ui.test.SemanticsMatcher matcher);
+ method public static androidx.compose.ui.test.SemanticsMatcher hasClickAction();
+ method public static androidx.compose.ui.test.SemanticsMatcher hasContentDescription(String value, optional boolean substring, optional boolean ignoreCase);
+ method public static androidx.compose.ui.test.SemanticsMatcher hasContentDescriptionExactly(java.lang.String... values);
+ method public static androidx.compose.ui.test.SemanticsMatcher hasImeAction(int actionType);
+ method public static androidx.compose.ui.test.SemanticsMatcher hasNoClickAction();
+ method public static androidx.compose.ui.test.SemanticsMatcher hasNoScrollAction();
+ method public static androidx.compose.ui.test.SemanticsMatcher hasParent(androidx.compose.ui.test.SemanticsMatcher matcher);
+ method public static androidx.compose.ui.test.SemanticsMatcher hasProgressBarRangeInfo(androidx.compose.ui.semantics.ProgressBarRangeInfo rangeInfo);
+ method public static androidx.compose.ui.test.SemanticsMatcher hasScrollAction();
+ method public static androidx.compose.ui.test.SemanticsMatcher hasScrollToIndexAction();
+ method public static androidx.compose.ui.test.SemanticsMatcher hasScrollToKeyAction();
+ method public static androidx.compose.ui.test.SemanticsMatcher hasScrollToNodeAction();
+ method public static androidx.compose.ui.test.SemanticsMatcher hasSetTextAction();
+ method public static androidx.compose.ui.test.SemanticsMatcher hasStateDescription(String value);
+ method public static androidx.compose.ui.test.SemanticsMatcher hasTestTag(String testTag);
+ method public static androidx.compose.ui.test.SemanticsMatcher hasText(String text, optional boolean substring, optional boolean ignoreCase);
+ method public static androidx.compose.ui.test.SemanticsMatcher hasTextExactly(String![] textValues, optional boolean includeEditableText);
+ method public static androidx.compose.ui.test.SemanticsMatcher isDialog();
+ method public static androidx.compose.ui.test.SemanticsMatcher isEnabled();
+ method public static androidx.compose.ui.test.SemanticsMatcher isFocusable();
+ method public static androidx.compose.ui.test.SemanticsMatcher isFocused();
+ method public static androidx.compose.ui.test.SemanticsMatcher isHeading();
+ method public static androidx.compose.ui.test.SemanticsMatcher isNotEnabled();
+ method public static androidx.compose.ui.test.SemanticsMatcher isNotFocusable();
+ method public static androidx.compose.ui.test.SemanticsMatcher isNotFocused();
+ method public static androidx.compose.ui.test.SemanticsMatcher isNotSelected();
+ method public static androidx.compose.ui.test.SemanticsMatcher isOff();
+ method public static androidx.compose.ui.test.SemanticsMatcher isOn();
+ method public static androidx.compose.ui.test.SemanticsMatcher isPopup();
+ method public static androidx.compose.ui.test.SemanticsMatcher isRoot();
+ method public static androidx.compose.ui.test.SemanticsMatcher isSelectable();
+ method public static androidx.compose.ui.test.SemanticsMatcher isSelected();
+ method public static androidx.compose.ui.test.SemanticsMatcher isToggleable();
+ }
+
+ public final class FindersKt {
+ method public static androidx.compose.ui.test.SemanticsNodeInteractionCollection onAllNodesWithContentDescription(androidx.compose.ui.test.SemanticsNodeInteractionsProvider, String label, optional boolean substring, optional boolean ignoreCase, optional boolean useUnmergedTree);
+ method public static androidx.compose.ui.test.SemanticsNodeInteractionCollection onAllNodesWithTag(androidx.compose.ui.test.SemanticsNodeInteractionsProvider, String testTag, optional boolean useUnmergedTree);
+ method public static androidx.compose.ui.test.SemanticsNodeInteractionCollection onAllNodesWithText(androidx.compose.ui.test.SemanticsNodeInteractionsProvider, String text, optional boolean substring, optional boolean ignoreCase, optional boolean useUnmergedTree);
+ method public static androidx.compose.ui.test.SemanticsNodeInteraction onNodeWithContentDescription(androidx.compose.ui.test.SemanticsNodeInteractionsProvider, String label, optional boolean substring, optional boolean ignoreCase, optional boolean useUnmergedTree);
+ method public static androidx.compose.ui.test.SemanticsNodeInteraction onNodeWithTag(androidx.compose.ui.test.SemanticsNodeInteractionsProvider, String testTag, optional boolean useUnmergedTree);
+ method public static androidx.compose.ui.test.SemanticsNodeInteraction onNodeWithText(androidx.compose.ui.test.SemanticsNodeInteractionsProvider, String text, optional boolean substring, optional boolean ignoreCase, optional boolean useUnmergedTree);
+ method public static androidx.compose.ui.test.SemanticsNodeInteraction onRoot(androidx.compose.ui.test.SemanticsNodeInteractionsProvider, optional boolean useUnmergedTree);
+ }
+
+ @Deprecated public final class GestureScope {
+ ctor @Deprecated public GestureScope(androidx.compose.ui.semantics.SemanticsNode node, androidx.compose.ui.test.TestContext testContext);
+ method @Deprecated public long getVisibleSize();
+ property public final long visibleSize;
+ }
+
+ public final class GestureScopeKt {
+ method @Deprecated public static void cancel(androidx.compose.ui.test.GestureScope);
+ method @Deprecated public static void click(androidx.compose.ui.test.GestureScope, optional long position);
+ method @Deprecated public static void doubleClick(androidx.compose.ui.test.GestureScope, optional long position, optional long delayMillis);
+ method @Deprecated public static void down(androidx.compose.ui.test.GestureScope, int pointerId, long position);
+ method @Deprecated public static void down(androidx.compose.ui.test.GestureScope, long position);
+ method @Deprecated public static inline float getBottom(androidx.compose.ui.test.GestureScope);
+ method @Deprecated public static long getBottomCenter(androidx.compose.ui.test.GestureScope);
+ method @Deprecated public static long getBottomLeft(androidx.compose.ui.test.GestureScope);
+ method @Deprecated public static long getBottomRight(androidx.compose.ui.test.GestureScope);
+ method @Deprecated public static long getCenter(androidx.compose.ui.test.GestureScope);
+ method @Deprecated public static long getCenterLeft(androidx.compose.ui.test.GestureScope);
+ method @Deprecated public static long getCenterRight(androidx.compose.ui.test.GestureScope);
+ method @Deprecated public static inline float getCenterX(androidx.compose.ui.test.GestureScope);
+ method @Deprecated public static inline float getCenterY(androidx.compose.ui.test.GestureScope);
+ method @Deprecated public static inline int getHeight(androidx.compose.ui.test.GestureScope);
+ method @Deprecated public static inline float getLeft(androidx.compose.ui.test.GestureScope);
+ method @Deprecated public static inline float getRight(androidx.compose.ui.test.GestureScope);
+ method @Deprecated public static inline float getTop(androidx.compose.ui.test.GestureScope);
+ method @Deprecated public static long getTopCenter(androidx.compose.ui.test.GestureScope);
+ method @Deprecated public static long getTopLeft(androidx.compose.ui.test.GestureScope);
+ method @Deprecated public static long getTopRight(androidx.compose.ui.test.GestureScope);
+ method @Deprecated public static inline int getWidth(androidx.compose.ui.test.GestureScope);
+ method @Deprecated public static void longClick(androidx.compose.ui.test.GestureScope, optional long position, optional long durationMillis);
+ method @Deprecated public static void move(androidx.compose.ui.test.GestureScope);
+ method @Deprecated public static void moveBy(androidx.compose.ui.test.GestureScope, int pointerId, long delta);
+ method @Deprecated public static void moveBy(androidx.compose.ui.test.GestureScope, long delta);
+ method @Deprecated public static void movePointerBy(androidx.compose.ui.test.GestureScope, int pointerId, long delta);
+ method @Deprecated public static void movePointerTo(androidx.compose.ui.test.GestureScope, int pointerId, long position);
+ method @Deprecated public static void moveTo(androidx.compose.ui.test.GestureScope, int pointerId, long position);
+ method @Deprecated public static void moveTo(androidx.compose.ui.test.GestureScope, long position);
+ method @Deprecated public static long percentOffset(androidx.compose.ui.test.GestureScope, optional float x, optional float y);
+ method @Deprecated public static void pinch(androidx.compose.ui.test.GestureScope, long start0, long end0, long start1, long end1, optional long durationMillis);
+ method @Deprecated public static void swipe(androidx.compose.ui.test.GestureScope, long start, long end, optional long durationMillis);
+ method @Deprecated public static void swipeDown(androidx.compose.ui.test.GestureScope);
+ method @Deprecated public static void swipeLeft(androidx.compose.ui.test.GestureScope);
+ method @Deprecated public static void swipeRight(androidx.compose.ui.test.GestureScope);
+ method @Deprecated public static void swipeUp(androidx.compose.ui.test.GestureScope);
+ method @Deprecated public static void swipeWithVelocity(androidx.compose.ui.test.GestureScope, long start, long end, float endVelocity, optional long durationMillis);
+ method @Deprecated public static void up(androidx.compose.ui.test.GestureScope, optional int pointerId);
+ }
+
+ public interface IdlingResource {
+ method public default String? getDiagnosticMessageIfBusy();
+ method public boolean isIdleNow();
+ property public abstract boolean isIdleNow;
+ }
+
+ public interface InjectionScope extends androidx.compose.ui.unit.Density {
+ method public void advanceEventTime(optional long durationMillis);
+ method public default float getBottom();
+ method public default long getBottomCenter();
+ method public default long getBottomLeft();
+ method public default long getBottomRight();
+ method public default long getCenter();
+ method public default long getCenterLeft();
+ method public default long getCenterRight();
+ method public default float getCenterX();
+ method public default float getCenterY();
+ method public default long getEventPeriodMillis();
+ method public default int getHeight();
+ method public default float getLeft();
+ method public default float getRight();
+ method public default float getTop();
+ method public default long getTopCenter();
+ method public default long getTopLeft();
+ method public default long getTopRight();
+ method public androidx.compose.ui.platform.ViewConfiguration getViewConfiguration();
+ method public long getVisibleSize();
+ method public default int getWidth();
+ method public default long percentOffset(optional float x, optional float y);
+ property public default float bottom;
+ property public default long bottomCenter;
+ property public default long bottomLeft;
+ property public default long bottomRight;
+ property public default long center;
+ property public default long centerLeft;
+ property public default long centerRight;
+ property public default float centerX;
+ property public default float centerY;
+ property public default long eventPeriodMillis;
+ property public default int height;
+ property public default float left;
+ property public default float right;
+ property public default float top;
+ property public default long topCenter;
+ property public default long topLeft;
+ property public default long topRight;
+ property public abstract androidx.compose.ui.platform.ViewConfiguration viewConfiguration;
+ property public abstract long visibleSize;
+ property public default int width;
+ }
+
+ public final class KeyInputHelpersKt {
+ method public static boolean performKeyPress(androidx.compose.ui.test.SemanticsNodeInteraction, android.view.KeyEvent keyEvent);
+ }
+
+ public interface MainTestClock {
+ method public void advanceTimeBy(long milliseconds, optional boolean ignoreFrameDuration);
+ method public void advanceTimeByFrame();
+ method public void advanceTimeUntil(optional long timeoutMillis, kotlin.jvm.functions.Function0<java.lang.Boolean> condition);
+ method public boolean getAutoAdvance();
+ method public long getCurrentTime();
+ method public void setAutoAdvance(boolean);
+ property public abstract boolean autoAdvance;
+ property public abstract long currentTime;
+ }
+
+ public final class MouseInjectionScopeKt {
+ }
+
+ public sealed interface MultiModalInjectionScope extends androidx.compose.ui.test.InjectionScope {
+ method public void touch(kotlin.jvm.functions.Function1<? super androidx.compose.ui.test.TouchInjectionScope,kotlin.Unit> block);
+ }
+
+ public final class OutputKt {
+ method public static void printToLog(androidx.compose.ui.test.SemanticsNodeInteraction, String tag, optional int maxDepth);
+ method public static void printToLog(androidx.compose.ui.test.SemanticsNodeInteractionCollection, String tag, optional int maxDepth);
+ method public static String printToString(androidx.compose.ui.test.SemanticsNodeInteraction, optional int maxDepth);
+ method public static String printToString(androidx.compose.ui.test.SemanticsNodeInteractionCollection, optional int maxDepth);
+ }
+
+ public final class SelectionResult {
+ ctor public SelectionResult(java.util.List<androidx.compose.ui.semantics.SemanticsNode> selectedNodes, optional String? customErrorOnNoMatch);
+ method public String? getCustomErrorOnNoMatch();
+ method public java.util.List<androidx.compose.ui.semantics.SemanticsNode> getSelectedNodes();
+ property public final String? customErrorOnNoMatch;
+ property public final java.util.List<androidx.compose.ui.semantics.SemanticsNode> selectedNodes;
+ }
+
+ public final class SelectorsKt {
+ method public static androidx.compose.ui.test.SemanticsNodeInteractionCollection filter(androidx.compose.ui.test.SemanticsNodeInteractionCollection, androidx.compose.ui.test.SemanticsMatcher matcher);
+ method public static androidx.compose.ui.test.SemanticsNodeInteraction filterToOne(androidx.compose.ui.test.SemanticsNodeInteractionCollection, androidx.compose.ui.test.SemanticsMatcher matcher);
+ method public static androidx.compose.ui.test.SemanticsNodeInteractionCollection onAncestors(androidx.compose.ui.test.SemanticsNodeInteraction);
+ method public static androidx.compose.ui.test.SemanticsNodeInteraction onChild(androidx.compose.ui.test.SemanticsNodeInteraction);
+ method public static androidx.compose.ui.test.SemanticsNodeInteraction onChildAt(androidx.compose.ui.test.SemanticsNodeInteraction, int index);
+ method public static androidx.compose.ui.test.SemanticsNodeInteractionCollection onChildren(androidx.compose.ui.test.SemanticsNodeInteraction);
+ method public static androidx.compose.ui.test.SemanticsNodeInteraction onFirst(androidx.compose.ui.test.SemanticsNodeInteractionCollection);
+ method public static androidx.compose.ui.test.SemanticsNodeInteraction onLast(androidx.compose.ui.test.SemanticsNodeInteractionCollection);
+ method public static androidx.compose.ui.test.SemanticsNodeInteraction onParent(androidx.compose.ui.test.SemanticsNodeInteraction);
+ method public static androidx.compose.ui.test.SemanticsNodeInteraction onSibling(androidx.compose.ui.test.SemanticsNodeInteraction);
+ method public static androidx.compose.ui.test.SemanticsNodeInteractionCollection onSiblings(androidx.compose.ui.test.SemanticsNodeInteraction);
+ }
+
+ public final class SemanticsMatcher {
+ ctor public SemanticsMatcher(String description, kotlin.jvm.functions.Function1<? super androidx.compose.ui.semantics.SemanticsNode,java.lang.Boolean> matcher);
+ method public infix androidx.compose.ui.test.SemanticsMatcher and(androidx.compose.ui.test.SemanticsMatcher other);
+ method public String getDescription();
+ method public boolean matches(androidx.compose.ui.semantics.SemanticsNode node);
+ method public boolean matchesAny(Iterable<androidx.compose.ui.semantics.SemanticsNode> nodes);
+ method public operator androidx.compose.ui.test.SemanticsMatcher not();
+ method public infix androidx.compose.ui.test.SemanticsMatcher or(androidx.compose.ui.test.SemanticsMatcher other);
+ property public final String description;
+ field public static final androidx.compose.ui.test.SemanticsMatcher.Companion Companion;
+ }
+
+ public static final class SemanticsMatcher.Companion {
+ method public <T> androidx.compose.ui.test.SemanticsMatcher expectValue(androidx.compose.ui.semantics.SemanticsPropertyKey<T> key, T? expectedValue);
+ method public <T> androidx.compose.ui.test.SemanticsMatcher keyIsDefined(androidx.compose.ui.semantics.SemanticsPropertyKey<T> key);
+ method public <T> androidx.compose.ui.test.SemanticsMatcher keyNotDefined(androidx.compose.ui.semantics.SemanticsPropertyKey<T> key);
+ }
+
+ public final class SemanticsNodeInteraction {
+ ctor public SemanticsNodeInteraction(androidx.compose.ui.test.TestContext testContext, boolean useUnmergedTree, androidx.compose.ui.test.SemanticsSelector selector);
+ ctor public SemanticsNodeInteraction(androidx.compose.ui.test.TestContext testContext, boolean useUnmergedTree, androidx.compose.ui.test.SemanticsMatcher matcher);
+ method public void assertDoesNotExist();
+ method public androidx.compose.ui.test.SemanticsNodeInteraction assertExists(optional String? errorMessageOnFail);
+ method public androidx.compose.ui.semantics.SemanticsNode fetchSemanticsNode(optional String? errorMessageOnFail);
+ }
+
+ public final class SemanticsNodeInteractionCollection {
+ ctor public SemanticsNodeInteractionCollection(androidx.compose.ui.test.TestContext testContext, boolean useUnmergedTree, androidx.compose.ui.test.SemanticsSelector selector);
+ ctor public SemanticsNodeInteractionCollection(androidx.compose.ui.test.TestContext testContext, boolean useUnmergedTree, androidx.compose.ui.test.SemanticsMatcher matcher);
+ method public java.util.List<androidx.compose.ui.semantics.SemanticsNode> fetchSemanticsNodes(optional boolean atLeastOneRootRequired, optional String? errorMessageOnFail);
+ method public operator androidx.compose.ui.test.SemanticsNodeInteraction get(int index);
+ }
+
+ public interface SemanticsNodeInteractionsProvider {
+ method public androidx.compose.ui.test.SemanticsNodeInteractionCollection onAllNodes(androidx.compose.ui.test.SemanticsMatcher matcher, optional boolean useUnmergedTree);
+ method public androidx.compose.ui.test.SemanticsNodeInteraction onNode(androidx.compose.ui.test.SemanticsMatcher matcher, optional boolean useUnmergedTree);
+ }
+
+ public final class SemanticsSelector {
+ ctor public SemanticsSelector(String description, boolean requiresExactlyOneNode, optional androidx.compose.ui.test.SemanticsSelector? chainedInputSelector, kotlin.jvm.functions.Function1<? super java.lang.Iterable<androidx.compose.ui.semantics.SemanticsNode>,androidx.compose.ui.test.SelectionResult> selector);
+ method public String getDescription();
+ method public androidx.compose.ui.test.SelectionResult map(Iterable<androidx.compose.ui.semantics.SemanticsNode> nodes, String errorOnFail);
+ property public final String description;
+ }
+
+ public final class SemanticsSelectorKt {
+ }
+
+ public final class TestContext {
+ }
+
+ public final class TestMonotonicFrameClock_jvmKt {
+ }
+
+ public final class TestOwnerKt {
+ }
+
+ public final class TextActionsKt {
+ method public static void performImeAction(androidx.compose.ui.test.SemanticsNodeInteraction);
+ method public static void performTextClearance(androidx.compose.ui.test.SemanticsNodeInteraction);
+ method public static void performTextInput(androidx.compose.ui.test.SemanticsNodeInteraction, String text);
+ method public static void performTextReplacement(androidx.compose.ui.test.SemanticsNodeInteraction, String text);
+ }
+
+ public interface TouchInjectionScope extends androidx.compose.ui.test.InjectionScope {
+ method public void cancel(optional long delayMillis);
+ method public androidx.compose.ui.geometry.Offset? currentPosition(optional int pointerId);
+ method public void down(int pointerId, long position);
+ method public default void down(long position);
+ method public void move(optional long delayMillis);
+ method public default void moveBy(int pointerId, long delta, optional long delayMillis);
+ method public default void moveBy(long delta, optional long delayMillis);
+ method public default void moveTo(int pointerId, long position, optional long delayMillis);
+ method public default void moveTo(long position, optional long delayMillis);
+ method public void up(optional int pointerId);
+ method public default void updatePointerBy(int pointerId, long delta);
+ method public void updatePointerTo(int pointerId, long position);
+ }
+
+ public final class TouchInjectionScopeKt {
+ method public static void click(androidx.compose.ui.test.TouchInjectionScope, optional long position);
+ method public static void doubleClick(androidx.compose.ui.test.TouchInjectionScope, optional long position, optional long delayMillis);
+ method public static void longClick(androidx.compose.ui.test.TouchInjectionScope, optional long position, optional long durationMillis);
+ method public static void pinch(androidx.compose.ui.test.TouchInjectionScope, long start0, long end0, long start1, long end1, optional long durationMillis);
+ method public static void swipe(androidx.compose.ui.test.TouchInjectionScope, long start, long end, optional long durationMillis);
+ method public static void swipe(androidx.compose.ui.test.TouchInjectionScope, kotlin.jvm.functions.Function1<? super java.lang.Long,androidx.compose.ui.geometry.Offset> curve, long durationMillis, optional java.util.List<java.lang.Long> keyTimes);
+ method public static void swipeDown(androidx.compose.ui.test.TouchInjectionScope, optional float startY, optional float endY, optional long durationMillis);
+ method public static void swipeLeft(androidx.compose.ui.test.TouchInjectionScope, optional float startX, optional float endX, optional long durationMillis);
+ method public static void swipeRight(androidx.compose.ui.test.TouchInjectionScope, optional float startX, optional float endX, optional long durationMillis);
+ method public static void swipeUp(androidx.compose.ui.test.TouchInjectionScope, optional float startY, optional float endY, optional long durationMillis);
+ method public static void swipeWithVelocity(androidx.compose.ui.test.TouchInjectionScope, long start, long end, float endVelocity, optional long durationMillis);
+ }
+
+ public final class UtilsKt {
+ }
+
+}
+
+package androidx.compose.ui.test.android {
+
+ public final class WindowCapture_androidKt {
+ }
+
+}
+
diff --git a/compose/ui/ui-test/api/public_plus_experimental_1.2.0-beta02.txt b/compose/ui/ui-test/api/public_plus_experimental_1.2.0-beta02.txt
new file mode 100644
index 0000000..88391e3
--- /dev/null
+++ b/compose/ui/ui-test/api/public_plus_experimental_1.2.0-beta02.txt
@@ -0,0 +1,491 @@
+// Signature format: 4.0
+package androidx.compose.ui.test {
+
+ public final class ActionsKt {
+ method public static androidx.compose.ui.test.SemanticsNodeInteraction performClick(androidx.compose.ui.test.SemanticsNodeInteraction);
+ method @Deprecated public static androidx.compose.ui.test.SemanticsNodeInteraction performGesture(androidx.compose.ui.test.SemanticsNodeInteraction, kotlin.jvm.functions.Function1<? super androidx.compose.ui.test.GestureScope,kotlin.Unit> block);
+ method @androidx.compose.ui.test.ExperimentalTestApi public static androidx.compose.ui.test.SemanticsNodeInteraction performMouseInput(androidx.compose.ui.test.SemanticsNodeInteraction, kotlin.jvm.functions.Function1<? super androidx.compose.ui.test.MouseInjectionScope,kotlin.Unit> block);
+ method public static androidx.compose.ui.test.SemanticsNodeInteraction performMultiModalInput(androidx.compose.ui.test.SemanticsNodeInteraction, kotlin.jvm.functions.Function1<? super androidx.compose.ui.test.MultiModalInjectionScope,kotlin.Unit> block);
+ method @androidx.compose.ui.test.ExperimentalTestApi public static androidx.compose.ui.test.SemanticsNodeInteraction performRotaryScrollInput(androidx.compose.ui.test.SemanticsNodeInteraction, kotlin.jvm.functions.Function1<? super androidx.compose.ui.test.RotaryInjectionScope,kotlin.Unit> block);
+ method public static androidx.compose.ui.test.SemanticsNodeInteraction performScrollTo(androidx.compose.ui.test.SemanticsNodeInteraction);
+ method public static androidx.compose.ui.test.SemanticsNodeInteraction performScrollToIndex(androidx.compose.ui.test.SemanticsNodeInteraction, int index);
+ method public static androidx.compose.ui.test.SemanticsNodeInteraction performScrollToKey(androidx.compose.ui.test.SemanticsNodeInteraction, Object key);
+ method public static androidx.compose.ui.test.SemanticsNodeInteraction performScrollToNode(androidx.compose.ui.test.SemanticsNodeInteraction, androidx.compose.ui.test.SemanticsMatcher matcher);
+ method public static <T extends kotlin.Function<? extends java.lang.Boolean>> androidx.compose.ui.test.SemanticsNodeInteraction performSemanticsAction(androidx.compose.ui.test.SemanticsNodeInteraction, androidx.compose.ui.semantics.SemanticsPropertyKey<androidx.compose.ui.semantics.AccessibilityAction<T>> key, kotlin.jvm.functions.Function1<? super T,kotlin.Unit> invocation);
+ method public static androidx.compose.ui.test.SemanticsNodeInteraction performSemanticsAction(androidx.compose.ui.test.SemanticsNodeInteraction, androidx.compose.ui.semantics.SemanticsPropertyKey<androidx.compose.ui.semantics.AccessibilityAction<kotlin.jvm.functions.Function0<java.lang.Boolean>>> key);
+ method @Deprecated public static <T extends kotlin.Function<? extends java.lang.Boolean>> void performSemanticsActionUnit(androidx.compose.ui.test.SemanticsNodeInteraction, androidx.compose.ui.semantics.SemanticsPropertyKey<androidx.compose.ui.semantics.AccessibilityAction<T>> key, kotlin.jvm.functions.Function1<? super T,? extends kotlin.Unit> invocation);
+ method @Deprecated public static void performSemanticsActionUnit(androidx.compose.ui.test.SemanticsNodeInteraction, androidx.compose.ui.semantics.SemanticsPropertyKey<androidx.compose.ui.semantics.AccessibilityAction<kotlin.jvm.functions.Function0<? extends java.lang.Boolean>>> key);
+ method public static androidx.compose.ui.test.SemanticsNodeInteraction performTouchInput(androidx.compose.ui.test.SemanticsNodeInteraction, kotlin.jvm.functions.Function1<? super androidx.compose.ui.test.TouchInjectionScope,kotlin.Unit> block);
+ }
+
+ public final class Actions_androidKt {
+ }
+
+ public final class AndroidAssertions_androidKt {
+ }
+
+ public final class AndroidImageHelpers_androidKt {
+ method @RequiresApi(android.os.Build.VERSION_CODES.O) public static androidx.compose.ui.graphics.ImageBitmap captureToImage(androidx.compose.ui.test.SemanticsNodeInteraction);
+ }
+
+ public final class AndroidInputDispatcher_androidKt {
+ }
+
+ public final class AndroidOutput_androidKt {
+ }
+
+ public final class AssertionsKt {
+ method public static androidx.compose.ui.test.SemanticsNodeInteraction assert(androidx.compose.ui.test.SemanticsNodeInteraction, androidx.compose.ui.test.SemanticsMatcher matcher, optional kotlin.jvm.functions.Function0<java.lang.String>? messagePrefixOnError);
+ method public static androidx.compose.ui.test.SemanticsNodeInteractionCollection assertAll(androidx.compose.ui.test.SemanticsNodeInteractionCollection, androidx.compose.ui.test.SemanticsMatcher matcher);
+ method public static androidx.compose.ui.test.SemanticsNodeInteractionCollection assertAny(androidx.compose.ui.test.SemanticsNodeInteractionCollection, androidx.compose.ui.test.SemanticsMatcher matcher);
+ method public static androidx.compose.ui.test.SemanticsNodeInteraction assertContentDescriptionContains(androidx.compose.ui.test.SemanticsNodeInteraction, String value, optional boolean substring, optional boolean ignoreCase);
+ method public static androidx.compose.ui.test.SemanticsNodeInteraction assertContentDescriptionEquals(androidx.compose.ui.test.SemanticsNodeInteraction, java.lang.String... values);
+ method public static androidx.compose.ui.test.SemanticsNodeInteractionCollection assertCountEquals(androidx.compose.ui.test.SemanticsNodeInteractionCollection, int expectedSize);
+ method public static androidx.compose.ui.test.SemanticsNodeInteraction assertHasClickAction(androidx.compose.ui.test.SemanticsNodeInteraction);
+ method public static androidx.compose.ui.test.SemanticsNodeInteraction assertHasNoClickAction(androidx.compose.ui.test.SemanticsNodeInteraction);
+ method public static androidx.compose.ui.test.SemanticsNodeInteraction assertIsDisplayed(androidx.compose.ui.test.SemanticsNodeInteraction);
+ method public static androidx.compose.ui.test.SemanticsNodeInteraction assertIsEnabled(androidx.compose.ui.test.SemanticsNodeInteraction);
+ method public static androidx.compose.ui.test.SemanticsNodeInteraction assertIsFocused(androidx.compose.ui.test.SemanticsNodeInteraction);
+ method public static androidx.compose.ui.test.SemanticsNodeInteraction assertIsNotDisplayed(androidx.compose.ui.test.SemanticsNodeInteraction);
+ method public static androidx.compose.ui.test.SemanticsNodeInteraction assertIsNotEnabled(androidx.compose.ui.test.SemanticsNodeInteraction);
+ method public static androidx.compose.ui.test.SemanticsNodeInteraction assertIsNotFocused(androidx.compose.ui.test.SemanticsNodeInteraction);
+ method public static androidx.compose.ui.test.SemanticsNodeInteraction assertIsNotSelected(androidx.compose.ui.test.SemanticsNodeInteraction);
+ method public static androidx.compose.ui.test.SemanticsNodeInteraction assertIsOff(androidx.compose.ui.test.SemanticsNodeInteraction);
+ method public static androidx.compose.ui.test.SemanticsNodeInteraction assertIsOn(androidx.compose.ui.test.SemanticsNodeInteraction);
+ method public static androidx.compose.ui.test.SemanticsNodeInteraction assertIsSelectable(androidx.compose.ui.test.SemanticsNodeInteraction);
+ method public static androidx.compose.ui.test.SemanticsNodeInteraction assertIsSelected(androidx.compose.ui.test.SemanticsNodeInteraction);
+ method public static androidx.compose.ui.test.SemanticsNodeInteraction assertIsToggleable(androidx.compose.ui.test.SemanticsNodeInteraction);
+ method public static androidx.compose.ui.test.SemanticsNodeInteraction assertRangeInfoEquals(androidx.compose.ui.test.SemanticsNodeInteraction, androidx.compose.ui.semantics.ProgressBarRangeInfo value);
+ method public static androidx.compose.ui.test.SemanticsNodeInteraction assertTextContains(androidx.compose.ui.test.SemanticsNodeInteraction, String value, optional boolean substring, optional boolean ignoreCase);
+ method public static androidx.compose.ui.test.SemanticsNodeInteraction assertTextEquals(androidx.compose.ui.test.SemanticsNodeInteraction, String![] values, optional boolean includeEditableText);
+ method public static androidx.compose.ui.test.SemanticsNodeInteraction assertValueEquals(androidx.compose.ui.test.SemanticsNodeInteraction, String value);
+ }
+
+ public final class BoundsAssertionsKt {
+ method public static androidx.compose.ui.test.SemanticsNodeInteraction assertHeightIsAtLeast(androidx.compose.ui.test.SemanticsNodeInteraction, float expectedMinHeight);
+ method public static androidx.compose.ui.test.SemanticsNodeInteraction assertHeightIsEqualTo(androidx.compose.ui.test.SemanticsNodeInteraction, float expectedHeight);
+ method public static void assertIsEqualTo(float, float expected, String subject, optional float tolerance);
+ method public static androidx.compose.ui.test.SemanticsNodeInteraction assertLeftPositionInRootIsEqualTo(androidx.compose.ui.test.SemanticsNodeInteraction, float expectedLeft);
+ method public static androidx.compose.ui.test.SemanticsNodeInteraction assertPositionInRootIsEqualTo(androidx.compose.ui.test.SemanticsNodeInteraction, float expectedLeft, float expectedTop);
+ method public static androidx.compose.ui.test.SemanticsNodeInteraction assertTopPositionInRootIsEqualTo(androidx.compose.ui.test.SemanticsNodeInteraction, float expectedTop);
+ method public static androidx.compose.ui.test.SemanticsNodeInteraction assertTouchHeightIsEqualTo(androidx.compose.ui.test.SemanticsNodeInteraction, float expectedHeight);
+ method public static androidx.compose.ui.test.SemanticsNodeInteraction assertTouchWidthIsEqualTo(androidx.compose.ui.test.SemanticsNodeInteraction, float expectedWidth);
+ method public static androidx.compose.ui.test.SemanticsNodeInteraction assertWidthIsAtLeast(androidx.compose.ui.test.SemanticsNodeInteraction, float expectedMinWidth);
+ method public static androidx.compose.ui.test.SemanticsNodeInteraction assertWidthIsEqualTo(androidx.compose.ui.test.SemanticsNodeInteraction, float expectedWidth);
+ method public static float getAlignmentLinePosition(androidx.compose.ui.test.SemanticsNodeInteraction, androidx.compose.ui.layout.AlignmentLine alignmentLine);
+ method public static androidx.compose.ui.unit.DpRect getBoundsInRoot(androidx.compose.ui.test.SemanticsNodeInteraction);
+ method public static androidx.compose.ui.unit.DpRect getUnclippedBoundsInRoot(androidx.compose.ui.test.SemanticsNodeInteraction);
+ }
+
+ public final class ComposeTimeoutException extends java.lang.Throwable {
+ ctor public ComposeTimeoutException(String? message);
+ }
+
+ public final class ErrorMessagesKt {
+ }
+
+ public final class Expect_jvmKt {
+ }
+
+ @kotlin.RequiresOptIn(message="This testing API is experimental and is likely to be changed or removed entirely") public @interface ExperimentalTestApi {
+ }
+
+ public final class FiltersKt {
+ method public static androidx.compose.ui.test.SemanticsMatcher hasAnyAncestor(androidx.compose.ui.test.SemanticsMatcher matcher);
+ method public static androidx.compose.ui.test.SemanticsMatcher hasAnyChild(androidx.compose.ui.test.SemanticsMatcher matcher);
+ method public static androidx.compose.ui.test.SemanticsMatcher hasAnyDescendant(androidx.compose.ui.test.SemanticsMatcher matcher);
+ method public static androidx.compose.ui.test.SemanticsMatcher hasAnySibling(androidx.compose.ui.test.SemanticsMatcher matcher);
+ method public static androidx.compose.ui.test.SemanticsMatcher hasClickAction();
+ method public static androidx.compose.ui.test.SemanticsMatcher hasContentDescription(String value, optional boolean substring, optional boolean ignoreCase);
+ method public static androidx.compose.ui.test.SemanticsMatcher hasContentDescriptionExactly(java.lang.String... values);
+ method public static androidx.compose.ui.test.SemanticsMatcher hasImeAction(int actionType);
+ method public static androidx.compose.ui.test.SemanticsMatcher hasNoClickAction();
+ method public static androidx.compose.ui.test.SemanticsMatcher hasNoScrollAction();
+ method public static androidx.compose.ui.test.SemanticsMatcher hasParent(androidx.compose.ui.test.SemanticsMatcher matcher);
+ method public static androidx.compose.ui.test.SemanticsMatcher hasProgressBarRangeInfo(androidx.compose.ui.semantics.ProgressBarRangeInfo rangeInfo);
+ method public static androidx.compose.ui.test.SemanticsMatcher hasScrollAction();
+ method public static androidx.compose.ui.test.SemanticsMatcher hasScrollToIndexAction();
+ method public static androidx.compose.ui.test.SemanticsMatcher hasScrollToKeyAction();
+ method public static androidx.compose.ui.test.SemanticsMatcher hasScrollToNodeAction();
+ method public static androidx.compose.ui.test.SemanticsMatcher hasSetTextAction();
+ method public static androidx.compose.ui.test.SemanticsMatcher hasStateDescription(String value);
+ method public static androidx.compose.ui.test.SemanticsMatcher hasTestTag(String testTag);
+ method public static androidx.compose.ui.test.SemanticsMatcher hasText(String text, optional boolean substring, optional boolean ignoreCase);
+ method public static androidx.compose.ui.test.SemanticsMatcher hasTextExactly(String![] textValues, optional boolean includeEditableText);
+ method public static androidx.compose.ui.test.SemanticsMatcher isDialog();
+ method public static androidx.compose.ui.test.SemanticsMatcher isEnabled();
+ method public static androidx.compose.ui.test.SemanticsMatcher isFocusable();
+ method public static androidx.compose.ui.test.SemanticsMatcher isFocused();
+ method public static androidx.compose.ui.test.SemanticsMatcher isHeading();
+ method public static androidx.compose.ui.test.SemanticsMatcher isNotEnabled();
+ method public static androidx.compose.ui.test.SemanticsMatcher isNotFocusable();
+ method public static androidx.compose.ui.test.SemanticsMatcher isNotFocused();
+ method public static androidx.compose.ui.test.SemanticsMatcher isNotSelected();
+ method public static androidx.compose.ui.test.SemanticsMatcher isOff();
+ method public static androidx.compose.ui.test.SemanticsMatcher isOn();
+ method public static androidx.compose.ui.test.SemanticsMatcher isPopup();
+ method public static androidx.compose.ui.test.SemanticsMatcher isRoot();
+ method public static androidx.compose.ui.test.SemanticsMatcher isSelectable();
+ method public static androidx.compose.ui.test.SemanticsMatcher isSelected();
+ method public static androidx.compose.ui.test.SemanticsMatcher isToggleable();
+ }
+
+ public final class FindersKt {
+ method public static androidx.compose.ui.test.SemanticsNodeInteractionCollection onAllNodesWithContentDescription(androidx.compose.ui.test.SemanticsNodeInteractionsProvider, String label, optional boolean substring, optional boolean ignoreCase, optional boolean useUnmergedTree);
+ method public static androidx.compose.ui.test.SemanticsNodeInteractionCollection onAllNodesWithTag(androidx.compose.ui.test.SemanticsNodeInteractionsProvider, String testTag, optional boolean useUnmergedTree);
+ method public static androidx.compose.ui.test.SemanticsNodeInteractionCollection onAllNodesWithText(androidx.compose.ui.test.SemanticsNodeInteractionsProvider, String text, optional boolean substring, optional boolean ignoreCase, optional boolean useUnmergedTree);
+ method public static androidx.compose.ui.test.SemanticsNodeInteraction onNodeWithContentDescription(androidx.compose.ui.test.SemanticsNodeInteractionsProvider, String label, optional boolean substring, optional boolean ignoreCase, optional boolean useUnmergedTree);
+ method public static androidx.compose.ui.test.SemanticsNodeInteraction onNodeWithTag(androidx.compose.ui.test.SemanticsNodeInteractionsProvider, String testTag, optional boolean useUnmergedTree);
+ method public static androidx.compose.ui.test.SemanticsNodeInteraction onNodeWithText(androidx.compose.ui.test.SemanticsNodeInteractionsProvider, String text, optional boolean substring, optional boolean ignoreCase, optional boolean useUnmergedTree);
+ method public static androidx.compose.ui.test.SemanticsNodeInteraction onRoot(androidx.compose.ui.test.SemanticsNodeInteractionsProvider, optional boolean useUnmergedTree);
+ }
+
+ @Deprecated public final class GestureScope {
+ ctor @Deprecated public GestureScope(androidx.compose.ui.semantics.SemanticsNode node, androidx.compose.ui.test.TestContext testContext);
+ method @Deprecated public long getVisibleSize();
+ property public final long visibleSize;
+ }
+
+ public final class GestureScopeKt {
+ method @Deprecated @androidx.compose.ui.test.ExperimentalTestApi public static void advanceEventTime(androidx.compose.ui.test.GestureScope, long durationMillis);
+ method @Deprecated public static void cancel(androidx.compose.ui.test.GestureScope);
+ method @Deprecated public static void click(androidx.compose.ui.test.GestureScope, optional long position);
+ method @Deprecated public static void doubleClick(androidx.compose.ui.test.GestureScope, optional long position, optional long delayMillis);
+ method @Deprecated public static void down(androidx.compose.ui.test.GestureScope, int pointerId, long position);
+ method @Deprecated public static void down(androidx.compose.ui.test.GestureScope, long position);
+ method @Deprecated public static inline float getBottom(androidx.compose.ui.test.GestureScope);
+ method @Deprecated public static long getBottomCenter(androidx.compose.ui.test.GestureScope);
+ method @Deprecated public static long getBottomLeft(androidx.compose.ui.test.GestureScope);
+ method @Deprecated public static long getBottomRight(androidx.compose.ui.test.GestureScope);
+ method @Deprecated public static long getCenter(androidx.compose.ui.test.GestureScope);
+ method @Deprecated public static long getCenterLeft(androidx.compose.ui.test.GestureScope);
+ method @Deprecated public static long getCenterRight(androidx.compose.ui.test.GestureScope);
+ method @Deprecated public static inline float getCenterX(androidx.compose.ui.test.GestureScope);
+ method @Deprecated public static inline float getCenterY(androidx.compose.ui.test.GestureScope);
+ method @Deprecated public static inline int getHeight(androidx.compose.ui.test.GestureScope);
+ method @Deprecated public static inline float getLeft(androidx.compose.ui.test.GestureScope);
+ method @Deprecated public static inline float getRight(androidx.compose.ui.test.GestureScope);
+ method @Deprecated public static inline float getTop(androidx.compose.ui.test.GestureScope);
+ method @Deprecated public static long getTopCenter(androidx.compose.ui.test.GestureScope);
+ method @Deprecated public static long getTopLeft(androidx.compose.ui.test.GestureScope);
+ method @Deprecated public static long getTopRight(androidx.compose.ui.test.GestureScope);
+ method @Deprecated public static inline int getWidth(androidx.compose.ui.test.GestureScope);
+ method @Deprecated public static void longClick(androidx.compose.ui.test.GestureScope, optional long position, optional long durationMillis);
+ method @Deprecated public static void move(androidx.compose.ui.test.GestureScope);
+ method @Deprecated public static void moveBy(androidx.compose.ui.test.GestureScope, int pointerId, long delta);
+ method @Deprecated public static void moveBy(androidx.compose.ui.test.GestureScope, long delta);
+ method @Deprecated public static void movePointerBy(androidx.compose.ui.test.GestureScope, int pointerId, long delta);
+ method @Deprecated public static void movePointerTo(androidx.compose.ui.test.GestureScope, int pointerId, long position);
+ method @Deprecated public static void moveTo(androidx.compose.ui.test.GestureScope, int pointerId, long position);
+ method @Deprecated public static void moveTo(androidx.compose.ui.test.GestureScope, long position);
+ method @Deprecated public static long percentOffset(androidx.compose.ui.test.GestureScope, optional float x, optional float y);
+ method @Deprecated public static void pinch(androidx.compose.ui.test.GestureScope, long start0, long end0, long start1, long end1, optional long durationMillis);
+ method @Deprecated public static void swipe(androidx.compose.ui.test.GestureScope, long start, long end, optional long durationMillis);
+ method @Deprecated public static void swipeDown(androidx.compose.ui.test.GestureScope);
+ method @Deprecated @androidx.compose.ui.test.ExperimentalTestApi public static void swipeDown(androidx.compose.ui.test.GestureScope, optional float startY, optional float endY, optional long durationMillis);
+ method @Deprecated public static void swipeLeft(androidx.compose.ui.test.GestureScope);
+ method @Deprecated @androidx.compose.ui.test.ExperimentalTestApi public static void swipeLeft(androidx.compose.ui.test.GestureScope, optional float startX, optional float endX, optional long durationMillis);
+ method @Deprecated public static void swipeRight(androidx.compose.ui.test.GestureScope);
+ method @Deprecated @androidx.compose.ui.test.ExperimentalTestApi public static void swipeRight(androidx.compose.ui.test.GestureScope, optional float startX, optional float endX, optional long durationMillis);
+ method @Deprecated public static void swipeUp(androidx.compose.ui.test.GestureScope);
+ method @Deprecated @androidx.compose.ui.test.ExperimentalTestApi public static void swipeUp(androidx.compose.ui.test.GestureScope, optional float startY, optional float endY, optional long durationMillis);
+ method @Deprecated public static void swipeWithVelocity(androidx.compose.ui.test.GestureScope, long start, long end, float endVelocity, optional long durationMillis);
+ method @Deprecated public static void up(androidx.compose.ui.test.GestureScope, optional int pointerId);
+ }
+
+ public interface IdlingResource {
+ method public default String? getDiagnosticMessageIfBusy();
+ method public boolean isIdleNow();
+ property public abstract boolean isIdleNow;
+ }
+
+ public interface InjectionScope extends androidx.compose.ui.unit.Density {
+ method public void advanceEventTime(optional long durationMillis);
+ method public default float getBottom();
+ method public default long getBottomCenter();
+ method public default long getBottomLeft();
+ method public default long getBottomRight();
+ method public default long getCenter();
+ method public default long getCenterLeft();
+ method public default long getCenterRight();
+ method public default float getCenterX();
+ method public default float getCenterY();
+ method public default long getEventPeriodMillis();
+ method public default int getHeight();
+ method public default float getLeft();
+ method public default float getRight();
+ method public default float getTop();
+ method public default long getTopCenter();
+ method public default long getTopLeft();
+ method public default long getTopRight();
+ method public androidx.compose.ui.platform.ViewConfiguration getViewConfiguration();
+ method public long getVisibleSize();
+ method public default int getWidth();
+ method public default long percentOffset(optional float x, optional float y);
+ property public default float bottom;
+ property public default long bottomCenter;
+ property public default long bottomLeft;
+ property public default long bottomRight;
+ property public default long center;
+ property public default long centerLeft;
+ property public default long centerRight;
+ property public default float centerX;
+ property public default float centerY;
+ property public default long eventPeriodMillis;
+ property public default int height;
+ property public default float left;
+ property public default float right;
+ property public default float top;
+ property public default long topCenter;
+ property public default long topLeft;
+ property public default long topRight;
+ property public abstract androidx.compose.ui.platform.ViewConfiguration viewConfiguration;
+ property public abstract long visibleSize;
+ property public default int width;
+ }
+
+ @kotlin.RequiresOptIn(message="This is internal API for Compose modules that may change frequently and without warning.") public @interface InternalTestApi {
+ }
+
+ public final class KeyInputHelpersKt {
+ method public static boolean performKeyPress(androidx.compose.ui.test.SemanticsNodeInteraction, android.view.KeyEvent keyEvent);
+ }
+
+ public interface MainTestClock {
+ method public void advanceTimeBy(long milliseconds, optional boolean ignoreFrameDuration);
+ method public void advanceTimeByFrame();
+ method public void advanceTimeUntil(optional long timeoutMillis, kotlin.jvm.functions.Function0<java.lang.Boolean> condition);
+ method public boolean getAutoAdvance();
+ method public long getCurrentTime();
+ method public void setAutoAdvance(boolean);
+ property public abstract boolean autoAdvance;
+ property public abstract long currentTime;
+ }
+
+ @androidx.compose.ui.test.ExperimentalTestApi @kotlin.jvm.JvmInline public final value class MouseButton {
+ ctor public MouseButton(int buttonId);
+ method public int getButtonId();
+ property public final int buttonId;
+ field public static final androidx.compose.ui.test.MouseButton.Companion Companion;
+ }
+
+ @androidx.compose.ui.test.ExperimentalTestApi public static final class MouseButton.Companion {
+ method public int getPrimary();
+ method public int getSecondary();
+ method public int getTertiary();
+ property public final int Primary;
+ property public final int Secondary;
+ property public final int Tertiary;
+ }
+
+ @androidx.compose.ui.test.ExperimentalTestApi public interface MouseInjectionScope extends androidx.compose.ui.test.InjectionScope {
+ method public void cancel(optional long delayMillis);
+ method public void enter(optional long position, optional long delayMillis);
+ method public void exit(optional long position, optional long delayMillis);
+ method public long getCurrentPosition();
+ method public default void moveBy(long delta, optional long delayMillis);
+ method public void moveTo(long position, optional long delayMillis);
+ method public void press(optional int button);
+ method public void release(optional int button);
+ method public void scroll(float delta, optional int scrollWheel);
+ method public default void updatePointerBy(long delta);
+ method public void updatePointerTo(long position);
+ property public abstract long currentPosition;
+ }
+
+ public final class MouseInjectionScopeKt {
+ method @androidx.compose.ui.test.ExperimentalTestApi public static void animateAlong(androidx.compose.ui.test.MouseInjectionScope, kotlin.jvm.functions.Function1<? super java.lang.Long,androidx.compose.ui.geometry.Offset> curve, optional long durationMillis);
+ method @androidx.compose.ui.test.ExperimentalTestApi public static void animateBy(androidx.compose.ui.test.MouseInjectionScope, long delta, optional long durationMillis);
+ method @androidx.compose.ui.test.ExperimentalTestApi public static void animateTo(androidx.compose.ui.test.MouseInjectionScope, long position, optional long durationMillis);
+ method @androidx.compose.ui.test.ExperimentalTestApi public static void click(androidx.compose.ui.test.MouseInjectionScope, optional long position);
+ method @androidx.compose.ui.test.ExperimentalTestApi public static void doubleClick(androidx.compose.ui.test.MouseInjectionScope, optional long position);
+ method @androidx.compose.ui.test.ExperimentalTestApi public static void dragAndDrop(androidx.compose.ui.test.MouseInjectionScope, long start, long end, optional long durationMillis);
+ method @androidx.compose.ui.test.ExperimentalTestApi public static void longClick(androidx.compose.ui.test.MouseInjectionScope, optional long position);
+ method @androidx.compose.ui.test.ExperimentalTestApi public static void rightClick(androidx.compose.ui.test.MouseInjectionScope, optional long position);
+ method @androidx.compose.ui.test.ExperimentalTestApi public static void smoothScroll(androidx.compose.ui.test.MouseInjectionScope, float scrollAmount, optional long durationMillis, optional int scrollWheel);
+ method @androidx.compose.ui.test.ExperimentalTestApi public static void tripleClick(androidx.compose.ui.test.MouseInjectionScope, optional long position);
+ }
+
+ public sealed interface MultiModalInjectionScope extends androidx.compose.ui.test.InjectionScope {
+ method @androidx.compose.ui.test.ExperimentalTestApi public void mouse(kotlin.jvm.functions.Function1<? super androidx.compose.ui.test.MouseInjectionScope,kotlin.Unit> block);
+ method @androidx.compose.ui.test.ExperimentalTestApi public void rotary(kotlin.jvm.functions.Function1<? super androidx.compose.ui.test.RotaryInjectionScope,kotlin.Unit> block);
+ method public void touch(kotlin.jvm.functions.Function1<? super androidx.compose.ui.test.TouchInjectionScope,kotlin.Unit> block);
+ }
+
+ public final class OutputKt {
+ method public static void printToLog(androidx.compose.ui.test.SemanticsNodeInteraction, String tag, optional int maxDepth);
+ method public static void printToLog(androidx.compose.ui.test.SemanticsNodeInteractionCollection, String tag, optional int maxDepth);
+ method public static String printToString(androidx.compose.ui.test.SemanticsNodeInteraction, optional int maxDepth);
+ method public static String printToString(androidx.compose.ui.test.SemanticsNodeInteractionCollection, optional int maxDepth);
+ }
+
+ @androidx.compose.ui.test.ExperimentalTestApi public interface RotaryInjectionScope extends androidx.compose.ui.test.InjectionScope {
+ method public void rotateToScrollHorizontally(float horizontalScrollPixels);
+ method public void rotateToScrollVertically(float verticalScrollPixels);
+ }
+
+ @androidx.compose.ui.test.ExperimentalTestApi @kotlin.jvm.JvmInline public final value class ScrollWheel {
+ method public int getValue();
+ property public final int value;
+ field public static final androidx.compose.ui.test.ScrollWheel.Companion Companion;
+ }
+
+ @androidx.compose.ui.test.ExperimentalTestApi public static final class ScrollWheel.Companion {
+ method public int getHorizontal();
+ method public int getVertical();
+ property public final int Horizontal;
+ property public final int Vertical;
+ }
+
+ public final class SelectionResult {
+ ctor public SelectionResult(java.util.List<androidx.compose.ui.semantics.SemanticsNode> selectedNodes, optional String? customErrorOnNoMatch);
+ method public String? getCustomErrorOnNoMatch();
+ method public java.util.List<androidx.compose.ui.semantics.SemanticsNode> getSelectedNodes();
+ property public final String? customErrorOnNoMatch;
+ property public final java.util.List<androidx.compose.ui.semantics.SemanticsNode> selectedNodes;
+ }
+
+ public final class SelectorsKt {
+ method public static androidx.compose.ui.test.SemanticsNodeInteractionCollection filter(androidx.compose.ui.test.SemanticsNodeInteractionCollection, androidx.compose.ui.test.SemanticsMatcher matcher);
+ method public static androidx.compose.ui.test.SemanticsNodeInteraction filterToOne(androidx.compose.ui.test.SemanticsNodeInteractionCollection, androidx.compose.ui.test.SemanticsMatcher matcher);
+ method public static androidx.compose.ui.test.SemanticsNodeInteractionCollection onAncestors(androidx.compose.ui.test.SemanticsNodeInteraction);
+ method public static androidx.compose.ui.test.SemanticsNodeInteraction onChild(androidx.compose.ui.test.SemanticsNodeInteraction);
+ method public static androidx.compose.ui.test.SemanticsNodeInteraction onChildAt(androidx.compose.ui.test.SemanticsNodeInteraction, int index);
+ method public static androidx.compose.ui.test.SemanticsNodeInteractionCollection onChildren(androidx.compose.ui.test.SemanticsNodeInteraction);
+ method public static androidx.compose.ui.test.SemanticsNodeInteraction onFirst(androidx.compose.ui.test.SemanticsNodeInteractionCollection);
+ method public static androidx.compose.ui.test.SemanticsNodeInteraction onLast(androidx.compose.ui.test.SemanticsNodeInteractionCollection);
+ method public static androidx.compose.ui.test.SemanticsNodeInteraction onParent(androidx.compose.ui.test.SemanticsNodeInteraction);
+ method public static androidx.compose.ui.test.SemanticsNodeInteraction onSibling(androidx.compose.ui.test.SemanticsNodeInteraction);
+ method public static androidx.compose.ui.test.SemanticsNodeInteractionCollection onSiblings(androidx.compose.ui.test.SemanticsNodeInteraction);
+ }
+
+ public final class SemanticsMatcher {
+ ctor public SemanticsMatcher(String description, kotlin.jvm.functions.Function1<? super androidx.compose.ui.semantics.SemanticsNode,java.lang.Boolean> matcher);
+ method public infix androidx.compose.ui.test.SemanticsMatcher and(androidx.compose.ui.test.SemanticsMatcher other);
+ method public String getDescription();
+ method public boolean matches(androidx.compose.ui.semantics.SemanticsNode node);
+ method public boolean matchesAny(Iterable<androidx.compose.ui.semantics.SemanticsNode> nodes);
+ method public operator androidx.compose.ui.test.SemanticsMatcher not();
+ method public infix androidx.compose.ui.test.SemanticsMatcher or(androidx.compose.ui.test.SemanticsMatcher other);
+ property public final String description;
+ field public static final androidx.compose.ui.test.SemanticsMatcher.Companion Companion;
+ }
+
+ public static final class SemanticsMatcher.Companion {
+ method public <T> androidx.compose.ui.test.SemanticsMatcher expectValue(androidx.compose.ui.semantics.SemanticsPropertyKey<T> key, T? expectedValue);
+ method public <T> androidx.compose.ui.test.SemanticsMatcher keyIsDefined(androidx.compose.ui.semantics.SemanticsPropertyKey<T> key);
+ method public <T> androidx.compose.ui.test.SemanticsMatcher keyNotDefined(androidx.compose.ui.semantics.SemanticsPropertyKey<T> key);
+ }
+
+ public final class SemanticsNodeInteraction {
+ ctor public SemanticsNodeInteraction(androidx.compose.ui.test.TestContext testContext, boolean useUnmergedTree, androidx.compose.ui.test.SemanticsSelector selector);
+ ctor public SemanticsNodeInteraction(androidx.compose.ui.test.TestContext testContext, boolean useUnmergedTree, androidx.compose.ui.test.SemanticsMatcher matcher);
+ method public void assertDoesNotExist();
+ method public androidx.compose.ui.test.SemanticsNodeInteraction assertExists(optional String? errorMessageOnFail);
+ method public androidx.compose.ui.semantics.SemanticsNode fetchSemanticsNode(optional String? errorMessageOnFail);
+ }
+
+ public final class SemanticsNodeInteractionCollection {
+ ctor public SemanticsNodeInteractionCollection(androidx.compose.ui.test.TestContext testContext, boolean useUnmergedTree, androidx.compose.ui.test.SemanticsSelector selector);
+ ctor public SemanticsNodeInteractionCollection(androidx.compose.ui.test.TestContext testContext, boolean useUnmergedTree, androidx.compose.ui.test.SemanticsMatcher matcher);
+ method public java.util.List<androidx.compose.ui.semantics.SemanticsNode> fetchSemanticsNodes(optional boolean atLeastOneRootRequired, optional String? errorMessageOnFail);
+ method public operator androidx.compose.ui.test.SemanticsNodeInteraction get(int index);
+ }
+
+ public interface SemanticsNodeInteractionsProvider {
+ method public androidx.compose.ui.test.SemanticsNodeInteractionCollection onAllNodes(androidx.compose.ui.test.SemanticsMatcher matcher, optional boolean useUnmergedTree);
+ method public androidx.compose.ui.test.SemanticsNodeInteraction onNode(androidx.compose.ui.test.SemanticsMatcher matcher, optional boolean useUnmergedTree);
+ }
+
+ public final class SemanticsSelector {
+ ctor public SemanticsSelector(String description, boolean requiresExactlyOneNode, optional androidx.compose.ui.test.SemanticsSelector? chainedInputSelector, kotlin.jvm.functions.Function1<? super java.lang.Iterable<androidx.compose.ui.semantics.SemanticsNode>,androidx.compose.ui.test.SelectionResult> selector);
+ method public String getDescription();
+ method public androidx.compose.ui.test.SelectionResult map(Iterable<androidx.compose.ui.semantics.SemanticsNode> nodes, String errorOnFail);
+ property public final String description;
+ }
+
+ public final class SemanticsSelectorKt {
+ }
+
+ public final class TestContext {
+ }
+
+ @kotlinx.coroutines.ExperimentalCoroutinesApi public final class TestMonotonicFrameClock implements androidx.compose.runtime.MonotonicFrameClock {
+ ctor public TestMonotonicFrameClock(kotlinx.coroutines.CoroutineScope coroutineScope, kotlinx.coroutines.test.TestCoroutineScheduler delayController, optional long frameDelayNanos);
+ method public long getFrameDelayNanos();
+ method public boolean getHasAwaiters();
+ method public suspend <R> Object? withFrameNanos(kotlin.jvm.functions.Function1<? super java.lang.Long,? extends R> onFrame, kotlin.coroutines.Continuation<? super R>);
+ property public final long frameDelayNanos;
+ property public final boolean hasAwaiters;
+ }
+
+ public final class TestMonotonicFrameClock_jvmKt {
+ method @kotlinx.coroutines.ExperimentalCoroutinesApi public static androidx.compose.ui.test.TestMonotonicFrameClock TestMonotonicFrameClock(kotlinx.coroutines.CoroutineScope coroutineScope, optional long frameDelayNanos);
+ method @kotlinx.coroutines.ExperimentalCoroutinesApi public static long getFrameDelayMillis(androidx.compose.ui.test.TestMonotonicFrameClock);
+ }
+
+ @androidx.compose.ui.test.InternalTestApi public interface TestOwner {
+ method public androidx.compose.ui.test.MainTestClock getMainClock();
+ method public java.util.Set<androidx.compose.ui.node.RootForTest> getRoots(boolean atLeastOneRootExpected);
+ method public <T> T! runOnUiThread(kotlin.jvm.functions.Function0<? extends T> action);
+ method public void sendImeAction(androidx.compose.ui.semantics.SemanticsNode node, int actionSpecified);
+ method public void sendTextInputCommand(androidx.compose.ui.semantics.SemanticsNode node, java.util.List<? extends androidx.compose.ui.text.input.EditCommand> command);
+ property public abstract androidx.compose.ui.test.MainTestClock mainClock;
+ }
+
+ public final class TestOwnerKt {
+ method @androidx.compose.ui.test.InternalTestApi public static androidx.compose.ui.test.TestContext createTestContext(androidx.compose.ui.test.TestOwner owner);
+ }
+
+ public final class TextActionsKt {
+ method public static void performImeAction(androidx.compose.ui.test.SemanticsNodeInteraction);
+ method public static void performTextClearance(androidx.compose.ui.test.SemanticsNodeInteraction);
+ method public static void performTextInput(androidx.compose.ui.test.SemanticsNodeInteraction, String text);
+ method @androidx.compose.ui.test.ExperimentalTestApi public static void performTextInputSelection(androidx.compose.ui.test.SemanticsNodeInteraction, long selection);
+ method public static void performTextReplacement(androidx.compose.ui.test.SemanticsNodeInteraction, String text);
+ }
+
+ public interface TouchInjectionScope extends androidx.compose.ui.test.InjectionScope {
+ method public void cancel(optional long delayMillis);
+ method public androidx.compose.ui.geometry.Offset? currentPosition(optional int pointerId);
+ method public void down(int pointerId, long position);
+ method public default void down(long position);
+ method public void move(optional long delayMillis);
+ method public default void moveBy(int pointerId, long delta, optional long delayMillis);
+ method public default void moveBy(long delta, optional long delayMillis);
+ method public default void moveTo(int pointerId, long position, optional long delayMillis);
+ method public default void moveTo(long position, optional long delayMillis);
+ method @androidx.compose.ui.test.ExperimentalTestApi public default void moveWithHistory(java.util.List<java.lang.Long> relativeHistoricalTimes, java.util.List<androidx.compose.ui.geometry.Offset> historicalCoordinates, optional long delayMillis);
+ method @androidx.compose.ui.test.ExperimentalTestApi public void moveWithHistoryMultiPointer(java.util.List<java.lang.Long> relativeHistoricalTimes, java.util.List<? extends java.util.List<androidx.compose.ui.geometry.Offset>> historicalCoordinates, optional long delayMillis);
+ method public void up(optional int pointerId);
+ method public default void updatePointerBy(int pointerId, long delta);
+ method public void updatePointerTo(int pointerId, long position);
+ }
+
+ public final class TouchInjectionScopeKt {
+ method public static void click(androidx.compose.ui.test.TouchInjectionScope, optional long position);
+ method public static void doubleClick(androidx.compose.ui.test.TouchInjectionScope, optional long position, optional long delayMillis);
+ method public static void longClick(androidx.compose.ui.test.TouchInjectionScope, optional long position, optional long durationMillis);
+ method @androidx.compose.ui.test.ExperimentalTestApi public static void multiTouchSwipe(androidx.compose.ui.test.TouchInjectionScope, java.util.List<? extends kotlin.jvm.functions.Function1<? super java.lang.Long,androidx.compose.ui.geometry.Offset>> curves, long durationMillis, optional java.util.List<java.lang.Long> keyTimes);
+ method public static void pinch(androidx.compose.ui.test.TouchInjectionScope, long start0, long end0, long start1, long end1, optional long durationMillis);
+ method public static void swipe(androidx.compose.ui.test.TouchInjectionScope, long start, long end, optional long durationMillis);
+ method public static void swipe(androidx.compose.ui.test.TouchInjectionScope, kotlin.jvm.functions.Function1<? super java.lang.Long,androidx.compose.ui.geometry.Offset> curve, long durationMillis, optional java.util.List<java.lang.Long> keyTimes);
+ method public static void swipeDown(androidx.compose.ui.test.TouchInjectionScope, optional float startY, optional float endY, optional long durationMillis);
+ method public static void swipeLeft(androidx.compose.ui.test.TouchInjectionScope, optional float startX, optional float endX, optional long durationMillis);
+ method public static void swipeRight(androidx.compose.ui.test.TouchInjectionScope, optional float startX, optional float endX, optional long durationMillis);
+ method public static void swipeUp(androidx.compose.ui.test.TouchInjectionScope, optional float startY, optional float endY, optional long durationMillis);
+ method public static void swipeWithVelocity(androidx.compose.ui.test.TouchInjectionScope, long start, long end, float endVelocity, optional long durationMillis);
+ }
+
+ public final class UtilsKt {
+ }
+
+}
+
+package androidx.compose.ui.test.android {
+
+ public final class WindowCapture_androidKt {
+ }
+
+}
+
diff --git a/compose/ui/ui-test/api/res-1.2.0-beta02.txt b/compose/ui/ui-test/api/res-1.2.0-beta02.txt
new file mode 100644
index 0000000..e69de29
--- /dev/null
+++ b/compose/ui/ui-test/api/res-1.2.0-beta02.txt
diff --git a/compose/ui/ui-test/api/restricted_1.2.0-beta02.txt b/compose/ui/ui-test/api/restricted_1.2.0-beta02.txt
new file mode 100644
index 0000000..bab6121
--- /dev/null
+++ b/compose/ui/ui-test/api/restricted_1.2.0-beta02.txt
@@ -0,0 +1,393 @@
+// Signature format: 4.0
+package androidx.compose.ui.test {
+
+ public final class ActionsKt {
+ method public static androidx.compose.ui.test.SemanticsNodeInteraction performClick(androidx.compose.ui.test.SemanticsNodeInteraction);
+ method @Deprecated public static androidx.compose.ui.test.SemanticsNodeInteraction performGesture(androidx.compose.ui.test.SemanticsNodeInteraction, kotlin.jvm.functions.Function1<? super androidx.compose.ui.test.GestureScope,kotlin.Unit> block);
+ method public static androidx.compose.ui.test.SemanticsNodeInteraction performMultiModalInput(androidx.compose.ui.test.SemanticsNodeInteraction, kotlin.jvm.functions.Function1<? super androidx.compose.ui.test.MultiModalInjectionScope,kotlin.Unit> block);
+ method public static androidx.compose.ui.test.SemanticsNodeInteraction performScrollTo(androidx.compose.ui.test.SemanticsNodeInteraction);
+ method public static androidx.compose.ui.test.SemanticsNodeInteraction performScrollToIndex(androidx.compose.ui.test.SemanticsNodeInteraction, int index);
+ method public static androidx.compose.ui.test.SemanticsNodeInteraction performScrollToKey(androidx.compose.ui.test.SemanticsNodeInteraction, Object key);
+ method public static androidx.compose.ui.test.SemanticsNodeInteraction performScrollToNode(androidx.compose.ui.test.SemanticsNodeInteraction, androidx.compose.ui.test.SemanticsMatcher matcher);
+ method public static <T extends kotlin.Function<? extends java.lang.Boolean>> androidx.compose.ui.test.SemanticsNodeInteraction performSemanticsAction(androidx.compose.ui.test.SemanticsNodeInteraction, androidx.compose.ui.semantics.SemanticsPropertyKey<androidx.compose.ui.semantics.AccessibilityAction<T>> key, kotlin.jvm.functions.Function1<? super T,kotlin.Unit> invocation);
+ method public static androidx.compose.ui.test.SemanticsNodeInteraction performSemanticsAction(androidx.compose.ui.test.SemanticsNodeInteraction, androidx.compose.ui.semantics.SemanticsPropertyKey<androidx.compose.ui.semantics.AccessibilityAction<kotlin.jvm.functions.Function0<java.lang.Boolean>>> key);
+ method @Deprecated public static <T extends kotlin.Function<? extends java.lang.Boolean>> void performSemanticsActionUnit(androidx.compose.ui.test.SemanticsNodeInteraction, androidx.compose.ui.semantics.SemanticsPropertyKey<androidx.compose.ui.semantics.AccessibilityAction<T>> key, kotlin.jvm.functions.Function1<? super T,? extends kotlin.Unit> invocation);
+ method @Deprecated public static void performSemanticsActionUnit(androidx.compose.ui.test.SemanticsNodeInteraction, androidx.compose.ui.semantics.SemanticsPropertyKey<androidx.compose.ui.semantics.AccessibilityAction<kotlin.jvm.functions.Function0<? extends java.lang.Boolean>>> key);
+ method public static androidx.compose.ui.test.SemanticsNodeInteraction performTouchInput(androidx.compose.ui.test.SemanticsNodeInteraction, kotlin.jvm.functions.Function1<? super androidx.compose.ui.test.TouchInjectionScope,kotlin.Unit> block);
+ }
+
+ public final class Actions_androidKt {
+ }
+
+ public final class AndroidAssertions_androidKt {
+ }
+
+ public final class AndroidImageHelpers_androidKt {
+ method @RequiresApi(android.os.Build.VERSION_CODES.O) public static androidx.compose.ui.graphics.ImageBitmap captureToImage(androidx.compose.ui.test.SemanticsNodeInteraction);
+ }
+
+ public final class AndroidInputDispatcher_androidKt {
+ }
+
+ public final class AndroidOutput_androidKt {
+ }
+
+ public final class AssertionsKt {
+ method public static androidx.compose.ui.test.SemanticsNodeInteraction assert(androidx.compose.ui.test.SemanticsNodeInteraction, androidx.compose.ui.test.SemanticsMatcher matcher, optional kotlin.jvm.functions.Function0<java.lang.String>? messagePrefixOnError);
+ method public static androidx.compose.ui.test.SemanticsNodeInteractionCollection assertAll(androidx.compose.ui.test.SemanticsNodeInteractionCollection, androidx.compose.ui.test.SemanticsMatcher matcher);
+ method public static androidx.compose.ui.test.SemanticsNodeInteractionCollection assertAny(androidx.compose.ui.test.SemanticsNodeInteractionCollection, androidx.compose.ui.test.SemanticsMatcher matcher);
+ method public static androidx.compose.ui.test.SemanticsNodeInteraction assertContentDescriptionContains(androidx.compose.ui.test.SemanticsNodeInteraction, String value, optional boolean substring, optional boolean ignoreCase);
+ method public static androidx.compose.ui.test.SemanticsNodeInteraction assertContentDescriptionEquals(androidx.compose.ui.test.SemanticsNodeInteraction, java.lang.String... values);
+ method public static androidx.compose.ui.test.SemanticsNodeInteractionCollection assertCountEquals(androidx.compose.ui.test.SemanticsNodeInteractionCollection, int expectedSize);
+ method public static androidx.compose.ui.test.SemanticsNodeInteraction assertHasClickAction(androidx.compose.ui.test.SemanticsNodeInteraction);
+ method public static androidx.compose.ui.test.SemanticsNodeInteraction assertHasNoClickAction(androidx.compose.ui.test.SemanticsNodeInteraction);
+ method public static androidx.compose.ui.test.SemanticsNodeInteraction assertIsDisplayed(androidx.compose.ui.test.SemanticsNodeInteraction);
+ method public static androidx.compose.ui.test.SemanticsNodeInteraction assertIsEnabled(androidx.compose.ui.test.SemanticsNodeInteraction);
+ method public static androidx.compose.ui.test.SemanticsNodeInteraction assertIsFocused(androidx.compose.ui.test.SemanticsNodeInteraction);
+ method public static androidx.compose.ui.test.SemanticsNodeInteraction assertIsNotDisplayed(androidx.compose.ui.test.SemanticsNodeInteraction);
+ method public static androidx.compose.ui.test.SemanticsNodeInteraction assertIsNotEnabled(androidx.compose.ui.test.SemanticsNodeInteraction);
+ method public static androidx.compose.ui.test.SemanticsNodeInteraction assertIsNotFocused(androidx.compose.ui.test.SemanticsNodeInteraction);
+ method public static androidx.compose.ui.test.SemanticsNodeInteraction assertIsNotSelected(androidx.compose.ui.test.SemanticsNodeInteraction);
+ method public static androidx.compose.ui.test.SemanticsNodeInteraction assertIsOff(androidx.compose.ui.test.SemanticsNodeInteraction);
+ method public static androidx.compose.ui.test.SemanticsNodeInteraction assertIsOn(androidx.compose.ui.test.SemanticsNodeInteraction);
+ method public static androidx.compose.ui.test.SemanticsNodeInteraction assertIsSelectable(androidx.compose.ui.test.SemanticsNodeInteraction);
+ method public static androidx.compose.ui.test.SemanticsNodeInteraction assertIsSelected(androidx.compose.ui.test.SemanticsNodeInteraction);
+ method public static androidx.compose.ui.test.SemanticsNodeInteraction assertIsToggleable(androidx.compose.ui.test.SemanticsNodeInteraction);
+ method public static androidx.compose.ui.test.SemanticsNodeInteraction assertRangeInfoEquals(androidx.compose.ui.test.SemanticsNodeInteraction, androidx.compose.ui.semantics.ProgressBarRangeInfo value);
+ method public static androidx.compose.ui.test.SemanticsNodeInteraction assertTextContains(androidx.compose.ui.test.SemanticsNodeInteraction, String value, optional boolean substring, optional boolean ignoreCase);
+ method public static androidx.compose.ui.test.SemanticsNodeInteraction assertTextEquals(androidx.compose.ui.test.SemanticsNodeInteraction, String![] values, optional boolean includeEditableText);
+ method public static androidx.compose.ui.test.SemanticsNodeInteraction assertValueEquals(androidx.compose.ui.test.SemanticsNodeInteraction, String value);
+ }
+
+ public final class BoundsAssertionsKt {
+ method public static androidx.compose.ui.test.SemanticsNodeInteraction assertHeightIsAtLeast(androidx.compose.ui.test.SemanticsNodeInteraction, float expectedMinHeight);
+ method public static androidx.compose.ui.test.SemanticsNodeInteraction assertHeightIsEqualTo(androidx.compose.ui.test.SemanticsNodeInteraction, float expectedHeight);
+ method public static void assertIsEqualTo(float, float expected, String subject, optional float tolerance);
+ method public static androidx.compose.ui.test.SemanticsNodeInteraction assertLeftPositionInRootIsEqualTo(androidx.compose.ui.test.SemanticsNodeInteraction, float expectedLeft);
+ method public static androidx.compose.ui.test.SemanticsNodeInteraction assertPositionInRootIsEqualTo(androidx.compose.ui.test.SemanticsNodeInteraction, float expectedLeft, float expectedTop);
+ method public static androidx.compose.ui.test.SemanticsNodeInteraction assertTopPositionInRootIsEqualTo(androidx.compose.ui.test.SemanticsNodeInteraction, float expectedTop);
+ method public static androidx.compose.ui.test.SemanticsNodeInteraction assertTouchHeightIsEqualTo(androidx.compose.ui.test.SemanticsNodeInteraction, float expectedHeight);
+ method public static androidx.compose.ui.test.SemanticsNodeInteraction assertTouchWidthIsEqualTo(androidx.compose.ui.test.SemanticsNodeInteraction, float expectedWidth);
+ method public static androidx.compose.ui.test.SemanticsNodeInteraction assertWidthIsAtLeast(androidx.compose.ui.test.SemanticsNodeInteraction, float expectedMinWidth);
+ method public static androidx.compose.ui.test.SemanticsNodeInteraction assertWidthIsEqualTo(androidx.compose.ui.test.SemanticsNodeInteraction, float expectedWidth);
+ method public static float getAlignmentLinePosition(androidx.compose.ui.test.SemanticsNodeInteraction, androidx.compose.ui.layout.AlignmentLine alignmentLine);
+ method public static androidx.compose.ui.unit.DpRect getBoundsInRoot(androidx.compose.ui.test.SemanticsNodeInteraction);
+ method public static androidx.compose.ui.unit.DpRect getUnclippedBoundsInRoot(androidx.compose.ui.test.SemanticsNodeInteraction);
+ }
+
+ public final class ComposeTimeoutException extends java.lang.Throwable {
+ ctor public ComposeTimeoutException(String? message);
+ }
+
+ public final class ErrorMessagesKt {
+ }
+
+ public final class Expect_jvmKt {
+ }
+
+ public final class FiltersKt {
+ method public static androidx.compose.ui.test.SemanticsMatcher hasAnyAncestor(androidx.compose.ui.test.SemanticsMatcher matcher);
+ method public static androidx.compose.ui.test.SemanticsMatcher hasAnyChild(androidx.compose.ui.test.SemanticsMatcher matcher);
+ method public static androidx.compose.ui.test.SemanticsMatcher hasAnyDescendant(androidx.compose.ui.test.SemanticsMatcher matcher);
+ method public static androidx.compose.ui.test.SemanticsMatcher hasAnySibling(androidx.compose.ui.test.SemanticsMatcher matcher);
+ method public static androidx.compose.ui.test.SemanticsMatcher hasClickAction();
+ method public static androidx.compose.ui.test.SemanticsMatcher hasContentDescription(String value, optional boolean substring, optional boolean ignoreCase);
+ method public static androidx.compose.ui.test.SemanticsMatcher hasContentDescriptionExactly(java.lang.String... values);
+ method public static androidx.compose.ui.test.SemanticsMatcher hasImeAction(int actionType);
+ method public static androidx.compose.ui.test.SemanticsMatcher hasNoClickAction();
+ method public static androidx.compose.ui.test.SemanticsMatcher hasNoScrollAction();
+ method public static androidx.compose.ui.test.SemanticsMatcher hasParent(androidx.compose.ui.test.SemanticsMatcher matcher);
+ method public static androidx.compose.ui.test.SemanticsMatcher hasProgressBarRangeInfo(androidx.compose.ui.semantics.ProgressBarRangeInfo rangeInfo);
+ method public static androidx.compose.ui.test.SemanticsMatcher hasScrollAction();
+ method public static androidx.compose.ui.test.SemanticsMatcher hasScrollToIndexAction();
+ method public static androidx.compose.ui.test.SemanticsMatcher hasScrollToKeyAction();
+ method public static androidx.compose.ui.test.SemanticsMatcher hasScrollToNodeAction();
+ method public static androidx.compose.ui.test.SemanticsMatcher hasSetTextAction();
+ method public static androidx.compose.ui.test.SemanticsMatcher hasStateDescription(String value);
+ method public static androidx.compose.ui.test.SemanticsMatcher hasTestTag(String testTag);
+ method public static androidx.compose.ui.test.SemanticsMatcher hasText(String text, optional boolean substring, optional boolean ignoreCase);
+ method public static androidx.compose.ui.test.SemanticsMatcher hasTextExactly(String![] textValues, optional boolean includeEditableText);
+ method public static androidx.compose.ui.test.SemanticsMatcher isDialog();
+ method public static androidx.compose.ui.test.SemanticsMatcher isEnabled();
+ method public static androidx.compose.ui.test.SemanticsMatcher isFocusable();
+ method public static androidx.compose.ui.test.SemanticsMatcher isFocused();
+ method public static androidx.compose.ui.test.SemanticsMatcher isHeading();
+ method public static androidx.compose.ui.test.SemanticsMatcher isNotEnabled();
+ method public static androidx.compose.ui.test.SemanticsMatcher isNotFocusable();
+ method public static androidx.compose.ui.test.SemanticsMatcher isNotFocused();
+ method public static androidx.compose.ui.test.SemanticsMatcher isNotSelected();
+ method public static androidx.compose.ui.test.SemanticsMatcher isOff();
+ method public static androidx.compose.ui.test.SemanticsMatcher isOn();
+ method public static androidx.compose.ui.test.SemanticsMatcher isPopup();
+ method public static androidx.compose.ui.test.SemanticsMatcher isRoot();
+ method public static androidx.compose.ui.test.SemanticsMatcher isSelectable();
+ method public static androidx.compose.ui.test.SemanticsMatcher isSelected();
+ method public static androidx.compose.ui.test.SemanticsMatcher isToggleable();
+ }
+
+ public final class FindersKt {
+ method public static androidx.compose.ui.test.SemanticsNodeInteractionCollection onAllNodesWithContentDescription(androidx.compose.ui.test.SemanticsNodeInteractionsProvider, String label, optional boolean substring, optional boolean ignoreCase, optional boolean useUnmergedTree);
+ method public static androidx.compose.ui.test.SemanticsNodeInteractionCollection onAllNodesWithTag(androidx.compose.ui.test.SemanticsNodeInteractionsProvider, String testTag, optional boolean useUnmergedTree);
+ method public static androidx.compose.ui.test.SemanticsNodeInteractionCollection onAllNodesWithText(androidx.compose.ui.test.SemanticsNodeInteractionsProvider, String text, optional boolean substring, optional boolean ignoreCase, optional boolean useUnmergedTree);
+ method public static androidx.compose.ui.test.SemanticsNodeInteraction onNodeWithContentDescription(androidx.compose.ui.test.SemanticsNodeInteractionsProvider, String label, optional boolean substring, optional boolean ignoreCase, optional boolean useUnmergedTree);
+ method public static androidx.compose.ui.test.SemanticsNodeInteraction onNodeWithTag(androidx.compose.ui.test.SemanticsNodeInteractionsProvider, String testTag, optional boolean useUnmergedTree);
+ method public static androidx.compose.ui.test.SemanticsNodeInteraction onNodeWithText(androidx.compose.ui.test.SemanticsNodeInteractionsProvider, String text, optional boolean substring, optional boolean ignoreCase, optional boolean useUnmergedTree);
+ method public static androidx.compose.ui.test.SemanticsNodeInteraction onRoot(androidx.compose.ui.test.SemanticsNodeInteractionsProvider, optional boolean useUnmergedTree);
+ }
+
+ @Deprecated public final class GestureScope {
+ ctor @Deprecated public GestureScope(androidx.compose.ui.semantics.SemanticsNode node, androidx.compose.ui.test.TestContext testContext);
+ method @Deprecated public long getVisibleSize();
+ property public final long visibleSize;
+ field @Deprecated @kotlin.PublishedApi internal final androidx.compose.ui.test.MultiModalInjectionScope delegateScope;
+ }
+
+ public final class GestureScopeKt {
+ method @Deprecated public static void cancel(androidx.compose.ui.test.GestureScope);
+ method @Deprecated public static void click(androidx.compose.ui.test.GestureScope, optional long position);
+ method @Deprecated public static void doubleClick(androidx.compose.ui.test.GestureScope, optional long position, optional long delayMillis);
+ method @Deprecated public static void down(androidx.compose.ui.test.GestureScope, int pointerId, long position);
+ method @Deprecated public static void down(androidx.compose.ui.test.GestureScope, long position);
+ method @Deprecated public static inline float getBottom(androidx.compose.ui.test.GestureScope);
+ method @Deprecated public static long getBottomCenter(androidx.compose.ui.test.GestureScope);
+ method @Deprecated public static long getBottomLeft(androidx.compose.ui.test.GestureScope);
+ method @Deprecated public static long getBottomRight(androidx.compose.ui.test.GestureScope);
+ method @Deprecated public static long getCenter(androidx.compose.ui.test.GestureScope);
+ method @Deprecated public static long getCenterLeft(androidx.compose.ui.test.GestureScope);
+ method @Deprecated public static long getCenterRight(androidx.compose.ui.test.GestureScope);
+ method @Deprecated public static inline float getCenterX(androidx.compose.ui.test.GestureScope);
+ method @Deprecated public static inline float getCenterY(androidx.compose.ui.test.GestureScope);
+ method @Deprecated public static inline int getHeight(androidx.compose.ui.test.GestureScope);
+ method @Deprecated public static inline float getLeft(androidx.compose.ui.test.GestureScope);
+ method @Deprecated public static inline float getRight(androidx.compose.ui.test.GestureScope);
+ method @Deprecated public static inline float getTop(androidx.compose.ui.test.GestureScope);
+ method @Deprecated public static long getTopCenter(androidx.compose.ui.test.GestureScope);
+ method @Deprecated public static long getTopLeft(androidx.compose.ui.test.GestureScope);
+ method @Deprecated public static long getTopRight(androidx.compose.ui.test.GestureScope);
+ method @Deprecated public static inline int getWidth(androidx.compose.ui.test.GestureScope);
+ method @Deprecated public static void longClick(androidx.compose.ui.test.GestureScope, optional long position, optional long durationMillis);
+ method @Deprecated public static void move(androidx.compose.ui.test.GestureScope);
+ method @Deprecated public static void moveBy(androidx.compose.ui.test.GestureScope, int pointerId, long delta);
+ method @Deprecated public static void moveBy(androidx.compose.ui.test.GestureScope, long delta);
+ method @Deprecated public static void movePointerBy(androidx.compose.ui.test.GestureScope, int pointerId, long delta);
+ method @Deprecated public static void movePointerTo(androidx.compose.ui.test.GestureScope, int pointerId, long position);
+ method @Deprecated public static void moveTo(androidx.compose.ui.test.GestureScope, int pointerId, long position);
+ method @Deprecated public static void moveTo(androidx.compose.ui.test.GestureScope, long position);
+ method @Deprecated public static long percentOffset(androidx.compose.ui.test.GestureScope, optional float x, optional float y);
+ method @Deprecated public static void pinch(androidx.compose.ui.test.GestureScope, long start0, long end0, long start1, long end1, optional long durationMillis);
+ method @Deprecated public static void swipe(androidx.compose.ui.test.GestureScope, long start, long end, optional long durationMillis);
+ method @Deprecated public static void swipeDown(androidx.compose.ui.test.GestureScope);
+ method @Deprecated public static void swipeLeft(androidx.compose.ui.test.GestureScope);
+ method @Deprecated public static void swipeRight(androidx.compose.ui.test.GestureScope);
+ method @Deprecated public static void swipeUp(androidx.compose.ui.test.GestureScope);
+ method @Deprecated public static void swipeWithVelocity(androidx.compose.ui.test.GestureScope, long start, long end, float endVelocity, optional long durationMillis);
+ method @Deprecated public static void up(androidx.compose.ui.test.GestureScope, optional int pointerId);
+ }
+
+ public interface IdlingResource {
+ method public default String? getDiagnosticMessageIfBusy();
+ method public boolean isIdleNow();
+ property public abstract boolean isIdleNow;
+ }
+
+ public interface InjectionScope extends androidx.compose.ui.unit.Density {
+ method public void advanceEventTime(optional long durationMillis);
+ method public default float getBottom();
+ method public default long getBottomCenter();
+ method public default long getBottomLeft();
+ method public default long getBottomRight();
+ method public default long getCenter();
+ method public default long getCenterLeft();
+ method public default long getCenterRight();
+ method public default float getCenterX();
+ method public default float getCenterY();
+ method public default long getEventPeriodMillis();
+ method public default int getHeight();
+ method public default float getLeft();
+ method public default float getRight();
+ method public default float getTop();
+ method public default long getTopCenter();
+ method public default long getTopLeft();
+ method public default long getTopRight();
+ method public androidx.compose.ui.platform.ViewConfiguration getViewConfiguration();
+ method public long getVisibleSize();
+ method public default int getWidth();
+ method public default long percentOffset(optional float x, optional float y);
+ property public default float bottom;
+ property public default long bottomCenter;
+ property public default long bottomLeft;
+ property public default long bottomRight;
+ property public default long center;
+ property public default long centerLeft;
+ property public default long centerRight;
+ property public default float centerX;
+ property public default float centerY;
+ property public default long eventPeriodMillis;
+ property public default int height;
+ property public default float left;
+ property public default float right;
+ property public default float top;
+ property public default long topCenter;
+ property public default long topLeft;
+ property public default long topRight;
+ property public abstract androidx.compose.ui.platform.ViewConfiguration viewConfiguration;
+ property public abstract long visibleSize;
+ property public default int width;
+ }
+
+ public final class KeyInputHelpersKt {
+ method public static boolean performKeyPress(androidx.compose.ui.test.SemanticsNodeInteraction, android.view.KeyEvent keyEvent);
+ }
+
+ public interface MainTestClock {
+ method public void advanceTimeBy(long milliseconds, optional boolean ignoreFrameDuration);
+ method public void advanceTimeByFrame();
+ method public void advanceTimeUntil(optional long timeoutMillis, kotlin.jvm.functions.Function0<java.lang.Boolean> condition);
+ method public boolean getAutoAdvance();
+ method public long getCurrentTime();
+ method public void setAutoAdvance(boolean);
+ property public abstract boolean autoAdvance;
+ property public abstract long currentTime;
+ }
+
+ public final class MouseInjectionScopeKt {
+ }
+
+ public sealed interface MultiModalInjectionScope extends androidx.compose.ui.test.InjectionScope {
+ method public void touch(kotlin.jvm.functions.Function1<? super androidx.compose.ui.test.TouchInjectionScope,kotlin.Unit> block);
+ }
+
+ public final class OutputKt {
+ method public static void printToLog(androidx.compose.ui.test.SemanticsNodeInteraction, String tag, optional int maxDepth);
+ method public static void printToLog(androidx.compose.ui.test.SemanticsNodeInteractionCollection, String tag, optional int maxDepth);
+ method public static String printToString(androidx.compose.ui.test.SemanticsNodeInteraction, optional int maxDepth);
+ method public static String printToString(androidx.compose.ui.test.SemanticsNodeInteractionCollection, optional int maxDepth);
+ }
+
+ public final class SelectionResult {
+ ctor public SelectionResult(java.util.List<androidx.compose.ui.semantics.SemanticsNode> selectedNodes, optional String? customErrorOnNoMatch);
+ method public String? getCustomErrorOnNoMatch();
+ method public java.util.List<androidx.compose.ui.semantics.SemanticsNode> getSelectedNodes();
+ property public final String? customErrorOnNoMatch;
+ property public final java.util.List<androidx.compose.ui.semantics.SemanticsNode> selectedNodes;
+ }
+
+ public final class SelectorsKt {
+ method public static androidx.compose.ui.test.SemanticsNodeInteractionCollection filter(androidx.compose.ui.test.SemanticsNodeInteractionCollection, androidx.compose.ui.test.SemanticsMatcher matcher);
+ method public static androidx.compose.ui.test.SemanticsNodeInteraction filterToOne(androidx.compose.ui.test.SemanticsNodeInteractionCollection, androidx.compose.ui.test.SemanticsMatcher matcher);
+ method public static androidx.compose.ui.test.SemanticsNodeInteractionCollection onAncestors(androidx.compose.ui.test.SemanticsNodeInteraction);
+ method public static androidx.compose.ui.test.SemanticsNodeInteraction onChild(androidx.compose.ui.test.SemanticsNodeInteraction);
+ method public static androidx.compose.ui.test.SemanticsNodeInteraction onChildAt(androidx.compose.ui.test.SemanticsNodeInteraction, int index);
+ method public static androidx.compose.ui.test.SemanticsNodeInteractionCollection onChildren(androidx.compose.ui.test.SemanticsNodeInteraction);
+ method public static androidx.compose.ui.test.SemanticsNodeInteraction onFirst(androidx.compose.ui.test.SemanticsNodeInteractionCollection);
+ method public static androidx.compose.ui.test.SemanticsNodeInteraction onLast(androidx.compose.ui.test.SemanticsNodeInteractionCollection);
+ method public static androidx.compose.ui.test.SemanticsNodeInteraction onParent(androidx.compose.ui.test.SemanticsNodeInteraction);
+ method public static androidx.compose.ui.test.SemanticsNodeInteraction onSibling(androidx.compose.ui.test.SemanticsNodeInteraction);
+ method public static androidx.compose.ui.test.SemanticsNodeInteractionCollection onSiblings(androidx.compose.ui.test.SemanticsNodeInteraction);
+ }
+
+ public final class SemanticsMatcher {
+ ctor public SemanticsMatcher(String description, kotlin.jvm.functions.Function1<? super androidx.compose.ui.semantics.SemanticsNode,java.lang.Boolean> matcher);
+ method public infix androidx.compose.ui.test.SemanticsMatcher and(androidx.compose.ui.test.SemanticsMatcher other);
+ method public String getDescription();
+ method public boolean matches(androidx.compose.ui.semantics.SemanticsNode node);
+ method public boolean matchesAny(Iterable<androidx.compose.ui.semantics.SemanticsNode> nodes);
+ method public operator androidx.compose.ui.test.SemanticsMatcher not();
+ method public infix androidx.compose.ui.test.SemanticsMatcher or(androidx.compose.ui.test.SemanticsMatcher other);
+ property public final String description;
+ field public static final androidx.compose.ui.test.SemanticsMatcher.Companion Companion;
+ }
+
+ public static final class SemanticsMatcher.Companion {
+ method public <T> androidx.compose.ui.test.SemanticsMatcher expectValue(androidx.compose.ui.semantics.SemanticsPropertyKey<T> key, T? expectedValue);
+ method public <T> androidx.compose.ui.test.SemanticsMatcher keyIsDefined(androidx.compose.ui.semantics.SemanticsPropertyKey<T> key);
+ method public <T> androidx.compose.ui.test.SemanticsMatcher keyNotDefined(androidx.compose.ui.semantics.SemanticsPropertyKey<T> key);
+ }
+
+ public final class SemanticsNodeInteraction {
+ ctor public SemanticsNodeInteraction(androidx.compose.ui.test.TestContext testContext, boolean useUnmergedTree, androidx.compose.ui.test.SemanticsSelector selector);
+ ctor public SemanticsNodeInteraction(androidx.compose.ui.test.TestContext testContext, boolean useUnmergedTree, androidx.compose.ui.test.SemanticsMatcher matcher);
+ method public void assertDoesNotExist();
+ method public androidx.compose.ui.test.SemanticsNodeInteraction assertExists(optional String? errorMessageOnFail);
+ method public androidx.compose.ui.semantics.SemanticsNode fetchSemanticsNode(optional String? errorMessageOnFail);
+ }
+
+ public final class SemanticsNodeInteractionCollection {
+ ctor public SemanticsNodeInteractionCollection(androidx.compose.ui.test.TestContext testContext, boolean useUnmergedTree, androidx.compose.ui.test.SemanticsSelector selector);
+ ctor public SemanticsNodeInteractionCollection(androidx.compose.ui.test.TestContext testContext, boolean useUnmergedTree, androidx.compose.ui.test.SemanticsMatcher matcher);
+ method public java.util.List<androidx.compose.ui.semantics.SemanticsNode> fetchSemanticsNodes(optional boolean atLeastOneRootRequired, optional String? errorMessageOnFail);
+ method public operator androidx.compose.ui.test.SemanticsNodeInteraction get(int index);
+ }
+
+ public interface SemanticsNodeInteractionsProvider {
+ method public androidx.compose.ui.test.SemanticsNodeInteractionCollection onAllNodes(androidx.compose.ui.test.SemanticsMatcher matcher, optional boolean useUnmergedTree);
+ method public androidx.compose.ui.test.SemanticsNodeInteraction onNode(androidx.compose.ui.test.SemanticsMatcher matcher, optional boolean useUnmergedTree);
+ }
+
+ public final class SemanticsSelector {
+ ctor public SemanticsSelector(String description, boolean requiresExactlyOneNode, optional androidx.compose.ui.test.SemanticsSelector? chainedInputSelector, kotlin.jvm.functions.Function1<? super java.lang.Iterable<androidx.compose.ui.semantics.SemanticsNode>,androidx.compose.ui.test.SelectionResult> selector);
+ method public String getDescription();
+ method public androidx.compose.ui.test.SelectionResult map(Iterable<androidx.compose.ui.semantics.SemanticsNode> nodes, String errorOnFail);
+ property public final String description;
+ }
+
+ public final class SemanticsSelectorKt {
+ }
+
+ public final class TestContext {
+ }
+
+ public final class TestMonotonicFrameClock_jvmKt {
+ }
+
+ public final class TestOwnerKt {
+ }
+
+ public final class TextActionsKt {
+ method public static void performImeAction(androidx.compose.ui.test.SemanticsNodeInteraction);
+ method public static void performTextClearance(androidx.compose.ui.test.SemanticsNodeInteraction);
+ method public static void performTextInput(androidx.compose.ui.test.SemanticsNodeInteraction, String text);
+ method public static void performTextReplacement(androidx.compose.ui.test.SemanticsNodeInteraction, String text);
+ }
+
+ public interface TouchInjectionScope extends androidx.compose.ui.test.InjectionScope {
+ method public void cancel(optional long delayMillis);
+ method public androidx.compose.ui.geometry.Offset? currentPosition(optional int pointerId);
+ method public void down(int pointerId, long position);
+ method public default void down(long position);
+ method public void move(optional long delayMillis);
+ method public default void moveBy(int pointerId, long delta, optional long delayMillis);
+ method public default void moveBy(long delta, optional long delayMillis);
+ method public default void moveTo(int pointerId, long position, optional long delayMillis);
+ method public default void moveTo(long position, optional long delayMillis);
+ method public void up(optional int pointerId);
+ method public default void updatePointerBy(int pointerId, long delta);
+ method public void updatePointerTo(int pointerId, long position);
+ }
+
+ public final class TouchInjectionScopeKt {
+ method public static void click(androidx.compose.ui.test.TouchInjectionScope, optional long position);
+ method public static void doubleClick(androidx.compose.ui.test.TouchInjectionScope, optional long position, optional long delayMillis);
+ method public static void longClick(androidx.compose.ui.test.TouchInjectionScope, optional long position, optional long durationMillis);
+ method public static void pinch(androidx.compose.ui.test.TouchInjectionScope, long start0, long end0, long start1, long end1, optional long durationMillis);
+ method public static void swipe(androidx.compose.ui.test.TouchInjectionScope, long start, long end, optional long durationMillis);
+ method public static void swipe(androidx.compose.ui.test.TouchInjectionScope, kotlin.jvm.functions.Function1<? super java.lang.Long,androidx.compose.ui.geometry.Offset> curve, long durationMillis, optional java.util.List<java.lang.Long> keyTimes);
+ method public static void swipeDown(androidx.compose.ui.test.TouchInjectionScope, optional float startY, optional float endY, optional long durationMillis);
+ method public static void swipeLeft(androidx.compose.ui.test.TouchInjectionScope, optional float startX, optional float endX, optional long durationMillis);
+ method public static void swipeRight(androidx.compose.ui.test.TouchInjectionScope, optional float startX, optional float endX, optional long durationMillis);
+ method public static void swipeUp(androidx.compose.ui.test.TouchInjectionScope, optional float startY, optional float endY, optional long durationMillis);
+ method public static void swipeWithVelocity(androidx.compose.ui.test.TouchInjectionScope, long start, long end, float endVelocity, optional long durationMillis);
+ }
+
+ public final class UtilsKt {
+ }
+
+}
+
+package androidx.compose.ui.test.android {
+
+ public final class WindowCapture_androidKt {
+ }
+
+}
+
diff --git a/compose/ui/ui-test/src/androidAndroidTest/kotlin/androidx/compose/ui/test/gesturescope/SendSwipeVelocityTest.kt b/compose/ui/ui-test/src/androidAndroidTest/kotlin/androidx/compose/ui/test/gesturescope/SendSwipeVelocityTest.kt
index a23987f..5902828 100644
--- a/compose/ui/ui-test/src/androidAndroidTest/kotlin/androidx/compose/ui/test/gesturescope/SendSwipeVelocityTest.kt
+++ b/compose/ui/ui-test/src/androidAndroidTest/kotlin/androidx/compose/ui/test/gesturescope/SendSwipeVelocityTest.kt
@@ -137,8 +137,8 @@
assertThat(recordedDurationMillis).isEqualTo(duration)
// Check velocity
- assertThat(recordedVelocity.x).isWithin(.1f).of(expectedXVelocity)
- assertThat(recordedVelocity.y).isWithin(.1f).of(expectedYVelocity)
+ assertThat(recordedVelocity.x).isWithin(1f).of(expectedXVelocity)
+ assertThat(recordedVelocity.y).isWithin(1f).of(expectedYVelocity)
}
}
}
diff --git a/compose/ui/ui-test/src/androidAndroidTest/kotlin/androidx/compose/ui/test/injectionscope/touch/SwipeWithVelocityTest.kt b/compose/ui/ui-test/src/androidAndroidTest/kotlin/androidx/compose/ui/test/injectionscope/touch/SwipeWithVelocityTest.kt
index 6bf7069..97cc537 100644
--- a/compose/ui/ui-test/src/androidAndroidTest/kotlin/androidx/compose/ui/test/injectionscope/touch/SwipeWithVelocityTest.kt
+++ b/compose/ui/ui-test/src/androidAndroidTest/kotlin/androidx/compose/ui/test/injectionscope/touch/SwipeWithVelocityTest.kt
@@ -119,8 +119,8 @@
assertThat(recordedDurationMillis).isEqualTo(config.durationMillis)
// Check velocity
- // Swipe goes from left to right, so vx = velocity and vy = 0
- assertThat(recordedVelocity.x).isWithin(.1f).of(config.velocity)
+ // Swipe goes from left to right, so vx = velocity (within 5%) and vy = 0
+ assertThat(recordedVelocity.x).isWithin(0.05f * config.velocity).of(config.velocity)
assertThat(recordedVelocity.y).isWithin(.1f).of(0f)
}
}
diff --git a/compose/ui/ui-test/src/androidAndroidTest/kotlin/androidx/compose/ui/test/injectionscope/touch/VelocityPathFinderCalculateDurationTest.kt b/compose/ui/ui-test/src/androidAndroidTest/kotlin/androidx/compose/ui/test/injectionscope/touch/VelocityPathFinderCalculateDurationTest.kt
index aa7c8fd..e32f259 100644
--- a/compose/ui/ui-test/src/androidAndroidTest/kotlin/androidx/compose/ui/test/injectionscope/touch/VelocityPathFinderCalculateDurationTest.kt
+++ b/compose/ui/ui-test/src/androidAndroidTest/kotlin/androidx/compose/ui/test/injectionscope/touch/VelocityPathFinderCalculateDurationTest.kt
@@ -46,7 +46,8 @@
val requestedVelocity: Float,
val expectedDurationMillis: Long? = null,
val expectSuggestions: Boolean = false,
- val expectedError: Regex? = if (expectSuggestions) errorWithSuggestions else null
+ val expectedError: Regex? = if (expectSuggestions) errorWithSuggestions else null,
+ val tolerance: Float = 0.1f,
)
companion object {
@@ -104,11 +105,13 @@
TestConfig(Distance100, 0f, expectedDurationMillis = 200L),
TestConfig(Distance100, 1f, expectedDurationMillis = 200L),
- TestConfig(Distance100, 1999f, expectedDurationMillis = 200L), // d > 100
+ TestConfig(Distance100, 1999f, expectedDurationMillis = 200L,
+ tolerance = 1f), // d > 100
TestConfig(Distance100, 2000f, expectedDurationMillis = 100L), // d = 100
- TestConfig(Distance100, 2480f, expectedDurationMillis = 80L), // d ≈ 80.65
- TestConfig(Distance100, 5000f, expectedDurationMillis = 40L), // d = 40
- TestConfig(Distance100, 5001f, expectSuggestions = true) // d < 40
+ TestConfig(Distance100, 2480f, expectedDurationMillis = 80L,
+ tolerance = 1f), // d ≈ 80.65
+ TestConfig(Distance100, 5000f, expectedError = errorWithSuggestions), // d = 40
+ TestConfig(Distance100, 5001f, expectedError = errorWithSuggestions), // d < 40
)
}
@@ -140,7 +143,7 @@
val velocityTracker = simulateSwipe(f, actualDuration)
val velocity = velocityTracker.calculateVelocity()
- assertThat(velocity.sum()).isWithin(.1f).of(config.requestedVelocity)
+ assertThat(velocity.sum()).isWithin(config.tolerance).of(config.requestedVelocity)
if (config.requestedVelocity > 0) {
// Direction of velocity of 0 is undefined, so any direction is correct
velocity.toOffset().normalize().isAlmostEqualTo(config.end.normalize())
diff --git a/compose/ui/ui-test/src/androidAndroidTest/kotlin/androidx/compose/ui/test/injectionscope/touch/VelocityPathFinderTest.kt b/compose/ui/ui-test/src/androidAndroidTest/kotlin/androidx/compose/ui/test/injectionscope/touch/VelocityPathFinderTest.kt
index 87832cc..1dd5291 100644
--- a/compose/ui/ui-test/src/androidAndroidTest/kotlin/androidx/compose/ui/test/injectionscope/touch/VelocityPathFinderTest.kt
+++ b/compose/ui/ui-test/src/androidAndroidTest/kotlin/androidx/compose/ui/test/injectionscope/touch/VelocityPathFinderTest.kt
@@ -68,11 +68,13 @@
add(TestConfig(direction.offset, 0f, 1500L, false)) // v == 0, large T
add(TestConfig(direction.offset, 500f, 500L, false)) // T < d
add(TestConfig(direction.offset, 1500f, 500L, false)) // 100 < d < T
- add(TestConfig(direction.offset, 6000f, 500L, true)) // d < 100 && T > d
+ add(TestConfig(direction.offset, 6000f, 500L, false)) // d < 100 && T > d
add(TestConfig(direction.offset, 6000f, 66L, false)) // d < 100 && T < d
}
// Regression for b/182477143
add(TestConfig(Offset(424.8f, 0f) - Offset(295.2f, 0f), 2000f, 3000L, false))
+ // Same as above, but for T = 100
+ add(TestConfig(Offset(129.6f, 0f), 2000f, 100L, false))
}
}
@@ -97,10 +99,11 @@
val velocityTracker = simulateSwipe(config, f)
val velocity = velocityTracker.calculateVelocity()
- assertThat(velocity.sum()).isWithin(.1f).of(config.requestedVelocity)
+ val velocityTolerance = .1f * config.requestedVelocity // 10% of the expected value
+ assertThat(velocity.sum()).isWithin(velocityTolerance).of(config.requestedVelocity)
if (config.requestedVelocity > 0) {
// Direction of velocity of 0 is undefined, so any direction is correct
- velocity.toOffset().normalize().isAlmostEqualTo(config.end.normalize())
+ velocity.toOffset().normalize().isAlmostEqualTo(config.end.normalize(), 0.03f)
}
// At t = 0, the function should return the start position (which is Offset.Zero here)
f(0).isAlmostEqualTo(Offset.Zero)
diff --git a/compose/ui/ui-test/src/commonMain/kotlin/androidx/compose/ui/test/VelocityPathFinder.kt b/compose/ui/ui-test/src/commonMain/kotlin/androidx/compose/ui/test/VelocityPathFinder.kt
index 404d5cd..886d3b44 100644
--- a/compose/ui/ui-test/src/commonMain/kotlin/androidx/compose/ui/test/VelocityPathFinder.kt
+++ b/compose/ui/ui-test/src/commonMain/kotlin/androidx/compose/ui/test/VelocityPathFinder.kt
@@ -17,11 +17,14 @@
package androidx.compose.ui.test
import androidx.compose.ui.geometry.Offset
+import androidx.compose.ui.input.pointer.util.VelocityTracker
import androidx.compose.ui.test.InputDispatcher.Companion.eventPeriodMillis
import kotlin.math.atan2
import kotlin.math.ceil
import kotlin.math.cos
import kotlin.math.floor
+import kotlin.math.abs
+import kotlin.math.max
import kotlin.math.min
import kotlin.math.roundToLong
import kotlin.math.sin
@@ -69,21 +72,28 @@
* 1. Flat line:
* This happens when start == end and requires that the requested velocity is 0.
*
- * 2. Flat line followed by a parabola:
- * This happens when there is a parabola that satisfies `f(t_d) = start`, `f'(t_d) = 0`,
- * `f'(T) = velocity` and `t_d >= 0`. The gesture will wait at the start location until t_d
- * and then follow that parabola till `f(T) = end`.
+ * 2. A line followed by another line:
+ * This happens when T <= HorizonMilliseconds.
+ * The first line is from t = 0, x = start until t = d, x = x_d.
+ * The second line is from t = d, x = x_d until t = T, x = end.
+ * The parameters d and x_d are found numerically.
*
- * 3. Parabola that starts with `f'(0) > 0`:
- * If there is a parabola that satisfies `f(t_d) = start`, `f'(t_d) = 0`, `f'(T) = velocity`,
- * but `t_d < 0`; or if `velocity = 0` (in which case the previously mentioned parabola
- * doesn't exist); we can't follow that parabola because we'd have to start following it in
- * the past (`t_d < 0`). Instead, it can be shown that in this case we can always create a
- * parabola that satisfies `f(0) = start`, `f(T) = end` and `f'(T) = velocity`. This parabola
- * will have `f'(0) > 0`.
+ * 3. Three lines
+ * This happens when T > HorizonMilliseconds.
+ * The first line is from t = 0, x = start until t = T - HorizonMilliseconds, x = x_horizon
+ * The second line is from t = T - HorizonMilliseconds until t = d, x = x_d
+ * The third line is from t = d, x = x_d until t = T, x = end
+ * The parameter x_horizon is computed by taking the final velocity and calculating back.
+ * The parameters d and x_d are found numerically.
*
- * In the calculations below, instead of calculating t_d, we calculate `d = T - t_d`, and
- * immediately cap it to T.
+ * The 'impulse' implementation of VelocityTracker can be reverse-engineered to a closed-form
+ * solution, but it is numerically complex. It would also result in (likely) a non-integer 'd'
+ * value. As a result, during the gesture sampling, the curve will not be followed closely
+ * during the injection. This will cause the final computed velocity to be different from the
+ * target velocity.
+ * Therefore, we aim to sample the motion at the 'eventPeriod' steps, to closely approximate
+ * the final injected path, and vary the parameters to find the ones that are closest to the
+ * desired velocity. This method should work for any implementation of the VelocityTracker.
*
* @param velocity The desired velocity in the x or y direction at the end position
*/
@@ -94,41 +104,97 @@
val T = durationMillis
val start = value.invoke(startPosition)
val end = value.invoke(endPosition)
- // `d = T - t_d` in scenario 2 (see documentation above)
- // `d = T` in scenario 1 and 3 (see documentation above)
- val d = if (start == end) {
- T.toDouble()
- } else {
- min(T.toDouble(), 2 / velocity * (end - start))
- }
- val a = (start + velocity * d - end) / (d * d)
- require(d >= min(T, HorizonMilliseconds)) {
- val requestedDistance = (endPosition - startPosition).getDistance()
- // 1) Decrease duration to d
- val suggestedDuration = d
- // 2) Decrease velocity to 2/100 * (end - start) -> should work for vectors too
- val suggestedVelocity = (2f / min(T, HorizonMilliseconds)) * requestedDistance * 1000
- // 3) Increase distance to 100/2 * velocity
- val suggestedDistance = (min(T, HorizonMilliseconds) / 2f) * endVelocity / 1000
- "Unable to generate a swipe gesture between $startPosition and $endPosition with " +
- "duration $durationMillis that ends with velocity of $endVelocity px/s, without " +
- "going outside of the range [start..end]. " +
- "Suggested fixes: " +
- "1. set duration to $suggestedDuration or lower; " +
- "2. set velocity to $suggestedVelocity px/s or lower; or " +
- "3. increase the distance between the start and end to $suggestedDistance or " +
- "higher"
+ if (start == end) {
+ require(abs(velocity) < 0.1) {
+ "Can't have matching positions, but nonzero velocity"
+ }
+ return { _ -> start }
}
- val threshold = T - d
- return { t: Long ->
- when {
- t < threshold -> start
- // `f(t) = a*(t-T)^2 + b*(t-T) + c`
- else -> a * (t - T) * (t - T) + velocity * (t - T) + end
- }.toFloat()
+ if (abs(velocity) < Double.MIN_VALUE) {
+ // Some tests, like ScrollableTest, assume that the pointer doesn't move during the
+ // entire gesture, not just during the last 'HorizonMilliseconds', so jump to 'end'
+ // right away
+ return { t: Long ->
+ when {
+ t == 0L -> start
+ else -> end
+ }
+ }
}
+
+ // Special handling for small velocity. We multiply by velocity to find the position rather
+ // than divide by velocity to calculate time.
+ if (abs(velocity) < 0.1) {
+ // Same as the condition below. Must start the movement earlier than HorizonMilliseconds
+ val suggestedDuration = HorizonMilliseconds
+ require(T >= suggestedDuration) {
+ "Unable to generate a swipe gesture between $start and $end with " +
+ "duration $durationMillis that ends with velocity of $velocity px/s, without " +
+ "going outside of the range [start..end]. " +
+ "Suggested fixes: " +
+ "1. set duration to $suggestedDuration or higher; "
+ }
+ val positionAtHorizonStart = (end - velocity * HorizonMilliseconds).toFloat()
+ return { t: Long ->
+ when {
+ // t == 0 condition is needed in case T <= HorizonMilliseconds
+ t == 0L -> start
+ t < (T - HorizonMilliseconds) ->
+ start + (positionAtHorizonStart - start) / (T - HorizonMilliseconds) * t
+ else ->
+ end - (T - t) * velocity.toFloat()
+ }
+ }
+ }
+
+ if (T <= HorizonMilliseconds) {
+ val result = searchPath(start, end, T, velocity.toFloat() * 1000)
+ if (result != null) {
+ val (d, x) = result
+ return { t: Long ->
+ computePosition(start, end, T, d, x, t)
+ }
+ }
+ }
+
+ if (T > HorizonMilliseconds) {
+ // Best case: just need to gradually move up to the correct place
+ val xHorizon = (end - HorizonMilliseconds * velocity).toFloat()
+ if (min(start, end) < xHorizon && xHorizon < max(start, end)) {
+ // Then it's within the start and end positions, so we are OK
+ return { t: Long ->
+ when {
+ t < T - HorizonMilliseconds ->
+ start + (xHorizon - start) / (T - HorizonMilliseconds) * t
+ else ->
+ xHorizon + (end - xHorizon) / (HorizonMilliseconds) *
+ (t - (T - HorizonMilliseconds))
+ }
+ }
+ }
+ // Move the 'start' coordinate to a time of 'T-HorizonMilliseconds'. Therefore, we will
+ // have 3 lines - flat line until 'T-HorizonMilliseconds', and then two lines as in
+ // previous solutions.
+ val result = searchPath(start, end, HorizonMilliseconds, velocity.toFloat() * 1000)
+ if (result != null) {
+ val (d, x) = result
+ return { t: Long ->
+ when {
+ t < T - HorizonMilliseconds -> start
+ else ->
+ computePosition(start, end, HorizonMilliseconds, d, x,
+ t - (T - HorizonMilliseconds))
+ }
+ }
+ }
+ }
+
+ throw IllegalArgumentException(
+ "Could not find a path for start=$start end=$end velocity=$velocity T=$T." +
+ "Try setting velocity=${(end - start) / T} or T=${(end - start) / velocity}." +
+ "Typically, T should be $HorizonMilliseconds ms or longer.")
}
companion object {
@@ -173,7 +239,7 @@
// d <= HorizonMilliseconds, so we have to pick `T = d`. But, when d is very small,
// this leads to a duration too short to even get a velocity.
// Check and throw if this is the case.
- val minimumDuration = ceil(2.5f * eventPeriodMillis).roundToLong()
+ val minimumDuration = ceil(3.5f * eventPeriodMillis).roundToLong()
require(floor(d).roundToLong() >= minimumDuration) {
// Nope. This won't work.
val suggestedVelocity = (2f / minimumDuration) * distance * 1000
@@ -189,4 +255,63 @@
return floor(d).roundToLong()
}
}
+
+ /**
+ * Compute the position at time t when the path is piecewise defined as 2 lines:
+ * one from (0, start) -> (d, x)
+ * and another from (d, x) -> (T, end)
+ */
+ private fun computePosition(start: Float, end: Float, T: Long, d: Long, x: Float, t: Long):
+ Float {
+ require(t in 0L..T) {
+ "You must provide 0 <= t <= $T, but received t=$t instead"
+ }
+ if (t < d) {
+ return start + (x - start) / d * t
+ }
+ return end - (end - x) / (T - d) * (T - t)
+ }
+
+ /**
+ * Inject a 2-line path into VelocityTracker and find the resulting velocity.
+ */
+ private fun calculateVelocityFullPath(start: Float, end: Float, T: Long, d: Long, x: Float):
+ Float {
+ val vt = VelocityTracker()
+
+ vt.addPosition(0, Offset(start, 0f))
+ var t = eventPeriodMillis
+ while (t < T) {
+ val position = computePosition(start, end, T, d, x, t)
+ vt.addPosition(t, Offset(position, 0f))
+ t += eventPeriodMillis
+ }
+ vt.addPosition(T, Offset(end, 0f))
+
+ return vt.calculateVelocity().x
+ }
+
+ private data class FittingResult(val d: Long, val x: Float)
+
+ /**
+ * Numerically find a path that best provides a motion that results in the velocity of
+ * targetVelocity.
+ */
+ private fun searchPath(start: Float, end: Float, T: Long, targetVelocity: Float):
+ FittingResult? {
+ val TOLERANCE = 1f
+ val step = (max(end, start) - min(end, start)) / 1000
+ for (d in 1 until T) {
+ var x = min(start, end)
+ while (x < max(start, end)) {
+ val velocity = calculateVelocityFullPath(start, end, T, d, x)
+ val diff = abs(targetVelocity - velocity)
+ if (diff < TOLERANCE) {
+ return FittingResult(d, x)
+ }
+ x += step
+ }
+ }
+ return null
+ }
}
diff --git a/compose/ui/ui-text-google-fonts/api/1.2.0-beta02.txt b/compose/ui/ui-text-google-fonts/api/1.2.0-beta02.txt
new file mode 100644
index 0000000..30ba845
--- /dev/null
+++ b/compose/ui/ui-text-google-fonts/api/1.2.0-beta02.txt
@@ -0,0 +1,11 @@
+// Signature format: 4.0
+package androidx.compose.ui.text.googlefonts {
+
+ public final class FontProviderHelperKt {
+ }
+
+ public final class GoogleFontKt {
+ }
+
+}
+
diff --git a/compose/ui/ui-text-google-fonts/api/public_plus_experimental_1.2.0-beta02.txt b/compose/ui/ui-text-google-fonts/api/public_plus_experimental_1.2.0-beta02.txt
new file mode 100644
index 0000000..1f1956a
--- /dev/null
+++ b/compose/ui/ui-text-google-fonts/api/public_plus_experimental_1.2.0-beta02.txt
@@ -0,0 +1,26 @@
+// Signature format: 4.0
+package androidx.compose.ui.text.googlefonts {
+
+ public final class FontProviderHelperKt {
+ }
+
+ @androidx.compose.ui.text.ExperimentalTextApi public final class GoogleFont {
+ ctor public GoogleFont(String name, optional boolean bestEffort);
+ method public boolean getBestEffort();
+ method public String getName();
+ property public final boolean bestEffort;
+ property public final String name;
+ }
+
+ @androidx.compose.ui.text.ExperimentalTextApi public static final class GoogleFont.Provider {
+ ctor public GoogleFont.Provider(String providerAuthority, String providerPackage, java.util.List<? extends java.util.List<byte[]>> certificates);
+ ctor public GoogleFont.Provider(String providerAuthority, String providerPackage, @ArrayRes int certificates);
+ }
+
+ public final class GoogleFontKt {
+ method @androidx.compose.ui.text.ExperimentalTextApi public static androidx.compose.ui.text.font.Font Font(androidx.compose.ui.text.googlefonts.GoogleFont googleFont, androidx.compose.ui.text.googlefonts.GoogleFont.Provider fontProvider, optional androidx.compose.ui.text.font.FontWeight weight, optional int style);
+ method @WorkerThread @androidx.compose.ui.text.ExperimentalTextApi public static boolean isAvailableOnDevice(androidx.compose.ui.text.googlefonts.GoogleFont.Provider, android.content.Context context);
+ }
+
+}
+
diff --git a/compose/ui/ui-text-google-fonts/api/res-1.2.0-beta02.txt b/compose/ui/ui-text-google-fonts/api/res-1.2.0-beta02.txt
new file mode 100644
index 0000000..e69de29
--- /dev/null
+++ b/compose/ui/ui-text-google-fonts/api/res-1.2.0-beta02.txt
diff --git a/compose/ui/ui-text-google-fonts/api/restricted_1.2.0-beta02.txt b/compose/ui/ui-text-google-fonts/api/restricted_1.2.0-beta02.txt
new file mode 100644
index 0000000..30ba845
--- /dev/null
+++ b/compose/ui/ui-text-google-fonts/api/restricted_1.2.0-beta02.txt
@@ -0,0 +1,11 @@
+// Signature format: 4.0
+package androidx.compose.ui.text.googlefonts {
+
+ public final class FontProviderHelperKt {
+ }
+
+ public final class GoogleFontKt {
+ }
+
+}
+
diff --git a/compose/ui/ui-text/api/1.2.0-beta02.txt b/compose/ui/ui-text/api/1.2.0-beta02.txt
new file mode 100644
index 0000000..23a9c3a9
--- /dev/null
+++ b/compose/ui/ui-text/api/1.2.0-beta02.txt
@@ -0,0 +1,1318 @@
+// Signature format: 4.0
+package androidx.compose.ui.text {
+
+ public final class ActualAtomicReferenceJvmKt {
+ }
+
+ public final class AndroidTextStyle_androidKt {
+ }
+
+ @androidx.compose.runtime.Immutable public final class AnnotatedString implements java.lang.CharSequence {
+ ctor public AnnotatedString(String text, optional java.util.List<androidx.compose.ui.text.AnnotatedString.Range<androidx.compose.ui.text.SpanStyle>> spanStyles, optional java.util.List<androidx.compose.ui.text.AnnotatedString.Range<androidx.compose.ui.text.ParagraphStyle>> paragraphStyles);
+ method public operator char get(int index);
+ method public int getLength();
+ method public java.util.List<androidx.compose.ui.text.AnnotatedString.Range<androidx.compose.ui.text.ParagraphStyle>> getParagraphStyles();
+ method public java.util.List<androidx.compose.ui.text.AnnotatedString.Range<androidx.compose.ui.text.SpanStyle>> getSpanStyles();
+ method public java.util.List<androidx.compose.ui.text.AnnotatedString.Range<java.lang.String>> getStringAnnotations(String tag, int start, int end);
+ method public java.util.List<androidx.compose.ui.text.AnnotatedString.Range<java.lang.String>> getStringAnnotations(int start, int end);
+ method public String getText();
+ method public java.util.List<androidx.compose.ui.text.AnnotatedString.Range<androidx.compose.ui.text.TtsAnnotation>> getTtsAnnotations(int start, int end);
+ method @androidx.compose.runtime.Stable public operator androidx.compose.ui.text.AnnotatedString plus(androidx.compose.ui.text.AnnotatedString other);
+ method public androidx.compose.ui.text.AnnotatedString subSequence(int startIndex, int endIndex);
+ method public androidx.compose.ui.text.AnnotatedString subSequence(long range);
+ property public int length;
+ property public final java.util.List<androidx.compose.ui.text.AnnotatedString.Range<androidx.compose.ui.text.ParagraphStyle>> paragraphStyles;
+ property public final java.util.List<androidx.compose.ui.text.AnnotatedString.Range<androidx.compose.ui.text.SpanStyle>> spanStyles;
+ property public final String text;
+ }
+
+ public static final class AnnotatedString.Builder {
+ ctor public AnnotatedString.Builder(optional int capacity);
+ ctor public AnnotatedString.Builder(String text);
+ ctor public AnnotatedString.Builder(androidx.compose.ui.text.AnnotatedString text);
+ method public void addStringAnnotation(String tag, String annotation, int start, int end);
+ method public void addStyle(androidx.compose.ui.text.SpanStyle style, int start, int end);
+ method public void addStyle(androidx.compose.ui.text.ParagraphStyle style, int start, int end);
+ method public void append(String text);
+ method public void append(char char);
+ method public void append(androidx.compose.ui.text.AnnotatedString text);
+ method public int getLength();
+ method public void pop();
+ method public void pop(int index);
+ method public int pushStringAnnotation(String tag, String annotation);
+ method public int pushStyle(androidx.compose.ui.text.SpanStyle style);
+ method public int pushStyle(androidx.compose.ui.text.ParagraphStyle style);
+ method public int pushTtsAnnotation(androidx.compose.ui.text.TtsAnnotation ttsAnnotation);
+ method public androidx.compose.ui.text.AnnotatedString toAnnotatedString();
+ property public final int length;
+ }
+
+ @androidx.compose.runtime.Immutable public static final class AnnotatedString.Range<T> {
+ ctor public AnnotatedString.Range(T? item, int start, int end, String tag);
+ ctor public AnnotatedString.Range(T? item, int start, int end);
+ method public T! component1();
+ method public int component2();
+ method public int component3();
+ method public String component4();
+ method public androidx.compose.ui.text.AnnotatedString.Range<T> copy(T! item, int start, int end, String tag);
+ method public int getEnd();
+ method public T! getItem();
+ method public int getStart();
+ method public String getTag();
+ property public final int end;
+ property public final T! item;
+ property public final int start;
+ property public final String tag;
+ }
+
+ public final class AnnotatedStringKt {
+ method public static androidx.compose.ui.text.AnnotatedString AnnotatedString(String text, androidx.compose.ui.text.SpanStyle spanStyle, optional androidx.compose.ui.text.ParagraphStyle? paragraphStyle);
+ method public static androidx.compose.ui.text.AnnotatedString AnnotatedString(String text, androidx.compose.ui.text.ParagraphStyle paragraphStyle);
+ method public static inline androidx.compose.ui.text.AnnotatedString buildAnnotatedString(kotlin.jvm.functions.Function1<? super androidx.compose.ui.text.AnnotatedString.Builder,kotlin.Unit> builder);
+ method public static androidx.compose.ui.text.AnnotatedString capitalize(androidx.compose.ui.text.AnnotatedString, optional androidx.compose.ui.text.intl.LocaleList localeList);
+ method public static androidx.compose.ui.text.AnnotatedString decapitalize(androidx.compose.ui.text.AnnotatedString, optional androidx.compose.ui.text.intl.LocaleList localeList);
+ method public static androidx.compose.ui.text.AnnotatedString toLowerCase(androidx.compose.ui.text.AnnotatedString, optional androidx.compose.ui.text.intl.LocaleList localeList);
+ method public static androidx.compose.ui.text.AnnotatedString toUpperCase(androidx.compose.ui.text.AnnotatedString, optional androidx.compose.ui.text.intl.LocaleList localeList);
+ method public static inline <R> R withStyle(androidx.compose.ui.text.AnnotatedString.Builder, androidx.compose.ui.text.SpanStyle style, kotlin.jvm.functions.Function1<? super androidx.compose.ui.text.AnnotatedString.Builder,? extends R> block);
+ method public static inline <R> R withStyle(androidx.compose.ui.text.AnnotatedString.Builder, androidx.compose.ui.text.ParagraphStyle style, kotlin.jvm.functions.Function1<? super androidx.compose.ui.text.AnnotatedString.Builder,? extends R> block);
+ }
+
+ public final class JvmAnnotatedString_jvmKt {
+ }
+
+ public final class JvmCharHelpers_androidKt {
+ }
+
+ public final class MultiParagraph {
+ ctor public MultiParagraph(androidx.compose.ui.text.MultiParagraphIntrinsics intrinsics, long constraints, optional int maxLines, optional boolean ellipsis);
+ ctor @Deprecated public MultiParagraph(androidx.compose.ui.text.MultiParagraphIntrinsics intrinsics, optional int maxLines, optional boolean ellipsis, float width);
+ ctor @Deprecated public MultiParagraph(androidx.compose.ui.text.AnnotatedString annotatedString, androidx.compose.ui.text.TextStyle style, optional java.util.List<androidx.compose.ui.text.AnnotatedString.Range<androidx.compose.ui.text.Placeholder>> placeholders, optional int maxLines, optional boolean ellipsis, float width, androidx.compose.ui.unit.Density density, androidx.compose.ui.text.font.Font.ResourceLoader resourceLoader);
+ ctor @Deprecated public MultiParagraph(androidx.compose.ui.text.AnnotatedString annotatedString, androidx.compose.ui.text.TextStyle style, float width, androidx.compose.ui.unit.Density density, androidx.compose.ui.text.font.FontFamily.Resolver fontFamilyResolver, optional java.util.List<androidx.compose.ui.text.AnnotatedString.Range<androidx.compose.ui.text.Placeholder>> placeholders, optional int maxLines, optional boolean ellipsis);
+ ctor public MultiParagraph(androidx.compose.ui.text.AnnotatedString annotatedString, androidx.compose.ui.text.TextStyle style, long constraints, androidx.compose.ui.unit.Density density, androidx.compose.ui.text.font.FontFamily.Resolver fontFamilyResolver, optional java.util.List<androidx.compose.ui.text.AnnotatedString.Range<androidx.compose.ui.text.Placeholder>> placeholders, optional int maxLines, optional boolean ellipsis);
+ method public androidx.compose.ui.text.style.ResolvedTextDirection getBidiRunDirection(int offset);
+ method public androidx.compose.ui.geometry.Rect getBoundingBox(int offset);
+ method public androidx.compose.ui.geometry.Rect getCursorRect(int offset);
+ method public boolean getDidExceedMaxLines();
+ method public float getFirstBaseline();
+ method public float getHeight();
+ method public float getHorizontalPosition(int offset, boolean usePrimaryDirection);
+ method public androidx.compose.ui.text.MultiParagraphIntrinsics getIntrinsics();
+ method public float getLastBaseline();
+ method public float getLineBottom(int lineIndex);
+ method public int getLineCount();
+ method public int getLineEnd(int lineIndex, optional boolean visibleEnd);
+ method public int getLineForOffset(int offset);
+ method public int getLineForVerticalPosition(float vertical);
+ method public float getLineHeight(int lineIndex);
+ method public float getLineLeft(int lineIndex);
+ method public float getLineRight(int lineIndex);
+ method public int getLineStart(int lineIndex);
+ method public float getLineTop(int lineIndex);
+ method public float getLineWidth(int lineIndex);
+ method public float getMaxIntrinsicWidth();
+ method public int getMaxLines();
+ method public float getMinIntrinsicWidth();
+ method public int getOffsetForPosition(long position);
+ method public androidx.compose.ui.text.style.ResolvedTextDirection getParagraphDirection(int offset);
+ method public androidx.compose.ui.graphics.Path getPathForRange(int start, int end);
+ method public java.util.List<androidx.compose.ui.geometry.Rect> getPlaceholderRects();
+ method public float getWidth();
+ method public long getWordBoundary(int offset);
+ method public boolean isLineEllipsized(int lineIndex);
+ method public void paint(androidx.compose.ui.graphics.Canvas canvas, optional long color, optional androidx.compose.ui.graphics.Shadow? shadow, optional androidx.compose.ui.text.style.TextDecoration? decoration);
+ property public final boolean didExceedMaxLines;
+ property public final float firstBaseline;
+ property public final float height;
+ property public final androidx.compose.ui.text.MultiParagraphIntrinsics intrinsics;
+ property public final float lastBaseline;
+ property public final int lineCount;
+ property public final float maxIntrinsicWidth;
+ property public final int maxLines;
+ property public final float minIntrinsicWidth;
+ property public final java.util.List<androidx.compose.ui.geometry.Rect> placeholderRects;
+ property public final float width;
+ }
+
+ public final class MultiParagraphIntrinsics implements androidx.compose.ui.text.ParagraphIntrinsics {
+ ctor public MultiParagraphIntrinsics(androidx.compose.ui.text.AnnotatedString annotatedString, androidx.compose.ui.text.TextStyle style, java.util.List<androidx.compose.ui.text.AnnotatedString.Range<androidx.compose.ui.text.Placeholder>> placeholders, androidx.compose.ui.unit.Density density, androidx.compose.ui.text.font.FontFamily.Resolver fontFamilyResolver);
+ ctor @Deprecated public MultiParagraphIntrinsics(androidx.compose.ui.text.AnnotatedString annotatedString, androidx.compose.ui.text.TextStyle style, java.util.List<androidx.compose.ui.text.AnnotatedString.Range<androidx.compose.ui.text.Placeholder>> placeholders, androidx.compose.ui.unit.Density density, androidx.compose.ui.text.font.Font.ResourceLoader resourceLoader);
+ method public androidx.compose.ui.text.AnnotatedString getAnnotatedString();
+ method public float getMaxIntrinsicWidth();
+ method public float getMinIntrinsicWidth();
+ method public java.util.List<androidx.compose.ui.text.AnnotatedString.Range<androidx.compose.ui.text.Placeholder>> getPlaceholders();
+ property public final androidx.compose.ui.text.AnnotatedString annotatedString;
+ property public boolean hasStaleResolvedFonts;
+ property public float maxIntrinsicWidth;
+ property public float minIntrinsicWidth;
+ property public final java.util.List<androidx.compose.ui.text.AnnotatedString.Range<androidx.compose.ui.text.Placeholder>> placeholders;
+ }
+
+ public final class MultiParagraphIntrinsicsKt {
+ }
+
+ public final class MultiParagraphKt {
+ }
+
+ public interface Paragraph {
+ method public androidx.compose.ui.text.style.ResolvedTextDirection getBidiRunDirection(int offset);
+ method public androidx.compose.ui.geometry.Rect getBoundingBox(int offset);
+ method public androidx.compose.ui.geometry.Rect getCursorRect(int offset);
+ method public boolean getDidExceedMaxLines();
+ method public float getFirstBaseline();
+ method public float getHeight();
+ method public float getHorizontalPosition(int offset, boolean usePrimaryDirection);
+ method public float getLastBaseline();
+ method public float getLineBottom(int lineIndex);
+ method public int getLineCount();
+ method public int getLineEnd(int lineIndex, optional boolean visibleEnd);
+ method public int getLineForOffset(int offset);
+ method public int getLineForVerticalPosition(float vertical);
+ method public float getLineHeight(int lineIndex);
+ method public float getLineLeft(int lineIndex);
+ method public float getLineRight(int lineIndex);
+ method public int getLineStart(int lineIndex);
+ method public float getLineTop(int lineIndex);
+ method public float getLineWidth(int lineIndex);
+ method public float getMaxIntrinsicWidth();
+ method public float getMinIntrinsicWidth();
+ method public int getOffsetForPosition(long position);
+ method public androidx.compose.ui.text.style.ResolvedTextDirection getParagraphDirection(int offset);
+ method public androidx.compose.ui.graphics.Path getPathForRange(int start, int end);
+ method public java.util.List<androidx.compose.ui.geometry.Rect> getPlaceholderRects();
+ method public float getWidth();
+ method public long getWordBoundary(int offset);
+ method public boolean isLineEllipsized(int lineIndex);
+ method public void paint(androidx.compose.ui.graphics.Canvas canvas, optional long color, optional androidx.compose.ui.graphics.Shadow? shadow, optional androidx.compose.ui.text.style.TextDecoration? textDecoration);
+ property public abstract boolean didExceedMaxLines;
+ property public abstract float firstBaseline;
+ property public abstract float height;
+ property public abstract float lastBaseline;
+ property public abstract int lineCount;
+ property public abstract float maxIntrinsicWidth;
+ property public abstract float minIntrinsicWidth;
+ property public abstract java.util.List<androidx.compose.ui.geometry.Rect> placeholderRects;
+ property public abstract float width;
+ }
+
+ public interface ParagraphIntrinsics {
+ method public default boolean getHasStaleResolvedFonts();
+ method public float getMaxIntrinsicWidth();
+ method public float getMinIntrinsicWidth();
+ property public default boolean hasStaleResolvedFonts;
+ property public abstract float maxIntrinsicWidth;
+ property public abstract float minIntrinsicWidth;
+ }
+
+ public final class ParagraphIntrinsicsKt {
+ method @Deprecated public static androidx.compose.ui.text.ParagraphIntrinsics ParagraphIntrinsics(String text, androidx.compose.ui.text.TextStyle style, optional java.util.List<androidx.compose.ui.text.AnnotatedString.Range<androidx.compose.ui.text.SpanStyle>> spanStyles, optional java.util.List<androidx.compose.ui.text.AnnotatedString.Range<androidx.compose.ui.text.Placeholder>> placeholders, androidx.compose.ui.unit.Density density, androidx.compose.ui.text.font.Font.ResourceLoader resourceLoader);
+ method public static androidx.compose.ui.text.ParagraphIntrinsics ParagraphIntrinsics(String text, androidx.compose.ui.text.TextStyle style, optional java.util.List<androidx.compose.ui.text.AnnotatedString.Range<androidx.compose.ui.text.SpanStyle>> spanStyles, optional java.util.List<androidx.compose.ui.text.AnnotatedString.Range<androidx.compose.ui.text.Placeholder>> placeholders, androidx.compose.ui.unit.Density density, androidx.compose.ui.text.font.FontFamily.Resolver fontFamilyResolver);
+ }
+
+ public final class ParagraphKt {
+ method @Deprecated public static androidx.compose.ui.text.Paragraph Paragraph(String text, androidx.compose.ui.text.TextStyle style, optional java.util.List<androidx.compose.ui.text.AnnotatedString.Range<androidx.compose.ui.text.SpanStyle>> spanStyles, optional java.util.List<androidx.compose.ui.text.AnnotatedString.Range<androidx.compose.ui.text.Placeholder>> placeholders, optional int maxLines, optional boolean ellipsis, float width, androidx.compose.ui.unit.Density density, androidx.compose.ui.text.font.Font.ResourceLoader resourceLoader);
+ method @Deprecated public static androidx.compose.ui.text.Paragraph Paragraph(String text, androidx.compose.ui.text.TextStyle style, float width, androidx.compose.ui.unit.Density density, androidx.compose.ui.text.font.FontFamily.Resolver fontFamilyResolver, optional java.util.List<androidx.compose.ui.text.AnnotatedString.Range<androidx.compose.ui.text.SpanStyle>> spanStyles, optional java.util.List<androidx.compose.ui.text.AnnotatedString.Range<androidx.compose.ui.text.Placeholder>> placeholders, optional int maxLines, optional boolean ellipsis);
+ method public static androidx.compose.ui.text.Paragraph Paragraph(String text, androidx.compose.ui.text.TextStyle style, long constraints, androidx.compose.ui.unit.Density density, androidx.compose.ui.text.font.FontFamily.Resolver fontFamilyResolver, optional java.util.List<androidx.compose.ui.text.AnnotatedString.Range<androidx.compose.ui.text.SpanStyle>> spanStyles, optional java.util.List<androidx.compose.ui.text.AnnotatedString.Range<androidx.compose.ui.text.Placeholder>> placeholders, optional int maxLines, optional boolean ellipsis);
+ method @Deprecated public static androidx.compose.ui.text.Paragraph Paragraph(androidx.compose.ui.text.ParagraphIntrinsics paragraphIntrinsics, optional int maxLines, optional boolean ellipsis, float width);
+ method public static androidx.compose.ui.text.Paragraph Paragraph(androidx.compose.ui.text.ParagraphIntrinsics paragraphIntrinsics, long constraints, optional int maxLines, optional boolean ellipsis);
+ }
+
+ @androidx.compose.runtime.Immutable public final class ParagraphStyle {
+ ctor public ParagraphStyle(optional androidx.compose.ui.text.style.TextAlign? textAlign, optional androidx.compose.ui.text.style.TextDirection? textDirection, optional long lineHeight, optional androidx.compose.ui.text.style.TextIndent? textIndent);
+ method public androidx.compose.ui.text.ParagraphStyle copy(optional androidx.compose.ui.text.style.TextAlign? textAlign, optional androidx.compose.ui.text.style.TextDirection? textDirection, optional long lineHeight, optional androidx.compose.ui.text.style.TextIndent? textIndent);
+ method public operator boolean equals(Object? other);
+ method public long getLineHeight();
+ method public androidx.compose.ui.text.style.TextAlign? getTextAlign();
+ method public androidx.compose.ui.text.style.TextDirection? getTextDirection();
+ method public androidx.compose.ui.text.style.TextIndent? getTextIndent();
+ method @androidx.compose.runtime.Stable public androidx.compose.ui.text.ParagraphStyle merge(optional androidx.compose.ui.text.ParagraphStyle? other);
+ method @androidx.compose.runtime.Stable public operator androidx.compose.ui.text.ParagraphStyle plus(androidx.compose.ui.text.ParagraphStyle other);
+ property public final long lineHeight;
+ property public final androidx.compose.ui.text.style.TextAlign? textAlign;
+ property public final androidx.compose.ui.text.style.TextDirection? textDirection;
+ property public final androidx.compose.ui.text.style.TextIndent? textIndent;
+ }
+
+ public final class ParagraphStyleKt {
+ method @androidx.compose.runtime.Stable public static androidx.compose.ui.text.ParagraphStyle lerp(androidx.compose.ui.text.ParagraphStyle start, androidx.compose.ui.text.ParagraphStyle stop, float fraction);
+ }
+
+ @androidx.compose.runtime.Immutable public final class Placeholder {
+ ctor public Placeholder(long width, long height, int placeholderVerticalAlign);
+ method public androidx.compose.ui.text.Placeholder copy(optional long width, optional long height, optional int placeholderVerticalAlign);
+ method public operator boolean equals(Object? other);
+ method public long getHeight();
+ method public int getPlaceholderVerticalAlign();
+ method public long getWidth();
+ property public final long height;
+ property public final int placeholderVerticalAlign;
+ property public final long width;
+ }
+
+ @kotlin.jvm.JvmInline public final value class PlaceholderVerticalAlign {
+ field public static final androidx.compose.ui.text.PlaceholderVerticalAlign.Companion Companion;
+ }
+
+ public static final class PlaceholderVerticalAlign.Companion {
+ method public int getAboveBaseline();
+ method public int getBottom();
+ method public int getCenter();
+ method public int getTextBottom();
+ method public int getTextCenter();
+ method public int getTextTop();
+ method public int getTop();
+ property public final int AboveBaseline;
+ property public final int Bottom;
+ property public final int Center;
+ property public final int TextBottom;
+ property public final int TextCenter;
+ property public final int TextTop;
+ property public final int Top;
+ }
+
+ public final class SaversKt {
+ }
+
+ @androidx.compose.runtime.Immutable public final class SpanStyle {
+ ctor public SpanStyle(optional long color, optional long fontSize, optional androidx.compose.ui.text.font.FontWeight? fontWeight, optional androidx.compose.ui.text.font.FontStyle? fontStyle, optional androidx.compose.ui.text.font.FontSynthesis? fontSynthesis, optional androidx.compose.ui.text.font.FontFamily? fontFamily, optional String? fontFeatureSettings, optional long letterSpacing, optional androidx.compose.ui.text.style.BaselineShift? baselineShift, optional androidx.compose.ui.text.style.TextGeometricTransform? textGeometricTransform, optional androidx.compose.ui.text.intl.LocaleList? localeList, optional long background, optional androidx.compose.ui.text.style.TextDecoration? textDecoration, optional androidx.compose.ui.graphics.Shadow? shadow);
+ method public androidx.compose.ui.text.SpanStyle copy(optional long color, optional long fontSize, optional androidx.compose.ui.text.font.FontWeight? fontWeight, optional androidx.compose.ui.text.font.FontStyle? fontStyle, optional androidx.compose.ui.text.font.FontSynthesis? fontSynthesis, optional androidx.compose.ui.text.font.FontFamily? fontFamily, optional String? fontFeatureSettings, optional long letterSpacing, optional androidx.compose.ui.text.style.BaselineShift? baselineShift, optional androidx.compose.ui.text.style.TextGeometricTransform? textGeometricTransform, optional androidx.compose.ui.text.intl.LocaleList? localeList, optional long background, optional androidx.compose.ui.text.style.TextDecoration? textDecoration, optional androidx.compose.ui.graphics.Shadow? shadow);
+ method public operator boolean equals(Object? other);
+ method public long getBackground();
+ method public androidx.compose.ui.text.style.BaselineShift? getBaselineShift();
+ method public long getColor();
+ method public androidx.compose.ui.text.font.FontFamily? getFontFamily();
+ method public String? getFontFeatureSettings();
+ method public long getFontSize();
+ method public androidx.compose.ui.text.font.FontStyle? getFontStyle();
+ method public androidx.compose.ui.text.font.FontSynthesis? getFontSynthesis();
+ method public androidx.compose.ui.text.font.FontWeight? getFontWeight();
+ method public long getLetterSpacing();
+ method public androidx.compose.ui.text.intl.LocaleList? getLocaleList();
+ method public androidx.compose.ui.graphics.Shadow? getShadow();
+ method public androidx.compose.ui.text.style.TextDecoration? getTextDecoration();
+ method public androidx.compose.ui.text.style.TextGeometricTransform? getTextGeometricTransform();
+ method @androidx.compose.runtime.Stable public androidx.compose.ui.text.SpanStyle merge(optional androidx.compose.ui.text.SpanStyle? other);
+ method @androidx.compose.runtime.Stable public operator androidx.compose.ui.text.SpanStyle plus(androidx.compose.ui.text.SpanStyle other);
+ property public final long background;
+ property public final androidx.compose.ui.text.style.BaselineShift? baselineShift;
+ property public final long color;
+ property public final androidx.compose.ui.text.font.FontFamily? fontFamily;
+ property public final String? fontFeatureSettings;
+ property public final long fontSize;
+ property public final androidx.compose.ui.text.font.FontStyle? fontStyle;
+ property public final androidx.compose.ui.text.font.FontSynthesis? fontSynthesis;
+ property public final androidx.compose.ui.text.font.FontWeight? fontWeight;
+ property public final long letterSpacing;
+ property public final androidx.compose.ui.text.intl.LocaleList? localeList;
+ property public final androidx.compose.ui.graphics.Shadow? shadow;
+ property public final androidx.compose.ui.text.style.TextDecoration? textDecoration;
+ property public final androidx.compose.ui.text.style.TextGeometricTransform? textGeometricTransform;
+ }
+
+ public final class SpanStyleKt {
+ method public static androidx.compose.ui.text.SpanStyle lerp(androidx.compose.ui.text.SpanStyle start, androidx.compose.ui.text.SpanStyle stop, float fraction);
+ }
+
+ public final class StringKt {
+ method public static String capitalize(String, androidx.compose.ui.text.intl.Locale locale);
+ method public static String capitalize(String, androidx.compose.ui.text.intl.LocaleList localeList);
+ method public static String decapitalize(String, androidx.compose.ui.text.intl.Locale locale);
+ method public static String decapitalize(String, androidx.compose.ui.text.intl.LocaleList localeList);
+ method public static String toLowerCase(String, androidx.compose.ui.text.intl.Locale locale);
+ method public static String toLowerCase(String, androidx.compose.ui.text.intl.LocaleList localeList);
+ method public static String toUpperCase(String, androidx.compose.ui.text.intl.Locale locale);
+ method public static String toUpperCase(String, androidx.compose.ui.text.intl.LocaleList localeList);
+ }
+
+ public final class TempListUtilsKt {
+ }
+
+ public final class TextLayoutInput {
+ ctor @Deprecated public TextLayoutInput(androidx.compose.ui.text.AnnotatedString text, androidx.compose.ui.text.TextStyle style, java.util.List<androidx.compose.ui.text.AnnotatedString.Range<androidx.compose.ui.text.Placeholder>> placeholders, int maxLines, boolean softWrap, int overflow, androidx.compose.ui.unit.Density density, androidx.compose.ui.unit.LayoutDirection layoutDirection, androidx.compose.ui.text.font.Font.ResourceLoader resourceLoader, long constraints);
+ ctor public TextLayoutInput(androidx.compose.ui.text.AnnotatedString text, androidx.compose.ui.text.TextStyle style, java.util.List<androidx.compose.ui.text.AnnotatedString.Range<androidx.compose.ui.text.Placeholder>> placeholders, int maxLines, boolean softWrap, int overflow, androidx.compose.ui.unit.Density density, androidx.compose.ui.unit.LayoutDirection layoutDirection, androidx.compose.ui.text.font.FontFamily.Resolver fontFamilyResolver, long constraints);
+ method @Deprecated public androidx.compose.ui.text.TextLayoutInput copy(optional androidx.compose.ui.text.AnnotatedString text, optional androidx.compose.ui.text.TextStyle style, optional java.util.List<androidx.compose.ui.text.AnnotatedString.Range<androidx.compose.ui.text.Placeholder>> placeholders, optional int maxLines, optional boolean softWrap, optional int overflow, optional androidx.compose.ui.unit.Density density, optional androidx.compose.ui.unit.LayoutDirection layoutDirection, optional androidx.compose.ui.text.font.Font.ResourceLoader resourceLoader, optional long constraints);
+ method public operator boolean equals(Object? other);
+ method public long getConstraints();
+ method public androidx.compose.ui.unit.Density getDensity();
+ method public androidx.compose.ui.text.font.FontFamily.Resolver getFontFamilyResolver();
+ method public androidx.compose.ui.unit.LayoutDirection getLayoutDirection();
+ method public int getMaxLines();
+ method public int getOverflow();
+ method public java.util.List<androidx.compose.ui.text.AnnotatedString.Range<androidx.compose.ui.text.Placeholder>> getPlaceholders();
+ method @Deprecated public androidx.compose.ui.text.font.Font.ResourceLoader getResourceLoader();
+ method public boolean getSoftWrap();
+ method public androidx.compose.ui.text.TextStyle getStyle();
+ method public androidx.compose.ui.text.AnnotatedString getText();
+ property public final long constraints;
+ property public final androidx.compose.ui.unit.Density density;
+ property public final androidx.compose.ui.text.font.FontFamily.Resolver fontFamilyResolver;
+ property public final androidx.compose.ui.unit.LayoutDirection layoutDirection;
+ property public final int maxLines;
+ property public final int overflow;
+ property public final java.util.List<androidx.compose.ui.text.AnnotatedString.Range<androidx.compose.ui.text.Placeholder>> placeholders;
+ property @Deprecated public final androidx.compose.ui.text.font.Font.ResourceLoader resourceLoader;
+ property public final boolean softWrap;
+ property public final androidx.compose.ui.text.TextStyle style;
+ property public final androidx.compose.ui.text.AnnotatedString text;
+ }
+
+ public final class TextLayoutResult {
+ ctor public TextLayoutResult(androidx.compose.ui.text.TextLayoutInput layoutInput, androidx.compose.ui.text.MultiParagraph multiParagraph, long size);
+ method public androidx.compose.ui.text.TextLayoutResult copy(optional androidx.compose.ui.text.TextLayoutInput layoutInput, optional long size);
+ method public operator boolean equals(Object? other);
+ method public androidx.compose.ui.text.style.ResolvedTextDirection getBidiRunDirection(int offset);
+ method public androidx.compose.ui.geometry.Rect getBoundingBox(int offset);
+ method public androidx.compose.ui.geometry.Rect getCursorRect(int offset);
+ method public boolean getDidOverflowHeight();
+ method public boolean getDidOverflowWidth();
+ method public float getFirstBaseline();
+ method public boolean getHasVisualOverflow();
+ method public float getHorizontalPosition(int offset, boolean usePrimaryDirection);
+ method public float getLastBaseline();
+ method public androidx.compose.ui.text.TextLayoutInput getLayoutInput();
+ method public float getLineBottom(int lineIndex);
+ method public int getLineCount();
+ method public int getLineEnd(int lineIndex, optional boolean visibleEnd);
+ method public int getLineForOffset(int offset);
+ method public int getLineForVerticalPosition(float vertical);
+ method public float getLineLeft(int lineIndex);
+ method public float getLineRight(int lineIndex);
+ method public int getLineStart(int lineIndex);
+ method public float getLineTop(int lineIndex);
+ method public androidx.compose.ui.text.MultiParagraph getMultiParagraph();
+ method public int getOffsetForPosition(long position);
+ method public androidx.compose.ui.text.style.ResolvedTextDirection getParagraphDirection(int offset);
+ method public androidx.compose.ui.graphics.Path getPathForRange(int start, int end);
+ method public java.util.List<androidx.compose.ui.geometry.Rect> getPlaceholderRects();
+ method public long getSize();
+ method public long getWordBoundary(int offset);
+ method public boolean isLineEllipsized(int lineIndex);
+ property public final boolean didOverflowHeight;
+ property public final boolean didOverflowWidth;
+ property public final float firstBaseline;
+ property public final boolean hasVisualOverflow;
+ property public final float lastBaseline;
+ property public final androidx.compose.ui.text.TextLayoutInput layoutInput;
+ property public final int lineCount;
+ property public final androidx.compose.ui.text.MultiParagraph multiParagraph;
+ property public final java.util.List<androidx.compose.ui.geometry.Rect> placeholderRects;
+ property public final long size;
+ }
+
+ public final class TextPainter {
+ method public void paint(androidx.compose.ui.graphics.Canvas canvas, androidx.compose.ui.text.TextLayoutResult textLayoutResult);
+ field public static final androidx.compose.ui.text.TextPainter INSTANCE;
+ }
+
+ @androidx.compose.runtime.Immutable @kotlin.jvm.JvmInline public final value class TextRange {
+ method public operator boolean contains(long other);
+ method public operator boolean contains(int offset);
+ method public boolean getCollapsed();
+ method public int getEnd();
+ method public int getLength();
+ method public int getMax();
+ method public int getMin();
+ method public boolean getReversed();
+ method public int getStart();
+ method public boolean intersects(long other);
+ property public final boolean collapsed;
+ property public final int end;
+ property public final int length;
+ property public final int max;
+ property public final int min;
+ property public final boolean reversed;
+ property public final int start;
+ field public static final androidx.compose.ui.text.TextRange.Companion Companion;
+ }
+
+ public static final class TextRange.Companion {
+ method public long getZero();
+ property public final long Zero;
+ }
+
+ public final class TextRangeKt {
+ method public static long TextRange(int start, int end);
+ method public static long TextRange(int index);
+ method public static String substring(CharSequence, long range);
+ }
+
+ @androidx.compose.runtime.Immutable public final class TextStyle {
+ ctor public TextStyle(optional long color, optional long fontSize, optional androidx.compose.ui.text.font.FontWeight? fontWeight, optional androidx.compose.ui.text.font.FontStyle? fontStyle, optional androidx.compose.ui.text.font.FontSynthesis? fontSynthesis, optional androidx.compose.ui.text.font.FontFamily? fontFamily, optional String? fontFeatureSettings, optional long letterSpacing, optional androidx.compose.ui.text.style.BaselineShift? baselineShift, optional androidx.compose.ui.text.style.TextGeometricTransform? textGeometricTransform, optional androidx.compose.ui.text.intl.LocaleList? localeList, optional long background, optional androidx.compose.ui.text.style.TextDecoration? textDecoration, optional androidx.compose.ui.graphics.Shadow? shadow, optional androidx.compose.ui.text.style.TextAlign? textAlign, optional androidx.compose.ui.text.style.TextDirection? textDirection, optional long lineHeight, optional androidx.compose.ui.text.style.TextIndent? textIndent);
+ method public androidx.compose.ui.text.TextStyle copy(optional long color, optional long fontSize, optional androidx.compose.ui.text.font.FontWeight? fontWeight, optional androidx.compose.ui.text.font.FontStyle? fontStyle, optional androidx.compose.ui.text.font.FontSynthesis? fontSynthesis, optional androidx.compose.ui.text.font.FontFamily? fontFamily, optional String? fontFeatureSettings, optional long letterSpacing, optional androidx.compose.ui.text.style.BaselineShift? baselineShift, optional androidx.compose.ui.text.style.TextGeometricTransform? textGeometricTransform, optional androidx.compose.ui.text.intl.LocaleList? localeList, optional long background, optional androidx.compose.ui.text.style.TextDecoration? textDecoration, optional androidx.compose.ui.graphics.Shadow? shadow, optional androidx.compose.ui.text.style.TextAlign? textAlign, optional androidx.compose.ui.text.style.TextDirection? textDirection, optional long lineHeight, optional androidx.compose.ui.text.style.TextIndent? textIndent);
+ method public long getBackground();
+ method public androidx.compose.ui.text.style.BaselineShift? getBaselineShift();
+ method public long getColor();
+ method public androidx.compose.ui.text.font.FontFamily? getFontFamily();
+ method public String? getFontFeatureSettings();
+ method public long getFontSize();
+ method public androidx.compose.ui.text.font.FontStyle? getFontStyle();
+ method public androidx.compose.ui.text.font.FontSynthesis? getFontSynthesis();
+ method public androidx.compose.ui.text.font.FontWeight? getFontWeight();
+ method public long getLetterSpacing();
+ method public long getLineHeight();
+ method public androidx.compose.ui.text.intl.LocaleList? getLocaleList();
+ method public androidx.compose.ui.graphics.Shadow? getShadow();
+ method public androidx.compose.ui.text.style.TextAlign? getTextAlign();
+ method public androidx.compose.ui.text.style.TextDecoration? getTextDecoration();
+ method public androidx.compose.ui.text.style.TextDirection? getTextDirection();
+ method public androidx.compose.ui.text.style.TextGeometricTransform? getTextGeometricTransform();
+ method public androidx.compose.ui.text.style.TextIndent? getTextIndent();
+ method public boolean hasSameLayoutAffectingAttributes(androidx.compose.ui.text.TextStyle other);
+ method @androidx.compose.runtime.Stable public androidx.compose.ui.text.TextStyle merge(optional androidx.compose.ui.text.TextStyle? other);
+ method @androidx.compose.runtime.Stable public androidx.compose.ui.text.TextStyle merge(androidx.compose.ui.text.SpanStyle other);
+ method @androidx.compose.runtime.Stable public androidx.compose.ui.text.TextStyle merge(androidx.compose.ui.text.ParagraphStyle other);
+ method @androidx.compose.runtime.Stable public operator androidx.compose.ui.text.TextStyle plus(androidx.compose.ui.text.TextStyle other);
+ method @androidx.compose.runtime.Stable public operator androidx.compose.ui.text.TextStyle plus(androidx.compose.ui.text.ParagraphStyle other);
+ method @androidx.compose.runtime.Stable public operator androidx.compose.ui.text.TextStyle plus(androidx.compose.ui.text.SpanStyle other);
+ method @androidx.compose.runtime.Stable public androidx.compose.ui.text.ParagraphStyle toParagraphStyle();
+ method @androidx.compose.runtime.Stable public androidx.compose.ui.text.SpanStyle toSpanStyle();
+ property public final long background;
+ property public final androidx.compose.ui.text.style.BaselineShift? baselineShift;
+ property public final long color;
+ property public final androidx.compose.ui.text.font.FontFamily? fontFamily;
+ property public final String? fontFeatureSettings;
+ property public final long fontSize;
+ property public final androidx.compose.ui.text.font.FontStyle? fontStyle;
+ property public final androidx.compose.ui.text.font.FontSynthesis? fontSynthesis;
+ property public final androidx.compose.ui.text.font.FontWeight? fontWeight;
+ property public final long letterSpacing;
+ property public final long lineHeight;
+ property public final androidx.compose.ui.text.intl.LocaleList? localeList;
+ property public final androidx.compose.ui.graphics.Shadow? shadow;
+ property public final androidx.compose.ui.text.style.TextAlign? textAlign;
+ property public final androidx.compose.ui.text.style.TextDecoration? textDecoration;
+ property public final androidx.compose.ui.text.style.TextDirection? textDirection;
+ property public final androidx.compose.ui.text.style.TextGeometricTransform? textGeometricTransform;
+ property public final androidx.compose.ui.text.style.TextIndent? textIndent;
+ field public static final androidx.compose.ui.text.TextStyle.Companion Companion;
+ }
+
+ public static final class TextStyle.Companion {
+ method public androidx.compose.ui.text.TextStyle getDefault();
+ property public final androidx.compose.ui.text.TextStyle Default;
+ }
+
+ public final class TextStyleKt {
+ method public static androidx.compose.ui.text.TextStyle lerp(androidx.compose.ui.text.TextStyle start, androidx.compose.ui.text.TextStyle stop, float fraction);
+ method public static androidx.compose.ui.text.TextStyle resolveDefaults(androidx.compose.ui.text.TextStyle style, androidx.compose.ui.unit.LayoutDirection direction);
+ }
+
+ public abstract sealed class TtsAnnotation {
+ }
+
+ public final class VerbatimTtsAnnotation extends androidx.compose.ui.text.TtsAnnotation {
+ ctor public VerbatimTtsAnnotation(String verbatim);
+ method public String getVerbatim();
+ property public final String verbatim;
+ }
+
+}
+
+package androidx.compose.ui.text.android {
+
+ public final class LayoutCompatKt {
+ }
+
+ public final class LayoutHelperKt {
+ }
+
+ public final class LayoutIntrinsicsKt {
+ }
+
+ public final class PaintExtensionsKt {
+ }
+
+ public final class SpannedExtensionsKt {
+ }
+
+ public final class StaticLayoutFactoryKt {
+ }
+
+ public final class TempListUtilsKt {
+ }
+
+ public final class TextLayoutKt {
+ }
+
+}
+
+package androidx.compose.ui.text.android.style {
+
+ public final class LineHeightStyleSpanKt {
+ }
+
+ public final class PlaceholderSpanKt {
+ }
+
+}
+
+package androidx.compose.ui.text.caches {
+
+ public final class ContainerHelpersKt {
+ }
+
+ public final class SimpleArrayMapKt {
+ }
+
+}
+
+package androidx.compose.ui.text.font {
+
+ public abstract class AndroidFont implements androidx.compose.ui.text.font.Font {
+ ctor public AndroidFont(int loadingStrategy, androidx.compose.ui.text.font.AndroidFont.TypefaceLoader typefaceLoader);
+ method public final int getLoadingStrategy();
+ method public final androidx.compose.ui.text.font.AndroidFont.TypefaceLoader getTypefaceLoader();
+ property public final int loadingStrategy;
+ property public final androidx.compose.ui.text.font.AndroidFont.TypefaceLoader typefaceLoader;
+ }
+
+ public static interface AndroidFont.TypefaceLoader {
+ method public suspend Object? awaitLoad(android.content.Context context, androidx.compose.ui.text.font.AndroidFont font, kotlin.coroutines.Continuation<? super android.graphics.Typeface>);
+ method public android.graphics.Typeface? loadBlocking(android.content.Context context, androidx.compose.ui.text.font.AndroidFont font);
+ }
+
+ public final class AndroidFontKt {
+ }
+
+ public final class AndroidFontLoader_androidKt {
+ }
+
+ public final class AndroidFontResolveInterceptor_androidKt {
+ }
+
+ public final class AndroidFontUtils_androidKt {
+ }
+
+ public final class AndroidTypeface_androidKt {
+ method public static androidx.compose.ui.text.font.FontFamily FontFamily(android.graphics.Typeface typeface);
+ method @Deprecated public static androidx.compose.ui.text.font.Typeface Typeface(android.content.Context context, androidx.compose.ui.text.font.FontFamily fontFamily, optional java.util.List<kotlin.Pair<androidx.compose.ui.text.font.FontWeight,androidx.compose.ui.text.font.FontStyle>>? styles);
+ method public static androidx.compose.ui.text.font.Typeface Typeface(android.graphics.Typeface typeface);
+ }
+
+ public final class DelegatingFontLoaderForDeprecatedUsage_androidKt {
+ method @Deprecated public static androidx.compose.ui.text.font.FontFamily.Resolver createFontFamilyResolver(androidx.compose.ui.text.font.Font.ResourceLoader fontResourceLoader, android.content.Context context);
+ }
+
+ public final class DeviceFontFamilyNameFontKt {
+ }
+
+ public abstract sealed class FileBasedFontFamily extends androidx.compose.ui.text.font.FontFamily {
+ }
+
+ @androidx.compose.runtime.Immutable public interface Font {
+ method public int getStyle();
+ method public androidx.compose.ui.text.font.FontWeight getWeight();
+ property public abstract int style;
+ property public abstract androidx.compose.ui.text.font.FontWeight weight;
+ field public static final androidx.compose.ui.text.font.Font.Companion Companion;
+ }
+
+ public static final class Font.Companion {
+ }
+
+ @Deprecated public static interface Font.ResourceLoader {
+ method @Deprecated public Object load(androidx.compose.ui.text.font.Font font);
+ }
+
+ @androidx.compose.runtime.Immutable public abstract sealed class FontFamily {
+ method @Deprecated public final boolean getCanLoadSynchronously();
+ property @Deprecated public final boolean canLoadSynchronously;
+ field public static final androidx.compose.ui.text.font.FontFamily.Companion Companion;
+ }
+
+ public static final class FontFamily.Companion {
+ method public androidx.compose.ui.text.font.GenericFontFamily getCursive();
+ method public androidx.compose.ui.text.font.SystemFontFamily getDefault();
+ method public androidx.compose.ui.text.font.GenericFontFamily getMonospace();
+ method public androidx.compose.ui.text.font.GenericFontFamily getSansSerif();
+ method public androidx.compose.ui.text.font.GenericFontFamily getSerif();
+ property public final androidx.compose.ui.text.font.GenericFontFamily Cursive;
+ property public final androidx.compose.ui.text.font.SystemFontFamily Default;
+ property public final androidx.compose.ui.text.font.GenericFontFamily Monospace;
+ property public final androidx.compose.ui.text.font.GenericFontFamily SansSerif;
+ property public final androidx.compose.ui.text.font.GenericFontFamily Serif;
+ }
+
+ public static sealed interface FontFamily.Resolver {
+ method public suspend Object? preload(androidx.compose.ui.text.font.FontFamily fontFamily, kotlin.coroutines.Continuation<? super kotlin.Unit>);
+ method public androidx.compose.runtime.State<java.lang.Object> resolve(optional androidx.compose.ui.text.font.FontFamily? fontFamily, optional androidx.compose.ui.text.font.FontWeight fontWeight, optional int fontStyle, optional int fontSynthesis);
+ }
+
+ public final class FontFamilyKt {
+ method @androidx.compose.runtime.Stable public static androidx.compose.ui.text.font.FontFamily FontFamily(java.util.List<? extends androidx.compose.ui.text.font.Font> fonts);
+ method @androidx.compose.runtime.Stable public static androidx.compose.ui.text.font.FontFamily FontFamily(androidx.compose.ui.text.font.Font... fonts);
+ method @androidx.compose.runtime.Stable public static androidx.compose.ui.text.font.FontFamily FontFamily(androidx.compose.ui.text.font.Typeface typeface);
+ }
+
+ public final class FontFamilyResolverKt {
+ }
+
+ public final class FontFamilyResolver_androidKt {
+ method public static androidx.compose.ui.text.font.FontFamily.Resolver createFontFamilyResolver(android.content.Context context);
+ }
+
+ public final class FontKt {
+ method @androidx.compose.runtime.Stable public static androidx.compose.ui.text.font.Font Font(int resId, optional androidx.compose.ui.text.font.FontWeight weight, optional int style, optional int loadingStrategy);
+ method @Deprecated @androidx.compose.runtime.Stable public static androidx.compose.ui.text.font.Font! Font(int resId, optional androidx.compose.ui.text.font.FontWeight weight, optional int style);
+ method @androidx.compose.runtime.Stable public static androidx.compose.ui.text.font.FontFamily toFontFamily(androidx.compose.ui.text.font.Font);
+ }
+
+ @androidx.compose.runtime.Immutable public final class FontListFontFamily extends androidx.compose.ui.text.font.FileBasedFontFamily implements kotlin.jvm.internal.markers.KMappedMarker java.util.List<androidx.compose.ui.text.font.Font> {
+ method public java.util.List<androidx.compose.ui.text.font.Font> getFonts();
+ property public final java.util.List<androidx.compose.ui.text.font.Font> fonts;
+ }
+
+ public final class FontListFontFamilyTypefaceAdapterKt {
+ }
+
+ @kotlin.jvm.JvmInline public final value class FontLoadingStrategy {
+ method public int getValue();
+ property public final int value;
+ field public static final androidx.compose.ui.text.font.FontLoadingStrategy.Companion Companion;
+ }
+
+ public static final class FontLoadingStrategy.Companion {
+ method public int getAsync();
+ method public int getBlocking();
+ method public int getOptionalLocal();
+ property public final int Async;
+ property public final int Blocking;
+ property public final int OptionalLocal;
+ }
+
+ @kotlin.jvm.JvmInline public final value class FontStyle {
+ ctor public FontStyle(int value);
+ method public int getValue();
+ property public final int value;
+ field public static final androidx.compose.ui.text.font.FontStyle.Companion Companion;
+ }
+
+ public static final class FontStyle.Companion {
+ method public int getItalic();
+ method public int getNormal();
+ method public java.util.List<androidx.compose.ui.text.font.FontStyle> values();
+ property public final int Italic;
+ property public final int Normal;
+ }
+
+ @kotlin.jvm.JvmInline public final value class FontSynthesis {
+ field public static final androidx.compose.ui.text.font.FontSynthesis.Companion Companion;
+ }
+
+ public static final class FontSynthesis.Companion {
+ method public int getAll();
+ method public int getNone();
+ method public int getStyle();
+ method public int getWeight();
+ property public final int All;
+ property public final int None;
+ property public final int Style;
+ property public final int Weight;
+ }
+
+ public final class FontSynthesis_androidKt {
+ }
+
+ @androidx.compose.runtime.Immutable public final class FontWeight implements java.lang.Comparable<androidx.compose.ui.text.font.FontWeight> {
+ ctor public FontWeight(int weight);
+ method public operator int compareTo(androidx.compose.ui.text.font.FontWeight other);
+ method public int getWeight();
+ property public final int weight;
+ field public static final androidx.compose.ui.text.font.FontWeight.Companion Companion;
+ }
+
+ public static final class FontWeight.Companion {
+ method public androidx.compose.ui.text.font.FontWeight getBlack();
+ method public androidx.compose.ui.text.font.FontWeight getBold();
+ method public androidx.compose.ui.text.font.FontWeight getExtraBold();
+ method public androidx.compose.ui.text.font.FontWeight getExtraLight();
+ method public androidx.compose.ui.text.font.FontWeight getLight();
+ method public androidx.compose.ui.text.font.FontWeight getMedium();
+ method public androidx.compose.ui.text.font.FontWeight getNormal();
+ method public androidx.compose.ui.text.font.FontWeight getSemiBold();
+ method public androidx.compose.ui.text.font.FontWeight getThin();
+ method public androidx.compose.ui.text.font.FontWeight getW100();
+ method public androidx.compose.ui.text.font.FontWeight getW200();
+ method public androidx.compose.ui.text.font.FontWeight getW300();
+ method public androidx.compose.ui.text.font.FontWeight getW400();
+ method public androidx.compose.ui.text.font.FontWeight getW500();
+ method public androidx.compose.ui.text.font.FontWeight getW600();
+ method public androidx.compose.ui.text.font.FontWeight getW700();
+ method public androidx.compose.ui.text.font.FontWeight getW800();
+ method public androidx.compose.ui.text.font.FontWeight getW900();
+ property public final androidx.compose.ui.text.font.FontWeight Black;
+ property public final androidx.compose.ui.text.font.FontWeight Bold;
+ property public final androidx.compose.ui.text.font.FontWeight ExtraBold;
+ property public final androidx.compose.ui.text.font.FontWeight ExtraLight;
+ property public final androidx.compose.ui.text.font.FontWeight Light;
+ property public final androidx.compose.ui.text.font.FontWeight Medium;
+ property public final androidx.compose.ui.text.font.FontWeight Normal;
+ property public final androidx.compose.ui.text.font.FontWeight SemiBold;
+ property public final androidx.compose.ui.text.font.FontWeight Thin;
+ property public final androidx.compose.ui.text.font.FontWeight W100;
+ property public final androidx.compose.ui.text.font.FontWeight W200;
+ property public final androidx.compose.ui.text.font.FontWeight W300;
+ property public final androidx.compose.ui.text.font.FontWeight W400;
+ property public final androidx.compose.ui.text.font.FontWeight W500;
+ property public final androidx.compose.ui.text.font.FontWeight W600;
+ property public final androidx.compose.ui.text.font.FontWeight W700;
+ property public final androidx.compose.ui.text.font.FontWeight W800;
+ property public final androidx.compose.ui.text.font.FontWeight W900;
+ }
+
+ public final class FontWeightKt {
+ method public static androidx.compose.ui.text.font.FontWeight lerp(androidx.compose.ui.text.font.FontWeight start, androidx.compose.ui.text.font.FontWeight stop, float fraction);
+ }
+
+ @androidx.compose.runtime.Immutable public final class GenericFontFamily extends androidx.compose.ui.text.font.SystemFontFamily {
+ method public String getName();
+ property public final String name;
+ }
+
+ public final class LoadedFontFamily extends androidx.compose.ui.text.font.FontFamily {
+ method public androidx.compose.ui.text.font.Typeface getTypeface();
+ property public final androidx.compose.ui.text.font.Typeface typeface;
+ }
+
+ public final class PlatformTypefacesKt {
+ }
+
+ public final class ResourceFont implements androidx.compose.ui.text.font.Font {
+ method public androidx.compose.ui.text.font.ResourceFont copy(optional int resId, optional androidx.compose.ui.text.font.FontWeight weight, optional int style);
+ method public int getResId();
+ method public int getStyle();
+ method public androidx.compose.ui.text.font.FontWeight getWeight();
+ property public final int resId;
+ property public int style;
+ property public androidx.compose.ui.text.font.FontWeight weight;
+ }
+
+ public abstract sealed class SystemFontFamily extends androidx.compose.ui.text.font.FontFamily {
+ }
+
+ public interface Typeface {
+ method public androidx.compose.ui.text.font.FontFamily? getFontFamily();
+ property public abstract androidx.compose.ui.text.font.FontFamily? fontFamily;
+ }
+
+}
+
+package androidx.compose.ui.text.input {
+
+ public final class BackspaceCommand implements androidx.compose.ui.text.input.EditCommand {
+ ctor public BackspaceCommand();
+ method public void applyTo(androidx.compose.ui.text.input.EditingBuffer buffer);
+ }
+
+ public final class CommitTextCommand implements androidx.compose.ui.text.input.EditCommand {
+ ctor public CommitTextCommand(androidx.compose.ui.text.AnnotatedString annotatedString, int newCursorPosition);
+ ctor public CommitTextCommand(String text, int newCursorPosition);
+ method public void applyTo(androidx.compose.ui.text.input.EditingBuffer buffer);
+ method public androidx.compose.ui.text.AnnotatedString getAnnotatedString();
+ method public int getNewCursorPosition();
+ method public String getText();
+ property public final androidx.compose.ui.text.AnnotatedString annotatedString;
+ property public final int newCursorPosition;
+ property public final String text;
+ }
+
+ public final class DeleteAllCommand implements androidx.compose.ui.text.input.EditCommand {
+ ctor public DeleteAllCommand();
+ method public void applyTo(androidx.compose.ui.text.input.EditingBuffer buffer);
+ }
+
+ public final class DeleteSurroundingTextCommand implements androidx.compose.ui.text.input.EditCommand {
+ ctor public DeleteSurroundingTextCommand(int lengthBeforeCursor, int lengthAfterCursor);
+ method public void applyTo(androidx.compose.ui.text.input.EditingBuffer buffer);
+ method public int getLengthAfterCursor();
+ method public int getLengthBeforeCursor();
+ property public final int lengthAfterCursor;
+ property public final int lengthBeforeCursor;
+ }
+
+ public final class DeleteSurroundingTextInCodePointsCommand implements androidx.compose.ui.text.input.EditCommand {
+ ctor public DeleteSurroundingTextInCodePointsCommand(int lengthBeforeCursor, int lengthAfterCursor);
+ method public void applyTo(androidx.compose.ui.text.input.EditingBuffer buffer);
+ method public int getLengthAfterCursor();
+ method public int getLengthBeforeCursor();
+ property public final int lengthAfterCursor;
+ property public final int lengthBeforeCursor;
+ }
+
+ public interface EditCommand {
+ method public void applyTo(androidx.compose.ui.text.input.EditingBuffer buffer);
+ }
+
+ public final class EditCommandKt {
+ }
+
+ public final class EditProcessor {
+ ctor public EditProcessor();
+ method public androidx.compose.ui.text.input.TextFieldValue apply(java.util.List<? extends androidx.compose.ui.text.input.EditCommand> editCommands);
+ method public void reset(androidx.compose.ui.text.input.TextFieldValue value, androidx.compose.ui.text.input.TextInputSession? textInputSession);
+ method public androidx.compose.ui.text.input.TextFieldValue toTextFieldValue();
+ }
+
+ public final class EditingBuffer {
+ ctor public EditingBuffer(androidx.compose.ui.text.AnnotatedString text, long selection);
+ }
+
+ public final class EditingBufferKt {
+ }
+
+ public final class FinishComposingTextCommand implements androidx.compose.ui.text.input.EditCommand {
+ ctor public FinishComposingTextCommand();
+ method public void applyTo(androidx.compose.ui.text.input.EditingBuffer buffer);
+ }
+
+ public final class GapBufferKt {
+ }
+
+ @kotlin.jvm.JvmInline public final value class ImeAction {
+ field public static final androidx.compose.ui.text.input.ImeAction.Companion Companion;
+ }
+
+ public static final class ImeAction.Companion {
+ method public int getDefault();
+ method public int getDone();
+ method public int getGo();
+ method public int getNext();
+ method public int getNone();
+ method public int getPrevious();
+ method public int getSearch();
+ method public int getSend();
+ property public final int Default;
+ property public final int Done;
+ property public final int Go;
+ property public final int Next;
+ property public final int None;
+ property public final int Previous;
+ property public final int Search;
+ property public final int Send;
+ }
+
+ @androidx.compose.runtime.Immutable public final class ImeOptions {
+ ctor public ImeOptions(optional boolean singleLine, optional int capitalization, optional boolean autoCorrect, optional int keyboardType, optional int imeAction);
+ method public androidx.compose.ui.text.input.ImeOptions copy(optional boolean singleLine, optional int capitalization, optional boolean autoCorrect, optional int keyboardType, optional int imeAction);
+ method public boolean getAutoCorrect();
+ method public int getCapitalization();
+ method public int getImeAction();
+ method public int getKeyboardType();
+ method public boolean getSingleLine();
+ property public final boolean autoCorrect;
+ property public final int capitalization;
+ property public final int imeAction;
+ property public final int keyboardType;
+ property public final boolean singleLine;
+ field public static final androidx.compose.ui.text.input.ImeOptions.Companion Companion;
+ }
+
+ public static final class ImeOptions.Companion {
+ method public androidx.compose.ui.text.input.ImeOptions getDefault();
+ property public final androidx.compose.ui.text.input.ImeOptions Default;
+ }
+
+ @Deprecated public interface InputEventCallback {
+ method @Deprecated public void onEditCommands(java.util.List<? extends androidx.compose.ui.text.input.EditCommand> editCommands);
+ method @Deprecated public void onImeAction(int imeAction);
+ }
+
+ @kotlin.jvm.JvmInline public final value class KeyboardCapitalization {
+ field public static final androidx.compose.ui.text.input.KeyboardCapitalization.Companion Companion;
+ }
+
+ public static final class KeyboardCapitalization.Companion {
+ method public int getCharacters();
+ method public int getNone();
+ method public int getSentences();
+ method public int getWords();
+ property public final int Characters;
+ property public final int None;
+ property public final int Sentences;
+ property public final int Words;
+ }
+
+ @kotlin.jvm.JvmInline public final value class KeyboardType {
+ field public static final androidx.compose.ui.text.input.KeyboardType.Companion Companion;
+ }
+
+ public static final class KeyboardType.Companion {
+ method public int getAscii();
+ method public int getDecimal();
+ method public int getEmail();
+ method public int getNumber();
+ method public int getNumberPassword();
+ method public int getPassword();
+ method public int getPhone();
+ method public int getText();
+ method public int getUri();
+ property public final int Ascii;
+ property public final int Decimal;
+ property public final int Email;
+ property public final int Number;
+ property public final int NumberPassword;
+ property public final int Password;
+ property public final int Phone;
+ property public final int Text;
+ property public final int Uri;
+ }
+
+ public final class MoveCursorCommand implements androidx.compose.ui.text.input.EditCommand {
+ ctor public MoveCursorCommand(int amount);
+ method public void applyTo(androidx.compose.ui.text.input.EditingBuffer buffer);
+ method public int getAmount();
+ property public final int amount;
+ }
+
+ public interface OffsetMapping {
+ method public int originalToTransformed(int offset);
+ method public int transformedToOriginal(int offset);
+ field public static final androidx.compose.ui.text.input.OffsetMapping.Companion Companion;
+ }
+
+ public static final class OffsetMapping.Companion {
+ method public androidx.compose.ui.text.input.OffsetMapping getIdentity();
+ property public final androidx.compose.ui.text.input.OffsetMapping Identity;
+ }
+
+ public final class PasswordVisualTransformation implements androidx.compose.ui.text.input.VisualTransformation {
+ ctor public PasswordVisualTransformation(optional char mask);
+ method public androidx.compose.ui.text.input.TransformedText filter(androidx.compose.ui.text.AnnotatedString text);
+ method public char getMask();
+ property public final char mask;
+ }
+
+ public interface PlatformTextInputService {
+ method public void hideSoftwareKeyboard();
+ method @Deprecated public default void notifyFocusedRect(androidx.compose.ui.geometry.Rect rect);
+ method public void showSoftwareKeyboard();
+ method public void startInput(androidx.compose.ui.text.input.TextFieldValue value, androidx.compose.ui.text.input.ImeOptions imeOptions, kotlin.jvm.functions.Function1<? super java.util.List<? extends androidx.compose.ui.text.input.EditCommand>,kotlin.Unit> onEditCommand, kotlin.jvm.functions.Function1<? super androidx.compose.ui.text.input.ImeAction,kotlin.Unit> onImeActionPerformed);
+ method public void stopInput();
+ method public void updateState(androidx.compose.ui.text.input.TextFieldValue? oldValue, androidx.compose.ui.text.input.TextFieldValue newValue);
+ }
+
+ public final class SetComposingRegionCommand implements androidx.compose.ui.text.input.EditCommand {
+ ctor public SetComposingRegionCommand(int start, int end);
+ method public void applyTo(androidx.compose.ui.text.input.EditingBuffer buffer);
+ method public int getEnd();
+ method public int getStart();
+ property public final int end;
+ property public final int start;
+ }
+
+ public final class SetComposingTextCommand implements androidx.compose.ui.text.input.EditCommand {
+ ctor public SetComposingTextCommand(androidx.compose.ui.text.AnnotatedString annotatedString, int newCursorPosition);
+ ctor public SetComposingTextCommand(String text, int newCursorPosition);
+ method public void applyTo(androidx.compose.ui.text.input.EditingBuffer buffer);
+ method public androidx.compose.ui.text.AnnotatedString getAnnotatedString();
+ method public int getNewCursorPosition();
+ method public String getText();
+ property public final androidx.compose.ui.text.AnnotatedString annotatedString;
+ property public final int newCursorPosition;
+ property public final String text;
+ }
+
+ public final class SetSelectionCommand implements androidx.compose.ui.text.input.EditCommand {
+ ctor public SetSelectionCommand(int start, int end);
+ method public void applyTo(androidx.compose.ui.text.input.EditingBuffer buffer);
+ method public int getEnd();
+ method public int getStart();
+ property public final int end;
+ property public final int start;
+ }
+
+ @androidx.compose.runtime.Immutable public final class TextFieldValue {
+ ctor public TextFieldValue(androidx.compose.ui.text.AnnotatedString annotatedString, optional long selection, optional androidx.compose.ui.text.TextRange? composition);
+ ctor public TextFieldValue(optional String text, optional long selection, optional androidx.compose.ui.text.TextRange? composition);
+ method public androidx.compose.ui.text.input.TextFieldValue copy(optional androidx.compose.ui.text.AnnotatedString annotatedString, optional long selection, optional androidx.compose.ui.text.TextRange? composition);
+ method public androidx.compose.ui.text.input.TextFieldValue copy(String text, optional long selection, optional androidx.compose.ui.text.TextRange? composition);
+ method public androidx.compose.ui.text.AnnotatedString getAnnotatedString();
+ method public androidx.compose.ui.text.TextRange? getComposition();
+ method public long getSelection();
+ method public String getText();
+ property public final androidx.compose.ui.text.AnnotatedString annotatedString;
+ property public final androidx.compose.ui.text.TextRange? composition;
+ property public final long selection;
+ property public final String text;
+ field public static final androidx.compose.ui.text.input.TextFieldValue.Companion Companion;
+ }
+
+ public static final class TextFieldValue.Companion {
+ method public androidx.compose.runtime.saveable.Saver<androidx.compose.ui.text.input.TextFieldValue,java.lang.Object> getSaver();
+ property public final androidx.compose.runtime.saveable.Saver<androidx.compose.ui.text.input.TextFieldValue,java.lang.Object> Saver;
+ }
+
+ public final class TextFieldValueKt {
+ method public static androidx.compose.ui.text.AnnotatedString getSelectedText(androidx.compose.ui.text.input.TextFieldValue);
+ method public static androidx.compose.ui.text.AnnotatedString getTextAfterSelection(androidx.compose.ui.text.input.TextFieldValue, int maxChars);
+ method public static androidx.compose.ui.text.AnnotatedString getTextBeforeSelection(androidx.compose.ui.text.input.TextFieldValue, int maxChars);
+ }
+
+ public class TextInputService {
+ ctor public TextInputService(androidx.compose.ui.text.input.PlatformTextInputService platformTextInputService);
+ method public final void hideSoftwareKeyboard();
+ method public final void showSoftwareKeyboard();
+ method public androidx.compose.ui.text.input.TextInputSession startInput(androidx.compose.ui.text.input.TextFieldValue value, androidx.compose.ui.text.input.ImeOptions imeOptions, kotlin.jvm.functions.Function1<? super java.util.List<? extends androidx.compose.ui.text.input.EditCommand>,kotlin.Unit> onEditCommand, kotlin.jvm.functions.Function1<? super androidx.compose.ui.text.input.ImeAction,kotlin.Unit> onImeActionPerformed);
+ method public void stopInput(androidx.compose.ui.text.input.TextInputSession session);
+ }
+
+ public final class TextInputSession {
+ ctor public TextInputSession(androidx.compose.ui.text.input.TextInputService textInputService, androidx.compose.ui.text.input.PlatformTextInputService platformTextInputService);
+ method public void dispose();
+ method public boolean hideSoftwareKeyboard();
+ method public boolean isOpen();
+ method @Deprecated public boolean notifyFocusedRect(androidx.compose.ui.geometry.Rect rect);
+ method public boolean showSoftwareKeyboard();
+ method public boolean updateState(androidx.compose.ui.text.input.TextFieldValue? oldValue, androidx.compose.ui.text.input.TextFieldValue newValue);
+ property public final boolean isOpen;
+ }
+
+ public final class TransformedText {
+ ctor public TransformedText(androidx.compose.ui.text.AnnotatedString text, androidx.compose.ui.text.input.OffsetMapping offsetMapping);
+ method public androidx.compose.ui.text.input.OffsetMapping getOffsetMapping();
+ method public androidx.compose.ui.text.AnnotatedString getText();
+ property public final androidx.compose.ui.text.input.OffsetMapping offsetMapping;
+ property public final androidx.compose.ui.text.AnnotatedString text;
+ }
+
+ @androidx.compose.runtime.Immutable public fun interface VisualTransformation {
+ method public androidx.compose.ui.text.input.TransformedText filter(androidx.compose.ui.text.AnnotatedString text);
+ field public static final androidx.compose.ui.text.input.VisualTransformation.Companion Companion;
+ }
+
+ public static final class VisualTransformation.Companion {
+ method public androidx.compose.ui.text.input.VisualTransformation getNone();
+ property public final androidx.compose.ui.text.input.VisualTransformation None;
+ }
+
+}
+
+package androidx.compose.ui.text.intl {
+
+ public final class AndroidPlatformLocale_androidKt {
+ }
+
+ @androidx.compose.runtime.Immutable public final class Locale {
+ ctor public Locale(String languageTag);
+ method public String getLanguage();
+ method public String getRegion();
+ method public String getScript();
+ method public String toLanguageTag();
+ property public final String language;
+ property public final String region;
+ property public final String script;
+ field public static final androidx.compose.ui.text.intl.Locale.Companion Companion;
+ }
+
+ public static final class Locale.Companion {
+ method public androidx.compose.ui.text.intl.Locale getCurrent();
+ property public final androidx.compose.ui.text.intl.Locale current;
+ }
+
+ @androidx.compose.runtime.Immutable public final class LocaleList implements java.util.Collection<androidx.compose.ui.text.intl.Locale> kotlin.jvm.internal.markers.KMappedMarker {
+ ctor public LocaleList(java.util.List<androidx.compose.ui.text.intl.Locale> localeList);
+ ctor public LocaleList(String languageTags);
+ ctor public LocaleList(androidx.compose.ui.text.intl.Locale... locales);
+ method public operator boolean contains(androidx.compose.ui.text.intl.Locale element);
+ method public boolean containsAll(java.util.Collection<E!> elements);
+ method public operator androidx.compose.ui.text.intl.Locale get(int i);
+ method public java.util.List<androidx.compose.ui.text.intl.Locale> getLocaleList();
+ method public int getSize();
+ method public boolean isEmpty();
+ method public java.util.Iterator<androidx.compose.ui.text.intl.Locale> iterator();
+ property public final java.util.List<androidx.compose.ui.text.intl.Locale> localeList;
+ property public int size;
+ field public static final androidx.compose.ui.text.intl.LocaleList.Companion Companion;
+ }
+
+ public static final class LocaleList.Companion {
+ method public androidx.compose.ui.text.intl.LocaleList getCurrent();
+ property public final androidx.compose.ui.text.intl.LocaleList current;
+ }
+
+ public final class PlatformLocaleKt {
+ }
+
+}
+
+package androidx.compose.ui.text.platform {
+
+ public final class AndroidAccessibilitySpannableString_androidKt {
+ }
+
+ public final class AndroidParagraphHelper_androidKt {
+ }
+
+ public final class AndroidParagraphIntrinsics_androidKt {
+ }
+
+ public final class AndroidParagraph_androidKt {
+ }
+
+ public final class AndroidStringDelegate_androidKt {
+ }
+
+ public final class Synchronization_jvmKt {
+ }
+
+}
+
+package androidx.compose.ui.text.platform.extensions {
+
+ public final class LocaleExtensions_androidKt {
+ }
+
+ public final class PlaceholderExtensions_androidKt {
+ }
+
+ public final class SpannableExtensions_androidKt {
+ }
+
+ public final class TextPaintExtensions_androidKt {
+ }
+
+ public final class TtsAnnotationExtensions_androidKt {
+ method public static android.text.style.TtsSpan toSpan(androidx.compose.ui.text.TtsAnnotation);
+ method public static android.text.style.TtsSpan toSpan(androidx.compose.ui.text.VerbatimTtsAnnotation);
+ }
+
+}
+
+package androidx.compose.ui.text.style {
+
+ @androidx.compose.runtime.Immutable @kotlin.jvm.JvmInline public final value class BaselineShift {
+ ctor public BaselineShift(float multiplier);
+ method public float getMultiplier();
+ property public final float multiplier;
+ field public static final androidx.compose.ui.text.style.BaselineShift.Companion Companion;
+ }
+
+ public static final class BaselineShift.Companion {
+ method public float getNone();
+ 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 @androidx.compose.runtime.Stable public static float lerp(float start, float stop, float fraction);
+ }
+
+ public enum ResolvedTextDirection {
+ enum_constant public static final androidx.compose.ui.text.style.ResolvedTextDirection Ltr;
+ enum_constant public static final androidx.compose.ui.text.style.ResolvedTextDirection Rtl;
+ }
+
+ @kotlin.jvm.JvmInline public final value class TextAlign {
+ field public static final androidx.compose.ui.text.style.TextAlign.Companion Companion;
+ }
+
+ public static final class TextAlign.Companion {
+ method public int getCenter();
+ method public int getEnd();
+ method public int getJustify();
+ method public int getLeft();
+ method public int getRight();
+ method public int getStart();
+ method public java.util.List<androidx.compose.ui.text.style.TextAlign> values();
+ property public final int Center;
+ property public final int End;
+ property public final int Justify;
+ property public final int Left;
+ property public final int Right;
+ property public final int Start;
+ }
+
+ @androidx.compose.runtime.Immutable public final class TextDecoration {
+ method public operator boolean contains(androidx.compose.ui.text.style.TextDecoration other);
+ method public operator boolean equals(Object? other);
+ method public int getMask();
+ method public operator androidx.compose.ui.text.style.TextDecoration plus(androidx.compose.ui.text.style.TextDecoration decoration);
+ property public final int mask;
+ field public static final androidx.compose.ui.text.style.TextDecoration.Companion Companion;
+ }
+
+ public static final class TextDecoration.Companion {
+ method public androidx.compose.ui.text.style.TextDecoration combine(java.util.List<androidx.compose.ui.text.style.TextDecoration> decorations);
+ method public androidx.compose.ui.text.style.TextDecoration getLineThrough();
+ method public androidx.compose.ui.text.style.TextDecoration getNone();
+ method public androidx.compose.ui.text.style.TextDecoration getUnderline();
+ property public final androidx.compose.ui.text.style.TextDecoration LineThrough;
+ property public final androidx.compose.ui.text.style.TextDecoration None;
+ property public final androidx.compose.ui.text.style.TextDecoration Underline;
+ }
+
+ @kotlin.jvm.JvmInline public final value class TextDirection {
+ field public static final androidx.compose.ui.text.style.TextDirection.Companion Companion;
+ }
+
+ public static final class TextDirection.Companion {
+ method public int getContent();
+ method public int getContentOrLtr();
+ method public int getContentOrRtl();
+ method public int getLtr();
+ method public int getRtl();
+ property public final int Content;
+ property public final int ContentOrLtr;
+ property public final int ContentOrRtl;
+ property public final int Ltr;
+ property public final int Rtl;
+ }
+
+ public final class TextDrawStyleKt {
+ }
+
+ @androidx.compose.runtime.Immutable public final class TextGeometricTransform {
+ ctor public TextGeometricTransform(optional float scaleX, optional float skewX);
+ method public androidx.compose.ui.text.style.TextGeometricTransform copy(optional float scaleX, optional float skewX);
+ method public operator boolean equals(Object? other);
+ method public float getScaleX();
+ method public float getSkewX();
+ property public final float scaleX;
+ property public final float skewX;
+ field public static final androidx.compose.ui.text.style.TextGeometricTransform.Companion Companion;
+ }
+
+ public static final class TextGeometricTransform.Companion {
+ }
+
+ public final class TextGeometricTransformKt {
+ method public static androidx.compose.ui.text.style.TextGeometricTransform lerp(androidx.compose.ui.text.style.TextGeometricTransform start, androidx.compose.ui.text.style.TextGeometricTransform stop, float fraction);
+ }
+
+ @androidx.compose.runtime.Immutable public final class TextIndent {
+ ctor public TextIndent(optional long firstLine, optional long restLine);
+ method public androidx.compose.ui.text.style.TextIndent copy(optional long firstLine, optional long restLine);
+ method public operator boolean equals(Object? other);
+ method public long getFirstLine();
+ method public long getRestLine();
+ property public final long firstLine;
+ property public final long restLine;
+ field public static final androidx.compose.ui.text.style.TextIndent.Companion Companion;
+ }
+
+ public static final class TextIndent.Companion {
+ method public androidx.compose.ui.text.style.TextIndent getNone();
+ property public final androidx.compose.ui.text.style.TextIndent None;
+ }
+
+ public final class TextIndentKt {
+ method public static androidx.compose.ui.text.style.TextIndent lerp(androidx.compose.ui.text.style.TextIndent start, androidx.compose.ui.text.style.TextIndent stop, float fraction);
+ }
+
+ @kotlin.jvm.JvmInline public final value class TextOverflow {
+ field public static final androidx.compose.ui.text.style.TextOverflow.Companion Companion;
+ }
+
+ public static final class TextOverflow.Companion {
+ method public int getClip();
+ method public int getEllipsis();
+ method public int getVisible();
+ property public final int Clip;
+ property public final int Ellipsis;
+ property public final int Visible;
+ }
+
+}
+
diff --git a/compose/ui/ui-text/api/public_plus_experimental_1.2.0-beta02.txt b/compose/ui/ui-text/api/public_plus_experimental_1.2.0-beta02.txt
new file mode 100644
index 0000000..25beabf
--- /dev/null
+++ b/compose/ui/ui-text/api/public_plus_experimental_1.2.0-beta02.txt
@@ -0,0 +1,1453 @@
+// Signature format: 4.0
+package androidx.compose.ui.text {
+
+ public final class ActualAtomicReferenceJvmKt {
+ }
+
+ public final class AndroidTextStyle_androidKt {
+ method @androidx.compose.ui.text.ExperimentalTextApi public static androidx.compose.ui.text.PlatformParagraphStyle lerp(androidx.compose.ui.text.PlatformParagraphStyle start, androidx.compose.ui.text.PlatformParagraphStyle stop, float fraction);
+ method @androidx.compose.ui.text.ExperimentalTextApi public static androidx.compose.ui.text.PlatformSpanStyle lerp(androidx.compose.ui.text.PlatformSpanStyle start, androidx.compose.ui.text.PlatformSpanStyle stop, float fraction);
+ }
+
+ @androidx.compose.runtime.Immutable public final class AnnotatedString implements java.lang.CharSequence {
+ ctor public AnnotatedString(String text, optional java.util.List<androidx.compose.ui.text.AnnotatedString.Range<androidx.compose.ui.text.SpanStyle>> spanStyles, optional java.util.List<androidx.compose.ui.text.AnnotatedString.Range<androidx.compose.ui.text.ParagraphStyle>> paragraphStyles);
+ method public operator char get(int index);
+ method public int getLength();
+ method public java.util.List<androidx.compose.ui.text.AnnotatedString.Range<androidx.compose.ui.text.ParagraphStyle>> getParagraphStyles();
+ method public java.util.List<androidx.compose.ui.text.AnnotatedString.Range<androidx.compose.ui.text.SpanStyle>> getSpanStyles();
+ method public java.util.List<androidx.compose.ui.text.AnnotatedString.Range<java.lang.String>> getStringAnnotations(String tag, int start, int end);
+ method public java.util.List<androidx.compose.ui.text.AnnotatedString.Range<java.lang.String>> getStringAnnotations(int start, int end);
+ method public String getText();
+ method public java.util.List<androidx.compose.ui.text.AnnotatedString.Range<androidx.compose.ui.text.TtsAnnotation>> getTtsAnnotations(int start, int end);
+ method @androidx.compose.runtime.Stable public operator androidx.compose.ui.text.AnnotatedString plus(androidx.compose.ui.text.AnnotatedString other);
+ method public androidx.compose.ui.text.AnnotatedString subSequence(int startIndex, int endIndex);
+ method public androidx.compose.ui.text.AnnotatedString subSequence(long range);
+ property public int length;
+ property public final java.util.List<androidx.compose.ui.text.AnnotatedString.Range<androidx.compose.ui.text.ParagraphStyle>> paragraphStyles;
+ property public final java.util.List<androidx.compose.ui.text.AnnotatedString.Range<androidx.compose.ui.text.SpanStyle>> spanStyles;
+ property public final String text;
+ }
+
+ public static final class AnnotatedString.Builder {
+ ctor public AnnotatedString.Builder(optional int capacity);
+ ctor public AnnotatedString.Builder(String text);
+ ctor public AnnotatedString.Builder(androidx.compose.ui.text.AnnotatedString text);
+ method public void addStringAnnotation(String tag, String annotation, int start, int end);
+ method public void addStyle(androidx.compose.ui.text.SpanStyle style, int start, int end);
+ method public void addStyle(androidx.compose.ui.text.ParagraphStyle style, int start, int end);
+ method @androidx.compose.ui.text.ExperimentalTextApi public void addTtsAnnotation(androidx.compose.ui.text.TtsAnnotation ttsAnnotation, int start, int end);
+ method public void append(String text);
+ method public void append(char char);
+ method public void append(androidx.compose.ui.text.AnnotatedString text);
+ method public int getLength();
+ method public void pop();
+ method public void pop(int index);
+ method public int pushStringAnnotation(String tag, String annotation);
+ method public int pushStyle(androidx.compose.ui.text.SpanStyle style);
+ method public int pushStyle(androidx.compose.ui.text.ParagraphStyle style);
+ method public int pushTtsAnnotation(androidx.compose.ui.text.TtsAnnotation ttsAnnotation);
+ method public androidx.compose.ui.text.AnnotatedString toAnnotatedString();
+ property public final int length;
+ }
+
+ @androidx.compose.runtime.Immutable public static final class AnnotatedString.Range<T> {
+ ctor public AnnotatedString.Range(T? item, int start, int end, String tag);
+ ctor public AnnotatedString.Range(T? item, int start, int end);
+ method public T! component1();
+ method public int component2();
+ method public int component3();
+ method public String component4();
+ method public androidx.compose.ui.text.AnnotatedString.Range<T> copy(T! item, int start, int end, String tag);
+ method public int getEnd();
+ method public T! getItem();
+ method public int getStart();
+ method public String getTag();
+ property public final int end;
+ property public final T! item;
+ property public final int start;
+ property public final String tag;
+ }
+
+ public final class AnnotatedStringKt {
+ method public static androidx.compose.ui.text.AnnotatedString AnnotatedString(String text, androidx.compose.ui.text.SpanStyle spanStyle, optional androidx.compose.ui.text.ParagraphStyle? paragraphStyle);
+ method public static androidx.compose.ui.text.AnnotatedString AnnotatedString(String text, androidx.compose.ui.text.ParagraphStyle paragraphStyle);
+ method public static inline androidx.compose.ui.text.AnnotatedString buildAnnotatedString(kotlin.jvm.functions.Function1<? super androidx.compose.ui.text.AnnotatedString.Builder,kotlin.Unit> builder);
+ method public static androidx.compose.ui.text.AnnotatedString capitalize(androidx.compose.ui.text.AnnotatedString, optional androidx.compose.ui.text.intl.LocaleList localeList);
+ method public static androidx.compose.ui.text.AnnotatedString decapitalize(androidx.compose.ui.text.AnnotatedString, optional androidx.compose.ui.text.intl.LocaleList localeList);
+ method public static androidx.compose.ui.text.AnnotatedString toLowerCase(androidx.compose.ui.text.AnnotatedString, optional androidx.compose.ui.text.intl.LocaleList localeList);
+ method public static androidx.compose.ui.text.AnnotatedString toUpperCase(androidx.compose.ui.text.AnnotatedString, optional androidx.compose.ui.text.intl.LocaleList localeList);
+ method @androidx.compose.ui.text.ExperimentalTextApi public static inline <R> R withAnnotation(androidx.compose.ui.text.AnnotatedString.Builder, String tag, String annotation, kotlin.jvm.functions.Function1<? super androidx.compose.ui.text.AnnotatedString.Builder,? extends R> block);
+ method @androidx.compose.ui.text.ExperimentalTextApi public static inline <R> R withAnnotation(androidx.compose.ui.text.AnnotatedString.Builder, androidx.compose.ui.text.TtsAnnotation ttsAnnotation, kotlin.jvm.functions.Function1<? super androidx.compose.ui.text.AnnotatedString.Builder,? extends R> block);
+ method public static inline <R> R withStyle(androidx.compose.ui.text.AnnotatedString.Builder, androidx.compose.ui.text.SpanStyle style, kotlin.jvm.functions.Function1<? super androidx.compose.ui.text.AnnotatedString.Builder,? extends R> block);
+ method public static inline <R> R withStyle(androidx.compose.ui.text.AnnotatedString.Builder, androidx.compose.ui.text.ParagraphStyle style, kotlin.jvm.functions.Function1<? super androidx.compose.ui.text.AnnotatedString.Builder,? extends R> block);
+ }
+
+ @kotlin.RequiresOptIn(message="This API is experimental and is likely to change in the future.") public @interface ExperimentalTextApi {
+ }
+
+ @kotlin.RequiresOptIn(level=kotlin.RequiresOptIn.Level.ERROR, message="This is internal API that may change frequently and without warning.") @kotlin.annotation.Target(allowedTargets={kotlin.annotation.AnnotationTarget.CLASS, kotlin.annotation.AnnotationTarget.FUNCTION, kotlin.annotation.AnnotationTarget.PROPERTY}) public @interface InternalTextApi {
+ }
+
+ public final class JvmAnnotatedString_jvmKt {
+ }
+
+ public final class JvmCharHelpers_androidKt {
+ }
+
+ public final class MultiParagraph {
+ ctor public MultiParagraph(androidx.compose.ui.text.MultiParagraphIntrinsics intrinsics, long constraints, optional int maxLines, optional boolean ellipsis);
+ ctor @Deprecated public MultiParagraph(androidx.compose.ui.text.MultiParagraphIntrinsics intrinsics, optional int maxLines, optional boolean ellipsis, float width);
+ ctor @Deprecated public MultiParagraph(androidx.compose.ui.text.AnnotatedString annotatedString, androidx.compose.ui.text.TextStyle style, optional java.util.List<androidx.compose.ui.text.AnnotatedString.Range<androidx.compose.ui.text.Placeholder>> placeholders, optional int maxLines, optional boolean ellipsis, float width, androidx.compose.ui.unit.Density density, androidx.compose.ui.text.font.Font.ResourceLoader resourceLoader);
+ ctor @Deprecated public MultiParagraph(androidx.compose.ui.text.AnnotatedString annotatedString, androidx.compose.ui.text.TextStyle style, float width, androidx.compose.ui.unit.Density density, androidx.compose.ui.text.font.FontFamily.Resolver fontFamilyResolver, optional java.util.List<androidx.compose.ui.text.AnnotatedString.Range<androidx.compose.ui.text.Placeholder>> placeholders, optional int maxLines, optional boolean ellipsis);
+ ctor public MultiParagraph(androidx.compose.ui.text.AnnotatedString annotatedString, androidx.compose.ui.text.TextStyle style, long constraints, androidx.compose.ui.unit.Density density, androidx.compose.ui.text.font.FontFamily.Resolver fontFamilyResolver, optional java.util.List<androidx.compose.ui.text.AnnotatedString.Range<androidx.compose.ui.text.Placeholder>> placeholders, optional int maxLines, optional boolean ellipsis);
+ method public androidx.compose.ui.text.style.ResolvedTextDirection getBidiRunDirection(int offset);
+ method public androidx.compose.ui.geometry.Rect getBoundingBox(int offset);
+ method public androidx.compose.ui.geometry.Rect getCursorRect(int offset);
+ method public boolean getDidExceedMaxLines();
+ method public float getFirstBaseline();
+ method public float getHeight();
+ method public float getHorizontalPosition(int offset, boolean usePrimaryDirection);
+ method public androidx.compose.ui.text.MultiParagraphIntrinsics getIntrinsics();
+ method public float getLastBaseline();
+ method public float getLineBottom(int lineIndex);
+ method public int getLineCount();
+ method public int getLineEnd(int lineIndex, optional boolean visibleEnd);
+ method public int getLineForOffset(int offset);
+ method public int getLineForVerticalPosition(float vertical);
+ method public float getLineHeight(int lineIndex);
+ method public float getLineLeft(int lineIndex);
+ method public float getLineRight(int lineIndex);
+ method public int getLineStart(int lineIndex);
+ method public float getLineTop(int lineIndex);
+ method public float getLineWidth(int lineIndex);
+ method public float getMaxIntrinsicWidth();
+ method public int getMaxLines();
+ method public float getMinIntrinsicWidth();
+ method public int getOffsetForPosition(long position);
+ method public androidx.compose.ui.text.style.ResolvedTextDirection getParagraphDirection(int offset);
+ method public androidx.compose.ui.graphics.Path getPathForRange(int start, int end);
+ method public java.util.List<androidx.compose.ui.geometry.Rect> getPlaceholderRects();
+ method public float getWidth();
+ method public long getWordBoundary(int offset);
+ method public boolean isLineEllipsized(int lineIndex);
+ method public void paint(androidx.compose.ui.graphics.Canvas canvas, optional long color, optional androidx.compose.ui.graphics.Shadow? shadow, optional androidx.compose.ui.text.style.TextDecoration? decoration);
+ method @androidx.compose.ui.text.ExperimentalTextApi public void paint(androidx.compose.ui.graphics.Canvas canvas, androidx.compose.ui.graphics.Brush brush, optional androidx.compose.ui.graphics.Shadow? shadow, optional androidx.compose.ui.text.style.TextDecoration? decoration);
+ property public final boolean didExceedMaxLines;
+ property public final float firstBaseline;
+ property public final float height;
+ property public final androidx.compose.ui.text.MultiParagraphIntrinsics intrinsics;
+ property public final float lastBaseline;
+ property public final int lineCount;
+ property public final float maxIntrinsicWidth;
+ property public final int maxLines;
+ property public final float minIntrinsicWidth;
+ property public final java.util.List<androidx.compose.ui.geometry.Rect> placeholderRects;
+ property public final float width;
+ }
+
+ public final class MultiParagraphIntrinsics implements androidx.compose.ui.text.ParagraphIntrinsics {
+ ctor public MultiParagraphIntrinsics(androidx.compose.ui.text.AnnotatedString annotatedString, androidx.compose.ui.text.TextStyle style, java.util.List<androidx.compose.ui.text.AnnotatedString.Range<androidx.compose.ui.text.Placeholder>> placeholders, androidx.compose.ui.unit.Density density, androidx.compose.ui.text.font.FontFamily.Resolver fontFamilyResolver);
+ ctor @Deprecated public MultiParagraphIntrinsics(androidx.compose.ui.text.AnnotatedString annotatedString, androidx.compose.ui.text.TextStyle style, java.util.List<androidx.compose.ui.text.AnnotatedString.Range<androidx.compose.ui.text.Placeholder>> placeholders, androidx.compose.ui.unit.Density density, androidx.compose.ui.text.font.Font.ResourceLoader resourceLoader);
+ method public androidx.compose.ui.text.AnnotatedString getAnnotatedString();
+ method public float getMaxIntrinsicWidth();
+ method public float getMinIntrinsicWidth();
+ method public java.util.List<androidx.compose.ui.text.AnnotatedString.Range<androidx.compose.ui.text.Placeholder>> getPlaceholders();
+ property public final androidx.compose.ui.text.AnnotatedString annotatedString;
+ property public boolean hasStaleResolvedFonts;
+ property public float maxIntrinsicWidth;
+ property public float minIntrinsicWidth;
+ property public final java.util.List<androidx.compose.ui.text.AnnotatedString.Range<androidx.compose.ui.text.Placeholder>> placeholders;
+ }
+
+ public final class MultiParagraphIntrinsicsKt {
+ }
+
+ public final class MultiParagraphKt {
+ }
+
+ public interface Paragraph {
+ method public androidx.compose.ui.text.style.ResolvedTextDirection getBidiRunDirection(int offset);
+ method public androidx.compose.ui.geometry.Rect getBoundingBox(int offset);
+ method public androidx.compose.ui.geometry.Rect getCursorRect(int offset);
+ method public boolean getDidExceedMaxLines();
+ method public float getFirstBaseline();
+ method public float getHeight();
+ method public float getHorizontalPosition(int offset, boolean usePrimaryDirection);
+ method public float getLastBaseline();
+ method public float getLineBottom(int lineIndex);
+ method public int getLineCount();
+ method public int getLineEnd(int lineIndex, optional boolean visibleEnd);
+ method public int getLineForOffset(int offset);
+ method public int getLineForVerticalPosition(float vertical);
+ method public float getLineHeight(int lineIndex);
+ method public float getLineLeft(int lineIndex);
+ method public float getLineRight(int lineIndex);
+ method public int getLineStart(int lineIndex);
+ method public float getLineTop(int lineIndex);
+ method public float getLineWidth(int lineIndex);
+ method public float getMaxIntrinsicWidth();
+ method public float getMinIntrinsicWidth();
+ method public int getOffsetForPosition(long position);
+ method public androidx.compose.ui.text.style.ResolvedTextDirection getParagraphDirection(int offset);
+ method public androidx.compose.ui.graphics.Path getPathForRange(int start, int end);
+ method public java.util.List<androidx.compose.ui.geometry.Rect> getPlaceholderRects();
+ method public float getWidth();
+ method public long getWordBoundary(int offset);
+ method public boolean isLineEllipsized(int lineIndex);
+ method public void paint(androidx.compose.ui.graphics.Canvas canvas, optional long color, optional androidx.compose.ui.graphics.Shadow? shadow, optional androidx.compose.ui.text.style.TextDecoration? textDecoration);
+ method @androidx.compose.ui.text.ExperimentalTextApi public default void paint(androidx.compose.ui.graphics.Canvas canvas, androidx.compose.ui.graphics.Brush brush, optional androidx.compose.ui.graphics.Shadow? shadow, optional androidx.compose.ui.text.style.TextDecoration? textDecoration);
+ property public abstract boolean didExceedMaxLines;
+ property public abstract float firstBaseline;
+ property public abstract float height;
+ property public abstract float lastBaseline;
+ property public abstract int lineCount;
+ property public abstract float maxIntrinsicWidth;
+ property public abstract float minIntrinsicWidth;
+ property public abstract java.util.List<androidx.compose.ui.geometry.Rect> placeholderRects;
+ property public abstract float width;
+ }
+
+ public interface ParagraphIntrinsics {
+ method public default boolean getHasStaleResolvedFonts();
+ method public float getMaxIntrinsicWidth();
+ method public float getMinIntrinsicWidth();
+ property public default boolean hasStaleResolvedFonts;
+ property public abstract float maxIntrinsicWidth;
+ property public abstract float minIntrinsicWidth;
+ }
+
+ public final class ParagraphIntrinsicsKt {
+ method @Deprecated public static androidx.compose.ui.text.ParagraphIntrinsics ParagraphIntrinsics(String text, androidx.compose.ui.text.TextStyle style, optional java.util.List<androidx.compose.ui.text.AnnotatedString.Range<androidx.compose.ui.text.SpanStyle>> spanStyles, optional java.util.List<androidx.compose.ui.text.AnnotatedString.Range<androidx.compose.ui.text.Placeholder>> placeholders, androidx.compose.ui.unit.Density density, androidx.compose.ui.text.font.Font.ResourceLoader resourceLoader);
+ method public static androidx.compose.ui.text.ParagraphIntrinsics ParagraphIntrinsics(String text, androidx.compose.ui.text.TextStyle style, optional java.util.List<androidx.compose.ui.text.AnnotatedString.Range<androidx.compose.ui.text.SpanStyle>> spanStyles, optional java.util.List<androidx.compose.ui.text.AnnotatedString.Range<androidx.compose.ui.text.Placeholder>> placeholders, androidx.compose.ui.unit.Density density, androidx.compose.ui.text.font.FontFamily.Resolver fontFamilyResolver);
+ }
+
+ public final class ParagraphKt {
+ method @Deprecated public static androidx.compose.ui.text.Paragraph Paragraph(String text, androidx.compose.ui.text.TextStyle style, optional java.util.List<androidx.compose.ui.text.AnnotatedString.Range<androidx.compose.ui.text.SpanStyle>> spanStyles, optional java.util.List<androidx.compose.ui.text.AnnotatedString.Range<androidx.compose.ui.text.Placeholder>> placeholders, optional int maxLines, optional boolean ellipsis, float width, androidx.compose.ui.unit.Density density, androidx.compose.ui.text.font.Font.ResourceLoader resourceLoader);
+ method @Deprecated public static androidx.compose.ui.text.Paragraph Paragraph(String text, androidx.compose.ui.text.TextStyle style, float width, androidx.compose.ui.unit.Density density, androidx.compose.ui.text.font.FontFamily.Resolver fontFamilyResolver, optional java.util.List<androidx.compose.ui.text.AnnotatedString.Range<androidx.compose.ui.text.SpanStyle>> spanStyles, optional java.util.List<androidx.compose.ui.text.AnnotatedString.Range<androidx.compose.ui.text.Placeholder>> placeholders, optional int maxLines, optional boolean ellipsis);
+ method public static androidx.compose.ui.text.Paragraph Paragraph(String text, androidx.compose.ui.text.TextStyle style, long constraints, androidx.compose.ui.unit.Density density, androidx.compose.ui.text.font.FontFamily.Resolver fontFamilyResolver, optional java.util.List<androidx.compose.ui.text.AnnotatedString.Range<androidx.compose.ui.text.SpanStyle>> spanStyles, optional java.util.List<androidx.compose.ui.text.AnnotatedString.Range<androidx.compose.ui.text.Placeholder>> placeholders, optional int maxLines, optional boolean ellipsis);
+ method @Deprecated public static androidx.compose.ui.text.Paragraph Paragraph(androidx.compose.ui.text.ParagraphIntrinsics paragraphIntrinsics, optional int maxLines, optional boolean ellipsis, float width);
+ method public static androidx.compose.ui.text.Paragraph Paragraph(androidx.compose.ui.text.ParagraphIntrinsics paragraphIntrinsics, long constraints, optional int maxLines, optional boolean ellipsis);
+ }
+
+ @androidx.compose.runtime.Immutable public final class ParagraphStyle {
+ ctor @androidx.compose.ui.text.ExperimentalTextApi public ParagraphStyle(optional androidx.compose.ui.text.style.TextAlign? textAlign, optional androidx.compose.ui.text.style.TextDirection? textDirection, optional long lineHeight, optional androidx.compose.ui.text.style.TextIndent? textIndent, optional androidx.compose.ui.text.PlatformParagraphStyle? platformStyle, optional androidx.compose.ui.text.style.LineHeightStyle? lineHeightStyle);
+ ctor public ParagraphStyle(optional androidx.compose.ui.text.style.TextAlign? textAlign, optional androidx.compose.ui.text.style.TextDirection? textDirection, optional long lineHeight, optional androidx.compose.ui.text.style.TextIndent? textIndent);
+ method public androidx.compose.ui.text.ParagraphStyle copy(optional androidx.compose.ui.text.style.TextAlign? textAlign, optional androidx.compose.ui.text.style.TextDirection? textDirection, optional long lineHeight, optional androidx.compose.ui.text.style.TextIndent? textIndent);
+ method @androidx.compose.ui.text.ExperimentalTextApi public androidx.compose.ui.text.ParagraphStyle copy(optional androidx.compose.ui.text.style.TextAlign? textAlign, optional androidx.compose.ui.text.style.TextDirection? textDirection, optional long lineHeight, optional androidx.compose.ui.text.style.TextIndent? textIndent, optional androidx.compose.ui.text.PlatformParagraphStyle? platformStyle, optional androidx.compose.ui.text.style.LineHeightStyle? lineHeightStyle);
+ method public operator boolean equals(Object? other);
+ method public long getLineHeight();
+ method @androidx.compose.ui.text.ExperimentalTextApi public androidx.compose.ui.text.style.LineHeightStyle? getLineHeightStyle();
+ method @androidx.compose.ui.text.ExperimentalTextApi public androidx.compose.ui.text.PlatformParagraphStyle? getPlatformStyle();
+ method public androidx.compose.ui.text.style.TextAlign? getTextAlign();
+ method public androidx.compose.ui.text.style.TextDirection? getTextDirection();
+ method public androidx.compose.ui.text.style.TextIndent? getTextIndent();
+ method @androidx.compose.runtime.Stable public androidx.compose.ui.text.ParagraphStyle merge(optional androidx.compose.ui.text.ParagraphStyle? other);
+ method @androidx.compose.runtime.Stable public operator androidx.compose.ui.text.ParagraphStyle plus(androidx.compose.ui.text.ParagraphStyle other);
+ property public final long lineHeight;
+ property @androidx.compose.ui.text.ExperimentalTextApi public final androidx.compose.ui.text.style.LineHeightStyle? lineHeightStyle;
+ property @androidx.compose.ui.text.ExperimentalTextApi public final androidx.compose.ui.text.PlatformParagraphStyle? platformStyle;
+ property public final androidx.compose.ui.text.style.TextAlign? textAlign;
+ property public final androidx.compose.ui.text.style.TextDirection? textDirection;
+ property public final androidx.compose.ui.text.style.TextIndent? textIndent;
+ }
+
+ public final class ParagraphStyleKt {
+ method @androidx.compose.runtime.Stable public static androidx.compose.ui.text.ParagraphStyle lerp(androidx.compose.ui.text.ParagraphStyle start, androidx.compose.ui.text.ParagraphStyle stop, float fraction);
+ }
+
+ @androidx.compose.runtime.Immutable public final class Placeholder {
+ ctor public Placeholder(long width, long height, int placeholderVerticalAlign);
+ method public androidx.compose.ui.text.Placeholder copy(optional long width, optional long height, optional int placeholderVerticalAlign);
+ method public operator boolean equals(Object? other);
+ method public long getHeight();
+ method public int getPlaceholderVerticalAlign();
+ method public long getWidth();
+ property public final long height;
+ property public final int placeholderVerticalAlign;
+ property public final long width;
+ }
+
+ @kotlin.jvm.JvmInline public final value class PlaceholderVerticalAlign {
+ field public static final androidx.compose.ui.text.PlaceholderVerticalAlign.Companion Companion;
+ }
+
+ public static final class PlaceholderVerticalAlign.Companion {
+ method public int getAboveBaseline();
+ method public int getBottom();
+ method public int getCenter();
+ method public int getTextBottom();
+ method public int getTextCenter();
+ method public int getTextTop();
+ method public int getTop();
+ property public final int AboveBaseline;
+ property public final int Bottom;
+ property public final int Center;
+ property public final int TextBottom;
+ property public final int TextCenter;
+ property public final int TextTop;
+ property public final int Top;
+ }
+
+ @androidx.compose.ui.text.ExperimentalTextApi public final class PlatformParagraphStyle {
+ ctor @Deprecated public PlatformParagraphStyle(optional boolean includeFontPadding);
+ method @Deprecated public boolean getIncludeFontPadding();
+ method public androidx.compose.ui.text.PlatformParagraphStyle merge(androidx.compose.ui.text.PlatformParagraphStyle? other);
+ property @Deprecated public final boolean includeFontPadding;
+ field public static final androidx.compose.ui.text.PlatformParagraphStyle.Companion Companion;
+ }
+
+ public static final class PlatformParagraphStyle.Companion {
+ method public androidx.compose.ui.text.PlatformParagraphStyle getDefault();
+ property public final androidx.compose.ui.text.PlatformParagraphStyle Default;
+ }
+
+ @androidx.compose.ui.text.ExperimentalTextApi public final class PlatformSpanStyle {
+ ctor public PlatformSpanStyle();
+ method public androidx.compose.ui.text.PlatformSpanStyle merge(androidx.compose.ui.text.PlatformSpanStyle? other);
+ field public static final androidx.compose.ui.text.PlatformSpanStyle.Companion Companion;
+ }
+
+ public static final class PlatformSpanStyle.Companion {
+ method public androidx.compose.ui.text.PlatformSpanStyle getDefault();
+ property public final androidx.compose.ui.text.PlatformSpanStyle Default;
+ }
+
+ @androidx.compose.ui.text.ExperimentalTextApi public final class PlatformTextStyle {
+ ctor public PlatformTextStyle(androidx.compose.ui.text.PlatformSpanStyle? spanStyle, androidx.compose.ui.text.PlatformParagraphStyle? paragraphStyle);
+ ctor @Deprecated public PlatformTextStyle(optional boolean includeFontPadding);
+ method public androidx.compose.ui.text.PlatformParagraphStyle? getParagraphStyle();
+ method public androidx.compose.ui.text.PlatformSpanStyle? getSpanStyle();
+ property public final androidx.compose.ui.text.PlatformParagraphStyle? paragraphStyle;
+ property public final androidx.compose.ui.text.PlatformSpanStyle? spanStyle;
+ }
+
+ public final class SaversKt {
+ }
+
+ @androidx.compose.runtime.Immutable public final class SpanStyle {
+ ctor public SpanStyle(optional long color, optional long fontSize, optional androidx.compose.ui.text.font.FontWeight? fontWeight, optional androidx.compose.ui.text.font.FontStyle? fontStyle, optional androidx.compose.ui.text.font.FontSynthesis? fontSynthesis, optional androidx.compose.ui.text.font.FontFamily? fontFamily, optional String? fontFeatureSettings, optional long letterSpacing, optional androidx.compose.ui.text.style.BaselineShift? baselineShift, optional androidx.compose.ui.text.style.TextGeometricTransform? textGeometricTransform, optional androidx.compose.ui.text.intl.LocaleList? localeList, optional long background, optional androidx.compose.ui.text.style.TextDecoration? textDecoration, optional androidx.compose.ui.graphics.Shadow? shadow);
+ ctor @androidx.compose.ui.text.ExperimentalTextApi public SpanStyle(optional long color, optional long fontSize, optional androidx.compose.ui.text.font.FontWeight? fontWeight, optional androidx.compose.ui.text.font.FontStyle? fontStyle, optional androidx.compose.ui.text.font.FontSynthesis? fontSynthesis, optional androidx.compose.ui.text.font.FontFamily? fontFamily, optional String? fontFeatureSettings, optional long letterSpacing, optional androidx.compose.ui.text.style.BaselineShift? baselineShift, optional androidx.compose.ui.text.style.TextGeometricTransform? textGeometricTransform, optional androidx.compose.ui.text.intl.LocaleList? localeList, optional long background, optional androidx.compose.ui.text.style.TextDecoration? textDecoration, optional androidx.compose.ui.graphics.Shadow? shadow, optional androidx.compose.ui.text.PlatformSpanStyle? platformStyle);
+ ctor @androidx.compose.ui.text.ExperimentalTextApi public SpanStyle(androidx.compose.ui.graphics.Brush? brush, optional long fontSize, optional androidx.compose.ui.text.font.FontWeight? fontWeight, optional androidx.compose.ui.text.font.FontStyle? fontStyle, optional androidx.compose.ui.text.font.FontSynthesis? fontSynthesis, optional androidx.compose.ui.text.font.FontFamily? fontFamily, optional String? fontFeatureSettings, optional long letterSpacing, optional androidx.compose.ui.text.style.BaselineShift? baselineShift, optional androidx.compose.ui.text.style.TextGeometricTransform? textGeometricTransform, optional androidx.compose.ui.text.intl.LocaleList? localeList, optional long background, optional androidx.compose.ui.text.style.TextDecoration? textDecoration, optional androidx.compose.ui.graphics.Shadow? shadow, optional androidx.compose.ui.text.PlatformSpanStyle? platformStyle);
+ method public androidx.compose.ui.text.SpanStyle copy(optional long color, optional long fontSize, optional androidx.compose.ui.text.font.FontWeight? fontWeight, optional androidx.compose.ui.text.font.FontStyle? fontStyle, optional androidx.compose.ui.text.font.FontSynthesis? fontSynthesis, optional androidx.compose.ui.text.font.FontFamily? fontFamily, optional String? fontFeatureSettings, optional long letterSpacing, optional androidx.compose.ui.text.style.BaselineShift? baselineShift, optional androidx.compose.ui.text.style.TextGeometricTransform? textGeometricTransform, optional androidx.compose.ui.text.intl.LocaleList? localeList, optional long background, optional androidx.compose.ui.text.style.TextDecoration? textDecoration, optional androidx.compose.ui.graphics.Shadow? shadow);
+ method @androidx.compose.ui.text.ExperimentalTextApi public androidx.compose.ui.text.SpanStyle copy(optional long color, optional long fontSize, optional androidx.compose.ui.text.font.FontWeight? fontWeight, optional androidx.compose.ui.text.font.FontStyle? fontStyle, optional androidx.compose.ui.text.font.FontSynthesis? fontSynthesis, optional androidx.compose.ui.text.font.FontFamily? fontFamily, optional String? fontFeatureSettings, optional long letterSpacing, optional androidx.compose.ui.text.style.BaselineShift? baselineShift, optional androidx.compose.ui.text.style.TextGeometricTransform? textGeometricTransform, optional androidx.compose.ui.text.intl.LocaleList? localeList, optional long background, optional androidx.compose.ui.text.style.TextDecoration? textDecoration, optional androidx.compose.ui.graphics.Shadow? shadow, optional androidx.compose.ui.text.PlatformSpanStyle? platformStyle);
+ method @androidx.compose.ui.text.ExperimentalTextApi public androidx.compose.ui.text.SpanStyle copy(androidx.compose.ui.graphics.Brush? brush, optional long fontSize, optional androidx.compose.ui.text.font.FontWeight? fontWeight, optional androidx.compose.ui.text.font.FontStyle? fontStyle, optional androidx.compose.ui.text.font.FontSynthesis? fontSynthesis, optional androidx.compose.ui.text.font.FontFamily? fontFamily, optional String? fontFeatureSettings, optional long letterSpacing, optional androidx.compose.ui.text.style.BaselineShift? baselineShift, optional androidx.compose.ui.text.style.TextGeometricTransform? textGeometricTransform, optional androidx.compose.ui.text.intl.LocaleList? localeList, optional long background, optional androidx.compose.ui.text.style.TextDecoration? textDecoration, optional androidx.compose.ui.graphics.Shadow? shadow, optional androidx.compose.ui.text.PlatformSpanStyle? platformStyle);
+ method public operator boolean equals(Object? other);
+ method public long getBackground();
+ method public androidx.compose.ui.text.style.BaselineShift? getBaselineShift();
+ method @androidx.compose.ui.text.ExperimentalTextApi public androidx.compose.ui.graphics.Brush? getBrush();
+ method public long getColor();
+ method public androidx.compose.ui.text.font.FontFamily? getFontFamily();
+ method public String? getFontFeatureSettings();
+ method public long getFontSize();
+ method public androidx.compose.ui.text.font.FontStyle? getFontStyle();
+ method public androidx.compose.ui.text.font.FontSynthesis? getFontSynthesis();
+ method public androidx.compose.ui.text.font.FontWeight? getFontWeight();
+ method public long getLetterSpacing();
+ method public androidx.compose.ui.text.intl.LocaleList? getLocaleList();
+ method @androidx.compose.ui.text.ExperimentalTextApi public androidx.compose.ui.text.PlatformSpanStyle? getPlatformStyle();
+ method public androidx.compose.ui.graphics.Shadow? getShadow();
+ method public androidx.compose.ui.text.style.TextDecoration? getTextDecoration();
+ method public androidx.compose.ui.text.style.TextGeometricTransform? getTextGeometricTransform();
+ method @androidx.compose.runtime.Stable public androidx.compose.ui.text.SpanStyle merge(optional androidx.compose.ui.text.SpanStyle? other);
+ method @androidx.compose.runtime.Stable public operator androidx.compose.ui.text.SpanStyle plus(androidx.compose.ui.text.SpanStyle other);
+ property public final long background;
+ property public final androidx.compose.ui.text.style.BaselineShift? baselineShift;
+ property @androidx.compose.ui.text.ExperimentalTextApi public final androidx.compose.ui.graphics.Brush? brush;
+ property public final long color;
+ property public final androidx.compose.ui.text.font.FontFamily? fontFamily;
+ property public final String? fontFeatureSettings;
+ property public final long fontSize;
+ property public final androidx.compose.ui.text.font.FontStyle? fontStyle;
+ property public final androidx.compose.ui.text.font.FontSynthesis? fontSynthesis;
+ property public final androidx.compose.ui.text.font.FontWeight? fontWeight;
+ property public final long letterSpacing;
+ property public final androidx.compose.ui.text.intl.LocaleList? localeList;
+ property @androidx.compose.ui.text.ExperimentalTextApi public final androidx.compose.ui.text.PlatformSpanStyle? platformStyle;
+ property public final androidx.compose.ui.graphics.Shadow? shadow;
+ property public final androidx.compose.ui.text.style.TextDecoration? textDecoration;
+ property public final androidx.compose.ui.text.style.TextGeometricTransform? textGeometricTransform;
+ }
+
+ public final class SpanStyleKt {
+ method public static androidx.compose.ui.text.SpanStyle lerp(androidx.compose.ui.text.SpanStyle start, androidx.compose.ui.text.SpanStyle stop, float fraction);
+ }
+
+ public final class StringKt {
+ method public static String capitalize(String, androidx.compose.ui.text.intl.Locale locale);
+ method public static String capitalize(String, androidx.compose.ui.text.intl.LocaleList localeList);
+ method public static String decapitalize(String, androidx.compose.ui.text.intl.Locale locale);
+ method public static String decapitalize(String, androidx.compose.ui.text.intl.LocaleList localeList);
+ method public static String toLowerCase(String, androidx.compose.ui.text.intl.Locale locale);
+ method public static String toLowerCase(String, androidx.compose.ui.text.intl.LocaleList localeList);
+ method public static String toUpperCase(String, androidx.compose.ui.text.intl.Locale locale);
+ method public static String toUpperCase(String, androidx.compose.ui.text.intl.LocaleList localeList);
+ }
+
+ public final class TempListUtilsKt {
+ }
+
+ public final class TextLayoutInput {
+ ctor @Deprecated public TextLayoutInput(androidx.compose.ui.text.AnnotatedString text, androidx.compose.ui.text.TextStyle style, java.util.List<androidx.compose.ui.text.AnnotatedString.Range<androidx.compose.ui.text.Placeholder>> placeholders, int maxLines, boolean softWrap, int overflow, androidx.compose.ui.unit.Density density, androidx.compose.ui.unit.LayoutDirection layoutDirection, androidx.compose.ui.text.font.Font.ResourceLoader resourceLoader, long constraints);
+ ctor public TextLayoutInput(androidx.compose.ui.text.AnnotatedString text, androidx.compose.ui.text.TextStyle style, java.util.List<androidx.compose.ui.text.AnnotatedString.Range<androidx.compose.ui.text.Placeholder>> placeholders, int maxLines, boolean softWrap, int overflow, androidx.compose.ui.unit.Density density, androidx.compose.ui.unit.LayoutDirection layoutDirection, androidx.compose.ui.text.font.FontFamily.Resolver fontFamilyResolver, long constraints);
+ method @Deprecated public androidx.compose.ui.text.TextLayoutInput copy(optional androidx.compose.ui.text.AnnotatedString text, optional androidx.compose.ui.text.TextStyle style, optional java.util.List<androidx.compose.ui.text.AnnotatedString.Range<androidx.compose.ui.text.Placeholder>> placeholders, optional int maxLines, optional boolean softWrap, optional int overflow, optional androidx.compose.ui.unit.Density density, optional androidx.compose.ui.unit.LayoutDirection layoutDirection, optional androidx.compose.ui.text.font.Font.ResourceLoader resourceLoader, optional long constraints);
+ method public operator boolean equals(Object? other);
+ method public long getConstraints();
+ method public androidx.compose.ui.unit.Density getDensity();
+ method public androidx.compose.ui.text.font.FontFamily.Resolver getFontFamilyResolver();
+ method public androidx.compose.ui.unit.LayoutDirection getLayoutDirection();
+ method public int getMaxLines();
+ method public int getOverflow();
+ method public java.util.List<androidx.compose.ui.text.AnnotatedString.Range<androidx.compose.ui.text.Placeholder>> getPlaceholders();
+ method @Deprecated public androidx.compose.ui.text.font.Font.ResourceLoader getResourceLoader();
+ method public boolean getSoftWrap();
+ method public androidx.compose.ui.text.TextStyle getStyle();
+ method public androidx.compose.ui.text.AnnotatedString getText();
+ property public final long constraints;
+ property public final androidx.compose.ui.unit.Density density;
+ property public final androidx.compose.ui.text.font.FontFamily.Resolver fontFamilyResolver;
+ property public final androidx.compose.ui.unit.LayoutDirection layoutDirection;
+ property public final int maxLines;
+ property public final int overflow;
+ property public final java.util.List<androidx.compose.ui.text.AnnotatedString.Range<androidx.compose.ui.text.Placeholder>> placeholders;
+ property @Deprecated public final androidx.compose.ui.text.font.Font.ResourceLoader resourceLoader;
+ property public final boolean softWrap;
+ property public final androidx.compose.ui.text.TextStyle style;
+ property public final androidx.compose.ui.text.AnnotatedString text;
+ }
+
+ public final class TextLayoutResult {
+ ctor public TextLayoutResult(androidx.compose.ui.text.TextLayoutInput layoutInput, androidx.compose.ui.text.MultiParagraph multiParagraph, long size);
+ method public androidx.compose.ui.text.TextLayoutResult copy(optional androidx.compose.ui.text.TextLayoutInput layoutInput, optional long size);
+ method public operator boolean equals(Object? other);
+ method public androidx.compose.ui.text.style.ResolvedTextDirection getBidiRunDirection(int offset);
+ method public androidx.compose.ui.geometry.Rect getBoundingBox(int offset);
+ method public androidx.compose.ui.geometry.Rect getCursorRect(int offset);
+ method public boolean getDidOverflowHeight();
+ method public boolean getDidOverflowWidth();
+ method public float getFirstBaseline();
+ method public boolean getHasVisualOverflow();
+ method public float getHorizontalPosition(int offset, boolean usePrimaryDirection);
+ method public float getLastBaseline();
+ method public androidx.compose.ui.text.TextLayoutInput getLayoutInput();
+ method public float getLineBottom(int lineIndex);
+ method public int getLineCount();
+ method public int getLineEnd(int lineIndex, optional boolean visibleEnd);
+ method public int getLineForOffset(int offset);
+ method public int getLineForVerticalPosition(float vertical);
+ method public float getLineLeft(int lineIndex);
+ method public float getLineRight(int lineIndex);
+ method public int getLineStart(int lineIndex);
+ method public float getLineTop(int lineIndex);
+ method public androidx.compose.ui.text.MultiParagraph getMultiParagraph();
+ method public int getOffsetForPosition(long position);
+ method public androidx.compose.ui.text.style.ResolvedTextDirection getParagraphDirection(int offset);
+ method public androidx.compose.ui.graphics.Path getPathForRange(int start, int end);
+ method public java.util.List<androidx.compose.ui.geometry.Rect> getPlaceholderRects();
+ method public long getSize();
+ method public long getWordBoundary(int offset);
+ method public boolean isLineEllipsized(int lineIndex);
+ property public final boolean didOverflowHeight;
+ property public final boolean didOverflowWidth;
+ property public final float firstBaseline;
+ property public final boolean hasVisualOverflow;
+ property public final float lastBaseline;
+ property public final androidx.compose.ui.text.TextLayoutInput layoutInput;
+ property public final int lineCount;
+ property public final androidx.compose.ui.text.MultiParagraph multiParagraph;
+ property public final java.util.List<androidx.compose.ui.geometry.Rect> placeholderRects;
+ property public final long size;
+ }
+
+ public final class TextPainter {
+ method public void paint(androidx.compose.ui.graphics.Canvas canvas, androidx.compose.ui.text.TextLayoutResult textLayoutResult);
+ field public static final androidx.compose.ui.text.TextPainter INSTANCE;
+ }
+
+ @androidx.compose.runtime.Immutable @kotlin.jvm.JvmInline public final value class TextRange {
+ method public operator boolean contains(long other);
+ method public operator boolean contains(int offset);
+ method public boolean getCollapsed();
+ method public int getEnd();
+ method public int getLength();
+ method public int getMax();
+ method public int getMin();
+ method public boolean getReversed();
+ method public int getStart();
+ method public boolean intersects(long other);
+ property public final boolean collapsed;
+ property public final int end;
+ property public final int length;
+ property public final int max;
+ property public final int min;
+ property public final boolean reversed;
+ property public final int start;
+ field public static final androidx.compose.ui.text.TextRange.Companion Companion;
+ }
+
+ public static final class TextRange.Companion {
+ method public long getZero();
+ property public final long Zero;
+ }
+
+ public final class TextRangeKt {
+ method public static long TextRange(int start, int end);
+ method public static long TextRange(int index);
+ method public static String substring(CharSequence, long range);
+ }
+
+ @androidx.compose.runtime.Immutable public final class TextStyle {
+ ctor public TextStyle(optional long color, optional long fontSize, optional androidx.compose.ui.text.font.FontWeight? fontWeight, optional androidx.compose.ui.text.font.FontStyle? fontStyle, optional androidx.compose.ui.text.font.FontSynthesis? fontSynthesis, optional androidx.compose.ui.text.font.FontFamily? fontFamily, optional String? fontFeatureSettings, optional long letterSpacing, optional androidx.compose.ui.text.style.BaselineShift? baselineShift, optional androidx.compose.ui.text.style.TextGeometricTransform? textGeometricTransform, optional androidx.compose.ui.text.intl.LocaleList? localeList, optional long background, optional androidx.compose.ui.text.style.TextDecoration? textDecoration, optional androidx.compose.ui.graphics.Shadow? shadow, optional androidx.compose.ui.text.style.TextAlign? textAlign, optional androidx.compose.ui.text.style.TextDirection? textDirection, optional long lineHeight, optional androidx.compose.ui.text.style.TextIndent? textIndent);
+ ctor @androidx.compose.ui.text.ExperimentalTextApi public TextStyle(optional long color, optional long fontSize, optional androidx.compose.ui.text.font.FontWeight? fontWeight, optional androidx.compose.ui.text.font.FontStyle? fontStyle, optional androidx.compose.ui.text.font.FontSynthesis? fontSynthesis, optional androidx.compose.ui.text.font.FontFamily? fontFamily, optional String? fontFeatureSettings, optional long letterSpacing, optional androidx.compose.ui.text.style.BaselineShift? baselineShift, optional androidx.compose.ui.text.style.TextGeometricTransform? textGeometricTransform, optional androidx.compose.ui.text.intl.LocaleList? localeList, optional long background, optional androidx.compose.ui.text.style.TextDecoration? textDecoration, optional androidx.compose.ui.graphics.Shadow? shadow, optional androidx.compose.ui.text.style.TextAlign? textAlign, optional androidx.compose.ui.text.style.TextDirection? textDirection, optional long lineHeight, optional androidx.compose.ui.text.style.TextIndent? textIndent, optional androidx.compose.ui.text.PlatformTextStyle? platformStyle, optional androidx.compose.ui.text.style.LineHeightStyle? lineHeightStyle);
+ ctor @androidx.compose.ui.text.ExperimentalTextApi public TextStyle(androidx.compose.ui.graphics.Brush? brush, optional long fontSize, optional androidx.compose.ui.text.font.FontWeight? fontWeight, optional androidx.compose.ui.text.font.FontStyle? fontStyle, optional androidx.compose.ui.text.font.FontSynthesis? fontSynthesis, optional androidx.compose.ui.text.font.FontFamily? fontFamily, optional String? fontFeatureSettings, optional long letterSpacing, optional androidx.compose.ui.text.style.BaselineShift? baselineShift, optional androidx.compose.ui.text.style.TextGeometricTransform? textGeometricTransform, optional androidx.compose.ui.text.intl.LocaleList? localeList, optional long background, optional androidx.compose.ui.text.style.TextDecoration? textDecoration, optional androidx.compose.ui.graphics.Shadow? shadow, optional androidx.compose.ui.text.style.TextAlign? textAlign, optional androidx.compose.ui.text.style.TextDirection? textDirection, optional long lineHeight, optional androidx.compose.ui.text.style.TextIndent? textIndent, optional androidx.compose.ui.text.PlatformTextStyle? platformStyle, optional androidx.compose.ui.text.style.LineHeightStyle? lineHeightStyle);
+ method public androidx.compose.ui.text.TextStyle copy(optional long color, optional long fontSize, optional androidx.compose.ui.text.font.FontWeight? fontWeight, optional androidx.compose.ui.text.font.FontStyle? fontStyle, optional androidx.compose.ui.text.font.FontSynthesis? fontSynthesis, optional androidx.compose.ui.text.font.FontFamily? fontFamily, optional String? fontFeatureSettings, optional long letterSpacing, optional androidx.compose.ui.text.style.BaselineShift? baselineShift, optional androidx.compose.ui.text.style.TextGeometricTransform? textGeometricTransform, optional androidx.compose.ui.text.intl.LocaleList? localeList, optional long background, optional androidx.compose.ui.text.style.TextDecoration? textDecoration, optional androidx.compose.ui.graphics.Shadow? shadow, optional androidx.compose.ui.text.style.TextAlign? textAlign, optional androidx.compose.ui.text.style.TextDirection? textDirection, optional long lineHeight, optional androidx.compose.ui.text.style.TextIndent? textIndent);
+ method @androidx.compose.ui.text.ExperimentalTextApi public androidx.compose.ui.text.TextStyle copy(optional long color, optional long fontSize, optional androidx.compose.ui.text.font.FontWeight? fontWeight, optional androidx.compose.ui.text.font.FontStyle? fontStyle, optional androidx.compose.ui.text.font.FontSynthesis? fontSynthesis, optional androidx.compose.ui.text.font.FontFamily? fontFamily, optional String? fontFeatureSettings, optional long letterSpacing, optional androidx.compose.ui.text.style.BaselineShift? baselineShift, optional androidx.compose.ui.text.style.TextGeometricTransform? textGeometricTransform, optional androidx.compose.ui.text.intl.LocaleList? localeList, optional long background, optional androidx.compose.ui.text.style.TextDecoration? textDecoration, optional androidx.compose.ui.graphics.Shadow? shadow, optional androidx.compose.ui.text.style.TextAlign? textAlign, optional androidx.compose.ui.text.style.TextDirection? textDirection, optional long lineHeight, optional androidx.compose.ui.text.style.TextIndent? textIndent, optional androidx.compose.ui.text.PlatformTextStyle? platformStyle, optional androidx.compose.ui.text.style.LineHeightStyle? lineHeightStyle);
+ method @androidx.compose.ui.text.ExperimentalTextApi public androidx.compose.ui.text.TextStyle copy(androidx.compose.ui.graphics.Brush? brush, optional long fontSize, optional androidx.compose.ui.text.font.FontWeight? fontWeight, optional androidx.compose.ui.text.font.FontStyle? fontStyle, optional androidx.compose.ui.text.font.FontSynthesis? fontSynthesis, optional androidx.compose.ui.text.font.FontFamily? fontFamily, optional String? fontFeatureSettings, optional long letterSpacing, optional androidx.compose.ui.text.style.BaselineShift? baselineShift, optional androidx.compose.ui.text.style.TextGeometricTransform? textGeometricTransform, optional androidx.compose.ui.text.intl.LocaleList? localeList, optional long background, optional androidx.compose.ui.text.style.TextDecoration? textDecoration, optional androidx.compose.ui.graphics.Shadow? shadow, optional androidx.compose.ui.text.style.TextAlign? textAlign, optional androidx.compose.ui.text.style.TextDirection? textDirection, optional long lineHeight, optional androidx.compose.ui.text.style.TextIndent? textIndent, optional androidx.compose.ui.text.PlatformTextStyle? platformStyle, optional androidx.compose.ui.text.style.LineHeightStyle? lineHeightStyle);
+ method public long getBackground();
+ method public androidx.compose.ui.text.style.BaselineShift? getBaselineShift();
+ method @androidx.compose.ui.text.ExperimentalTextApi public androidx.compose.ui.graphics.Brush? getBrush();
+ method public long getColor();
+ method public androidx.compose.ui.text.font.FontFamily? getFontFamily();
+ method public String? getFontFeatureSettings();
+ method public long getFontSize();
+ method public androidx.compose.ui.text.font.FontStyle? getFontStyle();
+ method public androidx.compose.ui.text.font.FontSynthesis? getFontSynthesis();
+ method public androidx.compose.ui.text.font.FontWeight? getFontWeight();
+ method public long getLetterSpacing();
+ method public long getLineHeight();
+ method @androidx.compose.ui.text.ExperimentalTextApi public androidx.compose.ui.text.style.LineHeightStyle? getLineHeightStyle();
+ method public androidx.compose.ui.text.intl.LocaleList? getLocaleList();
+ method @androidx.compose.ui.text.ExperimentalTextApi public androidx.compose.ui.text.PlatformTextStyle? getPlatformStyle();
+ method public androidx.compose.ui.graphics.Shadow? getShadow();
+ method public androidx.compose.ui.text.style.TextAlign? getTextAlign();
+ method public androidx.compose.ui.text.style.TextDecoration? getTextDecoration();
+ method public androidx.compose.ui.text.style.TextDirection? getTextDirection();
+ method public androidx.compose.ui.text.style.TextGeometricTransform? getTextGeometricTransform();
+ method public androidx.compose.ui.text.style.TextIndent? getTextIndent();
+ method public boolean hasSameLayoutAffectingAttributes(androidx.compose.ui.text.TextStyle other);
+ method @androidx.compose.runtime.Stable public androidx.compose.ui.text.TextStyle merge(optional androidx.compose.ui.text.TextStyle? other);
+ method @androidx.compose.runtime.Stable public androidx.compose.ui.text.TextStyle merge(androidx.compose.ui.text.SpanStyle other);
+ method @androidx.compose.runtime.Stable public androidx.compose.ui.text.TextStyle merge(androidx.compose.ui.text.ParagraphStyle other);
+ method @androidx.compose.runtime.Stable public operator androidx.compose.ui.text.TextStyle plus(androidx.compose.ui.text.TextStyle other);
+ method @androidx.compose.runtime.Stable public operator androidx.compose.ui.text.TextStyle plus(androidx.compose.ui.text.ParagraphStyle other);
+ method @androidx.compose.runtime.Stable public operator androidx.compose.ui.text.TextStyle plus(androidx.compose.ui.text.SpanStyle other);
+ method @androidx.compose.runtime.Stable public androidx.compose.ui.text.ParagraphStyle toParagraphStyle();
+ method @androidx.compose.runtime.Stable public androidx.compose.ui.text.SpanStyle toSpanStyle();
+ property public final long background;
+ property public final androidx.compose.ui.text.style.BaselineShift? baselineShift;
+ property @androidx.compose.ui.text.ExperimentalTextApi public final androidx.compose.ui.graphics.Brush? brush;
+ property public final long color;
+ property public final androidx.compose.ui.text.font.FontFamily? fontFamily;
+ property public final String? fontFeatureSettings;
+ property public final long fontSize;
+ property public final androidx.compose.ui.text.font.FontStyle? fontStyle;
+ property public final androidx.compose.ui.text.font.FontSynthesis? fontSynthesis;
+ property public final androidx.compose.ui.text.font.FontWeight? fontWeight;
+ property public final long letterSpacing;
+ property public final long lineHeight;
+ property @androidx.compose.ui.text.ExperimentalTextApi public final androidx.compose.ui.text.style.LineHeightStyle? lineHeightStyle;
+ property public final androidx.compose.ui.text.intl.LocaleList? localeList;
+ property @androidx.compose.ui.text.ExperimentalTextApi public final androidx.compose.ui.text.PlatformTextStyle? platformStyle;
+ property public final androidx.compose.ui.graphics.Shadow? shadow;
+ property public final androidx.compose.ui.text.style.TextAlign? textAlign;
+ property public final androidx.compose.ui.text.style.TextDecoration? textDecoration;
+ property public final androidx.compose.ui.text.style.TextDirection? textDirection;
+ property public final androidx.compose.ui.text.style.TextGeometricTransform? textGeometricTransform;
+ property public final androidx.compose.ui.text.style.TextIndent? textIndent;
+ field public static final androidx.compose.ui.text.TextStyle.Companion Companion;
+ }
+
+ public static final class TextStyle.Companion {
+ method public androidx.compose.ui.text.TextStyle getDefault();
+ property public final androidx.compose.ui.text.TextStyle Default;
+ }
+
+ public final class TextStyleKt {
+ method public static androidx.compose.ui.text.TextStyle lerp(androidx.compose.ui.text.TextStyle start, androidx.compose.ui.text.TextStyle stop, float fraction);
+ method public static androidx.compose.ui.text.TextStyle resolveDefaults(androidx.compose.ui.text.TextStyle style, androidx.compose.ui.unit.LayoutDirection direction);
+ }
+
+ public abstract sealed class TtsAnnotation {
+ }
+
+ public final class VerbatimTtsAnnotation extends androidx.compose.ui.text.TtsAnnotation {
+ ctor public VerbatimTtsAnnotation(String verbatim);
+ method public String getVerbatim();
+ property public final String verbatim;
+ }
+
+}
+
+package androidx.compose.ui.text.android {
+
+ @kotlin.RequiresOptIn(level=kotlin.RequiresOptIn.Level.ERROR, message="This is internal API that may change frequently and without warning.") @kotlin.annotation.Target(allowedTargets={kotlin.annotation.AnnotationTarget.CLASS, kotlin.annotation.AnnotationTarget.FUNCTION, kotlin.annotation.AnnotationTarget.PROPERTY}) public @interface InternalPlatformTextApi {
+ }
+
+ public final class LayoutCompatKt {
+ }
+
+ public final class LayoutHelperKt {
+ }
+
+ public final class LayoutIntrinsicsKt {
+ }
+
+ public final class PaintExtensionsKt {
+ }
+
+ public final class SpannedExtensionsKt {
+ }
+
+ public final class StaticLayoutFactoryKt {
+ }
+
+ public final class TempListUtilsKt {
+ }
+
+ public final class TextLayoutKt {
+ }
+
+}
+
+package androidx.compose.ui.text.android.style {
+
+ public final class LineHeightStyleSpanKt {
+ }
+
+ public final class PlaceholderSpanKt {
+ }
+
+}
+
+package androidx.compose.ui.text.caches {
+
+ public final class ContainerHelpersKt {
+ }
+
+ public final class SimpleArrayMapKt {
+ }
+
+}
+
+package androidx.compose.ui.text.font {
+
+ public abstract class AndroidFont implements androidx.compose.ui.text.font.Font {
+ ctor public AndroidFont(int loadingStrategy, androidx.compose.ui.text.font.AndroidFont.TypefaceLoader typefaceLoader);
+ method public final int getLoadingStrategy();
+ method public final androidx.compose.ui.text.font.AndroidFont.TypefaceLoader getTypefaceLoader();
+ property public final int loadingStrategy;
+ property public final androidx.compose.ui.text.font.AndroidFont.TypefaceLoader typefaceLoader;
+ }
+
+ public static interface AndroidFont.TypefaceLoader {
+ method public suspend Object? awaitLoad(android.content.Context context, androidx.compose.ui.text.font.AndroidFont font, kotlin.coroutines.Continuation<? super android.graphics.Typeface>);
+ method public android.graphics.Typeface? loadBlocking(android.content.Context context, androidx.compose.ui.text.font.AndroidFont font);
+ }
+
+ public final class AndroidFontKt {
+ method @Deprecated @androidx.compose.runtime.Stable @androidx.compose.ui.text.ExperimentalTextApi public static androidx.compose.ui.text.font.Font Font(android.content.res.AssetManager assetManager, String path, optional androidx.compose.ui.text.font.FontWeight weight, optional int style);
+ method @androidx.compose.runtime.Stable @androidx.compose.ui.text.ExperimentalTextApi public static androidx.compose.ui.text.font.Font Font(String path, android.content.res.AssetManager assetManager, optional androidx.compose.ui.text.font.FontWeight weight, optional int style);
+ method @androidx.compose.runtime.Stable @androidx.compose.ui.text.ExperimentalTextApi public static androidx.compose.ui.text.font.Font Font(java.io.File file, optional androidx.compose.ui.text.font.FontWeight weight, optional int style);
+ method @RequiresApi(26) @androidx.compose.runtime.Stable @androidx.compose.ui.text.ExperimentalTextApi public static androidx.compose.ui.text.font.Font Font(android.os.ParcelFileDescriptor fileDescriptor, optional androidx.compose.ui.text.font.FontWeight weight, optional int style);
+ }
+
+ public final class AndroidFontLoader_androidKt {
+ }
+
+ public final class AndroidFontResolveInterceptor_androidKt {
+ }
+
+ public final class AndroidFontUtils_androidKt {
+ }
+
+ public final class AndroidTypeface_androidKt {
+ method public static androidx.compose.ui.text.font.FontFamily FontFamily(android.graphics.Typeface typeface);
+ method @Deprecated public static androidx.compose.ui.text.font.Typeface Typeface(android.content.Context context, androidx.compose.ui.text.font.FontFamily fontFamily, optional java.util.List<kotlin.Pair<androidx.compose.ui.text.font.FontWeight,androidx.compose.ui.text.font.FontStyle>>? styles);
+ method public static androidx.compose.ui.text.font.Typeface Typeface(android.graphics.Typeface typeface);
+ }
+
+ public final class DelegatingFontLoaderForDeprecatedUsage_androidKt {
+ method @Deprecated public static androidx.compose.ui.text.font.FontFamily.Resolver createFontFamilyResolver(androidx.compose.ui.text.font.Font.ResourceLoader fontResourceLoader, android.content.Context context);
+ }
+
+ @androidx.compose.ui.text.ExperimentalTextApi @kotlin.jvm.JvmInline public final value class DeviceFontFamilyName {
+ ctor public DeviceFontFamilyName(String name);
+ method public String getName();
+ property public final String name;
+ }
+
+ public final class DeviceFontFamilyNameFontKt {
+ method @androidx.compose.ui.text.ExperimentalTextApi public static androidx.compose.ui.text.font.Font Font(String familyName, optional androidx.compose.ui.text.font.FontWeight weight, optional int style);
+ }
+
+ public abstract sealed class FileBasedFontFamily extends androidx.compose.ui.text.font.FontFamily {
+ }
+
+ @androidx.compose.runtime.Immutable public interface Font {
+ method @androidx.compose.ui.text.ExperimentalTextApi public int getLoadingStrategy();
+ method public int getStyle();
+ method public androidx.compose.ui.text.font.FontWeight getWeight();
+ property @androidx.compose.ui.text.ExperimentalTextApi public abstract int loadingStrategy;
+ property public abstract int style;
+ property public abstract androidx.compose.ui.text.font.FontWeight weight;
+ field public static final androidx.compose.ui.text.font.Font.Companion Companion;
+ field @androidx.compose.ui.text.ExperimentalTextApi public static final long MaximumAsyncTimeout = 15000L; // 0x3a98L
+ }
+
+ public static final class Font.Companion {
+ }
+
+ @Deprecated public static interface Font.ResourceLoader {
+ method @Deprecated public Object load(androidx.compose.ui.text.font.Font font);
+ }
+
+ @androidx.compose.runtime.Immutable public abstract sealed class FontFamily {
+ method @Deprecated public final boolean getCanLoadSynchronously();
+ property @Deprecated public final boolean canLoadSynchronously;
+ field public static final androidx.compose.ui.text.font.FontFamily.Companion Companion;
+ }
+
+ public static final class FontFamily.Companion {
+ method public androidx.compose.ui.text.font.GenericFontFamily getCursive();
+ method public androidx.compose.ui.text.font.SystemFontFamily getDefault();
+ method public androidx.compose.ui.text.font.GenericFontFamily getMonospace();
+ method public androidx.compose.ui.text.font.GenericFontFamily getSansSerif();
+ method public androidx.compose.ui.text.font.GenericFontFamily getSerif();
+ property public final androidx.compose.ui.text.font.GenericFontFamily Cursive;
+ property public final androidx.compose.ui.text.font.SystemFontFamily Default;
+ property public final androidx.compose.ui.text.font.GenericFontFamily Monospace;
+ property public final androidx.compose.ui.text.font.GenericFontFamily SansSerif;
+ property public final androidx.compose.ui.text.font.GenericFontFamily Serif;
+ }
+
+ public static sealed interface FontFamily.Resolver {
+ method public suspend Object? preload(androidx.compose.ui.text.font.FontFamily fontFamily, kotlin.coroutines.Continuation<? super kotlin.Unit>);
+ method public androidx.compose.runtime.State<java.lang.Object> resolve(optional androidx.compose.ui.text.font.FontFamily? fontFamily, optional androidx.compose.ui.text.font.FontWeight fontWeight, optional int fontStyle, optional int fontSynthesis);
+ }
+
+ public final class FontFamilyKt {
+ method @androidx.compose.runtime.Stable public static androidx.compose.ui.text.font.FontFamily FontFamily(java.util.List<? extends androidx.compose.ui.text.font.Font> fonts);
+ method @androidx.compose.runtime.Stable public static androidx.compose.ui.text.font.FontFamily FontFamily(androidx.compose.ui.text.font.Font... fonts);
+ method @androidx.compose.runtime.Stable public static androidx.compose.ui.text.font.FontFamily FontFamily(androidx.compose.ui.text.font.Typeface typeface);
+ }
+
+ public final class FontFamilyResolverKt {
+ }
+
+ public final class FontFamilyResolver_androidKt {
+ method public static androidx.compose.ui.text.font.FontFamily.Resolver createFontFamilyResolver(android.content.Context context);
+ method @androidx.compose.ui.text.ExperimentalTextApi public static androidx.compose.ui.text.font.FontFamily.Resolver createFontFamilyResolver(android.content.Context context, kotlin.coroutines.CoroutineContext coroutineContext);
+ }
+
+ public final class FontKt {
+ method @androidx.compose.runtime.Stable public static androidx.compose.ui.text.font.Font Font(int resId, optional androidx.compose.ui.text.font.FontWeight weight, optional int style, optional int loadingStrategy);
+ method @Deprecated @androidx.compose.runtime.Stable public static androidx.compose.ui.text.font.Font! Font(int resId, optional androidx.compose.ui.text.font.FontWeight weight, optional int style);
+ method @androidx.compose.runtime.Stable public static androidx.compose.ui.text.font.FontFamily toFontFamily(androidx.compose.ui.text.font.Font);
+ }
+
+ @androidx.compose.runtime.Immutable public final class FontListFontFamily extends androidx.compose.ui.text.font.FileBasedFontFamily implements kotlin.jvm.internal.markers.KMappedMarker java.util.List<androidx.compose.ui.text.font.Font> {
+ method public java.util.List<androidx.compose.ui.text.font.Font> getFonts();
+ property public final java.util.List<androidx.compose.ui.text.font.Font> fonts;
+ }
+
+ public final class FontListFontFamilyTypefaceAdapterKt {
+ }
+
+ @kotlin.jvm.JvmInline public final value class FontLoadingStrategy {
+ method public int getValue();
+ property public final int value;
+ field public static final androidx.compose.ui.text.font.FontLoadingStrategy.Companion Companion;
+ }
+
+ public static final class FontLoadingStrategy.Companion {
+ method public int getAsync();
+ method public int getBlocking();
+ method public int getOptionalLocal();
+ property public final int Async;
+ property public final int Blocking;
+ property public final int OptionalLocal;
+ }
+
+ @kotlin.jvm.JvmInline public final value class FontStyle {
+ ctor public FontStyle(int value);
+ method public int getValue();
+ property public final int value;
+ field public static final androidx.compose.ui.text.font.FontStyle.Companion Companion;
+ }
+
+ public static final class FontStyle.Companion {
+ method public int getItalic();
+ method public int getNormal();
+ method public java.util.List<androidx.compose.ui.text.font.FontStyle> values();
+ property public final int Italic;
+ property public final int Normal;
+ }
+
+ @kotlin.jvm.JvmInline public final value class FontSynthesis {
+ field public static final androidx.compose.ui.text.font.FontSynthesis.Companion Companion;
+ }
+
+ public static final class FontSynthesis.Companion {
+ method public int getAll();
+ method public int getNone();
+ method public int getStyle();
+ method public int getWeight();
+ property public final int All;
+ property public final int None;
+ property public final int Style;
+ property public final int Weight;
+ }
+
+ public final class FontSynthesis_androidKt {
+ }
+
+ @androidx.compose.runtime.Immutable public final class FontWeight implements java.lang.Comparable<androidx.compose.ui.text.font.FontWeight> {
+ ctor public FontWeight(int weight);
+ method public operator int compareTo(androidx.compose.ui.text.font.FontWeight other);
+ method public int getWeight();
+ property public final int weight;
+ field public static final androidx.compose.ui.text.font.FontWeight.Companion Companion;
+ }
+
+ public static final class FontWeight.Companion {
+ method public androidx.compose.ui.text.font.FontWeight getBlack();
+ method public androidx.compose.ui.text.font.FontWeight getBold();
+ method public androidx.compose.ui.text.font.FontWeight getExtraBold();
+ method public androidx.compose.ui.text.font.FontWeight getExtraLight();
+ method public androidx.compose.ui.text.font.FontWeight getLight();
+ method public androidx.compose.ui.text.font.FontWeight getMedium();
+ method public androidx.compose.ui.text.font.FontWeight getNormal();
+ method public androidx.compose.ui.text.font.FontWeight getSemiBold();
+ method public androidx.compose.ui.text.font.FontWeight getThin();
+ method public androidx.compose.ui.text.font.FontWeight getW100();
+ method public androidx.compose.ui.text.font.FontWeight getW200();
+ method public androidx.compose.ui.text.font.FontWeight getW300();
+ method public androidx.compose.ui.text.font.FontWeight getW400();
+ method public androidx.compose.ui.text.font.FontWeight getW500();
+ method public androidx.compose.ui.text.font.FontWeight getW600();
+ method public androidx.compose.ui.text.font.FontWeight getW700();
+ method public androidx.compose.ui.text.font.FontWeight getW800();
+ method public androidx.compose.ui.text.font.FontWeight getW900();
+ property public final androidx.compose.ui.text.font.FontWeight Black;
+ property public final androidx.compose.ui.text.font.FontWeight Bold;
+ property public final androidx.compose.ui.text.font.FontWeight ExtraBold;
+ property public final androidx.compose.ui.text.font.FontWeight ExtraLight;
+ property public final androidx.compose.ui.text.font.FontWeight Light;
+ property public final androidx.compose.ui.text.font.FontWeight Medium;
+ property public final androidx.compose.ui.text.font.FontWeight Normal;
+ property public final androidx.compose.ui.text.font.FontWeight SemiBold;
+ property public final androidx.compose.ui.text.font.FontWeight Thin;
+ property public final androidx.compose.ui.text.font.FontWeight W100;
+ property public final androidx.compose.ui.text.font.FontWeight W200;
+ property public final androidx.compose.ui.text.font.FontWeight W300;
+ property public final androidx.compose.ui.text.font.FontWeight W400;
+ property public final androidx.compose.ui.text.font.FontWeight W500;
+ property public final androidx.compose.ui.text.font.FontWeight W600;
+ property public final androidx.compose.ui.text.font.FontWeight W700;
+ property public final androidx.compose.ui.text.font.FontWeight W800;
+ property public final androidx.compose.ui.text.font.FontWeight W900;
+ }
+
+ public final class FontWeightKt {
+ method public static androidx.compose.ui.text.font.FontWeight lerp(androidx.compose.ui.text.font.FontWeight start, androidx.compose.ui.text.font.FontWeight stop, float fraction);
+ }
+
+ @androidx.compose.runtime.Immutable public final class GenericFontFamily extends androidx.compose.ui.text.font.SystemFontFamily {
+ method public String getName();
+ property public final String name;
+ }
+
+ public final class LoadedFontFamily extends androidx.compose.ui.text.font.FontFamily {
+ method public androidx.compose.ui.text.font.Typeface getTypeface();
+ property public final androidx.compose.ui.text.font.Typeface typeface;
+ }
+
+ public final class PlatformTypefacesKt {
+ }
+
+ public final class ResourceFont implements androidx.compose.ui.text.font.Font {
+ method public androidx.compose.ui.text.font.ResourceFont copy(optional int resId, optional androidx.compose.ui.text.font.FontWeight weight, optional int style);
+ method @androidx.compose.ui.text.ExperimentalTextApi public androidx.compose.ui.text.font.ResourceFont copy(optional int resId, optional androidx.compose.ui.text.font.FontWeight weight, optional int style, optional int loadingStrategy);
+ method @androidx.compose.ui.text.ExperimentalTextApi public int getLoadingStrategy();
+ method public int getResId();
+ method public int getStyle();
+ method public androidx.compose.ui.text.font.FontWeight getWeight();
+ property @androidx.compose.ui.text.ExperimentalTextApi public int loadingStrategy;
+ property public final int resId;
+ property public int style;
+ property public androidx.compose.ui.text.font.FontWeight weight;
+ }
+
+ public abstract sealed class SystemFontFamily extends androidx.compose.ui.text.font.FontFamily {
+ }
+
+ public interface Typeface {
+ method public androidx.compose.ui.text.font.FontFamily? getFontFamily();
+ property public abstract androidx.compose.ui.text.font.FontFamily? fontFamily;
+ }
+
+}
+
+package androidx.compose.ui.text.input {
+
+ public final class BackspaceCommand implements androidx.compose.ui.text.input.EditCommand {
+ ctor public BackspaceCommand();
+ method public void applyTo(androidx.compose.ui.text.input.EditingBuffer buffer);
+ }
+
+ public final class CommitTextCommand implements androidx.compose.ui.text.input.EditCommand {
+ ctor public CommitTextCommand(androidx.compose.ui.text.AnnotatedString annotatedString, int newCursorPosition);
+ ctor public CommitTextCommand(String text, int newCursorPosition);
+ method public void applyTo(androidx.compose.ui.text.input.EditingBuffer buffer);
+ method public androidx.compose.ui.text.AnnotatedString getAnnotatedString();
+ method public int getNewCursorPosition();
+ method public String getText();
+ property public final androidx.compose.ui.text.AnnotatedString annotatedString;
+ property public final int newCursorPosition;
+ property public final String text;
+ }
+
+ public final class DeleteAllCommand implements androidx.compose.ui.text.input.EditCommand {
+ ctor public DeleteAllCommand();
+ method public void applyTo(androidx.compose.ui.text.input.EditingBuffer buffer);
+ }
+
+ public final class DeleteSurroundingTextCommand implements androidx.compose.ui.text.input.EditCommand {
+ ctor public DeleteSurroundingTextCommand(int lengthBeforeCursor, int lengthAfterCursor);
+ method public void applyTo(androidx.compose.ui.text.input.EditingBuffer buffer);
+ method public int getLengthAfterCursor();
+ method public int getLengthBeforeCursor();
+ property public final int lengthAfterCursor;
+ property public final int lengthBeforeCursor;
+ }
+
+ public final class DeleteSurroundingTextInCodePointsCommand implements androidx.compose.ui.text.input.EditCommand {
+ ctor public DeleteSurroundingTextInCodePointsCommand(int lengthBeforeCursor, int lengthAfterCursor);
+ method public void applyTo(androidx.compose.ui.text.input.EditingBuffer buffer);
+ method public int getLengthAfterCursor();
+ method public int getLengthBeforeCursor();
+ property public final int lengthAfterCursor;
+ property public final int lengthBeforeCursor;
+ }
+
+ public interface EditCommand {
+ method public void applyTo(androidx.compose.ui.text.input.EditingBuffer buffer);
+ }
+
+ public final class EditCommandKt {
+ }
+
+ public final class EditProcessor {
+ ctor public EditProcessor();
+ method public androidx.compose.ui.text.input.TextFieldValue apply(java.util.List<? extends androidx.compose.ui.text.input.EditCommand> editCommands);
+ method public void reset(androidx.compose.ui.text.input.TextFieldValue value, androidx.compose.ui.text.input.TextInputSession? textInputSession);
+ method public androidx.compose.ui.text.input.TextFieldValue toTextFieldValue();
+ }
+
+ public final class EditingBuffer {
+ ctor public EditingBuffer(androidx.compose.ui.text.AnnotatedString text, long selection);
+ }
+
+ public final class EditingBufferKt {
+ }
+
+ public final class FinishComposingTextCommand implements androidx.compose.ui.text.input.EditCommand {
+ ctor public FinishComposingTextCommand();
+ method public void applyTo(androidx.compose.ui.text.input.EditingBuffer buffer);
+ }
+
+ public final class GapBufferKt {
+ }
+
+ @kotlin.jvm.JvmInline public final value class ImeAction {
+ field public static final androidx.compose.ui.text.input.ImeAction.Companion Companion;
+ }
+
+ public static final class ImeAction.Companion {
+ method public int getDefault();
+ method public int getDone();
+ method public int getGo();
+ method public int getNext();
+ method public int getNone();
+ method public int getPrevious();
+ method public int getSearch();
+ method public int getSend();
+ property public final int Default;
+ property public final int Done;
+ property public final int Go;
+ property public final int Next;
+ property public final int None;
+ property public final int Previous;
+ property public final int Search;
+ property public final int Send;
+ }
+
+ @androidx.compose.runtime.Immutable public final class ImeOptions {
+ ctor public ImeOptions(optional boolean singleLine, optional int capitalization, optional boolean autoCorrect, optional int keyboardType, optional int imeAction);
+ method public androidx.compose.ui.text.input.ImeOptions copy(optional boolean singleLine, optional int capitalization, optional boolean autoCorrect, optional int keyboardType, optional int imeAction);
+ method public boolean getAutoCorrect();
+ method public int getCapitalization();
+ method public int getImeAction();
+ method public int getKeyboardType();
+ method public boolean getSingleLine();
+ property public final boolean autoCorrect;
+ property public final int capitalization;
+ property public final int imeAction;
+ property public final int keyboardType;
+ property public final boolean singleLine;
+ field public static final androidx.compose.ui.text.input.ImeOptions.Companion Companion;
+ }
+
+ public static final class ImeOptions.Companion {
+ method public androidx.compose.ui.text.input.ImeOptions getDefault();
+ property public final androidx.compose.ui.text.input.ImeOptions Default;
+ }
+
+ @Deprecated public interface InputEventCallback {
+ method @Deprecated public void onEditCommands(java.util.List<? extends androidx.compose.ui.text.input.EditCommand> editCommands);
+ method @Deprecated public void onImeAction(int imeAction);
+ }
+
+ @kotlin.jvm.JvmInline public final value class KeyboardCapitalization {
+ field public static final androidx.compose.ui.text.input.KeyboardCapitalization.Companion Companion;
+ }
+
+ public static final class KeyboardCapitalization.Companion {
+ method public int getCharacters();
+ method public int getNone();
+ method public int getSentences();
+ method public int getWords();
+ property public final int Characters;
+ property public final int None;
+ property public final int Sentences;
+ property public final int Words;
+ }
+
+ @kotlin.jvm.JvmInline public final value class KeyboardType {
+ field public static final androidx.compose.ui.text.input.KeyboardType.Companion Companion;
+ }
+
+ public static final class KeyboardType.Companion {
+ method public int getAscii();
+ method public int getDecimal();
+ method public int getEmail();
+ method public int getNumber();
+ method public int getNumberPassword();
+ method public int getPassword();
+ method public int getPhone();
+ method public int getText();
+ method public int getUri();
+ property public final int Ascii;
+ property public final int Decimal;
+ property public final int Email;
+ property public final int Number;
+ property public final int NumberPassword;
+ property public final int Password;
+ property public final int Phone;
+ property public final int Text;
+ property public final int Uri;
+ }
+
+ public final class MoveCursorCommand implements androidx.compose.ui.text.input.EditCommand {
+ ctor public MoveCursorCommand(int amount);
+ method public void applyTo(androidx.compose.ui.text.input.EditingBuffer buffer);
+ method public int getAmount();
+ property public final int amount;
+ }
+
+ public interface OffsetMapping {
+ method public int originalToTransformed(int offset);
+ method public int transformedToOriginal(int offset);
+ field public static final androidx.compose.ui.text.input.OffsetMapping.Companion Companion;
+ }
+
+ public static final class OffsetMapping.Companion {
+ method public androidx.compose.ui.text.input.OffsetMapping getIdentity();
+ property public final androidx.compose.ui.text.input.OffsetMapping Identity;
+ }
+
+ public final class PasswordVisualTransformation implements androidx.compose.ui.text.input.VisualTransformation {
+ ctor public PasswordVisualTransformation(optional char mask);
+ method public androidx.compose.ui.text.input.TransformedText filter(androidx.compose.ui.text.AnnotatedString text);
+ method public char getMask();
+ property public final char mask;
+ }
+
+ public interface PlatformTextInputService {
+ method public void hideSoftwareKeyboard();
+ method @Deprecated public default void notifyFocusedRect(androidx.compose.ui.geometry.Rect rect);
+ method public void showSoftwareKeyboard();
+ method public void startInput(androidx.compose.ui.text.input.TextFieldValue value, androidx.compose.ui.text.input.ImeOptions imeOptions, kotlin.jvm.functions.Function1<? super java.util.List<? extends androidx.compose.ui.text.input.EditCommand>,kotlin.Unit> onEditCommand, kotlin.jvm.functions.Function1<? super androidx.compose.ui.text.input.ImeAction,kotlin.Unit> onImeActionPerformed);
+ method public void stopInput();
+ method public void updateState(androidx.compose.ui.text.input.TextFieldValue? oldValue, androidx.compose.ui.text.input.TextFieldValue newValue);
+ }
+
+ public final class SetComposingRegionCommand implements androidx.compose.ui.text.input.EditCommand {
+ ctor public SetComposingRegionCommand(int start, int end);
+ method public void applyTo(androidx.compose.ui.text.input.EditingBuffer buffer);
+ method public int getEnd();
+ method public int getStart();
+ property public final int end;
+ property public final int start;
+ }
+
+ public final class SetComposingTextCommand implements androidx.compose.ui.text.input.EditCommand {
+ ctor public SetComposingTextCommand(androidx.compose.ui.text.AnnotatedString annotatedString, int newCursorPosition);
+ ctor public SetComposingTextCommand(String text, int newCursorPosition);
+ method public void applyTo(androidx.compose.ui.text.input.EditingBuffer buffer);
+ method public androidx.compose.ui.text.AnnotatedString getAnnotatedString();
+ method public int getNewCursorPosition();
+ method public String getText();
+ property public final androidx.compose.ui.text.AnnotatedString annotatedString;
+ property public final int newCursorPosition;
+ property public final String text;
+ }
+
+ public final class SetSelectionCommand implements androidx.compose.ui.text.input.EditCommand {
+ ctor public SetSelectionCommand(int start, int end);
+ method public void applyTo(androidx.compose.ui.text.input.EditingBuffer buffer);
+ method public int getEnd();
+ method public int getStart();
+ property public final int end;
+ property public final int start;
+ }
+
+ @androidx.compose.runtime.Immutable public final class TextFieldValue {
+ ctor public TextFieldValue(androidx.compose.ui.text.AnnotatedString annotatedString, optional long selection, optional androidx.compose.ui.text.TextRange? composition);
+ ctor public TextFieldValue(optional String text, optional long selection, optional androidx.compose.ui.text.TextRange? composition);
+ method public androidx.compose.ui.text.input.TextFieldValue copy(optional androidx.compose.ui.text.AnnotatedString annotatedString, optional long selection, optional androidx.compose.ui.text.TextRange? composition);
+ method public androidx.compose.ui.text.input.TextFieldValue copy(String text, optional long selection, optional androidx.compose.ui.text.TextRange? composition);
+ method public androidx.compose.ui.text.AnnotatedString getAnnotatedString();
+ method public androidx.compose.ui.text.TextRange? getComposition();
+ method public long getSelection();
+ method public String getText();
+ property public final androidx.compose.ui.text.AnnotatedString annotatedString;
+ property public final androidx.compose.ui.text.TextRange? composition;
+ property public final long selection;
+ property public final String text;
+ field public static final androidx.compose.ui.text.input.TextFieldValue.Companion Companion;
+ }
+
+ public static final class TextFieldValue.Companion {
+ method public androidx.compose.runtime.saveable.Saver<androidx.compose.ui.text.input.TextFieldValue,java.lang.Object> getSaver();
+ property public final androidx.compose.runtime.saveable.Saver<androidx.compose.ui.text.input.TextFieldValue,java.lang.Object> Saver;
+ }
+
+ public final class TextFieldValueKt {
+ method public static androidx.compose.ui.text.AnnotatedString getSelectedText(androidx.compose.ui.text.input.TextFieldValue);
+ method public static androidx.compose.ui.text.AnnotatedString getTextAfterSelection(androidx.compose.ui.text.input.TextFieldValue, int maxChars);
+ method public static androidx.compose.ui.text.AnnotatedString getTextBeforeSelection(androidx.compose.ui.text.input.TextFieldValue, int maxChars);
+ }
+
+ public class TextInputService {
+ ctor public TextInputService(androidx.compose.ui.text.input.PlatformTextInputService platformTextInputService);
+ method public final void hideSoftwareKeyboard();
+ method public final void showSoftwareKeyboard();
+ method public androidx.compose.ui.text.input.TextInputSession startInput(androidx.compose.ui.text.input.TextFieldValue value, androidx.compose.ui.text.input.ImeOptions imeOptions, kotlin.jvm.functions.Function1<? super java.util.List<? extends androidx.compose.ui.text.input.EditCommand>,kotlin.Unit> onEditCommand, kotlin.jvm.functions.Function1<? super androidx.compose.ui.text.input.ImeAction,kotlin.Unit> onImeActionPerformed);
+ method public void stopInput(androidx.compose.ui.text.input.TextInputSession session);
+ }
+
+ public final class TextInputSession {
+ ctor public TextInputSession(androidx.compose.ui.text.input.TextInputService textInputService, androidx.compose.ui.text.input.PlatformTextInputService platformTextInputService);
+ method public void dispose();
+ method public boolean hideSoftwareKeyboard();
+ method public boolean isOpen();
+ method @Deprecated public boolean notifyFocusedRect(androidx.compose.ui.geometry.Rect rect);
+ method public boolean showSoftwareKeyboard();
+ method public boolean updateState(androidx.compose.ui.text.input.TextFieldValue? oldValue, androidx.compose.ui.text.input.TextFieldValue newValue);
+ property public final boolean isOpen;
+ }
+
+ public final class TransformedText {
+ ctor public TransformedText(androidx.compose.ui.text.AnnotatedString text, androidx.compose.ui.text.input.OffsetMapping offsetMapping);
+ method public androidx.compose.ui.text.input.OffsetMapping getOffsetMapping();
+ method public androidx.compose.ui.text.AnnotatedString getText();
+ property public final androidx.compose.ui.text.input.OffsetMapping offsetMapping;
+ property public final androidx.compose.ui.text.AnnotatedString text;
+ }
+
+ @androidx.compose.runtime.Immutable public fun interface VisualTransformation {
+ method public androidx.compose.ui.text.input.TransformedText filter(androidx.compose.ui.text.AnnotatedString text);
+ field public static final androidx.compose.ui.text.input.VisualTransformation.Companion Companion;
+ }
+
+ public static final class VisualTransformation.Companion {
+ method public androidx.compose.ui.text.input.VisualTransformation getNone();
+ property public final androidx.compose.ui.text.input.VisualTransformation None;
+ }
+
+}
+
+package androidx.compose.ui.text.intl {
+
+ public final class AndroidPlatformLocale_androidKt {
+ }
+
+ @androidx.compose.runtime.Immutable public final class Locale {
+ ctor public Locale(String languageTag);
+ method public String getLanguage();
+ method public String getRegion();
+ method public String getScript();
+ method public String toLanguageTag();
+ property public final String language;
+ property public final String region;
+ property public final String script;
+ field public static final androidx.compose.ui.text.intl.Locale.Companion Companion;
+ }
+
+ public static final class Locale.Companion {
+ method public androidx.compose.ui.text.intl.Locale getCurrent();
+ property public final androidx.compose.ui.text.intl.Locale current;
+ }
+
+ @androidx.compose.runtime.Immutable public final class LocaleList implements java.util.Collection<androidx.compose.ui.text.intl.Locale> kotlin.jvm.internal.markers.KMappedMarker {
+ ctor public LocaleList(java.util.List<androidx.compose.ui.text.intl.Locale> localeList);
+ ctor public LocaleList(String languageTags);
+ ctor public LocaleList(androidx.compose.ui.text.intl.Locale... locales);
+ method public operator boolean contains(androidx.compose.ui.text.intl.Locale element);
+ method public boolean containsAll(java.util.Collection<E!> elements);
+ method public operator androidx.compose.ui.text.intl.Locale get(int i);
+ method public java.util.List<androidx.compose.ui.text.intl.Locale> getLocaleList();
+ method public int getSize();
+ method public boolean isEmpty();
+ method public java.util.Iterator<androidx.compose.ui.text.intl.Locale> iterator();
+ property public final java.util.List<androidx.compose.ui.text.intl.Locale> localeList;
+ property public int size;
+ field public static final androidx.compose.ui.text.intl.LocaleList.Companion Companion;
+ }
+
+ public static final class LocaleList.Companion {
+ method public androidx.compose.ui.text.intl.LocaleList getCurrent();
+ property public final androidx.compose.ui.text.intl.LocaleList current;
+ }
+
+ public final class PlatformLocaleKt {
+ }
+
+}
+
+package androidx.compose.ui.text.platform {
+
+ public final class AndroidAccessibilitySpannableString_androidKt {
+ }
+
+ public final class AndroidParagraphHelper_androidKt {
+ }
+
+ public final class AndroidParagraphIntrinsics_androidKt {
+ }
+
+ public final class AndroidParagraph_androidKt {
+ }
+
+ public final class AndroidStringDelegate_androidKt {
+ }
+
+ public final class Synchronization_jvmKt {
+ }
+
+}
+
+package androidx.compose.ui.text.platform.extensions {
+
+ public final class LocaleExtensions_androidKt {
+ }
+
+ public final class PlaceholderExtensions_androidKt {
+ }
+
+ public final class SpannableExtensions_androidKt {
+ }
+
+ public final class TextPaintExtensions_androidKt {
+ }
+
+ public final class TtsAnnotationExtensions_androidKt {
+ method public static android.text.style.TtsSpan toSpan(androidx.compose.ui.text.TtsAnnotation);
+ method public static android.text.style.TtsSpan toSpan(androidx.compose.ui.text.VerbatimTtsAnnotation);
+ }
+
+}
+
+package androidx.compose.ui.text.style {
+
+ @androidx.compose.runtime.Immutable @kotlin.jvm.JvmInline public final value class BaselineShift {
+ ctor public BaselineShift(float multiplier);
+ method public float getMultiplier();
+ property public final float multiplier;
+ field public static final androidx.compose.ui.text.style.BaselineShift.Companion Companion;
+ }
+
+ public static final class BaselineShift.Companion {
+ method public float getNone();
+ 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 @androidx.compose.runtime.Stable public static float lerp(float start, float stop, float fraction);
+ }
+
+ @androidx.compose.ui.text.ExperimentalTextApi public final class LineHeightStyle {
+ ctor public LineHeightStyle(int alignment, int trim);
+ method public int getAlignment();
+ method public int getTrim();
+ property public final int alignment;
+ property public final int trim;
+ field public static final androidx.compose.ui.text.style.LineHeightStyle.Companion Companion;
+ }
+
+ @androidx.compose.ui.text.ExperimentalTextApi @kotlin.jvm.JvmInline public static final value class LineHeightStyle.Alignment {
+ field public static final androidx.compose.ui.text.style.LineHeightStyle.Alignment.Companion Companion;
+ }
+
+ public static final class LineHeightStyle.Alignment.Companion {
+ method public int getBottom();
+ method public int getCenter();
+ method public int getProportional();
+ method public int getTop();
+ property public final int Bottom;
+ property public final int Center;
+ property public final int Proportional;
+ property public final int Top;
+ }
+
+ public static final class LineHeightStyle.Companion {
+ method public androidx.compose.ui.text.style.LineHeightStyle getDefault();
+ property public final androidx.compose.ui.text.style.LineHeightStyle Default;
+ }
+
+ @androidx.compose.ui.text.ExperimentalTextApi @kotlin.jvm.JvmInline public static final value class LineHeightStyle.Trim {
+ field public static final androidx.compose.ui.text.style.LineHeightStyle.Trim.Companion Companion;
+ }
+
+ public static final class LineHeightStyle.Trim.Companion {
+ method public int getBoth();
+ method public int getFirstLineTop();
+ method public int getLastLineBottom();
+ method public int getNone();
+ property public final int Both;
+ property public final int FirstLineTop;
+ property public final int LastLineBottom;
+ property public final int None;
+ }
+
+ public enum ResolvedTextDirection {
+ enum_constant public static final androidx.compose.ui.text.style.ResolvedTextDirection Ltr;
+ enum_constant public static final androidx.compose.ui.text.style.ResolvedTextDirection Rtl;
+ }
+
+ @kotlin.jvm.JvmInline public final value class TextAlign {
+ field public static final androidx.compose.ui.text.style.TextAlign.Companion Companion;
+ }
+
+ public static final class TextAlign.Companion {
+ method public int getCenter();
+ method public int getEnd();
+ method public int getJustify();
+ method public int getLeft();
+ method public int getRight();
+ method public int getStart();
+ method public java.util.List<androidx.compose.ui.text.style.TextAlign> values();
+ property public final int Center;
+ property public final int End;
+ property public final int Justify;
+ property public final int Left;
+ property public final int Right;
+ property public final int Start;
+ }
+
+ @androidx.compose.runtime.Immutable public final class TextDecoration {
+ method public operator boolean contains(androidx.compose.ui.text.style.TextDecoration other);
+ method public operator boolean equals(Object? other);
+ method public int getMask();
+ method public operator androidx.compose.ui.text.style.TextDecoration plus(androidx.compose.ui.text.style.TextDecoration decoration);
+ property public final int mask;
+ field public static final androidx.compose.ui.text.style.TextDecoration.Companion Companion;
+ }
+
+ public static final class TextDecoration.Companion {
+ method public androidx.compose.ui.text.style.TextDecoration combine(java.util.List<androidx.compose.ui.text.style.TextDecoration> decorations);
+ method public androidx.compose.ui.text.style.TextDecoration getLineThrough();
+ method public androidx.compose.ui.text.style.TextDecoration getNone();
+ method public androidx.compose.ui.text.style.TextDecoration getUnderline();
+ property public final androidx.compose.ui.text.style.TextDecoration LineThrough;
+ property public final androidx.compose.ui.text.style.TextDecoration None;
+ property public final androidx.compose.ui.text.style.TextDecoration Underline;
+ }
+
+ @kotlin.jvm.JvmInline public final value class TextDirection {
+ field public static final androidx.compose.ui.text.style.TextDirection.Companion Companion;
+ }
+
+ public static final class TextDirection.Companion {
+ method public int getContent();
+ method public int getContentOrLtr();
+ method public int getContentOrRtl();
+ method public int getLtr();
+ method public int getRtl();
+ property public final int Content;
+ property public final int ContentOrLtr;
+ property public final int ContentOrRtl;
+ property public final int Ltr;
+ property public final int Rtl;
+ }
+
+ public final class TextDrawStyleKt {
+ }
+
+ @androidx.compose.runtime.Immutable public final class TextGeometricTransform {
+ ctor public TextGeometricTransform(optional float scaleX, optional float skewX);
+ method public androidx.compose.ui.text.style.TextGeometricTransform copy(optional float scaleX, optional float skewX);
+ method public operator boolean equals(Object? other);
+ method public float getScaleX();
+ method public float getSkewX();
+ property public final float scaleX;
+ property public final float skewX;
+ field public static final androidx.compose.ui.text.style.TextGeometricTransform.Companion Companion;
+ }
+
+ public static final class TextGeometricTransform.Companion {
+ }
+
+ public final class TextGeometricTransformKt {
+ method public static androidx.compose.ui.text.style.TextGeometricTransform lerp(androidx.compose.ui.text.style.TextGeometricTransform start, androidx.compose.ui.text.style.TextGeometricTransform stop, float fraction);
+ }
+
+ @androidx.compose.runtime.Immutable public final class TextIndent {
+ ctor public TextIndent(optional long firstLine, optional long restLine);
+ method public androidx.compose.ui.text.style.TextIndent copy(optional long firstLine, optional long restLine);
+ method public operator boolean equals(Object? other);
+ method public long getFirstLine();
+ method public long getRestLine();
+ property public final long firstLine;
+ property public final long restLine;
+ field public static final androidx.compose.ui.text.style.TextIndent.Companion Companion;
+ }
+
+ public static final class TextIndent.Companion {
+ method public androidx.compose.ui.text.style.TextIndent getNone();
+ property public final androidx.compose.ui.text.style.TextIndent None;
+ }
+
+ public final class TextIndentKt {
+ method public static androidx.compose.ui.text.style.TextIndent lerp(androidx.compose.ui.text.style.TextIndent start, androidx.compose.ui.text.style.TextIndent stop, float fraction);
+ }
+
+ @kotlin.jvm.JvmInline public final value class TextOverflow {
+ field public static final androidx.compose.ui.text.style.TextOverflow.Companion Companion;
+ }
+
+ public static final class TextOverflow.Companion {
+ method public int getClip();
+ method public int getEllipsis();
+ method public int getVisible();
+ property public final int Clip;
+ property public final int Ellipsis;
+ property public final int Visible;
+ }
+
+}
+
diff --git a/compose/ui/ui-text/api/res-1.2.0-beta02.txt b/compose/ui/ui-text/api/res-1.2.0-beta02.txt
new file mode 100644
index 0000000..e69de29
--- /dev/null
+++ b/compose/ui/ui-text/api/res-1.2.0-beta02.txt
diff --git a/compose/ui/ui-text/api/restricted_1.2.0-beta02.txt b/compose/ui/ui-text/api/restricted_1.2.0-beta02.txt
new file mode 100644
index 0000000..23a9c3a9
--- /dev/null
+++ b/compose/ui/ui-text/api/restricted_1.2.0-beta02.txt
@@ -0,0 +1,1318 @@
+// Signature format: 4.0
+package androidx.compose.ui.text {
+
+ public final class ActualAtomicReferenceJvmKt {
+ }
+
+ public final class AndroidTextStyle_androidKt {
+ }
+
+ @androidx.compose.runtime.Immutable public final class AnnotatedString implements java.lang.CharSequence {
+ ctor public AnnotatedString(String text, optional java.util.List<androidx.compose.ui.text.AnnotatedString.Range<androidx.compose.ui.text.SpanStyle>> spanStyles, optional java.util.List<androidx.compose.ui.text.AnnotatedString.Range<androidx.compose.ui.text.ParagraphStyle>> paragraphStyles);
+ method public operator char get(int index);
+ method public int getLength();
+ method public java.util.List<androidx.compose.ui.text.AnnotatedString.Range<androidx.compose.ui.text.ParagraphStyle>> getParagraphStyles();
+ method public java.util.List<androidx.compose.ui.text.AnnotatedString.Range<androidx.compose.ui.text.SpanStyle>> getSpanStyles();
+ method public java.util.List<androidx.compose.ui.text.AnnotatedString.Range<java.lang.String>> getStringAnnotations(String tag, int start, int end);
+ method public java.util.List<androidx.compose.ui.text.AnnotatedString.Range<java.lang.String>> getStringAnnotations(int start, int end);
+ method public String getText();
+ method public java.util.List<androidx.compose.ui.text.AnnotatedString.Range<androidx.compose.ui.text.TtsAnnotation>> getTtsAnnotations(int start, int end);
+ method @androidx.compose.runtime.Stable public operator androidx.compose.ui.text.AnnotatedString plus(androidx.compose.ui.text.AnnotatedString other);
+ method public androidx.compose.ui.text.AnnotatedString subSequence(int startIndex, int endIndex);
+ method public androidx.compose.ui.text.AnnotatedString subSequence(long range);
+ property public int length;
+ property public final java.util.List<androidx.compose.ui.text.AnnotatedString.Range<androidx.compose.ui.text.ParagraphStyle>> paragraphStyles;
+ property public final java.util.List<androidx.compose.ui.text.AnnotatedString.Range<androidx.compose.ui.text.SpanStyle>> spanStyles;
+ property public final String text;
+ }
+
+ public static final class AnnotatedString.Builder {
+ ctor public AnnotatedString.Builder(optional int capacity);
+ ctor public AnnotatedString.Builder(String text);
+ ctor public AnnotatedString.Builder(androidx.compose.ui.text.AnnotatedString text);
+ method public void addStringAnnotation(String tag, String annotation, int start, int end);
+ method public void addStyle(androidx.compose.ui.text.SpanStyle style, int start, int end);
+ method public void addStyle(androidx.compose.ui.text.ParagraphStyle style, int start, int end);
+ method public void append(String text);
+ method public void append(char char);
+ method public void append(androidx.compose.ui.text.AnnotatedString text);
+ method public int getLength();
+ method public void pop();
+ method public void pop(int index);
+ method public int pushStringAnnotation(String tag, String annotation);
+ method public int pushStyle(androidx.compose.ui.text.SpanStyle style);
+ method public int pushStyle(androidx.compose.ui.text.ParagraphStyle style);
+ method public int pushTtsAnnotation(androidx.compose.ui.text.TtsAnnotation ttsAnnotation);
+ method public androidx.compose.ui.text.AnnotatedString toAnnotatedString();
+ property public final int length;
+ }
+
+ @androidx.compose.runtime.Immutable public static final class AnnotatedString.Range<T> {
+ ctor public AnnotatedString.Range(T? item, int start, int end, String tag);
+ ctor public AnnotatedString.Range(T? item, int start, int end);
+ method public T! component1();
+ method public int component2();
+ method public int component3();
+ method public String component4();
+ method public androidx.compose.ui.text.AnnotatedString.Range<T> copy(T! item, int start, int end, String tag);
+ method public int getEnd();
+ method public T! getItem();
+ method public int getStart();
+ method public String getTag();
+ property public final int end;
+ property public final T! item;
+ property public final int start;
+ property public final String tag;
+ }
+
+ public final class AnnotatedStringKt {
+ method public static androidx.compose.ui.text.AnnotatedString AnnotatedString(String text, androidx.compose.ui.text.SpanStyle spanStyle, optional androidx.compose.ui.text.ParagraphStyle? paragraphStyle);
+ method public static androidx.compose.ui.text.AnnotatedString AnnotatedString(String text, androidx.compose.ui.text.ParagraphStyle paragraphStyle);
+ method public static inline androidx.compose.ui.text.AnnotatedString buildAnnotatedString(kotlin.jvm.functions.Function1<? super androidx.compose.ui.text.AnnotatedString.Builder,kotlin.Unit> builder);
+ method public static androidx.compose.ui.text.AnnotatedString capitalize(androidx.compose.ui.text.AnnotatedString, optional androidx.compose.ui.text.intl.LocaleList localeList);
+ method public static androidx.compose.ui.text.AnnotatedString decapitalize(androidx.compose.ui.text.AnnotatedString, optional androidx.compose.ui.text.intl.LocaleList localeList);
+ method public static androidx.compose.ui.text.AnnotatedString toLowerCase(androidx.compose.ui.text.AnnotatedString, optional androidx.compose.ui.text.intl.LocaleList localeList);
+ method public static androidx.compose.ui.text.AnnotatedString toUpperCase(androidx.compose.ui.text.AnnotatedString, optional androidx.compose.ui.text.intl.LocaleList localeList);
+ method public static inline <R> R withStyle(androidx.compose.ui.text.AnnotatedString.Builder, androidx.compose.ui.text.SpanStyle style, kotlin.jvm.functions.Function1<? super androidx.compose.ui.text.AnnotatedString.Builder,? extends R> block);
+ method public static inline <R> R withStyle(androidx.compose.ui.text.AnnotatedString.Builder, androidx.compose.ui.text.ParagraphStyle style, kotlin.jvm.functions.Function1<? super androidx.compose.ui.text.AnnotatedString.Builder,? extends R> block);
+ }
+
+ public final class JvmAnnotatedString_jvmKt {
+ }
+
+ public final class JvmCharHelpers_androidKt {
+ }
+
+ public final class MultiParagraph {
+ ctor public MultiParagraph(androidx.compose.ui.text.MultiParagraphIntrinsics intrinsics, long constraints, optional int maxLines, optional boolean ellipsis);
+ ctor @Deprecated public MultiParagraph(androidx.compose.ui.text.MultiParagraphIntrinsics intrinsics, optional int maxLines, optional boolean ellipsis, float width);
+ ctor @Deprecated public MultiParagraph(androidx.compose.ui.text.AnnotatedString annotatedString, androidx.compose.ui.text.TextStyle style, optional java.util.List<androidx.compose.ui.text.AnnotatedString.Range<androidx.compose.ui.text.Placeholder>> placeholders, optional int maxLines, optional boolean ellipsis, float width, androidx.compose.ui.unit.Density density, androidx.compose.ui.text.font.Font.ResourceLoader resourceLoader);
+ ctor @Deprecated public MultiParagraph(androidx.compose.ui.text.AnnotatedString annotatedString, androidx.compose.ui.text.TextStyle style, float width, androidx.compose.ui.unit.Density density, androidx.compose.ui.text.font.FontFamily.Resolver fontFamilyResolver, optional java.util.List<androidx.compose.ui.text.AnnotatedString.Range<androidx.compose.ui.text.Placeholder>> placeholders, optional int maxLines, optional boolean ellipsis);
+ ctor public MultiParagraph(androidx.compose.ui.text.AnnotatedString annotatedString, androidx.compose.ui.text.TextStyle style, long constraints, androidx.compose.ui.unit.Density density, androidx.compose.ui.text.font.FontFamily.Resolver fontFamilyResolver, optional java.util.List<androidx.compose.ui.text.AnnotatedString.Range<androidx.compose.ui.text.Placeholder>> placeholders, optional int maxLines, optional boolean ellipsis);
+ method public androidx.compose.ui.text.style.ResolvedTextDirection getBidiRunDirection(int offset);
+ method public androidx.compose.ui.geometry.Rect getBoundingBox(int offset);
+ method public androidx.compose.ui.geometry.Rect getCursorRect(int offset);
+ method public boolean getDidExceedMaxLines();
+ method public float getFirstBaseline();
+ method public float getHeight();
+ method public float getHorizontalPosition(int offset, boolean usePrimaryDirection);
+ method public androidx.compose.ui.text.MultiParagraphIntrinsics getIntrinsics();
+ method public float getLastBaseline();
+ method public float getLineBottom(int lineIndex);
+ method public int getLineCount();
+ method public int getLineEnd(int lineIndex, optional boolean visibleEnd);
+ method public int getLineForOffset(int offset);
+ method public int getLineForVerticalPosition(float vertical);
+ method public float getLineHeight(int lineIndex);
+ method public float getLineLeft(int lineIndex);
+ method public float getLineRight(int lineIndex);
+ method public int getLineStart(int lineIndex);
+ method public float getLineTop(int lineIndex);
+ method public float getLineWidth(int lineIndex);
+ method public float getMaxIntrinsicWidth();
+ method public int getMaxLines();
+ method public float getMinIntrinsicWidth();
+ method public int getOffsetForPosition(long position);
+ method public androidx.compose.ui.text.style.ResolvedTextDirection getParagraphDirection(int offset);
+ method public androidx.compose.ui.graphics.Path getPathForRange(int start, int end);
+ method public java.util.List<androidx.compose.ui.geometry.Rect> getPlaceholderRects();
+ method public float getWidth();
+ method public long getWordBoundary(int offset);
+ method public boolean isLineEllipsized(int lineIndex);
+ method public void paint(androidx.compose.ui.graphics.Canvas canvas, optional long color, optional androidx.compose.ui.graphics.Shadow? shadow, optional androidx.compose.ui.text.style.TextDecoration? decoration);
+ property public final boolean didExceedMaxLines;
+ property public final float firstBaseline;
+ property public final float height;
+ property public final androidx.compose.ui.text.MultiParagraphIntrinsics intrinsics;
+ property public final float lastBaseline;
+ property public final int lineCount;
+ property public final float maxIntrinsicWidth;
+ property public final int maxLines;
+ property public final float minIntrinsicWidth;
+ property public final java.util.List<androidx.compose.ui.geometry.Rect> placeholderRects;
+ property public final float width;
+ }
+
+ public final class MultiParagraphIntrinsics implements androidx.compose.ui.text.ParagraphIntrinsics {
+ ctor public MultiParagraphIntrinsics(androidx.compose.ui.text.AnnotatedString annotatedString, androidx.compose.ui.text.TextStyle style, java.util.List<androidx.compose.ui.text.AnnotatedString.Range<androidx.compose.ui.text.Placeholder>> placeholders, androidx.compose.ui.unit.Density density, androidx.compose.ui.text.font.FontFamily.Resolver fontFamilyResolver);
+ ctor @Deprecated public MultiParagraphIntrinsics(androidx.compose.ui.text.AnnotatedString annotatedString, androidx.compose.ui.text.TextStyle style, java.util.List<androidx.compose.ui.text.AnnotatedString.Range<androidx.compose.ui.text.Placeholder>> placeholders, androidx.compose.ui.unit.Density density, androidx.compose.ui.text.font.Font.ResourceLoader resourceLoader);
+ method public androidx.compose.ui.text.AnnotatedString getAnnotatedString();
+ method public float getMaxIntrinsicWidth();
+ method public float getMinIntrinsicWidth();
+ method public java.util.List<androidx.compose.ui.text.AnnotatedString.Range<androidx.compose.ui.text.Placeholder>> getPlaceholders();
+ property public final androidx.compose.ui.text.AnnotatedString annotatedString;
+ property public boolean hasStaleResolvedFonts;
+ property public float maxIntrinsicWidth;
+ property public float minIntrinsicWidth;
+ property public final java.util.List<androidx.compose.ui.text.AnnotatedString.Range<androidx.compose.ui.text.Placeholder>> placeholders;
+ }
+
+ public final class MultiParagraphIntrinsicsKt {
+ }
+
+ public final class MultiParagraphKt {
+ }
+
+ public interface Paragraph {
+ method public androidx.compose.ui.text.style.ResolvedTextDirection getBidiRunDirection(int offset);
+ method public androidx.compose.ui.geometry.Rect getBoundingBox(int offset);
+ method public androidx.compose.ui.geometry.Rect getCursorRect(int offset);
+ method public boolean getDidExceedMaxLines();
+ method public float getFirstBaseline();
+ method public float getHeight();
+ method public float getHorizontalPosition(int offset, boolean usePrimaryDirection);
+ method public float getLastBaseline();
+ method public float getLineBottom(int lineIndex);
+ method public int getLineCount();
+ method public int getLineEnd(int lineIndex, optional boolean visibleEnd);
+ method public int getLineForOffset(int offset);
+ method public int getLineForVerticalPosition(float vertical);
+ method public float getLineHeight(int lineIndex);
+ method public float getLineLeft(int lineIndex);
+ method public float getLineRight(int lineIndex);
+ method public int getLineStart(int lineIndex);
+ method public float getLineTop(int lineIndex);
+ method public float getLineWidth(int lineIndex);
+ method public float getMaxIntrinsicWidth();
+ method public float getMinIntrinsicWidth();
+ method public int getOffsetForPosition(long position);
+ method public androidx.compose.ui.text.style.ResolvedTextDirection getParagraphDirection(int offset);
+ method public androidx.compose.ui.graphics.Path getPathForRange(int start, int end);
+ method public java.util.List<androidx.compose.ui.geometry.Rect> getPlaceholderRects();
+ method public float getWidth();
+ method public long getWordBoundary(int offset);
+ method public boolean isLineEllipsized(int lineIndex);
+ method public void paint(androidx.compose.ui.graphics.Canvas canvas, optional long color, optional androidx.compose.ui.graphics.Shadow? shadow, optional androidx.compose.ui.text.style.TextDecoration? textDecoration);
+ property public abstract boolean didExceedMaxLines;
+ property public abstract float firstBaseline;
+ property public abstract float height;
+ property public abstract float lastBaseline;
+ property public abstract int lineCount;
+ property public abstract float maxIntrinsicWidth;
+ property public abstract float minIntrinsicWidth;
+ property public abstract java.util.List<androidx.compose.ui.geometry.Rect> placeholderRects;
+ property public abstract float width;
+ }
+
+ public interface ParagraphIntrinsics {
+ method public default boolean getHasStaleResolvedFonts();
+ method public float getMaxIntrinsicWidth();
+ method public float getMinIntrinsicWidth();
+ property public default boolean hasStaleResolvedFonts;
+ property public abstract float maxIntrinsicWidth;
+ property public abstract float minIntrinsicWidth;
+ }
+
+ public final class ParagraphIntrinsicsKt {
+ method @Deprecated public static androidx.compose.ui.text.ParagraphIntrinsics ParagraphIntrinsics(String text, androidx.compose.ui.text.TextStyle style, optional java.util.List<androidx.compose.ui.text.AnnotatedString.Range<androidx.compose.ui.text.SpanStyle>> spanStyles, optional java.util.List<androidx.compose.ui.text.AnnotatedString.Range<androidx.compose.ui.text.Placeholder>> placeholders, androidx.compose.ui.unit.Density density, androidx.compose.ui.text.font.Font.ResourceLoader resourceLoader);
+ method public static androidx.compose.ui.text.ParagraphIntrinsics ParagraphIntrinsics(String text, androidx.compose.ui.text.TextStyle style, optional java.util.List<androidx.compose.ui.text.AnnotatedString.Range<androidx.compose.ui.text.SpanStyle>> spanStyles, optional java.util.List<androidx.compose.ui.text.AnnotatedString.Range<androidx.compose.ui.text.Placeholder>> placeholders, androidx.compose.ui.unit.Density density, androidx.compose.ui.text.font.FontFamily.Resolver fontFamilyResolver);
+ }
+
+ public final class ParagraphKt {
+ method @Deprecated public static androidx.compose.ui.text.Paragraph Paragraph(String text, androidx.compose.ui.text.TextStyle style, optional java.util.List<androidx.compose.ui.text.AnnotatedString.Range<androidx.compose.ui.text.SpanStyle>> spanStyles, optional java.util.List<androidx.compose.ui.text.AnnotatedString.Range<androidx.compose.ui.text.Placeholder>> placeholders, optional int maxLines, optional boolean ellipsis, float width, androidx.compose.ui.unit.Density density, androidx.compose.ui.text.font.Font.ResourceLoader resourceLoader);
+ method @Deprecated public static androidx.compose.ui.text.Paragraph Paragraph(String text, androidx.compose.ui.text.TextStyle style, float width, androidx.compose.ui.unit.Density density, androidx.compose.ui.text.font.FontFamily.Resolver fontFamilyResolver, optional java.util.List<androidx.compose.ui.text.AnnotatedString.Range<androidx.compose.ui.text.SpanStyle>> spanStyles, optional java.util.List<androidx.compose.ui.text.AnnotatedString.Range<androidx.compose.ui.text.Placeholder>> placeholders, optional int maxLines, optional boolean ellipsis);
+ method public static androidx.compose.ui.text.Paragraph Paragraph(String text, androidx.compose.ui.text.TextStyle style, long constraints, androidx.compose.ui.unit.Density density, androidx.compose.ui.text.font.FontFamily.Resolver fontFamilyResolver, optional java.util.List<androidx.compose.ui.text.AnnotatedString.Range<androidx.compose.ui.text.SpanStyle>> spanStyles, optional java.util.List<androidx.compose.ui.text.AnnotatedString.Range<androidx.compose.ui.text.Placeholder>> placeholders, optional int maxLines, optional boolean ellipsis);
+ method @Deprecated public static androidx.compose.ui.text.Paragraph Paragraph(androidx.compose.ui.text.ParagraphIntrinsics paragraphIntrinsics, optional int maxLines, optional boolean ellipsis, float width);
+ method public static androidx.compose.ui.text.Paragraph Paragraph(androidx.compose.ui.text.ParagraphIntrinsics paragraphIntrinsics, long constraints, optional int maxLines, optional boolean ellipsis);
+ }
+
+ @androidx.compose.runtime.Immutable public final class ParagraphStyle {
+ ctor public ParagraphStyle(optional androidx.compose.ui.text.style.TextAlign? textAlign, optional androidx.compose.ui.text.style.TextDirection? textDirection, optional long lineHeight, optional androidx.compose.ui.text.style.TextIndent? textIndent);
+ method public androidx.compose.ui.text.ParagraphStyle copy(optional androidx.compose.ui.text.style.TextAlign? textAlign, optional androidx.compose.ui.text.style.TextDirection? textDirection, optional long lineHeight, optional androidx.compose.ui.text.style.TextIndent? textIndent);
+ method public operator boolean equals(Object? other);
+ method public long getLineHeight();
+ method public androidx.compose.ui.text.style.TextAlign? getTextAlign();
+ method public androidx.compose.ui.text.style.TextDirection? getTextDirection();
+ method public androidx.compose.ui.text.style.TextIndent? getTextIndent();
+ method @androidx.compose.runtime.Stable public androidx.compose.ui.text.ParagraphStyle merge(optional androidx.compose.ui.text.ParagraphStyle? other);
+ method @androidx.compose.runtime.Stable public operator androidx.compose.ui.text.ParagraphStyle plus(androidx.compose.ui.text.ParagraphStyle other);
+ property public final long lineHeight;
+ property public final androidx.compose.ui.text.style.TextAlign? textAlign;
+ property public final androidx.compose.ui.text.style.TextDirection? textDirection;
+ property public final androidx.compose.ui.text.style.TextIndent? textIndent;
+ }
+
+ public final class ParagraphStyleKt {
+ method @androidx.compose.runtime.Stable public static androidx.compose.ui.text.ParagraphStyle lerp(androidx.compose.ui.text.ParagraphStyle start, androidx.compose.ui.text.ParagraphStyle stop, float fraction);
+ }
+
+ @androidx.compose.runtime.Immutable public final class Placeholder {
+ ctor public Placeholder(long width, long height, int placeholderVerticalAlign);
+ method public androidx.compose.ui.text.Placeholder copy(optional long width, optional long height, optional int placeholderVerticalAlign);
+ method public operator boolean equals(Object? other);
+ method public long getHeight();
+ method public int getPlaceholderVerticalAlign();
+ method public long getWidth();
+ property public final long height;
+ property public final int placeholderVerticalAlign;
+ property public final long width;
+ }
+
+ @kotlin.jvm.JvmInline public final value class PlaceholderVerticalAlign {
+ field public static final androidx.compose.ui.text.PlaceholderVerticalAlign.Companion Companion;
+ }
+
+ public static final class PlaceholderVerticalAlign.Companion {
+ method public int getAboveBaseline();
+ method public int getBottom();
+ method public int getCenter();
+ method public int getTextBottom();
+ method public int getTextCenter();
+ method public int getTextTop();
+ method public int getTop();
+ property public final int AboveBaseline;
+ property public final int Bottom;
+ property public final int Center;
+ property public final int TextBottom;
+ property public final int TextCenter;
+ property public final int TextTop;
+ property public final int Top;
+ }
+
+ public final class SaversKt {
+ }
+
+ @androidx.compose.runtime.Immutable public final class SpanStyle {
+ ctor public SpanStyle(optional long color, optional long fontSize, optional androidx.compose.ui.text.font.FontWeight? fontWeight, optional androidx.compose.ui.text.font.FontStyle? fontStyle, optional androidx.compose.ui.text.font.FontSynthesis? fontSynthesis, optional androidx.compose.ui.text.font.FontFamily? fontFamily, optional String? fontFeatureSettings, optional long letterSpacing, optional androidx.compose.ui.text.style.BaselineShift? baselineShift, optional androidx.compose.ui.text.style.TextGeometricTransform? textGeometricTransform, optional androidx.compose.ui.text.intl.LocaleList? localeList, optional long background, optional androidx.compose.ui.text.style.TextDecoration? textDecoration, optional androidx.compose.ui.graphics.Shadow? shadow);
+ method public androidx.compose.ui.text.SpanStyle copy(optional long color, optional long fontSize, optional androidx.compose.ui.text.font.FontWeight? fontWeight, optional androidx.compose.ui.text.font.FontStyle? fontStyle, optional androidx.compose.ui.text.font.FontSynthesis? fontSynthesis, optional androidx.compose.ui.text.font.FontFamily? fontFamily, optional String? fontFeatureSettings, optional long letterSpacing, optional androidx.compose.ui.text.style.BaselineShift? baselineShift, optional androidx.compose.ui.text.style.TextGeometricTransform? textGeometricTransform, optional androidx.compose.ui.text.intl.LocaleList? localeList, optional long background, optional androidx.compose.ui.text.style.TextDecoration? textDecoration, optional androidx.compose.ui.graphics.Shadow? shadow);
+ method public operator boolean equals(Object? other);
+ method public long getBackground();
+ method public androidx.compose.ui.text.style.BaselineShift? getBaselineShift();
+ method public long getColor();
+ method public androidx.compose.ui.text.font.FontFamily? getFontFamily();
+ method public String? getFontFeatureSettings();
+ method public long getFontSize();
+ method public androidx.compose.ui.text.font.FontStyle? getFontStyle();
+ method public androidx.compose.ui.text.font.FontSynthesis? getFontSynthesis();
+ method public androidx.compose.ui.text.font.FontWeight? getFontWeight();
+ method public long getLetterSpacing();
+ method public androidx.compose.ui.text.intl.LocaleList? getLocaleList();
+ method public androidx.compose.ui.graphics.Shadow? getShadow();
+ method public androidx.compose.ui.text.style.TextDecoration? getTextDecoration();
+ method public androidx.compose.ui.text.style.TextGeometricTransform? getTextGeometricTransform();
+ method @androidx.compose.runtime.Stable public androidx.compose.ui.text.SpanStyle merge(optional androidx.compose.ui.text.SpanStyle? other);
+ method @androidx.compose.runtime.Stable public operator androidx.compose.ui.text.SpanStyle plus(androidx.compose.ui.text.SpanStyle other);
+ property public final long background;
+ property public final androidx.compose.ui.text.style.BaselineShift? baselineShift;
+ property public final long color;
+ property public final androidx.compose.ui.text.font.FontFamily? fontFamily;
+ property public final String? fontFeatureSettings;
+ property public final long fontSize;
+ property public final androidx.compose.ui.text.font.FontStyle? fontStyle;
+ property public final androidx.compose.ui.text.font.FontSynthesis? fontSynthesis;
+ property public final androidx.compose.ui.text.font.FontWeight? fontWeight;
+ property public final long letterSpacing;
+ property public final androidx.compose.ui.text.intl.LocaleList? localeList;
+ property public final androidx.compose.ui.graphics.Shadow? shadow;
+ property public final androidx.compose.ui.text.style.TextDecoration? textDecoration;
+ property public final androidx.compose.ui.text.style.TextGeometricTransform? textGeometricTransform;
+ }
+
+ public final class SpanStyleKt {
+ method public static androidx.compose.ui.text.SpanStyle lerp(androidx.compose.ui.text.SpanStyle start, androidx.compose.ui.text.SpanStyle stop, float fraction);
+ }
+
+ public final class StringKt {
+ method public static String capitalize(String, androidx.compose.ui.text.intl.Locale locale);
+ method public static String capitalize(String, androidx.compose.ui.text.intl.LocaleList localeList);
+ method public static String decapitalize(String, androidx.compose.ui.text.intl.Locale locale);
+ method public static String decapitalize(String, androidx.compose.ui.text.intl.LocaleList localeList);
+ method public static String toLowerCase(String, androidx.compose.ui.text.intl.Locale locale);
+ method public static String toLowerCase(String, androidx.compose.ui.text.intl.LocaleList localeList);
+ method public static String toUpperCase(String, androidx.compose.ui.text.intl.Locale locale);
+ method public static String toUpperCase(String, androidx.compose.ui.text.intl.LocaleList localeList);
+ }
+
+ public final class TempListUtilsKt {
+ }
+
+ public final class TextLayoutInput {
+ ctor @Deprecated public TextLayoutInput(androidx.compose.ui.text.AnnotatedString text, androidx.compose.ui.text.TextStyle style, java.util.List<androidx.compose.ui.text.AnnotatedString.Range<androidx.compose.ui.text.Placeholder>> placeholders, int maxLines, boolean softWrap, int overflow, androidx.compose.ui.unit.Density density, androidx.compose.ui.unit.LayoutDirection layoutDirection, androidx.compose.ui.text.font.Font.ResourceLoader resourceLoader, long constraints);
+ ctor public TextLayoutInput(androidx.compose.ui.text.AnnotatedString text, androidx.compose.ui.text.TextStyle style, java.util.List<androidx.compose.ui.text.AnnotatedString.Range<androidx.compose.ui.text.Placeholder>> placeholders, int maxLines, boolean softWrap, int overflow, androidx.compose.ui.unit.Density density, androidx.compose.ui.unit.LayoutDirection layoutDirection, androidx.compose.ui.text.font.FontFamily.Resolver fontFamilyResolver, long constraints);
+ method @Deprecated public androidx.compose.ui.text.TextLayoutInput copy(optional androidx.compose.ui.text.AnnotatedString text, optional androidx.compose.ui.text.TextStyle style, optional java.util.List<androidx.compose.ui.text.AnnotatedString.Range<androidx.compose.ui.text.Placeholder>> placeholders, optional int maxLines, optional boolean softWrap, optional int overflow, optional androidx.compose.ui.unit.Density density, optional androidx.compose.ui.unit.LayoutDirection layoutDirection, optional androidx.compose.ui.text.font.Font.ResourceLoader resourceLoader, optional long constraints);
+ method public operator boolean equals(Object? other);
+ method public long getConstraints();
+ method public androidx.compose.ui.unit.Density getDensity();
+ method public androidx.compose.ui.text.font.FontFamily.Resolver getFontFamilyResolver();
+ method public androidx.compose.ui.unit.LayoutDirection getLayoutDirection();
+ method public int getMaxLines();
+ method public int getOverflow();
+ method public java.util.List<androidx.compose.ui.text.AnnotatedString.Range<androidx.compose.ui.text.Placeholder>> getPlaceholders();
+ method @Deprecated public androidx.compose.ui.text.font.Font.ResourceLoader getResourceLoader();
+ method public boolean getSoftWrap();
+ method public androidx.compose.ui.text.TextStyle getStyle();
+ method public androidx.compose.ui.text.AnnotatedString getText();
+ property public final long constraints;
+ property public final androidx.compose.ui.unit.Density density;
+ property public final androidx.compose.ui.text.font.FontFamily.Resolver fontFamilyResolver;
+ property public final androidx.compose.ui.unit.LayoutDirection layoutDirection;
+ property public final int maxLines;
+ property public final int overflow;
+ property public final java.util.List<androidx.compose.ui.text.AnnotatedString.Range<androidx.compose.ui.text.Placeholder>> placeholders;
+ property @Deprecated public final androidx.compose.ui.text.font.Font.ResourceLoader resourceLoader;
+ property public final boolean softWrap;
+ property public final androidx.compose.ui.text.TextStyle style;
+ property public final androidx.compose.ui.text.AnnotatedString text;
+ }
+
+ public final class TextLayoutResult {
+ ctor public TextLayoutResult(androidx.compose.ui.text.TextLayoutInput layoutInput, androidx.compose.ui.text.MultiParagraph multiParagraph, long size);
+ method public androidx.compose.ui.text.TextLayoutResult copy(optional androidx.compose.ui.text.TextLayoutInput layoutInput, optional long size);
+ method public operator boolean equals(Object? other);
+ method public androidx.compose.ui.text.style.ResolvedTextDirection getBidiRunDirection(int offset);
+ method public androidx.compose.ui.geometry.Rect getBoundingBox(int offset);
+ method public androidx.compose.ui.geometry.Rect getCursorRect(int offset);
+ method public boolean getDidOverflowHeight();
+ method public boolean getDidOverflowWidth();
+ method public float getFirstBaseline();
+ method public boolean getHasVisualOverflow();
+ method public float getHorizontalPosition(int offset, boolean usePrimaryDirection);
+ method public float getLastBaseline();
+ method public androidx.compose.ui.text.TextLayoutInput getLayoutInput();
+ method public float getLineBottom(int lineIndex);
+ method public int getLineCount();
+ method public int getLineEnd(int lineIndex, optional boolean visibleEnd);
+ method public int getLineForOffset(int offset);
+ method public int getLineForVerticalPosition(float vertical);
+ method public float getLineLeft(int lineIndex);
+ method public float getLineRight(int lineIndex);
+ method public int getLineStart(int lineIndex);
+ method public float getLineTop(int lineIndex);
+ method public androidx.compose.ui.text.MultiParagraph getMultiParagraph();
+ method public int getOffsetForPosition(long position);
+ method public androidx.compose.ui.text.style.ResolvedTextDirection getParagraphDirection(int offset);
+ method public androidx.compose.ui.graphics.Path getPathForRange(int start, int end);
+ method public java.util.List<androidx.compose.ui.geometry.Rect> getPlaceholderRects();
+ method public long getSize();
+ method public long getWordBoundary(int offset);
+ method public boolean isLineEllipsized(int lineIndex);
+ property public final boolean didOverflowHeight;
+ property public final boolean didOverflowWidth;
+ property public final float firstBaseline;
+ property public final boolean hasVisualOverflow;
+ property public final float lastBaseline;
+ property public final androidx.compose.ui.text.TextLayoutInput layoutInput;
+ property public final int lineCount;
+ property public final androidx.compose.ui.text.MultiParagraph multiParagraph;
+ property public final java.util.List<androidx.compose.ui.geometry.Rect> placeholderRects;
+ property public final long size;
+ }
+
+ public final class TextPainter {
+ method public void paint(androidx.compose.ui.graphics.Canvas canvas, androidx.compose.ui.text.TextLayoutResult textLayoutResult);
+ field public static final androidx.compose.ui.text.TextPainter INSTANCE;
+ }
+
+ @androidx.compose.runtime.Immutable @kotlin.jvm.JvmInline public final value class TextRange {
+ method public operator boolean contains(long other);
+ method public operator boolean contains(int offset);
+ method public boolean getCollapsed();
+ method public int getEnd();
+ method public int getLength();
+ method public int getMax();
+ method public int getMin();
+ method public boolean getReversed();
+ method public int getStart();
+ method public boolean intersects(long other);
+ property public final boolean collapsed;
+ property public final int end;
+ property public final int length;
+ property public final int max;
+ property public final int min;
+ property public final boolean reversed;
+ property public final int start;
+ field public static final androidx.compose.ui.text.TextRange.Companion Companion;
+ }
+
+ public static final class TextRange.Companion {
+ method public long getZero();
+ property public final long Zero;
+ }
+
+ public final class TextRangeKt {
+ method public static long TextRange(int start, int end);
+ method public static long TextRange(int index);
+ method public static String substring(CharSequence, long range);
+ }
+
+ @androidx.compose.runtime.Immutable public final class TextStyle {
+ ctor public TextStyle(optional long color, optional long fontSize, optional androidx.compose.ui.text.font.FontWeight? fontWeight, optional androidx.compose.ui.text.font.FontStyle? fontStyle, optional androidx.compose.ui.text.font.FontSynthesis? fontSynthesis, optional androidx.compose.ui.text.font.FontFamily? fontFamily, optional String? fontFeatureSettings, optional long letterSpacing, optional androidx.compose.ui.text.style.BaselineShift? baselineShift, optional androidx.compose.ui.text.style.TextGeometricTransform? textGeometricTransform, optional androidx.compose.ui.text.intl.LocaleList? localeList, optional long background, optional androidx.compose.ui.text.style.TextDecoration? textDecoration, optional androidx.compose.ui.graphics.Shadow? shadow, optional androidx.compose.ui.text.style.TextAlign? textAlign, optional androidx.compose.ui.text.style.TextDirection? textDirection, optional long lineHeight, optional androidx.compose.ui.text.style.TextIndent? textIndent);
+ method public androidx.compose.ui.text.TextStyle copy(optional long color, optional long fontSize, optional androidx.compose.ui.text.font.FontWeight? fontWeight, optional androidx.compose.ui.text.font.FontStyle? fontStyle, optional androidx.compose.ui.text.font.FontSynthesis? fontSynthesis, optional androidx.compose.ui.text.font.FontFamily? fontFamily, optional String? fontFeatureSettings, optional long letterSpacing, optional androidx.compose.ui.text.style.BaselineShift? baselineShift, optional androidx.compose.ui.text.style.TextGeometricTransform? textGeometricTransform, optional androidx.compose.ui.text.intl.LocaleList? localeList, optional long background, optional androidx.compose.ui.text.style.TextDecoration? textDecoration, optional androidx.compose.ui.graphics.Shadow? shadow, optional androidx.compose.ui.text.style.TextAlign? textAlign, optional androidx.compose.ui.text.style.TextDirection? textDirection, optional long lineHeight, optional androidx.compose.ui.text.style.TextIndent? textIndent);
+ method public long getBackground();
+ method public androidx.compose.ui.text.style.BaselineShift? getBaselineShift();
+ method public long getColor();
+ method public androidx.compose.ui.text.font.FontFamily? getFontFamily();
+ method public String? getFontFeatureSettings();
+ method public long getFontSize();
+ method public androidx.compose.ui.text.font.FontStyle? getFontStyle();
+ method public androidx.compose.ui.text.font.FontSynthesis? getFontSynthesis();
+ method public androidx.compose.ui.text.font.FontWeight? getFontWeight();
+ method public long getLetterSpacing();
+ method public long getLineHeight();
+ method public androidx.compose.ui.text.intl.LocaleList? getLocaleList();
+ method public androidx.compose.ui.graphics.Shadow? getShadow();
+ method public androidx.compose.ui.text.style.TextAlign? getTextAlign();
+ method public androidx.compose.ui.text.style.TextDecoration? getTextDecoration();
+ method public androidx.compose.ui.text.style.TextDirection? getTextDirection();
+ method public androidx.compose.ui.text.style.TextGeometricTransform? getTextGeometricTransform();
+ method public androidx.compose.ui.text.style.TextIndent? getTextIndent();
+ method public boolean hasSameLayoutAffectingAttributes(androidx.compose.ui.text.TextStyle other);
+ method @androidx.compose.runtime.Stable public androidx.compose.ui.text.TextStyle merge(optional androidx.compose.ui.text.TextStyle? other);
+ method @androidx.compose.runtime.Stable public androidx.compose.ui.text.TextStyle merge(androidx.compose.ui.text.SpanStyle other);
+ method @androidx.compose.runtime.Stable public androidx.compose.ui.text.TextStyle merge(androidx.compose.ui.text.ParagraphStyle other);
+ method @androidx.compose.runtime.Stable public operator androidx.compose.ui.text.TextStyle plus(androidx.compose.ui.text.TextStyle other);
+ method @androidx.compose.runtime.Stable public operator androidx.compose.ui.text.TextStyle plus(androidx.compose.ui.text.ParagraphStyle other);
+ method @androidx.compose.runtime.Stable public operator androidx.compose.ui.text.TextStyle plus(androidx.compose.ui.text.SpanStyle other);
+ method @androidx.compose.runtime.Stable public androidx.compose.ui.text.ParagraphStyle toParagraphStyle();
+ method @androidx.compose.runtime.Stable public androidx.compose.ui.text.SpanStyle toSpanStyle();
+ property public final long background;
+ property public final androidx.compose.ui.text.style.BaselineShift? baselineShift;
+ property public final long color;
+ property public final androidx.compose.ui.text.font.FontFamily? fontFamily;
+ property public final String? fontFeatureSettings;
+ property public final long fontSize;
+ property public final androidx.compose.ui.text.font.FontStyle? fontStyle;
+ property public final androidx.compose.ui.text.font.FontSynthesis? fontSynthesis;
+ property public final androidx.compose.ui.text.font.FontWeight? fontWeight;
+ property public final long letterSpacing;
+ property public final long lineHeight;
+ property public final androidx.compose.ui.text.intl.LocaleList? localeList;
+ property public final androidx.compose.ui.graphics.Shadow? shadow;
+ property public final androidx.compose.ui.text.style.TextAlign? textAlign;
+ property public final androidx.compose.ui.text.style.TextDecoration? textDecoration;
+ property public final androidx.compose.ui.text.style.TextDirection? textDirection;
+ property public final androidx.compose.ui.text.style.TextGeometricTransform? textGeometricTransform;
+ property public final androidx.compose.ui.text.style.TextIndent? textIndent;
+ field public static final androidx.compose.ui.text.TextStyle.Companion Companion;
+ }
+
+ public static final class TextStyle.Companion {
+ method public androidx.compose.ui.text.TextStyle getDefault();
+ property public final androidx.compose.ui.text.TextStyle Default;
+ }
+
+ public final class TextStyleKt {
+ method public static androidx.compose.ui.text.TextStyle lerp(androidx.compose.ui.text.TextStyle start, androidx.compose.ui.text.TextStyle stop, float fraction);
+ method public static androidx.compose.ui.text.TextStyle resolveDefaults(androidx.compose.ui.text.TextStyle style, androidx.compose.ui.unit.LayoutDirection direction);
+ }
+
+ public abstract sealed class TtsAnnotation {
+ }
+
+ public final class VerbatimTtsAnnotation extends androidx.compose.ui.text.TtsAnnotation {
+ ctor public VerbatimTtsAnnotation(String verbatim);
+ method public String getVerbatim();
+ property public final String verbatim;
+ }
+
+}
+
+package androidx.compose.ui.text.android {
+
+ public final class LayoutCompatKt {
+ }
+
+ public final class LayoutHelperKt {
+ }
+
+ public final class LayoutIntrinsicsKt {
+ }
+
+ public final class PaintExtensionsKt {
+ }
+
+ public final class SpannedExtensionsKt {
+ }
+
+ public final class StaticLayoutFactoryKt {
+ }
+
+ public final class TempListUtilsKt {
+ }
+
+ public final class TextLayoutKt {
+ }
+
+}
+
+package androidx.compose.ui.text.android.style {
+
+ public final class LineHeightStyleSpanKt {
+ }
+
+ public final class PlaceholderSpanKt {
+ }
+
+}
+
+package androidx.compose.ui.text.caches {
+
+ public final class ContainerHelpersKt {
+ }
+
+ public final class SimpleArrayMapKt {
+ }
+
+}
+
+package androidx.compose.ui.text.font {
+
+ public abstract class AndroidFont implements androidx.compose.ui.text.font.Font {
+ ctor public AndroidFont(int loadingStrategy, androidx.compose.ui.text.font.AndroidFont.TypefaceLoader typefaceLoader);
+ method public final int getLoadingStrategy();
+ method public final androidx.compose.ui.text.font.AndroidFont.TypefaceLoader getTypefaceLoader();
+ property public final int loadingStrategy;
+ property public final androidx.compose.ui.text.font.AndroidFont.TypefaceLoader typefaceLoader;
+ }
+
+ public static interface AndroidFont.TypefaceLoader {
+ method public suspend Object? awaitLoad(android.content.Context context, androidx.compose.ui.text.font.AndroidFont font, kotlin.coroutines.Continuation<? super android.graphics.Typeface>);
+ method public android.graphics.Typeface? loadBlocking(android.content.Context context, androidx.compose.ui.text.font.AndroidFont font);
+ }
+
+ public final class AndroidFontKt {
+ }
+
+ public final class AndroidFontLoader_androidKt {
+ }
+
+ public final class AndroidFontResolveInterceptor_androidKt {
+ }
+
+ public final class AndroidFontUtils_androidKt {
+ }
+
+ public final class AndroidTypeface_androidKt {
+ method public static androidx.compose.ui.text.font.FontFamily FontFamily(android.graphics.Typeface typeface);
+ method @Deprecated public static androidx.compose.ui.text.font.Typeface Typeface(android.content.Context context, androidx.compose.ui.text.font.FontFamily fontFamily, optional java.util.List<kotlin.Pair<androidx.compose.ui.text.font.FontWeight,androidx.compose.ui.text.font.FontStyle>>? styles);
+ method public static androidx.compose.ui.text.font.Typeface Typeface(android.graphics.Typeface typeface);
+ }
+
+ public final class DelegatingFontLoaderForDeprecatedUsage_androidKt {
+ method @Deprecated public static androidx.compose.ui.text.font.FontFamily.Resolver createFontFamilyResolver(androidx.compose.ui.text.font.Font.ResourceLoader fontResourceLoader, android.content.Context context);
+ }
+
+ public final class DeviceFontFamilyNameFontKt {
+ }
+
+ public abstract sealed class FileBasedFontFamily extends androidx.compose.ui.text.font.FontFamily {
+ }
+
+ @androidx.compose.runtime.Immutable public interface Font {
+ method public int getStyle();
+ method public androidx.compose.ui.text.font.FontWeight getWeight();
+ property public abstract int style;
+ property public abstract androidx.compose.ui.text.font.FontWeight weight;
+ field public static final androidx.compose.ui.text.font.Font.Companion Companion;
+ }
+
+ public static final class Font.Companion {
+ }
+
+ @Deprecated public static interface Font.ResourceLoader {
+ method @Deprecated public Object load(androidx.compose.ui.text.font.Font font);
+ }
+
+ @androidx.compose.runtime.Immutable public abstract sealed class FontFamily {
+ method @Deprecated public final boolean getCanLoadSynchronously();
+ property @Deprecated public final boolean canLoadSynchronously;
+ field public static final androidx.compose.ui.text.font.FontFamily.Companion Companion;
+ }
+
+ public static final class FontFamily.Companion {
+ method public androidx.compose.ui.text.font.GenericFontFamily getCursive();
+ method public androidx.compose.ui.text.font.SystemFontFamily getDefault();
+ method public androidx.compose.ui.text.font.GenericFontFamily getMonospace();
+ method public androidx.compose.ui.text.font.GenericFontFamily getSansSerif();
+ method public androidx.compose.ui.text.font.GenericFontFamily getSerif();
+ property public final androidx.compose.ui.text.font.GenericFontFamily Cursive;
+ property public final androidx.compose.ui.text.font.SystemFontFamily Default;
+ property public final androidx.compose.ui.text.font.GenericFontFamily Monospace;
+ property public final androidx.compose.ui.text.font.GenericFontFamily SansSerif;
+ property public final androidx.compose.ui.text.font.GenericFontFamily Serif;
+ }
+
+ public static sealed interface FontFamily.Resolver {
+ method public suspend Object? preload(androidx.compose.ui.text.font.FontFamily fontFamily, kotlin.coroutines.Continuation<? super kotlin.Unit>);
+ method public androidx.compose.runtime.State<java.lang.Object> resolve(optional androidx.compose.ui.text.font.FontFamily? fontFamily, optional androidx.compose.ui.text.font.FontWeight fontWeight, optional int fontStyle, optional int fontSynthesis);
+ }
+
+ public final class FontFamilyKt {
+ method @androidx.compose.runtime.Stable public static androidx.compose.ui.text.font.FontFamily FontFamily(java.util.List<? extends androidx.compose.ui.text.font.Font> fonts);
+ method @androidx.compose.runtime.Stable public static androidx.compose.ui.text.font.FontFamily FontFamily(androidx.compose.ui.text.font.Font... fonts);
+ method @androidx.compose.runtime.Stable public static androidx.compose.ui.text.font.FontFamily FontFamily(androidx.compose.ui.text.font.Typeface typeface);
+ }
+
+ public final class FontFamilyResolverKt {
+ }
+
+ public final class FontFamilyResolver_androidKt {
+ method public static androidx.compose.ui.text.font.FontFamily.Resolver createFontFamilyResolver(android.content.Context context);
+ }
+
+ public final class FontKt {
+ method @androidx.compose.runtime.Stable public static androidx.compose.ui.text.font.Font Font(int resId, optional androidx.compose.ui.text.font.FontWeight weight, optional int style, optional int loadingStrategy);
+ method @Deprecated @androidx.compose.runtime.Stable public static androidx.compose.ui.text.font.Font! Font(int resId, optional androidx.compose.ui.text.font.FontWeight weight, optional int style);
+ method @androidx.compose.runtime.Stable public static androidx.compose.ui.text.font.FontFamily toFontFamily(androidx.compose.ui.text.font.Font);
+ }
+
+ @androidx.compose.runtime.Immutable public final class FontListFontFamily extends androidx.compose.ui.text.font.FileBasedFontFamily implements kotlin.jvm.internal.markers.KMappedMarker java.util.List<androidx.compose.ui.text.font.Font> {
+ method public java.util.List<androidx.compose.ui.text.font.Font> getFonts();
+ property public final java.util.List<androidx.compose.ui.text.font.Font> fonts;
+ }
+
+ public final class FontListFontFamilyTypefaceAdapterKt {
+ }
+
+ @kotlin.jvm.JvmInline public final value class FontLoadingStrategy {
+ method public int getValue();
+ property public final int value;
+ field public static final androidx.compose.ui.text.font.FontLoadingStrategy.Companion Companion;
+ }
+
+ public static final class FontLoadingStrategy.Companion {
+ method public int getAsync();
+ method public int getBlocking();
+ method public int getOptionalLocal();
+ property public final int Async;
+ property public final int Blocking;
+ property public final int OptionalLocal;
+ }
+
+ @kotlin.jvm.JvmInline public final value class FontStyle {
+ ctor public FontStyle(int value);
+ method public int getValue();
+ property public final int value;
+ field public static final androidx.compose.ui.text.font.FontStyle.Companion Companion;
+ }
+
+ public static final class FontStyle.Companion {
+ method public int getItalic();
+ method public int getNormal();
+ method public java.util.List<androidx.compose.ui.text.font.FontStyle> values();
+ property public final int Italic;
+ property public final int Normal;
+ }
+
+ @kotlin.jvm.JvmInline public final value class FontSynthesis {
+ field public static final androidx.compose.ui.text.font.FontSynthesis.Companion Companion;
+ }
+
+ public static final class FontSynthesis.Companion {
+ method public int getAll();
+ method public int getNone();
+ method public int getStyle();
+ method public int getWeight();
+ property public final int All;
+ property public final int None;
+ property public final int Style;
+ property public final int Weight;
+ }
+
+ public final class FontSynthesis_androidKt {
+ }
+
+ @androidx.compose.runtime.Immutable public final class FontWeight implements java.lang.Comparable<androidx.compose.ui.text.font.FontWeight> {
+ ctor public FontWeight(int weight);
+ method public operator int compareTo(androidx.compose.ui.text.font.FontWeight other);
+ method public int getWeight();
+ property public final int weight;
+ field public static final androidx.compose.ui.text.font.FontWeight.Companion Companion;
+ }
+
+ public static final class FontWeight.Companion {
+ method public androidx.compose.ui.text.font.FontWeight getBlack();
+ method public androidx.compose.ui.text.font.FontWeight getBold();
+ method public androidx.compose.ui.text.font.FontWeight getExtraBold();
+ method public androidx.compose.ui.text.font.FontWeight getExtraLight();
+ method public androidx.compose.ui.text.font.FontWeight getLight();
+ method public androidx.compose.ui.text.font.FontWeight getMedium();
+ method public androidx.compose.ui.text.font.FontWeight getNormal();
+ method public androidx.compose.ui.text.font.FontWeight getSemiBold();
+ method public androidx.compose.ui.text.font.FontWeight getThin();
+ method public androidx.compose.ui.text.font.FontWeight getW100();
+ method public androidx.compose.ui.text.font.FontWeight getW200();
+ method public androidx.compose.ui.text.font.FontWeight getW300();
+ method public androidx.compose.ui.text.font.FontWeight getW400();
+ method public androidx.compose.ui.text.font.FontWeight getW500();
+ method public androidx.compose.ui.text.font.FontWeight getW600();
+ method public androidx.compose.ui.text.font.FontWeight getW700();
+ method public androidx.compose.ui.text.font.FontWeight getW800();
+ method public androidx.compose.ui.text.font.FontWeight getW900();
+ property public final androidx.compose.ui.text.font.FontWeight Black;
+ property public final androidx.compose.ui.text.font.FontWeight Bold;
+ property public final androidx.compose.ui.text.font.FontWeight ExtraBold;
+ property public final androidx.compose.ui.text.font.FontWeight ExtraLight;
+ property public final androidx.compose.ui.text.font.FontWeight Light;
+ property public final androidx.compose.ui.text.font.FontWeight Medium;
+ property public final androidx.compose.ui.text.font.FontWeight Normal;
+ property public final androidx.compose.ui.text.font.FontWeight SemiBold;
+ property public final androidx.compose.ui.text.font.FontWeight Thin;
+ property public final androidx.compose.ui.text.font.FontWeight W100;
+ property public final androidx.compose.ui.text.font.FontWeight W200;
+ property public final androidx.compose.ui.text.font.FontWeight W300;
+ property public final androidx.compose.ui.text.font.FontWeight W400;
+ property public final androidx.compose.ui.text.font.FontWeight W500;
+ property public final androidx.compose.ui.text.font.FontWeight W600;
+ property public final androidx.compose.ui.text.font.FontWeight W700;
+ property public final androidx.compose.ui.text.font.FontWeight W800;
+ property public final androidx.compose.ui.text.font.FontWeight W900;
+ }
+
+ public final class FontWeightKt {
+ method public static androidx.compose.ui.text.font.FontWeight lerp(androidx.compose.ui.text.font.FontWeight start, androidx.compose.ui.text.font.FontWeight stop, float fraction);
+ }
+
+ @androidx.compose.runtime.Immutable public final class GenericFontFamily extends androidx.compose.ui.text.font.SystemFontFamily {
+ method public String getName();
+ property public final String name;
+ }
+
+ public final class LoadedFontFamily extends androidx.compose.ui.text.font.FontFamily {
+ method public androidx.compose.ui.text.font.Typeface getTypeface();
+ property public final androidx.compose.ui.text.font.Typeface typeface;
+ }
+
+ public final class PlatformTypefacesKt {
+ }
+
+ public final class ResourceFont implements androidx.compose.ui.text.font.Font {
+ method public androidx.compose.ui.text.font.ResourceFont copy(optional int resId, optional androidx.compose.ui.text.font.FontWeight weight, optional int style);
+ method public int getResId();
+ method public int getStyle();
+ method public androidx.compose.ui.text.font.FontWeight getWeight();
+ property public final int resId;
+ property public int style;
+ property public androidx.compose.ui.text.font.FontWeight weight;
+ }
+
+ public abstract sealed class SystemFontFamily extends androidx.compose.ui.text.font.FontFamily {
+ }
+
+ public interface Typeface {
+ method public androidx.compose.ui.text.font.FontFamily? getFontFamily();
+ property public abstract androidx.compose.ui.text.font.FontFamily? fontFamily;
+ }
+
+}
+
+package androidx.compose.ui.text.input {
+
+ public final class BackspaceCommand implements androidx.compose.ui.text.input.EditCommand {
+ ctor public BackspaceCommand();
+ method public void applyTo(androidx.compose.ui.text.input.EditingBuffer buffer);
+ }
+
+ public final class CommitTextCommand implements androidx.compose.ui.text.input.EditCommand {
+ ctor public CommitTextCommand(androidx.compose.ui.text.AnnotatedString annotatedString, int newCursorPosition);
+ ctor public CommitTextCommand(String text, int newCursorPosition);
+ method public void applyTo(androidx.compose.ui.text.input.EditingBuffer buffer);
+ method public androidx.compose.ui.text.AnnotatedString getAnnotatedString();
+ method public int getNewCursorPosition();
+ method public String getText();
+ property public final androidx.compose.ui.text.AnnotatedString annotatedString;
+ property public final int newCursorPosition;
+ property public final String text;
+ }
+
+ public final class DeleteAllCommand implements androidx.compose.ui.text.input.EditCommand {
+ ctor public DeleteAllCommand();
+ method public void applyTo(androidx.compose.ui.text.input.EditingBuffer buffer);
+ }
+
+ public final class DeleteSurroundingTextCommand implements androidx.compose.ui.text.input.EditCommand {
+ ctor public DeleteSurroundingTextCommand(int lengthBeforeCursor, int lengthAfterCursor);
+ method public void applyTo(androidx.compose.ui.text.input.EditingBuffer buffer);
+ method public int getLengthAfterCursor();
+ method public int getLengthBeforeCursor();
+ property public final int lengthAfterCursor;
+ property public final int lengthBeforeCursor;
+ }
+
+ public final class DeleteSurroundingTextInCodePointsCommand implements androidx.compose.ui.text.input.EditCommand {
+ ctor public DeleteSurroundingTextInCodePointsCommand(int lengthBeforeCursor, int lengthAfterCursor);
+ method public void applyTo(androidx.compose.ui.text.input.EditingBuffer buffer);
+ method public int getLengthAfterCursor();
+ method public int getLengthBeforeCursor();
+ property public final int lengthAfterCursor;
+ property public final int lengthBeforeCursor;
+ }
+
+ public interface EditCommand {
+ method public void applyTo(androidx.compose.ui.text.input.EditingBuffer buffer);
+ }
+
+ public final class EditCommandKt {
+ }
+
+ public final class EditProcessor {
+ ctor public EditProcessor();
+ method public androidx.compose.ui.text.input.TextFieldValue apply(java.util.List<? extends androidx.compose.ui.text.input.EditCommand> editCommands);
+ method public void reset(androidx.compose.ui.text.input.TextFieldValue value, androidx.compose.ui.text.input.TextInputSession? textInputSession);
+ method public androidx.compose.ui.text.input.TextFieldValue toTextFieldValue();
+ }
+
+ public final class EditingBuffer {
+ ctor public EditingBuffer(androidx.compose.ui.text.AnnotatedString text, long selection);
+ }
+
+ public final class EditingBufferKt {
+ }
+
+ public final class FinishComposingTextCommand implements androidx.compose.ui.text.input.EditCommand {
+ ctor public FinishComposingTextCommand();
+ method public void applyTo(androidx.compose.ui.text.input.EditingBuffer buffer);
+ }
+
+ public final class GapBufferKt {
+ }
+
+ @kotlin.jvm.JvmInline public final value class ImeAction {
+ field public static final androidx.compose.ui.text.input.ImeAction.Companion Companion;
+ }
+
+ public static final class ImeAction.Companion {
+ method public int getDefault();
+ method public int getDone();
+ method public int getGo();
+ method public int getNext();
+ method public int getNone();
+ method public int getPrevious();
+ method public int getSearch();
+ method public int getSend();
+ property public final int Default;
+ property public final int Done;
+ property public final int Go;
+ property public final int Next;
+ property public final int None;
+ property public final int Previous;
+ property public final int Search;
+ property public final int Send;
+ }
+
+ @androidx.compose.runtime.Immutable public final class ImeOptions {
+ ctor public ImeOptions(optional boolean singleLine, optional int capitalization, optional boolean autoCorrect, optional int keyboardType, optional int imeAction);
+ method public androidx.compose.ui.text.input.ImeOptions copy(optional boolean singleLine, optional int capitalization, optional boolean autoCorrect, optional int keyboardType, optional int imeAction);
+ method public boolean getAutoCorrect();
+ method public int getCapitalization();
+ method public int getImeAction();
+ method public int getKeyboardType();
+ method public boolean getSingleLine();
+ property public final boolean autoCorrect;
+ property public final int capitalization;
+ property public final int imeAction;
+ property public final int keyboardType;
+ property public final boolean singleLine;
+ field public static final androidx.compose.ui.text.input.ImeOptions.Companion Companion;
+ }
+
+ public static final class ImeOptions.Companion {
+ method public androidx.compose.ui.text.input.ImeOptions getDefault();
+ property public final androidx.compose.ui.text.input.ImeOptions Default;
+ }
+
+ @Deprecated public interface InputEventCallback {
+ method @Deprecated public void onEditCommands(java.util.List<? extends androidx.compose.ui.text.input.EditCommand> editCommands);
+ method @Deprecated public void onImeAction(int imeAction);
+ }
+
+ @kotlin.jvm.JvmInline public final value class KeyboardCapitalization {
+ field public static final androidx.compose.ui.text.input.KeyboardCapitalization.Companion Companion;
+ }
+
+ public static final class KeyboardCapitalization.Companion {
+ method public int getCharacters();
+ method public int getNone();
+ method public int getSentences();
+ method public int getWords();
+ property public final int Characters;
+ property public final int None;
+ property public final int Sentences;
+ property public final int Words;
+ }
+
+ @kotlin.jvm.JvmInline public final value class KeyboardType {
+ field public static final androidx.compose.ui.text.input.KeyboardType.Companion Companion;
+ }
+
+ public static final class KeyboardType.Companion {
+ method public int getAscii();
+ method public int getDecimal();
+ method public int getEmail();
+ method public int getNumber();
+ method public int getNumberPassword();
+ method public int getPassword();
+ method public int getPhone();
+ method public int getText();
+ method public int getUri();
+ property public final int Ascii;
+ property public final int Decimal;
+ property public final int Email;
+ property public final int Number;
+ property public final int NumberPassword;
+ property public final int Password;
+ property public final int Phone;
+ property public final int Text;
+ property public final int Uri;
+ }
+
+ public final class MoveCursorCommand implements androidx.compose.ui.text.input.EditCommand {
+ ctor public MoveCursorCommand(int amount);
+ method public void applyTo(androidx.compose.ui.text.input.EditingBuffer buffer);
+ method public int getAmount();
+ property public final int amount;
+ }
+
+ public interface OffsetMapping {
+ method public int originalToTransformed(int offset);
+ method public int transformedToOriginal(int offset);
+ field public static final androidx.compose.ui.text.input.OffsetMapping.Companion Companion;
+ }
+
+ public static final class OffsetMapping.Companion {
+ method public androidx.compose.ui.text.input.OffsetMapping getIdentity();
+ property public final androidx.compose.ui.text.input.OffsetMapping Identity;
+ }
+
+ public final class PasswordVisualTransformation implements androidx.compose.ui.text.input.VisualTransformation {
+ ctor public PasswordVisualTransformation(optional char mask);
+ method public androidx.compose.ui.text.input.TransformedText filter(androidx.compose.ui.text.AnnotatedString text);
+ method public char getMask();
+ property public final char mask;
+ }
+
+ public interface PlatformTextInputService {
+ method public void hideSoftwareKeyboard();
+ method @Deprecated public default void notifyFocusedRect(androidx.compose.ui.geometry.Rect rect);
+ method public void showSoftwareKeyboard();
+ method public void startInput(androidx.compose.ui.text.input.TextFieldValue value, androidx.compose.ui.text.input.ImeOptions imeOptions, kotlin.jvm.functions.Function1<? super java.util.List<? extends androidx.compose.ui.text.input.EditCommand>,kotlin.Unit> onEditCommand, kotlin.jvm.functions.Function1<? super androidx.compose.ui.text.input.ImeAction,kotlin.Unit> onImeActionPerformed);
+ method public void stopInput();
+ method public void updateState(androidx.compose.ui.text.input.TextFieldValue? oldValue, androidx.compose.ui.text.input.TextFieldValue newValue);
+ }
+
+ public final class SetComposingRegionCommand implements androidx.compose.ui.text.input.EditCommand {
+ ctor public SetComposingRegionCommand(int start, int end);
+ method public void applyTo(androidx.compose.ui.text.input.EditingBuffer buffer);
+ method public int getEnd();
+ method public int getStart();
+ property public final int end;
+ property public final int start;
+ }
+
+ public final class SetComposingTextCommand implements androidx.compose.ui.text.input.EditCommand {
+ ctor public SetComposingTextCommand(androidx.compose.ui.text.AnnotatedString annotatedString, int newCursorPosition);
+ ctor public SetComposingTextCommand(String text, int newCursorPosition);
+ method public void applyTo(androidx.compose.ui.text.input.EditingBuffer buffer);
+ method public androidx.compose.ui.text.AnnotatedString getAnnotatedString();
+ method public int getNewCursorPosition();
+ method public String getText();
+ property public final androidx.compose.ui.text.AnnotatedString annotatedString;
+ property public final int newCursorPosition;
+ property public final String text;
+ }
+
+ public final class SetSelectionCommand implements androidx.compose.ui.text.input.EditCommand {
+ ctor public SetSelectionCommand(int start, int end);
+ method public void applyTo(androidx.compose.ui.text.input.EditingBuffer buffer);
+ method public int getEnd();
+ method public int getStart();
+ property public final int end;
+ property public final int start;
+ }
+
+ @androidx.compose.runtime.Immutable public final class TextFieldValue {
+ ctor public TextFieldValue(androidx.compose.ui.text.AnnotatedString annotatedString, optional long selection, optional androidx.compose.ui.text.TextRange? composition);
+ ctor public TextFieldValue(optional String text, optional long selection, optional androidx.compose.ui.text.TextRange? composition);
+ method public androidx.compose.ui.text.input.TextFieldValue copy(optional androidx.compose.ui.text.AnnotatedString annotatedString, optional long selection, optional androidx.compose.ui.text.TextRange? composition);
+ method public androidx.compose.ui.text.input.TextFieldValue copy(String text, optional long selection, optional androidx.compose.ui.text.TextRange? composition);
+ method public androidx.compose.ui.text.AnnotatedString getAnnotatedString();
+ method public androidx.compose.ui.text.TextRange? getComposition();
+ method public long getSelection();
+ method public String getText();
+ property public final androidx.compose.ui.text.AnnotatedString annotatedString;
+ property public final androidx.compose.ui.text.TextRange? composition;
+ property public final long selection;
+ property public final String text;
+ field public static final androidx.compose.ui.text.input.TextFieldValue.Companion Companion;
+ }
+
+ public static final class TextFieldValue.Companion {
+ method public androidx.compose.runtime.saveable.Saver<androidx.compose.ui.text.input.TextFieldValue,java.lang.Object> getSaver();
+ property public final androidx.compose.runtime.saveable.Saver<androidx.compose.ui.text.input.TextFieldValue,java.lang.Object> Saver;
+ }
+
+ public final class TextFieldValueKt {
+ method public static androidx.compose.ui.text.AnnotatedString getSelectedText(androidx.compose.ui.text.input.TextFieldValue);
+ method public static androidx.compose.ui.text.AnnotatedString getTextAfterSelection(androidx.compose.ui.text.input.TextFieldValue, int maxChars);
+ method public static androidx.compose.ui.text.AnnotatedString getTextBeforeSelection(androidx.compose.ui.text.input.TextFieldValue, int maxChars);
+ }
+
+ public class TextInputService {
+ ctor public TextInputService(androidx.compose.ui.text.input.PlatformTextInputService platformTextInputService);
+ method public final void hideSoftwareKeyboard();
+ method public final void showSoftwareKeyboard();
+ method public androidx.compose.ui.text.input.TextInputSession startInput(androidx.compose.ui.text.input.TextFieldValue value, androidx.compose.ui.text.input.ImeOptions imeOptions, kotlin.jvm.functions.Function1<? super java.util.List<? extends androidx.compose.ui.text.input.EditCommand>,kotlin.Unit> onEditCommand, kotlin.jvm.functions.Function1<? super androidx.compose.ui.text.input.ImeAction,kotlin.Unit> onImeActionPerformed);
+ method public void stopInput(androidx.compose.ui.text.input.TextInputSession session);
+ }
+
+ public final class TextInputSession {
+ ctor public TextInputSession(androidx.compose.ui.text.input.TextInputService textInputService, androidx.compose.ui.text.input.PlatformTextInputService platformTextInputService);
+ method public void dispose();
+ method public boolean hideSoftwareKeyboard();
+ method public boolean isOpen();
+ method @Deprecated public boolean notifyFocusedRect(androidx.compose.ui.geometry.Rect rect);
+ method public boolean showSoftwareKeyboard();
+ method public boolean updateState(androidx.compose.ui.text.input.TextFieldValue? oldValue, androidx.compose.ui.text.input.TextFieldValue newValue);
+ property public final boolean isOpen;
+ }
+
+ public final class TransformedText {
+ ctor public TransformedText(androidx.compose.ui.text.AnnotatedString text, androidx.compose.ui.text.input.OffsetMapping offsetMapping);
+ method public androidx.compose.ui.text.input.OffsetMapping getOffsetMapping();
+ method public androidx.compose.ui.text.AnnotatedString getText();
+ property public final androidx.compose.ui.text.input.OffsetMapping offsetMapping;
+ property public final androidx.compose.ui.text.AnnotatedString text;
+ }
+
+ @androidx.compose.runtime.Immutable public fun interface VisualTransformation {
+ method public androidx.compose.ui.text.input.TransformedText filter(androidx.compose.ui.text.AnnotatedString text);
+ field public static final androidx.compose.ui.text.input.VisualTransformation.Companion Companion;
+ }
+
+ public static final class VisualTransformation.Companion {
+ method public androidx.compose.ui.text.input.VisualTransformation getNone();
+ property public final androidx.compose.ui.text.input.VisualTransformation None;
+ }
+
+}
+
+package androidx.compose.ui.text.intl {
+
+ public final class AndroidPlatformLocale_androidKt {
+ }
+
+ @androidx.compose.runtime.Immutable public final class Locale {
+ ctor public Locale(String languageTag);
+ method public String getLanguage();
+ method public String getRegion();
+ method public String getScript();
+ method public String toLanguageTag();
+ property public final String language;
+ property public final String region;
+ property public final String script;
+ field public static final androidx.compose.ui.text.intl.Locale.Companion Companion;
+ }
+
+ public static final class Locale.Companion {
+ method public androidx.compose.ui.text.intl.Locale getCurrent();
+ property public final androidx.compose.ui.text.intl.Locale current;
+ }
+
+ @androidx.compose.runtime.Immutable public final class LocaleList implements java.util.Collection<androidx.compose.ui.text.intl.Locale> kotlin.jvm.internal.markers.KMappedMarker {
+ ctor public LocaleList(java.util.List<androidx.compose.ui.text.intl.Locale> localeList);
+ ctor public LocaleList(String languageTags);
+ ctor public LocaleList(androidx.compose.ui.text.intl.Locale... locales);
+ method public operator boolean contains(androidx.compose.ui.text.intl.Locale element);
+ method public boolean containsAll(java.util.Collection<E!> elements);
+ method public operator androidx.compose.ui.text.intl.Locale get(int i);
+ method public java.util.List<androidx.compose.ui.text.intl.Locale> getLocaleList();
+ method public int getSize();
+ method public boolean isEmpty();
+ method public java.util.Iterator<androidx.compose.ui.text.intl.Locale> iterator();
+ property public final java.util.List<androidx.compose.ui.text.intl.Locale> localeList;
+ property public int size;
+ field public static final androidx.compose.ui.text.intl.LocaleList.Companion Companion;
+ }
+
+ public static final class LocaleList.Companion {
+ method public androidx.compose.ui.text.intl.LocaleList getCurrent();
+ property public final androidx.compose.ui.text.intl.LocaleList current;
+ }
+
+ public final class PlatformLocaleKt {
+ }
+
+}
+
+package androidx.compose.ui.text.platform {
+
+ public final class AndroidAccessibilitySpannableString_androidKt {
+ }
+
+ public final class AndroidParagraphHelper_androidKt {
+ }
+
+ public final class AndroidParagraphIntrinsics_androidKt {
+ }
+
+ public final class AndroidParagraph_androidKt {
+ }
+
+ public final class AndroidStringDelegate_androidKt {
+ }
+
+ public final class Synchronization_jvmKt {
+ }
+
+}
+
+package androidx.compose.ui.text.platform.extensions {
+
+ public final class LocaleExtensions_androidKt {
+ }
+
+ public final class PlaceholderExtensions_androidKt {
+ }
+
+ public final class SpannableExtensions_androidKt {
+ }
+
+ public final class TextPaintExtensions_androidKt {
+ }
+
+ public final class TtsAnnotationExtensions_androidKt {
+ method public static android.text.style.TtsSpan toSpan(androidx.compose.ui.text.TtsAnnotation);
+ method public static android.text.style.TtsSpan toSpan(androidx.compose.ui.text.VerbatimTtsAnnotation);
+ }
+
+}
+
+package androidx.compose.ui.text.style {
+
+ @androidx.compose.runtime.Immutable @kotlin.jvm.JvmInline public final value class BaselineShift {
+ ctor public BaselineShift(float multiplier);
+ method public float getMultiplier();
+ property public final float multiplier;
+ field public static final androidx.compose.ui.text.style.BaselineShift.Companion Companion;
+ }
+
+ public static final class BaselineShift.Companion {
+ method public float getNone();
+ 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 @androidx.compose.runtime.Stable public static float lerp(float start, float stop, float fraction);
+ }
+
+ public enum ResolvedTextDirection {
+ enum_constant public static final androidx.compose.ui.text.style.ResolvedTextDirection Ltr;
+ enum_constant public static final androidx.compose.ui.text.style.ResolvedTextDirection Rtl;
+ }
+
+ @kotlin.jvm.JvmInline public final value class TextAlign {
+ field public static final androidx.compose.ui.text.style.TextAlign.Companion Companion;
+ }
+
+ public static final class TextAlign.Companion {
+ method public int getCenter();
+ method public int getEnd();
+ method public int getJustify();
+ method public int getLeft();
+ method public int getRight();
+ method public int getStart();
+ method public java.util.List<androidx.compose.ui.text.style.TextAlign> values();
+ property public final int Center;
+ property public final int End;
+ property public final int Justify;
+ property public final int Left;
+ property public final int Right;
+ property public final int Start;
+ }
+
+ @androidx.compose.runtime.Immutable public final class TextDecoration {
+ method public operator boolean contains(androidx.compose.ui.text.style.TextDecoration other);
+ method public operator boolean equals(Object? other);
+ method public int getMask();
+ method public operator androidx.compose.ui.text.style.TextDecoration plus(androidx.compose.ui.text.style.TextDecoration decoration);
+ property public final int mask;
+ field public static final androidx.compose.ui.text.style.TextDecoration.Companion Companion;
+ }
+
+ public static final class TextDecoration.Companion {
+ method public androidx.compose.ui.text.style.TextDecoration combine(java.util.List<androidx.compose.ui.text.style.TextDecoration> decorations);
+ method public androidx.compose.ui.text.style.TextDecoration getLineThrough();
+ method public androidx.compose.ui.text.style.TextDecoration getNone();
+ method public androidx.compose.ui.text.style.TextDecoration getUnderline();
+ property public final androidx.compose.ui.text.style.TextDecoration LineThrough;
+ property public final androidx.compose.ui.text.style.TextDecoration None;
+ property public final androidx.compose.ui.text.style.TextDecoration Underline;
+ }
+
+ @kotlin.jvm.JvmInline public final value class TextDirection {
+ field public static final androidx.compose.ui.text.style.TextDirection.Companion Companion;
+ }
+
+ public static final class TextDirection.Companion {
+ method public int getContent();
+ method public int getContentOrLtr();
+ method public int getContentOrRtl();
+ method public int getLtr();
+ method public int getRtl();
+ property public final int Content;
+ property public final int ContentOrLtr;
+ property public final int ContentOrRtl;
+ property public final int Ltr;
+ property public final int Rtl;
+ }
+
+ public final class TextDrawStyleKt {
+ }
+
+ @androidx.compose.runtime.Immutable public final class TextGeometricTransform {
+ ctor public TextGeometricTransform(optional float scaleX, optional float skewX);
+ method public androidx.compose.ui.text.style.TextGeometricTransform copy(optional float scaleX, optional float skewX);
+ method public operator boolean equals(Object? other);
+ method public float getScaleX();
+ method public float getSkewX();
+ property public final float scaleX;
+ property public final float skewX;
+ field public static final androidx.compose.ui.text.style.TextGeometricTransform.Companion Companion;
+ }
+
+ public static final class TextGeometricTransform.Companion {
+ }
+
+ public final class TextGeometricTransformKt {
+ method public static androidx.compose.ui.text.style.TextGeometricTransform lerp(androidx.compose.ui.text.style.TextGeometricTransform start, androidx.compose.ui.text.style.TextGeometricTransform stop, float fraction);
+ }
+
+ @androidx.compose.runtime.Immutable public final class TextIndent {
+ ctor public TextIndent(optional long firstLine, optional long restLine);
+ method public androidx.compose.ui.text.style.TextIndent copy(optional long firstLine, optional long restLine);
+ method public operator boolean equals(Object? other);
+ method public long getFirstLine();
+ method public long getRestLine();
+ property public final long firstLine;
+ property public final long restLine;
+ field public static final androidx.compose.ui.text.style.TextIndent.Companion Companion;
+ }
+
+ public static final class TextIndent.Companion {
+ method public androidx.compose.ui.text.style.TextIndent getNone();
+ property public final androidx.compose.ui.text.style.TextIndent None;
+ }
+
+ public final class TextIndentKt {
+ method public static androidx.compose.ui.text.style.TextIndent lerp(androidx.compose.ui.text.style.TextIndent start, androidx.compose.ui.text.style.TextIndent stop, float fraction);
+ }
+
+ @kotlin.jvm.JvmInline public final value class TextOverflow {
+ field public static final androidx.compose.ui.text.style.TextOverflow.Companion Companion;
+ }
+
+ public static final class TextOverflow.Companion {
+ method public int getClip();
+ method public int getEllipsis();
+ method public int getVisible();
+ property public final int Clip;
+ property public final int Ellipsis;
+ property public final int Visible;
+ }
+
+}
+
diff --git a/compose/ui/ui-text/src/androidAndroidTest/kotlin/androidx/compose/ui/text/MultiParagraphIntegrationTest.kt b/compose/ui/ui-text/src/androidAndroidTest/kotlin/androidx/compose/ui/text/MultiParagraphIntegrationTest.kt
index 3ed4043..0a9a831 100644
--- a/compose/ui/ui-text/src/androidAndroidTest/kotlin/androidx/compose/ui/text/MultiParagraphIntegrationTest.kt
+++ b/compose/ui/ui-text/src/androidAndroidTest/kotlin/androidx/compose/ui/text/MultiParagraphIntegrationTest.kt
@@ -1420,6 +1420,57 @@
)
}
+ @Test(expected = IllegalArgumentException::class)
+ fun setMinWidthConstraints_notSupported() {
+ val minWidthConstraints = Constraints(minWidth = 100)
+ MultiParagraph(
+ annotatedString = AnnotatedString(""),
+ style = TextStyle(),
+ constraints = minWidthConstraints,
+ density = defaultDensity,
+ fontFamilyResolver = UncachedFontFamilyResolver(context)
+ )
+ }
+
+ @Test(expected = IllegalArgumentException::class)
+ fun setMinHeightConstraints_notSupported() {
+ val minHeightConstraints = Constraints(minHeight = 100)
+ MultiParagraph(
+ annotatedString = AnnotatedString(""),
+ style = TextStyle(),
+ constraints = minHeightConstraints,
+ density = defaultDensity,
+ fontFamilyResolver = UncachedFontFamilyResolver(context)
+ )
+ }
+
+ @Test
+ fun multiParagraphConstruction_doesNotThrow_ifNotAllParagraghsFitVertically() {
+ with(defaultDensity) {
+ val fontSize = 20.sp
+ val constraints = Constraints(
+ maxWidth = 10 * fontSize.roundToPx(),
+ maxHeight = fontSize.roundToPx() / 2
+ )
+ val text = buildAnnotatedString {
+ withStyle(ParagraphStyle(textAlign = TextAlign.Center)) {
+ append("Lorem")
+ }
+ withStyle(ParagraphStyle()) {
+ append("Ipsum")
+ }
+ }
+
+ MultiParagraph(
+ annotatedString = text,
+ style = TextStyle(fontSize = fontSize, fontFamily = fontFamilyMeasureFont),
+ constraints = constraints,
+ density = this,
+ fontFamilyResolver = UncachedFontFamilyResolver(context)
+ )
+ }
+ }
+
/**
* Helper function which creates an AnnotatedString where each input string becomes a paragraph.
*/
diff --git a/compose/ui/ui-text/src/androidAndroidTest/kotlin/androidx/compose/ui/text/ParagraphIntegrationTest.kt b/compose/ui/ui-text/src/androidAndroidTest/kotlin/androidx/compose/ui/text/ParagraphIntegrationTest.kt
index d6bdd0df..85c68ce 100644
--- a/compose/ui/ui-text/src/androidAndroidTest/kotlin/androidx/compose/ui/text/ParagraphIntegrationTest.kt
+++ b/compose/ui/ui-text/src/androidAndroidTest/kotlin/androidx/compose/ui/text/ParagraphIntegrationTest.kt
@@ -3779,7 +3779,7 @@
val actualPath = paragraph.getPathForRange(1, text.length - 1)
val expectedPath = Path()
- expectedPath.addRect(Rect(fontSizeInPx, 0f, 2 * fontSizeInPx, fontSizeInPx))
+ expectedPath.addRect(Rect(fontSizeInPx, 0f, fontSizeInPx, fontSizeInPx))
val diff = Path.combine(PathOperation.Difference, expectedPath, actualPath).getBounds()
assertThat(diff).isEqualTo(Rect.Zero)
diff --git a/compose/ui/ui-text/src/androidAndroidTest/kotlin/androidx/compose/ui/text/platform/AndroidParagraphTest.kt b/compose/ui/ui-text/src/androidAndroidTest/kotlin/androidx/compose/ui/text/platform/AndroidParagraphTest.kt
index c2d19bd..c469f1b 100644
--- a/compose/ui/ui-text/src/androidAndroidTest/kotlin/androidx/compose/ui/text/platform/AndroidParagraphTest.kt
+++ b/compose/ui/ui-text/src/androidAndroidTest/kotlin/androidx/compose/ui/text/platform/AndroidParagraphTest.kt
@@ -1548,6 +1548,38 @@
assertThat(paragraphPaddingTrue.height).isNotEqualTo(paragraphPaddingFalse.height)
}
+ @Test(expected = IllegalArgumentException::class)
+ fun setMinWidthConstraints_notSupported() {
+ val minWidthConstraints = Constraints(minWidth = 100)
+ AndroidParagraph(
+ text = "",
+ style = TextStyle(),
+ spanStyles = listOf(),
+ placeholders = listOf(),
+ maxLines = Int.MAX_VALUE,
+ ellipsis = true,
+ constraints = minWidthConstraints,
+ fontFamilyResolver = UncachedFontFamilyResolver(context),
+ density = defaultDensity,
+ )
+ }
+
+ @Test(expected = IllegalArgumentException::class)
+ fun setMinHeightConstraints_notSupported() {
+ val minHeightConstraints = Constraints(minHeight = 100)
+ AndroidParagraph(
+ text = "",
+ style = TextStyle(),
+ spanStyles = listOf(),
+ placeholders = listOf(),
+ maxLines = Int.MAX_VALUE,
+ ellipsis = true,
+ constraints = minHeightConstraints,
+ fontFamilyResolver = UncachedFontFamilyResolver(context),
+ density = defaultDensity,
+ )
+ }
+
private fun simpleParagraph(
text: String = "",
spanStyles: List<AnnotatedString.Range<SpanStyle>> = listOf(),
diff --git a/compose/ui/ui-text/src/androidMain/kotlin/androidx/compose/ui/text/platform/AndroidParagraph.android.kt b/compose/ui/ui-text/src/androidMain/kotlin/androidx/compose/ui/text/platform/AndroidParagraph.android.kt
index fc6163b..3111a7d 100644
--- a/compose/ui/ui-text/src/androidMain/kotlin/androidx/compose/ui/text/platform/AndroidParagraph.android.kt
+++ b/compose/ui/ui-text/src/androidMain/kotlin/androidx/compose/ui/text/platform/AndroidParagraph.android.kt
@@ -104,6 +104,10 @@
private val layout: TextLayout
init {
+ require(constraints.minHeight == 0 && constraints.minWidth == 0) {
+ "Setting Constraints.minWidth and Constraints.minHeight is not supported, " +
+ "these should be the default zero values instead."
+ }
require(maxLines >= 1) { "maxLines should be greater than 0" }
val style = paragraphIntrinsics.style
diff --git a/compose/ui/ui-text/src/commonMain/kotlin/androidx/compose/ui/text/MultiParagraph.kt b/compose/ui/ui-text/src/commonMain/kotlin/androidx/compose/ui/text/MultiParagraph.kt
index 3b4d9ac..516421b 100644
--- a/compose/ui/ui-text/src/commonMain/kotlin/androidx/compose/ui/text/MultiParagraph.kt
+++ b/compose/ui/ui-text/src/commonMain/kotlin/androidx/compose/ui/text/MultiParagraph.kt
@@ -40,9 +40,9 @@
*
* @param intrinsics previously calculated text intrinsics
* @param constraints how wide and tall the text is allowed to be. [Constraints.maxWidth]
- * will define the width of the Paragraph. Other components of the [Constraints] object are no-op
- * but will allow additional functionality in the future, e.g. ellipsis based on the limited
- * [Constraints.maxHeight]
+ * will define the width of the MultiParagraph. [Constraints.maxHeight] helps defining the
+ * number of lines that fit with ellipsis is true. Minimum components of the [Constraints]
+ * object are no-op.
* @param maxLines the maximum number of lines that the text can have
* @param ellipsis whether to ellipsize text, applied only when [maxLines] is set
*/
@@ -188,9 +188,9 @@
* @param annotatedString the text to be laid out
* @param style the [TextStyle] to be applied to the whole text
* @param constraints how wide and tall the text is allowed to be. [Constraints.maxWidth]
- * will define the width of the Paragraph. Other components of the [Constraints] object are no-op
- * but will allow additional functionality in the future, e.g. ellipsis based on the limited
- * [Constraints.maxHeight]
+ * will define the width of the MultiParagraph. [Constraints.maxHeight] helps defining the
+ * number of lines that fit with ellipsis is true. Minimum components of the [Constraints]
+ * object are no-op.
* @param density density of the device
* @param fontFamilyResolver to be used to load the font given in [SpanStyle]s
* @param placeholders a list of [Placeholder]s that specify ranges of text which will be
@@ -305,6 +305,11 @@
internal val paragraphInfoList: List<ParagraphInfo>
init {
+ require(constraints.minWidth == 0 && constraints.minHeight == 0) {
+ "Setting Constraints.minWidth and Constraints.minHeight is not supported, " +
+ "these should be the default zero values instead."
+ }
+
var currentHeight = 0f
var currentLineCount = 0
var didExceedMaxLines = false
@@ -319,7 +324,7 @@
Constraints(
maxWidth = constraints.maxWidth,
maxHeight = if (constraints.hasBoundedHeight) {
- constraints.maxHeight - currentHeight.ceilToInt()
+ (constraints.maxHeight - currentHeight.ceilToInt()).coerceAtLeast(0)
} else {
constraints.maxHeight
}
diff --git a/compose/ui/ui-text/src/commonMain/kotlin/androidx/compose/ui/text/Paragraph.kt b/compose/ui/ui-text/src/commonMain/kotlin/androidx/compose/ui/text/Paragraph.kt
index 7026c35..f626602 100644
--- a/compose/ui/ui-text/src/commonMain/kotlin/androidx/compose/ui/text/Paragraph.kt
+++ b/compose/ui/ui-text/src/commonMain/kotlin/androidx/compose/ui/text/Paragraph.kt
@@ -370,9 +370,8 @@
* @param text the text to be laid out
* @param style the [TextStyle] to be applied to the whole text
* @param constraints how wide and tall the text is allowed to be. [Constraints.maxWidth]
- * will define the width of the Paragraph. Other components of the [Constraints] object are no-op
- * but will allow additional functionality in the future, e.g. ellipsis based on the limited
- * [Constraints.maxHeight].
+ * will define the width of the Paragraph. [Constraints.maxHeight] helps defining the number of
+ * lines that fit with ellipsis is true. Minimum components of the [Constraints] object are no-op.
* @param density density of the device
* @param fontFamilyResolver [FontFamily.Resolver] to be used to load the font given in [SpanStyle]s
* @param spanStyles [SpanStyle]s to be applied to parts of text
@@ -441,9 +440,8 @@
*
* @param paragraphIntrinsics [ParagraphIntrinsics] instance
* @param constraints how wide and tall the text is allowed to be. [Constraints.maxWidth]
- * will define the width of the Paragraph. Other components of the [Constraints] object are no-op
- * but will allow additional functionality in the future, e.g. ellipsis based on the limited
- * [Constraints.maxHeight]
+ * will define the width of the Paragraph. [Constraints.maxHeight] helps defining the number of
+ * lines that fit with ellipsis is true. Minimum components of the [Constraints] object are no-op.
* @param maxLines the maximum number of lines that the text can have
* @param ellipsis whether to ellipsize text, applied only when [maxLines] is set
*/
diff --git a/compose/ui/ui-tooling-data/api/1.2.0-beta02.txt b/compose/ui/ui-tooling-data/api/1.2.0-beta02.txt
new file mode 100644
index 0000000..ab1e1a2
--- /dev/null
+++ b/compose/ui/ui-tooling-data/api/1.2.0-beta02.txt
@@ -0,0 +1,8 @@
+// Signature format: 4.0
+package androidx.compose.ui.tooling.data {
+
+ public final class SlotTreeKt {
+ }
+
+}
+
diff --git a/compose/ui/ui-tooling-data/api/public_plus_experimental_1.2.0-beta02.txt b/compose/ui/ui-tooling-data/api/public_plus_experimental_1.2.0-beta02.txt
new file mode 100644
index 0000000..f8fb257
--- /dev/null
+++ b/compose/ui/ui-tooling-data/api/public_plus_experimental_1.2.0-beta02.txt
@@ -0,0 +1,103 @@
+// Signature format: 4.0
+package androidx.compose.ui.tooling.data {
+
+ @androidx.compose.ui.tooling.data.UiToolingDataApi public final class CallGroup extends androidx.compose.ui.tooling.data.Group {
+ ctor public CallGroup(Object? key, String? name, androidx.compose.ui.unit.IntRect box, androidx.compose.ui.tooling.data.SourceLocation? location, Object? identity, java.util.List<androidx.compose.ui.tooling.data.ParameterInformation> parameters, java.util.Collection<?> data, java.util.Collection<? extends androidx.compose.ui.tooling.data.Group> children);
+ property public java.util.List<androidx.compose.ui.tooling.data.ParameterInformation> parameters;
+ }
+
+ @androidx.compose.ui.tooling.data.UiToolingDataApi public abstract sealed class Group {
+ method public final androidx.compose.ui.unit.IntRect getBox();
+ method public final java.util.Collection<androidx.compose.ui.tooling.data.Group> getChildren();
+ method public final java.util.Collection<java.lang.Object> getData();
+ method public final Object? getIdentity();
+ method public final Object? getKey();
+ method public final androidx.compose.ui.tooling.data.SourceLocation? getLocation();
+ method public java.util.List<androidx.compose.ui.layout.ModifierInfo> getModifierInfo();
+ method public final String? getName();
+ method public java.util.List<androidx.compose.ui.tooling.data.ParameterInformation> getParameters();
+ property public final androidx.compose.ui.unit.IntRect box;
+ property public final java.util.Collection<androidx.compose.ui.tooling.data.Group> children;
+ property public final java.util.Collection<java.lang.Object> data;
+ property public final Object? identity;
+ property public final Object? key;
+ property public final androidx.compose.ui.tooling.data.SourceLocation? location;
+ property public java.util.List<androidx.compose.ui.layout.ModifierInfo> modifierInfo;
+ property public final String? name;
+ property public java.util.List<androidx.compose.ui.tooling.data.ParameterInformation> parameters;
+ }
+
+ @androidx.compose.ui.tooling.data.UiToolingDataApi public final class JoinedKey {
+ ctor public JoinedKey(Object? left, Object? right);
+ method public Object? component1();
+ method public Object? component2();
+ method public androidx.compose.ui.tooling.data.JoinedKey copy(Object? left, Object? right);
+ method public Object? getLeft();
+ method public Object? getRight();
+ property public final Object? left;
+ property public final Object? right;
+ }
+
+ @androidx.compose.ui.tooling.data.UiToolingDataApi public final class NodeGroup extends androidx.compose.ui.tooling.data.Group {
+ ctor public NodeGroup(Object? key, Object node, androidx.compose.ui.unit.IntRect box, java.util.Collection<?> data, java.util.List<androidx.compose.ui.layout.ModifierInfo> modifierInfo, java.util.Collection<? extends androidx.compose.ui.tooling.data.Group> children);
+ method public Object getNode();
+ property public java.util.List<androidx.compose.ui.layout.ModifierInfo> modifierInfo;
+ property public final Object node;
+ }
+
+ @androidx.compose.ui.tooling.data.UiToolingDataApi public final class ParameterInformation {
+ ctor public ParameterInformation(String name, Object? value, boolean fromDefault, boolean static, boolean compared, String? inlineClass, boolean stable);
+ method public String component1();
+ method public Object? component2();
+ method public boolean component3();
+ method public boolean component4();
+ method public boolean component5();
+ method public String? component6();
+ method public boolean component7();
+ method public androidx.compose.ui.tooling.data.ParameterInformation copy(String name, Object? value, boolean fromDefault, boolean static, boolean compared, String? inlineClass, boolean stable);
+ method public boolean getCompared();
+ method public boolean getFromDefault();
+ method public String? getInlineClass();
+ method public String getName();
+ method public boolean getStable();
+ method public boolean getStatic();
+ method public Object? getValue();
+ property public final boolean compared;
+ property public final boolean fromDefault;
+ property public final String? inlineClass;
+ property public final String name;
+ property public final boolean stable;
+ property public final boolean static;
+ property public final Object? value;
+ }
+
+ public final class SlotTreeKt {
+ method @androidx.compose.ui.tooling.data.UiToolingDataApi public static androidx.compose.ui.tooling.data.Group asTree(androidx.compose.runtime.tooling.CompositionData);
+ method @androidx.compose.ui.tooling.data.UiToolingDataApi public static String? getPosition(androidx.compose.ui.tooling.data.Group);
+ }
+
+ @androidx.compose.ui.tooling.data.UiToolingDataApi public final class SourceLocation {
+ ctor public SourceLocation(int lineNumber, int offset, int length, String? sourceFile, int packageHash);
+ method public int component1();
+ method public int component2();
+ method public int component3();
+ method public String? component4();
+ method public int component5();
+ method public androidx.compose.ui.tooling.data.SourceLocation copy(int lineNumber, int offset, int length, String? sourceFile, int packageHash);
+ method public int getLength();
+ method public int getLineNumber();
+ method public int getOffset();
+ method public int getPackageHash();
+ method public String? getSourceFile();
+ property public final int length;
+ property public final int lineNumber;
+ property public final int offset;
+ property public final int packageHash;
+ property public final String? sourceFile;
+ }
+
+ @kotlin.RequiresOptIn(message="This API is for tooling only and is likely to change in the future.") public @interface UiToolingDataApi {
+ }
+
+}
+
diff --git a/compose/ui/ui-tooling-data/api/res-1.2.0-beta02.txt b/compose/ui/ui-tooling-data/api/res-1.2.0-beta02.txt
new file mode 100644
index 0000000..e69de29
--- /dev/null
+++ b/compose/ui/ui-tooling-data/api/res-1.2.0-beta02.txt
diff --git a/compose/ui/ui-tooling-data/api/restricted_1.2.0-beta02.txt b/compose/ui/ui-tooling-data/api/restricted_1.2.0-beta02.txt
new file mode 100644
index 0000000..ab1e1a2
--- /dev/null
+++ b/compose/ui/ui-tooling-data/api/restricted_1.2.0-beta02.txt
@@ -0,0 +1,8 @@
+// Signature format: 4.0
+package androidx.compose.ui.tooling.data {
+
+ public final class SlotTreeKt {
+ }
+
+}
+
diff --git a/compose/ui/ui-tooling-preview/api/1.2.0-beta02.txt b/compose/ui/ui-tooling-preview/api/1.2.0-beta02.txt
new file mode 100644
index 0000000..8a4375b
--- /dev/null
+++ b/compose/ui/ui-tooling-preview/api/1.2.0-beta02.txt
@@ -0,0 +1,103 @@
+// Signature format: 4.0
+package androidx.compose.ui.tooling.preview {
+
+ public final class Devices {
+ field public static final String AUTOMOTIVE_1024p = "id:automotive_1024p_landscape";
+ field public static final String DEFAULT = "";
+ field public static final String DESKTOP = "spec:shape=Normal,width=1920,height=1080,unit=dp,dpi=420";
+ field public static final String FOLDABLE = "spec:shape=Normal,width=673,height=841,unit=dp,dpi=480";
+ field public static final androidx.compose.ui.tooling.preview.Devices INSTANCE;
+ field public static final String NEXUS_10 = "name:Nexus 10";
+ field public static final String NEXUS_5 = "id:Nexus 5";
+ field public static final String NEXUS_5X = "id:Nexus 5X";
+ field public static final String NEXUS_6 = "id:Nexus 6";
+ field public static final String NEXUS_6P = "id:Nexus 6P";
+ field public static final String NEXUS_7 = "id:Nexus 7";
+ field public static final String NEXUS_7_2013 = "id:Nexus 7 2013";
+ field public static final String NEXUS_9 = "id:Nexus 9";
+ field public static final String PHONE = "spec:id=reference_phone,shape=Normal,width=411,height=891,unit=dp,dpi=420";
+ field public static final String PIXEL = "id:pixel";
+ field public static final String PIXEL_2 = "id:pixel_2";
+ field public static final String PIXEL_2_XL = "id:pixel_2_xl";
+ field public static final String PIXEL_3 = "id:pixel_3";
+ field public static final String PIXEL_3A = "id:pixel_3a";
+ field public static final String PIXEL_3A_XL = "id:pixel_3a_xl";
+ field public static final String PIXEL_3_XL = "id:pixel_3_xl";
+ field public static final String PIXEL_4 = "id:pixel_4";
+ field public static final String PIXEL_4_XL = "id:pixel_4_xl";
+ field public static final String PIXEL_C = "id:pixel_c";
+ field public static final String PIXEL_XL = "id:pixel_xl";
+ field public static final String TABLET = "spec:shape=Normal,width=1280,height=800,unit=dp,dpi=420";
+ field public static final String WEAR_OS_LARGE_ROUND = "id:wearos_large_round";
+ field public static final String WEAR_OS_RECT = "id:wearos_rect";
+ field public static final String WEAR_OS_SMALL_ROUND = "id:wearos_small_round";
+ field public static final String WEAR_OS_SQUARE = "id:wearos_square";
+ }
+
+ @kotlin.annotation.MustBeDocumented @kotlin.annotation.Repeatable @kotlin.annotation.Retention(kotlin.annotation.AnnotationRetention.SOURCE) @kotlin.annotation.Target(allowedTargets={kotlin.annotation.AnnotationTarget.ANNOTATION_CLASS, kotlin.annotation.AnnotationTarget.FUNCTION}) public @interface Preview {
+ method public abstract int apiLevel() default -1;
+ method public abstract long backgroundColor() default 0;
+ method public abstract String device() default androidx.compose.ui.tooling.preview.Devices.DEFAULT;
+ method public abstract float fontScale() default 1.0;
+ method public abstract String group() default "";
+ method public abstract int heightDp() default -1;
+ method public abstract String locale() default "";
+ method public abstract String name() default "";
+ method public abstract boolean showBackground() default false;
+ method public abstract boolean showSystemUi() default false;
+ method public abstract int uiMode() default 0;
+ method public abstract int widthDp() default -1;
+ property public abstract int apiLevel;
+ property public abstract long backgroundColor;
+ property public abstract String device;
+ property public abstract float fontScale;
+ property public abstract String group;
+ property public abstract int heightDp;
+ property public abstract String locale;
+ property public abstract String name;
+ property public abstract boolean showBackground;
+ property public abstract boolean showSystemUi;
+ property public abstract int uiMode;
+ property public abstract int widthDp;
+ }
+
+ @kotlin.annotation.MustBeDocumented @kotlin.annotation.Repeatable @kotlin.annotation.Retention(kotlin.annotation.AnnotationRetention.SOURCE) @kotlin.annotation.Target(allowedTargets={kotlin.annotation.AnnotationTarget.ANNOTATION_CLASS, kotlin.annotation.AnnotationTarget.FUNCTION}) public static @interface Preview.Container {
+ method public abstract androidx.compose.ui.tooling.preview.Preview[] value();
+ }
+
+ @java.lang.annotation.Retention(java.lang.annotation.RetentionPolicy.RUNTIME) public @interface PreviewParameter {
+ method public abstract int limit() default kotlin.jvm.internal.IntCompanionObject.MAX_VALUE;
+ method public abstract kotlin.reflect.KClass<? extends androidx.compose.ui.tooling.preview.PreviewParameterProvider<?>> provider();
+ property public abstract int limit;
+ property public abstract kotlin.reflect.KClass<? extends androidx.compose.ui.tooling.preview.PreviewParameterProvider<?>> provider;
+ }
+
+ public interface PreviewParameterProvider<T> {
+ method public default int getCount();
+ method public kotlin.sequences.Sequence<T> getValues();
+ property public default int count;
+ property public abstract kotlin.sequences.Sequence<T> values;
+ }
+
+}
+
+package androidx.compose.ui.tooling.preview.datasource {
+
+ public class CollectionPreviewParameterProvider<T> implements androidx.compose.ui.tooling.preview.PreviewParameterProvider<T> {
+ ctor public CollectionPreviewParameterProvider(java.util.Collection<? extends T> collection);
+ method public kotlin.sequences.Sequence<T> getValues();
+ property public kotlin.sequences.Sequence<T> values;
+ }
+
+ public final class LoremIpsum implements androidx.compose.ui.tooling.preview.PreviewParameterProvider<java.lang.String> {
+ ctor public LoremIpsum(int words);
+ ctor public LoremIpsum();
+ method public kotlin.sequences.Sequence<java.lang.String> getValues();
+ property public kotlin.sequences.Sequence<java.lang.String> values;
+ }
+
+ public final class LoremIpsumKt {
+ }
+
+}
+
diff --git a/compose/ui/ui-tooling-preview/api/public_plus_experimental_1.2.0-beta02.txt b/compose/ui/ui-tooling-preview/api/public_plus_experimental_1.2.0-beta02.txt
new file mode 100644
index 0000000..8a4375b
--- /dev/null
+++ b/compose/ui/ui-tooling-preview/api/public_plus_experimental_1.2.0-beta02.txt
@@ -0,0 +1,103 @@
+// Signature format: 4.0
+package androidx.compose.ui.tooling.preview {
+
+ public final class Devices {
+ field public static final String AUTOMOTIVE_1024p = "id:automotive_1024p_landscape";
+ field public static final String DEFAULT = "";
+ field public static final String DESKTOP = "spec:shape=Normal,width=1920,height=1080,unit=dp,dpi=420";
+ field public static final String FOLDABLE = "spec:shape=Normal,width=673,height=841,unit=dp,dpi=480";
+ field public static final androidx.compose.ui.tooling.preview.Devices INSTANCE;
+ field public static final String NEXUS_10 = "name:Nexus 10";
+ field public static final String NEXUS_5 = "id:Nexus 5";
+ field public static final String NEXUS_5X = "id:Nexus 5X";
+ field public static final String NEXUS_6 = "id:Nexus 6";
+ field public static final String NEXUS_6P = "id:Nexus 6P";
+ field public static final String NEXUS_7 = "id:Nexus 7";
+ field public static final String NEXUS_7_2013 = "id:Nexus 7 2013";
+ field public static final String NEXUS_9 = "id:Nexus 9";
+ field public static final String PHONE = "spec:id=reference_phone,shape=Normal,width=411,height=891,unit=dp,dpi=420";
+ field public static final String PIXEL = "id:pixel";
+ field public static final String PIXEL_2 = "id:pixel_2";
+ field public static final String PIXEL_2_XL = "id:pixel_2_xl";
+ field public static final String PIXEL_3 = "id:pixel_3";
+ field public static final String PIXEL_3A = "id:pixel_3a";
+ field public static final String PIXEL_3A_XL = "id:pixel_3a_xl";
+ field public static final String PIXEL_3_XL = "id:pixel_3_xl";
+ field public static final String PIXEL_4 = "id:pixel_4";
+ field public static final String PIXEL_4_XL = "id:pixel_4_xl";
+ field public static final String PIXEL_C = "id:pixel_c";
+ field public static final String PIXEL_XL = "id:pixel_xl";
+ field public static final String TABLET = "spec:shape=Normal,width=1280,height=800,unit=dp,dpi=420";
+ field public static final String WEAR_OS_LARGE_ROUND = "id:wearos_large_round";
+ field public static final String WEAR_OS_RECT = "id:wearos_rect";
+ field public static final String WEAR_OS_SMALL_ROUND = "id:wearos_small_round";
+ field public static final String WEAR_OS_SQUARE = "id:wearos_square";
+ }
+
+ @kotlin.annotation.MustBeDocumented @kotlin.annotation.Repeatable @kotlin.annotation.Retention(kotlin.annotation.AnnotationRetention.SOURCE) @kotlin.annotation.Target(allowedTargets={kotlin.annotation.AnnotationTarget.ANNOTATION_CLASS, kotlin.annotation.AnnotationTarget.FUNCTION}) public @interface Preview {
+ method public abstract int apiLevel() default -1;
+ method public abstract long backgroundColor() default 0;
+ method public abstract String device() default androidx.compose.ui.tooling.preview.Devices.DEFAULT;
+ method public abstract float fontScale() default 1.0;
+ method public abstract String group() default "";
+ method public abstract int heightDp() default -1;
+ method public abstract String locale() default "";
+ method public abstract String name() default "";
+ method public abstract boolean showBackground() default false;
+ method public abstract boolean showSystemUi() default false;
+ method public abstract int uiMode() default 0;
+ method public abstract int widthDp() default -1;
+ property public abstract int apiLevel;
+ property public abstract long backgroundColor;
+ property public abstract String device;
+ property public abstract float fontScale;
+ property public abstract String group;
+ property public abstract int heightDp;
+ property public abstract String locale;
+ property public abstract String name;
+ property public abstract boolean showBackground;
+ property public abstract boolean showSystemUi;
+ property public abstract int uiMode;
+ property public abstract int widthDp;
+ }
+
+ @kotlin.annotation.MustBeDocumented @kotlin.annotation.Repeatable @kotlin.annotation.Retention(kotlin.annotation.AnnotationRetention.SOURCE) @kotlin.annotation.Target(allowedTargets={kotlin.annotation.AnnotationTarget.ANNOTATION_CLASS, kotlin.annotation.AnnotationTarget.FUNCTION}) public static @interface Preview.Container {
+ method public abstract androidx.compose.ui.tooling.preview.Preview[] value();
+ }
+
+ @java.lang.annotation.Retention(java.lang.annotation.RetentionPolicy.RUNTIME) public @interface PreviewParameter {
+ method public abstract int limit() default kotlin.jvm.internal.IntCompanionObject.MAX_VALUE;
+ method public abstract kotlin.reflect.KClass<? extends androidx.compose.ui.tooling.preview.PreviewParameterProvider<?>> provider();
+ property public abstract int limit;
+ property public abstract kotlin.reflect.KClass<? extends androidx.compose.ui.tooling.preview.PreviewParameterProvider<?>> provider;
+ }
+
+ public interface PreviewParameterProvider<T> {
+ method public default int getCount();
+ method public kotlin.sequences.Sequence<T> getValues();
+ property public default int count;
+ property public abstract kotlin.sequences.Sequence<T> values;
+ }
+
+}
+
+package androidx.compose.ui.tooling.preview.datasource {
+
+ public class CollectionPreviewParameterProvider<T> implements androidx.compose.ui.tooling.preview.PreviewParameterProvider<T> {
+ ctor public CollectionPreviewParameterProvider(java.util.Collection<? extends T> collection);
+ method public kotlin.sequences.Sequence<T> getValues();
+ property public kotlin.sequences.Sequence<T> values;
+ }
+
+ public final class LoremIpsum implements androidx.compose.ui.tooling.preview.PreviewParameterProvider<java.lang.String> {
+ ctor public LoremIpsum(int words);
+ ctor public LoremIpsum();
+ method public kotlin.sequences.Sequence<java.lang.String> getValues();
+ property public kotlin.sequences.Sequence<java.lang.String> values;
+ }
+
+ public final class LoremIpsumKt {
+ }
+
+}
+
diff --git a/compose/ui/ui-tooling-preview/api/res-1.2.0-beta02.txt b/compose/ui/ui-tooling-preview/api/res-1.2.0-beta02.txt
new file mode 100644
index 0000000..e69de29
--- /dev/null
+++ b/compose/ui/ui-tooling-preview/api/res-1.2.0-beta02.txt
diff --git a/compose/ui/ui-tooling-preview/api/restricted_1.2.0-beta02.txt b/compose/ui/ui-tooling-preview/api/restricted_1.2.0-beta02.txt
new file mode 100644
index 0000000..8a4375b
--- /dev/null
+++ b/compose/ui/ui-tooling-preview/api/restricted_1.2.0-beta02.txt
@@ -0,0 +1,103 @@
+// Signature format: 4.0
+package androidx.compose.ui.tooling.preview {
+
+ public final class Devices {
+ field public static final String AUTOMOTIVE_1024p = "id:automotive_1024p_landscape";
+ field public static final String DEFAULT = "";
+ field public static final String DESKTOP = "spec:shape=Normal,width=1920,height=1080,unit=dp,dpi=420";
+ field public static final String FOLDABLE = "spec:shape=Normal,width=673,height=841,unit=dp,dpi=480";
+ field public static final androidx.compose.ui.tooling.preview.Devices INSTANCE;
+ field public static final String NEXUS_10 = "name:Nexus 10";
+ field public static final String NEXUS_5 = "id:Nexus 5";
+ field public static final String NEXUS_5X = "id:Nexus 5X";
+ field public static final String NEXUS_6 = "id:Nexus 6";
+ field public static final String NEXUS_6P = "id:Nexus 6P";
+ field public static final String NEXUS_7 = "id:Nexus 7";
+ field public static final String NEXUS_7_2013 = "id:Nexus 7 2013";
+ field public static final String NEXUS_9 = "id:Nexus 9";
+ field public static final String PHONE = "spec:id=reference_phone,shape=Normal,width=411,height=891,unit=dp,dpi=420";
+ field public static final String PIXEL = "id:pixel";
+ field public static final String PIXEL_2 = "id:pixel_2";
+ field public static final String PIXEL_2_XL = "id:pixel_2_xl";
+ field public static final String PIXEL_3 = "id:pixel_3";
+ field public static final String PIXEL_3A = "id:pixel_3a";
+ field public static final String PIXEL_3A_XL = "id:pixel_3a_xl";
+ field public static final String PIXEL_3_XL = "id:pixel_3_xl";
+ field public static final String PIXEL_4 = "id:pixel_4";
+ field public static final String PIXEL_4_XL = "id:pixel_4_xl";
+ field public static final String PIXEL_C = "id:pixel_c";
+ field public static final String PIXEL_XL = "id:pixel_xl";
+ field public static final String TABLET = "spec:shape=Normal,width=1280,height=800,unit=dp,dpi=420";
+ field public static final String WEAR_OS_LARGE_ROUND = "id:wearos_large_round";
+ field public static final String WEAR_OS_RECT = "id:wearos_rect";
+ field public static final String WEAR_OS_SMALL_ROUND = "id:wearos_small_round";
+ field public static final String WEAR_OS_SQUARE = "id:wearos_square";
+ }
+
+ @kotlin.annotation.MustBeDocumented @kotlin.annotation.Repeatable @kotlin.annotation.Retention(kotlin.annotation.AnnotationRetention.SOURCE) @kotlin.annotation.Target(allowedTargets={kotlin.annotation.AnnotationTarget.ANNOTATION_CLASS, kotlin.annotation.AnnotationTarget.FUNCTION}) public @interface Preview {
+ method public abstract int apiLevel() default -1;
+ method public abstract long backgroundColor() default 0;
+ method public abstract String device() default androidx.compose.ui.tooling.preview.Devices.DEFAULT;
+ method public abstract float fontScale() default 1.0;
+ method public abstract String group() default "";
+ method public abstract int heightDp() default -1;
+ method public abstract String locale() default "";
+ method public abstract String name() default "";
+ method public abstract boolean showBackground() default false;
+ method public abstract boolean showSystemUi() default false;
+ method public abstract int uiMode() default 0;
+ method public abstract int widthDp() default -1;
+ property public abstract int apiLevel;
+ property public abstract long backgroundColor;
+ property public abstract String device;
+ property public abstract float fontScale;
+ property public abstract String group;
+ property public abstract int heightDp;
+ property public abstract String locale;
+ property public abstract String name;
+ property public abstract boolean showBackground;
+ property public abstract boolean showSystemUi;
+ property public abstract int uiMode;
+ property public abstract int widthDp;
+ }
+
+ @kotlin.annotation.MustBeDocumented @kotlin.annotation.Repeatable @kotlin.annotation.Retention(kotlin.annotation.AnnotationRetention.SOURCE) @kotlin.annotation.Target(allowedTargets={kotlin.annotation.AnnotationTarget.ANNOTATION_CLASS, kotlin.annotation.AnnotationTarget.FUNCTION}) public static @interface Preview.Container {
+ method public abstract androidx.compose.ui.tooling.preview.Preview[] value();
+ }
+
+ @java.lang.annotation.Retention(java.lang.annotation.RetentionPolicy.RUNTIME) public @interface PreviewParameter {
+ method public abstract int limit() default kotlin.jvm.internal.IntCompanionObject.MAX_VALUE;
+ method public abstract kotlin.reflect.KClass<? extends androidx.compose.ui.tooling.preview.PreviewParameterProvider<?>> provider();
+ property public abstract int limit;
+ property public abstract kotlin.reflect.KClass<? extends androidx.compose.ui.tooling.preview.PreviewParameterProvider<?>> provider;
+ }
+
+ public interface PreviewParameterProvider<T> {
+ method public default int getCount();
+ method public kotlin.sequences.Sequence<T> getValues();
+ property public default int count;
+ property public abstract kotlin.sequences.Sequence<T> values;
+ }
+
+}
+
+package androidx.compose.ui.tooling.preview.datasource {
+
+ public class CollectionPreviewParameterProvider<T> implements androidx.compose.ui.tooling.preview.PreviewParameterProvider<T> {
+ ctor public CollectionPreviewParameterProvider(java.util.Collection<? extends T> collection);
+ method public kotlin.sequences.Sequence<T> getValues();
+ property public kotlin.sequences.Sequence<T> values;
+ }
+
+ public final class LoremIpsum implements androidx.compose.ui.tooling.preview.PreviewParameterProvider<java.lang.String> {
+ ctor public LoremIpsum(int words);
+ ctor public LoremIpsum();
+ method public kotlin.sequences.Sequence<java.lang.String> getValues();
+ property public kotlin.sequences.Sequence<java.lang.String> values;
+ }
+
+ public final class LoremIpsumKt {
+ }
+
+}
+
diff --git a/compose/ui/ui-tooling/api/1.2.0-beta02.txt b/compose/ui/ui-tooling/api/1.2.0-beta02.txt
new file mode 100644
index 0000000..2f0241d
--- /dev/null
+++ b/compose/ui/ui-tooling/api/1.2.0-beta02.txt
@@ -0,0 +1,22 @@
+// Signature format: 4.0
+package androidx.compose.ui.tooling {
+
+ public final class ComposeViewAdapterKt {
+ }
+
+ public final class InspectableKt {
+ method @Deprecated @androidx.compose.runtime.Composable public static void InInspectionModeOnly(kotlin.jvm.functions.Function0<kotlin.Unit> content);
+ }
+
+ public final class PreviewUtilsKt {
+ }
+
+}
+
+package androidx.compose.ui.tooling.animation {
+
+ public final class ComposeAnimationParserKt {
+ }
+
+}
+
diff --git a/compose/ui/ui-tooling/api/public_plus_experimental_1.2.0-beta01.txt b/compose/ui/ui-tooling/api/public_plus_experimental_1.2.0-beta01.txt
index 2f0241d..cfbe91f 100644
--- a/compose/ui/ui-tooling/api/public_plus_experimental_1.2.0-beta01.txt
+++ b/compose/ui/ui-tooling/api/public_plus_experimental_1.2.0-beta01.txt
@@ -1,6 +1,11 @@
// Signature format: 4.0
package androidx.compose.ui.tooling {
+ @androidx.compose.ui.ExperimentalComposeUiApi public final class ComposableInvoker {
+ method @androidx.compose.ui.ExperimentalComposeUiApi public void invokeComposable(String className, String methodName, androidx.compose.runtime.Composer composer, java.lang.Object?... args);
+ field public static final androidx.compose.ui.tooling.ComposableInvoker INSTANCE;
+ }
+
public final class ComposeViewAdapterKt {
}
diff --git a/compose/ui/ui-tooling/api/public_plus_experimental_1.2.0-beta02.txt b/compose/ui/ui-tooling/api/public_plus_experimental_1.2.0-beta02.txt
new file mode 100644
index 0000000..cfbe91f
--- /dev/null
+++ b/compose/ui/ui-tooling/api/public_plus_experimental_1.2.0-beta02.txt
@@ -0,0 +1,27 @@
+// Signature format: 4.0
+package androidx.compose.ui.tooling {
+
+ @androidx.compose.ui.ExperimentalComposeUiApi public final class ComposableInvoker {
+ method @androidx.compose.ui.ExperimentalComposeUiApi public void invokeComposable(String className, String methodName, androidx.compose.runtime.Composer composer, java.lang.Object?... args);
+ field public static final androidx.compose.ui.tooling.ComposableInvoker INSTANCE;
+ }
+
+ public final class ComposeViewAdapterKt {
+ }
+
+ public final class InspectableKt {
+ method @Deprecated @androidx.compose.runtime.Composable public static void InInspectionModeOnly(kotlin.jvm.functions.Function0<kotlin.Unit> content);
+ }
+
+ public final class PreviewUtilsKt {
+ }
+
+}
+
+package androidx.compose.ui.tooling.animation {
+
+ public final class ComposeAnimationParserKt {
+ }
+
+}
+
diff --git a/compose/ui/ui-tooling/api/public_plus_experimental_current.txt b/compose/ui/ui-tooling/api/public_plus_experimental_current.txt
index 2f0241d..cfbe91f 100644
--- a/compose/ui/ui-tooling/api/public_plus_experimental_current.txt
+++ b/compose/ui/ui-tooling/api/public_plus_experimental_current.txt
@@ -1,6 +1,11 @@
// Signature format: 4.0
package androidx.compose.ui.tooling {
+ @androidx.compose.ui.ExperimentalComposeUiApi public final class ComposableInvoker {
+ method @androidx.compose.ui.ExperimentalComposeUiApi public void invokeComposable(String className, String methodName, androidx.compose.runtime.Composer composer, java.lang.Object?... args);
+ field public static final androidx.compose.ui.tooling.ComposableInvoker INSTANCE;
+ }
+
public final class ComposeViewAdapterKt {
}
diff --git a/compose/ui/ui-tooling/api/res-1.2.0-beta02.txt b/compose/ui/ui-tooling/api/res-1.2.0-beta02.txt
new file mode 100644
index 0000000..e69de29
--- /dev/null
+++ b/compose/ui/ui-tooling/api/res-1.2.0-beta02.txt
diff --git a/compose/ui/ui-tooling/api/restricted_1.2.0-beta02.txt b/compose/ui/ui-tooling/api/restricted_1.2.0-beta02.txt
new file mode 100644
index 0000000..2f0241d
--- /dev/null
+++ b/compose/ui/ui-tooling/api/restricted_1.2.0-beta02.txt
@@ -0,0 +1,22 @@
+// Signature format: 4.0
+package androidx.compose.ui.tooling {
+
+ public final class ComposeViewAdapterKt {
+ }
+
+ public final class InspectableKt {
+ method @Deprecated @androidx.compose.runtime.Composable public static void InInspectionModeOnly(kotlin.jvm.functions.Function0<kotlin.Unit> content);
+ }
+
+ public final class PreviewUtilsKt {
+ }
+
+}
+
+package androidx.compose.ui.tooling.animation {
+
+ public final class ComposeAnimationParserKt {
+ }
+
+}
+
diff --git a/compose/ui/ui-tooling/src/androidMain/kotlin/androidx/compose/ui/tooling/ComposeViewAdapter.kt b/compose/ui/ui-tooling/src/androidMain/kotlin/androidx/compose/ui/tooling/ComposeViewAdapter.kt
index 404fa8f..7c484d32 100644
--- a/compose/ui/ui-tooling/src/androidMain/kotlin/androidx/compose/ui/tooling/ComposeViewAdapter.kt
+++ b/compose/ui/ui-tooling/src/androidMain/kotlin/androidx/compose/ui/tooling/ComposeViewAdapter.kt
@@ -41,6 +41,7 @@
import androidx.compose.runtime.currentComposer
import androidx.compose.runtime.mutableStateOf
import androidx.compose.runtime.snapshots.Snapshot
+import androidx.compose.ui.ExperimentalComposeUiApi
import androidx.compose.ui.graphics.Color
import androidx.compose.ui.graphics.toArgb
import androidx.compose.ui.platform.ComposeView
@@ -48,7 +49,7 @@
import androidx.compose.ui.platform.LocalFontLoader
import androidx.compose.ui.platform.ViewRootForTest
import androidx.compose.ui.text.font.createFontFamilyResolver
-import androidx.compose.ui.tooling.CommonPreviewUtils.invokeComposableViaReflection
+import androidx.compose.ui.tooling.ComposableInvoker.invokeComposable
import androidx.compose.ui.tooling.animation.PreviewAnimationClock
import androidx.compose.ui.tooling.data.Group
import androidx.compose.ui.tooling.data.SourceLocation
@@ -552,6 +553,7 @@
* @param onCommit callback invoked after every commit of the preview composable.
* @param onDraw callback invoked after every draw of the adapter. Only for test use.
*/
+ @OptIn(ExperimentalComposeUiApi::class)
@VisibleForTesting
internal fun init(
className: String,
@@ -585,7 +587,7 @@
// class loads correctly.
val composable = {
try {
- invokeComposableViaReflection(
+ invokeComposable(
className,
methodName,
composer,
diff --git a/compose/ui/ui-tooling/src/androidMain/kotlin/androidx/compose/ui/tooling/PreviewActivity.kt b/compose/ui/ui-tooling/src/androidMain/kotlin/androidx/compose/ui/tooling/PreviewActivity.kt
index 87f7446..6e5cad2 100644
--- a/compose/ui/ui-tooling/src/androidMain/kotlin/androidx/compose/ui/tooling/PreviewActivity.kt
+++ b/compose/ui/ui-tooling/src/androidMain/kotlin/androidx/compose/ui/tooling/PreviewActivity.kt
@@ -27,7 +27,8 @@
import androidx.compose.runtime.currentComposer
import androidx.compose.runtime.mutableStateOf
import androidx.compose.runtime.remember
-import androidx.compose.ui.tooling.CommonPreviewUtils.invokeComposableViaReflection
+import androidx.compose.ui.ExperimentalComposeUiApi
+import androidx.compose.ui.tooling.ComposableInvoker.invokeComposable
/**
* Activity used to run `@Composable` previews from Android Studio.
@@ -58,6 +59,7 @@
intent?.getStringExtra("composable")?.let { setComposableContent(it) }
}
+ @OptIn(ExperimentalComposeUiApi::class)
private fun setComposableContent(composableFqn: String) {
Log.d(TAG, "PreviewActivity has composable $composableFqn")
val className = composableFqn.substringBeforeLast('.')
@@ -69,7 +71,7 @@
}
Log.d(TAG, "Previewing '$methodName' without a parameter provider.")
setContent {
- invokeComposableViaReflection(
+ invokeComposable(
className,
methodName,
currentComposer
@@ -84,6 +86,7 @@
* Otherwise, the content will display a FAB that changes the argument value on click, cycling
* through all the values in the provider's sequence.
*/
+ @OptIn(ExperimentalComposeUiApi::class)
private fun setParameterizedContent(
className: String,
methodName: String,
@@ -104,7 +107,7 @@
Scaffold(
content = {
- invokeComposableViaReflection(
+ invokeComposable(
className,
methodName,
currentComposer,
@@ -121,7 +124,7 @@
}
} else {
setContent {
- invokeComposableViaReflection(
+ invokeComposable(
className,
methodName,
currentComposer,
diff --git a/compose/ui/ui-tooling/src/desktopMain/kotlin/androidx/compose/desktop/ui/tooling/preview/runtime/NonInteractivePreviewFacade.kt b/compose/ui/ui-tooling/src/desktopMain/kotlin/androidx/compose/desktop/ui/tooling/preview/runtime/NonInteractivePreviewFacade.kt
index f61464c..e569bf9 100644
--- a/compose/ui/ui-tooling/src/desktopMain/kotlin/androidx/compose/desktop/ui/tooling/preview/runtime/NonInteractivePreviewFacade.kt
+++ b/compose/ui/ui-tooling/src/desktopMain/kotlin/androidx/compose/desktop/ui/tooling/preview/runtime/NonInteractivePreviewFacade.kt
@@ -18,8 +18,9 @@
import androidx.compose.runtime.Composable
import androidx.compose.runtime.currentComposer
+import androidx.compose.ui.ExperimentalComposeUiApi
import androidx.compose.ui.platform.TestComposeWindow
-import androidx.compose.ui.tooling.CommonPreviewUtils
+import androidx.compose.ui.tooling.ComposableInvoker
import androidx.compose.ui.unit.Density
/**
@@ -46,6 +47,7 @@
internal class NonInteractivePreviewFacade {
companion object {
@JvmStatic
+ @OptIn(ExperimentalComposeUiApi::class)
fun render(fqName: String, width: Int, height: Int, scale: Double?): ByteArray {
val className = fqName.substringBeforeLast(".")
val methodName = fqName.substringAfterLast(".")
@@ -55,7 +57,7 @@
// We need to delay the reflection instantiation of the class until we are in the
// composable to ensure all the right initialization has happened and the Composable
// class loads correctly.
- CommonPreviewUtils.invokeComposableViaReflection(
+ ComposableInvoker.invokeComposable(
className,
methodName,
currentComposer
diff --git a/compose/ui/ui-tooling/src/desktopMain/kotlin/androidx/compose/desktop/ui/tooling/preview/runtime/PreviewRunner.kt b/compose/ui/ui-tooling/src/desktopMain/kotlin/androidx/compose/desktop/ui/tooling/preview/runtime/PreviewRunner.kt
index 65313de..89a9b0c 100644
--- a/compose/ui/ui-tooling/src/desktopMain/kotlin/androidx/compose/desktop/ui/tooling/preview/runtime/PreviewRunner.kt
+++ b/compose/ui/ui-tooling/src/desktopMain/kotlin/androidx/compose/desktop/ui/tooling/preview/runtime/PreviewRunner.kt
@@ -18,7 +18,8 @@
import androidx.compose.runtime.Composable
import androidx.compose.runtime.currentComposer
-import androidx.compose.ui.tooling.CommonPreviewUtils.invokeComposableViaReflection
+import androidx.compose.ui.ExperimentalComposeUiApi
+import androidx.compose.ui.tooling.ComposableInvoker.invokeComposable
import androidx.compose.ui.window.Window
import androidx.compose.ui.window.launchApplication
import kotlinx.coroutines.DelicateCoroutinesApi
@@ -29,6 +30,7 @@
private var previewComposition: @Composable () -> Unit = {}
@JvmStatic
+ @OptIn(ExperimentalComposeUiApi::class)
fun main(args: Array<String>) {
val previewFqName = args[0]
val className = previewFqName.substringBeforeLast(".")
@@ -38,7 +40,7 @@
// We need to delay the reflection instantiation of the class until we are in the
// composable to ensure all the right initialization has happened and the Composable
// class loads correctly.
- invokeComposableViaReflection(
+ invokeComposable(
className,
methodName,
currentComposer
diff --git a/compose/ui/ui-tooling/src/jvmMain/kotlin/androidx/compose/ui/tooling/CommonPreviewUtils.kt b/compose/ui/ui-tooling/src/jvmMain/kotlin/androidx/compose/ui/tooling/ComposableInvoker.kt
similarity index 95%
rename from compose/ui/ui-tooling/src/jvmMain/kotlin/androidx/compose/ui/tooling/CommonPreviewUtils.kt
rename to compose/ui/ui-tooling/src/jvmMain/kotlin/androidx/compose/ui/tooling/ComposableInvoker.kt
index 7f990ed..20309f7 100644
--- a/compose/ui/ui-tooling/src/jvmMain/kotlin/androidx/compose/ui/tooling/CommonPreviewUtils.kt
+++ b/compose/ui/ui-tooling/src/jvmMain/kotlin/androidx/compose/ui/tooling/ComposableInvoker.kt
@@ -17,11 +17,16 @@
package androidx.compose.ui.tooling
import androidx.compose.runtime.Composer
+import androidx.compose.ui.ExperimentalComposeUiApi
import java.lang.reflect.Method
import java.lang.reflect.Modifier
import kotlin.math.ceil
-internal object CommonPreviewUtils {
+/**
+ * A utility object to invoke composable function by its name and containing class.
+ */
+@ExperimentalComposeUiApi
+object ComposableInvoker {
/**
* Returns true if the [methodTypes] and [actualTypes] are compatible. This means that every
@@ -168,11 +173,12 @@
}
/**
- * Invokes the given [methodName] belonging to the given [className] via reflection. The
- * [methodName] is expected to be a Composable function.
+ * Invokes the given [methodName] belonging to the given [className]. The [methodName] is
+ * expected to be a Composable function.
* This method [args] will be forwarded to the Composable function.
*/
- internal fun invokeComposableViaReflection(
+ @ExperimentalComposeUiApi
+ fun invokeComposable(
className: String,
methodName: String,
composer: Composer,
diff --git a/compose/ui/ui-unit/api/1.2.0-beta02.txt b/compose/ui/ui-unit/api/1.2.0-beta02.txt
new file mode 100644
index 0000000..204f8d1
--- /dev/null
+++ b/compose/ui/ui-unit/api/1.2.0-beta02.txt
@@ -0,0 +1,409 @@
+// Signature format: 4.0
+package androidx.compose.ui.unit {
+
+ public final class AndroidDensity_androidKt {
+ method public static androidx.compose.ui.unit.Density Density(android.content.Context context);
+ }
+
+ @androidx.compose.runtime.Immutable @kotlin.jvm.JvmInline public final value class Constraints {
+ ctor public Constraints(@kotlin.PublishedApi long value);
+ method public long copy(optional int minWidth, optional int maxWidth, optional int minHeight, optional int maxHeight);
+ method public boolean getHasBoundedHeight();
+ method public boolean getHasBoundedWidth();
+ method public boolean getHasFixedHeight();
+ method public boolean getHasFixedWidth();
+ method public int getMaxHeight();
+ method public int getMaxWidth();
+ method public int getMinHeight();
+ method public int getMinWidth();
+ method public boolean isZero();
+ property public final boolean hasBoundedHeight;
+ property public final boolean hasBoundedWidth;
+ property public final boolean hasFixedHeight;
+ property public final boolean hasFixedWidth;
+ property public final boolean isZero;
+ property public final int maxHeight;
+ property public final int maxWidth;
+ property public final int minHeight;
+ property public final int minWidth;
+ field public static final androidx.compose.ui.unit.Constraints.Companion Companion;
+ field public static final int Infinity = 2147483647; // 0x7fffffff
+ }
+
+ public static final class Constraints.Companion {
+ method @androidx.compose.runtime.Stable public long fixed(int width, int height);
+ method @androidx.compose.runtime.Stable public long fixedHeight(int height);
+ method @androidx.compose.runtime.Stable public long fixedWidth(int width);
+ }
+
+ public final class ConstraintsKt {
+ method @androidx.compose.runtime.Stable public static long Constraints(optional int minWidth, optional int maxWidth, optional int minHeight, optional int maxHeight);
+ method public static long constrain(long, long otherConstraints);
+ method @androidx.compose.runtime.Stable public static long constrain(long, long size);
+ method @androidx.compose.runtime.Stable public static int constrainHeight(long, int height);
+ method @androidx.compose.runtime.Stable public static int constrainWidth(long, int width);
+ method @androidx.compose.runtime.Stable public static boolean isSatisfiedBy(long, long size);
+ method @androidx.compose.runtime.Stable public static long offset(long, optional int horizontal, optional int vertical);
+ }
+
+ @androidx.compose.runtime.Immutable public interface Density {
+ method public float getDensity();
+ method public float getFontScale();
+ method @androidx.compose.runtime.Stable public default int roundToPx(float);
+ method @androidx.compose.runtime.Stable public default int roundToPx(long);
+ method @androidx.compose.runtime.Stable public default float toDp(long);
+ method @androidx.compose.runtime.Stable public default float toDp(int);
+ method @androidx.compose.runtime.Stable public default float toDp(float);
+ method @androidx.compose.runtime.Stable public default long toDpSize(long);
+ method @androidx.compose.runtime.Stable public default float toPx(float);
+ method @androidx.compose.runtime.Stable public default float toPx(long);
+ method @androidx.compose.runtime.Stable public default androidx.compose.ui.geometry.Rect toRect(androidx.compose.ui.unit.DpRect);
+ method @androidx.compose.runtime.Stable public default long toSize(long);
+ method @androidx.compose.runtime.Stable public default long toSp(float);
+ method @androidx.compose.runtime.Stable public default long toSp(int);
+ method @androidx.compose.runtime.Stable public default long toSp(float);
+ property public abstract float density;
+ property public abstract float fontScale;
+ }
+
+ public final class DensityKt {
+ method @androidx.compose.runtime.Stable public static androidx.compose.ui.unit.Density Density(float density, optional float fontScale);
+ }
+
+ @androidx.compose.runtime.Immutable @kotlin.jvm.JvmInline public final value class Dp implements java.lang.Comparable<androidx.compose.ui.unit.Dp> {
+ ctor public Dp(float value);
+ method @androidx.compose.runtime.Stable public operator int compareTo(float other);
+ method @androidx.compose.runtime.Stable public inline operator float div(float other);
+ method @androidx.compose.runtime.Stable public inline operator float div(int other);
+ method @androidx.compose.runtime.Stable public inline operator float div(float other);
+ method public float getValue();
+ method @androidx.compose.runtime.Stable public inline operator float minus(float other);
+ method @androidx.compose.runtime.Stable public inline operator float plus(float other);
+ method @androidx.compose.runtime.Stable public inline operator float times(float other);
+ method @androidx.compose.runtime.Stable public inline operator float times(int other);
+ method @androidx.compose.runtime.Stable public inline operator float unaryMinus();
+ property public final float value;
+ field public static final androidx.compose.ui.unit.Dp.Companion Companion;
+ }
+
+ public static final class Dp.Companion {
+ method public float getHairline();
+ method public float getInfinity();
+ method public float getUnspecified();
+ property public final float Hairline;
+ property public final float Infinity;
+ property public final float Unspecified;
+ }
+
+ public final class DpKt {
+ method @androidx.compose.runtime.Stable public static long DpOffset(float x, float y);
+ method @androidx.compose.runtime.Stable public static long DpSize(float width, float height);
+ method @androidx.compose.runtime.Stable public static inline float coerceAtLeast(float, float minimumValue);
+ method @androidx.compose.runtime.Stable public static inline float coerceAtMost(float, float maximumValue);
+ method @androidx.compose.runtime.Stable public static inline float coerceIn(float, float minimumValue, float maximumValue);
+ method public static long getCenter(long);
+ method public static inline float getDp(int);
+ method public static inline float getDp(double);
+ method public static inline float getDp(float);
+ method public static inline float getHeight(androidx.compose.ui.unit.DpRect);
+ method public static inline long getSize(androidx.compose.ui.unit.DpRect);
+ method public static inline float getWidth(androidx.compose.ui.unit.DpRect);
+ method public static inline boolean isFinite(float);
+ method public static inline boolean isSpecified(float);
+ method public static inline boolean isSpecified(long);
+ method public static inline boolean isSpecified(long);
+ method public static inline boolean isUnspecified(float);
+ method public static inline boolean isUnspecified(long);
+ method public static inline boolean isUnspecified(long);
+ method @androidx.compose.runtime.Stable public static float lerp(float start, float stop, float fraction);
+ method @androidx.compose.runtime.Stable public static long lerp(long start, long stop, float fraction);
+ method @androidx.compose.runtime.Stable public static long lerp(long start, long stop, float fraction);
+ method @androidx.compose.runtime.Stable public static inline float max(float a, float b);
+ method @androidx.compose.runtime.Stable public static inline float min(float a, float b);
+ method public static inline float takeOrElse(float, kotlin.jvm.functions.Function0<androidx.compose.ui.unit.Dp> block);
+ method public static inline long takeOrElse(long, kotlin.jvm.functions.Function0<androidx.compose.ui.unit.DpOffset> block);
+ method public static inline long takeOrElse(long, kotlin.jvm.functions.Function0<androidx.compose.ui.unit.DpSize> block);
+ method @androidx.compose.runtime.Stable public static inline operator float times(float, float other);
+ method @androidx.compose.runtime.Stable public static inline operator float times(double, float other);
+ method @androidx.compose.runtime.Stable public static inline operator float times(int, float other);
+ method @androidx.compose.runtime.Stable public static inline operator long times(int, long size);
+ method @androidx.compose.runtime.Stable public static inline operator long times(float, long size);
+ }
+
+ @androidx.compose.runtime.Immutable @kotlin.jvm.JvmInline public final value class DpOffset {
+ method public long copy(optional float x, optional float y);
+ method public float getX();
+ method public float getY();
+ method @androidx.compose.runtime.Stable public inline operator long minus(long other);
+ method @androidx.compose.runtime.Stable public inline operator long plus(long other);
+ property public final float x;
+ property public final float y;
+ field public static final androidx.compose.ui.unit.DpOffset.Companion Companion;
+ }
+
+ public static final class DpOffset.Companion {
+ method public long getUnspecified();
+ method public long getZero();
+ property public final long Unspecified;
+ property public final long Zero;
+ }
+
+ @androidx.compose.runtime.Immutable public final class DpRect {
+ ctor public DpRect(@androidx.compose.runtime.Stable float left, @androidx.compose.runtime.Stable float top, @androidx.compose.runtime.Stable float right, @androidx.compose.runtime.Stable float bottom);
+ ctor public DpRect(long origin, long size);
+ method public float component1-D9Ej5fM();
+ method public float component2-D9Ej5fM();
+ method public float component3-D9Ej5fM();
+ method public float component4-D9Ej5fM();
+ method public androidx.compose.ui.unit.DpRect copy-a9UjIt4(float left, float top, float right, float bottom);
+ method public float getBottom();
+ method public float getLeft();
+ method public float getRight();
+ method public float getTop();
+ property public final float bottom;
+ property public final float left;
+ property public final float right;
+ property public final float top;
+ field public static final androidx.compose.ui.unit.DpRect.Companion Companion;
+ }
+
+ public static final class DpRect.Companion {
+ }
+
+ @androidx.compose.runtime.Immutable @kotlin.jvm.JvmInline public final value class DpSize {
+ method @androidx.compose.runtime.Stable public inline operator float component1();
+ method @androidx.compose.runtime.Stable public inline operator float component2();
+ method public long copy(optional float width, optional float height);
+ method @androidx.compose.runtime.Stable public operator long div(int other);
+ method @androidx.compose.runtime.Stable public operator long div(float other);
+ method public float getHeight();
+ method public float getWidth();
+ method @androidx.compose.runtime.Stable public inline operator long minus(long other);
+ method @androidx.compose.runtime.Stable public inline operator long plus(long other);
+ method @androidx.compose.runtime.Stable public operator long times(int other);
+ method @androidx.compose.runtime.Stable public operator long times(float other);
+ property public final float height;
+ property public final float width;
+ field public static final androidx.compose.ui.unit.DpSize.Companion Companion;
+ }
+
+ public static final class DpSize.Companion {
+ method public long getUnspecified();
+ method public long getZero();
+ property public final long Unspecified;
+ property public final long Zero;
+ }
+
+ @androidx.compose.runtime.Immutable @kotlin.jvm.JvmInline public final value class IntOffset {
+ method @androidx.compose.runtime.Stable public operator int component1();
+ method @androidx.compose.runtime.Stable public operator int component2();
+ method public long copy(optional int x, optional int y);
+ method @androidx.compose.runtime.Stable public operator long div(float operand);
+ method public int getX();
+ method public int getY();
+ method @androidx.compose.runtime.Stable public inline operator long minus(long other);
+ method @androidx.compose.runtime.Stable public inline operator long plus(long other);
+ method @androidx.compose.runtime.Stable public operator long rem(int operand);
+ method @androidx.compose.runtime.Stable public operator long times(float operand);
+ method @androidx.compose.runtime.Stable public inline operator long unaryMinus();
+ property public final int x;
+ property public final int y;
+ field public static final androidx.compose.ui.unit.IntOffset.Companion Companion;
+ }
+
+ public static final class IntOffset.Companion {
+ method public long getZero();
+ property public final long Zero;
+ }
+
+ public final class IntOffsetKt {
+ method @androidx.compose.runtime.Stable public static long IntOffset(int x, int y);
+ method @androidx.compose.runtime.Stable public static long lerp(long start, long stop, float fraction);
+ method @androidx.compose.runtime.Stable public static operator long minus(long, long offset);
+ method @androidx.compose.runtime.Stable public static operator long minus(long, long offset);
+ method @androidx.compose.runtime.Stable public static operator long plus(long, long offset);
+ method @androidx.compose.runtime.Stable public static operator long plus(long, long offset);
+ method @androidx.compose.runtime.Stable public static inline long round(long);
+ method @androidx.compose.runtime.Stable public static inline long toOffset(long);
+ }
+
+ @androidx.compose.runtime.Immutable public final class IntRect {
+ ctor public IntRect(@androidx.compose.runtime.Stable int left, @androidx.compose.runtime.Stable int top, @androidx.compose.runtime.Stable int right, @androidx.compose.runtime.Stable int bottom);
+ method public int component1();
+ method public int component2();
+ method public int component3();
+ method public int component4();
+ method public boolean contains(long offset);
+ method public androidx.compose.ui.unit.IntRect copy(int left, int top, int right, int bottom);
+ method @androidx.compose.runtime.Stable public androidx.compose.ui.unit.IntRect deflate(int delta);
+ method public int getBottom();
+ method public long getBottomCenter();
+ method public long getBottomLeft();
+ method public long getBottomRight();
+ method public long getCenter();
+ method public long getCenterLeft();
+ method public long getCenterRight();
+ method public int getHeight();
+ method public int getLeft();
+ method public int getMaxDimension();
+ method public int getMinDimension();
+ method public int getRight();
+ method public long getSize();
+ method public int getTop();
+ method public long getTopCenter();
+ method public long getTopLeft();
+ method public long getTopRight();
+ method public int getWidth();
+ method @androidx.compose.runtime.Stable public androidx.compose.ui.unit.IntRect inflate(int delta);
+ method @androidx.compose.runtime.Stable public androidx.compose.ui.unit.IntRect intersect(androidx.compose.ui.unit.IntRect other);
+ method public boolean isEmpty();
+ method public boolean overlaps(androidx.compose.ui.unit.IntRect other);
+ method @androidx.compose.runtime.Stable public androidx.compose.ui.unit.IntRect translate(long offset);
+ method @androidx.compose.runtime.Stable public androidx.compose.ui.unit.IntRect translate(int translateX, int translateY);
+ property public final int bottom;
+ property public final long bottomCenter;
+ property public final long bottomLeft;
+ property public final long bottomRight;
+ property public final long center;
+ property public final long centerLeft;
+ property public final long centerRight;
+ property public final int height;
+ property public final boolean isEmpty;
+ property public final int left;
+ property public final int maxDimension;
+ property public final int minDimension;
+ property public final int right;
+ property public final long size;
+ property public final int top;
+ property public final long topCenter;
+ property public final long topLeft;
+ property public final long topRight;
+ property public final int width;
+ field public static final androidx.compose.ui.unit.IntRect.Companion Companion;
+ }
+
+ public static final class IntRect.Companion {
+ method public androidx.compose.ui.unit.IntRect getZero();
+ property public final androidx.compose.ui.unit.IntRect Zero;
+ }
+
+ public final class IntRectKt {
+ method @androidx.compose.runtime.Stable public static androidx.compose.ui.unit.IntRect IntRect(long offset, long size);
+ method @androidx.compose.runtime.Stable public static androidx.compose.ui.unit.IntRect IntRect(long topLeft, long bottomRight);
+ method @androidx.compose.runtime.Stable public static androidx.compose.ui.unit.IntRect IntRect(long center, int radius);
+ method @androidx.compose.runtime.Stable public static androidx.compose.ui.unit.IntRect lerp(androidx.compose.ui.unit.IntRect start, androidx.compose.ui.unit.IntRect stop, float fraction);
+ }
+
+ @androidx.compose.runtime.Immutable @kotlin.jvm.JvmInline public final value class IntSize {
+ method @androidx.compose.runtime.Stable public inline operator int component1();
+ method @androidx.compose.runtime.Stable public inline operator int component2();
+ method @androidx.compose.runtime.Stable public operator long div(int other);
+ method public int getHeight();
+ method public int getWidth();
+ method @androidx.compose.runtime.Stable public operator long times(int other);
+ property public final int height;
+ property public final int width;
+ field public static final androidx.compose.ui.unit.IntSize.Companion Companion;
+ }
+
+ public static final class IntSize.Companion {
+ method public long getZero();
+ property public final long Zero;
+ }
+
+ public final class IntSizeKt {
+ method @androidx.compose.runtime.Stable public static long IntSize(int width, int height);
+ method public static long getCenter(long);
+ method @androidx.compose.runtime.Stable public static operator long times(int, long size);
+ method @androidx.compose.runtime.Stable public static androidx.compose.ui.unit.IntRect toIntRect(long);
+ method @androidx.compose.runtime.Stable public static long toSize(long);
+ }
+
+ public enum LayoutDirection {
+ enum_constant public static final androidx.compose.ui.unit.LayoutDirection Ltr;
+ enum_constant public static final androidx.compose.ui.unit.LayoutDirection Rtl;
+ }
+
+ @androidx.compose.runtime.Immutable @kotlin.jvm.JvmInline public final value class TextUnit {
+ method public inline operator int compareTo(long other);
+ method public inline operator long div(float other);
+ method public inline operator long div(double other);
+ method public inline operator long div(int other);
+ method public long getType();
+ method public float getValue();
+ method public boolean isEm();
+ method public boolean isSp();
+ method public inline operator long times(float other);
+ method public inline operator long times(double other);
+ method public inline operator long times(int other);
+ method public inline operator long unaryMinus();
+ property public final boolean isEm;
+ property public final boolean isSp;
+ property public final long type;
+ property public final float value;
+ field public static final androidx.compose.ui.unit.TextUnit.Companion Companion;
+ }
+
+ public static final class TextUnit.Companion {
+ method public long getUnspecified();
+ property public final long Unspecified;
+ }
+
+ public final class TextUnitKt {
+ method public static long getEm(float);
+ method public static long getEm(double);
+ method public static long getEm(int);
+ method public static long getSp(float);
+ method public static long getSp(double);
+ method public static long getSp(int);
+ method public static inline boolean isSpecified(long);
+ method public static boolean isUnspecified(long);
+ method @androidx.compose.runtime.Stable public static long lerp(long start, long stop, float fraction);
+ method public static inline long takeOrElse(long, kotlin.jvm.functions.Function0<androidx.compose.ui.unit.TextUnit> block);
+ method @androidx.compose.runtime.Stable public static inline operator long times(float, long other);
+ method @androidx.compose.runtime.Stable public static inline operator long times(double, long other);
+ method @androidx.compose.runtime.Stable public static inline operator long times(int, long other);
+ }
+
+ @kotlin.jvm.JvmInline public final value class TextUnitType {
+ ctor public TextUnitType(long type);
+ field public static final androidx.compose.ui.unit.TextUnitType.Companion Companion;
+ }
+
+ public static final class TextUnitType.Companion {
+ method public long getEm();
+ method public long getSp();
+ method public long getUnspecified();
+ property public final long Em;
+ property public final long Sp;
+ property public final long Unspecified;
+ }
+
+ @androidx.compose.runtime.Immutable @kotlin.jvm.JvmInline public final value class Velocity {
+ method @androidx.compose.runtime.Stable public operator float component1();
+ method @androidx.compose.runtime.Stable public operator float component2();
+ method public long copy(optional float x, optional float y);
+ method @androidx.compose.runtime.Stable public operator long div(float operand);
+ method public float getX();
+ method public float getY();
+ method @androidx.compose.runtime.Stable public operator long minus(long other);
+ method @androidx.compose.runtime.Stable public operator long plus(long other);
+ method @androidx.compose.runtime.Stable public operator long rem(float operand);
+ method @androidx.compose.runtime.Stable public operator long times(float operand);
+ method @androidx.compose.runtime.Stable public operator long unaryMinus();
+ property public final float x;
+ property public final float y;
+ field public static final androidx.compose.ui.unit.Velocity.Companion Companion;
+ }
+
+ public static final class Velocity.Companion {
+ method public long getZero();
+ property public final long Zero;
+ }
+
+ public final class VelocityKt {
+ method @androidx.compose.runtime.Stable public static long Velocity(float x, float y);
+ }
+
+}
+
diff --git a/compose/ui/ui-unit/api/public_plus_experimental_1.2.0-beta02.txt b/compose/ui/ui-unit/api/public_plus_experimental_1.2.0-beta02.txt
new file mode 100644
index 0000000..ae4f8a5
--- /dev/null
+++ b/compose/ui/ui-unit/api/public_plus_experimental_1.2.0-beta02.txt
@@ -0,0 +1,413 @@
+// Signature format: 4.0
+package androidx.compose.ui.unit {
+
+ public final class AndroidDensity_androidKt {
+ method public static androidx.compose.ui.unit.Density Density(android.content.Context context);
+ }
+
+ @androidx.compose.runtime.Immutable @kotlin.jvm.JvmInline public final value class Constraints {
+ ctor public Constraints(@kotlin.PublishedApi long value);
+ method public long copy(optional int minWidth, optional int maxWidth, optional int minHeight, optional int maxHeight);
+ method public boolean getHasBoundedHeight();
+ method public boolean getHasBoundedWidth();
+ method public boolean getHasFixedHeight();
+ method public boolean getHasFixedWidth();
+ method public int getMaxHeight();
+ method public int getMaxWidth();
+ method public int getMinHeight();
+ method public int getMinWidth();
+ method public boolean isZero();
+ property public final boolean hasBoundedHeight;
+ property public final boolean hasBoundedWidth;
+ property public final boolean hasFixedHeight;
+ property public final boolean hasFixedWidth;
+ property public final boolean isZero;
+ property public final int maxHeight;
+ property public final int maxWidth;
+ property public final int minHeight;
+ property public final int minWidth;
+ field public static final androidx.compose.ui.unit.Constraints.Companion Companion;
+ field public static final int Infinity = 2147483647; // 0x7fffffff
+ }
+
+ public static final class Constraints.Companion {
+ method @androidx.compose.runtime.Stable public long fixed(int width, int height);
+ method @androidx.compose.runtime.Stable public long fixedHeight(int height);
+ method @androidx.compose.runtime.Stable public long fixedWidth(int width);
+ }
+
+ public final class ConstraintsKt {
+ method @androidx.compose.runtime.Stable public static long Constraints(optional int minWidth, optional int maxWidth, optional int minHeight, optional int maxHeight);
+ method public static long constrain(long, long otherConstraints);
+ method @androidx.compose.runtime.Stable public static long constrain(long, long size);
+ method @androidx.compose.runtime.Stable public static int constrainHeight(long, int height);
+ method @androidx.compose.runtime.Stable public static int constrainWidth(long, int width);
+ method @androidx.compose.runtime.Stable public static boolean isSatisfiedBy(long, long size);
+ method @androidx.compose.runtime.Stable public static long offset(long, optional int horizontal, optional int vertical);
+ }
+
+ @androidx.compose.runtime.Immutable public interface Density {
+ method public float getDensity();
+ method public float getFontScale();
+ method @androidx.compose.runtime.Stable public default int roundToPx(float);
+ method @androidx.compose.runtime.Stable public default int roundToPx(long);
+ method @androidx.compose.runtime.Stable public default float toDp(long);
+ method @androidx.compose.runtime.Stable public default float toDp(int);
+ method @androidx.compose.runtime.Stable public default float toDp(float);
+ method @androidx.compose.runtime.Stable public default long toDpSize(long);
+ method @androidx.compose.runtime.Stable public default float toPx(float);
+ method @androidx.compose.runtime.Stable public default float toPx(long);
+ method @androidx.compose.runtime.Stable public default androidx.compose.ui.geometry.Rect toRect(androidx.compose.ui.unit.DpRect);
+ method @androidx.compose.runtime.Stable public default long toSize(long);
+ method @androidx.compose.runtime.Stable public default long toSp(float);
+ method @androidx.compose.runtime.Stable public default long toSp(int);
+ method @androidx.compose.runtime.Stable public default long toSp(float);
+ property public abstract float density;
+ property public abstract float fontScale;
+ }
+
+ public final class DensityKt {
+ method @androidx.compose.runtime.Stable public static androidx.compose.ui.unit.Density Density(float density, optional float fontScale);
+ }
+
+ @androidx.compose.runtime.Immutable @kotlin.jvm.JvmInline public final value class Dp implements java.lang.Comparable<androidx.compose.ui.unit.Dp> {
+ ctor public Dp(float value);
+ method @androidx.compose.runtime.Stable public operator int compareTo(float other);
+ method @androidx.compose.runtime.Stable public inline operator float div(float other);
+ method @androidx.compose.runtime.Stable public inline operator float div(int other);
+ method @androidx.compose.runtime.Stable public inline operator float div(float other);
+ method public float getValue();
+ method @androidx.compose.runtime.Stable public inline operator float minus(float other);
+ method @androidx.compose.runtime.Stable public inline operator float plus(float other);
+ method @androidx.compose.runtime.Stable public inline operator float times(float other);
+ method @androidx.compose.runtime.Stable public inline operator float times(int other);
+ method @androidx.compose.runtime.Stable public inline operator float unaryMinus();
+ property public final float value;
+ field public static final androidx.compose.ui.unit.Dp.Companion Companion;
+ }
+
+ public static final class Dp.Companion {
+ method public float getHairline();
+ method public float getInfinity();
+ method public float getUnspecified();
+ property public final float Hairline;
+ property public final float Infinity;
+ property public final float Unspecified;
+ }
+
+ public final class DpKt {
+ method @androidx.compose.runtime.Stable public static long DpOffset(float x, float y);
+ method @androidx.compose.runtime.Stable public static long DpSize(float width, float height);
+ method @androidx.compose.runtime.Stable public static inline float coerceAtLeast(float, float minimumValue);
+ method @androidx.compose.runtime.Stable public static inline float coerceAtMost(float, float maximumValue);
+ method @androidx.compose.runtime.Stable public static inline float coerceIn(float, float minimumValue, float maximumValue);
+ method public static long getCenter(long);
+ method public static inline float getDp(int);
+ method public static inline float getDp(double);
+ method public static inline float getDp(float);
+ method public static inline float getHeight(androidx.compose.ui.unit.DpRect);
+ method public static inline long getSize(androidx.compose.ui.unit.DpRect);
+ method public static inline float getWidth(androidx.compose.ui.unit.DpRect);
+ method public static inline boolean isFinite(float);
+ method public static inline boolean isSpecified(float);
+ method public static inline boolean isSpecified(long);
+ method public static inline boolean isSpecified(long);
+ method public static inline boolean isUnspecified(float);
+ method public static inline boolean isUnspecified(long);
+ method public static inline boolean isUnspecified(long);
+ method @androidx.compose.runtime.Stable public static float lerp(float start, float stop, float fraction);
+ method @androidx.compose.runtime.Stable public static long lerp(long start, long stop, float fraction);
+ method @androidx.compose.runtime.Stable public static long lerp(long start, long stop, float fraction);
+ method @androidx.compose.runtime.Stable public static inline float max(float a, float b);
+ method @androidx.compose.runtime.Stable public static inline float min(float a, float b);
+ method public static inline float takeOrElse(float, kotlin.jvm.functions.Function0<androidx.compose.ui.unit.Dp> block);
+ method public static inline long takeOrElse(long, kotlin.jvm.functions.Function0<androidx.compose.ui.unit.DpOffset> block);
+ method public static inline long takeOrElse(long, kotlin.jvm.functions.Function0<androidx.compose.ui.unit.DpSize> block);
+ method @androidx.compose.runtime.Stable public static inline operator float times(float, float other);
+ method @androidx.compose.runtime.Stable public static inline operator float times(double, float other);
+ method @androidx.compose.runtime.Stable public static inline operator float times(int, float other);
+ method @androidx.compose.runtime.Stable public static inline operator long times(int, long size);
+ method @androidx.compose.runtime.Stable public static inline operator long times(float, long size);
+ }
+
+ @androidx.compose.runtime.Immutable @kotlin.jvm.JvmInline public final value class DpOffset {
+ method public long copy(optional float x, optional float y);
+ method public float getX();
+ method public float getY();
+ method @androidx.compose.runtime.Stable public inline operator long minus(long other);
+ method @androidx.compose.runtime.Stable public inline operator long plus(long other);
+ property public final float x;
+ property public final float y;
+ field public static final androidx.compose.ui.unit.DpOffset.Companion Companion;
+ }
+
+ public static final class DpOffset.Companion {
+ method public long getUnspecified();
+ method public long getZero();
+ property public final long Unspecified;
+ property public final long Zero;
+ }
+
+ @androidx.compose.runtime.Immutable public final class DpRect {
+ ctor public DpRect(@androidx.compose.runtime.Stable float left, @androidx.compose.runtime.Stable float top, @androidx.compose.runtime.Stable float right, @androidx.compose.runtime.Stable float bottom);
+ ctor public DpRect(long origin, long size);
+ method public float component1-D9Ej5fM();
+ method public float component2-D9Ej5fM();
+ method public float component3-D9Ej5fM();
+ method public float component4-D9Ej5fM();
+ method public androidx.compose.ui.unit.DpRect copy-a9UjIt4(float left, float top, float right, float bottom);
+ method public float getBottom();
+ method public float getLeft();
+ method public float getRight();
+ method public float getTop();
+ property public final float bottom;
+ property public final float left;
+ property public final float right;
+ property public final float top;
+ field public static final androidx.compose.ui.unit.DpRect.Companion Companion;
+ }
+
+ public static final class DpRect.Companion {
+ }
+
+ @androidx.compose.runtime.Immutable @kotlin.jvm.JvmInline public final value class DpSize {
+ method @androidx.compose.runtime.Stable public inline operator float component1();
+ method @androidx.compose.runtime.Stable public inline operator float component2();
+ method public long copy(optional float width, optional float height);
+ method @androidx.compose.runtime.Stable public operator long div(int other);
+ method @androidx.compose.runtime.Stable public operator long div(float other);
+ method public float getHeight();
+ method public float getWidth();
+ method @androidx.compose.runtime.Stable public inline operator long minus(long other);
+ method @androidx.compose.runtime.Stable public inline operator long plus(long other);
+ method @androidx.compose.runtime.Stable public operator long times(int other);
+ method @androidx.compose.runtime.Stable public operator long times(float other);
+ property public final float height;
+ property public final float width;
+ field public static final androidx.compose.ui.unit.DpSize.Companion Companion;
+ }
+
+ public static final class DpSize.Companion {
+ method public long getUnspecified();
+ method public long getZero();
+ property public final long Unspecified;
+ property public final long Zero;
+ }
+
+ @kotlin.RequiresOptIn(message="This API is experimental and is likely to change in the future.") public @interface ExperimentalUnitApi {
+ }
+
+ @androidx.compose.runtime.Immutable @kotlin.jvm.JvmInline public final value class IntOffset {
+ method @androidx.compose.runtime.Stable public operator int component1();
+ method @androidx.compose.runtime.Stable public operator int component2();
+ method public long copy(optional int x, optional int y);
+ method @androidx.compose.runtime.Stable public operator long div(float operand);
+ method public int getX();
+ method public int getY();
+ method @androidx.compose.runtime.Stable public inline operator long minus(long other);
+ method @androidx.compose.runtime.Stable public inline operator long plus(long other);
+ method @androidx.compose.runtime.Stable public operator long rem(int operand);
+ method @androidx.compose.runtime.Stable public operator long times(float operand);
+ method @androidx.compose.runtime.Stable public inline operator long unaryMinus();
+ property public final int x;
+ property public final int y;
+ field public static final androidx.compose.ui.unit.IntOffset.Companion Companion;
+ }
+
+ public static final class IntOffset.Companion {
+ method public long getZero();
+ property public final long Zero;
+ }
+
+ public final class IntOffsetKt {
+ method @androidx.compose.runtime.Stable public static long IntOffset(int x, int y);
+ method @androidx.compose.runtime.Stable public static long lerp(long start, long stop, float fraction);
+ method @androidx.compose.runtime.Stable public static operator long minus(long, long offset);
+ method @androidx.compose.runtime.Stable public static operator long minus(long, long offset);
+ method @androidx.compose.runtime.Stable public static operator long plus(long, long offset);
+ method @androidx.compose.runtime.Stable public static operator long plus(long, long offset);
+ method @androidx.compose.runtime.Stable public static inline long round(long);
+ method @androidx.compose.runtime.Stable public static inline long toOffset(long);
+ }
+
+ @androidx.compose.runtime.Immutable public final class IntRect {
+ ctor public IntRect(@androidx.compose.runtime.Stable int left, @androidx.compose.runtime.Stable int top, @androidx.compose.runtime.Stable int right, @androidx.compose.runtime.Stable int bottom);
+ method public int component1();
+ method public int component2();
+ method public int component3();
+ method public int component4();
+ method public boolean contains(long offset);
+ method public androidx.compose.ui.unit.IntRect copy(int left, int top, int right, int bottom);
+ method @androidx.compose.runtime.Stable public androidx.compose.ui.unit.IntRect deflate(int delta);
+ method public int getBottom();
+ method public long getBottomCenter();
+ method public long getBottomLeft();
+ method public long getBottomRight();
+ method public long getCenter();
+ method public long getCenterLeft();
+ method public long getCenterRight();
+ method public int getHeight();
+ method public int getLeft();
+ method public int getMaxDimension();
+ method public int getMinDimension();
+ method public int getRight();
+ method public long getSize();
+ method public int getTop();
+ method public long getTopCenter();
+ method public long getTopLeft();
+ method public long getTopRight();
+ method public int getWidth();
+ method @androidx.compose.runtime.Stable public androidx.compose.ui.unit.IntRect inflate(int delta);
+ method @androidx.compose.runtime.Stable public androidx.compose.ui.unit.IntRect intersect(androidx.compose.ui.unit.IntRect other);
+ method public boolean isEmpty();
+ method public boolean overlaps(androidx.compose.ui.unit.IntRect other);
+ method @androidx.compose.runtime.Stable public androidx.compose.ui.unit.IntRect translate(long offset);
+ method @androidx.compose.runtime.Stable public androidx.compose.ui.unit.IntRect translate(int translateX, int translateY);
+ property public final int bottom;
+ property public final long bottomCenter;
+ property public final long bottomLeft;
+ property public final long bottomRight;
+ property public final long center;
+ property public final long centerLeft;
+ property public final long centerRight;
+ property public final int height;
+ property public final boolean isEmpty;
+ property public final int left;
+ property public final int maxDimension;
+ property public final int minDimension;
+ property public final int right;
+ property public final long size;
+ property public final int top;
+ property public final long topCenter;
+ property public final long topLeft;
+ property public final long topRight;
+ property public final int width;
+ field public static final androidx.compose.ui.unit.IntRect.Companion Companion;
+ }
+
+ public static final class IntRect.Companion {
+ method public androidx.compose.ui.unit.IntRect getZero();
+ property public final androidx.compose.ui.unit.IntRect Zero;
+ }
+
+ public final class IntRectKt {
+ method @androidx.compose.runtime.Stable public static androidx.compose.ui.unit.IntRect IntRect(long offset, long size);
+ method @androidx.compose.runtime.Stable public static androidx.compose.ui.unit.IntRect IntRect(long topLeft, long bottomRight);
+ method @androidx.compose.runtime.Stable public static androidx.compose.ui.unit.IntRect IntRect(long center, int radius);
+ method @androidx.compose.runtime.Stable public static androidx.compose.ui.unit.IntRect lerp(androidx.compose.ui.unit.IntRect start, androidx.compose.ui.unit.IntRect stop, float fraction);
+ }
+
+ @androidx.compose.runtime.Immutable @kotlin.jvm.JvmInline public final value class IntSize {
+ method @androidx.compose.runtime.Stable public inline operator int component1();
+ method @androidx.compose.runtime.Stable public inline operator int component2();
+ method @androidx.compose.runtime.Stable public operator long div(int other);
+ method public int getHeight();
+ method public int getWidth();
+ method @androidx.compose.runtime.Stable public operator long times(int other);
+ property public final int height;
+ property public final int width;
+ field public static final androidx.compose.ui.unit.IntSize.Companion Companion;
+ }
+
+ public static final class IntSize.Companion {
+ method public long getZero();
+ property public final long Zero;
+ }
+
+ public final class IntSizeKt {
+ method @androidx.compose.runtime.Stable public static long IntSize(int width, int height);
+ method public static long getCenter(long);
+ method @androidx.compose.runtime.Stable public static operator long times(int, long size);
+ method @androidx.compose.runtime.Stable public static androidx.compose.ui.unit.IntRect toIntRect(long);
+ method @androidx.compose.runtime.Stable public static long toSize(long);
+ }
+
+ public enum LayoutDirection {
+ enum_constant public static final androidx.compose.ui.unit.LayoutDirection Ltr;
+ enum_constant public static final androidx.compose.ui.unit.LayoutDirection Rtl;
+ }
+
+ @androidx.compose.runtime.Immutable @kotlin.jvm.JvmInline public final value class TextUnit {
+ method public inline operator int compareTo(long other);
+ method public inline operator long div(float other);
+ method public inline operator long div(double other);
+ method public inline operator long div(int other);
+ method public long getType();
+ method public float getValue();
+ method public boolean isEm();
+ method public boolean isSp();
+ method public inline operator long times(float other);
+ method public inline operator long times(double other);
+ method public inline operator long times(int other);
+ method public inline operator long unaryMinus();
+ property public final boolean isEm;
+ property public final boolean isSp;
+ property public final long type;
+ property public final float value;
+ field public static final androidx.compose.ui.unit.TextUnit.Companion Companion;
+ }
+
+ public static final class TextUnit.Companion {
+ method public long getUnspecified();
+ property public final long Unspecified;
+ }
+
+ public final class TextUnitKt {
+ method @androidx.compose.ui.unit.ExperimentalUnitApi public static long TextUnit(float value, long type);
+ method public static long getEm(float);
+ method public static long getEm(double);
+ method public static long getEm(int);
+ method public static long getSp(float);
+ method public static long getSp(double);
+ method public static long getSp(int);
+ method public static inline boolean isSpecified(long);
+ method public static boolean isUnspecified(long);
+ method @androidx.compose.runtime.Stable public static long lerp(long start, long stop, float fraction);
+ method public static inline long takeOrElse(long, kotlin.jvm.functions.Function0<androidx.compose.ui.unit.TextUnit> block);
+ method @androidx.compose.runtime.Stable public static inline operator long times(float, long other);
+ method @androidx.compose.runtime.Stable public static inline operator long times(double, long other);
+ method @androidx.compose.runtime.Stable public static inline operator long times(int, long other);
+ }
+
+ @kotlin.jvm.JvmInline public final value class TextUnitType {
+ ctor public TextUnitType(long type);
+ field public static final androidx.compose.ui.unit.TextUnitType.Companion Companion;
+ }
+
+ public static final class TextUnitType.Companion {
+ method public long getEm();
+ method public long getSp();
+ method public long getUnspecified();
+ property public final long Em;
+ property public final long Sp;
+ property public final long Unspecified;
+ }
+
+ @androidx.compose.runtime.Immutable @kotlin.jvm.JvmInline public final value class Velocity {
+ method @androidx.compose.runtime.Stable public operator float component1();
+ method @androidx.compose.runtime.Stable public operator float component2();
+ method public long copy(optional float x, optional float y);
+ method @androidx.compose.runtime.Stable public operator long div(float operand);
+ method public float getX();
+ method public float getY();
+ method @androidx.compose.runtime.Stable public operator long minus(long other);
+ method @androidx.compose.runtime.Stable public operator long plus(long other);
+ method @androidx.compose.runtime.Stable public operator long rem(float operand);
+ method @androidx.compose.runtime.Stable public operator long times(float operand);
+ method @androidx.compose.runtime.Stable public operator long unaryMinus();
+ property public final float x;
+ property public final float y;
+ field public static final androidx.compose.ui.unit.Velocity.Companion Companion;
+ }
+
+ public static final class Velocity.Companion {
+ method public long getZero();
+ property public final long Zero;
+ }
+
+ public final class VelocityKt {
+ method @androidx.compose.runtime.Stable public static long Velocity(float x, float y);
+ }
+
+}
+
diff --git a/compose/ui/ui-unit/api/res-1.2.0-beta02.txt b/compose/ui/ui-unit/api/res-1.2.0-beta02.txt
new file mode 100644
index 0000000..e69de29
--- /dev/null
+++ b/compose/ui/ui-unit/api/res-1.2.0-beta02.txt
diff --git a/compose/ui/ui-unit/api/restricted_1.2.0-beta02.txt b/compose/ui/ui-unit/api/restricted_1.2.0-beta02.txt
new file mode 100644
index 0000000..7a4ebe3
--- /dev/null
+++ b/compose/ui/ui-unit/api/restricted_1.2.0-beta02.txt
@@ -0,0 +1,413 @@
+// Signature format: 4.0
+package androidx.compose.ui.unit {
+
+ public final class AndroidDensity_androidKt {
+ method public static androidx.compose.ui.unit.Density Density(android.content.Context context);
+ }
+
+ @androidx.compose.runtime.Immutable @kotlin.jvm.JvmInline public final value class Constraints {
+ ctor public Constraints(@kotlin.PublishedApi long value);
+ method public long copy(optional int minWidth, optional int maxWidth, optional int minHeight, optional int maxHeight);
+ method public boolean getHasBoundedHeight();
+ method public boolean getHasBoundedWidth();
+ method public boolean getHasFixedHeight();
+ method public boolean getHasFixedWidth();
+ method public int getMaxHeight();
+ method public int getMaxWidth();
+ method public int getMinHeight();
+ method public int getMinWidth();
+ method public boolean isZero();
+ property public final boolean hasBoundedHeight;
+ property public final boolean hasBoundedWidth;
+ property public final boolean hasFixedHeight;
+ property public final boolean hasFixedWidth;
+ property public final boolean isZero;
+ property public final int maxHeight;
+ property public final int maxWidth;
+ property public final int minHeight;
+ property public final int minWidth;
+ field public static final androidx.compose.ui.unit.Constraints.Companion Companion;
+ field public static final int Infinity = 2147483647; // 0x7fffffff
+ }
+
+ public static final class Constraints.Companion {
+ method @androidx.compose.runtime.Stable public long fixed(int width, int height);
+ method @androidx.compose.runtime.Stable public long fixedHeight(int height);
+ method @androidx.compose.runtime.Stable public long fixedWidth(int width);
+ }
+
+ public final class ConstraintsKt {
+ method @androidx.compose.runtime.Stable public static long Constraints(optional int minWidth, optional int maxWidth, optional int minHeight, optional int maxHeight);
+ method public static long constrain(long, long otherConstraints);
+ method @androidx.compose.runtime.Stable public static long constrain(long, long size);
+ method @androidx.compose.runtime.Stable public static int constrainHeight(long, int height);
+ method @androidx.compose.runtime.Stable public static int constrainWidth(long, int width);
+ method @androidx.compose.runtime.Stable public static boolean isSatisfiedBy(long, long size);
+ method @androidx.compose.runtime.Stable public static long offset(long, optional int horizontal, optional int vertical);
+ }
+
+ @androidx.compose.runtime.Immutable public interface Density {
+ method public float getDensity();
+ method public float getFontScale();
+ method @androidx.compose.runtime.Stable public default int roundToPx(float);
+ method @androidx.compose.runtime.Stable public default int roundToPx(long);
+ method @androidx.compose.runtime.Stable public default float toDp(long);
+ method @androidx.compose.runtime.Stable public default float toDp(int);
+ method @androidx.compose.runtime.Stable public default float toDp(float);
+ method @androidx.compose.runtime.Stable public default long toDpSize(long);
+ method @androidx.compose.runtime.Stable public default float toPx(float);
+ method @androidx.compose.runtime.Stable public default float toPx(long);
+ method @androidx.compose.runtime.Stable public default androidx.compose.ui.geometry.Rect toRect(androidx.compose.ui.unit.DpRect);
+ method @androidx.compose.runtime.Stable public default long toSize(long);
+ method @androidx.compose.runtime.Stable public default long toSp(float);
+ method @androidx.compose.runtime.Stable public default long toSp(int);
+ method @androidx.compose.runtime.Stable public default long toSp(float);
+ property public abstract float density;
+ property public abstract float fontScale;
+ }
+
+ public final class DensityKt {
+ method @androidx.compose.runtime.Stable public static androidx.compose.ui.unit.Density Density(float density, optional float fontScale);
+ }
+
+ @androidx.compose.runtime.Immutable @kotlin.jvm.JvmInline public final value class Dp implements java.lang.Comparable<androidx.compose.ui.unit.Dp> {
+ ctor public Dp(float value);
+ method @androidx.compose.runtime.Stable public operator int compareTo(float other);
+ method @androidx.compose.runtime.Stable public inline operator float div(float other);
+ method @androidx.compose.runtime.Stable public inline operator float div(int other);
+ method @androidx.compose.runtime.Stable public inline operator float div(float other);
+ method public float getValue();
+ method @androidx.compose.runtime.Stable public inline operator float minus(float other);
+ method @androidx.compose.runtime.Stable public inline operator float plus(float other);
+ method @androidx.compose.runtime.Stable public inline operator float times(float other);
+ method @androidx.compose.runtime.Stable public inline operator float times(int other);
+ method @androidx.compose.runtime.Stable public inline operator float unaryMinus();
+ property public final float value;
+ field public static final androidx.compose.ui.unit.Dp.Companion Companion;
+ }
+
+ public static final class Dp.Companion {
+ method public float getHairline();
+ method public float getInfinity();
+ method public float getUnspecified();
+ property public final float Hairline;
+ property public final float Infinity;
+ property public final float Unspecified;
+ }
+
+ public final class DpKt {
+ method @androidx.compose.runtime.Stable public static long DpOffset(float x, float y);
+ method @androidx.compose.runtime.Stable public static long DpSize(float width, float height);
+ method @androidx.compose.runtime.Stable public static inline float coerceAtLeast(float, float minimumValue);
+ method @androidx.compose.runtime.Stable public static inline float coerceAtMost(float, float maximumValue);
+ method @androidx.compose.runtime.Stable public static inline float coerceIn(float, float minimumValue, float maximumValue);
+ method public static long getCenter(long);
+ method public static inline float getDp(int);
+ method public static inline float getDp(double);
+ method public static inline float getDp(float);
+ method public static inline float getHeight(androidx.compose.ui.unit.DpRect);
+ method public static inline long getSize(androidx.compose.ui.unit.DpRect);
+ method public static inline float getWidth(androidx.compose.ui.unit.DpRect);
+ method public static inline boolean isFinite(float);
+ method public static inline boolean isSpecified(float);
+ method public static inline boolean isSpecified(long);
+ method public static inline boolean isSpecified(long);
+ method public static inline boolean isUnspecified(float);
+ method public static inline boolean isUnspecified(long);
+ method public static inline boolean isUnspecified(long);
+ method @androidx.compose.runtime.Stable public static float lerp(float start, float stop, float fraction);
+ method @androidx.compose.runtime.Stable public static long lerp(long start, long stop, float fraction);
+ method @androidx.compose.runtime.Stable public static long lerp(long start, long stop, float fraction);
+ method @androidx.compose.runtime.Stable public static inline float max(float a, float b);
+ method @androidx.compose.runtime.Stable public static inline float min(float a, float b);
+ method public static inline float takeOrElse(float, kotlin.jvm.functions.Function0<androidx.compose.ui.unit.Dp> block);
+ method public static inline long takeOrElse(long, kotlin.jvm.functions.Function0<androidx.compose.ui.unit.DpOffset> block);
+ method public static inline long takeOrElse(long, kotlin.jvm.functions.Function0<androidx.compose.ui.unit.DpSize> block);
+ method @androidx.compose.runtime.Stable public static inline operator float times(float, float other);
+ method @androidx.compose.runtime.Stable public static inline operator float times(double, float other);
+ method @androidx.compose.runtime.Stable public static inline operator float times(int, float other);
+ method @androidx.compose.runtime.Stable public static inline operator long times(int, long size);
+ method @androidx.compose.runtime.Stable public static inline operator long times(float, long size);
+ }
+
+ @androidx.compose.runtime.Immutable @kotlin.jvm.JvmInline public final value class DpOffset {
+ method public long copy(optional float x, optional float y);
+ method public float getX();
+ method public float getY();
+ method @androidx.compose.runtime.Stable public inline operator long minus(long other);
+ method @androidx.compose.runtime.Stable public inline operator long plus(long other);
+ property public final float x;
+ property public final float y;
+ field public static final androidx.compose.ui.unit.DpOffset.Companion Companion;
+ }
+
+ public static final class DpOffset.Companion {
+ method public long getUnspecified();
+ method public long getZero();
+ property public final long Unspecified;
+ property public final long Zero;
+ }
+
+ @androidx.compose.runtime.Immutable public final class DpRect {
+ ctor public DpRect(@androidx.compose.runtime.Stable float left, @androidx.compose.runtime.Stable float top, @androidx.compose.runtime.Stable float right, @androidx.compose.runtime.Stable float bottom);
+ ctor public DpRect(long origin, long size);
+ method public float component1-D9Ej5fM();
+ method public float component2-D9Ej5fM();
+ method public float component3-D9Ej5fM();
+ method public float component4-D9Ej5fM();
+ method public androidx.compose.ui.unit.DpRect copy-a9UjIt4(float left, float top, float right, float bottom);
+ method public float getBottom();
+ method public float getLeft();
+ method public float getRight();
+ method public float getTop();
+ property public final float bottom;
+ property public final float left;
+ property public final float right;
+ property public final float top;
+ field public static final androidx.compose.ui.unit.DpRect.Companion Companion;
+ }
+
+ public static final class DpRect.Companion {
+ }
+
+ @androidx.compose.runtime.Immutable @kotlin.jvm.JvmInline public final value class DpSize {
+ method @androidx.compose.runtime.Stable public inline operator float component1();
+ method @androidx.compose.runtime.Stable public inline operator float component2();
+ method public long copy(optional float width, optional float height);
+ method @androidx.compose.runtime.Stable public operator long div(int other);
+ method @androidx.compose.runtime.Stable public operator long div(float other);
+ method public float getHeight();
+ method public float getWidth();
+ method @androidx.compose.runtime.Stable public inline operator long minus(long other);
+ method @androidx.compose.runtime.Stable public inline operator long plus(long other);
+ method @androidx.compose.runtime.Stable public operator long times(int other);
+ method @androidx.compose.runtime.Stable public operator long times(float other);
+ property public final float height;
+ property public final float width;
+ field public static final androidx.compose.ui.unit.DpSize.Companion Companion;
+ }
+
+ public static final class DpSize.Companion {
+ method public long getUnspecified();
+ method public long getZero();
+ property public final long Unspecified;
+ property public final long Zero;
+ }
+
+ @androidx.compose.runtime.Immutable @kotlin.jvm.JvmInline public final value class IntOffset {
+ method @androidx.compose.runtime.Stable public operator int component1();
+ method @androidx.compose.runtime.Stable public operator int component2();
+ method public long copy(optional int x, optional int y);
+ method @androidx.compose.runtime.Stable public operator long div(float operand);
+ method public int getX();
+ method public int getY();
+ method @androidx.compose.runtime.Stable public inline operator long minus(long other);
+ method @androidx.compose.runtime.Stable public inline operator long plus(long other);
+ method @androidx.compose.runtime.Stable public operator long rem(int operand);
+ method @androidx.compose.runtime.Stable public operator long times(float operand);
+ method @androidx.compose.runtime.Stable public inline operator long unaryMinus();
+ property public final int x;
+ property public final int y;
+ field public static final androidx.compose.ui.unit.IntOffset.Companion Companion;
+ }
+
+ public static final class IntOffset.Companion {
+ method public long getZero();
+ property public final long Zero;
+ }
+
+ public final class IntOffsetKt {
+ method @androidx.compose.runtime.Stable public static long IntOffset(int x, int y);
+ method @androidx.compose.runtime.Stable public static long lerp(long start, long stop, float fraction);
+ method @androidx.compose.runtime.Stable public static operator long minus(long, long offset);
+ method @androidx.compose.runtime.Stable public static operator long minus(long, long offset);
+ method @androidx.compose.runtime.Stable public static operator long plus(long, long offset);
+ method @androidx.compose.runtime.Stable public static operator long plus(long, long offset);
+ method @androidx.compose.runtime.Stable public static inline long round(long);
+ method @androidx.compose.runtime.Stable public static inline long toOffset(long);
+ }
+
+ @androidx.compose.runtime.Immutable public final class IntRect {
+ ctor public IntRect(@androidx.compose.runtime.Stable int left, @androidx.compose.runtime.Stable int top, @androidx.compose.runtime.Stable int right, @androidx.compose.runtime.Stable int bottom);
+ method public int component1();
+ method public int component2();
+ method public int component3();
+ method public int component4();
+ method public boolean contains(long offset);
+ method public androidx.compose.ui.unit.IntRect copy(int left, int top, int right, int bottom);
+ method @androidx.compose.runtime.Stable public androidx.compose.ui.unit.IntRect deflate(int delta);
+ method public int getBottom();
+ method public long getBottomCenter();
+ method public long getBottomLeft();
+ method public long getBottomRight();
+ method public long getCenter();
+ method public long getCenterLeft();
+ method public long getCenterRight();
+ method public int getHeight();
+ method public int getLeft();
+ method public int getMaxDimension();
+ method public int getMinDimension();
+ method public int getRight();
+ method public long getSize();
+ method public int getTop();
+ method public long getTopCenter();
+ method public long getTopLeft();
+ method public long getTopRight();
+ method public int getWidth();
+ method @androidx.compose.runtime.Stable public androidx.compose.ui.unit.IntRect inflate(int delta);
+ method @androidx.compose.runtime.Stable public androidx.compose.ui.unit.IntRect intersect(androidx.compose.ui.unit.IntRect other);
+ method public boolean isEmpty();
+ method public boolean overlaps(androidx.compose.ui.unit.IntRect other);
+ method @androidx.compose.runtime.Stable public androidx.compose.ui.unit.IntRect translate(long offset);
+ method @androidx.compose.runtime.Stable public androidx.compose.ui.unit.IntRect translate(int translateX, int translateY);
+ property public final int bottom;
+ property public final long bottomCenter;
+ property public final long bottomLeft;
+ property public final long bottomRight;
+ property public final long center;
+ property public final long centerLeft;
+ property public final long centerRight;
+ property public final int height;
+ property public final boolean isEmpty;
+ property public final int left;
+ property public final int maxDimension;
+ property public final int minDimension;
+ property public final int right;
+ property public final long size;
+ property public final int top;
+ property public final long topCenter;
+ property public final long topLeft;
+ property public final long topRight;
+ property public final int width;
+ field public static final androidx.compose.ui.unit.IntRect.Companion Companion;
+ }
+
+ public static final class IntRect.Companion {
+ method public androidx.compose.ui.unit.IntRect getZero();
+ property public final androidx.compose.ui.unit.IntRect Zero;
+ }
+
+ public final class IntRectKt {
+ method @androidx.compose.runtime.Stable public static androidx.compose.ui.unit.IntRect IntRect(long offset, long size);
+ method @androidx.compose.runtime.Stable public static androidx.compose.ui.unit.IntRect IntRect(long topLeft, long bottomRight);
+ method @androidx.compose.runtime.Stable public static androidx.compose.ui.unit.IntRect IntRect(long center, int radius);
+ method @androidx.compose.runtime.Stable public static androidx.compose.ui.unit.IntRect lerp(androidx.compose.ui.unit.IntRect start, androidx.compose.ui.unit.IntRect stop, float fraction);
+ }
+
+ @androidx.compose.runtime.Immutable @kotlin.jvm.JvmInline public final value class IntSize {
+ method @androidx.compose.runtime.Stable public inline operator int component1();
+ method @androidx.compose.runtime.Stable public inline operator int component2();
+ method @androidx.compose.runtime.Stable public operator long div(int other);
+ method public int getHeight();
+ method public int getWidth();
+ method @androidx.compose.runtime.Stable public operator long times(int other);
+ property public final int height;
+ property public final int width;
+ field public static final androidx.compose.ui.unit.IntSize.Companion Companion;
+ }
+
+ public static final class IntSize.Companion {
+ method public long getZero();
+ property public final long Zero;
+ }
+
+ public final class IntSizeKt {
+ method @androidx.compose.runtime.Stable public static long IntSize(int width, int height);
+ method public static long getCenter(long);
+ method @androidx.compose.runtime.Stable public static operator long times(int, long size);
+ method @androidx.compose.runtime.Stable public static androidx.compose.ui.unit.IntRect toIntRect(long);
+ method @androidx.compose.runtime.Stable public static long toSize(long);
+ }
+
+ public enum LayoutDirection {
+ enum_constant public static final androidx.compose.ui.unit.LayoutDirection Ltr;
+ enum_constant public static final androidx.compose.ui.unit.LayoutDirection Rtl;
+ }
+
+ @androidx.compose.runtime.Immutable @kotlin.jvm.JvmInline public final value class TextUnit {
+ method public inline operator int compareTo(long other);
+ method public inline operator long div(float other);
+ method public inline operator long div(double other);
+ method public inline operator long div(int other);
+ method public long getType();
+ method public float getValue();
+ method public boolean isEm();
+ method public boolean isSp();
+ method public inline operator long times(float other);
+ method public inline operator long times(double other);
+ method public inline operator long times(int other);
+ method public inline operator long unaryMinus();
+ property public final boolean isEm;
+ property public final boolean isSp;
+ property public final long type;
+ property public final float value;
+ field public static final androidx.compose.ui.unit.TextUnit.Companion Companion;
+ }
+
+ public static final class TextUnit.Companion {
+ method public long getUnspecified();
+ property public final long Unspecified;
+ }
+
+ public final class TextUnitKt {
+ method @kotlin.PublishedApi internal static void checkArithmetic(long a);
+ method @kotlin.PublishedApi internal static void checkArithmetic(long a, long b);
+ method @kotlin.PublishedApi internal static void checkArithmetic(long a, long b, long c);
+ method public static long getEm(float);
+ method public static long getEm(double);
+ method public static long getEm(int);
+ method public static long getSp(float);
+ method public static long getSp(double);
+ method public static long getSp(int);
+ method public static inline boolean isSpecified(long);
+ method public static boolean isUnspecified(long);
+ method @androidx.compose.runtime.Stable public static long lerp(long start, long stop, float fraction);
+ method @kotlin.PublishedApi internal static long pack(long unitType, float v);
+ method public static inline long takeOrElse(long, kotlin.jvm.functions.Function0<androidx.compose.ui.unit.TextUnit> block);
+ method @androidx.compose.runtime.Stable public static inline operator long times(float, long other);
+ method @androidx.compose.runtime.Stable public static inline operator long times(double, long other);
+ method @androidx.compose.runtime.Stable public static inline operator long times(int, long other);
+ }
+
+ @kotlin.jvm.JvmInline public final value class TextUnitType {
+ ctor public TextUnitType(long type);
+ field public static final androidx.compose.ui.unit.TextUnitType.Companion Companion;
+ }
+
+ public static final class TextUnitType.Companion {
+ method public long getEm();
+ method public long getSp();
+ method public long getUnspecified();
+ property public final long Em;
+ property public final long Sp;
+ property public final long Unspecified;
+ }
+
+ @androidx.compose.runtime.Immutable @kotlin.jvm.JvmInline public final value class Velocity {
+ method @androidx.compose.runtime.Stable public operator float component1();
+ method @androidx.compose.runtime.Stable public operator float component2();
+ method public long copy(optional float x, optional float y);
+ method @androidx.compose.runtime.Stable public operator long div(float operand);
+ method public float getX();
+ method public float getY();
+ method @androidx.compose.runtime.Stable public operator long minus(long other);
+ method @androidx.compose.runtime.Stable public operator long plus(long other);
+ method @androidx.compose.runtime.Stable public operator long rem(float operand);
+ method @androidx.compose.runtime.Stable public operator long times(float operand);
+ method @androidx.compose.runtime.Stable public operator long unaryMinus();
+ property public final float x;
+ property public final float y;
+ field public static final androidx.compose.ui.unit.Velocity.Companion Companion;
+ }
+
+ public static final class Velocity.Companion {
+ method public long getZero();
+ property public final long Zero;
+ }
+
+ public final class VelocityKt {
+ method @androidx.compose.runtime.Stable public static long Velocity(float x, float y);
+ }
+
+}
+
diff --git a/compose/ui/ui-util/api/1.2.0-beta02.txt b/compose/ui/ui-util/api/1.2.0-beta02.txt
new file mode 100644
index 0000000..b71072e
--- /dev/null
+++ b/compose/ui/ui-util/api/1.2.0-beta02.txt
@@ -0,0 +1,36 @@
+// Signature format: 4.0
+package androidx.compose.ui.util {
+
+ public final class AndroidTrace_androidKt {
+ method public static inline <T> T! trace(String sectionName, kotlin.jvm.functions.Function0<? extends T> block);
+ }
+
+ public final class InlineClassHelperKt {
+ method public static inline long packFloats(float val1, float val2);
+ method public static inline long packInts(int val1, int val2);
+ method public static inline float unpackFloat1(long value);
+ method public static inline float unpackFloat2(long value);
+ method public static inline int unpackInt1(long value);
+ method public static inline int unpackInt2(long value);
+ }
+
+ public final class ListUtilsKt {
+ method public static inline <T> boolean fastAll(java.util.List<? extends T>, kotlin.jvm.functions.Function1<? super T,java.lang.Boolean> predicate);
+ method public static inline <T> boolean fastAny(java.util.List<? extends T>, kotlin.jvm.functions.Function1<? super T,java.lang.Boolean> predicate);
+ method public static inline <T> T? fastFirstOrNull(java.util.List<? extends T>, kotlin.jvm.functions.Function1<? super T,java.lang.Boolean> predicate);
+ method public static inline <T> void fastForEach(java.util.List<? extends T>, kotlin.jvm.functions.Function1<? super T,kotlin.Unit> action);
+ method public static inline <T> void fastForEachIndexed(java.util.List<? extends T>, kotlin.jvm.functions.Function2<? super java.lang.Integer,? super T,kotlin.Unit> action);
+ method public static inline <T, R> java.util.List<R> fastMap(java.util.List<? extends T>, kotlin.jvm.functions.Function1<? super T,? extends R> transform);
+ method public static inline <T, R, C extends java.util.Collection<? super R>> C fastMapTo(java.util.List<? extends T>, C destination, kotlin.jvm.functions.Function1<? super T,? extends R> transform);
+ method public static inline <T, R extends java.lang.Comparable<? super R>> T? fastMaxBy(java.util.List<? extends T>, kotlin.jvm.functions.Function1<? super T,? extends R> selector);
+ method public static inline <T> int fastSumBy(java.util.List<? extends T>, kotlin.jvm.functions.Function1<? super T,java.lang.Integer> selector);
+ }
+
+ public final class MathHelpersKt {
+ method public static float lerp(float start, float stop, float fraction);
+ method public static int lerp(int start, int stop, float fraction);
+ method public static long lerp(long start, long stop, float fraction);
+ }
+
+}
+
diff --git a/compose/ui/ui-util/api/public_plus_experimental_1.2.0-beta02.txt b/compose/ui/ui-util/api/public_plus_experimental_1.2.0-beta02.txt
new file mode 100644
index 0000000..b71072e
--- /dev/null
+++ b/compose/ui/ui-util/api/public_plus_experimental_1.2.0-beta02.txt
@@ -0,0 +1,36 @@
+// Signature format: 4.0
+package androidx.compose.ui.util {
+
+ public final class AndroidTrace_androidKt {
+ method public static inline <T> T! trace(String sectionName, kotlin.jvm.functions.Function0<? extends T> block);
+ }
+
+ public final class InlineClassHelperKt {
+ method public static inline long packFloats(float val1, float val2);
+ method public static inline long packInts(int val1, int val2);
+ method public static inline float unpackFloat1(long value);
+ method public static inline float unpackFloat2(long value);
+ method public static inline int unpackInt1(long value);
+ method public static inline int unpackInt2(long value);
+ }
+
+ public final class ListUtilsKt {
+ method public static inline <T> boolean fastAll(java.util.List<? extends T>, kotlin.jvm.functions.Function1<? super T,java.lang.Boolean> predicate);
+ method public static inline <T> boolean fastAny(java.util.List<? extends T>, kotlin.jvm.functions.Function1<? super T,java.lang.Boolean> predicate);
+ method public static inline <T> T? fastFirstOrNull(java.util.List<? extends T>, kotlin.jvm.functions.Function1<? super T,java.lang.Boolean> predicate);
+ method public static inline <T> void fastForEach(java.util.List<? extends T>, kotlin.jvm.functions.Function1<? super T,kotlin.Unit> action);
+ method public static inline <T> void fastForEachIndexed(java.util.List<? extends T>, kotlin.jvm.functions.Function2<? super java.lang.Integer,? super T,kotlin.Unit> action);
+ method public static inline <T, R> java.util.List<R> fastMap(java.util.List<? extends T>, kotlin.jvm.functions.Function1<? super T,? extends R> transform);
+ method public static inline <T, R, C extends java.util.Collection<? super R>> C fastMapTo(java.util.List<? extends T>, C destination, kotlin.jvm.functions.Function1<? super T,? extends R> transform);
+ method public static inline <T, R extends java.lang.Comparable<? super R>> T? fastMaxBy(java.util.List<? extends T>, kotlin.jvm.functions.Function1<? super T,? extends R> selector);
+ method public static inline <T> int fastSumBy(java.util.List<? extends T>, kotlin.jvm.functions.Function1<? super T,java.lang.Integer> selector);
+ }
+
+ public final class MathHelpersKt {
+ method public static float lerp(float start, float stop, float fraction);
+ method public static int lerp(int start, int stop, float fraction);
+ method public static long lerp(long start, long stop, float fraction);
+ }
+
+}
+
diff --git a/compose/ui/ui-util/api/res-1.2.0-beta02.txt b/compose/ui/ui-util/api/res-1.2.0-beta02.txt
new file mode 100644
index 0000000..e69de29
--- /dev/null
+++ b/compose/ui/ui-util/api/res-1.2.0-beta02.txt
diff --git a/compose/ui/ui-util/api/restricted_1.2.0-beta02.txt b/compose/ui/ui-util/api/restricted_1.2.0-beta02.txt
new file mode 100644
index 0000000..b71072e
--- /dev/null
+++ b/compose/ui/ui-util/api/restricted_1.2.0-beta02.txt
@@ -0,0 +1,36 @@
+// Signature format: 4.0
+package androidx.compose.ui.util {
+
+ public final class AndroidTrace_androidKt {
+ method public static inline <T> T! trace(String sectionName, kotlin.jvm.functions.Function0<? extends T> block);
+ }
+
+ public final class InlineClassHelperKt {
+ method public static inline long packFloats(float val1, float val2);
+ method public static inline long packInts(int val1, int val2);
+ method public static inline float unpackFloat1(long value);
+ method public static inline float unpackFloat2(long value);
+ method public static inline int unpackInt1(long value);
+ method public static inline int unpackInt2(long value);
+ }
+
+ public final class ListUtilsKt {
+ method public static inline <T> boolean fastAll(java.util.List<? extends T>, kotlin.jvm.functions.Function1<? super T,java.lang.Boolean> predicate);
+ method public static inline <T> boolean fastAny(java.util.List<? extends T>, kotlin.jvm.functions.Function1<? super T,java.lang.Boolean> predicate);
+ method public static inline <T> T? fastFirstOrNull(java.util.List<? extends T>, kotlin.jvm.functions.Function1<? super T,java.lang.Boolean> predicate);
+ method public static inline <T> void fastForEach(java.util.List<? extends T>, kotlin.jvm.functions.Function1<? super T,kotlin.Unit> action);
+ method public static inline <T> void fastForEachIndexed(java.util.List<? extends T>, kotlin.jvm.functions.Function2<? super java.lang.Integer,? super T,kotlin.Unit> action);
+ method public static inline <T, R> java.util.List<R> fastMap(java.util.List<? extends T>, kotlin.jvm.functions.Function1<? super T,? extends R> transform);
+ method public static inline <T, R, C extends java.util.Collection<? super R>> C fastMapTo(java.util.List<? extends T>, C destination, kotlin.jvm.functions.Function1<? super T,? extends R> transform);
+ method public static inline <T, R extends java.lang.Comparable<? super R>> T? fastMaxBy(java.util.List<? extends T>, kotlin.jvm.functions.Function1<? super T,? extends R> selector);
+ method public static inline <T> int fastSumBy(java.util.List<? extends T>, kotlin.jvm.functions.Function1<? super T,java.lang.Integer> selector);
+ }
+
+ public final class MathHelpersKt {
+ method public static float lerp(float start, float stop, float fraction);
+ method public static int lerp(int start, int stop, float fraction);
+ method public static long lerp(long start, long stop, float fraction);
+ }
+
+}
+
diff --git a/compose/ui/ui-viewbinding/api/1.2.0-beta02.txt b/compose/ui/ui-viewbinding/api/1.2.0-beta02.txt
new file mode 100644
index 0000000..07ba909
--- /dev/null
+++ b/compose/ui/ui-viewbinding/api/1.2.0-beta02.txt
@@ -0,0 +1,9 @@
+// Signature format: 4.0
+package androidx.compose.ui.viewinterop {
+
+ public final class AndroidViewBindingKt {
+ method @androidx.compose.runtime.Composable public static <T extends androidx.viewbinding.ViewBinding> void AndroidViewBinding(kotlin.jvm.functions.Function3<? super android.view.LayoutInflater,? super android.view.ViewGroup,? super java.lang.Boolean,? extends T> factory, optional androidx.compose.ui.Modifier modifier, optional kotlin.jvm.functions.Function1<? super T,kotlin.Unit> update);
+ }
+
+}
+
diff --git a/compose/ui/ui-viewbinding/api/public_plus_experimental_1.2.0-beta02.txt b/compose/ui/ui-viewbinding/api/public_plus_experimental_1.2.0-beta02.txt
new file mode 100644
index 0000000..07ba909
--- /dev/null
+++ b/compose/ui/ui-viewbinding/api/public_plus_experimental_1.2.0-beta02.txt
@@ -0,0 +1,9 @@
+// Signature format: 4.0
+package androidx.compose.ui.viewinterop {
+
+ public final class AndroidViewBindingKt {
+ method @androidx.compose.runtime.Composable public static <T extends androidx.viewbinding.ViewBinding> void AndroidViewBinding(kotlin.jvm.functions.Function3<? super android.view.LayoutInflater,? super android.view.ViewGroup,? super java.lang.Boolean,? extends T> factory, optional androidx.compose.ui.Modifier modifier, optional kotlin.jvm.functions.Function1<? super T,kotlin.Unit> update);
+ }
+
+}
+
diff --git a/compose/ui/ui-viewbinding/api/res-1.2.0-beta02.txt b/compose/ui/ui-viewbinding/api/res-1.2.0-beta02.txt
new file mode 100644
index 0000000..e69de29
--- /dev/null
+++ b/compose/ui/ui-viewbinding/api/res-1.2.0-beta02.txt
diff --git a/compose/ui/ui-viewbinding/api/restricted_1.2.0-beta02.txt b/compose/ui/ui-viewbinding/api/restricted_1.2.0-beta02.txt
new file mode 100644
index 0000000..07ba909
--- /dev/null
+++ b/compose/ui/ui-viewbinding/api/restricted_1.2.0-beta02.txt
@@ -0,0 +1,9 @@
+// Signature format: 4.0
+package androidx.compose.ui.viewinterop {
+
+ public final class AndroidViewBindingKt {
+ method @androidx.compose.runtime.Composable public static <T extends androidx.viewbinding.ViewBinding> void AndroidViewBinding(kotlin.jvm.functions.Function3<? super android.view.LayoutInflater,? super android.view.ViewGroup,? super java.lang.Boolean,? extends T> factory, optional androidx.compose.ui.Modifier modifier, optional kotlin.jvm.functions.Function1<? super T,kotlin.Unit> update);
+ }
+
+}
+
diff --git a/compose/ui/ui-viewbinding/samples/build.gradle b/compose/ui/ui-viewbinding/samples/build.gradle
index b9a6b53..64a65d0 100644
--- a/compose/ui/ui-viewbinding/samples/build.gradle
+++ b/compose/ui/ui-viewbinding/samples/build.gradle
@@ -57,11 +57,3 @@
}
namespace "androidx.compose.ui.viewbinding.samples"
}
-
-// Workaround for https://github.com/gradle/gradle/issues/19882
-configurations.all {
- resolutionStrategy.dependencySubstitution {
- substitute(module("androidx.lifecycle:lifecycle-common-java8:")).
- using project(":lifecycle:lifecycle-common-java8")
- }
-}
diff --git a/compose/ui/ui/api/1.2.0-beta01.txt b/compose/ui/ui/api/1.2.0-beta01.txt
index 79e85e0..1b79ed2 100644
--- a/compose/ui/ui/api/1.2.0-beta01.txt
+++ b/compose/ui/ui/api/1.2.0-beta01.txt
@@ -2477,9 +2477,9 @@
field public static final androidx.compose.ui.platform.ViewCompositionStrategy.DisposeOnDetachedFromWindow INSTANCE;
}
- public static final class ViewCompositionStrategy.DisposeOnDetachedFromWindowIfNotInPoolingContainer implements androidx.compose.ui.platform.ViewCompositionStrategy {
+ public static final class ViewCompositionStrategy.DisposeOnDetachedFromWindowOrReleasedFromPool implements androidx.compose.ui.platform.ViewCompositionStrategy {
method public kotlin.jvm.functions.Function0<kotlin.Unit> installFor(androidx.compose.ui.platform.AbstractComposeView view);
- field public static final androidx.compose.ui.platform.ViewCompositionStrategy.DisposeOnDetachedFromWindowIfNotInPoolingContainer INSTANCE;
+ field public static final androidx.compose.ui.platform.ViewCompositionStrategy.DisposeOnDetachedFromWindowOrReleasedFromPool INSTANCE;
}
public static final class ViewCompositionStrategy.DisposeOnLifecycleDestroyed implements androidx.compose.ui.platform.ViewCompositionStrategy {
diff --git a/compose/ui/ui/api/1.2.0-beta02.txt b/compose/ui/ui/api/1.2.0-beta02.txt
new file mode 100644
index 0000000..1b79ed2
--- /dev/null
+++ b/compose/ui/ui/api/1.2.0-beta02.txt
@@ -0,0 +1,3060 @@
+// Signature format: 4.0
+package androidx.compose.ui {
+
+ public final class AbsoluteAlignment {
+ method public androidx.compose.ui.Alignment getBottomLeft();
+ method public androidx.compose.ui.Alignment getBottomRight();
+ method public androidx.compose.ui.Alignment getCenterLeft();
+ method public androidx.compose.ui.Alignment getCenterRight();
+ method public androidx.compose.ui.Alignment.Horizontal getLeft();
+ method public androidx.compose.ui.Alignment.Horizontal getRight();
+ method public androidx.compose.ui.Alignment getTopLeft();
+ method public androidx.compose.ui.Alignment getTopRight();
+ property public final androidx.compose.ui.Alignment BottomLeft;
+ property public final androidx.compose.ui.Alignment BottomRight;
+ property public final androidx.compose.ui.Alignment CenterLeft;
+ property public final androidx.compose.ui.Alignment CenterRight;
+ property public final androidx.compose.ui.Alignment.Horizontal Left;
+ property public final androidx.compose.ui.Alignment.Horizontal Right;
+ property public final androidx.compose.ui.Alignment TopLeft;
+ property public final androidx.compose.ui.Alignment TopRight;
+ field public static final androidx.compose.ui.AbsoluteAlignment INSTANCE;
+ }
+
+ @androidx.compose.runtime.Stable public fun interface Alignment {
+ method public long align(long size, long space, androidx.compose.ui.unit.LayoutDirection layoutDirection);
+ field public static final androidx.compose.ui.Alignment.Companion Companion;
+ }
+
+ public static final class Alignment.Companion {
+ method public androidx.compose.ui.Alignment.Vertical getBottom();
+ method public androidx.compose.ui.Alignment getBottomCenter();
+ method public androidx.compose.ui.Alignment getBottomEnd();
+ method public androidx.compose.ui.Alignment getBottomStart();
+ method public androidx.compose.ui.Alignment getCenter();
+ method public androidx.compose.ui.Alignment getCenterEnd();
+ method public androidx.compose.ui.Alignment.Horizontal getCenterHorizontally();
+ method public androidx.compose.ui.Alignment getCenterStart();
+ method public androidx.compose.ui.Alignment.Vertical getCenterVertically();
+ method public androidx.compose.ui.Alignment.Horizontal getEnd();
+ method public androidx.compose.ui.Alignment.Horizontal getStart();
+ method public androidx.compose.ui.Alignment.Vertical getTop();
+ method public androidx.compose.ui.Alignment getTopCenter();
+ method public androidx.compose.ui.Alignment getTopEnd();
+ method public androidx.compose.ui.Alignment getTopStart();
+ property public final androidx.compose.ui.Alignment.Vertical Bottom;
+ property public final androidx.compose.ui.Alignment BottomCenter;
+ property public final androidx.compose.ui.Alignment BottomEnd;
+ property public final androidx.compose.ui.Alignment BottomStart;
+ property public final androidx.compose.ui.Alignment Center;
+ property public final androidx.compose.ui.Alignment CenterEnd;
+ property public final androidx.compose.ui.Alignment.Horizontal CenterHorizontally;
+ property public final androidx.compose.ui.Alignment CenterStart;
+ property public final androidx.compose.ui.Alignment.Vertical CenterVertically;
+ property public final androidx.compose.ui.Alignment.Horizontal End;
+ property public final androidx.compose.ui.Alignment.Horizontal Start;
+ property public final androidx.compose.ui.Alignment.Vertical Top;
+ property public final androidx.compose.ui.Alignment TopCenter;
+ property public final androidx.compose.ui.Alignment TopEnd;
+ property public final androidx.compose.ui.Alignment TopStart;
+ }
+
+ @androidx.compose.runtime.Stable public static fun interface Alignment.Horizontal {
+ method public int align(int size, int space, androidx.compose.ui.unit.LayoutDirection layoutDirection);
+ }
+
+ @androidx.compose.runtime.Stable public static fun interface Alignment.Vertical {
+ method public int align(int size, int space);
+ }
+
+ @androidx.compose.runtime.Immutable public final class BiasAbsoluteAlignment implements androidx.compose.ui.Alignment {
+ ctor public BiasAbsoluteAlignment(float horizontalBias, float verticalBias);
+ method public long align(long size, long space, androidx.compose.ui.unit.LayoutDirection layoutDirection);
+ method public androidx.compose.ui.BiasAbsoluteAlignment copy(float horizontalBias, float verticalBias);
+ }
+
+ @androidx.compose.runtime.Immutable public static final class BiasAbsoluteAlignment.Horizontal implements androidx.compose.ui.Alignment.Horizontal {
+ ctor public BiasAbsoluteAlignment.Horizontal(float bias);
+ method public int align(int size, int space, androidx.compose.ui.unit.LayoutDirection layoutDirection);
+ method public androidx.compose.ui.BiasAbsoluteAlignment.Horizontal copy(float bias);
+ }
+
+ @androidx.compose.runtime.Immutable public final class BiasAlignment implements androidx.compose.ui.Alignment {
+ ctor public BiasAlignment(float horizontalBias, float verticalBias);
+ method public long align(long size, long space, androidx.compose.ui.unit.LayoutDirection layoutDirection);
+ method public float component1();
+ method public float component2();
+ method public androidx.compose.ui.BiasAlignment copy(float horizontalBias, float verticalBias);
+ method public float getHorizontalBias();
+ method public float getVerticalBias();
+ property public final float horizontalBias;
+ property public final float verticalBias;
+ }
+
+ @androidx.compose.runtime.Immutable public static final class BiasAlignment.Horizontal implements androidx.compose.ui.Alignment.Horizontal {
+ ctor public BiasAlignment.Horizontal(float bias);
+ method public int align(int size, int space, androidx.compose.ui.unit.LayoutDirection layoutDirection);
+ method public androidx.compose.ui.BiasAlignment.Horizontal copy(float bias);
+ }
+
+ @androidx.compose.runtime.Immutable public static final class BiasAlignment.Vertical implements androidx.compose.ui.Alignment.Vertical {
+ ctor public BiasAlignment.Vertical(float bias);
+ method public int align(int size, int space);
+ method public androidx.compose.ui.BiasAlignment.Vertical copy(float bias);
+ }
+
+ public final class CombinedModifier implements androidx.compose.ui.Modifier {
+ ctor public CombinedModifier(androidx.compose.ui.Modifier outer, androidx.compose.ui.Modifier inner);
+ method public boolean all(kotlin.jvm.functions.Function1<? super androidx.compose.ui.Modifier.Element,java.lang.Boolean> predicate);
+ method public boolean any(kotlin.jvm.functions.Function1<? super androidx.compose.ui.Modifier.Element,java.lang.Boolean> predicate);
+ method public <R> R! foldIn(R? initial, kotlin.jvm.functions.Function2<? super R,? super androidx.compose.ui.Modifier.Element,? extends R> operation);
+ method public <R> R! foldOut(R? initial, kotlin.jvm.functions.Function2<? super androidx.compose.ui.Modifier.Element,? super R,? extends R> operation);
+ }
+
+ public final class ComposedModifierKt {
+ method public static androidx.compose.ui.Modifier composed(androidx.compose.ui.Modifier, optional kotlin.jvm.functions.Function1<? super androidx.compose.ui.platform.InspectorInfo,kotlin.Unit> inspectorInfo, kotlin.jvm.functions.Function1<? super androidx.compose.ui.Modifier,? extends androidx.compose.ui.Modifier> factory);
+ method public static androidx.compose.ui.Modifier composed(androidx.compose.ui.Modifier, String fullyQualifiedName, Object? key1, optional kotlin.jvm.functions.Function1<? super androidx.compose.ui.platform.InspectorInfo,kotlin.Unit> inspectorInfo, kotlin.jvm.functions.Function1<? super androidx.compose.ui.Modifier,? extends androidx.compose.ui.Modifier> factory);
+ method public static androidx.compose.ui.Modifier composed(androidx.compose.ui.Modifier, String fullyQualifiedName, Object? key1, Object? key2, optional kotlin.jvm.functions.Function1<? super androidx.compose.ui.platform.InspectorInfo,kotlin.Unit> inspectorInfo, kotlin.jvm.functions.Function1<? super androidx.compose.ui.Modifier,? extends androidx.compose.ui.Modifier> factory);
+ method public static androidx.compose.ui.Modifier composed(androidx.compose.ui.Modifier, String fullyQualifiedName, Object? key1, Object? key2, Object? key3, optional kotlin.jvm.functions.Function1<? super androidx.compose.ui.platform.InspectorInfo,kotlin.Unit> inspectorInfo, kotlin.jvm.functions.Function1<? super androidx.compose.ui.Modifier,? extends androidx.compose.ui.Modifier> factory);
+ method public static androidx.compose.ui.Modifier composed(androidx.compose.ui.Modifier, String fullyQualifiedName, Object![]? keys, optional kotlin.jvm.functions.Function1<? super androidx.compose.ui.platform.InspectorInfo,kotlin.Unit> inspectorInfo, kotlin.jvm.functions.Function1<? super androidx.compose.ui.Modifier,? extends androidx.compose.ui.Modifier> factory);
+ method public static androidx.compose.ui.Modifier materialize(androidx.compose.runtime.Composer, androidx.compose.ui.Modifier modifier);
+ }
+
+ @androidx.compose.runtime.Stable public interface Modifier {
+ method public boolean all(kotlin.jvm.functions.Function1<? super androidx.compose.ui.Modifier.Element,java.lang.Boolean> predicate);
+ method public boolean any(kotlin.jvm.functions.Function1<? super androidx.compose.ui.Modifier.Element,java.lang.Boolean> predicate);
+ method public <R> R! foldIn(R? initial, kotlin.jvm.functions.Function2<? super R,? super androidx.compose.ui.Modifier.Element,? extends R> operation);
+ method public <R> R! foldOut(R? initial, kotlin.jvm.functions.Function2<? super androidx.compose.ui.Modifier.Element,? super R,? extends R> operation);
+ method public default infix androidx.compose.ui.Modifier then(androidx.compose.ui.Modifier other);
+ field public static final androidx.compose.ui.Modifier.Companion Companion;
+ }
+
+ public static final class Modifier.Companion implements androidx.compose.ui.Modifier {
+ method public boolean all(kotlin.jvm.functions.Function1<? super androidx.compose.ui.Modifier.Element,java.lang.Boolean> predicate);
+ method public boolean any(kotlin.jvm.functions.Function1<? super androidx.compose.ui.Modifier.Element,java.lang.Boolean> predicate);
+ method public <R> R! foldIn(R? initial, kotlin.jvm.functions.Function2<? super R,? super androidx.compose.ui.Modifier.Element,? extends R> operation);
+ method public <R> R! foldOut(R? initial, kotlin.jvm.functions.Function2<? super androidx.compose.ui.Modifier.Element,? super R,? extends R> operation);
+ }
+
+ public static interface Modifier.Element extends androidx.compose.ui.Modifier {
+ method public default boolean all(kotlin.jvm.functions.Function1<? super androidx.compose.ui.Modifier.Element,java.lang.Boolean> predicate);
+ method public default boolean any(kotlin.jvm.functions.Function1<? super androidx.compose.ui.Modifier.Element,java.lang.Boolean> predicate);
+ method public default <R> R! foldIn(R? initial, kotlin.jvm.functions.Function2<? super R,? super androidx.compose.ui.Modifier.Element,? extends R> operation);
+ method public default <R> R! foldOut(R? initial, kotlin.jvm.functions.Function2<? super androidx.compose.ui.Modifier.Element,? super R,? extends R> operation);
+ }
+
+ @androidx.compose.runtime.Stable public interface MotionDurationScale extends kotlin.coroutines.CoroutineContext.Element {
+ method public default kotlin.coroutines.CoroutineContext.Key<?> getKey();
+ method public float getScaleFactor();
+ property public default kotlin.coroutines.CoroutineContext.Key<?> key;
+ property public abstract float scaleFactor;
+ field public static final androidx.compose.ui.MotionDurationScale.Key Key;
+ }
+
+ public static final class MotionDurationScale.Key implements kotlin.coroutines.CoroutineContext.Key<androidx.compose.ui.MotionDurationScale> {
+ }
+
+ public final class TempListUtilsKt {
+ }
+
+ @androidx.compose.runtime.ComposableTargetMarker(description="UI Composable") @kotlin.annotation.Retention(kotlin.annotation.AnnotationRetention.BINARY) @kotlin.annotation.Target(allowedTargets={kotlin.annotation.AnnotationTarget.FILE, kotlin.annotation.AnnotationTarget.FUNCTION, kotlin.annotation.AnnotationTarget.PROPERTY_GETTER, kotlin.annotation.AnnotationTarget.TYPE, kotlin.annotation.AnnotationTarget.TYPE_PARAMETER}) public @interface UiComposable {
+ }
+
+ public final class ZIndexModifierKt {
+ method @androidx.compose.runtime.Stable public static androidx.compose.ui.Modifier zIndex(androidx.compose.ui.Modifier, float zIndex);
+ }
+
+}
+
+package androidx.compose.ui.autofill {
+
+ public final class AndroidAutofillType_androidKt {
+ }
+
+ public final class AndroidAutofill_androidKt {
+ }
+
+}
+
+package androidx.compose.ui.draw {
+
+ public final class AlphaKt {
+ method @androidx.compose.runtime.Stable public static androidx.compose.ui.Modifier alpha(androidx.compose.ui.Modifier, float alpha);
+ }
+
+ public final class BlurKt {
+ method @androidx.compose.runtime.Stable public static androidx.compose.ui.Modifier blur(androidx.compose.ui.Modifier, float radiusX, float radiusY, optional androidx.compose.ui.graphics.Shape edgeTreatment);
+ method @androidx.compose.runtime.Stable public static androidx.compose.ui.Modifier blur(androidx.compose.ui.Modifier, float radius, optional androidx.compose.ui.graphics.Shape edgeTreatment);
+ }
+
+ @androidx.compose.runtime.Immutable @kotlin.jvm.JvmInline public final value class BlurredEdgeTreatment {
+ ctor public BlurredEdgeTreatment(androidx.compose.ui.graphics.Shape? shape);
+ method public androidx.compose.ui.graphics.Shape? getShape();
+ property public final androidx.compose.ui.graphics.Shape? shape;
+ field public static final androidx.compose.ui.draw.BlurredEdgeTreatment.Companion Companion;
+ }
+
+ public static final class BlurredEdgeTreatment.Companion {
+ method public androidx.compose.ui.graphics.Shape getRectangle();
+ method public androidx.compose.ui.graphics.Shape getUnbounded();
+ property public final androidx.compose.ui.graphics.Shape Rectangle;
+ property public final androidx.compose.ui.graphics.Shape Unbounded;
+ }
+
+ public interface BuildDrawCacheParams {
+ method public androidx.compose.ui.unit.Density getDensity();
+ method public androidx.compose.ui.unit.LayoutDirection getLayoutDirection();
+ method public long getSize();
+ property public abstract androidx.compose.ui.unit.Density density;
+ property public abstract androidx.compose.ui.unit.LayoutDirection layoutDirection;
+ property public abstract long size;
+ }
+
+ public final class CacheDrawScope implements androidx.compose.ui.unit.Density {
+ method public float getDensity();
+ method public float getFontScale();
+ method public androidx.compose.ui.unit.LayoutDirection getLayoutDirection();
+ method public long getSize();
+ method public androidx.compose.ui.draw.DrawResult onDrawBehind(kotlin.jvm.functions.Function1<? super androidx.compose.ui.graphics.drawscope.DrawScope,kotlin.Unit> block);
+ method public androidx.compose.ui.draw.DrawResult onDrawWithContent(kotlin.jvm.functions.Function1<? super androidx.compose.ui.graphics.drawscope.ContentDrawScope,kotlin.Unit> block);
+ property public float density;
+ property public float fontScale;
+ property public final androidx.compose.ui.unit.LayoutDirection layoutDirection;
+ property public final long size;
+ }
+
+ public final class ClipKt {
+ method @androidx.compose.runtime.Stable public static androidx.compose.ui.Modifier clip(androidx.compose.ui.Modifier, androidx.compose.ui.graphics.Shape shape);
+ method @androidx.compose.runtime.Stable public static androidx.compose.ui.Modifier clipToBounds(androidx.compose.ui.Modifier);
+ }
+
+ public interface DrawCacheModifier extends androidx.compose.ui.draw.DrawModifier {
+ method public void onBuildCache(androidx.compose.ui.draw.BuildDrawCacheParams params);
+ }
+
+ public interface DrawModifier extends androidx.compose.ui.Modifier.Element {
+ method public void draw(androidx.compose.ui.graphics.drawscope.ContentDrawScope);
+ }
+
+ public final class DrawModifierKt {
+ method public static androidx.compose.ui.Modifier drawBehind(androidx.compose.ui.Modifier, kotlin.jvm.functions.Function1<? super androidx.compose.ui.graphics.drawscope.DrawScope,kotlin.Unit> onDraw);
+ method public static androidx.compose.ui.Modifier drawWithCache(androidx.compose.ui.Modifier, kotlin.jvm.functions.Function1<? super androidx.compose.ui.draw.CacheDrawScope,androidx.compose.ui.draw.DrawResult> onBuildDrawCache);
+ method public static androidx.compose.ui.Modifier drawWithContent(androidx.compose.ui.Modifier, kotlin.jvm.functions.Function1<? super androidx.compose.ui.graphics.drawscope.ContentDrawScope,kotlin.Unit> onDraw);
+ }
+
+ public final class DrawResult {
+ }
+
+ public final class PainterModifierKt {
+ method public static androidx.compose.ui.Modifier paint(androidx.compose.ui.Modifier, androidx.compose.ui.graphics.painter.Painter painter, optional boolean sizeToIntrinsics, optional androidx.compose.ui.Alignment alignment, optional androidx.compose.ui.layout.ContentScale contentScale, optional float alpha, optional androidx.compose.ui.graphics.ColorFilter? colorFilter);
+ }
+
+ public final class RotateKt {
+ method @androidx.compose.runtime.Stable public static androidx.compose.ui.Modifier rotate(androidx.compose.ui.Modifier, float degrees);
+ }
+
+ public final class ScaleKt {
+ method @androidx.compose.runtime.Stable public static androidx.compose.ui.Modifier scale(androidx.compose.ui.Modifier, float scaleX, float scaleY);
+ method @androidx.compose.runtime.Stable public static androidx.compose.ui.Modifier scale(androidx.compose.ui.Modifier, float scale);
+ }
+
+ public final class ShadowKt {
+ method @androidx.compose.runtime.Stable public static androidx.compose.ui.Modifier shadow(androidx.compose.ui.Modifier, float elevation, optional androidx.compose.ui.graphics.Shape shape, optional boolean clip, optional long ambientColor, optional long spotColor);
+ method @Deprecated @androidx.compose.runtime.Stable public static androidx.compose.ui.Modifier! shadow(androidx.compose.ui.Modifier, float elevation, optional androidx.compose.ui.graphics.Shape shape, optional boolean clip);
+ }
+
+}
+
+package androidx.compose.ui.focus {
+
+ public final class BeyondBoundsLayoutKt {
+ }
+
+ public final class FocusChangedModifierKt {
+ method public static androidx.compose.ui.Modifier onFocusChanged(androidx.compose.ui.Modifier, kotlin.jvm.functions.Function1<? super androidx.compose.ui.focus.FocusState,kotlin.Unit> onFocusChanged);
+ }
+
+ @kotlin.jvm.JvmInline public final value class FocusDirection {
+ field public static final androidx.compose.ui.focus.FocusDirection.Companion Companion;
+ }
+
+ public static final class FocusDirection.Companion {
+ method public int getDown();
+ method public int getIn();
+ method public int getLeft();
+ method public int getNext();
+ method public int getOut();
+ method public int getPrevious();
+ method public int getRight();
+ method public int getUp();
+ property public final int Down;
+ property public final int In;
+ property public final int Left;
+ property public final int Next;
+ property public final int Out;
+ property public final int Previous;
+ property public final int Right;
+ property public final int Up;
+ }
+
+ public interface FocusEventModifier extends androidx.compose.ui.Modifier.Element {
+ method public void onFocusEvent(androidx.compose.ui.focus.FocusState focusState);
+ }
+
+ public final class FocusEventModifierKt {
+ method public static androidx.compose.ui.Modifier onFocusEvent(androidx.compose.ui.Modifier, kotlin.jvm.functions.Function1<? super androidx.compose.ui.focus.FocusState,kotlin.Unit> onFocusEvent);
+ }
+
+ public interface FocusManager {
+ method public void clearFocus(optional boolean force);
+ method public boolean moveFocus(int focusDirection);
+ }
+
+ public final class FocusManagerKt {
+ }
+
+ public final class FocusModifierKt {
+ method @Deprecated public static androidx.compose.ui.Modifier focusModifier(androidx.compose.ui.Modifier);
+ method public static androidx.compose.ui.Modifier focusTarget(androidx.compose.ui.Modifier);
+ }
+
+ @Deprecated public final class FocusOrder {
+ ctor @Deprecated public FocusOrder();
+ method @Deprecated public androidx.compose.ui.focus.FocusRequester getDown();
+ method @Deprecated public androidx.compose.ui.focus.FocusRequester getEnd();
+ method @Deprecated public androidx.compose.ui.focus.FocusRequester getLeft();
+ method @Deprecated public androidx.compose.ui.focus.FocusRequester getNext();
+ method @Deprecated public androidx.compose.ui.focus.FocusRequester getPrevious();
+ method @Deprecated public androidx.compose.ui.focus.FocusRequester getRight();
+ method @Deprecated public androidx.compose.ui.focus.FocusRequester getStart();
+ method @Deprecated public androidx.compose.ui.focus.FocusRequester getUp();
+ method @Deprecated public void setDown(androidx.compose.ui.focus.FocusRequester);
+ method @Deprecated public void setEnd(androidx.compose.ui.focus.FocusRequester);
+ method @Deprecated public void setLeft(androidx.compose.ui.focus.FocusRequester);
+ method @Deprecated public void setNext(androidx.compose.ui.focus.FocusRequester);
+ method @Deprecated public void setPrevious(androidx.compose.ui.focus.FocusRequester);
+ method @Deprecated public void setRight(androidx.compose.ui.focus.FocusRequester);
+ method @Deprecated public void setStart(androidx.compose.ui.focus.FocusRequester);
+ method @Deprecated public void setUp(androidx.compose.ui.focus.FocusRequester);
+ property public final androidx.compose.ui.focus.FocusRequester down;
+ property public final androidx.compose.ui.focus.FocusRequester end;
+ property public final androidx.compose.ui.focus.FocusRequester left;
+ property public final androidx.compose.ui.focus.FocusRequester next;
+ property public final androidx.compose.ui.focus.FocusRequester previous;
+ property public final androidx.compose.ui.focus.FocusRequester right;
+ property public final androidx.compose.ui.focus.FocusRequester start;
+ property public final androidx.compose.ui.focus.FocusRequester up;
+ }
+
+ @Deprecated public interface FocusOrderModifier extends androidx.compose.ui.Modifier.Element {
+ method @Deprecated public void populateFocusOrder(androidx.compose.ui.focus.FocusOrder focusOrder);
+ }
+
+ public final class FocusOrderModifierKt {
+ method @Deprecated public static androidx.compose.ui.Modifier focusOrder(androidx.compose.ui.Modifier, kotlin.jvm.functions.Function1<? super androidx.compose.ui.focus.FocusOrder,kotlin.Unit> focusOrderReceiver);
+ method @Deprecated public static androidx.compose.ui.Modifier focusOrder(androidx.compose.ui.Modifier, androidx.compose.ui.focus.FocusRequester focusRequester);
+ method @Deprecated public static androidx.compose.ui.Modifier focusOrder(androidx.compose.ui.Modifier, androidx.compose.ui.focus.FocusRequester focusRequester, kotlin.jvm.functions.Function1<? super androidx.compose.ui.focus.FocusOrder,kotlin.Unit> focusOrderReceiver);
+ }
+
+ public interface FocusProperties {
+ method public boolean getCanFocus();
+ method public default androidx.compose.ui.focus.FocusRequester getDown();
+ method public default androidx.compose.ui.focus.FocusRequester getEnd();
+ method public default androidx.compose.ui.focus.FocusRequester getLeft();
+ method public default androidx.compose.ui.focus.FocusRequester getNext();
+ method public default androidx.compose.ui.focus.FocusRequester getPrevious();
+ method public default androidx.compose.ui.focus.FocusRequester getRight();
+ method public default androidx.compose.ui.focus.FocusRequester getStart();
+ method public default androidx.compose.ui.focus.FocusRequester getUp();
+ method public void setCanFocus(boolean);
+ method public default void setDown(androidx.compose.ui.focus.FocusRequester);
+ method public default void setEnd(androidx.compose.ui.focus.FocusRequester);
+ method public default void setLeft(androidx.compose.ui.focus.FocusRequester);
+ method public default void setNext(androidx.compose.ui.focus.FocusRequester);
+ method public default void setPrevious(androidx.compose.ui.focus.FocusRequester);
+ method public default void setRight(androidx.compose.ui.focus.FocusRequester);
+ method public default void setStart(androidx.compose.ui.focus.FocusRequester);
+ method public default void setUp(androidx.compose.ui.focus.FocusRequester);
+ property public abstract boolean canFocus;
+ property public default androidx.compose.ui.focus.FocusRequester down;
+ property public default androidx.compose.ui.focus.FocusRequester end;
+ property public default androidx.compose.ui.focus.FocusRequester left;
+ property public default androidx.compose.ui.focus.FocusRequester next;
+ property public default androidx.compose.ui.focus.FocusRequester previous;
+ property public default androidx.compose.ui.focus.FocusRequester right;
+ property public default androidx.compose.ui.focus.FocusRequester start;
+ property public default androidx.compose.ui.focus.FocusRequester up;
+ }
+
+ public final class FocusPropertiesKt {
+ method public static androidx.compose.ui.Modifier focusProperties(androidx.compose.ui.Modifier, kotlin.jvm.functions.Function1<? super androidx.compose.ui.focus.FocusProperties,kotlin.Unit> scope);
+ }
+
+ public final class FocusRequester {
+ ctor public FocusRequester();
+ method public boolean captureFocus();
+ method public boolean freeFocus();
+ method public void requestFocus();
+ field public static final androidx.compose.ui.focus.FocusRequester.Companion Companion;
+ }
+
+ public static final class FocusRequester.Companion {
+ method public androidx.compose.ui.focus.FocusRequester getDefault();
+ property public final androidx.compose.ui.focus.FocusRequester Default;
+ }
+
+ public final class FocusRequesterKt {
+ }
+
+ public interface FocusRequesterModifier extends androidx.compose.ui.Modifier.Element {
+ method public androidx.compose.ui.focus.FocusRequester getFocusRequester();
+ property public abstract androidx.compose.ui.focus.FocusRequester focusRequester;
+ }
+
+ public final class FocusRequesterModifierKt {
+ method public static androidx.compose.ui.Modifier focusRequester(androidx.compose.ui.Modifier, androidx.compose.ui.focus.FocusRequester focusRequester);
+ }
+
+ public interface FocusState {
+ method public boolean getHasFocus();
+ method public boolean isCaptured();
+ method public boolean isFocused();
+ property public abstract boolean hasFocus;
+ property public abstract boolean isCaptured;
+ property public abstract boolean isFocused;
+ }
+
+ public final class FocusTransactionsKt {
+ }
+
+ public final class FocusTraversalKt {
+ }
+
+ public final class OneDimensionalFocusSearchKt {
+ }
+
+ public final class TwoDimensionalFocusSearchKt {
+ }
+
+}
+
+package androidx.compose.ui.graphics {
+
+ public final class GraphicsLayerModifierKt {
+ method @androidx.compose.runtime.Stable public static androidx.compose.ui.Modifier graphicsLayer(androidx.compose.ui.Modifier, optional float scaleX, optional float scaleY, optional float alpha, optional float translationX, optional float translationY, optional float shadowElevation, optional float rotationX, optional float rotationY, optional float rotationZ, optional float cameraDistance, optional long transformOrigin, optional androidx.compose.ui.graphics.Shape shape, optional boolean clip, optional androidx.compose.ui.graphics.RenderEffect? renderEffect, optional long ambientShadowColor, optional long spotShadowColor);
+ method @androidx.compose.runtime.Stable public static androidx.compose.ui.Modifier graphicsLayer(androidx.compose.ui.Modifier, kotlin.jvm.functions.Function1<? super androidx.compose.ui.graphics.GraphicsLayerScope,kotlin.Unit> block);
+ method @Deprecated @androidx.compose.runtime.Stable public static androidx.compose.ui.Modifier! graphicsLayer(androidx.compose.ui.Modifier, optional float scaleX, optional float scaleY, optional float alpha, optional float translationX, optional float translationY, optional float shadowElevation, optional float rotationX, optional float rotationY, optional float rotationZ, optional float cameraDistance, optional long transformOrigin, optional androidx.compose.ui.graphics.Shape shape, optional boolean clip);
+ method @Deprecated @androidx.compose.runtime.Stable public static androidx.compose.ui.Modifier! graphicsLayer(androidx.compose.ui.Modifier, optional float scaleX, optional float scaleY, optional float alpha, optional float translationX, optional float translationY, optional float shadowElevation, optional float rotationX, optional float rotationY, optional float rotationZ, optional float cameraDistance, optional long transformOrigin, optional androidx.compose.ui.graphics.Shape shape, optional boolean clip, optional androidx.compose.ui.graphics.RenderEffect? renderEffect);
+ method @androidx.compose.runtime.Stable public static androidx.compose.ui.Modifier toolingGraphicsLayer(androidx.compose.ui.Modifier);
+ }
+
+ public interface GraphicsLayerScope extends androidx.compose.ui.unit.Density {
+ method public float getAlpha();
+ method public default long getAmbientShadowColor();
+ method public float getCameraDistance();
+ method public boolean getClip();
+ method public default androidx.compose.ui.graphics.RenderEffect? getRenderEffect();
+ method public float getRotationX();
+ method public float getRotationY();
+ method public float getRotationZ();
+ method public float getScaleX();
+ method public float getScaleY();
+ method public float getShadowElevation();
+ method public androidx.compose.ui.graphics.Shape getShape();
+ method public default long getSpotShadowColor();
+ method public long getTransformOrigin();
+ method public float getTranslationX();
+ method public float getTranslationY();
+ method public void setAlpha(float);
+ method public default void setAmbientShadowColor(long);
+ method public void setCameraDistance(float);
+ method public void setClip(boolean);
+ method public default void setRenderEffect(androidx.compose.ui.graphics.RenderEffect?);
+ method public void setRotationX(float);
+ method public void setRotationY(float);
+ method public void setRotationZ(float);
+ method public void setScaleX(float);
+ method public void setScaleY(float);
+ method public void setShadowElevation(float);
+ method public void setShape(androidx.compose.ui.graphics.Shape);
+ method public default void setSpotShadowColor(long);
+ method public void setTransformOrigin(long);
+ method public void setTranslationX(float);
+ method public void setTranslationY(float);
+ property public abstract float alpha;
+ property public default long ambientShadowColor;
+ property public abstract float cameraDistance;
+ property public abstract boolean clip;
+ property public default androidx.compose.ui.graphics.RenderEffect? renderEffect;
+ property public abstract float rotationX;
+ property public abstract float rotationY;
+ property public abstract float rotationZ;
+ property public abstract float scaleX;
+ property public abstract float scaleY;
+ property public abstract float shadowElevation;
+ property public abstract androidx.compose.ui.graphics.Shape shape;
+ property public default long spotShadowColor;
+ property public abstract long transformOrigin;
+ property public abstract float translationX;
+ property public abstract float translationY;
+ }
+
+ public final class GraphicsLayerScopeKt {
+ method public static androidx.compose.ui.graphics.GraphicsLayerScope GraphicsLayerScope();
+ method public static long getDefaultShadowColor();
+ property public static final long DefaultShadowColor;
+ field public static final float DefaultCameraDistance = 8.0f;
+ }
+
+ @androidx.compose.runtime.Immutable @kotlin.jvm.JvmInline public final value class TransformOrigin {
+ method @androidx.compose.runtime.Stable public inline operator float component1();
+ method @androidx.compose.runtime.Stable public inline operator float component2();
+ method public long copy(optional float pivotFractionX, optional float pivotFractionY);
+ method public float getPivotFractionX();
+ method public float getPivotFractionY();
+ property public final float pivotFractionX;
+ property public final float pivotFractionY;
+ field public static final androidx.compose.ui.graphics.TransformOrigin.Companion Companion;
+ }
+
+ public static final class TransformOrigin.Companion {
+ method public long getCenter();
+ property public final long Center;
+ }
+
+ public final class TransformOriginKt {
+ method public static long TransformOrigin(float pivotFractionX, float pivotFractionY);
+ }
+
+}
+
+package androidx.compose.ui.graphics.vector {
+
+ @androidx.compose.runtime.Immutable public final class ImageVector {
+ method public boolean getAutoMirror();
+ method public float getDefaultHeight();
+ method public float getDefaultWidth();
+ method public String getName();
+ method public androidx.compose.ui.graphics.vector.VectorGroup getRoot();
+ method public int getTintBlendMode();
+ method public long getTintColor();
+ method public float getViewportHeight();
+ method public float getViewportWidth();
+ property public final boolean autoMirror;
+ property public final float defaultHeight;
+ property public final float defaultWidth;
+ property public final String name;
+ property public final androidx.compose.ui.graphics.vector.VectorGroup root;
+ property public final int tintBlendMode;
+ property public final long tintColor;
+ property public final float viewportHeight;
+ property public final float viewportWidth;
+ field public static final androidx.compose.ui.graphics.vector.ImageVector.Companion Companion;
+ }
+
+ public static final class ImageVector.Builder {
+ ctor public ImageVector.Builder(optional String name, float defaultWidth, float defaultHeight, float viewportWidth, float viewportHeight, optional long tintColor, optional int tintBlendMode, optional boolean autoMirror);
+ method @Deprecated public androidx.compose.ui.graphics.vector.ImageVector.Builder! Builder(optional String name, float defaultWidth, float defaultHeight, float viewportWidth, float viewportHeight, optional long tintColor, optional int tintBlendMode);
+ method public androidx.compose.ui.graphics.vector.ImageVector.Builder addGroup(optional String name, optional float rotate, optional float pivotX, optional float pivotY, optional float scaleX, optional float scaleY, optional float translationX, optional float translationY, optional java.util.List<? extends androidx.compose.ui.graphics.vector.PathNode> clipPathData);
+ method public androidx.compose.ui.graphics.vector.ImageVector.Builder addPath(java.util.List<? extends androidx.compose.ui.graphics.vector.PathNode> pathData, optional int pathFillType, optional String name, optional androidx.compose.ui.graphics.Brush? fill, optional float fillAlpha, optional androidx.compose.ui.graphics.Brush? stroke, optional float strokeAlpha, optional float strokeLineWidth, optional int strokeLineCap, optional int strokeLineJoin, optional float strokeLineMiter, optional float trimPathStart, optional float trimPathEnd, optional float trimPathOffset);
+ method public androidx.compose.ui.graphics.vector.ImageVector build();
+ method public androidx.compose.ui.graphics.vector.ImageVector.Builder clearGroup();
+ }
+
+ public static final class ImageVector.Companion {
+ }
+
+ public final class ImageVectorKt {
+ method public static inline androidx.compose.ui.graphics.vector.ImageVector.Builder group(androidx.compose.ui.graphics.vector.ImageVector.Builder, optional String name, optional float rotate, optional float pivotX, optional float pivotY, optional float scaleX, optional float scaleY, optional float translationX, optional float translationY, optional java.util.List<? extends androidx.compose.ui.graphics.vector.PathNode> clipPathData, kotlin.jvm.functions.Function1<? super androidx.compose.ui.graphics.vector.ImageVector.Builder,kotlin.Unit> block);
+ method public static inline androidx.compose.ui.graphics.vector.ImageVector.Builder path(androidx.compose.ui.graphics.vector.ImageVector.Builder, optional String name, optional androidx.compose.ui.graphics.Brush? fill, optional float fillAlpha, optional androidx.compose.ui.graphics.Brush? stroke, optional float strokeAlpha, optional float strokeLineWidth, optional int strokeLineCap, optional int strokeLineJoin, optional float strokeLineMiter, optional int pathFillType, kotlin.jvm.functions.Function1<? super androidx.compose.ui.graphics.vector.PathBuilder,kotlin.Unit> pathBuilder);
+ }
+
+ public abstract sealed class VNode {
+ method public abstract void draw(androidx.compose.ui.graphics.drawscope.DrawScope);
+ method public final void invalidate();
+ }
+
+ public final class VectorApplier extends androidx.compose.runtime.AbstractApplier<androidx.compose.ui.graphics.vector.VNode> {
+ ctor public VectorApplier(androidx.compose.ui.graphics.vector.VNode root);
+ method public void insertBottomUp(int index, androidx.compose.ui.graphics.vector.VNode instance);
+ method public void insertTopDown(int index, androidx.compose.ui.graphics.vector.VNode instance);
+ method public void move(int from, int to, int count);
+ method protected void onClear();
+ method public void remove(int index, int count);
+ }
+
+ @androidx.compose.runtime.ComposableTargetMarker(description="Vector Composable") @kotlin.annotation.Retention(kotlin.annotation.AnnotationRetention.BINARY) @kotlin.annotation.Target(allowedTargets={kotlin.annotation.AnnotationTarget.FILE, kotlin.annotation.AnnotationTarget.FUNCTION, kotlin.annotation.AnnotationTarget.PROPERTY_GETTER, kotlin.annotation.AnnotationTarget.TYPE, kotlin.annotation.AnnotationTarget.TYPE_PARAMETER}) public @interface VectorComposable {
+ }
+
+ public final class VectorComposeKt {
+ method @androidx.compose.runtime.Composable @androidx.compose.ui.graphics.vector.VectorComposable public static void Group(optional String name, optional float rotation, optional float pivotX, optional float pivotY, optional float scaleX, optional float scaleY, optional float translationX, optional float translationY, optional java.util.List<? extends androidx.compose.ui.graphics.vector.PathNode> clipPathData, kotlin.jvm.functions.Function0<kotlin.Unit> content);
+ method @androidx.compose.runtime.Composable @androidx.compose.ui.graphics.vector.VectorComposable public static void Path(java.util.List<? extends androidx.compose.ui.graphics.vector.PathNode> pathData, optional int pathFillType, optional String name, optional androidx.compose.ui.graphics.Brush? fill, optional float fillAlpha, optional androidx.compose.ui.graphics.Brush? stroke, optional float strokeAlpha, optional float strokeLineWidth, optional int strokeLineCap, optional int strokeLineJoin, optional float strokeLineMiter, optional float trimPathStart, optional float trimPathEnd, optional float trimPathOffset);
+ }
+
+ public interface VectorConfig {
+ method public default <T> T! getOrDefault(androidx.compose.ui.graphics.vector.VectorProperty<T> property, T? defaultValue);
+ }
+
+ @androidx.compose.runtime.Immutable public final class VectorGroup extends androidx.compose.ui.graphics.vector.VectorNode implements java.lang.Iterable<androidx.compose.ui.graphics.vector.VectorNode> kotlin.jvm.internal.markers.KMappedMarker {
+ method public operator androidx.compose.ui.graphics.vector.VectorNode get(int index);
+ method public java.util.List<androidx.compose.ui.graphics.vector.PathNode> getClipPathData();
+ method public String getName();
+ method public float getPivotX();
+ method public float getPivotY();
+ method public float getRotation();
+ method public float getScaleX();
+ method public float getScaleY();
+ method public int getSize();
+ method public float getTranslationX();
+ method public float getTranslationY();
+ method public java.util.Iterator<androidx.compose.ui.graphics.vector.VectorNode> iterator();
+ property public final java.util.List<androidx.compose.ui.graphics.vector.PathNode> clipPathData;
+ property public final String name;
+ property public final float pivotX;
+ property public final float pivotY;
+ property public final float rotation;
+ property public final float scaleX;
+ property public final float scaleY;
+ property public final int size;
+ property public final float translationX;
+ property public final float translationY;
+ }
+
+ public final class VectorKt {
+ method public static inline java.util.List<androidx.compose.ui.graphics.vector.PathNode> PathData(kotlin.jvm.functions.Function1<? super androidx.compose.ui.graphics.vector.PathBuilder,kotlin.Unit> block);
+ method public static java.util.List<androidx.compose.ui.graphics.vector.PathNode> addPathNodes(String? pathStr);
+ method public static int getDefaultFillType();
+ method public static int getDefaultStrokeLineCap();
+ method public static int getDefaultStrokeLineJoin();
+ method public static int getDefaultTintBlendMode();
+ method public static long getDefaultTintColor();
+ method public static java.util.List<androidx.compose.ui.graphics.vector.PathNode> getEmptyPath();
+ property public static final int DefaultFillType;
+ property public static final int DefaultStrokeLineCap;
+ property public static final int DefaultStrokeLineJoin;
+ property public static final int DefaultTintBlendMode;
+ property public static final long DefaultTintColor;
+ property public static final java.util.List<androidx.compose.ui.graphics.vector.PathNode> EmptyPath;
+ field public static final String DefaultGroupName = "";
+ field public static final String DefaultPathName = "";
+ field public static final float DefaultPivotX = 0.0f;
+ field public static final float DefaultPivotY = 0.0f;
+ field public static final float DefaultRotation = 0.0f;
+ field public static final float DefaultScaleX = 1.0f;
+ field public static final float DefaultScaleY = 1.0f;
+ field public static final float DefaultStrokeLineMiter = 4.0f;
+ field public static final float DefaultStrokeLineWidth = 0.0f;
+ field public static final float DefaultTranslationX = 0.0f;
+ field public static final float DefaultTranslationY = 0.0f;
+ field public static final float DefaultTrimPathEnd = 1.0f;
+ field public static final float DefaultTrimPathOffset = 0.0f;
+ field public static final float DefaultTrimPathStart = 0.0f;
+ }
+
+ public abstract sealed class VectorNode {
+ }
+
+ public final class VectorPainter extends androidx.compose.ui.graphics.painter.Painter {
+ method public long getIntrinsicSize();
+ method protected void onDraw(androidx.compose.ui.graphics.drawscope.DrawScope);
+ property public long intrinsicSize;
+ }
+
+ public final class VectorPainterKt {
+ method @androidx.compose.runtime.Composable public static void RenderVectorGroup(androidx.compose.ui.graphics.vector.VectorGroup group, optional java.util.Map<java.lang.String,? extends androidx.compose.ui.graphics.vector.VectorConfig> configs);
+ method @Deprecated @androidx.compose.runtime.Composable @androidx.compose.runtime.ComposableOpenTarget(index=0xffffffff) public static androidx.compose.ui.graphics.vector.VectorPainter rememberVectorPainter(float defaultWidth, float defaultHeight, optional float viewportWidth, optional float viewportHeight, optional String name, optional long tintColor, optional int tintBlendMode, kotlin.jvm.functions.Function2<? super java.lang.Float,? super java.lang.Float,kotlin.Unit> content);
+ method @androidx.compose.runtime.Composable @androidx.compose.runtime.ComposableOpenTarget(index=0xffffffff) public static androidx.compose.ui.graphics.vector.VectorPainter rememberVectorPainter(float defaultWidth, float defaultHeight, optional float viewportWidth, optional float viewportHeight, optional String name, optional long tintColor, optional int tintBlendMode, optional boolean autoMirror, kotlin.jvm.functions.Function2<? super java.lang.Float,? super java.lang.Float,kotlin.Unit> content);
+ method @androidx.compose.runtime.Composable public static androidx.compose.ui.graphics.vector.VectorPainter rememberVectorPainter(androidx.compose.ui.graphics.vector.ImageVector image);
+ field public static final String RootGroupName = "VectorRootGroup";
+ }
+
+ @androidx.compose.runtime.Immutable public final class VectorPath extends androidx.compose.ui.graphics.vector.VectorNode {
+ method public androidx.compose.ui.graphics.Brush? getFill();
+ method public float getFillAlpha();
+ method public String getName();
+ method public java.util.List<androidx.compose.ui.graphics.vector.PathNode> getPathData();
+ method public int getPathFillType();
+ method public androidx.compose.ui.graphics.Brush? getStroke();
+ method public float getStrokeAlpha();
+ method public int getStrokeLineCap();
+ method public int getStrokeLineJoin();
+ method public float getStrokeLineMiter();
+ method public float getStrokeLineWidth();
+ method public float getTrimPathEnd();
+ method public float getTrimPathOffset();
+ method public float getTrimPathStart();
+ property public final androidx.compose.ui.graphics.Brush? fill;
+ property public final float fillAlpha;
+ property public final String name;
+ property public final java.util.List<androidx.compose.ui.graphics.vector.PathNode> pathData;
+ property public final int pathFillType;
+ property public final androidx.compose.ui.graphics.Brush? stroke;
+ property public final float strokeAlpha;
+ property public final int strokeLineCap;
+ property public final int strokeLineJoin;
+ property public final float strokeLineMiter;
+ property public final float strokeLineWidth;
+ property public final float trimPathEnd;
+ property public final float trimPathOffset;
+ property public final float trimPathStart;
+ }
+
+ public abstract sealed class VectorProperty<T> {
+ }
+
+ public static final class VectorProperty.Fill extends androidx.compose.ui.graphics.vector.VectorProperty<androidx.compose.ui.graphics.Brush> {
+ field public static final androidx.compose.ui.graphics.vector.VectorProperty.Fill INSTANCE;
+ }
+
+ public static final class VectorProperty.FillAlpha extends androidx.compose.ui.graphics.vector.VectorProperty<java.lang.Float> {
+ field public static final androidx.compose.ui.graphics.vector.VectorProperty.FillAlpha INSTANCE;
+ }
+
+ public static final class VectorProperty.PathData extends androidx.compose.ui.graphics.vector.VectorProperty<java.util.List<? extends androidx.compose.ui.graphics.vector.PathNode>> {
+ field public static final androidx.compose.ui.graphics.vector.VectorProperty.PathData INSTANCE;
+ }
+
+ public static final class VectorProperty.PivotX extends androidx.compose.ui.graphics.vector.VectorProperty<java.lang.Float> {
+ field public static final androidx.compose.ui.graphics.vector.VectorProperty.PivotX INSTANCE;
+ }
+
+ public static final class VectorProperty.PivotY extends androidx.compose.ui.graphics.vector.VectorProperty<java.lang.Float> {
+ field public static final androidx.compose.ui.graphics.vector.VectorProperty.PivotY INSTANCE;
+ }
+
+ public static final class VectorProperty.Rotation extends androidx.compose.ui.graphics.vector.VectorProperty<java.lang.Float> {
+ field public static final androidx.compose.ui.graphics.vector.VectorProperty.Rotation INSTANCE;
+ }
+
+ public static final class VectorProperty.ScaleX extends androidx.compose.ui.graphics.vector.VectorProperty<java.lang.Float> {
+ field public static final androidx.compose.ui.graphics.vector.VectorProperty.ScaleX INSTANCE;
+ }
+
+ public static final class VectorProperty.ScaleY extends androidx.compose.ui.graphics.vector.VectorProperty<java.lang.Float> {
+ field public static final androidx.compose.ui.graphics.vector.VectorProperty.ScaleY INSTANCE;
+ }
+
+ public static final class VectorProperty.Stroke extends androidx.compose.ui.graphics.vector.VectorProperty<androidx.compose.ui.graphics.Brush> {
+ field public static final androidx.compose.ui.graphics.vector.VectorProperty.Stroke INSTANCE;
+ }
+
+ public static final class VectorProperty.StrokeAlpha extends androidx.compose.ui.graphics.vector.VectorProperty<java.lang.Float> {
+ field public static final androidx.compose.ui.graphics.vector.VectorProperty.StrokeAlpha INSTANCE;
+ }
+
+ public static final class VectorProperty.StrokeLineWidth extends androidx.compose.ui.graphics.vector.VectorProperty<java.lang.Float> {
+ field public static final androidx.compose.ui.graphics.vector.VectorProperty.StrokeLineWidth INSTANCE;
+ }
+
+ public static final class VectorProperty.TranslateX extends androidx.compose.ui.graphics.vector.VectorProperty<java.lang.Float> {
+ field public static final androidx.compose.ui.graphics.vector.VectorProperty.TranslateX INSTANCE;
+ }
+
+ public static final class VectorProperty.TranslateY extends androidx.compose.ui.graphics.vector.VectorProperty<java.lang.Float> {
+ field public static final androidx.compose.ui.graphics.vector.VectorProperty.TranslateY INSTANCE;
+ }
+
+ public static final class VectorProperty.TrimPathEnd extends androidx.compose.ui.graphics.vector.VectorProperty<java.lang.Float> {
+ field public static final androidx.compose.ui.graphics.vector.VectorProperty.TrimPathEnd INSTANCE;
+ }
+
+ public static final class VectorProperty.TrimPathOffset extends androidx.compose.ui.graphics.vector.VectorProperty<java.lang.Float> {
+ field public static final androidx.compose.ui.graphics.vector.VectorProperty.TrimPathOffset INSTANCE;
+ }
+
+ public static final class VectorProperty.TrimPathStart extends androidx.compose.ui.graphics.vector.VectorProperty<java.lang.Float> {
+ field public static final androidx.compose.ui.graphics.vector.VectorProperty.TrimPathStart INSTANCE;
+ }
+
+}
+
+package androidx.compose.ui.graphics.vector.compat {
+
+ public final class XmlVectorParser_androidKt {
+ }
+
+}
+
+package androidx.compose.ui.hapticfeedback {
+
+ public interface HapticFeedback {
+ method public void performHapticFeedback(int hapticFeedbackType);
+ }
+
+ @kotlin.jvm.JvmInline public final value class HapticFeedbackType {
+ ctor public HapticFeedbackType(int value);
+ field public static final androidx.compose.ui.hapticfeedback.HapticFeedbackType.Companion Companion;
+ }
+
+ public static final class HapticFeedbackType.Companion {
+ method public int getLongPress();
+ method public int getTextHandleMove();
+ method public java.util.List<androidx.compose.ui.hapticfeedback.HapticFeedbackType> values();
+ property public final int LongPress;
+ property public final int TextHandleMove;
+ }
+
+}
+
+package androidx.compose.ui.input {
+
+ @kotlin.jvm.JvmInline public final value class InputMode {
+ field public static final androidx.compose.ui.input.InputMode.Companion Companion;
+ }
+
+ public static final class InputMode.Companion {
+ method public int getKeyboard();
+ method public int getTouch();
+ property public final int Keyboard;
+ property public final int Touch;
+ }
+
+ public interface InputModeManager {
+ method public int getInputMode();
+ property public abstract int inputMode;
+ }
+
+}
+
+package androidx.compose.ui.input.key {
+
+ @kotlin.jvm.JvmInline public final value class Key {
+ ctor public Key(long keyCode);
+ method public long getKeyCode();
+ property public final long keyCode;
+ field public static final androidx.compose.ui.input.key.Key.Companion Companion;
+ }
+
+ public static final class Key.Companion {
+ method public long getA();
+ method public long getAllApps();
+ method public long getAltLeft();
+ method public long getAltRight();
+ method public long getApostrophe();
+ method public long getAppSwitch();
+ method public long getAssist();
+ method public long getAt();
+ method public long getAvReceiverInput();
+ method public long getAvReceiverPower();
+ method public long getB();
+ method public long getBack();
+ method public long getBackslash();
+ method public long getBackspace();
+ method public long getBookmark();
+ method public long getBreak();
+ method public long getBrightnessDown();
+ method public long getBrightnessUp();
+ method public long getBrowser();
+ method public long getButton1();
+ method public long getButton10();
+ method public long getButton11();
+ method public long getButton12();
+ method public long getButton13();
+ method public long getButton14();
+ method public long getButton15();
+ method public long getButton16();
+ method public long getButton2();
+ method public long getButton3();
+ method public long getButton4();
+ method public long getButton5();
+ method public long getButton6();
+ method public long getButton7();
+ method public long getButton8();
+ method public long getButton9();
+ method public long getButtonA();
+ method public long getButtonB();
+ method public long getButtonC();
+ method public long getButtonL1();
+ method public long getButtonL2();
+ method public long getButtonMode();
+ method public long getButtonR1();
+ method public long getButtonR2();
+ method public long getButtonSelect();
+ method public long getButtonStart();
+ method public long getButtonThumbLeft();
+ method public long getButtonThumbRight();
+ method public long getButtonX();
+ method public long getButtonY();
+ method public long getButtonZ();
+ method public long getC();
+ method public long getCalculator();
+ method public long getCalendar();
+ method public long getCall();
+ method public long getCamera();
+ method public long getCapsLock();
+ method public long getCaptions();
+ method public long getChannelDown();
+ method public long getChannelUp();
+ method public long getClear();
+ method public long getComma();
+ method public long getContacts();
+ method public long getCopy();
+ method public long getCtrlLeft();
+ method public long getCtrlRight();
+ method public long getCut();
+ method public long getD();
+ method public long getDelete();
+ method public long getDirectionCenter();
+ method public long getDirectionDown();
+ method public long getDirectionDownLeft();
+ method public long getDirectionDownRight();
+ method public long getDirectionLeft();
+ method public long getDirectionRight();
+ method public long getDirectionUp();
+ method public long getDirectionUpLeft();
+ method public long getDirectionUpRight();
+ method public long getDvr();
+ method public long getE();
+ method public long getEight();
+ method public long getEisu();
+ method public long getEndCall();
+ method public long getEnter();
+ method public long getEnvelope();
+ method public long getEquals();
+ method public long getEscape();
+ method public long getF();
+ method public long getF1();
+ method public long getF10();
+ method public long getF11();
+ method public long getF12();
+ method public long getF2();
+ method public long getF3();
+ method public long getF4();
+ method public long getF5();
+ method public long getF6();
+ method public long getF7();
+ method public long getF8();
+ method public long getF9();
+ method public long getFive();
+ method public long getFocus();
+ method public long getForward();
+ method public long getFour();
+ method public long getFunction();
+ method public long getG();
+ method public long getGrave();
+ method public long getGuide();
+ method public long getH();
+ method public long getHeadsetHook();
+ method public long getHelp();
+ method public long getHenkan();
+ method public long getHome();
+ method public long getI();
+ method public long getInfo();
+ method public long getInsert();
+ method public long getJ();
+ method public long getK();
+ method public long getKana();
+ method public long getKatakanaHiragana();
+ method public long getL();
+ method public long getLanguageSwitch();
+ method public long getLastChannel();
+ method public long getLeftBracket();
+ method public long getM();
+ method public long getMannerMode();
+ method public long getMediaAudioTrack();
+ method public long getMediaClose();
+ method public long getMediaEject();
+ method public long getMediaFastForward();
+ method public long getMediaNext();
+ method public long getMediaPause();
+ method public long getMediaPlay();
+ method public long getMediaPlayPause();
+ method public long getMediaPrevious();
+ method public long getMediaRecord();
+ method public long getMediaRewind();
+ method public long getMediaSkipBackward();
+ method public long getMediaSkipForward();
+ method public long getMediaStepBackward();
+ method public long getMediaStepForward();
+ method public long getMediaStop();
+ method public long getMediaTopMenu();
+ method public long getMenu();
+ method public long getMetaLeft();
+ method public long getMetaRight();
+ method public long getMicrophoneMute();
+ method public long getMinus();
+ method public long getMoveEnd();
+ method public long getMoveHome();
+ method public long getMuhenkan();
+ method public long getMultiply();
+ method public long getMusic();
+ method public long getN();
+ method public long getNavigateIn();
+ method public long getNavigateNext();
+ method public long getNavigateOut();
+ method public long getNavigatePrevious();
+ method public long getNine();
+ method public long getNotification();
+ method public long getNumLock();
+ method public long getNumPad0();
+ method public long getNumPad1();
+ method public long getNumPad2();
+ method public long getNumPad3();
+ method public long getNumPad4();
+ method public long getNumPad5();
+ method public long getNumPad6();
+ method public long getNumPad7();
+ method public long getNumPad8();
+ method public long getNumPad9();
+ method public long getNumPadAdd();
+ method public long getNumPadComma();
+ method public long getNumPadDivide();
+ method public long getNumPadDot();
+ method public long getNumPadEnter();
+ method public long getNumPadEquals();
+ method public long getNumPadLeftParenthesis();
+ method public long getNumPadMultiply();
+ method public long getNumPadRightParenthesis();
+ method public long getNumPadSubtract();
+ method public long getNumber();
+ method public long getO();
+ method public long getOne();
+ method public long getP();
+ method public long getPageDown();
+ method public long getPageUp();
+ method public long getPairing();
+ method public long getPaste();
+ method public long getPeriod();
+ method public long getPictureSymbols();
+ method public long getPlus();
+ method public long getPound();
+ method public long getPower();
+ method public long getPrintScreen();
+ method public long getProfileSwitch();
+ method public long getProgramBlue();
+ method public long getProgramGreen();
+ method public long getProgramRed();
+ method public long getProgramYellow();
+ method public long getQ();
+ method public long getR();
+ method public long getRefresh();
+ method public long getRightBracket();
+ method public long getRo();
+ method public long getS();
+ method public long getScrollLock();
+ method public long getSearch();
+ method public long getSemicolon();
+ method public long getSetTopBoxInput();
+ method public long getSetTopBoxPower();
+ method public long getSettings();
+ method public long getSeven();
+ method public long getShiftLeft();
+ method public long getShiftRight();
+ method public long getSix();
+ method public long getSlash();
+ method public long getSleep();
+ method public long getSoftLeft();
+ method public long getSoftRight();
+ method public long getSoftSleep();
+ method public long getSpacebar();
+ method public long getStem1();
+ method public long getStem2();
+ method public long getStem3();
+ method public long getStemPrimary();
+ method public long getSwitchCharset();
+ method public long getSymbol();
+ method public long getSystemNavigationDown();
+ method public long getSystemNavigationLeft();
+ method public long getSystemNavigationRight();
+ method public long getSystemNavigationUp();
+ method public long getT();
+ method public long getTab();
+ method public long getThree();
+ method public long getThumbsDown();
+ method public long getThumbsUp();
+ method public long getToggle2D3D();
+ method public long getTv();
+ method public long getTvAntennaCable();
+ method public long getTvAudioDescription();
+ method public long getTvAudioDescriptionMixingVolumeDown();
+ method public long getTvAudioDescriptionMixingVolumeUp();
+ method public long getTvContentsMenu();
+ method public long getTvDataService();
+ method public long getTvInput();
+ method public long getTvInputComponent1();
+ method public long getTvInputComponent2();
+ method public long getTvInputComposite1();
+ method public long getTvInputComposite2();
+ method public long getTvInputHdmi1();
+ method public long getTvInputHdmi2();
+ method public long getTvInputHdmi3();
+ method public long getTvInputHdmi4();
+ method public long getTvInputVga1();
+ method public long getTvMediaContextMenu();
+ method public long getTvNetwork();
+ method public long getTvNumberEntry();
+ method public long getTvPower();
+ method public long getTvRadioService();
+ method public long getTvSatellite();
+ method public long getTvSatelliteBs();
+ method public long getTvSatelliteCs();
+ method public long getTvSatelliteService();
+ method public long getTvTeletext();
+ method public long getTvTerrestrialAnalog();
+ method public long getTvTerrestrialDigital();
+ method public long getTvTimerProgramming();
+ method public long getTvZoomMode();
+ method public long getTwo();
+ method public long getU();
+ method public long getUnknown();
+ method public long getV();
+ method public long getVoiceAssist();
+ method public long getVolumeDown();
+ method public long getVolumeMute();
+ method public long getVolumeUp();
+ method public long getW();
+ method public long getWakeUp();
+ method public long getWindow();
+ method public long getX();
+ method public long getY();
+ method public long getYen();
+ method public long getZ();
+ method public long getZenkakuHankaru();
+ method public long getZero();
+ method public long getZoomIn();
+ method public long getZoomOut();
+ property public final long A;
+ property public final long AllApps;
+ property public final long AltLeft;
+ property public final long AltRight;
+ property public final long Apostrophe;
+ property public final long AppSwitch;
+ property public final long Assist;
+ property public final long At;
+ property public final long AvReceiverInput;
+ property public final long AvReceiverPower;
+ property public final long B;
+ property public final long Back;
+ property public final long Backslash;
+ property public final long Backspace;
+ property public final long Bookmark;
+ property public final long Break;
+ property public final long BrightnessDown;
+ property public final long BrightnessUp;
+ property public final long Browser;
+ property public final long Button1;
+ property public final long Button10;
+ property public final long Button11;
+ property public final long Button12;
+ property public final long Button13;
+ property public final long Button14;
+ property public final long Button15;
+ property public final long Button16;
+ property public final long Button2;
+ property public final long Button3;
+ property public final long Button4;
+ property public final long Button5;
+ property public final long Button6;
+ property public final long Button7;
+ property public final long Button8;
+ property public final long Button9;
+ property public final long ButtonA;
+ property public final long ButtonB;
+ property public final long ButtonC;
+ property public final long ButtonL1;
+ property public final long ButtonL2;
+ property public final long ButtonMode;
+ property public final long ButtonR1;
+ property public final long ButtonR2;
+ property public final long ButtonSelect;
+ property public final long ButtonStart;
+ property public final long ButtonThumbLeft;
+ property public final long ButtonThumbRight;
+ property public final long ButtonX;
+ property public final long ButtonY;
+ property public final long ButtonZ;
+ property public final long C;
+ property public final long Calculator;
+ property public final long Calendar;
+ property public final long Call;
+ property public final long Camera;
+ property public final long CapsLock;
+ property public final long Captions;
+ property public final long ChannelDown;
+ property public final long ChannelUp;
+ property public final long Clear;
+ property public final long Comma;
+ property public final long Contacts;
+ property public final long Copy;
+ property public final long CtrlLeft;
+ property public final long CtrlRight;
+ property public final long Cut;
+ property public final long D;
+ property public final long Delete;
+ property public final long DirectionCenter;
+ property public final long DirectionDown;
+ property public final long DirectionDownLeft;
+ property public final long DirectionDownRight;
+ property public final long DirectionLeft;
+ property public final long DirectionRight;
+ property public final long DirectionUp;
+ property public final long DirectionUpLeft;
+ property public final long DirectionUpRight;
+ property public final long Dvr;
+ property public final long E;
+ property public final long Eight;
+ property public final long Eisu;
+ property public final long EndCall;
+ property public final long Enter;
+ property public final long Envelope;
+ property public final long Equals;
+ property public final long Escape;
+ property public final long F;
+ property public final long F1;
+ property public final long F10;
+ property public final long F11;
+ property public final long F12;
+ property public final long F2;
+ property public final long F3;
+ property public final long F4;
+ property public final long F5;
+ property public final long F6;
+ property public final long F7;
+ property public final long F8;
+ property public final long F9;
+ property public final long Five;
+ property public final long Focus;
+ property public final long Forward;
+ property public final long Four;
+ property public final long Function;
+ property public final long G;
+ property public final long Grave;
+ property public final long Guide;
+ property public final long H;
+ property public final long HeadsetHook;
+ property public final long Help;
+ property public final long Henkan;
+ property public final long Home;
+ property public final long I;
+ property public final long Info;
+ property public final long Insert;
+ property public final long J;
+ property public final long K;
+ property public final long Kana;
+ property public final long KatakanaHiragana;
+ property public final long L;
+ property public final long LanguageSwitch;
+ property public final long LastChannel;
+ property public final long LeftBracket;
+ property public final long M;
+ property public final long MannerMode;
+ property public final long MediaAudioTrack;
+ property public final long MediaClose;
+ property public final long MediaEject;
+ property public final long MediaFastForward;
+ property public final long MediaNext;
+ property public final long MediaPause;
+ property public final long MediaPlay;
+ property public final long MediaPlayPause;
+ property public final long MediaPrevious;
+ property public final long MediaRecord;
+ property public final long MediaRewind;
+ property public final long MediaSkipBackward;
+ property public final long MediaSkipForward;
+ property public final long MediaStepBackward;
+ property public final long MediaStepForward;
+ property public final long MediaStop;
+ property public final long MediaTopMenu;
+ property public final long Menu;
+ property public final long MetaLeft;
+ property public final long MetaRight;
+ property public final long MicrophoneMute;
+ property public final long Minus;
+ property public final long MoveEnd;
+ property public final long MoveHome;
+ property public final long Muhenkan;
+ property public final long Multiply;
+ property public final long Music;
+ property public final long N;
+ property public final long NavigateIn;
+ property public final long NavigateNext;
+ property public final long NavigateOut;
+ property public final long NavigatePrevious;
+ property public final long Nine;
+ property public final long Notification;
+ property public final long NumLock;
+ property public final long NumPad0;
+ property public final long NumPad1;
+ property public final long NumPad2;
+ property public final long NumPad3;
+ property public final long NumPad4;
+ property public final long NumPad5;
+ property public final long NumPad6;
+ property public final long NumPad7;
+ property public final long NumPad8;
+ property public final long NumPad9;
+ property public final long NumPadAdd;
+ property public final long NumPadComma;
+ property public final long NumPadDivide;
+ property public final long NumPadDot;
+ property public final long NumPadEnter;
+ property public final long NumPadEquals;
+ property public final long NumPadLeftParenthesis;
+ property public final long NumPadMultiply;
+ property public final long NumPadRightParenthesis;
+ property public final long NumPadSubtract;
+ property public final long Number;
+ property public final long O;
+ property public final long One;
+ property public final long P;
+ property public final long PageDown;
+ property public final long PageUp;
+ property public final long Pairing;
+ property public final long Paste;
+ property public final long Period;
+ property public final long PictureSymbols;
+ property public final long Plus;
+ property public final long Pound;
+ property public final long Power;
+ property public final long PrintScreen;
+ property public final long ProfileSwitch;
+ property public final long ProgramBlue;
+ property public final long ProgramGreen;
+ property public final long ProgramRed;
+ property public final long ProgramYellow;
+ property public final long Q;
+ property public final long R;
+ property public final long Refresh;
+ property public final long RightBracket;
+ property public final long Ro;
+ property public final long S;
+ property public final long ScrollLock;
+ property public final long Search;
+ property public final long Semicolon;
+ property public final long SetTopBoxInput;
+ property public final long SetTopBoxPower;
+ property public final long Settings;
+ property public final long Seven;
+ property public final long ShiftLeft;
+ property public final long ShiftRight;
+ property public final long Six;
+ property public final long Slash;
+ property public final long Sleep;
+ property public final long SoftLeft;
+ property public final long SoftRight;
+ property public final long SoftSleep;
+ property public final long Spacebar;
+ property public final long Stem1;
+ property public final long Stem2;
+ property public final long Stem3;
+ property public final long StemPrimary;
+ property public final long SwitchCharset;
+ property public final long Symbol;
+ property public final long SystemNavigationDown;
+ property public final long SystemNavigationLeft;
+ property public final long SystemNavigationRight;
+ property public final long SystemNavigationUp;
+ property public final long T;
+ property public final long Tab;
+ property public final long Three;
+ property public final long ThumbsDown;
+ property public final long ThumbsUp;
+ property public final long Toggle2D3D;
+ property public final long Tv;
+ property public final long TvAntennaCable;
+ property public final long TvAudioDescription;
+ property public final long TvAudioDescriptionMixingVolumeDown;
+ property public final long TvAudioDescriptionMixingVolumeUp;
+ property public final long TvContentsMenu;
+ property public final long TvDataService;
+ property public final long TvInput;
+ property public final long TvInputComponent1;
+ property public final long TvInputComponent2;
+ property public final long TvInputComposite1;
+ property public final long TvInputComposite2;
+ property public final long TvInputHdmi1;
+ property public final long TvInputHdmi2;
+ property public final long TvInputHdmi3;
+ property public final long TvInputHdmi4;
+ property public final long TvInputVga1;
+ property public final long TvMediaContextMenu;
+ property public final long TvNetwork;
+ property public final long TvNumberEntry;
+ property public final long TvPower;
+ property public final long TvRadioService;
+ property public final long TvSatellite;
+ property public final long TvSatelliteBs;
+ property public final long TvSatelliteCs;
+ property public final long TvSatelliteService;
+ property public final long TvTeletext;
+ property public final long TvTerrestrialAnalog;
+ property public final long TvTerrestrialDigital;
+ property public final long TvTimerProgramming;
+ property public final long TvZoomMode;
+ property public final long Two;
+ property public final long U;
+ property public final long Unknown;
+ property public final long V;
+ property public final long VoiceAssist;
+ property public final long VolumeDown;
+ property public final long VolumeMute;
+ property public final long VolumeUp;
+ property public final long W;
+ property public final long WakeUp;
+ property public final long Window;
+ property public final long X;
+ property public final long Y;
+ property public final long Yen;
+ property public final long Z;
+ property public final long ZenkakuHankaru;
+ property public final long Zero;
+ property public final long ZoomIn;
+ property public final long ZoomOut;
+ }
+
+ @kotlin.jvm.JvmInline public final value class KeyEvent {
+ ctor public KeyEvent(android.view.KeyEvent nativeKeyEvent);
+ method public android.view.KeyEvent getNativeKeyEvent();
+ property public final android.view.KeyEvent nativeKeyEvent;
+ }
+
+ @kotlin.jvm.JvmInline public final value class KeyEventType {
+ field public static final androidx.compose.ui.input.key.KeyEventType.Companion Companion;
+ }
+
+ public static final class KeyEventType.Companion {
+ method public int getKeyDown();
+ method public int getKeyUp();
+ method public int getUnknown();
+ property public final int KeyDown;
+ property public final int KeyUp;
+ property public final int Unknown;
+ }
+
+ public final class KeyEvent_androidKt {
+ method public static long getKey(android.view.KeyEvent);
+ method public static int getType(android.view.KeyEvent);
+ method public static int getUtf16CodePoint(android.view.KeyEvent);
+ method public static boolean isAltPressed(android.view.KeyEvent);
+ method public static boolean isCtrlPressed(android.view.KeyEvent);
+ method public static boolean isMetaPressed(android.view.KeyEvent);
+ method public static boolean isShiftPressed(android.view.KeyEvent);
+ }
+
+ public final class KeyInputModifierKt {
+ method public static androidx.compose.ui.Modifier onKeyEvent(androidx.compose.ui.Modifier, kotlin.jvm.functions.Function1<? super androidx.compose.ui.input.key.KeyEvent,java.lang.Boolean> onKeyEvent);
+ method public static androidx.compose.ui.Modifier onPreviewKeyEvent(androidx.compose.ui.Modifier, kotlin.jvm.functions.Function1<? super androidx.compose.ui.input.key.KeyEvent,java.lang.Boolean> onPreviewKeyEvent);
+ }
+
+ public final class Key_androidKt {
+ method public static long Key(int nativeKeyCode);
+ method public static int getNativeKeyCode(long);
+ }
+
+}
+
+package androidx.compose.ui.input.nestedscroll {
+
+ public interface NestedScrollConnection {
+ method public default suspend Object? onPostFling(long consumed, long available, kotlin.coroutines.Continuation<? super androidx.compose.ui.unit.Velocity>);
+ method public default long onPostScroll(long consumed, long available, int source);
+ method public default suspend Object? onPreFling(long available, kotlin.coroutines.Continuation<? super androidx.compose.ui.unit.Velocity>);
+ method public default long onPreScroll(long available, int source);
+ }
+
+ public final class NestedScrollDispatcher {
+ ctor public NestedScrollDispatcher();
+ method public suspend Object? dispatchPostFling(long consumed, long available, kotlin.coroutines.Continuation<? super androidx.compose.ui.unit.Velocity>);
+ method public long dispatchPostScroll(long consumed, long available, int source);
+ method public suspend Object? dispatchPreFling(long available, kotlin.coroutines.Continuation<? super androidx.compose.ui.unit.Velocity>);
+ method public long dispatchPreScroll(long available, int source);
+ method public kotlinx.coroutines.CoroutineScope getCoroutineScope();
+ property public final kotlinx.coroutines.CoroutineScope coroutineScope;
+ }
+
+ public final class NestedScrollModifierKt {
+ method public static androidx.compose.ui.Modifier nestedScroll(androidx.compose.ui.Modifier, androidx.compose.ui.input.nestedscroll.NestedScrollConnection connection, optional androidx.compose.ui.input.nestedscroll.NestedScrollDispatcher? dispatcher);
+ }
+
+ public final class NestedScrollModifierLocalKt {
+ }
+
+ @kotlin.jvm.JvmInline public final value class NestedScrollSource {
+ field public static final androidx.compose.ui.input.nestedscroll.NestedScrollSource.Companion Companion;
+ }
+
+ public static final class NestedScrollSource.Companion {
+ method public int getDrag();
+ method public int getFling();
+ method @Deprecated public int getRelocate();
+ property public final int Drag;
+ property public final int Fling;
+ property @Deprecated public final int Relocate;
+ }
+
+}
+
+package androidx.compose.ui.input.pointer {
+
+ @kotlin.coroutines.RestrictsSuspension public interface AwaitPointerEventScope extends androidx.compose.ui.unit.Density {
+ method public suspend Object? awaitPointerEvent(optional androidx.compose.ui.input.pointer.PointerEventPass pass, optional kotlin.coroutines.Continuation<? super androidx.compose.ui.input.pointer.PointerEvent>);
+ method public androidx.compose.ui.input.pointer.PointerEvent getCurrentEvent();
+ method public default long getExtendedTouchPadding();
+ method public long getSize();
+ method public androidx.compose.ui.platform.ViewConfiguration getViewConfiguration();
+ method public default suspend <T> Object? withTimeout(long timeMillis, kotlin.jvm.functions.Function2<? super androidx.compose.ui.input.pointer.AwaitPointerEventScope,? super kotlin.coroutines.Continuation<? super T>,?> block, kotlin.coroutines.Continuation<? super T>);
+ method public default suspend <T> Object? withTimeoutOrNull(long timeMillis, kotlin.jvm.functions.Function2<? super androidx.compose.ui.input.pointer.AwaitPointerEventScope,? super kotlin.coroutines.Continuation<? super T>,?> block, kotlin.coroutines.Continuation<? super T>);
+ property public abstract androidx.compose.ui.input.pointer.PointerEvent currentEvent;
+ property public default long extendedTouchPadding;
+ property public abstract long size;
+ property public abstract androidx.compose.ui.platform.ViewConfiguration viewConfiguration;
+ }
+
+ @Deprecated public final class ConsumedData {
+ ctor @Deprecated public ConsumedData(optional @Deprecated boolean positionChange, optional @Deprecated boolean downChange);
+ method @Deprecated public boolean getDownChange();
+ method @Deprecated public boolean getPositionChange();
+ method @Deprecated public void setDownChange(boolean);
+ method @Deprecated public void setPositionChange(boolean);
+ property @Deprecated public final boolean downChange;
+ property @Deprecated public final boolean positionChange;
+ }
+
+ @kotlin.jvm.JvmInline public final value class PointerButtons {
+ ctor public PointerButtons(int packedValue);
+ }
+
+ public final class PointerEvent {
+ ctor public PointerEvent(java.util.List<androidx.compose.ui.input.pointer.PointerInputChange> changes);
+ method public java.util.List<androidx.compose.ui.input.pointer.PointerInputChange> component1();
+ method public androidx.compose.ui.input.pointer.PointerEvent copy(java.util.List<androidx.compose.ui.input.pointer.PointerInputChange> changes, android.view.MotionEvent? motionEvent);
+ method public int getButtons();
+ method public java.util.List<androidx.compose.ui.input.pointer.PointerInputChange> getChanges();
+ method public int getKeyboardModifiers();
+ method public int getType();
+ property public final int buttons;
+ property public final java.util.List<androidx.compose.ui.input.pointer.PointerInputChange> changes;
+ property public final int keyboardModifiers;
+ property public final int type;
+ }
+
+ public final class PointerEventKt {
+ method @Deprecated public static boolean anyChangeConsumed(androidx.compose.ui.input.pointer.PointerInputChange);
+ method public static boolean changedToDown(androidx.compose.ui.input.pointer.PointerInputChange);
+ method public static boolean changedToDownIgnoreConsumed(androidx.compose.ui.input.pointer.PointerInputChange);
+ method public static boolean changedToUp(androidx.compose.ui.input.pointer.PointerInputChange);
+ method public static boolean changedToUpIgnoreConsumed(androidx.compose.ui.input.pointer.PointerInputChange);
+ method @Deprecated public static void consumeAllChanges(androidx.compose.ui.input.pointer.PointerInputChange);
+ method @Deprecated public static void consumeDownChange(androidx.compose.ui.input.pointer.PointerInputChange);
+ method @Deprecated public static void consumePositionChange(androidx.compose.ui.input.pointer.PointerInputChange);
+ method public static int indexOfFirstPressed(int);
+ method public static int indexOfLastPressed(int);
+ method @Deprecated public static boolean isOutOfBounds(androidx.compose.ui.input.pointer.PointerInputChange, long size);
+ method public static boolean isOutOfBounds(androidx.compose.ui.input.pointer.PointerInputChange, long size, long extendedTouchPadding);
+ method public static boolean isPressed(int, int buttonIndex);
+ method public static long positionChange(androidx.compose.ui.input.pointer.PointerInputChange);
+ method @Deprecated public static boolean positionChangeConsumed(androidx.compose.ui.input.pointer.PointerInputChange);
+ method public static long positionChangeIgnoreConsumed(androidx.compose.ui.input.pointer.PointerInputChange);
+ method public static boolean positionChanged(androidx.compose.ui.input.pointer.PointerInputChange);
+ method public static boolean positionChangedIgnoreConsumed(androidx.compose.ui.input.pointer.PointerInputChange);
+ }
+
+ public enum PointerEventPass {
+ enum_constant public static final androidx.compose.ui.input.pointer.PointerEventPass Final;
+ enum_constant public static final androidx.compose.ui.input.pointer.PointerEventPass Initial;
+ enum_constant public static final androidx.compose.ui.input.pointer.PointerEventPass Main;
+ }
+
+ public final class PointerEventTimeoutCancellationException extends java.util.concurrent.CancellationException {
+ ctor public PointerEventTimeoutCancellationException(long time);
+ }
+
+ @kotlin.jvm.JvmInline public final value class PointerEventType {
+ field public static final androidx.compose.ui.input.pointer.PointerEventType.Companion Companion;
+ }
+
+ public static final class PointerEventType.Companion {
+ method public int getEnter();
+ method public int getExit();
+ method public int getMove();
+ method public int getPress();
+ method public int getRelease();
+ method public int getScroll();
+ method public int getUnknown();
+ property public final int Enter;
+ property public final int Exit;
+ property public final int Move;
+ property public final int Press;
+ property public final int Release;
+ property public final int Scroll;
+ property public final int Unknown;
+ }
+
+ public final class PointerEvent_androidKt {
+ method public static boolean getAreAnyPressed(int);
+ method public static int indexOfFirstPressed(int);
+ method public static int indexOfLastPressed(int);
+ method public static boolean isAltGraphPressed(int);
+ method public static boolean isAltPressed(int);
+ method public static boolean isBackPressed(int);
+ method public static boolean isCapsLockOn(int);
+ method public static boolean isCtrlPressed(int);
+ method public static boolean isForwardPressed(int);
+ method public static boolean isFunctionPressed(int);
+ method public static boolean isMetaPressed(int);
+ method public static boolean isNumLockOn(int);
+ method public static boolean isPressed(int, int buttonIndex);
+ method public static boolean isPrimaryPressed(int);
+ method public static boolean isScrollLockOn(int);
+ method public static boolean isSecondaryPressed(int);
+ method public static boolean isShiftPressed(int);
+ method public static boolean isSymPressed(int);
+ method public static boolean isTertiaryPressed(int);
+ }
+
+ @androidx.compose.runtime.Stable public interface PointerIcon {
+ }
+
+ public final class PointerIconKt {
+ method @androidx.compose.runtime.Stable public static androidx.compose.ui.Modifier pointerHoverIcon(androidx.compose.ui.Modifier, androidx.compose.ui.input.pointer.PointerIcon icon, optional boolean overrideDescendants);
+ }
+
+ public final class PointerIcon_androidKt {
+ method public static androidx.compose.ui.input.pointer.PointerIcon PointerIcon(android.view.PointerIcon pointerIcon);
+ method public static androidx.compose.ui.input.pointer.PointerIcon PointerIcon(int pointerIconType);
+ }
+
+ @kotlin.jvm.JvmInline public final value class PointerId {
+ ctor public PointerId(long value);
+ method public long getValue();
+ property public final long value;
+ }
+
+ @androidx.compose.runtime.Immutable public final class PointerInputChange {
+ ctor public PointerInputChange(long id, long uptimeMillis, long position, boolean pressed, long previousUptimeMillis, long previousPosition, boolean previousPressed, boolean isInitiallyConsumed, optional int type, optional long scrollDelta);
+ method @Deprecated public androidx.compose.ui.input.pointer.PointerInputChange! PointerInputChange(long id, long uptimeMillis, long position, boolean pressed, long previousUptimeMillis, long previousPosition, boolean previousPressed, androidx.compose.ui.input.pointer.ConsumedData consumed, optional int type);
+ method public void consume();
+ method public androidx.compose.ui.input.pointer.PointerInputChange copy(optional long id, optional long currentTime, optional long currentPosition, optional boolean currentPressed, optional long previousTime, optional long previousPosition, optional boolean previousPressed, optional int type, optional long scrollDelta);
+ method @Deprecated public androidx.compose.ui.input.pointer.PointerInputChange copy(optional long id, optional long currentTime, optional long currentPosition, optional boolean currentPressed, optional long previousTime, optional long previousPosition, optional boolean previousPressed, androidx.compose.ui.input.pointer.ConsumedData consumed, optional int type, optional long scrollDelta);
+ method @Deprecated public androidx.compose.ui.input.pointer.PointerInputChange! copy(optional long id, optional long currentTime, optional long currentPosition, optional boolean currentPressed, optional long previousTime, optional long previousPosition, optional boolean previousPressed, optional androidx.compose.ui.input.pointer.ConsumedData consumed, optional int type);
+ method @Deprecated public androidx.compose.ui.input.pointer.ConsumedData getConsumed();
+ method public long getId();
+ method public long getPosition();
+ method public boolean getPressed();
+ method public long getPreviousPosition();
+ method public boolean getPreviousPressed();
+ method public long getPreviousUptimeMillis();
+ method public long getScrollDelta();
+ method public int getType();
+ method public long getUptimeMillis();
+ method public boolean isConsumed();
+ property @Deprecated public final androidx.compose.ui.input.pointer.ConsumedData consumed;
+ property public final long id;
+ property public final boolean isConsumed;
+ property public final long position;
+ property public final boolean pressed;
+ property public final long previousPosition;
+ property public final boolean previousPressed;
+ property public final long previousUptimeMillis;
+ property public final long scrollDelta;
+ property public final int type;
+ property public final long uptimeMillis;
+ }
+
+ public final class PointerInputEventProcessorKt {
+ }
+
+ public abstract class PointerInputFilter {
+ ctor public PointerInputFilter();
+ method public boolean getInterceptOutOfBoundsChildEvents();
+ method public final long getSize();
+ method public abstract void onCancel();
+ method public abstract void onPointerEvent(androidx.compose.ui.input.pointer.PointerEvent pointerEvent, androidx.compose.ui.input.pointer.PointerEventPass pass, long bounds);
+ property public boolean interceptOutOfBoundsChildEvents;
+ property public final long size;
+ }
+
+ public interface PointerInputModifier extends androidx.compose.ui.Modifier.Element {
+ method public androidx.compose.ui.input.pointer.PointerInputFilter getPointerInputFilter();
+ property public abstract androidx.compose.ui.input.pointer.PointerInputFilter pointerInputFilter;
+ }
+
+ public interface PointerInputScope extends androidx.compose.ui.unit.Density {
+ method public suspend <R> Object? awaitPointerEventScope(kotlin.jvm.functions.Function2<? super androidx.compose.ui.input.pointer.AwaitPointerEventScope,? super kotlin.coroutines.Continuation<? super R>,?> block, kotlin.coroutines.Continuation<? super R>);
+ method public default long getExtendedTouchPadding();
+ method public default boolean getInterceptOutOfBoundsChildEvents();
+ method public long getSize();
+ method public androidx.compose.ui.platform.ViewConfiguration getViewConfiguration();
+ method public default void setInterceptOutOfBoundsChildEvents(boolean);
+ property public default long extendedTouchPadding;
+ property public default boolean interceptOutOfBoundsChildEvents;
+ property public abstract long size;
+ property public abstract androidx.compose.ui.platform.ViewConfiguration viewConfiguration;
+ }
+
+ public final class PointerInputTestUtilKt {
+ }
+
+ public final class PointerInteropFilter_androidKt {
+ }
+
+ public final class PointerInteropUtils_androidKt {
+ }
+
+ @kotlin.jvm.JvmInline public final value class PointerKeyboardModifiers {
+ ctor public PointerKeyboardModifiers(int packedValue);
+ }
+
+ @kotlin.jvm.JvmInline public final value class PointerType {
+ field public static final androidx.compose.ui.input.pointer.PointerType.Companion Companion;
+ }
+
+ public static final class PointerType.Companion {
+ method public int getEraser();
+ method public int getMouse();
+ method public int getStylus();
+ method public int getTouch();
+ method public int getUnknown();
+ property public final int Eraser;
+ property public final int Mouse;
+ property public final int Stylus;
+ property public final int Touch;
+ property public final int Unknown;
+ }
+
+ public final class SuspendingPointerInputFilterKt {
+ method @Deprecated public static androidx.compose.ui.Modifier pointerInput(androidx.compose.ui.Modifier, kotlin.jvm.functions.Function2<? super androidx.compose.ui.input.pointer.PointerInputScope,? super kotlin.coroutines.Continuation<? super kotlin.Unit>,?> block);
+ method public static androidx.compose.ui.Modifier pointerInput(androidx.compose.ui.Modifier, Object? key1, kotlin.jvm.functions.Function2<? super androidx.compose.ui.input.pointer.PointerInputScope,? super kotlin.coroutines.Continuation<? super kotlin.Unit>,?> block);
+ method public static androidx.compose.ui.Modifier pointerInput(androidx.compose.ui.Modifier, Object? key1, Object? key2, kotlin.jvm.functions.Function2<? super androidx.compose.ui.input.pointer.PointerInputScope,? super kotlin.coroutines.Continuation<? super kotlin.Unit>,?> block);
+ method public static androidx.compose.ui.Modifier pointerInput(androidx.compose.ui.Modifier, Object![]? keys, kotlin.jvm.functions.Function2<? super androidx.compose.ui.input.pointer.PointerInputScope,? super kotlin.coroutines.Continuation<? super kotlin.Unit>,?> block);
+ }
+
+}
+
+package androidx.compose.ui.input.pointer.util {
+
+ public final class VelocityTracker {
+ ctor public VelocityTracker();
+ method public void addPosition(long timeMillis, long position);
+ method public long calculateVelocity();
+ method public void resetTracking();
+ }
+
+ public final class VelocityTrackerKt {
+ method public static void addPointerInputChange(androidx.compose.ui.input.pointer.util.VelocityTracker, androidx.compose.ui.input.pointer.PointerInputChange event);
+ }
+
+}
+
+package androidx.compose.ui.input.rotary {
+
+ public final class RotaryInputModifierKt {
+ }
+
+}
+
+package androidx.compose.ui.layout {
+
+ @androidx.compose.runtime.Immutable public abstract sealed class AlignmentLine {
+ field public static final androidx.compose.ui.layout.AlignmentLine.Companion Companion;
+ field public static final int Unspecified = -2147483648; // 0x80000000
+ }
+
+ public static final class AlignmentLine.Companion {
+ }
+
+ public final class AlignmentLineKt {
+ method public static androidx.compose.ui.layout.HorizontalAlignmentLine getFirstBaseline();
+ method public static androidx.compose.ui.layout.HorizontalAlignmentLine getLastBaseline();
+ property public static final androidx.compose.ui.layout.HorizontalAlignmentLine FirstBaseline;
+ property public static final androidx.compose.ui.layout.HorizontalAlignmentLine LastBaseline;
+ }
+
+ public interface BeyondBoundsLayout {
+ method public <T> T? layout(int direction, kotlin.jvm.functions.Function1<? super androidx.compose.ui.layout.BeyondBoundsLayout.BeyondBoundsScope,? extends T> block);
+ }
+
+ public static interface BeyondBoundsLayout.BeyondBoundsScope {
+ method public boolean getHasMoreContent();
+ property public abstract boolean hasMoreContent;
+ }
+
+ @kotlin.jvm.JvmInline public static final value class BeyondBoundsLayout.LayoutDirection {
+ field public static final androidx.compose.ui.layout.BeyondBoundsLayout.LayoutDirection.Companion Companion;
+ }
+
+ public static final class BeyondBoundsLayout.LayoutDirection.Companion {
+ method public int getAbove();
+ method public int getAfter();
+ method public int getBefore();
+ method public int getBelow();
+ method public int getLeft();
+ method public int getRight();
+ property public final int Above;
+ property public final int After;
+ property public final int Before;
+ property public final int Below;
+ property public final int Left;
+ property public final int Right;
+ }
+
+ public final class BeyondBoundsLayoutKt {
+ method public static androidx.compose.ui.modifier.ProvidableModifierLocal<androidx.compose.ui.layout.BeyondBoundsLayout> getModifierLocalBeyondBoundsLayout();
+ property public static final androidx.compose.ui.modifier.ProvidableModifierLocal<androidx.compose.ui.layout.BeyondBoundsLayout> ModifierLocalBeyondBoundsLayout;
+ }
+
+ @androidx.compose.runtime.Stable public interface ContentScale {
+ method public long computeScaleFactor(long srcSize, long dstSize);
+ field public static final androidx.compose.ui.layout.ContentScale.Companion Companion;
+ }
+
+ public static final class ContentScale.Companion {
+ method public androidx.compose.ui.layout.ContentScale getCrop();
+ method public androidx.compose.ui.layout.ContentScale getFillBounds();
+ method public androidx.compose.ui.layout.ContentScale getFillHeight();
+ method public androidx.compose.ui.layout.ContentScale getFillWidth();
+ method public androidx.compose.ui.layout.ContentScale getFit();
+ method public androidx.compose.ui.layout.ContentScale getInside();
+ method public androidx.compose.ui.layout.FixedScale getNone();
+ property public final androidx.compose.ui.layout.ContentScale Crop;
+ property public final androidx.compose.ui.layout.ContentScale FillBounds;
+ property public final androidx.compose.ui.layout.ContentScale FillHeight;
+ property public final androidx.compose.ui.layout.ContentScale FillWidth;
+ property public final androidx.compose.ui.layout.ContentScale Fit;
+ property public final androidx.compose.ui.layout.ContentScale Inside;
+ property public final androidx.compose.ui.layout.FixedScale None;
+ }
+
+ public final class ContentScaleKt {
+ }
+
+ @androidx.compose.runtime.Immutable public final class FixedScale implements androidx.compose.ui.layout.ContentScale {
+ ctor public FixedScale(float value);
+ method public float component1();
+ method public long computeScaleFactor(long srcSize, long dstSize);
+ method public androidx.compose.ui.layout.FixedScale copy(float value);
+ method public float getValue();
+ property public final float value;
+ }
+
+ public interface GraphicLayerInfo {
+ method public long getLayerId();
+ method public default long getOwnerViewId();
+ property public abstract long layerId;
+ property public default long ownerViewId;
+ }
+
+ public final class HorizontalAlignmentLine extends androidx.compose.ui.layout.AlignmentLine {
+ ctor public HorizontalAlignmentLine(kotlin.jvm.functions.Function2<? super java.lang.Integer,? super java.lang.Integer,java.lang.Integer> merger);
+ }
+
+ public interface IntrinsicMeasurable {
+ method public Object? getParentData();
+ method public int maxIntrinsicHeight(int width);
+ method public int maxIntrinsicWidth(int height);
+ method public int minIntrinsicHeight(int width);
+ method public int minIntrinsicWidth(int height);
+ property public abstract Object? parentData;
+ }
+
+ public final class IntrinsicMeasurableKt {
+ }
+
+ public interface IntrinsicMeasureScope extends androidx.compose.ui.unit.Density {
+ method public androidx.compose.ui.unit.LayoutDirection getLayoutDirection();
+ property public abstract androidx.compose.ui.unit.LayoutDirection layoutDirection;
+ }
+
+ public interface LayoutCoordinates {
+ method public operator int get(androidx.compose.ui.layout.AlignmentLine alignmentLine);
+ method public androidx.compose.ui.layout.LayoutCoordinates? getParentCoordinates();
+ method public androidx.compose.ui.layout.LayoutCoordinates? getParentLayoutCoordinates();
+ method public java.util.Set<androidx.compose.ui.layout.AlignmentLine> getProvidedAlignmentLines();
+ method public long getSize();
+ method public boolean isAttached();
+ method public androidx.compose.ui.geometry.Rect localBoundingBoxOf(androidx.compose.ui.layout.LayoutCoordinates sourceCoordinates, optional boolean clipBounds);
+ method public long localPositionOf(androidx.compose.ui.layout.LayoutCoordinates sourceCoordinates, long relativeToSource);
+ method public long localToRoot(long relativeToLocal);
+ method public long localToWindow(long relativeToLocal);
+ method public long windowToLocal(long relativeToWindow);
+ property public abstract boolean isAttached;
+ property public abstract androidx.compose.ui.layout.LayoutCoordinates? parentCoordinates;
+ property public abstract androidx.compose.ui.layout.LayoutCoordinates? parentLayoutCoordinates;
+ property public abstract java.util.Set<androidx.compose.ui.layout.AlignmentLine> providedAlignmentLines;
+ property public abstract long size;
+ }
+
+ public final class LayoutCoordinatesKt {
+ method public static androidx.compose.ui.geometry.Rect boundsInParent(androidx.compose.ui.layout.LayoutCoordinates);
+ method public static androidx.compose.ui.geometry.Rect boundsInRoot(androidx.compose.ui.layout.LayoutCoordinates);
+ method public static androidx.compose.ui.geometry.Rect boundsInWindow(androidx.compose.ui.layout.LayoutCoordinates);
+ method public static long positionInParent(androidx.compose.ui.layout.LayoutCoordinates);
+ method public static long positionInRoot(androidx.compose.ui.layout.LayoutCoordinates);
+ method public static long positionInWindow(androidx.compose.ui.layout.LayoutCoordinates);
+ }
+
+ public final class LayoutIdKt {
+ method public static Object? getLayoutId(androidx.compose.ui.layout.Measurable);
+ method @androidx.compose.runtime.Stable public static androidx.compose.ui.Modifier layoutId(androidx.compose.ui.Modifier, Object layoutId);
+ }
+
+ public interface LayoutIdParentData {
+ method public Object getLayoutId();
+ property public abstract Object layoutId;
+ }
+
+ public interface LayoutInfo {
+ method public androidx.compose.ui.layout.LayoutCoordinates getCoordinates();
+ method public androidx.compose.ui.unit.Density getDensity();
+ method public int getHeight();
+ method public androidx.compose.ui.unit.LayoutDirection getLayoutDirection();
+ method public java.util.List<androidx.compose.ui.layout.ModifierInfo> getModifierInfo();
+ method public androidx.compose.ui.layout.LayoutInfo? getParentInfo();
+ method public androidx.compose.ui.platform.ViewConfiguration getViewConfiguration();
+ method public int getWidth();
+ method public boolean isAttached();
+ method public boolean isPlaced();
+ property public abstract androidx.compose.ui.layout.LayoutCoordinates coordinates;
+ property public abstract androidx.compose.ui.unit.Density density;
+ property public abstract int height;
+ property public abstract boolean isAttached;
+ property public abstract boolean isPlaced;
+ property public abstract androidx.compose.ui.unit.LayoutDirection layoutDirection;
+ property public abstract androidx.compose.ui.layout.LayoutInfo? parentInfo;
+ property public abstract androidx.compose.ui.platform.ViewConfiguration viewConfiguration;
+ property public abstract int width;
+ }
+
+ public final class LayoutKt {
+ method @androidx.compose.runtime.Composable @androidx.compose.ui.UiComposable public static inline void Layout(kotlin.jvm.functions.Function0<kotlin.Unit> content, optional androidx.compose.ui.Modifier modifier, androidx.compose.ui.layout.MeasurePolicy measurePolicy);
+ method @androidx.compose.runtime.Composable @androidx.compose.ui.UiComposable public static inline void Layout(optional androidx.compose.ui.Modifier modifier, androidx.compose.ui.layout.MeasurePolicy measurePolicy);
+ method @Deprecated @androidx.compose.runtime.Composable @androidx.compose.ui.UiComposable public static void MultiMeasureLayout(optional androidx.compose.ui.Modifier modifier, kotlin.jvm.functions.Function0<kotlin.Unit> content, androidx.compose.ui.layout.MeasurePolicy measurePolicy);
+ }
+
+ public interface LayoutModifier extends androidx.compose.ui.Modifier.Element {
+ method public default int maxIntrinsicHeight(androidx.compose.ui.layout.IntrinsicMeasureScope, androidx.compose.ui.layout.IntrinsicMeasurable measurable, int width);
+ method public default int maxIntrinsicWidth(androidx.compose.ui.layout.IntrinsicMeasureScope, androidx.compose.ui.layout.IntrinsicMeasurable measurable, int height);
+ method public androidx.compose.ui.layout.MeasureResult measure(androidx.compose.ui.layout.MeasureScope, androidx.compose.ui.layout.Measurable measurable, long constraints);
+ method public default int minIntrinsicHeight(androidx.compose.ui.layout.IntrinsicMeasureScope, androidx.compose.ui.layout.IntrinsicMeasurable measurable, int width);
+ method public default int minIntrinsicWidth(androidx.compose.ui.layout.IntrinsicMeasureScope, androidx.compose.ui.layout.IntrinsicMeasurable measurable, int height);
+ }
+
+ public final class LayoutModifierKt {
+ method public static androidx.compose.ui.Modifier layout(androidx.compose.ui.Modifier, kotlin.jvm.functions.Function3<? super androidx.compose.ui.layout.MeasureScope,? super androidx.compose.ui.layout.Measurable,? super androidx.compose.ui.unit.Constraints,? extends androidx.compose.ui.layout.MeasureResult> measure);
+ }
+
+ public interface Measurable extends androidx.compose.ui.layout.IntrinsicMeasurable {
+ method public androidx.compose.ui.layout.Placeable measure(long constraints);
+ }
+
+ @androidx.compose.runtime.Stable public fun interface MeasurePolicy {
+ method public default int maxIntrinsicHeight(androidx.compose.ui.layout.IntrinsicMeasureScope, java.util.List<? extends androidx.compose.ui.layout.IntrinsicMeasurable> measurables, int width);
+ method public default int maxIntrinsicWidth(androidx.compose.ui.layout.IntrinsicMeasureScope, java.util.List<? extends androidx.compose.ui.layout.IntrinsicMeasurable> measurables, int height);
+ method public androidx.compose.ui.layout.MeasureResult measure(androidx.compose.ui.layout.MeasureScope, java.util.List<? extends androidx.compose.ui.layout.Measurable> measurables, long constraints);
+ method public default int minIntrinsicHeight(androidx.compose.ui.layout.IntrinsicMeasureScope, java.util.List<? extends androidx.compose.ui.layout.IntrinsicMeasurable> measurables, int width);
+ method public default int minIntrinsicWidth(androidx.compose.ui.layout.IntrinsicMeasureScope, java.util.List<? extends androidx.compose.ui.layout.IntrinsicMeasurable> measurables, int height);
+ }
+
+ public interface MeasureResult {
+ method public java.util.Map<androidx.compose.ui.layout.AlignmentLine,java.lang.Integer> getAlignmentLines();
+ method public int getHeight();
+ method public int getWidth();
+ method public void placeChildren();
+ property public abstract java.util.Map<androidx.compose.ui.layout.AlignmentLine,java.lang.Integer> alignmentLines;
+ property public abstract int height;
+ property public abstract int width;
+ }
+
+ public interface MeasureScope extends androidx.compose.ui.layout.IntrinsicMeasureScope {
+ method public default androidx.compose.ui.layout.MeasureResult layout(int width, int height, optional java.util.Map<androidx.compose.ui.layout.AlignmentLine,java.lang.Integer> alignmentLines, kotlin.jvm.functions.Function1<? super androidx.compose.ui.layout.Placeable.PlacementScope,kotlin.Unit> placementBlock);
+ }
+
+ public final class MeasureScopeKt {
+ }
+
+ public interface Measured {
+ method public operator int get(androidx.compose.ui.layout.AlignmentLine alignmentLine);
+ method public int getMeasuredHeight();
+ method public int getMeasuredWidth();
+ method public default Object? getParentData();
+ property public abstract int measuredHeight;
+ property public abstract int measuredWidth;
+ property public default Object? parentData;
+ }
+
+ public final class ModifierInfo {
+ ctor public ModifierInfo(androidx.compose.ui.Modifier modifier, androidx.compose.ui.layout.LayoutCoordinates coordinates, optional Object? extra);
+ method public androidx.compose.ui.layout.LayoutCoordinates getCoordinates();
+ method public Object? getExtra();
+ method public androidx.compose.ui.Modifier getModifier();
+ property public final androidx.compose.ui.layout.LayoutCoordinates coordinates;
+ property public final Object? extra;
+ property public final androidx.compose.ui.Modifier modifier;
+ }
+
+ public interface OnGloballyPositionedModifier extends androidx.compose.ui.Modifier.Element {
+ method public void onGloballyPositioned(androidx.compose.ui.layout.LayoutCoordinates coordinates);
+ }
+
+ public final class OnGloballyPositionedModifierKt {
+ method @androidx.compose.runtime.Stable public static androidx.compose.ui.Modifier onGloballyPositioned(androidx.compose.ui.Modifier, kotlin.jvm.functions.Function1<? super androidx.compose.ui.layout.LayoutCoordinates,kotlin.Unit> onGloballyPositioned);
+ }
+
+ public interface OnPlacedModifier extends androidx.compose.ui.Modifier.Element {
+ method public void onPlaced(androidx.compose.ui.layout.LayoutCoordinates coordinates);
+ }
+
+ public final class OnPlacedModifierKt {
+ method @androidx.compose.runtime.Stable public static androidx.compose.ui.Modifier onPlaced(androidx.compose.ui.Modifier, kotlin.jvm.functions.Function1<? super androidx.compose.ui.layout.LayoutCoordinates,kotlin.Unit> onPlaced);
+ }
+
+ public interface OnRemeasuredModifier extends androidx.compose.ui.Modifier.Element {
+ method public void onRemeasured(long size);
+ }
+
+ public final class OnRemeasuredModifierKt {
+ method @androidx.compose.runtime.Stable public static androidx.compose.ui.Modifier onSizeChanged(androidx.compose.ui.Modifier, kotlin.jvm.functions.Function1<? super androidx.compose.ui.unit.IntSize,kotlin.Unit> onSizeChanged);
+ }
+
+ public interface ParentDataModifier extends androidx.compose.ui.Modifier.Element {
+ method public Object? modifyParentData(androidx.compose.ui.unit.Density, Object? parentData);
+ }
+
+ public abstract class Placeable implements androidx.compose.ui.layout.Measured {
+ ctor public Placeable();
+ method protected final long getApparentToRealOffset();
+ method public final int getHeight();
+ method public int getMeasuredHeight();
+ method protected final long getMeasuredSize();
+ method public int getMeasuredWidth();
+ method protected final long getMeasurementConstraints();
+ method public final int getWidth();
+ method protected abstract void placeAt(long position, float zIndex, kotlin.jvm.functions.Function1<? super androidx.compose.ui.graphics.GraphicsLayerScope,kotlin.Unit>? layerBlock);
+ method protected final void setMeasuredSize(long);
+ method protected final void setMeasurementConstraints(long);
+ property protected final long apparentToRealOffset;
+ property public final int height;
+ property public int measuredHeight;
+ property protected final long measuredSize;
+ property public int measuredWidth;
+ property protected final long measurementConstraints;
+ property public final int width;
+ }
+
+ public abstract static class Placeable.PlacementScope {
+ ctor public Placeable.PlacementScope();
+ method protected abstract androidx.compose.ui.unit.LayoutDirection getParentLayoutDirection();
+ method protected abstract int getParentWidth();
+ method public final void place(androidx.compose.ui.layout.Placeable, int x, int y, optional float zIndex);
+ method public final void place(androidx.compose.ui.layout.Placeable, long position, optional float zIndex);
+ method public final void placeRelative(androidx.compose.ui.layout.Placeable, long position, optional float zIndex);
+ method public final void placeRelative(androidx.compose.ui.layout.Placeable, int x, int y, optional float zIndex);
+ method public final void placeRelativeWithLayer(androidx.compose.ui.layout.Placeable, long position, optional float zIndex, optional kotlin.jvm.functions.Function1<? super androidx.compose.ui.graphics.GraphicsLayerScope,kotlin.Unit> layerBlock);
+ method public final void placeRelativeWithLayer(androidx.compose.ui.layout.Placeable, int x, int y, optional float zIndex, optional kotlin.jvm.functions.Function1<? super androidx.compose.ui.graphics.GraphicsLayerScope,kotlin.Unit> layerBlock);
+ method public final void placeWithLayer(androidx.compose.ui.layout.Placeable, int x, int y, optional float zIndex, optional kotlin.jvm.functions.Function1<? super androidx.compose.ui.graphics.GraphicsLayerScope,kotlin.Unit> layerBlock);
+ method public final void placeWithLayer(androidx.compose.ui.layout.Placeable, long position, optional float zIndex, optional kotlin.jvm.functions.Function1<? super androidx.compose.ui.graphics.GraphicsLayerScope,kotlin.Unit> layerBlock);
+ property protected abstract androidx.compose.ui.unit.LayoutDirection parentLayoutDirection;
+ property protected abstract int parentWidth;
+ }
+
+ public final class PlaceableKt {
+ }
+
+ public final class RelocationModifierKt {
+ }
+
+ public final class RelocationRequesterModifierKt {
+ }
+
+ public interface Remeasurement {
+ method public void forceRemeasure();
+ }
+
+ public interface RemeasurementModifier extends androidx.compose.ui.Modifier.Element {
+ method public void onRemeasurementAvailable(androidx.compose.ui.layout.Remeasurement remeasurement);
+ }
+
+ @androidx.compose.runtime.Immutable @kotlin.jvm.JvmInline public final value class ScaleFactor {
+ method @androidx.compose.runtime.Stable public inline operator float component1();
+ method @androidx.compose.runtime.Stable public inline operator float component2();
+ method public long copy(optional float scaleX, optional float scaleY);
+ method @androidx.compose.runtime.Stable public operator long div(float operand);
+ method public float getScaleX();
+ method public float getScaleY();
+ method @androidx.compose.runtime.Stable public operator long times(float operand);
+ property public final float scaleX;
+ property public final float scaleY;
+ field public static final androidx.compose.ui.layout.ScaleFactor.Companion Companion;
+ }
+
+ public static final class ScaleFactor.Companion {
+ method public long getUnspecified();
+ property public final long Unspecified;
+ }
+
+ public final class ScaleFactorKt {
+ method @androidx.compose.runtime.Stable public static long ScaleFactor(float scaleX, float scaleY);
+ method @androidx.compose.runtime.Stable public static operator long div(long, long scaleFactor);
+ method public static inline boolean isSpecified(long);
+ method public static inline boolean isUnspecified(long);
+ method @androidx.compose.runtime.Stable public static long lerp(long start, long stop, float fraction);
+ method public static inline long takeOrElse(long, kotlin.jvm.functions.Function0<androidx.compose.ui.layout.ScaleFactor> block);
+ method @androidx.compose.runtime.Stable public static operator long times(long, long scaleFactor);
+ method @androidx.compose.runtime.Stable public static operator long times(long, long size);
+ }
+
+ public final class SubcomposeLayoutKt {
+ method @androidx.compose.runtime.Composable public static void SubcomposeLayout(optional androidx.compose.ui.Modifier modifier, kotlin.jvm.functions.Function2<? super androidx.compose.ui.layout.SubcomposeMeasureScope,? super androidx.compose.ui.unit.Constraints,? extends androidx.compose.ui.layout.MeasureResult> measurePolicy);
+ method @androidx.compose.runtime.Composable @androidx.compose.ui.UiComposable public static void SubcomposeLayout(androidx.compose.ui.layout.SubcomposeLayoutState state, optional androidx.compose.ui.Modifier modifier, kotlin.jvm.functions.Function2<? super androidx.compose.ui.layout.SubcomposeMeasureScope,? super androidx.compose.ui.unit.Constraints,? extends androidx.compose.ui.layout.MeasureResult> measurePolicy);
+ method public static androidx.compose.ui.layout.SubcomposeSlotReusePolicy SubcomposeSlotReusePolicy(int maxSlotsToRetainForReuse);
+ }
+
+ public final class SubcomposeLayoutState {
+ ctor public SubcomposeLayoutState(androidx.compose.ui.layout.SubcomposeSlotReusePolicy slotReusePolicy);
+ ctor public SubcomposeLayoutState();
+ ctor @Deprecated public SubcomposeLayoutState(int maxSlotsToRetainForReuse);
+ method public androidx.compose.ui.layout.SubcomposeLayoutState.PrecomposedSlotHandle precompose(Object? slotId, kotlin.jvm.functions.Function0<kotlin.Unit> content);
+ }
+
+ public static interface SubcomposeLayoutState.PrecomposedSlotHandle {
+ method public void dispose();
+ method public default int getPlaceablesCount();
+ method public default void premeasure(int index, long constraints);
+ property public default int placeablesCount;
+ }
+
+ public interface SubcomposeMeasureScope extends androidx.compose.ui.layout.MeasureScope {
+ method public java.util.List<androidx.compose.ui.layout.Measurable> subcompose(Object? slotId, kotlin.jvm.functions.Function0<kotlin.Unit> content);
+ }
+
+ public interface SubcomposeSlotReusePolicy {
+ method public boolean areCompatible(Object? slotId, Object? reusableSlotId);
+ method public void getSlotsToRetain(androidx.compose.ui.layout.SubcomposeSlotReusePolicy.SlotIdsSet slotIds);
+ }
+
+ public static final class SubcomposeSlotReusePolicy.SlotIdsSet implements java.util.Collection<java.lang.Object> kotlin.jvm.internal.markers.KMappedMarker {
+ method public void clear();
+ method public java.util.Iterator<java.lang.Object> iterator();
+ method public boolean remove(Object? slotId);
+ method public boolean removeAll(java.util.Collection<?> slotIds);
+ method public boolean removeAll(kotlin.jvm.functions.Function1<java.lang.Object,java.lang.Boolean> predicate);
+ method public boolean retainAll(java.util.Collection<?> slotIds);
+ method public boolean retainAll(kotlin.jvm.functions.Function1<java.lang.Object,java.lang.Boolean> predicate);
+ }
+
+ public final class TestModifierUpdaterKt {
+ }
+
+ public final class VerticalAlignmentLine extends androidx.compose.ui.layout.AlignmentLine {
+ ctor public VerticalAlignmentLine(kotlin.jvm.functions.Function2<? super java.lang.Integer,? super java.lang.Integer,java.lang.Integer> merger);
+ }
+
+}
+
+package androidx.compose.ui.modifier {
+
+ @androidx.compose.runtime.Stable public abstract sealed class ModifierLocal<T> {
+ }
+
+ @androidx.compose.runtime.Stable public interface ModifierLocalConsumer extends androidx.compose.ui.Modifier.Element {
+ method public void onModifierLocalsUpdated(androidx.compose.ui.modifier.ModifierLocalReadScope scope);
+ }
+
+ public final class ModifierLocalConsumerKt {
+ }
+
+ public final class ModifierLocalKt {
+ method public static <T> androidx.compose.ui.modifier.ProvidableModifierLocal<T> modifierLocalOf(kotlin.jvm.functions.Function0<? extends T> defaultFactory);
+ }
+
+ @androidx.compose.runtime.Stable public interface ModifierLocalProvider<T> extends androidx.compose.ui.Modifier.Element {
+ method public androidx.compose.ui.modifier.ProvidableModifierLocal<T> getKey();
+ method public T! getValue();
+ property public abstract androidx.compose.ui.modifier.ProvidableModifierLocal<T> key;
+ property public abstract T! value;
+ }
+
+ public final class ModifierLocalProviderKt {
+ }
+
+ public interface ModifierLocalReadScope {
+ method public <T> T! getCurrent(androidx.compose.ui.modifier.ModifierLocal<T>);
+ }
+
+ @androidx.compose.runtime.Stable public final class ProvidableModifierLocal<T> extends androidx.compose.ui.modifier.ModifierLocal<T> {
+ ctor public ProvidableModifierLocal(kotlin.jvm.functions.Function0<? extends T> defaultFactory);
+ }
+
+}
+
+package androidx.compose.ui.node {
+
+ public final class HitTestResultKt {
+ }
+
+ public final class LayoutNodeKt {
+ }
+
+ public final class Ref<T> {
+ ctor public Ref();
+ method public T? getValue();
+ method public void setValue(T?);
+ property public final T? value;
+ }
+
+ public interface RootForTest {
+ method public androidx.compose.ui.unit.Density getDensity();
+ method public androidx.compose.ui.semantics.SemanticsOwner getSemanticsOwner();
+ method public androidx.compose.ui.text.input.TextInputService getTextInputService();
+ method public boolean sendKeyEvent(android.view.KeyEvent keyEvent);
+ property public abstract androidx.compose.ui.unit.Density density;
+ property public abstract androidx.compose.ui.semantics.SemanticsOwner semanticsOwner;
+ property public abstract androidx.compose.ui.text.input.TextInputService textInputService;
+ }
+
+ public final class ViewInterop_androidKt {
+ }
+
+}
+
+package androidx.compose.ui.platform {
+
+ public abstract class AbstractComposeView extends android.view.ViewGroup {
+ ctor public AbstractComposeView(android.content.Context context, optional android.util.AttributeSet? attrs, optional int defStyleAttr);
+ ctor public AbstractComposeView(android.content.Context context, optional android.util.AttributeSet? attrs);
+ ctor public AbstractComposeView(android.content.Context context);
+ method @androidx.compose.runtime.Composable public abstract void Content();
+ method public final void createComposition();
+ method public final void disposeComposition();
+ method public final boolean getHasComposition();
+ method protected boolean getShouldCreateCompositionOnAttachedToWindow();
+ method public final boolean getShowLayoutBounds();
+ method protected final void onLayout(boolean changed, int left, int top, int right, int bottom);
+ method protected final void onMeasure(int widthMeasureSpec, int heightMeasureSpec);
+ method public final void setParentCompositionContext(androidx.compose.runtime.CompositionContext? parent);
+ method public final void setShowLayoutBounds(boolean);
+ method public final void setViewCompositionStrategy(androidx.compose.ui.platform.ViewCompositionStrategy strategy);
+ property public final boolean hasComposition;
+ property protected boolean shouldCreateCompositionOnAttachedToWindow;
+ property public final boolean showLayoutBounds;
+ }
+
+ public interface AccessibilityManager {
+ method public long calculateRecommendedTimeoutMillis(long originalTimeoutMillis, optional boolean containsIcons, optional boolean containsText, optional boolean containsControls);
+ }
+
+ public final class AndroidClipboardManager_androidKt {
+ }
+
+ public final class AndroidComposeViewAccessibilityDelegateCompat_androidKt {
+ }
+
+ public final class AndroidComposeView_androidKt {
+ }
+
+ public final class AndroidCompositionLocals_androidKt {
+ method public static androidx.compose.runtime.ProvidableCompositionLocal<android.content.res.Configuration> getLocalConfiguration();
+ method public static androidx.compose.runtime.ProvidableCompositionLocal<android.content.Context> getLocalContext();
+ method public static androidx.compose.runtime.ProvidableCompositionLocal<androidx.lifecycle.LifecycleOwner> getLocalLifecycleOwner();
+ method public static androidx.compose.runtime.ProvidableCompositionLocal<androidx.savedstate.SavedStateRegistryOwner> getLocalSavedStateRegistryOwner();
+ method public static androidx.compose.runtime.ProvidableCompositionLocal<android.view.View> getLocalView();
+ property public static final androidx.compose.runtime.ProvidableCompositionLocal<android.content.res.Configuration> LocalConfiguration;
+ property public static final androidx.compose.runtime.ProvidableCompositionLocal<android.content.Context> LocalContext;
+ property public static final androidx.compose.runtime.ProvidableCompositionLocal<androidx.lifecycle.LifecycleOwner> LocalLifecycleOwner;
+ property public static final androidx.compose.runtime.ProvidableCompositionLocal<androidx.savedstate.SavedStateRegistryOwner> LocalSavedStateRegistryOwner;
+ property public static final androidx.compose.runtime.ProvidableCompositionLocal<android.view.View> LocalView;
+ }
+
+ public final class AndroidUiDispatcher extends kotlinx.coroutines.CoroutineDispatcher {
+ method public void dispatch(kotlin.coroutines.CoroutineContext context, Runnable block);
+ method public android.view.Choreographer getChoreographer();
+ method public androidx.compose.runtime.MonotonicFrameClock getFrameClock();
+ property public final android.view.Choreographer choreographer;
+ property public final androidx.compose.runtime.MonotonicFrameClock frameClock;
+ field public static final androidx.compose.ui.platform.AndroidUiDispatcher.Companion Companion;
+ }
+
+ public static final class AndroidUiDispatcher.Companion {
+ method public kotlin.coroutines.CoroutineContext getCurrentThread();
+ method public kotlin.coroutines.CoroutineContext getMain();
+ property public final kotlin.coroutines.CoroutineContext CurrentThread;
+ property public final kotlin.coroutines.CoroutineContext Main;
+ }
+
+ public final class AndroidUiDispatcher_androidKt {
+ }
+
+ public final class AndroidUiFrameClock implements androidx.compose.runtime.MonotonicFrameClock {
+ ctor public AndroidUiFrameClock(android.view.Choreographer choreographer);
+ method public android.view.Choreographer getChoreographer();
+ method public suspend <R> Object? withFrameNanos(kotlin.jvm.functions.Function1<? super java.lang.Long,? extends R> onFrame, kotlin.coroutines.Continuation<? super R>);
+ property public final android.view.Choreographer choreographer;
+ }
+
+ public final class AndroidUriHandler implements androidx.compose.ui.platform.UriHandler {
+ ctor public AndroidUriHandler(android.content.Context context);
+ method public void openUri(String uri);
+ }
+
+ public final class AndroidViewConfiguration implements androidx.compose.ui.platform.ViewConfiguration {
+ ctor public AndroidViewConfiguration(android.view.ViewConfiguration viewConfiguration);
+ method public long getDoubleTapMinTimeMillis();
+ method public long getDoubleTapTimeoutMillis();
+ method public long getLongPressTimeoutMillis();
+ method public float getTouchSlop();
+ property public long doubleTapMinTimeMillis;
+ property public long doubleTapTimeoutMillis;
+ property public long longPressTimeoutMillis;
+ property public float touchSlop;
+ }
+
+ public interface ClipboardManager {
+ method public androidx.compose.ui.text.AnnotatedString? getText();
+ method public void setText(androidx.compose.ui.text.AnnotatedString annotatedString);
+ }
+
+ public final class ComposeView extends androidx.compose.ui.platform.AbstractComposeView {
+ ctor public ComposeView(android.content.Context context, optional android.util.AttributeSet? attrs, optional int defStyleAttr);
+ ctor public ComposeView(android.content.Context context, optional android.util.AttributeSet? attrs);
+ ctor public ComposeView(android.content.Context context);
+ method @androidx.compose.runtime.Composable public void Content();
+ method public void setContent(kotlin.jvm.functions.Function0<kotlin.Unit> content);
+ property protected boolean shouldCreateCompositionOnAttachedToWindow;
+ }
+
+ public final class CompositionLocalsKt {
+ method public static androidx.compose.runtime.ProvidableCompositionLocal<androidx.compose.ui.platform.AccessibilityManager> getLocalAccessibilityManager();
+ method public static androidx.compose.runtime.ProvidableCompositionLocal<androidx.compose.ui.platform.ClipboardManager> getLocalClipboardManager();
+ method public static androidx.compose.runtime.ProvidableCompositionLocal<androidx.compose.ui.unit.Density> getLocalDensity();
+ method public static androidx.compose.runtime.ProvidableCompositionLocal<androidx.compose.ui.focus.FocusManager> getLocalFocusManager();
+ method public static androidx.compose.runtime.ProvidableCompositionLocal<androidx.compose.ui.text.font.FontFamily.Resolver> getLocalFontFamilyResolver();
+ method public static androidx.compose.runtime.ProvidableCompositionLocal<androidx.compose.ui.hapticfeedback.HapticFeedback> getLocalHapticFeedback();
+ method public static androidx.compose.runtime.ProvidableCompositionLocal<androidx.compose.ui.input.InputModeManager> getLocalInputModeManager();
+ method public static androidx.compose.runtime.ProvidableCompositionLocal<androidx.compose.ui.unit.LayoutDirection> getLocalLayoutDirection();
+ method public static androidx.compose.runtime.ProvidableCompositionLocal<androidx.compose.ui.text.input.TextInputService> getLocalTextInputService();
+ method public static androidx.compose.runtime.ProvidableCompositionLocal<androidx.compose.ui.platform.TextToolbar> getLocalTextToolbar();
+ method public static androidx.compose.runtime.ProvidableCompositionLocal<androidx.compose.ui.platform.UriHandler> getLocalUriHandler();
+ method public static androidx.compose.runtime.ProvidableCompositionLocal<androidx.compose.ui.platform.ViewConfiguration> getLocalViewConfiguration();
+ method public static androidx.compose.runtime.ProvidableCompositionLocal<androidx.compose.ui.platform.WindowInfo> getLocalWindowInfo();
+ property public static final androidx.compose.runtime.ProvidableCompositionLocal<androidx.compose.ui.platform.AccessibilityManager> LocalAccessibilityManager;
+ property public static final androidx.compose.runtime.ProvidableCompositionLocal<androidx.compose.ui.platform.ClipboardManager> LocalClipboardManager;
+ property public static final androidx.compose.runtime.ProvidableCompositionLocal<androidx.compose.ui.unit.Density> LocalDensity;
+ property public static final androidx.compose.runtime.ProvidableCompositionLocal<androidx.compose.ui.focus.FocusManager> LocalFocusManager;
+ property public static final androidx.compose.runtime.ProvidableCompositionLocal<androidx.compose.ui.text.font.FontFamily.Resolver> LocalFontFamilyResolver;
+ property public static final androidx.compose.runtime.ProvidableCompositionLocal<androidx.compose.ui.hapticfeedback.HapticFeedback> LocalHapticFeedback;
+ property public static final androidx.compose.runtime.ProvidableCompositionLocal<androidx.compose.ui.input.InputModeManager> LocalInputModeManager;
+ property public static final androidx.compose.runtime.ProvidableCompositionLocal<androidx.compose.ui.unit.LayoutDirection> LocalLayoutDirection;
+ property public static final androidx.compose.runtime.ProvidableCompositionLocal<androidx.compose.ui.text.input.TextInputService> LocalTextInputService;
+ property public static final androidx.compose.runtime.ProvidableCompositionLocal<androidx.compose.ui.platform.TextToolbar> LocalTextToolbar;
+ property public static final androidx.compose.runtime.ProvidableCompositionLocal<androidx.compose.ui.platform.UriHandler> LocalUriHandler;
+ property public static final androidx.compose.runtime.ProvidableCompositionLocal<androidx.compose.ui.platform.ViewConfiguration> LocalViewConfiguration;
+ property public static final androidx.compose.runtime.ProvidableCompositionLocal<androidx.compose.ui.platform.WindowInfo> LocalWindowInfo;
+ }
+
+ public final class DebugUtilsKt {
+ }
+
+ public final class DisposableSaveableStateRegistry_androidKt {
+ }
+
+ public interface InfiniteAnimationPolicy extends kotlin.coroutines.CoroutineContext.Element {
+ method public default kotlin.coroutines.CoroutineContext.Key<?> getKey();
+ method public suspend <R> Object? onInfiniteOperation(kotlin.jvm.functions.Function1<? super kotlin.coroutines.Continuation<? super R>,?> block, kotlin.coroutines.Continuation<? super R>);
+ property public default kotlin.coroutines.CoroutineContext.Key<?> key;
+ field public static final androidx.compose.ui.platform.InfiniteAnimationPolicy.Key Key;
+ }
+
+ public static final class InfiniteAnimationPolicy.Key implements kotlin.coroutines.CoroutineContext.Key<androidx.compose.ui.platform.InfiniteAnimationPolicy> {
+ }
+
+ public final class InfiniteAnimationPolicyKt {
+ }
+
+ public final class InspectableModifier extends androidx.compose.ui.platform.InspectorValueInfo implements androidx.compose.ui.Modifier.Element {
+ ctor public InspectableModifier(kotlin.jvm.functions.Function1<? super androidx.compose.ui.platform.InspectorInfo,kotlin.Unit> inspectorInfo);
+ method public androidx.compose.ui.platform.InspectableModifier.End getEnd();
+ property public final androidx.compose.ui.platform.InspectableModifier.End end;
+ }
+
+ public final class InspectableModifier.End implements androidx.compose.ui.Modifier.Element {
+ ctor public InspectableModifier.End();
+ }
+
+ public interface InspectableValue {
+ method public default kotlin.sequences.Sequence<androidx.compose.ui.platform.ValueElement> getInspectableElements();
+ method public default String? getNameFallback();
+ method public default Object? getValueOverride();
+ property public default kotlin.sequences.Sequence<androidx.compose.ui.platform.ValueElement> inspectableElements;
+ property public default String? nameFallback;
+ property public default Object? valueOverride;
+ }
+
+ public final class InspectableValueKt {
+ method public static inline kotlin.jvm.functions.Function1<androidx.compose.ui.platform.InspectorInfo,kotlin.Unit> debugInspectorInfo(kotlin.jvm.functions.Function1<? super androidx.compose.ui.platform.InspectorInfo,kotlin.Unit> definitions);
+ method public static kotlin.jvm.functions.Function1<androidx.compose.ui.platform.InspectorInfo,kotlin.Unit> getNoInspectorInfo();
+ method public static inline androidx.compose.ui.Modifier inspectable(androidx.compose.ui.Modifier, kotlin.jvm.functions.Function1<? super androidx.compose.ui.platform.InspectorInfo,kotlin.Unit> inspectorInfo, kotlin.jvm.functions.Function1<? super androidx.compose.ui.Modifier,? extends androidx.compose.ui.Modifier> factory);
+ method public static boolean isDebugInspectorInfoEnabled();
+ method public static void setDebugInspectorInfoEnabled(boolean);
+ property public static final kotlin.jvm.functions.Function1<androidx.compose.ui.platform.InspectorInfo,kotlin.Unit> NoInspectorInfo;
+ property public static final boolean isDebugInspectorInfoEnabled;
+ }
+
+ public final class InspectionModeKt {
+ method public static androidx.compose.runtime.ProvidableCompositionLocal<java.lang.Boolean> getLocalInspectionMode();
+ property public static final androidx.compose.runtime.ProvidableCompositionLocal<java.lang.Boolean> LocalInspectionMode;
+ }
+
+ public final class InspectorInfo {
+ ctor public InspectorInfo();
+ method public String? getName();
+ method public androidx.compose.ui.platform.ValueElementSequence getProperties();
+ method public Object? getValue();
+ method public void setName(String?);
+ method public void setValue(Object?);
+ property public final String? name;
+ property public final androidx.compose.ui.platform.ValueElementSequence properties;
+ property public final Object? value;
+ }
+
+ public abstract class InspectorValueInfo implements androidx.compose.ui.platform.InspectableValue {
+ ctor public InspectorValueInfo(kotlin.jvm.functions.Function1<? super androidx.compose.ui.platform.InspectorInfo,kotlin.Unit> info);
+ property public kotlin.sequences.Sequence<androidx.compose.ui.platform.ValueElement> inspectableElements;
+ property public String? nameFallback;
+ property public Object? valueOverride;
+ }
+
+ public final class InvertMatrixKt {
+ }
+
+ public final class JvmActuals_jvmKt {
+ }
+
+ public final class NestedScrollInteropConnectionKt {
+ }
+
+ public final class ShapeContainingUtilKt {
+ }
+
+ public final class TestTagKt {
+ method @androidx.compose.runtime.Stable public static androidx.compose.ui.Modifier testTag(androidx.compose.ui.Modifier, String tag);
+ }
+
+ public interface TextToolbar {
+ method public androidx.compose.ui.platform.TextToolbarStatus getStatus();
+ method public void hide();
+ method public void showMenu(androidx.compose.ui.geometry.Rect rect, optional kotlin.jvm.functions.Function0<kotlin.Unit>? onCopyRequested, optional kotlin.jvm.functions.Function0<kotlin.Unit>? onPasteRequested, optional kotlin.jvm.functions.Function0<kotlin.Unit>? onCutRequested, optional kotlin.jvm.functions.Function0<kotlin.Unit>? onSelectAllRequested);
+ property public abstract androidx.compose.ui.platform.TextToolbarStatus status;
+ }
+
+ public enum TextToolbarStatus {
+ enum_constant public static final androidx.compose.ui.platform.TextToolbarStatus Hidden;
+ enum_constant public static final androidx.compose.ui.platform.TextToolbarStatus Shown;
+ }
+
+ public interface UriHandler {
+ method public void openUri(String uri);
+ }
+
+ public final class ValueElement {
+ ctor public ValueElement(String name, Object? value);
+ method public String component1();
+ method public Object? component2();
+ method public androidx.compose.ui.platform.ValueElement copy(String name, Object? value);
+ method public String getName();
+ method public Object? getValue();
+ property public final String name;
+ property public final Object? value;
+ }
+
+ public final class ValueElementSequence implements kotlin.sequences.Sequence<androidx.compose.ui.platform.ValueElement> {
+ ctor public ValueElementSequence();
+ method public java.util.Iterator<androidx.compose.ui.platform.ValueElement> iterator();
+ method public operator void set(String name, Object? value);
+ }
+
+ public interface ViewCompositionStrategy {
+ method public kotlin.jvm.functions.Function0<kotlin.Unit> installFor(androidx.compose.ui.platform.AbstractComposeView view);
+ field public static final androidx.compose.ui.platform.ViewCompositionStrategy.Companion Companion;
+ }
+
+ public static final class ViewCompositionStrategy.Companion {
+ method public androidx.compose.ui.platform.ViewCompositionStrategy getDefault();
+ property public final androidx.compose.ui.platform.ViewCompositionStrategy Default;
+ }
+
+ public static final class ViewCompositionStrategy.DisposeOnDetachedFromWindow implements androidx.compose.ui.platform.ViewCompositionStrategy {
+ method public kotlin.jvm.functions.Function0<kotlin.Unit> installFor(androidx.compose.ui.platform.AbstractComposeView view);
+ field public static final androidx.compose.ui.platform.ViewCompositionStrategy.DisposeOnDetachedFromWindow INSTANCE;
+ }
+
+ public static final class ViewCompositionStrategy.DisposeOnDetachedFromWindowOrReleasedFromPool implements androidx.compose.ui.platform.ViewCompositionStrategy {
+ method public kotlin.jvm.functions.Function0<kotlin.Unit> installFor(androidx.compose.ui.platform.AbstractComposeView view);
+ field public static final androidx.compose.ui.platform.ViewCompositionStrategy.DisposeOnDetachedFromWindowOrReleasedFromPool INSTANCE;
+ }
+
+ public static final class ViewCompositionStrategy.DisposeOnLifecycleDestroyed implements androidx.compose.ui.platform.ViewCompositionStrategy {
+ ctor public ViewCompositionStrategy.DisposeOnLifecycleDestroyed(androidx.lifecycle.Lifecycle lifecycle);
+ ctor public ViewCompositionStrategy.DisposeOnLifecycleDestroyed(androidx.lifecycle.LifecycleOwner lifecycleOwner);
+ method public kotlin.jvm.functions.Function0<kotlin.Unit> installFor(androidx.compose.ui.platform.AbstractComposeView view);
+ }
+
+ public static final class ViewCompositionStrategy.DisposeOnViewTreeLifecycleDestroyed implements androidx.compose.ui.platform.ViewCompositionStrategy {
+ method public kotlin.jvm.functions.Function0<kotlin.Unit> installFor(androidx.compose.ui.platform.AbstractComposeView view);
+ field public static final androidx.compose.ui.platform.ViewCompositionStrategy.DisposeOnViewTreeLifecycleDestroyed INSTANCE;
+ }
+
+ public final class ViewCompositionStrategy_androidKt {
+ }
+
+ public interface ViewConfiguration {
+ method public long getDoubleTapMinTimeMillis();
+ method public long getDoubleTapTimeoutMillis();
+ method public long getLongPressTimeoutMillis();
+ method public default long getMinimumTouchTargetSize();
+ method public float getTouchSlop();
+ property public abstract long doubleTapMinTimeMillis;
+ property public abstract long doubleTapTimeoutMillis;
+ property public abstract long longPressTimeoutMillis;
+ property public default long minimumTouchTargetSize;
+ property public abstract float touchSlop;
+ }
+
+ public interface ViewRootForInspector {
+ method public default androidx.compose.ui.platform.AbstractComposeView? getSubCompositionView();
+ method public default android.view.View? getViewRoot();
+ property public default androidx.compose.ui.platform.AbstractComposeView? subCompositionView;
+ property public default android.view.View? viewRoot;
+ }
+
+ @VisibleForTesting public interface ViewRootForTest extends androidx.compose.ui.node.RootForTest {
+ method public boolean getHasPendingMeasureOrLayout();
+ method public android.view.View getView();
+ method public void invalidateDescendants();
+ method public boolean isLifecycleInResumedState();
+ property public abstract boolean hasPendingMeasureOrLayout;
+ property public abstract boolean isLifecycleInResumedState;
+ property public abstract android.view.View view;
+ field public static final androidx.compose.ui.platform.ViewRootForTest.Companion Companion;
+ }
+
+ public static final class ViewRootForTest.Companion {
+ method public kotlin.jvm.functions.Function1<androidx.compose.ui.platform.ViewRootForTest,kotlin.Unit>? getOnViewCreatedCallback();
+ method public void setOnViewCreatedCallback(kotlin.jvm.functions.Function1<? super androidx.compose.ui.platform.ViewRootForTest,kotlin.Unit>?);
+ property public final kotlin.jvm.functions.Function1<androidx.compose.ui.platform.ViewRootForTest,kotlin.Unit>? onViewCreatedCallback;
+ }
+
+ @androidx.compose.runtime.Stable public interface WindowInfo {
+ method public boolean isWindowFocused();
+ property public abstract boolean isWindowFocused;
+ }
+
+ public final class WindowInfoKt {
+ }
+
+ public final class WindowRecomposer_androidKt {
+ method public static androidx.compose.runtime.CompositionContext? findViewTreeCompositionContext(android.view.View);
+ method public static androidx.compose.runtime.CompositionContext? getCompositionContext(android.view.View);
+ method public static void setCompositionContext(android.view.View, androidx.compose.runtime.CompositionContext?);
+ }
+
+ public final class Wrapper_androidKt {
+ }
+
+}
+
+package androidx.compose.ui.platform.accessibility {
+
+ public final class CollectionInfoKt {
+ }
+
+}
+
+package androidx.compose.ui.platform.actionmodecallback {
+
+ public final class TextActionModeCallback_androidKt {
+ }
+
+}
+
+package androidx.compose.ui.res {
+
+ public final class ColorResources_androidKt {
+ method @androidx.compose.runtime.Composable @androidx.compose.runtime.ReadOnlyComposable public static long colorResource(@ColorRes int id);
+ }
+
+ public final class FontResources_androidKt {
+ method @Deprecated @androidx.compose.runtime.Composable @androidx.compose.runtime.ReadOnlyComposable public static androidx.compose.ui.text.font.Typeface fontResource(androidx.compose.ui.text.font.FontFamily fontFamily);
+ }
+
+ public final class ImageResources_androidKt {
+ method public static androidx.compose.ui.graphics.ImageBitmap imageResource(androidx.compose.ui.graphics.ImageBitmap.Companion, android.content.res.Resources res, @DrawableRes int id);
+ method @androidx.compose.runtime.Composable public static androidx.compose.ui.graphics.ImageBitmap imageResource(androidx.compose.ui.graphics.ImageBitmap.Companion, @DrawableRes int id);
+ }
+
+ public final class PainterResources_androidKt {
+ method @androidx.compose.runtime.Composable public static androidx.compose.ui.graphics.painter.Painter painterResource(@DrawableRes int id);
+ }
+
+ public final class PrimitiveResources_androidKt {
+ method @androidx.compose.runtime.Composable @androidx.compose.runtime.ReadOnlyComposable public static boolean booleanResource(@BoolRes int id);
+ method @androidx.compose.runtime.Composable @androidx.compose.runtime.ReadOnlyComposable public static float dimensionResource(@DimenRes int id);
+ method @androidx.compose.runtime.Composable @androidx.compose.runtime.ReadOnlyComposable public static int[] integerArrayResource(@ArrayRes int id);
+ method @androidx.compose.runtime.Composable @androidx.compose.runtime.ReadOnlyComposable public static int integerResource(@IntegerRes int id);
+ }
+
+ public final class StringResources_androidKt {
+ method @androidx.compose.runtime.Composable @androidx.compose.runtime.ReadOnlyComposable public static String![] stringArrayResource(@ArrayRes int id);
+ method @androidx.compose.runtime.Composable @androidx.compose.runtime.ReadOnlyComposable public static String stringResource(@StringRes int id);
+ method @androidx.compose.runtime.Composable @androidx.compose.runtime.ReadOnlyComposable public static String stringResource(@StringRes int id, java.lang.Object... formatArgs);
+ }
+
+ public final class VectorResources_androidKt {
+ method @androidx.compose.runtime.Composable public static androidx.compose.ui.graphics.vector.ImageVector vectorResource(androidx.compose.ui.graphics.vector.ImageVector.Companion, @DrawableRes int id);
+ method @kotlin.jvm.Throws(exceptionClasses=XmlPullParserException::class) public static androidx.compose.ui.graphics.vector.ImageVector vectorResource(androidx.compose.ui.graphics.vector.ImageVector.Companion, optional android.content.res.Resources.Theme? theme, android.content.res.Resources res, int resId) throws org.xmlpull.v1.XmlPullParserException;
+ }
+
+}
+
+package androidx.compose.ui.semantics {
+
+ public final class AccessibilityAction<T extends kotlin.Function<? extends java.lang.Boolean>> {
+ ctor public AccessibilityAction(String? label, T? action);
+ method public T? getAction();
+ method public String? getLabel();
+ property public final T? action;
+ property public final String? label;
+ }
+
+ public final class CollectionInfo {
+ ctor public CollectionInfo(int rowCount, int columnCount);
+ method public int getColumnCount();
+ method public int getRowCount();
+ property public final int columnCount;
+ property public final int rowCount;
+ }
+
+ public final class CollectionItemInfo {
+ ctor public CollectionItemInfo(int rowIndex, int rowSpan, int columnIndex, int columnSpan);
+ method public int getColumnIndex();
+ method public int getColumnSpan();
+ method public int getRowIndex();
+ method public int getRowSpan();
+ property public final int columnIndex;
+ property public final int columnSpan;
+ property public final int rowIndex;
+ property public final int rowSpan;
+ }
+
+ public final class CustomAccessibilityAction {
+ ctor public CustomAccessibilityAction(String label, kotlin.jvm.functions.Function0<java.lang.Boolean> action);
+ method public kotlin.jvm.functions.Function0<java.lang.Boolean> getAction();
+ method public String getLabel();
+ property public final kotlin.jvm.functions.Function0<java.lang.Boolean> action;
+ property public final String label;
+ }
+
+ @androidx.compose.runtime.Immutable @kotlin.jvm.JvmInline public final value class LiveRegionMode {
+ field public static final androidx.compose.ui.semantics.LiveRegionMode.Companion Companion;
+ }
+
+ public static final class LiveRegionMode.Companion {
+ method public int getAssertive();
+ method public int getPolite();
+ property public final int Assertive;
+ property public final int Polite;
+ }
+
+ public final class ProgressBarRangeInfo {
+ ctor public ProgressBarRangeInfo(float current, kotlin.ranges.ClosedFloatingPointRange<java.lang.Float> range, optional int steps);
+ method public float getCurrent();
+ method public kotlin.ranges.ClosedFloatingPointRange<java.lang.Float> getRange();
+ method public int getSteps();
+ property public final float current;
+ property public final kotlin.ranges.ClosedFloatingPointRange<java.lang.Float> range;
+ property public final int steps;
+ field public static final androidx.compose.ui.semantics.ProgressBarRangeInfo.Companion Companion;
+ }
+
+ public static final class ProgressBarRangeInfo.Companion {
+ method public androidx.compose.ui.semantics.ProgressBarRangeInfo getIndeterminate();
+ property public final androidx.compose.ui.semantics.ProgressBarRangeInfo Indeterminate;
+ }
+
+ @androidx.compose.runtime.Immutable @kotlin.jvm.JvmInline public final value class Role {
+ field public static final androidx.compose.ui.semantics.Role.Companion Companion;
+ }
+
+ public static final class Role.Companion {
+ method public int getButton();
+ method public int getCheckbox();
+ method public int getImage();
+ method public int getRadioButton();
+ method public int getSwitch();
+ method public int getTab();
+ property public final int Button;
+ property public final int Checkbox;
+ property public final int Image;
+ property public final int RadioButton;
+ property public final int Switch;
+ property public final int Tab;
+ }
+
+ public final class ScrollAxisRange {
+ ctor public ScrollAxisRange(kotlin.jvm.functions.Function0<java.lang.Float> value, kotlin.jvm.functions.Function0<java.lang.Float> maxValue, optional boolean reverseScrolling);
+ method public kotlin.jvm.functions.Function0<java.lang.Float> getMaxValue();
+ method public boolean getReverseScrolling();
+ method public kotlin.jvm.functions.Function0<java.lang.Float> getValue();
+ property public final kotlin.jvm.functions.Function0<java.lang.Float> maxValue;
+ property public final boolean reverseScrolling;
+ property public final kotlin.jvm.functions.Function0<java.lang.Float> value;
+ }
+
+ public final class SemanticsActions {
+ method public androidx.compose.ui.semantics.SemanticsPropertyKey<androidx.compose.ui.semantics.AccessibilityAction<kotlin.jvm.functions.Function0<java.lang.Boolean>>> getCollapse();
+ method public androidx.compose.ui.semantics.SemanticsPropertyKey<androidx.compose.ui.semantics.AccessibilityAction<kotlin.jvm.functions.Function0<java.lang.Boolean>>> getCopyText();
+ method public androidx.compose.ui.semantics.SemanticsPropertyKey<java.util.List<androidx.compose.ui.semantics.CustomAccessibilityAction>> getCustomActions();
+ method public androidx.compose.ui.semantics.SemanticsPropertyKey<androidx.compose.ui.semantics.AccessibilityAction<kotlin.jvm.functions.Function0<java.lang.Boolean>>> getCutText();
+ method public androidx.compose.ui.semantics.SemanticsPropertyKey<androidx.compose.ui.semantics.AccessibilityAction<kotlin.jvm.functions.Function0<java.lang.Boolean>>> getDismiss();
+ method public androidx.compose.ui.semantics.SemanticsPropertyKey<androidx.compose.ui.semantics.AccessibilityAction<kotlin.jvm.functions.Function0<java.lang.Boolean>>> getExpand();
+ method public androidx.compose.ui.semantics.SemanticsPropertyKey<androidx.compose.ui.semantics.AccessibilityAction<kotlin.jvm.functions.Function1<java.util.List<androidx.compose.ui.text.TextLayoutResult>,java.lang.Boolean>>> getGetTextLayoutResult();
+ method public androidx.compose.ui.semantics.SemanticsPropertyKey<androidx.compose.ui.semantics.AccessibilityAction<kotlin.jvm.functions.Function0<java.lang.Boolean>>> getOnClick();
+ method public androidx.compose.ui.semantics.SemanticsPropertyKey<androidx.compose.ui.semantics.AccessibilityAction<kotlin.jvm.functions.Function0<java.lang.Boolean>>> getOnLongClick();
+ method public androidx.compose.ui.semantics.SemanticsPropertyKey<androidx.compose.ui.semantics.AccessibilityAction<kotlin.jvm.functions.Function0<java.lang.Boolean>>> getPasteText();
+ method public androidx.compose.ui.semantics.SemanticsPropertyKey<androidx.compose.ui.semantics.AccessibilityAction<kotlin.jvm.functions.Function0<java.lang.Boolean>>> getRequestFocus();
+ method public androidx.compose.ui.semantics.SemanticsPropertyKey<androidx.compose.ui.semantics.AccessibilityAction<kotlin.jvm.functions.Function2<java.lang.Float,java.lang.Float,java.lang.Boolean>>> getScrollBy();
+ method public androidx.compose.ui.semantics.SemanticsPropertyKey<androidx.compose.ui.semantics.AccessibilityAction<kotlin.jvm.functions.Function1<java.lang.Integer,java.lang.Boolean>>> getScrollToIndex();
+ method public androidx.compose.ui.semantics.SemanticsPropertyKey<androidx.compose.ui.semantics.AccessibilityAction<kotlin.jvm.functions.Function1<java.lang.Float,java.lang.Boolean>>> getSetProgress();
+ method public androidx.compose.ui.semantics.SemanticsPropertyKey<androidx.compose.ui.semantics.AccessibilityAction<kotlin.jvm.functions.Function3<java.lang.Integer,java.lang.Integer,java.lang.Boolean,java.lang.Boolean>>> getSetSelection();
+ method public androidx.compose.ui.semantics.SemanticsPropertyKey<androidx.compose.ui.semantics.AccessibilityAction<kotlin.jvm.functions.Function1<androidx.compose.ui.text.AnnotatedString,java.lang.Boolean>>> getSetText();
+ property public final androidx.compose.ui.semantics.SemanticsPropertyKey<androidx.compose.ui.semantics.AccessibilityAction<kotlin.jvm.functions.Function0<java.lang.Boolean>>> Collapse;
+ property public final androidx.compose.ui.semantics.SemanticsPropertyKey<androidx.compose.ui.semantics.AccessibilityAction<kotlin.jvm.functions.Function0<java.lang.Boolean>>> CopyText;
+ property public final androidx.compose.ui.semantics.SemanticsPropertyKey<java.util.List<androidx.compose.ui.semantics.CustomAccessibilityAction>> CustomActions;
+ property public final androidx.compose.ui.semantics.SemanticsPropertyKey<androidx.compose.ui.semantics.AccessibilityAction<kotlin.jvm.functions.Function0<java.lang.Boolean>>> CutText;
+ property public final androidx.compose.ui.semantics.SemanticsPropertyKey<androidx.compose.ui.semantics.AccessibilityAction<kotlin.jvm.functions.Function0<java.lang.Boolean>>> Dismiss;
+ property public final androidx.compose.ui.semantics.SemanticsPropertyKey<androidx.compose.ui.semantics.AccessibilityAction<kotlin.jvm.functions.Function0<java.lang.Boolean>>> Expand;
+ property public final androidx.compose.ui.semantics.SemanticsPropertyKey<androidx.compose.ui.semantics.AccessibilityAction<kotlin.jvm.functions.Function1<java.util.List<androidx.compose.ui.text.TextLayoutResult>,java.lang.Boolean>>> GetTextLayoutResult;
+ property public final androidx.compose.ui.semantics.SemanticsPropertyKey<androidx.compose.ui.semantics.AccessibilityAction<kotlin.jvm.functions.Function0<java.lang.Boolean>>> OnClick;
+ property public final androidx.compose.ui.semantics.SemanticsPropertyKey<androidx.compose.ui.semantics.AccessibilityAction<kotlin.jvm.functions.Function0<java.lang.Boolean>>> OnLongClick;
+ property public final androidx.compose.ui.semantics.SemanticsPropertyKey<androidx.compose.ui.semantics.AccessibilityAction<kotlin.jvm.functions.Function0<java.lang.Boolean>>> PasteText;
+ property public final androidx.compose.ui.semantics.SemanticsPropertyKey<androidx.compose.ui.semantics.AccessibilityAction<kotlin.jvm.functions.Function0<java.lang.Boolean>>> RequestFocus;
+ property public final androidx.compose.ui.semantics.SemanticsPropertyKey<androidx.compose.ui.semantics.AccessibilityAction<kotlin.jvm.functions.Function2<java.lang.Float,java.lang.Float,java.lang.Boolean>>> ScrollBy;
+ property public final androidx.compose.ui.semantics.SemanticsPropertyKey<androidx.compose.ui.semantics.AccessibilityAction<kotlin.jvm.functions.Function1<java.lang.Integer,java.lang.Boolean>>> ScrollToIndex;
+ property public final androidx.compose.ui.semantics.SemanticsPropertyKey<androidx.compose.ui.semantics.AccessibilityAction<kotlin.jvm.functions.Function1<java.lang.Float,java.lang.Boolean>>> SetProgress;
+ property public final androidx.compose.ui.semantics.SemanticsPropertyKey<androidx.compose.ui.semantics.AccessibilityAction<kotlin.jvm.functions.Function3<java.lang.Integer,java.lang.Integer,java.lang.Boolean,java.lang.Boolean>>> SetSelection;
+ property public final androidx.compose.ui.semantics.SemanticsPropertyKey<androidx.compose.ui.semantics.AccessibilityAction<kotlin.jvm.functions.Function1<androidx.compose.ui.text.AnnotatedString,java.lang.Boolean>>> SetText;
+ field public static final androidx.compose.ui.semantics.SemanticsActions INSTANCE;
+ }
+
+ public final class SemanticsConfiguration implements java.lang.Iterable<java.util.Map.Entry<? extends androidx.compose.ui.semantics.SemanticsPropertyKey<?>,?>> kotlin.jvm.internal.markers.KMappedMarker androidx.compose.ui.semantics.SemanticsPropertyReceiver {
+ ctor public SemanticsConfiguration();
+ method public operator <T> boolean contains(androidx.compose.ui.semantics.SemanticsPropertyKey<T> key);
+ method public androidx.compose.ui.semantics.SemanticsConfiguration copy();
+ method public operator <T> T! get(androidx.compose.ui.semantics.SemanticsPropertyKey<T> key);
+ method public <T> T! getOrElse(androidx.compose.ui.semantics.SemanticsPropertyKey<T> key, kotlin.jvm.functions.Function0<? extends T> defaultValue);
+ method public <T> T? getOrElseNullable(androidx.compose.ui.semantics.SemanticsPropertyKey<T> key, kotlin.jvm.functions.Function0<? extends T> defaultValue);
+ method public boolean isClearingSemantics();
+ method public boolean isMergingSemanticsOfDescendants();
+ method public java.util.Iterator<java.util.Map.Entry<androidx.compose.ui.semantics.SemanticsPropertyKey<?>,java.lang.Object>> iterator();
+ method public <T> void set(androidx.compose.ui.semantics.SemanticsPropertyKey<T> key, T? value);
+ method public void setClearingSemantics(boolean);
+ method public void setMergingSemanticsOfDescendants(boolean);
+ property public final boolean isClearingSemantics;
+ property public final boolean isMergingSemanticsOfDescendants;
+ }
+
+ public final class SemanticsConfigurationKt {
+ method public static <T> T? getOrNull(androidx.compose.ui.semantics.SemanticsConfiguration, androidx.compose.ui.semantics.SemanticsPropertyKey<T> key);
+ }
+
+ public interface SemanticsModifier extends androidx.compose.ui.Modifier.Element {
+ method public int getId();
+ method public androidx.compose.ui.semantics.SemanticsConfiguration getSemanticsConfiguration();
+ property public abstract int id;
+ property public abstract androidx.compose.ui.semantics.SemanticsConfiguration semanticsConfiguration;
+ }
+
+ public final class SemanticsModifierKt {
+ method public static androidx.compose.ui.Modifier clearAndSetSemantics(androidx.compose.ui.Modifier, kotlin.jvm.functions.Function1<? super androidx.compose.ui.semantics.SemanticsPropertyReceiver,kotlin.Unit> properties);
+ method public static androidx.compose.ui.Modifier semantics(androidx.compose.ui.Modifier, optional boolean mergeDescendants, kotlin.jvm.functions.Function1<? super androidx.compose.ui.semantics.SemanticsPropertyReceiver,kotlin.Unit> properties);
+ }
+
+ public final class SemanticsNode {
+ method public int getAlignmentLinePosition(androidx.compose.ui.layout.AlignmentLine alignmentLine);
+ method public androidx.compose.ui.geometry.Rect getBoundsInRoot();
+ method public androidx.compose.ui.geometry.Rect getBoundsInWindow();
+ method public java.util.List<androidx.compose.ui.semantics.SemanticsNode> getChildren();
+ method public androidx.compose.ui.semantics.SemanticsConfiguration getConfig();
+ method public int getId();
+ method public androidx.compose.ui.layout.LayoutInfo getLayoutInfo();
+ method public boolean getMergingEnabled();
+ method public androidx.compose.ui.semantics.SemanticsNode? getParent();
+ method public long getPositionInRoot();
+ method public long getPositionInWindow();
+ method public androidx.compose.ui.node.RootForTest? getRoot();
+ method public long getSize();
+ method public androidx.compose.ui.geometry.Rect getTouchBoundsInRoot();
+ method public boolean isRoot();
+ property public final androidx.compose.ui.geometry.Rect boundsInRoot;
+ property public final androidx.compose.ui.geometry.Rect boundsInWindow;
+ property public final java.util.List<androidx.compose.ui.semantics.SemanticsNode> children;
+ property public final androidx.compose.ui.semantics.SemanticsConfiguration config;
+ property public final int id;
+ property public final boolean isRoot;
+ property public final androidx.compose.ui.layout.LayoutInfo layoutInfo;
+ property public final boolean mergingEnabled;
+ property public final androidx.compose.ui.semantics.SemanticsNode? parent;
+ property public final long positionInRoot;
+ property public final long positionInWindow;
+ property public final androidx.compose.ui.node.RootForTest? root;
+ property public final long size;
+ property public final androidx.compose.ui.geometry.Rect touchBoundsInRoot;
+ }
+
+ public final class SemanticsNodeKt {
+ }
+
+ public final class SemanticsOwner {
+ method public androidx.compose.ui.semantics.SemanticsNode getRootSemanticsNode();
+ method public androidx.compose.ui.semantics.SemanticsNode getUnmergedRootSemanticsNode();
+ property public final androidx.compose.ui.semantics.SemanticsNode rootSemanticsNode;
+ property public final androidx.compose.ui.semantics.SemanticsNode unmergedRootSemanticsNode;
+ }
+
+ public final class SemanticsOwnerKt {
+ method public static java.util.List<androidx.compose.ui.semantics.SemanticsNode> getAllSemanticsNodes(androidx.compose.ui.semantics.SemanticsOwner, boolean mergingEnabled);
+ }
+
+ public final class SemanticsProperties {
+ method public androidx.compose.ui.semantics.SemanticsPropertyKey<androidx.compose.ui.semantics.CollectionInfo> getCollectionInfo();
+ method public androidx.compose.ui.semantics.SemanticsPropertyKey<androidx.compose.ui.semantics.CollectionItemInfo> getCollectionItemInfo();
+ method public androidx.compose.ui.semantics.SemanticsPropertyKey<java.util.List<java.lang.String>> getContentDescription();
+ method public androidx.compose.ui.semantics.SemanticsPropertyKey<kotlin.Unit> getDisabled();
+ method public androidx.compose.ui.semantics.SemanticsPropertyKey<androidx.compose.ui.text.AnnotatedString> getEditableText();
+ method public androidx.compose.ui.semantics.SemanticsPropertyKey<java.lang.String> getError();
+ method public androidx.compose.ui.semantics.SemanticsPropertyKey<java.lang.Boolean> getFocused();
+ method public androidx.compose.ui.semantics.SemanticsPropertyKey<kotlin.Unit> getHeading();
+ method public androidx.compose.ui.semantics.SemanticsPropertyKey<androidx.compose.ui.semantics.ScrollAxisRange> getHorizontalScrollAxisRange();
+ method public androidx.compose.ui.semantics.SemanticsPropertyKey<androidx.compose.ui.text.input.ImeAction> getImeAction();
+ method public androidx.compose.ui.semantics.SemanticsPropertyKey<kotlin.jvm.functions.Function1<java.lang.Object,java.lang.Integer>> getIndexForKey();
+ method public androidx.compose.ui.semantics.SemanticsPropertyKey<kotlin.Unit> getInvisibleToUser();
+ method public androidx.compose.ui.semantics.SemanticsPropertyKey<kotlin.Unit> getIsDialog();
+ method public androidx.compose.ui.semantics.SemanticsPropertyKey<kotlin.Unit> getIsPopup();
+ method public androidx.compose.ui.semantics.SemanticsPropertyKey<androidx.compose.ui.semantics.LiveRegionMode> getLiveRegion();
+ method public androidx.compose.ui.semantics.SemanticsPropertyKey<java.lang.String> getPaneTitle();
+ method public androidx.compose.ui.semantics.SemanticsPropertyKey<kotlin.Unit> getPassword();
+ method public androidx.compose.ui.semantics.SemanticsPropertyKey<androidx.compose.ui.semantics.ProgressBarRangeInfo> getProgressBarRangeInfo();
+ method public androidx.compose.ui.semantics.SemanticsPropertyKey<androidx.compose.ui.semantics.Role> getRole();
+ method public androidx.compose.ui.semantics.SemanticsPropertyKey<kotlin.Unit> getSelectableGroup();
+ method public androidx.compose.ui.semantics.SemanticsPropertyKey<java.lang.Boolean> getSelected();
+ method public androidx.compose.ui.semantics.SemanticsPropertyKey<java.lang.String> getStateDescription();
+ method public androidx.compose.ui.semantics.SemanticsPropertyKey<java.lang.String> getTestTag();
+ method public androidx.compose.ui.semantics.SemanticsPropertyKey<java.util.List<androidx.compose.ui.text.AnnotatedString>> getText();
+ method public androidx.compose.ui.semantics.SemanticsPropertyKey<androidx.compose.ui.text.TextRange> getTextSelectionRange();
+ method public androidx.compose.ui.semantics.SemanticsPropertyKey<androidx.compose.ui.state.ToggleableState> getToggleableState();
+ method public androidx.compose.ui.semantics.SemanticsPropertyKey<androidx.compose.ui.semantics.ScrollAxisRange> getVerticalScrollAxisRange();
+ property public final androidx.compose.ui.semantics.SemanticsPropertyKey<androidx.compose.ui.semantics.CollectionInfo> CollectionInfo;
+ property public final androidx.compose.ui.semantics.SemanticsPropertyKey<androidx.compose.ui.semantics.CollectionItemInfo> CollectionItemInfo;
+ property public final androidx.compose.ui.semantics.SemanticsPropertyKey<java.util.List<java.lang.String>> ContentDescription;
+ property public final androidx.compose.ui.semantics.SemanticsPropertyKey<kotlin.Unit> Disabled;
+ property public final androidx.compose.ui.semantics.SemanticsPropertyKey<androidx.compose.ui.text.AnnotatedString> EditableText;
+ property public final androidx.compose.ui.semantics.SemanticsPropertyKey<java.lang.String> Error;
+ property public final androidx.compose.ui.semantics.SemanticsPropertyKey<java.lang.Boolean> Focused;
+ property public final androidx.compose.ui.semantics.SemanticsPropertyKey<kotlin.Unit> Heading;
+ property public final androidx.compose.ui.semantics.SemanticsPropertyKey<androidx.compose.ui.semantics.ScrollAxisRange> HorizontalScrollAxisRange;
+ property public final androidx.compose.ui.semantics.SemanticsPropertyKey<androidx.compose.ui.text.input.ImeAction> ImeAction;
+ property public final androidx.compose.ui.semantics.SemanticsPropertyKey<kotlin.jvm.functions.Function1<java.lang.Object,java.lang.Integer>> IndexForKey;
+ property public final androidx.compose.ui.semantics.SemanticsPropertyKey<kotlin.Unit> InvisibleToUser;
+ property public final androidx.compose.ui.semantics.SemanticsPropertyKey<kotlin.Unit> IsDialog;
+ property public final androidx.compose.ui.semantics.SemanticsPropertyKey<kotlin.Unit> IsPopup;
+ property public final androidx.compose.ui.semantics.SemanticsPropertyKey<androidx.compose.ui.semantics.LiveRegionMode> LiveRegion;
+ property public final androidx.compose.ui.semantics.SemanticsPropertyKey<java.lang.String> PaneTitle;
+ property public final androidx.compose.ui.semantics.SemanticsPropertyKey<kotlin.Unit> Password;
+ property public final androidx.compose.ui.semantics.SemanticsPropertyKey<androidx.compose.ui.semantics.ProgressBarRangeInfo> ProgressBarRangeInfo;
+ property public final androidx.compose.ui.semantics.SemanticsPropertyKey<androidx.compose.ui.semantics.Role> Role;
+ property public final androidx.compose.ui.semantics.SemanticsPropertyKey<kotlin.Unit> SelectableGroup;
+ property public final androidx.compose.ui.semantics.SemanticsPropertyKey<java.lang.Boolean> Selected;
+ property public final androidx.compose.ui.semantics.SemanticsPropertyKey<java.lang.String> StateDescription;
+ property public final androidx.compose.ui.semantics.SemanticsPropertyKey<java.lang.String> TestTag;
+ property public final androidx.compose.ui.semantics.SemanticsPropertyKey<java.util.List<androidx.compose.ui.text.AnnotatedString>> Text;
+ property public final androidx.compose.ui.semantics.SemanticsPropertyKey<androidx.compose.ui.text.TextRange> TextSelectionRange;
+ property public final androidx.compose.ui.semantics.SemanticsPropertyKey<androidx.compose.ui.state.ToggleableState> ToggleableState;
+ property public final androidx.compose.ui.semantics.SemanticsPropertyKey<androidx.compose.ui.semantics.ScrollAxisRange> VerticalScrollAxisRange;
+ field public static final androidx.compose.ui.semantics.SemanticsProperties INSTANCE;
+ }
+
+ public final class SemanticsPropertiesKt {
+ method public static void collapse(androidx.compose.ui.semantics.SemanticsPropertyReceiver, optional String? label, kotlin.jvm.functions.Function0<java.lang.Boolean>? action);
+ method public static void copyText(androidx.compose.ui.semantics.SemanticsPropertyReceiver, optional String? label, kotlin.jvm.functions.Function0<java.lang.Boolean>? action);
+ method public static void cutText(androidx.compose.ui.semantics.SemanticsPropertyReceiver, optional String? label, kotlin.jvm.functions.Function0<java.lang.Boolean>? action);
+ method public static void dialog(androidx.compose.ui.semantics.SemanticsPropertyReceiver);
+ method public static void disabled(androidx.compose.ui.semantics.SemanticsPropertyReceiver);
+ method public static void dismiss(androidx.compose.ui.semantics.SemanticsPropertyReceiver, optional String? label, kotlin.jvm.functions.Function0<java.lang.Boolean>? action);
+ method public static void error(androidx.compose.ui.semantics.SemanticsPropertyReceiver, String description);
+ method public static void expand(androidx.compose.ui.semantics.SemanticsPropertyReceiver, optional String? label, kotlin.jvm.functions.Function0<java.lang.Boolean>? action);
+ method public static androidx.compose.ui.semantics.CollectionInfo getCollectionInfo(androidx.compose.ui.semantics.SemanticsPropertyReceiver);
+ method public static androidx.compose.ui.semantics.CollectionItemInfo getCollectionItemInfo(androidx.compose.ui.semantics.SemanticsPropertyReceiver);
+ method public static String getContentDescription(androidx.compose.ui.semantics.SemanticsPropertyReceiver);
+ method public static java.util.List<androidx.compose.ui.semantics.CustomAccessibilityAction> getCustomActions(androidx.compose.ui.semantics.SemanticsPropertyReceiver);
+ method public static androidx.compose.ui.text.AnnotatedString getEditableText(androidx.compose.ui.semantics.SemanticsPropertyReceiver);
+ method public static boolean getFocused(androidx.compose.ui.semantics.SemanticsPropertyReceiver);
+ method public static androidx.compose.ui.semantics.ScrollAxisRange getHorizontalScrollAxisRange(androidx.compose.ui.semantics.SemanticsPropertyReceiver);
+ method public static int getImeAction(androidx.compose.ui.semantics.SemanticsPropertyReceiver);
+ method public static int getLiveRegion(androidx.compose.ui.semantics.SemanticsPropertyReceiver);
+ method public static String getPaneTitle(androidx.compose.ui.semantics.SemanticsPropertyReceiver);
+ method public static androidx.compose.ui.semantics.ProgressBarRangeInfo getProgressBarRangeInfo(androidx.compose.ui.semantics.SemanticsPropertyReceiver);
+ method public static int getRole(androidx.compose.ui.semantics.SemanticsPropertyReceiver);
+ method public static boolean getSelected(androidx.compose.ui.semantics.SemanticsPropertyReceiver);
+ method public static String getStateDescription(androidx.compose.ui.semantics.SemanticsPropertyReceiver);
+ method public static String getTestTag(androidx.compose.ui.semantics.SemanticsPropertyReceiver);
+ method public static androidx.compose.ui.text.AnnotatedString getText(androidx.compose.ui.semantics.SemanticsPropertyReceiver);
+ method public static void getTextLayoutResult(androidx.compose.ui.semantics.SemanticsPropertyReceiver, optional String? label, kotlin.jvm.functions.Function1<? super java.util.List<androidx.compose.ui.text.TextLayoutResult>,java.lang.Boolean>? action);
+ method public static long getTextSelectionRange(androidx.compose.ui.semantics.SemanticsPropertyReceiver);
+ method public static androidx.compose.ui.state.ToggleableState getToggleableState(androidx.compose.ui.semantics.SemanticsPropertyReceiver);
+ method public static androidx.compose.ui.semantics.ScrollAxisRange getVerticalScrollAxisRange(androidx.compose.ui.semantics.SemanticsPropertyReceiver);
+ method public static void heading(androidx.compose.ui.semantics.SemanticsPropertyReceiver);
+ method public static void indexForKey(androidx.compose.ui.semantics.SemanticsPropertyReceiver, kotlin.jvm.functions.Function1<java.lang.Object,java.lang.Integer> mapping);
+ method public static void onClick(androidx.compose.ui.semantics.SemanticsPropertyReceiver, optional String? label, kotlin.jvm.functions.Function0<java.lang.Boolean>? action);
+ method public static void onLongClick(androidx.compose.ui.semantics.SemanticsPropertyReceiver, optional String? label, kotlin.jvm.functions.Function0<java.lang.Boolean>? action);
+ method public static void password(androidx.compose.ui.semantics.SemanticsPropertyReceiver);
+ method public static void pasteText(androidx.compose.ui.semantics.SemanticsPropertyReceiver, optional String? label, kotlin.jvm.functions.Function0<java.lang.Boolean>? action);
+ method public static void popup(androidx.compose.ui.semantics.SemanticsPropertyReceiver);
+ method public static void requestFocus(androidx.compose.ui.semantics.SemanticsPropertyReceiver, optional String? label, kotlin.jvm.functions.Function0<java.lang.Boolean>? action);
+ method public static void scrollBy(androidx.compose.ui.semantics.SemanticsPropertyReceiver, optional String? label, kotlin.jvm.functions.Function2<? super java.lang.Float,? super java.lang.Float,java.lang.Boolean>? action);
+ method public static void scrollToIndex(androidx.compose.ui.semantics.SemanticsPropertyReceiver, optional String? label, kotlin.jvm.functions.Function1<? super java.lang.Integer,java.lang.Boolean> action);
+ method public static void selectableGroup(androidx.compose.ui.semantics.SemanticsPropertyReceiver);
+ method public static void setCollectionInfo(androidx.compose.ui.semantics.SemanticsPropertyReceiver, androidx.compose.ui.semantics.CollectionInfo);
+ method public static void setCollectionItemInfo(androidx.compose.ui.semantics.SemanticsPropertyReceiver, androidx.compose.ui.semantics.CollectionItemInfo);
+ method public static void setContentDescription(androidx.compose.ui.semantics.SemanticsPropertyReceiver, String);
+ method public static void setCustomActions(androidx.compose.ui.semantics.SemanticsPropertyReceiver, java.util.List<androidx.compose.ui.semantics.CustomAccessibilityAction>);
+ method public static void setEditableText(androidx.compose.ui.semantics.SemanticsPropertyReceiver, androidx.compose.ui.text.AnnotatedString);
+ method public static void setFocused(androidx.compose.ui.semantics.SemanticsPropertyReceiver, boolean);
+ method public static void setHorizontalScrollAxisRange(androidx.compose.ui.semantics.SemanticsPropertyReceiver, androidx.compose.ui.semantics.ScrollAxisRange);
+ method public static void setImeAction(androidx.compose.ui.semantics.SemanticsPropertyReceiver, int);
+ method public static void setLiveRegion(androidx.compose.ui.semantics.SemanticsPropertyReceiver, int);
+ method public static void setPaneTitle(androidx.compose.ui.semantics.SemanticsPropertyReceiver, String);
+ method public static void setProgress(androidx.compose.ui.semantics.SemanticsPropertyReceiver, optional String? label, kotlin.jvm.functions.Function1<? super java.lang.Float,java.lang.Boolean>? action);
+ method public static void setProgressBarRangeInfo(androidx.compose.ui.semantics.SemanticsPropertyReceiver, androidx.compose.ui.semantics.ProgressBarRangeInfo);
+ method public static void setRole(androidx.compose.ui.semantics.SemanticsPropertyReceiver, int);
+ method public static void setSelected(androidx.compose.ui.semantics.SemanticsPropertyReceiver, boolean);
+ method public static void setSelection(androidx.compose.ui.semantics.SemanticsPropertyReceiver, optional String? label, kotlin.jvm.functions.Function3<? super java.lang.Integer,? super java.lang.Integer,? super java.lang.Boolean,java.lang.Boolean>? action);
+ method public static void setStateDescription(androidx.compose.ui.semantics.SemanticsPropertyReceiver, String);
+ method public static void setTestTag(androidx.compose.ui.semantics.SemanticsPropertyReceiver, String);
+ method public static void setText(androidx.compose.ui.semantics.SemanticsPropertyReceiver, androidx.compose.ui.text.AnnotatedString);
+ method public static void setText(androidx.compose.ui.semantics.SemanticsPropertyReceiver, optional String? label, kotlin.jvm.functions.Function1<? super androidx.compose.ui.text.AnnotatedString,java.lang.Boolean>? action);
+ method public static void setTextSelectionRange(androidx.compose.ui.semantics.SemanticsPropertyReceiver, long);
+ method public static void setToggleableState(androidx.compose.ui.semantics.SemanticsPropertyReceiver, androidx.compose.ui.state.ToggleableState);
+ method public static void setVerticalScrollAxisRange(androidx.compose.ui.semantics.SemanticsPropertyReceiver, androidx.compose.ui.semantics.ScrollAxisRange);
+ }
+
+ public final class SemanticsProperties_androidKt {
+ }
+
+ public final class SemanticsPropertyKey<T> {
+ ctor public SemanticsPropertyKey(String name, optional kotlin.jvm.functions.Function2<? super T,? super T,? extends T> mergePolicy);
+ method public String getName();
+ method public operator T! getValue(androidx.compose.ui.semantics.SemanticsPropertyReceiver thisRef, kotlin.reflect.KProperty<?> property);
+ method public T? merge(T? parentValue, T? childValue);
+ method public operator void setValue(androidx.compose.ui.semantics.SemanticsPropertyReceiver thisRef, kotlin.reflect.KProperty<?> property, T? value);
+ property public final String name;
+ }
+
+ public interface SemanticsPropertyReceiver {
+ method public operator <T> void set(androidx.compose.ui.semantics.SemanticsPropertyKey<T> key, T? value);
+ }
+
+ public final class SemanticsSortKt {
+ }
+
+}
+
+package androidx.compose.ui.state {
+
+ public enum ToggleableState {
+ enum_constant public static final androidx.compose.ui.state.ToggleableState Indeterminate;
+ enum_constant public static final androidx.compose.ui.state.ToggleableState Off;
+ enum_constant public static final androidx.compose.ui.state.ToggleableState On;
+ }
+
+ public final class ToggleableStateKt {
+ method public static androidx.compose.ui.state.ToggleableState ToggleableState(boolean value);
+ }
+
+}
+
+package androidx.compose.ui.text.input {
+
+ public final class CursorAnchorInfoBuilderKt {
+ }
+
+ public final class InputState_androidKt {
+ }
+
+ public final class RecordingInputConnection_androidKt {
+ }
+
+ public final class TextInputServiceAndroid_androidKt {
+ }
+
+}
+
+package androidx.compose.ui.viewinterop {
+
+ public final class AndroidViewHolder_androidKt {
+ }
+
+ public final class AndroidView_androidKt {
+ method @androidx.compose.runtime.Composable @androidx.compose.ui.UiComposable public static <T extends android.view.View> void AndroidView(kotlin.jvm.functions.Function1<? super android.content.Context,? extends T> factory, optional androidx.compose.ui.Modifier modifier, optional kotlin.jvm.functions.Function1<? super T,kotlin.Unit> update);
+ method public static kotlin.jvm.functions.Function1<android.view.View,kotlin.Unit> getNoOpUpdate();
+ property public static final kotlin.jvm.functions.Function1<android.view.View,kotlin.Unit> NoOpUpdate;
+ }
+
+}
+
+package androidx.compose.ui.window {
+
+ public final class AndroidDialog_androidKt {
+ method @androidx.compose.runtime.Composable public static void Dialog(kotlin.jvm.functions.Function0<kotlin.Unit> onDismissRequest, optional androidx.compose.ui.window.DialogProperties properties, kotlin.jvm.functions.Function0<kotlin.Unit> content);
+ }
+
+ public final class AndroidPopup_androidKt {
+ method @androidx.compose.runtime.Composable public static void Popup(optional androidx.compose.ui.Alignment alignment, optional long offset, optional kotlin.jvm.functions.Function0<kotlin.Unit>? onDismissRequest, optional androidx.compose.ui.window.PopupProperties properties, kotlin.jvm.functions.Function0<kotlin.Unit> content);
+ method @androidx.compose.runtime.Composable public static void Popup(androidx.compose.ui.window.PopupPositionProvider popupPositionProvider, optional kotlin.jvm.functions.Function0<kotlin.Unit>? onDismissRequest, optional androidx.compose.ui.window.PopupProperties properties, kotlin.jvm.functions.Function0<kotlin.Unit> content);
+ method @org.jetbrains.annotations.TestOnly public static boolean isPopupLayout(android.view.View view, optional String? testTag);
+ }
+
+ @androidx.compose.runtime.Immutable public final class DialogProperties {
+ ctor public DialogProperties(optional boolean dismissOnBackPress, optional boolean dismissOnClickOutside, optional androidx.compose.ui.window.SecureFlagPolicy securePolicy);
+ method public boolean getDismissOnBackPress();
+ method public boolean getDismissOnClickOutside();
+ method public androidx.compose.ui.window.SecureFlagPolicy getSecurePolicy();
+ property public final boolean dismissOnBackPress;
+ property public final boolean dismissOnClickOutside;
+ property public final androidx.compose.ui.window.SecureFlagPolicy securePolicy;
+ }
+
+ public interface DialogWindowProvider {
+ method public android.view.Window getWindow();
+ property public abstract android.view.Window window;
+ }
+
+ @androidx.compose.runtime.Immutable public interface PopupPositionProvider {
+ method public long calculatePosition(androidx.compose.ui.unit.IntRect anchorBounds, long windowSize, androidx.compose.ui.unit.LayoutDirection layoutDirection, long popupContentSize);
+ }
+
+ @androidx.compose.runtime.Immutable public final class PopupProperties {
+ ctor public PopupProperties(optional boolean focusable, optional boolean dismissOnBackPress, optional boolean dismissOnClickOutside, optional androidx.compose.ui.window.SecureFlagPolicy securePolicy, optional boolean excludeFromSystemGesture, optional boolean clippingEnabled);
+ method public boolean getClippingEnabled();
+ method public boolean getDismissOnBackPress();
+ method public boolean getDismissOnClickOutside();
+ method public boolean getExcludeFromSystemGesture();
+ method public boolean getFocusable();
+ method public androidx.compose.ui.window.SecureFlagPolicy getSecurePolicy();
+ property public final boolean clippingEnabled;
+ property public final boolean dismissOnBackPress;
+ property public final boolean dismissOnClickOutside;
+ property public final boolean excludeFromSystemGesture;
+ property public final boolean focusable;
+ property public final androidx.compose.ui.window.SecureFlagPolicy securePolicy;
+ }
+
+ public enum SecureFlagPolicy {
+ enum_constant public static final androidx.compose.ui.window.SecureFlagPolicy Inherit;
+ enum_constant public static final androidx.compose.ui.window.SecureFlagPolicy SecureOff;
+ enum_constant public static final androidx.compose.ui.window.SecureFlagPolicy SecureOn;
+ }
+
+ public final class SecureFlagPolicy_androidKt {
+ }
+
+}
+
diff --git a/compose/ui/ui/api/current.txt b/compose/ui/ui/api/current.txt
index 79e85e0..1b79ed2 100644
--- a/compose/ui/ui/api/current.txt
+++ b/compose/ui/ui/api/current.txt
@@ -2477,9 +2477,9 @@
field public static final androidx.compose.ui.platform.ViewCompositionStrategy.DisposeOnDetachedFromWindow INSTANCE;
}
- public static final class ViewCompositionStrategy.DisposeOnDetachedFromWindowIfNotInPoolingContainer implements androidx.compose.ui.platform.ViewCompositionStrategy {
+ public static final class ViewCompositionStrategy.DisposeOnDetachedFromWindowOrReleasedFromPool implements androidx.compose.ui.platform.ViewCompositionStrategy {
method public kotlin.jvm.functions.Function0<kotlin.Unit> installFor(androidx.compose.ui.platform.AbstractComposeView view);
- field public static final androidx.compose.ui.platform.ViewCompositionStrategy.DisposeOnDetachedFromWindowIfNotInPoolingContainer INSTANCE;
+ field public static final androidx.compose.ui.platform.ViewCompositionStrategy.DisposeOnDetachedFromWindowOrReleasedFromPool INSTANCE;
}
public static final class ViewCompositionStrategy.DisposeOnLifecycleDestroyed implements androidx.compose.ui.platform.ViewCompositionStrategy {
diff --git a/compose/ui/ui/api/public_plus_experimental_1.2.0-beta01.txt b/compose/ui/ui/api/public_plus_experimental_1.2.0-beta01.txt
index 858bbc4..bd011af 100644
--- a/compose/ui/ui/api/public_plus_experimental_1.2.0-beta01.txt
+++ b/compose/ui/ui/api/public_plus_experimental_1.2.0-beta01.txt
@@ -2649,9 +2649,9 @@
field public static final androidx.compose.ui.platform.ViewCompositionStrategy.DisposeOnDetachedFromWindow INSTANCE;
}
- public static final class ViewCompositionStrategy.DisposeOnDetachedFromWindowIfNotInPoolingContainer implements androidx.compose.ui.platform.ViewCompositionStrategy {
+ public static final class ViewCompositionStrategy.DisposeOnDetachedFromWindowOrReleasedFromPool implements androidx.compose.ui.platform.ViewCompositionStrategy {
method public kotlin.jvm.functions.Function0<kotlin.Unit> installFor(androidx.compose.ui.platform.AbstractComposeView view);
- field public static final androidx.compose.ui.platform.ViewCompositionStrategy.DisposeOnDetachedFromWindowIfNotInPoolingContainer INSTANCE;
+ field public static final androidx.compose.ui.platform.ViewCompositionStrategy.DisposeOnDetachedFromWindowOrReleasedFromPool INSTANCE;
}
public static final class ViewCompositionStrategy.DisposeOnLifecycleDestroyed implements androidx.compose.ui.platform.ViewCompositionStrategy {
diff --git a/compose/ui/ui/api/public_plus_experimental_1.2.0-beta02.txt b/compose/ui/ui/api/public_plus_experimental_1.2.0-beta02.txt
new file mode 100644
index 0000000..bd011af
--- /dev/null
+++ b/compose/ui/ui/api/public_plus_experimental_1.2.0-beta02.txt
@@ -0,0 +1,3266 @@
+// Signature format: 4.0
+package androidx.compose.ui {
+
+ public final class AbsoluteAlignment {
+ method public androidx.compose.ui.Alignment getBottomLeft();
+ method public androidx.compose.ui.Alignment getBottomRight();
+ method public androidx.compose.ui.Alignment getCenterLeft();
+ method public androidx.compose.ui.Alignment getCenterRight();
+ method public androidx.compose.ui.Alignment.Horizontal getLeft();
+ method public androidx.compose.ui.Alignment.Horizontal getRight();
+ method public androidx.compose.ui.Alignment getTopLeft();
+ method public androidx.compose.ui.Alignment getTopRight();
+ property public final androidx.compose.ui.Alignment BottomLeft;
+ property public final androidx.compose.ui.Alignment BottomRight;
+ property public final androidx.compose.ui.Alignment CenterLeft;
+ property public final androidx.compose.ui.Alignment CenterRight;
+ property public final androidx.compose.ui.Alignment.Horizontal Left;
+ property public final androidx.compose.ui.Alignment.Horizontal Right;
+ property public final androidx.compose.ui.Alignment TopLeft;
+ property public final androidx.compose.ui.Alignment TopRight;
+ field public static final androidx.compose.ui.AbsoluteAlignment INSTANCE;
+ }
+
+ @androidx.compose.runtime.Stable public fun interface Alignment {
+ method public long align(long size, long space, androidx.compose.ui.unit.LayoutDirection layoutDirection);
+ field public static final androidx.compose.ui.Alignment.Companion Companion;
+ }
+
+ public static final class Alignment.Companion {
+ method public androidx.compose.ui.Alignment.Vertical getBottom();
+ method public androidx.compose.ui.Alignment getBottomCenter();
+ method public androidx.compose.ui.Alignment getBottomEnd();
+ method public androidx.compose.ui.Alignment getBottomStart();
+ method public androidx.compose.ui.Alignment getCenter();
+ method public androidx.compose.ui.Alignment getCenterEnd();
+ method public androidx.compose.ui.Alignment.Horizontal getCenterHorizontally();
+ method public androidx.compose.ui.Alignment getCenterStart();
+ method public androidx.compose.ui.Alignment.Vertical getCenterVertically();
+ method public androidx.compose.ui.Alignment.Horizontal getEnd();
+ method public androidx.compose.ui.Alignment.Horizontal getStart();
+ method public androidx.compose.ui.Alignment.Vertical getTop();
+ method public androidx.compose.ui.Alignment getTopCenter();
+ method public androidx.compose.ui.Alignment getTopEnd();
+ method public androidx.compose.ui.Alignment getTopStart();
+ property public final androidx.compose.ui.Alignment.Vertical Bottom;
+ property public final androidx.compose.ui.Alignment BottomCenter;
+ property public final androidx.compose.ui.Alignment BottomEnd;
+ property public final androidx.compose.ui.Alignment BottomStart;
+ property public final androidx.compose.ui.Alignment Center;
+ property public final androidx.compose.ui.Alignment CenterEnd;
+ property public final androidx.compose.ui.Alignment.Horizontal CenterHorizontally;
+ property public final androidx.compose.ui.Alignment CenterStart;
+ property public final androidx.compose.ui.Alignment.Vertical CenterVertically;
+ property public final androidx.compose.ui.Alignment.Horizontal End;
+ property public final androidx.compose.ui.Alignment.Horizontal Start;
+ property public final androidx.compose.ui.Alignment.Vertical Top;
+ property public final androidx.compose.ui.Alignment TopCenter;
+ property public final androidx.compose.ui.Alignment TopEnd;
+ property public final androidx.compose.ui.Alignment TopStart;
+ }
+
+ @androidx.compose.runtime.Stable public static fun interface Alignment.Horizontal {
+ method public int align(int size, int space, androidx.compose.ui.unit.LayoutDirection layoutDirection);
+ }
+
+ @androidx.compose.runtime.Stable public static fun interface Alignment.Vertical {
+ method public int align(int size, int space);
+ }
+
+ @androidx.compose.runtime.Immutable public final class BiasAbsoluteAlignment implements androidx.compose.ui.Alignment {
+ ctor public BiasAbsoluteAlignment(float horizontalBias, float verticalBias);
+ method public long align(long size, long space, androidx.compose.ui.unit.LayoutDirection layoutDirection);
+ method public androidx.compose.ui.BiasAbsoluteAlignment copy(float horizontalBias, float verticalBias);
+ }
+
+ @androidx.compose.runtime.Immutable public static final class BiasAbsoluteAlignment.Horizontal implements androidx.compose.ui.Alignment.Horizontal {
+ ctor public BiasAbsoluteAlignment.Horizontal(float bias);
+ method public int align(int size, int space, androidx.compose.ui.unit.LayoutDirection layoutDirection);
+ method public androidx.compose.ui.BiasAbsoluteAlignment.Horizontal copy(float bias);
+ }
+
+ @androidx.compose.runtime.Immutable public final class BiasAlignment implements androidx.compose.ui.Alignment {
+ ctor public BiasAlignment(float horizontalBias, float verticalBias);
+ method public long align(long size, long space, androidx.compose.ui.unit.LayoutDirection layoutDirection);
+ method public float component1();
+ method public float component2();
+ method public androidx.compose.ui.BiasAlignment copy(float horizontalBias, float verticalBias);
+ method public float getHorizontalBias();
+ method public float getVerticalBias();
+ property public final float horizontalBias;
+ property public final float verticalBias;
+ }
+
+ @androidx.compose.runtime.Immutable public static final class BiasAlignment.Horizontal implements androidx.compose.ui.Alignment.Horizontal {
+ ctor public BiasAlignment.Horizontal(float bias);
+ method public int align(int size, int space, androidx.compose.ui.unit.LayoutDirection layoutDirection);
+ method public androidx.compose.ui.BiasAlignment.Horizontal copy(float bias);
+ }
+
+ @androidx.compose.runtime.Immutable public static final class BiasAlignment.Vertical implements androidx.compose.ui.Alignment.Vertical {
+ ctor public BiasAlignment.Vertical(float bias);
+ method public int align(int size, int space);
+ method public androidx.compose.ui.BiasAlignment.Vertical copy(float bias);
+ }
+
+ public final class CombinedModifier implements androidx.compose.ui.Modifier {
+ ctor public CombinedModifier(androidx.compose.ui.Modifier outer, androidx.compose.ui.Modifier inner);
+ method public boolean all(kotlin.jvm.functions.Function1<? super androidx.compose.ui.Modifier.Element,java.lang.Boolean> predicate);
+ method public boolean any(kotlin.jvm.functions.Function1<? super androidx.compose.ui.Modifier.Element,java.lang.Boolean> predicate);
+ method public <R> R! foldIn(R? initial, kotlin.jvm.functions.Function2<? super R,? super androidx.compose.ui.Modifier.Element,? extends R> operation);
+ method public <R> R! foldOut(R? initial, kotlin.jvm.functions.Function2<? super androidx.compose.ui.Modifier.Element,? super R,? extends R> operation);
+ }
+
+ public final class ComposedModifierKt {
+ method public static androidx.compose.ui.Modifier composed(androidx.compose.ui.Modifier, optional kotlin.jvm.functions.Function1<? super androidx.compose.ui.platform.InspectorInfo,kotlin.Unit> inspectorInfo, kotlin.jvm.functions.Function1<? super androidx.compose.ui.Modifier,? extends androidx.compose.ui.Modifier> factory);
+ method public static androidx.compose.ui.Modifier composed(androidx.compose.ui.Modifier, String fullyQualifiedName, Object? key1, optional kotlin.jvm.functions.Function1<? super androidx.compose.ui.platform.InspectorInfo,kotlin.Unit> inspectorInfo, kotlin.jvm.functions.Function1<? super androidx.compose.ui.Modifier,? extends androidx.compose.ui.Modifier> factory);
+ method public static androidx.compose.ui.Modifier composed(androidx.compose.ui.Modifier, String fullyQualifiedName, Object? key1, Object? key2, optional kotlin.jvm.functions.Function1<? super androidx.compose.ui.platform.InspectorInfo,kotlin.Unit> inspectorInfo, kotlin.jvm.functions.Function1<? super androidx.compose.ui.Modifier,? extends androidx.compose.ui.Modifier> factory);
+ method public static androidx.compose.ui.Modifier composed(androidx.compose.ui.Modifier, String fullyQualifiedName, Object? key1, Object? key2, Object? key3, optional kotlin.jvm.functions.Function1<? super androidx.compose.ui.platform.InspectorInfo,kotlin.Unit> inspectorInfo, kotlin.jvm.functions.Function1<? super androidx.compose.ui.Modifier,? extends androidx.compose.ui.Modifier> factory);
+ method public static androidx.compose.ui.Modifier composed(androidx.compose.ui.Modifier, String fullyQualifiedName, Object![]? keys, optional kotlin.jvm.functions.Function1<? super androidx.compose.ui.platform.InspectorInfo,kotlin.Unit> inspectorInfo, kotlin.jvm.functions.Function1<? super androidx.compose.ui.Modifier,? extends androidx.compose.ui.Modifier> factory);
+ method public static androidx.compose.ui.Modifier materialize(androidx.compose.runtime.Composer, androidx.compose.ui.Modifier modifier);
+ }
+
+ @kotlin.RequiresOptIn(message="This API is experimental and is likely to change in the future.") public @interface ExperimentalComposeUiApi {
+ }
+
+ @kotlin.RequiresOptIn(message="Unstable API for use only between compose-ui modules sharing the same exact version, " + "subject to change without notice in major, minor, or patch releases.") public @interface InternalComposeUiApi {
+ }
+
+ @androidx.compose.runtime.Stable public interface Modifier {
+ method public boolean all(kotlin.jvm.functions.Function1<? super androidx.compose.ui.Modifier.Element,java.lang.Boolean> predicate);
+ method public boolean any(kotlin.jvm.functions.Function1<? super androidx.compose.ui.Modifier.Element,java.lang.Boolean> predicate);
+ method public <R> R! foldIn(R? initial, kotlin.jvm.functions.Function2<? super R,? super androidx.compose.ui.Modifier.Element,? extends R> operation);
+ method public <R> R! foldOut(R? initial, kotlin.jvm.functions.Function2<? super androidx.compose.ui.Modifier.Element,? super R,? extends R> operation);
+ method public default infix androidx.compose.ui.Modifier then(androidx.compose.ui.Modifier other);
+ field public static final androidx.compose.ui.Modifier.Companion Companion;
+ }
+
+ public static final class Modifier.Companion implements androidx.compose.ui.Modifier {
+ method public boolean all(kotlin.jvm.functions.Function1<? super androidx.compose.ui.Modifier.Element,java.lang.Boolean> predicate);
+ method public boolean any(kotlin.jvm.functions.Function1<? super androidx.compose.ui.Modifier.Element,java.lang.Boolean> predicate);
+ method public <R> R! foldIn(R? initial, kotlin.jvm.functions.Function2<? super R,? super androidx.compose.ui.Modifier.Element,? extends R> operation);
+ method public <R> R! foldOut(R? initial, kotlin.jvm.functions.Function2<? super androidx.compose.ui.Modifier.Element,? super R,? extends R> operation);
+ }
+
+ public static interface Modifier.Element extends androidx.compose.ui.Modifier {
+ method public default boolean all(kotlin.jvm.functions.Function1<? super androidx.compose.ui.Modifier.Element,java.lang.Boolean> predicate);
+ method public default boolean any(kotlin.jvm.functions.Function1<? super androidx.compose.ui.Modifier.Element,java.lang.Boolean> predicate);
+ method public default <R> R! foldIn(R? initial, kotlin.jvm.functions.Function2<? super R,? super androidx.compose.ui.Modifier.Element,? extends R> operation);
+ method public default <R> R! foldOut(R? initial, kotlin.jvm.functions.Function2<? super androidx.compose.ui.Modifier.Element,? super R,? extends R> operation);
+ }
+
+ @androidx.compose.runtime.Stable public interface MotionDurationScale extends kotlin.coroutines.CoroutineContext.Element {
+ method public default kotlin.coroutines.CoroutineContext.Key<?> getKey();
+ method public float getScaleFactor();
+ property public default kotlin.coroutines.CoroutineContext.Key<?> key;
+ property public abstract float scaleFactor;
+ field public static final androidx.compose.ui.MotionDurationScale.Key Key;
+ }
+
+ public static final class MotionDurationScale.Key implements kotlin.coroutines.CoroutineContext.Key<androidx.compose.ui.MotionDurationScale> {
+ }
+
+ public final class TempListUtilsKt {
+ }
+
+ @androidx.compose.runtime.ComposableTargetMarker(description="UI Composable") @kotlin.annotation.Retention(kotlin.annotation.AnnotationRetention.BINARY) @kotlin.annotation.Target(allowedTargets={kotlin.annotation.AnnotationTarget.FILE, kotlin.annotation.AnnotationTarget.FUNCTION, kotlin.annotation.AnnotationTarget.PROPERTY_GETTER, kotlin.annotation.AnnotationTarget.TYPE, kotlin.annotation.AnnotationTarget.TYPE_PARAMETER}) public @interface UiComposable {
+ }
+
+ public final class ZIndexModifierKt {
+ method @androidx.compose.runtime.Stable public static androidx.compose.ui.Modifier zIndex(androidx.compose.ui.Modifier, float zIndex);
+ }
+
+}
+
+package androidx.compose.ui.autofill {
+
+ public final class AndroidAutofillType_androidKt {
+ }
+
+ public final class AndroidAutofill_androidKt {
+ }
+
+ @androidx.compose.ui.ExperimentalComposeUiApi public interface Autofill {
+ method public void cancelAutofillForNode(androidx.compose.ui.autofill.AutofillNode autofillNode);
+ method public void requestAutofillForNode(androidx.compose.ui.autofill.AutofillNode autofillNode);
+ }
+
+ @androidx.compose.ui.ExperimentalComposeUiApi public final class AutofillNode {
+ ctor public AutofillNode(optional java.util.List<? extends androidx.compose.ui.autofill.AutofillType> autofillTypes, optional androidx.compose.ui.geometry.Rect? boundingBox, kotlin.jvm.functions.Function1<? super java.lang.String,kotlin.Unit>? onFill);
+ method public java.util.List<androidx.compose.ui.autofill.AutofillType> getAutofillTypes();
+ method public androidx.compose.ui.geometry.Rect? getBoundingBox();
+ method public int getId();
+ method public kotlin.jvm.functions.Function1<java.lang.String,kotlin.Unit>? getOnFill();
+ method public void setBoundingBox(androidx.compose.ui.geometry.Rect?);
+ property public final java.util.List<androidx.compose.ui.autofill.AutofillType> autofillTypes;
+ property public final androidx.compose.ui.geometry.Rect? boundingBox;
+ property public final int id;
+ property public final kotlin.jvm.functions.Function1<java.lang.String,kotlin.Unit>? onFill;
+ }
+
+ @androidx.compose.ui.ExperimentalComposeUiApi public final class AutofillTree {
+ ctor public AutofillTree();
+ method public java.util.Map<java.lang.Integer,androidx.compose.ui.autofill.AutofillNode> getChildren();
+ method public kotlin.Unit? performAutofill(int id, String value);
+ method public operator void plusAssign(androidx.compose.ui.autofill.AutofillNode autofillNode);
+ property public final java.util.Map<java.lang.Integer,androidx.compose.ui.autofill.AutofillNode> children;
+ }
+
+ @androidx.compose.ui.ExperimentalComposeUiApi public enum AutofillType {
+ enum_constant public static final androidx.compose.ui.autofill.AutofillType AddressAuxiliaryDetails;
+ enum_constant public static final androidx.compose.ui.autofill.AutofillType AddressCountry;
+ enum_constant public static final androidx.compose.ui.autofill.AutofillType AddressLocality;
+ enum_constant public static final androidx.compose.ui.autofill.AutofillType AddressRegion;
+ enum_constant public static final androidx.compose.ui.autofill.AutofillType AddressStreet;
+ enum_constant public static final androidx.compose.ui.autofill.AutofillType BirthDateDay;
+ enum_constant public static final androidx.compose.ui.autofill.AutofillType BirthDateFull;
+ enum_constant public static final androidx.compose.ui.autofill.AutofillType BirthDateMonth;
+ enum_constant public static final androidx.compose.ui.autofill.AutofillType BirthDateYear;
+ enum_constant public static final androidx.compose.ui.autofill.AutofillType CreditCardExpirationDate;
+ enum_constant public static final androidx.compose.ui.autofill.AutofillType CreditCardExpirationDay;
+ enum_constant public static final androidx.compose.ui.autofill.AutofillType CreditCardExpirationMonth;
+ enum_constant public static final androidx.compose.ui.autofill.AutofillType CreditCardExpirationYear;
+ enum_constant public static final androidx.compose.ui.autofill.AutofillType CreditCardNumber;
+ enum_constant public static final androidx.compose.ui.autofill.AutofillType CreditCardSecurityCode;
+ enum_constant public static final androidx.compose.ui.autofill.AutofillType EmailAddress;
+ enum_constant public static final androidx.compose.ui.autofill.AutofillType Gender;
+ enum_constant public static final androidx.compose.ui.autofill.AutofillType NewPassword;
+ enum_constant public static final androidx.compose.ui.autofill.AutofillType NewUsername;
+ enum_constant public static final androidx.compose.ui.autofill.AutofillType Password;
+ enum_constant public static final androidx.compose.ui.autofill.AutofillType PersonFirstName;
+ enum_constant public static final androidx.compose.ui.autofill.AutofillType PersonFullName;
+ enum_constant public static final androidx.compose.ui.autofill.AutofillType PersonLastName;
+ enum_constant public static final androidx.compose.ui.autofill.AutofillType PersonMiddleInitial;
+ enum_constant public static final androidx.compose.ui.autofill.AutofillType PersonMiddleName;
+ enum_constant public static final androidx.compose.ui.autofill.AutofillType PersonNamePrefix;
+ enum_constant public static final androidx.compose.ui.autofill.AutofillType PersonNameSuffix;
+ enum_constant public static final androidx.compose.ui.autofill.AutofillType PhoneCountryCode;
+ enum_constant public static final androidx.compose.ui.autofill.AutofillType PhoneNumber;
+ enum_constant public static final androidx.compose.ui.autofill.AutofillType PhoneNumberDevice;
+ enum_constant public static final androidx.compose.ui.autofill.AutofillType PhoneNumberNational;
+ enum_constant public static final androidx.compose.ui.autofill.AutofillType PostalAddress;
+ enum_constant public static final androidx.compose.ui.autofill.AutofillType PostalCode;
+ enum_constant public static final androidx.compose.ui.autofill.AutofillType PostalCodeExtended;
+ enum_constant public static final androidx.compose.ui.autofill.AutofillType SmsOtpCode;
+ enum_constant public static final androidx.compose.ui.autofill.AutofillType Username;
+ }
+
+}
+
+package androidx.compose.ui.draw {
+
+ public final class AlphaKt {
+ method @androidx.compose.runtime.Stable public static androidx.compose.ui.Modifier alpha(androidx.compose.ui.Modifier, float alpha);
+ }
+
+ public final class BlurKt {
+ method @androidx.compose.runtime.Stable public static androidx.compose.ui.Modifier blur(androidx.compose.ui.Modifier, float radiusX, float radiusY, optional androidx.compose.ui.graphics.Shape edgeTreatment);
+ method @androidx.compose.runtime.Stable public static androidx.compose.ui.Modifier blur(androidx.compose.ui.Modifier, float radius, optional androidx.compose.ui.graphics.Shape edgeTreatment);
+ }
+
+ @androidx.compose.runtime.Immutable @kotlin.jvm.JvmInline public final value class BlurredEdgeTreatment {
+ ctor public BlurredEdgeTreatment(androidx.compose.ui.graphics.Shape? shape);
+ method public androidx.compose.ui.graphics.Shape? getShape();
+ property public final androidx.compose.ui.graphics.Shape? shape;
+ field public static final androidx.compose.ui.draw.BlurredEdgeTreatment.Companion Companion;
+ }
+
+ public static final class BlurredEdgeTreatment.Companion {
+ method public androidx.compose.ui.graphics.Shape getRectangle();
+ method public androidx.compose.ui.graphics.Shape getUnbounded();
+ property public final androidx.compose.ui.graphics.Shape Rectangle;
+ property public final androidx.compose.ui.graphics.Shape Unbounded;
+ }
+
+ public interface BuildDrawCacheParams {
+ method public androidx.compose.ui.unit.Density getDensity();
+ method public androidx.compose.ui.unit.LayoutDirection getLayoutDirection();
+ method public long getSize();
+ property public abstract androidx.compose.ui.unit.Density density;
+ property public abstract androidx.compose.ui.unit.LayoutDirection layoutDirection;
+ property public abstract long size;
+ }
+
+ public final class CacheDrawScope implements androidx.compose.ui.unit.Density {
+ method public float getDensity();
+ method public float getFontScale();
+ method public androidx.compose.ui.unit.LayoutDirection getLayoutDirection();
+ method public long getSize();
+ method public androidx.compose.ui.draw.DrawResult onDrawBehind(kotlin.jvm.functions.Function1<? super androidx.compose.ui.graphics.drawscope.DrawScope,kotlin.Unit> block);
+ method public androidx.compose.ui.draw.DrawResult onDrawWithContent(kotlin.jvm.functions.Function1<? super androidx.compose.ui.graphics.drawscope.ContentDrawScope,kotlin.Unit> block);
+ property public float density;
+ property public float fontScale;
+ property public final androidx.compose.ui.unit.LayoutDirection layoutDirection;
+ property public final long size;
+ }
+
+ public final class ClipKt {
+ method @androidx.compose.runtime.Stable public static androidx.compose.ui.Modifier clip(androidx.compose.ui.Modifier, androidx.compose.ui.graphics.Shape shape);
+ method @androidx.compose.runtime.Stable public static androidx.compose.ui.Modifier clipToBounds(androidx.compose.ui.Modifier);
+ }
+
+ public interface DrawCacheModifier extends androidx.compose.ui.draw.DrawModifier {
+ method public void onBuildCache(androidx.compose.ui.draw.BuildDrawCacheParams params);
+ }
+
+ public interface DrawModifier extends androidx.compose.ui.Modifier.Element {
+ method public void draw(androidx.compose.ui.graphics.drawscope.ContentDrawScope);
+ }
+
+ public final class DrawModifierKt {
+ method public static androidx.compose.ui.Modifier drawBehind(androidx.compose.ui.Modifier, kotlin.jvm.functions.Function1<? super androidx.compose.ui.graphics.drawscope.DrawScope,kotlin.Unit> onDraw);
+ method public static androidx.compose.ui.Modifier drawWithCache(androidx.compose.ui.Modifier, kotlin.jvm.functions.Function1<? super androidx.compose.ui.draw.CacheDrawScope,androidx.compose.ui.draw.DrawResult> onBuildDrawCache);
+ method public static androidx.compose.ui.Modifier drawWithContent(androidx.compose.ui.Modifier, kotlin.jvm.functions.Function1<? super androidx.compose.ui.graphics.drawscope.ContentDrawScope,kotlin.Unit> onDraw);
+ }
+
+ public final class DrawResult {
+ }
+
+ public final class PainterModifierKt {
+ method public static androidx.compose.ui.Modifier paint(androidx.compose.ui.Modifier, androidx.compose.ui.graphics.painter.Painter painter, optional boolean sizeToIntrinsics, optional androidx.compose.ui.Alignment alignment, optional androidx.compose.ui.layout.ContentScale contentScale, optional float alpha, optional androidx.compose.ui.graphics.ColorFilter? colorFilter);
+ }
+
+ public final class RotateKt {
+ method @androidx.compose.runtime.Stable public static androidx.compose.ui.Modifier rotate(androidx.compose.ui.Modifier, float degrees);
+ }
+
+ public final class ScaleKt {
+ method @androidx.compose.runtime.Stable public static androidx.compose.ui.Modifier scale(androidx.compose.ui.Modifier, float scaleX, float scaleY);
+ method @androidx.compose.runtime.Stable public static androidx.compose.ui.Modifier scale(androidx.compose.ui.Modifier, float scale);
+ }
+
+ public final class ShadowKt {
+ method @androidx.compose.runtime.Stable public static androidx.compose.ui.Modifier shadow(androidx.compose.ui.Modifier, float elevation, optional androidx.compose.ui.graphics.Shape shape, optional boolean clip, optional long ambientColor, optional long spotColor);
+ method @Deprecated @androidx.compose.runtime.Stable public static androidx.compose.ui.Modifier! shadow(androidx.compose.ui.Modifier, float elevation, optional androidx.compose.ui.graphics.Shape shape, optional boolean clip);
+ }
+
+}
+
+package androidx.compose.ui.focus {
+
+ public final class BeyondBoundsLayoutKt {
+ }
+
+ public final class FocusChangedModifierKt {
+ method public static androidx.compose.ui.Modifier onFocusChanged(androidx.compose.ui.Modifier, kotlin.jvm.functions.Function1<? super androidx.compose.ui.focus.FocusState,kotlin.Unit> onFocusChanged);
+ }
+
+ @kotlin.jvm.JvmInline public final value class FocusDirection {
+ field public static final androidx.compose.ui.focus.FocusDirection.Companion Companion;
+ }
+
+ public static final class FocusDirection.Companion {
+ method public int getDown();
+ method public int getIn();
+ method public int getLeft();
+ method public int getNext();
+ method public int getOut();
+ method public int getPrevious();
+ method public int getRight();
+ method public int getUp();
+ property public final int Down;
+ property public final int In;
+ property public final int Left;
+ property public final int Next;
+ property public final int Out;
+ property public final int Previous;
+ property public final int Right;
+ property public final int Up;
+ }
+
+ public interface FocusEventModifier extends androidx.compose.ui.Modifier.Element {
+ method public void onFocusEvent(androidx.compose.ui.focus.FocusState focusState);
+ }
+
+ public final class FocusEventModifierKt {
+ method public static androidx.compose.ui.Modifier onFocusEvent(androidx.compose.ui.Modifier, kotlin.jvm.functions.Function1<? super androidx.compose.ui.focus.FocusState,kotlin.Unit> onFocusEvent);
+ }
+
+ public interface FocusManager {
+ method public void clearFocus(optional boolean force);
+ method public boolean moveFocus(int focusDirection);
+ }
+
+ public final class FocusManagerKt {
+ }
+
+ public final class FocusModifierKt {
+ method @Deprecated public static androidx.compose.ui.Modifier focusModifier(androidx.compose.ui.Modifier);
+ method public static androidx.compose.ui.Modifier focusTarget(androidx.compose.ui.Modifier);
+ }
+
+ @Deprecated public final class FocusOrder {
+ ctor @Deprecated public FocusOrder();
+ method @Deprecated public androidx.compose.ui.focus.FocusRequester getDown();
+ method @Deprecated public androidx.compose.ui.focus.FocusRequester getEnd();
+ method @Deprecated public androidx.compose.ui.focus.FocusRequester getLeft();
+ method @Deprecated public androidx.compose.ui.focus.FocusRequester getNext();
+ method @Deprecated public androidx.compose.ui.focus.FocusRequester getPrevious();
+ method @Deprecated public androidx.compose.ui.focus.FocusRequester getRight();
+ method @Deprecated public androidx.compose.ui.focus.FocusRequester getStart();
+ method @Deprecated public androidx.compose.ui.focus.FocusRequester getUp();
+ method @Deprecated public void setDown(androidx.compose.ui.focus.FocusRequester);
+ method @Deprecated public void setEnd(androidx.compose.ui.focus.FocusRequester);
+ method @Deprecated public void setLeft(androidx.compose.ui.focus.FocusRequester);
+ method @Deprecated public void setNext(androidx.compose.ui.focus.FocusRequester);
+ method @Deprecated public void setPrevious(androidx.compose.ui.focus.FocusRequester);
+ method @Deprecated public void setRight(androidx.compose.ui.focus.FocusRequester);
+ method @Deprecated public void setStart(androidx.compose.ui.focus.FocusRequester);
+ method @Deprecated public void setUp(androidx.compose.ui.focus.FocusRequester);
+ property public final androidx.compose.ui.focus.FocusRequester down;
+ property public final androidx.compose.ui.focus.FocusRequester end;
+ property public final androidx.compose.ui.focus.FocusRequester left;
+ property public final androidx.compose.ui.focus.FocusRequester next;
+ property public final androidx.compose.ui.focus.FocusRequester previous;
+ property public final androidx.compose.ui.focus.FocusRequester right;
+ property public final androidx.compose.ui.focus.FocusRequester start;
+ property public final androidx.compose.ui.focus.FocusRequester up;
+ }
+
+ @Deprecated public interface FocusOrderModifier extends androidx.compose.ui.Modifier.Element {
+ method @Deprecated public void populateFocusOrder(androidx.compose.ui.focus.FocusOrder focusOrder);
+ }
+
+ public final class FocusOrderModifierKt {
+ method @Deprecated public static androidx.compose.ui.Modifier focusOrder(androidx.compose.ui.Modifier, kotlin.jvm.functions.Function1<? super androidx.compose.ui.focus.FocusOrder,kotlin.Unit> focusOrderReceiver);
+ method @Deprecated public static androidx.compose.ui.Modifier focusOrder(androidx.compose.ui.Modifier, androidx.compose.ui.focus.FocusRequester focusRequester);
+ method @Deprecated public static androidx.compose.ui.Modifier focusOrder(androidx.compose.ui.Modifier, androidx.compose.ui.focus.FocusRequester focusRequester, kotlin.jvm.functions.Function1<? super androidx.compose.ui.focus.FocusOrder,kotlin.Unit> focusOrderReceiver);
+ }
+
+ public interface FocusProperties {
+ method public boolean getCanFocus();
+ method public default androidx.compose.ui.focus.FocusRequester getDown();
+ method public default androidx.compose.ui.focus.FocusRequester getEnd();
+ method public default androidx.compose.ui.focus.FocusRequester getLeft();
+ method public default androidx.compose.ui.focus.FocusRequester getNext();
+ method public default androidx.compose.ui.focus.FocusRequester getPrevious();
+ method public default androidx.compose.ui.focus.FocusRequester getRight();
+ method public default androidx.compose.ui.focus.FocusRequester getStart();
+ method public default androidx.compose.ui.focus.FocusRequester getUp();
+ method public void setCanFocus(boolean);
+ method public default void setDown(androidx.compose.ui.focus.FocusRequester);
+ method public default void setEnd(androidx.compose.ui.focus.FocusRequester);
+ method public default void setLeft(androidx.compose.ui.focus.FocusRequester);
+ method public default void setNext(androidx.compose.ui.focus.FocusRequester);
+ method public default void setPrevious(androidx.compose.ui.focus.FocusRequester);
+ method public default void setRight(androidx.compose.ui.focus.FocusRequester);
+ method public default void setStart(androidx.compose.ui.focus.FocusRequester);
+ method public default void setUp(androidx.compose.ui.focus.FocusRequester);
+ property public abstract boolean canFocus;
+ property public default androidx.compose.ui.focus.FocusRequester down;
+ property public default androidx.compose.ui.focus.FocusRequester end;
+ property public default androidx.compose.ui.focus.FocusRequester left;
+ property public default androidx.compose.ui.focus.FocusRequester next;
+ property public default androidx.compose.ui.focus.FocusRequester previous;
+ property public default androidx.compose.ui.focus.FocusRequester right;
+ property public default androidx.compose.ui.focus.FocusRequester start;
+ property public default androidx.compose.ui.focus.FocusRequester up;
+ }
+
+ public final class FocusPropertiesKt {
+ method public static androidx.compose.ui.Modifier focusProperties(androidx.compose.ui.Modifier, kotlin.jvm.functions.Function1<? super androidx.compose.ui.focus.FocusProperties,kotlin.Unit> scope);
+ }
+
+ public final class FocusRequester {
+ ctor public FocusRequester();
+ method public boolean captureFocus();
+ method public boolean freeFocus();
+ method public void requestFocus();
+ field public static final androidx.compose.ui.focus.FocusRequester.Companion Companion;
+ }
+
+ public static final class FocusRequester.Companion {
+ method @androidx.compose.ui.ExperimentalComposeUiApi public androidx.compose.ui.focus.FocusRequester.Companion.FocusRequesterFactory createRefs();
+ method public androidx.compose.ui.focus.FocusRequester getDefault();
+ property public final androidx.compose.ui.focus.FocusRequester Default;
+ }
+
+ @androidx.compose.ui.ExperimentalComposeUiApi public static final class FocusRequester.Companion.FocusRequesterFactory {
+ method public operator androidx.compose.ui.focus.FocusRequester component1();
+ method public operator androidx.compose.ui.focus.FocusRequester component10();
+ method public operator androidx.compose.ui.focus.FocusRequester component11();
+ method public operator androidx.compose.ui.focus.FocusRequester component12();
+ method public operator androidx.compose.ui.focus.FocusRequester component13();
+ method public operator androidx.compose.ui.focus.FocusRequester component14();
+ method public operator androidx.compose.ui.focus.FocusRequester component15();
+ method public operator androidx.compose.ui.focus.FocusRequester component16();
+ method public operator androidx.compose.ui.focus.FocusRequester component2();
+ method public operator androidx.compose.ui.focus.FocusRequester component3();
+ method public operator androidx.compose.ui.focus.FocusRequester component4();
+ method public operator androidx.compose.ui.focus.FocusRequester component5();
+ method public operator androidx.compose.ui.focus.FocusRequester component6();
+ method public operator androidx.compose.ui.focus.FocusRequester component7();
+ method public operator androidx.compose.ui.focus.FocusRequester component8();
+ method public operator androidx.compose.ui.focus.FocusRequester component9();
+ field public static final androidx.compose.ui.focus.FocusRequester.Companion.FocusRequesterFactory INSTANCE;
+ }
+
+ public final class FocusRequesterKt {
+ }
+
+ public interface FocusRequesterModifier extends androidx.compose.ui.Modifier.Element {
+ method public androidx.compose.ui.focus.FocusRequester getFocusRequester();
+ property public abstract androidx.compose.ui.focus.FocusRequester focusRequester;
+ }
+
+ public final class FocusRequesterModifierKt {
+ method public static androidx.compose.ui.Modifier focusRequester(androidx.compose.ui.Modifier, androidx.compose.ui.focus.FocusRequester focusRequester);
+ }
+
+ public interface FocusState {
+ method public boolean getHasFocus();
+ method public boolean isCaptured();
+ method public boolean isFocused();
+ property public abstract boolean hasFocus;
+ property public abstract boolean isCaptured;
+ property public abstract boolean isFocused;
+ }
+
+ public final class FocusTransactionsKt {
+ }
+
+ public final class FocusTraversalKt {
+ }
+
+ public final class OneDimensionalFocusSearchKt {
+ }
+
+ public final class TwoDimensionalFocusSearchKt {
+ }
+
+}
+
+package androidx.compose.ui.graphics {
+
+ public final class GraphicsLayerModifierKt {
+ method @androidx.compose.runtime.Stable public static androidx.compose.ui.Modifier graphicsLayer(androidx.compose.ui.Modifier, optional float scaleX, optional float scaleY, optional float alpha, optional float translationX, optional float translationY, optional float shadowElevation, optional float rotationX, optional float rotationY, optional float rotationZ, optional float cameraDistance, optional long transformOrigin, optional androidx.compose.ui.graphics.Shape shape, optional boolean clip, optional androidx.compose.ui.graphics.RenderEffect? renderEffect, optional long ambientShadowColor, optional long spotShadowColor);
+ method @androidx.compose.runtime.Stable public static androidx.compose.ui.Modifier graphicsLayer(androidx.compose.ui.Modifier, kotlin.jvm.functions.Function1<? super androidx.compose.ui.graphics.GraphicsLayerScope,kotlin.Unit> block);
+ method @Deprecated @androidx.compose.runtime.Stable public static androidx.compose.ui.Modifier! graphicsLayer(androidx.compose.ui.Modifier, optional float scaleX, optional float scaleY, optional float alpha, optional float translationX, optional float translationY, optional float shadowElevation, optional float rotationX, optional float rotationY, optional float rotationZ, optional float cameraDistance, optional long transformOrigin, optional androidx.compose.ui.graphics.Shape shape, optional boolean clip);
+ method @Deprecated @androidx.compose.runtime.Stable public static androidx.compose.ui.Modifier! graphicsLayer(androidx.compose.ui.Modifier, optional float scaleX, optional float scaleY, optional float alpha, optional float translationX, optional float translationY, optional float shadowElevation, optional float rotationX, optional float rotationY, optional float rotationZ, optional float cameraDistance, optional long transformOrigin, optional androidx.compose.ui.graphics.Shape shape, optional boolean clip, optional androidx.compose.ui.graphics.RenderEffect? renderEffect);
+ method @androidx.compose.runtime.Stable public static androidx.compose.ui.Modifier toolingGraphicsLayer(androidx.compose.ui.Modifier);
+ }
+
+ public interface GraphicsLayerScope extends androidx.compose.ui.unit.Density {
+ method public float getAlpha();
+ method public default long getAmbientShadowColor();
+ method public float getCameraDistance();
+ method public boolean getClip();
+ method public default androidx.compose.ui.graphics.RenderEffect? getRenderEffect();
+ method public float getRotationX();
+ method public float getRotationY();
+ method public float getRotationZ();
+ method public float getScaleX();
+ method public float getScaleY();
+ method public float getShadowElevation();
+ method public androidx.compose.ui.graphics.Shape getShape();
+ method public default long getSpotShadowColor();
+ method public long getTransformOrigin();
+ method public float getTranslationX();
+ method public float getTranslationY();
+ method public void setAlpha(float);
+ method public default void setAmbientShadowColor(long);
+ method public void setCameraDistance(float);
+ method public void setClip(boolean);
+ method public default void setRenderEffect(androidx.compose.ui.graphics.RenderEffect?);
+ method public void setRotationX(float);
+ method public void setRotationY(float);
+ method public void setRotationZ(float);
+ method public void setScaleX(float);
+ method public void setScaleY(float);
+ method public void setShadowElevation(float);
+ method public void setShape(androidx.compose.ui.graphics.Shape);
+ method public default void setSpotShadowColor(long);
+ method public void setTransformOrigin(long);
+ method public void setTranslationX(float);
+ method public void setTranslationY(float);
+ property public abstract float alpha;
+ property public default long ambientShadowColor;
+ property public abstract float cameraDistance;
+ property public abstract boolean clip;
+ property public default androidx.compose.ui.graphics.RenderEffect? renderEffect;
+ property public abstract float rotationX;
+ property public abstract float rotationY;
+ property public abstract float rotationZ;
+ property public abstract float scaleX;
+ property public abstract float scaleY;
+ property public abstract float shadowElevation;
+ property public abstract androidx.compose.ui.graphics.Shape shape;
+ property public default long spotShadowColor;
+ property public abstract long transformOrigin;
+ property public abstract float translationX;
+ property public abstract float translationY;
+ }
+
+ public final class GraphicsLayerScopeKt {
+ method public static androidx.compose.ui.graphics.GraphicsLayerScope GraphicsLayerScope();
+ method public static long getDefaultShadowColor();
+ property public static final long DefaultShadowColor;
+ field public static final float DefaultCameraDistance = 8.0f;
+ }
+
+ @androidx.compose.runtime.Immutable @kotlin.jvm.JvmInline public final value class TransformOrigin {
+ method @androidx.compose.runtime.Stable public inline operator float component1();
+ method @androidx.compose.runtime.Stable public inline operator float component2();
+ method public long copy(optional float pivotFractionX, optional float pivotFractionY);
+ method public float getPivotFractionX();
+ method public float getPivotFractionY();
+ property public final float pivotFractionX;
+ property public final float pivotFractionY;
+ field public static final androidx.compose.ui.graphics.TransformOrigin.Companion Companion;
+ }
+
+ public static final class TransformOrigin.Companion {
+ method public long getCenter();
+ property public final long Center;
+ }
+
+ public final class TransformOriginKt {
+ method public static long TransformOrigin(float pivotFractionX, float pivotFractionY);
+ }
+
+}
+
+package androidx.compose.ui.graphics.vector {
+
+ @androidx.compose.runtime.Immutable public final class ImageVector {
+ method public boolean getAutoMirror();
+ method public float getDefaultHeight();
+ method public float getDefaultWidth();
+ method public String getName();
+ method public androidx.compose.ui.graphics.vector.VectorGroup getRoot();
+ method public int getTintBlendMode();
+ method public long getTintColor();
+ method public float getViewportHeight();
+ method public float getViewportWidth();
+ property public final boolean autoMirror;
+ property public final float defaultHeight;
+ property public final float defaultWidth;
+ property public final String name;
+ property public final androidx.compose.ui.graphics.vector.VectorGroup root;
+ property public final int tintBlendMode;
+ property public final long tintColor;
+ property public final float viewportHeight;
+ property public final float viewportWidth;
+ field public static final androidx.compose.ui.graphics.vector.ImageVector.Companion Companion;
+ }
+
+ public static final class ImageVector.Builder {
+ ctor public ImageVector.Builder(optional String name, float defaultWidth, float defaultHeight, float viewportWidth, float viewportHeight, optional long tintColor, optional int tintBlendMode, optional boolean autoMirror);
+ method @Deprecated public androidx.compose.ui.graphics.vector.ImageVector.Builder! Builder(optional String name, float defaultWidth, float defaultHeight, float viewportWidth, float viewportHeight, optional long tintColor, optional int tintBlendMode);
+ method public androidx.compose.ui.graphics.vector.ImageVector.Builder addGroup(optional String name, optional float rotate, optional float pivotX, optional float pivotY, optional float scaleX, optional float scaleY, optional float translationX, optional float translationY, optional java.util.List<? extends androidx.compose.ui.graphics.vector.PathNode> clipPathData);
+ method public androidx.compose.ui.graphics.vector.ImageVector.Builder addPath(java.util.List<? extends androidx.compose.ui.graphics.vector.PathNode> pathData, optional int pathFillType, optional String name, optional androidx.compose.ui.graphics.Brush? fill, optional float fillAlpha, optional androidx.compose.ui.graphics.Brush? stroke, optional float strokeAlpha, optional float strokeLineWidth, optional int strokeLineCap, optional int strokeLineJoin, optional float strokeLineMiter, optional float trimPathStart, optional float trimPathEnd, optional float trimPathOffset);
+ method public androidx.compose.ui.graphics.vector.ImageVector build();
+ method public androidx.compose.ui.graphics.vector.ImageVector.Builder clearGroup();
+ }
+
+ public static final class ImageVector.Companion {
+ }
+
+ public final class ImageVectorKt {
+ method public static inline androidx.compose.ui.graphics.vector.ImageVector.Builder group(androidx.compose.ui.graphics.vector.ImageVector.Builder, optional String name, optional float rotate, optional float pivotX, optional float pivotY, optional float scaleX, optional float scaleY, optional float translationX, optional float translationY, optional java.util.List<? extends androidx.compose.ui.graphics.vector.PathNode> clipPathData, kotlin.jvm.functions.Function1<? super androidx.compose.ui.graphics.vector.ImageVector.Builder,kotlin.Unit> block);
+ method public static inline androidx.compose.ui.graphics.vector.ImageVector.Builder path(androidx.compose.ui.graphics.vector.ImageVector.Builder, optional String name, optional androidx.compose.ui.graphics.Brush? fill, optional float fillAlpha, optional androidx.compose.ui.graphics.Brush? stroke, optional float strokeAlpha, optional float strokeLineWidth, optional int strokeLineCap, optional int strokeLineJoin, optional float strokeLineMiter, optional int pathFillType, kotlin.jvm.functions.Function1<? super androidx.compose.ui.graphics.vector.PathBuilder,kotlin.Unit> pathBuilder);
+ }
+
+ public abstract sealed class VNode {
+ method public abstract void draw(androidx.compose.ui.graphics.drawscope.DrawScope);
+ method public final void invalidate();
+ }
+
+ public final class VectorApplier extends androidx.compose.runtime.AbstractApplier<androidx.compose.ui.graphics.vector.VNode> {
+ ctor public VectorApplier(androidx.compose.ui.graphics.vector.VNode root);
+ method public void insertBottomUp(int index, androidx.compose.ui.graphics.vector.VNode instance);
+ method public void insertTopDown(int index, androidx.compose.ui.graphics.vector.VNode instance);
+ method public void move(int from, int to, int count);
+ method protected void onClear();
+ method public void remove(int index, int count);
+ }
+
+ @androidx.compose.runtime.ComposableTargetMarker(description="Vector Composable") @kotlin.annotation.Retention(kotlin.annotation.AnnotationRetention.BINARY) @kotlin.annotation.Target(allowedTargets={kotlin.annotation.AnnotationTarget.FILE, kotlin.annotation.AnnotationTarget.FUNCTION, kotlin.annotation.AnnotationTarget.PROPERTY_GETTER, kotlin.annotation.AnnotationTarget.TYPE, kotlin.annotation.AnnotationTarget.TYPE_PARAMETER}) public @interface VectorComposable {
+ }
+
+ public final class VectorComposeKt {
+ method @androidx.compose.runtime.Composable @androidx.compose.ui.graphics.vector.VectorComposable public static void Group(optional String name, optional float rotation, optional float pivotX, optional float pivotY, optional float scaleX, optional float scaleY, optional float translationX, optional float translationY, optional java.util.List<? extends androidx.compose.ui.graphics.vector.PathNode> clipPathData, kotlin.jvm.functions.Function0<kotlin.Unit> content);
+ method @androidx.compose.runtime.Composable @androidx.compose.ui.graphics.vector.VectorComposable public static void Path(java.util.List<? extends androidx.compose.ui.graphics.vector.PathNode> pathData, optional int pathFillType, optional String name, optional androidx.compose.ui.graphics.Brush? fill, optional float fillAlpha, optional androidx.compose.ui.graphics.Brush? stroke, optional float strokeAlpha, optional float strokeLineWidth, optional int strokeLineCap, optional int strokeLineJoin, optional float strokeLineMiter, optional float trimPathStart, optional float trimPathEnd, optional float trimPathOffset);
+ }
+
+ public interface VectorConfig {
+ method public default <T> T! getOrDefault(androidx.compose.ui.graphics.vector.VectorProperty<T> property, T? defaultValue);
+ }
+
+ @androidx.compose.runtime.Immutable public final class VectorGroup extends androidx.compose.ui.graphics.vector.VectorNode implements java.lang.Iterable<androidx.compose.ui.graphics.vector.VectorNode> kotlin.jvm.internal.markers.KMappedMarker {
+ method public operator androidx.compose.ui.graphics.vector.VectorNode get(int index);
+ method public java.util.List<androidx.compose.ui.graphics.vector.PathNode> getClipPathData();
+ method public String getName();
+ method public float getPivotX();
+ method public float getPivotY();
+ method public float getRotation();
+ method public float getScaleX();
+ method public float getScaleY();
+ method public int getSize();
+ method public float getTranslationX();
+ method public float getTranslationY();
+ method public java.util.Iterator<androidx.compose.ui.graphics.vector.VectorNode> iterator();
+ property public final java.util.List<androidx.compose.ui.graphics.vector.PathNode> clipPathData;
+ property public final String name;
+ property public final float pivotX;
+ property public final float pivotY;
+ property public final float rotation;
+ property public final float scaleX;
+ property public final float scaleY;
+ property public final int size;
+ property public final float translationX;
+ property public final float translationY;
+ }
+
+ public final class VectorKt {
+ method public static inline java.util.List<androidx.compose.ui.graphics.vector.PathNode> PathData(kotlin.jvm.functions.Function1<? super androidx.compose.ui.graphics.vector.PathBuilder,kotlin.Unit> block);
+ method public static java.util.List<androidx.compose.ui.graphics.vector.PathNode> addPathNodes(String? pathStr);
+ method public static int getDefaultFillType();
+ method public static int getDefaultStrokeLineCap();
+ method public static int getDefaultStrokeLineJoin();
+ method public static int getDefaultTintBlendMode();
+ method public static long getDefaultTintColor();
+ method public static java.util.List<androidx.compose.ui.graphics.vector.PathNode> getEmptyPath();
+ property public static final int DefaultFillType;
+ property public static final int DefaultStrokeLineCap;
+ property public static final int DefaultStrokeLineJoin;
+ property public static final int DefaultTintBlendMode;
+ property public static final long DefaultTintColor;
+ property public static final java.util.List<androidx.compose.ui.graphics.vector.PathNode> EmptyPath;
+ field public static final String DefaultGroupName = "";
+ field public static final String DefaultPathName = "";
+ field public static final float DefaultPivotX = 0.0f;
+ field public static final float DefaultPivotY = 0.0f;
+ field public static final float DefaultRotation = 0.0f;
+ field public static final float DefaultScaleX = 1.0f;
+ field public static final float DefaultScaleY = 1.0f;
+ field public static final float DefaultStrokeLineMiter = 4.0f;
+ field public static final float DefaultStrokeLineWidth = 0.0f;
+ field public static final float DefaultTranslationX = 0.0f;
+ field public static final float DefaultTranslationY = 0.0f;
+ field public static final float DefaultTrimPathEnd = 1.0f;
+ field public static final float DefaultTrimPathOffset = 0.0f;
+ field public static final float DefaultTrimPathStart = 0.0f;
+ }
+
+ public abstract sealed class VectorNode {
+ }
+
+ public final class VectorPainter extends androidx.compose.ui.graphics.painter.Painter {
+ method public long getIntrinsicSize();
+ method protected void onDraw(androidx.compose.ui.graphics.drawscope.DrawScope);
+ property public long intrinsicSize;
+ }
+
+ public final class VectorPainterKt {
+ method @androidx.compose.runtime.Composable public static void RenderVectorGroup(androidx.compose.ui.graphics.vector.VectorGroup group, optional java.util.Map<java.lang.String,? extends androidx.compose.ui.graphics.vector.VectorConfig> configs);
+ method @Deprecated @androidx.compose.runtime.Composable @androidx.compose.runtime.ComposableOpenTarget(index=0xffffffff) public static androidx.compose.ui.graphics.vector.VectorPainter rememberVectorPainter(float defaultWidth, float defaultHeight, optional float viewportWidth, optional float viewportHeight, optional String name, optional long tintColor, optional int tintBlendMode, kotlin.jvm.functions.Function2<? super java.lang.Float,? super java.lang.Float,kotlin.Unit> content);
+ method @androidx.compose.runtime.Composable @androidx.compose.runtime.ComposableOpenTarget(index=0xffffffff) public static androidx.compose.ui.graphics.vector.VectorPainter rememberVectorPainter(float defaultWidth, float defaultHeight, optional float viewportWidth, optional float viewportHeight, optional String name, optional long tintColor, optional int tintBlendMode, optional boolean autoMirror, kotlin.jvm.functions.Function2<? super java.lang.Float,? super java.lang.Float,kotlin.Unit> content);
+ method @androidx.compose.runtime.Composable public static androidx.compose.ui.graphics.vector.VectorPainter rememberVectorPainter(androidx.compose.ui.graphics.vector.ImageVector image);
+ field public static final String RootGroupName = "VectorRootGroup";
+ }
+
+ @androidx.compose.runtime.Immutable public final class VectorPath extends androidx.compose.ui.graphics.vector.VectorNode {
+ method public androidx.compose.ui.graphics.Brush? getFill();
+ method public float getFillAlpha();
+ method public String getName();
+ method public java.util.List<androidx.compose.ui.graphics.vector.PathNode> getPathData();
+ method public int getPathFillType();
+ method public androidx.compose.ui.graphics.Brush? getStroke();
+ method public float getStrokeAlpha();
+ method public int getStrokeLineCap();
+ method public int getStrokeLineJoin();
+ method public float getStrokeLineMiter();
+ method public float getStrokeLineWidth();
+ method public float getTrimPathEnd();
+ method public float getTrimPathOffset();
+ method public float getTrimPathStart();
+ property public final androidx.compose.ui.graphics.Brush? fill;
+ property public final float fillAlpha;
+ property public final String name;
+ property public final java.util.List<androidx.compose.ui.graphics.vector.PathNode> pathData;
+ property public final int pathFillType;
+ property public final androidx.compose.ui.graphics.Brush? stroke;
+ property public final float strokeAlpha;
+ property public final int strokeLineCap;
+ property public final int strokeLineJoin;
+ property public final float strokeLineMiter;
+ property public final float strokeLineWidth;
+ property public final float trimPathEnd;
+ property public final float trimPathOffset;
+ property public final float trimPathStart;
+ }
+
+ public abstract sealed class VectorProperty<T> {
+ }
+
+ public static final class VectorProperty.Fill extends androidx.compose.ui.graphics.vector.VectorProperty<androidx.compose.ui.graphics.Brush> {
+ field public static final androidx.compose.ui.graphics.vector.VectorProperty.Fill INSTANCE;
+ }
+
+ public static final class VectorProperty.FillAlpha extends androidx.compose.ui.graphics.vector.VectorProperty<java.lang.Float> {
+ field public static final androidx.compose.ui.graphics.vector.VectorProperty.FillAlpha INSTANCE;
+ }
+
+ public static final class VectorProperty.PathData extends androidx.compose.ui.graphics.vector.VectorProperty<java.util.List<? extends androidx.compose.ui.graphics.vector.PathNode>> {
+ field public static final androidx.compose.ui.graphics.vector.VectorProperty.PathData INSTANCE;
+ }
+
+ public static final class VectorProperty.PivotX extends androidx.compose.ui.graphics.vector.VectorProperty<java.lang.Float> {
+ field public static final androidx.compose.ui.graphics.vector.VectorProperty.PivotX INSTANCE;
+ }
+
+ public static final class VectorProperty.PivotY extends androidx.compose.ui.graphics.vector.VectorProperty<java.lang.Float> {
+ field public static final androidx.compose.ui.graphics.vector.VectorProperty.PivotY INSTANCE;
+ }
+
+ public static final class VectorProperty.Rotation extends androidx.compose.ui.graphics.vector.VectorProperty<java.lang.Float> {
+ field public static final androidx.compose.ui.graphics.vector.VectorProperty.Rotation INSTANCE;
+ }
+
+ public static final class VectorProperty.ScaleX extends androidx.compose.ui.graphics.vector.VectorProperty<java.lang.Float> {
+ field public static final androidx.compose.ui.graphics.vector.VectorProperty.ScaleX INSTANCE;
+ }
+
+ public static final class VectorProperty.ScaleY extends androidx.compose.ui.graphics.vector.VectorProperty<java.lang.Float> {
+ field public static final androidx.compose.ui.graphics.vector.VectorProperty.ScaleY INSTANCE;
+ }
+
+ public static final class VectorProperty.Stroke extends androidx.compose.ui.graphics.vector.VectorProperty<androidx.compose.ui.graphics.Brush> {
+ field public static final androidx.compose.ui.graphics.vector.VectorProperty.Stroke INSTANCE;
+ }
+
+ public static final class VectorProperty.StrokeAlpha extends androidx.compose.ui.graphics.vector.VectorProperty<java.lang.Float> {
+ field public static final androidx.compose.ui.graphics.vector.VectorProperty.StrokeAlpha INSTANCE;
+ }
+
+ public static final class VectorProperty.StrokeLineWidth extends androidx.compose.ui.graphics.vector.VectorProperty<java.lang.Float> {
+ field public static final androidx.compose.ui.graphics.vector.VectorProperty.StrokeLineWidth INSTANCE;
+ }
+
+ public static final class VectorProperty.TranslateX extends androidx.compose.ui.graphics.vector.VectorProperty<java.lang.Float> {
+ field public static final androidx.compose.ui.graphics.vector.VectorProperty.TranslateX INSTANCE;
+ }
+
+ public static final class VectorProperty.TranslateY extends androidx.compose.ui.graphics.vector.VectorProperty<java.lang.Float> {
+ field public static final androidx.compose.ui.graphics.vector.VectorProperty.TranslateY INSTANCE;
+ }
+
+ public static final class VectorProperty.TrimPathEnd extends androidx.compose.ui.graphics.vector.VectorProperty<java.lang.Float> {
+ field public static final androidx.compose.ui.graphics.vector.VectorProperty.TrimPathEnd INSTANCE;
+ }
+
+ public static final class VectorProperty.TrimPathOffset extends androidx.compose.ui.graphics.vector.VectorProperty<java.lang.Float> {
+ field public static final androidx.compose.ui.graphics.vector.VectorProperty.TrimPathOffset INSTANCE;
+ }
+
+ public static final class VectorProperty.TrimPathStart extends androidx.compose.ui.graphics.vector.VectorProperty<java.lang.Float> {
+ field public static final androidx.compose.ui.graphics.vector.VectorProperty.TrimPathStart INSTANCE;
+ }
+
+}
+
+package androidx.compose.ui.graphics.vector.compat {
+
+ public final class XmlVectorParser_androidKt {
+ }
+
+}
+
+package androidx.compose.ui.hapticfeedback {
+
+ public interface HapticFeedback {
+ method public void performHapticFeedback(int hapticFeedbackType);
+ }
+
+ @kotlin.jvm.JvmInline public final value class HapticFeedbackType {
+ ctor public HapticFeedbackType(int value);
+ field public static final androidx.compose.ui.hapticfeedback.HapticFeedbackType.Companion Companion;
+ }
+
+ public static final class HapticFeedbackType.Companion {
+ method public int getLongPress();
+ method public int getTextHandleMove();
+ method public java.util.List<androidx.compose.ui.hapticfeedback.HapticFeedbackType> values();
+ property public final int LongPress;
+ property public final int TextHandleMove;
+ }
+
+}
+
+package androidx.compose.ui.input {
+
+ @kotlin.jvm.JvmInline public final value class InputMode {
+ field public static final androidx.compose.ui.input.InputMode.Companion Companion;
+ }
+
+ public static final class InputMode.Companion {
+ method public int getKeyboard();
+ method public int getTouch();
+ property public final int Keyboard;
+ property public final int Touch;
+ }
+
+ public interface InputModeManager {
+ method public int getInputMode();
+ method @androidx.compose.ui.ExperimentalComposeUiApi public boolean requestInputMode(int inputMode);
+ property public abstract int inputMode;
+ }
+
+}
+
+package androidx.compose.ui.input.key {
+
+ @kotlin.jvm.JvmInline public final value class Key {
+ ctor public Key(long keyCode);
+ method public long getKeyCode();
+ property public final long keyCode;
+ field public static final androidx.compose.ui.input.key.Key.Companion Companion;
+ }
+
+ public static final class Key.Companion {
+ method public long getA();
+ method public long getAllApps();
+ method public long getAltLeft();
+ method public long getAltRight();
+ method public long getApostrophe();
+ method public long getAppSwitch();
+ method public long getAssist();
+ method public long getAt();
+ method public long getAvReceiverInput();
+ method public long getAvReceiverPower();
+ method public long getB();
+ method public long getBack();
+ method public long getBackslash();
+ method public long getBackspace();
+ method public long getBookmark();
+ method public long getBreak();
+ method public long getBrightnessDown();
+ method public long getBrightnessUp();
+ method public long getBrowser();
+ method public long getButton1();
+ method public long getButton10();
+ method public long getButton11();
+ method public long getButton12();
+ method public long getButton13();
+ method public long getButton14();
+ method public long getButton15();
+ method public long getButton16();
+ method public long getButton2();
+ method public long getButton3();
+ method public long getButton4();
+ method public long getButton5();
+ method public long getButton6();
+ method public long getButton7();
+ method public long getButton8();
+ method public long getButton9();
+ method public long getButtonA();
+ method public long getButtonB();
+ method public long getButtonC();
+ method public long getButtonL1();
+ method public long getButtonL2();
+ method public long getButtonMode();
+ method public long getButtonR1();
+ method public long getButtonR2();
+ method public long getButtonSelect();
+ method public long getButtonStart();
+ method public long getButtonThumbLeft();
+ method public long getButtonThumbRight();
+ method public long getButtonX();
+ method public long getButtonY();
+ method public long getButtonZ();
+ method public long getC();
+ method public long getCalculator();
+ method public long getCalendar();
+ method public long getCall();
+ method public long getCamera();
+ method public long getCapsLock();
+ method public long getCaptions();
+ method public long getChannelDown();
+ method public long getChannelUp();
+ method public long getClear();
+ method public long getComma();
+ method public long getContacts();
+ method public long getCopy();
+ method public long getCtrlLeft();
+ method public long getCtrlRight();
+ method public long getCut();
+ method public long getD();
+ method public long getDelete();
+ method public long getDirectionCenter();
+ method public long getDirectionDown();
+ method public long getDirectionDownLeft();
+ method public long getDirectionDownRight();
+ method public long getDirectionLeft();
+ method public long getDirectionRight();
+ method public long getDirectionUp();
+ method public long getDirectionUpLeft();
+ method public long getDirectionUpRight();
+ method public long getDvr();
+ method public long getE();
+ method public long getEight();
+ method public long getEisu();
+ method public long getEndCall();
+ method public long getEnter();
+ method public long getEnvelope();
+ method public long getEquals();
+ method public long getEscape();
+ method public long getF();
+ method public long getF1();
+ method public long getF10();
+ method public long getF11();
+ method public long getF12();
+ method public long getF2();
+ method public long getF3();
+ method public long getF4();
+ method public long getF5();
+ method public long getF6();
+ method public long getF7();
+ method public long getF8();
+ method public long getF9();
+ method public long getFive();
+ method public long getFocus();
+ method public long getForward();
+ method public long getFour();
+ method public long getFunction();
+ method public long getG();
+ method public long getGrave();
+ method public long getGuide();
+ method public long getH();
+ method public long getHeadsetHook();
+ method public long getHelp();
+ method public long getHenkan();
+ method public long getHome();
+ method public long getI();
+ method public long getInfo();
+ method public long getInsert();
+ method public long getJ();
+ method public long getK();
+ method public long getKana();
+ method public long getKatakanaHiragana();
+ method public long getL();
+ method public long getLanguageSwitch();
+ method public long getLastChannel();
+ method public long getLeftBracket();
+ method public long getM();
+ method public long getMannerMode();
+ method public long getMediaAudioTrack();
+ method public long getMediaClose();
+ method public long getMediaEject();
+ method public long getMediaFastForward();
+ method public long getMediaNext();
+ method public long getMediaPause();
+ method public long getMediaPlay();
+ method public long getMediaPlayPause();
+ method public long getMediaPrevious();
+ method public long getMediaRecord();
+ method public long getMediaRewind();
+ method public long getMediaSkipBackward();
+ method public long getMediaSkipForward();
+ method public long getMediaStepBackward();
+ method public long getMediaStepForward();
+ method public long getMediaStop();
+ method public long getMediaTopMenu();
+ method public long getMenu();
+ method public long getMetaLeft();
+ method public long getMetaRight();
+ method public long getMicrophoneMute();
+ method public long getMinus();
+ method public long getMoveEnd();
+ method public long getMoveHome();
+ method public long getMuhenkan();
+ method public long getMultiply();
+ method public long getMusic();
+ method public long getN();
+ method public long getNavigateIn();
+ method public long getNavigateNext();
+ method public long getNavigateOut();
+ method public long getNavigatePrevious();
+ method public long getNine();
+ method public long getNotification();
+ method public long getNumLock();
+ method public long getNumPad0();
+ method public long getNumPad1();
+ method public long getNumPad2();
+ method public long getNumPad3();
+ method public long getNumPad4();
+ method public long getNumPad5();
+ method public long getNumPad6();
+ method public long getNumPad7();
+ method public long getNumPad8();
+ method public long getNumPad9();
+ method public long getNumPadAdd();
+ method public long getNumPadComma();
+ method public long getNumPadDivide();
+ method public long getNumPadDot();
+ method public long getNumPadEnter();
+ method public long getNumPadEquals();
+ method public long getNumPadLeftParenthesis();
+ method public long getNumPadMultiply();
+ method public long getNumPadRightParenthesis();
+ method public long getNumPadSubtract();
+ method public long getNumber();
+ method public long getO();
+ method public long getOne();
+ method public long getP();
+ method public long getPageDown();
+ method public long getPageUp();
+ method public long getPairing();
+ method public long getPaste();
+ method public long getPeriod();
+ method public long getPictureSymbols();
+ method public long getPlus();
+ method public long getPound();
+ method public long getPower();
+ method public long getPrintScreen();
+ method public long getProfileSwitch();
+ method public long getProgramBlue();
+ method public long getProgramGreen();
+ method public long getProgramRed();
+ method public long getProgramYellow();
+ method public long getQ();
+ method public long getR();
+ method public long getRefresh();
+ method public long getRightBracket();
+ method public long getRo();
+ method public long getS();
+ method public long getScrollLock();
+ method public long getSearch();
+ method public long getSemicolon();
+ method public long getSetTopBoxInput();
+ method public long getSetTopBoxPower();
+ method public long getSettings();
+ method public long getSeven();
+ method public long getShiftLeft();
+ method public long getShiftRight();
+ method public long getSix();
+ method public long getSlash();
+ method public long getSleep();
+ method public long getSoftLeft();
+ method public long getSoftRight();
+ method public long getSoftSleep();
+ method public long getSpacebar();
+ method public long getStem1();
+ method public long getStem2();
+ method public long getStem3();
+ method public long getStemPrimary();
+ method public long getSwitchCharset();
+ method public long getSymbol();
+ method public long getSystemNavigationDown();
+ method public long getSystemNavigationLeft();
+ method public long getSystemNavigationRight();
+ method public long getSystemNavigationUp();
+ method public long getT();
+ method public long getTab();
+ method public long getThree();
+ method public long getThumbsDown();
+ method public long getThumbsUp();
+ method public long getToggle2D3D();
+ method public long getTv();
+ method public long getTvAntennaCable();
+ method public long getTvAudioDescription();
+ method public long getTvAudioDescriptionMixingVolumeDown();
+ method public long getTvAudioDescriptionMixingVolumeUp();
+ method public long getTvContentsMenu();
+ method public long getTvDataService();
+ method public long getTvInput();
+ method public long getTvInputComponent1();
+ method public long getTvInputComponent2();
+ method public long getTvInputComposite1();
+ method public long getTvInputComposite2();
+ method public long getTvInputHdmi1();
+ method public long getTvInputHdmi2();
+ method public long getTvInputHdmi3();
+ method public long getTvInputHdmi4();
+ method public long getTvInputVga1();
+ method public long getTvMediaContextMenu();
+ method public long getTvNetwork();
+ method public long getTvNumberEntry();
+ method public long getTvPower();
+ method public long getTvRadioService();
+ method public long getTvSatellite();
+ method public long getTvSatelliteBs();
+ method public long getTvSatelliteCs();
+ method public long getTvSatelliteService();
+ method public long getTvTeletext();
+ method public long getTvTerrestrialAnalog();
+ method public long getTvTerrestrialDigital();
+ method public long getTvTimerProgramming();
+ method public long getTvZoomMode();
+ method public long getTwo();
+ method public long getU();
+ method public long getUnknown();
+ method public long getV();
+ method public long getVoiceAssist();
+ method public long getVolumeDown();
+ method public long getVolumeMute();
+ method public long getVolumeUp();
+ method public long getW();
+ method public long getWakeUp();
+ method public long getWindow();
+ method public long getX();
+ method public long getY();
+ method public long getYen();
+ method public long getZ();
+ method public long getZenkakuHankaru();
+ method public long getZero();
+ method public long getZoomIn();
+ method public long getZoomOut();
+ property public final long A;
+ property public final long AllApps;
+ property public final long AltLeft;
+ property public final long AltRight;
+ property public final long Apostrophe;
+ property public final long AppSwitch;
+ property public final long Assist;
+ property public final long At;
+ property public final long AvReceiverInput;
+ property public final long AvReceiverPower;
+ property public final long B;
+ property public final long Back;
+ property public final long Backslash;
+ property public final long Backspace;
+ property public final long Bookmark;
+ property public final long Break;
+ property public final long BrightnessDown;
+ property public final long BrightnessUp;
+ property public final long Browser;
+ property public final long Button1;
+ property public final long Button10;
+ property public final long Button11;
+ property public final long Button12;
+ property public final long Button13;
+ property public final long Button14;
+ property public final long Button15;
+ property public final long Button16;
+ property public final long Button2;
+ property public final long Button3;
+ property public final long Button4;
+ property public final long Button5;
+ property public final long Button6;
+ property public final long Button7;
+ property public final long Button8;
+ property public final long Button9;
+ property public final long ButtonA;
+ property public final long ButtonB;
+ property public final long ButtonC;
+ property public final long ButtonL1;
+ property public final long ButtonL2;
+ property public final long ButtonMode;
+ property public final long ButtonR1;
+ property public final long ButtonR2;
+ property public final long ButtonSelect;
+ property public final long ButtonStart;
+ property public final long ButtonThumbLeft;
+ property public final long ButtonThumbRight;
+ property public final long ButtonX;
+ property public final long ButtonY;
+ property public final long ButtonZ;
+ property public final long C;
+ property public final long Calculator;
+ property public final long Calendar;
+ property public final long Call;
+ property public final long Camera;
+ property public final long CapsLock;
+ property public final long Captions;
+ property public final long ChannelDown;
+ property public final long ChannelUp;
+ property public final long Clear;
+ property public final long Comma;
+ property public final long Contacts;
+ property public final long Copy;
+ property public final long CtrlLeft;
+ property public final long CtrlRight;
+ property public final long Cut;
+ property public final long D;
+ property public final long Delete;
+ property public final long DirectionCenter;
+ property public final long DirectionDown;
+ property public final long DirectionDownLeft;
+ property public final long DirectionDownRight;
+ property public final long DirectionLeft;
+ property public final long DirectionRight;
+ property public final long DirectionUp;
+ property public final long DirectionUpLeft;
+ property public final long DirectionUpRight;
+ property public final long Dvr;
+ property public final long E;
+ property public final long Eight;
+ property public final long Eisu;
+ property public final long EndCall;
+ property public final long Enter;
+ property public final long Envelope;
+ property public final long Equals;
+ property public final long Escape;
+ property public final long F;
+ property public final long F1;
+ property public final long F10;
+ property public final long F11;
+ property public final long F12;
+ property public final long F2;
+ property public final long F3;
+ property public final long F4;
+ property public final long F5;
+ property public final long F6;
+ property public final long F7;
+ property public final long F8;
+ property public final long F9;
+ property public final long Five;
+ property public final long Focus;
+ property public final long Forward;
+ property public final long Four;
+ property public final long Function;
+ property public final long G;
+ property public final long Grave;
+ property public final long Guide;
+ property public final long H;
+ property public final long HeadsetHook;
+ property public final long Help;
+ property public final long Henkan;
+ property public final long Home;
+ property public final long I;
+ property public final long Info;
+ property public final long Insert;
+ property public final long J;
+ property public final long K;
+ property public final long Kana;
+ property public final long KatakanaHiragana;
+ property public final long L;
+ property public final long LanguageSwitch;
+ property public final long LastChannel;
+ property public final long LeftBracket;
+ property public final long M;
+ property public final long MannerMode;
+ property public final long MediaAudioTrack;
+ property public final long MediaClose;
+ property public final long MediaEject;
+ property public final long MediaFastForward;
+ property public final long MediaNext;
+ property public final long MediaPause;
+ property public final long MediaPlay;
+ property public final long MediaPlayPause;
+ property public final long MediaPrevious;
+ property public final long MediaRecord;
+ property public final long MediaRewind;
+ property public final long MediaSkipBackward;
+ property public final long MediaSkipForward;
+ property public final long MediaStepBackward;
+ property public final long MediaStepForward;
+ property public final long MediaStop;
+ property public final long MediaTopMenu;
+ property public final long Menu;
+ property public final long MetaLeft;
+ property public final long MetaRight;
+ property public final long MicrophoneMute;
+ property public final long Minus;
+ property public final long MoveEnd;
+ property public final long MoveHome;
+ property public final long Muhenkan;
+ property public final long Multiply;
+ property public final long Music;
+ property public final long N;
+ property public final long NavigateIn;
+ property public final long NavigateNext;
+ property public final long NavigateOut;
+ property public final long NavigatePrevious;
+ property public final long Nine;
+ property public final long Notification;
+ property public final long NumLock;
+ property public final long NumPad0;
+ property public final long NumPad1;
+ property public final long NumPad2;
+ property public final long NumPad3;
+ property public final long NumPad4;
+ property public final long NumPad5;
+ property public final long NumPad6;
+ property public final long NumPad7;
+ property public final long NumPad8;
+ property public final long NumPad9;
+ property public final long NumPadAdd;
+ property public final long NumPadComma;
+ property public final long NumPadDivide;
+ property public final long NumPadDot;
+ property public final long NumPadEnter;
+ property public final long NumPadEquals;
+ property public final long NumPadLeftParenthesis;
+ property public final long NumPadMultiply;
+ property public final long NumPadRightParenthesis;
+ property public final long NumPadSubtract;
+ property public final long Number;
+ property public final long O;
+ property public final long One;
+ property public final long P;
+ property public final long PageDown;
+ property public final long PageUp;
+ property public final long Pairing;
+ property public final long Paste;
+ property public final long Period;
+ property public final long PictureSymbols;
+ property public final long Plus;
+ property public final long Pound;
+ property public final long Power;
+ property public final long PrintScreen;
+ property public final long ProfileSwitch;
+ property public final long ProgramBlue;
+ property public final long ProgramGreen;
+ property public final long ProgramRed;
+ property public final long ProgramYellow;
+ property public final long Q;
+ property public final long R;
+ property public final long Refresh;
+ property public final long RightBracket;
+ property public final long Ro;
+ property public final long S;
+ property public final long ScrollLock;
+ property public final long Search;
+ property public final long Semicolon;
+ property public final long SetTopBoxInput;
+ property public final long SetTopBoxPower;
+ property public final long Settings;
+ property public final long Seven;
+ property public final long ShiftLeft;
+ property public final long ShiftRight;
+ property public final long Six;
+ property public final long Slash;
+ property public final long Sleep;
+ property public final long SoftLeft;
+ property public final long SoftRight;
+ property public final long SoftSleep;
+ property public final long Spacebar;
+ property public final long Stem1;
+ property public final long Stem2;
+ property public final long Stem3;
+ property public final long StemPrimary;
+ property public final long SwitchCharset;
+ property public final long Symbol;
+ property public final long SystemNavigationDown;
+ property public final long SystemNavigationLeft;
+ property public final long SystemNavigationRight;
+ property public final long SystemNavigationUp;
+ property public final long T;
+ property public final long Tab;
+ property public final long Three;
+ property public final long ThumbsDown;
+ property public final long ThumbsUp;
+ property public final long Toggle2D3D;
+ property public final long Tv;
+ property public final long TvAntennaCable;
+ property public final long TvAudioDescription;
+ property public final long TvAudioDescriptionMixingVolumeDown;
+ property public final long TvAudioDescriptionMixingVolumeUp;
+ property public final long TvContentsMenu;
+ property public final long TvDataService;
+ property public final long TvInput;
+ property public final long TvInputComponent1;
+ property public final long TvInputComponent2;
+ property public final long TvInputComposite1;
+ property public final long TvInputComposite2;
+ property public final long TvInputHdmi1;
+ property public final long TvInputHdmi2;
+ property public final long TvInputHdmi3;
+ property public final long TvInputHdmi4;
+ property public final long TvInputVga1;
+ property public final long TvMediaContextMenu;
+ property public final long TvNetwork;
+ property public final long TvNumberEntry;
+ property public final long TvPower;
+ property public final long TvRadioService;
+ property public final long TvSatellite;
+ property public final long TvSatelliteBs;
+ property public final long TvSatelliteCs;
+ property public final long TvSatelliteService;
+ property public final long TvTeletext;
+ property public final long TvTerrestrialAnalog;
+ property public final long TvTerrestrialDigital;
+ property public final long TvTimerProgramming;
+ property public final long TvZoomMode;
+ property public final long Two;
+ property public final long U;
+ property public final long Unknown;
+ property public final long V;
+ property public final long VoiceAssist;
+ property public final long VolumeDown;
+ property public final long VolumeMute;
+ property public final long VolumeUp;
+ property public final long W;
+ property public final long WakeUp;
+ property public final long Window;
+ property public final long X;
+ property public final long Y;
+ property public final long Yen;
+ property public final long Z;
+ property public final long ZenkakuHankaru;
+ property public final long Zero;
+ property public final long ZoomIn;
+ property public final long ZoomOut;
+ }
+
+ @kotlin.jvm.JvmInline public final value class KeyEvent {
+ ctor public KeyEvent(android.view.KeyEvent nativeKeyEvent);
+ method public android.view.KeyEvent getNativeKeyEvent();
+ property public final android.view.KeyEvent nativeKeyEvent;
+ }
+
+ @kotlin.jvm.JvmInline public final value class KeyEventType {
+ field public static final androidx.compose.ui.input.key.KeyEventType.Companion Companion;
+ }
+
+ public static final class KeyEventType.Companion {
+ method public int getKeyDown();
+ method public int getKeyUp();
+ method public int getUnknown();
+ property public final int KeyDown;
+ property public final int KeyUp;
+ property public final int Unknown;
+ }
+
+ public final class KeyEvent_androidKt {
+ method public static long getKey(android.view.KeyEvent);
+ method public static int getType(android.view.KeyEvent);
+ method public static int getUtf16CodePoint(android.view.KeyEvent);
+ method public static boolean isAltPressed(android.view.KeyEvent);
+ method public static boolean isCtrlPressed(android.view.KeyEvent);
+ method public static boolean isMetaPressed(android.view.KeyEvent);
+ method public static boolean isShiftPressed(android.view.KeyEvent);
+ }
+
+ public final class KeyInputModifierKt {
+ method public static androidx.compose.ui.Modifier onKeyEvent(androidx.compose.ui.Modifier, kotlin.jvm.functions.Function1<? super androidx.compose.ui.input.key.KeyEvent,java.lang.Boolean> onKeyEvent);
+ method public static androidx.compose.ui.Modifier onPreviewKeyEvent(androidx.compose.ui.Modifier, kotlin.jvm.functions.Function1<? super androidx.compose.ui.input.key.KeyEvent,java.lang.Boolean> onPreviewKeyEvent);
+ }
+
+ public final class Key_androidKt {
+ method public static long Key(int nativeKeyCode);
+ method public static int getNativeKeyCode(long);
+ }
+
+}
+
+package androidx.compose.ui.input.nestedscroll {
+
+ public interface NestedScrollConnection {
+ method public default suspend Object? onPostFling(long consumed, long available, kotlin.coroutines.Continuation<? super androidx.compose.ui.unit.Velocity>);
+ method public default long onPostScroll(long consumed, long available, int source);
+ method public default suspend Object? onPreFling(long available, kotlin.coroutines.Continuation<? super androidx.compose.ui.unit.Velocity>);
+ method public default long onPreScroll(long available, int source);
+ }
+
+ public final class NestedScrollDispatcher {
+ ctor public NestedScrollDispatcher();
+ method public suspend Object? dispatchPostFling(long consumed, long available, kotlin.coroutines.Continuation<? super androidx.compose.ui.unit.Velocity>);
+ method public long dispatchPostScroll(long consumed, long available, int source);
+ method public suspend Object? dispatchPreFling(long available, kotlin.coroutines.Continuation<? super androidx.compose.ui.unit.Velocity>);
+ method public long dispatchPreScroll(long available, int source);
+ method public kotlinx.coroutines.CoroutineScope getCoroutineScope();
+ property public final kotlinx.coroutines.CoroutineScope coroutineScope;
+ }
+
+ public final class NestedScrollModifierKt {
+ method public static androidx.compose.ui.Modifier nestedScroll(androidx.compose.ui.Modifier, androidx.compose.ui.input.nestedscroll.NestedScrollConnection connection, optional androidx.compose.ui.input.nestedscroll.NestedScrollDispatcher? dispatcher);
+ }
+
+ public final class NestedScrollModifierLocalKt {
+ }
+
+ @kotlin.jvm.JvmInline public final value class NestedScrollSource {
+ field public static final androidx.compose.ui.input.nestedscroll.NestedScrollSource.Companion Companion;
+ }
+
+ public static final class NestedScrollSource.Companion {
+ method public int getDrag();
+ method public int getFling();
+ method @Deprecated public int getRelocate();
+ property public final int Drag;
+ property public final int Fling;
+ property @Deprecated public final int Relocate;
+ }
+
+}
+
+package androidx.compose.ui.input.pointer {
+
+ @kotlin.coroutines.RestrictsSuspension public interface AwaitPointerEventScope extends androidx.compose.ui.unit.Density {
+ method public suspend Object? awaitPointerEvent(optional androidx.compose.ui.input.pointer.PointerEventPass pass, optional kotlin.coroutines.Continuation<? super androidx.compose.ui.input.pointer.PointerEvent>);
+ method public androidx.compose.ui.input.pointer.PointerEvent getCurrentEvent();
+ method public default long getExtendedTouchPadding();
+ method public long getSize();
+ method public androidx.compose.ui.platform.ViewConfiguration getViewConfiguration();
+ method public default suspend <T> Object? withTimeout(long timeMillis, kotlin.jvm.functions.Function2<? super androidx.compose.ui.input.pointer.AwaitPointerEventScope,? super kotlin.coroutines.Continuation<? super T>,?> block, kotlin.coroutines.Continuation<? super T>);
+ method public default suspend <T> Object? withTimeoutOrNull(long timeMillis, kotlin.jvm.functions.Function2<? super androidx.compose.ui.input.pointer.AwaitPointerEventScope,? super kotlin.coroutines.Continuation<? super T>,?> block, kotlin.coroutines.Continuation<? super T>);
+ property public abstract androidx.compose.ui.input.pointer.PointerEvent currentEvent;
+ property public default long extendedTouchPadding;
+ property public abstract long size;
+ property public abstract androidx.compose.ui.platform.ViewConfiguration viewConfiguration;
+ }
+
+ @Deprecated public final class ConsumedData {
+ ctor @Deprecated public ConsumedData(optional @Deprecated boolean positionChange, optional @Deprecated boolean downChange);
+ method @Deprecated public boolean getDownChange();
+ method @Deprecated public boolean getPositionChange();
+ method @Deprecated public void setDownChange(boolean);
+ method @Deprecated public void setPositionChange(boolean);
+ property @Deprecated public final boolean downChange;
+ property @Deprecated public final boolean positionChange;
+ }
+
+ @androidx.compose.runtime.Immutable @androidx.compose.ui.ExperimentalComposeUiApi public final class HistoricalChange {
+ ctor public HistoricalChange(long uptimeMillis, long position);
+ method public long getPosition();
+ method public long getUptimeMillis();
+ property public final long position;
+ property public final long uptimeMillis;
+ }
+
+ @kotlin.jvm.JvmInline public final value class PointerButtons {
+ ctor public PointerButtons(int packedValue);
+ }
+
+ public final class PointerEvent {
+ ctor public PointerEvent(java.util.List<androidx.compose.ui.input.pointer.PointerInputChange> changes);
+ method public java.util.List<androidx.compose.ui.input.pointer.PointerInputChange> component1();
+ method public androidx.compose.ui.input.pointer.PointerEvent copy(java.util.List<androidx.compose.ui.input.pointer.PointerInputChange> changes, android.view.MotionEvent? motionEvent);
+ method public int getButtons();
+ method public java.util.List<androidx.compose.ui.input.pointer.PointerInputChange> getChanges();
+ method public int getKeyboardModifiers();
+ method public int getType();
+ property public final int buttons;
+ property public final java.util.List<androidx.compose.ui.input.pointer.PointerInputChange> changes;
+ property public final int keyboardModifiers;
+ property public final int type;
+ }
+
+ public final class PointerEventKt {
+ method @Deprecated public static boolean anyChangeConsumed(androidx.compose.ui.input.pointer.PointerInputChange);
+ method public static boolean changedToDown(androidx.compose.ui.input.pointer.PointerInputChange);
+ method public static boolean changedToDownIgnoreConsumed(androidx.compose.ui.input.pointer.PointerInputChange);
+ method public static boolean changedToUp(androidx.compose.ui.input.pointer.PointerInputChange);
+ method public static boolean changedToUpIgnoreConsumed(androidx.compose.ui.input.pointer.PointerInputChange);
+ method @Deprecated public static void consumeAllChanges(androidx.compose.ui.input.pointer.PointerInputChange);
+ method @Deprecated public static void consumeDownChange(androidx.compose.ui.input.pointer.PointerInputChange);
+ method @Deprecated public static void consumePositionChange(androidx.compose.ui.input.pointer.PointerInputChange);
+ method public static int indexOfFirstPressed(int);
+ method public static int indexOfLastPressed(int);
+ method @Deprecated public static boolean isOutOfBounds(androidx.compose.ui.input.pointer.PointerInputChange, long size);
+ method public static boolean isOutOfBounds(androidx.compose.ui.input.pointer.PointerInputChange, long size, long extendedTouchPadding);
+ method public static boolean isPressed(int, int buttonIndex);
+ method public static long positionChange(androidx.compose.ui.input.pointer.PointerInputChange);
+ method @Deprecated public static boolean positionChangeConsumed(androidx.compose.ui.input.pointer.PointerInputChange);
+ method public static long positionChangeIgnoreConsumed(androidx.compose.ui.input.pointer.PointerInputChange);
+ method public static boolean positionChanged(androidx.compose.ui.input.pointer.PointerInputChange);
+ method public static boolean positionChangedIgnoreConsumed(androidx.compose.ui.input.pointer.PointerInputChange);
+ }
+
+ public enum PointerEventPass {
+ enum_constant public static final androidx.compose.ui.input.pointer.PointerEventPass Final;
+ enum_constant public static final androidx.compose.ui.input.pointer.PointerEventPass Initial;
+ enum_constant public static final androidx.compose.ui.input.pointer.PointerEventPass Main;
+ }
+
+ public final class PointerEventTimeoutCancellationException extends java.util.concurrent.CancellationException {
+ ctor public PointerEventTimeoutCancellationException(long time);
+ }
+
+ @kotlin.jvm.JvmInline public final value class PointerEventType {
+ field public static final androidx.compose.ui.input.pointer.PointerEventType.Companion Companion;
+ }
+
+ public static final class PointerEventType.Companion {
+ method public int getEnter();
+ method public int getExit();
+ method public int getMove();
+ method public int getPress();
+ method public int getRelease();
+ method public int getScroll();
+ method public int getUnknown();
+ property public final int Enter;
+ property public final int Exit;
+ property public final int Move;
+ property public final int Press;
+ property public final int Release;
+ property public final int Scroll;
+ property public final int Unknown;
+ }
+
+ public final class PointerEvent_androidKt {
+ method public static boolean getAreAnyPressed(int);
+ method public static int indexOfFirstPressed(int);
+ method public static int indexOfLastPressed(int);
+ method public static boolean isAltGraphPressed(int);
+ method public static boolean isAltPressed(int);
+ method public static boolean isBackPressed(int);
+ method public static boolean isCapsLockOn(int);
+ method public static boolean isCtrlPressed(int);
+ method public static boolean isForwardPressed(int);
+ method public static boolean isFunctionPressed(int);
+ method public static boolean isMetaPressed(int);
+ method public static boolean isNumLockOn(int);
+ method public static boolean isPressed(int, int buttonIndex);
+ method public static boolean isPrimaryPressed(int);
+ method public static boolean isScrollLockOn(int);
+ method public static boolean isSecondaryPressed(int);
+ method public static boolean isShiftPressed(int);
+ method public static boolean isSymPressed(int);
+ method public static boolean isTertiaryPressed(int);
+ }
+
+ @androidx.compose.runtime.Stable public interface PointerIcon {
+ }
+
+ @androidx.compose.ui.ExperimentalComposeUiApi public final class PointerIconDefaults {
+ method public androidx.compose.ui.input.pointer.PointerIcon getCrosshair();
+ method public androidx.compose.ui.input.pointer.PointerIcon getDefault();
+ method public androidx.compose.ui.input.pointer.PointerIcon getHand();
+ method public androidx.compose.ui.input.pointer.PointerIcon getText();
+ property public final androidx.compose.ui.input.pointer.PointerIcon Crosshair;
+ property public final androidx.compose.ui.input.pointer.PointerIcon Default;
+ property public final androidx.compose.ui.input.pointer.PointerIcon Hand;
+ property public final androidx.compose.ui.input.pointer.PointerIcon Text;
+ field public static final androidx.compose.ui.input.pointer.PointerIconDefaults INSTANCE;
+ }
+
+ public final class PointerIconKt {
+ method @androidx.compose.runtime.Stable public static androidx.compose.ui.Modifier pointerHoverIcon(androidx.compose.ui.Modifier, androidx.compose.ui.input.pointer.PointerIcon icon, optional boolean overrideDescendants);
+ }
+
+ public final class PointerIcon_androidKt {
+ method public static androidx.compose.ui.input.pointer.PointerIcon PointerIcon(android.view.PointerIcon pointerIcon);
+ method public static androidx.compose.ui.input.pointer.PointerIcon PointerIcon(int pointerIconType);
+ }
+
+ @kotlin.jvm.JvmInline public final value class PointerId {
+ ctor public PointerId(long value);
+ method public long getValue();
+ property public final long value;
+ }
+
+ @androidx.compose.runtime.Immutable public final class PointerInputChange {
+ ctor public PointerInputChange(long id, long uptimeMillis, long position, boolean pressed, long previousUptimeMillis, long previousPosition, boolean previousPressed, boolean isInitiallyConsumed, optional int type, optional long scrollDelta);
+ method @Deprecated public androidx.compose.ui.input.pointer.PointerInputChange! PointerInputChange(long id, long uptimeMillis, long position, boolean pressed, long previousUptimeMillis, long previousPosition, boolean previousPressed, androidx.compose.ui.input.pointer.ConsumedData consumed, optional int type);
+ method public void consume();
+ method public androidx.compose.ui.input.pointer.PointerInputChange copy(optional long id, optional long currentTime, optional long currentPosition, optional boolean currentPressed, optional long previousTime, optional long previousPosition, optional boolean previousPressed, optional int type, optional long scrollDelta);
+ method @Deprecated public androidx.compose.ui.input.pointer.PointerInputChange copy(optional long id, optional long currentTime, optional long currentPosition, optional boolean currentPressed, optional long previousTime, optional long previousPosition, optional boolean previousPressed, androidx.compose.ui.input.pointer.ConsumedData consumed, optional int type, optional long scrollDelta);
+ method @androidx.compose.ui.ExperimentalComposeUiApi public androidx.compose.ui.input.pointer.PointerInputChange copy(optional long id, optional long currentTime, optional long currentPosition, optional boolean currentPressed, optional long previousTime, optional long previousPosition, optional boolean previousPressed, optional int type, java.util.List<androidx.compose.ui.input.pointer.HistoricalChange> historical, optional long scrollDelta);
+ method @Deprecated public androidx.compose.ui.input.pointer.PointerInputChange! copy(optional long id, optional long currentTime, optional long currentPosition, optional boolean currentPressed, optional long previousTime, optional long previousPosition, optional boolean previousPressed, optional androidx.compose.ui.input.pointer.ConsumedData consumed, optional int type);
+ method @Deprecated public androidx.compose.ui.input.pointer.ConsumedData getConsumed();
+ method @androidx.compose.ui.ExperimentalComposeUiApi public java.util.List<androidx.compose.ui.input.pointer.HistoricalChange> getHistorical();
+ method public long getId();
+ method public long getPosition();
+ method public boolean getPressed();
+ method public long getPreviousPosition();
+ method public boolean getPreviousPressed();
+ method public long getPreviousUptimeMillis();
+ method public long getScrollDelta();
+ method public int getType();
+ method public long getUptimeMillis();
+ method public boolean isConsumed();
+ property @Deprecated public final androidx.compose.ui.input.pointer.ConsumedData consumed;
+ property @androidx.compose.ui.ExperimentalComposeUiApi public final java.util.List<androidx.compose.ui.input.pointer.HistoricalChange> historical;
+ property public final long id;
+ property public final boolean isConsumed;
+ property public final long position;
+ property public final boolean pressed;
+ property public final long previousPosition;
+ property public final boolean previousPressed;
+ property public final long previousUptimeMillis;
+ property public final long scrollDelta;
+ property public final int type;
+ property public final long uptimeMillis;
+ }
+
+ public final class PointerInputEventProcessorKt {
+ }
+
+ public abstract class PointerInputFilter {
+ ctor public PointerInputFilter();
+ method public boolean getInterceptOutOfBoundsChildEvents();
+ method @androidx.compose.ui.ExperimentalComposeUiApi public boolean getShareWithSiblings();
+ method public final long getSize();
+ method public abstract void onCancel();
+ method public abstract void onPointerEvent(androidx.compose.ui.input.pointer.PointerEvent pointerEvent, androidx.compose.ui.input.pointer.PointerEventPass pass, long bounds);
+ property public boolean interceptOutOfBoundsChildEvents;
+ property @androidx.compose.ui.ExperimentalComposeUiApi public boolean shareWithSiblings;
+ property public final long size;
+ }
+
+ public interface PointerInputModifier extends androidx.compose.ui.Modifier.Element {
+ method public androidx.compose.ui.input.pointer.PointerInputFilter getPointerInputFilter();
+ property public abstract androidx.compose.ui.input.pointer.PointerInputFilter pointerInputFilter;
+ }
+
+ public interface PointerInputScope extends androidx.compose.ui.unit.Density {
+ method public suspend <R> Object? awaitPointerEventScope(kotlin.jvm.functions.Function2<? super androidx.compose.ui.input.pointer.AwaitPointerEventScope,? super kotlin.coroutines.Continuation<? super R>,?> block, kotlin.coroutines.Continuation<? super R>);
+ method public default long getExtendedTouchPadding();
+ method public default boolean getInterceptOutOfBoundsChildEvents();
+ method public long getSize();
+ method public androidx.compose.ui.platform.ViewConfiguration getViewConfiguration();
+ method public default void setInterceptOutOfBoundsChildEvents(boolean);
+ property public default long extendedTouchPadding;
+ property public default boolean interceptOutOfBoundsChildEvents;
+ property public abstract long size;
+ property public abstract androidx.compose.ui.platform.ViewConfiguration viewConfiguration;
+ }
+
+ public final class PointerInputTestUtilKt {
+ }
+
+ public final class PointerInteropFilter_androidKt {
+ method @androidx.compose.ui.ExperimentalComposeUiApi public static androidx.compose.ui.Modifier motionEventSpy(androidx.compose.ui.Modifier, kotlin.jvm.functions.Function1<? super android.view.MotionEvent,kotlin.Unit> watcher);
+ method @androidx.compose.ui.ExperimentalComposeUiApi public static androidx.compose.ui.Modifier pointerInteropFilter(androidx.compose.ui.Modifier, optional androidx.compose.ui.input.pointer.RequestDisallowInterceptTouchEvent? requestDisallowInterceptTouchEvent, kotlin.jvm.functions.Function1<? super android.view.MotionEvent,java.lang.Boolean> onTouchEvent);
+ }
+
+ public final class PointerInteropUtils_androidKt {
+ }
+
+ @kotlin.jvm.JvmInline public final value class PointerKeyboardModifiers {
+ ctor public PointerKeyboardModifiers(int packedValue);
+ }
+
+ @kotlin.jvm.JvmInline public final value class PointerType {
+ field public static final androidx.compose.ui.input.pointer.PointerType.Companion Companion;
+ }
+
+ public static final class PointerType.Companion {
+ method public int getEraser();
+ method public int getMouse();
+ method public int getStylus();
+ method public int getTouch();
+ method public int getUnknown();
+ property public final int Eraser;
+ property public final int Mouse;
+ property public final int Stylus;
+ property public final int Touch;
+ property public final int Unknown;
+ }
+
+ @androidx.compose.ui.ExperimentalComposeUiApi public final class RequestDisallowInterceptTouchEvent implements kotlin.jvm.functions.Function1<java.lang.Boolean,kotlin.Unit> {
+ ctor public RequestDisallowInterceptTouchEvent();
+ method public void invoke(boolean disallowIntercept);
+ }
+
+ public final class SuspendingPointerInputFilterKt {
+ method @Deprecated public static androidx.compose.ui.Modifier pointerInput(androidx.compose.ui.Modifier, kotlin.jvm.functions.Function2<? super androidx.compose.ui.input.pointer.PointerInputScope,? super kotlin.coroutines.Continuation<? super kotlin.Unit>,?> block);
+ method public static androidx.compose.ui.Modifier pointerInput(androidx.compose.ui.Modifier, Object? key1, kotlin.jvm.functions.Function2<? super androidx.compose.ui.input.pointer.PointerInputScope,? super kotlin.coroutines.Continuation<? super kotlin.Unit>,?> block);
+ method public static androidx.compose.ui.Modifier pointerInput(androidx.compose.ui.Modifier, Object? key1, Object? key2, kotlin.jvm.functions.Function2<? super androidx.compose.ui.input.pointer.PointerInputScope,? super kotlin.coroutines.Continuation<? super kotlin.Unit>,?> block);
+ method public static androidx.compose.ui.Modifier pointerInput(androidx.compose.ui.Modifier, Object![]? keys, kotlin.jvm.functions.Function2<? super androidx.compose.ui.input.pointer.PointerInputScope,? super kotlin.coroutines.Continuation<? super kotlin.Unit>,?> block);
+ }
+
+}
+
+package androidx.compose.ui.input.pointer.util {
+
+ public final class VelocityTracker {
+ ctor public VelocityTracker();
+ method public void addPosition(long timeMillis, long position);
+ method public long calculateVelocity();
+ method public void resetTracking();
+ }
+
+ public final class VelocityTrackerKt {
+ method public static void addPointerInputChange(androidx.compose.ui.input.pointer.util.VelocityTracker, androidx.compose.ui.input.pointer.PointerInputChange event);
+ }
+
+}
+
+package androidx.compose.ui.input.rotary {
+
+ public final class RotaryInputModifierKt {
+ method @androidx.compose.ui.ExperimentalComposeUiApi public static androidx.compose.ui.Modifier onPreRotaryScrollEvent(androidx.compose.ui.Modifier, kotlin.jvm.functions.Function1<? super androidx.compose.ui.input.rotary.RotaryScrollEvent,java.lang.Boolean> onPreRotaryScrollEvent);
+ method @androidx.compose.ui.ExperimentalComposeUiApi public static androidx.compose.ui.Modifier onRotaryScrollEvent(androidx.compose.ui.Modifier, kotlin.jvm.functions.Function1<? super androidx.compose.ui.input.rotary.RotaryScrollEvent,java.lang.Boolean> onRotaryScrollEvent);
+ }
+
+ @androidx.compose.ui.ExperimentalComposeUiApi public final class RotaryScrollEvent {
+ method public float getHorizontalScrollPixels();
+ method public long getUptimeMillis();
+ method public float getVerticalScrollPixels();
+ property public final float horizontalScrollPixels;
+ property public final long uptimeMillis;
+ property public final float verticalScrollPixels;
+ }
+
+}
+
+package androidx.compose.ui.layout {
+
+ @androidx.compose.runtime.Immutable public abstract sealed class AlignmentLine {
+ field public static final androidx.compose.ui.layout.AlignmentLine.Companion Companion;
+ field public static final int Unspecified = -2147483648; // 0x80000000
+ }
+
+ public static final class AlignmentLine.Companion {
+ }
+
+ public final class AlignmentLineKt {
+ method public static androidx.compose.ui.layout.HorizontalAlignmentLine getFirstBaseline();
+ method public static androidx.compose.ui.layout.HorizontalAlignmentLine getLastBaseline();
+ property public static final androidx.compose.ui.layout.HorizontalAlignmentLine FirstBaseline;
+ property public static final androidx.compose.ui.layout.HorizontalAlignmentLine LastBaseline;
+ }
+
+ public interface BeyondBoundsLayout {
+ method public <T> T? layout(int direction, kotlin.jvm.functions.Function1<? super androidx.compose.ui.layout.BeyondBoundsLayout.BeyondBoundsScope,? extends T> block);
+ }
+
+ public static interface BeyondBoundsLayout.BeyondBoundsScope {
+ method public boolean getHasMoreContent();
+ property public abstract boolean hasMoreContent;
+ }
+
+ @kotlin.jvm.JvmInline public static final value class BeyondBoundsLayout.LayoutDirection {
+ field public static final androidx.compose.ui.layout.BeyondBoundsLayout.LayoutDirection.Companion Companion;
+ }
+
+ public static final class BeyondBoundsLayout.LayoutDirection.Companion {
+ method public int getAbove();
+ method public int getAfter();
+ method public int getBefore();
+ method public int getBelow();
+ method public int getLeft();
+ method public int getRight();
+ property public final int Above;
+ property public final int After;
+ property public final int Before;
+ property public final int Below;
+ property public final int Left;
+ property public final int Right;
+ }
+
+ public final class BeyondBoundsLayoutKt {
+ method public static androidx.compose.ui.modifier.ProvidableModifierLocal<androidx.compose.ui.layout.BeyondBoundsLayout> getModifierLocalBeyondBoundsLayout();
+ property public static final androidx.compose.ui.modifier.ProvidableModifierLocal<androidx.compose.ui.layout.BeyondBoundsLayout> ModifierLocalBeyondBoundsLayout;
+ }
+
+ @androidx.compose.runtime.Stable public interface ContentScale {
+ method public long computeScaleFactor(long srcSize, long dstSize);
+ field public static final androidx.compose.ui.layout.ContentScale.Companion Companion;
+ }
+
+ public static final class ContentScale.Companion {
+ method public androidx.compose.ui.layout.ContentScale getCrop();
+ method public androidx.compose.ui.layout.ContentScale getFillBounds();
+ method public androidx.compose.ui.layout.ContentScale getFillHeight();
+ method public androidx.compose.ui.layout.ContentScale getFillWidth();
+ method public androidx.compose.ui.layout.ContentScale getFit();
+ method public androidx.compose.ui.layout.ContentScale getInside();
+ method public androidx.compose.ui.layout.FixedScale getNone();
+ property public final androidx.compose.ui.layout.ContentScale Crop;
+ property public final androidx.compose.ui.layout.ContentScale FillBounds;
+ property public final androidx.compose.ui.layout.ContentScale FillHeight;
+ property public final androidx.compose.ui.layout.ContentScale FillWidth;
+ property public final androidx.compose.ui.layout.ContentScale Fit;
+ property public final androidx.compose.ui.layout.ContentScale Inside;
+ property public final androidx.compose.ui.layout.FixedScale None;
+ }
+
+ public final class ContentScaleKt {
+ }
+
+ @androidx.compose.runtime.Immutable public final class FixedScale implements androidx.compose.ui.layout.ContentScale {
+ ctor public FixedScale(float value);
+ method public float component1();
+ method public long computeScaleFactor(long srcSize, long dstSize);
+ method public androidx.compose.ui.layout.FixedScale copy(float value);
+ method public float getValue();
+ property public final float value;
+ }
+
+ public interface GraphicLayerInfo {
+ method public long getLayerId();
+ method public default long getOwnerViewId();
+ property public abstract long layerId;
+ property public default long ownerViewId;
+ }
+
+ public final class HorizontalAlignmentLine extends androidx.compose.ui.layout.AlignmentLine {
+ ctor public HorizontalAlignmentLine(kotlin.jvm.functions.Function2<? super java.lang.Integer,? super java.lang.Integer,java.lang.Integer> merger);
+ }
+
+ public interface IntrinsicMeasurable {
+ method public Object? getParentData();
+ method public int maxIntrinsicHeight(int width);
+ method public int maxIntrinsicWidth(int height);
+ method public int minIntrinsicHeight(int width);
+ method public int minIntrinsicWidth(int height);
+ property public abstract Object? parentData;
+ }
+
+ public final class IntrinsicMeasurableKt {
+ }
+
+ public interface IntrinsicMeasureScope extends androidx.compose.ui.unit.Density {
+ method public androidx.compose.ui.unit.LayoutDirection getLayoutDirection();
+ property public abstract androidx.compose.ui.unit.LayoutDirection layoutDirection;
+ }
+
+ public interface LayoutCoordinates {
+ method public operator int get(androidx.compose.ui.layout.AlignmentLine alignmentLine);
+ method public androidx.compose.ui.layout.LayoutCoordinates? getParentCoordinates();
+ method public androidx.compose.ui.layout.LayoutCoordinates? getParentLayoutCoordinates();
+ method public java.util.Set<androidx.compose.ui.layout.AlignmentLine> getProvidedAlignmentLines();
+ method public long getSize();
+ method public boolean isAttached();
+ method public androidx.compose.ui.geometry.Rect localBoundingBoxOf(androidx.compose.ui.layout.LayoutCoordinates sourceCoordinates, optional boolean clipBounds);
+ method public long localPositionOf(androidx.compose.ui.layout.LayoutCoordinates sourceCoordinates, long relativeToSource);
+ method public long localToRoot(long relativeToLocal);
+ method public long localToWindow(long relativeToLocal);
+ method public long windowToLocal(long relativeToWindow);
+ property public abstract boolean isAttached;
+ property public abstract androidx.compose.ui.layout.LayoutCoordinates? parentCoordinates;
+ property public abstract androidx.compose.ui.layout.LayoutCoordinates? parentLayoutCoordinates;
+ property public abstract java.util.Set<androidx.compose.ui.layout.AlignmentLine> providedAlignmentLines;
+ property public abstract long size;
+ }
+
+ public final class LayoutCoordinatesKt {
+ method public static androidx.compose.ui.geometry.Rect boundsInParent(androidx.compose.ui.layout.LayoutCoordinates);
+ method public static androidx.compose.ui.geometry.Rect boundsInRoot(androidx.compose.ui.layout.LayoutCoordinates);
+ method public static androidx.compose.ui.geometry.Rect boundsInWindow(androidx.compose.ui.layout.LayoutCoordinates);
+ method public static long positionInParent(androidx.compose.ui.layout.LayoutCoordinates);
+ method public static long positionInRoot(androidx.compose.ui.layout.LayoutCoordinates);
+ method public static long positionInWindow(androidx.compose.ui.layout.LayoutCoordinates);
+ }
+
+ public final class LayoutIdKt {
+ method public static Object? getLayoutId(androidx.compose.ui.layout.Measurable);
+ method @androidx.compose.runtime.Stable public static androidx.compose.ui.Modifier layoutId(androidx.compose.ui.Modifier, Object layoutId);
+ }
+
+ public interface LayoutIdParentData {
+ method public Object getLayoutId();
+ property public abstract Object layoutId;
+ }
+
+ public interface LayoutInfo {
+ method public androidx.compose.ui.layout.LayoutCoordinates getCoordinates();
+ method public androidx.compose.ui.unit.Density getDensity();
+ method public int getHeight();
+ method public androidx.compose.ui.unit.LayoutDirection getLayoutDirection();
+ method public java.util.List<androidx.compose.ui.layout.ModifierInfo> getModifierInfo();
+ method public androidx.compose.ui.layout.LayoutInfo? getParentInfo();
+ method public androidx.compose.ui.platform.ViewConfiguration getViewConfiguration();
+ method public int getWidth();
+ method public boolean isAttached();
+ method public boolean isPlaced();
+ property public abstract androidx.compose.ui.layout.LayoutCoordinates coordinates;
+ property public abstract androidx.compose.ui.unit.Density density;
+ property public abstract int height;
+ property public abstract boolean isAttached;
+ property public abstract boolean isPlaced;
+ property public abstract androidx.compose.ui.unit.LayoutDirection layoutDirection;
+ property public abstract androidx.compose.ui.layout.LayoutInfo? parentInfo;
+ property public abstract androidx.compose.ui.platform.ViewConfiguration viewConfiguration;
+ property public abstract int width;
+ }
+
+ public final class LayoutKt {
+ method @androidx.compose.runtime.Composable @androidx.compose.ui.UiComposable public static inline void Layout(kotlin.jvm.functions.Function0<kotlin.Unit> content, optional androidx.compose.ui.Modifier modifier, androidx.compose.ui.layout.MeasurePolicy measurePolicy);
+ method @androidx.compose.runtime.Composable @androidx.compose.ui.UiComposable public static inline void Layout(optional androidx.compose.ui.Modifier modifier, androidx.compose.ui.layout.MeasurePolicy measurePolicy);
+ method @Deprecated @androidx.compose.runtime.Composable @androidx.compose.ui.UiComposable public static void MultiMeasureLayout(optional androidx.compose.ui.Modifier modifier, kotlin.jvm.functions.Function0<kotlin.Unit> content, androidx.compose.ui.layout.MeasurePolicy measurePolicy);
+ }
+
+ public interface LayoutModifier extends androidx.compose.ui.Modifier.Element {
+ method public default int maxIntrinsicHeight(androidx.compose.ui.layout.IntrinsicMeasureScope, androidx.compose.ui.layout.IntrinsicMeasurable measurable, int width);
+ method public default int maxIntrinsicWidth(androidx.compose.ui.layout.IntrinsicMeasureScope, androidx.compose.ui.layout.IntrinsicMeasurable measurable, int height);
+ method public androidx.compose.ui.layout.MeasureResult measure(androidx.compose.ui.layout.MeasureScope, androidx.compose.ui.layout.Measurable measurable, long constraints);
+ method public default int minIntrinsicHeight(androidx.compose.ui.layout.IntrinsicMeasureScope, androidx.compose.ui.layout.IntrinsicMeasurable measurable, int width);
+ method public default int minIntrinsicWidth(androidx.compose.ui.layout.IntrinsicMeasureScope, androidx.compose.ui.layout.IntrinsicMeasurable measurable, int height);
+ }
+
+ public final class LayoutModifierKt {
+ method public static androidx.compose.ui.Modifier layout(androidx.compose.ui.Modifier, kotlin.jvm.functions.Function3<? super androidx.compose.ui.layout.MeasureScope,? super androidx.compose.ui.layout.Measurable,? super androidx.compose.ui.unit.Constraints,? extends androidx.compose.ui.layout.MeasureResult> measure);
+ }
+
+ public interface Measurable extends androidx.compose.ui.layout.IntrinsicMeasurable {
+ method public androidx.compose.ui.layout.Placeable measure(long constraints);
+ }
+
+ @androidx.compose.runtime.Stable public fun interface MeasurePolicy {
+ method public default int maxIntrinsicHeight(androidx.compose.ui.layout.IntrinsicMeasureScope, java.util.List<? extends androidx.compose.ui.layout.IntrinsicMeasurable> measurables, int width);
+ method public default int maxIntrinsicWidth(androidx.compose.ui.layout.IntrinsicMeasureScope, java.util.List<? extends androidx.compose.ui.layout.IntrinsicMeasurable> measurables, int height);
+ method public androidx.compose.ui.layout.MeasureResult measure(androidx.compose.ui.layout.MeasureScope, java.util.List<? extends androidx.compose.ui.layout.Measurable> measurables, long constraints);
+ method public default int minIntrinsicHeight(androidx.compose.ui.layout.IntrinsicMeasureScope, java.util.List<? extends androidx.compose.ui.layout.IntrinsicMeasurable> measurables, int width);
+ method public default int minIntrinsicWidth(androidx.compose.ui.layout.IntrinsicMeasureScope, java.util.List<? extends androidx.compose.ui.layout.IntrinsicMeasurable> measurables, int height);
+ }
+
+ public interface MeasureResult {
+ method public java.util.Map<androidx.compose.ui.layout.AlignmentLine,java.lang.Integer> getAlignmentLines();
+ method public int getHeight();
+ method public int getWidth();
+ method public void placeChildren();
+ property public abstract java.util.Map<androidx.compose.ui.layout.AlignmentLine,java.lang.Integer> alignmentLines;
+ property public abstract int height;
+ property public abstract int width;
+ }
+
+ public interface MeasureScope extends androidx.compose.ui.layout.IntrinsicMeasureScope {
+ method public default androidx.compose.ui.layout.MeasureResult layout(int width, int height, optional java.util.Map<androidx.compose.ui.layout.AlignmentLine,java.lang.Integer> alignmentLines, kotlin.jvm.functions.Function1<? super androidx.compose.ui.layout.Placeable.PlacementScope,kotlin.Unit> placementBlock);
+ }
+
+ public final class MeasureScopeKt {
+ }
+
+ public interface Measured {
+ method public operator int get(androidx.compose.ui.layout.AlignmentLine alignmentLine);
+ method public int getMeasuredHeight();
+ method public int getMeasuredWidth();
+ method public default Object? getParentData();
+ property public abstract int measuredHeight;
+ property public abstract int measuredWidth;
+ property public default Object? parentData;
+ }
+
+ public final class ModifierInfo {
+ ctor public ModifierInfo(androidx.compose.ui.Modifier modifier, androidx.compose.ui.layout.LayoutCoordinates coordinates, optional Object? extra);
+ method public androidx.compose.ui.layout.LayoutCoordinates getCoordinates();
+ method public Object? getExtra();
+ method public androidx.compose.ui.Modifier getModifier();
+ property public final androidx.compose.ui.layout.LayoutCoordinates coordinates;
+ property public final Object? extra;
+ property public final androidx.compose.ui.Modifier modifier;
+ }
+
+ public interface OnGloballyPositionedModifier extends androidx.compose.ui.Modifier.Element {
+ method public void onGloballyPositioned(androidx.compose.ui.layout.LayoutCoordinates coordinates);
+ }
+
+ public final class OnGloballyPositionedModifierKt {
+ method @androidx.compose.runtime.Stable public static androidx.compose.ui.Modifier onGloballyPositioned(androidx.compose.ui.Modifier, kotlin.jvm.functions.Function1<? super androidx.compose.ui.layout.LayoutCoordinates,kotlin.Unit> onGloballyPositioned);
+ }
+
+ public interface OnPlacedModifier extends androidx.compose.ui.Modifier.Element {
+ method public void onPlaced(androidx.compose.ui.layout.LayoutCoordinates coordinates);
+ }
+
+ public final class OnPlacedModifierKt {
+ method @androidx.compose.runtime.Stable public static androidx.compose.ui.Modifier onPlaced(androidx.compose.ui.Modifier, kotlin.jvm.functions.Function1<? super androidx.compose.ui.layout.LayoutCoordinates,kotlin.Unit> onPlaced);
+ }
+
+ public interface OnRemeasuredModifier extends androidx.compose.ui.Modifier.Element {
+ method public void onRemeasured(long size);
+ }
+
+ public final class OnRemeasuredModifierKt {
+ method @androidx.compose.runtime.Stable public static androidx.compose.ui.Modifier onSizeChanged(androidx.compose.ui.Modifier, kotlin.jvm.functions.Function1<? super androidx.compose.ui.unit.IntSize,kotlin.Unit> onSizeChanged);
+ }
+
+ public interface ParentDataModifier extends androidx.compose.ui.Modifier.Element {
+ method public Object? modifyParentData(androidx.compose.ui.unit.Density, Object? parentData);
+ }
+
+ public abstract class Placeable implements androidx.compose.ui.layout.Measured {
+ ctor public Placeable();
+ method protected final long getApparentToRealOffset();
+ method public final int getHeight();
+ method public int getMeasuredHeight();
+ method protected final long getMeasuredSize();
+ method public int getMeasuredWidth();
+ method protected final long getMeasurementConstraints();
+ method public final int getWidth();
+ method protected abstract void placeAt(long position, float zIndex, kotlin.jvm.functions.Function1<? super androidx.compose.ui.graphics.GraphicsLayerScope,kotlin.Unit>? layerBlock);
+ method protected final void setMeasuredSize(long);
+ method protected final void setMeasurementConstraints(long);
+ property protected final long apparentToRealOffset;
+ property public final int height;
+ property public int measuredHeight;
+ property protected final long measuredSize;
+ property public int measuredWidth;
+ property protected final long measurementConstraints;
+ property public final int width;
+ }
+
+ public abstract static class Placeable.PlacementScope {
+ ctor public Placeable.PlacementScope();
+ method protected abstract androidx.compose.ui.unit.LayoutDirection getParentLayoutDirection();
+ method protected abstract int getParentWidth();
+ method public final void place(androidx.compose.ui.layout.Placeable, int x, int y, optional float zIndex);
+ method public final void place(androidx.compose.ui.layout.Placeable, long position, optional float zIndex);
+ method public final void placeRelative(androidx.compose.ui.layout.Placeable, long position, optional float zIndex);
+ method public final void placeRelative(androidx.compose.ui.layout.Placeable, int x, int y, optional float zIndex);
+ method public final void placeRelativeWithLayer(androidx.compose.ui.layout.Placeable, long position, optional float zIndex, optional kotlin.jvm.functions.Function1<? super androidx.compose.ui.graphics.GraphicsLayerScope,kotlin.Unit> layerBlock);
+ method public final void placeRelativeWithLayer(androidx.compose.ui.layout.Placeable, int x, int y, optional float zIndex, optional kotlin.jvm.functions.Function1<? super androidx.compose.ui.graphics.GraphicsLayerScope,kotlin.Unit> layerBlock);
+ method public final void placeWithLayer(androidx.compose.ui.layout.Placeable, int x, int y, optional float zIndex, optional kotlin.jvm.functions.Function1<? super androidx.compose.ui.graphics.GraphicsLayerScope,kotlin.Unit> layerBlock);
+ method public final void placeWithLayer(androidx.compose.ui.layout.Placeable, long position, optional float zIndex, optional kotlin.jvm.functions.Function1<? super androidx.compose.ui.graphics.GraphicsLayerScope,kotlin.Unit> layerBlock);
+ property protected abstract androidx.compose.ui.unit.LayoutDirection parentLayoutDirection;
+ property protected abstract int parentWidth;
+ }
+
+ public final class PlaceableKt {
+ }
+
+ @Deprecated @androidx.compose.ui.ExperimentalComposeUiApi public interface RelocationModifier extends androidx.compose.ui.Modifier.Element {
+ method @Deprecated public androidx.compose.ui.geometry.Rect computeDestination(androidx.compose.ui.geometry.Rect source, androidx.compose.ui.layout.LayoutCoordinates layoutCoordinates);
+ method @Deprecated public suspend Object? performRelocation(androidx.compose.ui.geometry.Rect source, androidx.compose.ui.geometry.Rect destination, kotlin.coroutines.Continuation<? super kotlin.Unit>);
+ }
+
+ public final class RelocationModifierKt {
+ method @Deprecated @androidx.compose.ui.ExperimentalComposeUiApi public static androidx.compose.ui.Modifier onRelocationRequest(androidx.compose.ui.Modifier, kotlin.jvm.functions.Function2<? super androidx.compose.ui.geometry.Rect,? super androidx.compose.ui.layout.LayoutCoordinates,androidx.compose.ui.geometry.Rect> onProvideDestination, kotlin.jvm.functions.Function3<? super androidx.compose.ui.geometry.Rect,? super androidx.compose.ui.geometry.Rect,? super kotlin.coroutines.Continuation<? super kotlin.Unit>,?> onPerformRelocation);
+ }
+
+ @Deprecated @androidx.compose.ui.ExperimentalComposeUiApi public final class RelocationRequester {
+ ctor @Deprecated public RelocationRequester();
+ method @Deprecated public suspend Object? bringIntoView(optional androidx.compose.ui.geometry.Rect? rect, optional kotlin.coroutines.Continuation<? super kotlin.Unit>);
+ }
+
+ public final class RelocationRequesterModifierKt {
+ method @Deprecated @androidx.compose.ui.ExperimentalComposeUiApi public static androidx.compose.ui.Modifier relocationRequester(androidx.compose.ui.Modifier, Object relocationRequester);
+ }
+
+ public interface Remeasurement {
+ method public void forceRemeasure();
+ }
+
+ public interface RemeasurementModifier extends androidx.compose.ui.Modifier.Element {
+ method public void onRemeasurementAvailable(androidx.compose.ui.layout.Remeasurement remeasurement);
+ }
+
+ @androidx.compose.runtime.Immutable @kotlin.jvm.JvmInline public final value class ScaleFactor {
+ method @androidx.compose.runtime.Stable public inline operator float component1();
+ method @androidx.compose.runtime.Stable public inline operator float component2();
+ method public long copy(optional float scaleX, optional float scaleY);
+ method @androidx.compose.runtime.Stable public operator long div(float operand);
+ method public float getScaleX();
+ method public float getScaleY();
+ method @androidx.compose.runtime.Stable public operator long times(float operand);
+ property public final float scaleX;
+ property public final float scaleY;
+ field public static final androidx.compose.ui.layout.ScaleFactor.Companion Companion;
+ }
+
+ public static final class ScaleFactor.Companion {
+ method public long getUnspecified();
+ property public final long Unspecified;
+ }
+
+ public final class ScaleFactorKt {
+ method @androidx.compose.runtime.Stable public static long ScaleFactor(float scaleX, float scaleY);
+ method @androidx.compose.runtime.Stable public static operator long div(long, long scaleFactor);
+ method public static inline boolean isSpecified(long);
+ method public static inline boolean isUnspecified(long);
+ method @androidx.compose.runtime.Stable public static long lerp(long start, long stop, float fraction);
+ method public static inline long takeOrElse(long, kotlin.jvm.functions.Function0<androidx.compose.ui.layout.ScaleFactor> block);
+ method @androidx.compose.runtime.Stable public static operator long times(long, long scaleFactor);
+ method @androidx.compose.runtime.Stable public static operator long times(long, long size);
+ }
+
+ public final class SubcomposeLayoutKt {
+ method @androidx.compose.runtime.Composable public static void SubcomposeLayout(optional androidx.compose.ui.Modifier modifier, kotlin.jvm.functions.Function2<? super androidx.compose.ui.layout.SubcomposeMeasureScope,? super androidx.compose.ui.unit.Constraints,? extends androidx.compose.ui.layout.MeasureResult> measurePolicy);
+ method @androidx.compose.runtime.Composable @androidx.compose.ui.UiComposable public static void SubcomposeLayout(androidx.compose.ui.layout.SubcomposeLayoutState state, optional androidx.compose.ui.Modifier modifier, kotlin.jvm.functions.Function2<? super androidx.compose.ui.layout.SubcomposeMeasureScope,? super androidx.compose.ui.unit.Constraints,? extends androidx.compose.ui.layout.MeasureResult> measurePolicy);
+ method public static androidx.compose.ui.layout.SubcomposeSlotReusePolicy SubcomposeSlotReusePolicy(int maxSlotsToRetainForReuse);
+ }
+
+ public final class SubcomposeLayoutState {
+ ctor public SubcomposeLayoutState(androidx.compose.ui.layout.SubcomposeSlotReusePolicy slotReusePolicy);
+ ctor public SubcomposeLayoutState();
+ ctor @Deprecated public SubcomposeLayoutState(int maxSlotsToRetainForReuse);
+ method public androidx.compose.ui.layout.SubcomposeLayoutState.PrecomposedSlotHandle precompose(Object? slotId, kotlin.jvm.functions.Function0<kotlin.Unit> content);
+ }
+
+ public static interface SubcomposeLayoutState.PrecomposedSlotHandle {
+ method public void dispose();
+ method public default int getPlaceablesCount();
+ method public default void premeasure(int index, long constraints);
+ property public default int placeablesCount;
+ }
+
+ public interface SubcomposeMeasureScope extends androidx.compose.ui.layout.MeasureScope {
+ method public java.util.List<androidx.compose.ui.layout.Measurable> subcompose(Object? slotId, kotlin.jvm.functions.Function0<kotlin.Unit> content);
+ }
+
+ public interface SubcomposeSlotReusePolicy {
+ method public boolean areCompatible(Object? slotId, Object? reusableSlotId);
+ method public void getSlotsToRetain(androidx.compose.ui.layout.SubcomposeSlotReusePolicy.SlotIdsSet slotIds);
+ }
+
+ public static final class SubcomposeSlotReusePolicy.SlotIdsSet implements java.util.Collection<java.lang.Object> kotlin.jvm.internal.markers.KMappedMarker {
+ method public void clear();
+ method public java.util.Iterator<java.lang.Object> iterator();
+ method public boolean remove(Object? slotId);
+ method public boolean removeAll(java.util.Collection<?> slotIds);
+ method public boolean removeAll(kotlin.jvm.functions.Function1<java.lang.Object,java.lang.Boolean> predicate);
+ method public boolean retainAll(java.util.Collection<?> slotIds);
+ method public boolean retainAll(kotlin.jvm.functions.Function1<java.lang.Object,java.lang.Boolean> predicate);
+ }
+
+ public final class TestModifierUpdaterKt {
+ }
+
+ public final class VerticalAlignmentLine extends androidx.compose.ui.layout.AlignmentLine {
+ ctor public VerticalAlignmentLine(kotlin.jvm.functions.Function2<? super java.lang.Integer,? super java.lang.Integer,java.lang.Integer> merger);
+ }
+
+}
+
+package androidx.compose.ui.modifier {
+
+ @androidx.compose.runtime.Stable public abstract sealed class ModifierLocal<T> {
+ }
+
+ @androidx.compose.runtime.Stable public interface ModifierLocalConsumer extends androidx.compose.ui.Modifier.Element {
+ method public void onModifierLocalsUpdated(androidx.compose.ui.modifier.ModifierLocalReadScope scope);
+ }
+
+ public final class ModifierLocalConsumerKt {
+ method @androidx.compose.runtime.Stable @androidx.compose.ui.ExperimentalComposeUiApi public static androidx.compose.ui.Modifier modifierLocalConsumer(androidx.compose.ui.Modifier, kotlin.jvm.functions.Function1<? super androidx.compose.ui.modifier.ModifierLocalReadScope,kotlin.Unit> consumer);
+ }
+
+ public final class ModifierLocalKt {
+ method public static <T> androidx.compose.ui.modifier.ProvidableModifierLocal<T> modifierLocalOf(kotlin.jvm.functions.Function0<? extends T> defaultFactory);
+ }
+
+ @androidx.compose.runtime.Stable public interface ModifierLocalProvider<T> extends androidx.compose.ui.Modifier.Element {
+ method public androidx.compose.ui.modifier.ProvidableModifierLocal<T> getKey();
+ method public T! getValue();
+ property public abstract androidx.compose.ui.modifier.ProvidableModifierLocal<T> key;
+ property public abstract T! value;
+ }
+
+ public final class ModifierLocalProviderKt {
+ method @androidx.compose.ui.ExperimentalComposeUiApi public static <T> androidx.compose.ui.Modifier modifierLocalProvider(androidx.compose.ui.Modifier, androidx.compose.ui.modifier.ProvidableModifierLocal<T> key, kotlin.jvm.functions.Function0<? extends T> value);
+ }
+
+ public interface ModifierLocalReadScope {
+ method public <T> T! getCurrent(androidx.compose.ui.modifier.ModifierLocal<T>);
+ }
+
+ @androidx.compose.runtime.Stable public final class ProvidableModifierLocal<T> extends androidx.compose.ui.modifier.ModifierLocal<T> {
+ ctor public ProvidableModifierLocal(kotlin.jvm.functions.Function0<? extends T> defaultFactory);
+ }
+
+}
+
+package androidx.compose.ui.node {
+
+ public final class HitTestResultKt {
+ }
+
+ @kotlin.RequiresOptIn(message="This API is internal to library.") @kotlin.annotation.Target(allowedTargets={kotlin.annotation.AnnotationTarget.CLASS, kotlin.annotation.AnnotationTarget.FUNCTION, kotlin.annotation.AnnotationTarget.PROPERTY, kotlin.annotation.AnnotationTarget.PROPERTY_GETTER, kotlin.annotation.AnnotationTarget.PROPERTY_SETTER}) public @interface InternalCoreApi {
+ }
+
+ public final class LayoutNodeKt {
+ }
+
+ public final class Ref<T> {
+ ctor public Ref();
+ method public T? getValue();
+ method public void setValue(T?);
+ property public final T? value;
+ }
+
+ public interface RootForTest {
+ method public androidx.compose.ui.unit.Density getDensity();
+ method public androidx.compose.ui.semantics.SemanticsOwner getSemanticsOwner();
+ method public androidx.compose.ui.text.input.TextInputService getTextInputService();
+ method public boolean sendKeyEvent(android.view.KeyEvent keyEvent);
+ property public abstract androidx.compose.ui.unit.Density density;
+ property public abstract androidx.compose.ui.semantics.SemanticsOwner semanticsOwner;
+ property public abstract androidx.compose.ui.text.input.TextInputService textInputService;
+ }
+
+ public final class ViewInterop_androidKt {
+ }
+
+}
+
+package androidx.compose.ui.platform {
+
+ public abstract class AbstractComposeView extends android.view.ViewGroup {
+ ctor public AbstractComposeView(android.content.Context context, optional android.util.AttributeSet? attrs, optional int defStyleAttr);
+ ctor public AbstractComposeView(android.content.Context context, optional android.util.AttributeSet? attrs);
+ ctor public AbstractComposeView(android.content.Context context);
+ method @androidx.compose.runtime.Composable public abstract void Content();
+ method public final void createComposition();
+ method public final void disposeComposition();
+ method public final boolean getHasComposition();
+ method protected boolean getShouldCreateCompositionOnAttachedToWindow();
+ method public final boolean getShowLayoutBounds();
+ method protected final void onLayout(boolean changed, int left, int top, int right, int bottom);
+ method protected final void onMeasure(int widthMeasureSpec, int heightMeasureSpec);
+ method public final void setParentCompositionContext(androidx.compose.runtime.CompositionContext? parent);
+ method public final void setShowLayoutBounds(boolean);
+ method public final void setViewCompositionStrategy(androidx.compose.ui.platform.ViewCompositionStrategy strategy);
+ property public final boolean hasComposition;
+ property protected boolean shouldCreateCompositionOnAttachedToWindow;
+ property public final boolean showLayoutBounds;
+ }
+
+ public interface AccessibilityManager {
+ method public long calculateRecommendedTimeoutMillis(long originalTimeoutMillis, optional boolean containsIcons, optional boolean containsText, optional boolean containsControls);
+ }
+
+ public final class AndroidClipboardManager_androidKt {
+ }
+
+ public final class AndroidComposeViewAccessibilityDelegateCompat_androidKt {
+ }
+
+ public final class AndroidComposeView_androidKt {
+ }
+
+ public final class AndroidCompositionLocals_androidKt {
+ method public static androidx.compose.runtime.ProvidableCompositionLocal<android.content.res.Configuration> getLocalConfiguration();
+ method public static androidx.compose.runtime.ProvidableCompositionLocal<android.content.Context> getLocalContext();
+ method public static androidx.compose.runtime.ProvidableCompositionLocal<androidx.lifecycle.LifecycleOwner> getLocalLifecycleOwner();
+ method public static androidx.compose.runtime.ProvidableCompositionLocal<androidx.savedstate.SavedStateRegistryOwner> getLocalSavedStateRegistryOwner();
+ method public static androidx.compose.runtime.ProvidableCompositionLocal<android.view.View> getLocalView();
+ property public static final androidx.compose.runtime.ProvidableCompositionLocal<android.content.res.Configuration> LocalConfiguration;
+ property public static final androidx.compose.runtime.ProvidableCompositionLocal<android.content.Context> LocalContext;
+ property public static final androidx.compose.runtime.ProvidableCompositionLocal<androidx.lifecycle.LifecycleOwner> LocalLifecycleOwner;
+ property public static final androidx.compose.runtime.ProvidableCompositionLocal<androidx.savedstate.SavedStateRegistryOwner> LocalSavedStateRegistryOwner;
+ property public static final androidx.compose.runtime.ProvidableCompositionLocal<android.view.View> LocalView;
+ }
+
+ public final class AndroidUiDispatcher extends kotlinx.coroutines.CoroutineDispatcher {
+ method public void dispatch(kotlin.coroutines.CoroutineContext context, Runnable block);
+ method public android.view.Choreographer getChoreographer();
+ method public androidx.compose.runtime.MonotonicFrameClock getFrameClock();
+ property public final android.view.Choreographer choreographer;
+ property public final androidx.compose.runtime.MonotonicFrameClock frameClock;
+ field public static final androidx.compose.ui.platform.AndroidUiDispatcher.Companion Companion;
+ }
+
+ public static final class AndroidUiDispatcher.Companion {
+ method public kotlin.coroutines.CoroutineContext getCurrentThread();
+ method public kotlin.coroutines.CoroutineContext getMain();
+ property public final kotlin.coroutines.CoroutineContext CurrentThread;
+ property public final kotlin.coroutines.CoroutineContext Main;
+ }
+
+ public final class AndroidUiDispatcher_androidKt {
+ }
+
+ public final class AndroidUiFrameClock implements androidx.compose.runtime.MonotonicFrameClock {
+ ctor public AndroidUiFrameClock(android.view.Choreographer choreographer);
+ method public android.view.Choreographer getChoreographer();
+ method public suspend <R> Object? withFrameNanos(kotlin.jvm.functions.Function1<? super java.lang.Long,? extends R> onFrame, kotlin.coroutines.Continuation<? super R>);
+ property public final android.view.Choreographer choreographer;
+ }
+
+ public final class AndroidUriHandler implements androidx.compose.ui.platform.UriHandler {
+ ctor public AndroidUriHandler(android.content.Context context);
+ method public void openUri(String uri);
+ }
+
+ public final class AndroidViewConfiguration implements androidx.compose.ui.platform.ViewConfiguration {
+ ctor public AndroidViewConfiguration(android.view.ViewConfiguration viewConfiguration);
+ method public long getDoubleTapMinTimeMillis();
+ method public long getDoubleTapTimeoutMillis();
+ method public long getLongPressTimeoutMillis();
+ method public float getTouchSlop();
+ property public long doubleTapMinTimeMillis;
+ property public long doubleTapTimeoutMillis;
+ property public long longPressTimeoutMillis;
+ property public float touchSlop;
+ }
+
+ public interface ClipboardManager {
+ method public androidx.compose.ui.text.AnnotatedString? getText();
+ method public void setText(androidx.compose.ui.text.AnnotatedString annotatedString);
+ }
+
+ public final class ComposeView extends androidx.compose.ui.platform.AbstractComposeView {
+ ctor public ComposeView(android.content.Context context, optional android.util.AttributeSet? attrs, optional int defStyleAttr);
+ ctor public ComposeView(android.content.Context context, optional android.util.AttributeSet? attrs);
+ ctor public ComposeView(android.content.Context context);
+ method @androidx.compose.runtime.Composable public void Content();
+ method public void setContent(kotlin.jvm.functions.Function0<kotlin.Unit> content);
+ property protected boolean shouldCreateCompositionOnAttachedToWindow;
+ }
+
+ public final class CompositionLocalsKt {
+ method public static androidx.compose.runtime.ProvidableCompositionLocal<androidx.compose.ui.platform.AccessibilityManager> getLocalAccessibilityManager();
+ method @androidx.compose.ui.ExperimentalComposeUiApi public static androidx.compose.runtime.ProvidableCompositionLocal<androidx.compose.ui.autofill.Autofill> getLocalAutofill();
+ method @androidx.compose.ui.ExperimentalComposeUiApi public static androidx.compose.runtime.ProvidableCompositionLocal<androidx.compose.ui.autofill.AutofillTree> getLocalAutofillTree();
+ method public static androidx.compose.runtime.ProvidableCompositionLocal<androidx.compose.ui.platform.ClipboardManager> getLocalClipboardManager();
+ method public static androidx.compose.runtime.ProvidableCompositionLocal<androidx.compose.ui.unit.Density> getLocalDensity();
+ method public static androidx.compose.runtime.ProvidableCompositionLocal<androidx.compose.ui.focus.FocusManager> getLocalFocusManager();
+ method public static androidx.compose.runtime.ProvidableCompositionLocal<androidx.compose.ui.text.font.FontFamily.Resolver> getLocalFontFamilyResolver();
+ method public static androidx.compose.runtime.ProvidableCompositionLocal<androidx.compose.ui.hapticfeedback.HapticFeedback> getLocalHapticFeedback();
+ method public static androidx.compose.runtime.ProvidableCompositionLocal<androidx.compose.ui.input.InputModeManager> getLocalInputModeManager();
+ method public static androidx.compose.runtime.ProvidableCompositionLocal<androidx.compose.ui.unit.LayoutDirection> getLocalLayoutDirection();
+ method public static androidx.compose.runtime.ProvidableCompositionLocal<androidx.compose.ui.text.input.TextInputService> getLocalTextInputService();
+ method public static androidx.compose.runtime.ProvidableCompositionLocal<androidx.compose.ui.platform.TextToolbar> getLocalTextToolbar();
+ method public static androidx.compose.runtime.ProvidableCompositionLocal<androidx.compose.ui.platform.UriHandler> getLocalUriHandler();
+ method public static androidx.compose.runtime.ProvidableCompositionLocal<androidx.compose.ui.platform.ViewConfiguration> getLocalViewConfiguration();
+ method public static androidx.compose.runtime.ProvidableCompositionLocal<androidx.compose.ui.platform.WindowInfo> getLocalWindowInfo();
+ property public static final androidx.compose.runtime.ProvidableCompositionLocal<androidx.compose.ui.platform.AccessibilityManager> LocalAccessibilityManager;
+ property @androidx.compose.ui.ExperimentalComposeUiApi public static final androidx.compose.runtime.ProvidableCompositionLocal<androidx.compose.ui.autofill.Autofill> LocalAutofill;
+ property @androidx.compose.ui.ExperimentalComposeUiApi public static final androidx.compose.runtime.ProvidableCompositionLocal<androidx.compose.ui.autofill.AutofillTree> LocalAutofillTree;
+ property public static final androidx.compose.runtime.ProvidableCompositionLocal<androidx.compose.ui.platform.ClipboardManager> LocalClipboardManager;
+ property public static final androidx.compose.runtime.ProvidableCompositionLocal<androidx.compose.ui.unit.Density> LocalDensity;
+ property public static final androidx.compose.runtime.ProvidableCompositionLocal<androidx.compose.ui.focus.FocusManager> LocalFocusManager;
+ property public static final androidx.compose.runtime.ProvidableCompositionLocal<androidx.compose.ui.text.font.FontFamily.Resolver> LocalFontFamilyResolver;
+ property public static final androidx.compose.runtime.ProvidableCompositionLocal<androidx.compose.ui.hapticfeedback.HapticFeedback> LocalHapticFeedback;
+ property public static final androidx.compose.runtime.ProvidableCompositionLocal<androidx.compose.ui.input.InputModeManager> LocalInputModeManager;
+ property public static final androidx.compose.runtime.ProvidableCompositionLocal<androidx.compose.ui.unit.LayoutDirection> LocalLayoutDirection;
+ property public static final androidx.compose.runtime.ProvidableCompositionLocal<androidx.compose.ui.text.input.TextInputService> LocalTextInputService;
+ property public static final androidx.compose.runtime.ProvidableCompositionLocal<androidx.compose.ui.platform.TextToolbar> LocalTextToolbar;
+ property public static final androidx.compose.runtime.ProvidableCompositionLocal<androidx.compose.ui.platform.UriHandler> LocalUriHandler;
+ property public static final androidx.compose.runtime.ProvidableCompositionLocal<androidx.compose.ui.platform.ViewConfiguration> LocalViewConfiguration;
+ property public static final androidx.compose.runtime.ProvidableCompositionLocal<androidx.compose.ui.platform.WindowInfo> LocalWindowInfo;
+ }
+
+ public final class DebugUtilsKt {
+ }
+
+ public final class DisposableSaveableStateRegistry_androidKt {
+ }
+
+ public interface InfiniteAnimationPolicy extends kotlin.coroutines.CoroutineContext.Element {
+ method public default kotlin.coroutines.CoroutineContext.Key<?> getKey();
+ method public suspend <R> Object? onInfiniteOperation(kotlin.jvm.functions.Function1<? super kotlin.coroutines.Continuation<? super R>,?> block, kotlin.coroutines.Continuation<? super R>);
+ property public default kotlin.coroutines.CoroutineContext.Key<?> key;
+ field public static final androidx.compose.ui.platform.InfiniteAnimationPolicy.Key Key;
+ }
+
+ public static final class InfiniteAnimationPolicy.Key implements kotlin.coroutines.CoroutineContext.Key<androidx.compose.ui.platform.InfiniteAnimationPolicy> {
+ }
+
+ public final class InfiniteAnimationPolicyKt {
+ }
+
+ public final class InspectableModifier extends androidx.compose.ui.platform.InspectorValueInfo implements androidx.compose.ui.Modifier.Element {
+ ctor public InspectableModifier(kotlin.jvm.functions.Function1<? super androidx.compose.ui.platform.InspectorInfo,kotlin.Unit> inspectorInfo);
+ method public androidx.compose.ui.platform.InspectableModifier.End getEnd();
+ property public final androidx.compose.ui.platform.InspectableModifier.End end;
+ }
+
+ public final class InspectableModifier.End implements androidx.compose.ui.Modifier.Element {
+ ctor public InspectableModifier.End();
+ }
+
+ public interface InspectableValue {
+ method public default kotlin.sequences.Sequence<androidx.compose.ui.platform.ValueElement> getInspectableElements();
+ method public default String? getNameFallback();
+ method public default Object? getValueOverride();
+ property public default kotlin.sequences.Sequence<androidx.compose.ui.platform.ValueElement> inspectableElements;
+ property public default String? nameFallback;
+ property public default Object? valueOverride;
+ }
+
+ public final class InspectableValueKt {
+ method public static inline kotlin.jvm.functions.Function1<androidx.compose.ui.platform.InspectorInfo,kotlin.Unit> debugInspectorInfo(kotlin.jvm.functions.Function1<? super androidx.compose.ui.platform.InspectorInfo,kotlin.Unit> definitions);
+ method public static kotlin.jvm.functions.Function1<androidx.compose.ui.platform.InspectorInfo,kotlin.Unit> getNoInspectorInfo();
+ method public static inline androidx.compose.ui.Modifier inspectable(androidx.compose.ui.Modifier, kotlin.jvm.functions.Function1<? super androidx.compose.ui.platform.InspectorInfo,kotlin.Unit> inspectorInfo, kotlin.jvm.functions.Function1<? super androidx.compose.ui.Modifier,? extends androidx.compose.ui.Modifier> factory);
+ method public static boolean isDebugInspectorInfoEnabled();
+ method public static void setDebugInspectorInfoEnabled(boolean);
+ property public static final kotlin.jvm.functions.Function1<androidx.compose.ui.platform.InspectorInfo,kotlin.Unit> NoInspectorInfo;
+ property public static final boolean isDebugInspectorInfoEnabled;
+ }
+
+ public final class InspectionModeKt {
+ method public static androidx.compose.runtime.ProvidableCompositionLocal<java.lang.Boolean> getLocalInspectionMode();
+ property public static final androidx.compose.runtime.ProvidableCompositionLocal<java.lang.Boolean> LocalInspectionMode;
+ }
+
+ public final class InspectorInfo {
+ ctor public InspectorInfo();
+ method public String? getName();
+ method public androidx.compose.ui.platform.ValueElementSequence getProperties();
+ method public Object? getValue();
+ method public void setName(String?);
+ method public void setValue(Object?);
+ property public final String? name;
+ property public final androidx.compose.ui.platform.ValueElementSequence properties;
+ property public final Object? value;
+ }
+
+ public abstract class InspectorValueInfo implements androidx.compose.ui.platform.InspectableValue {
+ ctor public InspectorValueInfo(kotlin.jvm.functions.Function1<? super androidx.compose.ui.platform.InspectorInfo,kotlin.Unit> info);
+ property public kotlin.sequences.Sequence<androidx.compose.ui.platform.ValueElement> inspectableElements;
+ property public String? nameFallback;
+ property public Object? valueOverride;
+ }
+
+ public final class InvertMatrixKt {
+ }
+
+ public final class JvmActuals_jvmKt {
+ }
+
+ @androidx.compose.ui.ExperimentalComposeUiApi public final class LocalSoftwareKeyboardController {
+ method @androidx.compose.runtime.Composable public androidx.compose.ui.platform.SoftwareKeyboardController? getCurrent();
+ method public infix androidx.compose.runtime.ProvidedValue<androidx.compose.ui.platform.SoftwareKeyboardController> provides(androidx.compose.ui.platform.SoftwareKeyboardController softwareKeyboardController);
+ property @androidx.compose.runtime.Composable public final androidx.compose.ui.platform.SoftwareKeyboardController? current;
+ field public static final androidx.compose.ui.platform.LocalSoftwareKeyboardController INSTANCE;
+ }
+
+ public final class NestedScrollInteropConnectionKt {
+ method @androidx.compose.runtime.Composable @androidx.compose.ui.ExperimentalComposeUiApi public static androidx.compose.ui.input.nestedscroll.NestedScrollConnection rememberNestedScrollInteropConnection();
+ }
+
+ public final class ShapeContainingUtilKt {
+ }
+
+ @androidx.compose.runtime.Stable @androidx.compose.ui.ExperimentalComposeUiApi public interface SoftwareKeyboardController {
+ method public void hide();
+ method @Deprecated public default void hideSoftwareKeyboard();
+ method public void show();
+ method @Deprecated public default void showSoftwareKeyboard();
+ }
+
+ public final class TestTagKt {
+ method @androidx.compose.runtime.Stable public static androidx.compose.ui.Modifier testTag(androidx.compose.ui.Modifier, String tag);
+ }
+
+ public interface TextToolbar {
+ method public androidx.compose.ui.platform.TextToolbarStatus getStatus();
+ method public void hide();
+ method public void showMenu(androidx.compose.ui.geometry.Rect rect, optional kotlin.jvm.functions.Function0<kotlin.Unit>? onCopyRequested, optional kotlin.jvm.functions.Function0<kotlin.Unit>? onPasteRequested, optional kotlin.jvm.functions.Function0<kotlin.Unit>? onCutRequested, optional kotlin.jvm.functions.Function0<kotlin.Unit>? onSelectAllRequested);
+ property public abstract androidx.compose.ui.platform.TextToolbarStatus status;
+ }
+
+ public enum TextToolbarStatus {
+ enum_constant public static final androidx.compose.ui.platform.TextToolbarStatus Hidden;
+ enum_constant public static final androidx.compose.ui.platform.TextToolbarStatus Shown;
+ }
+
+ public interface UriHandler {
+ method public void openUri(String uri);
+ }
+
+ public final class ValueElement {
+ ctor public ValueElement(String name, Object? value);
+ method public String component1();
+ method public Object? component2();
+ method public androidx.compose.ui.platform.ValueElement copy(String name, Object? value);
+ method public String getName();
+ method public Object? getValue();
+ property public final String name;
+ property public final Object? value;
+ }
+
+ public final class ValueElementSequence implements kotlin.sequences.Sequence<androidx.compose.ui.platform.ValueElement> {
+ ctor public ValueElementSequence();
+ method public java.util.Iterator<androidx.compose.ui.platform.ValueElement> iterator();
+ method public operator void set(String name, Object? value);
+ }
+
+ public interface ViewCompositionStrategy {
+ method public kotlin.jvm.functions.Function0<kotlin.Unit> installFor(androidx.compose.ui.platform.AbstractComposeView view);
+ field public static final androidx.compose.ui.platform.ViewCompositionStrategy.Companion Companion;
+ }
+
+ public static final class ViewCompositionStrategy.Companion {
+ method public androidx.compose.ui.platform.ViewCompositionStrategy getDefault();
+ property public final androidx.compose.ui.platform.ViewCompositionStrategy Default;
+ }
+
+ public static final class ViewCompositionStrategy.DisposeOnDetachedFromWindow implements androidx.compose.ui.platform.ViewCompositionStrategy {
+ method public kotlin.jvm.functions.Function0<kotlin.Unit> installFor(androidx.compose.ui.platform.AbstractComposeView view);
+ field public static final androidx.compose.ui.platform.ViewCompositionStrategy.DisposeOnDetachedFromWindow INSTANCE;
+ }
+
+ public static final class ViewCompositionStrategy.DisposeOnDetachedFromWindowOrReleasedFromPool implements androidx.compose.ui.platform.ViewCompositionStrategy {
+ method public kotlin.jvm.functions.Function0<kotlin.Unit> installFor(androidx.compose.ui.platform.AbstractComposeView view);
+ field public static final androidx.compose.ui.platform.ViewCompositionStrategy.DisposeOnDetachedFromWindowOrReleasedFromPool INSTANCE;
+ }
+
+ public static final class ViewCompositionStrategy.DisposeOnLifecycleDestroyed implements androidx.compose.ui.platform.ViewCompositionStrategy {
+ ctor public ViewCompositionStrategy.DisposeOnLifecycleDestroyed(androidx.lifecycle.Lifecycle lifecycle);
+ ctor public ViewCompositionStrategy.DisposeOnLifecycleDestroyed(androidx.lifecycle.LifecycleOwner lifecycleOwner);
+ method public kotlin.jvm.functions.Function0<kotlin.Unit> installFor(androidx.compose.ui.platform.AbstractComposeView view);
+ }
+
+ public static final class ViewCompositionStrategy.DisposeOnViewTreeLifecycleDestroyed implements androidx.compose.ui.platform.ViewCompositionStrategy {
+ method public kotlin.jvm.functions.Function0<kotlin.Unit> installFor(androidx.compose.ui.platform.AbstractComposeView view);
+ field public static final androidx.compose.ui.platform.ViewCompositionStrategy.DisposeOnViewTreeLifecycleDestroyed INSTANCE;
+ }
+
+ public final class ViewCompositionStrategy_androidKt {
+ }
+
+ public interface ViewConfiguration {
+ method public long getDoubleTapMinTimeMillis();
+ method public long getDoubleTapTimeoutMillis();
+ method public long getLongPressTimeoutMillis();
+ method public default long getMinimumTouchTargetSize();
+ method public float getTouchSlop();
+ property public abstract long doubleTapMinTimeMillis;
+ property public abstract long doubleTapTimeoutMillis;
+ property public abstract long longPressTimeoutMillis;
+ property public default long minimumTouchTargetSize;
+ property public abstract float touchSlop;
+ }
+
+ public interface ViewRootForInspector {
+ method public default androidx.compose.ui.platform.AbstractComposeView? getSubCompositionView();
+ method public default android.view.View? getViewRoot();
+ property public default androidx.compose.ui.platform.AbstractComposeView? subCompositionView;
+ property public default android.view.View? viewRoot;
+ }
+
+ @VisibleForTesting public interface ViewRootForTest extends androidx.compose.ui.node.RootForTest {
+ method public boolean getHasPendingMeasureOrLayout();
+ method public android.view.View getView();
+ method public void invalidateDescendants();
+ method public boolean isLifecycleInResumedState();
+ property public abstract boolean hasPendingMeasureOrLayout;
+ property public abstract boolean isLifecycleInResumedState;
+ property public abstract android.view.View view;
+ field public static final androidx.compose.ui.platform.ViewRootForTest.Companion Companion;
+ }
+
+ public static final class ViewRootForTest.Companion {
+ method public kotlin.jvm.functions.Function1<androidx.compose.ui.platform.ViewRootForTest,kotlin.Unit>? getOnViewCreatedCallback();
+ method public void setOnViewCreatedCallback(kotlin.jvm.functions.Function1<? super androidx.compose.ui.platform.ViewRootForTest,kotlin.Unit>?);
+ property public final kotlin.jvm.functions.Function1<androidx.compose.ui.platform.ViewRootForTest,kotlin.Unit>? onViewCreatedCallback;
+ }
+
+ @androidx.compose.runtime.Stable public interface WindowInfo {
+ method public boolean isWindowFocused();
+ property public abstract boolean isWindowFocused;
+ }
+
+ public final class WindowInfoKt {
+ }
+
+ @androidx.compose.ui.InternalComposeUiApi public fun interface WindowRecomposerFactory {
+ method public androidx.compose.runtime.Recomposer createRecomposer(android.view.View windowRootView);
+ field public static final androidx.compose.ui.platform.WindowRecomposerFactory.Companion Companion;
+ }
+
+ public static final class WindowRecomposerFactory.Companion {
+ method public androidx.compose.ui.platform.WindowRecomposerFactory getLifecycleAware();
+ property public final androidx.compose.ui.platform.WindowRecomposerFactory LifecycleAware;
+ }
+
+ @androidx.compose.ui.InternalComposeUiApi public final class WindowRecomposerPolicy {
+ method public void setFactory(androidx.compose.ui.platform.WindowRecomposerFactory factory);
+ method public inline <R> R! withFactory(androidx.compose.ui.platform.WindowRecomposerFactory factory, kotlin.jvm.functions.Function0<? extends R> block);
+ field public static final androidx.compose.ui.platform.WindowRecomposerPolicy INSTANCE;
+ }
+
+ public final class WindowRecomposer_androidKt {
+ method @androidx.compose.ui.ExperimentalComposeUiApi public static androidx.compose.runtime.Recomposer createLifecycleAwareWindowRecomposer(android.view.View, optional kotlin.coroutines.CoroutineContext coroutineContext, optional androidx.lifecycle.Lifecycle? lifecycle);
+ method public static androidx.compose.runtime.CompositionContext? findViewTreeCompositionContext(android.view.View);
+ method public static androidx.compose.runtime.CompositionContext? getCompositionContext(android.view.View);
+ method public static void setCompositionContext(android.view.View, androidx.compose.runtime.CompositionContext?);
+ }
+
+ public final class Wrapper_androidKt {
+ }
+
+}
+
+package androidx.compose.ui.platform.accessibility {
+
+ public final class CollectionInfoKt {
+ }
+
+}
+
+package androidx.compose.ui.platform.actionmodecallback {
+
+ public final class TextActionModeCallback_androidKt {
+ }
+
+}
+
+package androidx.compose.ui.res {
+
+ public final class ColorResources_androidKt {
+ method @androidx.compose.runtime.Composable @androidx.compose.runtime.ReadOnlyComposable public static long colorResource(@ColorRes int id);
+ }
+
+ public final class FontResources_androidKt {
+ method @Deprecated @androidx.compose.runtime.Composable @androidx.compose.runtime.ReadOnlyComposable public static androidx.compose.ui.text.font.Typeface fontResource(androidx.compose.ui.text.font.FontFamily fontFamily);
+ }
+
+ public final class ImageResources_androidKt {
+ method public static androidx.compose.ui.graphics.ImageBitmap imageResource(androidx.compose.ui.graphics.ImageBitmap.Companion, android.content.res.Resources res, @DrawableRes int id);
+ method @androidx.compose.runtime.Composable public static androidx.compose.ui.graphics.ImageBitmap imageResource(androidx.compose.ui.graphics.ImageBitmap.Companion, @DrawableRes int id);
+ }
+
+ public final class PainterResources_androidKt {
+ method @androidx.compose.runtime.Composable public static androidx.compose.ui.graphics.painter.Painter painterResource(@DrawableRes int id);
+ }
+
+ public final class PrimitiveResources_androidKt {
+ method @androidx.compose.runtime.Composable @androidx.compose.runtime.ReadOnlyComposable public static boolean booleanResource(@BoolRes int id);
+ method @androidx.compose.runtime.Composable @androidx.compose.runtime.ReadOnlyComposable public static float dimensionResource(@DimenRes int id);
+ method @androidx.compose.runtime.Composable @androidx.compose.runtime.ReadOnlyComposable public static int[] integerArrayResource(@ArrayRes int id);
+ method @androidx.compose.runtime.Composable @androidx.compose.runtime.ReadOnlyComposable public static int integerResource(@IntegerRes int id);
+ }
+
+ public final class StringResources_androidKt {
+ method @androidx.compose.runtime.Composable @androidx.compose.runtime.ReadOnlyComposable @androidx.compose.ui.ExperimentalComposeUiApi public static String pluralStringResource(@PluralsRes int id, int count);
+ method @androidx.compose.runtime.Composable @androidx.compose.runtime.ReadOnlyComposable @androidx.compose.ui.ExperimentalComposeUiApi public static String pluralStringResource(@PluralsRes int id, int count, java.lang.Object... formatArgs);
+ method @androidx.compose.runtime.Composable @androidx.compose.runtime.ReadOnlyComposable public static String![] stringArrayResource(@ArrayRes int id);
+ method @androidx.compose.runtime.Composable @androidx.compose.runtime.ReadOnlyComposable public static String stringResource(@StringRes int id);
+ method @androidx.compose.runtime.Composable @androidx.compose.runtime.ReadOnlyComposable public static String stringResource(@StringRes int id, java.lang.Object... formatArgs);
+ }
+
+ public final class VectorResources_androidKt {
+ method @androidx.compose.runtime.Composable public static androidx.compose.ui.graphics.vector.ImageVector vectorResource(androidx.compose.ui.graphics.vector.ImageVector.Companion, @DrawableRes int id);
+ method @kotlin.jvm.Throws(exceptionClasses=XmlPullParserException::class) public static androidx.compose.ui.graphics.vector.ImageVector vectorResource(androidx.compose.ui.graphics.vector.ImageVector.Companion, optional android.content.res.Resources.Theme? theme, android.content.res.Resources res, int resId) throws org.xmlpull.v1.XmlPullParserException;
+ }
+
+}
+
+package androidx.compose.ui.semantics {
+
+ public final class AccessibilityAction<T extends kotlin.Function<? extends java.lang.Boolean>> {
+ ctor public AccessibilityAction(String? label, T? action);
+ method public T? getAction();
+ method public String? getLabel();
+ property public final T? action;
+ property public final String? label;
+ }
+
+ public final class CollectionInfo {
+ ctor public CollectionInfo(int rowCount, int columnCount);
+ method public int getColumnCount();
+ method public int getRowCount();
+ property public final int columnCount;
+ property public final int rowCount;
+ }
+
+ public final class CollectionItemInfo {
+ ctor public CollectionItemInfo(int rowIndex, int rowSpan, int columnIndex, int columnSpan);
+ method public int getColumnIndex();
+ method public int getColumnSpan();
+ method public int getRowIndex();
+ method public int getRowSpan();
+ property public final int columnIndex;
+ property public final int columnSpan;
+ property public final int rowIndex;
+ property public final int rowSpan;
+ }
+
+ public final class CustomAccessibilityAction {
+ ctor public CustomAccessibilityAction(String label, kotlin.jvm.functions.Function0<java.lang.Boolean> action);
+ method public kotlin.jvm.functions.Function0<java.lang.Boolean> getAction();
+ method public String getLabel();
+ property public final kotlin.jvm.functions.Function0<java.lang.Boolean> action;
+ property public final String label;
+ }
+
+ @androidx.compose.runtime.Immutable @kotlin.jvm.JvmInline public final value class LiveRegionMode {
+ field public static final androidx.compose.ui.semantics.LiveRegionMode.Companion Companion;
+ }
+
+ public static final class LiveRegionMode.Companion {
+ method public int getAssertive();
+ method public int getPolite();
+ property public final int Assertive;
+ property public final int Polite;
+ }
+
+ public final class ProgressBarRangeInfo {
+ ctor public ProgressBarRangeInfo(float current, kotlin.ranges.ClosedFloatingPointRange<java.lang.Float> range, optional int steps);
+ method public float getCurrent();
+ method public kotlin.ranges.ClosedFloatingPointRange<java.lang.Float> getRange();
+ method public int getSteps();
+ property public final float current;
+ property public final kotlin.ranges.ClosedFloatingPointRange<java.lang.Float> range;
+ property public final int steps;
+ field public static final androidx.compose.ui.semantics.ProgressBarRangeInfo.Companion Companion;
+ }
+
+ public static final class ProgressBarRangeInfo.Companion {
+ method public androidx.compose.ui.semantics.ProgressBarRangeInfo getIndeterminate();
+ property public final androidx.compose.ui.semantics.ProgressBarRangeInfo Indeterminate;
+ }
+
+ @androidx.compose.runtime.Immutable @kotlin.jvm.JvmInline public final value class Role {
+ field public static final androidx.compose.ui.semantics.Role.Companion Companion;
+ }
+
+ public static final class Role.Companion {
+ method public int getButton();
+ method public int getCheckbox();
+ method public int getImage();
+ method public int getRadioButton();
+ method public int getSwitch();
+ method public int getTab();
+ property public final int Button;
+ property public final int Checkbox;
+ property public final int Image;
+ property public final int RadioButton;
+ property public final int Switch;
+ property public final int Tab;
+ }
+
+ public final class ScrollAxisRange {
+ ctor public ScrollAxisRange(kotlin.jvm.functions.Function0<java.lang.Float> value, kotlin.jvm.functions.Function0<java.lang.Float> maxValue, optional boolean reverseScrolling);
+ method public kotlin.jvm.functions.Function0<java.lang.Float> getMaxValue();
+ method public boolean getReverseScrolling();
+ method public kotlin.jvm.functions.Function0<java.lang.Float> getValue();
+ property public final kotlin.jvm.functions.Function0<java.lang.Float> maxValue;
+ property public final boolean reverseScrolling;
+ property public final kotlin.jvm.functions.Function0<java.lang.Float> value;
+ }
+
+ public final class SemanticsActions {
+ method public androidx.compose.ui.semantics.SemanticsPropertyKey<androidx.compose.ui.semantics.AccessibilityAction<kotlin.jvm.functions.Function0<java.lang.Boolean>>> getCollapse();
+ method public androidx.compose.ui.semantics.SemanticsPropertyKey<androidx.compose.ui.semantics.AccessibilityAction<kotlin.jvm.functions.Function0<java.lang.Boolean>>> getCopyText();
+ method public androidx.compose.ui.semantics.SemanticsPropertyKey<java.util.List<androidx.compose.ui.semantics.CustomAccessibilityAction>> getCustomActions();
+ method public androidx.compose.ui.semantics.SemanticsPropertyKey<androidx.compose.ui.semantics.AccessibilityAction<kotlin.jvm.functions.Function0<java.lang.Boolean>>> getCutText();
+ method public androidx.compose.ui.semantics.SemanticsPropertyKey<androidx.compose.ui.semantics.AccessibilityAction<kotlin.jvm.functions.Function0<java.lang.Boolean>>> getDismiss();
+ method public androidx.compose.ui.semantics.SemanticsPropertyKey<androidx.compose.ui.semantics.AccessibilityAction<kotlin.jvm.functions.Function0<java.lang.Boolean>>> getExpand();
+ method public androidx.compose.ui.semantics.SemanticsPropertyKey<androidx.compose.ui.semantics.AccessibilityAction<kotlin.jvm.functions.Function1<java.util.List<androidx.compose.ui.text.TextLayoutResult>,java.lang.Boolean>>> getGetTextLayoutResult();
+ method public androidx.compose.ui.semantics.SemanticsPropertyKey<androidx.compose.ui.semantics.AccessibilityAction<kotlin.jvm.functions.Function0<java.lang.Boolean>>> getOnClick();
+ method public androidx.compose.ui.semantics.SemanticsPropertyKey<androidx.compose.ui.semantics.AccessibilityAction<kotlin.jvm.functions.Function0<java.lang.Boolean>>> getOnLongClick();
+ method public androidx.compose.ui.semantics.SemanticsPropertyKey<androidx.compose.ui.semantics.AccessibilityAction<kotlin.jvm.functions.Function0<java.lang.Boolean>>> getPasteText();
+ method public androidx.compose.ui.semantics.SemanticsPropertyKey<androidx.compose.ui.semantics.AccessibilityAction<kotlin.jvm.functions.Function0<java.lang.Boolean>>> getRequestFocus();
+ method public androidx.compose.ui.semantics.SemanticsPropertyKey<androidx.compose.ui.semantics.AccessibilityAction<kotlin.jvm.functions.Function2<java.lang.Float,java.lang.Float,java.lang.Boolean>>> getScrollBy();
+ method public androidx.compose.ui.semantics.SemanticsPropertyKey<androidx.compose.ui.semantics.AccessibilityAction<kotlin.jvm.functions.Function1<java.lang.Integer,java.lang.Boolean>>> getScrollToIndex();
+ method public androidx.compose.ui.semantics.SemanticsPropertyKey<androidx.compose.ui.semantics.AccessibilityAction<kotlin.jvm.functions.Function1<java.lang.Float,java.lang.Boolean>>> getSetProgress();
+ method public androidx.compose.ui.semantics.SemanticsPropertyKey<androidx.compose.ui.semantics.AccessibilityAction<kotlin.jvm.functions.Function3<java.lang.Integer,java.lang.Integer,java.lang.Boolean,java.lang.Boolean>>> getSetSelection();
+ method public androidx.compose.ui.semantics.SemanticsPropertyKey<androidx.compose.ui.semantics.AccessibilityAction<kotlin.jvm.functions.Function1<androidx.compose.ui.text.AnnotatedString,java.lang.Boolean>>> getSetText();
+ property public final androidx.compose.ui.semantics.SemanticsPropertyKey<androidx.compose.ui.semantics.AccessibilityAction<kotlin.jvm.functions.Function0<java.lang.Boolean>>> Collapse;
+ property public final androidx.compose.ui.semantics.SemanticsPropertyKey<androidx.compose.ui.semantics.AccessibilityAction<kotlin.jvm.functions.Function0<java.lang.Boolean>>> CopyText;
+ property public final androidx.compose.ui.semantics.SemanticsPropertyKey<java.util.List<androidx.compose.ui.semantics.CustomAccessibilityAction>> CustomActions;
+ property public final androidx.compose.ui.semantics.SemanticsPropertyKey<androidx.compose.ui.semantics.AccessibilityAction<kotlin.jvm.functions.Function0<java.lang.Boolean>>> CutText;
+ property public final androidx.compose.ui.semantics.SemanticsPropertyKey<androidx.compose.ui.semantics.AccessibilityAction<kotlin.jvm.functions.Function0<java.lang.Boolean>>> Dismiss;
+ property public final androidx.compose.ui.semantics.SemanticsPropertyKey<androidx.compose.ui.semantics.AccessibilityAction<kotlin.jvm.functions.Function0<java.lang.Boolean>>> Expand;
+ property public final androidx.compose.ui.semantics.SemanticsPropertyKey<androidx.compose.ui.semantics.AccessibilityAction<kotlin.jvm.functions.Function1<java.util.List<androidx.compose.ui.text.TextLayoutResult>,java.lang.Boolean>>> GetTextLayoutResult;
+ property public final androidx.compose.ui.semantics.SemanticsPropertyKey<androidx.compose.ui.semantics.AccessibilityAction<kotlin.jvm.functions.Function0<java.lang.Boolean>>> OnClick;
+ property public final androidx.compose.ui.semantics.SemanticsPropertyKey<androidx.compose.ui.semantics.AccessibilityAction<kotlin.jvm.functions.Function0<java.lang.Boolean>>> OnLongClick;
+ property public final androidx.compose.ui.semantics.SemanticsPropertyKey<androidx.compose.ui.semantics.AccessibilityAction<kotlin.jvm.functions.Function0<java.lang.Boolean>>> PasteText;
+ property public final androidx.compose.ui.semantics.SemanticsPropertyKey<androidx.compose.ui.semantics.AccessibilityAction<kotlin.jvm.functions.Function0<java.lang.Boolean>>> RequestFocus;
+ property public final androidx.compose.ui.semantics.SemanticsPropertyKey<androidx.compose.ui.semantics.AccessibilityAction<kotlin.jvm.functions.Function2<java.lang.Float,java.lang.Float,java.lang.Boolean>>> ScrollBy;
+ property public final androidx.compose.ui.semantics.SemanticsPropertyKey<androidx.compose.ui.semantics.AccessibilityAction<kotlin.jvm.functions.Function1<java.lang.Integer,java.lang.Boolean>>> ScrollToIndex;
+ property public final androidx.compose.ui.semantics.SemanticsPropertyKey<androidx.compose.ui.semantics.AccessibilityAction<kotlin.jvm.functions.Function1<java.lang.Float,java.lang.Boolean>>> SetProgress;
+ property public final androidx.compose.ui.semantics.SemanticsPropertyKey<androidx.compose.ui.semantics.AccessibilityAction<kotlin.jvm.functions.Function3<java.lang.Integer,java.lang.Integer,java.lang.Boolean,java.lang.Boolean>>> SetSelection;
+ property public final androidx.compose.ui.semantics.SemanticsPropertyKey<androidx.compose.ui.semantics.AccessibilityAction<kotlin.jvm.functions.Function1<androidx.compose.ui.text.AnnotatedString,java.lang.Boolean>>> SetText;
+ field public static final androidx.compose.ui.semantics.SemanticsActions INSTANCE;
+ }
+
+ public final class SemanticsConfiguration implements java.lang.Iterable<java.util.Map.Entry<? extends androidx.compose.ui.semantics.SemanticsPropertyKey<?>,?>> kotlin.jvm.internal.markers.KMappedMarker androidx.compose.ui.semantics.SemanticsPropertyReceiver {
+ ctor public SemanticsConfiguration();
+ method public operator <T> boolean contains(androidx.compose.ui.semantics.SemanticsPropertyKey<T> key);
+ method public androidx.compose.ui.semantics.SemanticsConfiguration copy();
+ method public operator <T> T! get(androidx.compose.ui.semantics.SemanticsPropertyKey<T> key);
+ method public <T> T! getOrElse(androidx.compose.ui.semantics.SemanticsPropertyKey<T> key, kotlin.jvm.functions.Function0<? extends T> defaultValue);
+ method public <T> T? getOrElseNullable(androidx.compose.ui.semantics.SemanticsPropertyKey<T> key, kotlin.jvm.functions.Function0<? extends T> defaultValue);
+ method public boolean isClearingSemantics();
+ method public boolean isMergingSemanticsOfDescendants();
+ method public java.util.Iterator<java.util.Map.Entry<androidx.compose.ui.semantics.SemanticsPropertyKey<?>,java.lang.Object>> iterator();
+ method public <T> void set(androidx.compose.ui.semantics.SemanticsPropertyKey<T> key, T? value);
+ method public void setClearingSemantics(boolean);
+ method public void setMergingSemanticsOfDescendants(boolean);
+ property public final boolean isClearingSemantics;
+ property public final boolean isMergingSemanticsOfDescendants;
+ }
+
+ public final class SemanticsConfigurationKt {
+ method public static <T> T? getOrNull(androidx.compose.ui.semantics.SemanticsConfiguration, androidx.compose.ui.semantics.SemanticsPropertyKey<T> key);
+ }
+
+ public interface SemanticsModifier extends androidx.compose.ui.Modifier.Element {
+ method public int getId();
+ method public androidx.compose.ui.semantics.SemanticsConfiguration getSemanticsConfiguration();
+ property public abstract int id;
+ property public abstract androidx.compose.ui.semantics.SemanticsConfiguration semanticsConfiguration;
+ }
+
+ public final class SemanticsModifierKt {
+ method public static androidx.compose.ui.Modifier clearAndSetSemantics(androidx.compose.ui.Modifier, kotlin.jvm.functions.Function1<? super androidx.compose.ui.semantics.SemanticsPropertyReceiver,kotlin.Unit> properties);
+ method public static androidx.compose.ui.Modifier semantics(androidx.compose.ui.Modifier, optional boolean mergeDescendants, kotlin.jvm.functions.Function1<? super androidx.compose.ui.semantics.SemanticsPropertyReceiver,kotlin.Unit> properties);
+ }
+
+ public final class SemanticsNode {
+ method public int getAlignmentLinePosition(androidx.compose.ui.layout.AlignmentLine alignmentLine);
+ method public androidx.compose.ui.geometry.Rect getBoundsInRoot();
+ method public androidx.compose.ui.geometry.Rect getBoundsInWindow();
+ method public java.util.List<androidx.compose.ui.semantics.SemanticsNode> getChildren();
+ method public androidx.compose.ui.semantics.SemanticsConfiguration getConfig();
+ method public int getId();
+ method public androidx.compose.ui.layout.LayoutInfo getLayoutInfo();
+ method public boolean getMergingEnabled();
+ method public androidx.compose.ui.semantics.SemanticsNode? getParent();
+ method public long getPositionInRoot();
+ method public long getPositionInWindow();
+ method public androidx.compose.ui.node.RootForTest? getRoot();
+ method public long getSize();
+ method public androidx.compose.ui.geometry.Rect getTouchBoundsInRoot();
+ method public boolean isRoot();
+ property public final androidx.compose.ui.geometry.Rect boundsInRoot;
+ property public final androidx.compose.ui.geometry.Rect boundsInWindow;
+ property public final java.util.List<androidx.compose.ui.semantics.SemanticsNode> children;
+ property public final androidx.compose.ui.semantics.SemanticsConfiguration config;
+ property public final int id;
+ property public final boolean isRoot;
+ property public final androidx.compose.ui.layout.LayoutInfo layoutInfo;
+ property public final boolean mergingEnabled;
+ property public final androidx.compose.ui.semantics.SemanticsNode? parent;
+ property public final long positionInRoot;
+ property public final long positionInWindow;
+ property public final androidx.compose.ui.node.RootForTest? root;
+ property public final long size;
+ property public final androidx.compose.ui.geometry.Rect touchBoundsInRoot;
+ }
+
+ public final class SemanticsNodeKt {
+ }
+
+ public final class SemanticsOwner {
+ method public androidx.compose.ui.semantics.SemanticsNode getRootSemanticsNode();
+ method public androidx.compose.ui.semantics.SemanticsNode getUnmergedRootSemanticsNode();
+ property public final androidx.compose.ui.semantics.SemanticsNode rootSemanticsNode;
+ property public final androidx.compose.ui.semantics.SemanticsNode unmergedRootSemanticsNode;
+ }
+
+ public final class SemanticsOwnerKt {
+ method public static java.util.List<androidx.compose.ui.semantics.SemanticsNode> getAllSemanticsNodes(androidx.compose.ui.semantics.SemanticsOwner, boolean mergingEnabled);
+ }
+
+ public final class SemanticsProperties {
+ method public androidx.compose.ui.semantics.SemanticsPropertyKey<androidx.compose.ui.semantics.CollectionInfo> getCollectionInfo();
+ method public androidx.compose.ui.semantics.SemanticsPropertyKey<androidx.compose.ui.semantics.CollectionItemInfo> getCollectionItemInfo();
+ method public androidx.compose.ui.semantics.SemanticsPropertyKey<java.util.List<java.lang.String>> getContentDescription();
+ method public androidx.compose.ui.semantics.SemanticsPropertyKey<kotlin.Unit> getDisabled();
+ method public androidx.compose.ui.semantics.SemanticsPropertyKey<androidx.compose.ui.text.AnnotatedString> getEditableText();
+ method public androidx.compose.ui.semantics.SemanticsPropertyKey<java.lang.String> getError();
+ method public androidx.compose.ui.semantics.SemanticsPropertyKey<java.lang.Boolean> getFocused();
+ method public androidx.compose.ui.semantics.SemanticsPropertyKey<kotlin.Unit> getHeading();
+ method public androidx.compose.ui.semantics.SemanticsPropertyKey<androidx.compose.ui.semantics.ScrollAxisRange> getHorizontalScrollAxisRange();
+ method public androidx.compose.ui.semantics.SemanticsPropertyKey<androidx.compose.ui.text.input.ImeAction> getImeAction();
+ method public androidx.compose.ui.semantics.SemanticsPropertyKey<kotlin.jvm.functions.Function1<java.lang.Object,java.lang.Integer>> getIndexForKey();
+ method public androidx.compose.ui.semantics.SemanticsPropertyKey<kotlin.Unit> getInvisibleToUser();
+ method public androidx.compose.ui.semantics.SemanticsPropertyKey<kotlin.Unit> getIsDialog();
+ method public androidx.compose.ui.semantics.SemanticsPropertyKey<kotlin.Unit> getIsPopup();
+ method public androidx.compose.ui.semantics.SemanticsPropertyKey<androidx.compose.ui.semantics.LiveRegionMode> getLiveRegion();
+ method public androidx.compose.ui.semantics.SemanticsPropertyKey<java.lang.String> getPaneTitle();
+ method public androidx.compose.ui.semantics.SemanticsPropertyKey<kotlin.Unit> getPassword();
+ method public androidx.compose.ui.semantics.SemanticsPropertyKey<androidx.compose.ui.semantics.ProgressBarRangeInfo> getProgressBarRangeInfo();
+ method public androidx.compose.ui.semantics.SemanticsPropertyKey<androidx.compose.ui.semantics.Role> getRole();
+ method public androidx.compose.ui.semantics.SemanticsPropertyKey<kotlin.Unit> getSelectableGroup();
+ method public androidx.compose.ui.semantics.SemanticsPropertyKey<java.lang.Boolean> getSelected();
+ method public androidx.compose.ui.semantics.SemanticsPropertyKey<java.lang.String> getStateDescription();
+ method public androidx.compose.ui.semantics.SemanticsPropertyKey<java.lang.String> getTestTag();
+ method public androidx.compose.ui.semantics.SemanticsPropertyKey<java.util.List<androidx.compose.ui.text.AnnotatedString>> getText();
+ method public androidx.compose.ui.semantics.SemanticsPropertyKey<androidx.compose.ui.text.TextRange> getTextSelectionRange();
+ method public androidx.compose.ui.semantics.SemanticsPropertyKey<androidx.compose.ui.state.ToggleableState> getToggleableState();
+ method public androidx.compose.ui.semantics.SemanticsPropertyKey<androidx.compose.ui.semantics.ScrollAxisRange> getVerticalScrollAxisRange();
+ property public final androidx.compose.ui.semantics.SemanticsPropertyKey<androidx.compose.ui.semantics.CollectionInfo> CollectionInfo;
+ property public final androidx.compose.ui.semantics.SemanticsPropertyKey<androidx.compose.ui.semantics.CollectionItemInfo> CollectionItemInfo;
+ property public final androidx.compose.ui.semantics.SemanticsPropertyKey<java.util.List<java.lang.String>> ContentDescription;
+ property public final androidx.compose.ui.semantics.SemanticsPropertyKey<kotlin.Unit> Disabled;
+ property public final androidx.compose.ui.semantics.SemanticsPropertyKey<androidx.compose.ui.text.AnnotatedString> EditableText;
+ property public final androidx.compose.ui.semantics.SemanticsPropertyKey<java.lang.String> Error;
+ property public final androidx.compose.ui.semantics.SemanticsPropertyKey<java.lang.Boolean> Focused;
+ property public final androidx.compose.ui.semantics.SemanticsPropertyKey<kotlin.Unit> Heading;
+ property public final androidx.compose.ui.semantics.SemanticsPropertyKey<androidx.compose.ui.semantics.ScrollAxisRange> HorizontalScrollAxisRange;
+ property public final androidx.compose.ui.semantics.SemanticsPropertyKey<androidx.compose.ui.text.input.ImeAction> ImeAction;
+ property public final androidx.compose.ui.semantics.SemanticsPropertyKey<kotlin.jvm.functions.Function1<java.lang.Object,java.lang.Integer>> IndexForKey;
+ property public final androidx.compose.ui.semantics.SemanticsPropertyKey<kotlin.Unit> InvisibleToUser;
+ property public final androidx.compose.ui.semantics.SemanticsPropertyKey<kotlin.Unit> IsDialog;
+ property public final androidx.compose.ui.semantics.SemanticsPropertyKey<kotlin.Unit> IsPopup;
+ property public final androidx.compose.ui.semantics.SemanticsPropertyKey<androidx.compose.ui.semantics.LiveRegionMode> LiveRegion;
+ property public final androidx.compose.ui.semantics.SemanticsPropertyKey<java.lang.String> PaneTitle;
+ property public final androidx.compose.ui.semantics.SemanticsPropertyKey<kotlin.Unit> Password;
+ property public final androidx.compose.ui.semantics.SemanticsPropertyKey<androidx.compose.ui.semantics.ProgressBarRangeInfo> ProgressBarRangeInfo;
+ property public final androidx.compose.ui.semantics.SemanticsPropertyKey<androidx.compose.ui.semantics.Role> Role;
+ property public final androidx.compose.ui.semantics.SemanticsPropertyKey<kotlin.Unit> SelectableGroup;
+ property public final androidx.compose.ui.semantics.SemanticsPropertyKey<java.lang.Boolean> Selected;
+ property public final androidx.compose.ui.semantics.SemanticsPropertyKey<java.lang.String> StateDescription;
+ property public final androidx.compose.ui.semantics.SemanticsPropertyKey<java.lang.String> TestTag;
+ property public final androidx.compose.ui.semantics.SemanticsPropertyKey<java.util.List<androidx.compose.ui.text.AnnotatedString>> Text;
+ property public final androidx.compose.ui.semantics.SemanticsPropertyKey<androidx.compose.ui.text.TextRange> TextSelectionRange;
+ property public final androidx.compose.ui.semantics.SemanticsPropertyKey<androidx.compose.ui.state.ToggleableState> ToggleableState;
+ property public final androidx.compose.ui.semantics.SemanticsPropertyKey<androidx.compose.ui.semantics.ScrollAxisRange> VerticalScrollAxisRange;
+ field public static final androidx.compose.ui.semantics.SemanticsProperties INSTANCE;
+ }
+
+ @androidx.compose.ui.ExperimentalComposeUiApi public final class SemanticsPropertiesAndroid {
+ method @androidx.compose.ui.ExperimentalComposeUiApi public androidx.compose.ui.semantics.SemanticsPropertyKey<java.lang.Boolean> getTestTagsAsResourceId();
+ property @androidx.compose.ui.ExperimentalComposeUiApi public final androidx.compose.ui.semantics.SemanticsPropertyKey<java.lang.Boolean> TestTagsAsResourceId;
+ field public static final androidx.compose.ui.semantics.SemanticsPropertiesAndroid INSTANCE;
+ }
+
+ public final class SemanticsPropertiesKt {
+ method public static void collapse(androidx.compose.ui.semantics.SemanticsPropertyReceiver, optional String? label, kotlin.jvm.functions.Function0<java.lang.Boolean>? action);
+ method public static void copyText(androidx.compose.ui.semantics.SemanticsPropertyReceiver, optional String? label, kotlin.jvm.functions.Function0<java.lang.Boolean>? action);
+ method public static void cutText(androidx.compose.ui.semantics.SemanticsPropertyReceiver, optional String? label, kotlin.jvm.functions.Function0<java.lang.Boolean>? action);
+ method public static void dialog(androidx.compose.ui.semantics.SemanticsPropertyReceiver);
+ method public static void disabled(androidx.compose.ui.semantics.SemanticsPropertyReceiver);
+ method public static void dismiss(androidx.compose.ui.semantics.SemanticsPropertyReceiver, optional String? label, kotlin.jvm.functions.Function0<java.lang.Boolean>? action);
+ method public static void error(androidx.compose.ui.semantics.SemanticsPropertyReceiver, String description);
+ method public static void expand(androidx.compose.ui.semantics.SemanticsPropertyReceiver, optional String? label, kotlin.jvm.functions.Function0<java.lang.Boolean>? action);
+ method public static androidx.compose.ui.semantics.CollectionInfo getCollectionInfo(androidx.compose.ui.semantics.SemanticsPropertyReceiver);
+ method public static androidx.compose.ui.semantics.CollectionItemInfo getCollectionItemInfo(androidx.compose.ui.semantics.SemanticsPropertyReceiver);
+ method public static String getContentDescription(androidx.compose.ui.semantics.SemanticsPropertyReceiver);
+ method public static java.util.List<androidx.compose.ui.semantics.CustomAccessibilityAction> getCustomActions(androidx.compose.ui.semantics.SemanticsPropertyReceiver);
+ method public static androidx.compose.ui.text.AnnotatedString getEditableText(androidx.compose.ui.semantics.SemanticsPropertyReceiver);
+ method public static boolean getFocused(androidx.compose.ui.semantics.SemanticsPropertyReceiver);
+ method public static androidx.compose.ui.semantics.ScrollAxisRange getHorizontalScrollAxisRange(androidx.compose.ui.semantics.SemanticsPropertyReceiver);
+ method public static int getImeAction(androidx.compose.ui.semantics.SemanticsPropertyReceiver);
+ method public static int getLiveRegion(androidx.compose.ui.semantics.SemanticsPropertyReceiver);
+ method public static String getPaneTitle(androidx.compose.ui.semantics.SemanticsPropertyReceiver);
+ method public static androidx.compose.ui.semantics.ProgressBarRangeInfo getProgressBarRangeInfo(androidx.compose.ui.semantics.SemanticsPropertyReceiver);
+ method public static int getRole(androidx.compose.ui.semantics.SemanticsPropertyReceiver);
+ method public static boolean getSelected(androidx.compose.ui.semantics.SemanticsPropertyReceiver);
+ method public static String getStateDescription(androidx.compose.ui.semantics.SemanticsPropertyReceiver);
+ method public static String getTestTag(androidx.compose.ui.semantics.SemanticsPropertyReceiver);
+ method public static androidx.compose.ui.text.AnnotatedString getText(androidx.compose.ui.semantics.SemanticsPropertyReceiver);
+ method public static void getTextLayoutResult(androidx.compose.ui.semantics.SemanticsPropertyReceiver, optional String? label, kotlin.jvm.functions.Function1<? super java.util.List<androidx.compose.ui.text.TextLayoutResult>,java.lang.Boolean>? action);
+ method public static long getTextSelectionRange(androidx.compose.ui.semantics.SemanticsPropertyReceiver);
+ method public static androidx.compose.ui.state.ToggleableState getToggleableState(androidx.compose.ui.semantics.SemanticsPropertyReceiver);
+ method public static androidx.compose.ui.semantics.ScrollAxisRange getVerticalScrollAxisRange(androidx.compose.ui.semantics.SemanticsPropertyReceiver);
+ method public static void heading(androidx.compose.ui.semantics.SemanticsPropertyReceiver);
+ method public static void indexForKey(androidx.compose.ui.semantics.SemanticsPropertyReceiver, kotlin.jvm.functions.Function1<java.lang.Object,java.lang.Integer> mapping);
+ method @androidx.compose.ui.ExperimentalComposeUiApi public static void invisibleToUser(androidx.compose.ui.semantics.SemanticsPropertyReceiver);
+ method public static void onClick(androidx.compose.ui.semantics.SemanticsPropertyReceiver, optional String? label, kotlin.jvm.functions.Function0<java.lang.Boolean>? action);
+ method public static void onLongClick(androidx.compose.ui.semantics.SemanticsPropertyReceiver, optional String? label, kotlin.jvm.functions.Function0<java.lang.Boolean>? action);
+ method public static void password(androidx.compose.ui.semantics.SemanticsPropertyReceiver);
+ method public static void pasteText(androidx.compose.ui.semantics.SemanticsPropertyReceiver, optional String? label, kotlin.jvm.functions.Function0<java.lang.Boolean>? action);
+ method public static void popup(androidx.compose.ui.semantics.SemanticsPropertyReceiver);
+ method public static void requestFocus(androidx.compose.ui.semantics.SemanticsPropertyReceiver, optional String? label, kotlin.jvm.functions.Function0<java.lang.Boolean>? action);
+ method public static void scrollBy(androidx.compose.ui.semantics.SemanticsPropertyReceiver, optional String? label, kotlin.jvm.functions.Function2<? super java.lang.Float,? super java.lang.Float,java.lang.Boolean>? action);
+ method public static void scrollToIndex(androidx.compose.ui.semantics.SemanticsPropertyReceiver, optional String? label, kotlin.jvm.functions.Function1<? super java.lang.Integer,java.lang.Boolean> action);
+ method public static void selectableGroup(androidx.compose.ui.semantics.SemanticsPropertyReceiver);
+ method public static void setCollectionInfo(androidx.compose.ui.semantics.SemanticsPropertyReceiver, androidx.compose.ui.semantics.CollectionInfo);
+ method public static void setCollectionItemInfo(androidx.compose.ui.semantics.SemanticsPropertyReceiver, androidx.compose.ui.semantics.CollectionItemInfo);
+ method public static void setContentDescription(androidx.compose.ui.semantics.SemanticsPropertyReceiver, String);
+ method public static void setCustomActions(androidx.compose.ui.semantics.SemanticsPropertyReceiver, java.util.List<androidx.compose.ui.semantics.CustomAccessibilityAction>);
+ method public static void setEditableText(androidx.compose.ui.semantics.SemanticsPropertyReceiver, androidx.compose.ui.text.AnnotatedString);
+ method public static void setFocused(androidx.compose.ui.semantics.SemanticsPropertyReceiver, boolean);
+ method public static void setHorizontalScrollAxisRange(androidx.compose.ui.semantics.SemanticsPropertyReceiver, androidx.compose.ui.semantics.ScrollAxisRange);
+ method public static void setImeAction(androidx.compose.ui.semantics.SemanticsPropertyReceiver, int);
+ method public static void setLiveRegion(androidx.compose.ui.semantics.SemanticsPropertyReceiver, int);
+ method public static void setPaneTitle(androidx.compose.ui.semantics.SemanticsPropertyReceiver, String);
+ method public static void setProgress(androidx.compose.ui.semantics.SemanticsPropertyReceiver, optional String? label, kotlin.jvm.functions.Function1<? super java.lang.Float,java.lang.Boolean>? action);
+ method public static void setProgressBarRangeInfo(androidx.compose.ui.semantics.SemanticsPropertyReceiver, androidx.compose.ui.semantics.ProgressBarRangeInfo);
+ method public static void setRole(androidx.compose.ui.semantics.SemanticsPropertyReceiver, int);
+ method public static void setSelected(androidx.compose.ui.semantics.SemanticsPropertyReceiver, boolean);
+ method public static void setSelection(androidx.compose.ui.semantics.SemanticsPropertyReceiver, optional String? label, kotlin.jvm.functions.Function3<? super java.lang.Integer,? super java.lang.Integer,? super java.lang.Boolean,java.lang.Boolean>? action);
+ method public static void setStateDescription(androidx.compose.ui.semantics.SemanticsPropertyReceiver, String);
+ method public static void setTestTag(androidx.compose.ui.semantics.SemanticsPropertyReceiver, String);
+ method public static void setText(androidx.compose.ui.semantics.SemanticsPropertyReceiver, androidx.compose.ui.text.AnnotatedString);
+ method public static void setText(androidx.compose.ui.semantics.SemanticsPropertyReceiver, optional String? label, kotlin.jvm.functions.Function1<? super androidx.compose.ui.text.AnnotatedString,java.lang.Boolean>? action);
+ method public static void setTextSelectionRange(androidx.compose.ui.semantics.SemanticsPropertyReceiver, long);
+ method public static void setToggleableState(androidx.compose.ui.semantics.SemanticsPropertyReceiver, androidx.compose.ui.state.ToggleableState);
+ method public static void setVerticalScrollAxisRange(androidx.compose.ui.semantics.SemanticsPropertyReceiver, androidx.compose.ui.semantics.ScrollAxisRange);
+ }
+
+ public final class SemanticsProperties_androidKt {
+ method @androidx.compose.ui.ExperimentalComposeUiApi public static boolean getTestTagsAsResourceId(androidx.compose.ui.semantics.SemanticsPropertyReceiver);
+ method @androidx.compose.ui.ExperimentalComposeUiApi public static void setTestTagsAsResourceId(androidx.compose.ui.semantics.SemanticsPropertyReceiver, boolean);
+ }
+
+ public final class SemanticsPropertyKey<T> {
+ ctor public SemanticsPropertyKey(String name, optional kotlin.jvm.functions.Function2<? super T,? super T,? extends T> mergePolicy);
+ method public String getName();
+ method public operator T! getValue(androidx.compose.ui.semantics.SemanticsPropertyReceiver thisRef, kotlin.reflect.KProperty<?> property);
+ method public T? merge(T? parentValue, T? childValue);
+ method public operator void setValue(androidx.compose.ui.semantics.SemanticsPropertyReceiver thisRef, kotlin.reflect.KProperty<?> property, T? value);
+ property public final String name;
+ }
+
+ public interface SemanticsPropertyReceiver {
+ method public operator <T> void set(androidx.compose.ui.semantics.SemanticsPropertyKey<T> key, T? value);
+ }
+
+ public final class SemanticsSortKt {
+ }
+
+}
+
+package androidx.compose.ui.state {
+
+ public enum ToggleableState {
+ enum_constant public static final androidx.compose.ui.state.ToggleableState Indeterminate;
+ enum_constant public static final androidx.compose.ui.state.ToggleableState Off;
+ enum_constant public static final androidx.compose.ui.state.ToggleableState On;
+ }
+
+ public final class ToggleableStateKt {
+ method public static androidx.compose.ui.state.ToggleableState ToggleableState(boolean value);
+ }
+
+}
+
+package androidx.compose.ui.text.input {
+
+ public final class CursorAnchorInfoBuilderKt {
+ }
+
+ public final class InputState_androidKt {
+ }
+
+ public final class RecordingInputConnection_androidKt {
+ }
+
+ public final class TextInputServiceAndroid_androidKt {
+ }
+
+}
+
+package androidx.compose.ui.viewinterop {
+
+ public final class AndroidViewHolder_androidKt {
+ }
+
+ public final class AndroidView_androidKt {
+ method @androidx.compose.runtime.Composable @androidx.compose.ui.UiComposable public static <T extends android.view.View> void AndroidView(kotlin.jvm.functions.Function1<? super android.content.Context,? extends T> factory, optional androidx.compose.ui.Modifier modifier, optional kotlin.jvm.functions.Function1<? super T,kotlin.Unit> update);
+ method public static kotlin.jvm.functions.Function1<android.view.View,kotlin.Unit> getNoOpUpdate();
+ property public static final kotlin.jvm.functions.Function1<android.view.View,kotlin.Unit> NoOpUpdate;
+ }
+
+}
+
+package androidx.compose.ui.window {
+
+ public final class AndroidDialog_androidKt {
+ method @androidx.compose.runtime.Composable public static void Dialog(kotlin.jvm.functions.Function0<kotlin.Unit> onDismissRequest, optional androidx.compose.ui.window.DialogProperties properties, kotlin.jvm.functions.Function0<kotlin.Unit> content);
+ }
+
+ public final class AndroidPopup_androidKt {
+ method @androidx.compose.runtime.Composable public static void Popup(optional androidx.compose.ui.Alignment alignment, optional long offset, optional kotlin.jvm.functions.Function0<kotlin.Unit>? onDismissRequest, optional androidx.compose.ui.window.PopupProperties properties, kotlin.jvm.functions.Function0<kotlin.Unit> content);
+ method @androidx.compose.runtime.Composable public static void Popup(androidx.compose.ui.window.PopupPositionProvider popupPositionProvider, optional kotlin.jvm.functions.Function0<kotlin.Unit>? onDismissRequest, optional androidx.compose.ui.window.PopupProperties properties, kotlin.jvm.functions.Function0<kotlin.Unit> content);
+ method @org.jetbrains.annotations.TestOnly public static boolean isPopupLayout(android.view.View view, optional String? testTag);
+ }
+
+ @androidx.compose.runtime.Immutable public final class DialogProperties {
+ ctor @androidx.compose.ui.ExperimentalComposeUiApi public DialogProperties(optional boolean dismissOnBackPress, optional boolean dismissOnClickOutside, optional androidx.compose.ui.window.SecureFlagPolicy securePolicy, optional boolean usePlatformDefaultWidth);
+ ctor public DialogProperties(optional boolean dismissOnBackPress, optional boolean dismissOnClickOutside, optional androidx.compose.ui.window.SecureFlagPolicy securePolicy);
+ method public boolean getDismissOnBackPress();
+ method public boolean getDismissOnClickOutside();
+ method public androidx.compose.ui.window.SecureFlagPolicy getSecurePolicy();
+ method @androidx.compose.ui.ExperimentalComposeUiApi public boolean getUsePlatformDefaultWidth();
+ property public final boolean dismissOnBackPress;
+ property public final boolean dismissOnClickOutside;
+ property public final androidx.compose.ui.window.SecureFlagPolicy securePolicy;
+ property @androidx.compose.ui.ExperimentalComposeUiApi public final boolean usePlatformDefaultWidth;
+ }
+
+ public interface DialogWindowProvider {
+ method public android.view.Window getWindow();
+ property public abstract android.view.Window window;
+ }
+
+ @androidx.compose.runtime.Immutable public interface PopupPositionProvider {
+ method public long calculatePosition(androidx.compose.ui.unit.IntRect anchorBounds, long windowSize, androidx.compose.ui.unit.LayoutDirection layoutDirection, long popupContentSize);
+ }
+
+ @androidx.compose.runtime.Immutable public final class PopupProperties {
+ ctor @androidx.compose.ui.ExperimentalComposeUiApi public PopupProperties(optional boolean focusable, optional boolean dismissOnBackPress, optional boolean dismissOnClickOutside, optional androidx.compose.ui.window.SecureFlagPolicy securePolicy, optional boolean excludeFromSystemGesture, optional boolean clippingEnabled, optional boolean usePlatformDefaultWidth);
+ ctor public PopupProperties(optional boolean focusable, optional boolean dismissOnBackPress, optional boolean dismissOnClickOutside, optional androidx.compose.ui.window.SecureFlagPolicy securePolicy, optional boolean excludeFromSystemGesture, optional boolean clippingEnabled);
+ method public boolean getClippingEnabled();
+ method public boolean getDismissOnBackPress();
+ method public boolean getDismissOnClickOutside();
+ method public boolean getExcludeFromSystemGesture();
+ method public boolean getFocusable();
+ method public androidx.compose.ui.window.SecureFlagPolicy getSecurePolicy();
+ method @androidx.compose.ui.ExperimentalComposeUiApi public boolean getUsePlatformDefaultWidth();
+ property public final boolean clippingEnabled;
+ property public final boolean dismissOnBackPress;
+ property public final boolean dismissOnClickOutside;
+ property public final boolean excludeFromSystemGesture;
+ property public final boolean focusable;
+ property public final androidx.compose.ui.window.SecureFlagPolicy securePolicy;
+ property @androidx.compose.ui.ExperimentalComposeUiApi public final boolean usePlatformDefaultWidth;
+ }
+
+ public enum SecureFlagPolicy {
+ enum_constant public static final androidx.compose.ui.window.SecureFlagPolicy Inherit;
+ enum_constant public static final androidx.compose.ui.window.SecureFlagPolicy SecureOff;
+ enum_constant public static final androidx.compose.ui.window.SecureFlagPolicy SecureOn;
+ }
+
+ public final class SecureFlagPolicy_androidKt {
+ }
+
+}
+
diff --git a/compose/ui/ui/api/public_plus_experimental_current.txt b/compose/ui/ui/api/public_plus_experimental_current.txt
index 858bbc4..bd011af 100644
--- a/compose/ui/ui/api/public_plus_experimental_current.txt
+++ b/compose/ui/ui/api/public_plus_experimental_current.txt
@@ -2649,9 +2649,9 @@
field public static final androidx.compose.ui.platform.ViewCompositionStrategy.DisposeOnDetachedFromWindow INSTANCE;
}
- public static final class ViewCompositionStrategy.DisposeOnDetachedFromWindowIfNotInPoolingContainer implements androidx.compose.ui.platform.ViewCompositionStrategy {
+ public static final class ViewCompositionStrategy.DisposeOnDetachedFromWindowOrReleasedFromPool implements androidx.compose.ui.platform.ViewCompositionStrategy {
method public kotlin.jvm.functions.Function0<kotlin.Unit> installFor(androidx.compose.ui.platform.AbstractComposeView view);
- field public static final androidx.compose.ui.platform.ViewCompositionStrategy.DisposeOnDetachedFromWindowIfNotInPoolingContainer INSTANCE;
+ field public static final androidx.compose.ui.platform.ViewCompositionStrategy.DisposeOnDetachedFromWindowOrReleasedFromPool INSTANCE;
}
public static final class ViewCompositionStrategy.DisposeOnLifecycleDestroyed implements androidx.compose.ui.platform.ViewCompositionStrategy {
diff --git a/compose/ui/ui/api/res-1.2.0-beta02.txt b/compose/ui/ui/api/res-1.2.0-beta02.txt
new file mode 100644
index 0000000..e69de29
--- /dev/null
+++ b/compose/ui/ui/api/res-1.2.0-beta02.txt
diff --git a/compose/ui/ui/api/restricted_1.2.0-beta01.txt b/compose/ui/ui/api/restricted_1.2.0-beta01.txt
index f29dcb6..43125a3 100644
--- a/compose/ui/ui/api/restricted_1.2.0-beta01.txt
+++ b/compose/ui/ui/api/restricted_1.2.0-beta01.txt
@@ -2513,9 +2513,9 @@
field public static final androidx.compose.ui.platform.ViewCompositionStrategy.DisposeOnDetachedFromWindow INSTANCE;
}
- public static final class ViewCompositionStrategy.DisposeOnDetachedFromWindowIfNotInPoolingContainer implements androidx.compose.ui.platform.ViewCompositionStrategy {
+ public static final class ViewCompositionStrategy.DisposeOnDetachedFromWindowOrReleasedFromPool implements androidx.compose.ui.platform.ViewCompositionStrategy {
method public kotlin.jvm.functions.Function0<kotlin.Unit> installFor(androidx.compose.ui.platform.AbstractComposeView view);
- field public static final androidx.compose.ui.platform.ViewCompositionStrategy.DisposeOnDetachedFromWindowIfNotInPoolingContainer INSTANCE;
+ field public static final androidx.compose.ui.platform.ViewCompositionStrategy.DisposeOnDetachedFromWindowOrReleasedFromPool INSTANCE;
}
public static final class ViewCompositionStrategy.DisposeOnLifecycleDestroyed implements androidx.compose.ui.platform.ViewCompositionStrategy {
diff --git a/compose/ui/ui/api/restricted_1.2.0-beta02.txt b/compose/ui/ui/api/restricted_1.2.0-beta02.txt
new file mode 100644
index 0000000..43125a3
--- /dev/null
+++ b/compose/ui/ui/api/restricted_1.2.0-beta02.txt
@@ -0,0 +1,3096 @@
+// Signature format: 4.0
+package androidx.compose.ui {
+
+ public final class AbsoluteAlignment {
+ method public androidx.compose.ui.Alignment getBottomLeft();
+ method public androidx.compose.ui.Alignment getBottomRight();
+ method public androidx.compose.ui.Alignment getCenterLeft();
+ method public androidx.compose.ui.Alignment getCenterRight();
+ method public androidx.compose.ui.Alignment.Horizontal getLeft();
+ method public androidx.compose.ui.Alignment.Horizontal getRight();
+ method public androidx.compose.ui.Alignment getTopLeft();
+ method public androidx.compose.ui.Alignment getTopRight();
+ property public final androidx.compose.ui.Alignment BottomLeft;
+ property public final androidx.compose.ui.Alignment BottomRight;
+ property public final androidx.compose.ui.Alignment CenterLeft;
+ property public final androidx.compose.ui.Alignment CenterRight;
+ property public final androidx.compose.ui.Alignment.Horizontal Left;
+ property public final androidx.compose.ui.Alignment.Horizontal Right;
+ property public final androidx.compose.ui.Alignment TopLeft;
+ property public final androidx.compose.ui.Alignment TopRight;
+ field public static final androidx.compose.ui.AbsoluteAlignment INSTANCE;
+ }
+
+ @androidx.compose.runtime.Stable public fun interface Alignment {
+ method public long align(long size, long space, androidx.compose.ui.unit.LayoutDirection layoutDirection);
+ field public static final androidx.compose.ui.Alignment.Companion Companion;
+ }
+
+ public static final class Alignment.Companion {
+ method public androidx.compose.ui.Alignment.Vertical getBottom();
+ method public androidx.compose.ui.Alignment getBottomCenter();
+ method public androidx.compose.ui.Alignment getBottomEnd();
+ method public androidx.compose.ui.Alignment getBottomStart();
+ method public androidx.compose.ui.Alignment getCenter();
+ method public androidx.compose.ui.Alignment getCenterEnd();
+ method public androidx.compose.ui.Alignment.Horizontal getCenterHorizontally();
+ method public androidx.compose.ui.Alignment getCenterStart();
+ method public androidx.compose.ui.Alignment.Vertical getCenterVertically();
+ method public androidx.compose.ui.Alignment.Horizontal getEnd();
+ method public androidx.compose.ui.Alignment.Horizontal getStart();
+ method public androidx.compose.ui.Alignment.Vertical getTop();
+ method public androidx.compose.ui.Alignment getTopCenter();
+ method public androidx.compose.ui.Alignment getTopEnd();
+ method public androidx.compose.ui.Alignment getTopStart();
+ property public final androidx.compose.ui.Alignment.Vertical Bottom;
+ property public final androidx.compose.ui.Alignment BottomCenter;
+ property public final androidx.compose.ui.Alignment BottomEnd;
+ property public final androidx.compose.ui.Alignment BottomStart;
+ property public final androidx.compose.ui.Alignment Center;
+ property public final androidx.compose.ui.Alignment CenterEnd;
+ property public final androidx.compose.ui.Alignment.Horizontal CenterHorizontally;
+ property public final androidx.compose.ui.Alignment CenterStart;
+ property public final androidx.compose.ui.Alignment.Vertical CenterVertically;
+ property public final androidx.compose.ui.Alignment.Horizontal End;
+ property public final androidx.compose.ui.Alignment.Horizontal Start;
+ property public final androidx.compose.ui.Alignment.Vertical Top;
+ property public final androidx.compose.ui.Alignment TopCenter;
+ property public final androidx.compose.ui.Alignment TopEnd;
+ property public final androidx.compose.ui.Alignment TopStart;
+ }
+
+ @androidx.compose.runtime.Stable public static fun interface Alignment.Horizontal {
+ method public int align(int size, int space, androidx.compose.ui.unit.LayoutDirection layoutDirection);
+ }
+
+ @androidx.compose.runtime.Stable public static fun interface Alignment.Vertical {
+ method public int align(int size, int space);
+ }
+
+ @androidx.compose.runtime.Immutable public final class BiasAbsoluteAlignment implements androidx.compose.ui.Alignment {
+ ctor public BiasAbsoluteAlignment(float horizontalBias, float verticalBias);
+ method public long align(long size, long space, androidx.compose.ui.unit.LayoutDirection layoutDirection);
+ method public androidx.compose.ui.BiasAbsoluteAlignment copy(float horizontalBias, float verticalBias);
+ }
+
+ @androidx.compose.runtime.Immutable public static final class BiasAbsoluteAlignment.Horizontal implements androidx.compose.ui.Alignment.Horizontal {
+ ctor public BiasAbsoluteAlignment.Horizontal(float bias);
+ method public int align(int size, int space, androidx.compose.ui.unit.LayoutDirection layoutDirection);
+ method public androidx.compose.ui.BiasAbsoluteAlignment.Horizontal copy(float bias);
+ }
+
+ @androidx.compose.runtime.Immutable public final class BiasAlignment implements androidx.compose.ui.Alignment {
+ ctor public BiasAlignment(float horizontalBias, float verticalBias);
+ method public long align(long size, long space, androidx.compose.ui.unit.LayoutDirection layoutDirection);
+ method public float component1();
+ method public float component2();
+ method public androidx.compose.ui.BiasAlignment copy(float horizontalBias, float verticalBias);
+ method public float getHorizontalBias();
+ method public float getVerticalBias();
+ property public final float horizontalBias;
+ property public final float verticalBias;
+ }
+
+ @androidx.compose.runtime.Immutable public static final class BiasAlignment.Horizontal implements androidx.compose.ui.Alignment.Horizontal {
+ ctor public BiasAlignment.Horizontal(float bias);
+ method public int align(int size, int space, androidx.compose.ui.unit.LayoutDirection layoutDirection);
+ method public androidx.compose.ui.BiasAlignment.Horizontal copy(float bias);
+ }
+
+ @androidx.compose.runtime.Immutable public static final class BiasAlignment.Vertical implements androidx.compose.ui.Alignment.Vertical {
+ ctor public BiasAlignment.Vertical(float bias);
+ method public int align(int size, int space);
+ method public androidx.compose.ui.BiasAlignment.Vertical copy(float bias);
+ }
+
+ public final class CombinedModifier implements androidx.compose.ui.Modifier {
+ ctor public CombinedModifier(androidx.compose.ui.Modifier outer, androidx.compose.ui.Modifier inner);
+ method public boolean all(kotlin.jvm.functions.Function1<? super androidx.compose.ui.Modifier.Element,java.lang.Boolean> predicate);
+ method public boolean any(kotlin.jvm.functions.Function1<? super androidx.compose.ui.Modifier.Element,java.lang.Boolean> predicate);
+ method public <R> R! foldIn(R? initial, kotlin.jvm.functions.Function2<? super R,? super androidx.compose.ui.Modifier.Element,? extends R> operation);
+ method public <R> R! foldOut(R? initial, kotlin.jvm.functions.Function2<? super androidx.compose.ui.Modifier.Element,? super R,? extends R> operation);
+ }
+
+ public final class ComposedModifierKt {
+ method public static androidx.compose.ui.Modifier composed(androidx.compose.ui.Modifier, optional kotlin.jvm.functions.Function1<? super androidx.compose.ui.platform.InspectorInfo,kotlin.Unit> inspectorInfo, kotlin.jvm.functions.Function1<? super androidx.compose.ui.Modifier,? extends androidx.compose.ui.Modifier> factory);
+ method public static androidx.compose.ui.Modifier composed(androidx.compose.ui.Modifier, String fullyQualifiedName, Object? key1, optional kotlin.jvm.functions.Function1<? super androidx.compose.ui.platform.InspectorInfo,kotlin.Unit> inspectorInfo, kotlin.jvm.functions.Function1<? super androidx.compose.ui.Modifier,? extends androidx.compose.ui.Modifier> factory);
+ method public static androidx.compose.ui.Modifier composed(androidx.compose.ui.Modifier, String fullyQualifiedName, Object? key1, Object? key2, optional kotlin.jvm.functions.Function1<? super androidx.compose.ui.platform.InspectorInfo,kotlin.Unit> inspectorInfo, kotlin.jvm.functions.Function1<? super androidx.compose.ui.Modifier,? extends androidx.compose.ui.Modifier> factory);
+ method public static androidx.compose.ui.Modifier composed(androidx.compose.ui.Modifier, String fullyQualifiedName, Object? key1, Object? key2, Object? key3, optional kotlin.jvm.functions.Function1<? super androidx.compose.ui.platform.InspectorInfo,kotlin.Unit> inspectorInfo, kotlin.jvm.functions.Function1<? super androidx.compose.ui.Modifier,? extends androidx.compose.ui.Modifier> factory);
+ method public static androidx.compose.ui.Modifier composed(androidx.compose.ui.Modifier, String fullyQualifiedName, Object![]? keys, optional kotlin.jvm.functions.Function1<? super androidx.compose.ui.platform.InspectorInfo,kotlin.Unit> inspectorInfo, kotlin.jvm.functions.Function1<? super androidx.compose.ui.Modifier,? extends androidx.compose.ui.Modifier> factory);
+ method public static androidx.compose.ui.Modifier materialize(androidx.compose.runtime.Composer, androidx.compose.ui.Modifier modifier);
+ }
+
+ @androidx.compose.runtime.Stable public interface Modifier {
+ method public boolean all(kotlin.jvm.functions.Function1<? super androidx.compose.ui.Modifier.Element,java.lang.Boolean> predicate);
+ method public boolean any(kotlin.jvm.functions.Function1<? super androidx.compose.ui.Modifier.Element,java.lang.Boolean> predicate);
+ method public <R> R! foldIn(R? initial, kotlin.jvm.functions.Function2<? super R,? super androidx.compose.ui.Modifier.Element,? extends R> operation);
+ method public <R> R! foldOut(R? initial, kotlin.jvm.functions.Function2<? super androidx.compose.ui.Modifier.Element,? super R,? extends R> operation);
+ method public default infix androidx.compose.ui.Modifier then(androidx.compose.ui.Modifier other);
+ field public static final androidx.compose.ui.Modifier.Companion Companion;
+ }
+
+ public static final class Modifier.Companion implements androidx.compose.ui.Modifier {
+ method public boolean all(kotlin.jvm.functions.Function1<? super androidx.compose.ui.Modifier.Element,java.lang.Boolean> predicate);
+ method public boolean any(kotlin.jvm.functions.Function1<? super androidx.compose.ui.Modifier.Element,java.lang.Boolean> predicate);
+ method public <R> R! foldIn(R? initial, kotlin.jvm.functions.Function2<? super R,? super androidx.compose.ui.Modifier.Element,? extends R> operation);
+ method public <R> R! foldOut(R? initial, kotlin.jvm.functions.Function2<? super androidx.compose.ui.Modifier.Element,? super R,? extends R> operation);
+ }
+
+ public static interface Modifier.Element extends androidx.compose.ui.Modifier {
+ method public default boolean all(kotlin.jvm.functions.Function1<? super androidx.compose.ui.Modifier.Element,java.lang.Boolean> predicate);
+ method public default boolean any(kotlin.jvm.functions.Function1<? super androidx.compose.ui.Modifier.Element,java.lang.Boolean> predicate);
+ method public default <R> R! foldIn(R? initial, kotlin.jvm.functions.Function2<? super R,? super androidx.compose.ui.Modifier.Element,? extends R> operation);
+ method public default <R> R! foldOut(R? initial, kotlin.jvm.functions.Function2<? super androidx.compose.ui.Modifier.Element,? super R,? extends R> operation);
+ }
+
+ @androidx.compose.runtime.Stable public interface MotionDurationScale extends kotlin.coroutines.CoroutineContext.Element {
+ method public default kotlin.coroutines.CoroutineContext.Key<?> getKey();
+ method public float getScaleFactor();
+ property public default kotlin.coroutines.CoroutineContext.Key<?> key;
+ property public abstract float scaleFactor;
+ field public static final androidx.compose.ui.MotionDurationScale.Key Key;
+ }
+
+ public static final class MotionDurationScale.Key implements kotlin.coroutines.CoroutineContext.Key<androidx.compose.ui.MotionDurationScale> {
+ }
+
+ public final class TempListUtilsKt {
+ }
+
+ @androidx.compose.runtime.ComposableTargetMarker(description="UI Composable") @kotlin.annotation.Retention(kotlin.annotation.AnnotationRetention.BINARY) @kotlin.annotation.Target(allowedTargets={kotlin.annotation.AnnotationTarget.FILE, kotlin.annotation.AnnotationTarget.FUNCTION, kotlin.annotation.AnnotationTarget.PROPERTY_GETTER, kotlin.annotation.AnnotationTarget.TYPE, kotlin.annotation.AnnotationTarget.TYPE_PARAMETER}) public @interface UiComposable {
+ }
+
+ public final class ZIndexModifierKt {
+ method @androidx.compose.runtime.Stable public static androidx.compose.ui.Modifier zIndex(androidx.compose.ui.Modifier, float zIndex);
+ }
+
+}
+
+package androidx.compose.ui.autofill {
+
+ public final class AndroidAutofillType_androidKt {
+ }
+
+ public final class AndroidAutofill_androidKt {
+ }
+
+}
+
+package androidx.compose.ui.draw {
+
+ public final class AlphaKt {
+ method @androidx.compose.runtime.Stable public static androidx.compose.ui.Modifier alpha(androidx.compose.ui.Modifier, float alpha);
+ }
+
+ public final class BlurKt {
+ method @androidx.compose.runtime.Stable public static androidx.compose.ui.Modifier blur(androidx.compose.ui.Modifier, float radiusX, float radiusY, optional androidx.compose.ui.graphics.Shape edgeTreatment);
+ method @androidx.compose.runtime.Stable public static androidx.compose.ui.Modifier blur(androidx.compose.ui.Modifier, float radius, optional androidx.compose.ui.graphics.Shape edgeTreatment);
+ }
+
+ @androidx.compose.runtime.Immutable @kotlin.jvm.JvmInline public final value class BlurredEdgeTreatment {
+ ctor public BlurredEdgeTreatment(androidx.compose.ui.graphics.Shape? shape);
+ method public androidx.compose.ui.graphics.Shape? getShape();
+ property public final androidx.compose.ui.graphics.Shape? shape;
+ field public static final androidx.compose.ui.draw.BlurredEdgeTreatment.Companion Companion;
+ }
+
+ public static final class BlurredEdgeTreatment.Companion {
+ method public androidx.compose.ui.graphics.Shape getRectangle();
+ method public androidx.compose.ui.graphics.Shape getUnbounded();
+ property public final androidx.compose.ui.graphics.Shape Rectangle;
+ property public final androidx.compose.ui.graphics.Shape Unbounded;
+ }
+
+ public interface BuildDrawCacheParams {
+ method public androidx.compose.ui.unit.Density getDensity();
+ method public androidx.compose.ui.unit.LayoutDirection getLayoutDirection();
+ method public long getSize();
+ property public abstract androidx.compose.ui.unit.Density density;
+ property public abstract androidx.compose.ui.unit.LayoutDirection layoutDirection;
+ property public abstract long size;
+ }
+
+ public final class CacheDrawScope implements androidx.compose.ui.unit.Density {
+ method public float getDensity();
+ method public float getFontScale();
+ method public androidx.compose.ui.unit.LayoutDirection getLayoutDirection();
+ method public long getSize();
+ method public androidx.compose.ui.draw.DrawResult onDrawBehind(kotlin.jvm.functions.Function1<? super androidx.compose.ui.graphics.drawscope.DrawScope,kotlin.Unit> block);
+ method public androidx.compose.ui.draw.DrawResult onDrawWithContent(kotlin.jvm.functions.Function1<? super androidx.compose.ui.graphics.drawscope.ContentDrawScope,kotlin.Unit> block);
+ property public float density;
+ property public float fontScale;
+ property public final androidx.compose.ui.unit.LayoutDirection layoutDirection;
+ property public final long size;
+ }
+
+ public final class ClipKt {
+ method @androidx.compose.runtime.Stable public static androidx.compose.ui.Modifier clip(androidx.compose.ui.Modifier, androidx.compose.ui.graphics.Shape shape);
+ method @androidx.compose.runtime.Stable public static androidx.compose.ui.Modifier clipToBounds(androidx.compose.ui.Modifier);
+ }
+
+ public interface DrawCacheModifier extends androidx.compose.ui.draw.DrawModifier {
+ method public void onBuildCache(androidx.compose.ui.draw.BuildDrawCacheParams params);
+ }
+
+ public interface DrawModifier extends androidx.compose.ui.Modifier.Element {
+ method public void draw(androidx.compose.ui.graphics.drawscope.ContentDrawScope);
+ }
+
+ public final class DrawModifierKt {
+ method public static androidx.compose.ui.Modifier drawBehind(androidx.compose.ui.Modifier, kotlin.jvm.functions.Function1<? super androidx.compose.ui.graphics.drawscope.DrawScope,kotlin.Unit> onDraw);
+ method public static androidx.compose.ui.Modifier drawWithCache(androidx.compose.ui.Modifier, kotlin.jvm.functions.Function1<? super androidx.compose.ui.draw.CacheDrawScope,androidx.compose.ui.draw.DrawResult> onBuildDrawCache);
+ method public static androidx.compose.ui.Modifier drawWithContent(androidx.compose.ui.Modifier, kotlin.jvm.functions.Function1<? super androidx.compose.ui.graphics.drawscope.ContentDrawScope,kotlin.Unit> onDraw);
+ }
+
+ public final class DrawResult {
+ }
+
+ public final class PainterModifierKt {
+ method public static androidx.compose.ui.Modifier paint(androidx.compose.ui.Modifier, androidx.compose.ui.graphics.painter.Painter painter, optional boolean sizeToIntrinsics, optional androidx.compose.ui.Alignment alignment, optional androidx.compose.ui.layout.ContentScale contentScale, optional float alpha, optional androidx.compose.ui.graphics.ColorFilter? colorFilter);
+ }
+
+ public final class RotateKt {
+ method @androidx.compose.runtime.Stable public static androidx.compose.ui.Modifier rotate(androidx.compose.ui.Modifier, float degrees);
+ }
+
+ public final class ScaleKt {
+ method @androidx.compose.runtime.Stable public static androidx.compose.ui.Modifier scale(androidx.compose.ui.Modifier, float scaleX, float scaleY);
+ method @androidx.compose.runtime.Stable public static androidx.compose.ui.Modifier scale(androidx.compose.ui.Modifier, float scale);
+ }
+
+ public final class ShadowKt {
+ method @androidx.compose.runtime.Stable public static androidx.compose.ui.Modifier shadow(androidx.compose.ui.Modifier, float elevation, optional androidx.compose.ui.graphics.Shape shape, optional boolean clip, optional long ambientColor, optional long spotColor);
+ method @Deprecated @androidx.compose.runtime.Stable public static androidx.compose.ui.Modifier! shadow(androidx.compose.ui.Modifier, float elevation, optional androidx.compose.ui.graphics.Shape shape, optional boolean clip);
+ }
+
+}
+
+package androidx.compose.ui.focus {
+
+ public final class BeyondBoundsLayoutKt {
+ }
+
+ public final class FocusChangedModifierKt {
+ method public static androidx.compose.ui.Modifier onFocusChanged(androidx.compose.ui.Modifier, kotlin.jvm.functions.Function1<? super androidx.compose.ui.focus.FocusState,kotlin.Unit> onFocusChanged);
+ }
+
+ @kotlin.jvm.JvmInline public final value class FocusDirection {
+ field public static final androidx.compose.ui.focus.FocusDirection.Companion Companion;
+ }
+
+ public static final class FocusDirection.Companion {
+ method public int getDown();
+ method public int getIn();
+ method public int getLeft();
+ method public int getNext();
+ method public int getOut();
+ method public int getPrevious();
+ method public int getRight();
+ method public int getUp();
+ property public final int Down;
+ property public final int In;
+ property public final int Left;
+ property public final int Next;
+ property public final int Out;
+ property public final int Previous;
+ property public final int Right;
+ property public final int Up;
+ }
+
+ public interface FocusEventModifier extends androidx.compose.ui.Modifier.Element {
+ method public void onFocusEvent(androidx.compose.ui.focus.FocusState focusState);
+ }
+
+ public final class FocusEventModifierKt {
+ method public static androidx.compose.ui.Modifier onFocusEvent(androidx.compose.ui.Modifier, kotlin.jvm.functions.Function1<? super androidx.compose.ui.focus.FocusState,kotlin.Unit> onFocusEvent);
+ }
+
+ public interface FocusManager {
+ method public void clearFocus(optional boolean force);
+ method public boolean moveFocus(int focusDirection);
+ }
+
+ public final class FocusManagerKt {
+ }
+
+ public final class FocusModifierKt {
+ method @Deprecated public static androidx.compose.ui.Modifier focusModifier(androidx.compose.ui.Modifier);
+ method public static androidx.compose.ui.Modifier focusTarget(androidx.compose.ui.Modifier);
+ }
+
+ @Deprecated public final class FocusOrder {
+ ctor @Deprecated public FocusOrder();
+ method @Deprecated public androidx.compose.ui.focus.FocusRequester getDown();
+ method @Deprecated public androidx.compose.ui.focus.FocusRequester getEnd();
+ method @Deprecated public androidx.compose.ui.focus.FocusRequester getLeft();
+ method @Deprecated public androidx.compose.ui.focus.FocusRequester getNext();
+ method @Deprecated public androidx.compose.ui.focus.FocusRequester getPrevious();
+ method @Deprecated public androidx.compose.ui.focus.FocusRequester getRight();
+ method @Deprecated public androidx.compose.ui.focus.FocusRequester getStart();
+ method @Deprecated public androidx.compose.ui.focus.FocusRequester getUp();
+ method @Deprecated public void setDown(androidx.compose.ui.focus.FocusRequester);
+ method @Deprecated public void setEnd(androidx.compose.ui.focus.FocusRequester);
+ method @Deprecated public void setLeft(androidx.compose.ui.focus.FocusRequester);
+ method @Deprecated public void setNext(androidx.compose.ui.focus.FocusRequester);
+ method @Deprecated public void setPrevious(androidx.compose.ui.focus.FocusRequester);
+ method @Deprecated public void setRight(androidx.compose.ui.focus.FocusRequester);
+ method @Deprecated public void setStart(androidx.compose.ui.focus.FocusRequester);
+ method @Deprecated public void setUp(androidx.compose.ui.focus.FocusRequester);
+ property public final androidx.compose.ui.focus.FocusRequester down;
+ property public final androidx.compose.ui.focus.FocusRequester end;
+ property public final androidx.compose.ui.focus.FocusRequester left;
+ property public final androidx.compose.ui.focus.FocusRequester next;
+ property public final androidx.compose.ui.focus.FocusRequester previous;
+ property public final androidx.compose.ui.focus.FocusRequester right;
+ property public final androidx.compose.ui.focus.FocusRequester start;
+ property public final androidx.compose.ui.focus.FocusRequester up;
+ }
+
+ @Deprecated public interface FocusOrderModifier extends androidx.compose.ui.Modifier.Element {
+ method @Deprecated public void populateFocusOrder(androidx.compose.ui.focus.FocusOrder focusOrder);
+ }
+
+ public final class FocusOrderModifierKt {
+ method @Deprecated public static androidx.compose.ui.Modifier focusOrder(androidx.compose.ui.Modifier, kotlin.jvm.functions.Function1<? super androidx.compose.ui.focus.FocusOrder,kotlin.Unit> focusOrderReceiver);
+ method @Deprecated public static androidx.compose.ui.Modifier focusOrder(androidx.compose.ui.Modifier, androidx.compose.ui.focus.FocusRequester focusRequester);
+ method @Deprecated public static androidx.compose.ui.Modifier focusOrder(androidx.compose.ui.Modifier, androidx.compose.ui.focus.FocusRequester focusRequester, kotlin.jvm.functions.Function1<? super androidx.compose.ui.focus.FocusOrder,kotlin.Unit> focusOrderReceiver);
+ }
+
+ public interface FocusProperties {
+ method public boolean getCanFocus();
+ method public default androidx.compose.ui.focus.FocusRequester getDown();
+ method public default androidx.compose.ui.focus.FocusRequester getEnd();
+ method public default androidx.compose.ui.focus.FocusRequester getLeft();
+ method public default androidx.compose.ui.focus.FocusRequester getNext();
+ method public default androidx.compose.ui.focus.FocusRequester getPrevious();
+ method public default androidx.compose.ui.focus.FocusRequester getRight();
+ method public default androidx.compose.ui.focus.FocusRequester getStart();
+ method public default androidx.compose.ui.focus.FocusRequester getUp();
+ method public void setCanFocus(boolean);
+ method public default void setDown(androidx.compose.ui.focus.FocusRequester);
+ method public default void setEnd(androidx.compose.ui.focus.FocusRequester);
+ method public default void setLeft(androidx.compose.ui.focus.FocusRequester);
+ method public default void setNext(androidx.compose.ui.focus.FocusRequester);
+ method public default void setPrevious(androidx.compose.ui.focus.FocusRequester);
+ method public default void setRight(androidx.compose.ui.focus.FocusRequester);
+ method public default void setStart(androidx.compose.ui.focus.FocusRequester);
+ method public default void setUp(androidx.compose.ui.focus.FocusRequester);
+ property public abstract boolean canFocus;
+ property public default androidx.compose.ui.focus.FocusRequester down;
+ property public default androidx.compose.ui.focus.FocusRequester end;
+ property public default androidx.compose.ui.focus.FocusRequester left;
+ property public default androidx.compose.ui.focus.FocusRequester next;
+ property public default androidx.compose.ui.focus.FocusRequester previous;
+ property public default androidx.compose.ui.focus.FocusRequester right;
+ property public default androidx.compose.ui.focus.FocusRequester start;
+ property public default androidx.compose.ui.focus.FocusRequester up;
+ }
+
+ public final class FocusPropertiesKt {
+ method public static androidx.compose.ui.Modifier focusProperties(androidx.compose.ui.Modifier, kotlin.jvm.functions.Function1<? super androidx.compose.ui.focus.FocusProperties,kotlin.Unit> scope);
+ }
+
+ public final class FocusRequester {
+ ctor public FocusRequester();
+ method public boolean captureFocus();
+ method public boolean freeFocus();
+ method public void requestFocus();
+ field public static final androidx.compose.ui.focus.FocusRequester.Companion Companion;
+ }
+
+ public static final class FocusRequester.Companion {
+ method public androidx.compose.ui.focus.FocusRequester getDefault();
+ property public final androidx.compose.ui.focus.FocusRequester Default;
+ }
+
+ public final class FocusRequesterKt {
+ }
+
+ public interface FocusRequesterModifier extends androidx.compose.ui.Modifier.Element {
+ method public androidx.compose.ui.focus.FocusRequester getFocusRequester();
+ property public abstract androidx.compose.ui.focus.FocusRequester focusRequester;
+ }
+
+ public final class FocusRequesterModifierKt {
+ method public static androidx.compose.ui.Modifier focusRequester(androidx.compose.ui.Modifier, androidx.compose.ui.focus.FocusRequester focusRequester);
+ }
+
+ public interface FocusState {
+ method public boolean getHasFocus();
+ method public boolean isCaptured();
+ method public boolean isFocused();
+ property public abstract boolean hasFocus;
+ property public abstract boolean isCaptured;
+ property public abstract boolean isFocused;
+ }
+
+ public final class FocusTransactionsKt {
+ }
+
+ public final class FocusTraversalKt {
+ }
+
+ public final class OneDimensionalFocusSearchKt {
+ }
+
+ public final class TwoDimensionalFocusSearchKt {
+ }
+
+}
+
+package androidx.compose.ui.graphics {
+
+ public final class GraphicsLayerModifierKt {
+ method @androidx.compose.runtime.Stable public static androidx.compose.ui.Modifier graphicsLayer(androidx.compose.ui.Modifier, optional float scaleX, optional float scaleY, optional float alpha, optional float translationX, optional float translationY, optional float shadowElevation, optional float rotationX, optional float rotationY, optional float rotationZ, optional float cameraDistance, optional long transformOrigin, optional androidx.compose.ui.graphics.Shape shape, optional boolean clip, optional androidx.compose.ui.graphics.RenderEffect? renderEffect, optional long ambientShadowColor, optional long spotShadowColor);
+ method @androidx.compose.runtime.Stable public static androidx.compose.ui.Modifier graphicsLayer(androidx.compose.ui.Modifier, kotlin.jvm.functions.Function1<? super androidx.compose.ui.graphics.GraphicsLayerScope,kotlin.Unit> block);
+ method @Deprecated @androidx.compose.runtime.Stable public static androidx.compose.ui.Modifier! graphicsLayer(androidx.compose.ui.Modifier, optional float scaleX, optional float scaleY, optional float alpha, optional float translationX, optional float translationY, optional float shadowElevation, optional float rotationX, optional float rotationY, optional float rotationZ, optional float cameraDistance, optional long transformOrigin, optional androidx.compose.ui.graphics.Shape shape, optional boolean clip);
+ method @Deprecated @androidx.compose.runtime.Stable public static androidx.compose.ui.Modifier! graphicsLayer(androidx.compose.ui.Modifier, optional float scaleX, optional float scaleY, optional float alpha, optional float translationX, optional float translationY, optional float shadowElevation, optional float rotationX, optional float rotationY, optional float rotationZ, optional float cameraDistance, optional long transformOrigin, optional androidx.compose.ui.graphics.Shape shape, optional boolean clip, optional androidx.compose.ui.graphics.RenderEffect? renderEffect);
+ method @androidx.compose.runtime.Stable public static androidx.compose.ui.Modifier toolingGraphicsLayer(androidx.compose.ui.Modifier);
+ }
+
+ public interface GraphicsLayerScope extends androidx.compose.ui.unit.Density {
+ method public float getAlpha();
+ method public default long getAmbientShadowColor();
+ method public float getCameraDistance();
+ method public boolean getClip();
+ method public default androidx.compose.ui.graphics.RenderEffect? getRenderEffect();
+ method public float getRotationX();
+ method public float getRotationY();
+ method public float getRotationZ();
+ method public float getScaleX();
+ method public float getScaleY();
+ method public float getShadowElevation();
+ method public androidx.compose.ui.graphics.Shape getShape();
+ method public default long getSpotShadowColor();
+ method public long getTransformOrigin();
+ method public float getTranslationX();
+ method public float getTranslationY();
+ method public void setAlpha(float);
+ method public default void setAmbientShadowColor(long);
+ method public void setCameraDistance(float);
+ method public void setClip(boolean);
+ method public default void setRenderEffect(androidx.compose.ui.graphics.RenderEffect?);
+ method public void setRotationX(float);
+ method public void setRotationY(float);
+ method public void setRotationZ(float);
+ method public void setScaleX(float);
+ method public void setScaleY(float);
+ method public void setShadowElevation(float);
+ method public void setShape(androidx.compose.ui.graphics.Shape);
+ method public default void setSpotShadowColor(long);
+ method public void setTransformOrigin(long);
+ method public void setTranslationX(float);
+ method public void setTranslationY(float);
+ property public abstract float alpha;
+ property public default long ambientShadowColor;
+ property public abstract float cameraDistance;
+ property public abstract boolean clip;
+ property public default androidx.compose.ui.graphics.RenderEffect? renderEffect;
+ property public abstract float rotationX;
+ property public abstract float rotationY;
+ property public abstract float rotationZ;
+ property public abstract float scaleX;
+ property public abstract float scaleY;
+ property public abstract float shadowElevation;
+ property public abstract androidx.compose.ui.graphics.Shape shape;
+ property public default long spotShadowColor;
+ property public abstract long transformOrigin;
+ property public abstract float translationX;
+ property public abstract float translationY;
+ }
+
+ public final class GraphicsLayerScopeKt {
+ method public static androidx.compose.ui.graphics.GraphicsLayerScope GraphicsLayerScope();
+ method public static long getDefaultShadowColor();
+ property public static final long DefaultShadowColor;
+ field public static final float DefaultCameraDistance = 8.0f;
+ }
+
+ @androidx.compose.runtime.Immutable @kotlin.jvm.JvmInline public final value class TransformOrigin {
+ method @androidx.compose.runtime.Stable public inline operator float component1();
+ method @androidx.compose.runtime.Stable public inline operator float component2();
+ method public long copy(optional float pivotFractionX, optional float pivotFractionY);
+ method public float getPivotFractionX();
+ method public float getPivotFractionY();
+ property public final float pivotFractionX;
+ property public final float pivotFractionY;
+ field public static final androidx.compose.ui.graphics.TransformOrigin.Companion Companion;
+ }
+
+ public static final class TransformOrigin.Companion {
+ method public long getCenter();
+ property public final long Center;
+ }
+
+ public final class TransformOriginKt {
+ method public static long TransformOrigin(float pivotFractionX, float pivotFractionY);
+ }
+
+}
+
+package androidx.compose.ui.graphics.vector {
+
+ @androidx.compose.runtime.Immutable public final class ImageVector {
+ method public boolean getAutoMirror();
+ method public float getDefaultHeight();
+ method public float getDefaultWidth();
+ method public String getName();
+ method public androidx.compose.ui.graphics.vector.VectorGroup getRoot();
+ method public int getTintBlendMode();
+ method public long getTintColor();
+ method public float getViewportHeight();
+ method public float getViewportWidth();
+ property public final boolean autoMirror;
+ property public final float defaultHeight;
+ property public final float defaultWidth;
+ property public final String name;
+ property public final androidx.compose.ui.graphics.vector.VectorGroup root;
+ property public final int tintBlendMode;
+ property public final long tintColor;
+ property public final float viewportHeight;
+ property public final float viewportWidth;
+ field public static final androidx.compose.ui.graphics.vector.ImageVector.Companion Companion;
+ }
+
+ public static final class ImageVector.Builder {
+ ctor public ImageVector.Builder(optional String name, float defaultWidth, float defaultHeight, float viewportWidth, float viewportHeight, optional long tintColor, optional int tintBlendMode, optional boolean autoMirror);
+ method @Deprecated public androidx.compose.ui.graphics.vector.ImageVector.Builder! Builder(optional String name, float defaultWidth, float defaultHeight, float viewportWidth, float viewportHeight, optional long tintColor, optional int tintBlendMode);
+ method public androidx.compose.ui.graphics.vector.ImageVector.Builder addGroup(optional String name, optional float rotate, optional float pivotX, optional float pivotY, optional float scaleX, optional float scaleY, optional float translationX, optional float translationY, optional java.util.List<? extends androidx.compose.ui.graphics.vector.PathNode> clipPathData);
+ method public androidx.compose.ui.graphics.vector.ImageVector.Builder addPath(java.util.List<? extends androidx.compose.ui.graphics.vector.PathNode> pathData, optional int pathFillType, optional String name, optional androidx.compose.ui.graphics.Brush? fill, optional float fillAlpha, optional androidx.compose.ui.graphics.Brush? stroke, optional float strokeAlpha, optional float strokeLineWidth, optional int strokeLineCap, optional int strokeLineJoin, optional float strokeLineMiter, optional float trimPathStart, optional float trimPathEnd, optional float trimPathOffset);
+ method public androidx.compose.ui.graphics.vector.ImageVector build();
+ method public androidx.compose.ui.graphics.vector.ImageVector.Builder clearGroup();
+ }
+
+ public static final class ImageVector.Companion {
+ }
+
+ public final class ImageVectorKt {
+ method public static inline androidx.compose.ui.graphics.vector.ImageVector.Builder group(androidx.compose.ui.graphics.vector.ImageVector.Builder, optional String name, optional float rotate, optional float pivotX, optional float pivotY, optional float scaleX, optional float scaleY, optional float translationX, optional float translationY, optional java.util.List<? extends androidx.compose.ui.graphics.vector.PathNode> clipPathData, kotlin.jvm.functions.Function1<? super androidx.compose.ui.graphics.vector.ImageVector.Builder,kotlin.Unit> block);
+ method public static inline androidx.compose.ui.graphics.vector.ImageVector.Builder path(androidx.compose.ui.graphics.vector.ImageVector.Builder, optional String name, optional androidx.compose.ui.graphics.Brush? fill, optional float fillAlpha, optional androidx.compose.ui.graphics.Brush? stroke, optional float strokeAlpha, optional float strokeLineWidth, optional int strokeLineCap, optional int strokeLineJoin, optional float strokeLineMiter, optional int pathFillType, kotlin.jvm.functions.Function1<? super androidx.compose.ui.graphics.vector.PathBuilder,kotlin.Unit> pathBuilder);
+ }
+
+ public abstract sealed class VNode {
+ method public abstract void draw(androidx.compose.ui.graphics.drawscope.DrawScope);
+ method public final void invalidate();
+ }
+
+ public final class VectorApplier extends androidx.compose.runtime.AbstractApplier<androidx.compose.ui.graphics.vector.VNode> {
+ ctor public VectorApplier(androidx.compose.ui.graphics.vector.VNode root);
+ method public void insertBottomUp(int index, androidx.compose.ui.graphics.vector.VNode instance);
+ method public void insertTopDown(int index, androidx.compose.ui.graphics.vector.VNode instance);
+ method public void move(int from, int to, int count);
+ method protected void onClear();
+ method public void remove(int index, int count);
+ }
+
+ @androidx.compose.runtime.ComposableTargetMarker(description="Vector Composable") @kotlin.annotation.Retention(kotlin.annotation.AnnotationRetention.BINARY) @kotlin.annotation.Target(allowedTargets={kotlin.annotation.AnnotationTarget.FILE, kotlin.annotation.AnnotationTarget.FUNCTION, kotlin.annotation.AnnotationTarget.PROPERTY_GETTER, kotlin.annotation.AnnotationTarget.TYPE, kotlin.annotation.AnnotationTarget.TYPE_PARAMETER}) public @interface VectorComposable {
+ }
+
+ public final class VectorComposeKt {
+ method @androidx.compose.runtime.Composable @androidx.compose.ui.graphics.vector.VectorComposable public static void Group(optional String name, optional float rotation, optional float pivotX, optional float pivotY, optional float scaleX, optional float scaleY, optional float translationX, optional float translationY, optional java.util.List<? extends androidx.compose.ui.graphics.vector.PathNode> clipPathData, kotlin.jvm.functions.Function0<kotlin.Unit> content);
+ method @androidx.compose.runtime.Composable @androidx.compose.ui.graphics.vector.VectorComposable public static void Path(java.util.List<? extends androidx.compose.ui.graphics.vector.PathNode> pathData, optional int pathFillType, optional String name, optional androidx.compose.ui.graphics.Brush? fill, optional float fillAlpha, optional androidx.compose.ui.graphics.Brush? stroke, optional float strokeAlpha, optional float strokeLineWidth, optional int strokeLineCap, optional int strokeLineJoin, optional float strokeLineMiter, optional float trimPathStart, optional float trimPathEnd, optional float trimPathOffset);
+ }
+
+ public interface VectorConfig {
+ method public default <T> T! getOrDefault(androidx.compose.ui.graphics.vector.VectorProperty<T> property, T? defaultValue);
+ }
+
+ @androidx.compose.runtime.Immutable public final class VectorGroup extends androidx.compose.ui.graphics.vector.VectorNode implements java.lang.Iterable<androidx.compose.ui.graphics.vector.VectorNode> kotlin.jvm.internal.markers.KMappedMarker {
+ method public operator androidx.compose.ui.graphics.vector.VectorNode get(int index);
+ method public java.util.List<androidx.compose.ui.graphics.vector.PathNode> getClipPathData();
+ method public String getName();
+ method public float getPivotX();
+ method public float getPivotY();
+ method public float getRotation();
+ method public float getScaleX();
+ method public float getScaleY();
+ method public int getSize();
+ method public float getTranslationX();
+ method public float getTranslationY();
+ method public java.util.Iterator<androidx.compose.ui.graphics.vector.VectorNode> iterator();
+ property public final java.util.List<androidx.compose.ui.graphics.vector.PathNode> clipPathData;
+ property public final String name;
+ property public final float pivotX;
+ property public final float pivotY;
+ property public final float rotation;
+ property public final float scaleX;
+ property public final float scaleY;
+ property public final int size;
+ property public final float translationX;
+ property public final float translationY;
+ }
+
+ public final class VectorKt {
+ method public static inline java.util.List<androidx.compose.ui.graphics.vector.PathNode> PathData(kotlin.jvm.functions.Function1<? super androidx.compose.ui.graphics.vector.PathBuilder,kotlin.Unit> block);
+ method public static java.util.List<androidx.compose.ui.graphics.vector.PathNode> addPathNodes(String? pathStr);
+ method public static int getDefaultFillType();
+ method public static int getDefaultStrokeLineCap();
+ method public static int getDefaultStrokeLineJoin();
+ method public static int getDefaultTintBlendMode();
+ method public static long getDefaultTintColor();
+ method public static java.util.List<androidx.compose.ui.graphics.vector.PathNode> getEmptyPath();
+ property public static final int DefaultFillType;
+ property public static final int DefaultStrokeLineCap;
+ property public static final int DefaultStrokeLineJoin;
+ property public static final int DefaultTintBlendMode;
+ property public static final long DefaultTintColor;
+ property public static final java.util.List<androidx.compose.ui.graphics.vector.PathNode> EmptyPath;
+ field public static final String DefaultGroupName = "";
+ field public static final String DefaultPathName = "";
+ field public static final float DefaultPivotX = 0.0f;
+ field public static final float DefaultPivotY = 0.0f;
+ field public static final float DefaultRotation = 0.0f;
+ field public static final float DefaultScaleX = 1.0f;
+ field public static final float DefaultScaleY = 1.0f;
+ field public static final float DefaultStrokeLineMiter = 4.0f;
+ field public static final float DefaultStrokeLineWidth = 0.0f;
+ field public static final float DefaultTranslationX = 0.0f;
+ field public static final float DefaultTranslationY = 0.0f;
+ field public static final float DefaultTrimPathEnd = 1.0f;
+ field public static final float DefaultTrimPathOffset = 0.0f;
+ field public static final float DefaultTrimPathStart = 0.0f;
+ }
+
+ public abstract sealed class VectorNode {
+ }
+
+ public final class VectorPainter extends androidx.compose.ui.graphics.painter.Painter {
+ method public long getIntrinsicSize();
+ method protected void onDraw(androidx.compose.ui.graphics.drawscope.DrawScope);
+ property public long intrinsicSize;
+ }
+
+ public final class VectorPainterKt {
+ method @androidx.compose.runtime.Composable public static void RenderVectorGroup(androidx.compose.ui.graphics.vector.VectorGroup group, optional java.util.Map<java.lang.String,? extends androidx.compose.ui.graphics.vector.VectorConfig> configs);
+ method @Deprecated @androidx.compose.runtime.Composable @androidx.compose.runtime.ComposableOpenTarget(index=0xffffffff) public static androidx.compose.ui.graphics.vector.VectorPainter rememberVectorPainter(float defaultWidth, float defaultHeight, optional float viewportWidth, optional float viewportHeight, optional String name, optional long tintColor, optional int tintBlendMode, kotlin.jvm.functions.Function2<? super java.lang.Float,? super java.lang.Float,kotlin.Unit> content);
+ method @androidx.compose.runtime.Composable @androidx.compose.runtime.ComposableOpenTarget(index=0xffffffff) public static androidx.compose.ui.graphics.vector.VectorPainter rememberVectorPainter(float defaultWidth, float defaultHeight, optional float viewportWidth, optional float viewportHeight, optional String name, optional long tintColor, optional int tintBlendMode, optional boolean autoMirror, kotlin.jvm.functions.Function2<? super java.lang.Float,? super java.lang.Float,kotlin.Unit> content);
+ method @androidx.compose.runtime.Composable public static androidx.compose.ui.graphics.vector.VectorPainter rememberVectorPainter(androidx.compose.ui.graphics.vector.ImageVector image);
+ field public static final String RootGroupName = "VectorRootGroup";
+ }
+
+ @androidx.compose.runtime.Immutable public final class VectorPath extends androidx.compose.ui.graphics.vector.VectorNode {
+ method public androidx.compose.ui.graphics.Brush? getFill();
+ method public float getFillAlpha();
+ method public String getName();
+ method public java.util.List<androidx.compose.ui.graphics.vector.PathNode> getPathData();
+ method public int getPathFillType();
+ method public androidx.compose.ui.graphics.Brush? getStroke();
+ method public float getStrokeAlpha();
+ method public int getStrokeLineCap();
+ method public int getStrokeLineJoin();
+ method public float getStrokeLineMiter();
+ method public float getStrokeLineWidth();
+ method public float getTrimPathEnd();
+ method public float getTrimPathOffset();
+ method public float getTrimPathStart();
+ property public final androidx.compose.ui.graphics.Brush? fill;
+ property public final float fillAlpha;
+ property public final String name;
+ property public final java.util.List<androidx.compose.ui.graphics.vector.PathNode> pathData;
+ property public final int pathFillType;
+ property public final androidx.compose.ui.graphics.Brush? stroke;
+ property public final float strokeAlpha;
+ property public final int strokeLineCap;
+ property public final int strokeLineJoin;
+ property public final float strokeLineMiter;
+ property public final float strokeLineWidth;
+ property public final float trimPathEnd;
+ property public final float trimPathOffset;
+ property public final float trimPathStart;
+ }
+
+ public abstract sealed class VectorProperty<T> {
+ }
+
+ public static final class VectorProperty.Fill extends androidx.compose.ui.graphics.vector.VectorProperty<androidx.compose.ui.graphics.Brush> {
+ field public static final androidx.compose.ui.graphics.vector.VectorProperty.Fill INSTANCE;
+ }
+
+ public static final class VectorProperty.FillAlpha extends androidx.compose.ui.graphics.vector.VectorProperty<java.lang.Float> {
+ field public static final androidx.compose.ui.graphics.vector.VectorProperty.FillAlpha INSTANCE;
+ }
+
+ public static final class VectorProperty.PathData extends androidx.compose.ui.graphics.vector.VectorProperty<java.util.List<? extends androidx.compose.ui.graphics.vector.PathNode>> {
+ field public static final androidx.compose.ui.graphics.vector.VectorProperty.PathData INSTANCE;
+ }
+
+ public static final class VectorProperty.PivotX extends androidx.compose.ui.graphics.vector.VectorProperty<java.lang.Float> {
+ field public static final androidx.compose.ui.graphics.vector.VectorProperty.PivotX INSTANCE;
+ }
+
+ public static final class VectorProperty.PivotY extends androidx.compose.ui.graphics.vector.VectorProperty<java.lang.Float> {
+ field public static final androidx.compose.ui.graphics.vector.VectorProperty.PivotY INSTANCE;
+ }
+
+ public static final class VectorProperty.Rotation extends androidx.compose.ui.graphics.vector.VectorProperty<java.lang.Float> {
+ field public static final androidx.compose.ui.graphics.vector.VectorProperty.Rotation INSTANCE;
+ }
+
+ public static final class VectorProperty.ScaleX extends androidx.compose.ui.graphics.vector.VectorProperty<java.lang.Float> {
+ field public static final androidx.compose.ui.graphics.vector.VectorProperty.ScaleX INSTANCE;
+ }
+
+ public static final class VectorProperty.ScaleY extends androidx.compose.ui.graphics.vector.VectorProperty<java.lang.Float> {
+ field public static final androidx.compose.ui.graphics.vector.VectorProperty.ScaleY INSTANCE;
+ }
+
+ public static final class VectorProperty.Stroke extends androidx.compose.ui.graphics.vector.VectorProperty<androidx.compose.ui.graphics.Brush> {
+ field public static final androidx.compose.ui.graphics.vector.VectorProperty.Stroke INSTANCE;
+ }
+
+ public static final class VectorProperty.StrokeAlpha extends androidx.compose.ui.graphics.vector.VectorProperty<java.lang.Float> {
+ field public static final androidx.compose.ui.graphics.vector.VectorProperty.StrokeAlpha INSTANCE;
+ }
+
+ public static final class VectorProperty.StrokeLineWidth extends androidx.compose.ui.graphics.vector.VectorProperty<java.lang.Float> {
+ field public static final androidx.compose.ui.graphics.vector.VectorProperty.StrokeLineWidth INSTANCE;
+ }
+
+ public static final class VectorProperty.TranslateX extends androidx.compose.ui.graphics.vector.VectorProperty<java.lang.Float> {
+ field public static final androidx.compose.ui.graphics.vector.VectorProperty.TranslateX INSTANCE;
+ }
+
+ public static final class VectorProperty.TranslateY extends androidx.compose.ui.graphics.vector.VectorProperty<java.lang.Float> {
+ field public static final androidx.compose.ui.graphics.vector.VectorProperty.TranslateY INSTANCE;
+ }
+
+ public static final class VectorProperty.TrimPathEnd extends androidx.compose.ui.graphics.vector.VectorProperty<java.lang.Float> {
+ field public static final androidx.compose.ui.graphics.vector.VectorProperty.TrimPathEnd INSTANCE;
+ }
+
+ public static final class VectorProperty.TrimPathOffset extends androidx.compose.ui.graphics.vector.VectorProperty<java.lang.Float> {
+ field public static final androidx.compose.ui.graphics.vector.VectorProperty.TrimPathOffset INSTANCE;
+ }
+
+ public static final class VectorProperty.TrimPathStart extends androidx.compose.ui.graphics.vector.VectorProperty<java.lang.Float> {
+ field public static final androidx.compose.ui.graphics.vector.VectorProperty.TrimPathStart INSTANCE;
+ }
+
+}
+
+package androidx.compose.ui.graphics.vector.compat {
+
+ public final class XmlVectorParser_androidKt {
+ }
+
+}
+
+package androidx.compose.ui.hapticfeedback {
+
+ public interface HapticFeedback {
+ method public void performHapticFeedback(int hapticFeedbackType);
+ }
+
+ @kotlin.jvm.JvmInline public final value class HapticFeedbackType {
+ ctor public HapticFeedbackType(int value);
+ field public static final androidx.compose.ui.hapticfeedback.HapticFeedbackType.Companion Companion;
+ }
+
+ public static final class HapticFeedbackType.Companion {
+ method public int getLongPress();
+ method public int getTextHandleMove();
+ method public java.util.List<androidx.compose.ui.hapticfeedback.HapticFeedbackType> values();
+ property public final int LongPress;
+ property public final int TextHandleMove;
+ }
+
+}
+
+package androidx.compose.ui.input {
+
+ @kotlin.jvm.JvmInline public final value class InputMode {
+ field public static final androidx.compose.ui.input.InputMode.Companion Companion;
+ }
+
+ public static final class InputMode.Companion {
+ method public int getKeyboard();
+ method public int getTouch();
+ property public final int Keyboard;
+ property public final int Touch;
+ }
+
+ public interface InputModeManager {
+ method public int getInputMode();
+ property public abstract int inputMode;
+ }
+
+}
+
+package androidx.compose.ui.input.key {
+
+ @kotlin.jvm.JvmInline public final value class Key {
+ ctor public Key(long keyCode);
+ method public long getKeyCode();
+ property public final long keyCode;
+ field public static final androidx.compose.ui.input.key.Key.Companion Companion;
+ }
+
+ public static final class Key.Companion {
+ method public long getA();
+ method public long getAllApps();
+ method public long getAltLeft();
+ method public long getAltRight();
+ method public long getApostrophe();
+ method public long getAppSwitch();
+ method public long getAssist();
+ method public long getAt();
+ method public long getAvReceiverInput();
+ method public long getAvReceiverPower();
+ method public long getB();
+ method public long getBack();
+ method public long getBackslash();
+ method public long getBackspace();
+ method public long getBookmark();
+ method public long getBreak();
+ method public long getBrightnessDown();
+ method public long getBrightnessUp();
+ method public long getBrowser();
+ method public long getButton1();
+ method public long getButton10();
+ method public long getButton11();
+ method public long getButton12();
+ method public long getButton13();
+ method public long getButton14();
+ method public long getButton15();
+ method public long getButton16();
+ method public long getButton2();
+ method public long getButton3();
+ method public long getButton4();
+ method public long getButton5();
+ method public long getButton6();
+ method public long getButton7();
+ method public long getButton8();
+ method public long getButton9();
+ method public long getButtonA();
+ method public long getButtonB();
+ method public long getButtonC();
+ method public long getButtonL1();
+ method public long getButtonL2();
+ method public long getButtonMode();
+ method public long getButtonR1();
+ method public long getButtonR2();
+ method public long getButtonSelect();
+ method public long getButtonStart();
+ method public long getButtonThumbLeft();
+ method public long getButtonThumbRight();
+ method public long getButtonX();
+ method public long getButtonY();
+ method public long getButtonZ();
+ method public long getC();
+ method public long getCalculator();
+ method public long getCalendar();
+ method public long getCall();
+ method public long getCamera();
+ method public long getCapsLock();
+ method public long getCaptions();
+ method public long getChannelDown();
+ method public long getChannelUp();
+ method public long getClear();
+ method public long getComma();
+ method public long getContacts();
+ method public long getCopy();
+ method public long getCtrlLeft();
+ method public long getCtrlRight();
+ method public long getCut();
+ method public long getD();
+ method public long getDelete();
+ method public long getDirectionCenter();
+ method public long getDirectionDown();
+ method public long getDirectionDownLeft();
+ method public long getDirectionDownRight();
+ method public long getDirectionLeft();
+ method public long getDirectionRight();
+ method public long getDirectionUp();
+ method public long getDirectionUpLeft();
+ method public long getDirectionUpRight();
+ method public long getDvr();
+ method public long getE();
+ method public long getEight();
+ method public long getEisu();
+ method public long getEndCall();
+ method public long getEnter();
+ method public long getEnvelope();
+ method public long getEquals();
+ method public long getEscape();
+ method public long getF();
+ method public long getF1();
+ method public long getF10();
+ method public long getF11();
+ method public long getF12();
+ method public long getF2();
+ method public long getF3();
+ method public long getF4();
+ method public long getF5();
+ method public long getF6();
+ method public long getF7();
+ method public long getF8();
+ method public long getF9();
+ method public long getFive();
+ method public long getFocus();
+ method public long getForward();
+ method public long getFour();
+ method public long getFunction();
+ method public long getG();
+ method public long getGrave();
+ method public long getGuide();
+ method public long getH();
+ method public long getHeadsetHook();
+ method public long getHelp();
+ method public long getHenkan();
+ method public long getHome();
+ method public long getI();
+ method public long getInfo();
+ method public long getInsert();
+ method public long getJ();
+ method public long getK();
+ method public long getKana();
+ method public long getKatakanaHiragana();
+ method public long getL();
+ method public long getLanguageSwitch();
+ method public long getLastChannel();
+ method public long getLeftBracket();
+ method public long getM();
+ method public long getMannerMode();
+ method public long getMediaAudioTrack();
+ method public long getMediaClose();
+ method public long getMediaEject();
+ method public long getMediaFastForward();
+ method public long getMediaNext();
+ method public long getMediaPause();
+ method public long getMediaPlay();
+ method public long getMediaPlayPause();
+ method public long getMediaPrevious();
+ method public long getMediaRecord();
+ method public long getMediaRewind();
+ method public long getMediaSkipBackward();
+ method public long getMediaSkipForward();
+ method public long getMediaStepBackward();
+ method public long getMediaStepForward();
+ method public long getMediaStop();
+ method public long getMediaTopMenu();
+ method public long getMenu();
+ method public long getMetaLeft();
+ method public long getMetaRight();
+ method public long getMicrophoneMute();
+ method public long getMinus();
+ method public long getMoveEnd();
+ method public long getMoveHome();
+ method public long getMuhenkan();
+ method public long getMultiply();
+ method public long getMusic();
+ method public long getN();
+ method public long getNavigateIn();
+ method public long getNavigateNext();
+ method public long getNavigateOut();
+ method public long getNavigatePrevious();
+ method public long getNine();
+ method public long getNotification();
+ method public long getNumLock();
+ method public long getNumPad0();
+ method public long getNumPad1();
+ method public long getNumPad2();
+ method public long getNumPad3();
+ method public long getNumPad4();
+ method public long getNumPad5();
+ method public long getNumPad6();
+ method public long getNumPad7();
+ method public long getNumPad8();
+ method public long getNumPad9();
+ method public long getNumPadAdd();
+ method public long getNumPadComma();
+ method public long getNumPadDivide();
+ method public long getNumPadDot();
+ method public long getNumPadEnter();
+ method public long getNumPadEquals();
+ method public long getNumPadLeftParenthesis();
+ method public long getNumPadMultiply();
+ method public long getNumPadRightParenthesis();
+ method public long getNumPadSubtract();
+ method public long getNumber();
+ method public long getO();
+ method public long getOne();
+ method public long getP();
+ method public long getPageDown();
+ method public long getPageUp();
+ method public long getPairing();
+ method public long getPaste();
+ method public long getPeriod();
+ method public long getPictureSymbols();
+ method public long getPlus();
+ method public long getPound();
+ method public long getPower();
+ method public long getPrintScreen();
+ method public long getProfileSwitch();
+ method public long getProgramBlue();
+ method public long getProgramGreen();
+ method public long getProgramRed();
+ method public long getProgramYellow();
+ method public long getQ();
+ method public long getR();
+ method public long getRefresh();
+ method public long getRightBracket();
+ method public long getRo();
+ method public long getS();
+ method public long getScrollLock();
+ method public long getSearch();
+ method public long getSemicolon();
+ method public long getSetTopBoxInput();
+ method public long getSetTopBoxPower();
+ method public long getSettings();
+ method public long getSeven();
+ method public long getShiftLeft();
+ method public long getShiftRight();
+ method public long getSix();
+ method public long getSlash();
+ method public long getSleep();
+ method public long getSoftLeft();
+ method public long getSoftRight();
+ method public long getSoftSleep();
+ method public long getSpacebar();
+ method public long getStem1();
+ method public long getStem2();
+ method public long getStem3();
+ method public long getStemPrimary();
+ method public long getSwitchCharset();
+ method public long getSymbol();
+ method public long getSystemNavigationDown();
+ method public long getSystemNavigationLeft();
+ method public long getSystemNavigationRight();
+ method public long getSystemNavigationUp();
+ method public long getT();
+ method public long getTab();
+ method public long getThree();
+ method public long getThumbsDown();
+ method public long getThumbsUp();
+ method public long getToggle2D3D();
+ method public long getTv();
+ method public long getTvAntennaCable();
+ method public long getTvAudioDescription();
+ method public long getTvAudioDescriptionMixingVolumeDown();
+ method public long getTvAudioDescriptionMixingVolumeUp();
+ method public long getTvContentsMenu();
+ method public long getTvDataService();
+ method public long getTvInput();
+ method public long getTvInputComponent1();
+ method public long getTvInputComponent2();
+ method public long getTvInputComposite1();
+ method public long getTvInputComposite2();
+ method public long getTvInputHdmi1();
+ method public long getTvInputHdmi2();
+ method public long getTvInputHdmi3();
+ method public long getTvInputHdmi4();
+ method public long getTvInputVga1();
+ method public long getTvMediaContextMenu();
+ method public long getTvNetwork();
+ method public long getTvNumberEntry();
+ method public long getTvPower();
+ method public long getTvRadioService();
+ method public long getTvSatellite();
+ method public long getTvSatelliteBs();
+ method public long getTvSatelliteCs();
+ method public long getTvSatelliteService();
+ method public long getTvTeletext();
+ method public long getTvTerrestrialAnalog();
+ method public long getTvTerrestrialDigital();
+ method public long getTvTimerProgramming();
+ method public long getTvZoomMode();
+ method public long getTwo();
+ method public long getU();
+ method public long getUnknown();
+ method public long getV();
+ method public long getVoiceAssist();
+ method public long getVolumeDown();
+ method public long getVolumeMute();
+ method public long getVolumeUp();
+ method public long getW();
+ method public long getWakeUp();
+ method public long getWindow();
+ method public long getX();
+ method public long getY();
+ method public long getYen();
+ method public long getZ();
+ method public long getZenkakuHankaru();
+ method public long getZero();
+ method public long getZoomIn();
+ method public long getZoomOut();
+ property public final long A;
+ property public final long AllApps;
+ property public final long AltLeft;
+ property public final long AltRight;
+ property public final long Apostrophe;
+ property public final long AppSwitch;
+ property public final long Assist;
+ property public final long At;
+ property public final long AvReceiverInput;
+ property public final long AvReceiverPower;
+ property public final long B;
+ property public final long Back;
+ property public final long Backslash;
+ property public final long Backspace;
+ property public final long Bookmark;
+ property public final long Break;
+ property public final long BrightnessDown;
+ property public final long BrightnessUp;
+ property public final long Browser;
+ property public final long Button1;
+ property public final long Button10;
+ property public final long Button11;
+ property public final long Button12;
+ property public final long Button13;
+ property public final long Button14;
+ property public final long Button15;
+ property public final long Button16;
+ property public final long Button2;
+ property public final long Button3;
+ property public final long Button4;
+ property public final long Button5;
+ property public final long Button6;
+ property public final long Button7;
+ property public final long Button8;
+ property public final long Button9;
+ property public final long ButtonA;
+ property public final long ButtonB;
+ property public final long ButtonC;
+ property public final long ButtonL1;
+ property public final long ButtonL2;
+ property public final long ButtonMode;
+ property public final long ButtonR1;
+ property public final long ButtonR2;
+ property public final long ButtonSelect;
+ property public final long ButtonStart;
+ property public final long ButtonThumbLeft;
+ property public final long ButtonThumbRight;
+ property public final long ButtonX;
+ property public final long ButtonY;
+ property public final long ButtonZ;
+ property public final long C;
+ property public final long Calculator;
+ property public final long Calendar;
+ property public final long Call;
+ property public final long Camera;
+ property public final long CapsLock;
+ property public final long Captions;
+ property public final long ChannelDown;
+ property public final long ChannelUp;
+ property public final long Clear;
+ property public final long Comma;
+ property public final long Contacts;
+ property public final long Copy;
+ property public final long CtrlLeft;
+ property public final long CtrlRight;
+ property public final long Cut;
+ property public final long D;
+ property public final long Delete;
+ property public final long DirectionCenter;
+ property public final long DirectionDown;
+ property public final long DirectionDownLeft;
+ property public final long DirectionDownRight;
+ property public final long DirectionLeft;
+ property public final long DirectionRight;
+ property public final long DirectionUp;
+ property public final long DirectionUpLeft;
+ property public final long DirectionUpRight;
+ property public final long Dvr;
+ property public final long E;
+ property public final long Eight;
+ property public final long Eisu;
+ property public final long EndCall;
+ property public final long Enter;
+ property public final long Envelope;
+ property public final long Equals;
+ property public final long Escape;
+ property public final long F;
+ property public final long F1;
+ property public final long F10;
+ property public final long F11;
+ property public final long F12;
+ property public final long F2;
+ property public final long F3;
+ property public final long F4;
+ property public final long F5;
+ property public final long F6;
+ property public final long F7;
+ property public final long F8;
+ property public final long F9;
+ property public final long Five;
+ property public final long Focus;
+ property public final long Forward;
+ property public final long Four;
+ property public final long Function;
+ property public final long G;
+ property public final long Grave;
+ property public final long Guide;
+ property public final long H;
+ property public final long HeadsetHook;
+ property public final long Help;
+ property public final long Henkan;
+ property public final long Home;
+ property public final long I;
+ property public final long Info;
+ property public final long Insert;
+ property public final long J;
+ property public final long K;
+ property public final long Kana;
+ property public final long KatakanaHiragana;
+ property public final long L;
+ property public final long LanguageSwitch;
+ property public final long LastChannel;
+ property public final long LeftBracket;
+ property public final long M;
+ property public final long MannerMode;
+ property public final long MediaAudioTrack;
+ property public final long MediaClose;
+ property public final long MediaEject;
+ property public final long MediaFastForward;
+ property public final long MediaNext;
+ property public final long MediaPause;
+ property public final long MediaPlay;
+ property public final long MediaPlayPause;
+ property public final long MediaPrevious;
+ property public final long MediaRecord;
+ property public final long MediaRewind;
+ property public final long MediaSkipBackward;
+ property public final long MediaSkipForward;
+ property public final long MediaStepBackward;
+ property public final long MediaStepForward;
+ property public final long MediaStop;
+ property public final long MediaTopMenu;
+ property public final long Menu;
+ property public final long MetaLeft;
+ property public final long MetaRight;
+ property public final long MicrophoneMute;
+ property public final long Minus;
+ property public final long MoveEnd;
+ property public final long MoveHome;
+ property public final long Muhenkan;
+ property public final long Multiply;
+ property public final long Music;
+ property public final long N;
+ property public final long NavigateIn;
+ property public final long NavigateNext;
+ property public final long NavigateOut;
+ property public final long NavigatePrevious;
+ property public final long Nine;
+ property public final long Notification;
+ property public final long NumLock;
+ property public final long NumPad0;
+ property public final long NumPad1;
+ property public final long NumPad2;
+ property public final long NumPad3;
+ property public final long NumPad4;
+ property public final long NumPad5;
+ property public final long NumPad6;
+ property public final long NumPad7;
+ property public final long NumPad8;
+ property public final long NumPad9;
+ property public final long NumPadAdd;
+ property public final long NumPadComma;
+ property public final long NumPadDivide;
+ property public final long NumPadDot;
+ property public final long NumPadEnter;
+ property public final long NumPadEquals;
+ property public final long NumPadLeftParenthesis;
+ property public final long NumPadMultiply;
+ property public final long NumPadRightParenthesis;
+ property public final long NumPadSubtract;
+ property public final long Number;
+ property public final long O;
+ property public final long One;
+ property public final long P;
+ property public final long PageDown;
+ property public final long PageUp;
+ property public final long Pairing;
+ property public final long Paste;
+ property public final long Period;
+ property public final long PictureSymbols;
+ property public final long Plus;
+ property public final long Pound;
+ property public final long Power;
+ property public final long PrintScreen;
+ property public final long ProfileSwitch;
+ property public final long ProgramBlue;
+ property public final long ProgramGreen;
+ property public final long ProgramRed;
+ property public final long ProgramYellow;
+ property public final long Q;
+ property public final long R;
+ property public final long Refresh;
+ property public final long RightBracket;
+ property public final long Ro;
+ property public final long S;
+ property public final long ScrollLock;
+ property public final long Search;
+ property public final long Semicolon;
+ property public final long SetTopBoxInput;
+ property public final long SetTopBoxPower;
+ property public final long Settings;
+ property public final long Seven;
+ property public final long ShiftLeft;
+ property public final long ShiftRight;
+ property public final long Six;
+ property public final long Slash;
+ property public final long Sleep;
+ property public final long SoftLeft;
+ property public final long SoftRight;
+ property public final long SoftSleep;
+ property public final long Spacebar;
+ property public final long Stem1;
+ property public final long Stem2;
+ property public final long Stem3;
+ property public final long StemPrimary;
+ property public final long SwitchCharset;
+ property public final long Symbol;
+ property public final long SystemNavigationDown;
+ property public final long SystemNavigationLeft;
+ property public final long SystemNavigationRight;
+ property public final long SystemNavigationUp;
+ property public final long T;
+ property public final long Tab;
+ property public final long Three;
+ property public final long ThumbsDown;
+ property public final long ThumbsUp;
+ property public final long Toggle2D3D;
+ property public final long Tv;
+ property public final long TvAntennaCable;
+ property public final long TvAudioDescription;
+ property public final long TvAudioDescriptionMixingVolumeDown;
+ property public final long TvAudioDescriptionMixingVolumeUp;
+ property public final long TvContentsMenu;
+ property public final long TvDataService;
+ property public final long TvInput;
+ property public final long TvInputComponent1;
+ property public final long TvInputComponent2;
+ property public final long TvInputComposite1;
+ property public final long TvInputComposite2;
+ property public final long TvInputHdmi1;
+ property public final long TvInputHdmi2;
+ property public final long TvInputHdmi3;
+ property public final long TvInputHdmi4;
+ property public final long TvInputVga1;
+ property public final long TvMediaContextMenu;
+ property public final long TvNetwork;
+ property public final long TvNumberEntry;
+ property public final long TvPower;
+ property public final long TvRadioService;
+ property public final long TvSatellite;
+ property public final long TvSatelliteBs;
+ property public final long TvSatelliteCs;
+ property public final long TvSatelliteService;
+ property public final long TvTeletext;
+ property public final long TvTerrestrialAnalog;
+ property public final long TvTerrestrialDigital;
+ property public final long TvTimerProgramming;
+ property public final long TvZoomMode;
+ property public final long Two;
+ property public final long U;
+ property public final long Unknown;
+ property public final long V;
+ property public final long VoiceAssist;
+ property public final long VolumeDown;
+ property public final long VolumeMute;
+ property public final long VolumeUp;
+ property public final long W;
+ property public final long WakeUp;
+ property public final long Window;
+ property public final long X;
+ property public final long Y;
+ property public final long Yen;
+ property public final long Z;
+ property public final long ZenkakuHankaru;
+ property public final long Zero;
+ property public final long ZoomIn;
+ property public final long ZoomOut;
+ }
+
+ @kotlin.jvm.JvmInline public final value class KeyEvent {
+ ctor public KeyEvent(android.view.KeyEvent nativeKeyEvent);
+ method public android.view.KeyEvent getNativeKeyEvent();
+ property public final android.view.KeyEvent nativeKeyEvent;
+ }
+
+ @kotlin.jvm.JvmInline public final value class KeyEventType {
+ field public static final androidx.compose.ui.input.key.KeyEventType.Companion Companion;
+ }
+
+ public static final class KeyEventType.Companion {
+ method public int getKeyDown();
+ method public int getKeyUp();
+ method public int getUnknown();
+ property public final int KeyDown;
+ property public final int KeyUp;
+ property public final int Unknown;
+ }
+
+ public final class KeyEvent_androidKt {
+ method public static long getKey(android.view.KeyEvent);
+ method public static int getType(android.view.KeyEvent);
+ method public static int getUtf16CodePoint(android.view.KeyEvent);
+ method public static boolean isAltPressed(android.view.KeyEvent);
+ method public static boolean isCtrlPressed(android.view.KeyEvent);
+ method public static boolean isMetaPressed(android.view.KeyEvent);
+ method public static boolean isShiftPressed(android.view.KeyEvent);
+ }
+
+ public final class KeyInputModifierKt {
+ method public static androidx.compose.ui.Modifier onKeyEvent(androidx.compose.ui.Modifier, kotlin.jvm.functions.Function1<? super androidx.compose.ui.input.key.KeyEvent,java.lang.Boolean> onKeyEvent);
+ method public static androidx.compose.ui.Modifier onPreviewKeyEvent(androidx.compose.ui.Modifier, kotlin.jvm.functions.Function1<? super androidx.compose.ui.input.key.KeyEvent,java.lang.Boolean> onPreviewKeyEvent);
+ }
+
+ public final class Key_androidKt {
+ method public static long Key(int nativeKeyCode);
+ method public static int getNativeKeyCode(long);
+ }
+
+}
+
+package androidx.compose.ui.input.nestedscroll {
+
+ public interface NestedScrollConnection {
+ method public default suspend Object? onPostFling(long consumed, long available, kotlin.coroutines.Continuation<? super androidx.compose.ui.unit.Velocity>);
+ method public default long onPostScroll(long consumed, long available, int source);
+ method public default suspend Object? onPreFling(long available, kotlin.coroutines.Continuation<? super androidx.compose.ui.unit.Velocity>);
+ method public default long onPreScroll(long available, int source);
+ }
+
+ public final class NestedScrollDispatcher {
+ ctor public NestedScrollDispatcher();
+ method public suspend Object? dispatchPostFling(long consumed, long available, kotlin.coroutines.Continuation<? super androidx.compose.ui.unit.Velocity>);
+ method public long dispatchPostScroll(long consumed, long available, int source);
+ method public suspend Object? dispatchPreFling(long available, kotlin.coroutines.Continuation<? super androidx.compose.ui.unit.Velocity>);
+ method public long dispatchPreScroll(long available, int source);
+ method public kotlinx.coroutines.CoroutineScope getCoroutineScope();
+ property public final kotlinx.coroutines.CoroutineScope coroutineScope;
+ }
+
+ public final class NestedScrollModifierKt {
+ method public static androidx.compose.ui.Modifier nestedScroll(androidx.compose.ui.Modifier, androidx.compose.ui.input.nestedscroll.NestedScrollConnection connection, optional androidx.compose.ui.input.nestedscroll.NestedScrollDispatcher? dispatcher);
+ }
+
+ public final class NestedScrollModifierLocalKt {
+ }
+
+ @kotlin.jvm.JvmInline public final value class NestedScrollSource {
+ field public static final androidx.compose.ui.input.nestedscroll.NestedScrollSource.Companion Companion;
+ }
+
+ public static final class NestedScrollSource.Companion {
+ method public int getDrag();
+ method public int getFling();
+ method @Deprecated public int getRelocate();
+ property public final int Drag;
+ property public final int Fling;
+ property @Deprecated public final int Relocate;
+ }
+
+}
+
+package androidx.compose.ui.input.pointer {
+
+ @kotlin.coroutines.RestrictsSuspension public interface AwaitPointerEventScope extends androidx.compose.ui.unit.Density {
+ method public suspend Object? awaitPointerEvent(optional androidx.compose.ui.input.pointer.PointerEventPass pass, optional kotlin.coroutines.Continuation<? super androidx.compose.ui.input.pointer.PointerEvent>);
+ method public androidx.compose.ui.input.pointer.PointerEvent getCurrentEvent();
+ method public default long getExtendedTouchPadding();
+ method public long getSize();
+ method public androidx.compose.ui.platform.ViewConfiguration getViewConfiguration();
+ method public default suspend <T> Object? withTimeout(long timeMillis, kotlin.jvm.functions.Function2<? super androidx.compose.ui.input.pointer.AwaitPointerEventScope,? super kotlin.coroutines.Continuation<? super T>,?> block, kotlin.coroutines.Continuation<? super T>);
+ method public default suspend <T> Object? withTimeoutOrNull(long timeMillis, kotlin.jvm.functions.Function2<? super androidx.compose.ui.input.pointer.AwaitPointerEventScope,? super kotlin.coroutines.Continuation<? super T>,?> block, kotlin.coroutines.Continuation<? super T>);
+ property public abstract androidx.compose.ui.input.pointer.PointerEvent currentEvent;
+ property public default long extendedTouchPadding;
+ property public abstract long size;
+ property public abstract androidx.compose.ui.platform.ViewConfiguration viewConfiguration;
+ }
+
+ @Deprecated public final class ConsumedData {
+ ctor @Deprecated public ConsumedData(optional @Deprecated boolean positionChange, optional @Deprecated boolean downChange);
+ method @Deprecated public boolean getDownChange();
+ method @Deprecated public boolean getPositionChange();
+ method @Deprecated public void setDownChange(boolean);
+ method @Deprecated public void setPositionChange(boolean);
+ property @Deprecated public final boolean downChange;
+ property @Deprecated public final boolean positionChange;
+ }
+
+ @kotlin.jvm.JvmInline public final value class PointerButtons {
+ ctor public PointerButtons(int packedValue);
+ }
+
+ public final class PointerEvent {
+ ctor public PointerEvent(java.util.List<androidx.compose.ui.input.pointer.PointerInputChange> changes);
+ method public java.util.List<androidx.compose.ui.input.pointer.PointerInputChange> component1();
+ method public androidx.compose.ui.input.pointer.PointerEvent copy(java.util.List<androidx.compose.ui.input.pointer.PointerInputChange> changes, android.view.MotionEvent? motionEvent);
+ method public int getButtons();
+ method public java.util.List<androidx.compose.ui.input.pointer.PointerInputChange> getChanges();
+ method public int getKeyboardModifiers();
+ method public int getType();
+ property public final int buttons;
+ property public final java.util.List<androidx.compose.ui.input.pointer.PointerInputChange> changes;
+ property public final int keyboardModifiers;
+ property public final int type;
+ }
+
+ public final class PointerEventKt {
+ method @Deprecated public static boolean anyChangeConsumed(androidx.compose.ui.input.pointer.PointerInputChange);
+ method public static boolean changedToDown(androidx.compose.ui.input.pointer.PointerInputChange);
+ method public static boolean changedToDownIgnoreConsumed(androidx.compose.ui.input.pointer.PointerInputChange);
+ method public static boolean changedToUp(androidx.compose.ui.input.pointer.PointerInputChange);
+ method public static boolean changedToUpIgnoreConsumed(androidx.compose.ui.input.pointer.PointerInputChange);
+ method @Deprecated public static void consumeAllChanges(androidx.compose.ui.input.pointer.PointerInputChange);
+ method @Deprecated public static void consumeDownChange(androidx.compose.ui.input.pointer.PointerInputChange);
+ method @Deprecated public static void consumePositionChange(androidx.compose.ui.input.pointer.PointerInputChange);
+ method public static int indexOfFirstPressed(int);
+ method public static int indexOfLastPressed(int);
+ method @Deprecated public static boolean isOutOfBounds(androidx.compose.ui.input.pointer.PointerInputChange, long size);
+ method public static boolean isOutOfBounds(androidx.compose.ui.input.pointer.PointerInputChange, long size, long extendedTouchPadding);
+ method public static boolean isPressed(int, int buttonIndex);
+ method public static long positionChange(androidx.compose.ui.input.pointer.PointerInputChange);
+ method @Deprecated public static boolean positionChangeConsumed(androidx.compose.ui.input.pointer.PointerInputChange);
+ method public static long positionChangeIgnoreConsumed(androidx.compose.ui.input.pointer.PointerInputChange);
+ method public static boolean positionChanged(androidx.compose.ui.input.pointer.PointerInputChange);
+ method public static boolean positionChangedIgnoreConsumed(androidx.compose.ui.input.pointer.PointerInputChange);
+ }
+
+ public enum PointerEventPass {
+ enum_constant public static final androidx.compose.ui.input.pointer.PointerEventPass Final;
+ enum_constant public static final androidx.compose.ui.input.pointer.PointerEventPass Initial;
+ enum_constant public static final androidx.compose.ui.input.pointer.PointerEventPass Main;
+ }
+
+ public final class PointerEventTimeoutCancellationException extends java.util.concurrent.CancellationException {
+ ctor public PointerEventTimeoutCancellationException(long time);
+ }
+
+ @kotlin.jvm.JvmInline public final value class PointerEventType {
+ field public static final androidx.compose.ui.input.pointer.PointerEventType.Companion Companion;
+ }
+
+ public static final class PointerEventType.Companion {
+ method public int getEnter();
+ method public int getExit();
+ method public int getMove();
+ method public int getPress();
+ method public int getRelease();
+ method public int getScroll();
+ method public int getUnknown();
+ property public final int Enter;
+ property public final int Exit;
+ property public final int Move;
+ property public final int Press;
+ property public final int Release;
+ property public final int Scroll;
+ property public final int Unknown;
+ }
+
+ public final class PointerEvent_androidKt {
+ method public static boolean getAreAnyPressed(int);
+ method public static int indexOfFirstPressed(int);
+ method public static int indexOfLastPressed(int);
+ method public static boolean isAltGraphPressed(int);
+ method public static boolean isAltPressed(int);
+ method public static boolean isBackPressed(int);
+ method public static boolean isCapsLockOn(int);
+ method public static boolean isCtrlPressed(int);
+ method public static boolean isForwardPressed(int);
+ method public static boolean isFunctionPressed(int);
+ method public static boolean isMetaPressed(int);
+ method public static boolean isNumLockOn(int);
+ method public static boolean isPressed(int, int buttonIndex);
+ method public static boolean isPrimaryPressed(int);
+ method public static boolean isScrollLockOn(int);
+ method public static boolean isSecondaryPressed(int);
+ method public static boolean isShiftPressed(int);
+ method public static boolean isSymPressed(int);
+ method public static boolean isTertiaryPressed(int);
+ }
+
+ @androidx.compose.runtime.Stable public interface PointerIcon {
+ }
+
+ public final class PointerIconKt {
+ method @androidx.compose.runtime.Stable public static androidx.compose.ui.Modifier pointerHoverIcon(androidx.compose.ui.Modifier, androidx.compose.ui.input.pointer.PointerIcon icon, optional boolean overrideDescendants);
+ }
+
+ public final class PointerIcon_androidKt {
+ method public static androidx.compose.ui.input.pointer.PointerIcon PointerIcon(android.view.PointerIcon pointerIcon);
+ method public static androidx.compose.ui.input.pointer.PointerIcon PointerIcon(int pointerIconType);
+ }
+
+ @kotlin.jvm.JvmInline public final value class PointerId {
+ ctor public PointerId(long value);
+ method public long getValue();
+ property public final long value;
+ }
+
+ @androidx.compose.runtime.Immutable public final class PointerInputChange {
+ ctor public PointerInputChange(long id, long uptimeMillis, long position, boolean pressed, long previousUptimeMillis, long previousPosition, boolean previousPressed, boolean isInitiallyConsumed, optional int type, optional long scrollDelta);
+ method @Deprecated public androidx.compose.ui.input.pointer.PointerInputChange! PointerInputChange(long id, long uptimeMillis, long position, boolean pressed, long previousUptimeMillis, long previousPosition, boolean previousPressed, androidx.compose.ui.input.pointer.ConsumedData consumed, optional int type);
+ method public void consume();
+ method public androidx.compose.ui.input.pointer.PointerInputChange copy(optional long id, optional long currentTime, optional long currentPosition, optional boolean currentPressed, optional long previousTime, optional long previousPosition, optional boolean previousPressed, optional int type, optional long scrollDelta);
+ method @Deprecated public androidx.compose.ui.input.pointer.PointerInputChange copy(optional long id, optional long currentTime, optional long currentPosition, optional boolean currentPressed, optional long previousTime, optional long previousPosition, optional boolean previousPressed, androidx.compose.ui.input.pointer.ConsumedData consumed, optional int type, optional long scrollDelta);
+ method @Deprecated public androidx.compose.ui.input.pointer.PointerInputChange! copy(optional long id, optional long currentTime, optional long currentPosition, optional boolean currentPressed, optional long previousTime, optional long previousPosition, optional boolean previousPressed, optional androidx.compose.ui.input.pointer.ConsumedData consumed, optional int type);
+ method @Deprecated public androidx.compose.ui.input.pointer.ConsumedData getConsumed();
+ method public long getId();
+ method public long getPosition();
+ method public boolean getPressed();
+ method public long getPreviousPosition();
+ method public boolean getPreviousPressed();
+ method public long getPreviousUptimeMillis();
+ method public long getScrollDelta();
+ method public int getType();
+ method public long getUptimeMillis();
+ method public boolean isConsumed();
+ property @Deprecated public final androidx.compose.ui.input.pointer.ConsumedData consumed;
+ property public final long id;
+ property public final boolean isConsumed;
+ property public final long position;
+ property public final boolean pressed;
+ property public final long previousPosition;
+ property public final boolean previousPressed;
+ property public final long previousUptimeMillis;
+ property public final long scrollDelta;
+ property public final int type;
+ property public final long uptimeMillis;
+ }
+
+ public final class PointerInputEventProcessorKt {
+ }
+
+ public abstract class PointerInputFilter {
+ ctor public PointerInputFilter();
+ method public boolean getInterceptOutOfBoundsChildEvents();
+ method public final long getSize();
+ method public abstract void onCancel();
+ method public abstract void onPointerEvent(androidx.compose.ui.input.pointer.PointerEvent pointerEvent, androidx.compose.ui.input.pointer.PointerEventPass pass, long bounds);
+ property public boolean interceptOutOfBoundsChildEvents;
+ property public final long size;
+ }
+
+ public interface PointerInputModifier extends androidx.compose.ui.Modifier.Element {
+ method public androidx.compose.ui.input.pointer.PointerInputFilter getPointerInputFilter();
+ property public abstract androidx.compose.ui.input.pointer.PointerInputFilter pointerInputFilter;
+ }
+
+ public interface PointerInputScope extends androidx.compose.ui.unit.Density {
+ method public suspend <R> Object? awaitPointerEventScope(kotlin.jvm.functions.Function2<? super androidx.compose.ui.input.pointer.AwaitPointerEventScope,? super kotlin.coroutines.Continuation<? super R>,?> block, kotlin.coroutines.Continuation<? super R>);
+ method public default long getExtendedTouchPadding();
+ method public default boolean getInterceptOutOfBoundsChildEvents();
+ method public long getSize();
+ method public androidx.compose.ui.platform.ViewConfiguration getViewConfiguration();
+ method public default void setInterceptOutOfBoundsChildEvents(boolean);
+ property public default long extendedTouchPadding;
+ property public default boolean interceptOutOfBoundsChildEvents;
+ property public abstract long size;
+ property public abstract androidx.compose.ui.platform.ViewConfiguration viewConfiguration;
+ }
+
+ public final class PointerInputTestUtilKt {
+ }
+
+ public final class PointerInteropFilter_androidKt {
+ }
+
+ public final class PointerInteropUtils_androidKt {
+ }
+
+ @kotlin.jvm.JvmInline public final value class PointerKeyboardModifiers {
+ ctor public PointerKeyboardModifiers(int packedValue);
+ }
+
+ @kotlin.jvm.JvmInline public final value class PointerType {
+ field public static final androidx.compose.ui.input.pointer.PointerType.Companion Companion;
+ }
+
+ public static final class PointerType.Companion {
+ method public int getEraser();
+ method public int getMouse();
+ method public int getStylus();
+ method public int getTouch();
+ method public int getUnknown();
+ property public final int Eraser;
+ property public final int Mouse;
+ property public final int Stylus;
+ property public final int Touch;
+ property public final int Unknown;
+ }
+
+ public final class SuspendingPointerInputFilterKt {
+ method @Deprecated public static androidx.compose.ui.Modifier pointerInput(androidx.compose.ui.Modifier, kotlin.jvm.functions.Function2<? super androidx.compose.ui.input.pointer.PointerInputScope,? super kotlin.coroutines.Continuation<? super kotlin.Unit>,?> block);
+ method public static androidx.compose.ui.Modifier pointerInput(androidx.compose.ui.Modifier, Object? key1, kotlin.jvm.functions.Function2<? super androidx.compose.ui.input.pointer.PointerInputScope,? super kotlin.coroutines.Continuation<? super kotlin.Unit>,?> block);
+ method public static androidx.compose.ui.Modifier pointerInput(androidx.compose.ui.Modifier, Object? key1, Object? key2, kotlin.jvm.functions.Function2<? super androidx.compose.ui.input.pointer.PointerInputScope,? super kotlin.coroutines.Continuation<? super kotlin.Unit>,?> block);
+ method public static androidx.compose.ui.Modifier pointerInput(androidx.compose.ui.Modifier, Object![]? keys, kotlin.jvm.functions.Function2<? super androidx.compose.ui.input.pointer.PointerInputScope,? super kotlin.coroutines.Continuation<? super kotlin.Unit>,?> block);
+ }
+
+}
+
+package androidx.compose.ui.input.pointer.util {
+
+ public final class VelocityTracker {
+ ctor public VelocityTracker();
+ method public void addPosition(long timeMillis, long position);
+ method public long calculateVelocity();
+ method public void resetTracking();
+ }
+
+ public final class VelocityTrackerKt {
+ method public static void addPointerInputChange(androidx.compose.ui.input.pointer.util.VelocityTracker, androidx.compose.ui.input.pointer.PointerInputChange event);
+ }
+
+}
+
+package androidx.compose.ui.input.rotary {
+
+ public final class RotaryInputModifierKt {
+ }
+
+}
+
+package androidx.compose.ui.layout {
+
+ @androidx.compose.runtime.Immutable public abstract sealed class AlignmentLine {
+ field public static final androidx.compose.ui.layout.AlignmentLine.Companion Companion;
+ field public static final int Unspecified = -2147483648; // 0x80000000
+ }
+
+ public static final class AlignmentLine.Companion {
+ }
+
+ public final class AlignmentLineKt {
+ method public static androidx.compose.ui.layout.HorizontalAlignmentLine getFirstBaseline();
+ method public static androidx.compose.ui.layout.HorizontalAlignmentLine getLastBaseline();
+ property public static final androidx.compose.ui.layout.HorizontalAlignmentLine FirstBaseline;
+ property public static final androidx.compose.ui.layout.HorizontalAlignmentLine LastBaseline;
+ }
+
+ public interface BeyondBoundsLayout {
+ method public <T> T? layout(int direction, kotlin.jvm.functions.Function1<? super androidx.compose.ui.layout.BeyondBoundsLayout.BeyondBoundsScope,? extends T> block);
+ }
+
+ public static interface BeyondBoundsLayout.BeyondBoundsScope {
+ method public boolean getHasMoreContent();
+ property public abstract boolean hasMoreContent;
+ }
+
+ @kotlin.jvm.JvmInline public static final value class BeyondBoundsLayout.LayoutDirection {
+ field public static final androidx.compose.ui.layout.BeyondBoundsLayout.LayoutDirection.Companion Companion;
+ }
+
+ public static final class BeyondBoundsLayout.LayoutDirection.Companion {
+ method public int getAbove();
+ method public int getAfter();
+ method public int getBefore();
+ method public int getBelow();
+ method public int getLeft();
+ method public int getRight();
+ property public final int Above;
+ property public final int After;
+ property public final int Before;
+ property public final int Below;
+ property public final int Left;
+ property public final int Right;
+ }
+
+ public final class BeyondBoundsLayoutKt {
+ method public static androidx.compose.ui.modifier.ProvidableModifierLocal<androidx.compose.ui.layout.BeyondBoundsLayout> getModifierLocalBeyondBoundsLayout();
+ property public static final androidx.compose.ui.modifier.ProvidableModifierLocal<androidx.compose.ui.layout.BeyondBoundsLayout> ModifierLocalBeyondBoundsLayout;
+ }
+
+ @androidx.compose.runtime.Stable public interface ContentScale {
+ method public long computeScaleFactor(long srcSize, long dstSize);
+ field public static final androidx.compose.ui.layout.ContentScale.Companion Companion;
+ }
+
+ public static final class ContentScale.Companion {
+ method public androidx.compose.ui.layout.ContentScale getCrop();
+ method public androidx.compose.ui.layout.ContentScale getFillBounds();
+ method public androidx.compose.ui.layout.ContentScale getFillHeight();
+ method public androidx.compose.ui.layout.ContentScale getFillWidth();
+ method public androidx.compose.ui.layout.ContentScale getFit();
+ method public androidx.compose.ui.layout.ContentScale getInside();
+ method public androidx.compose.ui.layout.FixedScale getNone();
+ property public final androidx.compose.ui.layout.ContentScale Crop;
+ property public final androidx.compose.ui.layout.ContentScale FillBounds;
+ property public final androidx.compose.ui.layout.ContentScale FillHeight;
+ property public final androidx.compose.ui.layout.ContentScale FillWidth;
+ property public final androidx.compose.ui.layout.ContentScale Fit;
+ property public final androidx.compose.ui.layout.ContentScale Inside;
+ property public final androidx.compose.ui.layout.FixedScale None;
+ }
+
+ public final class ContentScaleKt {
+ }
+
+ @androidx.compose.runtime.Immutable public final class FixedScale implements androidx.compose.ui.layout.ContentScale {
+ ctor public FixedScale(float value);
+ method public float component1();
+ method public long computeScaleFactor(long srcSize, long dstSize);
+ method public androidx.compose.ui.layout.FixedScale copy(float value);
+ method public float getValue();
+ property public final float value;
+ }
+
+ public interface GraphicLayerInfo {
+ method public long getLayerId();
+ method public default long getOwnerViewId();
+ property public abstract long layerId;
+ property public default long ownerViewId;
+ }
+
+ public final class HorizontalAlignmentLine extends androidx.compose.ui.layout.AlignmentLine {
+ ctor public HorizontalAlignmentLine(kotlin.jvm.functions.Function2<? super java.lang.Integer,? super java.lang.Integer,java.lang.Integer> merger);
+ }
+
+ public interface IntrinsicMeasurable {
+ method public Object? getParentData();
+ method public int maxIntrinsicHeight(int width);
+ method public int maxIntrinsicWidth(int height);
+ method public int minIntrinsicHeight(int width);
+ method public int minIntrinsicWidth(int height);
+ property public abstract Object? parentData;
+ }
+
+ public final class IntrinsicMeasurableKt {
+ }
+
+ public interface IntrinsicMeasureScope extends androidx.compose.ui.unit.Density {
+ method public androidx.compose.ui.unit.LayoutDirection getLayoutDirection();
+ property public abstract androidx.compose.ui.unit.LayoutDirection layoutDirection;
+ }
+
+ public interface LayoutCoordinates {
+ method public operator int get(androidx.compose.ui.layout.AlignmentLine alignmentLine);
+ method public androidx.compose.ui.layout.LayoutCoordinates? getParentCoordinates();
+ method public androidx.compose.ui.layout.LayoutCoordinates? getParentLayoutCoordinates();
+ method public java.util.Set<androidx.compose.ui.layout.AlignmentLine> getProvidedAlignmentLines();
+ method public long getSize();
+ method public boolean isAttached();
+ method public androidx.compose.ui.geometry.Rect localBoundingBoxOf(androidx.compose.ui.layout.LayoutCoordinates sourceCoordinates, optional boolean clipBounds);
+ method public long localPositionOf(androidx.compose.ui.layout.LayoutCoordinates sourceCoordinates, long relativeToSource);
+ method public long localToRoot(long relativeToLocal);
+ method public long localToWindow(long relativeToLocal);
+ method public long windowToLocal(long relativeToWindow);
+ property public abstract boolean isAttached;
+ property public abstract androidx.compose.ui.layout.LayoutCoordinates? parentCoordinates;
+ property public abstract androidx.compose.ui.layout.LayoutCoordinates? parentLayoutCoordinates;
+ property public abstract java.util.Set<androidx.compose.ui.layout.AlignmentLine> providedAlignmentLines;
+ property public abstract long size;
+ }
+
+ public final class LayoutCoordinatesKt {
+ method public static androidx.compose.ui.geometry.Rect boundsInParent(androidx.compose.ui.layout.LayoutCoordinates);
+ method public static androidx.compose.ui.geometry.Rect boundsInRoot(androidx.compose.ui.layout.LayoutCoordinates);
+ method public static androidx.compose.ui.geometry.Rect boundsInWindow(androidx.compose.ui.layout.LayoutCoordinates);
+ method public static long positionInParent(androidx.compose.ui.layout.LayoutCoordinates);
+ method public static long positionInRoot(androidx.compose.ui.layout.LayoutCoordinates);
+ method public static long positionInWindow(androidx.compose.ui.layout.LayoutCoordinates);
+ }
+
+ public final class LayoutIdKt {
+ method public static Object? getLayoutId(androidx.compose.ui.layout.Measurable);
+ method @androidx.compose.runtime.Stable public static androidx.compose.ui.Modifier layoutId(androidx.compose.ui.Modifier, Object layoutId);
+ }
+
+ public interface LayoutIdParentData {
+ method public Object getLayoutId();
+ property public abstract Object layoutId;
+ }
+
+ public interface LayoutInfo {
+ method public androidx.compose.ui.layout.LayoutCoordinates getCoordinates();
+ method public androidx.compose.ui.unit.Density getDensity();
+ method public int getHeight();
+ method public androidx.compose.ui.unit.LayoutDirection getLayoutDirection();
+ method public java.util.List<androidx.compose.ui.layout.ModifierInfo> getModifierInfo();
+ method public androidx.compose.ui.layout.LayoutInfo? getParentInfo();
+ method public androidx.compose.ui.platform.ViewConfiguration getViewConfiguration();
+ method public int getWidth();
+ method public boolean isAttached();
+ method public boolean isPlaced();
+ property public abstract androidx.compose.ui.layout.LayoutCoordinates coordinates;
+ property public abstract androidx.compose.ui.unit.Density density;
+ property public abstract int height;
+ property public abstract boolean isAttached;
+ property public abstract boolean isPlaced;
+ property public abstract androidx.compose.ui.unit.LayoutDirection layoutDirection;
+ property public abstract androidx.compose.ui.layout.LayoutInfo? parentInfo;
+ property public abstract androidx.compose.ui.platform.ViewConfiguration viewConfiguration;
+ property public abstract int width;
+ }
+
+ public final class LayoutKt {
+ method @androidx.compose.runtime.Composable @androidx.compose.ui.UiComposable public static inline void Layout(kotlin.jvm.functions.Function0<kotlin.Unit> content, optional androidx.compose.ui.Modifier modifier, androidx.compose.ui.layout.MeasurePolicy measurePolicy);
+ method @androidx.compose.runtime.Composable @androidx.compose.ui.UiComposable public static inline void Layout(optional androidx.compose.ui.Modifier modifier, androidx.compose.ui.layout.MeasurePolicy measurePolicy);
+ method @Deprecated @androidx.compose.runtime.Composable @androidx.compose.ui.UiComposable public static void MultiMeasureLayout(optional androidx.compose.ui.Modifier modifier, kotlin.jvm.functions.Function0<kotlin.Unit> content, androidx.compose.ui.layout.MeasurePolicy measurePolicy);
+ method @kotlin.PublishedApi internal static kotlin.jvm.functions.Function1<androidx.compose.runtime.SkippableUpdater<androidx.compose.ui.node.ComposeUiNode>,kotlin.Unit> materializerOf(androidx.compose.ui.Modifier modifier);
+ }
+
+ public interface LayoutModifier extends androidx.compose.ui.Modifier.Element {
+ method public default int maxIntrinsicHeight(androidx.compose.ui.layout.IntrinsicMeasureScope, androidx.compose.ui.layout.IntrinsicMeasurable measurable, int width);
+ method public default int maxIntrinsicWidth(androidx.compose.ui.layout.IntrinsicMeasureScope, androidx.compose.ui.layout.IntrinsicMeasurable measurable, int height);
+ method public androidx.compose.ui.layout.MeasureResult measure(androidx.compose.ui.layout.MeasureScope, androidx.compose.ui.layout.Measurable measurable, long constraints);
+ method public default int minIntrinsicHeight(androidx.compose.ui.layout.IntrinsicMeasureScope, androidx.compose.ui.layout.IntrinsicMeasurable measurable, int width);
+ method public default int minIntrinsicWidth(androidx.compose.ui.layout.IntrinsicMeasureScope, androidx.compose.ui.layout.IntrinsicMeasurable measurable, int height);
+ }
+
+ public final class LayoutModifierKt {
+ method public static androidx.compose.ui.Modifier layout(androidx.compose.ui.Modifier, kotlin.jvm.functions.Function3<? super androidx.compose.ui.layout.MeasureScope,? super androidx.compose.ui.layout.Measurable,? super androidx.compose.ui.unit.Constraints,? extends androidx.compose.ui.layout.MeasureResult> measure);
+ }
+
+ public interface Measurable extends androidx.compose.ui.layout.IntrinsicMeasurable {
+ method public androidx.compose.ui.layout.Placeable measure(long constraints);
+ }
+
+ @androidx.compose.runtime.Stable public fun interface MeasurePolicy {
+ method public default int maxIntrinsicHeight(androidx.compose.ui.layout.IntrinsicMeasureScope, java.util.List<? extends androidx.compose.ui.layout.IntrinsicMeasurable> measurables, int width);
+ method public default int maxIntrinsicWidth(androidx.compose.ui.layout.IntrinsicMeasureScope, java.util.List<? extends androidx.compose.ui.layout.IntrinsicMeasurable> measurables, int height);
+ method public androidx.compose.ui.layout.MeasureResult measure(androidx.compose.ui.layout.MeasureScope, java.util.List<? extends androidx.compose.ui.layout.Measurable> measurables, long constraints);
+ method public default int minIntrinsicHeight(androidx.compose.ui.layout.IntrinsicMeasureScope, java.util.List<? extends androidx.compose.ui.layout.IntrinsicMeasurable> measurables, int width);
+ method public default int minIntrinsicWidth(androidx.compose.ui.layout.IntrinsicMeasureScope, java.util.List<? extends androidx.compose.ui.layout.IntrinsicMeasurable> measurables, int height);
+ }
+
+ public interface MeasureResult {
+ method public java.util.Map<androidx.compose.ui.layout.AlignmentLine,java.lang.Integer> getAlignmentLines();
+ method public int getHeight();
+ method public int getWidth();
+ method public void placeChildren();
+ property public abstract java.util.Map<androidx.compose.ui.layout.AlignmentLine,java.lang.Integer> alignmentLines;
+ property public abstract int height;
+ property public abstract int width;
+ }
+
+ public interface MeasureScope extends androidx.compose.ui.layout.IntrinsicMeasureScope {
+ method public default androidx.compose.ui.layout.MeasureResult layout(int width, int height, optional java.util.Map<androidx.compose.ui.layout.AlignmentLine,java.lang.Integer> alignmentLines, kotlin.jvm.functions.Function1<? super androidx.compose.ui.layout.Placeable.PlacementScope,kotlin.Unit> placementBlock);
+ }
+
+ public final class MeasureScopeKt {
+ }
+
+ public interface Measured {
+ method public operator int get(androidx.compose.ui.layout.AlignmentLine alignmentLine);
+ method public int getMeasuredHeight();
+ method public int getMeasuredWidth();
+ method public default Object? getParentData();
+ property public abstract int measuredHeight;
+ property public abstract int measuredWidth;
+ property public default Object? parentData;
+ }
+
+ public final class ModifierInfo {
+ ctor public ModifierInfo(androidx.compose.ui.Modifier modifier, androidx.compose.ui.layout.LayoutCoordinates coordinates, optional Object? extra);
+ method public androidx.compose.ui.layout.LayoutCoordinates getCoordinates();
+ method public Object? getExtra();
+ method public androidx.compose.ui.Modifier getModifier();
+ property public final androidx.compose.ui.layout.LayoutCoordinates coordinates;
+ property public final Object? extra;
+ property public final androidx.compose.ui.Modifier modifier;
+ }
+
+ public interface OnGloballyPositionedModifier extends androidx.compose.ui.Modifier.Element {
+ method public void onGloballyPositioned(androidx.compose.ui.layout.LayoutCoordinates coordinates);
+ }
+
+ public final class OnGloballyPositionedModifierKt {
+ method @androidx.compose.runtime.Stable public static androidx.compose.ui.Modifier onGloballyPositioned(androidx.compose.ui.Modifier, kotlin.jvm.functions.Function1<? super androidx.compose.ui.layout.LayoutCoordinates,kotlin.Unit> onGloballyPositioned);
+ }
+
+ public interface OnPlacedModifier extends androidx.compose.ui.Modifier.Element {
+ method public void onPlaced(androidx.compose.ui.layout.LayoutCoordinates coordinates);
+ }
+
+ public final class OnPlacedModifierKt {
+ method @androidx.compose.runtime.Stable public static androidx.compose.ui.Modifier onPlaced(androidx.compose.ui.Modifier, kotlin.jvm.functions.Function1<? super androidx.compose.ui.layout.LayoutCoordinates,kotlin.Unit> onPlaced);
+ }
+
+ public interface OnRemeasuredModifier extends androidx.compose.ui.Modifier.Element {
+ method public void onRemeasured(long size);
+ }
+
+ public final class OnRemeasuredModifierKt {
+ method @androidx.compose.runtime.Stable public static androidx.compose.ui.Modifier onSizeChanged(androidx.compose.ui.Modifier, kotlin.jvm.functions.Function1<? super androidx.compose.ui.unit.IntSize,kotlin.Unit> onSizeChanged);
+ }
+
+ public interface ParentDataModifier extends androidx.compose.ui.Modifier.Element {
+ method public Object? modifyParentData(androidx.compose.ui.unit.Density, Object? parentData);
+ }
+
+ public abstract class Placeable implements androidx.compose.ui.layout.Measured {
+ ctor public Placeable();
+ method protected final long getApparentToRealOffset();
+ method public final int getHeight();
+ method public int getMeasuredHeight();
+ method protected final long getMeasuredSize();
+ method public int getMeasuredWidth();
+ method protected final long getMeasurementConstraints();
+ method public final int getWidth();
+ method protected abstract void placeAt(long position, float zIndex, kotlin.jvm.functions.Function1<? super androidx.compose.ui.graphics.GraphicsLayerScope,kotlin.Unit>? layerBlock);
+ method protected final void setMeasuredSize(long);
+ method protected final void setMeasurementConstraints(long);
+ property protected final long apparentToRealOffset;
+ property public final int height;
+ property public int measuredHeight;
+ property protected final long measuredSize;
+ property public int measuredWidth;
+ property protected final long measurementConstraints;
+ property public final int width;
+ }
+
+ public abstract static class Placeable.PlacementScope {
+ ctor public Placeable.PlacementScope();
+ method protected abstract androidx.compose.ui.unit.LayoutDirection getParentLayoutDirection();
+ method protected abstract int getParentWidth();
+ method public final void place(androidx.compose.ui.layout.Placeable, int x, int y, optional float zIndex);
+ method public final void place(androidx.compose.ui.layout.Placeable, long position, optional float zIndex);
+ method public final void placeRelative(androidx.compose.ui.layout.Placeable, long position, optional float zIndex);
+ method public final void placeRelative(androidx.compose.ui.layout.Placeable, int x, int y, optional float zIndex);
+ method public final void placeRelativeWithLayer(androidx.compose.ui.layout.Placeable, long position, optional float zIndex, optional kotlin.jvm.functions.Function1<? super androidx.compose.ui.graphics.GraphicsLayerScope,kotlin.Unit> layerBlock);
+ method public final void placeRelativeWithLayer(androidx.compose.ui.layout.Placeable, int x, int y, optional float zIndex, optional kotlin.jvm.functions.Function1<? super androidx.compose.ui.graphics.GraphicsLayerScope,kotlin.Unit> layerBlock);
+ method public final void placeWithLayer(androidx.compose.ui.layout.Placeable, int x, int y, optional float zIndex, optional kotlin.jvm.functions.Function1<? super androidx.compose.ui.graphics.GraphicsLayerScope,kotlin.Unit> layerBlock);
+ method public final void placeWithLayer(androidx.compose.ui.layout.Placeable, long position, optional float zIndex, optional kotlin.jvm.functions.Function1<? super androidx.compose.ui.graphics.GraphicsLayerScope,kotlin.Unit> layerBlock);
+ property protected abstract androidx.compose.ui.unit.LayoutDirection parentLayoutDirection;
+ property protected abstract int parentWidth;
+ }
+
+ public final class PlaceableKt {
+ }
+
+ public final class RelocationModifierKt {
+ }
+
+ public final class RelocationRequesterModifierKt {
+ }
+
+ public interface Remeasurement {
+ method public void forceRemeasure();
+ }
+
+ public interface RemeasurementModifier extends androidx.compose.ui.Modifier.Element {
+ method public void onRemeasurementAvailable(androidx.compose.ui.layout.Remeasurement remeasurement);
+ }
+
+ @androidx.compose.runtime.Immutable @kotlin.jvm.JvmInline public final value class ScaleFactor {
+ method @androidx.compose.runtime.Stable public inline operator float component1();
+ method @androidx.compose.runtime.Stable public inline operator float component2();
+ method public long copy(optional float scaleX, optional float scaleY);
+ method @androidx.compose.runtime.Stable public operator long div(float operand);
+ method public float getScaleX();
+ method public float getScaleY();
+ method @androidx.compose.runtime.Stable public operator long times(float operand);
+ property public final float scaleX;
+ property public final float scaleY;
+ field public static final androidx.compose.ui.layout.ScaleFactor.Companion Companion;
+ }
+
+ public static final class ScaleFactor.Companion {
+ method public long getUnspecified();
+ property public final long Unspecified;
+ }
+
+ public final class ScaleFactorKt {
+ method @androidx.compose.runtime.Stable public static long ScaleFactor(float scaleX, float scaleY);
+ method @androidx.compose.runtime.Stable public static operator long div(long, long scaleFactor);
+ method public static inline boolean isSpecified(long);
+ method public static inline boolean isUnspecified(long);
+ method @androidx.compose.runtime.Stable public static long lerp(long start, long stop, float fraction);
+ method public static inline long takeOrElse(long, kotlin.jvm.functions.Function0<androidx.compose.ui.layout.ScaleFactor> block);
+ method @androidx.compose.runtime.Stable public static operator long times(long, long scaleFactor);
+ method @androidx.compose.runtime.Stable public static operator long times(long, long size);
+ }
+
+ public final class SubcomposeLayoutKt {
+ method @androidx.compose.runtime.Composable public static void SubcomposeLayout(optional androidx.compose.ui.Modifier modifier, kotlin.jvm.functions.Function2<? super androidx.compose.ui.layout.SubcomposeMeasureScope,? super androidx.compose.ui.unit.Constraints,? extends androidx.compose.ui.layout.MeasureResult> measurePolicy);
+ method @androidx.compose.runtime.Composable @androidx.compose.ui.UiComposable public static void SubcomposeLayout(androidx.compose.ui.layout.SubcomposeLayoutState state, optional androidx.compose.ui.Modifier modifier, kotlin.jvm.functions.Function2<? super androidx.compose.ui.layout.SubcomposeMeasureScope,? super androidx.compose.ui.unit.Constraints,? extends androidx.compose.ui.layout.MeasureResult> measurePolicy);
+ method public static androidx.compose.ui.layout.SubcomposeSlotReusePolicy SubcomposeSlotReusePolicy(int maxSlotsToRetainForReuse);
+ }
+
+ public final class SubcomposeLayoutState {
+ ctor public SubcomposeLayoutState(androidx.compose.ui.layout.SubcomposeSlotReusePolicy slotReusePolicy);
+ ctor public SubcomposeLayoutState();
+ ctor @Deprecated public SubcomposeLayoutState(int maxSlotsToRetainForReuse);
+ method public androidx.compose.ui.layout.SubcomposeLayoutState.PrecomposedSlotHandle precompose(Object? slotId, kotlin.jvm.functions.Function0<kotlin.Unit> content);
+ }
+
+ public static interface SubcomposeLayoutState.PrecomposedSlotHandle {
+ method public void dispose();
+ method public default int getPlaceablesCount();
+ method public default void premeasure(int index, long constraints);
+ property public default int placeablesCount;
+ }
+
+ public interface SubcomposeMeasureScope extends androidx.compose.ui.layout.MeasureScope {
+ method public java.util.List<androidx.compose.ui.layout.Measurable> subcompose(Object? slotId, kotlin.jvm.functions.Function0<kotlin.Unit> content);
+ }
+
+ public interface SubcomposeSlotReusePolicy {
+ method public boolean areCompatible(Object? slotId, Object? reusableSlotId);
+ method public void getSlotsToRetain(androidx.compose.ui.layout.SubcomposeSlotReusePolicy.SlotIdsSet slotIds);
+ }
+
+ public static final class SubcomposeSlotReusePolicy.SlotIdsSet implements java.util.Collection<java.lang.Object> kotlin.jvm.internal.markers.KMappedMarker {
+ method public void clear();
+ method public java.util.Iterator<java.lang.Object> iterator();
+ method public boolean remove(Object? slotId);
+ method public boolean removeAll(java.util.Collection<?> slotIds);
+ method public boolean removeAll(kotlin.jvm.functions.Function1<java.lang.Object,java.lang.Boolean> predicate);
+ method public boolean retainAll(java.util.Collection<?> slotIds);
+ method public boolean retainAll(kotlin.jvm.functions.Function1<java.lang.Object,java.lang.Boolean> predicate);
+ }
+
+ public final class TestModifierUpdaterKt {
+ }
+
+ public final class VerticalAlignmentLine extends androidx.compose.ui.layout.AlignmentLine {
+ ctor public VerticalAlignmentLine(kotlin.jvm.functions.Function2<? super java.lang.Integer,? super java.lang.Integer,java.lang.Integer> merger);
+ }
+
+}
+
+package androidx.compose.ui.modifier {
+
+ @androidx.compose.runtime.Stable public abstract sealed class ModifierLocal<T> {
+ }
+
+ @androidx.compose.runtime.Stable public interface ModifierLocalConsumer extends androidx.compose.ui.Modifier.Element {
+ method public void onModifierLocalsUpdated(androidx.compose.ui.modifier.ModifierLocalReadScope scope);
+ }
+
+ public final class ModifierLocalConsumerKt {
+ }
+
+ public final class ModifierLocalKt {
+ method public static <T> androidx.compose.ui.modifier.ProvidableModifierLocal<T> modifierLocalOf(kotlin.jvm.functions.Function0<? extends T> defaultFactory);
+ }
+
+ @androidx.compose.runtime.Stable public interface ModifierLocalProvider<T> extends androidx.compose.ui.Modifier.Element {
+ method public androidx.compose.ui.modifier.ProvidableModifierLocal<T> getKey();
+ method public T! getValue();
+ property public abstract androidx.compose.ui.modifier.ProvidableModifierLocal<T> key;
+ property public abstract T! value;
+ }
+
+ public final class ModifierLocalProviderKt {
+ }
+
+ public interface ModifierLocalReadScope {
+ method public <T> T! getCurrent(androidx.compose.ui.modifier.ModifierLocal<T>);
+ }
+
+ @androidx.compose.runtime.Stable public final class ProvidableModifierLocal<T> extends androidx.compose.ui.modifier.ModifierLocal<T> {
+ ctor public ProvidableModifierLocal(kotlin.jvm.functions.Function0<? extends T> defaultFactory);
+ }
+
+}
+
+package androidx.compose.ui.node {
+
+ @kotlin.PublishedApi internal interface ComposeUiNode {
+ method public androidx.compose.ui.unit.Density getDensity();
+ method public androidx.compose.ui.unit.LayoutDirection getLayoutDirection();
+ method public androidx.compose.ui.layout.MeasurePolicy getMeasurePolicy();
+ method public androidx.compose.ui.Modifier getModifier();
+ method public androidx.compose.ui.platform.ViewConfiguration getViewConfiguration();
+ method public void setDensity(androidx.compose.ui.unit.Density);
+ method public void setLayoutDirection(androidx.compose.ui.unit.LayoutDirection);
+ method public void setMeasurePolicy(androidx.compose.ui.layout.MeasurePolicy);
+ method public void setModifier(androidx.compose.ui.Modifier);
+ method public void setViewConfiguration(androidx.compose.ui.platform.ViewConfiguration);
+ property public abstract androidx.compose.ui.unit.Density density;
+ property public abstract androidx.compose.ui.unit.LayoutDirection layoutDirection;
+ property public abstract androidx.compose.ui.layout.MeasurePolicy measurePolicy;
+ property public abstract androidx.compose.ui.Modifier modifier;
+ property public abstract androidx.compose.ui.platform.ViewConfiguration viewConfiguration;
+ field public static final androidx.compose.ui.node.ComposeUiNode.Companion Companion;
+ }
+
+ public static final class ComposeUiNode.Companion {
+ method public kotlin.jvm.functions.Function0<androidx.compose.ui.node.ComposeUiNode> getConstructor();
+ method public kotlin.jvm.functions.Function2<androidx.compose.ui.node.ComposeUiNode,androidx.compose.ui.unit.Density,kotlin.Unit> getSetDensity();
+ method public kotlin.jvm.functions.Function2<androidx.compose.ui.node.ComposeUiNode,androidx.compose.ui.unit.LayoutDirection,kotlin.Unit> getSetLayoutDirection();
+ method public kotlin.jvm.functions.Function2<androidx.compose.ui.node.ComposeUiNode,androidx.compose.ui.layout.MeasurePolicy,kotlin.Unit> getSetMeasurePolicy();
+ method public kotlin.jvm.functions.Function2<androidx.compose.ui.node.ComposeUiNode,androidx.compose.ui.Modifier,kotlin.Unit> getSetModifier();
+ method public kotlin.jvm.functions.Function2<androidx.compose.ui.node.ComposeUiNode,androidx.compose.ui.platform.ViewConfiguration,kotlin.Unit> getSetViewConfiguration();
+ property public final kotlin.jvm.functions.Function0<androidx.compose.ui.node.ComposeUiNode> Constructor;
+ property public final kotlin.jvm.functions.Function2<androidx.compose.ui.node.ComposeUiNode,androidx.compose.ui.unit.Density,kotlin.Unit> SetDensity;
+ property public final kotlin.jvm.functions.Function2<androidx.compose.ui.node.ComposeUiNode,androidx.compose.ui.unit.LayoutDirection,kotlin.Unit> SetLayoutDirection;
+ property public final kotlin.jvm.functions.Function2<androidx.compose.ui.node.ComposeUiNode,androidx.compose.ui.layout.MeasurePolicy,kotlin.Unit> SetMeasurePolicy;
+ property public final kotlin.jvm.functions.Function2<androidx.compose.ui.node.ComposeUiNode,androidx.compose.ui.Modifier,kotlin.Unit> SetModifier;
+ property public final kotlin.jvm.functions.Function2<androidx.compose.ui.node.ComposeUiNode,androidx.compose.ui.platform.ViewConfiguration,kotlin.Unit> SetViewConfiguration;
+ }
+
+ public final class HitTestResultKt {
+ }
+
+ public final class LayoutNodeKt {
+ }
+
+ public final class Ref<T> {
+ ctor public Ref();
+ method public T? getValue();
+ method public void setValue(T?);
+ property public final T? value;
+ }
+
+ public interface RootForTest {
+ method public androidx.compose.ui.unit.Density getDensity();
+ method public androidx.compose.ui.semantics.SemanticsOwner getSemanticsOwner();
+ method public androidx.compose.ui.text.input.TextInputService getTextInputService();
+ method public boolean sendKeyEvent(android.view.KeyEvent keyEvent);
+ property public abstract androidx.compose.ui.unit.Density density;
+ property public abstract androidx.compose.ui.semantics.SemanticsOwner semanticsOwner;
+ property public abstract androidx.compose.ui.text.input.TextInputService textInputService;
+ }
+
+ public final class ViewInterop_androidKt {
+ }
+
+}
+
+package androidx.compose.ui.platform {
+
+ public abstract class AbstractComposeView extends android.view.ViewGroup {
+ ctor public AbstractComposeView(android.content.Context context, optional android.util.AttributeSet? attrs, optional int defStyleAttr);
+ ctor public AbstractComposeView(android.content.Context context, optional android.util.AttributeSet? attrs);
+ ctor public AbstractComposeView(android.content.Context context);
+ method @androidx.compose.runtime.Composable public abstract void Content();
+ method public final void createComposition();
+ method public final void disposeComposition();
+ method public final boolean getHasComposition();
+ method protected boolean getShouldCreateCompositionOnAttachedToWindow();
+ method public final boolean getShowLayoutBounds();
+ method protected final void onLayout(boolean changed, int left, int top, int right, int bottom);
+ method protected final void onMeasure(int widthMeasureSpec, int heightMeasureSpec);
+ method public final void setParentCompositionContext(androidx.compose.runtime.CompositionContext? parent);
+ method public final void setShowLayoutBounds(boolean);
+ method public final void setViewCompositionStrategy(androidx.compose.ui.platform.ViewCompositionStrategy strategy);
+ property public final boolean hasComposition;
+ property protected boolean shouldCreateCompositionOnAttachedToWindow;
+ property public final boolean showLayoutBounds;
+ }
+
+ public interface AccessibilityManager {
+ method public long calculateRecommendedTimeoutMillis(long originalTimeoutMillis, optional boolean containsIcons, optional boolean containsText, optional boolean containsControls);
+ }
+
+ public final class AndroidClipboardManager_androidKt {
+ }
+
+ public final class AndroidComposeViewAccessibilityDelegateCompat_androidKt {
+ }
+
+ public final class AndroidComposeView_androidKt {
+ }
+
+ public final class AndroidCompositionLocals_androidKt {
+ method public static androidx.compose.runtime.ProvidableCompositionLocal<android.content.res.Configuration> getLocalConfiguration();
+ method public static androidx.compose.runtime.ProvidableCompositionLocal<android.content.Context> getLocalContext();
+ method public static androidx.compose.runtime.ProvidableCompositionLocal<androidx.lifecycle.LifecycleOwner> getLocalLifecycleOwner();
+ method public static androidx.compose.runtime.ProvidableCompositionLocal<androidx.savedstate.SavedStateRegistryOwner> getLocalSavedStateRegistryOwner();
+ method public static androidx.compose.runtime.ProvidableCompositionLocal<android.view.View> getLocalView();
+ property public static final androidx.compose.runtime.ProvidableCompositionLocal<android.content.res.Configuration> LocalConfiguration;
+ property public static final androidx.compose.runtime.ProvidableCompositionLocal<android.content.Context> LocalContext;
+ property public static final androidx.compose.runtime.ProvidableCompositionLocal<androidx.lifecycle.LifecycleOwner> LocalLifecycleOwner;
+ property public static final androidx.compose.runtime.ProvidableCompositionLocal<androidx.savedstate.SavedStateRegistryOwner> LocalSavedStateRegistryOwner;
+ property public static final androidx.compose.runtime.ProvidableCompositionLocal<android.view.View> LocalView;
+ }
+
+ public final class AndroidUiDispatcher extends kotlinx.coroutines.CoroutineDispatcher {
+ method public void dispatch(kotlin.coroutines.CoroutineContext context, Runnable block);
+ method public android.view.Choreographer getChoreographer();
+ method public androidx.compose.runtime.MonotonicFrameClock getFrameClock();
+ property public final android.view.Choreographer choreographer;
+ property public final androidx.compose.runtime.MonotonicFrameClock frameClock;
+ field public static final androidx.compose.ui.platform.AndroidUiDispatcher.Companion Companion;
+ }
+
+ public static final class AndroidUiDispatcher.Companion {
+ method public kotlin.coroutines.CoroutineContext getCurrentThread();
+ method public kotlin.coroutines.CoroutineContext getMain();
+ property public final kotlin.coroutines.CoroutineContext CurrentThread;
+ property public final kotlin.coroutines.CoroutineContext Main;
+ }
+
+ public final class AndroidUiDispatcher_androidKt {
+ }
+
+ public final class AndroidUiFrameClock implements androidx.compose.runtime.MonotonicFrameClock {
+ ctor public AndroidUiFrameClock(android.view.Choreographer choreographer);
+ method public android.view.Choreographer getChoreographer();
+ method public suspend <R> Object? withFrameNanos(kotlin.jvm.functions.Function1<? super java.lang.Long,? extends R> onFrame, kotlin.coroutines.Continuation<? super R>);
+ property public final android.view.Choreographer choreographer;
+ }
+
+ public final class AndroidUriHandler implements androidx.compose.ui.platform.UriHandler {
+ ctor public AndroidUriHandler(android.content.Context context);
+ method public void openUri(String uri);
+ }
+
+ public final class AndroidViewConfiguration implements androidx.compose.ui.platform.ViewConfiguration {
+ ctor public AndroidViewConfiguration(android.view.ViewConfiguration viewConfiguration);
+ method public long getDoubleTapMinTimeMillis();
+ method public long getDoubleTapTimeoutMillis();
+ method public long getLongPressTimeoutMillis();
+ method public float getTouchSlop();
+ property public long doubleTapMinTimeMillis;
+ property public long doubleTapTimeoutMillis;
+ property public long longPressTimeoutMillis;
+ property public float touchSlop;
+ }
+
+ public interface ClipboardManager {
+ method public androidx.compose.ui.text.AnnotatedString? getText();
+ method public void setText(androidx.compose.ui.text.AnnotatedString annotatedString);
+ }
+
+ public final class ComposeView extends androidx.compose.ui.platform.AbstractComposeView {
+ ctor public ComposeView(android.content.Context context, optional android.util.AttributeSet? attrs, optional int defStyleAttr);
+ ctor public ComposeView(android.content.Context context, optional android.util.AttributeSet? attrs);
+ ctor public ComposeView(android.content.Context context);
+ method @androidx.compose.runtime.Composable public void Content();
+ method public void setContent(kotlin.jvm.functions.Function0<kotlin.Unit> content);
+ property protected boolean shouldCreateCompositionOnAttachedToWindow;
+ }
+
+ public final class CompositionLocalsKt {
+ method public static androidx.compose.runtime.ProvidableCompositionLocal<androidx.compose.ui.platform.AccessibilityManager> getLocalAccessibilityManager();
+ method public static androidx.compose.runtime.ProvidableCompositionLocal<androidx.compose.ui.platform.ClipboardManager> getLocalClipboardManager();
+ method public static androidx.compose.runtime.ProvidableCompositionLocal<androidx.compose.ui.unit.Density> getLocalDensity();
+ method public static androidx.compose.runtime.ProvidableCompositionLocal<androidx.compose.ui.focus.FocusManager> getLocalFocusManager();
+ method public static androidx.compose.runtime.ProvidableCompositionLocal<androidx.compose.ui.text.font.FontFamily.Resolver> getLocalFontFamilyResolver();
+ method public static androidx.compose.runtime.ProvidableCompositionLocal<androidx.compose.ui.hapticfeedback.HapticFeedback> getLocalHapticFeedback();
+ method public static androidx.compose.runtime.ProvidableCompositionLocal<androidx.compose.ui.input.InputModeManager> getLocalInputModeManager();
+ method public static androidx.compose.runtime.ProvidableCompositionLocal<androidx.compose.ui.unit.LayoutDirection> getLocalLayoutDirection();
+ method public static androidx.compose.runtime.ProvidableCompositionLocal<androidx.compose.ui.text.input.TextInputService> getLocalTextInputService();
+ method public static androidx.compose.runtime.ProvidableCompositionLocal<androidx.compose.ui.platform.TextToolbar> getLocalTextToolbar();
+ method public static androidx.compose.runtime.ProvidableCompositionLocal<androidx.compose.ui.platform.UriHandler> getLocalUriHandler();
+ method public static androidx.compose.runtime.ProvidableCompositionLocal<androidx.compose.ui.platform.ViewConfiguration> getLocalViewConfiguration();
+ method public static androidx.compose.runtime.ProvidableCompositionLocal<androidx.compose.ui.platform.WindowInfo> getLocalWindowInfo();
+ property public static final androidx.compose.runtime.ProvidableCompositionLocal<androidx.compose.ui.platform.AccessibilityManager> LocalAccessibilityManager;
+ property public static final androidx.compose.runtime.ProvidableCompositionLocal<androidx.compose.ui.platform.ClipboardManager> LocalClipboardManager;
+ property public static final androidx.compose.runtime.ProvidableCompositionLocal<androidx.compose.ui.unit.Density> LocalDensity;
+ property public static final androidx.compose.runtime.ProvidableCompositionLocal<androidx.compose.ui.focus.FocusManager> LocalFocusManager;
+ property public static final androidx.compose.runtime.ProvidableCompositionLocal<androidx.compose.ui.text.font.FontFamily.Resolver> LocalFontFamilyResolver;
+ property public static final androidx.compose.runtime.ProvidableCompositionLocal<androidx.compose.ui.hapticfeedback.HapticFeedback> LocalHapticFeedback;
+ property public static final androidx.compose.runtime.ProvidableCompositionLocal<androidx.compose.ui.input.InputModeManager> LocalInputModeManager;
+ property public static final androidx.compose.runtime.ProvidableCompositionLocal<androidx.compose.ui.unit.LayoutDirection> LocalLayoutDirection;
+ property public static final androidx.compose.runtime.ProvidableCompositionLocal<androidx.compose.ui.text.input.TextInputService> LocalTextInputService;
+ property public static final androidx.compose.runtime.ProvidableCompositionLocal<androidx.compose.ui.platform.TextToolbar> LocalTextToolbar;
+ property public static final androidx.compose.runtime.ProvidableCompositionLocal<androidx.compose.ui.platform.UriHandler> LocalUriHandler;
+ property public static final androidx.compose.runtime.ProvidableCompositionLocal<androidx.compose.ui.platform.ViewConfiguration> LocalViewConfiguration;
+ property public static final androidx.compose.runtime.ProvidableCompositionLocal<androidx.compose.ui.platform.WindowInfo> LocalWindowInfo;
+ }
+
+ public final class DebugUtilsKt {
+ }
+
+ public final class DisposableSaveableStateRegistry_androidKt {
+ }
+
+ public interface InfiniteAnimationPolicy extends kotlin.coroutines.CoroutineContext.Element {
+ method public default kotlin.coroutines.CoroutineContext.Key<?> getKey();
+ method public suspend <R> Object? onInfiniteOperation(kotlin.jvm.functions.Function1<? super kotlin.coroutines.Continuation<? super R>,?> block, kotlin.coroutines.Continuation<? super R>);
+ property public default kotlin.coroutines.CoroutineContext.Key<?> key;
+ field public static final androidx.compose.ui.platform.InfiniteAnimationPolicy.Key Key;
+ }
+
+ public static final class InfiniteAnimationPolicy.Key implements kotlin.coroutines.CoroutineContext.Key<androidx.compose.ui.platform.InfiniteAnimationPolicy> {
+ }
+
+ public final class InfiniteAnimationPolicyKt {
+ }
+
+ public final class InspectableModifier extends androidx.compose.ui.platform.InspectorValueInfo implements androidx.compose.ui.Modifier.Element {
+ ctor public InspectableModifier(kotlin.jvm.functions.Function1<? super androidx.compose.ui.platform.InspectorInfo,kotlin.Unit> inspectorInfo);
+ method public androidx.compose.ui.platform.InspectableModifier.End getEnd();
+ property public final androidx.compose.ui.platform.InspectableModifier.End end;
+ }
+
+ public final class InspectableModifier.End implements androidx.compose.ui.Modifier.Element {
+ ctor public InspectableModifier.End();
+ }
+
+ public interface InspectableValue {
+ method public default kotlin.sequences.Sequence<androidx.compose.ui.platform.ValueElement> getInspectableElements();
+ method public default String? getNameFallback();
+ method public default Object? getValueOverride();
+ property public default kotlin.sequences.Sequence<androidx.compose.ui.platform.ValueElement> inspectableElements;
+ property public default String? nameFallback;
+ property public default Object? valueOverride;
+ }
+
+ public final class InspectableValueKt {
+ method public static inline kotlin.jvm.functions.Function1<androidx.compose.ui.platform.InspectorInfo,kotlin.Unit> debugInspectorInfo(kotlin.jvm.functions.Function1<? super androidx.compose.ui.platform.InspectorInfo,kotlin.Unit> definitions);
+ method public static kotlin.jvm.functions.Function1<androidx.compose.ui.platform.InspectorInfo,kotlin.Unit> getNoInspectorInfo();
+ method public static inline androidx.compose.ui.Modifier inspectable(androidx.compose.ui.Modifier, kotlin.jvm.functions.Function1<? super androidx.compose.ui.platform.InspectorInfo,kotlin.Unit> inspectorInfo, kotlin.jvm.functions.Function1<? super androidx.compose.ui.Modifier,? extends androidx.compose.ui.Modifier> factory);
+ method @kotlin.PublishedApi internal static androidx.compose.ui.Modifier inspectableWrapper(androidx.compose.ui.Modifier, kotlin.jvm.functions.Function1<? super androidx.compose.ui.platform.InspectorInfo,kotlin.Unit> inspectorInfo, androidx.compose.ui.Modifier wrapped);
+ method public static boolean isDebugInspectorInfoEnabled();
+ method public static void setDebugInspectorInfoEnabled(boolean);
+ property public static final kotlin.jvm.functions.Function1<androidx.compose.ui.platform.InspectorInfo,kotlin.Unit> NoInspectorInfo;
+ property public static final boolean isDebugInspectorInfoEnabled;
+ }
+
+ public final class InspectionModeKt {
+ method public static androidx.compose.runtime.ProvidableCompositionLocal<java.lang.Boolean> getLocalInspectionMode();
+ property public static final androidx.compose.runtime.ProvidableCompositionLocal<java.lang.Boolean> LocalInspectionMode;
+ }
+
+ public final class InspectorInfo {
+ ctor public InspectorInfo();
+ method public String? getName();
+ method public androidx.compose.ui.platform.ValueElementSequence getProperties();
+ method public Object? getValue();
+ method public void setName(String?);
+ method public void setValue(Object?);
+ property public final String? name;
+ property public final androidx.compose.ui.platform.ValueElementSequence properties;
+ property public final Object? value;
+ }
+
+ public abstract class InspectorValueInfo implements androidx.compose.ui.platform.InspectableValue {
+ ctor public InspectorValueInfo(kotlin.jvm.functions.Function1<? super androidx.compose.ui.platform.InspectorInfo,kotlin.Unit> info);
+ property public kotlin.sequences.Sequence<androidx.compose.ui.platform.ValueElement> inspectableElements;
+ property public String? nameFallback;
+ property public Object? valueOverride;
+ }
+
+ public final class InvertMatrixKt {
+ }
+
+ public final class JvmActuals_jvmKt {
+ }
+
+ public final class NestedScrollInteropConnectionKt {
+ }
+
+ public final class ShapeContainingUtilKt {
+ }
+
+ public final class TestTagKt {
+ method @androidx.compose.runtime.Stable public static androidx.compose.ui.Modifier testTag(androidx.compose.ui.Modifier, String tag);
+ }
+
+ public interface TextToolbar {
+ method public androidx.compose.ui.platform.TextToolbarStatus getStatus();
+ method public void hide();
+ method public void showMenu(androidx.compose.ui.geometry.Rect rect, optional kotlin.jvm.functions.Function0<kotlin.Unit>? onCopyRequested, optional kotlin.jvm.functions.Function0<kotlin.Unit>? onPasteRequested, optional kotlin.jvm.functions.Function0<kotlin.Unit>? onCutRequested, optional kotlin.jvm.functions.Function0<kotlin.Unit>? onSelectAllRequested);
+ property public abstract androidx.compose.ui.platform.TextToolbarStatus status;
+ }
+
+ public enum TextToolbarStatus {
+ enum_constant public static final androidx.compose.ui.platform.TextToolbarStatus Hidden;
+ enum_constant public static final androidx.compose.ui.platform.TextToolbarStatus Shown;
+ }
+
+ public interface UriHandler {
+ method public void openUri(String uri);
+ }
+
+ public final class ValueElement {
+ ctor public ValueElement(String name, Object? value);
+ method public String component1();
+ method public Object? component2();
+ method public androidx.compose.ui.platform.ValueElement copy(String name, Object? value);
+ method public String getName();
+ method public Object? getValue();
+ property public final String name;
+ property public final Object? value;
+ }
+
+ public final class ValueElementSequence implements kotlin.sequences.Sequence<androidx.compose.ui.platform.ValueElement> {
+ ctor public ValueElementSequence();
+ method public java.util.Iterator<androidx.compose.ui.platform.ValueElement> iterator();
+ method public operator void set(String name, Object? value);
+ }
+
+ public interface ViewCompositionStrategy {
+ method public kotlin.jvm.functions.Function0<kotlin.Unit> installFor(androidx.compose.ui.platform.AbstractComposeView view);
+ field public static final androidx.compose.ui.platform.ViewCompositionStrategy.Companion Companion;
+ }
+
+ public static final class ViewCompositionStrategy.Companion {
+ method public androidx.compose.ui.platform.ViewCompositionStrategy getDefault();
+ property public final androidx.compose.ui.platform.ViewCompositionStrategy Default;
+ }
+
+ public static final class ViewCompositionStrategy.DisposeOnDetachedFromWindow implements androidx.compose.ui.platform.ViewCompositionStrategy {
+ method public kotlin.jvm.functions.Function0<kotlin.Unit> installFor(androidx.compose.ui.platform.AbstractComposeView view);
+ field public static final androidx.compose.ui.platform.ViewCompositionStrategy.DisposeOnDetachedFromWindow INSTANCE;
+ }
+
+ public static final class ViewCompositionStrategy.DisposeOnDetachedFromWindowOrReleasedFromPool implements androidx.compose.ui.platform.ViewCompositionStrategy {
+ method public kotlin.jvm.functions.Function0<kotlin.Unit> installFor(androidx.compose.ui.platform.AbstractComposeView view);
+ field public static final androidx.compose.ui.platform.ViewCompositionStrategy.DisposeOnDetachedFromWindowOrReleasedFromPool INSTANCE;
+ }
+
+ public static final class ViewCompositionStrategy.DisposeOnLifecycleDestroyed implements androidx.compose.ui.platform.ViewCompositionStrategy {
+ ctor public ViewCompositionStrategy.DisposeOnLifecycleDestroyed(androidx.lifecycle.Lifecycle lifecycle);
+ ctor public ViewCompositionStrategy.DisposeOnLifecycleDestroyed(androidx.lifecycle.LifecycleOwner lifecycleOwner);
+ method public kotlin.jvm.functions.Function0<kotlin.Unit> installFor(androidx.compose.ui.platform.AbstractComposeView view);
+ }
+
+ public static final class ViewCompositionStrategy.DisposeOnViewTreeLifecycleDestroyed implements androidx.compose.ui.platform.ViewCompositionStrategy {
+ method public kotlin.jvm.functions.Function0<kotlin.Unit> installFor(androidx.compose.ui.platform.AbstractComposeView view);
+ field public static final androidx.compose.ui.platform.ViewCompositionStrategy.DisposeOnViewTreeLifecycleDestroyed INSTANCE;
+ }
+
+ public final class ViewCompositionStrategy_androidKt {
+ }
+
+ public interface ViewConfiguration {
+ method public long getDoubleTapMinTimeMillis();
+ method public long getDoubleTapTimeoutMillis();
+ method public long getLongPressTimeoutMillis();
+ method public default long getMinimumTouchTargetSize();
+ method public float getTouchSlop();
+ property public abstract long doubleTapMinTimeMillis;
+ property public abstract long doubleTapTimeoutMillis;
+ property public abstract long longPressTimeoutMillis;
+ property public default long minimumTouchTargetSize;
+ property public abstract float touchSlop;
+ }
+
+ public interface ViewRootForInspector {
+ method public default androidx.compose.ui.platform.AbstractComposeView? getSubCompositionView();
+ method public default android.view.View? getViewRoot();
+ property public default androidx.compose.ui.platform.AbstractComposeView? subCompositionView;
+ property public default android.view.View? viewRoot;
+ }
+
+ @VisibleForTesting public interface ViewRootForTest extends androidx.compose.ui.node.RootForTest {
+ method public boolean getHasPendingMeasureOrLayout();
+ method public android.view.View getView();
+ method public void invalidateDescendants();
+ method public boolean isLifecycleInResumedState();
+ property public abstract boolean hasPendingMeasureOrLayout;
+ property public abstract boolean isLifecycleInResumedState;
+ property public abstract android.view.View view;
+ field public static final androidx.compose.ui.platform.ViewRootForTest.Companion Companion;
+ }
+
+ public static final class ViewRootForTest.Companion {
+ method public kotlin.jvm.functions.Function1<androidx.compose.ui.platform.ViewRootForTest,kotlin.Unit>? getOnViewCreatedCallback();
+ method public void setOnViewCreatedCallback(kotlin.jvm.functions.Function1<? super androidx.compose.ui.platform.ViewRootForTest,kotlin.Unit>?);
+ property public final kotlin.jvm.functions.Function1<androidx.compose.ui.platform.ViewRootForTest,kotlin.Unit>? onViewCreatedCallback;
+ }
+
+ @androidx.compose.runtime.Stable public interface WindowInfo {
+ method public boolean isWindowFocused();
+ property public abstract boolean isWindowFocused;
+ }
+
+ public final class WindowInfoKt {
+ }
+
+ public final class WindowRecomposer_androidKt {
+ method public static androidx.compose.runtime.CompositionContext? findViewTreeCompositionContext(android.view.View);
+ method public static androidx.compose.runtime.CompositionContext? getCompositionContext(android.view.View);
+ method public static void setCompositionContext(android.view.View, androidx.compose.runtime.CompositionContext?);
+ }
+
+ public final class Wrapper_androidKt {
+ }
+
+}
+
+package androidx.compose.ui.platform.accessibility {
+
+ public final class CollectionInfoKt {
+ }
+
+}
+
+package androidx.compose.ui.platform.actionmodecallback {
+
+ public final class TextActionModeCallback_androidKt {
+ }
+
+}
+
+package androidx.compose.ui.res {
+
+ public final class ColorResources_androidKt {
+ method @androidx.compose.runtime.Composable @androidx.compose.runtime.ReadOnlyComposable public static long colorResource(@ColorRes int id);
+ }
+
+ public final class FontResources_androidKt {
+ method @Deprecated @androidx.compose.runtime.Composable @androidx.compose.runtime.ReadOnlyComposable public static androidx.compose.ui.text.font.Typeface fontResource(androidx.compose.ui.text.font.FontFamily fontFamily);
+ }
+
+ public final class ImageResources_androidKt {
+ method public static androidx.compose.ui.graphics.ImageBitmap imageResource(androidx.compose.ui.graphics.ImageBitmap.Companion, android.content.res.Resources res, @DrawableRes int id);
+ method @androidx.compose.runtime.Composable public static androidx.compose.ui.graphics.ImageBitmap imageResource(androidx.compose.ui.graphics.ImageBitmap.Companion, @DrawableRes int id);
+ }
+
+ public final class PainterResources_androidKt {
+ method @androidx.compose.runtime.Composable public static androidx.compose.ui.graphics.painter.Painter painterResource(@DrawableRes int id);
+ }
+
+ public final class PrimitiveResources_androidKt {
+ method @androidx.compose.runtime.Composable @androidx.compose.runtime.ReadOnlyComposable public static boolean booleanResource(@BoolRes int id);
+ method @androidx.compose.runtime.Composable @androidx.compose.runtime.ReadOnlyComposable public static float dimensionResource(@DimenRes int id);
+ method @androidx.compose.runtime.Composable @androidx.compose.runtime.ReadOnlyComposable public static int[] integerArrayResource(@ArrayRes int id);
+ method @androidx.compose.runtime.Composable @androidx.compose.runtime.ReadOnlyComposable public static int integerResource(@IntegerRes int id);
+ }
+
+ public final class StringResources_androidKt {
+ method @androidx.compose.runtime.Composable @androidx.compose.runtime.ReadOnlyComposable public static String![] stringArrayResource(@ArrayRes int id);
+ method @androidx.compose.runtime.Composable @androidx.compose.runtime.ReadOnlyComposable public static String stringResource(@StringRes int id);
+ method @androidx.compose.runtime.Composable @androidx.compose.runtime.ReadOnlyComposable public static String stringResource(@StringRes int id, java.lang.Object... formatArgs);
+ }
+
+ public final class VectorResources_androidKt {
+ method @androidx.compose.runtime.Composable public static androidx.compose.ui.graphics.vector.ImageVector vectorResource(androidx.compose.ui.graphics.vector.ImageVector.Companion, @DrawableRes int id);
+ method @kotlin.jvm.Throws(exceptionClasses=XmlPullParserException::class) public static androidx.compose.ui.graphics.vector.ImageVector vectorResource(androidx.compose.ui.graphics.vector.ImageVector.Companion, optional android.content.res.Resources.Theme? theme, android.content.res.Resources res, int resId) throws org.xmlpull.v1.XmlPullParserException;
+ }
+
+}
+
+package androidx.compose.ui.semantics {
+
+ public final class AccessibilityAction<T extends kotlin.Function<? extends java.lang.Boolean>> {
+ ctor public AccessibilityAction(String? label, T? action);
+ method public T? getAction();
+ method public String? getLabel();
+ property public final T? action;
+ property public final String? label;
+ }
+
+ public final class CollectionInfo {
+ ctor public CollectionInfo(int rowCount, int columnCount);
+ method public int getColumnCount();
+ method public int getRowCount();
+ property public final int columnCount;
+ property public final int rowCount;
+ }
+
+ public final class CollectionItemInfo {
+ ctor public CollectionItemInfo(int rowIndex, int rowSpan, int columnIndex, int columnSpan);
+ method public int getColumnIndex();
+ method public int getColumnSpan();
+ method public int getRowIndex();
+ method public int getRowSpan();
+ property public final int columnIndex;
+ property public final int columnSpan;
+ property public final int rowIndex;
+ property public final int rowSpan;
+ }
+
+ public final class CustomAccessibilityAction {
+ ctor public CustomAccessibilityAction(String label, kotlin.jvm.functions.Function0<java.lang.Boolean> action);
+ method public kotlin.jvm.functions.Function0<java.lang.Boolean> getAction();
+ method public String getLabel();
+ property public final kotlin.jvm.functions.Function0<java.lang.Boolean> action;
+ property public final String label;
+ }
+
+ @androidx.compose.runtime.Immutable @kotlin.jvm.JvmInline public final value class LiveRegionMode {
+ field public static final androidx.compose.ui.semantics.LiveRegionMode.Companion Companion;
+ }
+
+ public static final class LiveRegionMode.Companion {
+ method public int getAssertive();
+ method public int getPolite();
+ property public final int Assertive;
+ property public final int Polite;
+ }
+
+ public final class ProgressBarRangeInfo {
+ ctor public ProgressBarRangeInfo(float current, kotlin.ranges.ClosedFloatingPointRange<java.lang.Float> range, optional int steps);
+ method public float getCurrent();
+ method public kotlin.ranges.ClosedFloatingPointRange<java.lang.Float> getRange();
+ method public int getSteps();
+ property public final float current;
+ property public final kotlin.ranges.ClosedFloatingPointRange<java.lang.Float> range;
+ property public final int steps;
+ field public static final androidx.compose.ui.semantics.ProgressBarRangeInfo.Companion Companion;
+ }
+
+ public static final class ProgressBarRangeInfo.Companion {
+ method public androidx.compose.ui.semantics.ProgressBarRangeInfo getIndeterminate();
+ property public final androidx.compose.ui.semantics.ProgressBarRangeInfo Indeterminate;
+ }
+
+ @androidx.compose.runtime.Immutable @kotlin.jvm.JvmInline public final value class Role {
+ field public static final androidx.compose.ui.semantics.Role.Companion Companion;
+ }
+
+ public static final class Role.Companion {
+ method public int getButton();
+ method public int getCheckbox();
+ method public int getImage();
+ method public int getRadioButton();
+ method public int getSwitch();
+ method public int getTab();
+ property public final int Button;
+ property public final int Checkbox;
+ property public final int Image;
+ property public final int RadioButton;
+ property public final int Switch;
+ property public final int Tab;
+ }
+
+ public final class ScrollAxisRange {
+ ctor public ScrollAxisRange(kotlin.jvm.functions.Function0<java.lang.Float> value, kotlin.jvm.functions.Function0<java.lang.Float> maxValue, optional boolean reverseScrolling);
+ method public kotlin.jvm.functions.Function0<java.lang.Float> getMaxValue();
+ method public boolean getReverseScrolling();
+ method public kotlin.jvm.functions.Function0<java.lang.Float> getValue();
+ property public final kotlin.jvm.functions.Function0<java.lang.Float> maxValue;
+ property public final boolean reverseScrolling;
+ property public final kotlin.jvm.functions.Function0<java.lang.Float> value;
+ }
+
+ public final class SemanticsActions {
+ method public androidx.compose.ui.semantics.SemanticsPropertyKey<androidx.compose.ui.semantics.AccessibilityAction<kotlin.jvm.functions.Function0<java.lang.Boolean>>> getCollapse();
+ method public androidx.compose.ui.semantics.SemanticsPropertyKey<androidx.compose.ui.semantics.AccessibilityAction<kotlin.jvm.functions.Function0<java.lang.Boolean>>> getCopyText();
+ method public androidx.compose.ui.semantics.SemanticsPropertyKey<java.util.List<androidx.compose.ui.semantics.CustomAccessibilityAction>> getCustomActions();
+ method public androidx.compose.ui.semantics.SemanticsPropertyKey<androidx.compose.ui.semantics.AccessibilityAction<kotlin.jvm.functions.Function0<java.lang.Boolean>>> getCutText();
+ method public androidx.compose.ui.semantics.SemanticsPropertyKey<androidx.compose.ui.semantics.AccessibilityAction<kotlin.jvm.functions.Function0<java.lang.Boolean>>> getDismiss();
+ method public androidx.compose.ui.semantics.SemanticsPropertyKey<androidx.compose.ui.semantics.AccessibilityAction<kotlin.jvm.functions.Function0<java.lang.Boolean>>> getExpand();
+ method public androidx.compose.ui.semantics.SemanticsPropertyKey<androidx.compose.ui.semantics.AccessibilityAction<kotlin.jvm.functions.Function1<java.util.List<androidx.compose.ui.text.TextLayoutResult>,java.lang.Boolean>>> getGetTextLayoutResult();
+ method public androidx.compose.ui.semantics.SemanticsPropertyKey<androidx.compose.ui.semantics.AccessibilityAction<kotlin.jvm.functions.Function0<java.lang.Boolean>>> getOnClick();
+ method public androidx.compose.ui.semantics.SemanticsPropertyKey<androidx.compose.ui.semantics.AccessibilityAction<kotlin.jvm.functions.Function0<java.lang.Boolean>>> getOnLongClick();
+ method public androidx.compose.ui.semantics.SemanticsPropertyKey<androidx.compose.ui.semantics.AccessibilityAction<kotlin.jvm.functions.Function0<java.lang.Boolean>>> getPasteText();
+ method public androidx.compose.ui.semantics.SemanticsPropertyKey<androidx.compose.ui.semantics.AccessibilityAction<kotlin.jvm.functions.Function0<java.lang.Boolean>>> getRequestFocus();
+ method public androidx.compose.ui.semantics.SemanticsPropertyKey<androidx.compose.ui.semantics.AccessibilityAction<kotlin.jvm.functions.Function2<java.lang.Float,java.lang.Float,java.lang.Boolean>>> getScrollBy();
+ method public androidx.compose.ui.semantics.SemanticsPropertyKey<androidx.compose.ui.semantics.AccessibilityAction<kotlin.jvm.functions.Function1<java.lang.Integer,java.lang.Boolean>>> getScrollToIndex();
+ method public androidx.compose.ui.semantics.SemanticsPropertyKey<androidx.compose.ui.semantics.AccessibilityAction<kotlin.jvm.functions.Function1<java.lang.Float,java.lang.Boolean>>> getSetProgress();
+ method public androidx.compose.ui.semantics.SemanticsPropertyKey<androidx.compose.ui.semantics.AccessibilityAction<kotlin.jvm.functions.Function3<java.lang.Integer,java.lang.Integer,java.lang.Boolean,java.lang.Boolean>>> getSetSelection();
+ method public androidx.compose.ui.semantics.SemanticsPropertyKey<androidx.compose.ui.semantics.AccessibilityAction<kotlin.jvm.functions.Function1<androidx.compose.ui.text.AnnotatedString,java.lang.Boolean>>> getSetText();
+ property public final androidx.compose.ui.semantics.SemanticsPropertyKey<androidx.compose.ui.semantics.AccessibilityAction<kotlin.jvm.functions.Function0<java.lang.Boolean>>> Collapse;
+ property public final androidx.compose.ui.semantics.SemanticsPropertyKey<androidx.compose.ui.semantics.AccessibilityAction<kotlin.jvm.functions.Function0<java.lang.Boolean>>> CopyText;
+ property public final androidx.compose.ui.semantics.SemanticsPropertyKey<java.util.List<androidx.compose.ui.semantics.CustomAccessibilityAction>> CustomActions;
+ property public final androidx.compose.ui.semantics.SemanticsPropertyKey<androidx.compose.ui.semantics.AccessibilityAction<kotlin.jvm.functions.Function0<java.lang.Boolean>>> CutText;
+ property public final androidx.compose.ui.semantics.SemanticsPropertyKey<androidx.compose.ui.semantics.AccessibilityAction<kotlin.jvm.functions.Function0<java.lang.Boolean>>> Dismiss;
+ property public final androidx.compose.ui.semantics.SemanticsPropertyKey<androidx.compose.ui.semantics.AccessibilityAction<kotlin.jvm.functions.Function0<java.lang.Boolean>>> Expand;
+ property public final androidx.compose.ui.semantics.SemanticsPropertyKey<androidx.compose.ui.semantics.AccessibilityAction<kotlin.jvm.functions.Function1<java.util.List<androidx.compose.ui.text.TextLayoutResult>,java.lang.Boolean>>> GetTextLayoutResult;
+ property public final androidx.compose.ui.semantics.SemanticsPropertyKey<androidx.compose.ui.semantics.AccessibilityAction<kotlin.jvm.functions.Function0<java.lang.Boolean>>> OnClick;
+ property public final androidx.compose.ui.semantics.SemanticsPropertyKey<androidx.compose.ui.semantics.AccessibilityAction<kotlin.jvm.functions.Function0<java.lang.Boolean>>> OnLongClick;
+ property public final androidx.compose.ui.semantics.SemanticsPropertyKey<androidx.compose.ui.semantics.AccessibilityAction<kotlin.jvm.functions.Function0<java.lang.Boolean>>> PasteText;
+ property public final androidx.compose.ui.semantics.SemanticsPropertyKey<androidx.compose.ui.semantics.AccessibilityAction<kotlin.jvm.functions.Function0<java.lang.Boolean>>> RequestFocus;
+ property public final androidx.compose.ui.semantics.SemanticsPropertyKey<androidx.compose.ui.semantics.AccessibilityAction<kotlin.jvm.functions.Function2<java.lang.Float,java.lang.Float,java.lang.Boolean>>> ScrollBy;
+ property public final androidx.compose.ui.semantics.SemanticsPropertyKey<androidx.compose.ui.semantics.AccessibilityAction<kotlin.jvm.functions.Function1<java.lang.Integer,java.lang.Boolean>>> ScrollToIndex;
+ property public final androidx.compose.ui.semantics.SemanticsPropertyKey<androidx.compose.ui.semantics.AccessibilityAction<kotlin.jvm.functions.Function1<java.lang.Float,java.lang.Boolean>>> SetProgress;
+ property public final androidx.compose.ui.semantics.SemanticsPropertyKey<androidx.compose.ui.semantics.AccessibilityAction<kotlin.jvm.functions.Function3<java.lang.Integer,java.lang.Integer,java.lang.Boolean,java.lang.Boolean>>> SetSelection;
+ property public final androidx.compose.ui.semantics.SemanticsPropertyKey<androidx.compose.ui.semantics.AccessibilityAction<kotlin.jvm.functions.Function1<androidx.compose.ui.text.AnnotatedString,java.lang.Boolean>>> SetText;
+ field public static final androidx.compose.ui.semantics.SemanticsActions INSTANCE;
+ }
+
+ public final class SemanticsConfiguration implements java.lang.Iterable<java.util.Map.Entry<? extends androidx.compose.ui.semantics.SemanticsPropertyKey<?>,?>> kotlin.jvm.internal.markers.KMappedMarker androidx.compose.ui.semantics.SemanticsPropertyReceiver {
+ ctor public SemanticsConfiguration();
+ method public operator <T> boolean contains(androidx.compose.ui.semantics.SemanticsPropertyKey<T> key);
+ method public androidx.compose.ui.semantics.SemanticsConfiguration copy();
+ method public operator <T> T! get(androidx.compose.ui.semantics.SemanticsPropertyKey<T> key);
+ method public <T> T! getOrElse(androidx.compose.ui.semantics.SemanticsPropertyKey<T> key, kotlin.jvm.functions.Function0<? extends T> defaultValue);
+ method public <T> T? getOrElseNullable(androidx.compose.ui.semantics.SemanticsPropertyKey<T> key, kotlin.jvm.functions.Function0<? extends T> defaultValue);
+ method public boolean isClearingSemantics();
+ method public boolean isMergingSemanticsOfDescendants();
+ method public java.util.Iterator<java.util.Map.Entry<androidx.compose.ui.semantics.SemanticsPropertyKey<?>,java.lang.Object>> iterator();
+ method public <T> void set(androidx.compose.ui.semantics.SemanticsPropertyKey<T> key, T? value);
+ method public void setClearingSemantics(boolean);
+ method public void setMergingSemanticsOfDescendants(boolean);
+ property public final boolean isClearingSemantics;
+ property public final boolean isMergingSemanticsOfDescendants;
+ }
+
+ public final class SemanticsConfigurationKt {
+ method public static <T> T? getOrNull(androidx.compose.ui.semantics.SemanticsConfiguration, androidx.compose.ui.semantics.SemanticsPropertyKey<T> key);
+ }
+
+ public interface SemanticsModifier extends androidx.compose.ui.Modifier.Element {
+ method public int getId();
+ method public androidx.compose.ui.semantics.SemanticsConfiguration getSemanticsConfiguration();
+ property public abstract int id;
+ property public abstract androidx.compose.ui.semantics.SemanticsConfiguration semanticsConfiguration;
+ }
+
+ public final class SemanticsModifierKt {
+ method public static androidx.compose.ui.Modifier clearAndSetSemantics(androidx.compose.ui.Modifier, kotlin.jvm.functions.Function1<? super androidx.compose.ui.semantics.SemanticsPropertyReceiver,kotlin.Unit> properties);
+ method public static androidx.compose.ui.Modifier semantics(androidx.compose.ui.Modifier, optional boolean mergeDescendants, kotlin.jvm.functions.Function1<? super androidx.compose.ui.semantics.SemanticsPropertyReceiver,kotlin.Unit> properties);
+ }
+
+ public final class SemanticsNode {
+ method public int getAlignmentLinePosition(androidx.compose.ui.layout.AlignmentLine alignmentLine);
+ method public androidx.compose.ui.geometry.Rect getBoundsInRoot();
+ method public androidx.compose.ui.geometry.Rect getBoundsInWindow();
+ method public java.util.List<androidx.compose.ui.semantics.SemanticsNode> getChildren();
+ method public androidx.compose.ui.semantics.SemanticsConfiguration getConfig();
+ method public int getId();
+ method public androidx.compose.ui.layout.LayoutInfo getLayoutInfo();
+ method public boolean getMergingEnabled();
+ method public androidx.compose.ui.semantics.SemanticsNode? getParent();
+ method public long getPositionInRoot();
+ method public long getPositionInWindow();
+ method public androidx.compose.ui.node.RootForTest? getRoot();
+ method public long getSize();
+ method public androidx.compose.ui.geometry.Rect getTouchBoundsInRoot();
+ method public boolean isRoot();
+ property public final androidx.compose.ui.geometry.Rect boundsInRoot;
+ property public final androidx.compose.ui.geometry.Rect boundsInWindow;
+ property public final java.util.List<androidx.compose.ui.semantics.SemanticsNode> children;
+ property public final androidx.compose.ui.semantics.SemanticsConfiguration config;
+ property public final int id;
+ property public final boolean isRoot;
+ property public final androidx.compose.ui.layout.LayoutInfo layoutInfo;
+ property public final boolean mergingEnabled;
+ property public final androidx.compose.ui.semantics.SemanticsNode? parent;
+ property public final long positionInRoot;
+ property public final long positionInWindow;
+ property public final androidx.compose.ui.node.RootForTest? root;
+ property public final long size;
+ property public final androidx.compose.ui.geometry.Rect touchBoundsInRoot;
+ }
+
+ public final class SemanticsNodeKt {
+ }
+
+ public final class SemanticsOwner {
+ method public androidx.compose.ui.semantics.SemanticsNode getRootSemanticsNode();
+ method public androidx.compose.ui.semantics.SemanticsNode getUnmergedRootSemanticsNode();
+ property public final androidx.compose.ui.semantics.SemanticsNode rootSemanticsNode;
+ property public final androidx.compose.ui.semantics.SemanticsNode unmergedRootSemanticsNode;
+ }
+
+ public final class SemanticsOwnerKt {
+ method public static java.util.List<androidx.compose.ui.semantics.SemanticsNode> getAllSemanticsNodes(androidx.compose.ui.semantics.SemanticsOwner, boolean mergingEnabled);
+ }
+
+ public final class SemanticsProperties {
+ method public androidx.compose.ui.semantics.SemanticsPropertyKey<androidx.compose.ui.semantics.CollectionInfo> getCollectionInfo();
+ method public androidx.compose.ui.semantics.SemanticsPropertyKey<androidx.compose.ui.semantics.CollectionItemInfo> getCollectionItemInfo();
+ method public androidx.compose.ui.semantics.SemanticsPropertyKey<java.util.List<java.lang.String>> getContentDescription();
+ method public androidx.compose.ui.semantics.SemanticsPropertyKey<kotlin.Unit> getDisabled();
+ method public androidx.compose.ui.semantics.SemanticsPropertyKey<androidx.compose.ui.text.AnnotatedString> getEditableText();
+ method public androidx.compose.ui.semantics.SemanticsPropertyKey<java.lang.String> getError();
+ method public androidx.compose.ui.semantics.SemanticsPropertyKey<java.lang.Boolean> getFocused();
+ method public androidx.compose.ui.semantics.SemanticsPropertyKey<kotlin.Unit> getHeading();
+ method public androidx.compose.ui.semantics.SemanticsPropertyKey<androidx.compose.ui.semantics.ScrollAxisRange> getHorizontalScrollAxisRange();
+ method public androidx.compose.ui.semantics.SemanticsPropertyKey<androidx.compose.ui.text.input.ImeAction> getImeAction();
+ method public androidx.compose.ui.semantics.SemanticsPropertyKey<kotlin.jvm.functions.Function1<java.lang.Object,java.lang.Integer>> getIndexForKey();
+ method public androidx.compose.ui.semantics.SemanticsPropertyKey<kotlin.Unit> getInvisibleToUser();
+ method public androidx.compose.ui.semantics.SemanticsPropertyKey<kotlin.Unit> getIsDialog();
+ method public androidx.compose.ui.semantics.SemanticsPropertyKey<kotlin.Unit> getIsPopup();
+ method public androidx.compose.ui.semantics.SemanticsPropertyKey<androidx.compose.ui.semantics.LiveRegionMode> getLiveRegion();
+ method public androidx.compose.ui.semantics.SemanticsPropertyKey<java.lang.String> getPaneTitle();
+ method public androidx.compose.ui.semantics.SemanticsPropertyKey<kotlin.Unit> getPassword();
+ method public androidx.compose.ui.semantics.SemanticsPropertyKey<androidx.compose.ui.semantics.ProgressBarRangeInfo> getProgressBarRangeInfo();
+ method public androidx.compose.ui.semantics.SemanticsPropertyKey<androidx.compose.ui.semantics.Role> getRole();
+ method public androidx.compose.ui.semantics.SemanticsPropertyKey<kotlin.Unit> getSelectableGroup();
+ method public androidx.compose.ui.semantics.SemanticsPropertyKey<java.lang.Boolean> getSelected();
+ method public androidx.compose.ui.semantics.SemanticsPropertyKey<java.lang.String> getStateDescription();
+ method public androidx.compose.ui.semantics.SemanticsPropertyKey<java.lang.String> getTestTag();
+ method public androidx.compose.ui.semantics.SemanticsPropertyKey<java.util.List<androidx.compose.ui.text.AnnotatedString>> getText();
+ method public androidx.compose.ui.semantics.SemanticsPropertyKey<androidx.compose.ui.text.TextRange> getTextSelectionRange();
+ method public androidx.compose.ui.semantics.SemanticsPropertyKey<androidx.compose.ui.state.ToggleableState> getToggleableState();
+ method public androidx.compose.ui.semantics.SemanticsPropertyKey<androidx.compose.ui.semantics.ScrollAxisRange> getVerticalScrollAxisRange();
+ property public final androidx.compose.ui.semantics.SemanticsPropertyKey<androidx.compose.ui.semantics.CollectionInfo> CollectionInfo;
+ property public final androidx.compose.ui.semantics.SemanticsPropertyKey<androidx.compose.ui.semantics.CollectionItemInfo> CollectionItemInfo;
+ property public final androidx.compose.ui.semantics.SemanticsPropertyKey<java.util.List<java.lang.String>> ContentDescription;
+ property public final androidx.compose.ui.semantics.SemanticsPropertyKey<kotlin.Unit> Disabled;
+ property public final androidx.compose.ui.semantics.SemanticsPropertyKey<androidx.compose.ui.text.AnnotatedString> EditableText;
+ property public final androidx.compose.ui.semantics.SemanticsPropertyKey<java.lang.String> Error;
+ property public final androidx.compose.ui.semantics.SemanticsPropertyKey<java.lang.Boolean> Focused;
+ property public final androidx.compose.ui.semantics.SemanticsPropertyKey<kotlin.Unit> Heading;
+ property public final androidx.compose.ui.semantics.SemanticsPropertyKey<androidx.compose.ui.semantics.ScrollAxisRange> HorizontalScrollAxisRange;
+ property public final androidx.compose.ui.semantics.SemanticsPropertyKey<androidx.compose.ui.text.input.ImeAction> ImeAction;
+ property public final androidx.compose.ui.semantics.SemanticsPropertyKey<kotlin.jvm.functions.Function1<java.lang.Object,java.lang.Integer>> IndexForKey;
+ property public final androidx.compose.ui.semantics.SemanticsPropertyKey<kotlin.Unit> InvisibleToUser;
+ property public final androidx.compose.ui.semantics.SemanticsPropertyKey<kotlin.Unit> IsDialog;
+ property public final androidx.compose.ui.semantics.SemanticsPropertyKey<kotlin.Unit> IsPopup;
+ property public final androidx.compose.ui.semantics.SemanticsPropertyKey<androidx.compose.ui.semantics.LiveRegionMode> LiveRegion;
+ property public final androidx.compose.ui.semantics.SemanticsPropertyKey<java.lang.String> PaneTitle;
+ property public final androidx.compose.ui.semantics.SemanticsPropertyKey<kotlin.Unit> Password;
+ property public final androidx.compose.ui.semantics.SemanticsPropertyKey<androidx.compose.ui.semantics.ProgressBarRangeInfo> ProgressBarRangeInfo;
+ property public final androidx.compose.ui.semantics.SemanticsPropertyKey<androidx.compose.ui.semantics.Role> Role;
+ property public final androidx.compose.ui.semantics.SemanticsPropertyKey<kotlin.Unit> SelectableGroup;
+ property public final androidx.compose.ui.semantics.SemanticsPropertyKey<java.lang.Boolean> Selected;
+ property public final androidx.compose.ui.semantics.SemanticsPropertyKey<java.lang.String> StateDescription;
+ property public final androidx.compose.ui.semantics.SemanticsPropertyKey<java.lang.String> TestTag;
+ property public final androidx.compose.ui.semantics.SemanticsPropertyKey<java.util.List<androidx.compose.ui.text.AnnotatedString>> Text;
+ property public final androidx.compose.ui.semantics.SemanticsPropertyKey<androidx.compose.ui.text.TextRange> TextSelectionRange;
+ property public final androidx.compose.ui.semantics.SemanticsPropertyKey<androidx.compose.ui.state.ToggleableState> ToggleableState;
+ property public final androidx.compose.ui.semantics.SemanticsPropertyKey<androidx.compose.ui.semantics.ScrollAxisRange> VerticalScrollAxisRange;
+ field public static final androidx.compose.ui.semantics.SemanticsProperties INSTANCE;
+ }
+
+ public final class SemanticsPropertiesKt {
+ method public static void collapse(androidx.compose.ui.semantics.SemanticsPropertyReceiver, optional String? label, kotlin.jvm.functions.Function0<java.lang.Boolean>? action);
+ method public static void copyText(androidx.compose.ui.semantics.SemanticsPropertyReceiver, optional String? label, kotlin.jvm.functions.Function0<java.lang.Boolean>? action);
+ method public static void cutText(androidx.compose.ui.semantics.SemanticsPropertyReceiver, optional String? label, kotlin.jvm.functions.Function0<java.lang.Boolean>? action);
+ method public static void dialog(androidx.compose.ui.semantics.SemanticsPropertyReceiver);
+ method public static void disabled(androidx.compose.ui.semantics.SemanticsPropertyReceiver);
+ method public static void dismiss(androidx.compose.ui.semantics.SemanticsPropertyReceiver, optional String? label, kotlin.jvm.functions.Function0<java.lang.Boolean>? action);
+ method public static void error(androidx.compose.ui.semantics.SemanticsPropertyReceiver, String description);
+ method public static void expand(androidx.compose.ui.semantics.SemanticsPropertyReceiver, optional String? label, kotlin.jvm.functions.Function0<java.lang.Boolean>? action);
+ method public static androidx.compose.ui.semantics.CollectionInfo getCollectionInfo(androidx.compose.ui.semantics.SemanticsPropertyReceiver);
+ method public static androidx.compose.ui.semantics.CollectionItemInfo getCollectionItemInfo(androidx.compose.ui.semantics.SemanticsPropertyReceiver);
+ method public static String getContentDescription(androidx.compose.ui.semantics.SemanticsPropertyReceiver);
+ method public static java.util.List<androidx.compose.ui.semantics.CustomAccessibilityAction> getCustomActions(androidx.compose.ui.semantics.SemanticsPropertyReceiver);
+ method public static androidx.compose.ui.text.AnnotatedString getEditableText(androidx.compose.ui.semantics.SemanticsPropertyReceiver);
+ method public static boolean getFocused(androidx.compose.ui.semantics.SemanticsPropertyReceiver);
+ method public static androidx.compose.ui.semantics.ScrollAxisRange getHorizontalScrollAxisRange(androidx.compose.ui.semantics.SemanticsPropertyReceiver);
+ method public static int getImeAction(androidx.compose.ui.semantics.SemanticsPropertyReceiver);
+ method public static int getLiveRegion(androidx.compose.ui.semantics.SemanticsPropertyReceiver);
+ method public static String getPaneTitle(androidx.compose.ui.semantics.SemanticsPropertyReceiver);
+ method public static androidx.compose.ui.semantics.ProgressBarRangeInfo getProgressBarRangeInfo(androidx.compose.ui.semantics.SemanticsPropertyReceiver);
+ method public static int getRole(androidx.compose.ui.semantics.SemanticsPropertyReceiver);
+ method public static boolean getSelected(androidx.compose.ui.semantics.SemanticsPropertyReceiver);
+ method public static String getStateDescription(androidx.compose.ui.semantics.SemanticsPropertyReceiver);
+ method public static String getTestTag(androidx.compose.ui.semantics.SemanticsPropertyReceiver);
+ method public static androidx.compose.ui.text.AnnotatedString getText(androidx.compose.ui.semantics.SemanticsPropertyReceiver);
+ method public static void getTextLayoutResult(androidx.compose.ui.semantics.SemanticsPropertyReceiver, optional String? label, kotlin.jvm.functions.Function1<? super java.util.List<androidx.compose.ui.text.TextLayoutResult>,java.lang.Boolean>? action);
+ method public static long getTextSelectionRange(androidx.compose.ui.semantics.SemanticsPropertyReceiver);
+ method public static androidx.compose.ui.state.ToggleableState getToggleableState(androidx.compose.ui.semantics.SemanticsPropertyReceiver);
+ method public static androidx.compose.ui.semantics.ScrollAxisRange getVerticalScrollAxisRange(androidx.compose.ui.semantics.SemanticsPropertyReceiver);
+ method public static void heading(androidx.compose.ui.semantics.SemanticsPropertyReceiver);
+ method public static void indexForKey(androidx.compose.ui.semantics.SemanticsPropertyReceiver, kotlin.jvm.functions.Function1<java.lang.Object,java.lang.Integer> mapping);
+ method public static void onClick(androidx.compose.ui.semantics.SemanticsPropertyReceiver, optional String? label, kotlin.jvm.functions.Function0<java.lang.Boolean>? action);
+ method public static void onLongClick(androidx.compose.ui.semantics.SemanticsPropertyReceiver, optional String? label, kotlin.jvm.functions.Function0<java.lang.Boolean>? action);
+ method public static void password(androidx.compose.ui.semantics.SemanticsPropertyReceiver);
+ method public static void pasteText(androidx.compose.ui.semantics.SemanticsPropertyReceiver, optional String? label, kotlin.jvm.functions.Function0<java.lang.Boolean>? action);
+ method public static void popup(androidx.compose.ui.semantics.SemanticsPropertyReceiver);
+ method public static void requestFocus(androidx.compose.ui.semantics.SemanticsPropertyReceiver, optional String? label, kotlin.jvm.functions.Function0<java.lang.Boolean>? action);
+ method public static void scrollBy(androidx.compose.ui.semantics.SemanticsPropertyReceiver, optional String? label, kotlin.jvm.functions.Function2<? super java.lang.Float,? super java.lang.Float,java.lang.Boolean>? action);
+ method public static void scrollToIndex(androidx.compose.ui.semantics.SemanticsPropertyReceiver, optional String? label, kotlin.jvm.functions.Function1<? super java.lang.Integer,java.lang.Boolean> action);
+ method public static void selectableGroup(androidx.compose.ui.semantics.SemanticsPropertyReceiver);
+ method public static void setCollectionInfo(androidx.compose.ui.semantics.SemanticsPropertyReceiver, androidx.compose.ui.semantics.CollectionInfo);
+ method public static void setCollectionItemInfo(androidx.compose.ui.semantics.SemanticsPropertyReceiver, androidx.compose.ui.semantics.CollectionItemInfo);
+ method public static void setContentDescription(androidx.compose.ui.semantics.SemanticsPropertyReceiver, String);
+ method public static void setCustomActions(androidx.compose.ui.semantics.SemanticsPropertyReceiver, java.util.List<androidx.compose.ui.semantics.CustomAccessibilityAction>);
+ method public static void setEditableText(androidx.compose.ui.semantics.SemanticsPropertyReceiver, androidx.compose.ui.text.AnnotatedString);
+ method public static void setFocused(androidx.compose.ui.semantics.SemanticsPropertyReceiver, boolean);
+ method public static void setHorizontalScrollAxisRange(androidx.compose.ui.semantics.SemanticsPropertyReceiver, androidx.compose.ui.semantics.ScrollAxisRange);
+ method public static void setImeAction(androidx.compose.ui.semantics.SemanticsPropertyReceiver, int);
+ method public static void setLiveRegion(androidx.compose.ui.semantics.SemanticsPropertyReceiver, int);
+ method public static void setPaneTitle(androidx.compose.ui.semantics.SemanticsPropertyReceiver, String);
+ method public static void setProgress(androidx.compose.ui.semantics.SemanticsPropertyReceiver, optional String? label, kotlin.jvm.functions.Function1<? super java.lang.Float,java.lang.Boolean>? action);
+ method public static void setProgressBarRangeInfo(androidx.compose.ui.semantics.SemanticsPropertyReceiver, androidx.compose.ui.semantics.ProgressBarRangeInfo);
+ method public static void setRole(androidx.compose.ui.semantics.SemanticsPropertyReceiver, int);
+ method public static void setSelected(androidx.compose.ui.semantics.SemanticsPropertyReceiver, boolean);
+ method public static void setSelection(androidx.compose.ui.semantics.SemanticsPropertyReceiver, optional String? label, kotlin.jvm.functions.Function3<? super java.lang.Integer,? super java.lang.Integer,? super java.lang.Boolean,java.lang.Boolean>? action);
+ method public static void setStateDescription(androidx.compose.ui.semantics.SemanticsPropertyReceiver, String);
+ method public static void setTestTag(androidx.compose.ui.semantics.SemanticsPropertyReceiver, String);
+ method public static void setText(androidx.compose.ui.semantics.SemanticsPropertyReceiver, androidx.compose.ui.text.AnnotatedString);
+ method public static void setText(androidx.compose.ui.semantics.SemanticsPropertyReceiver, optional String? label, kotlin.jvm.functions.Function1<? super androidx.compose.ui.text.AnnotatedString,java.lang.Boolean>? action);
+ method public static void setTextSelectionRange(androidx.compose.ui.semantics.SemanticsPropertyReceiver, long);
+ method public static void setToggleableState(androidx.compose.ui.semantics.SemanticsPropertyReceiver, androidx.compose.ui.state.ToggleableState);
+ method public static void setVerticalScrollAxisRange(androidx.compose.ui.semantics.SemanticsPropertyReceiver, androidx.compose.ui.semantics.ScrollAxisRange);
+ }
+
+ public final class SemanticsProperties_androidKt {
+ }
+
+ public final class SemanticsPropertyKey<T> {
+ ctor public SemanticsPropertyKey(String name, optional kotlin.jvm.functions.Function2<? super T,? super T,? extends T> mergePolicy);
+ method public String getName();
+ method public operator T! getValue(androidx.compose.ui.semantics.SemanticsPropertyReceiver thisRef, kotlin.reflect.KProperty<?> property);
+ method public T? merge(T? parentValue, T? childValue);
+ method public operator void setValue(androidx.compose.ui.semantics.SemanticsPropertyReceiver thisRef, kotlin.reflect.KProperty<?> property, T? value);
+ property public final String name;
+ }
+
+ public interface SemanticsPropertyReceiver {
+ method public operator <T> void set(androidx.compose.ui.semantics.SemanticsPropertyKey<T> key, T? value);
+ }
+
+ public final class SemanticsSortKt {
+ }
+
+}
+
+package androidx.compose.ui.state {
+
+ public enum ToggleableState {
+ enum_constant public static final androidx.compose.ui.state.ToggleableState Indeterminate;
+ enum_constant public static final androidx.compose.ui.state.ToggleableState Off;
+ enum_constant public static final androidx.compose.ui.state.ToggleableState On;
+ }
+
+ public final class ToggleableStateKt {
+ method public static androidx.compose.ui.state.ToggleableState ToggleableState(boolean value);
+ }
+
+}
+
+package androidx.compose.ui.text.input {
+
+ public final class CursorAnchorInfoBuilderKt {
+ }
+
+ public final class InputState_androidKt {
+ }
+
+ public final class RecordingInputConnection_androidKt {
+ }
+
+ public final class TextInputServiceAndroid_androidKt {
+ }
+
+}
+
+package androidx.compose.ui.viewinterop {
+
+ public final class AndroidViewHolder_androidKt {
+ }
+
+ public final class AndroidView_androidKt {
+ method @androidx.compose.runtime.Composable @androidx.compose.ui.UiComposable public static <T extends android.view.View> void AndroidView(kotlin.jvm.functions.Function1<? super android.content.Context,? extends T> factory, optional androidx.compose.ui.Modifier modifier, optional kotlin.jvm.functions.Function1<? super T,kotlin.Unit> update);
+ method public static kotlin.jvm.functions.Function1<android.view.View,kotlin.Unit> getNoOpUpdate();
+ property public static final kotlin.jvm.functions.Function1<android.view.View,kotlin.Unit> NoOpUpdate;
+ }
+
+}
+
+package androidx.compose.ui.window {
+
+ public final class AndroidDialog_androidKt {
+ method @androidx.compose.runtime.Composable public static void Dialog(kotlin.jvm.functions.Function0<kotlin.Unit> onDismissRequest, optional androidx.compose.ui.window.DialogProperties properties, kotlin.jvm.functions.Function0<kotlin.Unit> content);
+ }
+
+ public final class AndroidPopup_androidKt {
+ method @androidx.compose.runtime.Composable public static void Popup(optional androidx.compose.ui.Alignment alignment, optional long offset, optional kotlin.jvm.functions.Function0<kotlin.Unit>? onDismissRequest, optional androidx.compose.ui.window.PopupProperties properties, kotlin.jvm.functions.Function0<kotlin.Unit> content);
+ method @androidx.compose.runtime.Composable public static void Popup(androidx.compose.ui.window.PopupPositionProvider popupPositionProvider, optional kotlin.jvm.functions.Function0<kotlin.Unit>? onDismissRequest, optional androidx.compose.ui.window.PopupProperties properties, kotlin.jvm.functions.Function0<kotlin.Unit> content);
+ method @org.jetbrains.annotations.TestOnly public static boolean isPopupLayout(android.view.View view, optional String? testTag);
+ }
+
+ @androidx.compose.runtime.Immutable public final class DialogProperties {
+ ctor public DialogProperties(optional boolean dismissOnBackPress, optional boolean dismissOnClickOutside, optional androidx.compose.ui.window.SecureFlagPolicy securePolicy);
+ method public boolean getDismissOnBackPress();
+ method public boolean getDismissOnClickOutside();
+ method public androidx.compose.ui.window.SecureFlagPolicy getSecurePolicy();
+ property public final boolean dismissOnBackPress;
+ property public final boolean dismissOnClickOutside;
+ property public final androidx.compose.ui.window.SecureFlagPolicy securePolicy;
+ }
+
+ public interface DialogWindowProvider {
+ method public android.view.Window getWindow();
+ property public abstract android.view.Window window;
+ }
+
+ @androidx.compose.runtime.Immutable public interface PopupPositionProvider {
+ method public long calculatePosition(androidx.compose.ui.unit.IntRect anchorBounds, long windowSize, androidx.compose.ui.unit.LayoutDirection layoutDirection, long popupContentSize);
+ }
+
+ @androidx.compose.runtime.Immutable public final class PopupProperties {
+ ctor public PopupProperties(optional boolean focusable, optional boolean dismissOnBackPress, optional boolean dismissOnClickOutside, optional androidx.compose.ui.window.SecureFlagPolicy securePolicy, optional boolean excludeFromSystemGesture, optional boolean clippingEnabled);
+ method public boolean getClippingEnabled();
+ method public boolean getDismissOnBackPress();
+ method public boolean getDismissOnClickOutside();
+ method public boolean getExcludeFromSystemGesture();
+ method public boolean getFocusable();
+ method public androidx.compose.ui.window.SecureFlagPolicy getSecurePolicy();
+ property public final boolean clippingEnabled;
+ property public final boolean dismissOnBackPress;
+ property public final boolean dismissOnClickOutside;
+ property public final boolean excludeFromSystemGesture;
+ property public final boolean focusable;
+ property public final androidx.compose.ui.window.SecureFlagPolicy securePolicy;
+ }
+
+ public enum SecureFlagPolicy {
+ enum_constant public static final androidx.compose.ui.window.SecureFlagPolicy Inherit;
+ enum_constant public static final androidx.compose.ui.window.SecureFlagPolicy SecureOff;
+ enum_constant public static final androidx.compose.ui.window.SecureFlagPolicy SecureOn;
+ }
+
+ public final class SecureFlagPolicy_androidKt {
+ }
+
+}
+
diff --git a/compose/ui/ui/api/restricted_current.txt b/compose/ui/ui/api/restricted_current.txt
index f29dcb6..43125a3 100644
--- a/compose/ui/ui/api/restricted_current.txt
+++ b/compose/ui/ui/api/restricted_current.txt
@@ -2513,9 +2513,9 @@
field public static final androidx.compose.ui.platform.ViewCompositionStrategy.DisposeOnDetachedFromWindow INSTANCE;
}
- public static final class ViewCompositionStrategy.DisposeOnDetachedFromWindowIfNotInPoolingContainer implements androidx.compose.ui.platform.ViewCompositionStrategy {
+ public static final class ViewCompositionStrategy.DisposeOnDetachedFromWindowOrReleasedFromPool implements androidx.compose.ui.platform.ViewCompositionStrategy {
method public kotlin.jvm.functions.Function0<kotlin.Unit> installFor(androidx.compose.ui.platform.AbstractComposeView view);
- field public static final androidx.compose.ui.platform.ViewCompositionStrategy.DisposeOnDetachedFromWindowIfNotInPoolingContainer INSTANCE;
+ field public static final androidx.compose.ui.platform.ViewCompositionStrategy.DisposeOnDetachedFromWindowOrReleasedFromPool INSTANCE;
}
public static final class ViewCompositionStrategy.DisposeOnLifecycleDestroyed implements androidx.compose.ui.platform.ViewCompositionStrategy {
diff --git a/compose/ui/ui/src/androidAndroidTest/kotlin/androidx/compose/ui/input/pointer/PointerInteropFilterAndroidViewHookupTest.kt b/compose/ui/ui/src/androidAndroidTest/kotlin/androidx/compose/ui/input/pointer/PointerInteropFilterAndroidViewHookupTest.kt
index 0f4c69b..a76783f 100644
--- a/compose/ui/ui/src/androidAndroidTest/kotlin/androidx/compose/ui/input/pointer/PointerInteropFilterAndroidViewHookupTest.kt
+++ b/compose/ui/ui/src/androidAndroidTest/kotlin/androidx/compose/ui/input/pointer/PointerInteropFilterAndroidViewHookupTest.kt
@@ -34,7 +34,6 @@
import androidx.compose.ui.test.junit4.createAndroidComposeRule
import androidx.compose.ui.viewinterop.AndroidView
import androidx.test.ext.junit.runners.AndroidJUnit4
-import androidx.test.filters.FlakyTest
import androidx.test.filters.MediumTest
import com.google.common.truth.Truth.assertThat
import org.junit.Before
@@ -478,7 +477,6 @@
assertThat(captureRequestDisallow.disallowIntercept).isFalse()
}
- @FlakyTest(bugId = 206967867)
@Test
fun disallowTriggeredWhenMovementInClickChildAfterRequestDisallow() {
var clicked = false
diff --git a/compose/ui/ui/src/androidMain/kotlin/androidx/compose/ui/platform/ViewCompositionStrategy.android.kt b/compose/ui/ui/src/androidMain/kotlin/androidx/compose/ui/platform/ViewCompositionStrategy.android.kt
index 39c1e73..c793093 100644
--- a/compose/ui/ui/src/androidMain/kotlin/androidx/compose/ui/platform/ViewCompositionStrategy.android.kt
+++ b/compose/ui/ui/src/androidMain/kotlin/androidx/compose/ui/platform/ViewCompositionStrategy.android.kt
@@ -60,14 +60,14 @@
/**
* The default strategy for [AbstractComposeView] and [ComposeView].
*
- * Currently, this is [DisposeOnDetachedFromWindowIfNotInPoolingContainer], though this
+ * Currently, this is [DisposeOnDetachedFromWindowOrReleasedFromPool], though this
* implementation detail may change.
*/
// WARNING: the implementation of the default strategy is installed with a reference to
// `this` on a not-fully-constructed object in AbstractComposeView.
// Be careful not to do anything that would break that.
val Default: ViewCompositionStrategy
- get() = DisposeOnDetachedFromWindowIfNotInPoolingContainer
+ get() = DisposeOnDetachedFromWindowOrReleasedFromPool
}
/**
@@ -80,7 +80,7 @@
// WARNING: the implementation of the default strategy is installed with a reference to
// `this` on a not-fully-constructed object in AbstractComposeView.
// Be careful not to do anything that would break that.
- object DisposeOnDetachedFromWindowIfNotInPoolingContainer : ViewCompositionStrategy {
+ object DisposeOnDetachedFromWindowOrReleasedFromPool : ViewCompositionStrategy {
override fun installFor(view: AbstractComposeView): () -> Unit {
val listener = object : View.OnAttachStateChangeListener {
override fun onViewAttachedToWindow(v: View) {}
diff --git a/compose/ui/ui/src/commonMain/kotlin/androidx/compose/ui/input/pointer/util/VelocityTracker.kt b/compose/ui/ui/src/commonMain/kotlin/androidx/compose/ui/input/pointer/util/VelocityTracker.kt
index 5955f55..580a3b8d 100644
--- a/compose/ui/ui/src/commonMain/kotlin/androidx/compose/ui/input/pointer/util/VelocityTracker.kt
+++ b/compose/ui/ui/src/commonMain/kotlin/androidx/compose/ui/input/pointer/util/VelocityTracker.kt
@@ -22,6 +22,7 @@
import androidx.compose.ui.util.fastForEach
import androidx.compose.ui.unit.Velocity
import kotlin.math.abs
+import kotlin.math.sign
import kotlin.math.sqrt
private const val AssumePointerMoveStoppedMilliseconds: Int = 40
@@ -31,22 +32,141 @@
private const val MinSampleSize: Int = 3
/**
+ * Calculate the total impulse provided to the screen and the resulting velocity.
+ *
+ * The touchscreen is modeled as a physical object.
+ * Initial condition is discussed below, but for now suppose that v(t=0) = 0
+ *
+ * The kinetic energy of the object at the release is E=0.5*m*v^2
+ * Then vfinal = sqrt(2E/m). The goal is to calculate E.
+ *
+ * The kinetic energy at the release is equal to the total work done on the object by the finger.
+ * The total work W is the sum of all dW along the path.
+ *
+ * dW = F*dx, where dx is the piece of path traveled.
+ * Force is change of momentum over time, F = dp/dt = m dv/dt.
+ * Then substituting:
+ * dW = m (dv/dt) * dx = m * v * dv
+ *
+ * Summing along the path, we get:
+ * W = sum(dW) = sum(m * v * dv) = m * sum(v * dv)
+ * Since the mass stays constant, the equation for final velocity is:
+ * vfinal = sqrt(2*sum(v * dv))
+ *
+ * Here,
+ * dv : change of velocity = (v[i+1]-v[i])
+ * dx : change of distance = (x[i+1]-x[i])
+ * dt : change of time = (t[i+1]-t[i])
+ * v : instantaneous velocity = dx/dt
+ *
+ * The final formula is:
+ * vfinal = sqrt(2) * sqrt(sum((v[i]-v[i-1])*|v[i]|)) for all i
+ * The absolute value is needed to properly account for the sign. If the velocity over a
+ * particular segment descreases, then this indicates braking, which means that negative
+ * work was done. So for two positive, but decreasing, velocities, this contribution would be
+ * negative and will cause a smaller final velocity.
+ *
+ * Initial condition
+ * There are two ways to deal with initial condition:
+ * 1) Assume that v(0) = 0, which would mean that the screen is initially at rest.
+ * This is not entirely accurate. We are only taking the past X ms of touch data, where X is
+ * currently equal to 100. However, a touch event that created a fling probably lasted for longer
+ * than that, which would mean that the user has already been interacting with the touchscreen
+ * and it has probably already been moving.
+ * 2) Assume that the touchscreen has already been moving at a certain velocity, calculate this
+ * initial velocity and the equivalent energy, and start with this initial energy.
+ * Consider an example where we have the following data, consisting of 3 points:
+ * time: t0, t1, t2
+ * x : x0, x1, x2
+ * v : 0, v1, v2
+ * Here is what will happen in each of these scenarios:
+ * 1) By directly applying the formula above with the v(0) = 0 boundary condition, we will get
+ * vfinal = sqrt(2*(|v1|*(v1-v0) + |v2|*(v2-v1))). This can be simplified since v0=0
+ * vfinal = sqrt(2*(|v1|*v1 + |v2|*(v2-v1))) = sqrt(2*(v1^2 + |v2|*(v2 - v1)))
+ * since velocity is a real number
+ * 2) If we treat the screen as already moving, then it must already have an energy (per mass)
+ * equal to 1/2*v1^2. Then the initial energy should be 1/2*v1*2, and only the second segment
+ * will contribute to the total kinetic energy (since we can effectively consider that v0=v1).
+ * This will give the following expression for the final velocity:
+ * vfinal = sqrt(2*(1/2*v1^2 + |v2|*(v2-v1)))
+ * This analysis can be generalized to an arbitrary number of samples.
+ *
+ *
+ * Comparing the two equations above, we see that the only mathematical difference
+ * is the factor of 1/2 in front of the first velocity term.
+ * This boundary condition would allow for the "proper" calculation of the case when all of the
+ * samples are equally spaced in time and distance, which should suggest a constant velocity.
+ *
+ * Note that approach 2) is sensitive to the proper ordering of the data in time, since
+ * the boundary condition must be applied to the oldest sample to be accurate.
+ */
+private fun kineticEnergyToVelocity(work: Float): Float {
+ return sign(work) * sqrt(2 * abs(work))
+}
+
+private class ImpulseCalculator {
+ private var work = 0f
+ private var previousT: Long? = null
+ private var previousX: Float? = null
+ private var initialCondition = true
+
+ /**
+ * Return the velocity, in pixels/second.
+ * Even though the input time is in milliseconds, we convert to second inside this function
+ * because it provides a more stable numerical behaviour.
+ */
+ fun getVelocity(): Float {
+ return kineticEnergyToVelocity(work)
+ }
+
+ fun addPosition(timeMillis: Long, x: Float) {
+ // t[i] is in milliseconds, but due to FP arithmetic, convert to seconds
+ val SecondsPerMs = 0.001f
+ if (previousT == null || previousX == null) {
+ previousT = timeMillis
+ previousX = x
+ // This is a first data point, nothing to compute here
+ return
+ }
+ if (timeMillis == previousT) {
+ previousX = x
+ // Should never happen, but for stability, skip this sample
+ return
+ }
+ val vprev = kineticEnergyToVelocity(work) // v[i-1]
+ val vcurr = (x - previousX!!) / (SecondsPerMs * (timeMillis - previousT!!)) // v[i]
+ work += (vcurr - vprev) * abs(vcurr)
+ if (initialCondition) {
+ work *= 0.5f
+ initialCondition = false
+ }
+ previousT = timeMillis
+ previousX = x
+ }
+
+ fun reset() {
+ work = 0f
+ previousT = null
+ previousX = null
+ initialCondition = true
+ }
+}
+
+/**
* Computes a pointer's velocity.
*
- * The input data is provided by calling [addPosition]. Adding data is cheap.
+ * The input data is provided by calling [addPosition]. Adding data is cheap. Ensure that all data
+ * for the gesture of interest is added.
*
- * To obtain a velocity, call [calculateVelocity] or [getVelocityEstimate]. This will
- * compute the velocity based on the data added so far. Only call these when
- * you need to use the velocity, as they are comparatively expensive.
- *
- * The quality of the velocity estimation will be better if more data points
- * have been received.
+ * To obtain a velocity, call [calculateVelocity]. This will
+ * compute the velocity based on the data added so far. Only call this when
+ * you need to use the velocity, since the computation is relatively expensive.
*/
class VelocityTracker {
-
// Circular buffer; current sample at index.
private val samples: Array<PointAtTime?> = Array(HistorySize) { null }
private var index: Int = 0
+ private val useImpulse = true
/**
* Adds a position as the given time to the tracker.
@@ -55,9 +175,6 @@
*
* @see resetTracking
*/
- // TODO(shepshapard): VelocityTracker needs to be updated to be passed vectors instead of
- // positions. For velocity tracking, the only thing that is important is the change in
- // position over time.
fun addPosition(timeMillis: Long, position: Offset) {
index = (index + 1) % HistorySize
samples[index] = PointAtTime(position, timeMillis)
@@ -69,8 +186,58 @@
* This can be expensive. Only call this when you need the velocity.
*/
fun calculateVelocity(): Velocity {
- val estimate = getVelocityEstimate().pixelsPerSecond
- return Velocity(estimate.x, estimate.y)
+ if (useImpulse) {
+ return getImpulseVelocity()
+ }
+ val lsq2estimate = getLsq2VelocityEstimate().pixelsPerSecond
+ return Velocity(lsq2estimate.x, lsq2estimate.y)
+ }
+
+ private fun getImpulseVelocity(): Velocity {
+ var sampleCount = 0
+
+ // The sample at index is our newest sample. If it is null, we have no samples so return.
+ val newestSample: PointAtTime = samples[index] ?: return Velocity(0f, 0f)
+
+ var previousSample: PointAtTime = newestSample
+
+ // Starting with the most recent PointAtTime sample, iterate backwards while
+ // the samples represent continuous motion.
+ val xCalculator = ImpulseCalculator()
+ val yCalculator = ImpulseCalculator()
+ var i: Int = index
+ do {
+ i = (i + 1) % HistorySize
+ val sample: PointAtTime = samples[i] ?: continue
+
+ val age = newestSample.time - sample.time
+ val delta = abs(sample.time - previousSample.time)
+ previousSample = newestSample
+ if (age > HorizonMilliseconds) {
+ continue // skip the old samples
+ }
+
+ if (delta > AssumePointerMoveStoppedMilliseconds) {
+ xCalculator.reset()
+ yCalculator.reset()
+ }
+
+ xCalculator.addPosition(-age, sample.point.x)
+ yCalculator.addPosition(-age, sample.point.y)
+
+ sampleCount += 1
+ } while (i != index && sampleCount < HistorySize)
+
+ if (sampleCount < MinSampleSize) {
+ // Compatibility behaviour: if we only have 2 points, return 0 velocity.
+ // Some tests needs this.
+ return Velocity(0f, 0f)
+ }
+
+ val xVelocity = xCalculator.getVelocity()
+ val yVelocity = yCalculator.getVelocity()
+
+ return Velocity(xVelocity, yVelocity)
}
/**
@@ -88,7 +255,7 @@
*
* Returns null if there is no data on which to base an estimate.
*/
- private fun getVelocityEstimate(): VelocityEstimate {
+ private fun getLsq2VelocityEstimate(): VelocityEstimate {
val x: MutableList<Float> = mutableListOf()
val y: MutableList<Float> = mutableListOf()
val time: MutableList<Float> = mutableListOf()
diff --git a/compose/ui/ui/src/test/kotlin/androidx/compose/ui/input/pointer/util/VelocityTrackerTest.kt b/compose/ui/ui/src/test/kotlin/androidx/compose/ui/input/pointer/util/VelocityTrackerTest.kt
index e599589..b6a96ca 100644
--- a/compose/ui/ui/src/test/kotlin/androidx/compose/ui/input/pointer/util/VelocityTrackerTest.kt
+++ b/compose/ui/ui/src/test/kotlin/androidx/compose/ui/input/pointer/util/VelocityTrackerTest.kt
@@ -25,6 +25,7 @@
@RunWith(JUnit4::class)
class VelocityTrackerTest {
+ val TOLERANCE = 0.1f
// TODO(shepshapard): This test needs to be broken up into smaller tests
// that make edge cases clearer. Right now its just a bunch of inputs and outputs
@@ -33,19 +34,19 @@
fun calculateVelocity_returnsExpectedValues() {
val expected = listOf(
- Pair(219.59280094228163f, 1304.701682306001f),
- Pair(355.71046950050845f, 967.2112857054104f),
- Pair(12.657970884022308f, -36.90447839251946f),
- Pair(714.1399654786744f, -2561.534447931869f),
- Pair(-19.668121066218564f, -2910.105747052462f),
- Pair(646.8690114934209f, 2976.977762577527f),
- Pair(396.6988447819592f, 2106.225572911095f),
- Pair(298.31594440044495f, -3660.8315955215294f),
- Pair(-1.7334232785165882f, -3288.13174127454f),
- Pair(384.6361280392334f, -2645.6612524779835f),
- Pair(176.37900397918557f, 2711.2542876273264f),
- Pair(396.9328560260098f, 4280.651578291764f),
- Pair(-71.51939428321249f, 3716.7385187526947f)
+ Pair(117.7f, 799f),
+ Pair(214.5f, 855.8f),
+ Pair(-50.5f, 182.2f),
+ Pair(628.5f, -2127.9f),
+ Pair(123.4f, -2970.8f),
+ Pair(537.3f, 2236.1f),
+ Pair(450.8f, 1786.9f),
+ Pair(430.9f, -2648.1f),
+ Pair(253.3f, -2723.7f),
+ Pair(285.7f, -2929.3f),
+ Pair(322.6f, 2369.8f),
+ Pair(1023.1f, 4477.2f),
+ Pair(629.8f, 3802.5f)
)
val tracker = VelocityTracker()
@@ -62,6 +63,127 @@
}
@Test
+ fun calculateVelocity_threePoints() {
+ // Same coordinate is reported 2 times in a row
+ // It is difficult to determine the correct answer here, but at least the direction
+ // of the reported velocity should be positive.
+ val tracker = VelocityTracker()
+ tracker.addPosition(0, Offset(273f, 0f))
+ tracker.addPosition(12, Offset(293f, 0f))
+ tracker.addPosition(14, Offset(293f, 0f))
+ tracker.addPosition(15, Offset(293f, 0f))
+ val velocity = tracker.calculateVelocity()
+ assertThat(velocity.x).isWithin(TOLERANCE).of(1666.7f)
+ }
+
+ @Test
+ fun calculateVelocity_threePoints2() {
+ val tracker = VelocityTracker()
+ tracker.addPosition(0, Offset(0f, 0f))
+ tracker.addPosition(25, Offset(25f, 0f))
+ tracker.addPosition(50, Offset(50f, 0f))
+ tracker.addPosition(100, Offset(100f, 0f))
+ val velocity = tracker.calculateVelocity()
+ assertThat(velocity.x).isWithin(TOLERANCE).of(1000f)
+ }
+
+ @Test
+ fun calculateVelocity_linearMotion() {
+ // Fixed velocity at 5 points per 10 milliseconds
+ val tracker = VelocityTracker()
+ tracker.addPosition(0, Offset(0f, 0f))
+ tracker.addPosition(10, Offset(5f, 0f))
+ tracker.addPosition(20, Offset(10f, 0f))
+ val velocity = tracker.calculateVelocity()
+ assertThat(velocity.x).isWithin(TOLERANCE).of(500f)
+ }
+
+ @Test
+ fun calculateVelocity_linearHalfMotion() {
+ // Stay still for 50 ms, and then move 100 points in the final 50 ms
+ // The final line is sloped at 2 pixels / ms
+ // This can be visualized as 2 lines: flat line (50ms), and line with slope of 2 px/ms
+ val tracker = VelocityTracker()
+ tracker.addPosition(0, Offset(0f, 0f))
+ tracker.addPosition(10, Offset(0f, 0f))
+ tracker.addPosition(20, Offset(0f, 0f))
+ tracker.addPosition(30, Offset(0f, 0f))
+ tracker.addPosition(40, Offset(0f, 0f))
+ tracker.addPosition(50, Offset(0f, 0f))
+ tracker.addPosition(60, Offset(20f, 0f))
+ tracker.addPosition(70, Offset(40f, 0f))
+ tracker.addPosition(80, Offset(60f, 0f))
+ tracker.addPosition(90, Offset(80f, 0f))
+ tracker.addPosition(100, Offset(100f, 0f))
+ val velocity = tracker.calculateVelocity()
+ assertThat(velocity.x).isWithin(TOLERANCE).of(2000f)
+ }
+
+ @Test
+ fun calculateVelocity_linearHalfMotionSampled() {
+ // Same test as above, but sampled much less frequently. The resulting velocity is higher
+ // than the previous test, because the path looks significantly different now if you
+ // were to just plot these points.
+ val tracker = VelocityTracker()
+ tracker.addPosition(0, Offset(0f, 0f))
+ tracker.addPosition(30, Offset(0f, 0f))
+ tracker.addPosition(40, Offset(0f, 0f))
+ tracker.addPosition(70, Offset(40f, 0f))
+ tracker.addPosition(100, Offset(100f, 0f))
+ val velocity = tracker.calculateVelocity()
+ assertThat(velocity.x).isWithin(TOLERANCE).of(2108.2f)
+ }
+
+ @Test
+ fun calculateVelocity_linearMotionFollowedByFlatLine() {
+ // Fixed velocity at first, but flat line afterwards
+ val tracker = VelocityTracker()
+ tracker.addPosition(0, Offset(0f, 0f))
+ tracker.addPosition(10, Offset(10f, 0f))
+ tracker.addPosition(20, Offset(20f, 0f))
+ tracker.addPosition(30, Offset(30f, 0f))
+ tracker.addPosition(40, Offset(40f, 0f))
+ tracker.addPosition(50, Offset(50f, 0f))
+ tracker.addPosition(60, Offset(50f, 0f))
+ tracker.addPosition(70, Offset(50f, 0f))
+ tracker.addPosition(80, Offset(50f, 0f))
+ tracker.addPosition(90, Offset(50f, 0f))
+ tracker.addPosition(100, Offset(50f, 0f))
+ val velocity = tracker.calculateVelocity()
+ assertThat(velocity.x).isWithin(TOLERANCE).of(0f)
+ }
+
+ @Test
+ fun calculateVelocity_linearMotionFollowedByFlatLineWithoutIntermediatePoints() {
+ // Fixed velocity at first, but flat line afterwards
+ val tracker = VelocityTracker()
+ tracker.addPosition(0, Offset(0f, 0f))
+ tracker.addPosition(50, Offset(50f, 0f))
+ tracker.addPosition(100, Offset(50f, 0f))
+ val velocity = tracker.calculateVelocity()
+ assertThat(velocity.x).isWithin(TOLERANCE).of(0f)
+ }
+
+ @Test
+ fun calculateVelocity_SwordfishFlingDown() {
+ // Recording of a fling on Swordfish that could cause a fling in the wrong direction
+ val tracker = VelocityTracker()
+ tracker.addPosition(0, Offset(271f, 96f))
+ tracker.addPosition(16, Offset(269.786346f, 106.922775f))
+ tracker.addPosition(35, Offset(267.983063f, 156.660034f))
+ tracker.addPosition(52, Offset(262.638397f, 220.339081f))
+ tracker.addPosition(68, Offset(266.138824f, 331.581116f))
+ tracker.addPosition(85, Offset(274.79245f, 428.113159f))
+ tracker.addPosition(96, Offset(274.79245f, 428.113159f))
+
+ val velocity = tracker.calculateVelocity()
+ // X velocity doesn't matter much here because it's a vertical motion, but it should have a
+ // small magnitude compared to the Y velocity
+ assertThat(velocity.x).isWithin(TOLERANCE).of(586f)
+ assertThat(velocity.y).isWithin(TOLERANCE).of(5819.6f)
+ }
+
+ @Test
fun calculateVelocity_gapOf40MillisecondsInPositions_positionsAfterGapIgnored() {
val tracker = VelocityTracker()
interruptedVelocityEventData.forEach {
@@ -70,8 +192,8 @@
} else {
checkVelocity(
tracker.calculateVelocity(),
- 649.48932102748f,
- 3890.30505589076f
+ 633.4f,
+ 3802.149f
)
tracker.resetTracking()
}
diff --git a/core/core-google-shortcuts/src/androidTest/java/androidx/core/google/shortcuts/converters/TimerConverterTest.java b/core/core-google-shortcuts/src/androidTest/java/androidx/core/google/shortcuts/converters/TimerConverterTest.java
index 6b0eeaa..1c8d69b 100644
--- a/core/core-google-shortcuts/src/androidTest/java/androidx/core/google/shortcuts/converters/TimerConverterTest.java
+++ b/core/core-google-shortcuts/src/androidTest/java/androidx/core/google/shortcuts/converters/TimerConverterTest.java
@@ -67,7 +67,7 @@
.setCreationTimestampMillis(1)
.setName("my timer")
.setDurationMillis(1000)
- .setRemainingTimeMillis(10000)
+ .setRemainingDurationMillis(10000)
.setRingtone(AlarmClock.VALUE_RINGTONE_SILENT)
.setStatus(Timer.STATUS_STARTED)
.setShouldVibrate(true)
@@ -125,7 +125,7 @@
.setCreationTimestampMillis(1)
.setName("my timer")
.setDurationMillis(1000)
- .setRemainingTimeMillis(10000)
+ .setRemainingDurationMillis(10000)
.setRingtone(AlarmClock.VALUE_RINGTONE_SILENT)
.setStatus(Timer.STATUS_STARTED)
.setShouldVibrate(true)
diff --git a/core/core-google-shortcuts/src/main/java/androidx/core/google/shortcuts/converters/TimerConverter.java b/core/core-google-shortcuts/src/main/java/androidx/core/google/shortcuts/converters/TimerConverter.java
index 40d09c1..779d764 100644
--- a/core/core-google-shortcuts/src/main/java/androidx/core/google/shortcuts/converters/TimerConverter.java
+++ b/core/core-google-shortcuts/src/main/java/androidx/core/google/shortcuts/converters/TimerConverter.java
@@ -43,7 +43,7 @@
// Keys from the AppSearch document
private static final String NAME_KEY = "name";
private static final String DURATION_MILLIS_KEY = "durationMillis";
- private static final String REMAINING_TIME_MILLIS_KEY = "remainingTimeMillis";
+ private static final String REMAINING_DURATION_MILLIS_KEY = "remainingDurationMillis";
private static final String RINGTONE_KEY = "ringtone";
private static final String STATUS_KEY = "status";
private static final String SHOULD_VIBRATE_KEY = "shouldVibrate";
@@ -98,7 +98,7 @@
.put(MESSAGE_KEY, timer.getPropertyString(NAME_KEY))
.put(LENGTH_KEY, timer.getPropertyLong(DURATION_MILLIS_KEY))
.put(REMAINING_TIME_KEY,
- timer.getPropertyLong(REMAINING_TIME_MILLIS_KEY))
+ timer.getPropertyLong(REMAINING_DURATION_MILLIS_KEY))
.put(RINGTONE_KEY, timer.getPropertyString(RINGTONE_KEY))
.put(VIBRATE_KEY, timer.getPropertyBoolean(SHOULD_VIBRATE_KEY))
.put(BOOT_COUNT_KEY, timer.getPropertyLong(BOOT_COUNT_KEY))
@@ -133,7 +133,7 @@
if (timerStatus == Timer.STATUS_STARTED) {
long startTime = timer.getPropertyLong(BASE_TIME_MILLIS_KEY);
- long remainingTime = timer.getPropertyLong(REMAINING_TIME_MILLIS_KEY);
+ long remainingTime = timer.getPropertyLong(REMAINING_DURATION_MILLIS_KEY);
long expireTime = remainingTime + startTime;
indexableBuilder.put(EXPIRE_TIME_KEY,
diff --git a/core/core-ktx/build.gradle b/core/core-ktx/build.gradle
index 3905f13..97233be 100644
--- a/core/core-ktx/build.gradle
+++ b/core/core-ktx/build.gradle
@@ -7,6 +7,11 @@
}
dependencies {
+ // Atomic group
+ constraints {
+ implementation(project(":core:core"))
+ }
+
api(libs.kotlinStdlib)
api("androidx.annotation:annotation:1.1.0")
api(project(":core:core"))
diff --git a/core/core/build.gradle b/core/core/build.gradle
index 2c85ed0..7815d5b 100644
--- a/core/core/build.gradle
+++ b/core/core/build.gradle
@@ -7,6 +7,11 @@
}
dependencies {
+ // Atomic group
+ constraints {
+ implementation(project(":core:core-ktx"))
+ }
+
api("androidx.annotation:annotation:1.2.0")
api("androidx.annotation:annotation-experimental:1.1.0")
api("androidx.lifecycle:lifecycle-runtime:2.3.1")
diff --git a/core/core/integration-tests/publishing/build.gradle b/core/core/integration-tests/publishing/build.gradle
new file mode 100644
index 0000000..6d9b83e
--- /dev/null
+++ b/core/core/integration-tests/publishing/build.gradle
@@ -0,0 +1,38 @@
+/*
+ * Copyright (C) 2022 The Android Open Source Project
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+import androidx.build.SdkResourceGenerator
+
+plugins {
+ id("AndroidXPlugin")
+ id("kotlin")
+}
+
+dependencies {
+ implementation(libs.kotlinStdlib)
+
+ testImplementation(project(":internal-testutils-gradle-plugin"))
+ testImplementation(libs.junit)
+ testImplementation(libs.truth)
+ testImplementation(gradleTestKit())
+}
+
+SdkResourceGenerator.generateForHostTest(project)
+
+tasks.named("test").configure {
+ dependsOn(":core:core:publish")
+ dependsOn(":core:core-ktx:publish")
+}
diff --git a/core/core/integration-tests/publishing/src/test/kotlin/androidx/build/ConstraintTest.kt b/core/core/integration-tests/publishing/src/test/kotlin/androidx/build/ConstraintTest.kt
new file mode 100644
index 0000000..f0e3ef7
--- /dev/null
+++ b/core/core/integration-tests/publishing/src/test/kotlin/androidx/build/ConstraintTest.kt
@@ -0,0 +1,115 @@
+/*
+ * Copyright 2022 The Android Open Source Project
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT 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.build
+
+import androidx.testutils.gradle.ProjectSetupRule
+import java.io.File
+import org.junit.Assert
+import org.junit.Assert.assertEquals
+import org.junit.Rule
+import org.junit.Test
+
+class ConstraintTest {
+ @get:Rule
+ val projectSetup = ProjectSetupRule()
+
+ /**
+ * Test for matching constraint versions in Gradle metadata.
+ */
+ @Test
+ fun mavenMetadataRequiresVersion() {
+ val baseMavenMetadata = getPublishedFile("androidx/core/core/maven-metadata.xml")
+ val baseVersion = getLatestVersion(baseMavenMetadata)
+
+ val baseGradleMetadata =
+ getPublishedFile("androidx/core/core/$baseVersion/core-$baseVersion.module")
+ val baseRequiresKtxVersion =
+ getConstraintVersion(baseGradleMetadata.readText(), "androidx.core", "core-ktx")!!
+
+ val ktxMavenMetadata = getPublishedFile("androidx/core/core-ktx/maven-metadata.xml")
+ val ktxVersion = getLatestVersion(ktxMavenMetadata)
+
+ val ktxGradleMetadata =
+ getPublishedFile("androidx/core/core-ktx/$ktxVersion/core-ktx-$ktxVersion.module")
+ val ktxRequiresBaseVersion =
+ getConstraintVersion(ktxGradleMetadata.readText(), "androidx.core", "core")!!
+
+ // The core and core-ktx libraries should share the same version.
+ assertEquals(baseVersion, ktxVersion)
+
+ // Their Gradle metadata files should reference each other as `required`-type constraints.
+ assertEquals(baseVersion, ktxRequiresBaseVersion)
+ assertEquals(ktxVersion, baseRequiresKtxVersion)
+ }
+
+ /**
+ * Unit test for the constraint version extraction function.
+ */
+ @Test
+ fun getConstraintVersionTest() {
+ val metadata = """
+ "version": {
+ "requires": "1.0.0"
+ }
+ }
+ ],
+ "dependencyConstraints": [
+ {
+ "group": "androidx.preference",
+ "module": "preference-ktx",
+ "version": {
+ "requires": "1.3.0-alpha01"
+ }
+ }
+ ],
+ "files": [
+ {
+ "name": "preference-1.3.0-alpha01.aar",
+ "url": "preference-1.3.0-alpha01.aar",
+ """.trimIndent()
+
+ val requiresVersion =
+ getConstraintVersion(metadata, "androidx.preference", "preference-ktx")
+ assertEquals("1.3.0-alpha01", requiresVersion)
+ }
+
+ private fun getConstraintVersion(metadata: String, groupId: String, artifact: String): String? =
+ getDependencyConstraints(metadata)?.let {
+ Regex(
+ "\"group\": \"$groupId\",\\s+\"module\": " +
+ "\"$artifact\",\\s+\"version\": \\{\\s+\"requires\": \"(.+?)\""
+ ).find(it)?.groups?.get(1)?.value
+ }
+
+ private fun getDependencyConstraints(moduleJson: String) = moduleJson.let {
+ Regex("(?s)\"dependencyConstraints\": \\[(.+?)]").find(it)?.groups?.get(1)?.value
+ }
+
+ // Yes, I know https://stackoverflow.com/a/1732454/258688, but it's just a test...
+ private fun getLatestVersion(metadataFile: File) = metadataFile.readLines()
+ .mapNotNull { Regex(".*<latest>(.*?)</latest>.*").find(it)?.groups?.get(1)?.value }.first()
+
+ private fun getPublishedFile(name: String) =
+ File(projectSetup.props.tipOfTreeMavenRepoPath).resolve(name).check { it.exists() }
+
+ private fun <T> T.check(eval: (T) -> Boolean): T {
+ if (!eval(this)) {
+ Assert.fail("Failed assertion: $this")
+ }
+ return this
+ }
+}
diff --git a/core/core/src/androidTest/java/androidx/core/app/ActivityCompatTest.java b/core/core/src/androidTest/java/androidx/core/app/ActivityCompatTest.java
index 9800531..dd22f6e 100644
--- a/core/core/src/androidTest/java/androidx/core/app/ActivityCompatTest.java
+++ b/core/core/src/androidTest/java/androidx/core/app/ActivityCompatTest.java
@@ -18,6 +18,7 @@
import static com.google.common.truth.Truth.assertThat;
+import static org.junit.Assert.assertEquals;
import static org.junit.Assert.assertSame;
import static org.mockito.AdditionalMatchers.aryEq;
import static org.mockito.ArgumentMatchers.eq;
@@ -36,11 +37,13 @@
import androidx.test.core.app.ActivityScenario;
import androidx.test.ext.junit.runners.AndroidJUnit4;
import androidx.test.filters.LargeTest;
+import androidx.test.filters.SdkSuppress;
import org.junit.Test;
import org.junit.runner.RunWith;
import java.util.Arrays;
+import java.util.concurrent.atomic.AtomicInteger;
@RunWith(AndroidJUnit4.class)
@LargeTest
@@ -145,4 +148,23 @@
ActivityCompat.requireViewById(getActivity(), View.NO_ID);
}
+ @SdkSuppress(minSdkVersion = 23)
+ @Test
+ public void testOnSharedElementsReady() {
+ AtomicInteger counter = new AtomicInteger();
+ SharedElementCallback callback = new SharedElementCallback() {};
+ android.app.SharedElementCallback.OnSharedElementsReadyListener listener =
+ counter::incrementAndGet;
+
+ // Ensure that the method wrapper works as intended.
+ ActivityCompat.Api23Impl.onSharedElementsReady(listener);
+ assertEquals(1, counter.get());
+
+ // Ensure that the callback wrapper calls the method wrapper.
+ android.app.SharedElementCallback wrapper =
+ new ActivityCompat.SharedElementCallback21Impl(callback);
+ wrapper.onSharedElementsArrived(null, null, listener);
+ assertEquals(2, counter.get());
+
+ }
}
diff --git a/core/core/src/main/java/androidx/core/app/ActivityCompat.java b/core/core/src/main/java/androidx/core/app/ActivityCompat.java
index 9cd1859..9c36ad6 100644
--- a/core/core/src/main/java/androidx/core/app/ActivityCompat.java
+++ b/core/core/src/main/java/androidx/core/app/ActivityCompat.java
@@ -672,7 +672,7 @@
}
@RequiresApi(21)
- private static class SharedElementCallback21Impl extends android.app.SharedElementCallback {
+ static class SharedElementCallback21Impl extends android.app.SharedElementCallback {
private final SharedElementCallback mCallback;
SharedElementCallback21Impl(SharedElementCallback callback) {
@@ -857,8 +857,8 @@
@DoNotInline
static void onSharedElementsReady(Object onSharedElementsReadyListener) {
- ((SharedElementCallback.OnSharedElementsReadyListener) onSharedElementsReadyListener)
- .onSharedElementsReady();
+ ((android.app.SharedElementCallback.OnSharedElementsReadyListener)
+ onSharedElementsReadyListener).onSharedElementsReady();
}
}
}
diff --git a/core/uwb/uwb/api/current.txt b/core/uwb/uwb/api/current.txt
index 0b2add9..71b0724 100644
--- a/core/uwb/uwb/api/current.txt
+++ b/core/uwb/uwb/api/current.txt
@@ -2,13 +2,13 @@
package androidx.core.uwb {
public final class RangingCapabilities {
- ctor public RangingCapabilities(boolean supportsDistance, boolean supportsAzimuthalAngle, boolean supportsElevationAngle);
- method public boolean getSupportsAzimuthalAngle();
- method public boolean getSupportsDistance();
- method public boolean getSupportsElevationAngle();
- property public final boolean supportsAzimuthalAngle;
- property public final boolean supportsDistance;
- property public final boolean supportsElevationAngle;
+ ctor public RangingCapabilities(boolean isDistanceSupported, boolean isAzimuthalAngleSupported, boolean isElevationAngleSupported);
+ method public boolean isAzimuthalAngleSupported();
+ method public boolean isDistanceSupported();
+ method public boolean isElevationAngleSupported();
+ property public final boolean isAzimuthalAngleSupported;
+ property public final boolean isDistanceSupported;
+ property public final boolean isElevationAngleSupported;
}
public final class RangingMeasurement {
@@ -18,19 +18,19 @@
}
public final class RangingParameters {
- ctor public RangingParameters(int uwbConfigId, int sessionId, byte[]? sessionKeyInfo, androidx.core.uwb.UwbComplexChannel? complexChannel, java.util.List<androidx.core.uwb.UwbDevice> peerDevices, int updateRate);
+ ctor public RangingParameters(int uwbConfigType, int sessionId, byte[]? sessionKeyInfo, androidx.core.uwb.UwbComplexChannel? complexChannel, java.util.List<androidx.core.uwb.UwbDevice> peerDevices, int updateRateType);
method public androidx.core.uwb.UwbComplexChannel? getComplexChannel();
method public java.util.List<androidx.core.uwb.UwbDevice> getPeerDevices();
method public int getSessionId();
method public byte[]? getSessionKeyInfo();
- method public int getUpdateRate();
- method public int getUwbConfigId();
+ method public int getUpdateRateType();
+ method public int getUwbConfigType();
property public final androidx.core.uwb.UwbComplexChannel? complexChannel;
property public final java.util.List<androidx.core.uwb.UwbDevice> peerDevices;
property public final int sessionId;
property public final byte[]? sessionKeyInfo;
- property public final int updateRate;
- property public final int uwbConfigId;
+ property public final int updateRateType;
+ property public final int uwbConfigType;
field public static final androidx.core.uwb.RangingParameters.Companion Companion;
field public static final int RANGING_UPDATE_RATE_AUTOMATIC;
field public static final int RANGING_UPDATE_RATE_FREQUENT;
@@ -53,19 +53,18 @@
}
public abstract class RangingResult {
- ctor public RangingResult();
method public abstract androidx.core.uwb.UwbDevice getDevice();
property public abstract androidx.core.uwb.UwbDevice device;
}
- public final class RangingResultPeerDisconnected extends androidx.core.uwb.RangingResult {
- ctor public RangingResultPeerDisconnected(androidx.core.uwb.UwbDevice device);
+ public static final class RangingResult.RangingResultPeerDisconnected extends androidx.core.uwb.RangingResult {
+ ctor public RangingResult.RangingResultPeerDisconnected(androidx.core.uwb.UwbDevice device);
method public androidx.core.uwb.UwbDevice getDevice();
property public androidx.core.uwb.UwbDevice device;
}
- public final class RangingResultPosition extends androidx.core.uwb.RangingResult {
- ctor public RangingResultPosition(androidx.core.uwb.UwbDevice device, androidx.core.uwb.RangingPosition position);
+ public static final class RangingResult.RangingResultPosition extends androidx.core.uwb.RangingResult {
+ ctor public RangingResult.RangingResultPosition(androidx.core.uwb.UwbDevice device, androidx.core.uwb.RangingPosition position);
method public androidx.core.uwb.UwbDevice getDevice();
method public androidx.core.uwb.RangingPosition getPosition();
property public androidx.core.uwb.UwbDevice device;
@@ -86,7 +85,7 @@
public interface UwbClientSessionScope {
method public androidx.core.uwb.UwbAddress getLocalAddress();
method public androidx.core.uwb.RangingCapabilities getRangingCapabilities();
- method public kotlinx.coroutines.flow.Flow<androidx.core.uwb.RangingResult> initSession(androidx.core.uwb.RangingParameters parameters);
+ method public kotlinx.coroutines.flow.Flow<androidx.core.uwb.RangingResult> prepareSession(androidx.core.uwb.RangingParameters parameters);
property public abstract androidx.core.uwb.UwbAddress localAddress;
property public abstract androidx.core.uwb.RangingCapabilities rangingCapabilities;
}
@@ -118,12 +117,12 @@
public interface UwbManager {
method public suspend <R> Object? clientSessionScope(kotlin.jvm.functions.Function2<? super androidx.core.uwb.UwbClientSessionScope,? super kotlin.coroutines.Continuation<? super R>,?> sessionHandler, kotlin.coroutines.Continuation<? super R>);
- method public default static androidx.core.uwb.UwbManager getInstance(android.content.Context context);
+ method public default static androidx.core.uwb.UwbManager createInstance(android.content.Context context);
field public static final androidx.core.uwb.UwbManager.Companion Companion;
}
public static final class UwbManager.Companion {
- method public androidx.core.uwb.UwbManager getInstance(android.content.Context context);
+ method public androidx.core.uwb.UwbManager createInstance(android.content.Context context);
}
}
@@ -134,18 +133,10 @@
ctor public UwbApiException(String message);
}
- public final class UwbBackgroundPolicyException extends androidx.core.uwb.exceptions.UwbApiException {
- ctor public UwbBackgroundPolicyException(String message);
- }
-
public final class UwbHardwareNotAvailableException extends androidx.core.uwb.exceptions.UwbApiException {
ctor public UwbHardwareNotAvailableException(String message);
}
- public final class UwbRangingAlreadyStartedException extends androidx.core.uwb.exceptions.UwbApiException {
- ctor public UwbRangingAlreadyStartedException(String message);
- }
-
public final class UwbServiceNotAvailableException extends androidx.core.uwb.exceptions.UwbApiException {
ctor public UwbServiceNotAvailableException(String message);
}
diff --git a/core/uwb/uwb/api/public_plus_experimental_current.txt b/core/uwb/uwb/api/public_plus_experimental_current.txt
index 0b2add9..71b0724 100644
--- a/core/uwb/uwb/api/public_plus_experimental_current.txt
+++ b/core/uwb/uwb/api/public_plus_experimental_current.txt
@@ -2,13 +2,13 @@
package androidx.core.uwb {
public final class RangingCapabilities {
- ctor public RangingCapabilities(boolean supportsDistance, boolean supportsAzimuthalAngle, boolean supportsElevationAngle);
- method public boolean getSupportsAzimuthalAngle();
- method public boolean getSupportsDistance();
- method public boolean getSupportsElevationAngle();
- property public final boolean supportsAzimuthalAngle;
- property public final boolean supportsDistance;
- property public final boolean supportsElevationAngle;
+ ctor public RangingCapabilities(boolean isDistanceSupported, boolean isAzimuthalAngleSupported, boolean isElevationAngleSupported);
+ method public boolean isAzimuthalAngleSupported();
+ method public boolean isDistanceSupported();
+ method public boolean isElevationAngleSupported();
+ property public final boolean isAzimuthalAngleSupported;
+ property public final boolean isDistanceSupported;
+ property public final boolean isElevationAngleSupported;
}
public final class RangingMeasurement {
@@ -18,19 +18,19 @@
}
public final class RangingParameters {
- ctor public RangingParameters(int uwbConfigId, int sessionId, byte[]? sessionKeyInfo, androidx.core.uwb.UwbComplexChannel? complexChannel, java.util.List<androidx.core.uwb.UwbDevice> peerDevices, int updateRate);
+ ctor public RangingParameters(int uwbConfigType, int sessionId, byte[]? sessionKeyInfo, androidx.core.uwb.UwbComplexChannel? complexChannel, java.util.List<androidx.core.uwb.UwbDevice> peerDevices, int updateRateType);
method public androidx.core.uwb.UwbComplexChannel? getComplexChannel();
method public java.util.List<androidx.core.uwb.UwbDevice> getPeerDevices();
method public int getSessionId();
method public byte[]? getSessionKeyInfo();
- method public int getUpdateRate();
- method public int getUwbConfigId();
+ method public int getUpdateRateType();
+ method public int getUwbConfigType();
property public final androidx.core.uwb.UwbComplexChannel? complexChannel;
property public final java.util.List<androidx.core.uwb.UwbDevice> peerDevices;
property public final int sessionId;
property public final byte[]? sessionKeyInfo;
- property public final int updateRate;
- property public final int uwbConfigId;
+ property public final int updateRateType;
+ property public final int uwbConfigType;
field public static final androidx.core.uwb.RangingParameters.Companion Companion;
field public static final int RANGING_UPDATE_RATE_AUTOMATIC;
field public static final int RANGING_UPDATE_RATE_FREQUENT;
@@ -53,19 +53,18 @@
}
public abstract class RangingResult {
- ctor public RangingResult();
method public abstract androidx.core.uwb.UwbDevice getDevice();
property public abstract androidx.core.uwb.UwbDevice device;
}
- public final class RangingResultPeerDisconnected extends androidx.core.uwb.RangingResult {
- ctor public RangingResultPeerDisconnected(androidx.core.uwb.UwbDevice device);
+ public static final class RangingResult.RangingResultPeerDisconnected extends androidx.core.uwb.RangingResult {
+ ctor public RangingResult.RangingResultPeerDisconnected(androidx.core.uwb.UwbDevice device);
method public androidx.core.uwb.UwbDevice getDevice();
property public androidx.core.uwb.UwbDevice device;
}
- public final class RangingResultPosition extends androidx.core.uwb.RangingResult {
- ctor public RangingResultPosition(androidx.core.uwb.UwbDevice device, androidx.core.uwb.RangingPosition position);
+ public static final class RangingResult.RangingResultPosition extends androidx.core.uwb.RangingResult {
+ ctor public RangingResult.RangingResultPosition(androidx.core.uwb.UwbDevice device, androidx.core.uwb.RangingPosition position);
method public androidx.core.uwb.UwbDevice getDevice();
method public androidx.core.uwb.RangingPosition getPosition();
property public androidx.core.uwb.UwbDevice device;
@@ -86,7 +85,7 @@
public interface UwbClientSessionScope {
method public androidx.core.uwb.UwbAddress getLocalAddress();
method public androidx.core.uwb.RangingCapabilities getRangingCapabilities();
- method public kotlinx.coroutines.flow.Flow<androidx.core.uwb.RangingResult> initSession(androidx.core.uwb.RangingParameters parameters);
+ method public kotlinx.coroutines.flow.Flow<androidx.core.uwb.RangingResult> prepareSession(androidx.core.uwb.RangingParameters parameters);
property public abstract androidx.core.uwb.UwbAddress localAddress;
property public abstract androidx.core.uwb.RangingCapabilities rangingCapabilities;
}
@@ -118,12 +117,12 @@
public interface UwbManager {
method public suspend <R> Object? clientSessionScope(kotlin.jvm.functions.Function2<? super androidx.core.uwb.UwbClientSessionScope,? super kotlin.coroutines.Continuation<? super R>,?> sessionHandler, kotlin.coroutines.Continuation<? super R>);
- method public default static androidx.core.uwb.UwbManager getInstance(android.content.Context context);
+ method public default static androidx.core.uwb.UwbManager createInstance(android.content.Context context);
field public static final androidx.core.uwb.UwbManager.Companion Companion;
}
public static final class UwbManager.Companion {
- method public androidx.core.uwb.UwbManager getInstance(android.content.Context context);
+ method public androidx.core.uwb.UwbManager createInstance(android.content.Context context);
}
}
@@ -134,18 +133,10 @@
ctor public UwbApiException(String message);
}
- public final class UwbBackgroundPolicyException extends androidx.core.uwb.exceptions.UwbApiException {
- ctor public UwbBackgroundPolicyException(String message);
- }
-
public final class UwbHardwareNotAvailableException extends androidx.core.uwb.exceptions.UwbApiException {
ctor public UwbHardwareNotAvailableException(String message);
}
- public final class UwbRangingAlreadyStartedException extends androidx.core.uwb.exceptions.UwbApiException {
- ctor public UwbRangingAlreadyStartedException(String message);
- }
-
public final class UwbServiceNotAvailableException extends androidx.core.uwb.exceptions.UwbApiException {
ctor public UwbServiceNotAvailableException(String message);
}
diff --git a/core/uwb/uwb/api/restricted_current.txt b/core/uwb/uwb/api/restricted_current.txt
index 0b2add9..71b0724 100644
--- a/core/uwb/uwb/api/restricted_current.txt
+++ b/core/uwb/uwb/api/restricted_current.txt
@@ -2,13 +2,13 @@
package androidx.core.uwb {
public final class RangingCapabilities {
- ctor public RangingCapabilities(boolean supportsDistance, boolean supportsAzimuthalAngle, boolean supportsElevationAngle);
- method public boolean getSupportsAzimuthalAngle();
- method public boolean getSupportsDistance();
- method public boolean getSupportsElevationAngle();
- property public final boolean supportsAzimuthalAngle;
- property public final boolean supportsDistance;
- property public final boolean supportsElevationAngle;
+ ctor public RangingCapabilities(boolean isDistanceSupported, boolean isAzimuthalAngleSupported, boolean isElevationAngleSupported);
+ method public boolean isAzimuthalAngleSupported();
+ method public boolean isDistanceSupported();
+ method public boolean isElevationAngleSupported();
+ property public final boolean isAzimuthalAngleSupported;
+ property public final boolean isDistanceSupported;
+ property public final boolean isElevationAngleSupported;
}
public final class RangingMeasurement {
@@ -18,19 +18,19 @@
}
public final class RangingParameters {
- ctor public RangingParameters(int uwbConfigId, int sessionId, byte[]? sessionKeyInfo, androidx.core.uwb.UwbComplexChannel? complexChannel, java.util.List<androidx.core.uwb.UwbDevice> peerDevices, int updateRate);
+ ctor public RangingParameters(int uwbConfigType, int sessionId, byte[]? sessionKeyInfo, androidx.core.uwb.UwbComplexChannel? complexChannel, java.util.List<androidx.core.uwb.UwbDevice> peerDevices, int updateRateType);
method public androidx.core.uwb.UwbComplexChannel? getComplexChannel();
method public java.util.List<androidx.core.uwb.UwbDevice> getPeerDevices();
method public int getSessionId();
method public byte[]? getSessionKeyInfo();
- method public int getUpdateRate();
- method public int getUwbConfigId();
+ method public int getUpdateRateType();
+ method public int getUwbConfigType();
property public final androidx.core.uwb.UwbComplexChannel? complexChannel;
property public final java.util.List<androidx.core.uwb.UwbDevice> peerDevices;
property public final int sessionId;
property public final byte[]? sessionKeyInfo;
- property public final int updateRate;
- property public final int uwbConfigId;
+ property public final int updateRateType;
+ property public final int uwbConfigType;
field public static final androidx.core.uwb.RangingParameters.Companion Companion;
field public static final int RANGING_UPDATE_RATE_AUTOMATIC;
field public static final int RANGING_UPDATE_RATE_FREQUENT;
@@ -53,19 +53,18 @@
}
public abstract class RangingResult {
- ctor public RangingResult();
method public abstract androidx.core.uwb.UwbDevice getDevice();
property public abstract androidx.core.uwb.UwbDevice device;
}
- public final class RangingResultPeerDisconnected extends androidx.core.uwb.RangingResult {
- ctor public RangingResultPeerDisconnected(androidx.core.uwb.UwbDevice device);
+ public static final class RangingResult.RangingResultPeerDisconnected extends androidx.core.uwb.RangingResult {
+ ctor public RangingResult.RangingResultPeerDisconnected(androidx.core.uwb.UwbDevice device);
method public androidx.core.uwb.UwbDevice getDevice();
property public androidx.core.uwb.UwbDevice device;
}
- public final class RangingResultPosition extends androidx.core.uwb.RangingResult {
- ctor public RangingResultPosition(androidx.core.uwb.UwbDevice device, androidx.core.uwb.RangingPosition position);
+ public static final class RangingResult.RangingResultPosition extends androidx.core.uwb.RangingResult {
+ ctor public RangingResult.RangingResultPosition(androidx.core.uwb.UwbDevice device, androidx.core.uwb.RangingPosition position);
method public androidx.core.uwb.UwbDevice getDevice();
method public androidx.core.uwb.RangingPosition getPosition();
property public androidx.core.uwb.UwbDevice device;
@@ -86,7 +85,7 @@
public interface UwbClientSessionScope {
method public androidx.core.uwb.UwbAddress getLocalAddress();
method public androidx.core.uwb.RangingCapabilities getRangingCapabilities();
- method public kotlinx.coroutines.flow.Flow<androidx.core.uwb.RangingResult> initSession(androidx.core.uwb.RangingParameters parameters);
+ method public kotlinx.coroutines.flow.Flow<androidx.core.uwb.RangingResult> prepareSession(androidx.core.uwb.RangingParameters parameters);
property public abstract androidx.core.uwb.UwbAddress localAddress;
property public abstract androidx.core.uwb.RangingCapabilities rangingCapabilities;
}
@@ -118,12 +117,12 @@
public interface UwbManager {
method public suspend <R> Object? clientSessionScope(kotlin.jvm.functions.Function2<? super androidx.core.uwb.UwbClientSessionScope,? super kotlin.coroutines.Continuation<? super R>,?> sessionHandler, kotlin.coroutines.Continuation<? super R>);
- method public default static androidx.core.uwb.UwbManager getInstance(android.content.Context context);
+ method public default static androidx.core.uwb.UwbManager createInstance(android.content.Context context);
field public static final androidx.core.uwb.UwbManager.Companion Companion;
}
public static final class UwbManager.Companion {
- method public androidx.core.uwb.UwbManager getInstance(android.content.Context context);
+ method public androidx.core.uwb.UwbManager createInstance(android.content.Context context);
}
}
@@ -134,18 +133,10 @@
ctor public UwbApiException(String message);
}
- public final class UwbBackgroundPolicyException extends androidx.core.uwb.exceptions.UwbApiException {
- ctor public UwbBackgroundPolicyException(String message);
- }
-
public final class UwbHardwareNotAvailableException extends androidx.core.uwb.exceptions.UwbApiException {
ctor public UwbHardwareNotAvailableException(String message);
}
- public final class UwbRangingAlreadyStartedException extends androidx.core.uwb.exceptions.UwbApiException {
- ctor public UwbRangingAlreadyStartedException(String message);
- }
-
public final class UwbServiceNotAvailableException extends androidx.core.uwb.exceptions.UwbApiException {
ctor public UwbServiceNotAvailableException(String message);
}
diff --git a/core/uwb/uwb/src/androidTest/java/androidx/core/uwb/impl/UwbClientSessionScopeImplTest.kt b/core/uwb/uwb/src/androidTest/java/androidx/core/uwb/impl/UwbClientSessionScopeImplTest.kt
index c4fad37..225fd73 100644
--- a/core/uwb/uwb/src/androidTest/java/androidx/core/uwb/impl/UwbClientSessionScopeImplTest.kt
+++ b/core/uwb/uwb/src/androidTest/java/androidx/core/uwb/impl/UwbClientSessionScopeImplTest.kt
@@ -18,10 +18,9 @@
import androidx.core.uwb.RangingParameters
import androidx.core.uwb.RangingResult
-import androidx.core.uwb.RangingResultPeerDisconnected
-import androidx.core.uwb.RangingResultPosition
+import androidx.core.uwb.RangingResult.RangingResultPeerDisconnected
+import androidx.core.uwb.RangingResult.RangingResultPosition
import androidx.core.uwb.UwbDevice
-import androidx.core.uwb.exceptions.UwbRangingAlreadyStartedException
import androidx.core.uwb.mock.TestUwbClient
import com.google.android.gms.nearby.uwb.RangingCapabilities
import com.google.android.gms.nearby.uwb.UwbAddress
@@ -68,7 +67,7 @@
@Test
public fun testInitSession_singleConsumer() {
- val sessionFlow = uwbClientSessionScopeImpl.initSession(rangingParameters)
+ val sessionFlow = uwbClientSessionScopeImpl.prepareSession(rangingParameters)
var rangingResult: RangingResult? = null
val job = sessionFlow
.cancellable()
@@ -100,7 +99,7 @@
public fun testInitSession_multipleSharedConsumers() {
var passed1 = false
var passed2 = false
- val sharedFlow = uwbClientSessionScopeImpl.initSession(rangingParameters)
+ val sharedFlow = uwbClientSessionScopeImpl.prepareSession(rangingParameters)
.shareIn(CoroutineScope(Dispatchers.Main.immediate), SharingStarted.WhileSubscribed(),
replay = 1)
val job = CoroutineScope(Dispatchers.Main.immediate).launch {
@@ -150,7 +149,7 @@
@Test
public fun testInitSession_singleConsumer_disconnectPeerDevice() {
- val sessionFlow = uwbClientSessionScopeImpl.initSession(rangingParameters)
+ val sessionFlow = uwbClientSessionScopeImpl.prepareSession(rangingParameters)
var peerDisconnected = false
val job = CoroutineScope(Dispatchers.Main.immediate).launch {
sessionFlow
@@ -187,7 +186,7 @@
@Test
public fun testInitSession_multipleSharedConsumers_disconnectPeerDevice() {
- val sharedFlow = uwbClientSessionScopeImpl.initSession(rangingParameters)
+ val sharedFlow = uwbClientSessionScopeImpl.prepareSession(rangingParameters)
.shareIn(CoroutineScope(Dispatchers.Main.immediate), SharingStarted.WhileSubscribed())
var peerDisconnected = false
@@ -244,8 +243,8 @@
@Test
public fun testInitSession_multipleSessions_throwsUwbApiException() {
- val sessionFlow = uwbClientSessionScopeImpl.initSession(rangingParameters)
- val sessionFlow2 = uwbClientSessionScopeImpl.initSession(rangingParameters)
+ val sessionFlow = uwbClientSessionScopeImpl.prepareSession(rangingParameters)
+ val sessionFlow2 = uwbClientSessionScopeImpl.prepareSession(rangingParameters)
val job = CoroutineScope(Dispatchers.Main.immediate).launch {
sessionFlow.collect()
@@ -258,7 +257,7 @@
try {
sessionFlow2.collect()
Assert.fail()
- } catch (e: UwbRangingAlreadyStartedException) {
+ } catch (e: IllegalStateException) {
// verified the exception was thrown.
}
}
@@ -268,7 +267,7 @@
@Test
public fun testInitSession_reusingSession_throwsUwbApiException() {
- val sessionFlow = uwbClientSessionScopeImpl.initSession(rangingParameters)
+ val sessionFlow = uwbClientSessionScopeImpl.prepareSession(rangingParameters)
val job = CoroutineScope(Dispatchers.Main.immediate).launch {
sessionFlow.collect()
@@ -289,7 +288,7 @@
// Reuse the same session after it was closed.
sessionFlow.collect()
Assert.fail()
- } catch (e: UwbRangingAlreadyStartedException) {
+ } catch (e: IllegalStateException) {
// verified the exception was thrown.
}
}
diff --git a/core/uwb/uwb/src/main/java/androidx/core/uwb/RangingCapabilities.kt b/core/uwb/uwb/src/main/java/androidx/core/uwb/RangingCapabilities.kt
index 1366a64..76aedc7 100644
--- a/core/uwb/uwb/src/main/java/androidx/core/uwb/RangingCapabilities.kt
+++ b/core/uwb/uwb/src/main/java/androidx/core/uwb/RangingCapabilities.kt
@@ -18,12 +18,12 @@
/**
* Describes UWB ranging capabilities for the current device.
- * @property supportsDistance - Whether distance ranging is supported
- * @property supportsAzimuthalAngle - Whether azimuthal angle of arrival is supported
- * @property supportsElevationAngle - Whether elevation angle of arrival is supported
+ * @property isDistanceSupported - Whether distance ranging is supported
+ * @property isAzimuthalAngleSupported - Whether azimuthal angle of arrival is supported
+ * @property isElevationAngleSupported - Whether elevation angle of arrival is supported
**/
class RangingCapabilities(
- val supportsDistance: Boolean,
- val supportsAzimuthalAngle: Boolean,
- val supportsElevationAngle: Boolean
+ val isDistanceSupported: Boolean,
+ val isAzimuthalAngleSupported: Boolean,
+ val isElevationAngleSupported: Boolean
)
diff --git a/core/uwb/uwb/src/main/java/androidx/core/uwb/RangingParameters.kt b/core/uwb/uwb/src/main/java/androidx/core/uwb/RangingParameters.kt
index d619642..1fdbf0a 100644
--- a/core/uwb/uwb/src/main/java/androidx/core/uwb/RangingParameters.kt
+++ b/core/uwb/uwb/src/main/java/androidx/core/uwb/RangingParameters.kt
@@ -19,8 +19,8 @@
/**
* Set of parameters which should be passed to the UWB chip to start ranging.
*
- * @property uwbConfigId
- * The UWB configuration ID. One ID specifies one fixed set of pre-defined parameters.
+ * @property uwbConfigType
+ * The UWB configuration type. One type specifies one fixed set of pre-defined parameters.
*
* @property sessionId
* The ID of the ranging session. If the value is SESSION_ID_UNSET (0), it will
@@ -42,16 +42,16 @@
* @property peerDevices
* The peers to perform ranging with. If using unicast, length should be 1.
*
- * @property updateRate
- * The update rate of the ranging data
+ * @property updateRateType
+ * The update rate type of the ranging data
*/
class RangingParameters(
- val uwbConfigId: Int,
+ val uwbConfigType: Int,
val sessionId: Int,
val sessionKeyInfo: ByteArray?,
val complexChannel: UwbComplexChannel?,
val peerDevices: List<UwbDevice>,
- val updateRate: Int
+ val updateRateType: Int
) {
companion object {
diff --git a/core/uwb/uwb/src/main/java/androidx/core/uwb/RangingResult.kt b/core/uwb/uwb/src/main/java/androidx/core/uwb/RangingResult.kt
index e43c336..7cdc6a0 100644
--- a/core/uwb/uwb/src/main/java/androidx/core/uwb/RangingResult.kt
+++ b/core/uwb/uwb/src/main/java/androidx/core/uwb/RangingResult.kt
@@ -17,15 +17,21 @@
package androidx.core.uwb
/** A data class for ranging result update. */
-abstract class RangingResult {
+abstract class RangingResult internal constructor() {
+ /** Represents a UWB device. */
abstract val device: UwbDevice
-}
-/** A ranging result with the device position update. */
-class RangingResultPosition(
- override val device: UwbDevice,
- val position: RangingPosition
-) : RangingResult()
+ /**
+ * A ranging result with the device position update.
+ *
+ * @property position
+ * Position of the UWB device during Ranging
+ */
+ class RangingResultPosition(
+ override val device: UwbDevice,
+ val position: RangingPosition
+ ) : RangingResult()
-/** A ranging result with peer disconnected status update. */
-class RangingResultPeerDisconnected(override val device: UwbDevice) : RangingResult()
\ No newline at end of file
+ /** A ranging result with peer disconnected status update. */
+ class RangingResultPeerDisconnected(override val device: UwbDevice) : RangingResult()
+}
\ No newline at end of file
diff --git a/core/uwb/uwb/src/main/java/androidx/core/uwb/UwbClientSessionScope.kt b/core/uwb/uwb/src/main/java/androidx/core/uwb/UwbClientSessionScope.kt
index 0151426..ff75e3c 100644
--- a/core/uwb/uwb/src/main/java/androidx/core/uwb/UwbClientSessionScope.kt
+++ b/core/uwb/uwb/src/main/java/androidx/core/uwb/UwbClientSessionScope.kt
@@ -25,7 +25,7 @@
* one flow can be initiated. To consume the flow from multiple consumers,
* convert the flow to a SharedFlow.
*
- * @throws [UwbRangingAlreadyStartedException] if a new flow was consumed again after the UWB
+ * @throws [IllegalStateException] if a new flow was consumed again after the UWB
* ranging is already initiated.
*
* @throws [UwbSystemCallbackException] if the backend UWB system has resulted in an error.
@@ -37,7 +37,7 @@
* @throws [IllegalArgumentException] if the client starts a controlee session
* without setting complex channel and peer address.
*/
- fun initSession(parameters: RangingParameters): Flow<RangingResult>
+ fun prepareSession(parameters: RangingParameters): Flow<RangingResult>
/** Returns the [RangingCapabilities] which the device supports. */
val rangingCapabilities: RangingCapabilities
diff --git a/core/uwb/uwb/src/main/java/androidx/core/uwb/UwbComplexChannel.kt b/core/uwb/uwb/src/main/java/androidx/core/uwb/UwbComplexChannel.kt
index 644dd5b..62e938d 100644
--- a/core/uwb/uwb/src/main/java/androidx/core/uwb/UwbComplexChannel.kt
+++ b/core/uwb/uwb/src/main/java/androidx/core/uwb/UwbComplexChannel.kt
@@ -22,4 +22,4 @@
* @property channel the current channel for the device.
* @property preambleIndex the current preamble index for the device.
*/
-class UwbComplexChannel(val channel: Int, val preambleIndex: Int)
+class UwbComplexChannel(val channel: Int, val preambleIndex: Int)
\ No newline at end of file
diff --git a/core/uwb/uwb/src/main/java/androidx/core/uwb/UwbManager.kt b/core/uwb/uwb/src/main/java/androidx/core/uwb/UwbManager.kt
index cf21af3..8cb03bf 100644
--- a/core/uwb/uwb/src/main/java/androidx/core/uwb/UwbManager.kt
+++ b/core/uwb/uwb/src/main/java/androidx/core/uwb/UwbManager.kt
@@ -28,7 +28,7 @@
/** Creates a new UwbManager that is used for creating controlee client sessions. */
@JvmStatic
- fun getInstance(context: Context): UwbManager {
+ fun createInstance(context: Context): UwbManager {
return UwbManagerImpl(context)
}
}
diff --git a/core/uwb/uwb/src/main/java/androidx/core/uwb/exceptions/UwbRangingAlreadyStartedException.kt b/core/uwb/uwb/src/main/java/androidx/core/uwb/exceptions/UwbRangingAlreadyStartedException.kt
deleted file mode 100644
index 8a300b0..0000000
--- a/core/uwb/uwb/src/main/java/androidx/core/uwb/exceptions/UwbRangingAlreadyStartedException.kt
+++ /dev/null
@@ -1,24 +0,0 @@
-/*
- * Copyright 2022 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT 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.core.uwb.exceptions
-
-/**
- * The ranging has already started for the [UwbClientSessionScope], but still received another
- * request to start ranging. You cannot reuse a [UwbClientSessionScope] for multiple ranging
- * sessions. To have multiple consumers for a single ranging session, use a [SharedFlow].
- */
-class UwbRangingAlreadyStartedException(message: String) : UwbApiException(message)
\ No newline at end of file
diff --git a/core/uwb/uwb/src/main/java/androidx/core/uwb/helper/UwbHelper.kt b/core/uwb/uwb/src/main/java/androidx/core/uwb/helper/UwbHelper.kt
index 965c741..29cc419 100644
--- a/core/uwb/uwb/src/main/java/androidx/core/uwb/helper/UwbHelper.kt
+++ b/core/uwb/uwb/src/main/java/androidx/core/uwb/helper/UwbHelper.kt
@@ -18,7 +18,6 @@
import android.content.Context
import androidx.core.uwb.exceptions.UwbHardwareNotAvailableException
-import androidx.core.uwb.exceptions.UwbRangingAlreadyStartedException
import androidx.core.uwb.exceptions.UwbServiceNotAvailableException
import androidx.core.uwb.exceptions.UwbSystemCallbackException
import com.google.android.gms.common.api.ApiException
@@ -43,7 +42,7 @@
UwbStatusCodes.INVALID_API_CALL ->
throw IllegalArgumentException("Illegal api call was received.")
UwbStatusCodes.RANGING_ALREADY_STARTED ->
- throw UwbRangingAlreadyStartedException("Ranging has already started for the" +
+ throw IllegalStateException("Ranging has already started for the" +
" clientSessionScope.")
UwbStatusCodes.SERVICE_NOT_AVAILABLE ->
throw UwbServiceNotAvailableException("UWB Service is not available.")
diff --git a/core/uwb/uwb/src/main/java/androidx/core/uwb/impl/UwbClientSessionScopeImpl.kt b/core/uwb/uwb/src/main/java/androidx/core/uwb/impl/UwbClientSessionScopeImpl.kt
index 1dada71..ca5a02f 100644
--- a/core/uwb/uwb/src/main/java/androidx/core/uwb/impl/UwbClientSessionScopeImpl.kt
+++ b/core/uwb/uwb/src/main/java/androidx/core/uwb/impl/UwbClientSessionScopeImpl.kt
@@ -20,11 +20,10 @@
import androidx.core.uwb.RangingCapabilities
import androidx.core.uwb.RangingMeasurement
import androidx.core.uwb.RangingParameters
-import androidx.core.uwb.RangingResultPeerDisconnected
-import androidx.core.uwb.RangingResultPosition
+import androidx.core.uwb.RangingResult.RangingResultPosition
+import androidx.core.uwb.RangingResult.RangingResultPeerDisconnected
import androidx.core.uwb.UwbAddress
import androidx.core.uwb.UwbControleeSessionScope
-import androidx.core.uwb.exceptions.UwbRangingAlreadyStartedException
import com.google.android.gms.common.api.ApiException
import com.google.android.gms.nearby.uwb.RangingPosition
import com.google.android.gms.nearby.uwb.RangingSessionCallback
@@ -45,13 +44,13 @@
}
private var sessionStarted = false
- override fun initSession(parameters: RangingParameters) = callbackFlow {
+ override fun prepareSession(parameters: RangingParameters) = callbackFlow {
if (sessionStarted) {
- throw UwbRangingAlreadyStartedException("Ranging has already started. To initiate " +
+ throw IllegalStateException("Ranging has already started. To initiate " +
"a new ranging session, create a new client session scope.")
}
- val configId = when (parameters.uwbConfigId) {
+ val configId = when (parameters.uwbConfigType) {
RangingParameters.UWB_CONFIG_ID_1 ->
com.google.android.gms.nearby.uwb.RangingParameters.UwbConfigId.CONFIG_ID_1
RangingParameters.UWB_CONFIG_ID_3 ->
@@ -59,7 +58,7 @@
else ->
com.google.android.gms.nearby.uwb.RangingParameters.UwbConfigId.UNKNOWN
}
- val updateRate = when (parameters.updateRate) {
+ val updateRate = when (parameters.updateRateType) {
RangingParameters.RANGING_UPDATE_RATE_AUTOMATIC ->
com.google.android.gms.nearby.uwb.RangingParameters.RangingUpdateRate.AUTOMATIC
RangingParameters.RANGING_UPDATE_RATE_FREQUENT ->
@@ -74,7 +73,7 @@
.setUwbConfigId(configId)
.setRangingUpdateRate(updateRate)
.setSessionKeyInfo(parameters.sessionKeyInfo)
- .setUwbConfigId(parameters.uwbConfigId)
+ .setUwbConfigId(parameters.uwbConfigType)
.setComplexChannel(
parameters.complexChannel?.let {
UwbComplexChannel.Builder()
diff --git a/customview/customview-poolingcontainer/api/1.0.0-beta02.txt b/customview/customview-poolingcontainer/api/1.0.0-beta02.txt
new file mode 100644
index 0000000..0f36bc7
--- /dev/null
+++ b/customview/customview-poolingcontainer/api/1.0.0-beta02.txt
@@ -0,0 +1,19 @@
+// Signature format: 4.0
+package androidx.customview.poolingcontainer {
+
+ public final class PoolingContainer {
+ method public static void addPoolingContainerListener(android.view.View, androidx.customview.poolingcontainer.PoolingContainerListener listener);
+ method public static void callPoolingContainerOnRelease(android.view.View);
+ method public static void callPoolingContainerOnReleaseForChildren(android.view.ViewGroup);
+ method public static boolean isPoolingContainer(android.view.View);
+ method public static boolean isWithinPoolingContainer(android.view.View);
+ method public static void removePoolingContainerListener(android.view.View, androidx.customview.poolingcontainer.PoolingContainerListener listener);
+ method public static void setPoolingContainer(android.view.View, boolean);
+ }
+
+ public fun interface PoolingContainerListener {
+ method @UiThread public void onRelease();
+ }
+
+}
+
diff --git a/customview/customview-poolingcontainer/api/public_plus_experimental_1.0.0-beta02.txt b/customview/customview-poolingcontainer/api/public_plus_experimental_1.0.0-beta02.txt
new file mode 100644
index 0000000..0f36bc7
--- /dev/null
+++ b/customview/customview-poolingcontainer/api/public_plus_experimental_1.0.0-beta02.txt
@@ -0,0 +1,19 @@
+// Signature format: 4.0
+package androidx.customview.poolingcontainer {
+
+ public final class PoolingContainer {
+ method public static void addPoolingContainerListener(android.view.View, androidx.customview.poolingcontainer.PoolingContainerListener listener);
+ method public static void callPoolingContainerOnRelease(android.view.View);
+ method public static void callPoolingContainerOnReleaseForChildren(android.view.ViewGroup);
+ method public static boolean isPoolingContainer(android.view.View);
+ method public static boolean isWithinPoolingContainer(android.view.View);
+ method public static void removePoolingContainerListener(android.view.View, androidx.customview.poolingcontainer.PoolingContainerListener listener);
+ method public static void setPoolingContainer(android.view.View, boolean);
+ }
+
+ public fun interface PoolingContainerListener {
+ method @UiThread public void onRelease();
+ }
+
+}
+
diff --git a/customview/customview-poolingcontainer/api/res-1.0.0-beta02.txt b/customview/customview-poolingcontainer/api/res-1.0.0-beta02.txt
new file mode 100644
index 0000000..e69de29
--- /dev/null
+++ b/customview/customview-poolingcontainer/api/res-1.0.0-beta02.txt
diff --git a/customview/customview-poolingcontainer/api/restricted_1.0.0-beta02.txt b/customview/customview-poolingcontainer/api/restricted_1.0.0-beta02.txt
new file mode 100644
index 0000000..0f36bc7
--- /dev/null
+++ b/customview/customview-poolingcontainer/api/restricted_1.0.0-beta02.txt
@@ -0,0 +1,19 @@
+// Signature format: 4.0
+package androidx.customview.poolingcontainer {
+
+ public final class PoolingContainer {
+ method public static void addPoolingContainerListener(android.view.View, androidx.customview.poolingcontainer.PoolingContainerListener listener);
+ method public static void callPoolingContainerOnRelease(android.view.View);
+ method public static void callPoolingContainerOnReleaseForChildren(android.view.ViewGroup);
+ method public static boolean isPoolingContainer(android.view.View);
+ method public static boolean isWithinPoolingContainer(android.view.View);
+ method public static void removePoolingContainerListener(android.view.View, androidx.customview.poolingcontainer.PoolingContainerListener listener);
+ method public static void setPoolingContainer(android.view.View, boolean);
+ }
+
+ public fun interface PoolingContainerListener {
+ method @UiThread public void onRelease();
+ }
+
+}
+
diff --git a/datastore/datastore-preferences-proto/build.gradle b/datastore/datastore-preferences-proto/build.gradle
index 9d32bc3..32535ef 100644
--- a/datastore/datastore-preferences-proto/build.gradle
+++ b/datastore/datastore-preferences-proto/build.gradle
@@ -15,6 +15,7 @@
*/
import androidx.build.Publish
+import org.jetbrains.kotlin.gradle.tasks.KotlinCompile
plugins {
id("AndroidXPlugin")
@@ -49,20 +50,14 @@
// Create export artifact for for JarJaring
def preferencesProtoJarJarTask = tasks.register("exportJar", Jar) {
archiveBaseName.set("export")
- dependsOn(protobuf.generateProtoTasks.all())
- dependsOn(compileKotlin)
- from(files(compileKotlin.outputs.files))
-
- dependsOn(compileJava)
- from(files(compileJava.destinationDirectory))
-
+ from(sourceSets.main.output)
// The proto-lite dependency includes .proto files, which are not used by datastore. When apps
// depend on datastore as well as proto-lite directly, these files conflict since jarjar only
// renames the java classes. Remove them here since they are unused.
+ exclude("**/*.proto")
+
from(zipTree(configurations.detachedConfiguration(
- dependencies.create(libs.protobufLite.get())).getSingleFile())) {
- exclude("**/*.proto")
- }
+ dependencies.create(libs.protobufLite.get())).getSingleFile()))
}
def jarjarConf = configurations.register("export")
diff --git a/development/build_log_simplifier/messages.ignore b/development/build_log_simplifier/messages.ignore
index 45c2547..849f682 100644
--- a/development/build_log_simplifier/messages.ignore
+++ b/development/build_log_simplifier/messages.ignore
@@ -616,8 +616,9 @@
# > Task :glance:glance:reportLibraryMetrics
Info: Stripped invalid locals information from [0-9]+ method\.
Info: Methods with invalid locals information:
+long androidx\.compose\.ui\.input\.pointer\.util\.VelocityTracker\.getImpulseVelocity.*
java\.lang\.Object androidx\.glance\.state\.GlanceState\.getDataStore\(android\.content\.Context, androidx\.glance\.state\.GlanceStateDefinition, java\.lang\.String, kotlin\.coroutines\.Continuation\)
-Information in locals\-table is invalid with respect to the stack map table\. Local refers to non\-present stack map type for register: [0-9]+ with constraint OBJECT\.
+Information in locals\-table is invalid with respect to the stack map table\. Local refers to non\-present stack map type for register: [0-9]+ with constraint [\-A-Z]*\.
Info: Some warnings are typically a sign of using an outdated Java toolchain\. To fix, recompile the source with an updated toolchain\.
# > Task :compose:ui:ui-inspection:buildCMakeRelWithDebInfo[arm64-v8a]
C/C\+\+: ninja: warning: bad deps log signature or version; starting over
diff --git a/development/diagnose-build-failure/impl/backup-state.sh b/development/diagnose-build-failure/impl/backup-state.sh
index 3591b76..28eab6b 100755
--- a/development/diagnose-build-failure/impl/backup-state.sh
+++ b/development/diagnose-build-failure/impl/backup-state.sh
@@ -53,7 +53,7 @@
function copy() {
from="$1"
to="$2"
- rm "$to" -rf
+ rm -rf "$to"
if [ -e "$from" ]; then
mkdir -p "$(dirname $to)"
if [ "$move" == "true" ]; then
@@ -62,7 +62,7 @@
cp --preserve=all -rT "$from" "$to"
fi
else
- rm "$to" -rf
+ rm -rf "$to"
fi
}
diff --git a/development/update-verification-metadata.sh b/development/update-verification-metadata.sh
index 3de0bcd..03c19f7 100755
--- a/development/update-verification-metadata.sh
+++ b/development/update-verification-metadata.sh
@@ -3,7 +3,13 @@
function runGradle() {
kmpArgs="-Pandroidx.compose.multiplatformEnabled=true -Pandroidx.kmp.native.enabled=true"
- ./gradlew $kmpArgs "$@"
+ echo running ./gradlew $kmpArgs "$@"
+ if ./gradlew $kmpArgs "$@"; then
+ echo succeeded: ./gradlew $kmpArgs "$@"
+ else
+ echo failed: ./gradlew $kmpArgs "$@"
+ return 1
+ fi
}
# This script regenerates signature-related information (dependency-verification-metadata and keyring)
diff --git a/docs-public/build.gradle b/docs-public/build.gradle
index dc27faf..df1cb55 100644
--- a/docs-public/build.gradle
+++ b/docs-public/build.gradle
@@ -23,22 +23,22 @@
docs("androidx.arch.core:core-testing:2.1.0")
docs("androidx.asynclayoutinflater:asynclayoutinflater:1.0.0")
docs("androidx.autofill:autofill:1.2.0-beta01")
- docs("androidx.benchmark:benchmark-common:1.1.0-rc01")
- docs("androidx.benchmark:benchmark-junit4:1.1.0-rc01")
- docs("androidx.benchmark:benchmark-macro:1.1.0-rc01")
- docs("androidx.benchmark:benchmark-macro-junit4:1.1.0-rc01")
+ docs("androidx.benchmark:benchmark-common:1.1.0-rc02")
+ docs("androidx.benchmark:benchmark-junit4:1.1.0-rc02")
+ docs("androidx.benchmark:benchmark-macro:1.1.0-rc02")
+ docs("androidx.benchmark:benchmark-macro-junit4:1.1.0-rc02")
docs("androidx.biometric:biometric:1.2.0-alpha04")
docs("androidx.biometric:biometric-ktx:1.2.0-alpha04")
samples("androidx.biometric:biometric-ktx-samples:1.2.0-alpha04")
docs("androidx.browser:browser:1.4.0")
- docs("androidx.camera:camera-camera2:1.1.0-beta03")
- docs("androidx.camera:camera-core:1.1.0-beta03")
- docs("androidx.camera:camera-extensions:1.1.0-beta03")
+ docs("androidx.camera:camera-camera2:1.1.0-rc01")
+ docs("androidx.camera:camera-core:1.1.0-rc01")
+ docs("androidx.camera:camera-extensions:1.1.0-rc01")
stubs(fileTree(dir: "../camera/camera-extensions-stub", include: ["camera-extensions-stub.jar"]))
- docs("androidx.camera:camera-lifecycle:1.1.0-beta03")
+ docs("androidx.camera:camera-lifecycle:1.1.0-rc01")
docs("androidx.camera:camera-previewview:1.1.0-beta02")
- docs("androidx.camera:camera-video:1.1.0-beta03")
- docs("androidx.camera:camera-view:1.1.0-beta03")
+ docs("androidx.camera:camera-video:1.1.0-rc01")
+ docs("androidx.camera:camera-view:1.1.0-rc01")
docs("androidx.car.app:app:1.2.0-rc01")
docs("androidx.car.app:app-automotive:1.2.0-rc01")
docs("androidx.car.app:app-projected:1.2.0-rc01")
@@ -46,54 +46,54 @@
docs("androidx.cardview:cardview:1.0.0")
docs("androidx.collection:collection:1.2.0")
docs("androidx.collection:collection-ktx:1.2.0")
- docs("androidx.compose.animation:animation:1.2.0-alpha08")
- docs("androidx.compose.animation:animation-core:1.2.0-alpha08")
- docs("androidx.compose.animation:animation-graphics:1.2.0-alpha08")
- samples("androidx.compose.animation:animation-samples:1.2.0-alpha08")
- samples("androidx.compose.animation:animation-core-samples:1.2.0-alpha08")
- samples("androidx.compose.animation:animation-graphics-samples:1.2.0-alpha08")
- docs("androidx.compose.foundation:foundation:1.2.0-alpha08")
- docs("androidx.compose.foundation:foundation-layout:1.2.0-alpha08")
- samples("androidx.compose.foundation:foundation-layout-samples:1.2.0-alpha08")
- samples("androidx.compose.foundation:foundation-samples:1.2.0-alpha08")
- docs("androidx.compose.material3:material3:1.0.0-alpha10")
- samples("androidx.compose.material3:material3-samples:1.0.0-alpha10")
- docs("androidx.compose.material3:material3-window-size-class:1.0.0-alpha10")
- samples("androidx.compose.material3:material3-window-size-class-samples:1.0.0-alpha10")
- docs("androidx.compose.material:material:1.2.0-alpha08")
- docs("androidx.compose.material:material-icons-core:1.2.0-alpha08")
- samples("androidx.compose.material:material-icons-core-samples:1.2.0-alpha08")
- docs("androidx.compose.material:material-ripple:1.2.0-alpha08")
- samples("androidx.compose.material:material-samples:1.2.0-alpha08")
- docs("androidx.compose.runtime:runtime:1.2.0-alpha08")
- docs("androidx.compose.runtime:runtime-livedata:1.2.0-alpha08")
- samples("androidx.compose.runtime:runtime-livedata-samples:1.2.0-alpha08")
- docs("androidx.compose.runtime:runtime-rxjava2:1.2.0-alpha08")
- samples("androidx.compose.runtime:runtime-rxjava2-samples:1.2.0-alpha08")
- docs("androidx.compose.runtime:runtime-rxjava3:1.2.0-alpha08")
- samples("androidx.compose.runtime:runtime-rxjava3-samples:1.2.0-alpha08")
- docs("androidx.compose.runtime:runtime-saveable:1.2.0-alpha08")
- samples("androidx.compose.runtime:runtime-saveable-samples:1.2.0-alpha08")
- samples("androidx.compose.runtime:runtime-samples:1.2.0-alpha08")
- docs("androidx.compose.ui:ui:1.2.0-alpha08")
- docs("androidx.compose.ui:ui-geometry:1.2.0-alpha08")
- docs("androidx.compose.ui:ui-graphics:1.2.0-alpha08")
- samples("androidx.compose.ui:ui-graphics-samples:1.2.0-alpha08")
- docs("androidx.compose.ui:ui-test:1.2.0-alpha08")
- docs("androidx.compose.ui:ui-test-junit4:1.2.0-alpha08")
- samples("androidx.compose.ui:ui-test-samples:1.2.0-alpha08")
- docs("androidx.compose.ui:ui-text:1.2.0-alpha08")
- docs("androidx.compose.ui:ui-text-google-fonts:1.2.0-alpha08")
- samples("androidx.compose.ui:ui-text-samples:1.2.0-alpha08")
- docs("androidx.compose.ui:ui-tooling:1.2.0-alpha08")
- docs("androidx.compose.ui:ui-tooling-data:1.2.0-alpha08")
- docs("androidx.compose.ui:ui-tooling-preview:1.2.0-alpha08")
- docs("androidx.compose.ui:ui-unit:1.2.0-alpha08")
- samples("androidx.compose.ui:ui-unit-samples:1.2.0-alpha08")
- docs("androidx.compose.ui:ui-util:1.2.0-alpha08")
- docs("androidx.compose.ui:ui-viewbinding:1.2.0-alpha08")
- samples("androidx.compose.ui:ui-viewbinding-samples:1.2.0-alpha08")
- samples("androidx.compose.ui:ui-samples:1.2.0-alpha08")
+ docs("androidx.compose.animation:animation:1.2.0-beta01")
+ docs("androidx.compose.animation:animation-core:1.2.0-beta01")
+ docs("androidx.compose.animation:animation-graphics:1.2.0-beta01")
+ samples("androidx.compose.animation:animation-samples:1.2.0-beta01")
+ samples("androidx.compose.animation:animation-core-samples:1.2.0-beta01")
+ samples("androidx.compose.animation:animation-graphics-samples:1.2.0-beta01")
+ docs("androidx.compose.foundation:foundation:1.2.0-beta01")
+ docs("androidx.compose.foundation:foundation-layout:1.2.0-beta01")
+ samples("androidx.compose.foundation:foundation-layout-samples:1.2.0-beta01")
+ samples("androidx.compose.foundation:foundation-samples:1.2.0-beta01")
+ docs("androidx.compose.material3:material3:1.0.0-alpha11")
+ samples("androidx.compose.material3:material3-samples:1.0.0-alpha11")
+ docs("androidx.compose.material3:material3-window-size-class:1.0.0-alpha11")
+ samples("androidx.compose.material3:material3-window-size-class-samples:1.0.0-alpha11")
+ docs("androidx.compose.material:material:1.2.0-beta01")
+ docs("androidx.compose.material:material-icons-core:1.2.0-beta01")
+ samples("androidx.compose.material:material-icons-core-samples:1.2.0-beta01")
+ docs("androidx.compose.material:material-ripple:1.2.0-beta01")
+ samples("androidx.compose.material:material-samples:1.2.0-beta01")
+ docs("androidx.compose.runtime:runtime:1.2.0-beta01")
+ docs("androidx.compose.runtime:runtime-livedata:1.2.0-beta01")
+ samples("androidx.compose.runtime:runtime-livedata-samples:1.2.0-beta01")
+ docs("androidx.compose.runtime:runtime-rxjava2:1.2.0-beta01")
+ samples("androidx.compose.runtime:runtime-rxjava2-samples:1.2.0-beta01")
+ docs("androidx.compose.runtime:runtime-rxjava3:1.2.0-beta01")
+ samples("androidx.compose.runtime:runtime-rxjava3-samples:1.2.0-beta01")
+ docs("androidx.compose.runtime:runtime-saveable:1.2.0-beta01")
+ samples("androidx.compose.runtime:runtime-saveable-samples:1.2.0-beta01")
+ samples("androidx.compose.runtime:runtime-samples:1.2.0-beta01")
+ docs("androidx.compose.ui:ui:1.2.0-beta01")
+ docs("androidx.compose.ui:ui-geometry:1.2.0-beta01")
+ docs("androidx.compose.ui:ui-graphics:1.2.0-beta01")
+ samples("androidx.compose.ui:ui-graphics-samples:1.2.0-beta01")
+ docs("androidx.compose.ui:ui-test:1.2.0-beta01")
+ docs("androidx.compose.ui:ui-test-junit4:1.2.0-beta01")
+ samples("androidx.compose.ui:ui-test-samples:1.2.0-beta01")
+ docs("androidx.compose.ui:ui-text:1.2.0-beta01")
+ docs("androidx.compose.ui:ui-text-google-fonts:1.2.0-beta01")
+ samples("androidx.compose.ui:ui-text-samples:1.2.0-beta01")
+ docs("androidx.compose.ui:ui-tooling:1.2.0-beta01")
+ docs("androidx.compose.ui:ui-tooling-data:1.2.0-beta01")
+ docs("androidx.compose.ui:ui-tooling-preview:1.2.0-beta01")
+ docs("androidx.compose.ui:ui-unit:1.2.0-beta01")
+ samples("androidx.compose.ui:ui-unit-samples:1.2.0-beta01")
+ docs("androidx.compose.ui:ui-util:1.2.0-beta01")
+ docs("androidx.compose.ui:ui-viewbinding:1.2.0-beta01")
+ samples("androidx.compose.ui:ui-viewbinding-samples:1.2.0-beta01")
+ samples("androidx.compose.ui:ui-samples:1.2.0-beta01")
docs("androidx.concurrent:concurrent-futures:1.1.0")
docs("androidx.concurrent:concurrent-futures-ktx:1.1.0")
docs("androidx.contentpager:contentpager:1.0.0")
@@ -110,7 +110,7 @@
docs("androidx.core:core-splashscreen:1.0.0-beta02")
docs("androidx.cursoradapter:cursoradapter:1.0.0")
docs("androidx.customview:customview:1.2.0-alpha01")
- docs("androidx.customview:customview-poolingcontainer:1.0.0-alpha01")
+ docs("androidx.customview:customview-poolingcontainer:1.0.0-beta01")
docs("androidx.datastore:datastore:1.0.0")
docs("androidx.datastore:datastore-core:1.0.0")
docs("androidx.datastore:datastore-preferences:1.0.0")
@@ -120,7 +120,7 @@
docs("androidx.datastore:datastore-rxjava2:1.0.0")
docs("androidx.datastore:datastore-rxjava3:1.0.0")
docs("androidx.documentfile:documentfile:1.1.0-alpha01")
- docs("androidx.draganddrop:draganddrop:1.0.0-rc01")
+ docs("androidx.draganddrop:draganddrop:1.0.0")
docs("androidx.drawerlayout:drawerlayout:1.1.1")
docs("androidx.dynamicanimation:dynamicanimation:1.1.0-alpha02")
docs("androidx.dynamicanimation:dynamicanimation-ktx:1.0.0-alpha03")
@@ -142,6 +142,7 @@
docs("androidx.glance:glance-appwidget-proto:1.0.0-alpha03")
docs("androidx.glance:glance-wear-tiles:1.0.0-alpha03")
docs("androidx.gridlayout:gridlayout:1.0.0")
+ docs("androidx.health:health-connect-client:1.0.0-alpha01")
docs("androidx.health:health-services-client:1.0.0-alpha03")
docs("androidx.heifwriter:heifwriter:1.1.0-alpha01")
docs("androidx.hilt:hilt-common:1.0.0-beta01")
@@ -185,19 +186,19 @@
docs("androidx.mediarouter:mediarouter:1.3.0")
docs("androidx.mediarouter:mediarouter-testing:1.3.0")
docs("androidx.metrics:metrics-performance:1.0.0-alpha01")
- docs("androidx.navigation:navigation-common:2.5.0-beta01")
- docs("androidx.navigation:navigation-common-ktx:2.5.0-beta01")
- docs("androidx.navigation:navigation-compose:2.5.0-beta01")
- samples("androidx.navigation:navigation-compose-samples:2.5.0-beta01")
- docs("androidx.navigation:navigation-dynamic-features-fragment:2.5.0-beta01")
- docs("androidx.navigation:navigation-dynamic-features-runtime:2.5.0-beta01")
- docs("androidx.navigation:navigation-fragment:2.5.0-beta01")
- docs("androidx.navigation:navigation-fragment-ktx:2.5.0-beta01")
- docs("androidx.navigation:navigation-runtime:2.5.0-beta01")
- docs("androidx.navigation:navigation-runtime-ktx:2.5.0-beta01")
- docs("androidx.navigation:navigation-testing:2.5.0-beta01")
- docs("androidx.navigation:navigation-ui:2.5.0-beta01")
- docs("androidx.navigation:navigation-ui-ktx:2.5.0-beta01")
+ docs("androidx.navigation:navigation-common:2.5.0-rc01")
+ docs("androidx.navigation:navigation-common-ktx:2.5.0-rc01")
+ docs("androidx.navigation:navigation-compose:2.5.0-rc01")
+ samples("androidx.navigation:navigation-compose-samples:2.5.0-rc01")
+ docs("androidx.navigation:navigation-dynamic-features-fragment:2.5.0-rc01")
+ docs("androidx.navigation:navigation-dynamic-features-runtime:2.5.0-rc01")
+ docs("androidx.navigation:navigation-fragment:2.5.0-rc01")
+ docs("androidx.navigation:navigation-fragment-ktx:2.5.0-rc01")
+ docs("androidx.navigation:navigation-runtime:2.5.0-rc01")
+ docs("androidx.navigation:navigation-runtime-ktx:2.5.0-rc01")
+ docs("androidx.navigation:navigation-testing:2.5.0-rc01")
+ docs("androidx.navigation:navigation-ui:2.5.0-rc01")
+ docs("androidx.navigation:navigation-ui-ktx:2.5.0-rc01")
docs("androidx.paging:paging-common:3.1.1")
docs("androidx.paging:paging-common-ktx:3.1.1")
docs("androidx.paging:paging-compose:1.0.0-alpha15")
@@ -215,7 +216,7 @@
docs("androidx.preference:preference:1.2.0")
docs("androidx.preference:preference-ktx:1.2.0")
docs("androidx.print:print:1.1.0-beta01")
- docs("androidx.profileinstaller:profileinstaller:1.2.0-alpha02")
+ docs("androidx.profileinstaller:profileinstaller:1.2.0-beta01")
docs("androidx.recommendation:recommendation:1.0.0")
docs("androidx.recyclerview:recyclerview:1.3.0-alpha02")
docs("androidx.recyclerview:recyclerview-selection:2.0.0-alpha01")
@@ -261,33 +262,33 @@
docs("androidx.versionedparcelable:versionedparcelable:1.1.1")
docs("androidx.viewpager2:viewpager2:1.1.0-beta01")
docs("androidx.viewpager:viewpager:1.1.0-alpha01")
- docs("androidx.wear.compose:compose-foundation:1.0.0-alpha21")
- samples("androidx.wear.compose:compose-foundation-samples:1.0.0-alpha21")
- docs("androidx.wear.compose:compose-material:1.0.0-alpha21")
- samples("androidx.wear.compose:compose-material-samples:1.0.0-alpha21")
- docs("androidx.wear.compose:compose-navigation:1.0.0-alpha21")
- samples("androidx.wear.compose:compose-navigation-samples:1.0.0-alpha21")
- docs("androidx.wear.tiles:tiles:1.1.0-alpha05")
- docs("androidx.wear.tiles:tiles-material:1.1.0-alpha05")
- docs("androidx.wear.tiles:tiles-proto:1.1.0-alpha05")
- docs("androidx.wear.tiles:tiles-renderer:1.1.0-alpha05")
- docs("androidx.wear.tiles:tiles-testing:1.1.0-alpha05")
- docs("androidx.wear.watchface:watchface:1.1.0-beta01")
- docs("androidx.wear.watchface:watchface-client:1.1.0-beta01")
- docs("androidx.wear.watchface:watchface-client-guava:1.1.0-beta01")
- docs("androidx.wear.watchface:watchface-complications:1.1.0-beta01")
- docs("androidx.wear.watchface:watchface-complications-data:1.1.0-beta01")
- docs("androidx.wear.watchface:watchface-complications-data-source:1.1.0-beta01")
- docs("androidx.wear.watchface:watchface-complications-data-source-ktx:1.1.0-beta01")
- samples("androidx.wear.watchface:watchface-complications-permission-dialogs-sample:1.1.0-beta01")
- docs("androidx.wear.watchface:watchface-complications-rendering:1.1.0-beta01")
- docs("androidx.wear.watchface:watchface-data:1.1.0-beta01")
- docs("androidx.wear.watchface:watchface-editor:1.1.0-beta01")
- docs("androidx.wear.watchface:watchface-editor-guava:1.1.0-beta01")
- samples("androidx.wear.watchface:watchface-editor-samples:1.1.0-beta01")
- docs("androidx.wear.watchface:watchface-guava:1.1.0-beta01")
- samples("androidx.wear.watchface:watchface-samples:1.1.0-beta01")
- docs("androidx.wear.watchface:watchface-style:1.1.0-beta01")
+ docs("androidx.wear.compose:compose-foundation:1.0.0-beta01")
+ samples("androidx.wear.compose:compose-foundation-samples:1.0.0-beta01")
+ docs("androidx.wear.compose:compose-material:1.0.0-beta01")
+ samples("androidx.wear.compose:compose-material-samples:1.0.0-beta01")
+ docs("androidx.wear.compose:compose-navigation:1.0.0-beta01")
+ samples("androidx.wear.compose:compose-navigation-samples:1.0.0-beta01")
+ docs("androidx.wear.tiles:tiles:1.1.0-alpha06")
+ docs("androidx.wear.tiles:tiles-material:1.1.0-alpha06")
+ docs("androidx.wear.tiles:tiles-proto:1.1.0-alpha06")
+ docs("androidx.wear.tiles:tiles-renderer:1.1.0-alpha06")
+ docs("androidx.wear.tiles:tiles-testing:1.1.0-alpha06")
+ docs("androidx.wear.watchface:watchface:1.1.0-beta02")
+ docs("androidx.wear.watchface:watchface-client:1.1.0-beta02")
+ docs("androidx.wear.watchface:watchface-client-guava:1.1.0-beta02")
+ docs("androidx.wear.watchface:watchface-complications:1.1.0-beta02")
+ docs("androidx.wear.watchface:watchface-complications-data:1.1.0-beta02")
+ docs("androidx.wear.watchface:watchface-complications-data-source:1.1.0-beta02")
+ docs("androidx.wear.watchface:watchface-complications-data-source-ktx:1.1.0-beta02")
+ samples("androidx.wear.watchface:watchface-complications-permission-dialogs-sample:1.1.0-beta02")
+ docs("androidx.wear.watchface:watchface-complications-rendering:1.1.0-beta02")
+ docs("androidx.wear.watchface:watchface-data:1.1.0-beta02")
+ docs("androidx.wear.watchface:watchface-editor:1.1.0-beta02")
+ docs("androidx.wear.watchface:watchface-editor-guava:1.1.0-beta02")
+ samples("androidx.wear.watchface:watchface-editor-samples:1.1.0-beta02")
+ docs("androidx.wear.watchface:watchface-guava:1.1.0-beta02")
+ samples("androidx.wear.watchface:watchface-samples:1.1.0-beta02")
+ docs("androidx.wear.watchface:watchface-style:1.1.0-beta02")
docs("androidx.wear:wear:1.3.0-alpha02")
stubs(fileTree(dir: "../wear/wear_stubs/", include: ["com.google.android.wearable-stubs.jar"]))
docs("androidx.wear:wear-ongoing:1.1.0-alpha01")
@@ -297,13 +298,13 @@
samples("androidx.wear:wear-input-samples:1.2.0-alpha01")
docs("androidx.wear:wear-input-testing:1.2.0-alpha02")
docs("androidx.webkit:webkit:1.4.0")
- docs("androidx.window:window:1.1.0-alpha01")
+ docs("androidx.window:window:1.1.0-alpha02")
stubs(fileTree(dir: "../window/stubs/", include: ["window-sidecar-release-0.1.0-alpha01.aar"]))
stubs("androidx.window:window-extensions:1.0.0-alpha01")
- docs("androidx.window:window-java:1.0.0")
- docs("androidx.window:window-rxjava2:1.0.0")
- docs("androidx.window:window-rxjava3:1.0.0")
- docs("androidx.window:window-testing:1.0.0")
+ docs("androidx.window:window-java:1.1.0-alpha02")
+ docs("androidx.window:window-rxjava2:1.1.0-alpha02")
+ docs("androidx.window:window-rxjava3:1.1.0-alpha02")
+ docs("androidx.window:window-testing:1.1.0-alpha02")
docs("androidx.work:work-gcm:2.8.0-alpha02")
docs("androidx.work:work-multiprocess:2.8.0-alpha02")
docs("androidx.work:work-runtime:2.8.0-alpha02")
diff --git a/docs-tip-of-tree/build.gradle b/docs-tip-of-tree/build.gradle
index c187e5f..baf598e 100644
--- a/docs-tip-of-tree/build.gradle
+++ b/docs-tip-of-tree/build.gradle
@@ -31,6 +31,7 @@
docs(project(":biometric:biometric"))
docs(project(":biometric:biometric-ktx"))
samples(project(":biometric:biometric-ktx-samples"))
+ docs(project(":bluetooth:bluetooth"))
docs(project(":browser:browser"))
docs(project(":camera:camera-camera2"))
docs(project(":camera:camera-core"))
diff --git a/docs/api_guidelines.md b/docs/api_guidelines.md
index a5d1192..b406439 100644
--- a/docs/api_guidelines.md
+++ b/docs/api_guidelines.md
@@ -925,8 +925,17 @@
accomplished by adding a `@Deprecated` and `@deprecated` (with migration
comment) annotation pair to *every* class and interface in the artifact.
-Entire packages (including Kotlin) can be deprecated by using a
-`package-info.java` file and applying the `@Deprecated` annotation there.
+To deprecate an entire artifact:
+
+1. Mark every top-level API (class, interface, extension function, etc.) in the
+ artifact as `@Deprecated` and update the API files
+ ([example CL](https://android-review.googlesource.com/c/platform/frameworks/support/+/1938773))
+1. Schedule a release of the artifact as a new minor version. When you populate
+ the release notes, explain that the entire artifact has been deprecated.
+ Include the reason for deprecation and the migration strategy.
+1. After the artifact has been released, remove the artifact from the source
+ tree, versions file, and tip-of-tree docs configuration
+ ([example CL](https://android-review.googlesource.com/c/platform/frameworks/support/+/2061731/))
The fully-deprecated artifact will be released as a deprecation release -- it
will ship normally with accompanying release notes indicating the reason for
@@ -1350,7 +1359,7 @@
Primary artifacts, e.g. `workmanager`, **must not** depend on closed-source
components including libraries and hard-coded references to packages,
-permissions, or IPC mechanisms that may only be fulfulled by closed-source
+permissions, or IPC mechanisms that may only be fulfilled by closed-source
components.
Optional artifacts, e.g. `workmanager-gcm`, *may* depend on closed-source
@@ -1360,7 +1369,7 @@
Some examples of safely depending on closed-source components include:
- WorkManager's GCM Network Manager integration, which uses
- [manifest metadata](https://cs.android.com/androidx/platform/frameworks/support/+/androidx-master-dev:work/workmanager-gcm/src/main/AndroidManifest.xml)
+ [manifest metadata](https://cs.android.com/androidx/platform/frameworks/support/+/androidx-main:work/workmanager-gcm/src/main/AndroidManifest.xml)
for service discovery and provides an optional artifact exposing the
service.
- Ads Identifier's Play Services integration, which provides a default backend
@@ -1368,7 +1377,7 @@
[`Intent` handling](https://cs.android.com/androidx/platform/frameworks/support/+/androidx-master-dev:ads/ads-identifier-provider/src/main/java/androidx/ads/identifier/provider/AdvertisingIdProviderManager.java;l=108)
as a service discovery mechanism for Play Services.
- Downloadable Fonts integration with Play Services, which plugs in via a
- [`ContentProvider`](https://cs.android.com/androidx/platform/frameworks/support/+/androidx-master-dev:core/core/src/androidTest/java/androidx/core/provider/MockFontProvider.java)
+ [`ContentProvider`](https://cs.android.com/androidx/platform/frameworks/support/+/androidx-main:core/core/src/androidTest/java/androidx/core/provider/MockFontProvider.java)
as a service discovery mechanism with developer-specified
[signature verification](https://developer.android.com/guide/topics/ui/look-and-feel/downloadable-fonts#adding-certificates)
for additional security.
@@ -1763,7 +1772,7 @@
* Update a value from multiple threads atomically
* Maintain granular control of your concurrency invariants
-### Kotlin {#kotlin}
+### Kotlin-specific guidelines {#kotlin}
#### Nullability from Java (new APIs)
diff --git a/docs/build_infrastructure.md b/docs/build_infrastructure.md
new file mode 100644
index 0000000..5c11bfc
--- /dev/null
+++ b/docs/build_infrastructure.md
@@ -0,0 +1,28 @@
+# Build infrastructure
+
+<!--*
+# Document freshness: For more information, see go/fresh-source.
+freshness: { owner: 'aurimas' reviewed: '2022-05-05' }
+*-->
+
+[TOC]
+
+## Build invocation scripts
+
+AndroidX uses
+[`busytown/`](https://cs.android.com/androidx/platform/frameworks/support/+/androidx-main:busytown/)
+directory to wrap build bot invocations to a single command per build target.
+Each one of these scripts receives `DIST_DIR`, `OUT_DIR`, and `CHANGE_INFO`
+enviroment variables. `DIST_DIR` is a directory for putting build artifacts that
+should be saved. `OUT_DIR` is a directory to write temporary build outputs.
+`CHANGE_INFO` points to a file that allows build system to know what changed for
+a given change that is being built.
+
+## Gradle Remote Build Cache
+
+AndroidX build bots use
+[Gradle Remote Build Cache](https://docs.gradle.org/current/userguide/build_cache.html)
+to speed up build targets.
+[GCP build cache Gradle plugin](https://github.com/androidx/gcp-gradle-build-cache)
+is used to connect to a GCP Storage bucket `androidx-gradle-remote-cache` from
+the `androidx-ge` project.
diff --git a/docs/gradle_enterprise.md b/docs/gradle_enterprise.md
index 49484441b..19cd12d 100644
--- a/docs/gradle_enterprise.md
+++ b/docs/gradle_enterprise.md
@@ -1,9 +1,6 @@
# Gradle Enterprise
-<!--*
-# Document freshness: For more information, see go/fresh-source.
-freshness: { owner: 'rahulrav' reviewed: '2021-11-03' }
-*-->
+<!--* freshness: { owner: 'rahulrav' reviewed: '2022-05-02' } *-->
[TOC]
diff --git a/docs/open_source.md b/docs/open_source.md
index 75d2a4d..6e8a794 100644
--- a/docs/open_source.md
+++ b/docs/open_source.md
@@ -1,12 +1,5 @@
# Integrating proprietary components
-go/androidx/open_source
-
-<!--*
-# Document freshness: For more information, see go/fresh-source.
-freshness: { owner: 'alanv' reviewed: '2022-01-14' }
-*-->
-
[TOC]
One of the core principles of Jetpack is "Developed as open-source and
@@ -23,14 +16,18 @@
### Exceptions
-The only unconditional exception to this definition is the Android platform SDK,
-which does not release sources until well after its API surface has been
-finalized.
+#### Android Open Source Project
+
+The only unconditional exception to this definition is the Android Open Source
+Project itself, which does not release sources publicly until well after its API
+surface has been finalized.
Libraries which are developed against the pre-release Android platform SDK _may_
remain closed-source until the platform SDK's API surface is finalized, at which
they **must** move to open-source.
+#### Closed-source dependencies
+
In specific cases, libraries *may* include closed-source dependencies. See the
[Open-source compatibility](api_guidelines.md#dependencies-aosp) section of the
API Guidelines for implementation details.
diff --git a/fragment/fragment/src/androidTest/java/androidx/fragment/app/BackStackStateTest.kt b/fragment/fragment/src/androidTest/java/androidx/fragment/app/BackStackStateTest.kt
index 6f2c0e1..f85cbcc 100644
--- a/fragment/fragment/src/androidTest/java/androidx/fragment/app/BackStackStateTest.kt
+++ b/fragment/fragment/src/androidTest/java/androidx/fragment/app/BackStackStateTest.kt
@@ -16,6 +16,7 @@
package androidx.fragment.app
+import android.os.Bundle
import android.os.Parcel
import androidx.fragment.app.test.EmptyFragmentTestActivity
import androidx.lifecycle.Lifecycle
@@ -64,6 +65,7 @@
}
@Test
+ @Suppress("DEPRECATION")
fun testParcel() {
val fragment = StrictFragment()
val backStackRecord = BackStackRecord(fragmentManager).apply {
@@ -73,7 +75,9 @@
setMaxLifecycle(fragment, Lifecycle.State.STARTED)
}
- fragmentManager.fragmentStore.setSavedState(fragment.mWho, FragmentState(fragment))
+ val stateBundle = Bundle()
+ stateBundle.putParcelable(FragmentManager.FRAGMENT_STATE_TAG, FragmentState(fragment))
+ fragmentManager.fragmentStore.setSavedState(fragment.mWho, stateBundle)
val backStackState = BackStackState(
listOf(fragment.mWho),
listOf(BackStackRecordState(backStackRecord))
diff --git a/fragment/fragment/src/androidTest/java/androidx/fragment/app/FragmentStateManagerTest.kt b/fragment/fragment/src/androidTest/java/androidx/fragment/app/FragmentStateManagerTest.kt
index 1fddf91..a6fae1f 100644
--- a/fragment/fragment/src/androidTest/java/androidx/fragment/app/FragmentStateManagerTest.kt
+++ b/fragment/fragment/src/androidTest/java/androidx/fragment/app/FragmentStateManagerTest.kt
@@ -16,6 +16,7 @@
package androidx.fragment.app
+import android.os.Bundle
import androidx.test.ext.junit.runners.AndroidJUnit4
import androidx.test.filters.MediumTest
import androidx.test.platform.app.InstrumentationRegistry
@@ -52,10 +53,14 @@
}
@Test
+ @Suppress("DEPRECATION")
fun constructorFragmentFactory() {
val fragment = StrictFragment()
FragmentStateManager(dispatcher, fragmentStore, fragment).saveState()
- val fragmentState = fragmentStore.getSavedState(fragment.mWho)!!
+
+ val stateBundle: Bundle = fragmentStore.getSavedState(fragment.mWho)!!
+ val fragmentState: FragmentState =
+ stateBundle.getParcelable(FragmentManager.FRAGMENT_STATE_TAG)!!
val fragmentStateManager = FragmentStateManager(
dispatcher, fragmentStore,
@@ -70,13 +75,16 @@
}
@Test
+ @Suppress("DEPRECATION")
fun constructorRetainedFragment() {
val fragment = StrictFragment()
FragmentStateManager(dispatcher, fragmentStore, fragment).saveState()
- val fragmentState = fragmentStore.getSavedState(fragment.mWho)!!
assertThat(fragment.mSavedFragmentState)
.isNull()
+ val stateBundle: Bundle = fragmentStore.getSavedState(fragment.mWho)!!
+ val fragmentState: FragmentState =
+ stateBundle.getParcelable(FragmentManager.FRAGMENT_STATE_TAG)!!
val fragmentStateManager = FragmentStateManager(
dispatcher, fragmentStore,
fragment, fragmentState
diff --git a/fragment/fragment/src/main/java/androidx/fragment/app/BackStackState.java b/fragment/fragment/src/main/java/androidx/fragment/app/BackStackState.java
index 93ef490..249c23e 100644
--- a/fragment/fragment/src/main/java/androidx/fragment/app/BackStackState.java
+++ b/fragment/fragment/src/main/java/androidx/fragment/app/BackStackState.java
@@ -17,6 +17,7 @@
package androidx.fragment.app;
import android.annotation.SuppressLint;
+import android.os.Bundle;
import android.os.Parcel;
import android.os.Parcelable;
@@ -44,6 +45,7 @@
}
@NonNull
+ @SuppressWarnings("deprecation")
List<BackStackRecord> instantiate(@NonNull FragmentManager fm,
Map<String, Fragment> pendingSavedFragments) {
// First instantiate the saved Fragments from state.
@@ -58,11 +60,14 @@
continue;
}
// Otherwise, retrieve any saved state, clearing it out for future calls
- FragmentState fragmentState = fm.getFragmentStore().setSavedState(fWho, null);
+ Bundle fragmentState = fm.getFragmentStore().setSavedState(fWho, null);
if (fragmentState != null) {
- Fragment fragment = fragmentState.instantiate(fm.getFragmentFactory(),
- fm.getHost().getContext().getClassLoader());
- fragments.put(fragment.mWho, fragment);
+ FragmentState fs = fragmentState.getParcelable(FragmentManager.FRAGMENT_STATE_TAG);
+ if (fs != null) {
+ Fragment fragment = fs.instantiate(fm.getFragmentFactory(),
+ fm.getHost().getContext().getClassLoader());
+ fragments.put(fragment.mWho, fragment);
+ }
}
}
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 c330863..0369449 100644
--- a/fragment/fragment/src/main/java/androidx/fragment/app/FragmentManager.java
+++ b/fragment/fragment/src/main/java/androidx/fragment/app/FragmentManager.java
@@ -2370,8 +2370,8 @@
// First save all active fragments.
ArrayList<String> active = mFragmentStore.saveActiveFragments();
- // And grab all FragmentState objects
- ArrayList<FragmentState> savedState = mFragmentStore.getAllSavedState();
+ // And grab all fragments' saved state bundles
+ HashMap<String, Bundle> savedState = mFragmentStore.getAllSavedState();
if (savedState.isEmpty()) {
if (isLoggingEnabled(Log.VERBOSE)) {
Log.v(TAG, "saveAllState: no fragments!");
@@ -2413,10 +2413,8 @@
bundle.putBundle(RESULT_NAME_PREFIX + resultName, mResults.get(resultName));
}
- for (FragmentState state : savedState) {
- Bundle fragmentBundle = new Bundle();
- fragmentBundle.putParcelable(FRAGMENT_STATE_TAG, state);
- bundle.putBundle(FRAGMENT_NAME_PREFIX + state.mWho, fragmentBundle);
+ for (String fWho : savedState.keySet()) {
+ bundle.putBundle(FRAGMENT_NAME_PREFIX + fWho, savedState.get(fWho));
}
}
@@ -2447,6 +2445,7 @@
if (state == null) return;
Bundle bundle = (Bundle) state;
+ // Restore the fragment results
for (String bundleKey : bundle.keySet()) {
if (bundleKey.startsWith(RESULT_NAME_PREFIX)) {
Bundle savedResult = bundle.getBundle(bundleKey);
@@ -2458,18 +2457,19 @@
}
}
- // Restore the saved state of all fragments
- ArrayList<FragmentState> allFragmentStates = new ArrayList<>();
+ // Restore the saved bundle for all fragments
+ HashMap<String, Bundle> allStateBundles = new HashMap<>();
for (String bundleKey : bundle.keySet()) {
if (bundleKey.startsWith(FRAGMENT_NAME_PREFIX)) {
Bundle savedFragmentBundle = bundle.getBundle(bundleKey);
if (savedFragmentBundle != null) {
savedFragmentBundle.setClassLoader(mHost.getContext().getClassLoader());
- allFragmentStates.add(savedFragmentBundle.getParcelable(FRAGMENT_STATE_TAG));
+ String fragmentKey = bundleKey.substring(FRAGMENT_NAME_PREFIX.length());
+ allStateBundles.put(fragmentKey, savedFragmentBundle);
}
}
}
- mFragmentStore.restoreSaveState(allFragmentStates);
+ mFragmentStore.restoreSaveState(allStateBundles);
FragmentManagerState fms = bundle.getParcelable(FRAGMENT_MANAGER_STATE_TAG);
if (fms == null) return;
@@ -2479,9 +2479,10 @@
mFragmentStore.resetActiveFragments();
for (String who : fms.mActive) {
// Retrieve any saved state, clearing it out for future calls
- FragmentState fs = mFragmentStore.setSavedState(who, null);
- if (fs != null) {
+ Bundle stateBundle = mFragmentStore.setSavedState(who, null);
+ if (stateBundle != null) {
FragmentStateManager fragmentStateManager;
+ FragmentState fs = stateBundle.getParcelable(FragmentManager.FRAGMENT_STATE_TAG);
Fragment retainedFragment = mNonConfig.findRetainedFragmentByWho(fs.mWho);
if (retainedFragment != null) {
if (isLoggingEnabled(Log.VERBOSE)) {
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 679e426..25fcbf8 100644
--- a/fragment/fragment/src/main/java/androidx/fragment/app/FragmentStateManager.java
+++ b/fragment/fragment/src/main/java/androidx/fragment/app/FragmentStateManager.java
@@ -663,7 +663,10 @@
} else {
fs.mSavedFragmentState = mFragment.mSavedFragmentState;
}
- mFragmentStore.setSavedState(mFragment.mWho, fs);
+
+ Bundle stateBundle = new Bundle();
+ stateBundle.putParcelable(FragmentManager.FRAGMENT_STATE_TAG, fs);
+ mFragmentStore.setSavedState(mFragment.mWho, stateBundle);
}
@Nullable
diff --git a/fragment/fragment/src/main/java/androidx/fragment/app/FragmentStore.java b/fragment/fragment/src/main/java/androidx/fragment/app/FragmentStore.java
index ca04c1e..e2fd4ac 100644
--- a/fragment/fragment/src/main/java/androidx/fragment/app/FragmentStore.java
+++ b/fragment/fragment/src/main/java/androidx/fragment/app/FragmentStore.java
@@ -16,6 +16,7 @@
package androidx.fragment.app;
+import android.os.Bundle;
import android.util.Log;
import android.view.ViewGroup;
@@ -36,7 +37,7 @@
private final ArrayList<Fragment> mAdded = new ArrayList<>();
private final HashMap<String, FragmentStateManager> mActive = new HashMap<>();
- private final HashMap<String, FragmentState> mSavedState = new HashMap<>();
+ private final HashMap<String, Bundle> mSavedState = new HashMap<>();
private FragmentManagerViewModel mNonConfig;
@@ -176,32 +177,30 @@
}
@Nullable
- FragmentState getSavedState(@NonNull String who) {
+ Bundle getSavedState(@NonNull String who) {
return mSavedState.get(who);
}
/**
- * Sets the saved state, returning the previously set FragmentState, if any.
+ * Sets the saved state, returning the previously set state bundle, if any.
*/
@Nullable
- FragmentState setSavedState(@NonNull String who, @Nullable FragmentState fragmentState) {
- if (fragmentState != null) {
- return mSavedState.put(who, fragmentState);
+ Bundle setSavedState(@NonNull String who, @Nullable Bundle bundle) {
+ if (bundle != null) {
+ return mSavedState.put(who, bundle);
} else {
return mSavedState.remove(who);
}
}
- void restoreSaveState(@NonNull ArrayList<FragmentState> savedState) {
+ void restoreSaveState(@NonNull HashMap<String, Bundle> allSavedStates) {
mSavedState.clear();
- for (FragmentState fs : savedState) {
- mSavedState.put(fs.mWho, fs);
- }
+ mSavedState.putAll(allSavedStates);
}
@NonNull
- ArrayList<FragmentState> getAllSavedState() {
- return new ArrayList<>(mSavedState.values());
+ HashMap<String, Bundle> getAllSavedState() {
+ return mSavedState;
}
@NonNull
diff --git a/glance/glance-appwidget-proto/build.gradle b/glance/glance-appwidget-proto/build.gradle
index faf1f80..ef4f144 100644
--- a/glance/glance-appwidget-proto/build.gradle
+++ b/glance/glance-appwidget-proto/build.gradle
@@ -51,28 +51,14 @@
// Create export artifact for for JarJaring
def preferencesProtoJarJarTask = tasks.register("exportJar", Jar) {
archiveBaseName.set("export")
- dependsOn(protobuf.generateProtoTasks.all())
- dependsOn(compileKotlin)
- from(files(compileKotlin.outputs.files)) {
- exclude("**/caches-jvm/**")
- exclude("**/last-build.bin")
- }
-
- dependsOn(compileJava)
- from(files(compileJava.destinationDirectory)) {
- exclude("**/caches-jvm/**")
- exclude("**/last-build.bin")
- }
-
- // The proto-lite dependency includes .proto files, which are not used by datastore. When apps
+ from(sourceSets.main.output)
+ // The proto-lite dependency includes .proto files, which are not used by glance. When apps
// depend on datastore as well as proto-lite directly, these files conflict since jarjar only
// renames the java classes. Remove them here since they are unused.
+ exclude("**/*.proto")
+
from(zipTree(configurations.detachedConfiguration(
- dependencies.create(libs.protobufLite.get())).getSingleFile())) {
- exclude("**/*.proto")
- exclude("**/caches-jvm/**")
- exclude("**/last-build.bin")
- }
+ dependencies.create(libs.protobufLite.get())).getSingleFile()))
}
def jarjarConf = configurations.register("export")
diff --git a/glance/glance-appwidget/api/current.txt b/glance/glance-appwidget/api/current.txt
index 49a3e62..94406e76 100644
--- a/glance/glance-appwidget/api/current.txt
+++ b/glance/glance-appwidget/api/current.txt
@@ -49,7 +49,7 @@
public abstract class GlanceAppWidget {
ctor public GlanceAppWidget(optional @LayoutRes int errorUiLayout);
- method @androidx.compose.runtime.Composable public abstract void Content();
+ method @androidx.compose.runtime.Composable @androidx.glance.GlanceComposable public abstract void Content();
method public androidx.glance.appwidget.SizeMode getSizeMode();
method public androidx.glance.state.GlanceStateDefinition<?>? getStateDefinition();
method public suspend Object? onDelete(android.content.Context context, androidx.glance.GlanceId glanceId, kotlin.coroutines.Continuation<? super kotlin.Unit>);
@@ -294,7 +294,7 @@
public abstract class GlanceTemplateAppWidget extends androidx.glance.appwidget.GlanceAppWidget {
ctor public GlanceTemplateAppWidget();
method @androidx.compose.runtime.Composable public final void Content();
- method @androidx.compose.runtime.Composable public abstract void TemplateContent();
+ method @androidx.compose.runtime.Composable @androidx.glance.GlanceComposable public abstract void TemplateContent();
method public androidx.glance.appwidget.SizeMode.Exact getSizeMode();
property public androidx.glance.appwidget.SizeMode.Exact sizeMode;
property public androidx.glance.state.GlanceStateDefinition<?>? stateDefinition;
diff --git a/glance/glance-appwidget/api/public_plus_experimental_current.txt b/glance/glance-appwidget/api/public_plus_experimental_current.txt
index 46d739a..43243dd 100644
--- a/glance/glance-appwidget/api/public_plus_experimental_current.txt
+++ b/glance/glance-appwidget/api/public_plus_experimental_current.txt
@@ -52,7 +52,7 @@
public abstract class GlanceAppWidget {
ctor public GlanceAppWidget(optional @LayoutRes int errorUiLayout);
- method @androidx.compose.runtime.Composable public abstract void Content();
+ method @androidx.compose.runtime.Composable @androidx.glance.GlanceComposable public abstract void Content();
method public androidx.glance.appwidget.SizeMode getSizeMode();
method public androidx.glance.state.GlanceStateDefinition<?>? getStateDefinition();
method public suspend Object? onDelete(android.content.Context context, androidx.glance.GlanceId glanceId, kotlin.coroutines.Continuation<? super kotlin.Unit>);
@@ -308,7 +308,7 @@
public abstract class GlanceTemplateAppWidget extends androidx.glance.appwidget.GlanceAppWidget {
ctor public GlanceTemplateAppWidget();
method @androidx.compose.runtime.Composable public final void Content();
- method @androidx.compose.runtime.Composable public abstract void TemplateContent();
+ method @androidx.compose.runtime.Composable @androidx.glance.GlanceComposable public abstract void TemplateContent();
method public androidx.glance.appwidget.SizeMode.Exact getSizeMode();
property public androidx.glance.appwidget.SizeMode.Exact sizeMode;
property public androidx.glance.state.GlanceStateDefinition<?>? stateDefinition;
diff --git a/glance/glance-appwidget/api/restricted_current.txt b/glance/glance-appwidget/api/restricted_current.txt
index 49a3e62..94406e76 100644
--- a/glance/glance-appwidget/api/restricted_current.txt
+++ b/glance/glance-appwidget/api/restricted_current.txt
@@ -49,7 +49,7 @@
public abstract class GlanceAppWidget {
ctor public GlanceAppWidget(optional @LayoutRes int errorUiLayout);
- method @androidx.compose.runtime.Composable public abstract void Content();
+ method @androidx.compose.runtime.Composable @androidx.glance.GlanceComposable public abstract void Content();
method public androidx.glance.appwidget.SizeMode getSizeMode();
method public androidx.glance.state.GlanceStateDefinition<?>? getStateDefinition();
method public suspend Object? onDelete(android.content.Context context, androidx.glance.GlanceId glanceId, kotlin.coroutines.Continuation<? super kotlin.Unit>);
@@ -294,7 +294,7 @@
public abstract class GlanceTemplateAppWidget extends androidx.glance.appwidget.GlanceAppWidget {
ctor public GlanceTemplateAppWidget();
method @androidx.compose.runtime.Composable public final void Content();
- method @androidx.compose.runtime.Composable public abstract void TemplateContent();
+ method @androidx.compose.runtime.Composable @androidx.glance.GlanceComposable public abstract void TemplateContent();
method public androidx.glance.appwidget.SizeMode.Exact getSizeMode();
property public androidx.glance.appwidget.SizeMode.Exact sizeMode;
property public androidx.glance.state.GlanceStateDefinition<?>? stateDefinition;
diff --git a/glance/glance-appwidget/src/androidMain/AndroidManifest.xml b/glance/glance-appwidget/src/androidMain/AndroidManifest.xml
index 65aedb9..9bcafb2 100644
--- a/glance/glance-appwidget/src/androidMain/AndroidManifest.xml
+++ b/glance/glance-appwidget/src/androidMain/AndroidManifest.xml
@@ -19,11 +19,7 @@
<activity
android:name=".action.ActionTrampolineActivity"
android:exported="false"
- android:enabled="true">
- <intent-filter>
- <data android:scheme="glance-action" />
- </intent-filter>
- </activity>
+ android:enabled="true" />
<activity
android:name=".action.InvisibleActionTrampolineActivity"
android:exported="false"
@@ -31,19 +27,11 @@
android:theme="@style/Widget.Glance.AppWidget.CallbackTrampoline"
android:launchMode="singleInstance"
android:noHistory="true"
- android:enabled="true">
- <intent-filter>
- <data android:scheme="glance-action" />
- </intent-filter>
- </activity>
+ android:enabled="true" />
<receiver
android:name=".action.ActionCallbackBroadcastReceiver"
android:exported="false"
- android:enabled="true">
- <intent-filter>
- <data android:scheme="glance-action" />
- </intent-filter>
- </receiver>
+ android:enabled="true" />
<receiver
android:name=".MyPackageReplacedReceiver"
diff --git a/glance/glance-appwidget/src/androidMain/kotlin/androidx/glance/appwidget/GlanceAppWidget.kt b/glance/glance-appwidget/src/androidMain/kotlin/androidx/glance/appwidget/GlanceAppWidget.kt
index 10b1a96..dc37087 100644
--- a/glance/glance-appwidget/src/androidMain/kotlin/androidx/glance/appwidget/GlanceAppWidget.kt
+++ b/glance/glance-appwidget/src/androidMain/kotlin/androidx/glance/appwidget/GlanceAppWidget.kt
@@ -37,6 +37,7 @@
import androidx.compose.ui.unit.DpSize
import androidx.compose.ui.unit.dp
import androidx.glance.Applier
+import androidx.glance.GlanceComposable
import androidx.glance.GlanceId
import androidx.glance.LocalContext
import androidx.glance.LocalGlanceId
@@ -46,14 +47,14 @@
import androidx.glance.state.GlanceState
import androidx.glance.state.GlanceStateDefinition
import androidx.glance.state.PreferencesGlanceStateDefinition
+import kotlin.math.ceil
+import kotlin.math.min
import kotlinx.coroutines.CancellationException
import kotlinx.coroutines.async
import kotlinx.coroutines.awaitAll
import kotlinx.coroutines.coroutineScope
import kotlinx.coroutines.launch
import kotlinx.coroutines.withContext
-import kotlin.math.ceil
-import kotlin.math.min
/**
* Object handling the composition and the communication with [AppWidgetManager].
@@ -73,6 +74,7 @@
* Definition of the UI.
*/
@Composable
+ @GlanceComposable
public abstract fun Content()
/**
diff --git a/glance/glance-appwidget/src/androidMain/kotlin/androidx/glance/appwidget/template/GlanceTemplateAppWidget.kt b/glance/glance-appwidget/src/androidMain/kotlin/androidx/glance/appwidget/template/GlanceTemplateAppWidget.kt
index dbd0442..485fe20 100644
--- a/glance/glance-appwidget/src/androidMain/kotlin/androidx/glance/appwidget/template/GlanceTemplateAppWidget.kt
+++ b/glance/glance-appwidget/src/androidMain/kotlin/androidx/glance/appwidget/template/GlanceTemplateAppWidget.kt
@@ -19,6 +19,7 @@
import androidx.compose.runtime.Composable
import androidx.compose.runtime.CompositionLocalProvider
import androidx.compose.ui.unit.Dp
+import androidx.glance.GlanceComposable
import androidx.glance.LocalSize
import androidx.glance.appwidget.GlanceAppWidget
import androidx.glance.appwidget.SizeMode
@@ -46,6 +47,7 @@
}
@Composable
+ @GlanceComposable
abstract fun TemplateContent()
/** Resolves the current display mode */
diff --git a/glance/glance-appwidget/src/androidMain/res/layout/list.xml b/glance/glance-appwidget/src/androidMain/res/layout/list.xml
index 3236975..9758a8a 100644
--- a/glance/glance-appwidget/src/androidMain/res/layout/list.xml
+++ b/glance/glance-appwidget/src/androidMain/res/layout/list.xml
@@ -18,4 +18,5 @@
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:divider="@null"
- style="@style/Glance.AppWidget.List"/>
\ No newline at end of file
+ android:theme="@style/Glance.AppWidget.Theme.ListChildren"
+ style="@style/Glance.AppWidget.List"/>
diff --git a/glance/glance-appwidget/src/androidMain/res/values/styles.xml b/glance/glance-appwidget/src/androidMain/res/values/styles.xml
index 45190c4..fd5a02d 100644
--- a/glance/glance-appwidget/src/androidMain/res/values/styles.xml
+++ b/glance/glance-appwidget/src/androidMain/res/values/styles.xml
@@ -32,7 +32,9 @@
<style name="Glance.AppWidget.CheckBoxText" parent=""/>
<style name="Glance.AppWidget.Column" parent=""/>
- <style name="Glance.AppWidget.List" parent=""/>
+ <style name="Glance.AppWidget.List" parent="">
+ <item name="android:foreground">@null</item>
+ </style>
<style name="Glance.AppWidget.Row" parent=""/>
<style name="Glance.AppWidget.Switch" parent="Base.Glance.AppWidget.Button"/>
diff --git a/glance/glance-appwidget/src/main/res/values/themes.xml b/glance/glance-appwidget/src/main/res/values/themes.xml
index 4743274..b9dcb24 100644
--- a/glance/glance-appwidget/src/main/res/values/themes.xml
+++ b/glance/glance-appwidget/src/main/res/values/themes.xml
@@ -18,4 +18,14 @@
<style name="Glance.AppWidget.Theme" parent="android:Theme.DeviceDefault">
<item name="android:foreground">?android:attr/selectableItemBackground</item>
</style>
+ <style name="Glance.AppWidget.Theme.ListChildren" parent="">
+ <!--
+ AbsListView sets the drawable state of its child views when an item is pressed. This
+ has the effect of activating ripples for child views even when the child has no click
+ handler set. In order to prevent this, we must explicitly set focusable in order to
+ avoid having the drawable state set. See AbsListView.keyPressed() and
+ AbsListView.onTouchUp().
+ -->
+ <item name="android:focusable">true</item>
+ </style>
</resources>
diff --git a/glance/glance-wear-tiles/api/current.txt b/glance/glance-wear-tiles/api/current.txt
index 93d7dde..02f02fc 100644
--- a/glance/glance-wear-tiles/api/current.txt
+++ b/glance/glance-wear-tiles/api/current.txt
@@ -20,7 +20,7 @@
public abstract class GlanceTileService extends androidx.wear.tiles.TileService {
ctor public GlanceTileService(optional androidx.wear.tiles.LayoutElementBuilders.LayoutElement? errorUiLayout);
- method @androidx.compose.runtime.Composable public abstract void Content();
+ method @androidx.compose.runtime.Composable @androidx.glance.GlanceComposable public abstract void Content();
method public androidx.glance.state.GlanceStateDefinition<?>? getStateDefinition();
method public final suspend <T> Object? getTileState(kotlin.coroutines.Continuation<? super T>);
method public androidx.glance.wear.tiles.TimelineMode getTimelineMode();
@@ -154,6 +154,7 @@
public final class GlanceCurvedModifierKt {
method public static androidx.glance.wear.tiles.curved.GlanceCurvedModifier clickable(androidx.glance.wear.tiles.curved.GlanceCurvedModifier, androidx.glance.action.Action onClick);
+ method public static androidx.glance.wear.tiles.curved.GlanceCurvedModifier semantics(androidx.glance.wear.tiles.curved.GlanceCurvedModifier, kotlin.jvm.functions.Function1<? super androidx.glance.semantics.SemanticsPropertyReceiver,kotlin.Unit> properties);
method public static androidx.glance.wear.tiles.curved.GlanceCurvedModifier sweepAngleDegrees(androidx.glance.wear.tiles.curved.GlanceCurvedModifier, float degrees);
method public static androidx.glance.wear.tiles.curved.GlanceCurvedModifier thickness(androidx.glance.wear.tiles.curved.GlanceCurvedModifier, float thickness);
}
diff --git a/glance/glance-wear-tiles/api/public_plus_experimental_current.txt b/glance/glance-wear-tiles/api/public_plus_experimental_current.txt
index 93d7dde..02f02fc 100644
--- a/glance/glance-wear-tiles/api/public_plus_experimental_current.txt
+++ b/glance/glance-wear-tiles/api/public_plus_experimental_current.txt
@@ -20,7 +20,7 @@
public abstract class GlanceTileService extends androidx.wear.tiles.TileService {
ctor public GlanceTileService(optional androidx.wear.tiles.LayoutElementBuilders.LayoutElement? errorUiLayout);
- method @androidx.compose.runtime.Composable public abstract void Content();
+ method @androidx.compose.runtime.Composable @androidx.glance.GlanceComposable public abstract void Content();
method public androidx.glance.state.GlanceStateDefinition<?>? getStateDefinition();
method public final suspend <T> Object? getTileState(kotlin.coroutines.Continuation<? super T>);
method public androidx.glance.wear.tiles.TimelineMode getTimelineMode();
@@ -154,6 +154,7 @@
public final class GlanceCurvedModifierKt {
method public static androidx.glance.wear.tiles.curved.GlanceCurvedModifier clickable(androidx.glance.wear.tiles.curved.GlanceCurvedModifier, androidx.glance.action.Action onClick);
+ method public static androidx.glance.wear.tiles.curved.GlanceCurvedModifier semantics(androidx.glance.wear.tiles.curved.GlanceCurvedModifier, kotlin.jvm.functions.Function1<? super androidx.glance.semantics.SemanticsPropertyReceiver,kotlin.Unit> properties);
method public static androidx.glance.wear.tiles.curved.GlanceCurvedModifier sweepAngleDegrees(androidx.glance.wear.tiles.curved.GlanceCurvedModifier, float degrees);
method public static androidx.glance.wear.tiles.curved.GlanceCurvedModifier thickness(androidx.glance.wear.tiles.curved.GlanceCurvedModifier, float thickness);
}
diff --git a/glance/glance-wear-tiles/api/restricted_current.txt b/glance/glance-wear-tiles/api/restricted_current.txt
index 93d7dde..02f02fc 100644
--- a/glance/glance-wear-tiles/api/restricted_current.txt
+++ b/glance/glance-wear-tiles/api/restricted_current.txt
@@ -20,7 +20,7 @@
public abstract class GlanceTileService extends androidx.wear.tiles.TileService {
ctor public GlanceTileService(optional androidx.wear.tiles.LayoutElementBuilders.LayoutElement? errorUiLayout);
- method @androidx.compose.runtime.Composable public abstract void Content();
+ method @androidx.compose.runtime.Composable @androidx.glance.GlanceComposable public abstract void Content();
method public androidx.glance.state.GlanceStateDefinition<?>? getStateDefinition();
method public final suspend <T> Object? getTileState(kotlin.coroutines.Continuation<? super T>);
method public androidx.glance.wear.tiles.TimelineMode getTimelineMode();
@@ -154,6 +154,7 @@
public final class GlanceCurvedModifierKt {
method public static androidx.glance.wear.tiles.curved.GlanceCurvedModifier clickable(androidx.glance.wear.tiles.curved.GlanceCurvedModifier, androidx.glance.action.Action onClick);
+ method public static androidx.glance.wear.tiles.curved.GlanceCurvedModifier semantics(androidx.glance.wear.tiles.curved.GlanceCurvedModifier, kotlin.jvm.functions.Function1<? super androidx.glance.semantics.SemanticsPropertyReceiver,kotlin.Unit> properties);
method public static androidx.glance.wear.tiles.curved.GlanceCurvedModifier sweepAngleDegrees(androidx.glance.wear.tiles.curved.GlanceCurvedModifier, float degrees);
method public static androidx.glance.wear.tiles.curved.GlanceCurvedModifier thickness(androidx.glance.wear.tiles.curved.GlanceCurvedModifier, float thickness);
}
diff --git a/glance/glance-wear-tiles/integration-tests/demos/src/main/java/androidx/glance/wear/tiles/demos/CountTileService.kt b/glance/glance-wear-tiles/integration-tests/demos/src/main/java/androidx/glance/wear/tiles/demos/CountTileService.kt
index d4b02a2..6f67ce1 100644
--- a/glance/glance-wear-tiles/integration-tests/demos/src/main/java/androidx/glance/wear/tiles/demos/CountTileService.kt
+++ b/glance/glance-wear-tiles/integration-tests/demos/src/main/java/androidx/glance/wear/tiles/demos/CountTileService.kt
@@ -37,6 +37,8 @@
import androidx.glance.layout.padding
import androidx.glance.layout.height
import androidx.glance.layout.width
+import androidx.glance.semantics.contentDescription
+import androidx.glance.semantics.semantics
import androidx.glance.state.PreferencesGlanceStateDefinition
import androidx.glance.wear.tiles.GlanceTileService
import androidx.glance.text.FontWeight
@@ -54,7 +56,9 @@
val currentCount = currentState<Preferences>()[prefsCountKey] ?: 0
Column(
- horizontalAlignment = Alignment.CenterHorizontally
+ horizontalAlignment = Alignment.CenterHorizontally,
+ modifier =
+ GlanceModifier.semantics({ contentDescription = "demo of actionRunCallback" })
) {
Text(
diff --git a/glance/glance-wear-tiles/integration-tests/demos/src/main/java/androidx/glance/wear/tiles/demos/CurvedLayoutTileService.kt b/glance/glance-wear-tiles/integration-tests/demos/src/main/java/androidx/glance/wear/tiles/demos/CurvedLayoutTileService.kt
index 7bc49498..a27f752 100644
--- a/glance/glance-wear-tiles/integration-tests/demos/src/main/java/androidx/glance/wear/tiles/demos/CurvedLayoutTileService.kt
+++ b/glance/glance-wear-tiles/integration-tests/demos/src/main/java/androidx/glance/wear/tiles/demos/CurvedLayoutTileService.kt
@@ -25,6 +25,7 @@
import androidx.glance.action.actionStartActivity
import androidx.glance.layout.ContentScale
import androidx.glance.layout.size
+import androidx.glance.semantics.contentDescription
import androidx.glance.text.Text
import androidx.glance.text.TextStyle
import androidx.glance.unit.ColorProvider
@@ -34,6 +35,7 @@
import androidx.glance.wear.tiles.curved.CurvedTextStyle
import androidx.glance.wear.tiles.curved.GlanceCurvedModifier
import androidx.glance.wear.tiles.curved.clickable
+import androidx.glance.wear.tiles.curved.semantics
import androidx.glance.wear.tiles.curved.sweepAngleDegrees
import androidx.glance.wear.tiles.curved.thickness
@@ -71,6 +73,7 @@
),
curvedModifier = GlanceCurvedModifier
.clickable(actionStartActivity(CalendarActivity::class.java))
+ .semantics({ contentDescription = "click to open activity" })
)
curvedComposable(false) {
Image(
diff --git a/glance/glance-wear-tiles/src/androidMain/kotlin/androidx/glance/wear/tiles/GlanceTileService.kt b/glance/glance-wear-tiles/src/androidMain/kotlin/androidx/glance/wear/tiles/GlanceTileService.kt
index 28a872f..a56d28df 100644
--- a/glance/glance-wear-tiles/src/androidMain/kotlin/androidx/glance/wear/tiles/GlanceTileService.kt
+++ b/glance/glance-wear-tiles/src/androidMain/kotlin/androidx/glance/wear/tiles/GlanceTileService.kt
@@ -29,18 +29,19 @@
import androidx.compose.ui.unit.DpSize
import androidx.compose.ui.unit.dp
import androidx.glance.Applier
-import androidx.glance.GlanceModifier
+import androidx.glance.GlanceComposable
import androidx.glance.GlanceId
-import androidx.glance.layout.EmittableBox
+import androidx.glance.GlanceModifier
import androidx.glance.LocalContext
import androidx.glance.LocalGlanceId
import androidx.glance.LocalSize
import androidx.glance.LocalState
import androidx.glance.layout.Alignment
+import androidx.glance.layout.EmittableBox
import androidx.glance.layout.fillMaxSize
-import androidx.glance.wear.tiles.action.RunCallbackAction
import androidx.glance.state.GlanceState
import androidx.glance.state.GlanceStateDefinition
+import androidx.glance.wear.tiles.action.RunCallbackAction
import androidx.lifecycle.Lifecycle
import androidx.lifecycle.LifecycleOwner
import androidx.lifecycle.LifecycleRegistry
@@ -55,13 +56,13 @@
import androidx.wear.tiles.TimelineBuilders
import com.google.common.util.concurrent.Futures
import com.google.common.util.concurrent.ListenableFuture
+import java.util.Arrays
import kotlinx.coroutines.CancellationException
import kotlinx.coroutines.CoroutineScope
import kotlinx.coroutines.coroutineScope
import kotlinx.coroutines.currentCoroutineContext
import kotlinx.coroutines.guava.future
import kotlinx.coroutines.launch
-import java.util.Arrays
/**
* [TileService] which can consume a Glance composition, convert it to a Wear Tile, and
@@ -71,6 +72,7 @@
* ```
* class MyTile: GlanceTileService() {
* @Composable
+ * @GlanceComposable
* override fun Content {
* Text("Hello World!")
* }
@@ -302,6 +304,7 @@
/** Override this method to set the layout to use in your Tile. */
@Composable
+ @GlanceComposable
public abstract fun Content()
/**
diff --git a/glance/glance-wear-tiles/src/androidMain/kotlin/androidx/glance/wear/tiles/WearCompositionTranslator.kt b/glance/glance-wear-tiles/src/androidMain/kotlin/androidx/glance/wear/tiles/WearCompositionTranslator.kt
index 5879c34..52fe283 100644
--- a/glance/glance-wear-tiles/src/androidMain/kotlin/androidx/glance/wear/tiles/WearCompositionTranslator.kt
+++ b/glance/glance-wear-tiles/src/androidMain/kotlin/androidx/glance/wear/tiles/WearCompositionTranslator.kt
@@ -30,6 +30,7 @@
import androidx.glance.EmittableButton
import androidx.glance.EmittableImage
import androidx.glance.GlanceModifier
+import androidx.glance.semantics.SemanticsModifier
import androidx.glance.VisibilityModifier
import androidx.glance.action.Action
import androidx.glance.action.ActionModifier
@@ -49,6 +50,7 @@
import androidx.glance.layout.PaddingModifier
import androidx.glance.layout.WidthModifier
import androidx.glance.layout.collectPaddingInDp
+import androidx.glance.semantics.SemanticsProperties
import androidx.glance.text.EmittableText
import androidx.glance.text.FontStyle
import androidx.glance.text.FontWeight
@@ -68,6 +70,7 @@
import androidx.glance.wear.tiles.curved.EmittableCurvedText
import androidx.glance.wear.tiles.curved.GlanceCurvedModifier
import androidx.glance.wear.tiles.curved.RadialAlignment
+import androidx.glance.wear.tiles.curved.SemanticsCurvedModifier
import androidx.glance.wear.tiles.curved.SweepAngleModifier
import androidx.glance.wear.tiles.curved.ThicknessModifier
import androidx.glance.wear.tiles.curved.findModifier
@@ -160,6 +163,20 @@
.setColor(argb(this.color.getColor(context)))
.build()
+private fun SemanticsModifier.toProto(): ModifiersBuilders.Semantics? =
+ this.configuration.getOrNull(SemanticsProperties.ContentDescription)?.let {
+ ModifiersBuilders.Semantics.Builder()
+ .setContentDescription(it.joinToString())
+ .build()
+ }
+
+private fun SemanticsCurvedModifier.toProto(): ModifiersBuilders.Semantics? =
+ this.configuration.getOrNull(SemanticsProperties.ContentDescription)?.let {
+ ModifiersBuilders.Semantics.Builder()
+ .setContentDescription(it.joinToString())
+ .build()
+ }
+
private fun ColorProvider.getColor(context: Context) = resolve(context).toArgb()
// TODO: handle parameters
@@ -666,6 +683,9 @@
is ActionCurvedModifier -> builder.setClickable(element.toProto(context))
is ThicknessModifier -> builder /* Skip for now, handled elsewhere. */
is SweepAngleModifier -> builder /* Skip for now, handled elsewhere. */
+ is SemanticsCurvedModifier -> {
+ element.toProto()?.let { builder.setSemantics(it) } ?: builder
+ }
else -> throw IllegalArgumentException("Unknown curved modifier type")
}
}.build()
@@ -686,6 +706,9 @@
is PaddingModifier -> builder // Processing that after
is VisibilityModifier -> builder // Already processed
is BorderModifier -> builder.setBorder(element.toProto(context))
+ is SemanticsModifier -> {
+ element.toProto()?.let { builder.setSemantics(it) } ?: builder
+ }
else -> throw IllegalArgumentException("Unknown modifier type")
}
}
diff --git a/glance/glance-wear-tiles/src/androidMain/kotlin/androidx/glance/wear/tiles/curved/GlanceCurvedModifier.kt b/glance/glance-wear-tiles/src/androidMain/kotlin/androidx/glance/wear/tiles/curved/GlanceCurvedModifier.kt
index 7c3faaf..796b93c 100644
--- a/glance/glance-wear-tiles/src/androidMain/kotlin/androidx/glance/wear/tiles/curved/GlanceCurvedModifier.kt
+++ b/glance/glance-wear-tiles/src/androidMain/kotlin/androidx/glance/wear/tiles/curved/GlanceCurvedModifier.kt
@@ -20,6 +20,8 @@
import androidx.compose.runtime.Stable
import androidx.compose.ui.unit.Dp
import androidx.glance.action.Action
+import androidx.glance.semantics.SemanticsConfiguration
+import androidx.glance.semantics.SemanticsPropertyReceiver
/**
* An ordered, immutable, collection of modifier element that works with curved components in the
@@ -191,3 +193,20 @@
*/
public fun GlanceCurvedModifier.clickable(onClick: Action): GlanceCurvedModifier =
this.then(ActionCurvedModifier(onClick))
+
+/** @suppress **/
+@RestrictTo(RestrictTo.Scope.LIBRARY_GROUP)
+public data class SemanticsCurvedModifier(
+ val configuration: SemanticsConfiguration
+) : GlanceCurvedModifier.Element
+
+/**
+ * Associate accessibility semantics with an element. This should generally be used sparingly, amd
+ * in mose cases should only be applied to the top-level layout element or clickable elements.
+ */
+public fun GlanceCurvedModifier.semantics(
+ properties: (SemanticsPropertyReceiver.() -> Unit)
+): GlanceCurvedModifier =
+ this.then(SemanticsCurvedModifier(
+ SemanticsConfiguration().also { it.properties() })
+ )
diff --git a/glance/glance-wear-tiles/src/test/kotlin/androidx/glance/wear/tiles/WearCompositionTranslatorTest.kt b/glance/glance-wear-tiles/src/test/kotlin/androidx/glance/wear/tiles/WearCompositionTranslatorTest.kt
index 2352f1d..566ac84 100644
--- a/glance/glance-wear-tiles/src/test/kotlin/androidx/glance/wear/tiles/WearCompositionTranslatorTest.kt
+++ b/glance/glance-wear-tiles/src/test/kotlin/androidx/glance/wear/tiles/WearCompositionTranslatorTest.kt
@@ -45,6 +45,8 @@
import androidx.glance.layout.padding
import androidx.glance.layout.size
import androidx.glance.layout.width
+import androidx.glance.semantics.contentDescription
+import androidx.glance.semantics.semantics
import androidx.glance.text.FontStyle
import androidx.glance.text.FontWeight
import androidx.glance.text.Text
@@ -60,6 +62,7 @@
import androidx.glance.wear.tiles.curved.GlanceCurvedModifier
import androidx.glance.wear.tiles.curved.RadialAlignment
import androidx.glance.wear.tiles.curved.clickable
+import androidx.glance.wear.tiles.curved.semantics
import androidx.glance.wear.tiles.curved.sweepAngleDegrees
import androidx.glance.wear.tiles.curved.thickness
import androidx.glance.wear.tiles.test.R
@@ -224,6 +227,37 @@
}
@Test
+ fun canTranslateSemanticsModifier() = fakeCoroutineScope.runTest {
+ val content = runAndTranslate {
+ Box(modifier = GlanceModifier.semantics({ contentDescription = "test_description" })) {}
+ }.layout
+
+ val innerBox =
+ (content as LayoutElementBuilders.Box).contents[0] as LayoutElementBuilders.Box
+ val semantics = requireNotNull(innerBox.modifiers!!.semantics)
+ assertThat(semantics.contentDescription).isEqualTo("test_description")
+ }
+
+ @Test
+ fun canTranslateSemanticsCurvedModifier() = fakeCoroutineScope.runTest {
+ val content = runAndTranslate {
+ CurvedRow {
+ curvedText(
+ text = "Hello World",
+ curvedModifier =
+ GlanceCurvedModifier.semantics({ contentDescription = "test_description" })
+ )
+ }
+ }.layout
+
+ val innerArc = (content as LayoutElementBuilders.Box).contents[0]
+ as LayoutElementBuilders.Arc
+ val innerArcText = innerArc.contents[0] as LayoutElementBuilders.ArcText
+ val semantics = requireNotNull(innerArcText.modifiers!!.semantics)
+ assertThat(semantics.contentDescription).isEqualTo("test_description")
+ }
+
+ @Test
fun canTranslateRow() = fakeCoroutineScope.runTest {
val content = runAndTranslate {
Row(verticalAlignment = Alignment.Vertical.CenterVertically) {
diff --git a/glance/glance/api/current.txt b/glance/glance/api/current.txt
index 53d4c50..7062b9b 100644
--- a/glance/glance/api/current.txt
+++ b/glance/glance/api/current.txt
@@ -282,6 +282,44 @@
}
+package androidx.glance.semantics {
+
+ public final class SemanticsConfiguration implements androidx.glance.semantics.SemanticsPropertyReceiver {
+ ctor public SemanticsConfiguration();
+ method public operator <T> T! get(androidx.glance.semantics.SemanticsPropertyKey<T> key);
+ method public <T> T? getOrElseNullable(androidx.glance.semantics.SemanticsPropertyKey<T> key, kotlin.jvm.functions.Function0<? extends T> defaultValue);
+ method public <T> T? getOrNull(androidx.glance.semantics.SemanticsPropertyKey<T> key);
+ method public <T> void set(androidx.glance.semantics.SemanticsPropertyKey<T> key, T? value);
+ }
+
+ public final class SemanticsModifierKt {
+ method public static androidx.glance.GlanceModifier semantics(androidx.glance.GlanceModifier, kotlin.jvm.functions.Function1<? super androidx.glance.semantics.SemanticsPropertyReceiver,kotlin.Unit> properties);
+ }
+
+ public final class SemanticsProperties {
+ method public androidx.glance.semantics.SemanticsPropertyKey<java.util.List<java.lang.String>> getContentDescription();
+ property public final androidx.glance.semantics.SemanticsPropertyKey<java.util.List<java.lang.String>> ContentDescription;
+ field public static final androidx.glance.semantics.SemanticsProperties INSTANCE;
+ }
+
+ public final class SemanticsPropertiesKt {
+ method public static String getContentDescription(androidx.glance.semantics.SemanticsPropertyReceiver);
+ method public static void setContentDescription(androidx.glance.semantics.SemanticsPropertyReceiver, String);
+ }
+
+ public final class SemanticsPropertyKey<T> {
+ ctor public SemanticsPropertyKey(String name, optional kotlin.jvm.functions.Function2<? super T,? super T,? extends T> mergePolicy);
+ method public String getName();
+ method public T? merge(T? parentValue, T? childValue);
+ property public final String name;
+ }
+
+ public interface SemanticsPropertyReceiver {
+ method public operator <T> void set(androidx.glance.semantics.SemanticsPropertyKey<T> key, T? value);
+ }
+
+}
+
package androidx.glance.state {
public interface GlanceStateDefinition<T> {
diff --git a/glance/glance/api/public_plus_experimental_current.txt b/glance/glance/api/public_plus_experimental_current.txt
index 53d4c50..7062b9b 100644
--- a/glance/glance/api/public_plus_experimental_current.txt
+++ b/glance/glance/api/public_plus_experimental_current.txt
@@ -282,6 +282,44 @@
}
+package androidx.glance.semantics {
+
+ public final class SemanticsConfiguration implements androidx.glance.semantics.SemanticsPropertyReceiver {
+ ctor public SemanticsConfiguration();
+ method public operator <T> T! get(androidx.glance.semantics.SemanticsPropertyKey<T> key);
+ method public <T> T? getOrElseNullable(androidx.glance.semantics.SemanticsPropertyKey<T> key, kotlin.jvm.functions.Function0<? extends T> defaultValue);
+ method public <T> T? getOrNull(androidx.glance.semantics.SemanticsPropertyKey<T> key);
+ method public <T> void set(androidx.glance.semantics.SemanticsPropertyKey<T> key, T? value);
+ }
+
+ public final class SemanticsModifierKt {
+ method public static androidx.glance.GlanceModifier semantics(androidx.glance.GlanceModifier, kotlin.jvm.functions.Function1<? super androidx.glance.semantics.SemanticsPropertyReceiver,kotlin.Unit> properties);
+ }
+
+ public final class SemanticsProperties {
+ method public androidx.glance.semantics.SemanticsPropertyKey<java.util.List<java.lang.String>> getContentDescription();
+ property public final androidx.glance.semantics.SemanticsPropertyKey<java.util.List<java.lang.String>> ContentDescription;
+ field public static final androidx.glance.semantics.SemanticsProperties INSTANCE;
+ }
+
+ public final class SemanticsPropertiesKt {
+ method public static String getContentDescription(androidx.glance.semantics.SemanticsPropertyReceiver);
+ method public static void setContentDescription(androidx.glance.semantics.SemanticsPropertyReceiver, String);
+ }
+
+ public final class SemanticsPropertyKey<T> {
+ ctor public SemanticsPropertyKey(String name, optional kotlin.jvm.functions.Function2<? super T,? super T,? extends T> mergePolicy);
+ method public String getName();
+ method public T? merge(T? parentValue, T? childValue);
+ property public final String name;
+ }
+
+ public interface SemanticsPropertyReceiver {
+ method public operator <T> void set(androidx.glance.semantics.SemanticsPropertyKey<T> key, T? value);
+ }
+
+}
+
package androidx.glance.state {
public interface GlanceStateDefinition<T> {
diff --git a/glance/glance/api/restricted_current.txt b/glance/glance/api/restricted_current.txt
index 53d4c50..7062b9b 100644
--- a/glance/glance/api/restricted_current.txt
+++ b/glance/glance/api/restricted_current.txt
@@ -282,6 +282,44 @@
}
+package androidx.glance.semantics {
+
+ public final class SemanticsConfiguration implements androidx.glance.semantics.SemanticsPropertyReceiver {
+ ctor public SemanticsConfiguration();
+ method public operator <T> T! get(androidx.glance.semantics.SemanticsPropertyKey<T> key);
+ method public <T> T? getOrElseNullable(androidx.glance.semantics.SemanticsPropertyKey<T> key, kotlin.jvm.functions.Function0<? extends T> defaultValue);
+ method public <T> T? getOrNull(androidx.glance.semantics.SemanticsPropertyKey<T> key);
+ method public <T> void set(androidx.glance.semantics.SemanticsPropertyKey<T> key, T? value);
+ }
+
+ public final class SemanticsModifierKt {
+ method public static androidx.glance.GlanceModifier semantics(androidx.glance.GlanceModifier, kotlin.jvm.functions.Function1<? super androidx.glance.semantics.SemanticsPropertyReceiver,kotlin.Unit> properties);
+ }
+
+ public final class SemanticsProperties {
+ method public androidx.glance.semantics.SemanticsPropertyKey<java.util.List<java.lang.String>> getContentDescription();
+ property public final androidx.glance.semantics.SemanticsPropertyKey<java.util.List<java.lang.String>> ContentDescription;
+ field public static final androidx.glance.semantics.SemanticsProperties INSTANCE;
+ }
+
+ public final class SemanticsPropertiesKt {
+ method public static String getContentDescription(androidx.glance.semantics.SemanticsPropertyReceiver);
+ method public static void setContentDescription(androidx.glance.semantics.SemanticsPropertyReceiver, String);
+ }
+
+ public final class SemanticsPropertyKey<T> {
+ ctor public SemanticsPropertyKey(String name, optional kotlin.jvm.functions.Function2<? super T,? super T,? extends T> mergePolicy);
+ method public String getName();
+ method public T? merge(T? parentValue, T? childValue);
+ property public final String name;
+ }
+
+ public interface SemanticsPropertyReceiver {
+ method public operator <T> void set(androidx.glance.semantics.SemanticsPropertyKey<T> key, T? value);
+ }
+
+}
+
package androidx.glance.state {
public interface GlanceStateDefinition<T> {
diff --git a/glance/glance/src/androidMain/kotlin/androidx/glance/semantics/SemanticsModifier.kt b/glance/glance/src/androidMain/kotlin/androidx/glance/semantics/SemanticsModifier.kt
new file mode 100644
index 0000000..b8cefe7
--- /dev/null
+++ b/glance/glance/src/androidMain/kotlin/androidx/glance/semantics/SemanticsModifier.kt
@@ -0,0 +1,35 @@
+/*
+ * Copyright 2022 The Android Open Source Project
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT 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.glance.semantics
+
+import androidx.annotation.RestrictTo
+import androidx.glance.GlanceModifier
+
+/** @suppress **/
+@RestrictTo(RestrictTo.Scope.LIBRARY_GROUP)
+public data class SemanticsModifier(
+ val configuration: SemanticsConfiguration
+) : GlanceModifier.Element
+
+/**
+ * Add semantics for use in testing, accessibility and similar use cases.
+ */
+public fun GlanceModifier.semantics(
+ properties: (SemanticsPropertyReceiver.() -> Unit)
+): GlanceModifier =
+ this.then(
+ SemanticsModifier(SemanticsConfiguration().also { it.properties() })
+ )
diff --git a/glance/glance/src/androidMain/kotlin/androidx/glance/semantics/SemanticsProperties.kt b/glance/glance/src/androidMain/kotlin/androidx/glance/semantics/SemanticsProperties.kt
new file mode 100644
index 0000000..235baa1
--- /dev/null
+++ b/glance/glance/src/androidMain/kotlin/androidx/glance/semantics/SemanticsProperties.kt
@@ -0,0 +1,116 @@
+/*
+ * Copyright 2022 The Android Open Source Project
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT 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.glance.semantics
+
+/**
+ * General semantics properties, mainly used for accessibility and testing.
+ *
+ * Each property is intended to be set by the respective SemanticsPropertyReceiver extension instead
+ * of used directly.
+ */
+object SemanticsProperties {
+ /**
+ * @see SemanticsPropertyReceiver.contentDescription
+ */
+ val ContentDescription = SemanticsPropertyKey<List<String>>(
+ name = "ContentDescription",
+ mergePolicy = { parentValue, childValue ->
+ parentValue?.toMutableList()?.also { it.addAll(childValue) } ?: childValue
+ }
+ )
+}
+
+/**
+ * SemanticsPropertyKey is the infrastructure for setting key/value pairs inside semantics block in
+ * a type-safe way. Each key has one particular statically defined value type T.
+ */
+class SemanticsPropertyKey<T>(
+ /**
+ * The name of the property. Should be the same as the constant from shich it is accessed.
+ */
+ val name: String,
+ internal val mergePolicy: (T?, T) -> T? = { parentValue, childValue ->
+ parentValue ?: childValue
+ }
+) {
+ fun merge(parentValue: T?, childValue: T): T? {
+ return mergePolicy(parentValue, childValue)
+ }
+}
+
+/**
+ * SemanticsPropertyReceiver is the scope provided by semantics {} blocks, letting you set key/value
+ * pairs primarily via extension functions.
+ */
+interface SemanticsPropertyReceiver {
+ operator fun <T> set(key: SemanticsPropertyKey<T>, value: T)
+}
+
+/**
+ * Developer-set content description of the semantics node, for use in testing, accessibility and
+ * similar use cases.
+ */
+var SemanticsPropertyReceiver.contentDescription: String
+ /**
+ * Throws [UnsupportedOperationException]. Should not be called.
+ */
+ get() {
+ throw UnsupportedOperationException(
+ "You cannot retrieve a semantics property directly"
+ )
+ }
+ set(value) { set(SemanticsProperties.ContentDescription, listOf(value)) }
+
+/**
+ * Describes the semantics information associated with the owning component.
+ */
+class SemanticsConfiguration : SemanticsPropertyReceiver {
+ private val props: MutableMap<SemanticsPropertyKey<*>, Any?> = mutableMapOf()
+ override fun <T> set(key: SemanticsPropertyKey<T>, value: T) {
+ props[key] = value
+ }
+
+ /**
+ * Retrieves the value for the given property, if one has been set,
+ * If a value has not been set, throws [IllegalStateException]
+ */
+ // Unavoidable, guaranteed by [set]
+ @Suppress("UNCHECKED_CAST")
+ operator fun <T> get(key: SemanticsPropertyKey<T>): T {
+ return props.getOrElse(key) {
+ throw java.lang.IllegalStateException("Key not present: $key")
+ } as T
+ }
+
+ /**
+ * Retrieves the value for the given property, if one has been set,
+ * If a value has not been set, returns the provided default value.
+ */
+ // Unavoidable, guaranteed by [set]
+ @Suppress("UNCHECKED_CAST")
+ fun <T> getOrElseNullable(key: SemanticsPropertyKey<T>, defaultValue: () -> T?): T? {
+ return props.getOrElse(key, defaultValue) as T?
+ }
+
+ /**
+ * Retrieves the value for the given property, if one has been set,
+ * If a value has not been set, returns null
+ */
+ fun <T> getOrNull(key: SemanticsPropertyKey<T>): T? {
+ return getOrElseNullable(key) { null }
+ }
+}
\ No newline at end of file
diff --git a/glance/glance/src/test/kotlin/androidx/glance/semantics/SemanticsTest.kt b/glance/glance/src/test/kotlin/androidx/glance/semantics/SemanticsTest.kt
new file mode 100644
index 0000000..59c32de
--- /dev/null
+++ b/glance/glance/src/test/kotlin/androidx/glance/semantics/SemanticsTest.kt
@@ -0,0 +1,35 @@
+/*
+ * Copyright 2022 The Android Open Source Project
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT 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.glance.semantics
+
+import androidx.glance.GlanceModifier
+import androidx.glance.findModifier
+import com.google.common.truth.Truth.assertThat
+import org.junit.Test
+
+class SemanticsTest {
+ @Test
+ fun testModifier() {
+ val modifiers = GlanceModifier.semantics({ contentDescription = "test_description" })
+
+ val semanticsModifier = checkNotNull(modifiers.findModifier<SemanticsModifier>())
+ assertThat(
+ semanticsModifier.configuration
+ .get(SemanticsProperties.ContentDescription).joinToString())
+ .isEqualTo("test_description")
+ }
+}
\ No newline at end of file
diff --git a/gradle.properties b/gradle.properties
index 22d731a..3219c553 100644
--- a/gradle.properties
+++ b/gradle.properties
@@ -54,4 +54,6 @@
# Do _not_ toggle or override unless you have read and understand this:
# https://blog.jetbrains.com/kotlin/2021/10/important-ua-parser-js-exploit-and-kotlin-js/
-androidx.kmp.js.enabled=false
\ No newline at end of file
+androidx.kmp.js.enabled=false
+
+kotlin.mpp.enableCInteropCommonization=true
diff --git a/health/health-services-client/api/1.0.0-beta02.txt b/health/health-services-client/api/1.0.0-beta02.txt
new file mode 100644
index 0000000..7c59c28
--- /dev/null
+++ b/health/health-services-client/api/1.0.0-beta02.txt
@@ -0,0 +1,956 @@
+// Signature format: 4.0
+package androidx.health.services.client {
+
+ public interface ExerciseClient {
+ method public com.google.common.util.concurrent.ListenableFuture<java.lang.Void> addGoalToActiveExerciseAsync(androidx.health.services.client.data.ExerciseGoal exerciseGoal);
+ method public com.google.common.util.concurrent.ListenableFuture<java.lang.Void> clearUpdateCallbackAsync(androidx.health.services.client.ExerciseUpdateCallback callback);
+ method public com.google.common.util.concurrent.ListenableFuture<java.lang.Void> endExerciseAsync();
+ method public com.google.common.util.concurrent.ListenableFuture<java.lang.Void> flushExerciseAsync();
+ method public com.google.common.util.concurrent.ListenableFuture<androidx.health.services.client.data.ExerciseCapabilities> getCapabilities();
+ method public com.google.common.util.concurrent.ListenableFuture<androidx.health.services.client.data.ExerciseInfo> getCurrentExerciseInfoAsync();
+ method public com.google.common.util.concurrent.ListenableFuture<java.lang.Void> markLapAsync();
+ method public com.google.common.util.concurrent.ListenableFuture<java.lang.Void> overrideAutoPauseAndResumeForActiveExerciseAsync(boolean enabled);
+ method public com.google.common.util.concurrent.ListenableFuture<java.lang.Void> pauseExerciseAsync();
+ method public com.google.common.util.concurrent.ListenableFuture<java.lang.Void> prepareExerciseAsync(androidx.health.services.client.data.WarmUpConfig configuration);
+ method public com.google.common.util.concurrent.ListenableFuture<java.lang.Void> removeGoalFromActiveExerciseAsync(androidx.health.services.client.data.ExerciseGoal exerciseGoal);
+ method public com.google.common.util.concurrent.ListenableFuture<java.lang.Void> resumeExerciseAsync();
+ method public void setUpdateCallback(androidx.health.services.client.ExerciseUpdateCallback callback);
+ method public void setUpdateCallback(java.util.concurrent.Executor executor, androidx.health.services.client.ExerciseUpdateCallback callback);
+ method public com.google.common.util.concurrent.ListenableFuture<java.lang.Void> startExerciseAsync(androidx.health.services.client.data.ExerciseConfig configuration);
+ property public abstract com.google.common.util.concurrent.ListenableFuture<androidx.health.services.client.data.ExerciseCapabilities> capabilities;
+ }
+
+ public interface ExerciseUpdateCallback {
+ method public void onAvailabilityChanged(androidx.health.services.client.data.DataType dataType, androidx.health.services.client.data.Availability availability);
+ method public void onExerciseUpdateReceived(androidx.health.services.client.data.ExerciseUpdate update);
+ method public void onLapSummaryReceived(androidx.health.services.client.data.ExerciseLapSummary lapSummary);
+ method public void onRegistered();
+ method public void onRegistrationFailed(Throwable throwable);
+ }
+
+ public final class HealthServices {
+ method public static androidx.health.services.client.HealthServicesClient getClient(android.content.Context context);
+ field public static final androidx.health.services.client.HealthServices INSTANCE;
+ }
+
+ public interface HealthServicesClient {
+ method public androidx.health.services.client.ExerciseClient getExerciseClient();
+ method public androidx.health.services.client.MeasureClient getMeasureClient();
+ method public androidx.health.services.client.PassiveMonitoringClient getPassiveMonitoringClient();
+ property public abstract androidx.health.services.client.ExerciseClient exerciseClient;
+ property public abstract androidx.health.services.client.MeasureClient measureClient;
+ property public abstract androidx.health.services.client.PassiveMonitoringClient passiveMonitoringClient;
+ }
+
+ public interface MeasureCallback {
+ method public void onAvailabilityChanged(androidx.health.services.client.data.DataType dataType, androidx.health.services.client.data.Availability availability);
+ method public void onDataReceived(java.util.List<androidx.health.services.client.data.DataPoint> data);
+ method public default void onRegistered();
+ method public default void onRegistrationFailed(Throwable throwable);
+ }
+
+ public interface MeasureClient {
+ method public com.google.common.util.concurrent.ListenableFuture<androidx.health.services.client.data.MeasureCapabilities> getCapabilities();
+ method public void registerCallback(androidx.health.services.client.data.DataType dataType, androidx.health.services.client.MeasureCallback callback);
+ method public void registerCallback(androidx.health.services.client.data.DataType dataType, java.util.concurrent.Executor executor, androidx.health.services.client.MeasureCallback callback);
+ method public com.google.common.util.concurrent.ListenableFuture<java.lang.Void> unregisterCallbackAsync(androidx.health.services.client.data.DataType dataType, androidx.health.services.client.MeasureCallback callback);
+ property public abstract com.google.common.util.concurrent.ListenableFuture<androidx.health.services.client.data.MeasureCapabilities> capabilities;
+ }
+
+ public interface PassiveMonitoringCallback {
+ method public void onPassiveMonitoringUpdate(androidx.health.services.client.data.PassiveMonitoringUpdate update);
+ }
+
+ public interface PassiveMonitoringClient {
+ method public com.google.common.util.concurrent.ListenableFuture<java.lang.Void> flushAsync();
+ method public com.google.common.util.concurrent.ListenableFuture<androidx.health.services.client.data.PassiveMonitoringCapabilities> getCapabilities();
+ method public com.google.common.util.concurrent.ListenableFuture<java.lang.Void> registerDataCallbackAsync(androidx.health.services.client.data.PassiveMonitoringConfig configuration);
+ method public com.google.common.util.concurrent.ListenableFuture<java.lang.Void> registerDataCallbackAsync(androidx.health.services.client.data.PassiveMonitoringConfig configuration, androidx.health.services.client.PassiveMonitoringCallback callback);
+ method public <T extends android.content.BroadcastReceiver> com.google.common.util.concurrent.ListenableFuture<java.lang.Void> registerPassiveGoalCallbackAsync(androidx.health.services.client.data.PassiveGoal passiveGoal, Class<T> broadcastReceiver);
+ method public com.google.common.util.concurrent.ListenableFuture<java.lang.Void> unregisterDataCallbackAsync();
+ method public com.google.common.util.concurrent.ListenableFuture<java.lang.Void> unregisterPassiveGoalCallbackAsync(androidx.health.services.client.data.PassiveGoal passiveGoal);
+ property public abstract com.google.common.util.concurrent.ListenableFuture<androidx.health.services.client.data.PassiveMonitoringCapabilities> capabilities;
+ }
+
+}
+
+package androidx.health.services.client.data {
+
+ public final class AchievedExerciseGoal extends androidx.health.services.client.data.ProtoParcelable<androidx.health.services.client.proto.DataProto.AchievedExerciseGoal> {
+ ctor public AchievedExerciseGoal(androidx.health.services.client.data.ExerciseGoal goal);
+ method public androidx.health.services.client.data.ExerciseGoal getGoal();
+ method public androidx.health.services.client.proto.DataProto.AchievedExerciseGoal getProto();
+ property public final androidx.health.services.client.data.ExerciseGoal goal;
+ field public static final android.os.Parcelable.Creator<androidx.health.services.client.data.AchievedExerciseGoal> CREATOR;
+ field public static final androidx.health.services.client.data.AchievedExerciseGoal.Companion Companion;
+ }
+
+ public static final class AchievedExerciseGoal.Companion {
+ }
+
+ public abstract class AggregateDataPoint extends androidx.health.services.client.data.ProtoParcelable<androidx.health.services.client.proto.DataProto.AggregateDataPoint> {
+ ctor public AggregateDataPoint();
+ }
+
+ @Keep public final class AggregateDataPoints {
+ method public static androidx.health.services.client.data.StatisticalDataPoint aggregateAbsoluteElevation(double minAbsElevationMeters, double maxAbsElevationMeters, double avgAbsElevationMeters, java.time.Instant startTime, java.time.Instant endTime);
+ method public static androidx.health.services.client.data.AggregateDataPoint aggregateCalories(double kcalories, java.time.Instant startTime, java.time.Instant endTime);
+ method public static androidx.health.services.client.data.AggregateDataPoint aggregateDistance(double meters, java.time.Instant startTime, java.time.Instant endTime);
+ method public static androidx.health.services.client.data.AggregateDataPoint aggregateElevationGain(double gainMeters, java.time.Instant startTime, java.time.Instant endTime);
+ method public static androidx.health.services.client.data.StatisticalDataPoint aggregateHeartRate(double minBpm, double maxBpm, double avgBpm, java.time.Instant startTime, java.time.Instant endTime);
+ method public static androidx.health.services.client.data.AggregateDataPoint aggregatePace(java.time.Duration minMillisPerKm, java.time.Duration maxMillisPerKm, java.time.Duration avgMillisPerKm, java.time.Instant startTime, java.time.Instant endTime);
+ method public static androidx.health.services.client.data.StatisticalDataPoint aggregateSpeed(double minMetersPerSecond, double maxMetersPerSecond, double avgMetersPerSecond, java.time.Instant startTime, java.time.Instant endTime);
+ method public static androidx.health.services.client.data.AggregateDataPoint aggregateSteps(long steps, java.time.Instant startTime, java.time.Instant endTime);
+ method public static androidx.health.services.client.data.AggregateDataPoint aggregateSwimmingStrokes(long swimmingStrokes, java.time.Instant startTime, java.time.Instant endTime);
+ field public static final androidx.health.services.client.data.AggregateDataPoints INSTANCE;
+ }
+
+ public interface Availability {
+ method public int getId();
+ property public abstract int id;
+ field public static final androidx.health.services.client.data.Availability.Companion Companion;
+ }
+
+ public static final class Availability.Companion {
+ }
+
+ public final class ComparisonType {
+ method public int getId();
+ method public String getName();
+ property public final int id;
+ property public final String name;
+ field public static final androidx.health.services.client.data.ComparisonType.Companion Companion;
+ field public static final androidx.health.services.client.data.ComparisonType GREATER_THAN;
+ field public static final androidx.health.services.client.data.ComparisonType GREATER_THAN_OR_EQUAL;
+ field public static final androidx.health.services.client.data.ComparisonType LESS_THAN;
+ field public static final androidx.health.services.client.data.ComparisonType LESS_THAN_OR_EQUAL;
+ field public static final androidx.health.services.client.data.ComparisonType UNKNOWN;
+ }
+
+ public static final class ComparisonType.Companion {
+ }
+
+ public final class CumulativeDataPoint extends androidx.health.services.client.data.AggregateDataPoint {
+ ctor public CumulativeDataPoint(java.time.Instant startTime, java.time.Instant endTime, androidx.health.services.client.data.DataType dataType, androidx.health.services.client.data.Value total);
+ method public androidx.health.services.client.data.DataType getDataType();
+ method public java.time.Instant getEndTime();
+ method public androidx.health.services.client.proto.DataProto.AggregateDataPoint getProto();
+ method public java.time.Instant getStartTime();
+ method public androidx.health.services.client.data.Value getTotal();
+ property public final androidx.health.services.client.data.DataType dataType;
+ property public final java.time.Instant endTime;
+ property public final java.time.Instant startTime;
+ property public final androidx.health.services.client.data.Value total;
+ field public static final android.os.Parcelable.Creator<androidx.health.services.client.data.CumulativeDataPoint> CREATOR;
+ field public static final androidx.health.services.client.data.CumulativeDataPoint.Companion Companion;
+ }
+
+ public static final class CumulativeDataPoint.Companion {
+ }
+
+ public final class DataPoint extends androidx.health.services.client.data.ProtoParcelable<androidx.health.services.client.proto.DataProto.DataPoint> {
+ method public static androidx.health.services.client.data.DataPoint createInterval(androidx.health.services.client.data.DataType dataType, androidx.health.services.client.data.Value value, java.time.Duration startDurationFromBoot, java.time.Duration endDurationFromBoot, optional android.os.Bundle metadata, optional androidx.health.services.client.data.DataPointAccuracy? accuracy);
+ method public static androidx.health.services.client.data.DataPoint createInterval(androidx.health.services.client.data.DataType dataType, androidx.health.services.client.data.Value value, java.time.Duration startDurationFromBoot, java.time.Duration endDurationFromBoot, optional android.os.Bundle metadata);
+ method public static androidx.health.services.client.data.DataPoint createInterval(androidx.health.services.client.data.DataType dataType, androidx.health.services.client.data.Value value, java.time.Duration startDurationFromBoot, java.time.Duration endDurationFromBoot);
+ method public static androidx.health.services.client.data.DataPoint createSample(androidx.health.services.client.data.DataType dataType, androidx.health.services.client.data.Value value, java.time.Duration durationFromBoot, optional android.os.Bundle metadata, optional androidx.health.services.client.data.DataPointAccuracy? accuracy);
+ method public static androidx.health.services.client.data.DataPoint createSample(androidx.health.services.client.data.DataType dataType, androidx.health.services.client.data.Value value, java.time.Duration durationFromBoot, optional android.os.Bundle metadata);
+ method public static androidx.health.services.client.data.DataPoint createSample(androidx.health.services.client.data.DataType dataType, androidx.health.services.client.data.Value value, java.time.Duration durationFromBoot);
+ method public androidx.health.services.client.data.DataPointAccuracy? getAccuracy();
+ method public androidx.health.services.client.data.DataType getDataType();
+ method public java.time.Duration getEndDurationFromBoot();
+ method public java.time.Instant getEndInstant(java.time.Instant bootInstant);
+ method public android.os.Bundle getMetadata();
+ method public androidx.health.services.client.proto.DataProto.DataPoint getProto();
+ method public java.time.Duration getStartDurationFromBoot();
+ method public java.time.Instant getStartInstant(java.time.Instant bootInstant);
+ method public androidx.health.services.client.data.Value getValue();
+ property public final androidx.health.services.client.data.DataPointAccuracy? accuracy;
+ property public final androidx.health.services.client.data.DataType dataType;
+ property public final java.time.Duration endDurationFromBoot;
+ property public final android.os.Bundle metadata;
+ property public final java.time.Duration startDurationFromBoot;
+ property public final androidx.health.services.client.data.Value value;
+ field public static final android.os.Parcelable.Creator<androidx.health.services.client.data.DataPoint> CREATOR;
+ field public static final androidx.health.services.client.data.DataPoint.Companion Companion;
+ }
+
+ public static final class DataPoint.Companion {
+ method public androidx.health.services.client.data.DataPoint createInterval(androidx.health.services.client.data.DataType dataType, androidx.health.services.client.data.Value value, java.time.Duration startDurationFromBoot, java.time.Duration endDurationFromBoot, optional android.os.Bundle metadata, optional androidx.health.services.client.data.DataPointAccuracy? accuracy);
+ method public androidx.health.services.client.data.DataPoint createInterval(androidx.health.services.client.data.DataType dataType, androidx.health.services.client.data.Value value, java.time.Duration startDurationFromBoot, java.time.Duration endDurationFromBoot, optional android.os.Bundle metadata);
+ method public androidx.health.services.client.data.DataPoint createInterval(androidx.health.services.client.data.DataType dataType, androidx.health.services.client.data.Value value, java.time.Duration startDurationFromBoot, java.time.Duration endDurationFromBoot);
+ method public androidx.health.services.client.data.DataPoint createSample(androidx.health.services.client.data.DataType dataType, androidx.health.services.client.data.Value value, java.time.Duration durationFromBoot, optional android.os.Bundle metadata, optional androidx.health.services.client.data.DataPointAccuracy? accuracy);
+ method public androidx.health.services.client.data.DataPoint createSample(androidx.health.services.client.data.DataType dataType, androidx.health.services.client.data.Value value, java.time.Duration durationFromBoot, optional android.os.Bundle metadata);
+ method public androidx.health.services.client.data.DataPoint createSample(androidx.health.services.client.data.DataType dataType, androidx.health.services.client.data.Value value, java.time.Duration durationFromBoot);
+ }
+
+ public abstract class DataPointAccuracy extends androidx.health.services.client.data.ProtoParcelable<androidx.health.services.client.proto.DataProto.DataPointAccuracy> {
+ ctor public DataPointAccuracy();
+ }
+
+ @Keep public final class DataPoints {
+ method public static androidx.health.services.client.data.DataPoint absoluteElevation(double meters, java.time.Duration durationFromBoot, optional android.os.Bundle? metadata);
+ method public static androidx.health.services.client.data.DataPoint absoluteElevation(double meters, java.time.Duration durationFromBoot);
+ method public static androidx.health.services.client.data.DataPoint calories(double kcalories, java.time.Duration startDurationFromBoot, java.time.Duration endDurationFromBoot, optional android.os.Bundle? metadata);
+ method public static androidx.health.services.client.data.DataPoint calories(double kcalories, java.time.Duration startDurationFromBoot, java.time.Duration endDurationFromBoot);
+ method public static androidx.health.services.client.data.DataPoint dailyCalories(double calories, java.time.Duration startDurationFromBoot, java.time.Duration endDurationFromBoot);
+ method public static androidx.health.services.client.data.DataPoint dailyDistance(double meters, java.time.Duration startDurationFromBoot, java.time.Duration endDurationFromBoot);
+ method public static androidx.health.services.client.data.DataPoint dailyFloors(double floors, java.time.Duration startDurationFromBoot, java.time.Duration endDurationFromBoot);
+ method public static androidx.health.services.client.data.DataPoint dailySteps(long steps, java.time.Duration startDurationFromBoot, java.time.Duration endDurationFromBoot);
+ method public static androidx.health.services.client.data.DataPoint distance(double meters, java.time.Duration startDurationFromBoot, java.time.Duration endDurationFromBoot, optional android.os.Bundle? metadata);
+ method public static androidx.health.services.client.data.DataPoint distance(double meters, java.time.Duration startDurationFromBoot, java.time.Duration endDurationFromBoot);
+ method public static androidx.health.services.client.data.DataPoint floors(double floors, java.time.Duration startDurationFromBoot, java.time.Duration endDurationFromBoot, optional android.os.Bundle? metadata);
+ method public static androidx.health.services.client.data.DataPoint floors(double floors, java.time.Duration startDurationFromBoot, java.time.Duration endDurationFromBoot);
+ method @Keep public static java.util.List<androidx.health.services.client.data.DataPoint> getDataPoints(android.content.Intent intent);
+ method public static boolean getPermissionsGranted(android.content.Intent intent);
+ method public static androidx.health.services.client.data.DataPoint heartRate(double bpm, java.time.Duration durationFromBoot, optional androidx.health.services.client.data.HeartRateAccuracy? accuracy);
+ method public static androidx.health.services.client.data.DataPoint heartRate(double bpm, java.time.Duration durationFromBoot);
+ method public static androidx.health.services.client.data.DataPoint location(double latitude, double longitude, optional double altitude, optional double bearing, java.time.Duration durationFromBoot, optional androidx.health.services.client.data.LocationAccuracy? accuracy);
+ method public static androidx.health.services.client.data.DataPoint location(double latitude, double longitude, optional double altitude, optional double bearing, java.time.Duration durationFromBoot);
+ method public static androidx.health.services.client.data.DataPoint location(double latitude, double longitude, optional double altitude, java.time.Duration durationFromBoot);
+ method public static androidx.health.services.client.data.DataPoint location(double latitude, double longitude, java.time.Duration durationFromBoot);
+ method public static androidx.health.services.client.data.DataPoint pace(java.time.Duration millisPerKm, java.time.Duration durationFromBoot);
+ method public static void putDataPoints(android.content.Intent intent, java.util.Collection<androidx.health.services.client.data.DataPoint> dataPoints);
+ method public static void putPermissionsGranted(android.content.Intent intent, boolean granted);
+ method public static androidx.health.services.client.data.DataPoint speed(double metersPerSecond, java.time.Duration durationFromBoot, optional android.os.Bundle? metadata);
+ method public static androidx.health.services.client.data.DataPoint speed(double metersPerSecond, java.time.Duration durationFromBoot);
+ method public static androidx.health.services.client.data.DataPoint steps(long steps, java.time.Duration startDurationFromBoot, java.time.Duration endDurationFromBoot, optional android.os.Bundle? metadata);
+ method public static androidx.health.services.client.data.DataPoint steps(long steps, java.time.Duration startDurationFromBoot, java.time.Duration endDurationFromBoot);
+ method public static androidx.health.services.client.data.DataPoint stepsPerMinute(long stepsPerMinute, java.time.Duration startDurationFromBoot);
+ method public static androidx.health.services.client.data.DataPoint swimmingStrokes(long strokes, java.time.Duration startDurationFromBoot, java.time.Duration endDurationFromBoot);
+ field public static final androidx.health.services.client.data.DataPoints INSTANCE;
+ field public static final int LOCATION_DATA_POINT_ALTITUDE_INDEX = 2; // 0x2
+ field public static final int LOCATION_DATA_POINT_BEARING_INDEX = 3; // 0x3
+ field public static final int LOCATION_DATA_POINT_LATITUDE_INDEX = 0; // 0x0
+ field public static final int LOCATION_DATA_POINT_LONGITUDE_INDEX = 1; // 0x1
+ }
+
+ public final class DataType extends androidx.health.services.client.data.ProtoParcelable<androidx.health.services.client.proto.DataProto.DataType> {
+ ctor public DataType(String name, androidx.health.services.client.data.DataType.TimeType timeType, int format);
+ method public int getFormat();
+ method public String getName();
+ method public androidx.health.services.client.proto.DataProto.DataType getProto();
+ method public androidx.health.services.client.data.DataType.TimeType getTimeType();
+ property public final int format;
+ property public final String name;
+ property public final androidx.health.services.client.data.DataType.TimeType timeType;
+ field public static final androidx.health.services.client.data.DataType ABSOLUTE_ELEVATION;
+ field public static final androidx.health.services.client.data.DataType ACTIVE_EXERCISE_DURATION;
+ field public static final android.os.Parcelable.Creator<androidx.health.services.client.data.DataType> CREATOR;
+ field public static final androidx.health.services.client.data.DataType.Companion Companion;
+ field public static final androidx.health.services.client.data.DataType DAILY_CALORIES;
+ field public static final androidx.health.services.client.data.DataType DAILY_DISTANCE;
+ field public static final androidx.health.services.client.data.DataType DAILY_FLOORS;
+ field public static final androidx.health.services.client.data.DataType DAILY_STEPS;
+ field public static final androidx.health.services.client.data.DataType DECLINE_DISTANCE;
+ field public static final androidx.health.services.client.data.DataType DECLINE_DURATION;
+ field public static final androidx.health.services.client.data.DataType DISTANCE;
+ field public static final androidx.health.services.client.data.DataType ELEVATION_GAIN;
+ field public static final androidx.health.services.client.data.DataType ELEVATION_LOSS;
+ field public static final androidx.health.services.client.data.DataType FLAT_GROUND_DISTANCE;
+ field public static final androidx.health.services.client.data.DataType FLAT_GROUND_DURATION;
+ field public static final androidx.health.services.client.data.DataType FLOORS;
+ field public static final androidx.health.services.client.data.DataType HEART_RATE_BPM;
+ field public static final androidx.health.services.client.data.DataType INCLINE_DISTANCE;
+ field public static final androidx.health.services.client.data.DataType INCLINE_DURATION;
+ field public static final androidx.health.services.client.data.DataType LOCATION;
+ field public static final androidx.health.services.client.data.DataType PACE;
+ field public static final androidx.health.services.client.data.DataType REP_COUNT;
+ field public static final androidx.health.services.client.data.DataType RESTING_EXERCISE_DURATION;
+ field public static final androidx.health.services.client.data.DataType RUNNING_STEPS;
+ field public static final androidx.health.services.client.data.DataType SPEED;
+ field public static final androidx.health.services.client.data.DataType SPO2;
+ field public static final androidx.health.services.client.data.DataType STEPS;
+ field public static final androidx.health.services.client.data.DataType STEPS_PER_MINUTE;
+ field public static final androidx.health.services.client.data.DataType SWIMMING_LAP_COUNT;
+ field public static final androidx.health.services.client.data.DataType SWIMMING_STROKES;
+ field public static final androidx.health.services.client.data.DataType TOTAL_CALORIES;
+ field public static final androidx.health.services.client.data.DataType VO2;
+ field public static final androidx.health.services.client.data.DataType VO2_MAX;
+ field public static final androidx.health.services.client.data.DataType WALKING_STEPS;
+ }
+
+ public static final class DataType.Companion {
+ }
+
+ public static final class DataType.TimeType {
+ method public int getId();
+ method public String getName();
+ property public final int id;
+ property public final String name;
+ field public static final androidx.health.services.client.data.DataType.TimeType.Companion Companion;
+ field public static final androidx.health.services.client.data.DataType.TimeType INTERVAL;
+ field public static final androidx.health.services.client.data.DataType.TimeType SAMPLE;
+ }
+
+ public static final class DataType.TimeType.Companion {
+ }
+
+ public final class DataTypeAvailability implements androidx.health.services.client.data.Availability {
+ method public static androidx.health.services.client.data.DataTypeAvailability? fromId(int id);
+ method public int getId();
+ method public String getName();
+ property public int id;
+ property public final String name;
+ field public static final androidx.health.services.client.data.DataTypeAvailability ACQUIRING;
+ field public static final androidx.health.services.client.data.DataTypeAvailability AVAILABLE;
+ field public static final androidx.health.services.client.data.DataTypeAvailability.Companion Companion;
+ field public static final androidx.health.services.client.data.DataTypeAvailability UNAVAILABLE;
+ field public static final androidx.health.services.client.data.DataTypeAvailability UNAVAILABLE_DEVICE_OFF_BODY;
+ field public static final androidx.health.services.client.data.DataTypeAvailability UNKNOWN;
+ }
+
+ public static final class DataTypeAvailability.Companion {
+ method public androidx.health.services.client.data.DataTypeAvailability? fromId(int id);
+ }
+
+ public final class DataTypeCondition extends androidx.health.services.client.data.ProtoParcelable<androidx.health.services.client.proto.DataProto.DataTypeCondition> {
+ ctor public DataTypeCondition(androidx.health.services.client.data.DataType dataType, androidx.health.services.client.data.Value threshold, androidx.health.services.client.data.ComparisonType comparisonType);
+ method public androidx.health.services.client.data.ComparisonType getComparisonType();
+ method public androidx.health.services.client.data.DataType getDataType();
+ method public androidx.health.services.client.proto.DataProto.DataTypeCondition getProto();
+ method public androidx.health.services.client.data.Value getThreshold();
+ method public boolean isSatisfied(androidx.health.services.client.data.DataPoint dataPoint);
+ method public boolean isThresholdSatisfied(androidx.health.services.client.data.Value value);
+ property public final androidx.health.services.client.data.ComparisonType comparisonType;
+ property public final androidx.health.services.client.data.DataType dataType;
+ property public final androidx.health.services.client.data.Value threshold;
+ field public static final android.os.Parcelable.Creator<androidx.health.services.client.data.DataTypeCondition> CREATOR;
+ field public static final androidx.health.services.client.data.DataTypeCondition.Companion Companion;
+ }
+
+ public static final class DataTypeCondition.Companion {
+ }
+
+ public final class DataTypes {
+ method public static boolean isCumulativeDataType(androidx.health.services.client.data.DataType dataType);
+ method public static boolean isStatisticalDataType(androidx.health.services.client.data.DataType dataType);
+ field public static final androidx.health.services.client.data.DataTypes INSTANCE;
+ }
+
+ public final class ExerciseCapabilities extends androidx.health.services.client.data.ProtoParcelable<androidx.health.services.client.proto.DataProto.ExerciseCapabilities> {
+ ctor public ExerciseCapabilities(java.util.Map<androidx.health.services.client.data.ExerciseType,androidx.health.services.client.data.ExerciseTypeCapabilities> typeToCapabilities);
+ method public java.util.Set<androidx.health.services.client.data.ExerciseType> getAutoPauseAndResumeEnabledExercises();
+ method public androidx.health.services.client.data.ExerciseTypeCapabilities getExerciseTypeCapabilities(androidx.health.services.client.data.ExerciseType exercise);
+ method public androidx.health.services.client.proto.DataProto.ExerciseCapabilities getProto();
+ method public java.util.Set<androidx.health.services.client.data.ExerciseType> getSupportedExerciseTypes();
+ method public java.util.Map<androidx.health.services.client.data.ExerciseType,androidx.health.services.client.data.ExerciseTypeCapabilities> getTypeToCapabilities();
+ property public final java.util.Set<androidx.health.services.client.data.ExerciseType> autoPauseAndResumeEnabledExercises;
+ property public final java.util.Set<androidx.health.services.client.data.ExerciseType> supportedExerciseTypes;
+ property public final java.util.Map<androidx.health.services.client.data.ExerciseType,androidx.health.services.client.data.ExerciseTypeCapabilities> typeToCapabilities;
+ field public static final android.os.Parcelable.Creator<androidx.health.services.client.data.ExerciseCapabilities> CREATOR;
+ field public static final androidx.health.services.client.data.ExerciseCapabilities.Companion Companion;
+ }
+
+ public static final class ExerciseCapabilities.Companion {
+ }
+
+ public final class ExerciseConfig extends androidx.health.services.client.data.ProtoParcelable<androidx.health.services.client.proto.DataProto.ExerciseConfig> {
+ ctor public ExerciseConfig(androidx.health.services.client.data.ExerciseType exerciseType, java.util.Set<androidx.health.services.client.data.DataType> dataTypes, java.util.Set<androidx.health.services.client.data.DataType> aggregateDataTypes, boolean isAutoPauseAndResumeEnabled, boolean isGpsEnabled, java.util.List<androidx.health.services.client.data.ExerciseGoal> exerciseGoals, android.os.Bundle exerciseParams);
+ method public static androidx.health.services.client.data.ExerciseConfig.Builder builder();
+ method public java.util.Set<androidx.health.services.client.data.DataType> getAggregateDataTypes();
+ method public java.util.Set<androidx.health.services.client.data.DataType> getDataTypes();
+ method public java.util.List<androidx.health.services.client.data.ExerciseGoal> getExerciseGoals();
+ method public android.os.Bundle getExerciseParams();
+ method public androidx.health.services.client.data.ExerciseType getExerciseType();
+ method public androidx.health.services.client.proto.DataProto.ExerciseConfig getProto();
+ method public boolean isAutoPauseAndResumeEnabled();
+ method public boolean isGpsEnabled();
+ property public final java.util.Set<androidx.health.services.client.data.DataType> aggregateDataTypes;
+ property public final java.util.Set<androidx.health.services.client.data.DataType> dataTypes;
+ property public final java.util.List<androidx.health.services.client.data.ExerciseGoal> exerciseGoals;
+ property public final android.os.Bundle exerciseParams;
+ property public final androidx.health.services.client.data.ExerciseType exerciseType;
+ property public final boolean isAutoPauseAndResumeEnabled;
+ property public final boolean isGpsEnabled;
+ field public static final android.os.Parcelable.Creator<androidx.health.services.client.data.ExerciseConfig> CREATOR;
+ field public static final androidx.health.services.client.data.ExerciseConfig.Companion Companion;
+ }
+
+ public static final class ExerciseConfig.Builder {
+ ctor public ExerciseConfig.Builder();
+ method public androidx.health.services.client.data.ExerciseConfig build();
+ method public androidx.health.services.client.data.ExerciseConfig.Builder setAggregateDataTypes(java.util.Set<androidx.health.services.client.data.DataType> dataTypes);
+ method public androidx.health.services.client.data.ExerciseConfig.Builder setDataTypes(java.util.Set<androidx.health.services.client.data.DataType> dataTypes);
+ method public androidx.health.services.client.data.ExerciseConfig.Builder setExerciseGoals(java.util.List<androidx.health.services.client.data.ExerciseGoal> exerciseGoals);
+ method public androidx.health.services.client.data.ExerciseConfig.Builder setExerciseParams(android.os.Bundle exerciseParams);
+ method public androidx.health.services.client.data.ExerciseConfig.Builder setExerciseType(androidx.health.services.client.data.ExerciseType exerciseType);
+ method public androidx.health.services.client.data.ExerciseConfig.Builder setIsAutoPauseAndResumeEnabled(boolean autoPauseAndResumeEnabled);
+ method public androidx.health.services.client.data.ExerciseConfig.Builder setIsGpsEnabled(boolean gpsEnabled);
+ }
+
+ public static final class ExerciseConfig.Companion {
+ method public androidx.health.services.client.data.ExerciseConfig.Builder builder();
+ }
+
+ public final class ExerciseGoal extends androidx.health.services.client.data.ProtoParcelable<androidx.health.services.client.proto.DataProto.ExerciseGoal> {
+ method public static androidx.health.services.client.data.ExerciseGoal createMilestone(androidx.health.services.client.data.DataTypeCondition condition, androidx.health.services.client.data.Value period);
+ method public static androidx.health.services.client.data.ExerciseGoal createMilestoneGoalWithUpdatedThreshold(androidx.health.services.client.data.ExerciseGoal goal, androidx.health.services.client.data.Value newThreshold);
+ method public static androidx.health.services.client.data.ExerciseGoal createOneTimeGoal(androidx.health.services.client.data.DataTypeCondition condition);
+ method public androidx.health.services.client.data.DataTypeCondition getDataTypeCondition();
+ method public androidx.health.services.client.data.ExerciseGoalType getExerciseGoalType();
+ method public androidx.health.services.client.data.Value? getPeriod();
+ method public androidx.health.services.client.proto.DataProto.ExerciseGoal getProto();
+ property public final androidx.health.services.client.data.DataTypeCondition dataTypeCondition;
+ property public final androidx.health.services.client.data.ExerciseGoalType exerciseGoalType;
+ property public final androidx.health.services.client.data.Value? period;
+ field public static final android.os.Parcelable.Creator<androidx.health.services.client.data.ExerciseGoal> CREATOR;
+ field public static final androidx.health.services.client.data.ExerciseGoal.Companion Companion;
+ }
+
+ public static final class ExerciseGoal.Companion {
+ method public androidx.health.services.client.data.ExerciseGoal createMilestone(androidx.health.services.client.data.DataTypeCondition condition, androidx.health.services.client.data.Value period);
+ method public androidx.health.services.client.data.ExerciseGoal createMilestoneGoalWithUpdatedThreshold(androidx.health.services.client.data.ExerciseGoal goal, androidx.health.services.client.data.Value newThreshold);
+ method public androidx.health.services.client.data.ExerciseGoal createOneTimeGoal(androidx.health.services.client.data.DataTypeCondition condition);
+ }
+
+ public final class ExerciseGoalType {
+ method public static androidx.health.services.client.data.ExerciseGoalType? fromId(int id);
+ method public int getId();
+ method public String getName();
+ property public final int id;
+ property public final String name;
+ field public static final androidx.health.services.client.data.ExerciseGoalType.Companion Companion;
+ field public static final androidx.health.services.client.data.ExerciseGoalType MILESTONE;
+ field public static final androidx.health.services.client.data.ExerciseGoalType ONE_TIME_GOAL;
+ }
+
+ public static final class ExerciseGoalType.Companion {
+ method public androidx.health.services.client.data.ExerciseGoalType? fromId(int id);
+ }
+
+ public final class ExerciseInfo extends androidx.health.services.client.data.ProtoParcelable<androidx.health.services.client.proto.DataProto.ExerciseInfo> {
+ ctor public ExerciseInfo(int exerciseTrackedStatus, androidx.health.services.client.data.ExerciseType exerciseType);
+ method public int getExerciseTrackedStatus();
+ method public androidx.health.services.client.data.ExerciseType getExerciseType();
+ method public androidx.health.services.client.proto.DataProto.ExerciseInfo getProto();
+ property public final int exerciseTrackedStatus;
+ property public final androidx.health.services.client.data.ExerciseType exerciseType;
+ field public static final android.os.Parcelable.Creator<androidx.health.services.client.data.ExerciseInfo> CREATOR;
+ field public static final androidx.health.services.client.data.ExerciseInfo.Companion Companion;
+ }
+
+ public static final class ExerciseInfo.Companion {
+ }
+
+ public final class ExerciseLapSummary extends androidx.health.services.client.data.ProtoParcelable<androidx.health.services.client.proto.DataProto.ExerciseLapSummary> {
+ ctor public ExerciseLapSummary(int lapCount, java.time.Instant startTime, java.time.Instant endTime, java.time.Duration activeDuration, java.util.Map<androidx.health.services.client.data.DataType,? extends androidx.health.services.client.data.AggregateDataPoint> lapMetrics);
+ method public java.time.Duration getActiveDuration();
+ method public java.time.Instant getEndTime();
+ method public int getLapCount();
+ method public java.util.Map<androidx.health.services.client.data.DataType,androidx.health.services.client.data.AggregateDataPoint> getLapMetrics();
+ method public androidx.health.services.client.proto.DataProto.ExerciseLapSummary getProto();
+ method public java.time.Instant getStartTime();
+ property public final java.time.Duration activeDuration;
+ property public final java.time.Instant endTime;
+ property public final int lapCount;
+ property public final java.util.Map<androidx.health.services.client.data.DataType,androidx.health.services.client.data.AggregateDataPoint> lapMetrics;
+ property public final java.time.Instant startTime;
+ field public static final android.os.Parcelable.Creator<androidx.health.services.client.data.ExerciseLapSummary> CREATOR;
+ field public static final androidx.health.services.client.data.ExerciseLapSummary.Companion Companion;
+ }
+
+ public static final class ExerciseLapSummary.Companion {
+ }
+
+ public final class ExerciseState {
+ method public static androidx.health.services.client.data.ExerciseState? fromId(int id);
+ method public int getId();
+ method public String getName();
+ method public boolean isEnded();
+ method public boolean isEnding();
+ method public boolean isPaused();
+ method public boolean isResuming();
+ property public final int id;
+ property public final boolean isEnded;
+ property public final boolean isEnding;
+ property public final boolean isPaused;
+ property public final boolean isResuming;
+ property public final String name;
+ field public static final androidx.health.services.client.data.ExerciseState ACTIVE;
+ field public static final androidx.health.services.client.data.ExerciseState AUTO_ENDED;
+ field public static final androidx.health.services.client.data.ExerciseState AUTO_ENDED_PERMISSION_LOST;
+ field public static final androidx.health.services.client.data.ExerciseState AUTO_ENDING;
+ field public static final androidx.health.services.client.data.ExerciseState AUTO_ENDING_PERMISSION_LOST;
+ field public static final androidx.health.services.client.data.ExerciseState AUTO_PAUSED;
+ field public static final androidx.health.services.client.data.ExerciseState AUTO_PAUSING;
+ field public static final androidx.health.services.client.data.ExerciseState AUTO_RESUMING;
+ field public static final androidx.health.services.client.data.ExerciseState.Companion Companion;
+ field public static final androidx.health.services.client.data.ExerciseState PREPARING;
+ field public static final androidx.health.services.client.data.ExerciseState TERMINATED;
+ field public static final androidx.health.services.client.data.ExerciseState TERMINATING;
+ field public static final androidx.health.services.client.data.ExerciseState USER_ENDED;
+ field public static final androidx.health.services.client.data.ExerciseState USER_ENDING;
+ field public static final androidx.health.services.client.data.ExerciseState USER_PAUSED;
+ field public static final androidx.health.services.client.data.ExerciseState USER_PAUSING;
+ field public static final androidx.health.services.client.data.ExerciseState USER_RESUMING;
+ field public static final androidx.health.services.client.data.ExerciseState USER_STARTING;
+ }
+
+ public static final class ExerciseState.Companion {
+ method public androidx.health.services.client.data.ExerciseState? fromId(int id);
+ }
+
+ public final class ExerciseType {
+ method public static androidx.health.services.client.data.ExerciseType fromId(int id);
+ method public int getId();
+ method public String getName();
+ property public final int id;
+ property public final String name;
+ field public static final androidx.health.services.client.data.ExerciseType ALPINE_SKIING;
+ field public static final androidx.health.services.client.data.ExerciseType BACKPACKING;
+ field public static final androidx.health.services.client.data.ExerciseType BACK_EXTENSION;
+ field public static final androidx.health.services.client.data.ExerciseType BADMINTON;
+ field public static final androidx.health.services.client.data.ExerciseType BARBELL_SHOULDER_PRESS;
+ field public static final androidx.health.services.client.data.ExerciseType BASEBALL;
+ field public static final androidx.health.services.client.data.ExerciseType BASKETBALL;
+ field public static final androidx.health.services.client.data.ExerciseType BENCH_PRESS;
+ field public static final androidx.health.services.client.data.ExerciseType BENCH_SIT_UP;
+ field public static final androidx.health.services.client.data.ExerciseType BIKING;
+ field public static final androidx.health.services.client.data.ExerciseType BIKING_STATIONARY;
+ field public static final androidx.health.services.client.data.ExerciseType BOOT_CAMP;
+ field public static final androidx.health.services.client.data.ExerciseType BOXING;
+ field public static final androidx.health.services.client.data.ExerciseType BURPEE;
+ field public static final androidx.health.services.client.data.ExerciseType CALISTHENICS;
+ field public static final androidx.health.services.client.data.ExerciseType CRICKET;
+ field public static final androidx.health.services.client.data.ExerciseType CROSS_COUNTRY_SKIING;
+ field public static final androidx.health.services.client.data.ExerciseType CRUNCH;
+ field public static final androidx.health.services.client.data.ExerciseType.Companion Companion;
+ field public static final androidx.health.services.client.data.ExerciseType DANCING;
+ field public static final androidx.health.services.client.data.ExerciseType DEADLIFT;
+ field public static final androidx.health.services.client.data.ExerciseType DUMBBELL_CURL_LEFT_ARM;
+ field public static final androidx.health.services.client.data.ExerciseType DUMBBELL_CURL_RIGHT_ARM;
+ field public static final androidx.health.services.client.data.ExerciseType DUMBBELL_FRONT_RAISE;
+ field public static final androidx.health.services.client.data.ExerciseType DUMBBELL_LATERAL_RAISE;
+ field public static final androidx.health.services.client.data.ExerciseType DUMBBELL_TRICEPS_EXTENSION_LEFT_ARM;
+ field public static final androidx.health.services.client.data.ExerciseType DUMBBELL_TRICEPS_EXTENSION_RIGHT_ARM;
+ field public static final androidx.health.services.client.data.ExerciseType DUMBBELL_TRICEPS_EXTENSION_TWO_ARM;
+ field public static final androidx.health.services.client.data.ExerciseType ELLIPTICAL;
+ field public static final androidx.health.services.client.data.ExerciseType EXERCISE_CLASS;
+ field public static final androidx.health.services.client.data.ExerciseType FENCING;
+ field public static final androidx.health.services.client.data.ExerciseType FOOTBALL_AMERICAN;
+ field public static final androidx.health.services.client.data.ExerciseType FOOTBALL_AUSTRALIAN;
+ field public static final androidx.health.services.client.data.ExerciseType FORWARD_TWIST;
+ field public static final androidx.health.services.client.data.ExerciseType FRISBEE_DISC;
+ field public static final androidx.health.services.client.data.ExerciseType GOLF;
+ field public static final androidx.health.services.client.data.ExerciseType GUIDED_BREATHING;
+ field public static final androidx.health.services.client.data.ExerciseType GYMNASTICS;
+ field public static final androidx.health.services.client.data.ExerciseType HANDBALL;
+ field public static final androidx.health.services.client.data.ExerciseType HIGH_INTENSITY_INTERVAL_TRAINING;
+ field public static final androidx.health.services.client.data.ExerciseType HIKING;
+ field public static final androidx.health.services.client.data.ExerciseType HORSE_RIDING;
+ field public static final androidx.health.services.client.data.ExerciseType ICE_HOCKEY;
+ field public static final androidx.health.services.client.data.ExerciseType ICE_SKATING;
+ field public static final androidx.health.services.client.data.ExerciseType INLINE_SKATING;
+ field public static final androidx.health.services.client.data.ExerciseType JUMPING_JACK;
+ field public static final androidx.health.services.client.data.ExerciseType JUMP_ROPE;
+ field public static final androidx.health.services.client.data.ExerciseType LAT_PULL_DOWN;
+ field public static final androidx.health.services.client.data.ExerciseType LUNGE;
+ field public static final androidx.health.services.client.data.ExerciseType MARTIAL_ARTS;
+ field public static final androidx.health.services.client.data.ExerciseType MEDITATION;
+ field public static final androidx.health.services.client.data.ExerciseType MOUNTAIN_BIKING;
+ field public static final androidx.health.services.client.data.ExerciseType ORIENTEERING;
+ field public static final androidx.health.services.client.data.ExerciseType PADDLING;
+ field public static final androidx.health.services.client.data.ExerciseType PARA_GLIDING;
+ field public static final androidx.health.services.client.data.ExerciseType PILATES;
+ field public static final androidx.health.services.client.data.ExerciseType PLANK;
+ field public static final androidx.health.services.client.data.ExerciseType RACQUETBALL;
+ field public static final androidx.health.services.client.data.ExerciseType ROCK_CLIMBING;
+ field public static final androidx.health.services.client.data.ExerciseType ROLLER_HOCKEY;
+ field public static final androidx.health.services.client.data.ExerciseType ROLLER_SKATING;
+ field public static final androidx.health.services.client.data.ExerciseType ROWING;
+ field public static final androidx.health.services.client.data.ExerciseType ROWING_MACHINE;
+ field public static final androidx.health.services.client.data.ExerciseType RUGBY;
+ field public static final androidx.health.services.client.data.ExerciseType RUNNING;
+ field public static final androidx.health.services.client.data.ExerciseType RUNNING_TREADMILL;
+ field public static final androidx.health.services.client.data.ExerciseType SAILING;
+ field public static final androidx.health.services.client.data.ExerciseType SCUBA_DIVING;
+ field public static final androidx.health.services.client.data.ExerciseType SKATING;
+ field public static final androidx.health.services.client.data.ExerciseType SKIING;
+ field public static final androidx.health.services.client.data.ExerciseType SNOWBOARDING;
+ field public static final androidx.health.services.client.data.ExerciseType SNOWSHOEING;
+ field public static final androidx.health.services.client.data.ExerciseType SOCCER;
+ field public static final androidx.health.services.client.data.ExerciseType SOFTBALL;
+ field public static final androidx.health.services.client.data.ExerciseType SQUASH;
+ field public static final androidx.health.services.client.data.ExerciseType SQUAT;
+ field public static final androidx.health.services.client.data.ExerciseType STAIR_CLIMBING;
+ field public static final androidx.health.services.client.data.ExerciseType STAIR_CLIMBING_MACHINE;
+ field public static final androidx.health.services.client.data.ExerciseType STRENGTH_TRAINING;
+ field public static final androidx.health.services.client.data.ExerciseType STRETCHING;
+ field public static final androidx.health.services.client.data.ExerciseType SURFING;
+ field public static final androidx.health.services.client.data.ExerciseType SWIMMING_OPEN_WATER;
+ field public static final androidx.health.services.client.data.ExerciseType SWIMMING_POOL;
+ field public static final androidx.health.services.client.data.ExerciseType TABLE_TENNIS;
+ field public static final androidx.health.services.client.data.ExerciseType TENNIS;
+ field public static final androidx.health.services.client.data.ExerciseType UNKNOWN;
+ field public static final androidx.health.services.client.data.ExerciseType UPPER_TWIST;
+ field public static final androidx.health.services.client.data.ExerciseType VOLLEYBALL;
+ field public static final androidx.health.services.client.data.ExerciseType WALKING;
+ field public static final androidx.health.services.client.data.ExerciseType WATER_POLO;
+ field public static final androidx.health.services.client.data.ExerciseType WEIGHTLIFTING;
+ field public static final androidx.health.services.client.data.ExerciseType WORKOUT;
+ field public static final androidx.health.services.client.data.ExerciseType YACHTING;
+ field public static final androidx.health.services.client.data.ExerciseType YOGA;
+ }
+
+ public static final class ExerciseType.Companion {
+ method public androidx.health.services.client.data.ExerciseType fromId(int id);
+ }
+
+ public final class ExerciseTypeCapabilities extends androidx.health.services.client.data.ProtoParcelable<androidx.health.services.client.proto.DataProto.ExerciseTypeCapabilities> {
+ ctor public ExerciseTypeCapabilities(java.util.Set<androidx.health.services.client.data.DataType> supportedDataTypes, java.util.Map<androidx.health.services.client.data.DataType,? extends java.util.Set<androidx.health.services.client.data.ComparisonType>> supportedGoals, java.util.Map<androidx.health.services.client.data.DataType,? extends java.util.Set<androidx.health.services.client.data.ComparisonType>> supportedMilestones, boolean supportsAutoPauseAndResume, boolean supportsLaps);
+ method public androidx.health.services.client.proto.DataProto.ExerciseTypeCapabilities getProto();
+ method public java.util.Set<androidx.health.services.client.data.DataType> getSupportedDataTypes();
+ method public java.util.Map<androidx.health.services.client.data.DataType,java.util.Set<androidx.health.services.client.data.ComparisonType>> getSupportedGoals();
+ method public java.util.Map<androidx.health.services.client.data.DataType,java.util.Set<androidx.health.services.client.data.ComparisonType>> getSupportedMilestones();
+ method public boolean getSupportsAutoPauseAndResume();
+ method public boolean getSupportsLaps();
+ property public final java.util.Set<androidx.health.services.client.data.DataType> supportedDataTypes;
+ property public final java.util.Map<androidx.health.services.client.data.DataType,java.util.Set<androidx.health.services.client.data.ComparisonType>> supportedGoals;
+ property public final java.util.Map<androidx.health.services.client.data.DataType,java.util.Set<androidx.health.services.client.data.ComparisonType>> supportedMilestones;
+ property public final boolean supportsAutoPauseAndResume;
+ property public final boolean supportsLaps;
+ field public static final android.os.Parcelable.Creator<androidx.health.services.client.data.ExerciseTypeCapabilities> CREATOR;
+ field public static final androidx.health.services.client.data.ExerciseTypeCapabilities.Companion Companion;
+ }
+
+ public static final class ExerciseTypeCapabilities.Companion {
+ }
+
+ public final class ExerciseUpdate extends androidx.health.services.client.data.ProtoParcelable<androidx.health.services.client.proto.DataProto.ExerciseUpdate> {
+ ctor public ExerciseUpdate(androidx.health.services.client.data.ExerciseState state, java.time.Instant? startTime, java.time.Duration activeDuration, java.time.Duration? updateDurationFromBoot, java.util.Map<androidx.health.services.client.data.DataType,? extends java.util.List<androidx.health.services.client.data.DataPoint>> latestMetrics, java.util.Map<androidx.health.services.client.data.DataType,? extends androidx.health.services.client.data.AggregateDataPoint> latestAggregateMetrics, java.util.Set<androidx.health.services.client.data.AchievedExerciseGoal> latestAchievedGoals, java.util.Set<androidx.health.services.client.data.MilestoneMarkerSummary> latestMilestoneMarkerSummaries, androidx.health.services.client.data.ExerciseConfig? exerciseConfig, androidx.health.services.client.data.ExerciseUpdate.ActiveDurationCheckpoint? activeDurationCheckpoint);
+ method public java.time.Duration getActiveDuration();
+ method public java.time.Duration getActiveDurationAtDataPoint(androidx.health.services.client.data.DataPoint dataPoint);
+ method public androidx.health.services.client.data.ExerciseUpdate.ActiveDurationCheckpoint? getActiveDurationCheckpoint();
+ method public androidx.health.services.client.data.ExerciseConfig? getExerciseConfig();
+ method public java.util.Set<androidx.health.services.client.data.AchievedExerciseGoal> getLatestAchievedGoals();
+ method public java.util.Map<androidx.health.services.client.data.DataType,androidx.health.services.client.data.AggregateDataPoint> getLatestAggregateMetrics();
+ method public java.util.Map<androidx.health.services.client.data.DataType,java.util.List<androidx.health.services.client.data.DataPoint>> getLatestMetrics();
+ method public java.util.Set<androidx.health.services.client.data.MilestoneMarkerSummary> getLatestMilestoneMarkerSummaries();
+ method public androidx.health.services.client.proto.DataProto.ExerciseUpdate getProto();
+ method public java.time.Instant? getStartTime();
+ method public androidx.health.services.client.data.ExerciseState getState();
+ property public final java.time.Duration activeDuration;
+ property public final androidx.health.services.client.data.ExerciseUpdate.ActiveDurationCheckpoint? activeDurationCheckpoint;
+ property public final androidx.health.services.client.data.ExerciseConfig? exerciseConfig;
+ property public final java.util.Set<androidx.health.services.client.data.AchievedExerciseGoal> latestAchievedGoals;
+ property public final java.util.Map<androidx.health.services.client.data.DataType,androidx.health.services.client.data.AggregateDataPoint> latestAggregateMetrics;
+ property public final java.util.Map<androidx.health.services.client.data.DataType,java.util.List<androidx.health.services.client.data.DataPoint>> latestMetrics;
+ property public final java.util.Set<androidx.health.services.client.data.MilestoneMarkerSummary> latestMilestoneMarkerSummaries;
+ property public final java.time.Instant? startTime;
+ property public final androidx.health.services.client.data.ExerciseState state;
+ field public static final android.os.Parcelable.Creator<androidx.health.services.client.data.ExerciseUpdate> CREATOR;
+ field public static final androidx.health.services.client.data.ExerciseUpdate.Companion Companion;
+ }
+
+ public static final class ExerciseUpdate.ActiveDurationCheckpoint {
+ ctor public ExerciseUpdate.ActiveDurationCheckpoint(java.time.Instant time, java.time.Duration activeDuration);
+ method public java.time.Duration getActiveDuration();
+ method public java.time.Instant getTime();
+ property public final java.time.Duration activeDuration;
+ property public final java.time.Instant time;
+ }
+
+ public static final class ExerciseUpdate.Companion {
+ }
+
+ public final class HeartRateAccuracy extends androidx.health.services.client.data.DataPointAccuracy {
+ ctor public HeartRateAccuracy(androidx.health.services.client.data.HeartRateAccuracy.SensorStatus sensorStatus);
+ method public androidx.health.services.client.proto.DataProto.DataPointAccuracy getProto();
+ method public androidx.health.services.client.data.HeartRateAccuracy.SensorStatus getSensorStatus();
+ property public final androidx.health.services.client.data.HeartRateAccuracy.SensorStatus sensorStatus;
+ field public static final android.os.Parcelable.Creator<androidx.health.services.client.data.HeartRateAccuracy> CREATOR;
+ field public static final androidx.health.services.client.data.HeartRateAccuracy.Companion Companion;
+ }
+
+ public static final class HeartRateAccuracy.Companion {
+ }
+
+ public static final class HeartRateAccuracy.SensorStatus {
+ method public int getId();
+ method public String getName();
+ property public final int id;
+ property public final String name;
+ field public static final androidx.health.services.client.data.HeartRateAccuracy.SensorStatus ACCURACY_HIGH;
+ field public static final androidx.health.services.client.data.HeartRateAccuracy.SensorStatus ACCURACY_LOW;
+ field public static final androidx.health.services.client.data.HeartRateAccuracy.SensorStatus ACCURACY_MEDIUM;
+ field public static final androidx.health.services.client.data.HeartRateAccuracy.SensorStatus.Companion Companion;
+ field public static final androidx.health.services.client.data.HeartRateAccuracy.SensorStatus NO_CONTACT;
+ field public static final androidx.health.services.client.data.HeartRateAccuracy.SensorStatus UNKNOWN;
+ field public static final androidx.health.services.client.data.HeartRateAccuracy.SensorStatus UNRELIABLE;
+ }
+
+ public static final class HeartRateAccuracy.SensorStatus.Companion {
+ }
+
+ public final class LocationAccuracy extends androidx.health.services.client.data.DataPointAccuracy {
+ ctor public LocationAccuracy(double horizontalPositionErrorMeters, optional double verticalPositionErrorMeters);
+ ctor public LocationAccuracy(double horizontalPositionErrorMeters);
+ method public double getHorizontalPositionErrorMeters();
+ method public androidx.health.services.client.proto.DataProto.DataPointAccuracy getProto();
+ property public final double horizontalPositionErrorMeters;
+ field public static final android.os.Parcelable.Creator<androidx.health.services.client.data.LocationAccuracy> CREATOR;
+ field public static final androidx.health.services.client.data.LocationAccuracy.Companion Companion;
+ }
+
+ public static final class LocationAccuracy.Companion {
+ }
+
+ public final class LocationAvailability implements androidx.health.services.client.data.Availability {
+ method public static androidx.health.services.client.data.LocationAvailability? fromId(int id);
+ method public int getId();
+ method public String getName();
+ property public int id;
+ property public final String name;
+ field public static final androidx.health.services.client.data.LocationAvailability ACQUIRED_TETHERED;
+ field public static final androidx.health.services.client.data.LocationAvailability ACQUIRED_UNTETHERED;
+ field public static final androidx.health.services.client.data.LocationAvailability ACQUIRING;
+ field public static final androidx.health.services.client.data.LocationAvailability.Companion Companion;
+ field public static final androidx.health.services.client.data.LocationAvailability NO_GNSS;
+ field public static final androidx.health.services.client.data.LocationAvailability UNAVAILABLE;
+ field public static final androidx.health.services.client.data.LocationAvailability UNKNOWN;
+ }
+
+ public static final class LocationAvailability.Companion {
+ method public androidx.health.services.client.data.LocationAvailability? fromId(int id);
+ }
+
+ public final class MeasureCapabilities extends androidx.health.services.client.data.ProtoParcelable<androidx.health.services.client.proto.DataProto.MeasureCapabilities> {
+ ctor public MeasureCapabilities(java.util.Set<androidx.health.services.client.data.DataType> supportedDataTypesMeasure);
+ method public androidx.health.services.client.proto.DataProto.MeasureCapabilities getProto();
+ method public java.util.Set<androidx.health.services.client.data.DataType> getSupportedDataTypesMeasure();
+ property public final java.util.Set<androidx.health.services.client.data.DataType> supportedDataTypesMeasure;
+ field public static final android.os.Parcelable.Creator<androidx.health.services.client.data.MeasureCapabilities> CREATOR;
+ field public static final androidx.health.services.client.data.MeasureCapabilities.Companion Companion;
+ }
+
+ public static final class MeasureCapabilities.Companion {
+ }
+
+ public final class MilestoneMarkerSummary extends androidx.health.services.client.data.ProtoParcelable<androidx.health.services.client.proto.DataProto.MilestoneMarkerSummary> {
+ ctor public MilestoneMarkerSummary(java.time.Instant startTime, java.time.Instant endTime, java.time.Duration activeDuration, androidx.health.services.client.data.AchievedExerciseGoal achievedGoal, java.util.Map<androidx.health.services.client.data.DataType,? extends androidx.health.services.client.data.AggregateDataPoint> summaryMetrics);
+ method public androidx.health.services.client.data.AchievedExerciseGoal getAchievedGoal();
+ method public java.time.Duration getActiveDuration();
+ method public java.time.Instant getEndTime();
+ method public androidx.health.services.client.proto.DataProto.MilestoneMarkerSummary getProto();
+ method public java.time.Instant getStartTime();
+ method public java.util.Map<androidx.health.services.client.data.DataType,androidx.health.services.client.data.AggregateDataPoint> getSummaryMetrics();
+ property public final androidx.health.services.client.data.AchievedExerciseGoal achievedGoal;
+ property public final java.time.Duration activeDuration;
+ property public final java.time.Instant endTime;
+ property public final java.time.Instant startTime;
+ property public final java.util.Map<androidx.health.services.client.data.DataType,androidx.health.services.client.data.AggregateDataPoint> summaryMetrics;
+ field public static final android.os.Parcelable.Creator<androidx.health.services.client.data.MilestoneMarkerSummary> CREATOR;
+ field public static final androidx.health.services.client.data.MilestoneMarkerSummary.Companion Companion;
+ }
+
+ public static final class MilestoneMarkerSummary.Companion {
+ }
+
+ public final class PassiveGoal extends androidx.health.services.client.data.ProtoParcelable<androidx.health.services.client.proto.DataProto.PassiveGoal> {
+ ctor public PassiveGoal(androidx.health.services.client.data.DataTypeCondition dataTypeCondition, int triggerFrequency);
+ method public static androidx.health.services.client.data.PassiveGoal? fromIntent(android.content.Intent intent);
+ method public androidx.health.services.client.data.DataTypeCondition getDataTypeCondition();
+ method public androidx.health.services.client.proto.DataProto.PassiveGoal getProto();
+ method public int getTriggerFrequency();
+ method public boolean isTriggered(androidx.health.services.client.data.DataPoint dataPoint);
+ method public void putToIntent(android.content.Intent intent);
+ property public final androidx.health.services.client.data.DataTypeCondition dataTypeCondition;
+ property public final int triggerFrequency;
+ field public static final String ACTION_GOAL = "hs.passivemonitoring.GOAL";
+ field public static final android.os.Parcelable.Creator<androidx.health.services.client.data.PassiveGoal> CREATOR;
+ field public static final androidx.health.services.client.data.PassiveGoal.Companion Companion;
+ }
+
+ public static final class PassiveGoal.Companion {
+ method public androidx.health.services.client.data.PassiveGoal? fromIntent(android.content.Intent intent);
+ }
+
+ public final class PassiveMonitoringCapabilities extends androidx.health.services.client.data.ProtoParcelable<androidx.health.services.client.proto.DataProto.PassiveMonitoringCapabilities> {
+ ctor public PassiveMonitoringCapabilities(java.util.Set<androidx.health.services.client.data.DataType> supportedDataTypesPassiveMonitoring, java.util.Set<androidx.health.services.client.data.DataType> supportedDataTypesPassiveGoals, java.util.Set<androidx.health.services.client.data.UserActivityState> supportedUserActivityStates);
+ method public androidx.health.services.client.proto.DataProto.PassiveMonitoringCapabilities getProto();
+ method public java.util.Set<androidx.health.services.client.data.DataType> getSupportedDataTypesPassiveGoals();
+ method public java.util.Set<androidx.health.services.client.data.DataType> getSupportedDataTypesPassiveMonitoring();
+ property public final java.util.Set<androidx.health.services.client.data.DataType> supportedDataTypesPassiveGoals;
+ property public final java.util.Set<androidx.health.services.client.data.DataType> supportedDataTypesPassiveMonitoring;
+ field public static final android.os.Parcelable.Creator<androidx.health.services.client.data.PassiveMonitoringCapabilities> CREATOR;
+ field public static final androidx.health.services.client.data.PassiveMonitoringCapabilities.Companion Companion;
+ }
+
+ public static final class PassiveMonitoringCapabilities.Companion {
+ }
+
+ public final class PassiveMonitoringConfig extends androidx.health.services.client.data.ProtoParcelable<androidx.health.services.client.proto.DataProto.PassiveMonitoringConfig> {
+ ctor public PassiveMonitoringConfig(java.util.Set<androidx.health.services.client.data.DataType> dataTypes, android.content.ComponentName componentName, optional boolean requestUserActivityState);
+ method public static androidx.health.services.client.data.PassiveMonitoringConfig.Builder builder();
+ method public android.content.ComponentName getComponentName();
+ method public java.util.Set<androidx.health.services.client.data.DataType> getDataTypes();
+ method public androidx.health.services.client.proto.DataProto.PassiveMonitoringConfig getProto();
+ method public boolean getRequestUserActivityState();
+ property public final android.content.ComponentName componentName;
+ property public final java.util.Set<androidx.health.services.client.data.DataType> dataTypes;
+ property public final boolean requestUserActivityState;
+ field public static final android.os.Parcelable.Creator<androidx.health.services.client.data.PassiveMonitoringConfig> CREATOR;
+ field public static final androidx.health.services.client.data.PassiveMonitoringConfig.Companion Companion;
+ }
+
+ public static final class PassiveMonitoringConfig.Builder {
+ ctor public PassiveMonitoringConfig.Builder();
+ method public androidx.health.services.client.data.PassiveMonitoringConfig build();
+ method public androidx.health.services.client.data.PassiveMonitoringConfig.Builder setComponentName(android.content.ComponentName componentName);
+ method public androidx.health.services.client.data.PassiveMonitoringConfig.Builder setDataTypes(java.util.Set<androidx.health.services.client.data.DataType> dataTypes);
+ method public androidx.health.services.client.data.PassiveMonitoringConfig.Builder setRequestUserActivityState(boolean requestUserActivityState);
+ }
+
+ public static final class PassiveMonitoringConfig.Companion {
+ method public androidx.health.services.client.data.PassiveMonitoringConfig.Builder builder();
+ }
+
+ public final class PassiveMonitoringUpdate extends androidx.health.services.client.data.ProtoParcelable<androidx.health.services.client.proto.DataProto.PassiveMonitoringUpdate> {
+ ctor public PassiveMonitoringUpdate(java.util.List<androidx.health.services.client.data.DataPoint> dataPoints, java.util.List<androidx.health.services.client.data.UserActivityInfo> userActivityInfoUpdates);
+ method public static androidx.health.services.client.data.PassiveMonitoringUpdate? fromIntent(android.content.Intent intent);
+ method public java.util.List<androidx.health.services.client.data.DataPoint> getDataPoints();
+ method public androidx.health.services.client.proto.DataProto.PassiveMonitoringUpdate getProto();
+ method public java.util.List<androidx.health.services.client.data.UserActivityInfo> getUserActivityInfoUpdates();
+ method public void putToIntent(android.content.Intent intent);
+ property public final java.util.List<androidx.health.services.client.data.DataPoint> dataPoints;
+ property public final java.util.List<androidx.health.services.client.data.UserActivityInfo> userActivityInfoUpdates;
+ field public static final String ACTION_DATA = "hs.passivemonitoring.DATA";
+ field public static final android.os.Parcelable.Creator<androidx.health.services.client.data.PassiveMonitoringUpdate> CREATOR;
+ field public static final androidx.health.services.client.data.PassiveMonitoringUpdate.Companion Companion;
+ }
+
+ public static final class PassiveMonitoringUpdate.Companion {
+ method public androidx.health.services.client.data.PassiveMonitoringUpdate? fromIntent(android.content.Intent intent);
+ }
+
+ public abstract class ProtoParcelable<T extends com.google.protobuf.MessageLite> implements android.os.Parcelable {
+ ctor public ProtoParcelable();
+ method public int describeContents();
+ method protected final byte[] getBytes();
+ method public abstract T getProto();
+ method public void writeToParcel(android.os.Parcel dest, int flags);
+ property protected final byte[] bytes;
+ property public abstract T proto;
+ field public static final androidx.health.services.client.data.ProtoParcelable.Companion Companion;
+ }
+
+ public static final class ProtoParcelable.Companion {
+ }
+
+ public final class StatisticalDataPoint extends androidx.health.services.client.data.AggregateDataPoint {
+ ctor public StatisticalDataPoint(java.time.Instant startTime, java.time.Instant endTime, androidx.health.services.client.data.DataType dataType, androidx.health.services.client.data.Value min, androidx.health.services.client.data.Value max, androidx.health.services.client.data.Value average);
+ method public androidx.health.services.client.data.Value getAverage();
+ method public androidx.health.services.client.data.DataType getDataType();
+ method public java.time.Instant getEndTime();
+ method public androidx.health.services.client.data.Value getMax();
+ method public androidx.health.services.client.data.Value getMin();
+ method public androidx.health.services.client.proto.DataProto.AggregateDataPoint getProto();
+ method public java.time.Instant getStartTime();
+ property public final androidx.health.services.client.data.Value average;
+ property public final androidx.health.services.client.data.DataType dataType;
+ property public final java.time.Instant endTime;
+ property public final androidx.health.services.client.data.Value max;
+ property public final androidx.health.services.client.data.Value min;
+ property public final java.time.Instant startTime;
+ field public static final android.os.Parcelable.Creator<androidx.health.services.client.data.StatisticalDataPoint> CREATOR;
+ field public static final androidx.health.services.client.data.StatisticalDataPoint.Companion Companion;
+ }
+
+ public static final class StatisticalDataPoint.Companion {
+ }
+
+ public final class UserActivityInfo extends androidx.health.services.client.data.ProtoParcelable<androidx.health.services.client.proto.DataProto.UserActivityInfo> {
+ ctor public UserActivityInfo(androidx.health.services.client.data.UserActivityState userActivityState, androidx.health.services.client.data.ExerciseInfo? exerciseInfo, java.time.Instant stateChangeTime);
+ method public static androidx.health.services.client.data.UserActivityInfo createActiveExerciseState(androidx.health.services.client.data.ExerciseInfo exerciseInfo, java.time.Instant stateChangeTime);
+ method public static androidx.health.services.client.data.UserActivityInfo createAsleepState(java.time.Instant stateChangeTime);
+ method public static androidx.health.services.client.data.UserActivityInfo createPassiveActivityState(java.time.Instant stateChangeTime);
+ method public static androidx.health.services.client.data.UserActivityInfo createUnknownTypeState(java.time.Instant stateChangeTime);
+ method public androidx.health.services.client.data.ExerciseInfo? getExerciseInfo();
+ method public androidx.health.services.client.proto.DataProto.UserActivityInfo getProto();
+ method public java.time.Instant getStateChangeTime();
+ method public androidx.health.services.client.data.UserActivityState getUserActivityState();
+ property public final androidx.health.services.client.data.ExerciseInfo? exerciseInfo;
+ property public final java.time.Instant stateChangeTime;
+ property public final androidx.health.services.client.data.UserActivityState userActivityState;
+ field public static final android.os.Parcelable.Creator<androidx.health.services.client.data.UserActivityInfo> CREATOR;
+ field public static final androidx.health.services.client.data.UserActivityInfo.Companion Companion;
+ }
+
+ public static final class UserActivityInfo.Companion {
+ method public androidx.health.services.client.data.UserActivityInfo createActiveExerciseState(androidx.health.services.client.data.ExerciseInfo exerciseInfo, java.time.Instant stateChangeTime);
+ method public androidx.health.services.client.data.UserActivityInfo createAsleepState(java.time.Instant stateChangeTime);
+ method public androidx.health.services.client.data.UserActivityInfo createPassiveActivityState(java.time.Instant stateChangeTime);
+ method public androidx.health.services.client.data.UserActivityInfo createUnknownTypeState(java.time.Instant stateChangeTime);
+ }
+
+ public final class UserActivityState {
+ ctor public UserActivityState(int id, String name);
+ method public int getId();
+ method public String getName();
+ property public final int id;
+ property public final String name;
+ field public static final androidx.health.services.client.data.UserActivityState.Companion Companion;
+ field public static final androidx.health.services.client.data.UserActivityState USER_ACTIVITY_ASLEEP;
+ field public static final androidx.health.services.client.data.UserActivityState USER_ACTIVITY_EXERCISE;
+ field public static final androidx.health.services.client.data.UserActivityState USER_ACTIVITY_PASSIVE;
+ field public static final androidx.health.services.client.data.UserActivityState USER_ACTIVITY_UNKNOWN;
+ }
+
+ public static final class UserActivityState.Companion {
+ }
+
+ public final class Value extends androidx.health.services.client.data.ProtoParcelable<androidx.health.services.client.proto.DataProto.Value> {
+ method public boolean asBoolean();
+ method public double asDouble();
+ method public double[] asDoubleArray();
+ method public long asLong();
+ method public static int compare(androidx.health.services.client.data.Value first, androidx.health.services.client.data.Value second);
+ method public int getFormat();
+ method public androidx.health.services.client.proto.DataProto.Value getProto();
+ method public boolean isBoolean();
+ method public boolean isDouble();
+ method public boolean isDoubleArray();
+ method public boolean isLong();
+ method public static androidx.health.services.client.data.Value ofBoolean(boolean value);
+ method public static androidx.health.services.client.data.Value ofDouble(double value);
+ method public static androidx.health.services.client.data.Value ofDoubleArray(double... doubleArray);
+ method public static androidx.health.services.client.data.Value ofLong(long value);
+ method public static androidx.health.services.client.data.Value sum(androidx.health.services.client.data.Value first, androidx.health.services.client.data.Value second);
+ property public final int format;
+ property public final boolean isBoolean;
+ property public final boolean isDouble;
+ property public final boolean isDoubleArray;
+ property public final boolean isLong;
+ field public static final android.os.Parcelable.Creator<androidx.health.services.client.data.Value> CREATOR;
+ field public static final androidx.health.services.client.data.Value.Companion Companion;
+ field public static final int FORMAT_BOOLEAN = 4; // 0x4
+ field public static final int FORMAT_DOUBLE = 1; // 0x1
+ field public static final int FORMAT_DOUBLE_ARRAY = 3; // 0x3
+ field public static final int FORMAT_LONG = 2; // 0x2
+ }
+
+ public static final class Value.Companion {
+ method public int compare(androidx.health.services.client.data.Value first, androidx.health.services.client.data.Value second);
+ method public androidx.health.services.client.data.Value ofBoolean(boolean value);
+ method public androidx.health.services.client.data.Value ofDouble(double value);
+ method public androidx.health.services.client.data.Value ofDoubleArray(double... doubleArray);
+ method public androidx.health.services.client.data.Value ofLong(long value);
+ method public androidx.health.services.client.data.Value sum(androidx.health.services.client.data.Value first, androidx.health.services.client.data.Value second);
+ }
+
+ public final class WarmUpConfig extends androidx.health.services.client.data.ProtoParcelable<androidx.health.services.client.proto.DataProto.WarmUpConfig> {
+ ctor public WarmUpConfig(androidx.health.services.client.data.ExerciseType exerciseType, java.util.Set<androidx.health.services.client.data.DataType> dataTypes);
+ method public java.util.Set<androidx.health.services.client.data.DataType> getDataTypes();
+ method public androidx.health.services.client.data.ExerciseType getExerciseType();
+ method public androidx.health.services.client.proto.DataProto.WarmUpConfig getProto();
+ property public final java.util.Set<androidx.health.services.client.data.DataType> dataTypes;
+ property public final androidx.health.services.client.data.ExerciseType exerciseType;
+ field public static final android.os.Parcelable.Creator<androidx.health.services.client.data.WarmUpConfig> CREATOR;
+ field public static final androidx.health.services.client.data.WarmUpConfig.Companion Companion;
+ }
+
+ public static final class WarmUpConfig.Companion {
+ }
+
+}
+
diff --git a/health/health-services-client/api/public_plus_experimental_1.0.0-beta02.txt b/health/health-services-client/api/public_plus_experimental_1.0.0-beta02.txt
new file mode 100644
index 0000000..7c59c28
--- /dev/null
+++ b/health/health-services-client/api/public_plus_experimental_1.0.0-beta02.txt
@@ -0,0 +1,956 @@
+// Signature format: 4.0
+package androidx.health.services.client {
+
+ public interface ExerciseClient {
+ method public com.google.common.util.concurrent.ListenableFuture<java.lang.Void> addGoalToActiveExerciseAsync(androidx.health.services.client.data.ExerciseGoal exerciseGoal);
+ method public com.google.common.util.concurrent.ListenableFuture<java.lang.Void> clearUpdateCallbackAsync(androidx.health.services.client.ExerciseUpdateCallback callback);
+ method public com.google.common.util.concurrent.ListenableFuture<java.lang.Void> endExerciseAsync();
+ method public com.google.common.util.concurrent.ListenableFuture<java.lang.Void> flushExerciseAsync();
+ method public com.google.common.util.concurrent.ListenableFuture<androidx.health.services.client.data.ExerciseCapabilities> getCapabilities();
+ method public com.google.common.util.concurrent.ListenableFuture<androidx.health.services.client.data.ExerciseInfo> getCurrentExerciseInfoAsync();
+ method public com.google.common.util.concurrent.ListenableFuture<java.lang.Void> markLapAsync();
+ method public com.google.common.util.concurrent.ListenableFuture<java.lang.Void> overrideAutoPauseAndResumeForActiveExerciseAsync(boolean enabled);
+ method public com.google.common.util.concurrent.ListenableFuture<java.lang.Void> pauseExerciseAsync();
+ method public com.google.common.util.concurrent.ListenableFuture<java.lang.Void> prepareExerciseAsync(androidx.health.services.client.data.WarmUpConfig configuration);
+ method public com.google.common.util.concurrent.ListenableFuture<java.lang.Void> removeGoalFromActiveExerciseAsync(androidx.health.services.client.data.ExerciseGoal exerciseGoal);
+ method public com.google.common.util.concurrent.ListenableFuture<java.lang.Void> resumeExerciseAsync();
+ method public void setUpdateCallback(androidx.health.services.client.ExerciseUpdateCallback callback);
+ method public void setUpdateCallback(java.util.concurrent.Executor executor, androidx.health.services.client.ExerciseUpdateCallback callback);
+ method public com.google.common.util.concurrent.ListenableFuture<java.lang.Void> startExerciseAsync(androidx.health.services.client.data.ExerciseConfig configuration);
+ property public abstract com.google.common.util.concurrent.ListenableFuture<androidx.health.services.client.data.ExerciseCapabilities> capabilities;
+ }
+
+ public interface ExerciseUpdateCallback {
+ method public void onAvailabilityChanged(androidx.health.services.client.data.DataType dataType, androidx.health.services.client.data.Availability availability);
+ method public void onExerciseUpdateReceived(androidx.health.services.client.data.ExerciseUpdate update);
+ method public void onLapSummaryReceived(androidx.health.services.client.data.ExerciseLapSummary lapSummary);
+ method public void onRegistered();
+ method public void onRegistrationFailed(Throwable throwable);
+ }
+
+ public final class HealthServices {
+ method public static androidx.health.services.client.HealthServicesClient getClient(android.content.Context context);
+ field public static final androidx.health.services.client.HealthServices INSTANCE;
+ }
+
+ public interface HealthServicesClient {
+ method public androidx.health.services.client.ExerciseClient getExerciseClient();
+ method public androidx.health.services.client.MeasureClient getMeasureClient();
+ method public androidx.health.services.client.PassiveMonitoringClient getPassiveMonitoringClient();
+ property public abstract androidx.health.services.client.ExerciseClient exerciseClient;
+ property public abstract androidx.health.services.client.MeasureClient measureClient;
+ property public abstract androidx.health.services.client.PassiveMonitoringClient passiveMonitoringClient;
+ }
+
+ public interface MeasureCallback {
+ method public void onAvailabilityChanged(androidx.health.services.client.data.DataType dataType, androidx.health.services.client.data.Availability availability);
+ method public void onDataReceived(java.util.List<androidx.health.services.client.data.DataPoint> data);
+ method public default void onRegistered();
+ method public default void onRegistrationFailed(Throwable throwable);
+ }
+
+ public interface MeasureClient {
+ method public com.google.common.util.concurrent.ListenableFuture<androidx.health.services.client.data.MeasureCapabilities> getCapabilities();
+ method public void registerCallback(androidx.health.services.client.data.DataType dataType, androidx.health.services.client.MeasureCallback callback);
+ method public void registerCallback(androidx.health.services.client.data.DataType dataType, java.util.concurrent.Executor executor, androidx.health.services.client.MeasureCallback callback);
+ method public com.google.common.util.concurrent.ListenableFuture<java.lang.Void> unregisterCallbackAsync(androidx.health.services.client.data.DataType dataType, androidx.health.services.client.MeasureCallback callback);
+ property public abstract com.google.common.util.concurrent.ListenableFuture<androidx.health.services.client.data.MeasureCapabilities> capabilities;
+ }
+
+ public interface PassiveMonitoringCallback {
+ method public void onPassiveMonitoringUpdate(androidx.health.services.client.data.PassiveMonitoringUpdate update);
+ }
+
+ public interface PassiveMonitoringClient {
+ method public com.google.common.util.concurrent.ListenableFuture<java.lang.Void> flushAsync();
+ method public com.google.common.util.concurrent.ListenableFuture<androidx.health.services.client.data.PassiveMonitoringCapabilities> getCapabilities();
+ method public com.google.common.util.concurrent.ListenableFuture<java.lang.Void> registerDataCallbackAsync(androidx.health.services.client.data.PassiveMonitoringConfig configuration);
+ method public com.google.common.util.concurrent.ListenableFuture<java.lang.Void> registerDataCallbackAsync(androidx.health.services.client.data.PassiveMonitoringConfig configuration, androidx.health.services.client.PassiveMonitoringCallback callback);
+ method public <T extends android.content.BroadcastReceiver> com.google.common.util.concurrent.ListenableFuture<java.lang.Void> registerPassiveGoalCallbackAsync(androidx.health.services.client.data.PassiveGoal passiveGoal, Class<T> broadcastReceiver);
+ method public com.google.common.util.concurrent.ListenableFuture<java.lang.Void> unregisterDataCallbackAsync();
+ method public com.google.common.util.concurrent.ListenableFuture<java.lang.Void> unregisterPassiveGoalCallbackAsync(androidx.health.services.client.data.PassiveGoal passiveGoal);
+ property public abstract com.google.common.util.concurrent.ListenableFuture<androidx.health.services.client.data.PassiveMonitoringCapabilities> capabilities;
+ }
+
+}
+
+package androidx.health.services.client.data {
+
+ public final class AchievedExerciseGoal extends androidx.health.services.client.data.ProtoParcelable<androidx.health.services.client.proto.DataProto.AchievedExerciseGoal> {
+ ctor public AchievedExerciseGoal(androidx.health.services.client.data.ExerciseGoal goal);
+ method public androidx.health.services.client.data.ExerciseGoal getGoal();
+ method public androidx.health.services.client.proto.DataProto.AchievedExerciseGoal getProto();
+ property public final androidx.health.services.client.data.ExerciseGoal goal;
+ field public static final android.os.Parcelable.Creator<androidx.health.services.client.data.AchievedExerciseGoal> CREATOR;
+ field public static final androidx.health.services.client.data.AchievedExerciseGoal.Companion Companion;
+ }
+
+ public static final class AchievedExerciseGoal.Companion {
+ }
+
+ public abstract class AggregateDataPoint extends androidx.health.services.client.data.ProtoParcelable<androidx.health.services.client.proto.DataProto.AggregateDataPoint> {
+ ctor public AggregateDataPoint();
+ }
+
+ @Keep public final class AggregateDataPoints {
+ method public static androidx.health.services.client.data.StatisticalDataPoint aggregateAbsoluteElevation(double minAbsElevationMeters, double maxAbsElevationMeters, double avgAbsElevationMeters, java.time.Instant startTime, java.time.Instant endTime);
+ method public static androidx.health.services.client.data.AggregateDataPoint aggregateCalories(double kcalories, java.time.Instant startTime, java.time.Instant endTime);
+ method public static androidx.health.services.client.data.AggregateDataPoint aggregateDistance(double meters, java.time.Instant startTime, java.time.Instant endTime);
+ method public static androidx.health.services.client.data.AggregateDataPoint aggregateElevationGain(double gainMeters, java.time.Instant startTime, java.time.Instant endTime);
+ method public static androidx.health.services.client.data.StatisticalDataPoint aggregateHeartRate(double minBpm, double maxBpm, double avgBpm, java.time.Instant startTime, java.time.Instant endTime);
+ method public static androidx.health.services.client.data.AggregateDataPoint aggregatePace(java.time.Duration minMillisPerKm, java.time.Duration maxMillisPerKm, java.time.Duration avgMillisPerKm, java.time.Instant startTime, java.time.Instant endTime);
+ method public static androidx.health.services.client.data.StatisticalDataPoint aggregateSpeed(double minMetersPerSecond, double maxMetersPerSecond, double avgMetersPerSecond, java.time.Instant startTime, java.time.Instant endTime);
+ method public static androidx.health.services.client.data.AggregateDataPoint aggregateSteps(long steps, java.time.Instant startTime, java.time.Instant endTime);
+ method public static androidx.health.services.client.data.AggregateDataPoint aggregateSwimmingStrokes(long swimmingStrokes, java.time.Instant startTime, java.time.Instant endTime);
+ field public static final androidx.health.services.client.data.AggregateDataPoints INSTANCE;
+ }
+
+ public interface Availability {
+ method public int getId();
+ property public abstract int id;
+ field public static final androidx.health.services.client.data.Availability.Companion Companion;
+ }
+
+ public static final class Availability.Companion {
+ }
+
+ public final class ComparisonType {
+ method public int getId();
+ method public String getName();
+ property public final int id;
+ property public final String name;
+ field public static final androidx.health.services.client.data.ComparisonType.Companion Companion;
+ field public static final androidx.health.services.client.data.ComparisonType GREATER_THAN;
+ field public static final androidx.health.services.client.data.ComparisonType GREATER_THAN_OR_EQUAL;
+ field public static final androidx.health.services.client.data.ComparisonType LESS_THAN;
+ field public static final androidx.health.services.client.data.ComparisonType LESS_THAN_OR_EQUAL;
+ field public static final androidx.health.services.client.data.ComparisonType UNKNOWN;
+ }
+
+ public static final class ComparisonType.Companion {
+ }
+
+ public final class CumulativeDataPoint extends androidx.health.services.client.data.AggregateDataPoint {
+ ctor public CumulativeDataPoint(java.time.Instant startTime, java.time.Instant endTime, androidx.health.services.client.data.DataType dataType, androidx.health.services.client.data.Value total);
+ method public androidx.health.services.client.data.DataType getDataType();
+ method public java.time.Instant getEndTime();
+ method public androidx.health.services.client.proto.DataProto.AggregateDataPoint getProto();
+ method public java.time.Instant getStartTime();
+ method public androidx.health.services.client.data.Value getTotal();
+ property public final androidx.health.services.client.data.DataType dataType;
+ property public final java.time.Instant endTime;
+ property public final java.time.Instant startTime;
+ property public final androidx.health.services.client.data.Value total;
+ field public static final android.os.Parcelable.Creator<androidx.health.services.client.data.CumulativeDataPoint> CREATOR;
+ field public static final androidx.health.services.client.data.CumulativeDataPoint.Companion Companion;
+ }
+
+ public static final class CumulativeDataPoint.Companion {
+ }
+
+ public final class DataPoint extends androidx.health.services.client.data.ProtoParcelable<androidx.health.services.client.proto.DataProto.DataPoint> {
+ method public static androidx.health.services.client.data.DataPoint createInterval(androidx.health.services.client.data.DataType dataType, androidx.health.services.client.data.Value value, java.time.Duration startDurationFromBoot, java.time.Duration endDurationFromBoot, optional android.os.Bundle metadata, optional androidx.health.services.client.data.DataPointAccuracy? accuracy);
+ method public static androidx.health.services.client.data.DataPoint createInterval(androidx.health.services.client.data.DataType dataType, androidx.health.services.client.data.Value value, java.time.Duration startDurationFromBoot, java.time.Duration endDurationFromBoot, optional android.os.Bundle metadata);
+ method public static androidx.health.services.client.data.DataPoint createInterval(androidx.health.services.client.data.DataType dataType, androidx.health.services.client.data.Value value, java.time.Duration startDurationFromBoot, java.time.Duration endDurationFromBoot);
+ method public static androidx.health.services.client.data.DataPoint createSample(androidx.health.services.client.data.DataType dataType, androidx.health.services.client.data.Value value, java.time.Duration durationFromBoot, optional android.os.Bundle metadata, optional androidx.health.services.client.data.DataPointAccuracy? accuracy);
+ method public static androidx.health.services.client.data.DataPoint createSample(androidx.health.services.client.data.DataType dataType, androidx.health.services.client.data.Value value, java.time.Duration durationFromBoot, optional android.os.Bundle metadata);
+ method public static androidx.health.services.client.data.DataPoint createSample(androidx.health.services.client.data.DataType dataType, androidx.health.services.client.data.Value value, java.time.Duration durationFromBoot);
+ method public androidx.health.services.client.data.DataPointAccuracy? getAccuracy();
+ method public androidx.health.services.client.data.DataType getDataType();
+ method public java.time.Duration getEndDurationFromBoot();
+ method public java.time.Instant getEndInstant(java.time.Instant bootInstant);
+ method public android.os.Bundle getMetadata();
+ method public androidx.health.services.client.proto.DataProto.DataPoint getProto();
+ method public java.time.Duration getStartDurationFromBoot();
+ method public java.time.Instant getStartInstant(java.time.Instant bootInstant);
+ method public androidx.health.services.client.data.Value getValue();
+ property public final androidx.health.services.client.data.DataPointAccuracy? accuracy;
+ property public final androidx.health.services.client.data.DataType dataType;
+ property public final java.time.Duration endDurationFromBoot;
+ property public final android.os.Bundle metadata;
+ property public final java.time.Duration startDurationFromBoot;
+ property public final androidx.health.services.client.data.Value value;
+ field public static final android.os.Parcelable.Creator<androidx.health.services.client.data.DataPoint> CREATOR;
+ field public static final androidx.health.services.client.data.DataPoint.Companion Companion;
+ }
+
+ public static final class DataPoint.Companion {
+ method public androidx.health.services.client.data.DataPoint createInterval(androidx.health.services.client.data.DataType dataType, androidx.health.services.client.data.Value value, java.time.Duration startDurationFromBoot, java.time.Duration endDurationFromBoot, optional android.os.Bundle metadata, optional androidx.health.services.client.data.DataPointAccuracy? accuracy);
+ method public androidx.health.services.client.data.DataPoint createInterval(androidx.health.services.client.data.DataType dataType, androidx.health.services.client.data.Value value, java.time.Duration startDurationFromBoot, java.time.Duration endDurationFromBoot, optional android.os.Bundle metadata);
+ method public androidx.health.services.client.data.DataPoint createInterval(androidx.health.services.client.data.DataType dataType, androidx.health.services.client.data.Value value, java.time.Duration startDurationFromBoot, java.time.Duration endDurationFromBoot);
+ method public androidx.health.services.client.data.DataPoint createSample(androidx.health.services.client.data.DataType dataType, androidx.health.services.client.data.Value value, java.time.Duration durationFromBoot, optional android.os.Bundle metadata, optional androidx.health.services.client.data.DataPointAccuracy? accuracy);
+ method public androidx.health.services.client.data.DataPoint createSample(androidx.health.services.client.data.DataType dataType, androidx.health.services.client.data.Value value, java.time.Duration durationFromBoot, optional android.os.Bundle metadata);
+ method public androidx.health.services.client.data.DataPoint createSample(androidx.health.services.client.data.DataType dataType, androidx.health.services.client.data.Value value, java.time.Duration durationFromBoot);
+ }
+
+ public abstract class DataPointAccuracy extends androidx.health.services.client.data.ProtoParcelable<androidx.health.services.client.proto.DataProto.DataPointAccuracy> {
+ ctor public DataPointAccuracy();
+ }
+
+ @Keep public final class DataPoints {
+ method public static androidx.health.services.client.data.DataPoint absoluteElevation(double meters, java.time.Duration durationFromBoot, optional android.os.Bundle? metadata);
+ method public static androidx.health.services.client.data.DataPoint absoluteElevation(double meters, java.time.Duration durationFromBoot);
+ method public static androidx.health.services.client.data.DataPoint calories(double kcalories, java.time.Duration startDurationFromBoot, java.time.Duration endDurationFromBoot, optional android.os.Bundle? metadata);
+ method public static androidx.health.services.client.data.DataPoint calories(double kcalories, java.time.Duration startDurationFromBoot, java.time.Duration endDurationFromBoot);
+ method public static androidx.health.services.client.data.DataPoint dailyCalories(double calories, java.time.Duration startDurationFromBoot, java.time.Duration endDurationFromBoot);
+ method public static androidx.health.services.client.data.DataPoint dailyDistance(double meters, java.time.Duration startDurationFromBoot, java.time.Duration endDurationFromBoot);
+ method public static androidx.health.services.client.data.DataPoint dailyFloors(double floors, java.time.Duration startDurationFromBoot, java.time.Duration endDurationFromBoot);
+ method public static androidx.health.services.client.data.DataPoint dailySteps(long steps, java.time.Duration startDurationFromBoot, java.time.Duration endDurationFromBoot);
+ method public static androidx.health.services.client.data.DataPoint distance(double meters, java.time.Duration startDurationFromBoot, java.time.Duration endDurationFromBoot, optional android.os.Bundle? metadata);
+ method public static androidx.health.services.client.data.DataPoint distance(double meters, java.time.Duration startDurationFromBoot, java.time.Duration endDurationFromBoot);
+ method public static androidx.health.services.client.data.DataPoint floors(double floors, java.time.Duration startDurationFromBoot, java.time.Duration endDurationFromBoot, optional android.os.Bundle? metadata);
+ method public static androidx.health.services.client.data.DataPoint floors(double floors, java.time.Duration startDurationFromBoot, java.time.Duration endDurationFromBoot);
+ method @Keep public static java.util.List<androidx.health.services.client.data.DataPoint> getDataPoints(android.content.Intent intent);
+ method public static boolean getPermissionsGranted(android.content.Intent intent);
+ method public static androidx.health.services.client.data.DataPoint heartRate(double bpm, java.time.Duration durationFromBoot, optional androidx.health.services.client.data.HeartRateAccuracy? accuracy);
+ method public static androidx.health.services.client.data.DataPoint heartRate(double bpm, java.time.Duration durationFromBoot);
+ method public static androidx.health.services.client.data.DataPoint location(double latitude, double longitude, optional double altitude, optional double bearing, java.time.Duration durationFromBoot, optional androidx.health.services.client.data.LocationAccuracy? accuracy);
+ method public static androidx.health.services.client.data.DataPoint location(double latitude, double longitude, optional double altitude, optional double bearing, java.time.Duration durationFromBoot);
+ method public static androidx.health.services.client.data.DataPoint location(double latitude, double longitude, optional double altitude, java.time.Duration durationFromBoot);
+ method public static androidx.health.services.client.data.DataPoint location(double latitude, double longitude, java.time.Duration durationFromBoot);
+ method public static androidx.health.services.client.data.DataPoint pace(java.time.Duration millisPerKm, java.time.Duration durationFromBoot);
+ method public static void putDataPoints(android.content.Intent intent, java.util.Collection<androidx.health.services.client.data.DataPoint> dataPoints);
+ method public static void putPermissionsGranted(android.content.Intent intent, boolean granted);
+ method public static androidx.health.services.client.data.DataPoint speed(double metersPerSecond, java.time.Duration durationFromBoot, optional android.os.Bundle? metadata);
+ method public static androidx.health.services.client.data.DataPoint speed(double metersPerSecond, java.time.Duration durationFromBoot);
+ method public static androidx.health.services.client.data.DataPoint steps(long steps, java.time.Duration startDurationFromBoot, java.time.Duration endDurationFromBoot, optional android.os.Bundle? metadata);
+ method public static androidx.health.services.client.data.DataPoint steps(long steps, java.time.Duration startDurationFromBoot, java.time.Duration endDurationFromBoot);
+ method public static androidx.health.services.client.data.DataPoint stepsPerMinute(long stepsPerMinute, java.time.Duration startDurationFromBoot);
+ method public static androidx.health.services.client.data.DataPoint swimmingStrokes(long strokes, java.time.Duration startDurationFromBoot, java.time.Duration endDurationFromBoot);
+ field public static final androidx.health.services.client.data.DataPoints INSTANCE;
+ field public static final int LOCATION_DATA_POINT_ALTITUDE_INDEX = 2; // 0x2
+ field public static final int LOCATION_DATA_POINT_BEARING_INDEX = 3; // 0x3
+ field public static final int LOCATION_DATA_POINT_LATITUDE_INDEX = 0; // 0x0
+ field public static final int LOCATION_DATA_POINT_LONGITUDE_INDEX = 1; // 0x1
+ }
+
+ public final class DataType extends androidx.health.services.client.data.ProtoParcelable<androidx.health.services.client.proto.DataProto.DataType> {
+ ctor public DataType(String name, androidx.health.services.client.data.DataType.TimeType timeType, int format);
+ method public int getFormat();
+ method public String getName();
+ method public androidx.health.services.client.proto.DataProto.DataType getProto();
+ method public androidx.health.services.client.data.DataType.TimeType getTimeType();
+ property public final int format;
+ property public final String name;
+ property public final androidx.health.services.client.data.DataType.TimeType timeType;
+ field public static final androidx.health.services.client.data.DataType ABSOLUTE_ELEVATION;
+ field public static final androidx.health.services.client.data.DataType ACTIVE_EXERCISE_DURATION;
+ field public static final android.os.Parcelable.Creator<androidx.health.services.client.data.DataType> CREATOR;
+ field public static final androidx.health.services.client.data.DataType.Companion Companion;
+ field public static final androidx.health.services.client.data.DataType DAILY_CALORIES;
+ field public static final androidx.health.services.client.data.DataType DAILY_DISTANCE;
+ field public static final androidx.health.services.client.data.DataType DAILY_FLOORS;
+ field public static final androidx.health.services.client.data.DataType DAILY_STEPS;
+ field public static final androidx.health.services.client.data.DataType DECLINE_DISTANCE;
+ field public static final androidx.health.services.client.data.DataType DECLINE_DURATION;
+ field public static final androidx.health.services.client.data.DataType DISTANCE;
+ field public static final androidx.health.services.client.data.DataType ELEVATION_GAIN;
+ field public static final androidx.health.services.client.data.DataType ELEVATION_LOSS;
+ field public static final androidx.health.services.client.data.DataType FLAT_GROUND_DISTANCE;
+ field public static final androidx.health.services.client.data.DataType FLAT_GROUND_DURATION;
+ field public static final androidx.health.services.client.data.DataType FLOORS;
+ field public static final androidx.health.services.client.data.DataType HEART_RATE_BPM;
+ field public static final androidx.health.services.client.data.DataType INCLINE_DISTANCE;
+ field public static final androidx.health.services.client.data.DataType INCLINE_DURATION;
+ field public static final androidx.health.services.client.data.DataType LOCATION;
+ field public static final androidx.health.services.client.data.DataType PACE;
+ field public static final androidx.health.services.client.data.DataType REP_COUNT;
+ field public static final androidx.health.services.client.data.DataType RESTING_EXERCISE_DURATION;
+ field public static final androidx.health.services.client.data.DataType RUNNING_STEPS;
+ field public static final androidx.health.services.client.data.DataType SPEED;
+ field public static final androidx.health.services.client.data.DataType SPO2;
+ field public static final androidx.health.services.client.data.DataType STEPS;
+ field public static final androidx.health.services.client.data.DataType STEPS_PER_MINUTE;
+ field public static final androidx.health.services.client.data.DataType SWIMMING_LAP_COUNT;
+ field public static final androidx.health.services.client.data.DataType SWIMMING_STROKES;
+ field public static final androidx.health.services.client.data.DataType TOTAL_CALORIES;
+ field public static final androidx.health.services.client.data.DataType VO2;
+ field public static final androidx.health.services.client.data.DataType VO2_MAX;
+ field public static final androidx.health.services.client.data.DataType WALKING_STEPS;
+ }
+
+ public static final class DataType.Companion {
+ }
+
+ public static final class DataType.TimeType {
+ method public int getId();
+ method public String getName();
+ property public final int id;
+ property public final String name;
+ field public static final androidx.health.services.client.data.DataType.TimeType.Companion Companion;
+ field public static final androidx.health.services.client.data.DataType.TimeType INTERVAL;
+ field public static final androidx.health.services.client.data.DataType.TimeType SAMPLE;
+ }
+
+ public static final class DataType.TimeType.Companion {
+ }
+
+ public final class DataTypeAvailability implements androidx.health.services.client.data.Availability {
+ method public static androidx.health.services.client.data.DataTypeAvailability? fromId(int id);
+ method public int getId();
+ method public String getName();
+ property public int id;
+ property public final String name;
+ field public static final androidx.health.services.client.data.DataTypeAvailability ACQUIRING;
+ field public static final androidx.health.services.client.data.DataTypeAvailability AVAILABLE;
+ field public static final androidx.health.services.client.data.DataTypeAvailability.Companion Companion;
+ field public static final androidx.health.services.client.data.DataTypeAvailability UNAVAILABLE;
+ field public static final androidx.health.services.client.data.DataTypeAvailability UNAVAILABLE_DEVICE_OFF_BODY;
+ field public static final androidx.health.services.client.data.DataTypeAvailability UNKNOWN;
+ }
+
+ public static final class DataTypeAvailability.Companion {
+ method public androidx.health.services.client.data.DataTypeAvailability? fromId(int id);
+ }
+
+ public final class DataTypeCondition extends androidx.health.services.client.data.ProtoParcelable<androidx.health.services.client.proto.DataProto.DataTypeCondition> {
+ ctor public DataTypeCondition(androidx.health.services.client.data.DataType dataType, androidx.health.services.client.data.Value threshold, androidx.health.services.client.data.ComparisonType comparisonType);
+ method public androidx.health.services.client.data.ComparisonType getComparisonType();
+ method public androidx.health.services.client.data.DataType getDataType();
+ method public androidx.health.services.client.proto.DataProto.DataTypeCondition getProto();
+ method public androidx.health.services.client.data.Value getThreshold();
+ method public boolean isSatisfied(androidx.health.services.client.data.DataPoint dataPoint);
+ method public boolean isThresholdSatisfied(androidx.health.services.client.data.Value value);
+ property public final androidx.health.services.client.data.ComparisonType comparisonType;
+ property public final androidx.health.services.client.data.DataType dataType;
+ property public final androidx.health.services.client.data.Value threshold;
+ field public static final android.os.Parcelable.Creator<androidx.health.services.client.data.DataTypeCondition> CREATOR;
+ field public static final androidx.health.services.client.data.DataTypeCondition.Companion Companion;
+ }
+
+ public static final class DataTypeCondition.Companion {
+ }
+
+ public final class DataTypes {
+ method public static boolean isCumulativeDataType(androidx.health.services.client.data.DataType dataType);
+ method public static boolean isStatisticalDataType(androidx.health.services.client.data.DataType dataType);
+ field public static final androidx.health.services.client.data.DataTypes INSTANCE;
+ }
+
+ public final class ExerciseCapabilities extends androidx.health.services.client.data.ProtoParcelable<androidx.health.services.client.proto.DataProto.ExerciseCapabilities> {
+ ctor public ExerciseCapabilities(java.util.Map<androidx.health.services.client.data.ExerciseType,androidx.health.services.client.data.ExerciseTypeCapabilities> typeToCapabilities);
+ method public java.util.Set<androidx.health.services.client.data.ExerciseType> getAutoPauseAndResumeEnabledExercises();
+ method public androidx.health.services.client.data.ExerciseTypeCapabilities getExerciseTypeCapabilities(androidx.health.services.client.data.ExerciseType exercise);
+ method public androidx.health.services.client.proto.DataProto.ExerciseCapabilities getProto();
+ method public java.util.Set<androidx.health.services.client.data.ExerciseType> getSupportedExerciseTypes();
+ method public java.util.Map<androidx.health.services.client.data.ExerciseType,androidx.health.services.client.data.ExerciseTypeCapabilities> getTypeToCapabilities();
+ property public final java.util.Set<androidx.health.services.client.data.ExerciseType> autoPauseAndResumeEnabledExercises;
+ property public final java.util.Set<androidx.health.services.client.data.ExerciseType> supportedExerciseTypes;
+ property public final java.util.Map<androidx.health.services.client.data.ExerciseType,androidx.health.services.client.data.ExerciseTypeCapabilities> typeToCapabilities;
+ field public static final android.os.Parcelable.Creator<androidx.health.services.client.data.ExerciseCapabilities> CREATOR;
+ field public static final androidx.health.services.client.data.ExerciseCapabilities.Companion Companion;
+ }
+
+ public static final class ExerciseCapabilities.Companion {
+ }
+
+ public final class ExerciseConfig extends androidx.health.services.client.data.ProtoParcelable<androidx.health.services.client.proto.DataProto.ExerciseConfig> {
+ ctor public ExerciseConfig(androidx.health.services.client.data.ExerciseType exerciseType, java.util.Set<androidx.health.services.client.data.DataType> dataTypes, java.util.Set<androidx.health.services.client.data.DataType> aggregateDataTypes, boolean isAutoPauseAndResumeEnabled, boolean isGpsEnabled, java.util.List<androidx.health.services.client.data.ExerciseGoal> exerciseGoals, android.os.Bundle exerciseParams);
+ method public static androidx.health.services.client.data.ExerciseConfig.Builder builder();
+ method public java.util.Set<androidx.health.services.client.data.DataType> getAggregateDataTypes();
+ method public java.util.Set<androidx.health.services.client.data.DataType> getDataTypes();
+ method public java.util.List<androidx.health.services.client.data.ExerciseGoal> getExerciseGoals();
+ method public android.os.Bundle getExerciseParams();
+ method public androidx.health.services.client.data.ExerciseType getExerciseType();
+ method public androidx.health.services.client.proto.DataProto.ExerciseConfig getProto();
+ method public boolean isAutoPauseAndResumeEnabled();
+ method public boolean isGpsEnabled();
+ property public final java.util.Set<androidx.health.services.client.data.DataType> aggregateDataTypes;
+ property public final java.util.Set<androidx.health.services.client.data.DataType> dataTypes;
+ property public final java.util.List<androidx.health.services.client.data.ExerciseGoal> exerciseGoals;
+ property public final android.os.Bundle exerciseParams;
+ property public final androidx.health.services.client.data.ExerciseType exerciseType;
+ property public final boolean isAutoPauseAndResumeEnabled;
+ property public final boolean isGpsEnabled;
+ field public static final android.os.Parcelable.Creator<androidx.health.services.client.data.ExerciseConfig> CREATOR;
+ field public static final androidx.health.services.client.data.ExerciseConfig.Companion Companion;
+ }
+
+ public static final class ExerciseConfig.Builder {
+ ctor public ExerciseConfig.Builder();
+ method public androidx.health.services.client.data.ExerciseConfig build();
+ method public androidx.health.services.client.data.ExerciseConfig.Builder setAggregateDataTypes(java.util.Set<androidx.health.services.client.data.DataType> dataTypes);
+ method public androidx.health.services.client.data.ExerciseConfig.Builder setDataTypes(java.util.Set<androidx.health.services.client.data.DataType> dataTypes);
+ method public androidx.health.services.client.data.ExerciseConfig.Builder setExerciseGoals(java.util.List<androidx.health.services.client.data.ExerciseGoal> exerciseGoals);
+ method public androidx.health.services.client.data.ExerciseConfig.Builder setExerciseParams(android.os.Bundle exerciseParams);
+ method public androidx.health.services.client.data.ExerciseConfig.Builder setExerciseType(androidx.health.services.client.data.ExerciseType exerciseType);
+ method public androidx.health.services.client.data.ExerciseConfig.Builder setIsAutoPauseAndResumeEnabled(boolean autoPauseAndResumeEnabled);
+ method public androidx.health.services.client.data.ExerciseConfig.Builder setIsGpsEnabled(boolean gpsEnabled);
+ }
+
+ public static final class ExerciseConfig.Companion {
+ method public androidx.health.services.client.data.ExerciseConfig.Builder builder();
+ }
+
+ public final class ExerciseGoal extends androidx.health.services.client.data.ProtoParcelable<androidx.health.services.client.proto.DataProto.ExerciseGoal> {
+ method public static androidx.health.services.client.data.ExerciseGoal createMilestone(androidx.health.services.client.data.DataTypeCondition condition, androidx.health.services.client.data.Value period);
+ method public static androidx.health.services.client.data.ExerciseGoal createMilestoneGoalWithUpdatedThreshold(androidx.health.services.client.data.ExerciseGoal goal, androidx.health.services.client.data.Value newThreshold);
+ method public static androidx.health.services.client.data.ExerciseGoal createOneTimeGoal(androidx.health.services.client.data.DataTypeCondition condition);
+ method public androidx.health.services.client.data.DataTypeCondition getDataTypeCondition();
+ method public androidx.health.services.client.data.ExerciseGoalType getExerciseGoalType();
+ method public androidx.health.services.client.data.Value? getPeriod();
+ method public androidx.health.services.client.proto.DataProto.ExerciseGoal getProto();
+ property public final androidx.health.services.client.data.DataTypeCondition dataTypeCondition;
+ property public final androidx.health.services.client.data.ExerciseGoalType exerciseGoalType;
+ property public final androidx.health.services.client.data.Value? period;
+ field public static final android.os.Parcelable.Creator<androidx.health.services.client.data.ExerciseGoal> CREATOR;
+ field public static final androidx.health.services.client.data.ExerciseGoal.Companion Companion;
+ }
+
+ public static final class ExerciseGoal.Companion {
+ method public androidx.health.services.client.data.ExerciseGoal createMilestone(androidx.health.services.client.data.DataTypeCondition condition, androidx.health.services.client.data.Value period);
+ method public androidx.health.services.client.data.ExerciseGoal createMilestoneGoalWithUpdatedThreshold(androidx.health.services.client.data.ExerciseGoal goal, androidx.health.services.client.data.Value newThreshold);
+ method public androidx.health.services.client.data.ExerciseGoal createOneTimeGoal(androidx.health.services.client.data.DataTypeCondition condition);
+ }
+
+ public final class ExerciseGoalType {
+ method public static androidx.health.services.client.data.ExerciseGoalType? fromId(int id);
+ method public int getId();
+ method public String getName();
+ property public final int id;
+ property public final String name;
+ field public static final androidx.health.services.client.data.ExerciseGoalType.Companion Companion;
+ field public static final androidx.health.services.client.data.ExerciseGoalType MILESTONE;
+ field public static final androidx.health.services.client.data.ExerciseGoalType ONE_TIME_GOAL;
+ }
+
+ public static final class ExerciseGoalType.Companion {
+ method public androidx.health.services.client.data.ExerciseGoalType? fromId(int id);
+ }
+
+ public final class ExerciseInfo extends androidx.health.services.client.data.ProtoParcelable<androidx.health.services.client.proto.DataProto.ExerciseInfo> {
+ ctor public ExerciseInfo(int exerciseTrackedStatus, androidx.health.services.client.data.ExerciseType exerciseType);
+ method public int getExerciseTrackedStatus();
+ method public androidx.health.services.client.data.ExerciseType getExerciseType();
+ method public androidx.health.services.client.proto.DataProto.ExerciseInfo getProto();
+ property public final int exerciseTrackedStatus;
+ property public final androidx.health.services.client.data.ExerciseType exerciseType;
+ field public static final android.os.Parcelable.Creator<androidx.health.services.client.data.ExerciseInfo> CREATOR;
+ field public static final androidx.health.services.client.data.ExerciseInfo.Companion Companion;
+ }
+
+ public static final class ExerciseInfo.Companion {
+ }
+
+ public final class ExerciseLapSummary extends androidx.health.services.client.data.ProtoParcelable<androidx.health.services.client.proto.DataProto.ExerciseLapSummary> {
+ ctor public ExerciseLapSummary(int lapCount, java.time.Instant startTime, java.time.Instant endTime, java.time.Duration activeDuration, java.util.Map<androidx.health.services.client.data.DataType,? extends androidx.health.services.client.data.AggregateDataPoint> lapMetrics);
+ method public java.time.Duration getActiveDuration();
+ method public java.time.Instant getEndTime();
+ method public int getLapCount();
+ method public java.util.Map<androidx.health.services.client.data.DataType,androidx.health.services.client.data.AggregateDataPoint> getLapMetrics();
+ method public androidx.health.services.client.proto.DataProto.ExerciseLapSummary getProto();
+ method public java.time.Instant getStartTime();
+ property public final java.time.Duration activeDuration;
+ property public final java.time.Instant endTime;
+ property public final int lapCount;
+ property public final java.util.Map<androidx.health.services.client.data.DataType,androidx.health.services.client.data.AggregateDataPoint> lapMetrics;
+ property public final java.time.Instant startTime;
+ field public static final android.os.Parcelable.Creator<androidx.health.services.client.data.ExerciseLapSummary> CREATOR;
+ field public static final androidx.health.services.client.data.ExerciseLapSummary.Companion Companion;
+ }
+
+ public static final class ExerciseLapSummary.Companion {
+ }
+
+ public final class ExerciseState {
+ method public static androidx.health.services.client.data.ExerciseState? fromId(int id);
+ method public int getId();
+ method public String getName();
+ method public boolean isEnded();
+ method public boolean isEnding();
+ method public boolean isPaused();
+ method public boolean isResuming();
+ property public final int id;
+ property public final boolean isEnded;
+ property public final boolean isEnding;
+ property public final boolean isPaused;
+ property public final boolean isResuming;
+ property public final String name;
+ field public static final androidx.health.services.client.data.ExerciseState ACTIVE;
+ field public static final androidx.health.services.client.data.ExerciseState AUTO_ENDED;
+ field public static final androidx.health.services.client.data.ExerciseState AUTO_ENDED_PERMISSION_LOST;
+ field public static final androidx.health.services.client.data.ExerciseState AUTO_ENDING;
+ field public static final androidx.health.services.client.data.ExerciseState AUTO_ENDING_PERMISSION_LOST;
+ field public static final androidx.health.services.client.data.ExerciseState AUTO_PAUSED;
+ field public static final androidx.health.services.client.data.ExerciseState AUTO_PAUSING;
+ field public static final androidx.health.services.client.data.ExerciseState AUTO_RESUMING;
+ field public static final androidx.health.services.client.data.ExerciseState.Companion Companion;
+ field public static final androidx.health.services.client.data.ExerciseState PREPARING;
+ field public static final androidx.health.services.client.data.ExerciseState TERMINATED;
+ field public static final androidx.health.services.client.data.ExerciseState TERMINATING;
+ field public static final androidx.health.services.client.data.ExerciseState USER_ENDED;
+ field public static final androidx.health.services.client.data.ExerciseState USER_ENDING;
+ field public static final androidx.health.services.client.data.ExerciseState USER_PAUSED;
+ field public static final androidx.health.services.client.data.ExerciseState USER_PAUSING;
+ field public static final androidx.health.services.client.data.ExerciseState USER_RESUMING;
+ field public static final androidx.health.services.client.data.ExerciseState USER_STARTING;
+ }
+
+ public static final class ExerciseState.Companion {
+ method public androidx.health.services.client.data.ExerciseState? fromId(int id);
+ }
+
+ public final class ExerciseType {
+ method public static androidx.health.services.client.data.ExerciseType fromId(int id);
+ method public int getId();
+ method public String getName();
+ property public final int id;
+ property public final String name;
+ field public static final androidx.health.services.client.data.ExerciseType ALPINE_SKIING;
+ field public static final androidx.health.services.client.data.ExerciseType BACKPACKING;
+ field public static final androidx.health.services.client.data.ExerciseType BACK_EXTENSION;
+ field public static final androidx.health.services.client.data.ExerciseType BADMINTON;
+ field public static final androidx.health.services.client.data.ExerciseType BARBELL_SHOULDER_PRESS;
+ field public static final androidx.health.services.client.data.ExerciseType BASEBALL;
+ field public static final androidx.health.services.client.data.ExerciseType BASKETBALL;
+ field public static final androidx.health.services.client.data.ExerciseType BENCH_PRESS;
+ field public static final androidx.health.services.client.data.ExerciseType BENCH_SIT_UP;
+ field public static final androidx.health.services.client.data.ExerciseType BIKING;
+ field public static final androidx.health.services.client.data.ExerciseType BIKING_STATIONARY;
+ field public static final androidx.health.services.client.data.ExerciseType BOOT_CAMP;
+ field public static final androidx.health.services.client.data.ExerciseType BOXING;
+ field public static final androidx.health.services.client.data.ExerciseType BURPEE;
+ field public static final androidx.health.services.client.data.ExerciseType CALISTHENICS;
+ field public static final androidx.health.services.client.data.ExerciseType CRICKET;
+ field public static final androidx.health.services.client.data.ExerciseType CROSS_COUNTRY_SKIING;
+ field public static final androidx.health.services.client.data.ExerciseType CRUNCH;
+ field public static final androidx.health.services.client.data.ExerciseType.Companion Companion;
+ field public static final androidx.health.services.client.data.ExerciseType DANCING;
+ field public static final androidx.health.services.client.data.ExerciseType DEADLIFT;
+ field public static final androidx.health.services.client.data.ExerciseType DUMBBELL_CURL_LEFT_ARM;
+ field public static final androidx.health.services.client.data.ExerciseType DUMBBELL_CURL_RIGHT_ARM;
+ field public static final androidx.health.services.client.data.ExerciseType DUMBBELL_FRONT_RAISE;
+ field public static final androidx.health.services.client.data.ExerciseType DUMBBELL_LATERAL_RAISE;
+ field public static final androidx.health.services.client.data.ExerciseType DUMBBELL_TRICEPS_EXTENSION_LEFT_ARM;
+ field public static final androidx.health.services.client.data.ExerciseType DUMBBELL_TRICEPS_EXTENSION_RIGHT_ARM;
+ field public static final androidx.health.services.client.data.ExerciseType DUMBBELL_TRICEPS_EXTENSION_TWO_ARM;
+ field public static final androidx.health.services.client.data.ExerciseType ELLIPTICAL;
+ field public static final androidx.health.services.client.data.ExerciseType EXERCISE_CLASS;
+ field public static final androidx.health.services.client.data.ExerciseType FENCING;
+ field public static final androidx.health.services.client.data.ExerciseType FOOTBALL_AMERICAN;
+ field public static final androidx.health.services.client.data.ExerciseType FOOTBALL_AUSTRALIAN;
+ field public static final androidx.health.services.client.data.ExerciseType FORWARD_TWIST;
+ field public static final androidx.health.services.client.data.ExerciseType FRISBEE_DISC;
+ field public static final androidx.health.services.client.data.ExerciseType GOLF;
+ field public static final androidx.health.services.client.data.ExerciseType GUIDED_BREATHING;
+ field public static final androidx.health.services.client.data.ExerciseType GYMNASTICS;
+ field public static final androidx.health.services.client.data.ExerciseType HANDBALL;
+ field public static final androidx.health.services.client.data.ExerciseType HIGH_INTENSITY_INTERVAL_TRAINING;
+ field public static final androidx.health.services.client.data.ExerciseType HIKING;
+ field public static final androidx.health.services.client.data.ExerciseType HORSE_RIDING;
+ field public static final androidx.health.services.client.data.ExerciseType ICE_HOCKEY;
+ field public static final androidx.health.services.client.data.ExerciseType ICE_SKATING;
+ field public static final androidx.health.services.client.data.ExerciseType INLINE_SKATING;
+ field public static final androidx.health.services.client.data.ExerciseType JUMPING_JACK;
+ field public static final androidx.health.services.client.data.ExerciseType JUMP_ROPE;
+ field public static final androidx.health.services.client.data.ExerciseType LAT_PULL_DOWN;
+ field public static final androidx.health.services.client.data.ExerciseType LUNGE;
+ field public static final androidx.health.services.client.data.ExerciseType MARTIAL_ARTS;
+ field public static final androidx.health.services.client.data.ExerciseType MEDITATION;
+ field public static final androidx.health.services.client.data.ExerciseType MOUNTAIN_BIKING;
+ field public static final androidx.health.services.client.data.ExerciseType ORIENTEERING;
+ field public static final androidx.health.services.client.data.ExerciseType PADDLING;
+ field public static final androidx.health.services.client.data.ExerciseType PARA_GLIDING;
+ field public static final androidx.health.services.client.data.ExerciseType PILATES;
+ field public static final androidx.health.services.client.data.ExerciseType PLANK;
+ field public static final androidx.health.services.client.data.ExerciseType RACQUETBALL;
+ field public static final androidx.health.services.client.data.ExerciseType ROCK_CLIMBING;
+ field public static final androidx.health.services.client.data.ExerciseType ROLLER_HOCKEY;
+ field public static final androidx.health.services.client.data.ExerciseType ROLLER_SKATING;
+ field public static final androidx.health.services.client.data.ExerciseType ROWING;
+ field public static final androidx.health.services.client.data.ExerciseType ROWING_MACHINE;
+ field public static final androidx.health.services.client.data.ExerciseType RUGBY;
+ field public static final androidx.health.services.client.data.ExerciseType RUNNING;
+ field public static final androidx.health.services.client.data.ExerciseType RUNNING_TREADMILL;
+ field public static final androidx.health.services.client.data.ExerciseType SAILING;
+ field public static final androidx.health.services.client.data.ExerciseType SCUBA_DIVING;
+ field public static final androidx.health.services.client.data.ExerciseType SKATING;
+ field public static final androidx.health.services.client.data.ExerciseType SKIING;
+ field public static final androidx.health.services.client.data.ExerciseType SNOWBOARDING;
+ field public static final androidx.health.services.client.data.ExerciseType SNOWSHOEING;
+ field public static final androidx.health.services.client.data.ExerciseType SOCCER;
+ field public static final androidx.health.services.client.data.ExerciseType SOFTBALL;
+ field public static final androidx.health.services.client.data.ExerciseType SQUASH;
+ field public static final androidx.health.services.client.data.ExerciseType SQUAT;
+ field public static final androidx.health.services.client.data.ExerciseType STAIR_CLIMBING;
+ field public static final androidx.health.services.client.data.ExerciseType STAIR_CLIMBING_MACHINE;
+ field public static final androidx.health.services.client.data.ExerciseType STRENGTH_TRAINING;
+ field public static final androidx.health.services.client.data.ExerciseType STRETCHING;
+ field public static final androidx.health.services.client.data.ExerciseType SURFING;
+ field public static final androidx.health.services.client.data.ExerciseType SWIMMING_OPEN_WATER;
+ field public static final androidx.health.services.client.data.ExerciseType SWIMMING_POOL;
+ field public static final androidx.health.services.client.data.ExerciseType TABLE_TENNIS;
+ field public static final androidx.health.services.client.data.ExerciseType TENNIS;
+ field public static final androidx.health.services.client.data.ExerciseType UNKNOWN;
+ field public static final androidx.health.services.client.data.ExerciseType UPPER_TWIST;
+ field public static final androidx.health.services.client.data.ExerciseType VOLLEYBALL;
+ field public static final androidx.health.services.client.data.ExerciseType WALKING;
+ field public static final androidx.health.services.client.data.ExerciseType WATER_POLO;
+ field public static final androidx.health.services.client.data.ExerciseType WEIGHTLIFTING;
+ field public static final androidx.health.services.client.data.ExerciseType WORKOUT;
+ field public static final androidx.health.services.client.data.ExerciseType YACHTING;
+ field public static final androidx.health.services.client.data.ExerciseType YOGA;
+ }
+
+ public static final class ExerciseType.Companion {
+ method public androidx.health.services.client.data.ExerciseType fromId(int id);
+ }
+
+ public final class ExerciseTypeCapabilities extends androidx.health.services.client.data.ProtoParcelable<androidx.health.services.client.proto.DataProto.ExerciseTypeCapabilities> {
+ ctor public ExerciseTypeCapabilities(java.util.Set<androidx.health.services.client.data.DataType> supportedDataTypes, java.util.Map<androidx.health.services.client.data.DataType,? extends java.util.Set<androidx.health.services.client.data.ComparisonType>> supportedGoals, java.util.Map<androidx.health.services.client.data.DataType,? extends java.util.Set<androidx.health.services.client.data.ComparisonType>> supportedMilestones, boolean supportsAutoPauseAndResume, boolean supportsLaps);
+ method public androidx.health.services.client.proto.DataProto.ExerciseTypeCapabilities getProto();
+ method public java.util.Set<androidx.health.services.client.data.DataType> getSupportedDataTypes();
+ method public java.util.Map<androidx.health.services.client.data.DataType,java.util.Set<androidx.health.services.client.data.ComparisonType>> getSupportedGoals();
+ method public java.util.Map<androidx.health.services.client.data.DataType,java.util.Set<androidx.health.services.client.data.ComparisonType>> getSupportedMilestones();
+ method public boolean getSupportsAutoPauseAndResume();
+ method public boolean getSupportsLaps();
+ property public final java.util.Set<androidx.health.services.client.data.DataType> supportedDataTypes;
+ property public final java.util.Map<androidx.health.services.client.data.DataType,java.util.Set<androidx.health.services.client.data.ComparisonType>> supportedGoals;
+ property public final java.util.Map<androidx.health.services.client.data.DataType,java.util.Set<androidx.health.services.client.data.ComparisonType>> supportedMilestones;
+ property public final boolean supportsAutoPauseAndResume;
+ property public final boolean supportsLaps;
+ field public static final android.os.Parcelable.Creator<androidx.health.services.client.data.ExerciseTypeCapabilities> CREATOR;
+ field public static final androidx.health.services.client.data.ExerciseTypeCapabilities.Companion Companion;
+ }
+
+ public static final class ExerciseTypeCapabilities.Companion {
+ }
+
+ public final class ExerciseUpdate extends androidx.health.services.client.data.ProtoParcelable<androidx.health.services.client.proto.DataProto.ExerciseUpdate> {
+ ctor public ExerciseUpdate(androidx.health.services.client.data.ExerciseState state, java.time.Instant? startTime, java.time.Duration activeDuration, java.time.Duration? updateDurationFromBoot, java.util.Map<androidx.health.services.client.data.DataType,? extends java.util.List<androidx.health.services.client.data.DataPoint>> latestMetrics, java.util.Map<androidx.health.services.client.data.DataType,? extends androidx.health.services.client.data.AggregateDataPoint> latestAggregateMetrics, java.util.Set<androidx.health.services.client.data.AchievedExerciseGoal> latestAchievedGoals, java.util.Set<androidx.health.services.client.data.MilestoneMarkerSummary> latestMilestoneMarkerSummaries, androidx.health.services.client.data.ExerciseConfig? exerciseConfig, androidx.health.services.client.data.ExerciseUpdate.ActiveDurationCheckpoint? activeDurationCheckpoint);
+ method public java.time.Duration getActiveDuration();
+ method public java.time.Duration getActiveDurationAtDataPoint(androidx.health.services.client.data.DataPoint dataPoint);
+ method public androidx.health.services.client.data.ExerciseUpdate.ActiveDurationCheckpoint? getActiveDurationCheckpoint();
+ method public androidx.health.services.client.data.ExerciseConfig? getExerciseConfig();
+ method public java.util.Set<androidx.health.services.client.data.AchievedExerciseGoal> getLatestAchievedGoals();
+ method public java.util.Map<androidx.health.services.client.data.DataType,androidx.health.services.client.data.AggregateDataPoint> getLatestAggregateMetrics();
+ method public java.util.Map<androidx.health.services.client.data.DataType,java.util.List<androidx.health.services.client.data.DataPoint>> getLatestMetrics();
+ method public java.util.Set<androidx.health.services.client.data.MilestoneMarkerSummary> getLatestMilestoneMarkerSummaries();
+ method public androidx.health.services.client.proto.DataProto.ExerciseUpdate getProto();
+ method public java.time.Instant? getStartTime();
+ method public androidx.health.services.client.data.ExerciseState getState();
+ property public final java.time.Duration activeDuration;
+ property public final androidx.health.services.client.data.ExerciseUpdate.ActiveDurationCheckpoint? activeDurationCheckpoint;
+ property public final androidx.health.services.client.data.ExerciseConfig? exerciseConfig;
+ property public final java.util.Set<androidx.health.services.client.data.AchievedExerciseGoal> latestAchievedGoals;
+ property public final java.util.Map<androidx.health.services.client.data.DataType,androidx.health.services.client.data.AggregateDataPoint> latestAggregateMetrics;
+ property public final java.util.Map<androidx.health.services.client.data.DataType,java.util.List<androidx.health.services.client.data.DataPoint>> latestMetrics;
+ property public final java.util.Set<androidx.health.services.client.data.MilestoneMarkerSummary> latestMilestoneMarkerSummaries;
+ property public final java.time.Instant? startTime;
+ property public final androidx.health.services.client.data.ExerciseState state;
+ field public static final android.os.Parcelable.Creator<androidx.health.services.client.data.ExerciseUpdate> CREATOR;
+ field public static final androidx.health.services.client.data.ExerciseUpdate.Companion Companion;
+ }
+
+ public static final class ExerciseUpdate.ActiveDurationCheckpoint {
+ ctor public ExerciseUpdate.ActiveDurationCheckpoint(java.time.Instant time, java.time.Duration activeDuration);
+ method public java.time.Duration getActiveDuration();
+ method public java.time.Instant getTime();
+ property public final java.time.Duration activeDuration;
+ property public final java.time.Instant time;
+ }
+
+ public static final class ExerciseUpdate.Companion {
+ }
+
+ public final class HeartRateAccuracy extends androidx.health.services.client.data.DataPointAccuracy {
+ ctor public HeartRateAccuracy(androidx.health.services.client.data.HeartRateAccuracy.SensorStatus sensorStatus);
+ method public androidx.health.services.client.proto.DataProto.DataPointAccuracy getProto();
+ method public androidx.health.services.client.data.HeartRateAccuracy.SensorStatus getSensorStatus();
+ property public final androidx.health.services.client.data.HeartRateAccuracy.SensorStatus sensorStatus;
+ field public static final android.os.Parcelable.Creator<androidx.health.services.client.data.HeartRateAccuracy> CREATOR;
+ field public static final androidx.health.services.client.data.HeartRateAccuracy.Companion Companion;
+ }
+
+ public static final class HeartRateAccuracy.Companion {
+ }
+
+ public static final class HeartRateAccuracy.SensorStatus {
+ method public int getId();
+ method public String getName();
+ property public final int id;
+ property public final String name;
+ field public static final androidx.health.services.client.data.HeartRateAccuracy.SensorStatus ACCURACY_HIGH;
+ field public static final androidx.health.services.client.data.HeartRateAccuracy.SensorStatus ACCURACY_LOW;
+ field public static final androidx.health.services.client.data.HeartRateAccuracy.SensorStatus ACCURACY_MEDIUM;
+ field public static final androidx.health.services.client.data.HeartRateAccuracy.SensorStatus.Companion Companion;
+ field public static final androidx.health.services.client.data.HeartRateAccuracy.SensorStatus NO_CONTACT;
+ field public static final androidx.health.services.client.data.HeartRateAccuracy.SensorStatus UNKNOWN;
+ field public static final androidx.health.services.client.data.HeartRateAccuracy.SensorStatus UNRELIABLE;
+ }
+
+ public static final class HeartRateAccuracy.SensorStatus.Companion {
+ }
+
+ public final class LocationAccuracy extends androidx.health.services.client.data.DataPointAccuracy {
+ ctor public LocationAccuracy(double horizontalPositionErrorMeters, optional double verticalPositionErrorMeters);
+ ctor public LocationAccuracy(double horizontalPositionErrorMeters);
+ method public double getHorizontalPositionErrorMeters();
+ method public androidx.health.services.client.proto.DataProto.DataPointAccuracy getProto();
+ property public final double horizontalPositionErrorMeters;
+ field public static final android.os.Parcelable.Creator<androidx.health.services.client.data.LocationAccuracy> CREATOR;
+ field public static final androidx.health.services.client.data.LocationAccuracy.Companion Companion;
+ }
+
+ public static final class LocationAccuracy.Companion {
+ }
+
+ public final class LocationAvailability implements androidx.health.services.client.data.Availability {
+ method public static androidx.health.services.client.data.LocationAvailability? fromId(int id);
+ method public int getId();
+ method public String getName();
+ property public int id;
+ property public final String name;
+ field public static final androidx.health.services.client.data.LocationAvailability ACQUIRED_TETHERED;
+ field public static final androidx.health.services.client.data.LocationAvailability ACQUIRED_UNTETHERED;
+ field public static final androidx.health.services.client.data.LocationAvailability ACQUIRING;
+ field public static final androidx.health.services.client.data.LocationAvailability.Companion Companion;
+ field public static final androidx.health.services.client.data.LocationAvailability NO_GNSS;
+ field public static final androidx.health.services.client.data.LocationAvailability UNAVAILABLE;
+ field public static final androidx.health.services.client.data.LocationAvailability UNKNOWN;
+ }
+
+ public static final class LocationAvailability.Companion {
+ method public androidx.health.services.client.data.LocationAvailability? fromId(int id);
+ }
+
+ public final class MeasureCapabilities extends androidx.health.services.client.data.ProtoParcelable<androidx.health.services.client.proto.DataProto.MeasureCapabilities> {
+ ctor public MeasureCapabilities(java.util.Set<androidx.health.services.client.data.DataType> supportedDataTypesMeasure);
+ method public androidx.health.services.client.proto.DataProto.MeasureCapabilities getProto();
+ method public java.util.Set<androidx.health.services.client.data.DataType> getSupportedDataTypesMeasure();
+ property public final java.util.Set<androidx.health.services.client.data.DataType> supportedDataTypesMeasure;
+ field public static final android.os.Parcelable.Creator<androidx.health.services.client.data.MeasureCapabilities> CREATOR;
+ field public static final androidx.health.services.client.data.MeasureCapabilities.Companion Companion;
+ }
+
+ public static final class MeasureCapabilities.Companion {
+ }
+
+ public final class MilestoneMarkerSummary extends androidx.health.services.client.data.ProtoParcelable<androidx.health.services.client.proto.DataProto.MilestoneMarkerSummary> {
+ ctor public MilestoneMarkerSummary(java.time.Instant startTime, java.time.Instant endTime, java.time.Duration activeDuration, androidx.health.services.client.data.AchievedExerciseGoal achievedGoal, java.util.Map<androidx.health.services.client.data.DataType,? extends androidx.health.services.client.data.AggregateDataPoint> summaryMetrics);
+ method public androidx.health.services.client.data.AchievedExerciseGoal getAchievedGoal();
+ method public java.time.Duration getActiveDuration();
+ method public java.time.Instant getEndTime();
+ method public androidx.health.services.client.proto.DataProto.MilestoneMarkerSummary getProto();
+ method public java.time.Instant getStartTime();
+ method public java.util.Map<androidx.health.services.client.data.DataType,androidx.health.services.client.data.AggregateDataPoint> getSummaryMetrics();
+ property public final androidx.health.services.client.data.AchievedExerciseGoal achievedGoal;
+ property public final java.time.Duration activeDuration;
+ property public final java.time.Instant endTime;
+ property public final java.time.Instant startTime;
+ property public final java.util.Map<androidx.health.services.client.data.DataType,androidx.health.services.client.data.AggregateDataPoint> summaryMetrics;
+ field public static final android.os.Parcelable.Creator<androidx.health.services.client.data.MilestoneMarkerSummary> CREATOR;
+ field public static final androidx.health.services.client.data.MilestoneMarkerSummary.Companion Companion;
+ }
+
+ public static final class MilestoneMarkerSummary.Companion {
+ }
+
+ public final class PassiveGoal extends androidx.health.services.client.data.ProtoParcelable<androidx.health.services.client.proto.DataProto.PassiveGoal> {
+ ctor public PassiveGoal(androidx.health.services.client.data.DataTypeCondition dataTypeCondition, int triggerFrequency);
+ method public static androidx.health.services.client.data.PassiveGoal? fromIntent(android.content.Intent intent);
+ method public androidx.health.services.client.data.DataTypeCondition getDataTypeCondition();
+ method public androidx.health.services.client.proto.DataProto.PassiveGoal getProto();
+ method public int getTriggerFrequency();
+ method public boolean isTriggered(androidx.health.services.client.data.DataPoint dataPoint);
+ method public void putToIntent(android.content.Intent intent);
+ property public final androidx.health.services.client.data.DataTypeCondition dataTypeCondition;
+ property public final int triggerFrequency;
+ field public static final String ACTION_GOAL = "hs.passivemonitoring.GOAL";
+ field public static final android.os.Parcelable.Creator<androidx.health.services.client.data.PassiveGoal> CREATOR;
+ field public static final androidx.health.services.client.data.PassiveGoal.Companion Companion;
+ }
+
+ public static final class PassiveGoal.Companion {
+ method public androidx.health.services.client.data.PassiveGoal? fromIntent(android.content.Intent intent);
+ }
+
+ public final class PassiveMonitoringCapabilities extends androidx.health.services.client.data.ProtoParcelable<androidx.health.services.client.proto.DataProto.PassiveMonitoringCapabilities> {
+ ctor public PassiveMonitoringCapabilities(java.util.Set<androidx.health.services.client.data.DataType> supportedDataTypesPassiveMonitoring, java.util.Set<androidx.health.services.client.data.DataType> supportedDataTypesPassiveGoals, java.util.Set<androidx.health.services.client.data.UserActivityState> supportedUserActivityStates);
+ method public androidx.health.services.client.proto.DataProto.PassiveMonitoringCapabilities getProto();
+ method public java.util.Set<androidx.health.services.client.data.DataType> getSupportedDataTypesPassiveGoals();
+ method public java.util.Set<androidx.health.services.client.data.DataType> getSupportedDataTypesPassiveMonitoring();
+ property public final java.util.Set<androidx.health.services.client.data.DataType> supportedDataTypesPassiveGoals;
+ property public final java.util.Set<androidx.health.services.client.data.DataType> supportedDataTypesPassiveMonitoring;
+ field public static final android.os.Parcelable.Creator<androidx.health.services.client.data.PassiveMonitoringCapabilities> CREATOR;
+ field public static final androidx.health.services.client.data.PassiveMonitoringCapabilities.Companion Companion;
+ }
+
+ public static final class PassiveMonitoringCapabilities.Companion {
+ }
+
+ public final class PassiveMonitoringConfig extends androidx.health.services.client.data.ProtoParcelable<androidx.health.services.client.proto.DataProto.PassiveMonitoringConfig> {
+ ctor public PassiveMonitoringConfig(java.util.Set<androidx.health.services.client.data.DataType> dataTypes, android.content.ComponentName componentName, optional boolean requestUserActivityState);
+ method public static androidx.health.services.client.data.PassiveMonitoringConfig.Builder builder();
+ method public android.content.ComponentName getComponentName();
+ method public java.util.Set<androidx.health.services.client.data.DataType> getDataTypes();
+ method public androidx.health.services.client.proto.DataProto.PassiveMonitoringConfig getProto();
+ method public boolean getRequestUserActivityState();
+ property public final android.content.ComponentName componentName;
+ property public final java.util.Set<androidx.health.services.client.data.DataType> dataTypes;
+ property public final boolean requestUserActivityState;
+ field public static final android.os.Parcelable.Creator<androidx.health.services.client.data.PassiveMonitoringConfig> CREATOR;
+ field public static final androidx.health.services.client.data.PassiveMonitoringConfig.Companion Companion;
+ }
+
+ public static final class PassiveMonitoringConfig.Builder {
+ ctor public PassiveMonitoringConfig.Builder();
+ method public androidx.health.services.client.data.PassiveMonitoringConfig build();
+ method public androidx.health.services.client.data.PassiveMonitoringConfig.Builder setComponentName(android.content.ComponentName componentName);
+ method public androidx.health.services.client.data.PassiveMonitoringConfig.Builder setDataTypes(java.util.Set<androidx.health.services.client.data.DataType> dataTypes);
+ method public androidx.health.services.client.data.PassiveMonitoringConfig.Builder setRequestUserActivityState(boolean requestUserActivityState);
+ }
+
+ public static final class PassiveMonitoringConfig.Companion {
+ method public androidx.health.services.client.data.PassiveMonitoringConfig.Builder builder();
+ }
+
+ public final class PassiveMonitoringUpdate extends androidx.health.services.client.data.ProtoParcelable<androidx.health.services.client.proto.DataProto.PassiveMonitoringUpdate> {
+ ctor public PassiveMonitoringUpdate(java.util.List<androidx.health.services.client.data.DataPoint> dataPoints, java.util.List<androidx.health.services.client.data.UserActivityInfo> userActivityInfoUpdates);
+ method public static androidx.health.services.client.data.PassiveMonitoringUpdate? fromIntent(android.content.Intent intent);
+ method public java.util.List<androidx.health.services.client.data.DataPoint> getDataPoints();
+ method public androidx.health.services.client.proto.DataProto.PassiveMonitoringUpdate getProto();
+ method public java.util.List<androidx.health.services.client.data.UserActivityInfo> getUserActivityInfoUpdates();
+ method public void putToIntent(android.content.Intent intent);
+ property public final java.util.List<androidx.health.services.client.data.DataPoint> dataPoints;
+ property public final java.util.List<androidx.health.services.client.data.UserActivityInfo> userActivityInfoUpdates;
+ field public static final String ACTION_DATA = "hs.passivemonitoring.DATA";
+ field public static final android.os.Parcelable.Creator<androidx.health.services.client.data.PassiveMonitoringUpdate> CREATOR;
+ field public static final androidx.health.services.client.data.PassiveMonitoringUpdate.Companion Companion;
+ }
+
+ public static final class PassiveMonitoringUpdate.Companion {
+ method public androidx.health.services.client.data.PassiveMonitoringUpdate? fromIntent(android.content.Intent intent);
+ }
+
+ public abstract class ProtoParcelable<T extends com.google.protobuf.MessageLite> implements android.os.Parcelable {
+ ctor public ProtoParcelable();
+ method public int describeContents();
+ method protected final byte[] getBytes();
+ method public abstract T getProto();
+ method public void writeToParcel(android.os.Parcel dest, int flags);
+ property protected final byte[] bytes;
+ property public abstract T proto;
+ field public static final androidx.health.services.client.data.ProtoParcelable.Companion Companion;
+ }
+
+ public static final class ProtoParcelable.Companion {
+ }
+
+ public final class StatisticalDataPoint extends androidx.health.services.client.data.AggregateDataPoint {
+ ctor public StatisticalDataPoint(java.time.Instant startTime, java.time.Instant endTime, androidx.health.services.client.data.DataType dataType, androidx.health.services.client.data.Value min, androidx.health.services.client.data.Value max, androidx.health.services.client.data.Value average);
+ method public androidx.health.services.client.data.Value getAverage();
+ method public androidx.health.services.client.data.DataType getDataType();
+ method public java.time.Instant getEndTime();
+ method public androidx.health.services.client.data.Value getMax();
+ method public androidx.health.services.client.data.Value getMin();
+ method public androidx.health.services.client.proto.DataProto.AggregateDataPoint getProto();
+ method public java.time.Instant getStartTime();
+ property public final androidx.health.services.client.data.Value average;
+ property public final androidx.health.services.client.data.DataType dataType;
+ property public final java.time.Instant endTime;
+ property public final androidx.health.services.client.data.Value max;
+ property public final androidx.health.services.client.data.Value min;
+ property public final java.time.Instant startTime;
+ field public static final android.os.Parcelable.Creator<androidx.health.services.client.data.StatisticalDataPoint> CREATOR;
+ field public static final androidx.health.services.client.data.StatisticalDataPoint.Companion Companion;
+ }
+
+ public static final class StatisticalDataPoint.Companion {
+ }
+
+ public final class UserActivityInfo extends androidx.health.services.client.data.ProtoParcelable<androidx.health.services.client.proto.DataProto.UserActivityInfo> {
+ ctor public UserActivityInfo(androidx.health.services.client.data.UserActivityState userActivityState, androidx.health.services.client.data.ExerciseInfo? exerciseInfo, java.time.Instant stateChangeTime);
+ method public static androidx.health.services.client.data.UserActivityInfo createActiveExerciseState(androidx.health.services.client.data.ExerciseInfo exerciseInfo, java.time.Instant stateChangeTime);
+ method public static androidx.health.services.client.data.UserActivityInfo createAsleepState(java.time.Instant stateChangeTime);
+ method public static androidx.health.services.client.data.UserActivityInfo createPassiveActivityState(java.time.Instant stateChangeTime);
+ method public static androidx.health.services.client.data.UserActivityInfo createUnknownTypeState(java.time.Instant stateChangeTime);
+ method public androidx.health.services.client.data.ExerciseInfo? getExerciseInfo();
+ method public androidx.health.services.client.proto.DataProto.UserActivityInfo getProto();
+ method public java.time.Instant getStateChangeTime();
+ method public androidx.health.services.client.data.UserActivityState getUserActivityState();
+ property public final androidx.health.services.client.data.ExerciseInfo? exerciseInfo;
+ property public final java.time.Instant stateChangeTime;
+ property public final androidx.health.services.client.data.UserActivityState userActivityState;
+ field public static final android.os.Parcelable.Creator<androidx.health.services.client.data.UserActivityInfo> CREATOR;
+ field public static final androidx.health.services.client.data.UserActivityInfo.Companion Companion;
+ }
+
+ public static final class UserActivityInfo.Companion {
+ method public androidx.health.services.client.data.UserActivityInfo createActiveExerciseState(androidx.health.services.client.data.ExerciseInfo exerciseInfo, java.time.Instant stateChangeTime);
+ method public androidx.health.services.client.data.UserActivityInfo createAsleepState(java.time.Instant stateChangeTime);
+ method public androidx.health.services.client.data.UserActivityInfo createPassiveActivityState(java.time.Instant stateChangeTime);
+ method public androidx.health.services.client.data.UserActivityInfo createUnknownTypeState(java.time.Instant stateChangeTime);
+ }
+
+ public final class UserActivityState {
+ ctor public UserActivityState(int id, String name);
+ method public int getId();
+ method public String getName();
+ property public final int id;
+ property public final String name;
+ field public static final androidx.health.services.client.data.UserActivityState.Companion Companion;
+ field public static final androidx.health.services.client.data.UserActivityState USER_ACTIVITY_ASLEEP;
+ field public static final androidx.health.services.client.data.UserActivityState USER_ACTIVITY_EXERCISE;
+ field public static final androidx.health.services.client.data.UserActivityState USER_ACTIVITY_PASSIVE;
+ field public static final androidx.health.services.client.data.UserActivityState USER_ACTIVITY_UNKNOWN;
+ }
+
+ public static final class UserActivityState.Companion {
+ }
+
+ public final class Value extends androidx.health.services.client.data.ProtoParcelable<androidx.health.services.client.proto.DataProto.Value> {
+ method public boolean asBoolean();
+ method public double asDouble();
+ method public double[] asDoubleArray();
+ method public long asLong();
+ method public static int compare(androidx.health.services.client.data.Value first, androidx.health.services.client.data.Value second);
+ method public int getFormat();
+ method public androidx.health.services.client.proto.DataProto.Value getProto();
+ method public boolean isBoolean();
+ method public boolean isDouble();
+ method public boolean isDoubleArray();
+ method public boolean isLong();
+ method public static androidx.health.services.client.data.Value ofBoolean(boolean value);
+ method public static androidx.health.services.client.data.Value ofDouble(double value);
+ method public static androidx.health.services.client.data.Value ofDoubleArray(double... doubleArray);
+ method public static androidx.health.services.client.data.Value ofLong(long value);
+ method public static androidx.health.services.client.data.Value sum(androidx.health.services.client.data.Value first, androidx.health.services.client.data.Value second);
+ property public final int format;
+ property public final boolean isBoolean;
+ property public final boolean isDouble;
+ property public final boolean isDoubleArray;
+ property public final boolean isLong;
+ field public static final android.os.Parcelable.Creator<androidx.health.services.client.data.Value> CREATOR;
+ field public static final androidx.health.services.client.data.Value.Companion Companion;
+ field public static final int FORMAT_BOOLEAN = 4; // 0x4
+ field public static final int FORMAT_DOUBLE = 1; // 0x1
+ field public static final int FORMAT_DOUBLE_ARRAY = 3; // 0x3
+ field public static final int FORMAT_LONG = 2; // 0x2
+ }
+
+ public static final class Value.Companion {
+ method public int compare(androidx.health.services.client.data.Value first, androidx.health.services.client.data.Value second);
+ method public androidx.health.services.client.data.Value ofBoolean(boolean value);
+ method public androidx.health.services.client.data.Value ofDouble(double value);
+ method public androidx.health.services.client.data.Value ofDoubleArray(double... doubleArray);
+ method public androidx.health.services.client.data.Value ofLong(long value);
+ method public androidx.health.services.client.data.Value sum(androidx.health.services.client.data.Value first, androidx.health.services.client.data.Value second);
+ }
+
+ public final class WarmUpConfig extends androidx.health.services.client.data.ProtoParcelable<androidx.health.services.client.proto.DataProto.WarmUpConfig> {
+ ctor public WarmUpConfig(androidx.health.services.client.data.ExerciseType exerciseType, java.util.Set<androidx.health.services.client.data.DataType> dataTypes);
+ method public java.util.Set<androidx.health.services.client.data.DataType> getDataTypes();
+ method public androidx.health.services.client.data.ExerciseType getExerciseType();
+ method public androidx.health.services.client.proto.DataProto.WarmUpConfig getProto();
+ property public final java.util.Set<androidx.health.services.client.data.DataType> dataTypes;
+ property public final androidx.health.services.client.data.ExerciseType exerciseType;
+ field public static final android.os.Parcelable.Creator<androidx.health.services.client.data.WarmUpConfig> CREATOR;
+ field public static final androidx.health.services.client.data.WarmUpConfig.Companion Companion;
+ }
+
+ public static final class WarmUpConfig.Companion {
+ }
+
+}
+
diff --git a/health/health-services-client/api/res-1.0.0-beta02.txt b/health/health-services-client/api/res-1.0.0-beta02.txt
new file mode 100644
index 0000000..e69de29
--- /dev/null
+++ b/health/health-services-client/api/res-1.0.0-beta02.txt
diff --git a/health/health-services-client/api/restricted_1.0.0-beta02.txt b/health/health-services-client/api/restricted_1.0.0-beta02.txt
new file mode 100644
index 0000000..7c59c28
--- /dev/null
+++ b/health/health-services-client/api/restricted_1.0.0-beta02.txt
@@ -0,0 +1,956 @@
+// Signature format: 4.0
+package androidx.health.services.client {
+
+ public interface ExerciseClient {
+ method public com.google.common.util.concurrent.ListenableFuture<java.lang.Void> addGoalToActiveExerciseAsync(androidx.health.services.client.data.ExerciseGoal exerciseGoal);
+ method public com.google.common.util.concurrent.ListenableFuture<java.lang.Void> clearUpdateCallbackAsync(androidx.health.services.client.ExerciseUpdateCallback callback);
+ method public com.google.common.util.concurrent.ListenableFuture<java.lang.Void> endExerciseAsync();
+ method public com.google.common.util.concurrent.ListenableFuture<java.lang.Void> flushExerciseAsync();
+ method public com.google.common.util.concurrent.ListenableFuture<androidx.health.services.client.data.ExerciseCapabilities> getCapabilities();
+ method public com.google.common.util.concurrent.ListenableFuture<androidx.health.services.client.data.ExerciseInfo> getCurrentExerciseInfoAsync();
+ method public com.google.common.util.concurrent.ListenableFuture<java.lang.Void> markLapAsync();
+ method public com.google.common.util.concurrent.ListenableFuture<java.lang.Void> overrideAutoPauseAndResumeForActiveExerciseAsync(boolean enabled);
+ method public com.google.common.util.concurrent.ListenableFuture<java.lang.Void> pauseExerciseAsync();
+ method public com.google.common.util.concurrent.ListenableFuture<java.lang.Void> prepareExerciseAsync(androidx.health.services.client.data.WarmUpConfig configuration);
+ method public com.google.common.util.concurrent.ListenableFuture<java.lang.Void> removeGoalFromActiveExerciseAsync(androidx.health.services.client.data.ExerciseGoal exerciseGoal);
+ method public com.google.common.util.concurrent.ListenableFuture<java.lang.Void> resumeExerciseAsync();
+ method public void setUpdateCallback(androidx.health.services.client.ExerciseUpdateCallback callback);
+ method public void setUpdateCallback(java.util.concurrent.Executor executor, androidx.health.services.client.ExerciseUpdateCallback callback);
+ method public com.google.common.util.concurrent.ListenableFuture<java.lang.Void> startExerciseAsync(androidx.health.services.client.data.ExerciseConfig configuration);
+ property public abstract com.google.common.util.concurrent.ListenableFuture<androidx.health.services.client.data.ExerciseCapabilities> capabilities;
+ }
+
+ public interface ExerciseUpdateCallback {
+ method public void onAvailabilityChanged(androidx.health.services.client.data.DataType dataType, androidx.health.services.client.data.Availability availability);
+ method public void onExerciseUpdateReceived(androidx.health.services.client.data.ExerciseUpdate update);
+ method public void onLapSummaryReceived(androidx.health.services.client.data.ExerciseLapSummary lapSummary);
+ method public void onRegistered();
+ method public void onRegistrationFailed(Throwable throwable);
+ }
+
+ public final class HealthServices {
+ method public static androidx.health.services.client.HealthServicesClient getClient(android.content.Context context);
+ field public static final androidx.health.services.client.HealthServices INSTANCE;
+ }
+
+ public interface HealthServicesClient {
+ method public androidx.health.services.client.ExerciseClient getExerciseClient();
+ method public androidx.health.services.client.MeasureClient getMeasureClient();
+ method public androidx.health.services.client.PassiveMonitoringClient getPassiveMonitoringClient();
+ property public abstract androidx.health.services.client.ExerciseClient exerciseClient;
+ property public abstract androidx.health.services.client.MeasureClient measureClient;
+ property public abstract androidx.health.services.client.PassiveMonitoringClient passiveMonitoringClient;
+ }
+
+ public interface MeasureCallback {
+ method public void onAvailabilityChanged(androidx.health.services.client.data.DataType dataType, androidx.health.services.client.data.Availability availability);
+ method public void onDataReceived(java.util.List<androidx.health.services.client.data.DataPoint> data);
+ method public default void onRegistered();
+ method public default void onRegistrationFailed(Throwable throwable);
+ }
+
+ public interface MeasureClient {
+ method public com.google.common.util.concurrent.ListenableFuture<androidx.health.services.client.data.MeasureCapabilities> getCapabilities();
+ method public void registerCallback(androidx.health.services.client.data.DataType dataType, androidx.health.services.client.MeasureCallback callback);
+ method public void registerCallback(androidx.health.services.client.data.DataType dataType, java.util.concurrent.Executor executor, androidx.health.services.client.MeasureCallback callback);
+ method public com.google.common.util.concurrent.ListenableFuture<java.lang.Void> unregisterCallbackAsync(androidx.health.services.client.data.DataType dataType, androidx.health.services.client.MeasureCallback callback);
+ property public abstract com.google.common.util.concurrent.ListenableFuture<androidx.health.services.client.data.MeasureCapabilities> capabilities;
+ }
+
+ public interface PassiveMonitoringCallback {
+ method public void onPassiveMonitoringUpdate(androidx.health.services.client.data.PassiveMonitoringUpdate update);
+ }
+
+ public interface PassiveMonitoringClient {
+ method public com.google.common.util.concurrent.ListenableFuture<java.lang.Void> flushAsync();
+ method public com.google.common.util.concurrent.ListenableFuture<androidx.health.services.client.data.PassiveMonitoringCapabilities> getCapabilities();
+ method public com.google.common.util.concurrent.ListenableFuture<java.lang.Void> registerDataCallbackAsync(androidx.health.services.client.data.PassiveMonitoringConfig configuration);
+ method public com.google.common.util.concurrent.ListenableFuture<java.lang.Void> registerDataCallbackAsync(androidx.health.services.client.data.PassiveMonitoringConfig configuration, androidx.health.services.client.PassiveMonitoringCallback callback);
+ method public <T extends android.content.BroadcastReceiver> com.google.common.util.concurrent.ListenableFuture<java.lang.Void> registerPassiveGoalCallbackAsync(androidx.health.services.client.data.PassiveGoal passiveGoal, Class<T> broadcastReceiver);
+ method public com.google.common.util.concurrent.ListenableFuture<java.lang.Void> unregisterDataCallbackAsync();
+ method public com.google.common.util.concurrent.ListenableFuture<java.lang.Void> unregisterPassiveGoalCallbackAsync(androidx.health.services.client.data.PassiveGoal passiveGoal);
+ property public abstract com.google.common.util.concurrent.ListenableFuture<androidx.health.services.client.data.PassiveMonitoringCapabilities> capabilities;
+ }
+
+}
+
+package androidx.health.services.client.data {
+
+ public final class AchievedExerciseGoal extends androidx.health.services.client.data.ProtoParcelable<androidx.health.services.client.proto.DataProto.AchievedExerciseGoal> {
+ ctor public AchievedExerciseGoal(androidx.health.services.client.data.ExerciseGoal goal);
+ method public androidx.health.services.client.data.ExerciseGoal getGoal();
+ method public androidx.health.services.client.proto.DataProto.AchievedExerciseGoal getProto();
+ property public final androidx.health.services.client.data.ExerciseGoal goal;
+ field public static final android.os.Parcelable.Creator<androidx.health.services.client.data.AchievedExerciseGoal> CREATOR;
+ field public static final androidx.health.services.client.data.AchievedExerciseGoal.Companion Companion;
+ }
+
+ public static final class AchievedExerciseGoal.Companion {
+ }
+
+ public abstract class AggregateDataPoint extends androidx.health.services.client.data.ProtoParcelable<androidx.health.services.client.proto.DataProto.AggregateDataPoint> {
+ ctor public AggregateDataPoint();
+ }
+
+ @Keep public final class AggregateDataPoints {
+ method public static androidx.health.services.client.data.StatisticalDataPoint aggregateAbsoluteElevation(double minAbsElevationMeters, double maxAbsElevationMeters, double avgAbsElevationMeters, java.time.Instant startTime, java.time.Instant endTime);
+ method public static androidx.health.services.client.data.AggregateDataPoint aggregateCalories(double kcalories, java.time.Instant startTime, java.time.Instant endTime);
+ method public static androidx.health.services.client.data.AggregateDataPoint aggregateDistance(double meters, java.time.Instant startTime, java.time.Instant endTime);
+ method public static androidx.health.services.client.data.AggregateDataPoint aggregateElevationGain(double gainMeters, java.time.Instant startTime, java.time.Instant endTime);
+ method public static androidx.health.services.client.data.StatisticalDataPoint aggregateHeartRate(double minBpm, double maxBpm, double avgBpm, java.time.Instant startTime, java.time.Instant endTime);
+ method public static androidx.health.services.client.data.AggregateDataPoint aggregatePace(java.time.Duration minMillisPerKm, java.time.Duration maxMillisPerKm, java.time.Duration avgMillisPerKm, java.time.Instant startTime, java.time.Instant endTime);
+ method public static androidx.health.services.client.data.StatisticalDataPoint aggregateSpeed(double minMetersPerSecond, double maxMetersPerSecond, double avgMetersPerSecond, java.time.Instant startTime, java.time.Instant endTime);
+ method public static androidx.health.services.client.data.AggregateDataPoint aggregateSteps(long steps, java.time.Instant startTime, java.time.Instant endTime);
+ method public static androidx.health.services.client.data.AggregateDataPoint aggregateSwimmingStrokes(long swimmingStrokes, java.time.Instant startTime, java.time.Instant endTime);
+ field public static final androidx.health.services.client.data.AggregateDataPoints INSTANCE;
+ }
+
+ public interface Availability {
+ method public int getId();
+ property public abstract int id;
+ field public static final androidx.health.services.client.data.Availability.Companion Companion;
+ }
+
+ public static final class Availability.Companion {
+ }
+
+ public final class ComparisonType {
+ method public int getId();
+ method public String getName();
+ property public final int id;
+ property public final String name;
+ field public static final androidx.health.services.client.data.ComparisonType.Companion Companion;
+ field public static final androidx.health.services.client.data.ComparisonType GREATER_THAN;
+ field public static final androidx.health.services.client.data.ComparisonType GREATER_THAN_OR_EQUAL;
+ field public static final androidx.health.services.client.data.ComparisonType LESS_THAN;
+ field public static final androidx.health.services.client.data.ComparisonType LESS_THAN_OR_EQUAL;
+ field public static final androidx.health.services.client.data.ComparisonType UNKNOWN;
+ }
+
+ public static final class ComparisonType.Companion {
+ }
+
+ public final class CumulativeDataPoint extends androidx.health.services.client.data.AggregateDataPoint {
+ ctor public CumulativeDataPoint(java.time.Instant startTime, java.time.Instant endTime, androidx.health.services.client.data.DataType dataType, androidx.health.services.client.data.Value total);
+ method public androidx.health.services.client.data.DataType getDataType();
+ method public java.time.Instant getEndTime();
+ method public androidx.health.services.client.proto.DataProto.AggregateDataPoint getProto();
+ method public java.time.Instant getStartTime();
+ method public androidx.health.services.client.data.Value getTotal();
+ property public final androidx.health.services.client.data.DataType dataType;
+ property public final java.time.Instant endTime;
+ property public final java.time.Instant startTime;
+ property public final androidx.health.services.client.data.Value total;
+ field public static final android.os.Parcelable.Creator<androidx.health.services.client.data.CumulativeDataPoint> CREATOR;
+ field public static final androidx.health.services.client.data.CumulativeDataPoint.Companion Companion;
+ }
+
+ public static final class CumulativeDataPoint.Companion {
+ }
+
+ public final class DataPoint extends androidx.health.services.client.data.ProtoParcelable<androidx.health.services.client.proto.DataProto.DataPoint> {
+ method public static androidx.health.services.client.data.DataPoint createInterval(androidx.health.services.client.data.DataType dataType, androidx.health.services.client.data.Value value, java.time.Duration startDurationFromBoot, java.time.Duration endDurationFromBoot, optional android.os.Bundle metadata, optional androidx.health.services.client.data.DataPointAccuracy? accuracy);
+ method public static androidx.health.services.client.data.DataPoint createInterval(androidx.health.services.client.data.DataType dataType, androidx.health.services.client.data.Value value, java.time.Duration startDurationFromBoot, java.time.Duration endDurationFromBoot, optional android.os.Bundle metadata);
+ method public static androidx.health.services.client.data.DataPoint createInterval(androidx.health.services.client.data.DataType dataType, androidx.health.services.client.data.Value value, java.time.Duration startDurationFromBoot, java.time.Duration endDurationFromBoot);
+ method public static androidx.health.services.client.data.DataPoint createSample(androidx.health.services.client.data.DataType dataType, androidx.health.services.client.data.Value value, java.time.Duration durationFromBoot, optional android.os.Bundle metadata, optional androidx.health.services.client.data.DataPointAccuracy? accuracy);
+ method public static androidx.health.services.client.data.DataPoint createSample(androidx.health.services.client.data.DataType dataType, androidx.health.services.client.data.Value value, java.time.Duration durationFromBoot, optional android.os.Bundle metadata);
+ method public static androidx.health.services.client.data.DataPoint createSample(androidx.health.services.client.data.DataType dataType, androidx.health.services.client.data.Value value, java.time.Duration durationFromBoot);
+ method public androidx.health.services.client.data.DataPointAccuracy? getAccuracy();
+ method public androidx.health.services.client.data.DataType getDataType();
+ method public java.time.Duration getEndDurationFromBoot();
+ method public java.time.Instant getEndInstant(java.time.Instant bootInstant);
+ method public android.os.Bundle getMetadata();
+ method public androidx.health.services.client.proto.DataProto.DataPoint getProto();
+ method public java.time.Duration getStartDurationFromBoot();
+ method public java.time.Instant getStartInstant(java.time.Instant bootInstant);
+ method public androidx.health.services.client.data.Value getValue();
+ property public final androidx.health.services.client.data.DataPointAccuracy? accuracy;
+ property public final androidx.health.services.client.data.DataType dataType;
+ property public final java.time.Duration endDurationFromBoot;
+ property public final android.os.Bundle metadata;
+ property public final java.time.Duration startDurationFromBoot;
+ property public final androidx.health.services.client.data.Value value;
+ field public static final android.os.Parcelable.Creator<androidx.health.services.client.data.DataPoint> CREATOR;
+ field public static final androidx.health.services.client.data.DataPoint.Companion Companion;
+ }
+
+ public static final class DataPoint.Companion {
+ method public androidx.health.services.client.data.DataPoint createInterval(androidx.health.services.client.data.DataType dataType, androidx.health.services.client.data.Value value, java.time.Duration startDurationFromBoot, java.time.Duration endDurationFromBoot, optional android.os.Bundle metadata, optional androidx.health.services.client.data.DataPointAccuracy? accuracy);
+ method public androidx.health.services.client.data.DataPoint createInterval(androidx.health.services.client.data.DataType dataType, androidx.health.services.client.data.Value value, java.time.Duration startDurationFromBoot, java.time.Duration endDurationFromBoot, optional android.os.Bundle metadata);
+ method public androidx.health.services.client.data.DataPoint createInterval(androidx.health.services.client.data.DataType dataType, androidx.health.services.client.data.Value value, java.time.Duration startDurationFromBoot, java.time.Duration endDurationFromBoot);
+ method public androidx.health.services.client.data.DataPoint createSample(androidx.health.services.client.data.DataType dataType, androidx.health.services.client.data.Value value, java.time.Duration durationFromBoot, optional android.os.Bundle metadata, optional androidx.health.services.client.data.DataPointAccuracy? accuracy);
+ method public androidx.health.services.client.data.DataPoint createSample(androidx.health.services.client.data.DataType dataType, androidx.health.services.client.data.Value value, java.time.Duration durationFromBoot, optional android.os.Bundle metadata);
+ method public androidx.health.services.client.data.DataPoint createSample(androidx.health.services.client.data.DataType dataType, androidx.health.services.client.data.Value value, java.time.Duration durationFromBoot);
+ }
+
+ public abstract class DataPointAccuracy extends androidx.health.services.client.data.ProtoParcelable<androidx.health.services.client.proto.DataProto.DataPointAccuracy> {
+ ctor public DataPointAccuracy();
+ }
+
+ @Keep public final class DataPoints {
+ method public static androidx.health.services.client.data.DataPoint absoluteElevation(double meters, java.time.Duration durationFromBoot, optional android.os.Bundle? metadata);
+ method public static androidx.health.services.client.data.DataPoint absoluteElevation(double meters, java.time.Duration durationFromBoot);
+ method public static androidx.health.services.client.data.DataPoint calories(double kcalories, java.time.Duration startDurationFromBoot, java.time.Duration endDurationFromBoot, optional android.os.Bundle? metadata);
+ method public static androidx.health.services.client.data.DataPoint calories(double kcalories, java.time.Duration startDurationFromBoot, java.time.Duration endDurationFromBoot);
+ method public static androidx.health.services.client.data.DataPoint dailyCalories(double calories, java.time.Duration startDurationFromBoot, java.time.Duration endDurationFromBoot);
+ method public static androidx.health.services.client.data.DataPoint dailyDistance(double meters, java.time.Duration startDurationFromBoot, java.time.Duration endDurationFromBoot);
+ method public static androidx.health.services.client.data.DataPoint dailyFloors(double floors, java.time.Duration startDurationFromBoot, java.time.Duration endDurationFromBoot);
+ method public static androidx.health.services.client.data.DataPoint dailySteps(long steps, java.time.Duration startDurationFromBoot, java.time.Duration endDurationFromBoot);
+ method public static androidx.health.services.client.data.DataPoint distance(double meters, java.time.Duration startDurationFromBoot, java.time.Duration endDurationFromBoot, optional android.os.Bundle? metadata);
+ method public static androidx.health.services.client.data.DataPoint distance(double meters, java.time.Duration startDurationFromBoot, java.time.Duration endDurationFromBoot);
+ method public static androidx.health.services.client.data.DataPoint floors(double floors, java.time.Duration startDurationFromBoot, java.time.Duration endDurationFromBoot, optional android.os.Bundle? metadata);
+ method public static androidx.health.services.client.data.DataPoint floors(double floors, java.time.Duration startDurationFromBoot, java.time.Duration endDurationFromBoot);
+ method @Keep public static java.util.List<androidx.health.services.client.data.DataPoint> getDataPoints(android.content.Intent intent);
+ method public static boolean getPermissionsGranted(android.content.Intent intent);
+ method public static androidx.health.services.client.data.DataPoint heartRate(double bpm, java.time.Duration durationFromBoot, optional androidx.health.services.client.data.HeartRateAccuracy? accuracy);
+ method public static androidx.health.services.client.data.DataPoint heartRate(double bpm, java.time.Duration durationFromBoot);
+ method public static androidx.health.services.client.data.DataPoint location(double latitude, double longitude, optional double altitude, optional double bearing, java.time.Duration durationFromBoot, optional androidx.health.services.client.data.LocationAccuracy? accuracy);
+ method public static androidx.health.services.client.data.DataPoint location(double latitude, double longitude, optional double altitude, optional double bearing, java.time.Duration durationFromBoot);
+ method public static androidx.health.services.client.data.DataPoint location(double latitude, double longitude, optional double altitude, java.time.Duration durationFromBoot);
+ method public static androidx.health.services.client.data.DataPoint location(double latitude, double longitude, java.time.Duration durationFromBoot);
+ method public static androidx.health.services.client.data.DataPoint pace(java.time.Duration millisPerKm, java.time.Duration durationFromBoot);
+ method public static void putDataPoints(android.content.Intent intent, java.util.Collection<androidx.health.services.client.data.DataPoint> dataPoints);
+ method public static void putPermissionsGranted(android.content.Intent intent, boolean granted);
+ method public static androidx.health.services.client.data.DataPoint speed(double metersPerSecond, java.time.Duration durationFromBoot, optional android.os.Bundle? metadata);
+ method public static androidx.health.services.client.data.DataPoint speed(double metersPerSecond, java.time.Duration durationFromBoot);
+ method public static androidx.health.services.client.data.DataPoint steps(long steps, java.time.Duration startDurationFromBoot, java.time.Duration endDurationFromBoot, optional android.os.Bundle? metadata);
+ method public static androidx.health.services.client.data.DataPoint steps(long steps, java.time.Duration startDurationFromBoot, java.time.Duration endDurationFromBoot);
+ method public static androidx.health.services.client.data.DataPoint stepsPerMinute(long stepsPerMinute, java.time.Duration startDurationFromBoot);
+ method public static androidx.health.services.client.data.DataPoint swimmingStrokes(long strokes, java.time.Duration startDurationFromBoot, java.time.Duration endDurationFromBoot);
+ field public static final androidx.health.services.client.data.DataPoints INSTANCE;
+ field public static final int LOCATION_DATA_POINT_ALTITUDE_INDEX = 2; // 0x2
+ field public static final int LOCATION_DATA_POINT_BEARING_INDEX = 3; // 0x3
+ field public static final int LOCATION_DATA_POINT_LATITUDE_INDEX = 0; // 0x0
+ field public static final int LOCATION_DATA_POINT_LONGITUDE_INDEX = 1; // 0x1
+ }
+
+ public final class DataType extends androidx.health.services.client.data.ProtoParcelable<androidx.health.services.client.proto.DataProto.DataType> {
+ ctor public DataType(String name, androidx.health.services.client.data.DataType.TimeType timeType, int format);
+ method public int getFormat();
+ method public String getName();
+ method public androidx.health.services.client.proto.DataProto.DataType getProto();
+ method public androidx.health.services.client.data.DataType.TimeType getTimeType();
+ property public final int format;
+ property public final String name;
+ property public final androidx.health.services.client.data.DataType.TimeType timeType;
+ field public static final androidx.health.services.client.data.DataType ABSOLUTE_ELEVATION;
+ field public static final androidx.health.services.client.data.DataType ACTIVE_EXERCISE_DURATION;
+ field public static final android.os.Parcelable.Creator<androidx.health.services.client.data.DataType> CREATOR;
+ field public static final androidx.health.services.client.data.DataType.Companion Companion;
+ field public static final androidx.health.services.client.data.DataType DAILY_CALORIES;
+ field public static final androidx.health.services.client.data.DataType DAILY_DISTANCE;
+ field public static final androidx.health.services.client.data.DataType DAILY_FLOORS;
+ field public static final androidx.health.services.client.data.DataType DAILY_STEPS;
+ field public static final androidx.health.services.client.data.DataType DECLINE_DISTANCE;
+ field public static final androidx.health.services.client.data.DataType DECLINE_DURATION;
+ field public static final androidx.health.services.client.data.DataType DISTANCE;
+ field public static final androidx.health.services.client.data.DataType ELEVATION_GAIN;
+ field public static final androidx.health.services.client.data.DataType ELEVATION_LOSS;
+ field public static final androidx.health.services.client.data.DataType FLAT_GROUND_DISTANCE;
+ field public static final androidx.health.services.client.data.DataType FLAT_GROUND_DURATION;
+ field public static final androidx.health.services.client.data.DataType FLOORS;
+ field public static final androidx.health.services.client.data.DataType HEART_RATE_BPM;
+ field public static final androidx.health.services.client.data.DataType INCLINE_DISTANCE;
+ field public static final androidx.health.services.client.data.DataType INCLINE_DURATION;
+ field public static final androidx.health.services.client.data.DataType LOCATION;
+ field public static final androidx.health.services.client.data.DataType PACE;
+ field public static final androidx.health.services.client.data.DataType REP_COUNT;
+ field public static final androidx.health.services.client.data.DataType RESTING_EXERCISE_DURATION;
+ field public static final androidx.health.services.client.data.DataType RUNNING_STEPS;
+ field public static final androidx.health.services.client.data.DataType SPEED;
+ field public static final androidx.health.services.client.data.DataType SPO2;
+ field public static final androidx.health.services.client.data.DataType STEPS;
+ field public static final androidx.health.services.client.data.DataType STEPS_PER_MINUTE;
+ field public static final androidx.health.services.client.data.DataType SWIMMING_LAP_COUNT;
+ field public static final androidx.health.services.client.data.DataType SWIMMING_STROKES;
+ field public static final androidx.health.services.client.data.DataType TOTAL_CALORIES;
+ field public static final androidx.health.services.client.data.DataType VO2;
+ field public static final androidx.health.services.client.data.DataType VO2_MAX;
+ field public static final androidx.health.services.client.data.DataType WALKING_STEPS;
+ }
+
+ public static final class DataType.Companion {
+ }
+
+ public static final class DataType.TimeType {
+ method public int getId();
+ method public String getName();
+ property public final int id;
+ property public final String name;
+ field public static final androidx.health.services.client.data.DataType.TimeType.Companion Companion;
+ field public static final androidx.health.services.client.data.DataType.TimeType INTERVAL;
+ field public static final androidx.health.services.client.data.DataType.TimeType SAMPLE;
+ }
+
+ public static final class DataType.TimeType.Companion {
+ }
+
+ public final class DataTypeAvailability implements androidx.health.services.client.data.Availability {
+ method public static androidx.health.services.client.data.DataTypeAvailability? fromId(int id);
+ method public int getId();
+ method public String getName();
+ property public int id;
+ property public final String name;
+ field public static final androidx.health.services.client.data.DataTypeAvailability ACQUIRING;
+ field public static final androidx.health.services.client.data.DataTypeAvailability AVAILABLE;
+ field public static final androidx.health.services.client.data.DataTypeAvailability.Companion Companion;
+ field public static final androidx.health.services.client.data.DataTypeAvailability UNAVAILABLE;
+ field public static final androidx.health.services.client.data.DataTypeAvailability UNAVAILABLE_DEVICE_OFF_BODY;
+ field public static final androidx.health.services.client.data.DataTypeAvailability UNKNOWN;
+ }
+
+ public static final class DataTypeAvailability.Companion {
+ method public androidx.health.services.client.data.DataTypeAvailability? fromId(int id);
+ }
+
+ public final class DataTypeCondition extends androidx.health.services.client.data.ProtoParcelable<androidx.health.services.client.proto.DataProto.DataTypeCondition> {
+ ctor public DataTypeCondition(androidx.health.services.client.data.DataType dataType, androidx.health.services.client.data.Value threshold, androidx.health.services.client.data.ComparisonType comparisonType);
+ method public androidx.health.services.client.data.ComparisonType getComparisonType();
+ method public androidx.health.services.client.data.DataType getDataType();
+ method public androidx.health.services.client.proto.DataProto.DataTypeCondition getProto();
+ method public androidx.health.services.client.data.Value getThreshold();
+ method public boolean isSatisfied(androidx.health.services.client.data.DataPoint dataPoint);
+ method public boolean isThresholdSatisfied(androidx.health.services.client.data.Value value);
+ property public final androidx.health.services.client.data.ComparisonType comparisonType;
+ property public final androidx.health.services.client.data.DataType dataType;
+ property public final androidx.health.services.client.data.Value threshold;
+ field public static final android.os.Parcelable.Creator<androidx.health.services.client.data.DataTypeCondition> CREATOR;
+ field public static final androidx.health.services.client.data.DataTypeCondition.Companion Companion;
+ }
+
+ public static final class DataTypeCondition.Companion {
+ }
+
+ public final class DataTypes {
+ method public static boolean isCumulativeDataType(androidx.health.services.client.data.DataType dataType);
+ method public static boolean isStatisticalDataType(androidx.health.services.client.data.DataType dataType);
+ field public static final androidx.health.services.client.data.DataTypes INSTANCE;
+ }
+
+ public final class ExerciseCapabilities extends androidx.health.services.client.data.ProtoParcelable<androidx.health.services.client.proto.DataProto.ExerciseCapabilities> {
+ ctor public ExerciseCapabilities(java.util.Map<androidx.health.services.client.data.ExerciseType,androidx.health.services.client.data.ExerciseTypeCapabilities> typeToCapabilities);
+ method public java.util.Set<androidx.health.services.client.data.ExerciseType> getAutoPauseAndResumeEnabledExercises();
+ method public androidx.health.services.client.data.ExerciseTypeCapabilities getExerciseTypeCapabilities(androidx.health.services.client.data.ExerciseType exercise);
+ method public androidx.health.services.client.proto.DataProto.ExerciseCapabilities getProto();
+ method public java.util.Set<androidx.health.services.client.data.ExerciseType> getSupportedExerciseTypes();
+ method public java.util.Map<androidx.health.services.client.data.ExerciseType,androidx.health.services.client.data.ExerciseTypeCapabilities> getTypeToCapabilities();
+ property public final java.util.Set<androidx.health.services.client.data.ExerciseType> autoPauseAndResumeEnabledExercises;
+ property public final java.util.Set<androidx.health.services.client.data.ExerciseType> supportedExerciseTypes;
+ property public final java.util.Map<androidx.health.services.client.data.ExerciseType,androidx.health.services.client.data.ExerciseTypeCapabilities> typeToCapabilities;
+ field public static final android.os.Parcelable.Creator<androidx.health.services.client.data.ExerciseCapabilities> CREATOR;
+ field public static final androidx.health.services.client.data.ExerciseCapabilities.Companion Companion;
+ }
+
+ public static final class ExerciseCapabilities.Companion {
+ }
+
+ public final class ExerciseConfig extends androidx.health.services.client.data.ProtoParcelable<androidx.health.services.client.proto.DataProto.ExerciseConfig> {
+ ctor public ExerciseConfig(androidx.health.services.client.data.ExerciseType exerciseType, java.util.Set<androidx.health.services.client.data.DataType> dataTypes, java.util.Set<androidx.health.services.client.data.DataType> aggregateDataTypes, boolean isAutoPauseAndResumeEnabled, boolean isGpsEnabled, java.util.List<androidx.health.services.client.data.ExerciseGoal> exerciseGoals, android.os.Bundle exerciseParams);
+ method public static androidx.health.services.client.data.ExerciseConfig.Builder builder();
+ method public java.util.Set<androidx.health.services.client.data.DataType> getAggregateDataTypes();
+ method public java.util.Set<androidx.health.services.client.data.DataType> getDataTypes();
+ method public java.util.List<androidx.health.services.client.data.ExerciseGoal> getExerciseGoals();
+ method public android.os.Bundle getExerciseParams();
+ method public androidx.health.services.client.data.ExerciseType getExerciseType();
+ method public androidx.health.services.client.proto.DataProto.ExerciseConfig getProto();
+ method public boolean isAutoPauseAndResumeEnabled();
+ method public boolean isGpsEnabled();
+ property public final java.util.Set<androidx.health.services.client.data.DataType> aggregateDataTypes;
+ property public final java.util.Set<androidx.health.services.client.data.DataType> dataTypes;
+ property public final java.util.List<androidx.health.services.client.data.ExerciseGoal> exerciseGoals;
+ property public final android.os.Bundle exerciseParams;
+ property public final androidx.health.services.client.data.ExerciseType exerciseType;
+ property public final boolean isAutoPauseAndResumeEnabled;
+ property public final boolean isGpsEnabled;
+ field public static final android.os.Parcelable.Creator<androidx.health.services.client.data.ExerciseConfig> CREATOR;
+ field public static final androidx.health.services.client.data.ExerciseConfig.Companion Companion;
+ }
+
+ public static final class ExerciseConfig.Builder {
+ ctor public ExerciseConfig.Builder();
+ method public androidx.health.services.client.data.ExerciseConfig build();
+ method public androidx.health.services.client.data.ExerciseConfig.Builder setAggregateDataTypes(java.util.Set<androidx.health.services.client.data.DataType> dataTypes);
+ method public androidx.health.services.client.data.ExerciseConfig.Builder setDataTypes(java.util.Set<androidx.health.services.client.data.DataType> dataTypes);
+ method public androidx.health.services.client.data.ExerciseConfig.Builder setExerciseGoals(java.util.List<androidx.health.services.client.data.ExerciseGoal> exerciseGoals);
+ method public androidx.health.services.client.data.ExerciseConfig.Builder setExerciseParams(android.os.Bundle exerciseParams);
+ method public androidx.health.services.client.data.ExerciseConfig.Builder setExerciseType(androidx.health.services.client.data.ExerciseType exerciseType);
+ method public androidx.health.services.client.data.ExerciseConfig.Builder setIsAutoPauseAndResumeEnabled(boolean autoPauseAndResumeEnabled);
+ method public androidx.health.services.client.data.ExerciseConfig.Builder setIsGpsEnabled(boolean gpsEnabled);
+ }
+
+ public static final class ExerciseConfig.Companion {
+ method public androidx.health.services.client.data.ExerciseConfig.Builder builder();
+ }
+
+ public final class ExerciseGoal extends androidx.health.services.client.data.ProtoParcelable<androidx.health.services.client.proto.DataProto.ExerciseGoal> {
+ method public static androidx.health.services.client.data.ExerciseGoal createMilestone(androidx.health.services.client.data.DataTypeCondition condition, androidx.health.services.client.data.Value period);
+ method public static androidx.health.services.client.data.ExerciseGoal createMilestoneGoalWithUpdatedThreshold(androidx.health.services.client.data.ExerciseGoal goal, androidx.health.services.client.data.Value newThreshold);
+ method public static androidx.health.services.client.data.ExerciseGoal createOneTimeGoal(androidx.health.services.client.data.DataTypeCondition condition);
+ method public androidx.health.services.client.data.DataTypeCondition getDataTypeCondition();
+ method public androidx.health.services.client.data.ExerciseGoalType getExerciseGoalType();
+ method public androidx.health.services.client.data.Value? getPeriod();
+ method public androidx.health.services.client.proto.DataProto.ExerciseGoal getProto();
+ property public final androidx.health.services.client.data.DataTypeCondition dataTypeCondition;
+ property public final androidx.health.services.client.data.ExerciseGoalType exerciseGoalType;
+ property public final androidx.health.services.client.data.Value? period;
+ field public static final android.os.Parcelable.Creator<androidx.health.services.client.data.ExerciseGoal> CREATOR;
+ field public static final androidx.health.services.client.data.ExerciseGoal.Companion Companion;
+ }
+
+ public static final class ExerciseGoal.Companion {
+ method public androidx.health.services.client.data.ExerciseGoal createMilestone(androidx.health.services.client.data.DataTypeCondition condition, androidx.health.services.client.data.Value period);
+ method public androidx.health.services.client.data.ExerciseGoal createMilestoneGoalWithUpdatedThreshold(androidx.health.services.client.data.ExerciseGoal goal, androidx.health.services.client.data.Value newThreshold);
+ method public androidx.health.services.client.data.ExerciseGoal createOneTimeGoal(androidx.health.services.client.data.DataTypeCondition condition);
+ }
+
+ public final class ExerciseGoalType {
+ method public static androidx.health.services.client.data.ExerciseGoalType? fromId(int id);
+ method public int getId();
+ method public String getName();
+ property public final int id;
+ property public final String name;
+ field public static final androidx.health.services.client.data.ExerciseGoalType.Companion Companion;
+ field public static final androidx.health.services.client.data.ExerciseGoalType MILESTONE;
+ field public static final androidx.health.services.client.data.ExerciseGoalType ONE_TIME_GOAL;
+ }
+
+ public static final class ExerciseGoalType.Companion {
+ method public androidx.health.services.client.data.ExerciseGoalType? fromId(int id);
+ }
+
+ public final class ExerciseInfo extends androidx.health.services.client.data.ProtoParcelable<androidx.health.services.client.proto.DataProto.ExerciseInfo> {
+ ctor public ExerciseInfo(int exerciseTrackedStatus, androidx.health.services.client.data.ExerciseType exerciseType);
+ method public int getExerciseTrackedStatus();
+ method public androidx.health.services.client.data.ExerciseType getExerciseType();
+ method public androidx.health.services.client.proto.DataProto.ExerciseInfo getProto();
+ property public final int exerciseTrackedStatus;
+ property public final androidx.health.services.client.data.ExerciseType exerciseType;
+ field public static final android.os.Parcelable.Creator<androidx.health.services.client.data.ExerciseInfo> CREATOR;
+ field public static final androidx.health.services.client.data.ExerciseInfo.Companion Companion;
+ }
+
+ public static final class ExerciseInfo.Companion {
+ }
+
+ public final class ExerciseLapSummary extends androidx.health.services.client.data.ProtoParcelable<androidx.health.services.client.proto.DataProto.ExerciseLapSummary> {
+ ctor public ExerciseLapSummary(int lapCount, java.time.Instant startTime, java.time.Instant endTime, java.time.Duration activeDuration, java.util.Map<androidx.health.services.client.data.DataType,? extends androidx.health.services.client.data.AggregateDataPoint> lapMetrics);
+ method public java.time.Duration getActiveDuration();
+ method public java.time.Instant getEndTime();
+ method public int getLapCount();
+ method public java.util.Map<androidx.health.services.client.data.DataType,androidx.health.services.client.data.AggregateDataPoint> getLapMetrics();
+ method public androidx.health.services.client.proto.DataProto.ExerciseLapSummary getProto();
+ method public java.time.Instant getStartTime();
+ property public final java.time.Duration activeDuration;
+ property public final java.time.Instant endTime;
+ property public final int lapCount;
+ property public final java.util.Map<androidx.health.services.client.data.DataType,androidx.health.services.client.data.AggregateDataPoint> lapMetrics;
+ property public final java.time.Instant startTime;
+ field public static final android.os.Parcelable.Creator<androidx.health.services.client.data.ExerciseLapSummary> CREATOR;
+ field public static final androidx.health.services.client.data.ExerciseLapSummary.Companion Companion;
+ }
+
+ public static final class ExerciseLapSummary.Companion {
+ }
+
+ public final class ExerciseState {
+ method public static androidx.health.services.client.data.ExerciseState? fromId(int id);
+ method public int getId();
+ method public String getName();
+ method public boolean isEnded();
+ method public boolean isEnding();
+ method public boolean isPaused();
+ method public boolean isResuming();
+ property public final int id;
+ property public final boolean isEnded;
+ property public final boolean isEnding;
+ property public final boolean isPaused;
+ property public final boolean isResuming;
+ property public final String name;
+ field public static final androidx.health.services.client.data.ExerciseState ACTIVE;
+ field public static final androidx.health.services.client.data.ExerciseState AUTO_ENDED;
+ field public static final androidx.health.services.client.data.ExerciseState AUTO_ENDED_PERMISSION_LOST;
+ field public static final androidx.health.services.client.data.ExerciseState AUTO_ENDING;
+ field public static final androidx.health.services.client.data.ExerciseState AUTO_ENDING_PERMISSION_LOST;
+ field public static final androidx.health.services.client.data.ExerciseState AUTO_PAUSED;
+ field public static final androidx.health.services.client.data.ExerciseState AUTO_PAUSING;
+ field public static final androidx.health.services.client.data.ExerciseState AUTO_RESUMING;
+ field public static final androidx.health.services.client.data.ExerciseState.Companion Companion;
+ field public static final androidx.health.services.client.data.ExerciseState PREPARING;
+ field public static final androidx.health.services.client.data.ExerciseState TERMINATED;
+ field public static final androidx.health.services.client.data.ExerciseState TERMINATING;
+ field public static final androidx.health.services.client.data.ExerciseState USER_ENDED;
+ field public static final androidx.health.services.client.data.ExerciseState USER_ENDING;
+ field public static final androidx.health.services.client.data.ExerciseState USER_PAUSED;
+ field public static final androidx.health.services.client.data.ExerciseState USER_PAUSING;
+ field public static final androidx.health.services.client.data.ExerciseState USER_RESUMING;
+ field public static final androidx.health.services.client.data.ExerciseState USER_STARTING;
+ }
+
+ public static final class ExerciseState.Companion {
+ method public androidx.health.services.client.data.ExerciseState? fromId(int id);
+ }
+
+ public final class ExerciseType {
+ method public static androidx.health.services.client.data.ExerciseType fromId(int id);
+ method public int getId();
+ method public String getName();
+ property public final int id;
+ property public final String name;
+ field public static final androidx.health.services.client.data.ExerciseType ALPINE_SKIING;
+ field public static final androidx.health.services.client.data.ExerciseType BACKPACKING;
+ field public static final androidx.health.services.client.data.ExerciseType BACK_EXTENSION;
+ field public static final androidx.health.services.client.data.ExerciseType BADMINTON;
+ field public static final androidx.health.services.client.data.ExerciseType BARBELL_SHOULDER_PRESS;
+ field public static final androidx.health.services.client.data.ExerciseType BASEBALL;
+ field public static final androidx.health.services.client.data.ExerciseType BASKETBALL;
+ field public static final androidx.health.services.client.data.ExerciseType BENCH_PRESS;
+ field public static final androidx.health.services.client.data.ExerciseType BENCH_SIT_UP;
+ field public static final androidx.health.services.client.data.ExerciseType BIKING;
+ field public static final androidx.health.services.client.data.ExerciseType BIKING_STATIONARY;
+ field public static final androidx.health.services.client.data.ExerciseType BOOT_CAMP;
+ field public static final androidx.health.services.client.data.ExerciseType BOXING;
+ field public static final androidx.health.services.client.data.ExerciseType BURPEE;
+ field public static final androidx.health.services.client.data.ExerciseType CALISTHENICS;
+ field public static final androidx.health.services.client.data.ExerciseType CRICKET;
+ field public static final androidx.health.services.client.data.ExerciseType CROSS_COUNTRY_SKIING;
+ field public static final androidx.health.services.client.data.ExerciseType CRUNCH;
+ field public static final androidx.health.services.client.data.ExerciseType.Companion Companion;
+ field public static final androidx.health.services.client.data.ExerciseType DANCING;
+ field public static final androidx.health.services.client.data.ExerciseType DEADLIFT;
+ field public static final androidx.health.services.client.data.ExerciseType DUMBBELL_CURL_LEFT_ARM;
+ field public static final androidx.health.services.client.data.ExerciseType DUMBBELL_CURL_RIGHT_ARM;
+ field public static final androidx.health.services.client.data.ExerciseType DUMBBELL_FRONT_RAISE;
+ field public static final androidx.health.services.client.data.ExerciseType DUMBBELL_LATERAL_RAISE;
+ field public static final androidx.health.services.client.data.ExerciseType DUMBBELL_TRICEPS_EXTENSION_LEFT_ARM;
+ field public static final androidx.health.services.client.data.ExerciseType DUMBBELL_TRICEPS_EXTENSION_RIGHT_ARM;
+ field public static final androidx.health.services.client.data.ExerciseType DUMBBELL_TRICEPS_EXTENSION_TWO_ARM;
+ field public static final androidx.health.services.client.data.ExerciseType ELLIPTICAL;
+ field public static final androidx.health.services.client.data.ExerciseType EXERCISE_CLASS;
+ field public static final androidx.health.services.client.data.ExerciseType FENCING;
+ field public static final androidx.health.services.client.data.ExerciseType FOOTBALL_AMERICAN;
+ field public static final androidx.health.services.client.data.ExerciseType FOOTBALL_AUSTRALIAN;
+ field public static final androidx.health.services.client.data.ExerciseType FORWARD_TWIST;
+ field public static final androidx.health.services.client.data.ExerciseType FRISBEE_DISC;
+ field public static final androidx.health.services.client.data.ExerciseType GOLF;
+ field public static final androidx.health.services.client.data.ExerciseType GUIDED_BREATHING;
+ field public static final androidx.health.services.client.data.ExerciseType GYMNASTICS;
+ field public static final androidx.health.services.client.data.ExerciseType HANDBALL;
+ field public static final androidx.health.services.client.data.ExerciseType HIGH_INTENSITY_INTERVAL_TRAINING;
+ field public static final androidx.health.services.client.data.ExerciseType HIKING;
+ field public static final androidx.health.services.client.data.ExerciseType HORSE_RIDING;
+ field public static final androidx.health.services.client.data.ExerciseType ICE_HOCKEY;
+ field public static final androidx.health.services.client.data.ExerciseType ICE_SKATING;
+ field public static final androidx.health.services.client.data.ExerciseType INLINE_SKATING;
+ field public static final androidx.health.services.client.data.ExerciseType JUMPING_JACK;
+ field public static final androidx.health.services.client.data.ExerciseType JUMP_ROPE;
+ field public static final androidx.health.services.client.data.ExerciseType LAT_PULL_DOWN;
+ field public static final androidx.health.services.client.data.ExerciseType LUNGE;
+ field public static final androidx.health.services.client.data.ExerciseType MARTIAL_ARTS;
+ field public static final androidx.health.services.client.data.ExerciseType MEDITATION;
+ field public static final androidx.health.services.client.data.ExerciseType MOUNTAIN_BIKING;
+ field public static final androidx.health.services.client.data.ExerciseType ORIENTEERING;
+ field public static final androidx.health.services.client.data.ExerciseType PADDLING;
+ field public static final androidx.health.services.client.data.ExerciseType PARA_GLIDING;
+ field public static final androidx.health.services.client.data.ExerciseType PILATES;
+ field public static final androidx.health.services.client.data.ExerciseType PLANK;
+ field public static final androidx.health.services.client.data.ExerciseType RACQUETBALL;
+ field public static final androidx.health.services.client.data.ExerciseType ROCK_CLIMBING;
+ field public static final androidx.health.services.client.data.ExerciseType ROLLER_HOCKEY;
+ field public static final androidx.health.services.client.data.ExerciseType ROLLER_SKATING;
+ field public static final androidx.health.services.client.data.ExerciseType ROWING;
+ field public static final androidx.health.services.client.data.ExerciseType ROWING_MACHINE;
+ field public static final androidx.health.services.client.data.ExerciseType RUGBY;
+ field public static final androidx.health.services.client.data.ExerciseType RUNNING;
+ field public static final androidx.health.services.client.data.ExerciseType RUNNING_TREADMILL;
+ field public static final androidx.health.services.client.data.ExerciseType SAILING;
+ field public static final androidx.health.services.client.data.ExerciseType SCUBA_DIVING;
+ field public static final androidx.health.services.client.data.ExerciseType SKATING;
+ field public static final androidx.health.services.client.data.ExerciseType SKIING;
+ field public static final androidx.health.services.client.data.ExerciseType SNOWBOARDING;
+ field public static final androidx.health.services.client.data.ExerciseType SNOWSHOEING;
+ field public static final androidx.health.services.client.data.ExerciseType SOCCER;
+ field public static final androidx.health.services.client.data.ExerciseType SOFTBALL;
+ field public static final androidx.health.services.client.data.ExerciseType SQUASH;
+ field public static final androidx.health.services.client.data.ExerciseType SQUAT;
+ field public static final androidx.health.services.client.data.ExerciseType STAIR_CLIMBING;
+ field public static final androidx.health.services.client.data.ExerciseType STAIR_CLIMBING_MACHINE;
+ field public static final androidx.health.services.client.data.ExerciseType STRENGTH_TRAINING;
+ field public static final androidx.health.services.client.data.ExerciseType STRETCHING;
+ field public static final androidx.health.services.client.data.ExerciseType SURFING;
+ field public static final androidx.health.services.client.data.ExerciseType SWIMMING_OPEN_WATER;
+ field public static final androidx.health.services.client.data.ExerciseType SWIMMING_POOL;
+ field public static final androidx.health.services.client.data.ExerciseType TABLE_TENNIS;
+ field public static final androidx.health.services.client.data.ExerciseType TENNIS;
+ field public static final androidx.health.services.client.data.ExerciseType UNKNOWN;
+ field public static final androidx.health.services.client.data.ExerciseType UPPER_TWIST;
+ field public static final androidx.health.services.client.data.ExerciseType VOLLEYBALL;
+ field public static final androidx.health.services.client.data.ExerciseType WALKING;
+ field public static final androidx.health.services.client.data.ExerciseType WATER_POLO;
+ field public static final androidx.health.services.client.data.ExerciseType WEIGHTLIFTING;
+ field public static final androidx.health.services.client.data.ExerciseType WORKOUT;
+ field public static final androidx.health.services.client.data.ExerciseType YACHTING;
+ field public static final androidx.health.services.client.data.ExerciseType YOGA;
+ }
+
+ public static final class ExerciseType.Companion {
+ method public androidx.health.services.client.data.ExerciseType fromId(int id);
+ }
+
+ public final class ExerciseTypeCapabilities extends androidx.health.services.client.data.ProtoParcelable<androidx.health.services.client.proto.DataProto.ExerciseTypeCapabilities> {
+ ctor public ExerciseTypeCapabilities(java.util.Set<androidx.health.services.client.data.DataType> supportedDataTypes, java.util.Map<androidx.health.services.client.data.DataType,? extends java.util.Set<androidx.health.services.client.data.ComparisonType>> supportedGoals, java.util.Map<androidx.health.services.client.data.DataType,? extends java.util.Set<androidx.health.services.client.data.ComparisonType>> supportedMilestones, boolean supportsAutoPauseAndResume, boolean supportsLaps);
+ method public androidx.health.services.client.proto.DataProto.ExerciseTypeCapabilities getProto();
+ method public java.util.Set<androidx.health.services.client.data.DataType> getSupportedDataTypes();
+ method public java.util.Map<androidx.health.services.client.data.DataType,java.util.Set<androidx.health.services.client.data.ComparisonType>> getSupportedGoals();
+ method public java.util.Map<androidx.health.services.client.data.DataType,java.util.Set<androidx.health.services.client.data.ComparisonType>> getSupportedMilestones();
+ method public boolean getSupportsAutoPauseAndResume();
+ method public boolean getSupportsLaps();
+ property public final java.util.Set<androidx.health.services.client.data.DataType> supportedDataTypes;
+ property public final java.util.Map<androidx.health.services.client.data.DataType,java.util.Set<androidx.health.services.client.data.ComparisonType>> supportedGoals;
+ property public final java.util.Map<androidx.health.services.client.data.DataType,java.util.Set<androidx.health.services.client.data.ComparisonType>> supportedMilestones;
+ property public final boolean supportsAutoPauseAndResume;
+ property public final boolean supportsLaps;
+ field public static final android.os.Parcelable.Creator<androidx.health.services.client.data.ExerciseTypeCapabilities> CREATOR;
+ field public static final androidx.health.services.client.data.ExerciseTypeCapabilities.Companion Companion;
+ }
+
+ public static final class ExerciseTypeCapabilities.Companion {
+ }
+
+ public final class ExerciseUpdate extends androidx.health.services.client.data.ProtoParcelable<androidx.health.services.client.proto.DataProto.ExerciseUpdate> {
+ ctor public ExerciseUpdate(androidx.health.services.client.data.ExerciseState state, java.time.Instant? startTime, java.time.Duration activeDuration, java.time.Duration? updateDurationFromBoot, java.util.Map<androidx.health.services.client.data.DataType,? extends java.util.List<androidx.health.services.client.data.DataPoint>> latestMetrics, java.util.Map<androidx.health.services.client.data.DataType,? extends androidx.health.services.client.data.AggregateDataPoint> latestAggregateMetrics, java.util.Set<androidx.health.services.client.data.AchievedExerciseGoal> latestAchievedGoals, java.util.Set<androidx.health.services.client.data.MilestoneMarkerSummary> latestMilestoneMarkerSummaries, androidx.health.services.client.data.ExerciseConfig? exerciseConfig, androidx.health.services.client.data.ExerciseUpdate.ActiveDurationCheckpoint? activeDurationCheckpoint);
+ method public java.time.Duration getActiveDuration();
+ method public java.time.Duration getActiveDurationAtDataPoint(androidx.health.services.client.data.DataPoint dataPoint);
+ method public androidx.health.services.client.data.ExerciseUpdate.ActiveDurationCheckpoint? getActiveDurationCheckpoint();
+ method public androidx.health.services.client.data.ExerciseConfig? getExerciseConfig();
+ method public java.util.Set<androidx.health.services.client.data.AchievedExerciseGoal> getLatestAchievedGoals();
+ method public java.util.Map<androidx.health.services.client.data.DataType,androidx.health.services.client.data.AggregateDataPoint> getLatestAggregateMetrics();
+ method public java.util.Map<androidx.health.services.client.data.DataType,java.util.List<androidx.health.services.client.data.DataPoint>> getLatestMetrics();
+ method public java.util.Set<androidx.health.services.client.data.MilestoneMarkerSummary> getLatestMilestoneMarkerSummaries();
+ method public androidx.health.services.client.proto.DataProto.ExerciseUpdate getProto();
+ method public java.time.Instant? getStartTime();
+ method public androidx.health.services.client.data.ExerciseState getState();
+ property public final java.time.Duration activeDuration;
+ property public final androidx.health.services.client.data.ExerciseUpdate.ActiveDurationCheckpoint? activeDurationCheckpoint;
+ property public final androidx.health.services.client.data.ExerciseConfig? exerciseConfig;
+ property public final java.util.Set<androidx.health.services.client.data.AchievedExerciseGoal> latestAchievedGoals;
+ property public final java.util.Map<androidx.health.services.client.data.DataType,androidx.health.services.client.data.AggregateDataPoint> latestAggregateMetrics;
+ property public final java.util.Map<androidx.health.services.client.data.DataType,java.util.List<androidx.health.services.client.data.DataPoint>> latestMetrics;
+ property public final java.util.Set<androidx.health.services.client.data.MilestoneMarkerSummary> latestMilestoneMarkerSummaries;
+ property public final java.time.Instant? startTime;
+ property public final androidx.health.services.client.data.ExerciseState state;
+ field public static final android.os.Parcelable.Creator<androidx.health.services.client.data.ExerciseUpdate> CREATOR;
+ field public static final androidx.health.services.client.data.ExerciseUpdate.Companion Companion;
+ }
+
+ public static final class ExerciseUpdate.ActiveDurationCheckpoint {
+ ctor public ExerciseUpdate.ActiveDurationCheckpoint(java.time.Instant time, java.time.Duration activeDuration);
+ method public java.time.Duration getActiveDuration();
+ method public java.time.Instant getTime();
+ property public final java.time.Duration activeDuration;
+ property public final java.time.Instant time;
+ }
+
+ public static final class ExerciseUpdate.Companion {
+ }
+
+ public final class HeartRateAccuracy extends androidx.health.services.client.data.DataPointAccuracy {
+ ctor public HeartRateAccuracy(androidx.health.services.client.data.HeartRateAccuracy.SensorStatus sensorStatus);
+ method public androidx.health.services.client.proto.DataProto.DataPointAccuracy getProto();
+ method public androidx.health.services.client.data.HeartRateAccuracy.SensorStatus getSensorStatus();
+ property public final androidx.health.services.client.data.HeartRateAccuracy.SensorStatus sensorStatus;
+ field public static final android.os.Parcelable.Creator<androidx.health.services.client.data.HeartRateAccuracy> CREATOR;
+ field public static final androidx.health.services.client.data.HeartRateAccuracy.Companion Companion;
+ }
+
+ public static final class HeartRateAccuracy.Companion {
+ }
+
+ public static final class HeartRateAccuracy.SensorStatus {
+ method public int getId();
+ method public String getName();
+ property public final int id;
+ property public final String name;
+ field public static final androidx.health.services.client.data.HeartRateAccuracy.SensorStatus ACCURACY_HIGH;
+ field public static final androidx.health.services.client.data.HeartRateAccuracy.SensorStatus ACCURACY_LOW;
+ field public static final androidx.health.services.client.data.HeartRateAccuracy.SensorStatus ACCURACY_MEDIUM;
+ field public static final androidx.health.services.client.data.HeartRateAccuracy.SensorStatus.Companion Companion;
+ field public static final androidx.health.services.client.data.HeartRateAccuracy.SensorStatus NO_CONTACT;
+ field public static final androidx.health.services.client.data.HeartRateAccuracy.SensorStatus UNKNOWN;
+ field public static final androidx.health.services.client.data.HeartRateAccuracy.SensorStatus UNRELIABLE;
+ }
+
+ public static final class HeartRateAccuracy.SensorStatus.Companion {
+ }
+
+ public final class LocationAccuracy extends androidx.health.services.client.data.DataPointAccuracy {
+ ctor public LocationAccuracy(double horizontalPositionErrorMeters, optional double verticalPositionErrorMeters);
+ ctor public LocationAccuracy(double horizontalPositionErrorMeters);
+ method public double getHorizontalPositionErrorMeters();
+ method public androidx.health.services.client.proto.DataProto.DataPointAccuracy getProto();
+ property public final double horizontalPositionErrorMeters;
+ field public static final android.os.Parcelable.Creator<androidx.health.services.client.data.LocationAccuracy> CREATOR;
+ field public static final androidx.health.services.client.data.LocationAccuracy.Companion Companion;
+ }
+
+ public static final class LocationAccuracy.Companion {
+ }
+
+ public final class LocationAvailability implements androidx.health.services.client.data.Availability {
+ method public static androidx.health.services.client.data.LocationAvailability? fromId(int id);
+ method public int getId();
+ method public String getName();
+ property public int id;
+ property public final String name;
+ field public static final androidx.health.services.client.data.LocationAvailability ACQUIRED_TETHERED;
+ field public static final androidx.health.services.client.data.LocationAvailability ACQUIRED_UNTETHERED;
+ field public static final androidx.health.services.client.data.LocationAvailability ACQUIRING;
+ field public static final androidx.health.services.client.data.LocationAvailability.Companion Companion;
+ field public static final androidx.health.services.client.data.LocationAvailability NO_GNSS;
+ field public static final androidx.health.services.client.data.LocationAvailability UNAVAILABLE;
+ field public static final androidx.health.services.client.data.LocationAvailability UNKNOWN;
+ }
+
+ public static final class LocationAvailability.Companion {
+ method public androidx.health.services.client.data.LocationAvailability? fromId(int id);
+ }
+
+ public final class MeasureCapabilities extends androidx.health.services.client.data.ProtoParcelable<androidx.health.services.client.proto.DataProto.MeasureCapabilities> {
+ ctor public MeasureCapabilities(java.util.Set<androidx.health.services.client.data.DataType> supportedDataTypesMeasure);
+ method public androidx.health.services.client.proto.DataProto.MeasureCapabilities getProto();
+ method public java.util.Set<androidx.health.services.client.data.DataType> getSupportedDataTypesMeasure();
+ property public final java.util.Set<androidx.health.services.client.data.DataType> supportedDataTypesMeasure;
+ field public static final android.os.Parcelable.Creator<androidx.health.services.client.data.MeasureCapabilities> CREATOR;
+ field public static final androidx.health.services.client.data.MeasureCapabilities.Companion Companion;
+ }
+
+ public static final class MeasureCapabilities.Companion {
+ }
+
+ public final class MilestoneMarkerSummary extends androidx.health.services.client.data.ProtoParcelable<androidx.health.services.client.proto.DataProto.MilestoneMarkerSummary> {
+ ctor public MilestoneMarkerSummary(java.time.Instant startTime, java.time.Instant endTime, java.time.Duration activeDuration, androidx.health.services.client.data.AchievedExerciseGoal achievedGoal, java.util.Map<androidx.health.services.client.data.DataType,? extends androidx.health.services.client.data.AggregateDataPoint> summaryMetrics);
+ method public androidx.health.services.client.data.AchievedExerciseGoal getAchievedGoal();
+ method public java.time.Duration getActiveDuration();
+ method public java.time.Instant getEndTime();
+ method public androidx.health.services.client.proto.DataProto.MilestoneMarkerSummary getProto();
+ method public java.time.Instant getStartTime();
+ method public java.util.Map<androidx.health.services.client.data.DataType,androidx.health.services.client.data.AggregateDataPoint> getSummaryMetrics();
+ property public final androidx.health.services.client.data.AchievedExerciseGoal achievedGoal;
+ property public final java.time.Duration activeDuration;
+ property public final java.time.Instant endTime;
+ property public final java.time.Instant startTime;
+ property public final java.util.Map<androidx.health.services.client.data.DataType,androidx.health.services.client.data.AggregateDataPoint> summaryMetrics;
+ field public static final android.os.Parcelable.Creator<androidx.health.services.client.data.MilestoneMarkerSummary> CREATOR;
+ field public static final androidx.health.services.client.data.MilestoneMarkerSummary.Companion Companion;
+ }
+
+ public static final class MilestoneMarkerSummary.Companion {
+ }
+
+ public final class PassiveGoal extends androidx.health.services.client.data.ProtoParcelable<androidx.health.services.client.proto.DataProto.PassiveGoal> {
+ ctor public PassiveGoal(androidx.health.services.client.data.DataTypeCondition dataTypeCondition, int triggerFrequency);
+ method public static androidx.health.services.client.data.PassiveGoal? fromIntent(android.content.Intent intent);
+ method public androidx.health.services.client.data.DataTypeCondition getDataTypeCondition();
+ method public androidx.health.services.client.proto.DataProto.PassiveGoal getProto();
+ method public int getTriggerFrequency();
+ method public boolean isTriggered(androidx.health.services.client.data.DataPoint dataPoint);
+ method public void putToIntent(android.content.Intent intent);
+ property public final androidx.health.services.client.data.DataTypeCondition dataTypeCondition;
+ property public final int triggerFrequency;
+ field public static final String ACTION_GOAL = "hs.passivemonitoring.GOAL";
+ field public static final android.os.Parcelable.Creator<androidx.health.services.client.data.PassiveGoal> CREATOR;
+ field public static final androidx.health.services.client.data.PassiveGoal.Companion Companion;
+ }
+
+ public static final class PassiveGoal.Companion {
+ method public androidx.health.services.client.data.PassiveGoal? fromIntent(android.content.Intent intent);
+ }
+
+ public final class PassiveMonitoringCapabilities extends androidx.health.services.client.data.ProtoParcelable<androidx.health.services.client.proto.DataProto.PassiveMonitoringCapabilities> {
+ ctor public PassiveMonitoringCapabilities(java.util.Set<androidx.health.services.client.data.DataType> supportedDataTypesPassiveMonitoring, java.util.Set<androidx.health.services.client.data.DataType> supportedDataTypesPassiveGoals, java.util.Set<androidx.health.services.client.data.UserActivityState> supportedUserActivityStates);
+ method public androidx.health.services.client.proto.DataProto.PassiveMonitoringCapabilities getProto();
+ method public java.util.Set<androidx.health.services.client.data.DataType> getSupportedDataTypesPassiveGoals();
+ method public java.util.Set<androidx.health.services.client.data.DataType> getSupportedDataTypesPassiveMonitoring();
+ property public final java.util.Set<androidx.health.services.client.data.DataType> supportedDataTypesPassiveGoals;
+ property public final java.util.Set<androidx.health.services.client.data.DataType> supportedDataTypesPassiveMonitoring;
+ field public static final android.os.Parcelable.Creator<androidx.health.services.client.data.PassiveMonitoringCapabilities> CREATOR;
+ field public static final androidx.health.services.client.data.PassiveMonitoringCapabilities.Companion Companion;
+ }
+
+ public static final class PassiveMonitoringCapabilities.Companion {
+ }
+
+ public final class PassiveMonitoringConfig extends androidx.health.services.client.data.ProtoParcelable<androidx.health.services.client.proto.DataProto.PassiveMonitoringConfig> {
+ ctor public PassiveMonitoringConfig(java.util.Set<androidx.health.services.client.data.DataType> dataTypes, android.content.ComponentName componentName, optional boolean requestUserActivityState);
+ method public static androidx.health.services.client.data.PassiveMonitoringConfig.Builder builder();
+ method public android.content.ComponentName getComponentName();
+ method public java.util.Set<androidx.health.services.client.data.DataType> getDataTypes();
+ method public androidx.health.services.client.proto.DataProto.PassiveMonitoringConfig getProto();
+ method public boolean getRequestUserActivityState();
+ property public final android.content.ComponentName componentName;
+ property public final java.util.Set<androidx.health.services.client.data.DataType> dataTypes;
+ property public final boolean requestUserActivityState;
+ field public static final android.os.Parcelable.Creator<androidx.health.services.client.data.PassiveMonitoringConfig> CREATOR;
+ field public static final androidx.health.services.client.data.PassiveMonitoringConfig.Companion Companion;
+ }
+
+ public static final class PassiveMonitoringConfig.Builder {
+ ctor public PassiveMonitoringConfig.Builder();
+ method public androidx.health.services.client.data.PassiveMonitoringConfig build();
+ method public androidx.health.services.client.data.PassiveMonitoringConfig.Builder setComponentName(android.content.ComponentName componentName);
+ method public androidx.health.services.client.data.PassiveMonitoringConfig.Builder setDataTypes(java.util.Set<androidx.health.services.client.data.DataType> dataTypes);
+ method public androidx.health.services.client.data.PassiveMonitoringConfig.Builder setRequestUserActivityState(boolean requestUserActivityState);
+ }
+
+ public static final class PassiveMonitoringConfig.Companion {
+ method public androidx.health.services.client.data.PassiveMonitoringConfig.Builder builder();
+ }
+
+ public final class PassiveMonitoringUpdate extends androidx.health.services.client.data.ProtoParcelable<androidx.health.services.client.proto.DataProto.PassiveMonitoringUpdate> {
+ ctor public PassiveMonitoringUpdate(java.util.List<androidx.health.services.client.data.DataPoint> dataPoints, java.util.List<androidx.health.services.client.data.UserActivityInfo> userActivityInfoUpdates);
+ method public static androidx.health.services.client.data.PassiveMonitoringUpdate? fromIntent(android.content.Intent intent);
+ method public java.util.List<androidx.health.services.client.data.DataPoint> getDataPoints();
+ method public androidx.health.services.client.proto.DataProto.PassiveMonitoringUpdate getProto();
+ method public java.util.List<androidx.health.services.client.data.UserActivityInfo> getUserActivityInfoUpdates();
+ method public void putToIntent(android.content.Intent intent);
+ property public final java.util.List<androidx.health.services.client.data.DataPoint> dataPoints;
+ property public final java.util.List<androidx.health.services.client.data.UserActivityInfo> userActivityInfoUpdates;
+ field public static final String ACTION_DATA = "hs.passivemonitoring.DATA";
+ field public static final android.os.Parcelable.Creator<androidx.health.services.client.data.PassiveMonitoringUpdate> CREATOR;
+ field public static final androidx.health.services.client.data.PassiveMonitoringUpdate.Companion Companion;
+ }
+
+ public static final class PassiveMonitoringUpdate.Companion {
+ method public androidx.health.services.client.data.PassiveMonitoringUpdate? fromIntent(android.content.Intent intent);
+ }
+
+ public abstract class ProtoParcelable<T extends com.google.protobuf.MessageLite> implements android.os.Parcelable {
+ ctor public ProtoParcelable();
+ method public int describeContents();
+ method protected final byte[] getBytes();
+ method public abstract T getProto();
+ method public void writeToParcel(android.os.Parcel dest, int flags);
+ property protected final byte[] bytes;
+ property public abstract T proto;
+ field public static final androidx.health.services.client.data.ProtoParcelable.Companion Companion;
+ }
+
+ public static final class ProtoParcelable.Companion {
+ }
+
+ public final class StatisticalDataPoint extends androidx.health.services.client.data.AggregateDataPoint {
+ ctor public StatisticalDataPoint(java.time.Instant startTime, java.time.Instant endTime, androidx.health.services.client.data.DataType dataType, androidx.health.services.client.data.Value min, androidx.health.services.client.data.Value max, androidx.health.services.client.data.Value average);
+ method public androidx.health.services.client.data.Value getAverage();
+ method public androidx.health.services.client.data.DataType getDataType();
+ method public java.time.Instant getEndTime();
+ method public androidx.health.services.client.data.Value getMax();
+ method public androidx.health.services.client.data.Value getMin();
+ method public androidx.health.services.client.proto.DataProto.AggregateDataPoint getProto();
+ method public java.time.Instant getStartTime();
+ property public final androidx.health.services.client.data.Value average;
+ property public final androidx.health.services.client.data.DataType dataType;
+ property public final java.time.Instant endTime;
+ property public final androidx.health.services.client.data.Value max;
+ property public final androidx.health.services.client.data.Value min;
+ property public final java.time.Instant startTime;
+ field public static final android.os.Parcelable.Creator<androidx.health.services.client.data.StatisticalDataPoint> CREATOR;
+ field public static final androidx.health.services.client.data.StatisticalDataPoint.Companion Companion;
+ }
+
+ public static final class StatisticalDataPoint.Companion {
+ }
+
+ public final class UserActivityInfo extends androidx.health.services.client.data.ProtoParcelable<androidx.health.services.client.proto.DataProto.UserActivityInfo> {
+ ctor public UserActivityInfo(androidx.health.services.client.data.UserActivityState userActivityState, androidx.health.services.client.data.ExerciseInfo? exerciseInfo, java.time.Instant stateChangeTime);
+ method public static androidx.health.services.client.data.UserActivityInfo createActiveExerciseState(androidx.health.services.client.data.ExerciseInfo exerciseInfo, java.time.Instant stateChangeTime);
+ method public static androidx.health.services.client.data.UserActivityInfo createAsleepState(java.time.Instant stateChangeTime);
+ method public static androidx.health.services.client.data.UserActivityInfo createPassiveActivityState(java.time.Instant stateChangeTime);
+ method public static androidx.health.services.client.data.UserActivityInfo createUnknownTypeState(java.time.Instant stateChangeTime);
+ method public androidx.health.services.client.data.ExerciseInfo? getExerciseInfo();
+ method public androidx.health.services.client.proto.DataProto.UserActivityInfo getProto();
+ method public java.time.Instant getStateChangeTime();
+ method public androidx.health.services.client.data.UserActivityState getUserActivityState();
+ property public final androidx.health.services.client.data.ExerciseInfo? exerciseInfo;
+ property public final java.time.Instant stateChangeTime;
+ property public final androidx.health.services.client.data.UserActivityState userActivityState;
+ field public static final android.os.Parcelable.Creator<androidx.health.services.client.data.UserActivityInfo> CREATOR;
+ field public static final androidx.health.services.client.data.UserActivityInfo.Companion Companion;
+ }
+
+ public static final class UserActivityInfo.Companion {
+ method public androidx.health.services.client.data.UserActivityInfo createActiveExerciseState(androidx.health.services.client.data.ExerciseInfo exerciseInfo, java.time.Instant stateChangeTime);
+ method public androidx.health.services.client.data.UserActivityInfo createAsleepState(java.time.Instant stateChangeTime);
+ method public androidx.health.services.client.data.UserActivityInfo createPassiveActivityState(java.time.Instant stateChangeTime);
+ method public androidx.health.services.client.data.UserActivityInfo createUnknownTypeState(java.time.Instant stateChangeTime);
+ }
+
+ public final class UserActivityState {
+ ctor public UserActivityState(int id, String name);
+ method public int getId();
+ method public String getName();
+ property public final int id;
+ property public final String name;
+ field public static final androidx.health.services.client.data.UserActivityState.Companion Companion;
+ field public static final androidx.health.services.client.data.UserActivityState USER_ACTIVITY_ASLEEP;
+ field public static final androidx.health.services.client.data.UserActivityState USER_ACTIVITY_EXERCISE;
+ field public static final androidx.health.services.client.data.UserActivityState USER_ACTIVITY_PASSIVE;
+ field public static final androidx.health.services.client.data.UserActivityState USER_ACTIVITY_UNKNOWN;
+ }
+
+ public static final class UserActivityState.Companion {
+ }
+
+ public final class Value extends androidx.health.services.client.data.ProtoParcelable<androidx.health.services.client.proto.DataProto.Value> {
+ method public boolean asBoolean();
+ method public double asDouble();
+ method public double[] asDoubleArray();
+ method public long asLong();
+ method public static int compare(androidx.health.services.client.data.Value first, androidx.health.services.client.data.Value second);
+ method public int getFormat();
+ method public androidx.health.services.client.proto.DataProto.Value getProto();
+ method public boolean isBoolean();
+ method public boolean isDouble();
+ method public boolean isDoubleArray();
+ method public boolean isLong();
+ method public static androidx.health.services.client.data.Value ofBoolean(boolean value);
+ method public static androidx.health.services.client.data.Value ofDouble(double value);
+ method public static androidx.health.services.client.data.Value ofDoubleArray(double... doubleArray);
+ method public static androidx.health.services.client.data.Value ofLong(long value);
+ method public static androidx.health.services.client.data.Value sum(androidx.health.services.client.data.Value first, androidx.health.services.client.data.Value second);
+ property public final int format;
+ property public final boolean isBoolean;
+ property public final boolean isDouble;
+ property public final boolean isDoubleArray;
+ property public final boolean isLong;
+ field public static final android.os.Parcelable.Creator<androidx.health.services.client.data.Value> CREATOR;
+ field public static final androidx.health.services.client.data.Value.Companion Companion;
+ field public static final int FORMAT_BOOLEAN = 4; // 0x4
+ field public static final int FORMAT_DOUBLE = 1; // 0x1
+ field public static final int FORMAT_DOUBLE_ARRAY = 3; // 0x3
+ field public static final int FORMAT_LONG = 2; // 0x2
+ }
+
+ public static final class Value.Companion {
+ method public int compare(androidx.health.services.client.data.Value first, androidx.health.services.client.data.Value second);
+ method public androidx.health.services.client.data.Value ofBoolean(boolean value);
+ method public androidx.health.services.client.data.Value ofDouble(double value);
+ method public androidx.health.services.client.data.Value ofDoubleArray(double... doubleArray);
+ method public androidx.health.services.client.data.Value ofLong(long value);
+ method public androidx.health.services.client.data.Value sum(androidx.health.services.client.data.Value first, androidx.health.services.client.data.Value second);
+ }
+
+ public final class WarmUpConfig extends androidx.health.services.client.data.ProtoParcelable<androidx.health.services.client.proto.DataProto.WarmUpConfig> {
+ ctor public WarmUpConfig(androidx.health.services.client.data.ExerciseType exerciseType, java.util.Set<androidx.health.services.client.data.DataType> dataTypes);
+ method public java.util.Set<androidx.health.services.client.data.DataType> getDataTypes();
+ method public androidx.health.services.client.data.ExerciseType getExerciseType();
+ method public androidx.health.services.client.proto.DataProto.WarmUpConfig getProto();
+ property public final java.util.Set<androidx.health.services.client.data.DataType> dataTypes;
+ property public final androidx.health.services.client.data.ExerciseType exerciseType;
+ field public static final android.os.Parcelable.Creator<androidx.health.services.client.data.WarmUpConfig> CREATOR;
+ field public static final androidx.health.services.client.data.WarmUpConfig.Companion Companion;
+ }
+
+ public static final class WarmUpConfig.Companion {
+ }
+
+}
+
diff --git a/libraryversions.toml b/libraryversions.toml
index ec0529e..8c53f8e 100644
--- a/libraryversions.toml
+++ b/libraryversions.toml
@@ -10,6 +10,7 @@
AUTOFILL = "1.2.0-beta02"
BENCHMARK = "1.2.0-alpha01"
BIOMETRIC = "1.2.0-alpha05"
+BLUETOOTH = "1.0.0-alpha01"
BROWSER = "1.5.0-alpha01"
BUILDSRC_TESTS = "1.0.0-alpha01"
CAMERA = "1.2.0-alpha01"
@@ -18,11 +19,13 @@
CAR_APP = "1.3.0-alpha01"
COLLECTION = "1.3.0-alpha01"
COLLECTION2 = "1.3.0-alpha01"
-COMPOSE = "1.2.0-beta01"
-COMPOSE_MATERIAL3 = "1.0.0-alpha11"
+COMPOSE_RUNTIME_TRACING = "1.0.0-alpha01"
+COMPOSE = "1.2.0-beta02"
+COMPOSE_MATERIAL3 = "1.0.0-alpha12"
+COMPOSE_RUNTIME_TRACING = "1.0.0-alpha01"
CONTENTPAGER = "1.1.0-alpha01"
COORDINATORLAYOUT = "1.3.0-alpha01"
-CORE = "1.8.0-rc01"
+CORE = "1.9.0-alpha04"
CORE_ANIMATION = "1.0.0-beta02"
CORE_ANIMATION_TESTING = "1.0.0-beta01"
CORE_APPDIGEST = "1.0.0-alpha01"
@@ -35,7 +38,7 @@
CORE_UWB = "1.0.0-alpha01"
CURSORADAPTER = "1.1.0-alpha01"
CUSTOMVIEW = "1.2.0-alpha02"
-CUSTOMVIEW_POOLINGCONTAINER = "1.0.0-beta01"
+CUSTOMVIEW_POOLINGCONTAINER = "1.0.0-beta02"
DATASTORE = "1.1.0-alpha01"
DOCUMENTFILE = "1.1.0-alpha02"
DRAGANDDROP = "1.1.0-alpha01"
@@ -51,8 +54,8 @@
GLANCE = "1.0.0-alpha04"
GLANCE_TEMPLATE = "1.0.0-alpha01"
GRIDLAYOUT = "1.1.0-alpha01"
-HEALTH_CONNECT_CLIENT = "1.0.0-alpha01"
-HEALTH_SERVICES_CLIENT = "1.0.0-beta01"
+HEALTH_CONNECT_CLIENT = "1.0.0-alpha02"
+HEALTH_SERVICES_CLIENT = "1.0.0-beta02"
HEIFWRITER = "1.1.0-alpha02"
HILT = "1.1.0-alpha01"
HILT_NAVIGATION_COMPOSE = "1.1.0-alpha01"
@@ -81,7 +84,7 @@
PERCENTLAYOUT = "1.1.0-alpha01"
PREFERENCE = "1.3.0-alpha01"
PRINT = "1.1.0-beta01"
-PROFILEINSTALLER = "1.2.0-beta01"
+PROFILEINSTALLER = "1.2.0-beta02"
RECOMMENDATION = "1.1.0-alpha01"
RECYCLERVIEW = "1.3.0-alpha03"
RECYCLERVIEW_SELECTION = "1.2.0-alpha02"
@@ -118,16 +121,16 @@
VIEWPAGER = "1.1.0-alpha02"
VIEWPAGER2 = "1.1.0-beta02"
WEAR = "1.3.0-alpha03"
-WEAR_COMPOSE = "1.0.0-beta01"
+WEAR_COMPOSE = "1.0.0-beta02"
WEAR_INPUT = "1.2.0-alpha03"
WEAR_INPUT_TESTING = "1.2.0-alpha03"
WEAR_ONGOING = "1.1.0-alpha01"
WEAR_PHONE_INTERACTIONS = "1.1.0-alpha04"
WEAR_REMOTE_INTERACTIONS = "1.1.0-alpha01"
-WEAR_TILES = "1.1.0-alpha06"
-WEAR_WATCHFACE = "1.1.0-beta02"
+WEAR_TILES = "1.1.0-alpha07"
+WEAR_WATCHFACE = "1.2.0-alpha01"
WEBKIT = "1.5.0-alpha01"
-WINDOW = "1.1.0-alpha02"
+WINDOW = "1.1.0-alpha03"
WINDOW_EXTENSIONS = "1.1.0-alpha01"
WINDOW_SIDECAR = "1.0.0-rc01"
WORK = "2.8.0-alpha02"
@@ -143,6 +146,7 @@
AUTOFILL = { group = "androidx.autofill", atomicGroupVersion = "versions.AUTOFILL" }
BENCHMARK = { group = "androidx.benchmark", atomicGroupVersion = "versions.BENCHMARK" }
BIOMETRIC = { group = "androidx.biometric", atomicGroupVersion = "versions.BIOMETRIC" }
+BLUETOOTH = { group = "androidx.bluetooth", atomicGroupVersion = "versions.BLUETOOTH" }
BROWSER = { group = "androidx.browser", atomicGroupVersion = "versions.BROWSER" }
BUILDSRC_TESTS = { group = "androidx.buildSrc-tests", atomicGroupVersion = "versions.BUILDSRC_TESTS" }
CAMERA = { group = "androidx.camera", atomicGroupVersion = "versions.CAMERA" }
diff --git a/mediarouter/mediarouter/build.gradle b/mediarouter/mediarouter/build.gradle
index 87ca287..8e77961 100644
--- a/mediarouter/mediarouter/build.gradle
+++ b/mediarouter/mediarouter/build.gradle
@@ -41,15 +41,6 @@
}
android {
- sourceSets {
- main.java.srcDirs += [
- "jellybean",
- "jellybean-mr1",
- "jellybean-mr2",
- "api24"
- ]
- }
-
buildTypes.all {
consumerProguardFiles "proguard-rules.pro"
}
diff --git a/mediarouter/mediarouter/src/androidTest/java/androidx/mediarouter/media/MediaRouter2Test.java b/mediarouter/mediarouter/src/androidTest/java/androidx/mediarouter/media/MediaRouter2Test.java
index 522ae5f..eb44a5e 100644
--- a/mediarouter/mediarouter/src/androidTest/java/androidx/mediarouter/media/MediaRouter2Test.java
+++ b/mediarouter/mediarouter/src/androidTest/java/androidx/mediarouter/media/MediaRouter2Test.java
@@ -148,7 +148,8 @@
}
@Override
- public void onRouteUnselected(MediaRouter router, RouteInfo route, int reason) {
+ public void onRouteUnselected(
+ @NonNull MediaRouter router, @NonNull RouteInfo route, int reason) {
if (TextUtils.equals(route.getDescriptorId(), descriptorId)
&& reason == MediaRouter.UNSELECT_REASON_STOPPED) {
onRouteUnselectedLatch.countDown();
@@ -156,7 +157,7 @@
}
@Override
- public void onRouteChanged(MediaRouter router, RouteInfo route) {
+ public void onRouteChanged(@NonNull MediaRouter router, @NonNull RouteInfo route) {
if (onRouteUnselectedLatch.getCount() == 0
&& TextUtils.equals(route.getDescriptorId(), descriptorId)
&& route.isEnabled()) {
@@ -232,7 +233,8 @@
addCallback(new MediaRouter.Callback() {
@Override
- public void onRouterParamsChanged(MediaRouter router, MediaRouterParams params) {
+ public void onRouterParamsChanged(
+ @NonNull MediaRouter router, MediaRouterParams params) {
routerParams[0] = params;
onRouterParmasChangedLatch.countDown();
}
@@ -253,7 +255,8 @@
void addCallback(MediaRouter.Callback callback) {
getInstrumentation().runOnMainSync(() -> {
- mRouter.addCallback(mSelector, callback, MediaRouter.CALLBACK_FLAG_REQUEST_DISCOVERY
+ mRouter.addCallback(mSelector, callback,
+ MediaRouter.CALLBACK_FLAG_REQUEST_DISCOVERY
| MediaRouter.CALLBACK_FLAG_PERFORM_ACTIVE_SCAN);
});
mCallbacks.add(callback);
@@ -263,7 +266,7 @@
CountDownLatch latch = new CountDownLatch(1);
MediaRouter.Callback callback = new MediaRouter.Callback() {
@Override
- public void onRouteAdded(MediaRouter router, RouteInfo route) {
+ public void onRouteAdded(@NonNull MediaRouter router, @NonNull RouteInfo route) {
if (!route.isDefaultOrBluetooth()) {
latch.countDown();
}
diff --git a/mediarouter/mediarouter/src/main/java/androidx/mediarouter/app/MediaRouteActionProvider.java b/mediarouter/mediarouter/src/main/java/androidx/mediarouter/app/MediaRouteActionProvider.java
index 2c69865..aee286e 100644
--- a/mediarouter/mediarouter/src/main/java/androidx/mediarouter/app/MediaRouteActionProvider.java
+++ b/mediarouter/mediarouter/src/main/java/androidx/mediarouter/app/MediaRouteActionProvider.java
@@ -299,7 +299,6 @@
}
@Override
- @SuppressWarnings("deprecation")
@NonNull
public View onCreateActionView() {
if (mButton != null) {
@@ -350,32 +349,37 @@
}
@Override
- public void onRouteAdded(MediaRouter router, MediaRouter.RouteInfo info) {
+ public void onRouteAdded(@NonNull MediaRouter router, @NonNull MediaRouter.RouteInfo info) {
refreshRoute(router);
}
@Override
- public void onRouteRemoved(MediaRouter router, MediaRouter.RouteInfo info) {
+ public void onRouteRemoved(@NonNull MediaRouter router,
+ @NonNull MediaRouter.RouteInfo info) {
refreshRoute(router);
}
@Override
- public void onRouteChanged(MediaRouter router, MediaRouter.RouteInfo info) {
+ public void onRouteChanged(@NonNull MediaRouter router,
+ @NonNull MediaRouter.RouteInfo info) {
refreshRoute(router);
}
@Override
- public void onProviderAdded(MediaRouter router, MediaRouter.ProviderInfo provider) {
+ public void onProviderAdded(@NonNull MediaRouter router,
+ @NonNull MediaRouter.ProviderInfo provider) {
refreshRoute(router);
}
@Override
- public void onProviderRemoved(MediaRouter router, MediaRouter.ProviderInfo provider) {
+ public void onProviderRemoved(@NonNull MediaRouter router,
+ @NonNull MediaRouter.ProviderInfo provider) {
refreshRoute(router);
}
@Override
- public void onProviderChanged(MediaRouter router, MediaRouter.ProviderInfo provider) {
+ public void onProviderChanged(@NonNull MediaRouter router,
+ @NonNull MediaRouter.ProviderInfo provider) {
refreshRoute(router);
}
diff --git a/mediarouter/mediarouter/src/main/java/androidx/mediarouter/app/MediaRouteButton.java b/mediarouter/mediarouter/src/main/java/androidx/mediarouter/app/MediaRouteButton.java
index 88a95b7..7614ff5 100644
--- a/mediarouter/mediarouter/src/main/java/androidx/mediarouter/app/MediaRouteButton.java
+++ b/mediarouter/mediarouter/src/main/java/androidx/mediarouter/app/MediaRouteButton.java
@@ -412,7 +412,6 @@
return result;
}
- @SuppressWarnings("deprecation")
private boolean showOutputSwitcherForAndroidR() {
Context context = getContext();
@@ -800,47 +799,54 @@
}
@Override
- public void onRouteAdded(MediaRouter router, MediaRouter.RouteInfo info) {
+ public void onRouteAdded(@NonNull MediaRouter router, @NonNull MediaRouter.RouteInfo info) {
refreshRoute();
}
@Override
- public void onRouteRemoved(MediaRouter router, MediaRouter.RouteInfo info) {
+ public void onRouteRemoved(@NonNull MediaRouter router,
+ @NonNull MediaRouter.RouteInfo info) {
refreshRoute();
}
@Override
- public void onRouteChanged(MediaRouter router, MediaRouter.RouteInfo info) {
+ public void onRouteChanged(@NonNull MediaRouter router,
+ @NonNull MediaRouter.RouteInfo info) {
refreshRoute();
}
@Override
- public void onRouteSelected(MediaRouter router, MediaRouter.RouteInfo info) {
+ public void onRouteSelected(@NonNull MediaRouter router,
+ @NonNull MediaRouter.RouteInfo info) {
refreshRoute();
}
@Override
- public void onRouteUnselected(MediaRouter router, MediaRouter.RouteInfo info) {
+ public void onRouteUnselected(@NonNull MediaRouter router,
+ @NonNull MediaRouter.RouteInfo info) {
refreshRoute();
}
@Override
- public void onProviderAdded(MediaRouter router, MediaRouter.ProviderInfo provider) {
+ public void onProviderAdded(@NonNull MediaRouter router,
+ @NonNull MediaRouter.ProviderInfo provider) {
refreshRoute();
}
@Override
- public void onProviderRemoved(MediaRouter router, MediaRouter.ProviderInfo provider) {
+ public void onProviderRemoved(@NonNull MediaRouter router,
+ @NonNull MediaRouter.ProviderInfo provider) {
refreshRoute();
}
@Override
- public void onProviderChanged(MediaRouter router, MediaRouter.ProviderInfo provider) {
+ public void onProviderChanged(@NonNull MediaRouter router,
+ @NonNull MediaRouter.ProviderInfo provider) {
refreshRoute();
}
@Override
- public void onRouterParamsChanged(MediaRouter router, MediaRouterParams params) {
+ public void onRouterParamsChanged(@NonNull MediaRouter router, MediaRouterParams params) {
boolean fixedIcon = false;
if (params != null) {
fixedIcon = params.getExtras()
diff --git a/mediarouter/mediarouter/src/main/java/androidx/mediarouter/app/MediaRouteChooserDialog.java b/mediarouter/mediarouter/src/main/java/androidx/mediarouter/app/MediaRouteChooserDialog.java
index 6971229..2f7f395 100644
--- a/mediarouter/mediarouter/src/main/java/androidx/mediarouter/app/MediaRouteChooserDialog.java
+++ b/mediarouter/mediarouter/src/main/java/androidx/mediarouter/app/MediaRouteChooserDialog.java
@@ -190,7 +190,7 @@
mRoutes = new ArrayList<>();
mAdapter = new RouteAdapter(getContext(), mRoutes);
- mListView = (ListView)findViewById(R.id.mr_chooser_list);
+ mListView = findViewById(R.id.mr_chooser_list);
mListView.setAdapter(mAdapter);
mListView.setOnItemClickListener(mAdapter);
mListView.setEmptyView(findViewById(android.R.id.empty));
@@ -296,8 +296,8 @@
}
MediaRouter.RouteInfo route = getItem(position);
- TextView text1 = (TextView) view.findViewById(R.id.mr_chooser_route_name);
- TextView text2 = (TextView) view.findViewById(R.id.mr_chooser_route_desc);
+ TextView text1 = view.findViewById(R.id.mr_chooser_route_name);
+ TextView text2 = view.findViewById(R.id.mr_chooser_route_desc);
text1.setText(route.getName());
String description = route.getDescription();
boolean isConnectedOrConnecting =
@@ -314,7 +314,7 @@
}
view.setEnabled(route.isEnabled());
- ImageView iconView = (ImageView) view.findViewById(R.id.mr_chooser_route_icon);
+ ImageView iconView = view.findViewById(R.id.mr_chooser_route_icon);
if (iconView != null) {
iconView.setImageDrawable(getIconDrawable(route));
}
@@ -376,22 +376,25 @@
}
@Override
- public void onRouteAdded(MediaRouter router, MediaRouter.RouteInfo info) {
+ public void onRouteAdded(@NonNull MediaRouter router, @NonNull MediaRouter.RouteInfo info) {
refreshRoutes();
}
@Override
- public void onRouteRemoved(MediaRouter router, MediaRouter.RouteInfo info) {
+ public void onRouteRemoved(@NonNull MediaRouter router,
+ @NonNull MediaRouter.RouteInfo info) {
refreshRoutes();
}
@Override
- public void onRouteChanged(MediaRouter router, MediaRouter.RouteInfo info) {
+ public void onRouteChanged(@NonNull MediaRouter router,
+ @NonNull MediaRouter.RouteInfo info) {
refreshRoutes();
}
@Override
- public void onRouteSelected(MediaRouter router, MediaRouter.RouteInfo route) {
+ public void onRouteSelected(@NonNull MediaRouter router,
+ @NonNull MediaRouter.RouteInfo route) {
dismiss();
}
}
diff --git a/mediarouter/mediarouter/src/main/java/androidx/mediarouter/app/MediaRouteControllerDialog.java b/mediarouter/mediarouter/src/main/java/androidx/mediarouter/app/MediaRouteControllerDialog.java
index 5c7095f..e1d423a 100644
--- a/mediarouter/mediarouter/src/main/java/androidx/mediarouter/app/MediaRouteControllerDialog.java
+++ b/mediarouter/mediarouter/src/main/java/androidx/mediarouter/app/MediaRouteControllerDialog.java
@@ -699,7 +699,7 @@
}
void updateVolumeGroupItemHeight(View item) {
- LinearLayout container = (LinearLayout) item.findViewById(R.id.volume_item_container);
+ LinearLayout container = item.findViewById(R.id.volume_item_container);
setLayoutHeight(container, mVolumeGroupListItemHeight);
View icon = item.findViewById(R.id.mr_volume_item_icon);
ViewGroup.LayoutParams lp = icon.getLayoutParams();
@@ -866,7 +866,7 @@
final MediaRouter.RouteInfo route = item.getKey();
final BitmapDrawable bitmap = item.getValue();
final Rect bounds = previousRouteBoundMap.get(route);
- OverlayListView.OverlayObject object = null;
+ OverlayListView.OverlayObject object;
if (mGroupMemberRoutesRemoved.contains(route)) {
object = new OverlayListView.OverlayObject(bitmap, bounds).setAlphaAnimation(1.0f, 0.0f)
.setDuration(mGroupListFadeOutDurationMs)
@@ -965,7 +965,7 @@
&& mGroupMemberRoutesAdded.contains(route)) {
continue;
}
- LinearLayout container = (LinearLayout) view.findViewById(R.id.volume_item_container);
+ LinearLayout container = view.findViewById(R.id.volume_item_container);
container.setVisibility(View.VISIBLE);
AnimationSet animSet = new AnimationSet(true);
Animation alphaAnim = new AlphaAnimation(1.0f, 1.0f);
@@ -1147,17 +1147,20 @@
}
@Override
- public void onRouteUnselected(MediaRouter router, MediaRouter.RouteInfo route) {
+ public void onRouteUnselected(@NonNull MediaRouter router,
+ @NonNull MediaRouter.RouteInfo route) {
update(false);
}
@Override
- public void onRouteChanged(MediaRouter router, MediaRouter.RouteInfo route) {
+ public void onRouteChanged(@NonNull MediaRouter router,
+ @NonNull MediaRouter.RouteInfo route) {
update(true);
}
@Override
- public void onRouteVolumeChanged(MediaRouter router, MediaRouter.RouteInfo route) {
+ public void onRouteVolumeChanged(@NonNull MediaRouter router,
+ @NonNull MediaRouter.RouteInfo route) {
SeekBar volumeSlider = mVolumeSliderMap.get(route);
int volume = route.getVolume();
if (DEBUG) {
@@ -1312,12 +1315,12 @@
if (route != null) {
boolean isEnabled = route.isEnabled();
- TextView routeName = (TextView) v.findViewById(R.id.mr_name);
+ TextView routeName = v.findViewById(R.id.mr_name);
routeName.setEnabled(isEnabled);
routeName.setText(route.getName());
MediaRouteVolumeSlider volumeSlider =
- (MediaRouteVolumeSlider) v.findViewById(R.id.mr_volume_slider);
+ v.findViewById(R.id.mr_volume_slider);
MediaRouterThemeHelper.setVolumeSliderColor(
parent.getContext(), volumeSlider, mVolumeGroupList);
volumeSlider.setTag(route);
@@ -1337,12 +1340,12 @@
}
ImageView volumeItemIcon =
- (ImageView) v.findViewById(R.id.mr_volume_item_icon);
+ v.findViewById(R.id.mr_volume_item_icon);
volumeItemIcon.setAlpha(isEnabled ? 0xFF : (int) (0xFF * mDisabledAlpha));
// If overlay bitmap exists, real view should remain hidden until
// the animation ends.
- LinearLayout container = (LinearLayout) v.findViewById(R.id.volume_item_container);
+ LinearLayout container = v.findViewById(R.id.volume_item_container);
container.setVisibility(mGroupMemberRoutesAnimatingWithBitmap.contains(route)
? View.INVISIBLE : View.VISIBLE);
@@ -1475,7 +1478,7 @@
private InputStream openInputStreamByScheme(Uri uri) throws IOException {
String scheme = uri.getScheme().toLowerCase();
- InputStream stream = null;
+ InputStream stream;
if (ContentResolver.SCHEME_ANDROID_RESOURCE.equals(scheme)
|| ContentResolver.SCHEME_CONTENT.equals(scheme)
|| ContentResolver.SCHEME_FILE.equals(scheme)) {
diff --git a/mediarouter/mediarouter/src/main/java/androidx/mediarouter/app/MediaRouteDynamicChooserDialog.java b/mediarouter/mediarouter/src/main/java/androidx/mediarouter/app/MediaRouteDynamicChooserDialog.java
index dc5446a..8f5e970 100644
--- a/mediarouter/mediarouter/src/main/java/androidx/mediarouter/app/MediaRouteDynamicChooserDialog.java
+++ b/mediarouter/mediarouter/src/main/java/androidx/mediarouter/app/MediaRouteDynamicChooserDialog.java
@@ -63,9 +63,7 @@
*/
@RestrictTo(LIBRARY)
public class MediaRouteDynamicChooserDialog extends AppCompatDialog {
- private static final String TAG = "MediaRouteChooserDialog";
- private static final int ITEM_TYPE_NONE = 0;
private static final int ITEM_TYPE_HEADER = 1;
private static final int ITEM_TYPE_ROUTE = 2;
@@ -264,22 +262,25 @@
}
@Override
- public void onRouteAdded(MediaRouter router, MediaRouter.RouteInfo info) {
+ public void onRouteAdded(@NonNull MediaRouter router, @NonNull MediaRouter.RouteInfo info) {
refreshRoutes();
}
@Override
- public void onRouteRemoved(MediaRouter router, MediaRouter.RouteInfo info) {
+ public void onRouteRemoved(@NonNull MediaRouter router,
+ @NonNull MediaRouter.RouteInfo info) {
refreshRoutes();
}
@Override
- public void onRouteChanged(MediaRouter router, MediaRouter.RouteInfo info) {
+ public void onRouteChanged(@NonNull MediaRouter router,
+ @NonNull MediaRouter.RouteInfo info) {
refreshRoutes();
}
@Override
- public void onRouteSelected(MediaRouter router, MediaRouter.RouteInfo route) {
+ public void onRouteSelected(@NonNull MediaRouter router,
+ @NonNull MediaRouter.RouteInfo route) {
dismiss();
}
}
@@ -331,7 +332,8 @@
}
@Override
- public RecyclerView.ViewHolder onCreateViewHolder(ViewGroup parent, int viewType) {
+ @NonNull
+ public RecyclerView.ViewHolder onCreateViewHolder(@NonNull ViewGroup parent, int viewType) {
View view;
switch (viewType) {
@@ -342,13 +344,13 @@
view = mInflater.inflate(R.layout.mr_picker_route_item, parent, false);
return new RouteViewHolder(view);
default:
- Log.w(TAG, "Cannot create ViewHolder because of wrong view type");
- return null;
+ // Never happens.
+ throw new IllegalStateException();
}
}
@Override
- public void onBindViewHolder(RecyclerView.ViewHolder holder, int position) {
+ public void onBindViewHolder(@NonNull RecyclerView.ViewHolder holder, int position) {
int viewType = getItemViewType(position);
Item item = getItem(position);
@@ -428,8 +430,8 @@
} else if (data instanceof MediaRouter.RouteInfo) {
mType = ITEM_TYPE_ROUTE;
} else {
- mType = ITEM_TYPE_NONE;
- Log.w(TAG, "Wrong type of data passed to Item constructor");
+ // Never happens.
+ throw new IllegalArgumentException();
}
}
diff --git a/mediarouter/mediarouter/src/main/java/androidx/mediarouter/app/MediaRouteDynamicControllerDialog.java b/mediarouter/mediarouter/src/main/java/androidx/mediarouter/app/MediaRouteDynamicControllerDialog.java
index 0f5b82d..5c54a1c 100644
--- a/mediarouter/mediarouter/src/main/java/androidx/mediarouter/app/MediaRouteDynamicControllerDialog.java
+++ b/mediarouter/mediarouter/src/main/java/androidx/mediarouter/app/MediaRouteDynamicControllerDialog.java
@@ -930,6 +930,7 @@
}
@Override
+ @NonNull
public RecyclerView.ViewHolder onCreateViewHolder(@NonNull ViewGroup parent, int viewType) {
View view;
@@ -947,8 +948,8 @@
view = mInflater.inflate(R.layout.mr_cast_group_item, parent, false);
return new GroupViewHolder(view);
default:
- Log.w(TAG, "Cannot create ViewHolder because of wrong view type");
- return null;
+ // Never happens
+ throw new IllegalStateException();
}
}
@@ -981,8 +982,8 @@
break;
}
default: {
- Log.w(TAG, "Cannot bind item to ViewHolder because of wrong view type");
- break;
+ // Never happens.
+ throw new IllegalStateException();
}
}
}
@@ -1072,8 +1073,8 @@
private final int mExpandedHeight;
GroupVolumeViewHolder(View itemView) {
- super(itemView, (ImageButton) itemView.findViewById(R.id.mr_cast_mute_button),
- (MediaRouteVolumeSlider) itemView.findViewById(R.id.mr_cast_volume_slider));
+ super(itemView, itemView.findViewById(R.id.mr_cast_mute_button),
+ itemView.findViewById(R.id.mr_cast_volume_slider));
mTextView = itemView.findViewById(R.id.mr_group_volume_route_name);
Resources res = mContext.getResources();
@@ -1157,8 +1158,8 @@
};
RouteViewHolder(View itemView) {
- super(itemView, (ImageButton) itemView.findViewById(R.id.mr_cast_mute_button),
- (MediaRouteVolumeSlider) itemView.findViewById(R.id.mr_cast_volume_slider));
+ super(itemView, itemView.findViewById(R.id.mr_cast_mute_button),
+ itemView.findViewById(R.id.mr_cast_volume_slider));
mItemView = itemView;
mImageView = itemView.findViewById(R.id.mr_cast_route_icon);
mProgressBar = itemView.findViewById(R.id.mr_cast_route_progress_bar);
@@ -1330,17 +1331,19 @@
}
@Override
- public void onRouteAdded(MediaRouter router, MediaRouter.RouteInfo info) {
+ public void onRouteAdded(@NonNull MediaRouter router, @NonNull MediaRouter.RouteInfo info) {
updateRoutesView();
}
@Override
- public void onRouteRemoved(MediaRouter router, MediaRouter.RouteInfo info) {
+ public void onRouteRemoved(@NonNull MediaRouter router,
+ @NonNull MediaRouter.RouteInfo info) {
updateRoutesView();
}
@Override
- public void onRouteSelected(MediaRouter router, MediaRouter.RouteInfo route) {
+ public void onRouteSelected(@NonNull MediaRouter router,
+ @NonNull MediaRouter.RouteInfo route) {
mSelectedRoute = route;
mIsSelectingRoute = false;
@@ -1351,12 +1354,14 @@
}
@Override
- public void onRouteUnselected(MediaRouter router, MediaRouter.RouteInfo route) {
+ public void onRouteUnselected(@NonNull MediaRouter router,
+ @NonNull MediaRouter.RouteInfo route) {
updateRoutesView();
}
@Override
- public void onRouteChanged(MediaRouter router, MediaRouter.RouteInfo route) {
+ public void onRouteChanged(@NonNull MediaRouter router,
+ @NonNull MediaRouter.RouteInfo route) {
boolean shouldRefreshRoute = false;
if (route == mSelectedRoute && route.getDynamicGroupController() != null) {
for (MediaRouter.RouteInfo memberRoute : route.getProvider().getRoutes()) {
@@ -1384,7 +1389,8 @@
}
@Override
- public void onRouteVolumeChanged(MediaRouter router, MediaRouter.RouteInfo route) {
+ public void onRouteVolumeChanged(@NonNull MediaRouter router,
+ @NonNull MediaRouter.RouteInfo route) {
int volume = route.getVolume();
if (DEBUG) {
Log.d(TAG, "onRouteVolumeChanged(), route.getVolume:" + volume);
@@ -1528,7 +1534,7 @@
private InputStream openInputStreamByScheme(Uri uri) throws IOException {
String scheme = uri.getScheme().toLowerCase();
- InputStream stream = null;
+ InputStream stream;
if (ContentResolver.SCHEME_ANDROID_RESOURCE.equals(scheme)
|| ContentResolver.SCHEME_CONTENT.equals(scheme)
|| ContentResolver.SCHEME_FILE.equals(scheme)) {
diff --git a/mediarouter/mediarouter/src/main/java/androidx/mediarouter/app/MediaRouterThemeHelper.java b/mediarouter/mediarouter/src/main/java/androidx/mediarouter/app/MediaRouterThemeHelper.java
index fcb778f..269ebe3 100644
--- a/mediarouter/mediarouter/src/main/java/androidx/mediarouter/app/MediaRouterThemeHelper.java
+++ b/mediarouter/mediarouter/src/main/java/androidx/mediarouter/app/MediaRouterThemeHelper.java
@@ -196,12 +196,11 @@
}
static TypedArray getStyledAttributes(Context context) {
- TypedArray styledAttributes = context.obtainStyledAttributes(new int[] {
+ return context.obtainStyledAttributes(new int[]{
R.attr.mediaRouteDefaultIconDrawable,
R.attr.mediaRouteTvIconDrawable,
R.attr.mediaRouteSpeakerIconDrawable,
R.attr.mediaRouteSpeakerGroupIconDrawable});
- return styledAttributes;
}
static void setDialogBackgroundColor(Context context, Dialog dialog) {
diff --git a/mediarouter/mediarouter/src/main/java/androidx/mediarouter/media/MediaItemStatus.java b/mediarouter/mediarouter/src/main/java/androidx/mediarouter/media/MediaItemStatus.java
index 0231574..a01fb65 100644
--- a/mediarouter/mediarouter/src/main/java/androidx/mediarouter/media/MediaItemStatus.java
+++ b/mediarouter/mediarouter/src/main/java/androidx/mediarouter/media/MediaItemStatus.java
@@ -255,6 +255,7 @@
return mBundle.getBundle(KEY_EXTRAS);
}
+ @NonNull
@Override
public String toString() {
StringBuilder result = new StringBuilder();
diff --git a/mediarouter/mediarouter/src/main/java/androidx/mediarouter/media/MediaRoute2Provider.java b/mediarouter/mediarouter/src/main/java/androidx/mediarouter/media/MediaRoute2Provider.java
index adcbf65..c27d26c 100644
--- a/mediarouter/mediarouter/src/main/java/androidx/mediarouter/media/MediaRoute2Provider.java
+++ b/mediarouter/mediarouter/src/main/java/androidx/mediarouter/media/MediaRoute2Provider.java
@@ -212,7 +212,6 @@
}
@Nullable
- @SuppressWarnings("deprecation")
static Messenger getMessengerFromRoutingController(
@Nullable MediaRouter2.RoutingController controller) {
if (controller == null) {
@@ -513,7 +512,8 @@
}
@Override
- public boolean onControlRequest(Intent intent, @Nullable ControlRequestCallback callback) {
+ public boolean onControlRequest(@NonNull Intent intent,
+ @Nullable ControlRequestCallback callback) {
if (mRoutingController == null || mRoutingController.isReleased()
|| mServiceMessenger == null) {
return false;
@@ -580,7 +580,7 @@
}
@Override
- public void onRemoveMemberRoute(String routeId) {
+ public void onRemoveMemberRoute(@NonNull String routeId) {
if (routeId == null || routeId.isEmpty()) {
Log.w(TAG, "onRemoveMemberRoute: Ignoring null or empty routeId.");
return;
diff --git a/mediarouter/mediarouter/src/main/java/androidx/mediarouter/media/MediaRoute2ProviderServiceAdapter.java b/mediarouter/mediarouter/src/main/java/androidx/mediarouter/media/MediaRoute2ProviderServiceAdapter.java
index 998b632..d5381f5 100644
--- a/mediarouter/mediarouter/src/main/java/androidx/mediarouter/media/MediaRoute2ProviderServiceAdapter.java
+++ b/mediarouter/mediarouter/src/main/java/androidx/mediarouter/media/MediaRoute2ProviderServiceAdapter.java
@@ -526,9 +526,9 @@
}
private RouteController findControllerByRouteId(String routeId) {
- List<SessionRecord> sessionRecords = new ArrayList<>();
+ List<SessionRecord> sessionRecords;
synchronized (mLock) {
- sessionRecords.addAll(mSessionRecords.values());
+ sessionRecords = new ArrayList<>(mSessionRecords.values());
}
for (SessionRecord sessionRecord : sessionRecords) {
RouteController controller = sessionRecord.findControllerByRouteId(routeId);
diff --git a/mediarouter/mediarouter/src/main/java/androidx/mediarouter/media/MediaRouteDescriptor.java b/mediarouter/mediarouter/src/main/java/androidx/mediarouter/media/MediaRouteDescriptor.java
index 422ff08..4ee22c6 100644
--- a/mediarouter/mediarouter/src/main/java/androidx/mediarouter/media/MediaRouteDescriptor.java
+++ b/mediarouter/mediarouter/src/main/java/androidx/mediarouter/media/MediaRouteDescriptor.java
@@ -221,7 +221,6 @@
* @return An {@link IntentSender} to start a settings activity.
*/
@Nullable
- @SuppressWarnings("deprecation")
public IntentSender getSettingsActivity() {
return mBundle.getParcelable(KEY_SETTINGS_INTENT);
}
@@ -235,12 +234,11 @@
return mControlFilters;
}
- @SuppressWarnings("deprecation")
void ensureControlFilters() {
if (mControlFilters == null) {
- mControlFilters = mBundle.<IntentFilter>getParcelableArrayList(KEY_CONTROL_FILTERS);
+ mControlFilters = mBundle.getParcelableArrayList(KEY_CONTROL_FILTERS);
if (mControlFilters == null) {
- mControlFilters = Collections.<IntentFilter>emptyList();
+ mControlFilters = Collections.emptyList();
}
}
}
@@ -350,31 +348,30 @@
return true;
}
+ @NonNull
@Override
public String toString() {
- StringBuilder result = new StringBuilder();
- result.append("MediaRouteDescriptor{ ");
- result.append("id=").append(getId());
- result.append(", groupMemberIds=").append(getGroupMemberIds());
- result.append(", name=").append(getName());
- result.append(", description=").append(getDescription());
- result.append(", iconUri=").append(getIconUri());
- result.append(", isEnabled=").append(isEnabled());
- result.append(", connectionState=").append(getConnectionState());
- result.append(", controlFilters=").append(Arrays.toString(getControlFilters().toArray()));
- result.append(", playbackType=").append(getPlaybackType());
- result.append(", playbackStream=").append(getPlaybackStream());
- result.append(", deviceType=").append(getDeviceType());
- result.append(", volume=").append(getVolume());
- result.append(", volumeMax=").append(getVolumeMax());
- result.append(", volumeHandling=").append(getVolumeHandling());
- result.append(", presentationDisplayId=").append(getPresentationDisplayId());
- result.append(", extras=").append(getExtras());
- result.append(", isValid=").append(isValid());
- result.append(", minClientVersion=").append(getMinClientVersion());
- result.append(", maxClientVersion=").append(getMaxClientVersion());
- result.append(" }");
- return result.toString();
+ return "MediaRouteDescriptor{ "
+ + "id=" + getId()
+ + ", groupMemberIds=" + getGroupMemberIds()
+ + ", name=" + getName()
+ + ", description=" + getDescription()
+ + ", iconUri=" + getIconUri()
+ + ", isEnabled=" + isEnabled()
+ + ", connectionState=" + getConnectionState()
+ + ", controlFilters=" + Arrays.toString(getControlFilters().toArray())
+ + ", playbackType=" + getPlaybackType()
+ + ", playbackStream=" + getPlaybackStream()
+ + ", deviceType=" + getDeviceType()
+ + ", volume=" + getVolume()
+ + ", volumeMax=" + getVolumeMax()
+ + ", volumeHandling=" + getVolumeHandling()
+ + ", presentationDisplayId=" + getPresentationDisplayId()
+ + ", extras=" + getExtras()
+ + ", isValid=" + isValid()
+ + ", minClientVersion=" + getMinClientVersion()
+ + ", maxClientVersion=" + getMaxClientVersion()
+ + " }";
}
/**
diff --git a/mediarouter/mediarouter/src/main/java/androidx/mediarouter/media/MediaRouteDiscoveryRequest.java b/mediarouter/mediarouter/src/main/java/androidx/mediarouter/media/MediaRouteDiscoveryRequest.java
index c1c76075..c0188ab 100644
--- a/mediarouter/mediarouter/src/main/java/androidx/mediarouter/media/MediaRouteDiscoveryRequest.java
+++ b/mediarouter/mediarouter/src/main/java/androidx/mediarouter/media/MediaRouteDiscoveryRequest.java
@@ -105,14 +105,13 @@
return getSelector().hashCode() ^ (isActiveScan() ? 1 : 0);
}
+ @NonNull
@Override
public String toString() {
- StringBuilder result = new StringBuilder();
- result.append("DiscoveryRequest{ selector=").append(getSelector());
- result.append(", activeScan=").append(isActiveScan());
- result.append(", isValid=").append(isValid());
- result.append(" }");
- return result.toString();
+ return "DiscoveryRequest{ selector=" + getSelector()
+ + ", activeScan=" + isActiveScan()
+ + ", isValid=" + isValid()
+ + " }";
}
/**
diff --git a/mediarouter/mediarouter/src/main/java/androidx/mediarouter/media/MediaRouteProvider.java b/mediarouter/mediarouter/src/main/java/androidx/mediarouter/media/MediaRouteProvider.java
index 40108e6..ed033e1 100644
--- a/mediarouter/mediarouter/src/main/java/androidx/mediarouter/media/MediaRouteProvider.java
+++ b/mediarouter/mediarouter/src/main/java/androidx/mediarouter/media/MediaRouteProvider.java
@@ -286,7 +286,7 @@
/**
* Called by the media router to obtain a route controller for a particular route which is a
- * member of {@link MediaRouter.RouteGroup}.
+ * member of a route group.
* <p>
* The media router will invoke the {@link RouteController#onRelease} method of the route
* controller when it is no longer needed to allow it to free its resources.
@@ -363,6 +363,7 @@
return mComponentName;
}
+ @NonNull
@Override
public String toString() {
return "ProviderMetadata{ componentName="
@@ -767,8 +768,7 @@
* Returns true if the route can be grouped into the dynamic group route.
* <p>
* Only applicable to unselected/unselecting routes.
- * Note that {@link #isGroupable()} and {@link #isTransferable()} are NOT mutually
- * exclusive.
+ * Note that this is NOT mutually exclusive with {@link #isTransferable()}.
* </p>
*/
public boolean isGroupable() {
@@ -779,8 +779,7 @@
* Returns true if the current dynamic group route can be transferred to this route.
* <p>
* Only applicable to unselected/unselecting routes.
- * Note that {@link #isGroupable()} and {@link #isTransferable()} are NOT mutually
- * exclusive.
+ * Note that this is NOT mutually exclusive with {@link #isGroupable()}.
* </p>
*/
public boolean isTransferable() {
diff --git a/mediarouter/mediarouter/src/main/java/androidx/mediarouter/media/MediaRouteProviderDescriptor.java b/mediarouter/mediarouter/src/main/java/androidx/mediarouter/media/MediaRouteProviderDescriptor.java
index 8aa1e42..c7e4d1f 100644
--- a/mediarouter/mediarouter/src/main/java/androidx/mediarouter/media/MediaRouteProviderDescriptor.java
+++ b/mediarouter/mediarouter/src/main/java/androidx/mediarouter/media/MediaRouteProviderDescriptor.java
@@ -44,7 +44,7 @@
MediaRouteProviderDescriptor(List<MediaRouteDescriptor> routes,
boolean supportsDynamicGroupRoute) {
- mRoutes = (routes == null) ? Collections.<MediaRouteDescriptor>emptyList() : routes;
+ mRoutes = (routes == null) ? Collections.emptyList() : routes;
mSupportsDynamicGroupRoute = supportsDynamicGroupRoute;
}
@@ -64,7 +64,7 @@
* it contains have all of the required fields.
* <p>
* This verification is deep. If the provider descriptor is known to be
- * valid then it is not necessary to call {@link #isValid} on each of its routes.
+ * valid then it is not necessary to call this method on each of its routes.
* </p>
*/
public boolean isValid() {
@@ -87,15 +87,14 @@
return mSupportsDynamicGroupRoute;
}
+ @NonNull
@Override
public String toString() {
- StringBuilder result = new StringBuilder();
- result.append("MediaRouteProviderDescriptor{ ");
- result.append("routes=").append(
- Arrays.toString(getRoutes().toArray()));
- result.append(", isValid=").append(isValid());
- result.append(" }");
- return result.toString();
+ return "MediaRouteProviderDescriptor{ "
+ + "routes="
+ + Arrays.toString(getRoutes().toArray())
+ + ", isValid=" + isValid()
+ + " }";
}
/**
@@ -128,13 +127,12 @@
* @return The new instance, or null if the bundle was null.
*/
@Nullable
- @SuppressWarnings("deprecation")
public static MediaRouteProviderDescriptor fromBundle(@Nullable Bundle bundle) {
if (bundle == null) {
return null;
}
List<MediaRouteDescriptor> routes = null;
- ArrayList<Bundle> routeBundles = bundle.<Bundle>getParcelableArrayList(KEY_ROUTES);
+ ArrayList<Bundle> routeBundles = bundle.getParcelableArrayList(KEY_ROUTES);
if (routeBundles != null && !routeBundles.isEmpty()) {
final int count = routeBundles.size();
routes = new ArrayList<MediaRouteDescriptor>(count);
diff --git a/mediarouter/mediarouter/src/main/java/androidx/mediarouter/media/MediaRouteProviderService.java b/mediarouter/mediarouter/src/main/java/androidx/mediarouter/media/MediaRouteProviderService.java
index aaf3805..596de17 100644
--- a/mediarouter/mediarouter/src/main/java/androidx/mediarouter/media/MediaRouteProviderService.java
+++ b/mediarouter/mediarouter/src/main/java/androidx/mediarouter/media/MediaRouteProviderService.java
@@ -1068,6 +1068,7 @@
.obtainMessage(PRIVATE_MSG_CLIENT_DIED, mMessenger).sendToTarget();
}
+ @NonNull
@Override
public String toString() {
return getClientId(mMessenger);
diff --git a/mediarouter/mediarouter/src/main/java/androidx/mediarouter/media/MediaRouteSelector.java b/mediarouter/mediarouter/src/main/java/androidx/mediarouter/media/MediaRouteSelector.java
index 4be6c85..79d5364 100644
--- a/mediarouter/mediarouter/src/main/java/androidx/mediarouter/media/MediaRouteSelector.java
+++ b/mediarouter/mediarouter/src/main/java/androidx/mediarouter/media/MediaRouteSelector.java
@@ -75,7 +75,7 @@
if (mControlCategories == null) {
mControlCategories = mBundle.getStringArrayList(KEY_CONTROL_CATEGORIES);
if (mControlCategories == null || mControlCategories.isEmpty()) {
- mControlCategories = Collections.<String>emptyList();
+ mControlCategories = Collections.emptyList();
}
}
}
@@ -180,14 +180,13 @@
return mControlCategories.hashCode();
}
+ @NonNull
@Override
public String toString() {
- StringBuilder result = new StringBuilder();
- result.append("MediaRouteSelector{ ");
- result.append("controlCategories=").append(
- Arrays.toString(getControlCategories().toArray()));
- result.append(" }");
- return result.toString();
+ return "MediaRouteSelector{ "
+ + "controlCategories="
+ + Arrays.toString(getControlCategories().toArray())
+ + " }";
}
/**
diff --git a/mediarouter/mediarouter/src/main/java/androidx/mediarouter/media/MediaRouter.java b/mediarouter/mediarouter/src/main/java/androidx/mediarouter/media/MediaRouter.java
index 3334211..e14565b 100644
--- a/mediarouter/mediarouter/src/main/java/androidx/mediarouter/media/MediaRouter.java
+++ b/mediarouter/mediarouter/src/main/java/androidx/mediarouter/media/MediaRouter.java
@@ -199,7 +199,7 @@
* When this flag is specified, the media router will try to discover routes.
* Although route discovery is intended to be efficient, checking for new routes may
* result in some network activity and could slowly drain the battery. Therefore
- * applications should only specify {@link #CALLBACK_FLAG_REQUEST_DISCOVERY} when
+ * applications should only specify this flag when
* they are running in the foreground and would like to provide the user with the
* option of connecting to new routes.
* </p><p>
@@ -1006,7 +1006,7 @@
*/
static boolean isTransferToLocalEnabled() {
GlobalMediaRouter globalMediaRouter = getGlobalRouter();
- return globalMediaRouter == null ? false : globalMediaRouter.isTransferToLocalEnabled();
+ return globalMediaRouter != null && globalMediaRouter.isTransferToLocalEnabled();
}
/**
@@ -1751,23 +1751,23 @@
public String toString() {
StringBuilder sb = new StringBuilder();
- sb.append("MediaRouter.RouteInfo{ uniqueId=" + mUniqueId
- + ", name=" + mName
- + ", description=" + mDescription
- + ", iconUri=" + mIconUri
- + ", enabled=" + mEnabled
- + ", connectionState=" + mConnectionState
- + ", canDisconnect=" + mCanDisconnect
- + ", playbackType=" + mPlaybackType
- + ", playbackStream=" + mPlaybackStream
- + ", deviceType=" + mDeviceType
- + ", volumeHandling=" + mVolumeHandling
- + ", volume=" + mVolume
- + ", volumeMax=" + mVolumeMax
- + ", presentationDisplayId=" + mPresentationDisplayId
- + ", extras=" + mExtras
- + ", settingsIntent=" + mSettingsIntent
- + ", providerPackageName=" + mProvider.getPackageName());
+ sb.append("MediaRouter.RouteInfo{ uniqueId=").append(mUniqueId)
+ .append(", name=").append(mName)
+ .append(", description=").append(mDescription)
+ .append(", iconUri=").append(mIconUri)
+ .append(", enabled=").append(mEnabled)
+ .append(", connectionState=").append(mConnectionState)
+ .append(", canDisconnect=").append(mCanDisconnect)
+ .append(", playbackType=").append(mPlaybackType)
+ .append(", playbackStream=").append(mPlaybackStream)
+ .append(", deviceType=").append(mDeviceType)
+ .append(", volumeHandling=").append(mVolumeHandling)
+ .append(", volume=").append(mVolume)
+ .append(", volumeMax=").append(mVolumeMax)
+ .append(", presentationDisplayId=").append(mPresentationDisplayId)
+ .append(", extras=").append(mExtras)
+ .append(", settingsIntent=").append(mSettingsIntent)
+ .append(", providerPackageName=").append(mProvider.getPackageName());
if (isGroup()) {
sb.append(", members=[");
final int count = mMemberRoutes.size();
@@ -2118,6 +2118,7 @@
return mDescriptor != null && mDescriptor.supportsDynamicGroupRoute();
}
+ @NonNull
@Override
public String toString() {
return "MediaRouter.RouteProviderInfo{ packageName=" + getPackageName()
@@ -2659,10 +2660,10 @@
mRegisteredProviderWatcher.rescan();
}
- boolean oldTransferToLocalEnabled = oldParams == null ? false :
- oldParams.isTransferToLocalEnabled();
- boolean newTransferToLocalEnabled = params == null ? false :
- params.isTransferToLocalEnabled();
+ boolean oldTransferToLocalEnabled =
+ oldParams != null && oldParams.isTransferToLocalEnabled();
+ boolean newTransferToLocalEnabled =
+ params != null && params.isTransferToLocalEnabled();
if (oldTransferToLocalEnabled != newTransferToLocalEnabled) {
// Since the discovery request itself is not changed,
@@ -2983,7 +2984,7 @@
}
@Override
- public void removeProvider(MediaRouteProvider providerInstance) {
+ public void removeProvider(@NonNull MediaRouteProvider providerInstance) {
ProviderInfo provider = findProviderInfo(providerInstance);
if (provider != null) {
// 1. Unregister the provider callback.
@@ -3304,10 +3305,10 @@
}
if (sGlobal == null) {
Log.w(TAG, "setSelectedRouteInternal is called while sGlobal is null: pkgName="
- + mApplicationContext.getPackageName() + ", callers=" + sb.toString());
+ + mApplicationContext.getPackageName() + ", callers=" + sb);
} else {
Log.w(TAG, "Default route is selected while a BT route is available: pkgName="
- + mApplicationContext.getPackageName() + ", callers=" + sb.toString());
+ + mApplicationContext.getPackageName() + ", callers=" + sb);
}
}
@@ -3361,7 +3362,6 @@
mSelectedRouteController = routeController;
mCallbackHandler.post(GlobalMediaRouter.CallbackHandler.MSG_ROUTE_SELECTED,
new Pair<>(null, route), unselectReason);
- return;
} else {
notifyTransfer(this, route, routeController, unselectReason,
/*requestedRoute=*/null, /*memberRoutes=*/null);
@@ -3465,7 +3465,7 @@
};
@Override
- public void onSystemRouteSelectedByDescriptorId(String id) {
+ public void onSystemRouteSelectedByDescriptorId(@NonNull String id) {
// System route is selected, do not sync the route we selected before.
mCallbackHandler.removeMessages(CallbackHandler.MSG_ROUTE_SELECTED);
ProviderInfo provider = findProviderInfo(mSystemProvider);
diff --git a/mediarouter/mediarouter/src/main/java/androidx/mediarouter/media/MediaRouter2Utils.java b/mediarouter/mediarouter/src/main/java/androidx/mediarouter/media/MediaRouter2Utils.java
index 2f7695f0..360efa1 100644
--- a/mediarouter/mediarouter/src/main/java/androidx/mediarouter/media/MediaRouter2Utils.java
+++ b/mediarouter/mediarouter/src/main/java/androidx/mediarouter/media/MediaRouter2Utils.java
@@ -114,7 +114,6 @@
}
@Nullable
- @SuppressWarnings("deprecation")
public static MediaRouteDescriptor toMediaRouteDescriptor(
@Nullable MediaRoute2Info fwkMediaRoute2Info) {
if (fwkMediaRoute2Info == null) {
diff --git a/mediarouter/mediarouter/api24/androidx/mediarouter/media/MediaRouterApi24.java b/mediarouter/mediarouter/src/main/java/androidx/mediarouter/media/MediaRouterApi24.java
similarity index 91%
rename from mediarouter/mediarouter/api24/androidx/mediarouter/media/MediaRouterApi24.java
rename to mediarouter/mediarouter/src/main/java/androidx/mediarouter/media/MediaRouterApi24.java
index c5e4a5f..6790703 100644
--- a/mediarouter/mediarouter/api24/androidx/mediarouter/media/MediaRouterApi24.java
+++ b/mediarouter/mediarouter/src/main/java/androidx/mediarouter/media/MediaRouterApi24.java
@@ -23,7 +23,7 @@
final class MediaRouterApi24 {
public static final class RouteInfo {
public static int getDeviceType(@NonNull Object routeObj) {
- return ((android.media.MediaRouter.RouteInfo)routeObj).getDeviceType();
+ return ((android.media.MediaRouter.RouteInfo) routeObj).getDeviceType();
}
private RouteInfo() {
diff --git a/mediarouter/mediarouter/jellybean/androidx/mediarouter/media/MediaRouterJellybean.java b/mediarouter/mediarouter/src/main/java/androidx/mediarouter/media/MediaRouterJellybean.java
similarity index 76%
rename from mediarouter/mediarouter/jellybean/androidx/mediarouter/media/MediaRouterJellybean.java
rename to mediarouter/mediarouter/src/main/java/androidx/mediarouter/media/MediaRouterJellybean.java
index 6f725dc..13a1b7b 100644
--- a/mediarouter/mediarouter/jellybean/androidx/mediarouter/media/MediaRouterJellybean.java
+++ b/mediarouter/mediarouter/src/main/java/androidx/mediarouter/media/MediaRouterJellybean.java
@@ -16,6 +16,7 @@
package androidx.mediarouter.media;
+import android.annotation.SuppressLint;
import android.content.Context;
import android.graphics.drawable.Drawable;
import android.os.Build;
@@ -45,16 +46,16 @@
public static final int ALL_ROUTE_TYPES =
MediaRouterJellybean.ROUTE_TYPE_LIVE_AUDIO
- | MediaRouterJellybean.ROUTE_TYPE_LIVE_VIDEO
- | MediaRouterJellybean.ROUTE_TYPE_USER;
+ | MediaRouterJellybean.ROUTE_TYPE_LIVE_VIDEO
+ | MediaRouterJellybean.ROUTE_TYPE_USER;
public static Object getMediaRouter(Context context) {
return context.getSystemService(Context.MEDIA_ROUTER_SERVICE);
}
- @SuppressWarnings({ "rawtypes", "unchecked" })
+ @SuppressWarnings({"rawtypes", "unchecked"})
public static List getRoutes(Object routerObj) {
- final android.media.MediaRouter router = (android.media.MediaRouter)routerObj;
+ final android.media.MediaRouter router = (android.media.MediaRouter) routerObj;
final int count = router.getRouteCount();
List out = new ArrayList(count);
for (int i = 0; i < count; i++) {
@@ -63,9 +64,9 @@
return out;
}
- @SuppressWarnings({ "rawtypes", "unchecked" })
+ @SuppressWarnings({"rawtypes", "unchecked"})
public static List getCategories(Object routerObj) {
- final android.media.MediaRouter router = (android.media.MediaRouter)routerObj;
+ final android.media.MediaRouter router = (android.media.MediaRouter) routerObj;
final int count = router.getCategoryCount();
List out = new ArrayList(count);
for (int i = 0; i < count; i++) {
@@ -75,42 +76,42 @@
}
public static Object getSelectedRoute(Object routerObj, int type) {
- return ((android.media.MediaRouter)routerObj).getSelectedRoute(type);
+ return ((android.media.MediaRouter) routerObj).getSelectedRoute(type);
}
public static void selectRoute(Object routerObj, int types, Object routeObj) {
- ((android.media.MediaRouter)routerObj).selectRoute(types,
- (android.media.MediaRouter.RouteInfo)routeObj);
+ ((android.media.MediaRouter) routerObj).selectRoute(types,
+ (android.media.MediaRouter.RouteInfo) routeObj);
}
public static void addCallback(Object routerObj, int types, Object callbackObj) {
- ((android.media.MediaRouter)routerObj).addCallback(types,
- (android.media.MediaRouter.Callback)callbackObj);
+ ((android.media.MediaRouter) routerObj).addCallback(types,
+ (android.media.MediaRouter.Callback) callbackObj);
}
public static void removeCallback(Object routerObj, Object callbackObj) {
- ((android.media.MediaRouter)routerObj).removeCallback(
- (android.media.MediaRouter.Callback)callbackObj);
+ ((android.media.MediaRouter) routerObj).removeCallback(
+ (android.media.MediaRouter.Callback) callbackObj);
}
public static Object createRouteCategory(Object routerObj,
String name, boolean isGroupable) {
- return ((android.media.MediaRouter)routerObj).createRouteCategory(name, isGroupable);
+ return ((android.media.MediaRouter) routerObj).createRouteCategory(name, isGroupable);
}
public static Object createUserRoute(Object routerObj, Object categoryObj) {
- return ((android.media.MediaRouter)routerObj).createUserRoute(
- (android.media.MediaRouter.RouteCategory)categoryObj);
+ return ((android.media.MediaRouter) routerObj).createUserRoute(
+ (android.media.MediaRouter.RouteCategory) categoryObj);
}
public static void addUserRoute(Object routerObj, Object routeObj) {
- ((android.media.MediaRouter)routerObj).addUserRoute(
- (android.media.MediaRouter.UserRouteInfo)routeObj);
+ ((android.media.MediaRouter) routerObj).addUserRoute(
+ (android.media.MediaRouter.UserRouteInfo) routeObj);
}
public static void removeUserRoute(Object routerObj, Object routeObj) {
- ((android.media.MediaRouter)routerObj).removeUserRoute(
- (android.media.MediaRouter.UserRouteInfo)routeObj);
+ ((android.media.MediaRouter) routerObj).removeUserRoute(
+ (android.media.MediaRouter.UserRouteInfo) routeObj);
}
public static Object createCallback(Callback callback) {
@@ -124,68 +125,68 @@
public static final class RouteInfo {
@NonNull
public static CharSequence getName(@NonNull Object routeObj, @NonNull Context context) {
- return ((android.media.MediaRouter.RouteInfo)routeObj).getName(context);
+ return ((android.media.MediaRouter.RouteInfo) routeObj).getName(context);
}
@NonNull
public static CharSequence getStatus(@NonNull Object routeObj) {
- return ((android.media.MediaRouter.RouteInfo)routeObj).getStatus();
+ return ((android.media.MediaRouter.RouteInfo) routeObj).getStatus();
}
public static int getSupportedTypes(@NonNull Object routeObj) {
- return ((android.media.MediaRouter.RouteInfo)routeObj).getSupportedTypes();
+ return ((android.media.MediaRouter.RouteInfo) routeObj).getSupportedTypes();
}
@Nullable
public static Object getCategory(@NonNull Object routeObj) {
- return ((android.media.MediaRouter.RouteInfo)routeObj).getCategory();
+ return ((android.media.MediaRouter.RouteInfo) routeObj).getCategory();
}
@Nullable
public static Drawable getIconDrawable(@NonNull Object routeObj) {
- return ((android.media.MediaRouter.RouteInfo)routeObj).getIconDrawable();
+ return ((android.media.MediaRouter.RouteInfo) routeObj).getIconDrawable();
}
public static int getPlaybackType(@NonNull Object routeObj) {
- return ((android.media.MediaRouter.RouteInfo)routeObj).getPlaybackType();
+ return ((android.media.MediaRouter.RouteInfo) routeObj).getPlaybackType();
}
public static int getPlaybackStream(@NonNull Object routeObj) {
- return ((android.media.MediaRouter.RouteInfo)routeObj).getPlaybackStream();
+ return ((android.media.MediaRouter.RouteInfo) routeObj).getPlaybackStream();
}
public static int getVolume(@NonNull Object routeObj) {
- return ((android.media.MediaRouter.RouteInfo)routeObj).getVolume();
+ return ((android.media.MediaRouter.RouteInfo) routeObj).getVolume();
}
public static int getVolumeMax(@NonNull Object routeObj) {
- return ((android.media.MediaRouter.RouteInfo)routeObj).getVolumeMax();
+ return ((android.media.MediaRouter.RouteInfo) routeObj).getVolumeMax();
}
public static int getVolumeHandling(@NonNull Object routeObj) {
- return ((android.media.MediaRouter.RouteInfo)routeObj).getVolumeHandling();
+ return ((android.media.MediaRouter.RouteInfo) routeObj).getVolumeHandling();
}
@Nullable
public static Object getTag(@NonNull Object routeObj) {
- return ((android.media.MediaRouter.RouteInfo)routeObj).getTag();
+ return ((android.media.MediaRouter.RouteInfo) routeObj).getTag();
}
public static void setTag(@NonNull Object routeObj, @Nullable Object tag) {
- ((android.media.MediaRouter.RouteInfo)routeObj).setTag(tag);
+ ((android.media.MediaRouter.RouteInfo) routeObj).setTag(tag);
}
public static void requestSetVolume(@NonNull Object routeObj, int volume) {
- ((android.media.MediaRouter.RouteInfo)routeObj).requestSetVolume(volume);
+ ((android.media.MediaRouter.RouteInfo) routeObj).requestSetVolume(volume);
}
public static void requestUpdateVolume(@NonNull Object routeObj, int direction) {
- ((android.media.MediaRouter.RouteInfo)routeObj).requestUpdateVolume(direction);
+ ((android.media.MediaRouter.RouteInfo) routeObj).requestUpdateVolume(direction);
}
@Nullable
public static Object getGroup(@NonNull Object routeObj) {
- return ((android.media.MediaRouter.RouteInfo)routeObj).getGroup();
+ return ((android.media.MediaRouter.RouteInfo) routeObj).getGroup();
}
public static boolean isGroup(@NonNull Object routeObj) {
@@ -197,11 +198,11 @@
}
public static final class RouteGroup {
- @SuppressWarnings({ "rawtypes", "unchecked" })
+ @SuppressWarnings({"rawtypes", "unchecked"})
@NonNull
public static List getGroupedRoutes(@NonNull Object groupObj) {
final android.media.MediaRouter.RouteGroup group =
- (android.media.MediaRouter.RouteGroup)groupObj;
+ (android.media.MediaRouter.RouteGroup) groupObj;
final int count = group.getRouteCount();
List out = new ArrayList(count);
for (int i = 0; i < count; i++) {
@@ -216,47 +217,47 @@
public static final class UserRouteInfo {
public static void setName(@NonNull Object routeObj, @NonNull CharSequence name) {
- ((android.media.MediaRouter.UserRouteInfo)routeObj).setName(name);
+ ((android.media.MediaRouter.UserRouteInfo) routeObj).setName(name);
}
public static void setStatus(@NonNull Object routeObj, @NonNull CharSequence status) {
- ((android.media.MediaRouter.UserRouteInfo)routeObj).setStatus(status);
+ ((android.media.MediaRouter.UserRouteInfo) routeObj).setStatus(status);
}
public static void setIconDrawable(@NonNull Object routeObj, @Nullable Drawable icon) {
- ((android.media.MediaRouter.UserRouteInfo)routeObj).setIconDrawable(icon);
+ ((android.media.MediaRouter.UserRouteInfo) routeObj).setIconDrawable(icon);
}
public static void setPlaybackType(@NonNull Object routeObj, int type) {
- ((android.media.MediaRouter.UserRouteInfo)routeObj).setPlaybackType(type);
+ ((android.media.MediaRouter.UserRouteInfo) routeObj).setPlaybackType(type);
}
public static void setPlaybackStream(@NonNull Object routeObj, int stream) {
- ((android.media.MediaRouter.UserRouteInfo)routeObj).setPlaybackStream(stream);
+ ((android.media.MediaRouter.UserRouteInfo) routeObj).setPlaybackStream(stream);
}
public static void setVolume(@NonNull Object routeObj, int volume) {
- ((android.media.MediaRouter.UserRouteInfo)routeObj).setVolume(volume);
+ ((android.media.MediaRouter.UserRouteInfo) routeObj).setVolume(volume);
}
public static void setVolumeMax(@NonNull Object routeObj, int volumeMax) {
- ((android.media.MediaRouter.UserRouteInfo)routeObj).setVolumeMax(volumeMax);
+ ((android.media.MediaRouter.UserRouteInfo) routeObj).setVolumeMax(volumeMax);
}
public static void setVolumeHandling(@NonNull Object routeObj, int volumeHandling) {
- ((android.media.MediaRouter.UserRouteInfo)routeObj).setVolumeHandling(volumeHandling);
+ ((android.media.MediaRouter.UserRouteInfo) routeObj).setVolumeHandling(volumeHandling);
}
public static void setVolumeCallback(@NonNull Object routeObj,
@NonNull Object volumeCallbackObj) {
- ((android.media.MediaRouter.UserRouteInfo)routeObj).setVolumeCallback(
- (android.media.MediaRouter.VolumeCallback)volumeCallbackObj);
+ ((android.media.MediaRouter.UserRouteInfo) routeObj).setVolumeCallback(
+ (android.media.MediaRouter.VolumeCallback) volumeCallbackObj);
}
public static void setRemoteControlClient(@NonNull Object routeObj,
@Nullable Object rccObj) {
- ((android.media.MediaRouter.UserRouteInfo)routeObj).setRemoteControlClient(
- (android.media.RemoteControlClient)rccObj);
+ ((android.media.MediaRouter.UserRouteInfo) routeObj).setRemoteControlClient(
+ (android.media.RemoteControlClient) rccObj);
}
private UserRouteInfo() {
@@ -266,23 +267,23 @@
public static final class RouteCategory {
@Nullable
public static CharSequence getName(@NonNull Object categoryObj, @NonNull Context context) {
- return ((android.media.MediaRouter.RouteCategory)categoryObj).getName(context);
+ return ((android.media.MediaRouter.RouteCategory) categoryObj).getName(context);
}
- @SuppressWarnings({ "rawtypes", "unchecked" })
+ @SuppressWarnings({"rawtypes", "unchecked"})
@NonNull
public static List getRoutes(@NonNull Object categoryObj) {
ArrayList out = new ArrayList();
- ((android.media.MediaRouter.RouteCategory)categoryObj).getRoutes(out);
+ ((android.media.MediaRouter.RouteCategory) categoryObj).getRoutes(out);
return out;
}
public static int getSupportedTypes(@NonNull Object categoryObj) {
- return ((android.media.MediaRouter.RouteCategory)categoryObj).getSupportedTypes();
+ return ((android.media.MediaRouter.RouteCategory) categoryObj).getSupportedTypes();
}
public static boolean isGroupable(@NonNull Object categoryObj) {
- return ((android.media.MediaRouter.RouteCategory)categoryObj).isGroupable();
+ return ((android.media.MediaRouter.RouteCategory) categoryObj).isGroupable();
}
private RouteCategory() {
@@ -291,17 +292,25 @@
public interface Callback {
void onRouteSelected(int type, @NonNull Object routeObj);
+
void onRouteUnselected(int type, @NonNull Object routeObj);
+
void onRouteAdded(@NonNull Object routeObj);
+
void onRouteRemoved(@NonNull Object routeObj);
+
void onRouteChanged(@NonNull Object routeObj);
+
void onRouteGrouped(@NonNull Object routeObj, @NonNull Object groupObj, int index);
+
void onRouteUngrouped(@NonNull Object routeObj, @NonNull Object groupObj);
+
void onRouteVolumeChanged(@NonNull Object routeObj);
}
public interface VolumeCallback {
void onVolumeSetRequest(@NonNull Object routeObj, int volume);
+
void onVolumeUpdateRequest(@NonNull Object routeObj, int direction);
}
@@ -312,7 +321,7 @@
public static final class SelectRouteWorkaround {
private Method mSelectRouteIntMethod;
- public SelectRouteWorkaround() {
+ SelectRouteWorkaround() {
if (Build.VERSION.SDK_INT < 16 || Build.VERSION.SDK_INT > 17) {
throw new UnsupportedOperationException();
}
@@ -323,10 +332,11 @@
}
}
+ @SuppressLint("BanUncheckedReflection") // TODO: b/232075564
public void selectRoute(@NonNull Object routerObj, int types, @NonNull Object routeObj) {
- android.media.MediaRouter router = (android.media.MediaRouter)routerObj;
+ android.media.MediaRouter router = (android.media.MediaRouter) routerObj;
android.media.MediaRouter.RouteInfo route =
- (android.media.MediaRouter.RouteInfo)routeObj;
+ (android.media.MediaRouter.RouteInfo) routeObj;
int routeTypes = route.getSupportedTypes();
if ((routeTypes & ROUTE_TYPE_USER) == 0) {
@@ -365,7 +375,7 @@
public static final class GetDefaultRouteWorkaround {
private Method mGetSystemAudioRouteMethod;
- public GetDefaultRouteWorkaround() {
+ GetDefaultRouteWorkaround() {
if (Build.VERSION.SDK_INT < 16 || Build.VERSION.SDK_INT > 17) {
throw new UnsupportedOperationException();
}
@@ -376,9 +386,10 @@
}
}
+ @SuppressLint("BanUncheckedReflection") // TODO: b/232075564
@NonNull
public Object getDefaultRoute(@NonNull Object routerObj) {
- android.media.MediaRouter router = (android.media.MediaRouter)routerObj;
+ android.media.MediaRouter router = (android.media.MediaRouter) routerObj;
if (mGetSystemAudioRouteMethod != null) {
try {
@@ -398,7 +409,7 @@
extends android.media.MediaRouter.Callback {
protected final T mCallback;
- public CallbackProxy(T callback) {
+ CallbackProxy(T callback) {
mCallback = callback;
}
@@ -457,7 +468,7 @@
extends android.media.MediaRouter.VolumeCallback {
protected final T mCallback;
- public VolumeCallbackProxy(T callback) {
+ VolumeCallbackProxy(T callback) {
mCallback = callback;
}
diff --git a/mediarouter/mediarouter/jellybean-mr1/androidx/mediarouter/media/MediaRouterJellybeanMr1.java b/mediarouter/mediarouter/src/main/java/androidx/mediarouter/media/MediaRouterJellybeanMr1.java
similarity index 92%
rename from mediarouter/mediarouter/jellybean-mr1/androidx/mediarouter/media/MediaRouterJellybeanMr1.java
rename to mediarouter/mediarouter/src/main/java/androidx/mediarouter/media/MediaRouterJellybeanMr1.java
index 927e40b..de46e8e 100644
--- a/mediarouter/mediarouter/jellybean-mr1/androidx/mediarouter/media/MediaRouterJellybeanMr1.java
+++ b/mediarouter/mediarouter/src/main/java/androidx/mediarouter/media/MediaRouterJellybeanMr1.java
@@ -16,6 +16,7 @@
package androidx.mediarouter.media;
+import android.annotation.SuppressLint;
import android.content.Context;
import android.hardware.display.DisplayManager;
import android.os.Build;
@@ -41,7 +42,7 @@
public static final class RouteInfo {
public static boolean isEnabled(@NonNull Object routeObj) {
- return ((android.media.MediaRouter.RouteInfo)routeObj).isEnabled();
+ return ((android.media.MediaRouter.RouteInfo) routeObj).isEnabled();
}
@Nullable
@@ -49,7 +50,7 @@
// android.media.MediaRouter.RouteInfo.getPresentationDisplay() was
// added in API 17. However, some factory releases of JB MR1 missed it.
try {
- return ((android.media.MediaRouter.RouteInfo)routeObj).getPresentationDisplay();
+ return ((android.media.MediaRouter.RouteInfo) routeObj).getPresentationDisplay();
} catch (NoSuchMethodError ex) {
Log.w(TAG, "Cannot get presentation display for the route.", ex);
}
@@ -126,6 +127,7 @@
}
}
+ @SuppressLint("BanUncheckedReflection") // TODO: b/232075564
@Override
public void run() {
if (mActivelyScanningWifiDisplays) {
@@ -149,7 +151,7 @@
private Method mGetStatusCodeMethod;
private int mStatusConnecting;
- public IsConnectingWorkaround() {
+ IsConnectingWorkaround() {
if (Build.VERSION.SDK_INT != 17) {
throw new UnsupportedOperationException();
}
@@ -166,13 +168,14 @@
}
}
+ @SuppressLint("BanUncheckedReflection") // TODO: b/232075564
public boolean isConnecting(@NonNull Object routeObj) {
android.media.MediaRouter.RouteInfo route =
- (android.media.MediaRouter.RouteInfo)routeObj;
+ (android.media.MediaRouter.RouteInfo) routeObj;
if (mGetStatusCodeMethod != null) {
try {
- int statusCode = (Integer)mGetStatusCodeMethod.invoke(route);
+ int statusCode = (Integer) mGetStatusCodeMethod.invoke(route);
return statusCode == mStatusConnecting;
} catch (IllegalAccessException ex) {
} catch (InvocationTargetException ex) {
@@ -186,7 +189,7 @@
static class CallbackProxy<T extends Callback>
extends MediaRouterJellybean.CallbackProxy<T> {
- public CallbackProxy(T callback) {
+ CallbackProxy(T callback) {
super(callback);
}
diff --git a/mediarouter/mediarouter/jellybean-mr2/androidx/mediarouter/media/MediaRouterJellybeanMr2.java b/mediarouter/mediarouter/src/main/java/androidx/mediarouter/media/MediaRouterJellybeanMr2.java
similarity index 76%
rename from mediarouter/mediarouter/jellybean-mr2/androidx/mediarouter/media/MediaRouterJellybeanMr2.java
rename to mediarouter/mediarouter/src/main/java/androidx/mediarouter/media/MediaRouterJellybeanMr2.java
index 8543950..796da87 100644
--- a/mediarouter/mediarouter/jellybean-mr2/androidx/mediarouter/media/MediaRouterJellybeanMr2.java
+++ b/mediarouter/mediarouter/src/main/java/androidx/mediarouter/media/MediaRouterJellybeanMr2.java
@@ -23,22 +23,22 @@
@RequiresApi(18)
final class MediaRouterJellybeanMr2 {
public static Object getDefaultRoute(Object routerObj) {
- return ((android.media.MediaRouter)routerObj).getDefaultRoute();
+ return ((android.media.MediaRouter) routerObj).getDefaultRoute();
}
public static void addCallback(Object routerObj, int types, Object callbackObj, int flags) {
- ((android.media.MediaRouter)routerObj).addCallback(types,
- (android.media.MediaRouter.Callback)callbackObj, flags);
+ ((android.media.MediaRouter) routerObj).addCallback(types,
+ (android.media.MediaRouter.Callback) callbackObj, flags);
}
public static final class RouteInfo {
@Nullable
public static CharSequence getDescription(@NonNull Object routeObj) {
- return ((android.media.MediaRouter.RouteInfo)routeObj).getDescription();
+ return ((android.media.MediaRouter.RouteInfo) routeObj).getDescription();
}
public static boolean isConnecting(@NonNull Object routeObj) {
- return ((android.media.MediaRouter.RouteInfo)routeObj).isConnecting();
+ return ((android.media.MediaRouter.RouteInfo) routeObj).isConnecting();
}
private RouteInfo() {
@@ -48,7 +48,7 @@
public static final class UserRouteInfo {
public static void setDescription(@NonNull Object routeObj,
@Nullable CharSequence description) {
- ((android.media.MediaRouter.UserRouteInfo)routeObj).setDescription(description);
+ ((android.media.MediaRouter.UserRouteInfo) routeObj).setDescription(description);
}
private UserRouteInfo() {
diff --git a/mediarouter/mediarouter/src/main/java/androidx/mediarouter/media/MediaSessionStatus.java b/mediarouter/mediarouter/src/main/java/androidx/mediarouter/media/MediaSessionStatus.java
index f4c9290..820982db 100644
--- a/mediarouter/mediarouter/src/main/java/androidx/mediarouter/media/MediaSessionStatus.java
+++ b/mediarouter/mediarouter/src/main/java/androidx/mediarouter/media/MediaSessionStatus.java
@@ -128,6 +128,7 @@
return mBundle.getBundle(KEY_EXTRAS);
}
+ @NonNull
@Override
public String toString() {
StringBuilder result = new StringBuilder();
diff --git a/mediarouter/mediarouter/src/main/java/androidx/mediarouter/media/RegisteredMediaRouteProvider.java b/mediarouter/mediarouter/src/main/java/androidx/mediarouter/media/RegisteredMediaRouteProvider.java
index b3584f8..4edda14 100644
--- a/mediarouter/mediarouter/src/main/java/androidx/mediarouter/media/RegisteredMediaRouteProvider.java
+++ b/mediarouter/mediarouter/src/main/java/androidx/mediarouter/media/RegisteredMediaRouteProvider.java
@@ -175,6 +175,7 @@
disconnect();
}
+ @NonNull
@Override
public String toString() {
return "Service connection " + mComponentName.flattenToShortString();
@@ -548,7 +549,7 @@
}
@Override
- public boolean onControlRequest(Intent intent, ControlRequestCallback callback) {
+ public boolean onControlRequest(@NonNull Intent intent, ControlRequestCallback callback) {
if (mConnection != null) {
return mConnection.sendControlRequest(mControllerId, intent, callback);
}
@@ -692,7 +693,7 @@
}
@Override
- public boolean onControlRequest(Intent intent, ControlRequestCallback callback) {
+ public boolean onControlRequest(@NonNull Intent intent, ControlRequestCallback callback) {
if (mConnection != null) {
return mConnection.sendControlRequest(mControllerId, intent, callback);
}
@@ -798,7 +799,6 @@
return false;
}
- @SuppressWarnings("deprecation")
public boolean onDynamicRouteDescriptorsChanged(
int controllerId, Bundle descriptorsBundle) {
if (mServiceVersion != 0) {
diff --git a/mediarouter/mediarouter/src/main/java/androidx/mediarouter/media/RegisteredMediaRouteProviderWatcher.java b/mediarouter/mediarouter/src/main/java/androidx/mediarouter/media/RegisteredMediaRouteProviderWatcher.java
index d392178..2918139 100644
--- a/mediarouter/mediarouter/src/main/java/androidx/mediarouter/media/RegisteredMediaRouteProviderWatcher.java
+++ b/mediarouter/mediarouter/src/main/java/androidx/mediarouter/media/RegisteredMediaRouteProviderWatcher.java
@@ -50,7 +50,6 @@
private final ArrayList<RegisteredMediaRouteProvider> mProviders = new ArrayList<>();
private boolean mRunning;
- @SuppressWarnings("deprecation")
RegisteredMediaRouteProviderWatcher(Context context, Callback callback) {
mContext = context;
mCallback = callback;
@@ -95,7 +94,6 @@
}
}
- @SuppressWarnings("deprecation")
void scanPackages() {
if (!mRunning) {
return;
@@ -165,7 +163,6 @@
@RequiresApi(Build.VERSION_CODES.R)
@NonNull
- @SuppressWarnings("deprecation")
List<ServiceInfo> getMediaRoute2ProviderServices() {
Intent intent = new Intent(MediaRoute2ProviderService.SERVICE_INTERFACE);
diff --git a/mediarouter/mediarouter/src/main/java/androidx/mediarouter/media/RemoteControlClientCompat.java b/mediarouter/mediarouter/src/main/java/androidx/mediarouter/media/RemoteControlClientCompat.java
index 93f3879..cfc8cfd 100644
--- a/mediarouter/mediarouter/src/main/java/androidx/mediarouter/media/RemoteControlClientCompat.java
+++ b/mediarouter/mediarouter/src/main/java/androidx/mediarouter/media/RemoteControlClientCompat.java
@@ -19,6 +19,7 @@
import android.media.AudioManager;
import android.os.Build;
+import androidx.annotation.NonNull;
import androidx.annotation.Nullable;
import androidx.annotation.RequiresApi;
@@ -90,11 +91,11 @@
* Called when the volume should be increased or decreased.
*
* @param direction An integer indicating whether the volume is to be increased
- * (positive value) or decreased (negative value).
- * For bundled changes, the absolute value indicates the number of changes
- * in the same direction, e.g. +3 corresponds to three "volume up" changes.
+ * (positive value) or decreased (negative value).
+ * For bundled changes, the absolute value indicates the number of changes
+ * in the same direction, e.g. +3 corresponds to three "volume up" changes.
*/
- public void onVolumeUpdateRequest(int direction);
+ void onVolumeUpdateRequest(int direction);
/**
* Called when the volume for the route should be set to the given value.
@@ -102,7 +103,7 @@
* @param volume An integer indicating the new volume value that should be used,
* always between 0 and the value set by {@link PlaybackInfo#volumeMax}.
*/
- public void onVolumeSetRequest(int volume);
+ void onVolumeSetRequest(int volume);
}
/**
@@ -175,7 +176,7 @@
}
@Override
- public void onVolumeUpdateRequest(Object routeObj, int direction) {
+ public void onVolumeUpdateRequest(@NonNull Object routeObj, int direction) {
JellybeanImpl impl = mImplWeak.get();
if (impl != null && impl.mVolumeCallback != null) {
impl.mVolumeCallback.onVolumeUpdateRequest(direction);
@@ -183,7 +184,7 @@
}
@Override
- public void onVolumeSetRequest(Object routeObj, int volume) {
+ public void onVolumeSetRequest(@NonNull Object routeObj, int volume) {
JellybeanImpl impl = mImplWeak.get();
if (impl != null && impl.mVolumeCallback != null) {
impl.mVolumeCallback.onVolumeSetRequest(volume);
diff --git a/mediarouter/mediarouter/src/main/java/androidx/mediarouter/media/SystemMediaRouteProvider.java b/mediarouter/mediarouter/src/main/java/androidx/mediarouter/media/SystemMediaRouteProvider.java
index 42ae475..04616d1 100644
--- a/mediarouter/mediarouter/src/main/java/androidx/mediarouter/media/SystemMediaRouteProvider.java
+++ b/mediarouter/mediarouter/src/main/java/androidx/mediarouter/media/SystemMediaRouteProvider.java
@@ -162,7 +162,7 @@
}
@Override
- public RouteController onCreateRouteController(String routeId) {
+ public RouteController onCreateRouteController(@NonNull String routeId) {
if (routeId.equals(DEFAULT_ROUTE_ID)) {
return new DefaultRouteController();
}
@@ -275,7 +275,7 @@
}
@Override
- public RouteController onCreateRouteController(String routeId) {
+ public RouteController onCreateRouteController(@NonNull String routeId) {
int index = findSystemRouteRecordByDescriptorId(routeId);
if (index >= 0) {
SystemRouteRecord record = mSystemRouteRecords.get(index);
@@ -313,7 +313,7 @@
}
@Override
- public void onRouteAdded(Object routeObj) {
+ public void onRouteAdded(@NonNull Object routeObj) {
if (addSystemRouteNoPublish(routeObj)) {
publishRoutes();
}
@@ -361,7 +361,7 @@
}
@Override
- public void onRouteRemoved(Object routeObj) {
+ public void onRouteRemoved(@NonNull Object routeObj) {
if (getUserRouteRecord(routeObj) == null) {
int index = findSystemRouteRecord(routeObj);
if (index >= 0) {
@@ -372,7 +372,7 @@
}
@Override
- public void onRouteChanged(Object routeObj) {
+ public void onRouteChanged(@NonNull Object routeObj) {
if (getUserRouteRecord(routeObj) == null) {
int index = findSystemRouteRecord(routeObj);
if (index >= 0) {
@@ -384,7 +384,7 @@
}
@Override
- public void onRouteVolumeChanged(Object routeObj) {
+ public void onRouteVolumeChanged(@NonNull Object routeObj) {
if (getUserRouteRecord(routeObj) == null) {
int index = findSystemRouteRecord(routeObj);
if (index >= 0) {
@@ -393,8 +393,8 @@
if (newVolume != record.mRouteDescriptor.getVolume()) {
record.mRouteDescriptor =
new MediaRouteDescriptor.Builder(record.mRouteDescriptor)
- .setVolume(newVolume)
- .build();
+ .setVolume(newVolume)
+ .build();
publishRoutes();
}
}
@@ -402,7 +402,7 @@
}
@Override
- public void onRouteSelected(int type, Object routeObj) {
+ public void onRouteSelected(int type, @NonNull Object routeObj) {
if (routeObj != MediaRouterJellybean.getSelectedRoute(mRouterObj,
MediaRouterJellybean.ALL_ROUTE_TYPES)) {
// The currently selected route has already changed so this callback
@@ -425,23 +425,23 @@
}
@Override
- public void onRouteUnselected(int type, Object routeObj) {
+ public void onRouteUnselected(int type, @NonNull Object routeObj) {
// Nothing to do when a route is unselected.
// We only need to handle when a route is selected.
}
@Override
- public void onRouteGrouped(Object routeObj, Object groupObj, int index) {
+ public void onRouteGrouped(@NonNull Object routeObj, @NonNull Object groupObj, int index) {
// Route grouping is deprecated and no longer supported.
}
@Override
- public void onRouteUngrouped(Object routeObj, Object groupObj) {
+ public void onRouteUngrouped(@NonNull Object routeObj, @NonNull Object groupObj) {
// Route grouping is deprecated and no longer supported.
}
@Override
- public void onVolumeSetRequest(Object routeObj, int volume) {
+ public void onVolumeSetRequest(@NonNull Object routeObj, int volume) {
UserRouteRecord record = getUserRouteRecord(routeObj);
if (record != null) {
record.mRoute.requestSetVolume(volume);
@@ -449,7 +449,7 @@
}
@Override
- public void onVolumeUpdateRequest(Object routeObj, int direction) {
+ public void onVolumeUpdateRequest(@NonNull Object routeObj, int direction) {
UserRouteRecord record = getUserRouteRecord(routeObj);
if (record != null) {
record.mRoute.requestUpdateVolume(direction);
@@ -742,7 +742,7 @@
}
@Override
- public void onRoutePresentationDisplayChanged(Object routeObj) {
+ public void onRoutePresentationDisplayChanged(@NonNull Object routeObj) {
int index = findSystemRouteRecord(routeObj);
if (index >= 0) {
SystemRouteRecord record = mSystemRouteRecords.get(index);
diff --git a/metrics/integration-tests/janktest/src/main/java/androidx/metrics/performance/janktest/MessageListFragment.kt b/metrics/integration-tests/janktest/src/main/java/androidx/metrics/performance/janktest/MessageListFragment.kt
index d8e13f1..797f6f3 100644
--- a/metrics/integration-tests/janktest/src/main/java/androidx/metrics/performance/janktest/MessageListFragment.kt
+++ b/metrics/integration-tests/janktest/src/main/java/androidx/metrics/performance/janktest/MessageListFragment.kt
@@ -61,7 +61,7 @@
}
class MetricsStateCache : View.OnAttachStateChangeListener {
- private var holder: PerformanceMetricsState.MetricsStateHolder? = null
+ private var holder: PerformanceMetricsState.Holder? = null
val state: PerformanceMetricsState?
get() = holder?.state
diff --git a/metrics/metrics-performance/api/current.txt b/metrics/metrics-performance/api/current.txt
index 9729d9a..5efa062 100644
--- a/metrics/metrics-performance/api/current.txt
+++ b/metrics/metrics-performance/api/current.txt
@@ -47,16 +47,16 @@
public final class PerformanceMetricsState {
method public void addSingleFrameState(String stateName, String state);
method public void addState(String stateName, String state);
- method @UiThread public static androidx.metrics.performance.PerformanceMetricsState.MetricsStateHolder getForHierarchy(android.view.View view);
+ method @UiThread public static androidx.metrics.performance.PerformanceMetricsState.Holder getForHierarchy(android.view.View view);
method public void removeState(String stateName);
field public static final androidx.metrics.performance.PerformanceMetricsState.Companion Companion;
}
public static final class PerformanceMetricsState.Companion {
- method @UiThread public androidx.metrics.performance.PerformanceMetricsState.MetricsStateHolder getForHierarchy(android.view.View view);
+ method @UiThread public androidx.metrics.performance.PerformanceMetricsState.Holder getForHierarchy(android.view.View view);
}
- public static final class PerformanceMetricsState.MetricsStateHolder {
+ public static final class PerformanceMetricsState.Holder {
method public androidx.metrics.performance.PerformanceMetricsState? getState();
property public final androidx.metrics.performance.PerformanceMetricsState? state;
}
diff --git a/metrics/metrics-performance/api/public_plus_experimental_current.txt b/metrics/metrics-performance/api/public_plus_experimental_current.txt
index 9729d9a..5efa062 100644
--- a/metrics/metrics-performance/api/public_plus_experimental_current.txt
+++ b/metrics/metrics-performance/api/public_plus_experimental_current.txt
@@ -47,16 +47,16 @@
public final class PerformanceMetricsState {
method public void addSingleFrameState(String stateName, String state);
method public void addState(String stateName, String state);
- method @UiThread public static androidx.metrics.performance.PerformanceMetricsState.MetricsStateHolder getForHierarchy(android.view.View view);
+ method @UiThread public static androidx.metrics.performance.PerformanceMetricsState.Holder getForHierarchy(android.view.View view);
method public void removeState(String stateName);
field public static final androidx.metrics.performance.PerformanceMetricsState.Companion Companion;
}
public static final class PerformanceMetricsState.Companion {
- method @UiThread public androidx.metrics.performance.PerformanceMetricsState.MetricsStateHolder getForHierarchy(android.view.View view);
+ method @UiThread public androidx.metrics.performance.PerformanceMetricsState.Holder getForHierarchy(android.view.View view);
}
- public static final class PerformanceMetricsState.MetricsStateHolder {
+ public static final class PerformanceMetricsState.Holder {
method public androidx.metrics.performance.PerformanceMetricsState? getState();
property public final androidx.metrics.performance.PerformanceMetricsState? state;
}
diff --git a/metrics/metrics-performance/api/restricted_current.txt b/metrics/metrics-performance/api/restricted_current.txt
index 9729d9a..5efa062 100644
--- a/metrics/metrics-performance/api/restricted_current.txt
+++ b/metrics/metrics-performance/api/restricted_current.txt
@@ -47,16 +47,16 @@
public final class PerformanceMetricsState {
method public void addSingleFrameState(String stateName, String state);
method public void addState(String stateName, String state);
- method @UiThread public static androidx.metrics.performance.PerformanceMetricsState.MetricsStateHolder getForHierarchy(android.view.View view);
+ method @UiThread public static androidx.metrics.performance.PerformanceMetricsState.Holder getForHierarchy(android.view.View view);
method public void removeState(String stateName);
field public static final androidx.metrics.performance.PerformanceMetricsState.Companion Companion;
}
public static final class PerformanceMetricsState.Companion {
- method @UiThread public androidx.metrics.performance.PerformanceMetricsState.MetricsStateHolder getForHierarchy(android.view.View view);
+ method @UiThread public androidx.metrics.performance.PerformanceMetricsState.Holder getForHierarchy(android.view.View view);
}
- public static final class PerformanceMetricsState.MetricsStateHolder {
+ public static final class PerformanceMetricsState.Holder {
method public androidx.metrics.performance.PerformanceMetricsState? getState();
property public final androidx.metrics.performance.PerformanceMetricsState? state;
}
diff --git a/metrics/metrics-performance/src/androidTest/java/androidx/metrics/performance/test/DelayedActivity.kt b/metrics/metrics-performance/src/androidTest/java/androidx/metrics/performance/test/DelayedActivity.kt
index acb7ded..6082640 100644
--- a/metrics/metrics-performance/src/androidTest/java/androidx/metrics/performance/test/DelayedActivity.kt
+++ b/metrics/metrics-performance/src/androidTest/java/androidx/metrics/performance/test/DelayedActivity.kt
@@ -35,7 +35,17 @@
delayedView?.delayMs = value
}
- var repetions: Int
+ var maxReps: Int
+ get() {
+ val delayedView = findViewById<DelayedView>(R.id.delayedView)
+ return delayedView?.maxReps ?: 0
+ }
+ set(value) {
+ val delayedView = findViewById<DelayedView>(R.id.delayedView)
+ delayedView?.maxReps = value
+ }
+
+ var repetitions: Int
get() {
val delayedView = findViewById<DelayedView>(R.id.delayedView)
return delayedView?.repetitions ?: 0
diff --git a/metrics/metrics-performance/src/androidTest/java/androidx/metrics/performance/test/DelayedView.kt b/metrics/metrics-performance/src/androidTest/java/androidx/metrics/performance/test/DelayedView.kt
index 7a3006c..bc05bd9 100644
--- a/metrics/metrics-performance/src/androidTest/java/androidx/metrics/performance/test/DelayedView.kt
+++ b/metrics/metrics-performance/src/androidTest/java/androidx/metrics/performance/test/DelayedView.kt
@@ -6,22 +6,23 @@
import android.util.AttributeSet
import android.view.View
import androidx.annotation.RequiresApi
+import androidx.metrics.performance.PerformanceMetricsState
class DelayedView(context: Context?, attrs: AttributeSet?) :
View(context, attrs) {
var delayMs: Long = 0
var repetitions: Int = 0
+ var maxReps: Int = 0
+ var perFrameStateData: List<JankStatsTest.FrameStateInputData> = listOf()
@RequiresApi(Build.VERSION_CODES.JELLY_BEAN)
override fun onDraw(canvas: Canvas?) {
- if (repetitions > 0) {
- repetitions--
- }
+ repetitions++
if (delayMs > 0) {
try {
Thread.sleep(delayMs)
- } catch (e: Exception) {
+ } catch (_: Exception) {
}
}
val randomColor: Int = 0xff000000.toInt() or
@@ -30,8 +31,25 @@
((Math.random() * 127) + 128).toInt()
canvas!!.drawColor(randomColor)
- if (repetitions > 0) {
- postInvalidateOnAnimation()
+ if (perFrameStateData.isNotEmpty()) {
+ val metricsState = PerformanceMetricsState.getForHierarchy(this).state!!
+ val stateData = perFrameStateData[repetitions - 1]
+ for (state in stateData.addSFStates) {
+ metricsState.addSingleFrameState(state.first, state.second)
+ }
+ for (state in stateData.addStates) {
+ metricsState.addState(state.first, state.second)
+ }
+ for (stateName in stateData.removeStates) {
+ metricsState.removeState(stateName)
+ }
+ }
+ if (repetitions < maxReps) {
+ if (Build.VERSION.SDK_INT >= 16) {
+ postInvalidateOnAnimation()
+ } else {
+ postInvalidate()
+ }
}
}
}
\ No newline at end of file
diff --git a/metrics/metrics-performance/src/androidTest/java/androidx/metrics/performance/test/JankStatsTest.kt b/metrics/metrics-performance/src/androidTest/java/androidx/metrics/performance/test/JankStatsTest.kt
index cd66a43..c350dcf 100644
--- a/metrics/metrics-performance/src/androidTest/java/androidx/metrics/performance/test/JankStatsTest.kt
+++ b/metrics/metrics-performance/src/androidTest/java/androidx/metrics/performance/test/JankStatsTest.kt
@@ -15,7 +15,11 @@
*/
package androidx.metrics.performance.test
-import androidx.core.util.Pair
+import android.os.Build
+import android.os.Build.VERSION_CODES.ICE_CREAM_SANDWICH_MR1
+import android.os.Build.VERSION_CODES.JELLY_BEAN
+import android.view.Choreographer
+import androidx.annotation.RequiresApi
import androidx.metrics.performance.PerformanceMetricsState
import androidx.metrics.performance.FrameData
import androidx.metrics.performance.FrameDataApi24
@@ -27,6 +31,7 @@
import androidx.test.ext.junit.rules.ActivityScenarioRule
import androidx.test.ext.junit.runners.AndroidJUnit4
import androidx.test.filters.LargeTest
+import androidx.test.filters.SdkSuppress
import java.util.concurrent.CountDownLatch
import java.util.concurrent.TimeUnit
import kotlinx.coroutines.Dispatchers
@@ -52,9 +57,23 @@
private lateinit var delayedView: DelayedView
private lateinit var latchedListener: LatchedListener
- private val IDLE_PAUSE = 1000
+ private var frameInit: FrameInitCompat
+
private val NUM_FRAMES = 10
+ /**
+ * On some older APIs and emulators, frames may occasionally take longer than predicted
+ * jank. We check against this MIN duration to avoid flaky tests.
+ */
+ private val MIN_JANK_NS = 100000000
+
+ init {
+ if (Build.VERSION.SDK_INT >= 16) {
+ frameInit = FrameInit16(this)
+ } else {
+ frameInit = FrameInitCompat(this)
+ }
+ }
@Rule
@JvmField
var delayedActivityRule: ActivityScenarioRule<DelayedActivity> =
@@ -130,13 +149,12 @@
assertNotEquals(frameData31, frameData31A)
}
+ @SdkSuppress(minSdkVersion = JELLY_BEAN)
@Test
fun testNoJank() {
val frameDelay = 0
- // Prime the system first to flush out any frames happening before we start forcing jank
- runDelayTest(0, NUM_FRAMES, latchedListener)
- latchedListener.reset()
+ frameInit.initFramePipeline()
runDelayTest(frameDelay, NUM_FRAMES, latchedListener)
assertEquals("numJankFrames should equal 0", 0, latchedListener.numJankFrames)
@@ -144,22 +162,26 @@
jankStats.jankHeuristicMultiplier = 0f
runDelayTest(frameDelay, NUM_FRAMES, latchedListener)
+ // FrameMetrics sometimes drops a frame, so the total number of
+ // jankData items might be less than NUM_FRAMES
assertEquals(
- "multiplier 0, extremeMs 0: numJankFrames should equal NUM_FRAMES",
+ "jank frames != NUMFRAMES",
NUM_FRAMES, latchedListener.numJankFrames
)
+ assertTrue(
+ "With heuristicMultiplier 0, should be at least ${NUM_FRAMES - 1} " +
+ "frames with jank data, not ${latchedListener.numJankFrames}",
+ latchedListener.numJankFrames >= (NUM_FRAMES - 1)
+ )
}
+ @SdkSuppress(minSdkVersion = JELLY_BEAN)
@Test
fun testMultipleListeners() {
val frameDelay = 0
- // Prime the system first to flush out any frames happening before we start forcing jank
- runDelayTest(0, NUM_FRAMES, latchedListener)
- latchedListener.reset()
+ frameInit.initFramePipeline()
- val testState = StateInfo("Testing State", "sampleState")
- metricsState.addSingleFrameState(testState.stateName, testState.state)
val secondListenerStates = mutableListOf<StateInfo>()
val secondListener = OnFrameListener {
secondListenerStates.addAll(it.states)
@@ -171,25 +193,32 @@
Dispatchers.Default.asExecutor(), secondListener
)
}
+ val testState = StateInfo("Testing State", "sampleState")
+ metricsState.addSingleFrameState(testState.stateName, testState.state)
+
+ // in case earlier frames arrive before our test begins
+ secondListenerStates.clear()
+ latchedListener.reset()
runDelayTest(frameDelay, NUM_FRAMES, latchedListener)
val jankData: FrameData = latchedListener.jankData[0]
assertEquals(listOf(testState), jankData.states)
assertEquals(listOf(testState), secondListenerStates)
}
+ @SdkSuppress(minSdkVersion = JELLY_BEAN)
@Test
fun testRegularJank() {
val frameDelay = 100
- // Prime the system first to flush out any frames happening before we start forcing jank
- runDelayTest(0, NUM_FRAMES, latchedListener)
- latchedListener.reset()
+ frameInit.initFramePipeline()
runDelayTest(frameDelay, NUM_FRAMES, latchedListener)
- assertEquals(
- "numJankFrames should equal NUM_FRAMES",
- NUM_FRAMES,
- latchedListener.numJankFrames
+ // FrameMetrics sometimes drops a frame, so the total number of
+ // jankData items might be less than NUM_FRAMES
+ assertTrue(
+ "There should be at least ${NUM_FRAMES - 1} frames with jank data, " +
+ "not ${latchedListener.jankData.size}",
+ latchedListener.jankData.size >= (NUM_FRAMES - 1)
)
latchedListener.reset()
@@ -201,15 +230,12 @@
)
}
+ @SdkSuppress(minSdkVersion = JELLY_BEAN)
@Test
fun testFrameStates() {
- val frameDelay = 100
+ val frameDelay = 0
- // prime the system first -some platform versions start with historical data which may not
- // have the forced-jank frames up front that we're counting on. Running it twice ensures
- // that our assumptions will be true the second time around
- runDelayTest(frameDelay, NUM_FRAMES, latchedListener)
- latchedListener.reset()
+ frameInit.initFramePipeline()
val state0 = StateInfo("Testing State 0", "sampleStateA")
val state1 = StateInfo("Testing State 1", "sampleStateB")
@@ -237,7 +263,7 @@
// Now test the rest of the frames, which should not include singleFrameState state2
for (i in 1 until NUM_FRAMES) {
val item = latchedListener.jankData[i]
- assertEquals("There should be 2 states at frame 0", 2,
+ assertEquals("There should be 2 states at frame $i", 2,
item.states.size)
for (state in item.states) {
assertThat(
@@ -262,16 +288,16 @@
latchedListener.reset()
val state3 = Pair("Testing State 3", "sampleStateD")
val state4 = Pair("Testing State 4", "sampleStateE")
- metricsState.addState(state3.first!!, state3.second!!)
- metricsState.addState(state4.first!!, state4.second!!)
+ metricsState.addState(state3.first, state3.second)
+ metricsState.addState(state4.first, state4.second)
runDelayTest(frameDelay, 1, latchedListener)
item0 = latchedListener.jankData[0]
assertEquals(2, item0.states.size)
latchedListener.reset()
// Test removal of state3 and replacement of state4
- metricsState.removeState(state3.first!!)
- metricsState.addState(state4.first!!, "sampleStateF")
+ metricsState.removeState(state3.first)
+ metricsState.addState(state4.first, "sampleStateF")
runDelayTest(frameDelay, 1, latchedListener)
item0 = latchedListener.jankData[0]
assertEquals(1, item0.states.size)
@@ -280,37 +306,190 @@
latchedListener.reset()
}
+ /**
+ * Data structure to hold per-frame state data to be injected during the test
+ */
+ data class FrameStateInputData(
+ val addSFStates: List<Pair<String, String>> = emptyList(),
+ val addStates: List<Pair<String, String>> = emptyList(),
+ val removeStates: List<String> = emptyList()
+ )
+
+ /**
+ * Utility function (embedded in a class because it uses version-specific APIs) which
+ * is used by tests which require the frame pipeline to be empty when they
+ * start. When the activity first starts, there are usually a couple of frames drawn.
+ * Depending on when those frames are drawn relative to when the JankStats object and
+ * OnFrameListener are set up, there can be old frame data still being set to JankStats
+ * after the test has started, which causes problems with a test not getting the result
+ * that it should. The workaround is to force these initial frames to draw before the test
+ * begins, so that any data used by the test will only land on frames after the test begins
+ * instead of these old activity-creation frames.
+ */
+ open class FrameInitCompat(val jankStatsTest: JankStatsTest) {
+ open fun initFramePipeline() {}
+ }
+
+ @RequiresApi(16)
+ class FrameInit16(jankStatsTest: JankStatsTest) : FrameInitCompat(jankStatsTest) {
+ override fun initFramePipeline() {
+ val latch = CountDownLatch(10)
+ var numFrames = 10
+ val callback: Choreographer.FrameCallback = object : Choreographer.FrameCallback {
+ override fun doFrame(frameTimeNanos: Long) {
+ --numFrames
+ latch.countDown()
+ if (numFrames > 0) {
+ Choreographer.getInstance().postFrameCallback(this)
+ }
+ }
+ }
+ jankStatsTest.delayedActivityRule.getScenario().onActivity {
+ Choreographer.getInstance().postFrameCallback(callback)
+ }
+ latch.await(5, TimeUnit.SECONDS)
+
+ jankStatsTest.latchedListener.reset()
+ }
+ }
+
+ /**
+ * JankStats doesn't do anything pre API 16. But it would be nice to not crash running
+ * code that calls JankStats functionality on that version. This test just calls basic APIs
+ * to make sure they don't crash.
+ */
+ @SdkSuppress(maxSdkVersion = ICE_CREAM_SANDWICH_MR1)
+ @Test
+ fun testPreAPI16() {
+ delayedActivityRule.getScenario().onActivity {
+ val state0 = StateInfo("Testing State 0", "sampleStateA")
+ val state1 = StateInfo("Testing State 1", "sampleStateB")
+ metricsState.addState(state0.stateName, state0.state)
+ metricsState.addSingleFrameState(state1.stateName, state1.state)
+ }
+ runDelayTest(0, NUM_FRAMES, latchedListener)
+ }
+
+ @SdkSuppress(minSdkVersion = JELLY_BEAN)
+ @Test
+ fun testComplexFrameStateData() {
+ frameInit.initFramePipeline()
+
+ // perFrameStateData is a structure for testing which holds information about the
+ // states that should be added or removed on every frame. This functionality is
+ // handled inside DelayedView. //-Comments above each item indicate what the resulting
+ // state should be in that frame, which is checked in the asserts below
+ // TODO: make immutable, copy to mutable list for delayedView
+ var perFrameStateData = mutableListOf(
+ // 0: A:0
+ JankStatsTest.FrameStateInputData(
+ addStates = listOf("stateNameA" to "0"),
+ ),
+ // 1: A:0
+ JankStatsTest.FrameStateInputData(),
+ // 2: A:1
+ JankStatsTest.FrameStateInputData(
+ addStates = listOf("stateNameA" to "1"),
+ ),
+ // 3: A:2
+ JankStatsTest.FrameStateInputData(
+ addStates = listOf("stateNameA" to "2"),
+ ),
+ // 4: A:2
+ JankStatsTest.FrameStateInputData(
+ removeStates = listOf("stateNameA"),
+ ),
+ // 5: [nothing]
+ JankStatsTest.FrameStateInputData(),
+ // 6: A:0, B:10
+ JankStatsTest.FrameStateInputData(
+ addStates = listOf("stateNameA" to "0", "stateNameB" to "10"),
+ ),
+ // 7: A:0, B:10, C:100
+ JankStatsTest.FrameStateInputData(
+ addSFStates = listOf("stateNameC" to "100"),
+ ),
+ // 8: A:0, B:10
+ JankStatsTest.FrameStateInputData(),
+ // 9: A:0, B:10
+ JankStatsTest.FrameStateInputData(
+ removeStates = listOf("stateNameA", "stateNameB"),
+ ),
+ // 10: empty
+ JankStatsTest.FrameStateInputData(),
+ // 11: A:1
+ JankStatsTest.FrameStateInputData(
+ addStates = listOf("stateNameA" to "0", "stateNameA" to "1"),
+ ),
+ )
+ // testData will hold input (above) plus expected results
+ val expectedResults = listOf(
+ mapOf("stateNameA" to "0"),
+ mapOf("stateNameA" to "0"),
+ mapOf("stateNameA" to "1"),
+ mapOf("stateNameA" to "2"),
+ mapOf("stateNameA" to "2"),
+ emptyMap(),
+ mapOf("stateNameA" to "0", "stateNameB" to "10"),
+ mapOf("stateNameA" to "0", "stateNameB" to "10", "stateNameC" to "100"),
+ mapOf("stateNameA" to "0", "stateNameB" to "10"),
+ mapOf("stateNameA" to "0", "stateNameB" to "10"),
+ emptyMap(),
+ mapOf("stateNameA" to "1"),
+ )
+
+ runDelayTest(frameDelay = 0, numFrames = perFrameStateData.size,
+ latchedListener, perFrameStateData)
+
+ assertEquals("There should be ${expectedResults.size} frames of data",
+ expectedResults.size, latchedListener.jankData.size)
+ for (i in 0 until expectedResults.size) {
+ val testResultStates = latchedListener.jankData[i].states
+ val expectedResult = expectedResults[i]
+ assertEquals("There should be ${expectedResult.size} states",
+ expectedResult.size, testResultStates.size)
+ for (state in testResultStates) {
+ assertEquals("State value not correct",
+ state.state, expectedResult.get(state.stateName))
+ }
+ }
+ }
+
private fun runDelayTest(
frameDelay: Int,
numFrames: Int,
- listener: LatchedListener
+ listener: LatchedListener,
+ perFrameStateData: List<FrameStateInputData>? = null
) {
- val latch = CountDownLatch(numFrames)
+ val latch = CountDownLatch(1)
listener.latch = latch
- delayedActivity.repetions = numFrames
- delayedActivity.delayMs = frameDelay.toLong()
- delayedActivityRule.scenario.onActivity {
+ listener.minFrames = numFrames
+ delayedActivityRule.getScenario().onActivity {
+ if (perFrameStateData != null) delayedView.perFrameStateData = perFrameStateData
+ delayedActivity.repetitions = 0
+ delayedActivity.maxReps = numFrames
+ delayedActivity.delayMs = frameDelay.toLong()
delayedActivity.invalidate()
+ listener.numFrames = 0
}
try {
- Thread.sleep((numFrames * frameDelay + IDLE_PAUSE).toLong())
- } catch (e: Exception) {
- }
- try {
- latch.await(20, TimeUnit.SECONDS)
+ latch.await(frameDelay * numFrames + 1000L, TimeUnit.MILLISECONDS)
} catch (e: InterruptedException) {
assert(false)
}
}
- internal inner class LatchedListener : OnFrameListener {
+ inner class LatchedListener : OnFrameListener {
var numJankFrames = 0
var jankData = mutableListOf<FrameData>()
var latch: CountDownLatch? = null
+ var minFrames = 0
+ var numFrames = 0
fun reset() {
jankData.clear()
numJankFrames = 0
+ numFrames = 0
}
override fun onFrame(
@@ -319,12 +498,26 @@
if (latch == null) {
throw Exception("latch not set in LatchedListener")
} else {
- if (frameData.isJank) {
+ if (frameData.isJank && frameData.frameDurationUiNanos >
+ (MIN_JANK_NS * jankStats.jankHeuristicMultiplier)) {
this.numJankFrames++
}
this.jankData.add(frameData)
- latch!!.countDown()
+ numFrames++
+ if (numFrames >= minFrames) {
+ latch!!.countDown()
+ }
}
}
}
+
+ private fun getFrameEndTime(frameData: FrameData): Long {
+ var duration = frameData.frameStartNanos
+ if (frameData is FrameDataApi24) {
+ duration += frameData.frameDurationCpuNanos
+ } else {
+ duration += frameData.frameDurationUiNanos
+ }
+ return duration
+ }
}
\ No newline at end of file
diff --git a/metrics/metrics-performance/src/main/java/androidx/metrics/performance/JankStats.kt b/metrics/metrics-performance/src/main/java/androidx/metrics/performance/JankStats.kt
index 3f2c0be..58939ed 100644
--- a/metrics/metrics-performance/src/main/java/androidx/metrics/performance/JankStats.kt
+++ b/metrics/metrics-performance/src/main/java/androidx/metrics/performance/JankStats.kt
@@ -66,7 +66,7 @@
private val executor: Executor,
private val frameListener: OnFrameListener
) {
- private val metricsStateHolder: PerformanceMetricsState.MetricsStateHolder
+ private val holder: PerformanceMetricsState.Holder
/**
* JankStats uses the platform FrameMetrics API internally when it is available to track frame
@@ -88,7 +88,7 @@
"JankStats can only be created with a Window that has a non-null DecorView"
)
}
- metricsStateHolder = PerformanceMetricsState.create(decorView)
+ holder = PerformanceMetricsState.create(decorView)
implementation =
when {
Build.VERSION.SDK_INT >= 31 -> {
diff --git a/metrics/metrics-performance/src/main/java/androidx/metrics/performance/PerformanceMetricsState.kt b/metrics/metrics-performance/src/main/java/androidx/metrics/performance/PerformanceMetricsState.kt
index f32c026..fedae4b 100644
--- a/metrics/metrics-performance/src/main/java/androidx/metrics/performance/PerformanceMetricsState.kt
+++ b/metrics/metrics-performance/src/main/java/androidx/metrics/performance/PerformanceMetricsState.kt
@@ -54,6 +54,13 @@
*/
private var singleFrameStates = mutableListOf<StateData>()
+ /**
+ * Temporary list to hold states that will be added to for any given frame in addFrameState().
+ * It is used to avoid adding duplicate states by storing all data for states being considered.
+ */
+ private val statesHolder = mutableListOf<StateData>()
+ private val statesToBeCleared = mutableListOf<Int>()
+
private fun addFrameState(
frameStartTime: Long,
frameEndTime: Long,
@@ -70,13 +77,47 @@
activeStates.removeAt(i)
} else if (item.timeAdded < frameEndTime) {
// Only add unique state. There may be several states added in
- // a given frame (especially during heavy jank periods), but it is
- // only necessary/helpful to log one of those items
- if (item.state !in frameStates) {
- frameStates.add(item.state)
+ // a given frame (especially during heavy jank periods). Only the
+ // most recently added should be logged, as it replaces the earlier ones.
+ statesHolder.add(item)
+ if (activeStates == singleFrameStates && item.timeRemoved == -1L) {
+ // This marks a single frame state for removal now that it has logged data
+ // It will actually be removed at the end of the frame, to give it a chance to
+ // log data for multiple listeners.
+ item.timeRemoved = System.nanoTime()
}
}
}
+ // It's possible to have multiple versions with the same stateName active on a given
+ // frame. This should result in only using the latest state added, which is what
+ // this block ensures.
+ if (statesHolder.size > 0) {
+ for (i in 0 until statesHolder.size) {
+ if (i !in statesToBeCleared) {
+ val item = statesHolder.get(i)
+ for (j in (i + 1) until statesHolder.size) {
+ val otherItem = statesHolder.get(j)
+ if (item.state.stateName == otherItem.state.stateName) {
+ // If state names are the same, remove the one added earlier.
+ // Note that we are only marking them for removal here since we
+ // cannot alter the structure while iterating through it.
+ if (item.timeAdded < otherItem.timeAdded) statesToBeCleared.add(i)
+ else statesToBeCleared.add(j)
+ }
+ }
+ }
+ }
+ // This block actually removes the duplicate items
+ for (i in statesToBeCleared.size - 1 downTo 0) {
+ statesHolder.removeAt(statesToBeCleared[i])
+ }
+ // Finally, process all items left in the holder list and add them to frameStates
+ for (i in 0 until statesHolder.size) {
+ frameStates.add(statesHolder[i].state)
+ }
+ statesHolder.clear()
+ statesToBeCleared.clear()
+ }
}
/**
@@ -233,7 +274,11 @@
internal fun cleanupSingleFrameStates() {
synchronized(singleFrameStates) {
// Remove all states intended for just one frame
- singleFrameStates.clear()
+ for (i in singleFrameStates.size - 1 downTo 0) {
+ // SFStates are marked with timeRemoved during processing so we know when
+ // they have logged data and can actually be removed
+ if (singleFrameStates[i].timeRemoved != -1L) singleFrameStates.removeAt(i)
+ }
}
}
@@ -256,14 +301,14 @@
*/
@JvmStatic
@UiThread
- fun getForHierarchy(view: View): MetricsStateHolder {
+ fun getForHierarchy(view: View): Holder {
val rootView = getRootView(view)
var metricsStateHolder = rootView.getTag(R.id.metricsStateHolder)
if (metricsStateHolder == null) {
- metricsStateHolder = MetricsStateHolder()
+ metricsStateHolder = Holder()
rootView.setTag(R.id.metricsStateHolder, metricsStateHolder)
}
- return metricsStateHolder as MetricsStateHolder
+ return metricsStateHolder as Holder
}
/**
@@ -279,7 +324,7 @@
*/
@JvmStatic
@UiThread
- internal fun create(view: View): MetricsStateHolder {
+ internal fun create(view: View): Holder {
val holder = getForHierarchy(view)
if (holder.state == null) {
holder.state = PerformanceMetricsState()
@@ -304,7 +349,7 @@
* the value of the [state] property to see whether state is being tracked by JankStats
* for the hierarchy.
*/
- class MetricsStateHolder internal constructor() {
+ class Holder internal constructor() {
/**
* The current PerformanceMetricsState for the view hierarchy where this
diff --git a/navigation/navigation-compose/samples/build.gradle b/navigation/navigation-compose/samples/build.gradle
index 3b53aff..5fd75a9 100644
--- a/navigation/navigation-compose/samples/build.gradle
+++ b/navigation/navigation-compose/samples/build.gradle
@@ -34,8 +34,8 @@
implementation(projectOrArtifact(":navigation:navigation-compose"))
implementation("androidx.compose.material:material:1.0.1")
implementation("org.jetbrains.kotlinx:kotlinx-serialization-json:1.0.1")
- implementation(projectOrArtifact(":lifecycle:lifecycle-runtime-ktx"))
- implementation(projectOrArtifact(":savedstate:savedstate-ktx"))
+ implementation("androidx.lifecycle:lifecycle-runtime-ktx:2.5.0-rc01")
+ implementation("androidx.savedstate:savedstate-ktx:1.2.0-rc01")
}
androidx {
diff --git a/palette/palette-ktx/build.gradle b/palette/palette-ktx/build.gradle
index 0fbe185..4e09042 100644
--- a/palette/palette-ktx/build.gradle
+++ b/palette/palette-ktx/build.gradle
@@ -23,6 +23,11 @@
}
dependencies {
+ // Atomic group
+ constraints {
+ implementation(project(":palette:palette"))
+ }
+
api(project(":palette:palette"))
api(libs.kotlinStdlib)
androidTestImplementation(libs.junit)
diff --git a/palette/palette/build.gradle b/palette/palette/build.gradle
index 14f3c00..573af81 100644
--- a/palette/palette/build.gradle
+++ b/palette/palette/build.gradle
@@ -6,6 +6,11 @@
}
dependencies {
+ // Atomic group
+ constraints {
+ implementation(project(":palette:palette-ktx"))
+ }
+
api("androidx.core:core:1.1.0")
implementation("androidx.collection:collection:1.1.0")
diff --git a/playground-common/androidx-shared.properties b/playground-common/androidx-shared.properties
index d678753..f0115ba 100644
--- a/playground-common/androidx-shared.properties
+++ b/playground-common/androidx-shared.properties
@@ -78,3 +78,6 @@
# Do _not_ toggle or override unless you have read and understand this:
# https://blog.jetbrains.com/kotlin/2021/10/important-ua-parser-js-exploit-and-kotlin-js/
androidx.kmp.js.enabled=false
+
+# enable commonization for KMP projects
+kotlin.mpp.enableCInteropCommonization=true
\ No newline at end of file
diff --git a/playground-common/playground.properties b/playground-common/playground.properties
index 3de462d..034d284 100644
--- a/playground-common/playground.properties
+++ b/playground-common/playground.properties
@@ -25,8 +25,7 @@
kotlin.code.style=official
# Disable docs
androidx.enableDocumentation=false
-androidx.playground.snapshotBuildId=8517803
+androidx.playground.snapshotBuildId=8572002
androidx.playground.metalavaBuildId=8444773
androidx.playground.dokkaBuildId=7472101
androidx.studio.type=playground
-kotlin.mpp.enableCInteropCommonization=true
diff --git a/preference/preference-ktx/build.gradle b/preference/preference-ktx/build.gradle
index b10c5b1..91ab34a 100644
--- a/preference/preference-ktx/build.gradle
+++ b/preference/preference-ktx/build.gradle
@@ -23,6 +23,11 @@
}
dependencies {
+ // Atomic group
+ constraints {
+ implementation(project(":preference:preference"))
+ }
+
api(project(":preference:preference"))
api("androidx.core:core-ktx:1.1.0") {
because "Mirror preference dependency graph for -ktx artifacts"
diff --git a/preference/preference/build.gradle b/preference/preference/build.gradle
index 73f104c..782614b 100644
--- a/preference/preference/build.gradle
+++ b/preference/preference/build.gradle
@@ -23,6 +23,11 @@
}
dependencies {
+ // Atomic group
+ constraints {
+ implementation(project(":preference:preference-ktx"))
+ }
+
api("androidx.annotation:annotation:1.2.0")
api("androidx.appcompat:appcompat:1.1.0")
// Use the latest version of core library for verifying insets visibility
diff --git a/profileinstaller/profileinstaller/api/1.2.0-beta02.txt b/profileinstaller/profileinstaller/api/1.2.0-beta02.txt
new file mode 100644
index 0000000..4d5e335
--- /dev/null
+++ b/profileinstaller/profileinstaller/api/1.2.0-beta02.txt
@@ -0,0 +1,47 @@
+// Signature format: 4.0
+package androidx.profileinstaller {
+
+ public class ProfileInstallReceiver extends android.content.BroadcastReceiver {
+ ctor public ProfileInstallReceiver();
+ method public void onReceive(android.content.Context, android.content.Intent?);
+ field public static final String ACTION_INSTALL_PROFILE = "androidx.profileinstaller.action.INSTALL_PROFILE";
+ field public static final String ACTION_SKIP_FILE = "androidx.profileinstaller.action.SKIP_FILE";
+ }
+
+ public class ProfileInstaller {
+ method @WorkerThread public static void writeProfile(android.content.Context);
+ method @WorkerThread public static void writeProfile(android.content.Context, java.util.concurrent.Executor, androidx.profileinstaller.ProfileInstaller.DiagnosticsCallback);
+ field public static final int DIAGNOSTIC_CURRENT_PROFILE_DOES_NOT_EXIST = 2; // 0x2
+ field public static final int DIAGNOSTIC_CURRENT_PROFILE_EXISTS = 1; // 0x1
+ field public static final int DIAGNOSTIC_REF_PROFILE_DOES_NOT_EXIST = 4; // 0x4
+ field public static final int DIAGNOSTIC_REF_PROFILE_EXISTS = 3; // 0x3
+ field public static final int RESULT_ALREADY_INSTALLED = 2; // 0x2
+ field public static final int RESULT_BASELINE_PROFILE_NOT_FOUND = 6; // 0x6
+ field public static final int RESULT_DELETE_SKIP_FILE_SUCCESS = 11; // 0xb
+ field public static final int RESULT_DESIRED_FORMAT_UNSUPPORTED = 5; // 0x5
+ field public static final int RESULT_INSTALL_SKIP_FILE_SUCCESS = 10; // 0xa
+ field public static final int RESULT_INSTALL_SUCCESS = 1; // 0x1
+ field public static final int RESULT_IO_EXCEPTION = 7; // 0x7
+ field public static final int RESULT_META_FILE_REQUIRED_BUT_NOT_FOUND = 9; // 0x9
+ field public static final int RESULT_NOT_WRITABLE = 4; // 0x4
+ field public static final int RESULT_PARSE_EXCEPTION = 8; // 0x8
+ field public static final int RESULT_UNSUPPORTED_ART_VERSION = 3; // 0x3
+ }
+
+ public static interface ProfileInstaller.DiagnosticsCallback {
+ method public void onDiagnosticReceived(int, Object?);
+ method public void onResultReceived(int, Object?);
+ }
+
+ public class ProfileInstallerInitializer implements androidx.startup.Initializer<androidx.profileinstaller.ProfileInstallerInitializer.Result> {
+ ctor public ProfileInstallerInitializer();
+ method public androidx.profileinstaller.ProfileInstallerInitializer.Result create(android.content.Context);
+ method public java.util.List<java.lang.Class<? extends androidx.startup.Initializer<?>>!> dependencies();
+ }
+
+ public static class ProfileInstallerInitializer.Result {
+ ctor public ProfileInstallerInitializer.Result();
+ }
+
+}
+
diff --git a/profileinstaller/profileinstaller/api/public_plus_experimental_1.2.0-beta02.txt b/profileinstaller/profileinstaller/api/public_plus_experimental_1.2.0-beta02.txt
new file mode 100644
index 0000000..4d5e335
--- /dev/null
+++ b/profileinstaller/profileinstaller/api/public_plus_experimental_1.2.0-beta02.txt
@@ -0,0 +1,47 @@
+// Signature format: 4.0
+package androidx.profileinstaller {
+
+ public class ProfileInstallReceiver extends android.content.BroadcastReceiver {
+ ctor public ProfileInstallReceiver();
+ method public void onReceive(android.content.Context, android.content.Intent?);
+ field public static final String ACTION_INSTALL_PROFILE = "androidx.profileinstaller.action.INSTALL_PROFILE";
+ field public static final String ACTION_SKIP_FILE = "androidx.profileinstaller.action.SKIP_FILE";
+ }
+
+ public class ProfileInstaller {
+ method @WorkerThread public static void writeProfile(android.content.Context);
+ method @WorkerThread public static void writeProfile(android.content.Context, java.util.concurrent.Executor, androidx.profileinstaller.ProfileInstaller.DiagnosticsCallback);
+ field public static final int DIAGNOSTIC_CURRENT_PROFILE_DOES_NOT_EXIST = 2; // 0x2
+ field public static final int DIAGNOSTIC_CURRENT_PROFILE_EXISTS = 1; // 0x1
+ field public static final int DIAGNOSTIC_REF_PROFILE_DOES_NOT_EXIST = 4; // 0x4
+ field public static final int DIAGNOSTIC_REF_PROFILE_EXISTS = 3; // 0x3
+ field public static final int RESULT_ALREADY_INSTALLED = 2; // 0x2
+ field public static final int RESULT_BASELINE_PROFILE_NOT_FOUND = 6; // 0x6
+ field public static final int RESULT_DELETE_SKIP_FILE_SUCCESS = 11; // 0xb
+ field public static final int RESULT_DESIRED_FORMAT_UNSUPPORTED = 5; // 0x5
+ field public static final int RESULT_INSTALL_SKIP_FILE_SUCCESS = 10; // 0xa
+ field public static final int RESULT_INSTALL_SUCCESS = 1; // 0x1
+ field public static final int RESULT_IO_EXCEPTION = 7; // 0x7
+ field public static final int RESULT_META_FILE_REQUIRED_BUT_NOT_FOUND = 9; // 0x9
+ field public static final int RESULT_NOT_WRITABLE = 4; // 0x4
+ field public static final int RESULT_PARSE_EXCEPTION = 8; // 0x8
+ field public static final int RESULT_UNSUPPORTED_ART_VERSION = 3; // 0x3
+ }
+
+ public static interface ProfileInstaller.DiagnosticsCallback {
+ method public void onDiagnosticReceived(int, Object?);
+ method public void onResultReceived(int, Object?);
+ }
+
+ public class ProfileInstallerInitializer implements androidx.startup.Initializer<androidx.profileinstaller.ProfileInstallerInitializer.Result> {
+ ctor public ProfileInstallerInitializer();
+ method public androidx.profileinstaller.ProfileInstallerInitializer.Result create(android.content.Context);
+ method public java.util.List<java.lang.Class<? extends androidx.startup.Initializer<?>>!> dependencies();
+ }
+
+ public static class ProfileInstallerInitializer.Result {
+ ctor public ProfileInstallerInitializer.Result();
+ }
+
+}
+
diff --git a/profileinstaller/profileinstaller/api/res-1.2.0-beta02.txt b/profileinstaller/profileinstaller/api/res-1.2.0-beta02.txt
new file mode 100644
index 0000000..e69de29
--- /dev/null
+++ b/profileinstaller/profileinstaller/api/res-1.2.0-beta02.txt
diff --git a/profileinstaller/profileinstaller/api/restricted_1.2.0-beta02.txt b/profileinstaller/profileinstaller/api/restricted_1.2.0-beta02.txt
new file mode 100644
index 0000000..4d5e335
--- /dev/null
+++ b/profileinstaller/profileinstaller/api/restricted_1.2.0-beta02.txt
@@ -0,0 +1,47 @@
+// Signature format: 4.0
+package androidx.profileinstaller {
+
+ public class ProfileInstallReceiver extends android.content.BroadcastReceiver {
+ ctor public ProfileInstallReceiver();
+ method public void onReceive(android.content.Context, android.content.Intent?);
+ field public static final String ACTION_INSTALL_PROFILE = "androidx.profileinstaller.action.INSTALL_PROFILE";
+ field public static final String ACTION_SKIP_FILE = "androidx.profileinstaller.action.SKIP_FILE";
+ }
+
+ public class ProfileInstaller {
+ method @WorkerThread public static void writeProfile(android.content.Context);
+ method @WorkerThread public static void writeProfile(android.content.Context, java.util.concurrent.Executor, androidx.profileinstaller.ProfileInstaller.DiagnosticsCallback);
+ field public static final int DIAGNOSTIC_CURRENT_PROFILE_DOES_NOT_EXIST = 2; // 0x2
+ field public static final int DIAGNOSTIC_CURRENT_PROFILE_EXISTS = 1; // 0x1
+ field public static final int DIAGNOSTIC_REF_PROFILE_DOES_NOT_EXIST = 4; // 0x4
+ field public static final int DIAGNOSTIC_REF_PROFILE_EXISTS = 3; // 0x3
+ field public static final int RESULT_ALREADY_INSTALLED = 2; // 0x2
+ field public static final int RESULT_BASELINE_PROFILE_NOT_FOUND = 6; // 0x6
+ field public static final int RESULT_DELETE_SKIP_FILE_SUCCESS = 11; // 0xb
+ field public static final int RESULT_DESIRED_FORMAT_UNSUPPORTED = 5; // 0x5
+ field public static final int RESULT_INSTALL_SKIP_FILE_SUCCESS = 10; // 0xa
+ field public static final int RESULT_INSTALL_SUCCESS = 1; // 0x1
+ field public static final int RESULT_IO_EXCEPTION = 7; // 0x7
+ field public static final int RESULT_META_FILE_REQUIRED_BUT_NOT_FOUND = 9; // 0x9
+ field public static final int RESULT_NOT_WRITABLE = 4; // 0x4
+ field public static final int RESULT_PARSE_EXCEPTION = 8; // 0x8
+ field public static final int RESULT_UNSUPPORTED_ART_VERSION = 3; // 0x3
+ }
+
+ public static interface ProfileInstaller.DiagnosticsCallback {
+ method public void onDiagnosticReceived(int, Object?);
+ method public void onResultReceived(int, Object?);
+ }
+
+ public class ProfileInstallerInitializer implements androidx.startup.Initializer<androidx.profileinstaller.ProfileInstallerInitializer.Result> {
+ ctor public ProfileInstallerInitializer();
+ method public androidx.profileinstaller.ProfileInstallerInitializer.Result create(android.content.Context);
+ method public java.util.List<java.lang.Class<? extends androidx.startup.Initializer<?>>!> dependencies();
+ }
+
+ public static class ProfileInstallerInitializer.Result {
+ ctor public ProfileInstallerInitializer.Result();
+ }
+
+}
+
diff --git a/profileinstaller/profileinstaller/src/main/java/androidx/profileinstaller/ProfileInstaller.java b/profileinstaller/profileinstaller/src/main/java/androidx/profileinstaller/ProfileInstaller.java
index ad3f5e2..4c7c392 100644
--- a/profileinstaller/profileinstaller/src/main/java/androidx/profileinstaller/ProfileInstaller.java
+++ b/profileinstaller/profileinstaller/src/main/java/androidx/profileinstaller/ProfileInstaller.java
@@ -292,6 +292,9 @@
/**
* Indicates that the device requires a metadata file in order to install the profile
* successfully, but there was not one included in the APK.
+ *
+ * The correct metadata files are produced when using Android Gradle Plugin `7.1.0-alpha05` or
+ * newer.
*/
@ResultCode public static final int RESULT_META_FILE_REQUIRED_BUT_NOT_FOUND = 9;
diff --git a/room/integration-tests/kotlintestapp/build.gradle b/room/integration-tests/kotlintestapp/build.gradle
index 00e68bc..eedd3de 100644
--- a/room/integration-tests/kotlintestapp/build.gradle
+++ b/room/integration-tests/kotlintestapp/build.gradle
@@ -100,13 +100,16 @@
androidTestImplementation(libs.kotlinTest)
androidTestImplementation(project(":room:room-guava"))
androidTestImplementation(project(":room:room-testing"))
+ androidTestImplementation(project(":room:room-paging-guava"))
+ // we need latest guava android because room-paging-guava's guava-android gets override by
+ // its kotlinx-coroutines-guava dependency's guava-jre version
+ androidTestImplementation(libs.guavaAndroid)
androidTestImplementation(project(":room:room-rxjava2"))
androidTestImplementation(project(":room:room-rxjava3"))
androidTestImplementation(project(":room:room-ktx"))
androidTestImplementation(project(":internal-testutils-common"))
androidTestImplementation("androidx.arch.core:core-testing:2.0.1")
androidTestImplementation("androidx.paging:paging-runtime:3.1.1")
- androidTestImplementation(libs.guavaAndroid)
androidTestImplementation(libs.rxjava2)
testImplementation(libs.mockitoCore)
}
diff --git a/room/integration-tests/kotlintestapp/src/androidTest/java/androidx/room/integration/kotlintestapp/test/ListenableFuturePagingSourceTest.kt b/room/integration-tests/kotlintestapp/src/androidTest/java/androidx/room/integration/kotlintestapp/test/ListenableFuturePagingSourceTest.kt
new file mode 100644
index 0000000..7eec936
--- /dev/null
+++ b/room/integration-tests/kotlintestapp/src/androidTest/java/androidx/room/integration/kotlintestapp/test/ListenableFuturePagingSourceTest.kt
@@ -0,0 +1,281 @@
+/*
+ * Copyright 2022 The Android Open Source Project
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+/*
+ * Copyright 2021 The Android Open Source Project
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package androidx.room.integration.kotlintestapp.test
+
+import androidx.paging.ListenableFuturePagingSource
+import androidx.paging.Pager
+import androidx.paging.PagingState
+import androidx.room.Room
+import androidx.room.androidx.room.integration.kotlintestapp.testutil.ItemStore
+import androidx.room.androidx.room.integration.kotlintestapp.testutil.PagingDb
+import androidx.room.androidx.room.integration.kotlintestapp.testutil.PagingEntity
+import androidx.test.core.app.ApplicationProvider
+import androidx.test.ext.junit.runners.AndroidJUnit4
+import androidx.test.filters.SmallTest
+import androidx.testutils.FilteringExecutor
+import com.google.common.truth.Truth.assertThat
+import com.google.common.util.concurrent.ListenableFuture
+import java.util.concurrent.Executors
+import kotlin.test.assertFailsWith
+import kotlinx.coroutines.CoroutineScope
+import kotlinx.coroutines.Dispatchers
+import kotlinx.coroutines.cancel
+import kotlinx.coroutines.cancelAndJoin
+import kotlinx.coroutines.flow.collectLatest
+import kotlinx.coroutines.launch
+import kotlinx.coroutines.runBlocking
+import kotlinx.coroutines.withContext
+import org.junit.After
+import org.junit.Before
+import org.junit.Test
+import org.junit.runner.RunWith
+
+@RunWith(AndroidJUnit4::class)
+@SmallTest
+class ListenableFuturePagingSourceTest {
+
+ private lateinit var coroutineScope: CoroutineScope
+ private lateinit var db: PagingDb
+ private lateinit var itemStore: ItemStore
+
+ // Multiple threads are necessary to prevent deadlock, since Room will acquire a thread to
+ // dispatch on, when using the query / transaction dispatchers.
+ private val queryExecutor = FilteringExecutor(Executors.newFixedThreadPool(2))
+ private val mainThreadQueries = mutableListOf<Pair<String, String>>()
+ private val pagingSources = mutableListOf<ListenableFuturePagingSourceImpl>()
+
+ @Before
+ fun init() {
+ coroutineScope = CoroutineScope(Dispatchers.Main)
+ itemStore = ItemStore(coroutineScope)
+
+ val mainThread: Thread = runBlocking(Dispatchers.Main) {
+ Thread.currentThread()
+ }
+ db = Room.inMemoryDatabaseBuilder(
+ ApplicationProvider.getApplicationContext(),
+ PagingDb::class.java
+ ).setQueryCallback(
+ { sqlQuery, _ ->
+ if (Thread.currentThread() === mainThread) {
+ mainThreadQueries.add(
+ sqlQuery to Throwable().stackTraceToString()
+ )
+ }
+ },
+ {
+ // instantly execute the log callback so that we can check the thread.
+ it.run()
+ }
+ ).setQueryExecutor(queryExecutor)
+ .build()
+ }
+
+ @After
+ fun tearDown() {
+ // Check no mainThread queries happened.
+ assertThat(mainThreadQueries).isEmpty()
+ coroutineScope.cancel()
+ }
+
+ @Test
+ fun refresh_canceledCoroutine_cancelsFuture() {
+ val items = createItems(startId = 0, count = 90)
+ db.dao.insert(items)
+
+ // filter right away to block initial load
+ queryExecutor.filterFunction = { runnable ->
+ // filtering out the transform async function called inside loadFuture
+ // filtering as String b/c `AbstractTransformFuture` is a package-private class
+ !runnable.javaClass.enclosingClass.toString()
+ .contains("AbstractTransformFuture")
+ }
+
+ runTest {
+ val expectError = assertFailsWith<AssertionError> {
+ itemStore.awaitInitialLoad(timeOutDuration = 2)
+ }
+ assertThat(expectError.message).isEqualTo("didn't complete in expected time")
+
+ val futures = pagingSources[0].futures
+ assertThat(futures.size).isEqualTo(1)
+ assertThat(futures[0].isDone).isFalse() // initial load future is pending
+
+ // now cancel collection which should also cancel the future
+ coroutineScope.cancel()
+
+ // just making sure no new futures are created, and ensuring that the pending future
+ // is now cancelled
+ assertThat(futures.size).isEqualTo(1)
+ assertThat(futures[0].isCancelled).isTrue()
+ assertThat(futures[0].isDone).isTrue()
+ }
+ }
+
+ @Test
+ fun append_canceledCoroutine_cancelsFuture() {
+ val items = createItems(startId = 0, count = 90)
+ db.dao.insert(items)
+
+ runTest {
+ itemStore.awaitInitialLoad()
+
+ val futures = pagingSources[0].futures
+ assertThat(futures.size).isEqualTo(1)
+ assertThat(futures[0].isDone).isTrue() // initial load future is complete
+
+ queryExecutor.filterFunction = { runnable ->
+ // filtering out the transform async function called inside loadFuture
+ // filtering as String b/c `AbstractTransformFuture` is a package-private class
+ !runnable.javaClass.enclosingClass.toString()
+ .contains("AbstractTransformFuture")
+ }
+
+ // now access more items that should trigger loading more
+ withContext(Dispatchers.Main) {
+ itemStore.get(10)
+ }
+
+ // await should fail because we have blocked the paging source' async function,
+ // which calls nonInitialLoad in this case, from executing
+ val expectError = assertFailsWith<AssertionError> {
+ assertThat(itemStore.awaitItem(index = 10, timeOutDuration = 2))
+ .isEqualTo(items[10])
+ }
+ assertThat(expectError.message).isEqualTo("didn't complete in expected time")
+ queryExecutor.awaitDeferredSizeAtLeast(1)
+
+ // even though the load runnable was blocked, a new future should have been returned
+ assertThat(futures.size).isEqualTo(2)
+ // ensure future is pending
+ assertThat(futures[1].isDone).isFalse()
+
+ // now cancel collection which should also cancel the future
+ coroutineScope.cancel()
+
+ // just making sure no new futures are created, and ensuring that the pending future
+ // is now cancelled
+ assertThat(futures.size).isEqualTo(2)
+ assertThat(futures[1].isCancelled).isTrue()
+ assertThat(futures[1].isDone).isTrue()
+ }
+ }
+
+ @Test
+ fun prepend_canceledCoroutine_cancelsFuture() {
+ val items = createItems(startId = 0, count = 90)
+ db.dao.insert(items)
+
+ runTest {
+ itemStore.awaitInitialLoad()
+
+ val futures = pagingSources[0].futures
+ assertThat(futures.size).isEqualTo(1)
+ assertThat(futures[0].isDone).isTrue() // initial load future is complete
+
+ queryExecutor.filterFunction = { runnable ->
+ // filtering out the transform async function called inside loadFuture
+ // filtering as String b/c `AbstractTransformFuture` is a package-private class
+ !runnable.javaClass.enclosingClass.toString()
+ .contains("AbstractTransformFuture")
+ }
+
+ // now access more items that should trigger loading more
+ withContext(Dispatchers.Main) {
+ itemStore.get(40)
+ }
+
+ // await should fail because we have blocked the paging source' async function,
+ // which calls nonInitialLoad in this case, from executing
+ val expectError = assertFailsWith<AssertionError> {
+ assertThat(itemStore.awaitItem(index = 40, timeOutDuration = 2))
+ .isEqualTo(items[40])
+ }
+ assertThat(expectError.message).isEqualTo("didn't complete in expected time")
+ queryExecutor.awaitDeferredSizeAtLeast(1)
+
+ // even though the load runnable was blocked, a new future should have been returned
+ assertThat(futures.size).isEqualTo(2)
+ // ensure future is pending
+ assertThat(futures[1].isDone).isFalse()
+
+ // now cancel collection which should also cancel the future
+ coroutineScope.cancel()
+
+ // just making sure no new futures are created, and ensuring that the pending future
+ // is now cancelled
+ assertThat(futures.size).isEqualTo(2)
+ assertThat(futures[1].isCancelled).isTrue()
+ assertThat(futures[1].isDone).isTrue()
+ }
+ }
+
+ private fun runTest(
+ pager: Pager<Int, PagingEntity> =
+ Pager(config = CONFIG) {
+ val baseSource = db.dao.loadItemsListenableFuture()
+ // to get access to the futures returned from loadFuture. Also to
+ // mimic real use case of wrapping the source returned from Room.
+ ListenableFuturePagingSourceImpl(baseSource).also { pagingSources.add(it) }
+ },
+ block: suspend () -> Unit
+ ) {
+ val collection = coroutineScope.launch(Dispatchers.Main) {
+ pager.flow.collectLatest {
+ itemStore.collectFrom(it)
+ }
+ }
+ runBlocking {
+ try {
+ block()
+ } finally {
+ collection.cancelAndJoin()
+ }
+ }
+ }
+}
+
+private class ListenableFuturePagingSourceImpl(
+ private val baseSource: ListenableFuturePagingSource<Int, PagingEntity>
+) : ListenableFuturePagingSource<Int, PagingEntity>() {
+
+ val futures = mutableListOf<ListenableFuture<LoadResult<Int, PagingEntity>>>()
+
+ override fun getRefreshKey(state: PagingState<Int, PagingEntity>): Int? {
+ return baseSource.getRefreshKey(state)
+ }
+
+ override fun loadFuture(params: LoadParams<Int>):
+ ListenableFuture<LoadResult<Int, PagingEntity>> {
+ return baseSource.loadFuture(params).also { futures.add(it) }
+ }
+}
diff --git a/room/integration-tests/kotlintestapp/src/androidTest/java/androidx/room/integration/kotlintestapp/test/MultiTypedPagingSourceTest.kt b/room/integration-tests/kotlintestapp/src/androidTest/java/androidx/room/integration/kotlintestapp/test/MultiTypedPagingSourceTest.kt
index f80e077..df7a5ec 100644
--- a/room/integration-tests/kotlintestapp/src/androidTest/java/androidx/room/integration/kotlintestapp/test/MultiTypedPagingSourceTest.kt
+++ b/room/integration-tests/kotlintestapp/src/androidTest/java/androidx/room/integration/kotlintestapp/test/MultiTypedPagingSourceTest.kt
@@ -527,7 +527,10 @@
*/
@Parameterized.Parameters(name = "pagingSourceFactory={0}")
@JvmStatic
- fun parameters() = listOf(PagingEntityDao::loadItems)
+ fun parameters() = listOf(
+ PagingEntityDao::loadItems,
+ PagingEntityDao::loadItemsListenableFuture
+ )
}
}
@@ -730,7 +733,10 @@
*/
@Parameterized.Parameters(name = "pagingSourceFactory={0}")
@JvmStatic
- fun parameters() = listOf(PagingEntityDao::loadItemsRaw)
+ fun parameters() = listOf(
+ PagingEntityDao::loadItemsRaw,
+ PagingEntityDao::loadItemsRawListenableFuture
+ )
}
}
diff --git a/room/integration-tests/kotlintestapp/src/androidTest/java/androidx/room/integration/kotlintestapp/testutil/ItemStore.kt b/room/integration-tests/kotlintestapp/src/androidTest/java/androidx/room/integration/kotlintestapp/testutil/ItemStore.kt
index 0cacc49..c232edb 100644
--- a/room/integration-tests/kotlintestapp/src/androidTest/java/androidx/room/integration/kotlintestapp/testutil/ItemStore.kt
+++ b/room/integration-tests/kotlintestapp/src/androidTest/java/androidx/room/integration/kotlintestapp/testutil/ItemStore.kt
@@ -102,10 +102,10 @@
}
@OptIn(ExperimentalCoroutinesApi::class)
- suspend fun awaitItem(index: Int): PagingEntity = withTestTimeout {
- generation.mapLatest {
- asyncDiffer.peek(index)
- }.filterNotNull().first()
+ suspend fun awaitItem(index: Int, timeOutDuration: Long = 3): PagingEntity =
+ withTestTimeout(timeOutDuration) {
+ generation.mapLatest { asyncDiffer.peek(index) }
+ .filterNotNull().first()
}
suspend fun collectFrom(data: PagingData<PagingEntity>) {
@@ -128,8 +128,8 @@
}
}
- suspend fun awaitInitialLoad(): ItemSnapshotList<PagingEntity> =
- withTestTimeout {
+ suspend fun awaitInitialLoad(timeOutDuration: Long = 3): ItemSnapshotList<PagingEntity> =
+ withTestTimeout(timeOutDuration) {
withContext(Dispatchers.Main) {
generation.filter { it.initialLoadCompleted }.first()
asyncDiffer.snapshot()
diff --git a/room/integration-tests/kotlintestapp/src/androidTest/java/androidx/room/integration/kotlintestapp/testutil/PagingEntityDao.kt b/room/integration-tests/kotlintestapp/src/androidTest/java/androidx/room/integration/kotlintestapp/testutil/PagingEntityDao.kt
index 658d150..46d3fd1 100644
--- a/room/integration-tests/kotlintestapp/src/androidTest/java/androidx/room/integration/kotlintestapp/testutil/PagingEntityDao.kt
+++ b/room/integration-tests/kotlintestapp/src/androidTest/java/androidx/room/integration/kotlintestapp/testutil/PagingEntityDao.kt
@@ -16,6 +16,7 @@
package androidx.room.androidx.room.integration.kotlintestapp.testutil
+import androidx.paging.ListenableFuturePagingSource
import androidx.paging.PagingSource
import androidx.room.Dao
import androidx.room.Insert
@@ -39,4 +40,11 @@
@RawQuery(observedEntities = [PagingEntity::class])
fun loadItemsRaw(query: SupportSQLiteQuery): PagingSource<Int, PagingEntity>
+
+ @Query("SELECT * FROM PagingEntity ORDER BY id ASC")
+ fun loadItemsListenableFuture(): ListenableFuturePagingSource<Int, PagingEntity>
+
+ @RawQuery(observedEntities = [PagingEntity::class])
+ fun loadItemsRawListenableFuture(query: SupportSQLiteQuery):
+ ListenableFuturePagingSource<Int, PagingEntity>
}
diff --git a/room/room-compiler/src/main/kotlin/androidx/room/ext/javapoet_ext.kt b/room/room-compiler/src/main/kotlin/androidx/room/ext/javapoet_ext.kt
index 1d21c1a..33c58fa 100644
--- a/room/room-compiler/src/main/kotlin/androidx/room/ext/javapoet_ext.kt
+++ b/room/room-compiler/src/main/kotlin/androidx/room/ext/javapoet_ext.kt
@@ -110,6 +110,8 @@
ClassName.get(PAGING_PACKAGE, "DataSource", "Factory")
val PAGING_SOURCE: ClassName =
ClassName.get(PAGING_PACKAGE, "PagingSource")
+ val LISTENABLE_FUTURE_PAGING_SOURCE: ClassName =
+ ClassName.get(PAGING_PACKAGE, "ListenableFuturePagingSource")
}
object LifecyclesTypeNames {
@@ -198,6 +200,14 @@
ClassName.get("$ROOM_PACKAGE.paging", "LimitOffsetPagingSource")
}
+object RoomPagingGuavaTypeNames {
+ val LIMIT_OFFSET_LISTENABLE_FUTURE_PAGING_SOURCE: ClassName =
+ ClassName.get(
+ "$ROOM_PACKAGE.paging.guava",
+ "LimitOffsetListenableFuturePagingSource"
+ )
+}
+
object RoomCoroutinesTypeNames {
val COROUTINES_ROOM = ClassName.get(ROOM_PACKAGE, "CoroutinesRoom")
}
diff --git a/room/room-compiler/src/main/kotlin/androidx/room/processor/ProcessorErrors.kt b/room/room-compiler/src/main/kotlin/androidx/room/processor/ProcessorErrors.kt
index c48afce..b8344d5 100644
--- a/room/room-compiler/src/main/kotlin/androidx/room/processor/ProcessorErrors.kt
+++ b/room/room-compiler/src/main/kotlin/androidx/room/processor/ProcessorErrors.kt
@@ -619,6 +619,10 @@
val MISSING_ROOM_PAGING_ARTIFACT = "To use PagingSource, you must add `room-paging`" +
" artifact from Room as a dependency. androidx.room:room-paging:<version>"
+ val MISSING_ROOM_PAGING_GUAVA_ARTIFACT = "To use ListenableFuturePagingSource, you must " +
+ "add `room-paging-guava` artifact from Room as a dependency. " +
+ "androidx.room:room-paging-guava:<version>"
+
val MISSING_ROOM_COROUTINE_ARTIFACT = "To use Coroutine features, you must add `ktx`" +
" artifact from Room as a dependency. androidx.room:room-ktx:<version>"
diff --git a/room/room-compiler/src/main/kotlin/androidx/room/solver/TypeAdapterStore.kt b/room/room-compiler/src/main/kotlin/androidx/room/solver/TypeAdapterStore.kt
index bd8e0f7..8f16715 100644
--- a/room/room-compiler/src/main/kotlin/androidx/room/solver/TypeAdapterStore.kt
+++ b/room/room-compiler/src/main/kotlin/androidx/room/solver/TypeAdapterStore.kt
@@ -44,6 +44,7 @@
import androidx.room.solver.binderprovider.DataSourceQueryResultBinderProvider
import androidx.room.solver.binderprovider.GuavaListenableFutureQueryResultBinderProvider
import androidx.room.solver.binderprovider.InstantQueryResultBinderProvider
+import androidx.room.solver.binderprovider.ListenableFuturePagingSourceQueryResultBinderProvider
import androidx.room.solver.binderprovider.LiveDataQueryResultBinderProvider
import androidx.room.solver.binderprovider.PagingSourceQueryResultBinderProvider
import androidx.room.solver.binderprovider.RxCallableQueryResultBinderProvider
@@ -200,6 +201,7 @@
addAll(RxCallableQueryResultBinderProvider.getAll(context))
add(DataSourceQueryResultBinderProvider(context))
add(DataSourceFactoryQueryResultBinderProvider(context))
+ add(ListenableFuturePagingSourceQueryResultBinderProvider(context))
add(PagingSourceQueryResultBinderProvider(context))
add(CoroutineFlowResultBinderProvider(context))
add(InstantQueryResultBinderProvider(context))
diff --git a/room/room-compiler/src/main/kotlin/androidx/room/solver/binderprovider/ListenableFuturePagingSourceQueryResultBinderProvider.kt b/room/room-compiler/src/main/kotlin/androidx/room/solver/binderprovider/ListenableFuturePagingSourceQueryResultBinderProvider.kt
new file mode 100644
index 0000000..8b78461
--- /dev/null
+++ b/room/room-compiler/src/main/kotlin/androidx/room/solver/binderprovider/ListenableFuturePagingSourceQueryResultBinderProvider.kt
@@ -0,0 +1,40 @@
+/*
+ * Copyright 2022 The Android Open Source Project
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package androidx.room.solver.binderprovider
+
+import androidx.room.ext.PagingTypeNames
+import androidx.room.ext.RoomPagingGuavaTypeNames
+import androidx.room.processor.Context
+import androidx.room.processor.ProcessorErrors.MISSING_ROOM_PAGING_GUAVA_ARTIFACT
+import androidx.room.solver.QueryResultBinderProvider
+
+fun ListenableFuturePagingSourceQueryResultBinderProvider(
+ context: Context
+): QueryResultBinderProvider {
+ val limitOffsetListenableFuturePagingSource =
+ RoomPagingGuavaTypeNames.LIMIT_OFFSET_LISTENABLE_FUTURE_PAGING_SOURCE
+
+ return MultiTypedPagingSourceQueryResultBinderProvider(
+ context = context,
+ roomPagingClassName = limitOffsetListenableFuturePagingSource,
+ pagingSourceTypeName = PagingTypeNames.LISTENABLE_FUTURE_PAGING_SOURCE
+ ).requireArtifact(
+ context = context,
+ requiredType = limitOffsetListenableFuturePagingSource,
+ missingArtifactErrorMsg = MISSING_ROOM_PAGING_GUAVA_ARTIFACT
+ )
+}
diff --git a/room/room-compiler/src/main/kotlin/androidx/room/solver/binderprovider/MultiTypedPagingSourceQueryResultBinderProvider.kt b/room/room-compiler/src/main/kotlin/androidx/room/solver/binderprovider/MultiTypedPagingSourceQueryResultBinderProvider.kt
new file mode 100644
index 0000000..eb300a8
--- /dev/null
+++ b/room/room-compiler/src/main/kotlin/androidx/room/solver/binderprovider/MultiTypedPagingSourceQueryResultBinderProvider.kt
@@ -0,0 +1,91 @@
+/*
+ * Copyright 2022 The Android Open Source Project
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package androidx.room.solver.binderprovider
+
+import androidx.room.compiler.processing.XRawType
+import androidx.room.compiler.processing.XType
+import androidx.room.parser.ParsedQuery
+import androidx.room.processor.Context
+import androidx.room.processor.ProcessorErrors
+import androidx.room.solver.QueryResultBinderProvider
+import androidx.room.solver.TypeAdapterExtras
+import androidx.room.solver.query.result.ListQueryResultAdapter
+import androidx.room.solver.query.result.MultiTypedPagingSourceQueryResultBinder
+import androidx.room.solver.query.result.QueryResultBinder
+import com.squareup.javapoet.ClassName
+import com.squareup.javapoet.TypeName
+
+class MultiTypedPagingSourceQueryResultBinderProvider(
+ private val context: Context,
+ private val roomPagingClassName: ClassName,
+ pagingSourceTypeName: TypeName,
+) : QueryResultBinderProvider {
+
+ private val pagingSourceType: XRawType? by lazy {
+ context.processingEnv.findType(pagingSourceTypeName)?.rawType
+ }
+
+ override fun provide(
+ declared: XType,
+ query: ParsedQuery,
+ extras: TypeAdapterExtras
+ ): QueryResultBinder {
+ if (query.tables.isEmpty()) {
+ context.logger.e(ProcessorErrors.OBSERVABLE_QUERY_NOTHING_TO_OBSERVE)
+ }
+ val typeArg = declared.typeArguments.last()
+ val listAdapter = context.typeAdapterStore.findRowAdapter(typeArg, query)?.let {
+ ListQueryResultAdapter(typeArg, it)
+ }
+ val tableNames = (
+ (listAdapter?.accessedTableNames() ?: emptyList()) +
+ query.tables.map { it.name }
+ ).toSet()
+
+ return MultiTypedPagingSourceQueryResultBinder(
+ listAdapter = listAdapter,
+ tableNames = tableNames,
+ className = roomPagingClassName
+ )
+ }
+
+ override fun matches(declared: XType): Boolean {
+ val collectionTypeRaw = context.COMMON_TYPES.READONLY_COLLECTION.rawType
+
+ if (pagingSourceType == null) {
+ return false
+ }
+
+ if (declared.typeArguments.isEmpty()) {
+ return false
+ }
+
+ if (!pagingSourceType!!.isAssignableFrom(declared)) {
+ return false
+ }
+
+ if (declared.typeArguments.first().typeName != TypeName.INT.box()) {
+ context.logger.e(ProcessorErrors.PAGING_SPECIFY_PAGING_SOURCE_TYPE)
+ }
+
+ if (collectionTypeRaw.isAssignableFrom(declared.typeArguments.last().rawType)) {
+ context.logger.e(ProcessorErrors.PAGING_SPECIFY_PAGING_SOURCE_VALUE_TYPE)
+ }
+
+ return true
+ }
+}
\ No newline at end of file
diff --git a/room/room-compiler/src/main/kotlin/androidx/room/solver/binderprovider/PagingSourceQueryResultBinderProvider.kt b/room/room-compiler/src/main/kotlin/androidx/room/solver/binderprovider/PagingSourceQueryResultBinderProvider.kt
index 32add64..dfb9ee6 100644
--- a/room/room-compiler/src/main/kotlin/androidx/room/solver/binderprovider/PagingSourceQueryResultBinderProvider.kt
+++ b/room/room-compiler/src/main/kotlin/androidx/room/solver/binderprovider/PagingSourceQueryResultBinderProvider.kt
@@ -16,83 +16,23 @@
package androidx.room.solver.binderprovider
-import androidx.room.compiler.processing.XRawType
-import androidx.room.compiler.processing.XType
import androidx.room.ext.PagingTypeNames
import androidx.room.ext.RoomPagingTypeNames
-import androidx.room.parser.ParsedQuery
import androidx.room.processor.Context
import androidx.room.processor.ProcessorErrors
import androidx.room.solver.QueryResultBinderProvider
-import androidx.room.solver.TypeAdapterExtras
-import androidx.room.solver.query.result.MultiTypedPagingSourceQueryResultBinder
-import androidx.room.solver.query.result.ListQueryResultAdapter
-import androidx.room.solver.query.result.QueryResultBinder
-import com.squareup.javapoet.TypeName
@Suppress("FunctionName")
-fun PagingSourceQueryResultBinderProvider(context: Context): QueryResultBinderProvider =
- PagingSourceQueryResultBinderProviderImpl(
- context = context
+fun PagingSourceQueryResultBinderProvider(context: Context): QueryResultBinderProvider {
+ val limitOffsetPagingSource = RoomPagingTypeNames.LIMIT_OFFSET_PAGING_SOURCE
+
+ return MultiTypedPagingSourceQueryResultBinderProvider(
+ context = context,
+ roomPagingClassName = limitOffsetPagingSource,
+ pagingSourceTypeName = PagingTypeNames.PAGING_SOURCE
).requireArtifact(
context = context,
- requiredType = RoomPagingTypeNames.LIMIT_OFFSET_PAGING_SOURCE,
+ requiredType = limitOffsetPagingSource,
missingArtifactErrorMsg = ProcessorErrors.MISSING_ROOM_PAGING_ARTIFACT
)
-
-private class PagingSourceQueryResultBinderProviderImpl(
- val context: Context
-) : QueryResultBinderProvider {
- private val pagingSourceType: XRawType? by lazy {
- context.processingEnv.findType(PagingTypeNames.PAGING_SOURCE)?.rawType
- }
-
- override fun provide(
- declared: XType,
- query: ParsedQuery,
- extras: TypeAdapterExtras
- ): QueryResultBinder {
- if (query.tables.isEmpty()) {
- context.logger.e(ProcessorErrors.OBSERVABLE_QUERY_NOTHING_TO_OBSERVE)
- }
- val typeArg = declared.typeArguments.last()
- val listAdapter = context.typeAdapterStore.findRowAdapter(typeArg, query)?.let {
- ListQueryResultAdapter(typeArg, it)
- }
- val tableNames = (
- (listAdapter?.accessedTableNames() ?: emptyList()) +
- query.tables.map { it.name }
- ).toSet()
- return MultiTypedPagingSourceQueryResultBinder(
- listAdapter = listAdapter,
- tableNames = tableNames,
- className = RoomPagingTypeNames.LIMIT_OFFSET_PAGING_SOURCE
- )
- }
-
- override fun matches(declared: XType): Boolean {
- val collectionTypeRaw = context.COMMON_TYPES.READONLY_COLLECTION.rawType
-
- if (pagingSourceType == null) {
- return false
- }
-
- if (declared.typeArguments.isEmpty()) {
- return false
- }
-
- if (!pagingSourceType!!.isAssignableFrom(declared)) {
- return false
- }
-
- if (declared.typeArguments.first().typeName != TypeName.INT.box()) {
- context.logger.e(ProcessorErrors.PAGING_SPECIFY_PAGING_SOURCE_TYPE)
- }
-
- if (collectionTypeRaw.isAssignableFrom(declared.typeArguments.last().rawType)) {
- context.logger.e(ProcessorErrors.PAGING_SPECIFY_PAGING_SOURCE_VALUE_TYPE)
- }
-
- return true
- }
}
diff --git a/core/uwb/uwb/src/main/java/androidx/core/uwb/exceptions/UwbBackgroundPolicyException.kt b/room/room-compiler/src/test/data/common/input/LimitOffsetListenableFuturePagingSource.java
similarity index 66%
copy from core/uwb/uwb/src/main/java/androidx/core/uwb/exceptions/UwbBackgroundPolicyException.kt
copy to room/room-compiler/src/test/data/common/input/LimitOffsetListenableFuturePagingSource.java
index 1d8d7e2..bf4934e 100644
--- a/core/uwb/uwb/src/main/java/androidx/core/uwb/exceptions/UwbBackgroundPolicyException.kt
+++ b/room/room-compiler/src/test/data/common/input/LimitOffsetListenableFuturePagingSource.java
@@ -1,5 +1,5 @@
/*
- * Copyright 2022 The Android Open Source Project
+ * Copyright 2021 The Android Open Source Project
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
@@ -14,10 +14,9 @@
* limitations under the License.
*/
-package androidx.core.uwb.exceptions
+package androidx.room.paging.guava;
-/**
- * Calls to the UWB service fail for background systems. Only foreground
- * systems can call the UWB service.
- */
-class UwbBackgroundPolicyException(message: String) : UwbApiException(message)
\ No newline at end of file
+public abstract class LimitOffsetListenableFuturePagingSource<T>
+ extends androidx.paging.ListenableFuturePagingSource<Integer, T> {
+
+}
diff --git a/core/uwb/uwb/src/main/java/androidx/core/uwb/exceptions/UwbBackgroundPolicyException.kt b/room/room-compiler/src/test/data/common/input/ListenableFuturePagingSource.java
similarity index 66%
copy from core/uwb/uwb/src/main/java/androidx/core/uwb/exceptions/UwbBackgroundPolicyException.kt
copy to room/room-compiler/src/test/data/common/input/ListenableFuturePagingSource.java
index 1d8d7e2..7343d49 100644
--- a/core/uwb/uwb/src/main/java/androidx/core/uwb/exceptions/UwbBackgroundPolicyException.kt
+++ b/room/room-compiler/src/test/data/common/input/ListenableFuturePagingSource.java
@@ -1,5 +1,5 @@
/*
- * Copyright 2022 The Android Open Source Project
+ * Copyright 2021 The Android Open Source Project
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
@@ -14,10 +14,9 @@
* limitations under the License.
*/
-package androidx.core.uwb.exceptions
+package androidx.paging;
-/**
- * Calls to the UWB service fail for background systems. Only foreground
- * systems can call the UWB service.
- */
-class UwbBackgroundPolicyException(message: String) : UwbApiException(message)
\ No newline at end of file
+public abstract class ListenableFuturePagingSource<Integer, T>
+ extends androidx.paging.PagingSource<Integer, T> {
+
+}
diff --git a/room/room-compiler/src/test/kotlin/androidx/room/solver/TypeAdapterStoreTest.kt b/room/room-compiler/src/test/kotlin/androidx/room/solver/TypeAdapterStoreTest.kt
index 3208dfa..6096d8b 100644
--- a/room/room-compiler/src/test/kotlin/androidx/room/solver/TypeAdapterStoreTest.kt
+++ b/room/room-compiler/src/test/kotlin/androidx/room/solver/TypeAdapterStoreTest.kt
@@ -46,6 +46,7 @@
import androidx.room.processor.ProcessorErrors
import androidx.room.solver.binderprovider.DataSourceFactoryQueryResultBinderProvider
import androidx.room.solver.binderprovider.DataSourceQueryResultBinderProvider
+import androidx.room.solver.binderprovider.ListenableFuturePagingSourceQueryResultBinderProvider
import androidx.room.solver.binderprovider.LiveDataQueryResultBinderProvider
import androidx.room.solver.binderprovider.PagingSourceQueryResultBinderProvider
import androidx.room.solver.binderprovider.RxQueryResultBinderProvider
@@ -523,6 +524,29 @@
}
@Test
+ fun testMissingRoomPagingGuava() {
+ runProcessorTest(
+ sources = listOf(COMMON.LISTENABLE_FUTURE_PAGING_SOURCE)
+ ) { invocation ->
+ val listenableFuturePagingSourceElement = invocation.processingEnv
+ .requireTypeElement(PagingTypeNames.LISTENABLE_FUTURE_PAGING_SOURCE)
+ val intType = invocation.processingEnv.requireType(Integer::class)
+ val listenableFuturePagingSourceIntIntType = invocation.processingEnv
+ .getDeclaredType(listenableFuturePagingSourceElement, intType, intType)
+
+ assertThat(listenableFuturePagingSourceElement, notNullValue())
+ assertThat(
+ ListenableFuturePagingSourceQueryResultBinderProvider(invocation.context)
+ .matches(listenableFuturePagingSourceIntIntType),
+ `is`(true)
+ )
+ invocation.assertCompilationResult {
+ hasError(ProcessorErrors.MISSING_ROOM_PAGING_GUAVA_ARTIFACT)
+ }
+ }
+ }
+
+ @Test
fun testFindPublisher() {
listOf(
COMMON.RX2_FLOWABLE to COMMON.RX2_ROOM,
@@ -862,6 +886,52 @@
}
@Test
+ fun findListenableFuturePagingSourceJavaCollectionValue() {
+ runProcessorTest(
+ sources = listOf(COMMON.LISTENABLE_FUTURE_PAGING_SOURCE)
+ ) { invocation ->
+ val listenableFuturePagingSourceElement = invocation.processingEnv
+ .requireTypeElement(PagingTypeNames.LISTENABLE_FUTURE_PAGING_SOURCE)
+ val intType = invocation.processingEnv.requireType(Integer::class)
+ val collectionType = invocation.processingEnv.requireType("java.util.Collection")
+ val listenableFuturePagingSourceIntCollectionType = invocation.processingEnv
+ .getDeclaredType(listenableFuturePagingSourceElement, intType, collectionType)
+
+ assertThat(listenableFuturePagingSourceIntCollectionType).isNotNull()
+ assertThat(
+ ListenableFuturePagingSourceQueryResultBinderProvider(invocation.context)
+ .matches(listenableFuturePagingSourceIntCollectionType)
+ ).isTrue()
+ invocation.assertCompilationResult {
+ hasError(ProcessorErrors.PAGING_SPECIFY_PAGING_SOURCE_VALUE_TYPE)
+ }
+ }
+ }
+
+ @Test
+ fun findListenableFutureKotlinCollectionValue() {
+ runProcessorTest(
+ sources = listOf(COMMON.LISTENABLE_FUTURE_PAGING_SOURCE)
+ ) { invocation ->
+ val listenableFuturePagingSourceElement = invocation.processingEnv
+ .requireTypeElement(PagingTypeNames.LISTENABLE_FUTURE_PAGING_SOURCE)
+ val intType = invocation.processingEnv.requireType(Integer::class)
+ val kotlinCollectionType = invocation.processingEnv.requireType(Collection::class)
+ val listenableFuturePagingSourceIntCollectionType = invocation.processingEnv
+ .getDeclaredType(listenableFuturePagingSourceElement, intType, kotlinCollectionType)
+
+ assertThat(listenableFuturePagingSourceIntCollectionType).isNotNull()
+ assertThat(
+ ListenableFuturePagingSourceQueryResultBinderProvider(invocation.context)
+ .matches(listenableFuturePagingSourceIntCollectionType)
+ ).isTrue()
+ invocation.assertCompilationResult {
+ hasError(ProcessorErrors.PAGING_SPECIFY_PAGING_SOURCE_VALUE_TYPE)
+ }
+ }
+ }
+
+ @Test
fun testPagingSourceBinder() {
val inputSource =
Source.java(
@@ -882,6 +952,7 @@
COMMON.USER,
COMMON.PAGING_SOURCE,
COMMON.LIMIT_OFFSET_PAGING_SOURCE,
+ COMMON.LISTENABLE_FUTURE_PAGING_SOURCE,
),
) { invocation: XTestInvocation ->
val dao = invocation.roundEnv
@@ -906,6 +977,63 @@
.filterIsInstance<ReadQueryMethod>().first().returnType.rawType
// make sure returned type is the original PagingSource
assertThat(returnedXRawType).isEqualTo(pagingSourceXRawType)
+
+ val listenableFuturePagingSourceXRawType: XRawType? = invocation.context.processingEnv
+ .findType(PagingTypeNames.LISTENABLE_FUTURE_PAGING_SOURCE)?.rawType
+ assertThat(listenableFuturePagingSourceXRawType!!.isAssignableFrom(returnedXRawType))
+ .isFalse()
+ }
+ }
+
+ @Test
+ fun testListenableFuturePagingSourceBinder() {
+ val inputSource =
+ Source.java(
+ qName = "foo.bar.MyDao",
+ code =
+ """
+ ${DaoProcessorTest.DAO_PREFIX}
+
+ @Dao abstract class MyDao {
+ @Query("SELECT uid FROM User")
+ abstract androidx.paging.ListenableFuturePagingSource<Integer, User> getAllIds();
+ }
+ """.trimIndent()
+ )
+ runProcessorTest(
+ sources = listOf(
+ inputSource,
+ COMMON.USER,
+ COMMON.LISTENABLE_FUTURE_PAGING_SOURCE,
+ COMMON.LIMIT_OFFSET_LISTENABLE_FUTURE_PAGING_SOURCE,
+ ),
+ ) { invocation: XTestInvocation ->
+ val dao = invocation.roundEnv
+ .getElementsAnnotatedWith(
+ Dao::class.qualifiedName!!
+ ).first()
+ check(dao.isTypeElement())
+ val dbType = invocation.context.processingEnv
+ .requireType(RoomTypeNames.ROOM_DB)
+ val parser = DaoProcessor(
+ invocation.context,
+ dao, dbType, null,
+ )
+ val parsedDao = parser.process()
+ val binder = parsedDao.queryMethods.filterIsInstance<ReadQueryMethod>()
+ .first().queryResultBinder
+
+ // assert that room correctly binds to ListenableFuturePagingSource instead of
+ // its supertype PagingSource. ListenableFuturePagingSourceBinderProvider
+ // must be added into list of binder providers in TypeAdapterStore before
+ // generic PagingSource.
+ assertThat(binder is MultiTypedPagingSourceQueryResultBinder).isTrue()
+ val listenableFuturePagingSourceXRawType: XRawType? = invocation.context.processingEnv
+ .findType(PagingTypeNames.LISTENABLE_FUTURE_PAGING_SOURCE)?.rawType
+ val returnedXRawType = parsedDao.queryMethods
+ .filterIsInstance<ReadQueryMethod>().first().returnType.rawType
+ // make sure the actual returned type from Provider is ListenableFuturePagingSource
+ assertThat(returnedXRawType).isEqualTo(listenableFuturePagingSourceXRawType)
}
}
diff --git a/room/room-compiler/src/test/kotlin/androidx/room/testing/test_util.kt b/room/room-compiler/src/test/kotlin/androidx/room/testing/test_util.kt
index aede69a..0b76f25 100644
--- a/room/room-compiler/src/test/kotlin/androidx/room/testing/test_util.kt
+++ b/room/room-compiler/src/test/kotlin/androidx/room/testing/test_util.kt
@@ -29,6 +29,7 @@
import androidx.room.ext.ReactiveStreamsTypeNames
import androidx.room.ext.RoomCoroutinesTypeNames
import androidx.room.ext.RoomGuavaTypeNames
+import androidx.room.ext.RoomPagingGuavaTypeNames
import androidx.room.ext.RoomPagingTypeNames
import androidx.room.ext.RoomRxJava2TypeNames
import androidx.room.ext.RoomRxJava3TypeNames
@@ -232,6 +233,20 @@
)
}
+ val LISTENABLE_FUTURE_PAGING_SOURCE by lazy {
+ loadJavaCode(
+ "common/input/ListenableFuturePagingSource.java",
+ PagingTypeNames.LISTENABLE_FUTURE_PAGING_SOURCE.toString()
+ )
+ }
+
+ val LIMIT_OFFSET_LISTENABLE_FUTURE_PAGING_SOURCE by lazy {
+ loadJavaCode(
+ "common/input/LimitOffsetListenableFuturePagingSource.java",
+ RoomPagingGuavaTypeNames.LIMIT_OFFSET_LISTENABLE_FUTURE_PAGING_SOURCE.toString()
+ )
+ }
+
val COROUTINES_ROOM by lazy {
loadJavaCode(
"common/input/CoroutinesRoom.java",
diff --git a/room/room-paging-guava/build.gradle b/room/room-paging-guava/build.gradle
index 2e69703..4a073c9 100644
--- a/room/room-paging-guava/build.gradle
+++ b/room/room-paging-guava/build.gradle
@@ -39,7 +39,7 @@
api(libs.kotlinStdlib)
implementation(project(":room:room-paging"))
implementation(project(":room:room-guava"))
- implementation(projectOrArtifact(":paging:paging-guava"))
+ api("androidx.paging:paging-guava:3.1.1")
androidTestImplementation(libs.truth)
androidTestImplementation(libs.testExtJunitKtx)
diff --git a/savedstate/savedstate-ktx/build.gradle b/savedstate/savedstate-ktx/build.gradle
index e09dc9f..7f5e440 100644
--- a/savedstate/savedstate-ktx/build.gradle
+++ b/savedstate/savedstate-ktx/build.gradle
@@ -23,6 +23,11 @@
}
dependencies {
+ // Atomic group
+ constraints {
+ implementation(project(":savedstate:savedstate"))
+ }
+
api(project(":savedstate:savedstate"))
api(libs.kotlinStdlib)
diff --git a/savedstate/savedstate/build.gradle b/savedstate/savedstate/build.gradle
index fb3aa36..ca99126 100644
--- a/savedstate/savedstate/build.gradle
+++ b/savedstate/savedstate/build.gradle
@@ -14,6 +14,11 @@
}
dependencies {
+ // Atomic group
+ constraints {
+ implementation(project(":savedstate:savedstate-ktx"))
+ }
+
api("androidx.annotation:annotation:1.1.0")
implementation("androidx.arch.core:core-common:2.1.0")
implementation("androidx.lifecycle:lifecycle-common:2.4.0")
diff --git a/settings.gradle b/settings.gradle
index e669502..14affbb 100644
--- a/settings.gradle
+++ b/settings.gradle
@@ -279,7 +279,7 @@
includeProject(":activity:activity-compose:activity-compose-samples", "activity/activity-compose/samples", [BuildType.COMPOSE])
includeProject(":activity:activity-compose:integration-tests:activity-demos", [BuildType.COMPOSE])
includeProject(":activity:activity-compose-lint", [BuildType.COMPOSE])
-includeProject(":activity:activity-ktx", [BuildType.MAIN, BuildType.FLAN, BuildType.COMPOSE])
+includeProject(":activity:activity-ktx", [BuildType.MAIN, BuildType.FLAN, BuildType.COMPOSE, BuildType.WEAR])
includeProject(":activity:activity-lint", [BuildType.MAIN, BuildType.FLAN, BuildType.COMPOSE, BuildType.WEAR])
includeProject(":activity:integration-tests:testapp", [BuildType.MAIN, BuildType.FLAN])
includeProject(":ads:ads-identifier", [BuildType.MAIN])
@@ -328,6 +328,7 @@
includeProject(":biometric:biometric-ktx", [BuildType.MAIN])
includeProject(":biometric:biometric-ktx-samples", "biometric/biometric-ktx/samples", [BuildType.MAIN])
includeProject(":biometric:integration-tests:testapp", [BuildType.MAIN])
+includeProject(":bluetooth:bluetooth", [BuildType.MAIN])
includeProject(":browser:browser", [BuildType.MAIN])
includeProject(":buildSrc-tests", [BuildType.MAIN])
// these projects intentionally fail to compile unless androidx.useMaxDepVersions is enabled
@@ -458,6 +459,7 @@
includeProject(":compose:runtime:runtime-lint", [BuildType.COMPOSE, BuildType.MAIN])
includeProject(":compose:runtime:runtime-livedata", [BuildType.COMPOSE])
includeProject(":compose:runtime:runtime-livedata:runtime-livedata-samples", "compose/runtime/runtime-livedata/samples", [BuildType.COMPOSE])
+includeProject(":compose:runtime:runtime-tracing", [BuildType.COMPOSE])
includeProject(":compose:runtime:runtime-rxjava2", [BuildType.COMPOSE])
includeProject(":compose:runtime:runtime-rxjava2:runtime-rxjava2-samples", "compose/runtime/runtime-rxjava2/samples", [BuildType.COMPOSE])
includeProject(":compose:runtime:runtime-rxjava3", [BuildType.COMPOSE])
@@ -505,14 +507,15 @@
includeProject(":concurrent:concurrent-futures-ktx", [BuildType.MAIN])
includeProject(":contentpager:contentpager", [BuildType.MAIN])
includeProject(":coordinatorlayout:coordinatorlayout", [BuildType.MAIN])
-includeProject(":core:core", [BuildType.MAIN, BuildType.MEDIA, BuildType.FLAN, BuildType.COMPOSE, BuildType.WEAR])
+includeProject(":core:core", [BuildType.MAIN, BuildType.GLANCE, BuildType.MEDIA, BuildType.FLAN, BuildType.COMPOSE, BuildType.WEAR])
+includeProject(":core:core:integration-tests:publishing", [BuildType.MAIN])
includeProject(":core:core-animation", [BuildType.MAIN])
includeProject(":core:core-animation-integration-tests:testapp", [BuildType.MAIN])
includeProject(":core:core-animation-testing", [BuildType.MAIN])
includeProject(":core:core-appdigest", [BuildType.MAIN])
includeProject(":core:core-google-shortcuts", [BuildType.MAIN])
includeProject(":core:core-i18n", [BuildType.MAIN])
-includeProject(":core:core-ktx", [BuildType.MAIN, BuildType.GLANCE])
+includeProject(":core:core-ktx", [BuildType.MAIN, BuildType.GLANCE, BuildType.MEDIA, BuildType.FLAN, BuildType.COMPOSE, BuildType.WEAR])
includeProject(":core:core-performance", [BuildType.MAIN])
includeProject(":core:core-performance:core-performance-samples", "core/core-performance/samples", [BuildType.MAIN])
includeProject(":core:core-remoteviews", [BuildType.MAIN, BuildType.GLANCE])
@@ -725,7 +728,7 @@
includeProject(":room:room-rxjava3", [BuildType.MAIN])
includeProject(":room:room-testing", [BuildType.MAIN])
includeProject(":savedstate:savedstate", [BuildType.MAIN, BuildType.COMPOSE, BuildType.FLAN, BuildType.WEAR])
-includeProject(":savedstate:savedstate-ktx", [BuildType.MAIN, BuildType.COMPOSE, BuildType.FLAN])
+includeProject(":savedstate:savedstate-ktx", [BuildType.MAIN, BuildType.COMPOSE, BuildType.FLAN, BuildType.WEAR])
includeProject(":security:security-app-authenticator", [BuildType.MAIN])
includeProject(":security:security-app-authenticator-testing", [BuildType.MAIN])
includeProject(":security:security-biometric", [BuildType.MAIN])
@@ -821,6 +824,7 @@
includeProject(":wear:watchface:watchface-samples-app", "wear/watchface/watchface/samples/app", [BuildType.MAIN, BuildType.WEAR])
includeProject(":wear:watchface:watchface-samples-minimal", "wear/watchface/watchface/samples/minimal", [BuildType.MAIN, BuildType.WEAR])
includeProject(":wear:watchface:watchface-samples-minimal-complications", [BuildType.MAIN, BuildType.WEAR])
+includeProject(":wear:watchface:watchface-samples-minimal-instances", [BuildType.MAIN, BuildType.WEAR])
includeProject(":wear:watchface:watchface-samples-minimal-style", [BuildType.MAIN, BuildType.WEAR])
includeProject(":wear:watchface:watchface-style", [BuildType.MAIN, BuildType.WEAR])
includeProject(":webkit:integration-tests:testapp", [BuildType.MAIN])
@@ -878,7 +882,7 @@
includeProject(":internal-testutils-runtime", "testutils/testutils-runtime", [BuildType.MAIN, BuildType.FLAN, BuildType.COMPOSE, BuildType.MEDIA, BuildType.WEAR])
includeProject(":internal-testutils-appcompat", "testutils/testutils-appcompat", [BuildType.MAIN])
includeProject(":internal-testutils-espresso", "testutils/testutils-espresso", [BuildType.MAIN, BuildType.COMPOSE])
-includeProject(":internal-testutils-truth", "testutils/testutils-truth", [BuildType.MAIN, BuildType.FLAN, BuildType.COMPOSE])
+includeProject(":internal-testutils-truth", "testutils/testutils-truth", [BuildType.MAIN, BuildType.GLANCE, BuildType.MEDIA, BuildType.FLAN, BuildType.COMPOSE, BuildType.WEAR])
includeProject(":internal-testutils-ktx", "testutils/testutils-ktx")
includeProject(":internal-testutils-macrobenchmark", "testutils/testutils-macrobenchmark", [BuildType.MAIN, BuildType.COMPOSE])
includeProject(":internal-testutils-navigation", "testutils/testutils-navigation", [BuildType.MAIN, BuildType.COMPOSE, BuildType.FLAN])
diff --git a/testutils/testutils-common/src/main/java/androidx/testutils/FilteringExecutor.kt b/testutils/testutils-common/src/main/java/androidx/testutils/FilteringExecutor.kt
index 3c8f192..e981829 100644
--- a/testutils/testutils-common/src/main/java/androidx/testutils/FilteringExecutor.kt
+++ b/testutils/testutils-common/src/main/java/androidx/testutils/FilteringExecutor.kt
@@ -87,10 +87,10 @@
}
}
-suspend fun <T> withTestTimeout(block: suspend () -> T): T {
+suspend fun <T> withTestTimeout(duration: Long = 3, block: suspend () -> T): T {
try {
return withTimeout(
- timeMillis = TimeUnit.SECONDS.toMillis(3)
+ timeMillis = TimeUnit.SECONDS.toMillis(duration)
) {
block()
}
diff --git a/wear/compose/compose-foundation/api/1.0.0-beta02.txt b/wear/compose/compose-foundation/api/1.0.0-beta02.txt
new file mode 100644
index 0000000..78a48d4
--- /dev/null
+++ b/wear/compose/compose-foundation/api/1.0.0-beta02.txt
@@ -0,0 +1,168 @@
+// Signature format: 4.0
+package androidx.wear.compose.foundation {
+
+ @kotlin.jvm.JvmInline public final value class AnchorType {
+ field public static final androidx.wear.compose.foundation.AnchorType.Companion Companion;
+ }
+
+ public static final class AnchorType.Companion {
+ method public float getCenter();
+ method public float getEnd();
+ method public float getStart();
+ property public final float Center;
+ property public final float End;
+ property public final float Start;
+ }
+
+ @androidx.compose.runtime.Stable public interface ArcPaddingValues {
+ method public float calculateAfterPadding(androidx.compose.ui.unit.LayoutDirection layoutDirection, int angularDirection);
+ method public float calculateBeforePadding(androidx.compose.ui.unit.LayoutDirection layoutDirection, int angularDirection);
+ method public float calculateInnerPadding(int radialDirection);
+ method public float calculateOuterPadding(int radialDirection);
+ }
+
+ public final class BasicCurvedTextKt {
+ method public static void basicCurvedText(androidx.wear.compose.foundation.CurvedScope, String text, optional androidx.wear.compose.foundation.CurvedModifier modifier, optional androidx.wear.compose.foundation.CurvedDirection.Angular? angularDirection, optional int overflow, optional kotlin.jvm.functions.Function0<androidx.wear.compose.foundation.CurvedTextStyle> style);
+ method public static void basicCurvedText(androidx.wear.compose.foundation.CurvedScope, String text, androidx.wear.compose.foundation.CurvedTextStyle style, optional androidx.wear.compose.foundation.CurvedModifier modifier, optional androidx.wear.compose.foundation.CurvedDirection.Angular? angularDirection, optional int overflow);
+ }
+
+ public interface CurvedAlignment {
+ }
+
+ @kotlin.jvm.JvmInline public static final value class CurvedAlignment.Angular {
+ field public static final androidx.wear.compose.foundation.CurvedAlignment.Angular.Companion Companion;
+ }
+
+ public static final class CurvedAlignment.Angular.Companion {
+ method public float Custom(float ratio);
+ method public float getCenter();
+ method public float getEnd();
+ method public float getStart();
+ property public final float Center;
+ property public final float End;
+ property public final float Start;
+ }
+
+ @kotlin.jvm.JvmInline public static final value class CurvedAlignment.Radial {
+ field public static final androidx.wear.compose.foundation.CurvedAlignment.Radial.Companion Companion;
+ }
+
+ public static final class CurvedAlignment.Radial.Companion {
+ method public float Custom(float ratio);
+ method public float getCenter();
+ method public float getInner();
+ method public float getOuter();
+ property public final float Center;
+ property public final float Inner;
+ property public final float Outer;
+ }
+
+ public final class CurvedColumnKt {
+ method public static void curvedColumn(androidx.wear.compose.foundation.CurvedScope, optional androidx.wear.compose.foundation.CurvedModifier modifier, optional androidx.wear.compose.foundation.CurvedDirection.Radial? radialDirection, optional androidx.wear.compose.foundation.CurvedAlignment.Angular? angularAlignment, kotlin.jvm.functions.Function1<? super androidx.wear.compose.foundation.CurvedScope,kotlin.Unit> contentBuilder);
+ }
+
+ public final class CurvedComposableKt {
+ method public static void curvedComposable(androidx.wear.compose.foundation.CurvedScope, optional androidx.wear.compose.foundation.CurvedModifier modifier, optional float radialAlignment, kotlin.jvm.functions.Function1<? super androidx.compose.foundation.layout.BoxScope,kotlin.Unit> content);
+ }
+
+ public interface CurvedDirection {
+ }
+
+ @androidx.compose.runtime.Immutable @kotlin.jvm.JvmInline public static final value class CurvedDirection.Angular {
+ field public static final androidx.wear.compose.foundation.CurvedDirection.Angular.Companion Companion;
+ }
+
+ public static final class CurvedDirection.Angular.Companion {
+ method public int getClockwise();
+ method public int getCounterClockwise();
+ method public int getNormal();
+ method public int getReversed();
+ property public final int Clockwise;
+ property public final int CounterClockwise;
+ property public final int Normal;
+ property public final int Reversed;
+ }
+
+ @androidx.compose.runtime.Immutable @kotlin.jvm.JvmInline public static final value class CurvedDirection.Radial {
+ field public static final androidx.wear.compose.foundation.CurvedDirection.Radial.Companion Companion;
+ }
+
+ public static final class CurvedDirection.Radial.Companion {
+ method public int getInsideOut();
+ method public int getOutsideIn();
+ property public final int InsideOut;
+ property public final int OutsideIn;
+ }
+
+ public final class CurvedDrawKt {
+ method public static androidx.wear.compose.foundation.CurvedModifier angularGradientBackground(androidx.wear.compose.foundation.CurvedModifier, kotlin.Pair<java.lang.Float,androidx.compose.ui.graphics.Color>![] colorStops, optional int cap);
+ method public static androidx.wear.compose.foundation.CurvedModifier angularGradientBackground(androidx.wear.compose.foundation.CurvedModifier, java.util.List<androidx.compose.ui.graphics.Color> colors, optional int cap);
+ method public static androidx.wear.compose.foundation.CurvedModifier background(androidx.wear.compose.foundation.CurvedModifier, long color, optional int cap);
+ method public static androidx.wear.compose.foundation.CurvedModifier radialGradientBackground(androidx.wear.compose.foundation.CurvedModifier, kotlin.Pair<java.lang.Float,androidx.compose.ui.graphics.Color>![] colorStops, optional int cap);
+ method public static androidx.wear.compose.foundation.CurvedModifier radialGradientBackground(androidx.wear.compose.foundation.CurvedModifier, java.util.List<androidx.compose.ui.graphics.Color> colors, optional int cap);
+ }
+
+ public final class CurvedLayoutKt {
+ method @androidx.compose.runtime.Composable public static void CurvedLayout(optional androidx.compose.ui.Modifier modifier, optional float anchor, optional float anchorType, optional androidx.wear.compose.foundation.CurvedAlignment.Radial? radialAlignment, optional int angularDirection, kotlin.jvm.functions.Function1<? super androidx.wear.compose.foundation.CurvedScope,kotlin.Unit> contentBuilder);
+ }
+
+ @androidx.compose.runtime.Stable public sealed interface CurvedModifier {
+ method public default infix androidx.wear.compose.foundation.CurvedModifier then(androidx.wear.compose.foundation.CurvedModifier other);
+ field public static final androidx.wear.compose.foundation.CurvedModifier.Companion Companion;
+ }
+
+ public static final class CurvedModifier.Companion implements androidx.wear.compose.foundation.CurvedModifier {
+ }
+
+ public final class CurvedModifierKt {
+ }
+
+ public final class CurvedPaddingKt {
+ method public static androidx.wear.compose.foundation.ArcPaddingValues ArcPaddingValues(optional float outer, optional float inner, optional float before, optional float after);
+ method public static androidx.wear.compose.foundation.ArcPaddingValues ArcPaddingValues(float all);
+ method public static androidx.wear.compose.foundation.ArcPaddingValues ArcPaddingValues(optional float radial, optional float angular);
+ method public static androidx.wear.compose.foundation.CurvedModifier padding(androidx.wear.compose.foundation.CurvedModifier, androidx.wear.compose.foundation.ArcPaddingValues paddingValues);
+ method public static androidx.wear.compose.foundation.CurvedModifier padding(androidx.wear.compose.foundation.CurvedModifier, float outer, float inner, float before, float after);
+ method public static androidx.wear.compose.foundation.CurvedModifier padding(androidx.wear.compose.foundation.CurvedModifier, optional float radial, optional float angular);
+ method public static androidx.wear.compose.foundation.CurvedModifier padding(androidx.wear.compose.foundation.CurvedModifier, optional float all);
+ }
+
+ public final class CurvedParentDataKt {
+ method public static androidx.wear.compose.foundation.CurvedModifier parentDataModifier(androidx.wear.compose.foundation.CurvedModifier, kotlin.jvm.functions.Function1<java.lang.Object,?> modifyParentData);
+ method public static androidx.wear.compose.foundation.CurvedModifier weight(androidx.wear.compose.foundation.CurvedModifier, float weight);
+ }
+
+ public final class CurvedRowKt {
+ method public static void curvedRow(androidx.wear.compose.foundation.CurvedScope, optional androidx.wear.compose.foundation.CurvedModifier modifier, optional androidx.wear.compose.foundation.CurvedAlignment.Radial? radialAlignment, optional androidx.wear.compose.foundation.CurvedDirection.Angular? angularDirection, kotlin.jvm.functions.Function1<? super androidx.wear.compose.foundation.CurvedScope,kotlin.Unit> contentBuilder);
+ }
+
+ @androidx.compose.foundation.layout.LayoutScopeMarker public final class CurvedScope {
+ }
+
+ public final class CurvedSizeKt {
+ method public static androidx.wear.compose.foundation.CurvedModifier angularSize(androidx.wear.compose.foundation.CurvedModifier, float sweepDegrees);
+ method public static androidx.wear.compose.foundation.CurvedModifier radialSize(androidx.wear.compose.foundation.CurvedModifier, float thickness);
+ method public static androidx.wear.compose.foundation.CurvedModifier size(androidx.wear.compose.foundation.CurvedModifier, float sweepDegrees, float thickness);
+ method public static androidx.wear.compose.foundation.CurvedModifier sizeIn(androidx.wear.compose.foundation.CurvedModifier, optional float minSweepDegrees, optional float maxSweepDegrees, optional float minThickness, optional float maxThickness);
+ }
+
+ public final class CurvedTextStyle {
+ ctor public CurvedTextStyle(optional long background, optional long color, optional long fontSize);
+ ctor public CurvedTextStyle(androidx.compose.ui.text.TextStyle style);
+ method public androidx.wear.compose.foundation.CurvedTextStyle copy(optional long background, optional long color, optional long fontSize);
+ method public operator boolean equals(Object? other);
+ method public long getBackground();
+ method public long getColor();
+ method public long getFontSize();
+ method public androidx.wear.compose.foundation.CurvedTextStyle merge(optional androidx.wear.compose.foundation.CurvedTextStyle? other);
+ method public operator androidx.wear.compose.foundation.CurvedTextStyle plus(androidx.wear.compose.foundation.CurvedTextStyle other);
+ property public final long background;
+ property public final long color;
+ property public final long fontSize;
+ }
+
+ public final class CurvedTextStyleKt {
+ }
+
+}
+
diff --git a/wear/compose/compose-foundation/api/public_plus_experimental_1.0.0-beta02.txt b/wear/compose/compose-foundation/api/public_plus_experimental_1.0.0-beta02.txt
new file mode 100644
index 0000000..78a48d4
--- /dev/null
+++ b/wear/compose/compose-foundation/api/public_plus_experimental_1.0.0-beta02.txt
@@ -0,0 +1,168 @@
+// Signature format: 4.0
+package androidx.wear.compose.foundation {
+
+ @kotlin.jvm.JvmInline public final value class AnchorType {
+ field public static final androidx.wear.compose.foundation.AnchorType.Companion Companion;
+ }
+
+ public static final class AnchorType.Companion {
+ method public float getCenter();
+ method public float getEnd();
+ method public float getStart();
+ property public final float Center;
+ property public final float End;
+ property public final float Start;
+ }
+
+ @androidx.compose.runtime.Stable public interface ArcPaddingValues {
+ method public float calculateAfterPadding(androidx.compose.ui.unit.LayoutDirection layoutDirection, int angularDirection);
+ method public float calculateBeforePadding(androidx.compose.ui.unit.LayoutDirection layoutDirection, int angularDirection);
+ method public float calculateInnerPadding(int radialDirection);
+ method public float calculateOuterPadding(int radialDirection);
+ }
+
+ public final class BasicCurvedTextKt {
+ method public static void basicCurvedText(androidx.wear.compose.foundation.CurvedScope, String text, optional androidx.wear.compose.foundation.CurvedModifier modifier, optional androidx.wear.compose.foundation.CurvedDirection.Angular? angularDirection, optional int overflow, optional kotlin.jvm.functions.Function0<androidx.wear.compose.foundation.CurvedTextStyle> style);
+ method public static void basicCurvedText(androidx.wear.compose.foundation.CurvedScope, String text, androidx.wear.compose.foundation.CurvedTextStyle style, optional androidx.wear.compose.foundation.CurvedModifier modifier, optional androidx.wear.compose.foundation.CurvedDirection.Angular? angularDirection, optional int overflow);
+ }
+
+ public interface CurvedAlignment {
+ }
+
+ @kotlin.jvm.JvmInline public static final value class CurvedAlignment.Angular {
+ field public static final androidx.wear.compose.foundation.CurvedAlignment.Angular.Companion Companion;
+ }
+
+ public static final class CurvedAlignment.Angular.Companion {
+ method public float Custom(float ratio);
+ method public float getCenter();
+ method public float getEnd();
+ method public float getStart();
+ property public final float Center;
+ property public final float End;
+ property public final float Start;
+ }
+
+ @kotlin.jvm.JvmInline public static final value class CurvedAlignment.Radial {
+ field public static final androidx.wear.compose.foundation.CurvedAlignment.Radial.Companion Companion;
+ }
+
+ public static final class CurvedAlignment.Radial.Companion {
+ method public float Custom(float ratio);
+ method public float getCenter();
+ method public float getInner();
+ method public float getOuter();
+ property public final float Center;
+ property public final float Inner;
+ property public final float Outer;
+ }
+
+ public final class CurvedColumnKt {
+ method public static void curvedColumn(androidx.wear.compose.foundation.CurvedScope, optional androidx.wear.compose.foundation.CurvedModifier modifier, optional androidx.wear.compose.foundation.CurvedDirection.Radial? radialDirection, optional androidx.wear.compose.foundation.CurvedAlignment.Angular? angularAlignment, kotlin.jvm.functions.Function1<? super androidx.wear.compose.foundation.CurvedScope,kotlin.Unit> contentBuilder);
+ }
+
+ public final class CurvedComposableKt {
+ method public static void curvedComposable(androidx.wear.compose.foundation.CurvedScope, optional androidx.wear.compose.foundation.CurvedModifier modifier, optional float radialAlignment, kotlin.jvm.functions.Function1<? super androidx.compose.foundation.layout.BoxScope,kotlin.Unit> content);
+ }
+
+ public interface CurvedDirection {
+ }
+
+ @androidx.compose.runtime.Immutable @kotlin.jvm.JvmInline public static final value class CurvedDirection.Angular {
+ field public static final androidx.wear.compose.foundation.CurvedDirection.Angular.Companion Companion;
+ }
+
+ public static final class CurvedDirection.Angular.Companion {
+ method public int getClockwise();
+ method public int getCounterClockwise();
+ method public int getNormal();
+ method public int getReversed();
+ property public final int Clockwise;
+ property public final int CounterClockwise;
+ property public final int Normal;
+ property public final int Reversed;
+ }
+
+ @androidx.compose.runtime.Immutable @kotlin.jvm.JvmInline public static final value class CurvedDirection.Radial {
+ field public static final androidx.wear.compose.foundation.CurvedDirection.Radial.Companion Companion;
+ }
+
+ public static final class CurvedDirection.Radial.Companion {
+ method public int getInsideOut();
+ method public int getOutsideIn();
+ property public final int InsideOut;
+ property public final int OutsideIn;
+ }
+
+ public final class CurvedDrawKt {
+ method public static androidx.wear.compose.foundation.CurvedModifier angularGradientBackground(androidx.wear.compose.foundation.CurvedModifier, kotlin.Pair<java.lang.Float,androidx.compose.ui.graphics.Color>![] colorStops, optional int cap);
+ method public static androidx.wear.compose.foundation.CurvedModifier angularGradientBackground(androidx.wear.compose.foundation.CurvedModifier, java.util.List<androidx.compose.ui.graphics.Color> colors, optional int cap);
+ method public static androidx.wear.compose.foundation.CurvedModifier background(androidx.wear.compose.foundation.CurvedModifier, long color, optional int cap);
+ method public static androidx.wear.compose.foundation.CurvedModifier radialGradientBackground(androidx.wear.compose.foundation.CurvedModifier, kotlin.Pair<java.lang.Float,androidx.compose.ui.graphics.Color>![] colorStops, optional int cap);
+ method public static androidx.wear.compose.foundation.CurvedModifier radialGradientBackground(androidx.wear.compose.foundation.CurvedModifier, java.util.List<androidx.compose.ui.graphics.Color> colors, optional int cap);
+ }
+
+ public final class CurvedLayoutKt {
+ method @androidx.compose.runtime.Composable public static void CurvedLayout(optional androidx.compose.ui.Modifier modifier, optional float anchor, optional float anchorType, optional androidx.wear.compose.foundation.CurvedAlignment.Radial? radialAlignment, optional int angularDirection, kotlin.jvm.functions.Function1<? super androidx.wear.compose.foundation.CurvedScope,kotlin.Unit> contentBuilder);
+ }
+
+ @androidx.compose.runtime.Stable public sealed interface CurvedModifier {
+ method public default infix androidx.wear.compose.foundation.CurvedModifier then(androidx.wear.compose.foundation.CurvedModifier other);
+ field public static final androidx.wear.compose.foundation.CurvedModifier.Companion Companion;
+ }
+
+ public static final class CurvedModifier.Companion implements androidx.wear.compose.foundation.CurvedModifier {
+ }
+
+ public final class CurvedModifierKt {
+ }
+
+ public final class CurvedPaddingKt {
+ method public static androidx.wear.compose.foundation.ArcPaddingValues ArcPaddingValues(optional float outer, optional float inner, optional float before, optional float after);
+ method public static androidx.wear.compose.foundation.ArcPaddingValues ArcPaddingValues(float all);
+ method public static androidx.wear.compose.foundation.ArcPaddingValues ArcPaddingValues(optional float radial, optional float angular);
+ method public static androidx.wear.compose.foundation.CurvedModifier padding(androidx.wear.compose.foundation.CurvedModifier, androidx.wear.compose.foundation.ArcPaddingValues paddingValues);
+ method public static androidx.wear.compose.foundation.CurvedModifier padding(androidx.wear.compose.foundation.CurvedModifier, float outer, float inner, float before, float after);
+ method public static androidx.wear.compose.foundation.CurvedModifier padding(androidx.wear.compose.foundation.CurvedModifier, optional float radial, optional float angular);
+ method public static androidx.wear.compose.foundation.CurvedModifier padding(androidx.wear.compose.foundation.CurvedModifier, optional float all);
+ }
+
+ public final class CurvedParentDataKt {
+ method public static androidx.wear.compose.foundation.CurvedModifier parentDataModifier(androidx.wear.compose.foundation.CurvedModifier, kotlin.jvm.functions.Function1<java.lang.Object,?> modifyParentData);
+ method public static androidx.wear.compose.foundation.CurvedModifier weight(androidx.wear.compose.foundation.CurvedModifier, float weight);
+ }
+
+ public final class CurvedRowKt {
+ method public static void curvedRow(androidx.wear.compose.foundation.CurvedScope, optional androidx.wear.compose.foundation.CurvedModifier modifier, optional androidx.wear.compose.foundation.CurvedAlignment.Radial? radialAlignment, optional androidx.wear.compose.foundation.CurvedDirection.Angular? angularDirection, kotlin.jvm.functions.Function1<? super androidx.wear.compose.foundation.CurvedScope,kotlin.Unit> contentBuilder);
+ }
+
+ @androidx.compose.foundation.layout.LayoutScopeMarker public final class CurvedScope {
+ }
+
+ public final class CurvedSizeKt {
+ method public static androidx.wear.compose.foundation.CurvedModifier angularSize(androidx.wear.compose.foundation.CurvedModifier, float sweepDegrees);
+ method public static androidx.wear.compose.foundation.CurvedModifier radialSize(androidx.wear.compose.foundation.CurvedModifier, float thickness);
+ method public static androidx.wear.compose.foundation.CurvedModifier size(androidx.wear.compose.foundation.CurvedModifier, float sweepDegrees, float thickness);
+ method public static androidx.wear.compose.foundation.CurvedModifier sizeIn(androidx.wear.compose.foundation.CurvedModifier, optional float minSweepDegrees, optional float maxSweepDegrees, optional float minThickness, optional float maxThickness);
+ }
+
+ public final class CurvedTextStyle {
+ ctor public CurvedTextStyle(optional long background, optional long color, optional long fontSize);
+ ctor public CurvedTextStyle(androidx.compose.ui.text.TextStyle style);
+ method public androidx.wear.compose.foundation.CurvedTextStyle copy(optional long background, optional long color, optional long fontSize);
+ method public operator boolean equals(Object? other);
+ method public long getBackground();
+ method public long getColor();
+ method public long getFontSize();
+ method public androidx.wear.compose.foundation.CurvedTextStyle merge(optional androidx.wear.compose.foundation.CurvedTextStyle? other);
+ method public operator androidx.wear.compose.foundation.CurvedTextStyle plus(androidx.wear.compose.foundation.CurvedTextStyle other);
+ property public final long background;
+ property public final long color;
+ property public final long fontSize;
+ }
+
+ public final class CurvedTextStyleKt {
+ }
+
+}
+
diff --git a/wear/compose/compose-foundation/api/res-1.0.0-beta02.txt b/wear/compose/compose-foundation/api/res-1.0.0-beta02.txt
new file mode 100644
index 0000000..e69de29
--- /dev/null
+++ b/wear/compose/compose-foundation/api/res-1.0.0-beta02.txt
diff --git a/wear/compose/compose-foundation/api/restricted_1.0.0-beta02.txt b/wear/compose/compose-foundation/api/restricted_1.0.0-beta02.txt
new file mode 100644
index 0000000..78a48d4
--- /dev/null
+++ b/wear/compose/compose-foundation/api/restricted_1.0.0-beta02.txt
@@ -0,0 +1,168 @@
+// Signature format: 4.0
+package androidx.wear.compose.foundation {
+
+ @kotlin.jvm.JvmInline public final value class AnchorType {
+ field public static final androidx.wear.compose.foundation.AnchorType.Companion Companion;
+ }
+
+ public static final class AnchorType.Companion {
+ method public float getCenter();
+ method public float getEnd();
+ method public float getStart();
+ property public final float Center;
+ property public final float End;
+ property public final float Start;
+ }
+
+ @androidx.compose.runtime.Stable public interface ArcPaddingValues {
+ method public float calculateAfterPadding(androidx.compose.ui.unit.LayoutDirection layoutDirection, int angularDirection);
+ method public float calculateBeforePadding(androidx.compose.ui.unit.LayoutDirection layoutDirection, int angularDirection);
+ method public float calculateInnerPadding(int radialDirection);
+ method public float calculateOuterPadding(int radialDirection);
+ }
+
+ public final class BasicCurvedTextKt {
+ method public static void basicCurvedText(androidx.wear.compose.foundation.CurvedScope, String text, optional androidx.wear.compose.foundation.CurvedModifier modifier, optional androidx.wear.compose.foundation.CurvedDirection.Angular? angularDirection, optional int overflow, optional kotlin.jvm.functions.Function0<androidx.wear.compose.foundation.CurvedTextStyle> style);
+ method public static void basicCurvedText(androidx.wear.compose.foundation.CurvedScope, String text, androidx.wear.compose.foundation.CurvedTextStyle style, optional androidx.wear.compose.foundation.CurvedModifier modifier, optional androidx.wear.compose.foundation.CurvedDirection.Angular? angularDirection, optional int overflow);
+ }
+
+ public interface CurvedAlignment {
+ }
+
+ @kotlin.jvm.JvmInline public static final value class CurvedAlignment.Angular {
+ field public static final androidx.wear.compose.foundation.CurvedAlignment.Angular.Companion Companion;
+ }
+
+ public static final class CurvedAlignment.Angular.Companion {
+ method public float Custom(float ratio);
+ method public float getCenter();
+ method public float getEnd();
+ method public float getStart();
+ property public final float Center;
+ property public final float End;
+ property public final float Start;
+ }
+
+ @kotlin.jvm.JvmInline public static final value class CurvedAlignment.Radial {
+ field public static final androidx.wear.compose.foundation.CurvedAlignment.Radial.Companion Companion;
+ }
+
+ public static final class CurvedAlignment.Radial.Companion {
+ method public float Custom(float ratio);
+ method public float getCenter();
+ method public float getInner();
+ method public float getOuter();
+ property public final float Center;
+ property public final float Inner;
+ property public final float Outer;
+ }
+
+ public final class CurvedColumnKt {
+ method public static void curvedColumn(androidx.wear.compose.foundation.CurvedScope, optional androidx.wear.compose.foundation.CurvedModifier modifier, optional androidx.wear.compose.foundation.CurvedDirection.Radial? radialDirection, optional androidx.wear.compose.foundation.CurvedAlignment.Angular? angularAlignment, kotlin.jvm.functions.Function1<? super androidx.wear.compose.foundation.CurvedScope,kotlin.Unit> contentBuilder);
+ }
+
+ public final class CurvedComposableKt {
+ method public static void curvedComposable(androidx.wear.compose.foundation.CurvedScope, optional androidx.wear.compose.foundation.CurvedModifier modifier, optional float radialAlignment, kotlin.jvm.functions.Function1<? super androidx.compose.foundation.layout.BoxScope,kotlin.Unit> content);
+ }
+
+ public interface CurvedDirection {
+ }
+
+ @androidx.compose.runtime.Immutable @kotlin.jvm.JvmInline public static final value class CurvedDirection.Angular {
+ field public static final androidx.wear.compose.foundation.CurvedDirection.Angular.Companion Companion;
+ }
+
+ public static final class CurvedDirection.Angular.Companion {
+ method public int getClockwise();
+ method public int getCounterClockwise();
+ method public int getNormal();
+ method public int getReversed();
+ property public final int Clockwise;
+ property public final int CounterClockwise;
+ property public final int Normal;
+ property public final int Reversed;
+ }
+
+ @androidx.compose.runtime.Immutable @kotlin.jvm.JvmInline public static final value class CurvedDirection.Radial {
+ field public static final androidx.wear.compose.foundation.CurvedDirection.Radial.Companion Companion;
+ }
+
+ public static final class CurvedDirection.Radial.Companion {
+ method public int getInsideOut();
+ method public int getOutsideIn();
+ property public final int InsideOut;
+ property public final int OutsideIn;
+ }
+
+ public final class CurvedDrawKt {
+ method public static androidx.wear.compose.foundation.CurvedModifier angularGradientBackground(androidx.wear.compose.foundation.CurvedModifier, kotlin.Pair<java.lang.Float,androidx.compose.ui.graphics.Color>![] colorStops, optional int cap);
+ method public static androidx.wear.compose.foundation.CurvedModifier angularGradientBackground(androidx.wear.compose.foundation.CurvedModifier, java.util.List<androidx.compose.ui.graphics.Color> colors, optional int cap);
+ method public static androidx.wear.compose.foundation.CurvedModifier background(androidx.wear.compose.foundation.CurvedModifier, long color, optional int cap);
+ method public static androidx.wear.compose.foundation.CurvedModifier radialGradientBackground(androidx.wear.compose.foundation.CurvedModifier, kotlin.Pair<java.lang.Float,androidx.compose.ui.graphics.Color>![] colorStops, optional int cap);
+ method public static androidx.wear.compose.foundation.CurvedModifier radialGradientBackground(androidx.wear.compose.foundation.CurvedModifier, java.util.List<androidx.compose.ui.graphics.Color> colors, optional int cap);
+ }
+
+ public final class CurvedLayoutKt {
+ method @androidx.compose.runtime.Composable public static void CurvedLayout(optional androidx.compose.ui.Modifier modifier, optional float anchor, optional float anchorType, optional androidx.wear.compose.foundation.CurvedAlignment.Radial? radialAlignment, optional int angularDirection, kotlin.jvm.functions.Function1<? super androidx.wear.compose.foundation.CurvedScope,kotlin.Unit> contentBuilder);
+ }
+
+ @androidx.compose.runtime.Stable public sealed interface CurvedModifier {
+ method public default infix androidx.wear.compose.foundation.CurvedModifier then(androidx.wear.compose.foundation.CurvedModifier other);
+ field public static final androidx.wear.compose.foundation.CurvedModifier.Companion Companion;
+ }
+
+ public static final class CurvedModifier.Companion implements androidx.wear.compose.foundation.CurvedModifier {
+ }
+
+ public final class CurvedModifierKt {
+ }
+
+ public final class CurvedPaddingKt {
+ method public static androidx.wear.compose.foundation.ArcPaddingValues ArcPaddingValues(optional float outer, optional float inner, optional float before, optional float after);
+ method public static androidx.wear.compose.foundation.ArcPaddingValues ArcPaddingValues(float all);
+ method public static androidx.wear.compose.foundation.ArcPaddingValues ArcPaddingValues(optional float radial, optional float angular);
+ method public static androidx.wear.compose.foundation.CurvedModifier padding(androidx.wear.compose.foundation.CurvedModifier, androidx.wear.compose.foundation.ArcPaddingValues paddingValues);
+ method public static androidx.wear.compose.foundation.CurvedModifier padding(androidx.wear.compose.foundation.CurvedModifier, float outer, float inner, float before, float after);
+ method public static androidx.wear.compose.foundation.CurvedModifier padding(androidx.wear.compose.foundation.CurvedModifier, optional float radial, optional float angular);
+ method public static androidx.wear.compose.foundation.CurvedModifier padding(androidx.wear.compose.foundation.CurvedModifier, optional float all);
+ }
+
+ public final class CurvedParentDataKt {
+ method public static androidx.wear.compose.foundation.CurvedModifier parentDataModifier(androidx.wear.compose.foundation.CurvedModifier, kotlin.jvm.functions.Function1<java.lang.Object,?> modifyParentData);
+ method public static androidx.wear.compose.foundation.CurvedModifier weight(androidx.wear.compose.foundation.CurvedModifier, float weight);
+ }
+
+ public final class CurvedRowKt {
+ method public static void curvedRow(androidx.wear.compose.foundation.CurvedScope, optional androidx.wear.compose.foundation.CurvedModifier modifier, optional androidx.wear.compose.foundation.CurvedAlignment.Radial? radialAlignment, optional androidx.wear.compose.foundation.CurvedDirection.Angular? angularDirection, kotlin.jvm.functions.Function1<? super androidx.wear.compose.foundation.CurvedScope,kotlin.Unit> contentBuilder);
+ }
+
+ @androidx.compose.foundation.layout.LayoutScopeMarker public final class CurvedScope {
+ }
+
+ public final class CurvedSizeKt {
+ method public static androidx.wear.compose.foundation.CurvedModifier angularSize(androidx.wear.compose.foundation.CurvedModifier, float sweepDegrees);
+ method public static androidx.wear.compose.foundation.CurvedModifier radialSize(androidx.wear.compose.foundation.CurvedModifier, float thickness);
+ method public static androidx.wear.compose.foundation.CurvedModifier size(androidx.wear.compose.foundation.CurvedModifier, float sweepDegrees, float thickness);
+ method public static androidx.wear.compose.foundation.CurvedModifier sizeIn(androidx.wear.compose.foundation.CurvedModifier, optional float minSweepDegrees, optional float maxSweepDegrees, optional float minThickness, optional float maxThickness);
+ }
+
+ public final class CurvedTextStyle {
+ ctor public CurvedTextStyle(optional long background, optional long color, optional long fontSize);
+ ctor public CurvedTextStyle(androidx.compose.ui.text.TextStyle style);
+ method public androidx.wear.compose.foundation.CurvedTextStyle copy(optional long background, optional long color, optional long fontSize);
+ method public operator boolean equals(Object? other);
+ method public long getBackground();
+ method public long getColor();
+ method public long getFontSize();
+ method public androidx.wear.compose.foundation.CurvedTextStyle merge(optional androidx.wear.compose.foundation.CurvedTextStyle? other);
+ method public operator androidx.wear.compose.foundation.CurvedTextStyle plus(androidx.wear.compose.foundation.CurvedTextStyle other);
+ property public final long background;
+ property public final long color;
+ property public final long fontSize;
+ }
+
+ public final class CurvedTextStyleKt {
+ }
+
+}
+
diff --git a/wear/compose/compose-foundation/build.gradle b/wear/compose/compose-foundation/build.gradle
index 02a5602..785edf3 100644
--- a/wear/compose/compose-foundation/build.gradle
+++ b/wear/compose/compose-foundation/build.gradle
@@ -102,6 +102,8 @@
}
// Use Robolectric 4.+
testOptions.unitTests.includeAndroidResources = true
+ sourceSets.androidTest.assets.srcDirs +=
+ project.rootDir.absolutePath + "/../../golden/wear/compose/foundation"
namespace "androidx.wear.compose.foundation"
}
diff --git a/wear/compose/compose-foundation/src/androidAndroidTest/kotlin/androidx/wear/compose/foundation/CurvedScreenshotTest.kt b/wear/compose/compose-foundation/src/androidAndroidTest/kotlin/androidx/wear/compose/foundation/CurvedScreenshotTest.kt
new file mode 100644
index 0000000..7dcec87
--- /dev/null
+++ b/wear/compose/compose-foundation/src/androidAndroidTest/kotlin/androidx/wear/compose/foundation/CurvedScreenshotTest.kt
@@ -0,0 +1,265 @@
+/*
+ * Copyright 2021 The Android Open Source Project
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package androidx.wear.compose.foundation
+
+import android.os.Build
+import androidx.compose.foundation.background
+import androidx.compose.foundation.layout.Box
+import androidx.compose.foundation.layout.BoxScope
+import androidx.compose.foundation.layout.Column
+import androidx.compose.foundation.layout.Spacer
+import androidx.compose.foundation.layout.fillMaxSize
+import androidx.compose.foundation.layout.size
+import androidx.compose.foundation.text.BasicText
+import androidx.compose.runtime.Composable
+import androidx.compose.runtime.CompositionLocalProvider
+import androidx.compose.testutils.assertAgainstGolden
+import androidx.compose.ui.Modifier
+import androidx.compose.ui.graphics.Color
+import androidx.compose.ui.platform.LocalLayoutDirection
+import androidx.compose.ui.platform.testTag
+import androidx.compose.ui.test.captureToImage
+import androidx.compose.ui.test.junit4.createComposeRule
+import androidx.compose.ui.test.onNodeWithTag
+import androidx.compose.ui.unit.LayoutDirection
+import androidx.compose.ui.unit.dp
+import androidx.compose.ui.unit.sp
+import androidx.test.ext.junit.runners.AndroidJUnit4
+import androidx.test.filters.MediumTest
+import androidx.test.filters.SdkSuppress
+import androidx.test.screenshot.AndroidXScreenshotTestRule
+import org.junit.Rule
+import org.junit.Test
+import org.junit.rules.TestName
+import org.junit.runner.RunWith
+
+@MediumTest
+@RunWith(AndroidJUnit4::class)
+@SdkSuppress(minSdkVersion = Build.VERSION_CODES.O)
+class CurvedScreenshotTest {
+
+ @get:Rule
+ val rule = createComposeRule()
+
+ @get:Rule
+ val screenshotRule = AndroidXScreenshotTestRule(SCREENSHOT_GOLDEN_PATH)
+
+ @get:Rule
+ val testName = TestName()
+
+ @Test
+ fun curved_row_and_column() = verify_screenshot {
+ curvedColumn(CurvedModifier.background(Color.Red)) {
+ basicCurvedText("A")
+ basicCurvedText("B")
+ basicCurvedText("C")
+ }
+ basicCurvedText("D", CurvedModifier.background(Color.Green))
+ curvedColumn(CurvedModifier.background(Color.Blue)) {
+ basicCurvedText("E")
+ curvedRow {
+ basicCurvedText("F")
+ basicCurvedText("G")
+ basicCurvedText("H")
+ }
+ basicCurvedText("I")
+ }
+ }
+
+ @Test
+ fun curved_backgrounds() = verify_screenshot {
+ val size = 0.15f
+ val rgb = listOf(Color.Red, Color.Green, Color.Blue)
+ curvedColumn(
+ CurvedModifier.size(sweepDegrees = 20f, thickness = 30.dp)
+ .radialGradientBackground(rgb)
+ ) { }
+ curvedColumn(
+ CurvedModifier.size(sweepDegrees = 20f, thickness = 30.dp)
+ .radialGradientBackground(
+ (0.5f - size) to Color.Red,
+ 0.5f to Color.Blue,
+ (0.5f + size) to Color.Red,
+ )
+ ) { }
+ curvedColumn(
+ CurvedModifier.size(sweepDegrees = 20f, thickness = 30.dp)
+ .angularGradientBackground(rgb)
+ ) { }
+ curvedColumn(
+ CurvedModifier.size(sweepDegrees = 20f, thickness = 30.dp)
+ .angularGradientBackground(
+ (0.5f - size) to Color.Red,
+ 0.5f to Color.Blue,
+ (0.5f + size) to Color.Red,
+ )
+ ) { }
+ }
+
+ @Test
+ fun curved_padding() = verify_screenshot {
+ basicCurvedText(
+ "Text",
+ CurvedModifier.background(Color.Red).padding(3.dp)
+ .background(Color.Green).padding(angular = 5.dp)
+ .background(Color.Blue).padding(radial = 4.dp)
+ )
+ }
+
+ @Test
+ fun curved_plus_composables() = verify_screenshot {
+ curvedRow(CurvedModifier.background(Color.Green)) {
+ curvedComposable {
+ Column {
+ Box(Modifier.size(15.dp).background(Color.Red))
+ BasicText("Text")
+ Box(Modifier.size(15.dp).background(Color.Red))
+ }
+ }
+ curvedComposable {
+ Box(Modifier.size(15.dp).background(Color.Blue))
+ }
+ }
+ }
+
+ @Test
+ fun curved_alignment() = verify_screenshot {
+ listOf(
+ CurvedAlignment.Angular.Start,
+ CurvedAlignment.Angular.Center,
+ CurvedAlignment.Angular.End
+ ).forEachIndexed { ix, align ->
+ curvedColumn(
+ CurvedModifier.angularSize(45f)
+ .angularGradientBackground(listOf(Color.Red, Color.Green)),
+ angularAlignment = align
+ ) {
+ curvedComposable { Box(Modifier.size(15.dp).background(Color.Blue)) }
+ basicCurvedText(listOf("Start", "Center", "End")[ix])
+ }
+ }
+ curvedColumn(
+ CurvedModifier.angularSize(45f)
+ ) {
+ listOf(
+ CurvedAlignment.Radial.Inner,
+ CurvedAlignment.Radial.Center,
+ CurvedAlignment.Radial.Outer,
+ ).forEachIndexed { ix, align ->
+ curvedRow(
+ CurvedModifier.size(45f, 20.dp)
+ .radialGradientBackground(listOf(Color.Red, Color.Green)),
+ radialAlignment = align
+ ) {
+ curvedComposable { Box(Modifier.size(10.dp).background(Color.Blue)) }
+ basicCurvedText(
+ listOf("Inner", "Center", "Outer")[ix],
+ style = CurvedTextStyle(fontSize = 10.sp)
+ )
+ }
+ }
+ }
+ }
+
+ @Test
+ public fun layout_direction_rtl() = layout_direction(LayoutDirection.Rtl)
+
+ @Test
+ public fun layout_direction_ltr() = layout_direction(LayoutDirection.Ltr)
+
+ private fun layout_direction(layoutDirection: LayoutDirection) = verify_composable_screenshot {
+ CompositionLocalProvider(LocalLayoutDirection provides layoutDirection) {
+ CurvedLayout(
+ Modifier.fillMaxSize(),
+ angularDirection = CurvedDirection.Angular.Clockwise
+ ) {
+ curvedRow(
+ CurvedModifier.background(Color.Green),
+ angularDirection = CurvedDirection.Angular.Normal
+ ) {
+ layout_direction_block()
+ }
+ curvedComposable { Spacer(Modifier.size(10.dp)) }
+ curvedRow(
+ CurvedModifier.background(Color.Red),
+ angularDirection = CurvedDirection.Angular.Clockwise
+ ) {
+ layout_direction_block()
+ }
+ }
+
+ CurvedLayout(
+ Modifier.fillMaxSize(),
+ anchor = 90f,
+ angularDirection = CurvedDirection.Angular.CounterClockwise
+ ) {
+ curvedRow(
+ CurvedModifier.background(Color.Green),
+ angularDirection = CurvedDirection.Angular.Reversed
+ ) {
+ layout_direction_block()
+ }
+ curvedComposable { Spacer(Modifier.size(10.dp)) }
+ curvedRow(
+ CurvedModifier.background(Color.Red),
+ angularDirection = CurvedDirection.Angular.CounterClockwise
+ ) {
+ layout_direction_block()
+ }
+ }
+ }
+ }
+
+ private fun CurvedScope.layout_direction_block() {
+ basicCurvedText("A")
+ curvedColumn {
+ basicCurvedText("B")
+ basicCurvedText("C")
+ }
+ curvedColumn(radialDirection = CurvedDirection.Radial.OutsideIn) {
+ basicCurvedText("D")
+ basicCurvedText("E")
+ }
+ curvedColumn(radialDirection = CurvedDirection.Radial.InsideOut) {
+ basicCurvedText("F")
+ basicCurvedText("G")
+ }
+ basicCurvedText("H")
+ }
+
+ private fun verify_screenshot(contentBuilder: CurvedScope.() -> Unit) =
+ verify_composable_screenshot(content = {
+ CurvedLayout(
+ modifier = Modifier.fillMaxSize(),
+ contentBuilder = contentBuilder
+ )
+ })
+
+ private fun verify_composable_screenshot(content: @Composable BoxScope.() -> Unit) {
+ rule.setContent {
+ Box(
+ modifier = Modifier.size(200.dp).background(Color.White).testTag(TEST_TAG),
+ content = content
+ )
+ }
+
+ rule.onNodeWithTag(TEST_TAG)
+ .captureToImage()
+ .assertAgainstGolden(screenshotRule, testName.methodName)
+ }
+}
+
+internal const val SCREENSHOT_GOLDEN_PATH = "wear/compose/foundation"
\ No newline at end of file
diff --git a/wear/compose/compose-foundation/src/commonMain/kotlin/androidx/wear/compose/foundation/CurvedDraw.kt b/wear/compose/compose-foundation/src/commonMain/kotlin/androidx/wear/compose/foundation/CurvedDraw.kt
index d0df695..28421be 100644
--- a/wear/compose/compose-foundation/src/commonMain/kotlin/androidx/wear/compose/foundation/CurvedDraw.kt
+++ b/wear/compose/compose-foundation/src/commonMain/kotlin/androidx/wear/compose/foundation/CurvedDraw.kt
@@ -56,7 +56,9 @@
Brush.radialGradient(
*(colorStops.map { (step, color) ->
1f - step * (1f - radiusRatio) to color
- }.reversed().toTypedArray())
+ }.reversed().toTypedArray()),
+ center = layoutInfo.centerOffset,
+ radius = layoutInfo.outerRadius
)
}
diff --git a/wear/compose/compose-material/api/1.0.0-beta02.txt b/wear/compose/compose-material/api/1.0.0-beta02.txt
new file mode 100644
index 0000000..e8eb66d
--- /dev/null
+++ b/wear/compose/compose-material/api/1.0.0-beta02.txt
@@ -0,0 +1,706 @@
+// Signature format: 4.0
+package androidx.wear.compose.material {
+
+ @androidx.compose.runtime.Immutable public final class AutoCenteringParams {
+ ctor public AutoCenteringParams(optional int itemIndex, optional int itemOffset);
+ }
+
+ @androidx.compose.runtime.Stable public interface ButtonColors {
+ method @androidx.compose.runtime.Composable public androidx.compose.runtime.State<androidx.compose.ui.graphics.Color> backgroundColor(boolean enabled);
+ method @androidx.compose.runtime.Composable public androidx.compose.runtime.State<androidx.compose.ui.graphics.Color> contentColor(boolean enabled);
+ }
+
+ public final class ButtonDefaults {
+ method @androidx.compose.runtime.Composable public androidx.wear.compose.material.ButtonColors buttonColors(optional long backgroundColor, optional long contentColor, optional long disabledBackgroundColor, optional long disabledContentColor);
+ method public float getCompactButtonBackgroundPadding();
+ method public float getDefaultButtonSize();
+ method public float getDefaultIconSize();
+ method public float getExtraSmallButtonSize();
+ method public float getLargeButtonSize();
+ method public float getLargeIconSize();
+ method public float getSmallButtonSize();
+ method public float getSmallIconSize();
+ method @androidx.compose.runtime.Composable public androidx.wear.compose.material.ButtonColors iconButtonColors(optional long contentColor);
+ method @androidx.compose.runtime.Composable public androidx.wear.compose.material.ButtonColors primaryButtonColors(optional long backgroundColor, optional long contentColor);
+ method @androidx.compose.runtime.Composable public androidx.wear.compose.material.ButtonColors secondaryButtonColors(optional long backgroundColor, optional long contentColor);
+ property public final float CompactButtonBackgroundPadding;
+ property public final float DefaultButtonSize;
+ property public final float DefaultIconSize;
+ property public final float ExtraSmallButtonSize;
+ property public final float LargeButtonSize;
+ property public final float LargeIconSize;
+ property public final float SmallButtonSize;
+ property public final float SmallIconSize;
+ field public static final androidx.wear.compose.material.ButtonDefaults INSTANCE;
+ }
+
+ public final class ButtonKt {
+ method @androidx.compose.runtime.Composable public static void Button(kotlin.jvm.functions.Function0<kotlin.Unit> onClick, optional androidx.compose.ui.Modifier modifier, optional boolean enabled, optional androidx.wear.compose.material.ButtonColors colors, optional androidx.compose.foundation.interaction.MutableInteractionSource interactionSource, kotlin.jvm.functions.Function1<? super androidx.compose.foundation.layout.BoxScope,kotlin.Unit> content);
+ method @androidx.compose.runtime.Composable public static void CompactButton(kotlin.jvm.functions.Function0<kotlin.Unit> onClick, optional androidx.compose.ui.Modifier modifier, optional boolean enabled, optional androidx.wear.compose.material.ButtonColors colors, optional float backgroundPadding, optional androidx.compose.foundation.interaction.MutableInteractionSource interactionSource, kotlin.jvm.functions.Function1<? super androidx.compose.foundation.layout.BoxScope,kotlin.Unit> content);
+ }
+
+ public final class CardDefaults {
+ method @androidx.compose.runtime.Composable public androidx.compose.ui.graphics.painter.Painter cardBackgroundPainter(optional long startBackgroundColor, optional long endBackgroundColor, optional androidx.compose.ui.unit.LayoutDirection gradientDirection);
+ method public float getAppImageSize();
+ method public androidx.compose.foundation.layout.PaddingValues getContentPadding();
+ method @androidx.compose.runtime.Composable public androidx.compose.ui.graphics.painter.Painter imageWithScrimBackgroundPainter(androidx.compose.ui.graphics.painter.Painter backgroundImagePainter, optional androidx.compose.ui.graphics.Brush backgroundImageScrimBrush);
+ property public final float AppImageSize;
+ property public final androidx.compose.foundation.layout.PaddingValues ContentPadding;
+ field public static final androidx.wear.compose.material.CardDefaults INSTANCE;
+ }
+
+ public final class CardKt {
+ method @androidx.compose.runtime.Composable public static void AppCard(kotlin.jvm.functions.Function0<kotlin.Unit> onClick, kotlin.jvm.functions.Function1<? super androidx.compose.foundation.layout.RowScope,kotlin.Unit> appName, kotlin.jvm.functions.Function1<? super androidx.compose.foundation.layout.RowScope,kotlin.Unit> time, kotlin.jvm.functions.Function1<? super androidx.compose.foundation.layout.RowScope,kotlin.Unit> title, optional androidx.compose.ui.Modifier modifier, optional boolean enabled, optional kotlin.jvm.functions.Function1<? super androidx.compose.foundation.layout.RowScope,kotlin.Unit>? appImage, optional androidx.compose.ui.graphics.painter.Painter backgroundPainter, optional long contentColor, optional long appColor, optional long timeColor, optional long titleColor, kotlin.jvm.functions.Function1<? super androidx.compose.foundation.layout.ColumnScope,kotlin.Unit> content);
+ method @androidx.compose.runtime.Composable public static void Card(kotlin.jvm.functions.Function0<kotlin.Unit> onClick, optional androidx.compose.ui.Modifier modifier, optional androidx.compose.ui.graphics.painter.Painter backgroundPainter, optional long contentColor, optional boolean enabled, optional androidx.compose.foundation.layout.PaddingValues contentPadding, optional androidx.compose.ui.graphics.Shape shape, optional androidx.compose.foundation.interaction.MutableInteractionSource interactionSource, optional androidx.compose.ui.semantics.Role? role, kotlin.jvm.functions.Function1<? super androidx.compose.foundation.layout.ColumnScope,kotlin.Unit> content);
+ method @androidx.compose.runtime.Composable public static void TitleCard(kotlin.jvm.functions.Function0<kotlin.Unit> onClick, kotlin.jvm.functions.Function1<? super androidx.compose.foundation.layout.RowScope,kotlin.Unit> title, optional androidx.compose.ui.Modifier modifier, optional boolean enabled, optional kotlin.jvm.functions.Function1<? super androidx.compose.foundation.layout.RowScope,kotlin.Unit>? time, optional androidx.compose.ui.graphics.painter.Painter backgroundPainter, optional long contentColor, optional long titleColor, optional long timeColor, kotlin.jvm.functions.Function1<? super androidx.compose.foundation.layout.ColumnScope,kotlin.Unit> content);
+ }
+
+ @androidx.compose.runtime.Stable public interface ChipColors {
+ method @androidx.compose.runtime.Composable public androidx.compose.runtime.State<androidx.compose.ui.graphics.painter.Painter> background(boolean enabled);
+ method @androidx.compose.runtime.Composable public androidx.compose.runtime.State<androidx.compose.ui.graphics.Color> contentColor(boolean enabled);
+ method @androidx.compose.runtime.Composable public androidx.compose.runtime.State<androidx.compose.ui.graphics.Color> iconColor(boolean enabled);
+ method @androidx.compose.runtime.Composable public androidx.compose.runtime.State<androidx.compose.ui.graphics.Color> secondaryContentColor(boolean enabled);
+ }
+
+ public final class ChipDefaults {
+ method @androidx.compose.runtime.Composable public androidx.wear.compose.material.ChipColors childChipColors(optional long contentColor, optional long secondaryContentColor, optional long iconColor);
+ method @androidx.compose.runtime.Composable public androidx.wear.compose.material.ChipColors chipColors(optional long backgroundColor, optional long contentColor, optional long secondaryContentColor, optional long iconColor, optional long disabledBackgroundColor, optional long disabledContentColor, optional long disabledSecondaryContentColor, optional long disabledIconColor);
+ method public androidx.compose.foundation.layout.PaddingValues getCompactChipContentPadding();
+ method public androidx.compose.foundation.layout.PaddingValues getContentPadding();
+ method public float getIconSize();
+ method public float getLargeIconSize();
+ method public float getSmallIconSize();
+ method @androidx.compose.runtime.Composable public androidx.wear.compose.material.ChipColors gradientBackgroundChipColors(optional long startBackgroundColor, optional long endBackgroundColor, optional long contentColor, optional long secondaryContentColor, optional long iconColor, optional androidx.compose.ui.unit.LayoutDirection gradientDirection);
+ method @androidx.compose.runtime.Composable public androidx.wear.compose.material.ChipColors imageBackgroundChipColors(androidx.compose.ui.graphics.painter.Painter backgroundImagePainter, optional androidx.compose.ui.graphics.Brush backgroundImageScrimBrush, optional long contentColor, optional long secondaryContentColor, optional long iconColor);
+ method @androidx.compose.runtime.Composable public androidx.wear.compose.material.ChipColors primaryChipColors(optional long backgroundColor, optional long contentColor, optional long secondaryContentColor, optional long iconColor);
+ method @androidx.compose.runtime.Composable public androidx.wear.compose.material.ChipColors secondaryChipColors(optional long backgroundColor, optional long contentColor, optional long secondaryContentColor, optional long iconColor);
+ property public final androidx.compose.foundation.layout.PaddingValues CompactChipContentPadding;
+ property public final androidx.compose.foundation.layout.PaddingValues ContentPadding;
+ property public final float IconSize;
+ property public final float LargeIconSize;
+ property public final float SmallIconSize;
+ field public static final androidx.wear.compose.material.ChipDefaults INSTANCE;
+ }
+
+ public final class ChipKt {
+ method @androidx.compose.runtime.Composable public static void Chip(kotlin.jvm.functions.Function0<kotlin.Unit> onClick, androidx.wear.compose.material.ChipColors colors, optional androidx.compose.ui.Modifier modifier, optional boolean enabled, optional androidx.compose.foundation.layout.PaddingValues contentPadding, optional androidx.compose.ui.graphics.Shape shape, optional androidx.compose.foundation.interaction.MutableInteractionSource interactionSource, optional androidx.compose.ui.semantics.Role? role, kotlin.jvm.functions.Function1<? super androidx.compose.foundation.layout.RowScope,kotlin.Unit> content);
+ method @androidx.compose.runtime.Composable public static void Chip(kotlin.jvm.functions.Function1<? super androidx.compose.foundation.layout.RowScope,kotlin.Unit> label, kotlin.jvm.functions.Function0<kotlin.Unit> onClick, optional androidx.compose.ui.Modifier modifier, optional kotlin.jvm.functions.Function1<? super androidx.compose.foundation.layout.RowScope,kotlin.Unit>? secondaryLabel, optional kotlin.jvm.functions.Function1<? super androidx.compose.foundation.layout.BoxScope,kotlin.Unit>? icon, optional androidx.wear.compose.material.ChipColors colors, optional boolean enabled, optional androidx.compose.foundation.interaction.MutableInteractionSource interactionSource, optional androidx.compose.foundation.layout.PaddingValues contentPadding);
+ method @androidx.compose.runtime.Composable public static void CompactChip(kotlin.jvm.functions.Function0<kotlin.Unit> onClick, optional androidx.compose.ui.Modifier modifier, optional kotlin.jvm.functions.Function1<? super androidx.compose.foundation.layout.RowScope,kotlin.Unit>? label, optional kotlin.jvm.functions.Function1<? super androidx.compose.foundation.layout.BoxScope,kotlin.Unit>? icon, optional androidx.wear.compose.material.ChipColors colors, optional boolean enabled, optional androidx.compose.foundation.interaction.MutableInteractionSource interactionSource, optional androidx.compose.foundation.layout.PaddingValues contentPadding);
+ }
+
+ @androidx.compose.runtime.Stable public final class Colors {
+ ctor public Colors(optional long primary, optional long primaryVariant, optional long secondary, optional long secondaryVariant, optional long background, optional long surface, optional long error, optional long onPrimary, optional long onSecondary, optional long onBackground, optional long onSurface, optional long onSurfaceVariant, optional long onError);
+ method public androidx.wear.compose.material.Colors copy(optional long primary, optional long primaryVariant, optional long secondary, optional long secondaryVariant, optional long background, optional long surface, optional long error, optional long onPrimary, optional long onSecondary, optional long onBackground, optional long onSurface, optional long onSurfaceVariant, optional long onError);
+ 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 getOnSurfaceVariant();
+ method public long getPrimary();
+ method public long getPrimaryVariant();
+ method public long getSecondary();
+ method public long getSecondaryVariant();
+ method public long getSurface();
+ property public final long background;
+ property public final long error;
+ property public final long onBackground;
+ property public final long onError;
+ property public final long onPrimary;
+ property public final long onSecondary;
+ property public final long onSurface;
+ property public final long onSurfaceVariant;
+ property public final long primary;
+ property public final long primaryVariant;
+ property public final long secondary;
+ property public final long secondaryVariant;
+ property public final long surface;
+ }
+
+ public final class ColorsKt {
+ method public static long contentColorFor(androidx.wear.compose.material.Colors, long backgroundColor);
+ method @androidx.compose.runtime.Composable @androidx.compose.runtime.ReadOnlyComposable public static long contentColorFor(long backgroundColor);
+ }
+
+ public final class ContentAlpha {
+ method @androidx.compose.runtime.Composable public float getDisabled();
+ method @androidx.compose.runtime.Composable public float getHigh();
+ method @androidx.compose.runtime.Composable public float getMedium();
+ property @androidx.compose.runtime.Composable public final float disabled;
+ property @androidx.compose.runtime.Composable public final float high;
+ property @androidx.compose.runtime.Composable public final float medium;
+ field public static final androidx.wear.compose.material.ContentAlpha INSTANCE;
+ }
+
+ public final class ContentAlphaKt {
+ method public static androidx.compose.runtime.ProvidableCompositionLocal<java.lang.Float> getLocalContentAlpha();
+ property public static final androidx.compose.runtime.ProvidableCompositionLocal<java.lang.Float> LocalContentAlpha;
+ }
+
+ public final class ContentColorKt {
+ method public static androidx.compose.runtime.ProvidableCompositionLocal<androidx.compose.ui.graphics.Color> getLocalContentColor();
+ property public static final androidx.compose.runtime.ProvidableCompositionLocal<androidx.compose.ui.graphics.Color> LocalContentColor;
+ }
+
+ public final class CurvedTextKt {
+ method public static void curvedText(androidx.wear.compose.foundation.CurvedScope, String text, optional androidx.wear.compose.foundation.CurvedModifier modifier, optional long background, optional long color, optional long fontSize, optional androidx.wear.compose.foundation.CurvedTextStyle? style, optional androidx.wear.compose.foundation.CurvedDirection.Angular? angularDirection, optional int overflow);
+ }
+
+ public final class DefaultTimeSourceKt {
+ }
+
+ public final class HorizontalPageIndicatorKt {
+ method @androidx.compose.runtime.Composable public static void HorizontalPageIndicator(androidx.wear.compose.material.PageIndicatorState pageIndicatorState, optional androidx.compose.ui.Modifier modifier, optional int indicatorStyle, optional long selectedColor, optional long unselectedColor, optional float indicatorSize, optional float spacing, optional androidx.compose.ui.graphics.Shape indicatorShape);
+ }
+
+ public final class IconKt {
+ method @androidx.compose.runtime.Composable public static void Icon(androidx.compose.ui.graphics.vector.ImageVector imageVector, String? contentDescription, optional androidx.compose.ui.Modifier modifier, optional long tint);
+ method @androidx.compose.runtime.Composable public static void Icon(androidx.compose.ui.graphics.ImageBitmap bitmap, String? contentDescription, optional androidx.compose.ui.Modifier modifier, optional long tint);
+ method @androidx.compose.runtime.Composable public static void Icon(androidx.compose.ui.graphics.painter.Painter painter, String? contentDescription, optional androidx.compose.ui.Modifier modifier, optional long tint);
+ }
+
+ @androidx.compose.runtime.Stable public interface InlineSliderColors {
+ method @androidx.compose.runtime.Composable public androidx.compose.runtime.State<androidx.compose.ui.graphics.Color> backgroundColor(boolean enabled);
+ method @androidx.compose.runtime.Composable public androidx.compose.runtime.State<androidx.compose.ui.graphics.Color> barColor(boolean enabled, boolean selected);
+ method @androidx.compose.runtime.Composable public androidx.compose.runtime.State<androidx.compose.ui.graphics.Color> spacerColor(boolean enabled);
+ }
+
+ public final class InlineSliderDefaults {
+ method @androidx.compose.runtime.Composable public androidx.wear.compose.material.InlineSliderColors colors(optional long backgroundColor, optional long spacerColor, optional long selectedBarColor, optional long unselectedBarColor, optional long disabledBackgroundColor, optional long disabledSpacerColor, optional long disabledSelectedBarColor, optional long disabledUnselectedBarColor);
+ method public androidx.compose.ui.graphics.vector.ImageVector getDecrease();
+ method public androidx.compose.ui.graphics.vector.ImageVector getIncrease();
+ property public final androidx.compose.ui.graphics.vector.ImageVector Decrease;
+ property public final androidx.compose.ui.graphics.vector.ImageVector Increase;
+ field public static final androidx.wear.compose.material.InlineSliderDefaults INSTANCE;
+ }
+
+ public final class ListHeaderKt {
+ method @androidx.compose.runtime.Composable public static void ListHeader(optional androidx.compose.ui.Modifier modifier, optional long backgroundColor, optional long contentColor, kotlin.jvm.functions.Function1<? super androidx.compose.foundation.layout.RowScope,kotlin.Unit> content);
+ }
+
+ public final class MaterialTextSelectionColorsKt {
+ }
+
+ public final class MaterialTheme {
+ method @androidx.compose.runtime.Composable @androidx.compose.runtime.ReadOnlyComposable public androidx.wear.compose.material.Colors getColors();
+ method @androidx.compose.runtime.Composable @androidx.compose.runtime.ReadOnlyComposable public androidx.wear.compose.material.Shapes getShapes();
+ method @androidx.compose.runtime.Composable @androidx.compose.runtime.ReadOnlyComposable public androidx.wear.compose.material.Typography getTypography();
+ property @androidx.compose.runtime.Composable @androidx.compose.runtime.ReadOnlyComposable public final androidx.wear.compose.material.Colors colors;
+ property @androidx.compose.runtime.Composable @androidx.compose.runtime.ReadOnlyComposable public final androidx.wear.compose.material.Shapes shapes;
+ property @androidx.compose.runtime.Composable @androidx.compose.runtime.ReadOnlyComposable public final androidx.wear.compose.material.Typography typography;
+ field public static final androidx.wear.compose.material.MaterialTheme INSTANCE;
+ }
+
+ public final class MaterialThemeKt {
+ method @androidx.compose.runtime.Composable public static void MaterialTheme(optional androidx.wear.compose.material.Colors colors, optional androidx.wear.compose.material.Typography typography, optional androidx.wear.compose.material.Shapes shapes, kotlin.jvm.functions.Function0<kotlin.Unit> content);
+ }
+
+ public final class PageIndicatorDefaults {
+ method @androidx.compose.runtime.Composable public int style();
+ field public static final androidx.wear.compose.material.PageIndicatorDefaults INSTANCE;
+ }
+
+ public interface PageIndicatorState {
+ method public int getPageCount();
+ method public float getPageOffset();
+ method public int getSelectedPage();
+ property public abstract int pageCount;
+ property public abstract float pageOffset;
+ property public abstract int selectedPage;
+ }
+
+ @kotlin.jvm.JvmInline public final value class PageIndicatorStyle {
+ field public static final androidx.wear.compose.material.PageIndicatorStyle.Companion Companion;
+ }
+
+ public static final class PageIndicatorStyle.Companion {
+ method public int getCurved();
+ method public int getLinear();
+ property public final int Curved;
+ property public final int Linear;
+ }
+
+ public final class PickerDefaults {
+ method @androidx.compose.runtime.Composable public androidx.compose.foundation.gestures.FlingBehavior flingBehavior(androidx.wear.compose.material.PickerState state, optional androidx.compose.animation.core.DecayAnimationSpec<java.lang.Float> decay);
+ method public float getDefaultGradientRatio();
+ method public androidx.wear.compose.material.ScalingParams scalingParams(optional float edgeScale, optional float edgeAlpha, optional float minElementHeight, optional float maxElementHeight, optional float minTransitionArea, optional float maxTransitionArea, optional androidx.compose.animation.core.Easing scaleInterpolator, optional kotlin.jvm.functions.Function1<? super androidx.compose.ui.unit.Constraints,java.lang.Integer> viewportVerticalOffsetResolver);
+ property public final float DefaultGradientRatio;
+ field public static final androidx.wear.compose.material.PickerDefaults INSTANCE;
+ }
+
+ public final class PickerKt {
+ method @androidx.compose.runtime.Composable public static void Picker(androidx.wear.compose.material.PickerState state, optional androidx.compose.ui.Modifier modifier, optional boolean readOnly, optional kotlin.jvm.functions.Function1<? super androidx.compose.foundation.layout.BoxScope,kotlin.Unit>? readOnlyLabel, optional androidx.wear.compose.material.ScalingParams scalingParams, optional float separation, optional float gradientRatio, optional long gradientColor, optional androidx.compose.foundation.gestures.FlingBehavior flingBehavior, kotlin.jvm.functions.Function2<? super androidx.wear.compose.material.PickerScope,? super java.lang.Integer,kotlin.Unit> option);
+ method @androidx.compose.runtime.Composable public static androidx.wear.compose.material.PickerState rememberPickerState(int initialNumberOfOptions, optional int initiallySelectedOption, optional boolean repeatItems);
+ }
+
+ public interface PickerScope {
+ method public int getSelectedOption();
+ property public abstract int selectedOption;
+ }
+
+ @androidx.compose.runtime.Stable public final class PickerState implements androidx.compose.foundation.gestures.ScrollableState {
+ ctor public PickerState(int initialNumberOfOptions, optional int initiallySelectedOption, optional boolean repeatItems);
+ method public float dispatchRawDelta(float delta);
+ method public int getNumberOfOptions();
+ method public boolean getRepeatItems();
+ method public int getSelectedOption();
+ method public boolean isScrollInProgress();
+ method public suspend Object? scroll(androidx.compose.foundation.MutatePriority scrollPriority, kotlin.jvm.functions.Function2<? super androidx.compose.foundation.gestures.ScrollScope,? super kotlin.coroutines.Continuation<? super kotlin.Unit>,?> block, kotlin.coroutines.Continuation<? super kotlin.Unit>);
+ method public suspend Object? scrollToOption(int index, kotlin.coroutines.Continuation<? super kotlin.Unit>);
+ method public void setNumberOfOptions(int);
+ property public boolean isScrollInProgress;
+ property public final int numberOfOptions;
+ property public final boolean repeatItems;
+ property public final int selectedOption;
+ field public static final androidx.wear.compose.material.PickerState.Companion Companion;
+ }
+
+ public static final class PickerState.Companion {
+ method public androidx.compose.runtime.saveable.Saver<androidx.wear.compose.material.PickerState,java.lang.Object> getSaver();
+ property public final androidx.compose.runtime.saveable.Saver<androidx.wear.compose.material.PickerState,java.lang.Object> Saver;
+ }
+
+ @kotlin.jvm.JvmInline public final value class PositionIndicatorAlignment {
+ field public static final androidx.wear.compose.material.PositionIndicatorAlignment.Companion Companion;
+ }
+
+ public static final class PositionIndicatorAlignment.Companion {
+ method public int getEnd();
+ method public int getLeft();
+ method public int getOppositeRsb();
+ method public int getRight();
+ property public final int End;
+ property public final int Left;
+ property public final int OppositeRsb;
+ property public final int Right;
+ }
+
+ public final class PositionIndicatorKt {
+ method @androidx.compose.runtime.Composable public static void PositionIndicator(androidx.compose.foundation.ScrollState scrollState, optional androidx.compose.ui.Modifier modifier, optional boolean reverseDirection);
+ method @androidx.compose.runtime.Composable public static void PositionIndicator(androidx.wear.compose.material.ScalingLazyListState scalingLazyListState, optional androidx.compose.ui.Modifier modifier, optional boolean reverseDirection);
+ method @androidx.compose.runtime.Composable public static void PositionIndicator(androidx.compose.foundation.lazy.LazyListState lazyListState, optional androidx.compose.ui.Modifier modifier, optional boolean reverseDirection);
+ method @androidx.compose.runtime.Composable public static void PositionIndicator(kotlin.jvm.functions.Function0<java.lang.Float> value, optional androidx.compose.ui.Modifier modifier, optional kotlin.ranges.ClosedFloatingPointRange<java.lang.Float> range, optional long color, optional boolean reverseDirection, optional int position);
+ method @androidx.compose.runtime.Composable public static void PositionIndicator(androidx.wear.compose.material.PositionIndicatorState state, float indicatorHeight, float indicatorWidth, float paddingHorizontal, optional androidx.compose.ui.Modifier modifier, optional long background, optional long color, optional boolean reverseDirection, optional int position);
+ }
+
+ @androidx.compose.runtime.Stable public interface PositionIndicatorState {
+ method public float getPositionFraction();
+ method public float sizeFraction(float scrollableContainerSizePx);
+ method public int visibility(float scrollableContainerSizePx);
+ property public abstract float positionFraction;
+ }
+
+ @kotlin.jvm.JvmInline public final value class PositionIndicatorVisibility {
+ field public static final androidx.wear.compose.material.PositionIndicatorVisibility.Companion Companion;
+ }
+
+ public static final class PositionIndicatorVisibility.Companion {
+ method public int getAutoHide();
+ method public int getHide();
+ method public int getShow();
+ property public final int AutoHide;
+ property public final int Hide;
+ property public final int Show;
+ }
+
+ public final class ProgressIndicatorDefaults {
+ method public androidx.compose.animation.core.SpringSpec<java.lang.Float> getProgressAnimationSpec();
+ method public float getStrokeWidth();
+ property public final androidx.compose.animation.core.SpringSpec<java.lang.Float> ProgressAnimationSpec;
+ property public final float StrokeWidth;
+ field public static final androidx.wear.compose.material.ProgressIndicatorDefaults INSTANCE;
+ }
+
+ public final class ProgressIndicatorKt {
+ method @androidx.compose.runtime.Composable public static void CircularProgressIndicator(float progress, optional androidx.compose.ui.Modifier modifier, optional float startAngle, optional float endAngle, optional long indicatorColor, optional long trackColor, optional float strokeWidth);
+ method @androidx.compose.runtime.Composable public static void CircularProgressIndicator(optional androidx.compose.ui.Modifier modifier, optional float startAngle, optional long indicatorColor, optional long trackColor, optional float strokeWidth);
+ }
+
+ public final class RangeDefaultsKt {
+ }
+
+ public final class Resources_androidKt {
+ }
+
+ public final class ScaffoldKt {
+ method @androidx.compose.runtime.Composable public static void Scaffold(optional androidx.compose.ui.Modifier modifier, optional kotlin.jvm.functions.Function0<kotlin.Unit>? vignette, optional kotlin.jvm.functions.Function0<kotlin.Unit>? positionIndicator, optional kotlin.jvm.functions.Function0<kotlin.Unit>? pageIndicator, optional kotlin.jvm.functions.Function0<kotlin.Unit>? timeText, kotlin.jvm.functions.Function0<kotlin.Unit> content);
+ }
+
+ public final class ScalingLazyColumnDefaults {
+ method public androidx.wear.compose.material.ScalingParams scalingParams(optional float edgeScale, optional float edgeAlpha, optional float minElementHeight, optional float maxElementHeight, optional float minTransitionArea, optional float maxTransitionArea, optional androidx.compose.animation.core.Easing scaleInterpolator, optional kotlin.jvm.functions.Function1<? super androidx.compose.ui.unit.Constraints,java.lang.Integer> viewportVerticalOffsetResolver);
+ method @androidx.compose.runtime.Composable public androidx.compose.foundation.gestures.FlingBehavior snapFlingBehavior(androidx.wear.compose.material.ScalingLazyListState state, optional float snapOffset, optional androidx.compose.animation.core.DecayAnimationSpec<java.lang.Float> decay);
+ field public static final androidx.wear.compose.material.ScalingLazyColumnDefaults INSTANCE;
+ }
+
+ public final class ScalingLazyColumnKt {
+ method @androidx.compose.runtime.Composable public static void ScalingLazyColumn(optional androidx.compose.ui.Modifier modifier, optional androidx.wear.compose.material.ScalingLazyListState state, optional androidx.compose.foundation.layout.PaddingValues contentPadding, optional boolean reverseLayout, optional androidx.compose.foundation.layout.Arrangement.Vertical verticalArrangement, optional androidx.compose.ui.Alignment.Horizontal horizontalAlignment, optional androidx.compose.foundation.gestures.FlingBehavior flingBehavior, optional boolean userScrollEnabled, optional androidx.wear.compose.material.ScalingParams scalingParams, optional int anchorType, optional androidx.wear.compose.material.AutoCenteringParams? autoCentering, kotlin.jvm.functions.Function1<? super androidx.wear.compose.material.ScalingLazyListScope,kotlin.Unit> content);
+ method public static inline <T> void items(androidx.wear.compose.material.ScalingLazyListScope, java.util.List<? extends T> items, optional kotlin.jvm.functions.Function1<? super T,?>? key, kotlin.jvm.functions.Function2<? super androidx.wear.compose.material.ScalingLazyListItemScope,? super T,kotlin.Unit> itemContent);
+ method public static inline <T> void items(androidx.wear.compose.material.ScalingLazyListScope, T![] items, optional kotlin.jvm.functions.Function1<? super T,?>? key, kotlin.jvm.functions.Function2<? super androidx.wear.compose.material.ScalingLazyListItemScope,? super T,kotlin.Unit> itemContent);
+ method public static inline <T> void itemsIndexed(androidx.wear.compose.material.ScalingLazyListScope, java.util.List<? extends T> items, optional kotlin.jvm.functions.Function2<? super java.lang.Integer,? super T,?>? key, kotlin.jvm.functions.Function3<? super androidx.wear.compose.material.ScalingLazyListItemScope,? super java.lang.Integer,? super T,kotlin.Unit> itemContent);
+ method public static inline <T> void itemsIndexed(androidx.wear.compose.material.ScalingLazyListScope, T![] items, optional kotlin.jvm.functions.Function2<? super java.lang.Integer,? super T,?>? key, kotlin.jvm.functions.Function3<? super androidx.wear.compose.material.ScalingLazyListItemScope,? super java.lang.Integer,? super T,kotlin.Unit> itemContent);
+ }
+
+ public final class ScalingLazyColumnMeasureKt {
+ }
+
+ @androidx.compose.runtime.Immutable @kotlin.jvm.JvmInline public final value class ScalingLazyListAnchorType {
+ field public static final androidx.wear.compose.material.ScalingLazyListAnchorType.Companion Companion;
+ }
+
+ public static final class ScalingLazyListAnchorType.Companion {
+ method public int getItemCenter();
+ method public int getItemStart();
+ property public final int ItemCenter;
+ property public final int ItemStart;
+ }
+
+ public sealed interface ScalingLazyListItemInfo {
+ method public float getAlpha();
+ method public int getIndex();
+ method public Object getKey();
+ method public int getOffset();
+ method public float getScale();
+ method public int getSize();
+ method public int getUnadjustedOffset();
+ method public int getUnadjustedSize();
+ property public abstract float alpha;
+ property public abstract int index;
+ property public abstract Object key;
+ property public abstract int offset;
+ property public abstract float scale;
+ property public abstract int size;
+ property public abstract int unadjustedOffset;
+ property public abstract int unadjustedSize;
+ }
+
+ @androidx.compose.runtime.Stable @androidx.wear.compose.material.ScalingLazyScopeMarker public sealed interface ScalingLazyListItemScope {
+ method public androidx.compose.ui.Modifier fillParentMaxHeight(androidx.compose.ui.Modifier, optional float fraction);
+ method public androidx.compose.ui.Modifier fillParentMaxSize(androidx.compose.ui.Modifier, optional float fraction);
+ method public androidx.compose.ui.Modifier fillParentMaxWidth(androidx.compose.ui.Modifier, optional float fraction);
+ }
+
+ public sealed interface ScalingLazyListLayoutInfo {
+ method public int getAfterAutoCenteringPadding();
+ method public int getAfterContentPadding();
+ method public int getBeforeAutoCenteringPadding();
+ method public int getBeforeContentPadding();
+ method public androidx.compose.foundation.gestures.Orientation getOrientation();
+ method public boolean getReverseLayout();
+ method public int getTotalItemsCount();
+ method public int getViewportEndOffset();
+ method public long getViewportSize();
+ method public int getViewportStartOffset();
+ method public java.util.List<androidx.wear.compose.material.ScalingLazyListItemInfo> getVisibleItemsInfo();
+ property public abstract int afterAutoCenteringPadding;
+ property public abstract int afterContentPadding;
+ property public abstract int beforeAutoCenteringPadding;
+ property public abstract int beforeContentPadding;
+ property public abstract androidx.compose.foundation.gestures.Orientation orientation;
+ property public abstract boolean reverseLayout;
+ property public abstract int totalItemsCount;
+ property public abstract int viewportEndOffset;
+ property public abstract long viewportSize;
+ property public abstract int viewportStartOffset;
+ property public abstract java.util.List<androidx.wear.compose.material.ScalingLazyListItemInfo> visibleItemsInfo;
+ }
+
+ @androidx.wear.compose.material.ScalingLazyScopeMarker public sealed interface ScalingLazyListScope {
+ method public void item(optional Object? key, kotlin.jvm.functions.Function1<? super androidx.wear.compose.material.ScalingLazyListItemScope,kotlin.Unit> content);
+ method public void items(int count, optional kotlin.jvm.functions.Function1<? super java.lang.Integer,?>? key, kotlin.jvm.functions.Function2<? super androidx.wear.compose.material.ScalingLazyListItemScope,? super java.lang.Integer,kotlin.Unit> itemContent);
+ }
+
+ @androidx.compose.runtime.Stable public final class ScalingLazyListState implements androidx.compose.foundation.gestures.ScrollableState {
+ ctor public ScalingLazyListState(optional int initialCenterItemIndex, optional int initialCenterItemScrollOffset);
+ method public suspend Object? animateScrollToItem(int index, optional int scrollOffset, optional kotlin.coroutines.Continuation<? super kotlin.Unit>);
+ method public float dispatchRawDelta(float delta);
+ method public int getCenterItemIndex();
+ method public int getCenterItemScrollOffset();
+ method public androidx.wear.compose.material.ScalingLazyListLayoutInfo getLayoutInfo();
+ method public boolean isScrollInProgress();
+ method public suspend Object? scroll(androidx.compose.foundation.MutatePriority scrollPriority, kotlin.jvm.functions.Function2<? super androidx.compose.foundation.gestures.ScrollScope,? super kotlin.coroutines.Continuation<? super kotlin.Unit>,?> block, kotlin.coroutines.Continuation<? super kotlin.Unit>);
+ method public suspend Object? scrollToItem(int index, optional int scrollOffset, optional kotlin.coroutines.Continuation<? super kotlin.Unit>);
+ property public final int centerItemIndex;
+ property public final int centerItemScrollOffset;
+ property public boolean isScrollInProgress;
+ property public final androidx.wear.compose.material.ScalingLazyListLayoutInfo layoutInfo;
+ field public static final androidx.wear.compose.material.ScalingLazyListState.Companion Companion;
+ }
+
+ public static final class ScalingLazyListState.Companion {
+ method public androidx.compose.runtime.saveable.Saver<androidx.wear.compose.material.ScalingLazyListState,java.lang.Object> getSaver();
+ property public final androidx.compose.runtime.saveable.Saver<androidx.wear.compose.material.ScalingLazyListState,java.lang.Object> Saver;
+ }
+
+ public final class ScalingLazyListStateKt {
+ method @androidx.compose.runtime.Composable public static androidx.wear.compose.material.ScalingLazyListState rememberScalingLazyListState(optional int initialCenterItemIndex, optional int initialCenterItemScrollOffset);
+ }
+
+ @kotlin.DslMarker public @interface ScalingLazyScopeMarker {
+ }
+
+ @androidx.compose.runtime.Stable public interface ScalingParams {
+ method public float getEdgeAlpha();
+ method public float getEdgeScale();
+ method public float getMaxElementHeight();
+ method public float getMaxTransitionArea();
+ method public float getMinElementHeight();
+ method public float getMinTransitionArea();
+ method public androidx.compose.animation.core.Easing getScaleInterpolator();
+ method public int resolveViewportVerticalOffset(long viewportConstraints);
+ property public abstract float edgeAlpha;
+ property public abstract float edgeScale;
+ property public abstract float maxElementHeight;
+ property public abstract float maxTransitionArea;
+ property public abstract float minElementHeight;
+ property public abstract float minTransitionArea;
+ property public abstract androidx.compose.animation.core.Easing scaleInterpolator;
+ }
+
+ @androidx.compose.runtime.Immutable public final class Shapes {
+ ctor public Shapes(optional androidx.compose.foundation.shape.CornerBasedShape small, optional androidx.compose.foundation.shape.CornerBasedShape medium, optional androidx.compose.foundation.shape.CornerBasedShape large);
+ method public androidx.wear.compose.material.Shapes copy(optional androidx.compose.foundation.shape.CornerBasedShape small, optional androidx.compose.foundation.shape.CornerBasedShape medium, optional androidx.compose.foundation.shape.CornerBasedShape large);
+ method public androidx.compose.foundation.shape.CornerBasedShape getLarge();
+ method public androidx.compose.foundation.shape.CornerBasedShape getMedium();
+ method public androidx.compose.foundation.shape.CornerBasedShape getSmall();
+ property public final androidx.compose.foundation.shape.CornerBasedShape large;
+ property public final androidx.compose.foundation.shape.CornerBasedShape medium;
+ property public final androidx.compose.foundation.shape.CornerBasedShape small;
+ }
+
+ public final class ShapesKt {
+ }
+
+ public final class SliderKt {
+ method @androidx.compose.runtime.Composable public static void InlineSlider(float value, kotlin.jvm.functions.Function1<? super java.lang.Float,kotlin.Unit> onValueChange, int steps, kotlin.jvm.functions.Function0<kotlin.Unit> decreaseIcon, kotlin.jvm.functions.Function0<kotlin.Unit> increaseIcon, optional androidx.compose.ui.Modifier modifier, optional boolean enabled, optional kotlin.ranges.ClosedFloatingPointRange<java.lang.Float> valueRange, optional boolean segmented, optional androidx.wear.compose.material.InlineSliderColors colors);
+ method @androidx.compose.runtime.Composable public static void InlineSlider(int value, kotlin.jvm.functions.Function1<? super java.lang.Integer,kotlin.Unit> onValueChange, kotlin.ranges.IntProgression valueProgression, kotlin.jvm.functions.Function0<kotlin.Unit> decreaseIcon, kotlin.jvm.functions.Function0<kotlin.Unit> increaseIcon, optional androidx.compose.ui.Modifier modifier, optional boolean enabled, optional boolean segmented, optional androidx.wear.compose.material.InlineSliderColors colors);
+ }
+
+ @androidx.compose.runtime.Stable public interface SplitToggleChipColors {
+ method @androidx.compose.runtime.Composable public androidx.compose.runtime.State<androidx.compose.ui.graphics.Color> backgroundColor(boolean enabled);
+ method @androidx.compose.runtime.Composable public androidx.compose.runtime.State<androidx.compose.ui.graphics.Color> contentColor(boolean enabled);
+ method @androidx.compose.runtime.Composable public androidx.compose.runtime.State<androidx.compose.ui.graphics.Color> secondaryContentColor(boolean enabled);
+ method @androidx.compose.runtime.Composable public androidx.compose.runtime.State<androidx.compose.ui.graphics.Color> splitBackgroundOverlay(boolean enabled, boolean checked);
+ method @androidx.compose.runtime.Composable public androidx.compose.runtime.State<androidx.compose.ui.graphics.Color> toggleControlColor(boolean enabled, boolean checked);
+ }
+
+ public final class StepperDefaults {
+ method public androidx.compose.ui.graphics.vector.ImageVector getDecrease();
+ method public androidx.compose.ui.graphics.vector.ImageVector getIncrease();
+ property public final androidx.compose.ui.graphics.vector.ImageVector Decrease;
+ property public final androidx.compose.ui.graphics.vector.ImageVector Increase;
+ field public static final androidx.wear.compose.material.StepperDefaults INSTANCE;
+ }
+
+ public final class StepperKt {
+ method @androidx.compose.runtime.Composable public static void Stepper(float value, kotlin.jvm.functions.Function1<? super java.lang.Float,kotlin.Unit> onValueChange, int steps, kotlin.jvm.functions.Function0<kotlin.Unit> decreaseIcon, kotlin.jvm.functions.Function0<kotlin.Unit> increaseIcon, optional androidx.compose.ui.Modifier modifier, optional kotlin.ranges.ClosedFloatingPointRange<java.lang.Float> valueRange, optional long backgroundColor, optional long contentColor, optional long iconColor, kotlin.jvm.functions.Function1<? super androidx.compose.foundation.layout.BoxScope,kotlin.Unit> content);
+ method @androidx.compose.runtime.Composable public static void Stepper(int value, kotlin.jvm.functions.Function1<? super java.lang.Integer,kotlin.Unit> onValueChange, kotlin.ranges.IntProgression valueProgression, kotlin.jvm.functions.Function0<kotlin.Unit> decreaseIcon, kotlin.jvm.functions.Function0<kotlin.Unit> increaseIcon, optional androidx.compose.ui.Modifier modifier, optional long backgroundColor, optional long contentColor, optional long iconColor, kotlin.jvm.functions.Function1<? super androidx.compose.foundation.layout.BoxScope,kotlin.Unit> content);
+ }
+
+ public final class SwipeToDismissBoxDefaults {
+ method public androidx.compose.animation.core.SpringSpec<java.lang.Float> getAnimationSpec();
+ method public float getEdgeWidth();
+ property public final androidx.compose.animation.core.SpringSpec<java.lang.Float> AnimationSpec;
+ property public final float EdgeWidth;
+ field public static final androidx.wear.compose.material.SwipeToDismissBoxDefaults INSTANCE;
+ }
+
+ public final class SwipeToDismissBoxKt {
+ method @androidx.compose.runtime.Composable public static void SwipeToDismissBox(androidx.wear.compose.material.SwipeToDismissBoxState state, optional androidx.compose.ui.Modifier modifier, optional long backgroundScrimColor, optional long contentScrimColor, optional Object backgroundKey, optional Object contentKey, optional boolean hasBackground, kotlin.jvm.functions.Function2<? super androidx.compose.foundation.layout.BoxScope,? super java.lang.Boolean,kotlin.Unit> content);
+ method @androidx.compose.runtime.Composable public static void SwipeToDismissBox(kotlin.jvm.functions.Function0<kotlin.Unit> onDismissed, optional androidx.compose.ui.Modifier modifier, optional androidx.wear.compose.material.SwipeToDismissBoxState state, optional long backgroundScrimColor, optional long contentScrimColor, optional Object backgroundKey, optional Object contentKey, optional boolean hasBackground, kotlin.jvm.functions.Function2<? super androidx.compose.foundation.layout.BoxScope,? super java.lang.Boolean,kotlin.Unit> content);
+ method public static androidx.compose.ui.Modifier edgeSwipeToDismiss(androidx.compose.ui.Modifier, androidx.wear.compose.material.SwipeToDismissBoxState swipeToDismissBoxState, optional float edgeWidth);
+ method @androidx.compose.runtime.Composable public static androidx.wear.compose.material.SwipeToDismissBoxState rememberSwipeToDismissBoxState(optional androidx.compose.animation.core.AnimationSpec<java.lang.Float> animationSpec, optional kotlin.jvm.functions.Function1<? super androidx.wear.compose.material.SwipeToDismissValue,java.lang.Boolean> confirmStateChange);
+ }
+
+ @androidx.compose.runtime.Stable public final class SwipeToDismissBoxState {
+ ctor public SwipeToDismissBoxState(optional androidx.compose.animation.core.AnimationSpec<java.lang.Float> animationSpec, optional kotlin.jvm.functions.Function1<? super androidx.wear.compose.material.SwipeToDismissValue,java.lang.Boolean> confirmStateChange);
+ method public androidx.wear.compose.material.SwipeToDismissValue getCurrentValue();
+ method public androidx.wear.compose.material.SwipeToDismissValue getTargetValue();
+ method public boolean isAnimationRunning();
+ method public suspend Object? snapTo(androidx.wear.compose.material.SwipeToDismissValue targetValue, kotlin.coroutines.Continuation<? super kotlin.Unit>);
+ property public final androidx.wear.compose.material.SwipeToDismissValue currentValue;
+ property public final boolean isAnimationRunning;
+ property public final androidx.wear.compose.material.SwipeToDismissValue targetValue;
+ }
+
+ public enum SwipeToDismissKeys {
+ enum_constant public static final androidx.wear.compose.material.SwipeToDismissKeys Background;
+ enum_constant public static final androidx.wear.compose.material.SwipeToDismissKeys Content;
+ }
+
+ public enum SwipeToDismissValue {
+ enum_constant public static final androidx.wear.compose.material.SwipeToDismissValue Default;
+ enum_constant public static final androidx.wear.compose.material.SwipeToDismissValue Dismissed;
+ }
+
+ public final class SwipeableKt {
+ }
+
+ public final class TextKt {
+ method @androidx.compose.runtime.Composable public static void ProvideTextStyle(androidx.compose.ui.text.TextStyle value, kotlin.jvm.functions.Function0<kotlin.Unit> content);
+ method @androidx.compose.runtime.Composable public static void Text(String text, optional androidx.compose.ui.Modifier modifier, optional long color, optional long fontSize, optional androidx.compose.ui.text.font.FontStyle? fontStyle, optional androidx.compose.ui.text.font.FontWeight? fontWeight, optional androidx.compose.ui.text.font.FontFamily? fontFamily, optional long letterSpacing, optional androidx.compose.ui.text.style.TextDecoration? textDecoration, optional androidx.compose.ui.text.style.TextAlign? textAlign, optional long lineHeight, optional int overflow, optional boolean softWrap, optional int maxLines, optional kotlin.jvm.functions.Function1<? super androidx.compose.ui.text.TextLayoutResult,kotlin.Unit> onTextLayout, optional androidx.compose.ui.text.TextStyle style);
+ method @androidx.compose.runtime.Composable public static void Text(androidx.compose.ui.text.AnnotatedString text, optional androidx.compose.ui.Modifier modifier, optional long color, optional long fontSize, optional androidx.compose.ui.text.font.FontStyle? fontStyle, optional androidx.compose.ui.text.font.FontWeight? fontWeight, optional androidx.compose.ui.text.font.FontFamily? fontFamily, optional long letterSpacing, optional androidx.compose.ui.text.style.TextDecoration? textDecoration, optional androidx.compose.ui.text.style.TextAlign? textAlign, optional long lineHeight, optional int overflow, optional boolean softWrap, optional int maxLines, optional java.util.Map<java.lang.String,androidx.compose.foundation.text.InlineTextContent> inlineContent, optional kotlin.jvm.functions.Function1<? super androidx.compose.ui.text.TextLayoutResult,kotlin.Unit> onTextLayout, optional androidx.compose.ui.text.TextStyle style);
+ method public static androidx.compose.runtime.ProvidableCompositionLocal<androidx.compose.ui.text.TextStyle> getLocalTextStyle();
+ property public static final androidx.compose.runtime.ProvidableCompositionLocal<androidx.compose.ui.text.TextStyle> LocalTextStyle;
+ }
+
+ public interface TimeSource {
+ method @androidx.compose.runtime.Composable public String getCurrentTime();
+ property @androidx.compose.runtime.Composable public abstract String currentTime;
+ }
+
+ public final class TimeTextDefaults {
+ method public void CurvedTextSeparator(androidx.wear.compose.foundation.CurvedScope, optional androidx.wear.compose.foundation.CurvedTextStyle? curvedTextStyle, optional androidx.wear.compose.foundation.ArcPaddingValues contentArcPadding);
+ method @androidx.compose.runtime.Composable public void TextSeparator(optional androidx.compose.ui.Modifier modifier, optional androidx.compose.ui.text.TextStyle textStyle, optional androidx.compose.foundation.layout.PaddingValues contentPadding);
+ method public androidx.compose.foundation.layout.PaddingValues getContentPadding();
+ method @androidx.compose.runtime.Composable public String timeFormat();
+ method public androidx.wear.compose.material.TimeSource timeSource(String timeFormat);
+ method @androidx.compose.runtime.Composable public androidx.compose.ui.text.TextStyle timeTextStyle(optional long background, optional long color, optional long fontSize);
+ property public final androidx.compose.foundation.layout.PaddingValues ContentPadding;
+ field public static final androidx.wear.compose.material.TimeTextDefaults INSTANCE;
+ field public static final String TimeFormat12Hours = "h:mm a";
+ field public static final String TimeFormat24Hours = "HH:mm";
+ }
+
+ public final class TimeTextKt {
+ method @androidx.compose.runtime.Composable public static void TimeText(optional androidx.compose.ui.Modifier modifier, optional androidx.wear.compose.material.TimeSource timeSource, optional androidx.compose.ui.text.TextStyle timeTextStyle, optional androidx.compose.foundation.layout.PaddingValues contentPadding, optional kotlin.jvm.functions.Function0<kotlin.Unit>? startLinearContent, optional kotlin.jvm.functions.Function1<? super androidx.wear.compose.foundation.CurvedScope,kotlin.Unit>? startCurvedContent, optional kotlin.jvm.functions.Function0<kotlin.Unit>? endLinearContent, optional kotlin.jvm.functions.Function1<? super androidx.wear.compose.foundation.CurvedScope,kotlin.Unit>? endCurvedContent, optional kotlin.jvm.functions.Function0<kotlin.Unit> textLinearSeparator, optional kotlin.jvm.functions.Function1<? super androidx.wear.compose.foundation.CurvedScope,kotlin.Unit> textCurvedSeparator);
+ }
+
+ @androidx.compose.runtime.Stable public interface ToggleButtonColors {
+ method @androidx.compose.runtime.Composable public androidx.compose.runtime.State<androidx.compose.ui.graphics.Color> backgroundColor(boolean enabled, boolean checked);
+ method @androidx.compose.runtime.Composable public androidx.compose.runtime.State<androidx.compose.ui.graphics.Color> contentColor(boolean enabled, boolean checked);
+ }
+
+ public final class ToggleButtonDefaults {
+ method public float getDefaultIconSize();
+ method public float getDefaultToggleButtonSize();
+ method public float getSmallIconSize();
+ method public float getSmallToggleButtonSize();
+ method @androidx.compose.runtime.Composable public androidx.wear.compose.material.ToggleButtonColors toggleButtonColors(optional long checkedBackgroundColor, optional long checkedContentColor, optional long disabledCheckedBackgroundColor, optional long disabledCheckedContentColor, optional long uncheckedBackgroundColor, optional long uncheckedContentColor, optional long disabledUncheckedBackgroundColor, optional long disabledUncheckedContentColor);
+ property public final float DefaultIconSize;
+ property public final float DefaultToggleButtonSize;
+ property public final float SmallIconSize;
+ property public final float SmallToggleButtonSize;
+ field public static final androidx.wear.compose.material.ToggleButtonDefaults INSTANCE;
+ }
+
+ public final class ToggleButtonKt {
+ method @androidx.compose.runtime.Composable public static void ToggleButton(boolean checked, kotlin.jvm.functions.Function1<? super java.lang.Boolean,kotlin.Unit> onCheckedChange, optional androidx.compose.ui.Modifier modifier, optional boolean enabled, optional androidx.wear.compose.material.ToggleButtonColors colors, optional androidx.compose.foundation.interaction.MutableInteractionSource interactionSource, kotlin.jvm.functions.Function1<? super androidx.compose.foundation.layout.BoxScope,kotlin.Unit> content);
+ }
+
+ @androidx.compose.runtime.Stable public interface ToggleChipColors {
+ method @androidx.compose.runtime.Composable public androidx.compose.runtime.State<androidx.compose.ui.graphics.painter.Painter> background(boolean enabled, boolean checked);
+ method @androidx.compose.runtime.Composable public androidx.compose.runtime.State<androidx.compose.ui.graphics.Color> contentColor(boolean enabled, boolean checked);
+ method @androidx.compose.runtime.Composable public androidx.compose.runtime.State<androidx.compose.ui.graphics.Color> secondaryContentColor(boolean enabled, boolean checked);
+ method @androidx.compose.runtime.Composable public androidx.compose.runtime.State<androidx.compose.ui.graphics.Color> toggleControlColor(boolean enabled, boolean checked);
+ }
+
+ public final class ToggleChipDefaults {
+ method public androidx.compose.ui.graphics.vector.ImageVector checkboxIcon(boolean checked);
+ method public androidx.compose.ui.graphics.vector.ImageVector getCheckboxOn();
+ method public androidx.compose.foundation.layout.PaddingValues getContentPadding();
+ method public float getIconSize();
+ method public androidx.compose.ui.graphics.vector.ImageVector getRadioOff();
+ method public androidx.compose.ui.graphics.vector.ImageVector getRadioOn();
+ method @androidx.compose.runtime.Composable public long getSwitchUncheckedIconColor();
+ method public androidx.compose.ui.graphics.vector.ImageVector radioIcon(boolean checked);
+ method @androidx.compose.runtime.Composable public androidx.wear.compose.material.SplitToggleChipColors splitToggleChipColors(optional long backgroundColor, optional long contentColor, optional long secondaryContentColor, optional long checkedToggleControlColor, optional long uncheckedToggleControlColor, optional long splitBackgroundOverlayColor);
+ method public androidx.compose.ui.graphics.vector.ImageVector switchIcon(boolean checked);
+ method @androidx.compose.runtime.Composable public androidx.wear.compose.material.ToggleChipColors toggleChipColors(optional long checkedStartBackgroundColor, optional long checkedEndBackgroundColor, optional long checkedContentColor, optional long checkedSecondaryContentColor, optional long checkedToggleControlColor, optional long uncheckedStartBackgroundColor, optional long uncheckedEndBackgroundColor, optional long uncheckedContentColor, optional long uncheckedSecondaryContentColor, optional long uncheckedToggleControlColor, optional androidx.compose.ui.unit.LayoutDirection gradientDirection);
+ property public final androidx.compose.ui.graphics.vector.ImageVector CheckboxOn;
+ property public final androidx.compose.foundation.layout.PaddingValues ContentPadding;
+ property public final float IconSize;
+ property public final androidx.compose.ui.graphics.vector.ImageVector RadioOff;
+ property public final androidx.compose.ui.graphics.vector.ImageVector RadioOn;
+ property @androidx.compose.runtime.Composable public final long SwitchUncheckedIconColor;
+ field public static final androidx.wear.compose.material.ToggleChipDefaults INSTANCE;
+ }
+
+ public final class ToggleChipKt {
+ method @androidx.compose.runtime.Composable public static void SplitToggleChip(boolean checked, kotlin.jvm.functions.Function1<? super java.lang.Boolean,kotlin.Unit> onCheckedChange, kotlin.jvm.functions.Function1<? super androidx.compose.foundation.layout.RowScope,kotlin.Unit> label, kotlin.jvm.functions.Function0<kotlin.Unit> onClick, kotlin.jvm.functions.Function1<? super androidx.compose.foundation.layout.BoxScope,kotlin.Unit> toggleControl, optional androidx.compose.ui.Modifier modifier, optional kotlin.jvm.functions.Function1<? super androidx.compose.foundation.layout.RowScope,kotlin.Unit>? secondaryLabel, optional androidx.wear.compose.material.SplitToggleChipColors colors, optional boolean enabled, optional androidx.compose.foundation.interaction.MutableInteractionSource checkedInteractionSource, optional androidx.compose.foundation.interaction.MutableInteractionSource clickInteractionSource, optional androidx.compose.foundation.layout.PaddingValues contentPadding, optional androidx.compose.ui.graphics.Shape shape);
+ method @androidx.compose.runtime.Composable public static void ToggleChip(boolean checked, kotlin.jvm.functions.Function1<? super java.lang.Boolean,kotlin.Unit> onCheckedChange, kotlin.jvm.functions.Function1<? super androidx.compose.foundation.layout.RowScope,kotlin.Unit> label, kotlin.jvm.functions.Function0<kotlin.Unit> toggleControl, optional androidx.compose.ui.Modifier modifier, optional kotlin.jvm.functions.Function1<? super androidx.compose.foundation.layout.BoxScope,kotlin.Unit>? appIcon, optional kotlin.jvm.functions.Function1<? super androidx.compose.foundation.layout.RowScope,kotlin.Unit>? secondaryLabel, optional androidx.wear.compose.material.ToggleChipColors colors, optional boolean enabled, optional androidx.compose.foundation.interaction.MutableInteractionSource interactionSource, optional androidx.compose.foundation.layout.PaddingValues contentPadding, optional androidx.compose.ui.graphics.Shape shape);
+ }
+
+ @androidx.compose.runtime.Immutable public final class Typography {
+ ctor public Typography(optional androidx.compose.ui.text.font.FontFamily defaultFontFamily, optional androidx.compose.ui.text.TextStyle display1, optional androidx.compose.ui.text.TextStyle display2, optional androidx.compose.ui.text.TextStyle display3, optional androidx.compose.ui.text.TextStyle title1, optional androidx.compose.ui.text.TextStyle title2, optional androidx.compose.ui.text.TextStyle title3, optional androidx.compose.ui.text.TextStyle body1, optional androidx.compose.ui.text.TextStyle body2, optional androidx.compose.ui.text.TextStyle button, optional androidx.compose.ui.text.TextStyle caption1, optional androidx.compose.ui.text.TextStyle caption2, optional androidx.compose.ui.text.TextStyle caption3);
+ method public androidx.wear.compose.material.Typography copy(optional androidx.compose.ui.text.TextStyle display1, optional androidx.compose.ui.text.TextStyle display2, optional androidx.compose.ui.text.TextStyle display3, optional androidx.compose.ui.text.TextStyle title1, optional androidx.compose.ui.text.TextStyle title2, optional androidx.compose.ui.text.TextStyle title3, optional androidx.compose.ui.text.TextStyle body1, optional androidx.compose.ui.text.TextStyle body2, optional androidx.compose.ui.text.TextStyle button, optional androidx.compose.ui.text.TextStyle caption1, optional androidx.compose.ui.text.TextStyle caption2, optional androidx.compose.ui.text.TextStyle caption3);
+ method public androidx.compose.ui.text.TextStyle getBody1();
+ method public androidx.compose.ui.text.TextStyle getBody2();
+ method public androidx.compose.ui.text.TextStyle getButton();
+ method public androidx.compose.ui.text.TextStyle getCaption1();
+ method public androidx.compose.ui.text.TextStyle getCaption2();
+ method public androidx.compose.ui.text.TextStyle getCaption3();
+ method public androidx.compose.ui.text.TextStyle getDisplay1();
+ method public androidx.compose.ui.text.TextStyle getDisplay2();
+ method public androidx.compose.ui.text.TextStyle getDisplay3();
+ method public androidx.compose.ui.text.TextStyle getTitle1();
+ method public androidx.compose.ui.text.TextStyle getTitle2();
+ method public androidx.compose.ui.text.TextStyle getTitle3();
+ property public final androidx.compose.ui.text.TextStyle body1;
+ property public final androidx.compose.ui.text.TextStyle body2;
+ property public final androidx.compose.ui.text.TextStyle button;
+ property public final androidx.compose.ui.text.TextStyle caption1;
+ property public final androidx.compose.ui.text.TextStyle caption2;
+ property public final androidx.compose.ui.text.TextStyle caption3;
+ property public final androidx.compose.ui.text.TextStyle display1;
+ property public final androidx.compose.ui.text.TextStyle display2;
+ property public final androidx.compose.ui.text.TextStyle display3;
+ property public final androidx.compose.ui.text.TextStyle title1;
+ property public final androidx.compose.ui.text.TextStyle title2;
+ property public final androidx.compose.ui.text.TextStyle title3;
+ }
+
+ public final class TypographyKt {
+ }
+
+ public final class VignetteKt {
+ method @androidx.compose.runtime.Composable public static void Vignette(int vignettePosition, optional androidx.compose.ui.Modifier modifier);
+ }
+
+ @kotlin.jvm.JvmInline public final value class VignettePosition {
+ ctor public VignettePosition(int key);
+ field public static final androidx.wear.compose.material.VignettePosition.Companion Companion;
+ }
+
+ public static final class VignettePosition.Companion {
+ method public int getBottom();
+ method public int getTop();
+ method public int getTopAndBottom();
+ property public final int Bottom;
+ property public final int Top;
+ property public final int TopAndBottom;
+ }
+
+}
+
+package androidx.wear.compose.material.dialog {
+
+ public final class DialogDefaults {
+ method public androidx.compose.foundation.layout.Arrangement.Vertical getAlertVerticalArrangement();
+ method public androidx.compose.foundation.layout.Arrangement.Vertical getConfirmationVerticalArrangement();
+ method public androidx.compose.foundation.layout.PaddingValues getContentPadding();
+ method public long getIndefiniteDurationMillis();
+ method public long getLongDurationMillis();
+ method public long getShortDurationMillis();
+ property public final androidx.compose.foundation.layout.Arrangement.Vertical AlertVerticalArrangement;
+ property public final androidx.compose.foundation.layout.Arrangement.Vertical ConfirmationVerticalArrangement;
+ property public final androidx.compose.foundation.layout.PaddingValues ContentPadding;
+ property public final long IndefiniteDurationMillis;
+ property public final long LongDurationMillis;
+ property public final long ShortDurationMillis;
+ field public static final androidx.wear.compose.material.dialog.DialogDefaults INSTANCE;
+ }
+
+ public final class DialogKt {
+ method @androidx.compose.runtime.Composable public static void Alert(kotlin.jvm.functions.Function1<? super androidx.compose.foundation.layout.ColumnScope,kotlin.Unit> title, kotlin.jvm.functions.Function0<kotlin.Unit> negativeButton, kotlin.jvm.functions.Function0<kotlin.Unit> positiveButton, optional androidx.compose.ui.Modifier modifier, optional kotlin.jvm.functions.Function1<? super androidx.compose.foundation.layout.ColumnScope,kotlin.Unit>? icon, optional androidx.wear.compose.material.ScalingLazyListState scrollState, optional long backgroundColor, optional long contentColor, optional long titleColor, optional long iconColor, optional androidx.compose.foundation.layout.Arrangement.Vertical verticalArrangement, optional androidx.compose.foundation.layout.PaddingValues contentPadding, optional kotlin.jvm.functions.Function1<? super androidx.compose.foundation.layout.ColumnScope,kotlin.Unit>? content);
+ method @androidx.compose.runtime.Composable public static void Alert(kotlin.jvm.functions.Function1<? super androidx.compose.foundation.layout.ColumnScope,kotlin.Unit> title, optional androidx.compose.ui.Modifier modifier, optional kotlin.jvm.functions.Function1<? super androidx.compose.foundation.layout.ColumnScope,kotlin.Unit>? icon, optional kotlin.jvm.functions.Function1<? super androidx.compose.foundation.layout.ColumnScope,kotlin.Unit>? message, optional androidx.wear.compose.material.ScalingLazyListState scrollState, optional long backgroundColor, optional long titleColor, optional long messageColor, optional long iconColor, optional androidx.compose.foundation.layout.Arrangement.Vertical verticalArrangement, optional androidx.compose.foundation.layout.PaddingValues contentPadding, kotlin.jvm.functions.Function1<? super androidx.wear.compose.material.ScalingLazyListScope,kotlin.Unit> content);
+ method @androidx.compose.runtime.Composable public static void Confirmation(kotlin.jvm.functions.Function0<kotlin.Unit> onTimeout, optional androidx.compose.ui.Modifier modifier, optional kotlin.jvm.functions.Function1<? super androidx.compose.foundation.layout.ColumnScope,kotlin.Unit>? icon, optional androidx.wear.compose.material.ScalingLazyListState scrollState, optional long durationMillis, optional long backgroundColor, optional long contentColor, optional long iconColor, optional androidx.compose.foundation.layout.Arrangement.Vertical verticalArrangement, optional androidx.compose.foundation.layout.PaddingValues contentPadding, kotlin.jvm.functions.Function1<? super androidx.compose.foundation.layout.ColumnScope,kotlin.Unit> content);
+ }
+
+ public final class Dialog_androidKt {
+ method @androidx.compose.runtime.Composable public static void Dialog(boolean showDialog, kotlin.jvm.functions.Function0<kotlin.Unit> onDismissRequest, optional androidx.compose.ui.Modifier modifier, optional androidx.wear.compose.material.ScalingLazyListState? scrollState, optional androidx.compose.ui.window.DialogProperties properties, kotlin.jvm.functions.Function0<kotlin.Unit> content);
+ }
+
+}
+
diff --git a/wear/compose/compose-material/api/public_plus_experimental_1.0.0-beta02.txt b/wear/compose/compose-material/api/public_plus_experimental_1.0.0-beta02.txt
new file mode 100644
index 0000000..532b324
--- /dev/null
+++ b/wear/compose/compose-material/api/public_plus_experimental_1.0.0-beta02.txt
@@ -0,0 +1,785 @@
+// Signature format: 4.0
+package androidx.wear.compose.material {
+
+ @androidx.compose.runtime.Immutable public final class AutoCenteringParams {
+ ctor public AutoCenteringParams(optional int itemIndex, optional int itemOffset);
+ }
+
+ @androidx.compose.runtime.Stable public interface ButtonColors {
+ method @androidx.compose.runtime.Composable public androidx.compose.runtime.State<androidx.compose.ui.graphics.Color> backgroundColor(boolean enabled);
+ method @androidx.compose.runtime.Composable public androidx.compose.runtime.State<androidx.compose.ui.graphics.Color> contentColor(boolean enabled);
+ }
+
+ public final class ButtonDefaults {
+ method @androidx.compose.runtime.Composable public androidx.wear.compose.material.ButtonColors buttonColors(optional long backgroundColor, optional long contentColor, optional long disabledBackgroundColor, optional long disabledContentColor);
+ method public float getCompactButtonBackgroundPadding();
+ method public float getDefaultButtonSize();
+ method public float getDefaultIconSize();
+ method public float getExtraSmallButtonSize();
+ method public float getLargeButtonSize();
+ method public float getLargeIconSize();
+ method public float getSmallButtonSize();
+ method public float getSmallIconSize();
+ method @androidx.compose.runtime.Composable public androidx.wear.compose.material.ButtonColors iconButtonColors(optional long contentColor);
+ method @androidx.compose.runtime.Composable public androidx.wear.compose.material.ButtonColors primaryButtonColors(optional long backgroundColor, optional long contentColor);
+ method @androidx.compose.runtime.Composable public androidx.wear.compose.material.ButtonColors secondaryButtonColors(optional long backgroundColor, optional long contentColor);
+ property public final float CompactButtonBackgroundPadding;
+ property public final float DefaultButtonSize;
+ property public final float DefaultIconSize;
+ property public final float ExtraSmallButtonSize;
+ property public final float LargeButtonSize;
+ property public final float LargeIconSize;
+ property public final float SmallButtonSize;
+ property public final float SmallIconSize;
+ field public static final androidx.wear.compose.material.ButtonDefaults INSTANCE;
+ }
+
+ public final class ButtonKt {
+ method @androidx.compose.runtime.Composable public static void Button(kotlin.jvm.functions.Function0<kotlin.Unit> onClick, optional androidx.compose.ui.Modifier modifier, optional boolean enabled, optional androidx.wear.compose.material.ButtonColors colors, optional androidx.compose.foundation.interaction.MutableInteractionSource interactionSource, kotlin.jvm.functions.Function1<? super androidx.compose.foundation.layout.BoxScope,kotlin.Unit> content);
+ method @androidx.compose.runtime.Composable public static void CompactButton(kotlin.jvm.functions.Function0<kotlin.Unit> onClick, optional androidx.compose.ui.Modifier modifier, optional boolean enabled, optional androidx.wear.compose.material.ButtonColors colors, optional float backgroundPadding, optional androidx.compose.foundation.interaction.MutableInteractionSource interactionSource, kotlin.jvm.functions.Function1<? super androidx.compose.foundation.layout.BoxScope,kotlin.Unit> content);
+ }
+
+ public final class CardDefaults {
+ method @androidx.compose.runtime.Composable public androidx.compose.ui.graphics.painter.Painter cardBackgroundPainter(optional long startBackgroundColor, optional long endBackgroundColor, optional androidx.compose.ui.unit.LayoutDirection gradientDirection);
+ method public float getAppImageSize();
+ method public androidx.compose.foundation.layout.PaddingValues getContentPadding();
+ method @androidx.compose.runtime.Composable public androidx.compose.ui.graphics.painter.Painter imageWithScrimBackgroundPainter(androidx.compose.ui.graphics.painter.Painter backgroundImagePainter, optional androidx.compose.ui.graphics.Brush backgroundImageScrimBrush);
+ property public final float AppImageSize;
+ property public final androidx.compose.foundation.layout.PaddingValues ContentPadding;
+ field public static final androidx.wear.compose.material.CardDefaults INSTANCE;
+ }
+
+ public final class CardKt {
+ method @androidx.compose.runtime.Composable public static void AppCard(kotlin.jvm.functions.Function0<kotlin.Unit> onClick, kotlin.jvm.functions.Function1<? super androidx.compose.foundation.layout.RowScope,kotlin.Unit> appName, kotlin.jvm.functions.Function1<? super androidx.compose.foundation.layout.RowScope,kotlin.Unit> time, kotlin.jvm.functions.Function1<? super androidx.compose.foundation.layout.RowScope,kotlin.Unit> title, optional androidx.compose.ui.Modifier modifier, optional boolean enabled, optional kotlin.jvm.functions.Function1<? super androidx.compose.foundation.layout.RowScope,kotlin.Unit>? appImage, optional androidx.compose.ui.graphics.painter.Painter backgroundPainter, optional long contentColor, optional long appColor, optional long timeColor, optional long titleColor, kotlin.jvm.functions.Function1<? super androidx.compose.foundation.layout.ColumnScope,kotlin.Unit> content);
+ method @androidx.compose.runtime.Composable public static void Card(kotlin.jvm.functions.Function0<kotlin.Unit> onClick, optional androidx.compose.ui.Modifier modifier, optional androidx.compose.ui.graphics.painter.Painter backgroundPainter, optional long contentColor, optional boolean enabled, optional androidx.compose.foundation.layout.PaddingValues contentPadding, optional androidx.compose.ui.graphics.Shape shape, optional androidx.compose.foundation.interaction.MutableInteractionSource interactionSource, optional androidx.compose.ui.semantics.Role? role, kotlin.jvm.functions.Function1<? super androidx.compose.foundation.layout.ColumnScope,kotlin.Unit> content);
+ method @androidx.compose.runtime.Composable public static void TitleCard(kotlin.jvm.functions.Function0<kotlin.Unit> onClick, kotlin.jvm.functions.Function1<? super androidx.compose.foundation.layout.RowScope,kotlin.Unit> title, optional androidx.compose.ui.Modifier modifier, optional boolean enabled, optional kotlin.jvm.functions.Function1<? super androidx.compose.foundation.layout.RowScope,kotlin.Unit>? time, optional androidx.compose.ui.graphics.painter.Painter backgroundPainter, optional long contentColor, optional long titleColor, optional long timeColor, kotlin.jvm.functions.Function1<? super androidx.compose.foundation.layout.ColumnScope,kotlin.Unit> content);
+ }
+
+ @androidx.compose.runtime.Stable public interface ChipColors {
+ method @androidx.compose.runtime.Composable public androidx.compose.runtime.State<androidx.compose.ui.graphics.painter.Painter> background(boolean enabled);
+ method @androidx.compose.runtime.Composable public androidx.compose.runtime.State<androidx.compose.ui.graphics.Color> contentColor(boolean enabled);
+ method @androidx.compose.runtime.Composable public androidx.compose.runtime.State<androidx.compose.ui.graphics.Color> iconColor(boolean enabled);
+ method @androidx.compose.runtime.Composable public androidx.compose.runtime.State<androidx.compose.ui.graphics.Color> secondaryContentColor(boolean enabled);
+ }
+
+ public final class ChipDefaults {
+ method @androidx.compose.runtime.Composable public androidx.wear.compose.material.ChipColors childChipColors(optional long contentColor, optional long secondaryContentColor, optional long iconColor);
+ method @androidx.compose.runtime.Composable public androidx.wear.compose.material.ChipColors chipColors(optional long backgroundColor, optional long contentColor, optional long secondaryContentColor, optional long iconColor, optional long disabledBackgroundColor, optional long disabledContentColor, optional long disabledSecondaryContentColor, optional long disabledIconColor);
+ method public androidx.compose.foundation.layout.PaddingValues getCompactChipContentPadding();
+ method public androidx.compose.foundation.layout.PaddingValues getContentPadding();
+ method public float getIconSize();
+ method public float getLargeIconSize();
+ method public float getSmallIconSize();
+ method @androidx.compose.runtime.Composable public androidx.wear.compose.material.ChipColors gradientBackgroundChipColors(optional long startBackgroundColor, optional long endBackgroundColor, optional long contentColor, optional long secondaryContentColor, optional long iconColor, optional androidx.compose.ui.unit.LayoutDirection gradientDirection);
+ method @androidx.compose.runtime.Composable public androidx.wear.compose.material.ChipColors imageBackgroundChipColors(androidx.compose.ui.graphics.painter.Painter backgroundImagePainter, optional androidx.compose.ui.graphics.Brush backgroundImageScrimBrush, optional long contentColor, optional long secondaryContentColor, optional long iconColor);
+ method @androidx.compose.runtime.Composable public androidx.wear.compose.material.ChipColors primaryChipColors(optional long backgroundColor, optional long contentColor, optional long secondaryContentColor, optional long iconColor);
+ method @androidx.compose.runtime.Composable public androidx.wear.compose.material.ChipColors secondaryChipColors(optional long backgroundColor, optional long contentColor, optional long secondaryContentColor, optional long iconColor);
+ property public final androidx.compose.foundation.layout.PaddingValues CompactChipContentPadding;
+ property public final androidx.compose.foundation.layout.PaddingValues ContentPadding;
+ property public final float IconSize;
+ property public final float LargeIconSize;
+ property public final float SmallIconSize;
+ field public static final androidx.wear.compose.material.ChipDefaults INSTANCE;
+ }
+
+ public final class ChipKt {
+ method @androidx.compose.runtime.Composable public static void Chip(kotlin.jvm.functions.Function0<kotlin.Unit> onClick, androidx.wear.compose.material.ChipColors colors, optional androidx.compose.ui.Modifier modifier, optional boolean enabled, optional androidx.compose.foundation.layout.PaddingValues contentPadding, optional androidx.compose.ui.graphics.Shape shape, optional androidx.compose.foundation.interaction.MutableInteractionSource interactionSource, optional androidx.compose.ui.semantics.Role? role, kotlin.jvm.functions.Function1<? super androidx.compose.foundation.layout.RowScope,kotlin.Unit> content);
+ method @androidx.compose.runtime.Composable public static void Chip(kotlin.jvm.functions.Function1<? super androidx.compose.foundation.layout.RowScope,kotlin.Unit> label, kotlin.jvm.functions.Function0<kotlin.Unit> onClick, optional androidx.compose.ui.Modifier modifier, optional kotlin.jvm.functions.Function1<? super androidx.compose.foundation.layout.RowScope,kotlin.Unit>? secondaryLabel, optional kotlin.jvm.functions.Function1<? super androidx.compose.foundation.layout.BoxScope,kotlin.Unit>? icon, optional androidx.wear.compose.material.ChipColors colors, optional boolean enabled, optional androidx.compose.foundation.interaction.MutableInteractionSource interactionSource, optional androidx.compose.foundation.layout.PaddingValues contentPadding);
+ method @androidx.compose.runtime.Composable public static void CompactChip(kotlin.jvm.functions.Function0<kotlin.Unit> onClick, optional androidx.compose.ui.Modifier modifier, optional kotlin.jvm.functions.Function1<? super androidx.compose.foundation.layout.RowScope,kotlin.Unit>? label, optional kotlin.jvm.functions.Function1<? super androidx.compose.foundation.layout.BoxScope,kotlin.Unit>? icon, optional androidx.wear.compose.material.ChipColors colors, optional boolean enabled, optional androidx.compose.foundation.interaction.MutableInteractionSource interactionSource, optional androidx.compose.foundation.layout.PaddingValues contentPadding);
+ }
+
+ @androidx.compose.runtime.Stable public final class Colors {
+ ctor public Colors(optional long primary, optional long primaryVariant, optional long secondary, optional long secondaryVariant, optional long background, optional long surface, optional long error, optional long onPrimary, optional long onSecondary, optional long onBackground, optional long onSurface, optional long onSurfaceVariant, optional long onError);
+ method public androidx.wear.compose.material.Colors copy(optional long primary, optional long primaryVariant, optional long secondary, optional long secondaryVariant, optional long background, optional long surface, optional long error, optional long onPrimary, optional long onSecondary, optional long onBackground, optional long onSurface, optional long onSurfaceVariant, optional long onError);
+ 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 getOnSurfaceVariant();
+ method public long getPrimary();
+ method public long getPrimaryVariant();
+ method public long getSecondary();
+ method public long getSecondaryVariant();
+ method public long getSurface();
+ property public final long background;
+ property public final long error;
+ property public final long onBackground;
+ property public final long onError;
+ property public final long onPrimary;
+ property public final long onSecondary;
+ property public final long onSurface;
+ property public final long onSurfaceVariant;
+ property public final long primary;
+ property public final long primaryVariant;
+ property public final long secondary;
+ property public final long secondaryVariant;
+ property public final long surface;
+ }
+
+ public final class ColorsKt {
+ method public static long contentColorFor(androidx.wear.compose.material.Colors, long backgroundColor);
+ method @androidx.compose.runtime.Composable @androidx.compose.runtime.ReadOnlyComposable public static long contentColorFor(long backgroundColor);
+ }
+
+ public final class ContentAlpha {
+ method @androidx.compose.runtime.Composable public float getDisabled();
+ method @androidx.compose.runtime.Composable public float getHigh();
+ method @androidx.compose.runtime.Composable public float getMedium();
+ property @androidx.compose.runtime.Composable public final float disabled;
+ property @androidx.compose.runtime.Composable public final float high;
+ property @androidx.compose.runtime.Composable public final float medium;
+ field public static final androidx.wear.compose.material.ContentAlpha INSTANCE;
+ }
+
+ public final class ContentAlphaKt {
+ method public static androidx.compose.runtime.ProvidableCompositionLocal<java.lang.Float> getLocalContentAlpha();
+ property public static final androidx.compose.runtime.ProvidableCompositionLocal<java.lang.Float> LocalContentAlpha;
+ }
+
+ public final class ContentColorKt {
+ method public static androidx.compose.runtime.ProvidableCompositionLocal<androidx.compose.ui.graphics.Color> getLocalContentColor();
+ property public static final androidx.compose.runtime.ProvidableCompositionLocal<androidx.compose.ui.graphics.Color> LocalContentColor;
+ }
+
+ public final class CurvedTextKt {
+ method public static void curvedText(androidx.wear.compose.foundation.CurvedScope, String text, optional androidx.wear.compose.foundation.CurvedModifier modifier, optional long background, optional long color, optional long fontSize, optional androidx.wear.compose.foundation.CurvedTextStyle? style, optional androidx.wear.compose.foundation.CurvedDirection.Angular? angularDirection, optional int overflow);
+ }
+
+ public final class DefaultTimeSourceKt {
+ }
+
+ @kotlin.RequiresOptIn(message="This Wear Material API is experimental and is likely to change or to be removed in" + " the future.") public @interface ExperimentalWearMaterialApi {
+ }
+
+ @androidx.compose.runtime.Immutable @androidx.wear.compose.material.ExperimentalWearMaterialApi public final class FixedThreshold implements androidx.wear.compose.material.ThresholdConfig {
+ ctor public FixedThreshold(float offset);
+ method public float computeThreshold(androidx.compose.ui.unit.Density, float fromValue, float toValue);
+ method public androidx.wear.compose.material.FixedThreshold copy-0680j_4(float offset);
+ }
+
+ @androidx.compose.runtime.Immutable @androidx.wear.compose.material.ExperimentalWearMaterialApi public final class FractionalThreshold implements androidx.wear.compose.material.ThresholdConfig {
+ ctor public FractionalThreshold(float fraction);
+ method public float computeThreshold(androidx.compose.ui.unit.Density, float fromValue, float toValue);
+ method public androidx.wear.compose.material.FractionalThreshold copy(float fraction);
+ }
+
+ public final class HorizontalPageIndicatorKt {
+ method @androidx.compose.runtime.Composable public static void HorizontalPageIndicator(androidx.wear.compose.material.PageIndicatorState pageIndicatorState, optional androidx.compose.ui.Modifier modifier, optional int indicatorStyle, optional long selectedColor, optional long unselectedColor, optional float indicatorSize, optional float spacing, optional androidx.compose.ui.graphics.Shape indicatorShape);
+ }
+
+ public final class IconKt {
+ method @androidx.compose.runtime.Composable public static void Icon(androidx.compose.ui.graphics.vector.ImageVector imageVector, String? contentDescription, optional androidx.compose.ui.Modifier modifier, optional long tint);
+ method @androidx.compose.runtime.Composable public static void Icon(androidx.compose.ui.graphics.ImageBitmap bitmap, String? contentDescription, optional androidx.compose.ui.Modifier modifier, optional long tint);
+ method @androidx.compose.runtime.Composable public static void Icon(androidx.compose.ui.graphics.painter.Painter painter, String? contentDescription, optional androidx.compose.ui.Modifier modifier, optional long tint);
+ }
+
+ @androidx.compose.runtime.Stable public interface InlineSliderColors {
+ method @androidx.compose.runtime.Composable public androidx.compose.runtime.State<androidx.compose.ui.graphics.Color> backgroundColor(boolean enabled);
+ method @androidx.compose.runtime.Composable public androidx.compose.runtime.State<androidx.compose.ui.graphics.Color> barColor(boolean enabled, boolean selected);
+ method @androidx.compose.runtime.Composable public androidx.compose.runtime.State<androidx.compose.ui.graphics.Color> spacerColor(boolean enabled);
+ }
+
+ public final class InlineSliderDefaults {
+ method @androidx.compose.runtime.Composable public androidx.wear.compose.material.InlineSliderColors colors(optional long backgroundColor, optional long spacerColor, optional long selectedBarColor, optional long unselectedBarColor, optional long disabledBackgroundColor, optional long disabledSpacerColor, optional long disabledSelectedBarColor, optional long disabledUnselectedBarColor);
+ method public androidx.compose.ui.graphics.vector.ImageVector getDecrease();
+ method public androidx.compose.ui.graphics.vector.ImageVector getIncrease();
+ property public final androidx.compose.ui.graphics.vector.ImageVector Decrease;
+ property public final androidx.compose.ui.graphics.vector.ImageVector Increase;
+ field public static final androidx.wear.compose.material.InlineSliderDefaults INSTANCE;
+ }
+
+ public final class ListHeaderKt {
+ method @androidx.compose.runtime.Composable public static void ListHeader(optional androidx.compose.ui.Modifier modifier, optional long backgroundColor, optional long contentColor, kotlin.jvm.functions.Function1<? super androidx.compose.foundation.layout.RowScope,kotlin.Unit> content);
+ }
+
+ public final class MaterialTextSelectionColorsKt {
+ }
+
+ public final class MaterialTheme {
+ method @androidx.compose.runtime.Composable @androidx.compose.runtime.ReadOnlyComposable public androidx.wear.compose.material.Colors getColors();
+ method @androidx.compose.runtime.Composable @androidx.compose.runtime.ReadOnlyComposable public androidx.wear.compose.material.Shapes getShapes();
+ method @androidx.compose.runtime.Composable @androidx.compose.runtime.ReadOnlyComposable public androidx.wear.compose.material.Typography getTypography();
+ property @androidx.compose.runtime.Composable @androidx.compose.runtime.ReadOnlyComposable public final androidx.wear.compose.material.Colors colors;
+ property @androidx.compose.runtime.Composable @androidx.compose.runtime.ReadOnlyComposable public final androidx.wear.compose.material.Shapes shapes;
+ property @androidx.compose.runtime.Composable @androidx.compose.runtime.ReadOnlyComposable public final androidx.wear.compose.material.Typography typography;
+ field public static final androidx.wear.compose.material.MaterialTheme INSTANCE;
+ }
+
+ public final class MaterialThemeKt {
+ method @androidx.compose.runtime.Composable public static void MaterialTheme(optional androidx.wear.compose.material.Colors colors, optional androidx.wear.compose.material.Typography typography, optional androidx.wear.compose.material.Shapes shapes, kotlin.jvm.functions.Function0<kotlin.Unit> content);
+ }
+
+ public final class PageIndicatorDefaults {
+ method @androidx.compose.runtime.Composable public int style();
+ field public static final androidx.wear.compose.material.PageIndicatorDefaults INSTANCE;
+ }
+
+ public interface PageIndicatorState {
+ method public int getPageCount();
+ method public float getPageOffset();
+ method public int getSelectedPage();
+ property public abstract int pageCount;
+ property public abstract float pageOffset;
+ property public abstract int selectedPage;
+ }
+
+ @kotlin.jvm.JvmInline public final value class PageIndicatorStyle {
+ field public static final androidx.wear.compose.material.PageIndicatorStyle.Companion Companion;
+ }
+
+ public static final class PageIndicatorStyle.Companion {
+ method public int getCurved();
+ method public int getLinear();
+ property public final int Curved;
+ property public final int Linear;
+ }
+
+ public final class PickerDefaults {
+ method @androidx.compose.runtime.Composable public androidx.compose.foundation.gestures.FlingBehavior flingBehavior(androidx.wear.compose.material.PickerState state, optional androidx.compose.animation.core.DecayAnimationSpec<java.lang.Float> decay);
+ method public float getDefaultGradientRatio();
+ method public androidx.wear.compose.material.ScalingParams scalingParams(optional float edgeScale, optional float edgeAlpha, optional float minElementHeight, optional float maxElementHeight, optional float minTransitionArea, optional float maxTransitionArea, optional androidx.compose.animation.core.Easing scaleInterpolator, optional kotlin.jvm.functions.Function1<? super androidx.compose.ui.unit.Constraints,java.lang.Integer> viewportVerticalOffsetResolver);
+ property public final float DefaultGradientRatio;
+ field public static final androidx.wear.compose.material.PickerDefaults INSTANCE;
+ }
+
+ public final class PickerKt {
+ method @androidx.compose.runtime.Composable public static void Picker(androidx.wear.compose.material.PickerState state, optional androidx.compose.ui.Modifier modifier, optional boolean readOnly, optional kotlin.jvm.functions.Function1<? super androidx.compose.foundation.layout.BoxScope,kotlin.Unit>? readOnlyLabel, optional androidx.wear.compose.material.ScalingParams scalingParams, optional float separation, optional float gradientRatio, optional long gradientColor, optional androidx.compose.foundation.gestures.FlingBehavior flingBehavior, kotlin.jvm.functions.Function2<? super androidx.wear.compose.material.PickerScope,? super java.lang.Integer,kotlin.Unit> option);
+ method @androidx.compose.runtime.Composable public static androidx.wear.compose.material.PickerState rememberPickerState(int initialNumberOfOptions, optional int initiallySelectedOption, optional boolean repeatItems);
+ }
+
+ public interface PickerScope {
+ method public int getSelectedOption();
+ property public abstract int selectedOption;
+ }
+
+ @androidx.compose.runtime.Stable public final class PickerState implements androidx.compose.foundation.gestures.ScrollableState {
+ ctor public PickerState(int initialNumberOfOptions, optional int initiallySelectedOption, optional boolean repeatItems);
+ method public float dispatchRawDelta(float delta);
+ method public int getNumberOfOptions();
+ method public boolean getRepeatItems();
+ method public int getSelectedOption();
+ method public boolean isScrollInProgress();
+ method public suspend Object? scroll(androidx.compose.foundation.MutatePriority scrollPriority, kotlin.jvm.functions.Function2<? super androidx.compose.foundation.gestures.ScrollScope,? super kotlin.coroutines.Continuation<? super kotlin.Unit>,?> block, kotlin.coroutines.Continuation<? super kotlin.Unit>);
+ method public suspend Object? scrollToOption(int index, kotlin.coroutines.Continuation<? super kotlin.Unit>);
+ method public void setNumberOfOptions(int);
+ property public boolean isScrollInProgress;
+ property public final int numberOfOptions;
+ property public final boolean repeatItems;
+ property public final int selectedOption;
+ field public static final androidx.wear.compose.material.PickerState.Companion Companion;
+ }
+
+ public static final class PickerState.Companion {
+ method public androidx.compose.runtime.saveable.Saver<androidx.wear.compose.material.PickerState,java.lang.Object> getSaver();
+ property public final androidx.compose.runtime.saveable.Saver<androidx.wear.compose.material.PickerState,java.lang.Object> Saver;
+ }
+
+ @kotlin.jvm.JvmInline public final value class PositionIndicatorAlignment {
+ field public static final androidx.wear.compose.material.PositionIndicatorAlignment.Companion Companion;
+ }
+
+ public static final class PositionIndicatorAlignment.Companion {
+ method public int getEnd();
+ method public int getLeft();
+ method public int getOppositeRsb();
+ method public int getRight();
+ property public final int End;
+ property public final int Left;
+ property public final int OppositeRsb;
+ property public final int Right;
+ }
+
+ public final class PositionIndicatorKt {
+ method @androidx.compose.runtime.Composable public static void PositionIndicator(androidx.compose.foundation.ScrollState scrollState, optional androidx.compose.ui.Modifier modifier, optional boolean reverseDirection);
+ method @androidx.compose.runtime.Composable public static void PositionIndicator(androidx.wear.compose.material.ScalingLazyListState scalingLazyListState, optional androidx.compose.ui.Modifier modifier, optional boolean reverseDirection);
+ method @androidx.compose.runtime.Composable public static void PositionIndicator(androidx.compose.foundation.lazy.LazyListState lazyListState, optional androidx.compose.ui.Modifier modifier, optional boolean reverseDirection);
+ method @androidx.compose.runtime.Composable public static void PositionIndicator(kotlin.jvm.functions.Function0<java.lang.Float> value, optional androidx.compose.ui.Modifier modifier, optional kotlin.ranges.ClosedFloatingPointRange<java.lang.Float> range, optional long color, optional boolean reverseDirection, optional int position);
+ method @androidx.compose.runtime.Composable public static void PositionIndicator(androidx.wear.compose.material.PositionIndicatorState state, float indicatorHeight, float indicatorWidth, float paddingHorizontal, optional androidx.compose.ui.Modifier modifier, optional long background, optional long color, optional boolean reverseDirection, optional int position);
+ }
+
+ @androidx.compose.runtime.Stable public interface PositionIndicatorState {
+ method public float getPositionFraction();
+ method public float sizeFraction(float scrollableContainerSizePx);
+ method public int visibility(float scrollableContainerSizePx);
+ property public abstract float positionFraction;
+ }
+
+ @kotlin.jvm.JvmInline public final value class PositionIndicatorVisibility {
+ field public static final androidx.wear.compose.material.PositionIndicatorVisibility.Companion Companion;
+ }
+
+ public static final class PositionIndicatorVisibility.Companion {
+ method public int getAutoHide();
+ method public int getHide();
+ method public int getShow();
+ property public final int AutoHide;
+ property public final int Hide;
+ property public final int Show;
+ }
+
+ public final class ProgressIndicatorDefaults {
+ method public androidx.compose.animation.core.SpringSpec<java.lang.Float> getProgressAnimationSpec();
+ method public float getStrokeWidth();
+ property public final androidx.compose.animation.core.SpringSpec<java.lang.Float> ProgressAnimationSpec;
+ property public final float StrokeWidth;
+ field public static final androidx.wear.compose.material.ProgressIndicatorDefaults INSTANCE;
+ }
+
+ public final class ProgressIndicatorKt {
+ method @androidx.compose.runtime.Composable public static void CircularProgressIndicator(float progress, optional androidx.compose.ui.Modifier modifier, optional float startAngle, optional float endAngle, optional long indicatorColor, optional long trackColor, optional float strokeWidth);
+ method @androidx.compose.runtime.Composable public static void CircularProgressIndicator(optional androidx.compose.ui.Modifier modifier, optional float startAngle, optional long indicatorColor, optional long trackColor, optional float strokeWidth);
+ }
+
+ public final class RangeDefaultsKt {
+ }
+
+ @androidx.compose.runtime.Immutable @androidx.wear.compose.material.ExperimentalWearMaterialApi public final class ResistanceConfig {
+ ctor public ResistanceConfig(float basis, optional float factorAtMin, optional float factorAtMax);
+ method public float computeResistance(float overflow);
+ method public float getBasis();
+ method public float getFactorAtMax();
+ method public float getFactorAtMin();
+ property public final float basis;
+ property public final float factorAtMax;
+ property public final float factorAtMin;
+ }
+
+ public final class Resources_androidKt {
+ }
+
+ public final class ScaffoldKt {
+ method @androidx.compose.runtime.Composable public static void Scaffold(optional androidx.compose.ui.Modifier modifier, optional kotlin.jvm.functions.Function0<kotlin.Unit>? vignette, optional kotlin.jvm.functions.Function0<kotlin.Unit>? positionIndicator, optional kotlin.jvm.functions.Function0<kotlin.Unit>? pageIndicator, optional kotlin.jvm.functions.Function0<kotlin.Unit>? timeText, kotlin.jvm.functions.Function0<kotlin.Unit> content);
+ }
+
+ public final class ScalingLazyColumnDefaults {
+ method public androidx.wear.compose.material.ScalingParams scalingParams(optional float edgeScale, optional float edgeAlpha, optional float minElementHeight, optional float maxElementHeight, optional float minTransitionArea, optional float maxTransitionArea, optional androidx.compose.animation.core.Easing scaleInterpolator, optional kotlin.jvm.functions.Function1<? super androidx.compose.ui.unit.Constraints,java.lang.Integer> viewportVerticalOffsetResolver);
+ method @androidx.compose.runtime.Composable public androidx.compose.foundation.gestures.FlingBehavior snapFlingBehavior(androidx.wear.compose.material.ScalingLazyListState state, optional float snapOffset, optional androidx.compose.animation.core.DecayAnimationSpec<java.lang.Float> decay);
+ field public static final androidx.wear.compose.material.ScalingLazyColumnDefaults INSTANCE;
+ }
+
+ public final class ScalingLazyColumnKt {
+ method @androidx.compose.runtime.Composable public static void ScalingLazyColumn(optional androidx.compose.ui.Modifier modifier, optional androidx.wear.compose.material.ScalingLazyListState state, optional androidx.compose.foundation.layout.PaddingValues contentPadding, optional boolean reverseLayout, optional androidx.compose.foundation.layout.Arrangement.Vertical verticalArrangement, optional androidx.compose.ui.Alignment.Horizontal horizontalAlignment, optional androidx.compose.foundation.gestures.FlingBehavior flingBehavior, optional boolean userScrollEnabled, optional androidx.wear.compose.material.ScalingParams scalingParams, optional int anchorType, optional androidx.wear.compose.material.AutoCenteringParams? autoCentering, kotlin.jvm.functions.Function1<? super androidx.wear.compose.material.ScalingLazyListScope,kotlin.Unit> content);
+ method public static inline <T> void items(androidx.wear.compose.material.ScalingLazyListScope, java.util.List<? extends T> items, optional kotlin.jvm.functions.Function1<? super T,?>? key, kotlin.jvm.functions.Function2<? super androidx.wear.compose.material.ScalingLazyListItemScope,? super T,kotlin.Unit> itemContent);
+ method public static inline <T> void items(androidx.wear.compose.material.ScalingLazyListScope, T![] items, optional kotlin.jvm.functions.Function1<? super T,?>? key, kotlin.jvm.functions.Function2<? super androidx.wear.compose.material.ScalingLazyListItemScope,? super T,kotlin.Unit> itemContent);
+ method public static inline <T> void itemsIndexed(androidx.wear.compose.material.ScalingLazyListScope, java.util.List<? extends T> items, optional kotlin.jvm.functions.Function2<? super java.lang.Integer,? super T,?>? key, kotlin.jvm.functions.Function3<? super androidx.wear.compose.material.ScalingLazyListItemScope,? super java.lang.Integer,? super T,kotlin.Unit> itemContent);
+ method public static inline <T> void itemsIndexed(androidx.wear.compose.material.ScalingLazyListScope, T![] items, optional kotlin.jvm.functions.Function2<? super java.lang.Integer,? super T,?>? key, kotlin.jvm.functions.Function3<? super androidx.wear.compose.material.ScalingLazyListItemScope,? super java.lang.Integer,? super T,kotlin.Unit> itemContent);
+ }
+
+ public final class ScalingLazyColumnMeasureKt {
+ }
+
+ @androidx.compose.runtime.Immutable @kotlin.jvm.JvmInline public final value class ScalingLazyListAnchorType {
+ field public static final androidx.wear.compose.material.ScalingLazyListAnchorType.Companion Companion;
+ }
+
+ public static final class ScalingLazyListAnchorType.Companion {
+ method public int getItemCenter();
+ method public int getItemStart();
+ property public final int ItemCenter;
+ property public final int ItemStart;
+ }
+
+ public sealed interface ScalingLazyListItemInfo {
+ method public float getAlpha();
+ method public int getIndex();
+ method public Object getKey();
+ method public int getOffset();
+ method public float getScale();
+ method public int getSize();
+ method public int getUnadjustedOffset();
+ method public int getUnadjustedSize();
+ property public abstract float alpha;
+ property public abstract int index;
+ property public abstract Object key;
+ property public abstract int offset;
+ property public abstract float scale;
+ property public abstract int size;
+ property public abstract int unadjustedOffset;
+ property public abstract int unadjustedSize;
+ }
+
+ @androidx.compose.runtime.Stable @androidx.wear.compose.material.ScalingLazyScopeMarker public sealed interface ScalingLazyListItemScope {
+ method public androidx.compose.ui.Modifier fillParentMaxHeight(androidx.compose.ui.Modifier, optional float fraction);
+ method public androidx.compose.ui.Modifier fillParentMaxSize(androidx.compose.ui.Modifier, optional float fraction);
+ method public androidx.compose.ui.Modifier fillParentMaxWidth(androidx.compose.ui.Modifier, optional float fraction);
+ }
+
+ public sealed interface ScalingLazyListLayoutInfo {
+ method public int getAfterAutoCenteringPadding();
+ method public int getAfterContentPadding();
+ method public int getBeforeAutoCenteringPadding();
+ method public int getBeforeContentPadding();
+ method public androidx.compose.foundation.gestures.Orientation getOrientation();
+ method public boolean getReverseLayout();
+ method public int getTotalItemsCount();
+ method public int getViewportEndOffset();
+ method public long getViewportSize();
+ method public int getViewportStartOffset();
+ method public java.util.List<androidx.wear.compose.material.ScalingLazyListItemInfo> getVisibleItemsInfo();
+ property public abstract int afterAutoCenteringPadding;
+ property public abstract int afterContentPadding;
+ property public abstract int beforeAutoCenteringPadding;
+ property public abstract int beforeContentPadding;
+ property public abstract androidx.compose.foundation.gestures.Orientation orientation;
+ property public abstract boolean reverseLayout;
+ property public abstract int totalItemsCount;
+ property public abstract int viewportEndOffset;
+ property public abstract long viewportSize;
+ property public abstract int viewportStartOffset;
+ property public abstract java.util.List<androidx.wear.compose.material.ScalingLazyListItemInfo> visibleItemsInfo;
+ }
+
+ @androidx.wear.compose.material.ScalingLazyScopeMarker public sealed interface ScalingLazyListScope {
+ method public void item(optional Object? key, kotlin.jvm.functions.Function1<? super androidx.wear.compose.material.ScalingLazyListItemScope,kotlin.Unit> content);
+ method public void items(int count, optional kotlin.jvm.functions.Function1<? super java.lang.Integer,?>? key, kotlin.jvm.functions.Function2<? super androidx.wear.compose.material.ScalingLazyListItemScope,? super java.lang.Integer,kotlin.Unit> itemContent);
+ }
+
+ @androidx.compose.runtime.Stable public final class ScalingLazyListState implements androidx.compose.foundation.gestures.ScrollableState {
+ ctor public ScalingLazyListState(optional int initialCenterItemIndex, optional int initialCenterItemScrollOffset);
+ method public suspend Object? animateScrollToItem(int index, optional int scrollOffset, optional kotlin.coroutines.Continuation<? super kotlin.Unit>);
+ method public float dispatchRawDelta(float delta);
+ method public int getCenterItemIndex();
+ method public int getCenterItemScrollOffset();
+ method public androidx.wear.compose.material.ScalingLazyListLayoutInfo getLayoutInfo();
+ method public boolean isScrollInProgress();
+ method public suspend Object? scroll(androidx.compose.foundation.MutatePriority scrollPriority, kotlin.jvm.functions.Function2<? super androidx.compose.foundation.gestures.ScrollScope,? super kotlin.coroutines.Continuation<? super kotlin.Unit>,?> block, kotlin.coroutines.Continuation<? super kotlin.Unit>);
+ method public suspend Object? scrollToItem(int index, optional int scrollOffset, optional kotlin.coroutines.Continuation<? super kotlin.Unit>);
+ property public final int centerItemIndex;
+ property public final int centerItemScrollOffset;
+ property public boolean isScrollInProgress;
+ property public final androidx.wear.compose.material.ScalingLazyListLayoutInfo layoutInfo;
+ field public static final androidx.wear.compose.material.ScalingLazyListState.Companion Companion;
+ }
+
+ public static final class ScalingLazyListState.Companion {
+ method public androidx.compose.runtime.saveable.Saver<androidx.wear.compose.material.ScalingLazyListState,java.lang.Object> getSaver();
+ property public final androidx.compose.runtime.saveable.Saver<androidx.wear.compose.material.ScalingLazyListState,java.lang.Object> Saver;
+ }
+
+ public final class ScalingLazyListStateKt {
+ method @androidx.compose.runtime.Composable public static androidx.wear.compose.material.ScalingLazyListState rememberScalingLazyListState(optional int initialCenterItemIndex, optional int initialCenterItemScrollOffset);
+ }
+
+ @kotlin.DslMarker public @interface ScalingLazyScopeMarker {
+ }
+
+ @androidx.compose.runtime.Stable public interface ScalingParams {
+ method public float getEdgeAlpha();
+ method public float getEdgeScale();
+ method public float getMaxElementHeight();
+ method public float getMaxTransitionArea();
+ method public float getMinElementHeight();
+ method public float getMinTransitionArea();
+ method public androidx.compose.animation.core.Easing getScaleInterpolator();
+ method public int resolveViewportVerticalOffset(long viewportConstraints);
+ property public abstract float edgeAlpha;
+ property public abstract float edgeScale;
+ property public abstract float maxElementHeight;
+ property public abstract float maxTransitionArea;
+ property public abstract float minElementHeight;
+ property public abstract float minTransitionArea;
+ property public abstract androidx.compose.animation.core.Easing scaleInterpolator;
+ }
+
+ @androidx.compose.runtime.Immutable public final class Shapes {
+ ctor public Shapes(optional androidx.compose.foundation.shape.CornerBasedShape small, optional androidx.compose.foundation.shape.CornerBasedShape medium, optional androidx.compose.foundation.shape.CornerBasedShape large);
+ method public androidx.wear.compose.material.Shapes copy(optional androidx.compose.foundation.shape.CornerBasedShape small, optional androidx.compose.foundation.shape.CornerBasedShape medium, optional androidx.compose.foundation.shape.CornerBasedShape large);
+ method public androidx.compose.foundation.shape.CornerBasedShape getLarge();
+ method public androidx.compose.foundation.shape.CornerBasedShape getMedium();
+ method public androidx.compose.foundation.shape.CornerBasedShape getSmall();
+ property public final androidx.compose.foundation.shape.CornerBasedShape large;
+ property public final androidx.compose.foundation.shape.CornerBasedShape medium;
+ property public final androidx.compose.foundation.shape.CornerBasedShape small;
+ }
+
+ public final class ShapesKt {
+ }
+
+ public final class SliderKt {
+ method @androidx.compose.runtime.Composable public static void InlineSlider(float value, kotlin.jvm.functions.Function1<? super java.lang.Float,kotlin.Unit> onValueChange, int steps, kotlin.jvm.functions.Function0<kotlin.Unit> decreaseIcon, kotlin.jvm.functions.Function0<kotlin.Unit> increaseIcon, optional androidx.compose.ui.Modifier modifier, optional boolean enabled, optional kotlin.ranges.ClosedFloatingPointRange<java.lang.Float> valueRange, optional boolean segmented, optional androidx.wear.compose.material.InlineSliderColors colors);
+ method @androidx.compose.runtime.Composable public static void InlineSlider(int value, kotlin.jvm.functions.Function1<? super java.lang.Integer,kotlin.Unit> onValueChange, kotlin.ranges.IntProgression valueProgression, kotlin.jvm.functions.Function0<kotlin.Unit> decreaseIcon, kotlin.jvm.functions.Function0<kotlin.Unit> increaseIcon, optional androidx.compose.ui.Modifier modifier, optional boolean enabled, optional boolean segmented, optional androidx.wear.compose.material.InlineSliderColors colors);
+ }
+
+ @androidx.compose.runtime.Stable public interface SplitToggleChipColors {
+ method @androidx.compose.runtime.Composable public androidx.compose.runtime.State<androidx.compose.ui.graphics.Color> backgroundColor(boolean enabled);
+ method @androidx.compose.runtime.Composable public androidx.compose.runtime.State<androidx.compose.ui.graphics.Color> contentColor(boolean enabled);
+ method @androidx.compose.runtime.Composable public androidx.compose.runtime.State<androidx.compose.ui.graphics.Color> secondaryContentColor(boolean enabled);
+ method @androidx.compose.runtime.Composable public androidx.compose.runtime.State<androidx.compose.ui.graphics.Color> splitBackgroundOverlay(boolean enabled, boolean checked);
+ method @androidx.compose.runtime.Composable public androidx.compose.runtime.State<androidx.compose.ui.graphics.Color> toggleControlColor(boolean enabled, boolean checked);
+ }
+
+ public final class StepperDefaults {
+ method public androidx.compose.ui.graphics.vector.ImageVector getDecrease();
+ method public androidx.compose.ui.graphics.vector.ImageVector getIncrease();
+ property public final androidx.compose.ui.graphics.vector.ImageVector Decrease;
+ property public final androidx.compose.ui.graphics.vector.ImageVector Increase;
+ field public static final androidx.wear.compose.material.StepperDefaults INSTANCE;
+ }
+
+ public final class StepperKt {
+ method @androidx.compose.runtime.Composable public static void Stepper(float value, kotlin.jvm.functions.Function1<? super java.lang.Float,kotlin.Unit> onValueChange, int steps, kotlin.jvm.functions.Function0<kotlin.Unit> decreaseIcon, kotlin.jvm.functions.Function0<kotlin.Unit> increaseIcon, optional androidx.compose.ui.Modifier modifier, optional kotlin.ranges.ClosedFloatingPointRange<java.lang.Float> valueRange, optional long backgroundColor, optional long contentColor, optional long iconColor, kotlin.jvm.functions.Function1<? super androidx.compose.foundation.layout.BoxScope,kotlin.Unit> content);
+ method @androidx.compose.runtime.Composable public static void Stepper(int value, kotlin.jvm.functions.Function1<? super java.lang.Integer,kotlin.Unit> onValueChange, kotlin.ranges.IntProgression valueProgression, kotlin.jvm.functions.Function0<kotlin.Unit> decreaseIcon, kotlin.jvm.functions.Function0<kotlin.Unit> increaseIcon, optional androidx.compose.ui.Modifier modifier, optional long backgroundColor, optional long contentColor, optional long iconColor, kotlin.jvm.functions.Function1<? super androidx.compose.foundation.layout.BoxScope,kotlin.Unit> content);
+ }
+
+ @androidx.compose.runtime.Immutable @androidx.wear.compose.material.ExperimentalWearMaterialApi public final class SwipeProgress<T> {
+ ctor public SwipeProgress(T? from, T? to, float fraction);
+ method public float getFraction();
+ method public T! getFrom();
+ method public T! getTo();
+ property public final float fraction;
+ property public final T! from;
+ property public final T! to;
+ }
+
+ public final class SwipeToDismissBoxDefaults {
+ method public androidx.compose.animation.core.SpringSpec<java.lang.Float> getAnimationSpec();
+ method public float getEdgeWidth();
+ property public final androidx.compose.animation.core.SpringSpec<java.lang.Float> AnimationSpec;
+ property public final float EdgeWidth;
+ field public static final androidx.wear.compose.material.SwipeToDismissBoxDefaults INSTANCE;
+ }
+
+ public final class SwipeToDismissBoxKt {
+ method @androidx.compose.runtime.Composable public static void SwipeToDismissBox(androidx.wear.compose.material.SwipeToDismissBoxState state, optional androidx.compose.ui.Modifier modifier, optional long backgroundScrimColor, optional long contentScrimColor, optional Object backgroundKey, optional Object contentKey, optional boolean hasBackground, kotlin.jvm.functions.Function2<? super androidx.compose.foundation.layout.BoxScope,? super java.lang.Boolean,kotlin.Unit> content);
+ method @androidx.compose.runtime.Composable public static void SwipeToDismissBox(kotlin.jvm.functions.Function0<kotlin.Unit> onDismissed, optional androidx.compose.ui.Modifier modifier, optional androidx.wear.compose.material.SwipeToDismissBoxState state, optional long backgroundScrimColor, optional long contentScrimColor, optional Object backgroundKey, optional Object contentKey, optional boolean hasBackground, kotlin.jvm.functions.Function2<? super androidx.compose.foundation.layout.BoxScope,? super java.lang.Boolean,kotlin.Unit> content);
+ method public static androidx.compose.ui.Modifier edgeSwipeToDismiss(androidx.compose.ui.Modifier, androidx.wear.compose.material.SwipeToDismissBoxState swipeToDismissBoxState, optional float edgeWidth);
+ method @androidx.compose.runtime.Composable public static androidx.wear.compose.material.SwipeToDismissBoxState rememberSwipeToDismissBoxState(optional androidx.compose.animation.core.AnimationSpec<java.lang.Float> animationSpec, optional kotlin.jvm.functions.Function1<? super androidx.wear.compose.material.SwipeToDismissValue,java.lang.Boolean> confirmStateChange);
+ }
+
+ @androidx.compose.runtime.Stable public final class SwipeToDismissBoxState {
+ ctor public SwipeToDismissBoxState(optional androidx.compose.animation.core.AnimationSpec<java.lang.Float> animationSpec, optional kotlin.jvm.functions.Function1<? super androidx.wear.compose.material.SwipeToDismissValue,java.lang.Boolean> confirmStateChange);
+ method public androidx.wear.compose.material.SwipeToDismissValue getCurrentValue();
+ method public androidx.wear.compose.material.SwipeToDismissValue getTargetValue();
+ method public boolean isAnimationRunning();
+ method public suspend Object? snapTo(androidx.wear.compose.material.SwipeToDismissValue targetValue, kotlin.coroutines.Continuation<? super kotlin.Unit>);
+ property public final androidx.wear.compose.material.SwipeToDismissValue currentValue;
+ property public final boolean isAnimationRunning;
+ property public final androidx.wear.compose.material.SwipeToDismissValue targetValue;
+ }
+
+ public enum SwipeToDismissKeys {
+ enum_constant public static final androidx.wear.compose.material.SwipeToDismissKeys Background;
+ enum_constant public static final androidx.wear.compose.material.SwipeToDismissKeys Content;
+ }
+
+ public enum SwipeToDismissValue {
+ enum_constant public static final androidx.wear.compose.material.SwipeToDismissValue Default;
+ enum_constant public static final androidx.wear.compose.material.SwipeToDismissValue Dismissed;
+ }
+
+ @androidx.wear.compose.material.ExperimentalWearMaterialApi public final class SwipeableDefaults {
+ method public androidx.compose.animation.core.SpringSpec<java.lang.Float> getAnimationSpec();
+ method public float getVelocityThreshold();
+ method public androidx.wear.compose.material.ResistanceConfig? resistanceConfig(java.util.Set<java.lang.Float> anchors, optional float factorAtMin, optional float factorAtMax);
+ property public final androidx.compose.animation.core.SpringSpec<java.lang.Float> AnimationSpec;
+ property public final float VelocityThreshold;
+ field public static final androidx.wear.compose.material.SwipeableDefaults INSTANCE;
+ field public static final float StandardResistanceFactor = 10.0f;
+ field public static final float StiffResistanceFactor = 20.0f;
+ }
+
+ public final class SwipeableKt {
+ method @androidx.compose.runtime.Composable @androidx.wear.compose.material.ExperimentalWearMaterialApi public static <T> androidx.wear.compose.material.SwipeableState<T> rememberSwipeableState(T initialValue, optional androidx.compose.animation.core.AnimationSpec<java.lang.Float> animationSpec, optional kotlin.jvm.functions.Function1<? super T,java.lang.Boolean> confirmStateChange);
+ method @androidx.wear.compose.material.ExperimentalWearMaterialApi public static <T> androidx.compose.ui.Modifier swipeable(androidx.compose.ui.Modifier, androidx.wear.compose.material.SwipeableState<T> state, java.util.Map<java.lang.Float,? extends T> anchors, androidx.compose.foundation.gestures.Orientation orientation, optional boolean enabled, optional boolean reverseDirection, optional androidx.compose.foundation.interaction.MutableInteractionSource? interactionSource, optional kotlin.jvm.functions.Function2<? super T,? super T,? extends androidx.wear.compose.material.ThresholdConfig> thresholds, optional androidx.wear.compose.material.ResistanceConfig? resistance, optional float velocityThreshold);
+ }
+
+ @androidx.compose.runtime.Stable @androidx.wear.compose.material.ExperimentalWearMaterialApi public class SwipeableState<T> {
+ ctor public SwipeableState(T? initialValue, optional androidx.compose.animation.core.AnimationSpec<java.lang.Float> animationSpec, optional kotlin.jvm.functions.Function1<? super T,java.lang.Boolean> confirmStateChange);
+ method @androidx.wear.compose.material.ExperimentalWearMaterialApi public final suspend Object? animateTo(T? targetValue, optional androidx.compose.animation.core.AnimationSpec<java.lang.Float> anim, optional kotlin.coroutines.Continuation<? super kotlin.Unit>);
+ method public final T! getCurrentValue();
+ method public final float getDirection();
+ method public final androidx.compose.runtime.State<java.lang.Float> getOffset();
+ method public final androidx.compose.runtime.State<java.lang.Float> getOverflow();
+ method public final androidx.wear.compose.material.SwipeProgress<T> getProgress();
+ method public final T! getTargetValue();
+ method public final boolean isAnimationRunning();
+ method @androidx.wear.compose.material.ExperimentalWearMaterialApi public final suspend Object? performFling(float velocity, kotlin.coroutines.Continuation<? super kotlin.Unit>);
+ method @androidx.wear.compose.material.ExperimentalWearMaterialApi public final suspend Object? snapTo(T? targetValue, kotlin.coroutines.Continuation<? super kotlin.Unit>);
+ property public final T! currentValue;
+ property public final float direction;
+ property public final boolean isAnimationRunning;
+ property public final androidx.compose.runtime.State<java.lang.Float> offset;
+ property public final androidx.compose.runtime.State<java.lang.Float> overflow;
+ property public final androidx.wear.compose.material.SwipeProgress<T> progress;
+ property public final T! targetValue;
+ field public static final androidx.wear.compose.material.SwipeableState.Companion Companion;
+ }
+
+ public static final class SwipeableState.Companion {
+ method public <T> androidx.compose.runtime.saveable.Saver<androidx.wear.compose.material.SwipeableState<T>,T> Saver(androidx.compose.animation.core.AnimationSpec<java.lang.Float> animationSpec, kotlin.jvm.functions.Function1<? super T,java.lang.Boolean> confirmStateChange);
+ }
+
+ public final class TextKt {
+ method @androidx.compose.runtime.Composable public static void ProvideTextStyle(androidx.compose.ui.text.TextStyle value, kotlin.jvm.functions.Function0<kotlin.Unit> content);
+ method @androidx.compose.runtime.Composable public static void Text(String text, optional androidx.compose.ui.Modifier modifier, optional long color, optional long fontSize, optional androidx.compose.ui.text.font.FontStyle? fontStyle, optional androidx.compose.ui.text.font.FontWeight? fontWeight, optional androidx.compose.ui.text.font.FontFamily? fontFamily, optional long letterSpacing, optional androidx.compose.ui.text.style.TextDecoration? textDecoration, optional androidx.compose.ui.text.style.TextAlign? textAlign, optional long lineHeight, optional int overflow, optional boolean softWrap, optional int maxLines, optional kotlin.jvm.functions.Function1<? super androidx.compose.ui.text.TextLayoutResult,kotlin.Unit> onTextLayout, optional androidx.compose.ui.text.TextStyle style);
+ method @androidx.compose.runtime.Composable public static void Text(androidx.compose.ui.text.AnnotatedString text, optional androidx.compose.ui.Modifier modifier, optional long color, optional long fontSize, optional androidx.compose.ui.text.font.FontStyle? fontStyle, optional androidx.compose.ui.text.font.FontWeight? fontWeight, optional androidx.compose.ui.text.font.FontFamily? fontFamily, optional long letterSpacing, optional androidx.compose.ui.text.style.TextDecoration? textDecoration, optional androidx.compose.ui.text.style.TextAlign? textAlign, optional long lineHeight, optional int overflow, optional boolean softWrap, optional int maxLines, optional java.util.Map<java.lang.String,androidx.compose.foundation.text.InlineTextContent> inlineContent, optional kotlin.jvm.functions.Function1<? super androidx.compose.ui.text.TextLayoutResult,kotlin.Unit> onTextLayout, optional androidx.compose.ui.text.TextStyle style);
+ method public static androidx.compose.runtime.ProvidableCompositionLocal<androidx.compose.ui.text.TextStyle> getLocalTextStyle();
+ property public static final androidx.compose.runtime.ProvidableCompositionLocal<androidx.compose.ui.text.TextStyle> LocalTextStyle;
+ }
+
+ @androidx.compose.runtime.Stable @androidx.wear.compose.material.ExperimentalWearMaterialApi public interface ThresholdConfig {
+ method public float computeThreshold(androidx.compose.ui.unit.Density, float fromValue, float toValue);
+ }
+
+ public interface TimeSource {
+ method @androidx.compose.runtime.Composable public String getCurrentTime();
+ property @androidx.compose.runtime.Composable public abstract String currentTime;
+ }
+
+ public final class TimeTextDefaults {
+ method public void CurvedTextSeparator(androidx.wear.compose.foundation.CurvedScope, optional androidx.wear.compose.foundation.CurvedTextStyle? curvedTextStyle, optional androidx.wear.compose.foundation.ArcPaddingValues contentArcPadding);
+ method @androidx.compose.runtime.Composable public void TextSeparator(optional androidx.compose.ui.Modifier modifier, optional androidx.compose.ui.text.TextStyle textStyle, optional androidx.compose.foundation.layout.PaddingValues contentPadding);
+ method public androidx.compose.foundation.layout.PaddingValues getContentPadding();
+ method @androidx.compose.runtime.Composable public String timeFormat();
+ method public androidx.wear.compose.material.TimeSource timeSource(String timeFormat);
+ method @androidx.compose.runtime.Composable public androidx.compose.ui.text.TextStyle timeTextStyle(optional long background, optional long color, optional long fontSize);
+ property public final androidx.compose.foundation.layout.PaddingValues ContentPadding;
+ field public static final androidx.wear.compose.material.TimeTextDefaults INSTANCE;
+ field public static final String TimeFormat12Hours = "h:mm a";
+ field public static final String TimeFormat24Hours = "HH:mm";
+ }
+
+ public final class TimeTextKt {
+ method @androidx.compose.runtime.Composable public static void TimeText(optional androidx.compose.ui.Modifier modifier, optional androidx.wear.compose.material.TimeSource timeSource, optional androidx.compose.ui.text.TextStyle timeTextStyle, optional androidx.compose.foundation.layout.PaddingValues contentPadding, optional kotlin.jvm.functions.Function0<kotlin.Unit>? startLinearContent, optional kotlin.jvm.functions.Function1<? super androidx.wear.compose.foundation.CurvedScope,kotlin.Unit>? startCurvedContent, optional kotlin.jvm.functions.Function0<kotlin.Unit>? endLinearContent, optional kotlin.jvm.functions.Function1<? super androidx.wear.compose.foundation.CurvedScope,kotlin.Unit>? endCurvedContent, optional kotlin.jvm.functions.Function0<kotlin.Unit> textLinearSeparator, optional kotlin.jvm.functions.Function1<? super androidx.wear.compose.foundation.CurvedScope,kotlin.Unit> textCurvedSeparator);
+ }
+
+ @androidx.compose.runtime.Stable public interface ToggleButtonColors {
+ method @androidx.compose.runtime.Composable public androidx.compose.runtime.State<androidx.compose.ui.graphics.Color> backgroundColor(boolean enabled, boolean checked);
+ method @androidx.compose.runtime.Composable public androidx.compose.runtime.State<androidx.compose.ui.graphics.Color> contentColor(boolean enabled, boolean checked);
+ }
+
+ public final class ToggleButtonDefaults {
+ method public float getDefaultIconSize();
+ method public float getDefaultToggleButtonSize();
+ method public float getSmallIconSize();
+ method public float getSmallToggleButtonSize();
+ method @androidx.compose.runtime.Composable public androidx.wear.compose.material.ToggleButtonColors toggleButtonColors(optional long checkedBackgroundColor, optional long checkedContentColor, optional long disabledCheckedBackgroundColor, optional long disabledCheckedContentColor, optional long uncheckedBackgroundColor, optional long uncheckedContentColor, optional long disabledUncheckedBackgroundColor, optional long disabledUncheckedContentColor);
+ property public final float DefaultIconSize;
+ property public final float DefaultToggleButtonSize;
+ property public final float SmallIconSize;
+ property public final float SmallToggleButtonSize;
+ field public static final androidx.wear.compose.material.ToggleButtonDefaults INSTANCE;
+ }
+
+ public final class ToggleButtonKt {
+ method @androidx.compose.runtime.Composable public static void ToggleButton(boolean checked, kotlin.jvm.functions.Function1<? super java.lang.Boolean,kotlin.Unit> onCheckedChange, optional androidx.compose.ui.Modifier modifier, optional boolean enabled, optional androidx.wear.compose.material.ToggleButtonColors colors, optional androidx.compose.foundation.interaction.MutableInteractionSource interactionSource, kotlin.jvm.functions.Function1<? super androidx.compose.foundation.layout.BoxScope,kotlin.Unit> content);
+ }
+
+ @androidx.compose.runtime.Stable public interface ToggleChipColors {
+ method @androidx.compose.runtime.Composable public androidx.compose.runtime.State<androidx.compose.ui.graphics.painter.Painter> background(boolean enabled, boolean checked);
+ method @androidx.compose.runtime.Composable public androidx.compose.runtime.State<androidx.compose.ui.graphics.Color> contentColor(boolean enabled, boolean checked);
+ method @androidx.compose.runtime.Composable public androidx.compose.runtime.State<androidx.compose.ui.graphics.Color> secondaryContentColor(boolean enabled, boolean checked);
+ method @androidx.compose.runtime.Composable public androidx.compose.runtime.State<androidx.compose.ui.graphics.Color> toggleControlColor(boolean enabled, boolean checked);
+ }
+
+ public final class ToggleChipDefaults {
+ method public androidx.compose.ui.graphics.vector.ImageVector checkboxIcon(boolean checked);
+ method public androidx.compose.ui.graphics.vector.ImageVector getCheckboxOn();
+ method public androidx.compose.foundation.layout.PaddingValues getContentPadding();
+ method public float getIconSize();
+ method public androidx.compose.ui.graphics.vector.ImageVector getRadioOff();
+ method public androidx.compose.ui.graphics.vector.ImageVector getRadioOn();
+ method @androidx.compose.runtime.Composable public long getSwitchUncheckedIconColor();
+ method public androidx.compose.ui.graphics.vector.ImageVector radioIcon(boolean checked);
+ method @androidx.compose.runtime.Composable public androidx.wear.compose.material.SplitToggleChipColors splitToggleChipColors(optional long backgroundColor, optional long contentColor, optional long secondaryContentColor, optional long checkedToggleControlColor, optional long uncheckedToggleControlColor, optional long splitBackgroundOverlayColor);
+ method public androidx.compose.ui.graphics.vector.ImageVector switchIcon(boolean checked);
+ method @androidx.compose.runtime.Composable public androidx.wear.compose.material.ToggleChipColors toggleChipColors(optional long checkedStartBackgroundColor, optional long checkedEndBackgroundColor, optional long checkedContentColor, optional long checkedSecondaryContentColor, optional long checkedToggleControlColor, optional long uncheckedStartBackgroundColor, optional long uncheckedEndBackgroundColor, optional long uncheckedContentColor, optional long uncheckedSecondaryContentColor, optional long uncheckedToggleControlColor, optional androidx.compose.ui.unit.LayoutDirection gradientDirection);
+ property public final androidx.compose.ui.graphics.vector.ImageVector CheckboxOn;
+ property public final androidx.compose.foundation.layout.PaddingValues ContentPadding;
+ property public final float IconSize;
+ property public final androidx.compose.ui.graphics.vector.ImageVector RadioOff;
+ property public final androidx.compose.ui.graphics.vector.ImageVector RadioOn;
+ property @androidx.compose.runtime.Composable public final long SwitchUncheckedIconColor;
+ field public static final androidx.wear.compose.material.ToggleChipDefaults INSTANCE;
+ }
+
+ public final class ToggleChipKt {
+ method @androidx.compose.runtime.Composable public static void SplitToggleChip(boolean checked, kotlin.jvm.functions.Function1<? super java.lang.Boolean,kotlin.Unit> onCheckedChange, kotlin.jvm.functions.Function1<? super androidx.compose.foundation.layout.RowScope,kotlin.Unit> label, kotlin.jvm.functions.Function0<kotlin.Unit> onClick, kotlin.jvm.functions.Function1<? super androidx.compose.foundation.layout.BoxScope,kotlin.Unit> toggleControl, optional androidx.compose.ui.Modifier modifier, optional kotlin.jvm.functions.Function1<? super androidx.compose.foundation.layout.RowScope,kotlin.Unit>? secondaryLabel, optional androidx.wear.compose.material.SplitToggleChipColors colors, optional boolean enabled, optional androidx.compose.foundation.interaction.MutableInteractionSource checkedInteractionSource, optional androidx.compose.foundation.interaction.MutableInteractionSource clickInteractionSource, optional androidx.compose.foundation.layout.PaddingValues contentPadding, optional androidx.compose.ui.graphics.Shape shape);
+ method @androidx.compose.runtime.Composable public static void ToggleChip(boolean checked, kotlin.jvm.functions.Function1<? super java.lang.Boolean,kotlin.Unit> onCheckedChange, kotlin.jvm.functions.Function1<? super androidx.compose.foundation.layout.RowScope,kotlin.Unit> label, kotlin.jvm.functions.Function0<kotlin.Unit> toggleControl, optional androidx.compose.ui.Modifier modifier, optional kotlin.jvm.functions.Function1<? super androidx.compose.foundation.layout.BoxScope,kotlin.Unit>? appIcon, optional kotlin.jvm.functions.Function1<? super androidx.compose.foundation.layout.RowScope,kotlin.Unit>? secondaryLabel, optional androidx.wear.compose.material.ToggleChipColors colors, optional boolean enabled, optional androidx.compose.foundation.interaction.MutableInteractionSource interactionSource, optional androidx.compose.foundation.layout.PaddingValues contentPadding, optional androidx.compose.ui.graphics.Shape shape);
+ }
+
+ @androidx.compose.runtime.Immutable public final class Typography {
+ ctor public Typography(optional androidx.compose.ui.text.font.FontFamily defaultFontFamily, optional androidx.compose.ui.text.TextStyle display1, optional androidx.compose.ui.text.TextStyle display2, optional androidx.compose.ui.text.TextStyle display3, optional androidx.compose.ui.text.TextStyle title1, optional androidx.compose.ui.text.TextStyle title2, optional androidx.compose.ui.text.TextStyle title3, optional androidx.compose.ui.text.TextStyle body1, optional androidx.compose.ui.text.TextStyle body2, optional androidx.compose.ui.text.TextStyle button, optional androidx.compose.ui.text.TextStyle caption1, optional androidx.compose.ui.text.TextStyle caption2, optional androidx.compose.ui.text.TextStyle caption3);
+ method public androidx.wear.compose.material.Typography copy(optional androidx.compose.ui.text.TextStyle display1, optional androidx.compose.ui.text.TextStyle display2, optional androidx.compose.ui.text.TextStyle display3, optional androidx.compose.ui.text.TextStyle title1, optional androidx.compose.ui.text.TextStyle title2, optional androidx.compose.ui.text.TextStyle title3, optional androidx.compose.ui.text.TextStyle body1, optional androidx.compose.ui.text.TextStyle body2, optional androidx.compose.ui.text.TextStyle button, optional androidx.compose.ui.text.TextStyle caption1, optional androidx.compose.ui.text.TextStyle caption2, optional androidx.compose.ui.text.TextStyle caption3);
+ method public androidx.compose.ui.text.TextStyle getBody1();
+ method public androidx.compose.ui.text.TextStyle getBody2();
+ method public androidx.compose.ui.text.TextStyle getButton();
+ method public androidx.compose.ui.text.TextStyle getCaption1();
+ method public androidx.compose.ui.text.TextStyle getCaption2();
+ method public androidx.compose.ui.text.TextStyle getCaption3();
+ method public androidx.compose.ui.text.TextStyle getDisplay1();
+ method public androidx.compose.ui.text.TextStyle getDisplay2();
+ method public androidx.compose.ui.text.TextStyle getDisplay3();
+ method public androidx.compose.ui.text.TextStyle getTitle1();
+ method public androidx.compose.ui.text.TextStyle getTitle2();
+ method public androidx.compose.ui.text.TextStyle getTitle3();
+ property public final androidx.compose.ui.text.TextStyle body1;
+ property public final androidx.compose.ui.text.TextStyle body2;
+ property public final androidx.compose.ui.text.TextStyle button;
+ property public final androidx.compose.ui.text.TextStyle caption1;
+ property public final androidx.compose.ui.text.TextStyle caption2;
+ property public final androidx.compose.ui.text.TextStyle caption3;
+ property public final androidx.compose.ui.text.TextStyle display1;
+ property public final androidx.compose.ui.text.TextStyle display2;
+ property public final androidx.compose.ui.text.TextStyle display3;
+ property public final androidx.compose.ui.text.TextStyle title1;
+ property public final androidx.compose.ui.text.TextStyle title2;
+ property public final androidx.compose.ui.text.TextStyle title3;
+ }
+
+ public final class TypographyKt {
+ }
+
+ public final class VignetteKt {
+ method @androidx.compose.runtime.Composable public static void Vignette(int vignettePosition, optional androidx.compose.ui.Modifier modifier);
+ }
+
+ @kotlin.jvm.JvmInline public final value class VignettePosition {
+ ctor public VignettePosition(int key);
+ field public static final androidx.wear.compose.material.VignettePosition.Companion Companion;
+ }
+
+ public static final class VignettePosition.Companion {
+ method public int getBottom();
+ method public int getTop();
+ method public int getTopAndBottom();
+ property public final int Bottom;
+ property public final int Top;
+ property public final int TopAndBottom;
+ }
+
+}
+
+package androidx.wear.compose.material.dialog {
+
+ public final class DialogDefaults {
+ method public androidx.compose.foundation.layout.Arrangement.Vertical getAlertVerticalArrangement();
+ method public androidx.compose.foundation.layout.Arrangement.Vertical getConfirmationVerticalArrangement();
+ method public androidx.compose.foundation.layout.PaddingValues getContentPadding();
+ method public long getIndefiniteDurationMillis();
+ method public long getLongDurationMillis();
+ method public long getShortDurationMillis();
+ property public final androidx.compose.foundation.layout.Arrangement.Vertical AlertVerticalArrangement;
+ property public final androidx.compose.foundation.layout.Arrangement.Vertical ConfirmationVerticalArrangement;
+ property public final androidx.compose.foundation.layout.PaddingValues ContentPadding;
+ property public final long IndefiniteDurationMillis;
+ property public final long LongDurationMillis;
+ property public final long ShortDurationMillis;
+ field public static final androidx.wear.compose.material.dialog.DialogDefaults INSTANCE;
+ }
+
+ public final class DialogKt {
+ method @androidx.compose.runtime.Composable public static void Alert(kotlin.jvm.functions.Function1<? super androidx.compose.foundation.layout.ColumnScope,kotlin.Unit> title, kotlin.jvm.functions.Function0<kotlin.Unit> negativeButton, kotlin.jvm.functions.Function0<kotlin.Unit> positiveButton, optional androidx.compose.ui.Modifier modifier, optional kotlin.jvm.functions.Function1<? super androidx.compose.foundation.layout.ColumnScope,kotlin.Unit>? icon, optional androidx.wear.compose.material.ScalingLazyListState scrollState, optional long backgroundColor, optional long contentColor, optional long titleColor, optional long iconColor, optional androidx.compose.foundation.layout.Arrangement.Vertical verticalArrangement, optional androidx.compose.foundation.layout.PaddingValues contentPadding, optional kotlin.jvm.functions.Function1<? super androidx.compose.foundation.layout.ColumnScope,kotlin.Unit>? content);
+ method @androidx.compose.runtime.Composable public static void Alert(kotlin.jvm.functions.Function1<? super androidx.compose.foundation.layout.ColumnScope,kotlin.Unit> title, optional androidx.compose.ui.Modifier modifier, optional kotlin.jvm.functions.Function1<? super androidx.compose.foundation.layout.ColumnScope,kotlin.Unit>? icon, optional kotlin.jvm.functions.Function1<? super androidx.compose.foundation.layout.ColumnScope,kotlin.Unit>? message, optional androidx.wear.compose.material.ScalingLazyListState scrollState, optional long backgroundColor, optional long titleColor, optional long messageColor, optional long iconColor, optional androidx.compose.foundation.layout.Arrangement.Vertical verticalArrangement, optional androidx.compose.foundation.layout.PaddingValues contentPadding, kotlin.jvm.functions.Function1<? super androidx.wear.compose.material.ScalingLazyListScope,kotlin.Unit> content);
+ method @androidx.compose.runtime.Composable public static void Confirmation(kotlin.jvm.functions.Function0<kotlin.Unit> onTimeout, optional androidx.compose.ui.Modifier modifier, optional kotlin.jvm.functions.Function1<? super androidx.compose.foundation.layout.ColumnScope,kotlin.Unit>? icon, optional androidx.wear.compose.material.ScalingLazyListState scrollState, optional long durationMillis, optional long backgroundColor, optional long contentColor, optional long iconColor, optional androidx.compose.foundation.layout.Arrangement.Vertical verticalArrangement, optional androidx.compose.foundation.layout.PaddingValues contentPadding, kotlin.jvm.functions.Function1<? super androidx.compose.foundation.layout.ColumnScope,kotlin.Unit> content);
+ }
+
+ public final class Dialog_androidKt {
+ method @androidx.compose.runtime.Composable public static void Dialog(boolean showDialog, kotlin.jvm.functions.Function0<kotlin.Unit> onDismissRequest, optional androidx.compose.ui.Modifier modifier, optional androidx.wear.compose.material.ScalingLazyListState? scrollState, optional androidx.compose.ui.window.DialogProperties properties, kotlin.jvm.functions.Function0<kotlin.Unit> content);
+ }
+
+}
+
diff --git a/wear/compose/compose-material/api/res-1.0.0-beta02.txt b/wear/compose/compose-material/api/res-1.0.0-beta02.txt
new file mode 100644
index 0000000..e69de29
--- /dev/null
+++ b/wear/compose/compose-material/api/res-1.0.0-beta02.txt
diff --git a/wear/compose/compose-material/api/restricted_1.0.0-beta02.txt b/wear/compose/compose-material/api/restricted_1.0.0-beta02.txt
new file mode 100644
index 0000000..e8eb66d
--- /dev/null
+++ b/wear/compose/compose-material/api/restricted_1.0.0-beta02.txt
@@ -0,0 +1,706 @@
+// Signature format: 4.0
+package androidx.wear.compose.material {
+
+ @androidx.compose.runtime.Immutable public final class AutoCenteringParams {
+ ctor public AutoCenteringParams(optional int itemIndex, optional int itemOffset);
+ }
+
+ @androidx.compose.runtime.Stable public interface ButtonColors {
+ method @androidx.compose.runtime.Composable public androidx.compose.runtime.State<androidx.compose.ui.graphics.Color> backgroundColor(boolean enabled);
+ method @androidx.compose.runtime.Composable public androidx.compose.runtime.State<androidx.compose.ui.graphics.Color> contentColor(boolean enabled);
+ }
+
+ public final class ButtonDefaults {
+ method @androidx.compose.runtime.Composable public androidx.wear.compose.material.ButtonColors buttonColors(optional long backgroundColor, optional long contentColor, optional long disabledBackgroundColor, optional long disabledContentColor);
+ method public float getCompactButtonBackgroundPadding();
+ method public float getDefaultButtonSize();
+ method public float getDefaultIconSize();
+ method public float getExtraSmallButtonSize();
+ method public float getLargeButtonSize();
+ method public float getLargeIconSize();
+ method public float getSmallButtonSize();
+ method public float getSmallIconSize();
+ method @androidx.compose.runtime.Composable public androidx.wear.compose.material.ButtonColors iconButtonColors(optional long contentColor);
+ method @androidx.compose.runtime.Composable public androidx.wear.compose.material.ButtonColors primaryButtonColors(optional long backgroundColor, optional long contentColor);
+ method @androidx.compose.runtime.Composable public androidx.wear.compose.material.ButtonColors secondaryButtonColors(optional long backgroundColor, optional long contentColor);
+ property public final float CompactButtonBackgroundPadding;
+ property public final float DefaultButtonSize;
+ property public final float DefaultIconSize;
+ property public final float ExtraSmallButtonSize;
+ property public final float LargeButtonSize;
+ property public final float LargeIconSize;
+ property public final float SmallButtonSize;
+ property public final float SmallIconSize;
+ field public static final androidx.wear.compose.material.ButtonDefaults INSTANCE;
+ }
+
+ public final class ButtonKt {
+ method @androidx.compose.runtime.Composable public static void Button(kotlin.jvm.functions.Function0<kotlin.Unit> onClick, optional androidx.compose.ui.Modifier modifier, optional boolean enabled, optional androidx.wear.compose.material.ButtonColors colors, optional androidx.compose.foundation.interaction.MutableInteractionSource interactionSource, kotlin.jvm.functions.Function1<? super androidx.compose.foundation.layout.BoxScope,kotlin.Unit> content);
+ method @androidx.compose.runtime.Composable public static void CompactButton(kotlin.jvm.functions.Function0<kotlin.Unit> onClick, optional androidx.compose.ui.Modifier modifier, optional boolean enabled, optional androidx.wear.compose.material.ButtonColors colors, optional float backgroundPadding, optional androidx.compose.foundation.interaction.MutableInteractionSource interactionSource, kotlin.jvm.functions.Function1<? super androidx.compose.foundation.layout.BoxScope,kotlin.Unit> content);
+ }
+
+ public final class CardDefaults {
+ method @androidx.compose.runtime.Composable public androidx.compose.ui.graphics.painter.Painter cardBackgroundPainter(optional long startBackgroundColor, optional long endBackgroundColor, optional androidx.compose.ui.unit.LayoutDirection gradientDirection);
+ method public float getAppImageSize();
+ method public androidx.compose.foundation.layout.PaddingValues getContentPadding();
+ method @androidx.compose.runtime.Composable public androidx.compose.ui.graphics.painter.Painter imageWithScrimBackgroundPainter(androidx.compose.ui.graphics.painter.Painter backgroundImagePainter, optional androidx.compose.ui.graphics.Brush backgroundImageScrimBrush);
+ property public final float AppImageSize;
+ property public final androidx.compose.foundation.layout.PaddingValues ContentPadding;
+ field public static final androidx.wear.compose.material.CardDefaults INSTANCE;
+ }
+
+ public final class CardKt {
+ method @androidx.compose.runtime.Composable public static void AppCard(kotlin.jvm.functions.Function0<kotlin.Unit> onClick, kotlin.jvm.functions.Function1<? super androidx.compose.foundation.layout.RowScope,kotlin.Unit> appName, kotlin.jvm.functions.Function1<? super androidx.compose.foundation.layout.RowScope,kotlin.Unit> time, kotlin.jvm.functions.Function1<? super androidx.compose.foundation.layout.RowScope,kotlin.Unit> title, optional androidx.compose.ui.Modifier modifier, optional boolean enabled, optional kotlin.jvm.functions.Function1<? super androidx.compose.foundation.layout.RowScope,kotlin.Unit>? appImage, optional androidx.compose.ui.graphics.painter.Painter backgroundPainter, optional long contentColor, optional long appColor, optional long timeColor, optional long titleColor, kotlin.jvm.functions.Function1<? super androidx.compose.foundation.layout.ColumnScope,kotlin.Unit> content);
+ method @androidx.compose.runtime.Composable public static void Card(kotlin.jvm.functions.Function0<kotlin.Unit> onClick, optional androidx.compose.ui.Modifier modifier, optional androidx.compose.ui.graphics.painter.Painter backgroundPainter, optional long contentColor, optional boolean enabled, optional androidx.compose.foundation.layout.PaddingValues contentPadding, optional androidx.compose.ui.graphics.Shape shape, optional androidx.compose.foundation.interaction.MutableInteractionSource interactionSource, optional androidx.compose.ui.semantics.Role? role, kotlin.jvm.functions.Function1<? super androidx.compose.foundation.layout.ColumnScope,kotlin.Unit> content);
+ method @androidx.compose.runtime.Composable public static void TitleCard(kotlin.jvm.functions.Function0<kotlin.Unit> onClick, kotlin.jvm.functions.Function1<? super androidx.compose.foundation.layout.RowScope,kotlin.Unit> title, optional androidx.compose.ui.Modifier modifier, optional boolean enabled, optional kotlin.jvm.functions.Function1<? super androidx.compose.foundation.layout.RowScope,kotlin.Unit>? time, optional androidx.compose.ui.graphics.painter.Painter backgroundPainter, optional long contentColor, optional long titleColor, optional long timeColor, kotlin.jvm.functions.Function1<? super androidx.compose.foundation.layout.ColumnScope,kotlin.Unit> content);
+ }
+
+ @androidx.compose.runtime.Stable public interface ChipColors {
+ method @androidx.compose.runtime.Composable public androidx.compose.runtime.State<androidx.compose.ui.graphics.painter.Painter> background(boolean enabled);
+ method @androidx.compose.runtime.Composable public androidx.compose.runtime.State<androidx.compose.ui.graphics.Color> contentColor(boolean enabled);
+ method @androidx.compose.runtime.Composable public androidx.compose.runtime.State<androidx.compose.ui.graphics.Color> iconColor(boolean enabled);
+ method @androidx.compose.runtime.Composable public androidx.compose.runtime.State<androidx.compose.ui.graphics.Color> secondaryContentColor(boolean enabled);
+ }
+
+ public final class ChipDefaults {
+ method @androidx.compose.runtime.Composable public androidx.wear.compose.material.ChipColors childChipColors(optional long contentColor, optional long secondaryContentColor, optional long iconColor);
+ method @androidx.compose.runtime.Composable public androidx.wear.compose.material.ChipColors chipColors(optional long backgroundColor, optional long contentColor, optional long secondaryContentColor, optional long iconColor, optional long disabledBackgroundColor, optional long disabledContentColor, optional long disabledSecondaryContentColor, optional long disabledIconColor);
+ method public androidx.compose.foundation.layout.PaddingValues getCompactChipContentPadding();
+ method public androidx.compose.foundation.layout.PaddingValues getContentPadding();
+ method public float getIconSize();
+ method public float getLargeIconSize();
+ method public float getSmallIconSize();
+ method @androidx.compose.runtime.Composable public androidx.wear.compose.material.ChipColors gradientBackgroundChipColors(optional long startBackgroundColor, optional long endBackgroundColor, optional long contentColor, optional long secondaryContentColor, optional long iconColor, optional androidx.compose.ui.unit.LayoutDirection gradientDirection);
+ method @androidx.compose.runtime.Composable public androidx.wear.compose.material.ChipColors imageBackgroundChipColors(androidx.compose.ui.graphics.painter.Painter backgroundImagePainter, optional androidx.compose.ui.graphics.Brush backgroundImageScrimBrush, optional long contentColor, optional long secondaryContentColor, optional long iconColor);
+ method @androidx.compose.runtime.Composable public androidx.wear.compose.material.ChipColors primaryChipColors(optional long backgroundColor, optional long contentColor, optional long secondaryContentColor, optional long iconColor);
+ method @androidx.compose.runtime.Composable public androidx.wear.compose.material.ChipColors secondaryChipColors(optional long backgroundColor, optional long contentColor, optional long secondaryContentColor, optional long iconColor);
+ property public final androidx.compose.foundation.layout.PaddingValues CompactChipContentPadding;
+ property public final androidx.compose.foundation.layout.PaddingValues ContentPadding;
+ property public final float IconSize;
+ property public final float LargeIconSize;
+ property public final float SmallIconSize;
+ field public static final androidx.wear.compose.material.ChipDefaults INSTANCE;
+ }
+
+ public final class ChipKt {
+ method @androidx.compose.runtime.Composable public static void Chip(kotlin.jvm.functions.Function0<kotlin.Unit> onClick, androidx.wear.compose.material.ChipColors colors, optional androidx.compose.ui.Modifier modifier, optional boolean enabled, optional androidx.compose.foundation.layout.PaddingValues contentPadding, optional androidx.compose.ui.graphics.Shape shape, optional androidx.compose.foundation.interaction.MutableInteractionSource interactionSource, optional androidx.compose.ui.semantics.Role? role, kotlin.jvm.functions.Function1<? super androidx.compose.foundation.layout.RowScope,kotlin.Unit> content);
+ method @androidx.compose.runtime.Composable public static void Chip(kotlin.jvm.functions.Function1<? super androidx.compose.foundation.layout.RowScope,kotlin.Unit> label, kotlin.jvm.functions.Function0<kotlin.Unit> onClick, optional androidx.compose.ui.Modifier modifier, optional kotlin.jvm.functions.Function1<? super androidx.compose.foundation.layout.RowScope,kotlin.Unit>? secondaryLabel, optional kotlin.jvm.functions.Function1<? super androidx.compose.foundation.layout.BoxScope,kotlin.Unit>? icon, optional androidx.wear.compose.material.ChipColors colors, optional boolean enabled, optional androidx.compose.foundation.interaction.MutableInteractionSource interactionSource, optional androidx.compose.foundation.layout.PaddingValues contentPadding);
+ method @androidx.compose.runtime.Composable public static void CompactChip(kotlin.jvm.functions.Function0<kotlin.Unit> onClick, optional androidx.compose.ui.Modifier modifier, optional kotlin.jvm.functions.Function1<? super androidx.compose.foundation.layout.RowScope,kotlin.Unit>? label, optional kotlin.jvm.functions.Function1<? super androidx.compose.foundation.layout.BoxScope,kotlin.Unit>? icon, optional androidx.wear.compose.material.ChipColors colors, optional boolean enabled, optional androidx.compose.foundation.interaction.MutableInteractionSource interactionSource, optional androidx.compose.foundation.layout.PaddingValues contentPadding);
+ }
+
+ @androidx.compose.runtime.Stable public final class Colors {
+ ctor public Colors(optional long primary, optional long primaryVariant, optional long secondary, optional long secondaryVariant, optional long background, optional long surface, optional long error, optional long onPrimary, optional long onSecondary, optional long onBackground, optional long onSurface, optional long onSurfaceVariant, optional long onError);
+ method public androidx.wear.compose.material.Colors copy(optional long primary, optional long primaryVariant, optional long secondary, optional long secondaryVariant, optional long background, optional long surface, optional long error, optional long onPrimary, optional long onSecondary, optional long onBackground, optional long onSurface, optional long onSurfaceVariant, optional long onError);
+ 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 getOnSurfaceVariant();
+ method public long getPrimary();
+ method public long getPrimaryVariant();
+ method public long getSecondary();
+ method public long getSecondaryVariant();
+ method public long getSurface();
+ property public final long background;
+ property public final long error;
+ property public final long onBackground;
+ property public final long onError;
+ property public final long onPrimary;
+ property public final long onSecondary;
+ property public final long onSurface;
+ property public final long onSurfaceVariant;
+ property public final long primary;
+ property public final long primaryVariant;
+ property public final long secondary;
+ property public final long secondaryVariant;
+ property public final long surface;
+ }
+
+ public final class ColorsKt {
+ method public static long contentColorFor(androidx.wear.compose.material.Colors, long backgroundColor);
+ method @androidx.compose.runtime.Composable @androidx.compose.runtime.ReadOnlyComposable public static long contentColorFor(long backgroundColor);
+ }
+
+ public final class ContentAlpha {
+ method @androidx.compose.runtime.Composable public float getDisabled();
+ method @androidx.compose.runtime.Composable public float getHigh();
+ method @androidx.compose.runtime.Composable public float getMedium();
+ property @androidx.compose.runtime.Composable public final float disabled;
+ property @androidx.compose.runtime.Composable public final float high;
+ property @androidx.compose.runtime.Composable public final float medium;
+ field public static final androidx.wear.compose.material.ContentAlpha INSTANCE;
+ }
+
+ public final class ContentAlphaKt {
+ method public static androidx.compose.runtime.ProvidableCompositionLocal<java.lang.Float> getLocalContentAlpha();
+ property public static final androidx.compose.runtime.ProvidableCompositionLocal<java.lang.Float> LocalContentAlpha;
+ }
+
+ public final class ContentColorKt {
+ method public static androidx.compose.runtime.ProvidableCompositionLocal<androidx.compose.ui.graphics.Color> getLocalContentColor();
+ property public static final androidx.compose.runtime.ProvidableCompositionLocal<androidx.compose.ui.graphics.Color> LocalContentColor;
+ }
+
+ public final class CurvedTextKt {
+ method public static void curvedText(androidx.wear.compose.foundation.CurvedScope, String text, optional androidx.wear.compose.foundation.CurvedModifier modifier, optional long background, optional long color, optional long fontSize, optional androidx.wear.compose.foundation.CurvedTextStyle? style, optional androidx.wear.compose.foundation.CurvedDirection.Angular? angularDirection, optional int overflow);
+ }
+
+ public final class DefaultTimeSourceKt {
+ }
+
+ public final class HorizontalPageIndicatorKt {
+ method @androidx.compose.runtime.Composable public static void HorizontalPageIndicator(androidx.wear.compose.material.PageIndicatorState pageIndicatorState, optional androidx.compose.ui.Modifier modifier, optional int indicatorStyle, optional long selectedColor, optional long unselectedColor, optional float indicatorSize, optional float spacing, optional androidx.compose.ui.graphics.Shape indicatorShape);
+ }
+
+ public final class IconKt {
+ method @androidx.compose.runtime.Composable public static void Icon(androidx.compose.ui.graphics.vector.ImageVector imageVector, String? contentDescription, optional androidx.compose.ui.Modifier modifier, optional long tint);
+ method @androidx.compose.runtime.Composable public static void Icon(androidx.compose.ui.graphics.ImageBitmap bitmap, String? contentDescription, optional androidx.compose.ui.Modifier modifier, optional long tint);
+ method @androidx.compose.runtime.Composable public static void Icon(androidx.compose.ui.graphics.painter.Painter painter, String? contentDescription, optional androidx.compose.ui.Modifier modifier, optional long tint);
+ }
+
+ @androidx.compose.runtime.Stable public interface InlineSliderColors {
+ method @androidx.compose.runtime.Composable public androidx.compose.runtime.State<androidx.compose.ui.graphics.Color> backgroundColor(boolean enabled);
+ method @androidx.compose.runtime.Composable public androidx.compose.runtime.State<androidx.compose.ui.graphics.Color> barColor(boolean enabled, boolean selected);
+ method @androidx.compose.runtime.Composable public androidx.compose.runtime.State<androidx.compose.ui.graphics.Color> spacerColor(boolean enabled);
+ }
+
+ public final class InlineSliderDefaults {
+ method @androidx.compose.runtime.Composable public androidx.wear.compose.material.InlineSliderColors colors(optional long backgroundColor, optional long spacerColor, optional long selectedBarColor, optional long unselectedBarColor, optional long disabledBackgroundColor, optional long disabledSpacerColor, optional long disabledSelectedBarColor, optional long disabledUnselectedBarColor);
+ method public androidx.compose.ui.graphics.vector.ImageVector getDecrease();
+ method public androidx.compose.ui.graphics.vector.ImageVector getIncrease();
+ property public final androidx.compose.ui.graphics.vector.ImageVector Decrease;
+ property public final androidx.compose.ui.graphics.vector.ImageVector Increase;
+ field public static final androidx.wear.compose.material.InlineSliderDefaults INSTANCE;
+ }
+
+ public final class ListHeaderKt {
+ method @androidx.compose.runtime.Composable public static void ListHeader(optional androidx.compose.ui.Modifier modifier, optional long backgroundColor, optional long contentColor, kotlin.jvm.functions.Function1<? super androidx.compose.foundation.layout.RowScope,kotlin.Unit> content);
+ }
+
+ public final class MaterialTextSelectionColorsKt {
+ }
+
+ public final class MaterialTheme {
+ method @androidx.compose.runtime.Composable @androidx.compose.runtime.ReadOnlyComposable public androidx.wear.compose.material.Colors getColors();
+ method @androidx.compose.runtime.Composable @androidx.compose.runtime.ReadOnlyComposable public androidx.wear.compose.material.Shapes getShapes();
+ method @androidx.compose.runtime.Composable @androidx.compose.runtime.ReadOnlyComposable public androidx.wear.compose.material.Typography getTypography();
+ property @androidx.compose.runtime.Composable @androidx.compose.runtime.ReadOnlyComposable public final androidx.wear.compose.material.Colors colors;
+ property @androidx.compose.runtime.Composable @androidx.compose.runtime.ReadOnlyComposable public final androidx.wear.compose.material.Shapes shapes;
+ property @androidx.compose.runtime.Composable @androidx.compose.runtime.ReadOnlyComposable public final androidx.wear.compose.material.Typography typography;
+ field public static final androidx.wear.compose.material.MaterialTheme INSTANCE;
+ }
+
+ public final class MaterialThemeKt {
+ method @androidx.compose.runtime.Composable public static void MaterialTheme(optional androidx.wear.compose.material.Colors colors, optional androidx.wear.compose.material.Typography typography, optional androidx.wear.compose.material.Shapes shapes, kotlin.jvm.functions.Function0<kotlin.Unit> content);
+ }
+
+ public final class PageIndicatorDefaults {
+ method @androidx.compose.runtime.Composable public int style();
+ field public static final androidx.wear.compose.material.PageIndicatorDefaults INSTANCE;
+ }
+
+ public interface PageIndicatorState {
+ method public int getPageCount();
+ method public float getPageOffset();
+ method public int getSelectedPage();
+ property public abstract int pageCount;
+ property public abstract float pageOffset;
+ property public abstract int selectedPage;
+ }
+
+ @kotlin.jvm.JvmInline public final value class PageIndicatorStyle {
+ field public static final androidx.wear.compose.material.PageIndicatorStyle.Companion Companion;
+ }
+
+ public static final class PageIndicatorStyle.Companion {
+ method public int getCurved();
+ method public int getLinear();
+ property public final int Curved;
+ property public final int Linear;
+ }
+
+ public final class PickerDefaults {
+ method @androidx.compose.runtime.Composable public androidx.compose.foundation.gestures.FlingBehavior flingBehavior(androidx.wear.compose.material.PickerState state, optional androidx.compose.animation.core.DecayAnimationSpec<java.lang.Float> decay);
+ method public float getDefaultGradientRatio();
+ method public androidx.wear.compose.material.ScalingParams scalingParams(optional float edgeScale, optional float edgeAlpha, optional float minElementHeight, optional float maxElementHeight, optional float minTransitionArea, optional float maxTransitionArea, optional androidx.compose.animation.core.Easing scaleInterpolator, optional kotlin.jvm.functions.Function1<? super androidx.compose.ui.unit.Constraints,java.lang.Integer> viewportVerticalOffsetResolver);
+ property public final float DefaultGradientRatio;
+ field public static final androidx.wear.compose.material.PickerDefaults INSTANCE;
+ }
+
+ public final class PickerKt {
+ method @androidx.compose.runtime.Composable public static void Picker(androidx.wear.compose.material.PickerState state, optional androidx.compose.ui.Modifier modifier, optional boolean readOnly, optional kotlin.jvm.functions.Function1<? super androidx.compose.foundation.layout.BoxScope,kotlin.Unit>? readOnlyLabel, optional androidx.wear.compose.material.ScalingParams scalingParams, optional float separation, optional float gradientRatio, optional long gradientColor, optional androidx.compose.foundation.gestures.FlingBehavior flingBehavior, kotlin.jvm.functions.Function2<? super androidx.wear.compose.material.PickerScope,? super java.lang.Integer,kotlin.Unit> option);
+ method @androidx.compose.runtime.Composable public static androidx.wear.compose.material.PickerState rememberPickerState(int initialNumberOfOptions, optional int initiallySelectedOption, optional boolean repeatItems);
+ }
+
+ public interface PickerScope {
+ method public int getSelectedOption();
+ property public abstract int selectedOption;
+ }
+
+ @androidx.compose.runtime.Stable public final class PickerState implements androidx.compose.foundation.gestures.ScrollableState {
+ ctor public PickerState(int initialNumberOfOptions, optional int initiallySelectedOption, optional boolean repeatItems);
+ method public float dispatchRawDelta(float delta);
+ method public int getNumberOfOptions();
+ method public boolean getRepeatItems();
+ method public int getSelectedOption();
+ method public boolean isScrollInProgress();
+ method public suspend Object? scroll(androidx.compose.foundation.MutatePriority scrollPriority, kotlin.jvm.functions.Function2<? super androidx.compose.foundation.gestures.ScrollScope,? super kotlin.coroutines.Continuation<? super kotlin.Unit>,?> block, kotlin.coroutines.Continuation<? super kotlin.Unit>);
+ method public suspend Object? scrollToOption(int index, kotlin.coroutines.Continuation<? super kotlin.Unit>);
+ method public void setNumberOfOptions(int);
+ property public boolean isScrollInProgress;
+ property public final int numberOfOptions;
+ property public final boolean repeatItems;
+ property public final int selectedOption;
+ field public static final androidx.wear.compose.material.PickerState.Companion Companion;
+ }
+
+ public static final class PickerState.Companion {
+ method public androidx.compose.runtime.saveable.Saver<androidx.wear.compose.material.PickerState,java.lang.Object> getSaver();
+ property public final androidx.compose.runtime.saveable.Saver<androidx.wear.compose.material.PickerState,java.lang.Object> Saver;
+ }
+
+ @kotlin.jvm.JvmInline public final value class PositionIndicatorAlignment {
+ field public static final androidx.wear.compose.material.PositionIndicatorAlignment.Companion Companion;
+ }
+
+ public static final class PositionIndicatorAlignment.Companion {
+ method public int getEnd();
+ method public int getLeft();
+ method public int getOppositeRsb();
+ method public int getRight();
+ property public final int End;
+ property public final int Left;
+ property public final int OppositeRsb;
+ property public final int Right;
+ }
+
+ public final class PositionIndicatorKt {
+ method @androidx.compose.runtime.Composable public static void PositionIndicator(androidx.compose.foundation.ScrollState scrollState, optional androidx.compose.ui.Modifier modifier, optional boolean reverseDirection);
+ method @androidx.compose.runtime.Composable public static void PositionIndicator(androidx.wear.compose.material.ScalingLazyListState scalingLazyListState, optional androidx.compose.ui.Modifier modifier, optional boolean reverseDirection);
+ method @androidx.compose.runtime.Composable public static void PositionIndicator(androidx.compose.foundation.lazy.LazyListState lazyListState, optional androidx.compose.ui.Modifier modifier, optional boolean reverseDirection);
+ method @androidx.compose.runtime.Composable public static void PositionIndicator(kotlin.jvm.functions.Function0<java.lang.Float> value, optional androidx.compose.ui.Modifier modifier, optional kotlin.ranges.ClosedFloatingPointRange<java.lang.Float> range, optional long color, optional boolean reverseDirection, optional int position);
+ method @androidx.compose.runtime.Composable public static void PositionIndicator(androidx.wear.compose.material.PositionIndicatorState state, float indicatorHeight, float indicatorWidth, float paddingHorizontal, optional androidx.compose.ui.Modifier modifier, optional long background, optional long color, optional boolean reverseDirection, optional int position);
+ }
+
+ @androidx.compose.runtime.Stable public interface PositionIndicatorState {
+ method public float getPositionFraction();
+ method public float sizeFraction(float scrollableContainerSizePx);
+ method public int visibility(float scrollableContainerSizePx);
+ property public abstract float positionFraction;
+ }
+
+ @kotlin.jvm.JvmInline public final value class PositionIndicatorVisibility {
+ field public static final androidx.wear.compose.material.PositionIndicatorVisibility.Companion Companion;
+ }
+
+ public static final class PositionIndicatorVisibility.Companion {
+ method public int getAutoHide();
+ method public int getHide();
+ method public int getShow();
+ property public final int AutoHide;
+ property public final int Hide;
+ property public final int Show;
+ }
+
+ public final class ProgressIndicatorDefaults {
+ method public androidx.compose.animation.core.SpringSpec<java.lang.Float> getProgressAnimationSpec();
+ method public float getStrokeWidth();
+ property public final androidx.compose.animation.core.SpringSpec<java.lang.Float> ProgressAnimationSpec;
+ property public final float StrokeWidth;
+ field public static final androidx.wear.compose.material.ProgressIndicatorDefaults INSTANCE;
+ }
+
+ public final class ProgressIndicatorKt {
+ method @androidx.compose.runtime.Composable public static void CircularProgressIndicator(float progress, optional androidx.compose.ui.Modifier modifier, optional float startAngle, optional float endAngle, optional long indicatorColor, optional long trackColor, optional float strokeWidth);
+ method @androidx.compose.runtime.Composable public static void CircularProgressIndicator(optional androidx.compose.ui.Modifier modifier, optional float startAngle, optional long indicatorColor, optional long trackColor, optional float strokeWidth);
+ }
+
+ public final class RangeDefaultsKt {
+ }
+
+ public final class Resources_androidKt {
+ }
+
+ public final class ScaffoldKt {
+ method @androidx.compose.runtime.Composable public static void Scaffold(optional androidx.compose.ui.Modifier modifier, optional kotlin.jvm.functions.Function0<kotlin.Unit>? vignette, optional kotlin.jvm.functions.Function0<kotlin.Unit>? positionIndicator, optional kotlin.jvm.functions.Function0<kotlin.Unit>? pageIndicator, optional kotlin.jvm.functions.Function0<kotlin.Unit>? timeText, kotlin.jvm.functions.Function0<kotlin.Unit> content);
+ }
+
+ public final class ScalingLazyColumnDefaults {
+ method public androidx.wear.compose.material.ScalingParams scalingParams(optional float edgeScale, optional float edgeAlpha, optional float minElementHeight, optional float maxElementHeight, optional float minTransitionArea, optional float maxTransitionArea, optional androidx.compose.animation.core.Easing scaleInterpolator, optional kotlin.jvm.functions.Function1<? super androidx.compose.ui.unit.Constraints,java.lang.Integer> viewportVerticalOffsetResolver);
+ method @androidx.compose.runtime.Composable public androidx.compose.foundation.gestures.FlingBehavior snapFlingBehavior(androidx.wear.compose.material.ScalingLazyListState state, optional float snapOffset, optional androidx.compose.animation.core.DecayAnimationSpec<java.lang.Float> decay);
+ field public static final androidx.wear.compose.material.ScalingLazyColumnDefaults INSTANCE;
+ }
+
+ public final class ScalingLazyColumnKt {
+ method @androidx.compose.runtime.Composable public static void ScalingLazyColumn(optional androidx.compose.ui.Modifier modifier, optional androidx.wear.compose.material.ScalingLazyListState state, optional androidx.compose.foundation.layout.PaddingValues contentPadding, optional boolean reverseLayout, optional androidx.compose.foundation.layout.Arrangement.Vertical verticalArrangement, optional androidx.compose.ui.Alignment.Horizontal horizontalAlignment, optional androidx.compose.foundation.gestures.FlingBehavior flingBehavior, optional boolean userScrollEnabled, optional androidx.wear.compose.material.ScalingParams scalingParams, optional int anchorType, optional androidx.wear.compose.material.AutoCenteringParams? autoCentering, kotlin.jvm.functions.Function1<? super androidx.wear.compose.material.ScalingLazyListScope,kotlin.Unit> content);
+ method public static inline <T> void items(androidx.wear.compose.material.ScalingLazyListScope, java.util.List<? extends T> items, optional kotlin.jvm.functions.Function1<? super T,?>? key, kotlin.jvm.functions.Function2<? super androidx.wear.compose.material.ScalingLazyListItemScope,? super T,kotlin.Unit> itemContent);
+ method public static inline <T> void items(androidx.wear.compose.material.ScalingLazyListScope, T![] items, optional kotlin.jvm.functions.Function1<? super T,?>? key, kotlin.jvm.functions.Function2<? super androidx.wear.compose.material.ScalingLazyListItemScope,? super T,kotlin.Unit> itemContent);
+ method public static inline <T> void itemsIndexed(androidx.wear.compose.material.ScalingLazyListScope, java.util.List<? extends T> items, optional kotlin.jvm.functions.Function2<? super java.lang.Integer,? super T,?>? key, kotlin.jvm.functions.Function3<? super androidx.wear.compose.material.ScalingLazyListItemScope,? super java.lang.Integer,? super T,kotlin.Unit> itemContent);
+ method public static inline <T> void itemsIndexed(androidx.wear.compose.material.ScalingLazyListScope, T![] items, optional kotlin.jvm.functions.Function2<? super java.lang.Integer,? super T,?>? key, kotlin.jvm.functions.Function3<? super androidx.wear.compose.material.ScalingLazyListItemScope,? super java.lang.Integer,? super T,kotlin.Unit> itemContent);
+ }
+
+ public final class ScalingLazyColumnMeasureKt {
+ }
+
+ @androidx.compose.runtime.Immutable @kotlin.jvm.JvmInline public final value class ScalingLazyListAnchorType {
+ field public static final androidx.wear.compose.material.ScalingLazyListAnchorType.Companion Companion;
+ }
+
+ public static final class ScalingLazyListAnchorType.Companion {
+ method public int getItemCenter();
+ method public int getItemStart();
+ property public final int ItemCenter;
+ property public final int ItemStart;
+ }
+
+ public sealed interface ScalingLazyListItemInfo {
+ method public float getAlpha();
+ method public int getIndex();
+ method public Object getKey();
+ method public int getOffset();
+ method public float getScale();
+ method public int getSize();
+ method public int getUnadjustedOffset();
+ method public int getUnadjustedSize();
+ property public abstract float alpha;
+ property public abstract int index;
+ property public abstract Object key;
+ property public abstract int offset;
+ property public abstract float scale;
+ property public abstract int size;
+ property public abstract int unadjustedOffset;
+ property public abstract int unadjustedSize;
+ }
+
+ @androidx.compose.runtime.Stable @androidx.wear.compose.material.ScalingLazyScopeMarker public sealed interface ScalingLazyListItemScope {
+ method public androidx.compose.ui.Modifier fillParentMaxHeight(androidx.compose.ui.Modifier, optional float fraction);
+ method public androidx.compose.ui.Modifier fillParentMaxSize(androidx.compose.ui.Modifier, optional float fraction);
+ method public androidx.compose.ui.Modifier fillParentMaxWidth(androidx.compose.ui.Modifier, optional float fraction);
+ }
+
+ public sealed interface ScalingLazyListLayoutInfo {
+ method public int getAfterAutoCenteringPadding();
+ method public int getAfterContentPadding();
+ method public int getBeforeAutoCenteringPadding();
+ method public int getBeforeContentPadding();
+ method public androidx.compose.foundation.gestures.Orientation getOrientation();
+ method public boolean getReverseLayout();
+ method public int getTotalItemsCount();
+ method public int getViewportEndOffset();
+ method public long getViewportSize();
+ method public int getViewportStartOffset();
+ method public java.util.List<androidx.wear.compose.material.ScalingLazyListItemInfo> getVisibleItemsInfo();
+ property public abstract int afterAutoCenteringPadding;
+ property public abstract int afterContentPadding;
+ property public abstract int beforeAutoCenteringPadding;
+ property public abstract int beforeContentPadding;
+ property public abstract androidx.compose.foundation.gestures.Orientation orientation;
+ property public abstract boolean reverseLayout;
+ property public abstract int totalItemsCount;
+ property public abstract int viewportEndOffset;
+ property public abstract long viewportSize;
+ property public abstract int viewportStartOffset;
+ property public abstract java.util.List<androidx.wear.compose.material.ScalingLazyListItemInfo> visibleItemsInfo;
+ }
+
+ @androidx.wear.compose.material.ScalingLazyScopeMarker public sealed interface ScalingLazyListScope {
+ method public void item(optional Object? key, kotlin.jvm.functions.Function1<? super androidx.wear.compose.material.ScalingLazyListItemScope,kotlin.Unit> content);
+ method public void items(int count, optional kotlin.jvm.functions.Function1<? super java.lang.Integer,?>? key, kotlin.jvm.functions.Function2<? super androidx.wear.compose.material.ScalingLazyListItemScope,? super java.lang.Integer,kotlin.Unit> itemContent);
+ }
+
+ @androidx.compose.runtime.Stable public final class ScalingLazyListState implements androidx.compose.foundation.gestures.ScrollableState {
+ ctor public ScalingLazyListState(optional int initialCenterItemIndex, optional int initialCenterItemScrollOffset);
+ method public suspend Object? animateScrollToItem(int index, optional int scrollOffset, optional kotlin.coroutines.Continuation<? super kotlin.Unit>);
+ method public float dispatchRawDelta(float delta);
+ method public int getCenterItemIndex();
+ method public int getCenterItemScrollOffset();
+ method public androidx.wear.compose.material.ScalingLazyListLayoutInfo getLayoutInfo();
+ method public boolean isScrollInProgress();
+ method public suspend Object? scroll(androidx.compose.foundation.MutatePriority scrollPriority, kotlin.jvm.functions.Function2<? super androidx.compose.foundation.gestures.ScrollScope,? super kotlin.coroutines.Continuation<? super kotlin.Unit>,?> block, kotlin.coroutines.Continuation<? super kotlin.Unit>);
+ method public suspend Object? scrollToItem(int index, optional int scrollOffset, optional kotlin.coroutines.Continuation<? super kotlin.Unit>);
+ property public final int centerItemIndex;
+ property public final int centerItemScrollOffset;
+ property public boolean isScrollInProgress;
+ property public final androidx.wear.compose.material.ScalingLazyListLayoutInfo layoutInfo;
+ field public static final androidx.wear.compose.material.ScalingLazyListState.Companion Companion;
+ }
+
+ public static final class ScalingLazyListState.Companion {
+ method public androidx.compose.runtime.saveable.Saver<androidx.wear.compose.material.ScalingLazyListState,java.lang.Object> getSaver();
+ property public final androidx.compose.runtime.saveable.Saver<androidx.wear.compose.material.ScalingLazyListState,java.lang.Object> Saver;
+ }
+
+ public final class ScalingLazyListStateKt {
+ method @androidx.compose.runtime.Composable public static androidx.wear.compose.material.ScalingLazyListState rememberScalingLazyListState(optional int initialCenterItemIndex, optional int initialCenterItemScrollOffset);
+ }
+
+ @kotlin.DslMarker public @interface ScalingLazyScopeMarker {
+ }
+
+ @androidx.compose.runtime.Stable public interface ScalingParams {
+ method public float getEdgeAlpha();
+ method public float getEdgeScale();
+ method public float getMaxElementHeight();
+ method public float getMaxTransitionArea();
+ method public float getMinElementHeight();
+ method public float getMinTransitionArea();
+ method public androidx.compose.animation.core.Easing getScaleInterpolator();
+ method public int resolveViewportVerticalOffset(long viewportConstraints);
+ property public abstract float edgeAlpha;
+ property public abstract float edgeScale;
+ property public abstract float maxElementHeight;
+ property public abstract float maxTransitionArea;
+ property public abstract float minElementHeight;
+ property public abstract float minTransitionArea;
+ property public abstract androidx.compose.animation.core.Easing scaleInterpolator;
+ }
+
+ @androidx.compose.runtime.Immutable public final class Shapes {
+ ctor public Shapes(optional androidx.compose.foundation.shape.CornerBasedShape small, optional androidx.compose.foundation.shape.CornerBasedShape medium, optional androidx.compose.foundation.shape.CornerBasedShape large);
+ method public androidx.wear.compose.material.Shapes copy(optional androidx.compose.foundation.shape.CornerBasedShape small, optional androidx.compose.foundation.shape.CornerBasedShape medium, optional androidx.compose.foundation.shape.CornerBasedShape large);
+ method public androidx.compose.foundation.shape.CornerBasedShape getLarge();
+ method public androidx.compose.foundation.shape.CornerBasedShape getMedium();
+ method public androidx.compose.foundation.shape.CornerBasedShape getSmall();
+ property public final androidx.compose.foundation.shape.CornerBasedShape large;
+ property public final androidx.compose.foundation.shape.CornerBasedShape medium;
+ property public final androidx.compose.foundation.shape.CornerBasedShape small;
+ }
+
+ public final class ShapesKt {
+ }
+
+ public final class SliderKt {
+ method @androidx.compose.runtime.Composable public static void InlineSlider(float value, kotlin.jvm.functions.Function1<? super java.lang.Float,kotlin.Unit> onValueChange, int steps, kotlin.jvm.functions.Function0<kotlin.Unit> decreaseIcon, kotlin.jvm.functions.Function0<kotlin.Unit> increaseIcon, optional androidx.compose.ui.Modifier modifier, optional boolean enabled, optional kotlin.ranges.ClosedFloatingPointRange<java.lang.Float> valueRange, optional boolean segmented, optional androidx.wear.compose.material.InlineSliderColors colors);
+ method @androidx.compose.runtime.Composable public static void InlineSlider(int value, kotlin.jvm.functions.Function1<? super java.lang.Integer,kotlin.Unit> onValueChange, kotlin.ranges.IntProgression valueProgression, kotlin.jvm.functions.Function0<kotlin.Unit> decreaseIcon, kotlin.jvm.functions.Function0<kotlin.Unit> increaseIcon, optional androidx.compose.ui.Modifier modifier, optional boolean enabled, optional boolean segmented, optional androidx.wear.compose.material.InlineSliderColors colors);
+ }
+
+ @androidx.compose.runtime.Stable public interface SplitToggleChipColors {
+ method @androidx.compose.runtime.Composable public androidx.compose.runtime.State<androidx.compose.ui.graphics.Color> backgroundColor(boolean enabled);
+ method @androidx.compose.runtime.Composable public androidx.compose.runtime.State<androidx.compose.ui.graphics.Color> contentColor(boolean enabled);
+ method @androidx.compose.runtime.Composable public androidx.compose.runtime.State<androidx.compose.ui.graphics.Color> secondaryContentColor(boolean enabled);
+ method @androidx.compose.runtime.Composable public androidx.compose.runtime.State<androidx.compose.ui.graphics.Color> splitBackgroundOverlay(boolean enabled, boolean checked);
+ method @androidx.compose.runtime.Composable public androidx.compose.runtime.State<androidx.compose.ui.graphics.Color> toggleControlColor(boolean enabled, boolean checked);
+ }
+
+ public final class StepperDefaults {
+ method public androidx.compose.ui.graphics.vector.ImageVector getDecrease();
+ method public androidx.compose.ui.graphics.vector.ImageVector getIncrease();
+ property public final androidx.compose.ui.graphics.vector.ImageVector Decrease;
+ property public final androidx.compose.ui.graphics.vector.ImageVector Increase;
+ field public static final androidx.wear.compose.material.StepperDefaults INSTANCE;
+ }
+
+ public final class StepperKt {
+ method @androidx.compose.runtime.Composable public static void Stepper(float value, kotlin.jvm.functions.Function1<? super java.lang.Float,kotlin.Unit> onValueChange, int steps, kotlin.jvm.functions.Function0<kotlin.Unit> decreaseIcon, kotlin.jvm.functions.Function0<kotlin.Unit> increaseIcon, optional androidx.compose.ui.Modifier modifier, optional kotlin.ranges.ClosedFloatingPointRange<java.lang.Float> valueRange, optional long backgroundColor, optional long contentColor, optional long iconColor, kotlin.jvm.functions.Function1<? super androidx.compose.foundation.layout.BoxScope,kotlin.Unit> content);
+ method @androidx.compose.runtime.Composable public static void Stepper(int value, kotlin.jvm.functions.Function1<? super java.lang.Integer,kotlin.Unit> onValueChange, kotlin.ranges.IntProgression valueProgression, kotlin.jvm.functions.Function0<kotlin.Unit> decreaseIcon, kotlin.jvm.functions.Function0<kotlin.Unit> increaseIcon, optional androidx.compose.ui.Modifier modifier, optional long backgroundColor, optional long contentColor, optional long iconColor, kotlin.jvm.functions.Function1<? super androidx.compose.foundation.layout.BoxScope,kotlin.Unit> content);
+ }
+
+ public final class SwipeToDismissBoxDefaults {
+ method public androidx.compose.animation.core.SpringSpec<java.lang.Float> getAnimationSpec();
+ method public float getEdgeWidth();
+ property public final androidx.compose.animation.core.SpringSpec<java.lang.Float> AnimationSpec;
+ property public final float EdgeWidth;
+ field public static final androidx.wear.compose.material.SwipeToDismissBoxDefaults INSTANCE;
+ }
+
+ public final class SwipeToDismissBoxKt {
+ method @androidx.compose.runtime.Composable public static void SwipeToDismissBox(androidx.wear.compose.material.SwipeToDismissBoxState state, optional androidx.compose.ui.Modifier modifier, optional long backgroundScrimColor, optional long contentScrimColor, optional Object backgroundKey, optional Object contentKey, optional boolean hasBackground, kotlin.jvm.functions.Function2<? super androidx.compose.foundation.layout.BoxScope,? super java.lang.Boolean,kotlin.Unit> content);
+ method @androidx.compose.runtime.Composable public static void SwipeToDismissBox(kotlin.jvm.functions.Function0<kotlin.Unit> onDismissed, optional androidx.compose.ui.Modifier modifier, optional androidx.wear.compose.material.SwipeToDismissBoxState state, optional long backgroundScrimColor, optional long contentScrimColor, optional Object backgroundKey, optional Object contentKey, optional boolean hasBackground, kotlin.jvm.functions.Function2<? super androidx.compose.foundation.layout.BoxScope,? super java.lang.Boolean,kotlin.Unit> content);
+ method public static androidx.compose.ui.Modifier edgeSwipeToDismiss(androidx.compose.ui.Modifier, androidx.wear.compose.material.SwipeToDismissBoxState swipeToDismissBoxState, optional float edgeWidth);
+ method @androidx.compose.runtime.Composable public static androidx.wear.compose.material.SwipeToDismissBoxState rememberSwipeToDismissBoxState(optional androidx.compose.animation.core.AnimationSpec<java.lang.Float> animationSpec, optional kotlin.jvm.functions.Function1<? super androidx.wear.compose.material.SwipeToDismissValue,java.lang.Boolean> confirmStateChange);
+ }
+
+ @androidx.compose.runtime.Stable public final class SwipeToDismissBoxState {
+ ctor public SwipeToDismissBoxState(optional androidx.compose.animation.core.AnimationSpec<java.lang.Float> animationSpec, optional kotlin.jvm.functions.Function1<? super androidx.wear.compose.material.SwipeToDismissValue,java.lang.Boolean> confirmStateChange);
+ method public androidx.wear.compose.material.SwipeToDismissValue getCurrentValue();
+ method public androidx.wear.compose.material.SwipeToDismissValue getTargetValue();
+ method public boolean isAnimationRunning();
+ method public suspend Object? snapTo(androidx.wear.compose.material.SwipeToDismissValue targetValue, kotlin.coroutines.Continuation<? super kotlin.Unit>);
+ property public final androidx.wear.compose.material.SwipeToDismissValue currentValue;
+ property public final boolean isAnimationRunning;
+ property public final androidx.wear.compose.material.SwipeToDismissValue targetValue;
+ }
+
+ public enum SwipeToDismissKeys {
+ enum_constant public static final androidx.wear.compose.material.SwipeToDismissKeys Background;
+ enum_constant public static final androidx.wear.compose.material.SwipeToDismissKeys Content;
+ }
+
+ public enum SwipeToDismissValue {
+ enum_constant public static final androidx.wear.compose.material.SwipeToDismissValue Default;
+ enum_constant public static final androidx.wear.compose.material.SwipeToDismissValue Dismissed;
+ }
+
+ public final class SwipeableKt {
+ }
+
+ public final class TextKt {
+ method @androidx.compose.runtime.Composable public static void ProvideTextStyle(androidx.compose.ui.text.TextStyle value, kotlin.jvm.functions.Function0<kotlin.Unit> content);
+ method @androidx.compose.runtime.Composable public static void Text(String text, optional androidx.compose.ui.Modifier modifier, optional long color, optional long fontSize, optional androidx.compose.ui.text.font.FontStyle? fontStyle, optional androidx.compose.ui.text.font.FontWeight? fontWeight, optional androidx.compose.ui.text.font.FontFamily? fontFamily, optional long letterSpacing, optional androidx.compose.ui.text.style.TextDecoration? textDecoration, optional androidx.compose.ui.text.style.TextAlign? textAlign, optional long lineHeight, optional int overflow, optional boolean softWrap, optional int maxLines, optional kotlin.jvm.functions.Function1<? super androidx.compose.ui.text.TextLayoutResult,kotlin.Unit> onTextLayout, optional androidx.compose.ui.text.TextStyle style);
+ method @androidx.compose.runtime.Composable public static void Text(androidx.compose.ui.text.AnnotatedString text, optional androidx.compose.ui.Modifier modifier, optional long color, optional long fontSize, optional androidx.compose.ui.text.font.FontStyle? fontStyle, optional androidx.compose.ui.text.font.FontWeight? fontWeight, optional androidx.compose.ui.text.font.FontFamily? fontFamily, optional long letterSpacing, optional androidx.compose.ui.text.style.TextDecoration? textDecoration, optional androidx.compose.ui.text.style.TextAlign? textAlign, optional long lineHeight, optional int overflow, optional boolean softWrap, optional int maxLines, optional java.util.Map<java.lang.String,androidx.compose.foundation.text.InlineTextContent> inlineContent, optional kotlin.jvm.functions.Function1<? super androidx.compose.ui.text.TextLayoutResult,kotlin.Unit> onTextLayout, optional androidx.compose.ui.text.TextStyle style);
+ method public static androidx.compose.runtime.ProvidableCompositionLocal<androidx.compose.ui.text.TextStyle> getLocalTextStyle();
+ property public static final androidx.compose.runtime.ProvidableCompositionLocal<androidx.compose.ui.text.TextStyle> LocalTextStyle;
+ }
+
+ public interface TimeSource {
+ method @androidx.compose.runtime.Composable public String getCurrentTime();
+ property @androidx.compose.runtime.Composable public abstract String currentTime;
+ }
+
+ public final class TimeTextDefaults {
+ method public void CurvedTextSeparator(androidx.wear.compose.foundation.CurvedScope, optional androidx.wear.compose.foundation.CurvedTextStyle? curvedTextStyle, optional androidx.wear.compose.foundation.ArcPaddingValues contentArcPadding);
+ method @androidx.compose.runtime.Composable public void TextSeparator(optional androidx.compose.ui.Modifier modifier, optional androidx.compose.ui.text.TextStyle textStyle, optional androidx.compose.foundation.layout.PaddingValues contentPadding);
+ method public androidx.compose.foundation.layout.PaddingValues getContentPadding();
+ method @androidx.compose.runtime.Composable public String timeFormat();
+ method public androidx.wear.compose.material.TimeSource timeSource(String timeFormat);
+ method @androidx.compose.runtime.Composable public androidx.compose.ui.text.TextStyle timeTextStyle(optional long background, optional long color, optional long fontSize);
+ property public final androidx.compose.foundation.layout.PaddingValues ContentPadding;
+ field public static final androidx.wear.compose.material.TimeTextDefaults INSTANCE;
+ field public static final String TimeFormat12Hours = "h:mm a";
+ field public static final String TimeFormat24Hours = "HH:mm";
+ }
+
+ public final class TimeTextKt {
+ method @androidx.compose.runtime.Composable public static void TimeText(optional androidx.compose.ui.Modifier modifier, optional androidx.wear.compose.material.TimeSource timeSource, optional androidx.compose.ui.text.TextStyle timeTextStyle, optional androidx.compose.foundation.layout.PaddingValues contentPadding, optional kotlin.jvm.functions.Function0<kotlin.Unit>? startLinearContent, optional kotlin.jvm.functions.Function1<? super androidx.wear.compose.foundation.CurvedScope,kotlin.Unit>? startCurvedContent, optional kotlin.jvm.functions.Function0<kotlin.Unit>? endLinearContent, optional kotlin.jvm.functions.Function1<? super androidx.wear.compose.foundation.CurvedScope,kotlin.Unit>? endCurvedContent, optional kotlin.jvm.functions.Function0<kotlin.Unit> textLinearSeparator, optional kotlin.jvm.functions.Function1<? super androidx.wear.compose.foundation.CurvedScope,kotlin.Unit> textCurvedSeparator);
+ }
+
+ @androidx.compose.runtime.Stable public interface ToggleButtonColors {
+ method @androidx.compose.runtime.Composable public androidx.compose.runtime.State<androidx.compose.ui.graphics.Color> backgroundColor(boolean enabled, boolean checked);
+ method @androidx.compose.runtime.Composable public androidx.compose.runtime.State<androidx.compose.ui.graphics.Color> contentColor(boolean enabled, boolean checked);
+ }
+
+ public final class ToggleButtonDefaults {
+ method public float getDefaultIconSize();
+ method public float getDefaultToggleButtonSize();
+ method public float getSmallIconSize();
+ method public float getSmallToggleButtonSize();
+ method @androidx.compose.runtime.Composable public androidx.wear.compose.material.ToggleButtonColors toggleButtonColors(optional long checkedBackgroundColor, optional long checkedContentColor, optional long disabledCheckedBackgroundColor, optional long disabledCheckedContentColor, optional long uncheckedBackgroundColor, optional long uncheckedContentColor, optional long disabledUncheckedBackgroundColor, optional long disabledUncheckedContentColor);
+ property public final float DefaultIconSize;
+ property public final float DefaultToggleButtonSize;
+ property public final float SmallIconSize;
+ property public final float SmallToggleButtonSize;
+ field public static final androidx.wear.compose.material.ToggleButtonDefaults INSTANCE;
+ }
+
+ public final class ToggleButtonKt {
+ method @androidx.compose.runtime.Composable public static void ToggleButton(boolean checked, kotlin.jvm.functions.Function1<? super java.lang.Boolean,kotlin.Unit> onCheckedChange, optional androidx.compose.ui.Modifier modifier, optional boolean enabled, optional androidx.wear.compose.material.ToggleButtonColors colors, optional androidx.compose.foundation.interaction.MutableInteractionSource interactionSource, kotlin.jvm.functions.Function1<? super androidx.compose.foundation.layout.BoxScope,kotlin.Unit> content);
+ }
+
+ @androidx.compose.runtime.Stable public interface ToggleChipColors {
+ method @androidx.compose.runtime.Composable public androidx.compose.runtime.State<androidx.compose.ui.graphics.painter.Painter> background(boolean enabled, boolean checked);
+ method @androidx.compose.runtime.Composable public androidx.compose.runtime.State<androidx.compose.ui.graphics.Color> contentColor(boolean enabled, boolean checked);
+ method @androidx.compose.runtime.Composable public androidx.compose.runtime.State<androidx.compose.ui.graphics.Color> secondaryContentColor(boolean enabled, boolean checked);
+ method @androidx.compose.runtime.Composable public androidx.compose.runtime.State<androidx.compose.ui.graphics.Color> toggleControlColor(boolean enabled, boolean checked);
+ }
+
+ public final class ToggleChipDefaults {
+ method public androidx.compose.ui.graphics.vector.ImageVector checkboxIcon(boolean checked);
+ method public androidx.compose.ui.graphics.vector.ImageVector getCheckboxOn();
+ method public androidx.compose.foundation.layout.PaddingValues getContentPadding();
+ method public float getIconSize();
+ method public androidx.compose.ui.graphics.vector.ImageVector getRadioOff();
+ method public androidx.compose.ui.graphics.vector.ImageVector getRadioOn();
+ method @androidx.compose.runtime.Composable public long getSwitchUncheckedIconColor();
+ method public androidx.compose.ui.graphics.vector.ImageVector radioIcon(boolean checked);
+ method @androidx.compose.runtime.Composable public androidx.wear.compose.material.SplitToggleChipColors splitToggleChipColors(optional long backgroundColor, optional long contentColor, optional long secondaryContentColor, optional long checkedToggleControlColor, optional long uncheckedToggleControlColor, optional long splitBackgroundOverlayColor);
+ method public androidx.compose.ui.graphics.vector.ImageVector switchIcon(boolean checked);
+ method @androidx.compose.runtime.Composable public androidx.wear.compose.material.ToggleChipColors toggleChipColors(optional long checkedStartBackgroundColor, optional long checkedEndBackgroundColor, optional long checkedContentColor, optional long checkedSecondaryContentColor, optional long checkedToggleControlColor, optional long uncheckedStartBackgroundColor, optional long uncheckedEndBackgroundColor, optional long uncheckedContentColor, optional long uncheckedSecondaryContentColor, optional long uncheckedToggleControlColor, optional androidx.compose.ui.unit.LayoutDirection gradientDirection);
+ property public final androidx.compose.ui.graphics.vector.ImageVector CheckboxOn;
+ property public final androidx.compose.foundation.layout.PaddingValues ContentPadding;
+ property public final float IconSize;
+ property public final androidx.compose.ui.graphics.vector.ImageVector RadioOff;
+ property public final androidx.compose.ui.graphics.vector.ImageVector RadioOn;
+ property @androidx.compose.runtime.Composable public final long SwitchUncheckedIconColor;
+ field public static final androidx.wear.compose.material.ToggleChipDefaults INSTANCE;
+ }
+
+ public final class ToggleChipKt {
+ method @androidx.compose.runtime.Composable public static void SplitToggleChip(boolean checked, kotlin.jvm.functions.Function1<? super java.lang.Boolean,kotlin.Unit> onCheckedChange, kotlin.jvm.functions.Function1<? super androidx.compose.foundation.layout.RowScope,kotlin.Unit> label, kotlin.jvm.functions.Function0<kotlin.Unit> onClick, kotlin.jvm.functions.Function1<? super androidx.compose.foundation.layout.BoxScope,kotlin.Unit> toggleControl, optional androidx.compose.ui.Modifier modifier, optional kotlin.jvm.functions.Function1<? super androidx.compose.foundation.layout.RowScope,kotlin.Unit>? secondaryLabel, optional androidx.wear.compose.material.SplitToggleChipColors colors, optional boolean enabled, optional androidx.compose.foundation.interaction.MutableInteractionSource checkedInteractionSource, optional androidx.compose.foundation.interaction.MutableInteractionSource clickInteractionSource, optional androidx.compose.foundation.layout.PaddingValues contentPadding, optional androidx.compose.ui.graphics.Shape shape);
+ method @androidx.compose.runtime.Composable public static void ToggleChip(boolean checked, kotlin.jvm.functions.Function1<? super java.lang.Boolean,kotlin.Unit> onCheckedChange, kotlin.jvm.functions.Function1<? super androidx.compose.foundation.layout.RowScope,kotlin.Unit> label, kotlin.jvm.functions.Function0<kotlin.Unit> toggleControl, optional androidx.compose.ui.Modifier modifier, optional kotlin.jvm.functions.Function1<? super androidx.compose.foundation.layout.BoxScope,kotlin.Unit>? appIcon, optional kotlin.jvm.functions.Function1<? super androidx.compose.foundation.layout.RowScope,kotlin.Unit>? secondaryLabel, optional androidx.wear.compose.material.ToggleChipColors colors, optional boolean enabled, optional androidx.compose.foundation.interaction.MutableInteractionSource interactionSource, optional androidx.compose.foundation.layout.PaddingValues contentPadding, optional androidx.compose.ui.graphics.Shape shape);
+ }
+
+ @androidx.compose.runtime.Immutable public final class Typography {
+ ctor public Typography(optional androidx.compose.ui.text.font.FontFamily defaultFontFamily, optional androidx.compose.ui.text.TextStyle display1, optional androidx.compose.ui.text.TextStyle display2, optional androidx.compose.ui.text.TextStyle display3, optional androidx.compose.ui.text.TextStyle title1, optional androidx.compose.ui.text.TextStyle title2, optional androidx.compose.ui.text.TextStyle title3, optional androidx.compose.ui.text.TextStyle body1, optional androidx.compose.ui.text.TextStyle body2, optional androidx.compose.ui.text.TextStyle button, optional androidx.compose.ui.text.TextStyle caption1, optional androidx.compose.ui.text.TextStyle caption2, optional androidx.compose.ui.text.TextStyle caption3);
+ method public androidx.wear.compose.material.Typography copy(optional androidx.compose.ui.text.TextStyle display1, optional androidx.compose.ui.text.TextStyle display2, optional androidx.compose.ui.text.TextStyle display3, optional androidx.compose.ui.text.TextStyle title1, optional androidx.compose.ui.text.TextStyle title2, optional androidx.compose.ui.text.TextStyle title3, optional androidx.compose.ui.text.TextStyle body1, optional androidx.compose.ui.text.TextStyle body2, optional androidx.compose.ui.text.TextStyle button, optional androidx.compose.ui.text.TextStyle caption1, optional androidx.compose.ui.text.TextStyle caption2, optional androidx.compose.ui.text.TextStyle caption3);
+ method public androidx.compose.ui.text.TextStyle getBody1();
+ method public androidx.compose.ui.text.TextStyle getBody2();
+ method public androidx.compose.ui.text.TextStyle getButton();
+ method public androidx.compose.ui.text.TextStyle getCaption1();
+ method public androidx.compose.ui.text.TextStyle getCaption2();
+ method public androidx.compose.ui.text.TextStyle getCaption3();
+ method public androidx.compose.ui.text.TextStyle getDisplay1();
+ method public androidx.compose.ui.text.TextStyle getDisplay2();
+ method public androidx.compose.ui.text.TextStyle getDisplay3();
+ method public androidx.compose.ui.text.TextStyle getTitle1();
+ method public androidx.compose.ui.text.TextStyle getTitle2();
+ method public androidx.compose.ui.text.TextStyle getTitle3();
+ property public final androidx.compose.ui.text.TextStyle body1;
+ property public final androidx.compose.ui.text.TextStyle body2;
+ property public final androidx.compose.ui.text.TextStyle button;
+ property public final androidx.compose.ui.text.TextStyle caption1;
+ property public final androidx.compose.ui.text.TextStyle caption2;
+ property public final androidx.compose.ui.text.TextStyle caption3;
+ property public final androidx.compose.ui.text.TextStyle display1;
+ property public final androidx.compose.ui.text.TextStyle display2;
+ property public final androidx.compose.ui.text.TextStyle display3;
+ property public final androidx.compose.ui.text.TextStyle title1;
+ property public final androidx.compose.ui.text.TextStyle title2;
+ property public final androidx.compose.ui.text.TextStyle title3;
+ }
+
+ public final class TypographyKt {
+ }
+
+ public final class VignetteKt {
+ method @androidx.compose.runtime.Composable public static void Vignette(int vignettePosition, optional androidx.compose.ui.Modifier modifier);
+ }
+
+ @kotlin.jvm.JvmInline public final value class VignettePosition {
+ ctor public VignettePosition(int key);
+ field public static final androidx.wear.compose.material.VignettePosition.Companion Companion;
+ }
+
+ public static final class VignettePosition.Companion {
+ method public int getBottom();
+ method public int getTop();
+ method public int getTopAndBottom();
+ property public final int Bottom;
+ property public final int Top;
+ property public final int TopAndBottom;
+ }
+
+}
+
+package androidx.wear.compose.material.dialog {
+
+ public final class DialogDefaults {
+ method public androidx.compose.foundation.layout.Arrangement.Vertical getAlertVerticalArrangement();
+ method public androidx.compose.foundation.layout.Arrangement.Vertical getConfirmationVerticalArrangement();
+ method public androidx.compose.foundation.layout.PaddingValues getContentPadding();
+ method public long getIndefiniteDurationMillis();
+ method public long getLongDurationMillis();
+ method public long getShortDurationMillis();
+ property public final androidx.compose.foundation.layout.Arrangement.Vertical AlertVerticalArrangement;
+ property public final androidx.compose.foundation.layout.Arrangement.Vertical ConfirmationVerticalArrangement;
+ property public final androidx.compose.foundation.layout.PaddingValues ContentPadding;
+ property public final long IndefiniteDurationMillis;
+ property public final long LongDurationMillis;
+ property public final long ShortDurationMillis;
+ field public static final androidx.wear.compose.material.dialog.DialogDefaults INSTANCE;
+ }
+
+ public final class DialogKt {
+ method @androidx.compose.runtime.Composable public static void Alert(kotlin.jvm.functions.Function1<? super androidx.compose.foundation.layout.ColumnScope,kotlin.Unit> title, kotlin.jvm.functions.Function0<kotlin.Unit> negativeButton, kotlin.jvm.functions.Function0<kotlin.Unit> positiveButton, optional androidx.compose.ui.Modifier modifier, optional kotlin.jvm.functions.Function1<? super androidx.compose.foundation.layout.ColumnScope,kotlin.Unit>? icon, optional androidx.wear.compose.material.ScalingLazyListState scrollState, optional long backgroundColor, optional long contentColor, optional long titleColor, optional long iconColor, optional androidx.compose.foundation.layout.Arrangement.Vertical verticalArrangement, optional androidx.compose.foundation.layout.PaddingValues contentPadding, optional kotlin.jvm.functions.Function1<? super androidx.compose.foundation.layout.ColumnScope,kotlin.Unit>? content);
+ method @androidx.compose.runtime.Composable public static void Alert(kotlin.jvm.functions.Function1<? super androidx.compose.foundation.layout.ColumnScope,kotlin.Unit> title, optional androidx.compose.ui.Modifier modifier, optional kotlin.jvm.functions.Function1<? super androidx.compose.foundation.layout.ColumnScope,kotlin.Unit>? icon, optional kotlin.jvm.functions.Function1<? super androidx.compose.foundation.layout.ColumnScope,kotlin.Unit>? message, optional androidx.wear.compose.material.ScalingLazyListState scrollState, optional long backgroundColor, optional long titleColor, optional long messageColor, optional long iconColor, optional androidx.compose.foundation.layout.Arrangement.Vertical verticalArrangement, optional androidx.compose.foundation.layout.PaddingValues contentPadding, kotlin.jvm.functions.Function1<? super androidx.wear.compose.material.ScalingLazyListScope,kotlin.Unit> content);
+ method @androidx.compose.runtime.Composable public static void Confirmation(kotlin.jvm.functions.Function0<kotlin.Unit> onTimeout, optional androidx.compose.ui.Modifier modifier, optional kotlin.jvm.functions.Function1<? super androidx.compose.foundation.layout.ColumnScope,kotlin.Unit>? icon, optional androidx.wear.compose.material.ScalingLazyListState scrollState, optional long durationMillis, optional long backgroundColor, optional long contentColor, optional long iconColor, optional androidx.compose.foundation.layout.Arrangement.Vertical verticalArrangement, optional androidx.compose.foundation.layout.PaddingValues contentPadding, kotlin.jvm.functions.Function1<? super androidx.compose.foundation.layout.ColumnScope,kotlin.Unit> content);
+ }
+
+ public final class Dialog_androidKt {
+ method @androidx.compose.runtime.Composable public static void Dialog(boolean showDialog, kotlin.jvm.functions.Function0<kotlin.Unit> onDismissRequest, optional androidx.compose.ui.Modifier modifier, optional androidx.wear.compose.material.ScalingLazyListState? scrollState, optional androidx.compose.ui.window.DialogProperties properties, kotlin.jvm.functions.Function0<kotlin.Unit> content);
+ }
+
+}
+
diff --git a/wear/compose/compose-material/samples/build.gradle b/wear/compose/compose-material/samples/build.gradle
index 7b1743a..a46003b 100644
--- a/wear/compose/compose-material/samples/build.gradle
+++ b/wear/compose/compose-material/samples/build.gradle
@@ -61,11 +61,3 @@
inceptionYear = "2021"
description = "Contains the sample code for the Android Wear Compose Material Classes"
}
-
-// Workaround for https://github.com/gradle/gradle/issues/19882
-configurations.all {
- resolutionStrategy.dependencySubstitution {
- substitute(module("androidx.lifecycle:lifecycle-common-java8:")).
- using project(":lifecycle:lifecycle-common-java8")
- }
-}
diff --git a/wear/compose/compose-material/samples/src/main/java/androidx/wear/compose/material/samples/CardSample.kt b/wear/compose/compose-material/samples/src/main/java/androidx/wear/compose/material/samples/CardSample.kt
index b18ee9e..49b3b78 100644
--- a/wear/compose/compose-material/samples/src/main/java/androidx/wear/compose/material/samples/CardSample.kt
+++ b/wear/compose/compose-material/samples/src/main/java/androidx/wear/compose/material/samples/CardSample.kt
@@ -17,8 +17,6 @@
package androidx.wear.compose.material.samples
import androidx.annotation.Sampled
-import androidx.compose.foundation.layout.Column
-import androidx.compose.foundation.layout.fillMaxWidth
import androidx.compose.foundation.layout.size
import androidx.compose.foundation.layout.wrapContentSize
import androidx.compose.runtime.Composable
@@ -49,10 +47,8 @@
title = { Text("AppCard") },
time = { Text("now") },
) {
- Column(modifier = Modifier.fillMaxWidth()) {
- Text("Some body content")
- Text("and some more body content")
- }
+ Text("Some body content")
+ Text("and some more body content")
}
}
@@ -64,10 +60,8 @@
title = { Text("TitleCard") },
time = { Text("now") },
) {
- Column(modifier = Modifier.fillMaxWidth()) {
- Text("Some body content")
- Text("and some more body content")
- }
+ Text("Some body content")
+ Text("and some more body content")
}
}
@@ -83,8 +77,6 @@
contentColor = MaterialTheme.colors.onSurface,
titleColor = MaterialTheme.colors.onSurface,
) {
- Column(modifier = Modifier.fillMaxWidth()) {
- Text("Text coloured to stand out on the image")
- }
+ Text("Text coloured to stand out on the image")
}
}
diff --git a/wear/compose/compose-material/samples/src/main/java/androidx/wear/compose/material/samples/HorizontalPageIndicatorSample.kt b/wear/compose/compose-material/samples/src/main/java/androidx/wear/compose/material/samples/HorizontalPageIndicatorSample.kt
index 3ba0240..eb1bad7 100644
--- a/wear/compose/compose-material/samples/src/main/java/androidx/wear/compose/material/samples/HorizontalPageIndicatorSample.kt
+++ b/wear/compose/compose-material/samples/src/main/java/androidx/wear/compose/material/samples/HorizontalPageIndicatorSample.kt
@@ -38,18 +38,22 @@
@Sampled
@Composable
fun HorizontalPageIndicatorSample() {
- val maxPages = 6
+ val maxPages = 9
var selectedPage by remember { mutableStateOf(0) }
+ var finalValue by remember { mutableStateOf(0) }
+
val animatedSelectedPage by animateFloatAsState(
targetValue = selectedPage.toFloat(),
- )
+ ) {
+ finalValue = it.toInt()
+ }
val pageIndicatorState: PageIndicatorState = remember {
object : PageIndicatorState {
override val pageOffset: Float
- get() = animatedSelectedPage - selectedPage
+ get() = animatedSelectedPage - finalValue
override val selectedPage: Int
- get() = selectedPage
+ get() = finalValue
override val pageCount: Int
get() = maxPages
}
@@ -68,4 +72,4 @@
pageIndicatorState = pageIndicatorState
)
}
-}
+}
\ No newline at end of file
diff --git a/wear/compose/compose-material/src/androidAndroidTest/kotlin/androidx/wear/compose/material/HorizontalPageIndicatorTest.kt b/wear/compose/compose-material/src/androidAndroidTest/kotlin/androidx/wear/compose/material/HorizontalPageIndicatorTest.kt
index 72f900a..19ab271 100644
--- a/wear/compose/compose-material/src/androidAndroidTest/kotlin/androidx/wear/compose/material/HorizontalPageIndicatorTest.kt
+++ b/wear/compose/compose-material/src/androidAndroidTest/kotlin/androidx/wear/compose/material/HorizontalPageIndicatorTest.kt
@@ -18,6 +18,7 @@
import android.os.Build
import androidx.annotation.RequiresApi
+import androidx.compose.foundation.layout.fillMaxWidth
import androidx.compose.foundation.layout.size
import androidx.compose.foundation.shape.AbsoluteCutCornerShape
import androidx.compose.ui.Modifier
@@ -97,30 +98,30 @@
pageIndicatorState = pageIndicatorState(),
selectedColor = selectedColor,
unselectedColor = unselectedColor,
- indicatorSize = 30.dp
+ indicatorSize = 20.dp
)
}
rule.waitForIdle()
- // A selected dot with specified color should be visible on the screen, which is apprx 3%
- // (3% per dot, 1 dot in total)
+ // A selected dot with specified color should be visible on the screen, which is apprx 1.3%
+ // (1.3% per dot, 1 dot in total)
rule.onNodeWithTag(TEST_TAG).captureToImage()
- .assertColorInPercentageRange(selectedColor, 3f..3f)
- // Unselected dots should also be visible on the screen, and should take around 15%
- // (3% per dot, 3 dots total)
+ .assertColorInPercentageRange(selectedColor, 1.2f..1.5f)
+ // Unselected dots should also be visible on the screen, and should take around 4%
+ // (1.3% per dot, 3 dots total)
rule.onNodeWithTag(TEST_TAG).captureToImage()
- .assertColorInPercentageRange(unselectedColor, 9f..9f)
+ .assertColorInPercentageRange(unselectedColor, 3.8f..4.5f)
}
private fun in_between_positions(indicatorStyle: PageIndicatorStyle) {
rule.setContentWithTheme {
HorizontalPageIndicator(
- modifier = Modifier.testTag(TEST_TAG).size(150.dp),
+ modifier = Modifier.testTag(TEST_TAG).size(150.dp).fillMaxWidth(),
pageIndicatorState = pageIndicatorState(pageOffset = 0.5f),
indicatorStyle = indicatorStyle,
selectedColor = selectedColor,
unselectedColor = unselectedColor,
- indicatorSize = 30.dp
+ indicatorSize = 20.dp
)
}
rule.waitForIdle()
@@ -129,10 +130,10 @@
rule.onNodeWithTag(TEST_TAG).captureToImage()
.assertDoesNotContainColor(selectedColor)
// Unselected dots ( which doesn't participate in color merge)
- // should also be visible on the screen, and should take around 6%
- // (3% per dot, 2 dots in total)
+ // should also be visible on the screen, and should take around 2.7%
+ // (1.3% per dot, 2 dots in total)
rule.onNodeWithTag(TEST_TAG).captureToImage()
- .assertColorInPercentageRange(unselectedColor, 6f..6f)
+ .assertColorInPercentageRange(unselectedColor, 2.5f..3f)
}
private fun has_square_shape(indicatorStyle: PageIndicatorStyle) {
@@ -144,19 +145,19 @@
selectedColor = selectedColor,
unselectedColor = unselectedColor,
indicatorShape = AbsoluteCutCornerShape(0f),
- indicatorSize = 30.dp
+ indicatorSize = 20.dp
)
}
rule.waitForIdle()
- // A selected item with specified color should be visible on the screen, which is apprx 4%
- // (4% per item, 1 item in total)
+ // A selected item with specified color should be visible on the screen, which is
+ // apprx 1.8% (1.8% per item, 1 item in total)
rule.onNodeWithTag(TEST_TAG).captureToImage()
- .assertColorInPercentageRange(selectedColor, 4f..4f)
- // Unselected item should also be visible on the screen, and should take around 12%
- // (4% per item, 3 items in total)
+ .assertColorInPercentageRange(selectedColor, 1.6f..1.9f)
+ // Unselected item should also be visible on the screen, and should take around 5.8%
+ // (1.8% per item, 3 items in total)
rule.onNodeWithTag(TEST_TAG).captureToImage()
- .assertColorInPercentageRange(unselectedColor, 12f..12f)
+ .assertColorInPercentageRange(unselectedColor, 5f..6f)
}
companion object {
diff --git a/wear/compose/compose-material/src/androidAndroidTest/kotlin/androidx/wear/compose/material/MaterialTest.kt b/wear/compose/compose-material/src/androidAndroidTest/kotlin/androidx/wear/compose/material/MaterialTest.kt
index e64794f..d83eac1 100644
--- a/wear/compose/compose-material/src/androidAndroidTest/kotlin/androidx/wear/compose/material/MaterialTest.kt
+++ b/wear/compose/compose-material/src/androidAndroidTest/kotlin/androidx/wear/compose/material/MaterialTest.kt
@@ -170,7 +170,7 @@
throw AssertionError("Expected color $expectedColor was not found in the bitmap.")
}
- round((histogram[expectedColor]!! * 100f) / (width * height)).let { actualPercent ->
+ ((histogram[expectedColor]!! * 100f) / (width * height)).let { actualPercent ->
if (actualPercent !in range) {
throw AssertionError(
"Expected color $expectedColor found " +
diff --git a/wear/compose/compose-material/src/androidAndroidTest/kotlin/androidx/wear/compose/material/PickerTest.kt b/wear/compose/compose-material/src/androidAndroidTest/kotlin/androidx/wear/compose/material/PickerTest.kt
index 03f61a9..4eefd06 100644
--- a/wear/compose/compose-material/src/androidAndroidTest/kotlin/androidx/wear/compose/material/PickerTest.kt
+++ b/wear/compose/compose-material/src/androidAndroidTest/kotlin/androidx/wear/compose/material/PickerTest.kt
@@ -450,8 +450,39 @@
assertThat(state.selectedOption).isEqualTo(selectedOption)
}
- // Regression test for http://b/230485107
@Test
+ fun can_scroll_picker_up_when_read_only() {
+ val initialOption = 3
+ lateinit var state: PickerState
+
+ rule.setContent {
+ WithTouchSlop(0f) {
+ Picker(
+ state = rememberPickerState(
+ initialNumberOfOptions = 5,
+ initiallySelectedOption = initialOption)
+ .also { state = it },
+ readOnly = true,
+ modifier = Modifier.testTag(TEST_TAG).requiredSize(itemSizeDp * 3),
+ ) {
+ Box(Modifier.requiredSize(itemSizeDp))
+ }
+ }
+ }
+ rule.waitForIdle()
+
+ rule.onNodeWithTag(TEST_TAG).performTouchInput {
+ swipeWithVelocity(
+ start = Offset(centerX, bottom),
+ end = Offset(centerX, bottom - itemSizePx * 16), // 3 loops + 1 element
+ endVelocity = NOT_A_FLING_SPEED
+ )
+ }
+
+ rule.waitForIdle()
+ assertThat(state.selectedOption).isNotEqualTo(initialOption)
+ }
+
fun scrolls_from_non_canonical_option_works() {
lateinit var scope: CoroutineScope
val pickerDriver = PickerDriver(separationSign = 1)
@@ -473,11 +504,13 @@
rule.waitForIdle()
pickerDriver.readOnly.value = true
rule.waitForIdle()
- scope.launch {
- pickerDriver.state.scrollToOption(
- (pickerDriver.state.selectedOption + 1) % pickerDriver.state.numberOfOptions
- )
- pickerDriver.readOnly.value = false
+ rule.runOnUiThread {
+ scope.launch {
+ pickerDriver.state.scrollToOption(
+ (pickerDriver.state.selectedOption + 1) % pickerDriver.state.numberOfOptions
+ )
+ pickerDriver.readOnly.value = false
+ }
}
rule.waitForIdle()
diff --git a/wear/compose/compose-material/src/androidAndroidTest/kotlin/androidx/wear/compose/material/ProgressIndicatorTest.kt b/wear/compose/compose-material/src/androidAndroidTest/kotlin/androidx/wear/compose/material/ProgressIndicatorTest.kt
index 07239e8..a20b5bc 100644
--- a/wear/compose/compose-material/src/androidAndroidTest/kotlin/androidx/wear/compose/material/ProgressIndicatorTest.kt
+++ b/wear/compose/compose-material/src/androidAndroidTest/kotlin/androidx/wear/compose/material/ProgressIndicatorTest.kt
@@ -164,9 +164,9 @@
// Color should take approximately a quarter of what it normally takes
// (a little bit less), eg 25% / 4 ≈ 6%
rule.onNodeWithTag(TEST_TAG).captureToImage()
- .assertColorInPercentageRange(Color.Yellow, 5f..7f)
+ .assertColorInPercentageRange(Color.Yellow, 5f..8f)
rule.onNodeWithTag(TEST_TAG).captureToImage()
- .assertColorInPercentageRange(Color.Red, 5f..7f)
+ .assertColorInPercentageRange(Color.Red, 5f..8f)
}
@Test
diff --git a/wear/compose/compose-material/src/androidAndroidTest/kotlin/androidx/wear/compose/material/SwipeToDismissBoxTest.kt b/wear/compose/compose-material/src/androidAndroidTest/kotlin/androidx/wear/compose/material/SwipeToDismissBoxTest.kt
index 751e48e..9e15bff 100644
--- a/wear/compose/compose-material/src/androidAndroidTest/kotlin/androidx/wear/compose/material/SwipeToDismissBoxTest.kt
+++ b/wear/compose/compose-material/src/androidAndroidTest/kotlin/androidx/wear/compose/material/SwipeToDismissBoxTest.kt
@@ -44,8 +44,10 @@
import androidx.compose.ui.test.onNodeWithText
import androidx.compose.ui.test.performClick
import androidx.compose.ui.test.performTouchInput
+import androidx.compose.ui.test.swipe
import androidx.compose.ui.test.swipeLeft
import androidx.compose.ui.test.swipeRight
+import java.lang.Math.sin
import org.junit.Assert.assertEquals
import org.junit.Rule
import org.junit.Test
@@ -283,10 +285,20 @@
}
@Test
- fun edgeswipe_non_edge_swiped_right_not_dismissed() {
+ fun edgeswipe_non_edge_swiped_right_with_offset_not_dismissed() {
verifyEdgeSwipeWithNestedScroll(
gesture = { swipeRight(200f, 400f) },
- expectedToDismiss = false
+ expectedToDismiss = false,
+ initialScrollState = 200
+ )
+ }
+
+ @Test
+ fun edgeswipe_non_edge_swiped_right_without_offset_not_dismissed() {
+ verifyEdgeSwipeWithNestedScroll(
+ gesture = { swipeRight(200f, 400f) },
+ expectedToDismiss = false,
+ initialScrollState = 0
)
}
@@ -350,6 +362,92 @@
}
}
+ @Test
+ fun edgeswipe_swipe_edge_content_right_then_left_no_scroll() {
+ testBothDirectionScroll(
+ initialTouch = 10,
+ duration = 2000,
+ amplitude = 100,
+ startLeft = false
+ ) { scrollState ->
+ assertEquals(scrollState.value, 200)
+ }
+ }
+
+ @Test
+ fun edgeswipe_fling_edge_content_right_then_left_no_scroll() {
+ testBothDirectionScroll(
+ initialTouch = 10,
+ duration = 100,
+ amplitude = 100,
+ startLeft = false
+ ) { scrollState ->
+ assertEquals(scrollState.value, 200)
+ }
+ }
+
+ @Test
+ fun edgeswipe_swipe_edge_content_left_then_right_with_scroll() {
+ testBothDirectionScroll(
+ initialTouch = 10,
+ duration = 2000,
+ amplitude = 100,
+ startLeft = true
+ ) { scrollState ->
+ // After scrolling to the left, successful scroll to the right
+ // reduced scrollState
+ assert(scrollState.value < 200)
+ }
+ }
+
+ @Test
+ fun edgeswipe_fling_edge_content_left_then_right_with_scroll() {
+ testBothDirectionScroll(
+ initialTouch = 10,
+ duration = 100,
+ amplitude = 100,
+ startLeft = true
+ ) { scrollState ->
+ // Fling right to the start (0)
+ assertEquals(scrollState.value, 0)
+ }
+ }
+
+ private fun testBothDirectionScroll(
+ initialTouch: Long,
+ duration: Long,
+ amplitude: Long,
+ startLeft: Boolean,
+ testScrollState: (ScrollState) -> Unit
+ ) {
+ val initialScrollState = 200
+ lateinit var horizontalScrollState: ScrollState
+ rule.setContentWithTheme {
+ val state = rememberSwipeToDismissBoxState()
+ horizontalScrollState = rememberScrollState(initialScrollState)
+
+ SwipeToDismissBox(
+ state = state,
+ modifier = Modifier.testTag(TEST_TAG),
+ ) {
+ nestedScrollContent(state, horizontalScrollState)
+ }
+ }
+
+ rule.onNodeWithTag(TEST_TAG)
+ .performTouchInput {
+ swipeBothDirections(
+ startLeft = startLeft,
+ startX = initialTouch,
+ amplitude = amplitude,
+ duration = duration
+ )
+ }
+ rule.runOnIdle {
+ testScrollState(horizontalScrollState)
+ }
+ }
+
private fun verifySwipe(gesture: TouchInjectionScope.() -> Unit, expectedToDismiss: Boolean) {
var dismissed = false
rule.setContentWithTheme {
@@ -375,12 +473,13 @@
private fun verifyEdgeSwipeWithNestedScroll(
gesture: TouchInjectionScope.() -> Unit,
- expectedToDismiss: Boolean
+ expectedToDismiss: Boolean,
+ initialScrollState: Int = 200
) {
var dismissed = false
rule.setContentWithTheme {
val state = rememberSwipeToDismissBoxState()
- val horizontalScrollState = rememberScrollState(200)
+ val horizontalScrollState = rememberScrollState(initialScrollState)
LaunchedEffect(state.currentValue) {
dismissed =
@@ -451,6 +550,25 @@
)
}
}
+
+ private fun TouchInjectionScope.swipeBothDirections(
+ startLeft: Boolean,
+ startX: Long,
+ amplitude: Long,
+ duration: Long = 200
+ ) {
+ val sign = if (startLeft) -1 else 1
+ // By using sin function for range 0.. 3pi/2 , we can achieve 0 -> 1 and 1 -> -1 values
+ swipe(curve = { time ->
+ val x =
+ startX + sign * sin(time.toFloat() / duration.toFloat() * 3 * Math.PI / 2)
+ .toFloat() * amplitude
+ Offset(
+ x = x,
+ y = centerY
+ )
+ }, durationMillis = duration)
+ }
}
private const val BACKGROUND_MESSAGE = "The Background"
diff --git a/wear/compose/compose-material/src/androidAndroidTest/kotlin/androidx/wear/compose/material/ToggleChipTest.kt b/wear/compose/compose-material/src/androidAndroidTest/kotlin/androidx/wear/compose/material/ToggleChipTest.kt
index 8b7dbd0..56aaf82 100644
--- a/wear/compose/compose-material/src/androidAndroidTest/kotlin/androidx/wear/compose/material/ToggleChipTest.kt
+++ b/wear/compose/compose-material/src/androidAndroidTest/kotlin/androidx/wear/compose/material/ToggleChipTest.kt
@@ -20,6 +20,7 @@
import androidx.compose.foundation.background
import androidx.compose.foundation.layout.Box
import androidx.compose.foundation.layout.fillMaxSize
+import androidx.compose.foundation.layout.fillMaxWidth
import androidx.compose.runtime.Composable
import androidx.compose.runtime.mutableStateOf
import androidx.compose.runtime.remember
@@ -714,7 +715,7 @@
label = {},
toggleControl = {},
onClick = {},
- modifier = Modifier.testTag(TEST_TAG)
+ modifier = Modifier.testTag(TEST_TAG).fillMaxWidth()
)
}
actualBackgrondColor = MaterialTheme.colors.surface
@@ -740,7 +741,7 @@
label = {},
toggleControl = {},
onClick = {},
- modifier = Modifier.testTag(TEST_TAG)
+ modifier = Modifier.testTag(TEST_TAG).fillMaxWidth()
)
}
}
diff --git a/wear/compose/compose-material/src/commonMain/kotlin/androidx/wear/compose/material/Chip.kt b/wear/compose/compose-material/src/commonMain/kotlin/androidx/wear/compose/material/Chip.kt
index e50c9dc..aa4c8ed 100644
--- a/wear/compose/compose-material/src/commonMain/kotlin/androidx/wear/compose/material/Chip.kt
+++ b/wear/compose/compose-material/src/commonMain/kotlin/androidx/wear/compose/material/Chip.kt
@@ -21,10 +21,12 @@
import androidx.compose.foundation.layout.Box
import androidx.compose.foundation.layout.BoxScope
import androidx.compose.foundation.layout.Column
+import androidx.compose.foundation.layout.IntrinsicSize
import androidx.compose.foundation.layout.PaddingValues
import androidx.compose.foundation.layout.Row
import androidx.compose.foundation.layout.RowScope
import androidx.compose.foundation.layout.Spacer
+import androidx.compose.foundation.layout.fillMaxHeight
import androidx.compose.foundation.layout.fillMaxSize
import androidx.compose.foundation.layout.height
import androidx.compose.foundation.layout.padding
@@ -118,6 +120,7 @@
modifier = modifier
.height(ChipDefaults.Height)
.clip(shape = shape)
+ .width(intrinsicSize = IntrinsicSize.Max)
.paint(
painter = colors.background(enabled = enabled).value,
contentScale = ContentScale.Crop
@@ -129,7 +132,6 @@
indication = rememberRipple(),
interactionSource = interactionSource,
)
- .fillMaxSize()
.padding(contentPadding),
content = content
)
@@ -214,7 +216,9 @@
) {
Row(
verticalAlignment = Alignment.CenterVertically,
- modifier = Modifier.fillMaxSize()
+ // Fill the container height but not its width as chips have fixed size height but we
+ // want them to be able to fit their content
+ modifier = Modifier.fillMaxHeight()
) {
if (icon != null) {
CompositionLocalProvider(
diff --git a/wear/compose/compose-material/src/commonMain/kotlin/androidx/wear/compose/material/HorizontalPageIndicator.kt b/wear/compose/compose-material/src/commonMain/kotlin/androidx/wear/compose/material/HorizontalPageIndicator.kt
index 0dfc658..f73c371 100644
--- a/wear/compose/compose-material/src/commonMain/kotlin/androidx/wear/compose/material/HorizontalPageIndicator.kt
+++ b/wear/compose/compose-material/src/commonMain/kotlin/androidx/wear/compose/material/HorizontalPageIndicator.kt
@@ -20,14 +20,20 @@
import androidx.compose.foundation.layout.Arrangement
import androidx.compose.foundation.layout.Box
import androidx.compose.foundation.layout.Row
+import androidx.compose.foundation.layout.Spacer
import androidx.compose.foundation.layout.fillMaxSize
+import androidx.compose.foundation.layout.height
import androidx.compose.foundation.layout.padding
import androidx.compose.foundation.layout.size
+import androidx.compose.foundation.layout.width
import androidx.compose.foundation.shape.CircleShape
import androidx.compose.runtime.Composable
+import androidx.compose.runtime.remember
import androidx.compose.ui.Alignment
import androidx.compose.ui.Modifier
+import androidx.compose.ui.draw.alpha
import androidx.compose.ui.draw.clip
+import androidx.compose.ui.draw.scale
import androidx.compose.ui.graphics.Color
import androidx.compose.ui.graphics.Shape
import androidx.compose.ui.graphics.lerp
@@ -36,11 +42,24 @@
import androidx.wear.compose.foundation.CurvedDirection
import androidx.wear.compose.foundation.CurvedLayout
import androidx.wear.compose.foundation.curvedComposable
+import androidx.wear.compose.material.PageIndicatorDefaults.MaxNumberOfIndicators
+import java.lang.Integer.min
import kotlin.math.abs
/**
* A horizontal indicator for a Pager, representing
- * the currently active page and total pages drawn using a [Shape].
+ * the currently active page and total pages drawn using a [Shape]. It shows up to 6 pages
+ * on the screen and doesn't represent the exact page index if there are more than 6 pages.
+ * Instead of showing the exact position, [HorizontalPageIndicator] shows a half-size indicator
+ * on the left or on the right if there are more pages.
+ *
+ * Here's how different positions 0..10 might be visually represented:
+ * "X" is selected item, "O" and "o" full and half size items respectively.
+ *
+ * O X O O O o - 2nd position out of 10. There are no more items on the left but more on the right
+ * o O O O X o - might be 6, 7 or 8 out of 10, as there are more possible items
+ * on the left and on the right
+ * o O O O X O - is 9 out of 10, as there're no more items on the right
*
* [HorizontalPageIndicator] may be linear or curved, depending on [indicatorStyle]. By default
* it depends on the screen shape of the device - for circular screens it will be curved,
@@ -75,27 +94,87 @@
spacing: Dp = 4.dp,
indicatorShape: Shape = CircleShape
) {
+ // We want to bring offset to 0..1 range.
+ // However, it can come in any range. It might be for example selectedPage = 1, with offset 2.5
+ // We can't work with these offsets, thus should normalize them so that offset will be
+ // in 0..1 range. For example selectedPage = 3, offset = -1.5 -> could transform it
+ // to selectedPage = 1, offset = 0.5
+ // Other example: selectedPage = 1, offset = 2.5 -> selectedPage = 3, offset = 0.5
+ val normalizedSelectedPage: Int =
+ (pageIndicatorState.selectedPage + pageIndicatorState.pageOffset).toInt()
+ val normalizedOffset =
+ pageIndicatorState.selectedPage + pageIndicatorState.pageOffset - normalizedSelectedPage
+
+ val horizontalPadding = spacing / 2
+ val spacerDefaultSize = (indicatorSize + spacing).value
+
+ val pagesOnScreen = min(MaxNumberOfIndicators, pageIndicatorState.pageCount)
+ val pagesState = remember(pageIndicatorState.pageCount) {
+ PagesState(
+ totalPages = pageIndicatorState.pageCount,
+ pagesOnScreen = pagesOnScreen
+ )
+ }
+ pagesState.recalculateState(normalizedSelectedPage, normalizedOffset)
+
+ val indicatorFactory: @Composable (Int) -> Unit = { page ->
+ // An external box with a fixed indicatorSize - let us remain the same size for
+ // an indicator even if it's shrinked for smooth animations
+ Box(
+ modifier = Modifier
+ .padding(horizontal = horizontalPadding)
+ .size(indicatorSize)
+ ) {
+ Box(
+ modifier = Modifier
+ .fillMaxSize()
+ .align(Alignment.Center)
+ .scale(pagesState.sizeRatio(page))
+ .clip(indicatorShape)
+ .alpha(pagesState.alpha(page))
+ // Interpolation between unselected and selected colors depending
+ // on selectedPageRatio
+ .background(
+ lerp(
+ unselectedColor, selectedColor,
+ pagesState.calculateSelectedRatio(page, normalizedOffset)
+ )
+ )
+ )
+ }
+ }
+
+ val spacerLeft = @Composable {
+ Spacer(
+ Modifier.width((pagesState.leftSpacerSizeRatio * spacerDefaultSize).dp)
+ .height(indicatorSize)
+ )
+ }
+ val spacerRight = @Composable {
+ Spacer(
+ Modifier.width((pagesState.rightSpacerSizeRatio * spacerDefaultSize).dp)
+ .height(indicatorSize)
+
+ )
+ }
+
when (indicatorStyle) {
PageIndicatorStyle.Linear -> {
LinearPageIndicator(
- pageIndicatorState,
- modifier,
- selectedColor,
- unselectedColor,
- indicatorSize,
- spacing,
- indicatorShape
+ modifier = modifier,
+ pagesOnScreen = pagesOnScreen,
+ indicatorFactory = indicatorFactory,
+ spacerLeft = spacerLeft,
+ spacerRight = spacerRight
)
}
PageIndicatorStyle.Curved -> {
CurvedPageIndicator(
- pageIndicatorState,
- modifier,
- selectedColor,
- unselectedColor,
- indicatorSize,
- spacing,
- indicatorShape
+ modifier = modifier,
+ pagesOnScreen = pagesOnScreen,
+ indicatorFactory = indicatorFactory,
+ spacerLeft = spacerLeft,
+ spacerRight = spacerRight
)
}
}
@@ -110,12 +189,12 @@
/**
* Curved style of [HorizontalPageIndicator]
*/
- val Curved = PageIndicatorStyle(0)
+ public val Curved = PageIndicatorStyle(0)
/**
* Linear style of [HorizontalPageIndicator]
*/
- val Linear = PageIndicatorStyle(1)
+ public val Linear = PageIndicatorStyle(1)
}
}
@@ -123,14 +202,17 @@
* Contains the default values used by [HorizontalPageIndicator]
*/
public object PageIndicatorDefaults {
+
/**
* Default style of [HorizontalPageIndicator]. Depending on shape of device, it returns either Curved
* or Linear style.
*/
@Composable
- fun style(): PageIndicatorStyle =
+ public fun style(): PageIndicatorStyle =
if (isRoundDevice()) PageIndicatorStyle.Curved
else PageIndicatorStyle.Linear
+
+ internal val MaxNumberOfIndicators = 6
}
/**
@@ -139,66 +221,53 @@
public interface PageIndicatorState {
/**
* The current offset from the start of [selectedPage], as a ratio of the page width.
- * May be in range -1..1.
*
* Changes when a scroll (drag, swipe or fling) between pages happens in Pager.
*/
- val pageOffset: Float
+ public val pageOffset: Float
/**
* The currently selected page index
*/
- val selectedPage: Int
+ public val selectedPage: Int
/**
* Total number of pages
*/
- val pageCount: Int
+ public val pageCount: Int
}
@Composable
private fun LinearPageIndicator(
- pageIndicatorState: PageIndicatorState,
modifier: Modifier,
- selectedColor: Color,
- unselectedColor: Color,
- indicatorSize: Dp,
- spacing: Dp,
- indicatorShape: Shape
+ pagesOnScreen: Int,
+ indicatorFactory: @Composable (Int) -> Unit,
+ spacerLeft: @Composable () -> Unit,
+ spacerRight: @Composable () -> Unit
+
) {
Row(
modifier = modifier.fillMaxSize(),
horizontalArrangement = Arrangement.Center,
verticalAlignment = Alignment.Bottom
) {
- for (page in 0 until pageIndicatorState.pageCount) {
- Item(
- selectedColor = selectedColor,
- unselectedColor = unselectedColor,
- indicatorSize = indicatorSize,
- horizontalPadding = spacing / 2,
- indicatorShape = indicatorShape,
- selectedPageRatio = calculateSelectedRatio(
- page,
- pageIndicatorState.selectedPage,
- pageIndicatorState.pageOffset
- )
- )
+ // drawing 1 extra spacer for transition
+ spacerLeft()
+ for (page in 0..pagesOnScreen) {
+ indicatorFactory(page)
}
+ spacerRight()
}
}
@Composable
private fun CurvedPageIndicator(
- pageIndicatorState: PageIndicatorState,
modifier: Modifier,
- selectedColor: Color,
- unselectedColor: Color,
- indicatorSize: Dp,
- spacing: Dp,
- indicatorShape: Shape
+ pagesOnScreen: Int,
+ indicatorFactory: @Composable (Int) -> Unit,
+ spacerLeft: @Composable () -> Unit,
+ spacerRight: @Composable () -> Unit
) {
- // TODO: b/218985697 additional flexible layout will be added later to properly show pages > 6
CurvedLayout(
modifier = modifier,
// 90 degrees equals to 6 o'clock position, at the bottom of the screen
@@ -207,47 +276,158 @@
// navigating amongst pages, so the first page is always on the left.
angularDirection = CurvedDirection.Angular.CounterClockwise
) {
- for (page in 0 until pageIndicatorState.pageCount) {
+ // drawing 1 extra spacer for transition
+ curvedComposable {
+ spacerLeft()
+ }
+ for (page in 0..pagesOnScreen) {
curvedComposable {
- Item(
- selectedColor = selectedColor,
- unselectedColor = unselectedColor,
- indicatorSize = indicatorSize,
- horizontalPadding = spacing / 2,
- indicatorShape = indicatorShape,
- selectedPageRatio = calculateSelectedRatio(
- page,
- pageIndicatorState.selectedPage,
- pageIndicatorState.pageOffset
- )
- )
+ indicatorFactory(page)
}
}
+ curvedComposable {
+ spacerRight()
+ }
}
}
/**
- * Returns a value in the range 0..1 where 0 is unselected state, and 1 is selected.
- * Used to show a smooth transition between page indicator items.
+ * Represents an internal state of pageIndicator
*/
-private fun calculateSelectedRatio(targetPage: Int, selectedPage: Int, pageOffset: Float): Float =
- (1 - abs(selectedPage + pageOffset - targetPage)).coerceAtLeast(0f)
-
-@Composable
-private fun Item(
- selectedColor: Color,
- unselectedColor: Color,
- indicatorSize: Dp,
- horizontalPadding: Dp,
- indicatorShape: Shape,
- selectedPageRatio: Float
+internal class PagesState(
+ val totalPages: Int,
+ val pagesOnScreen: Int
) {
- Box(
- modifier = Modifier
- .padding(horizontal = horizontalPadding)
- .clip(indicatorShape)
- // Interpolation between unselected and selected colors depending on selectedPageRatio
- .background(lerp(unselectedColor, selectedColor, selectedPageRatio))
- .size(indicatorSize)
- )
+ // Sizes and alphas of first and last indicators on the screen. Used to show that there're more
+ // pages on the left or on the right, and also for smooth transitions
+ private var firstAlpha = 1f
+ private var lastAlpha = 0f
+ private var firstSize = 1f
+ private var secondSize = 1f
+ private var lastSize = 1f
+ private var lastButOneSize = 1f
+
+ private var smoothProgress = 0f
+
+ // An offset in pages, basically meaning how many pages are hidden to the left.
+ private var hiddenPagesToTheLeft = 0
+
+ // A default size of spacers - invisible items to the left and to the right of
+ // visible indicators, used for smooth transitions
+
+ // Current visible position on the screen.
+ private var visibleDotIndex = 0
+
+ // A size of a left spacer used for smooth transitions
+ val leftSpacerSizeRatio
+ get() = 1 - smoothProgress
+
+ // A size of a right spacer used for smooth transitions
+ val rightSpacerSizeRatio
+ get() = smoothProgress
+
+ /**
+ * Depending on the page index, return an alpha for this indicator
+ *
+ * @param page Page index
+ * @return An alpha of page index- in range 0..1
+ */
+ fun alpha(page: Int): Float =
+ when (page) {
+ 0 -> firstAlpha
+ pagesOnScreen -> lastAlpha
+ else -> 1f
+ }
+
+ /**
+ * Depending on the page index, return a size ratio for this indicator
+ *
+ * @param page Page index
+ * @return An size ratio for page index - in range 0..1
+ */
+ fun sizeRatio(page: Int): Float =
+ when (page) {
+ 0 -> firstSize
+ 1 -> secondSize
+ pagesOnScreen - 1 -> lastButOneSize
+ pagesOnScreen -> lastSize
+ else -> 1f
+ }
+
+ /**
+ * Returns a value in the range 0..1 where 0 is unselected state, and 1 is selected.
+ * Used to show a smooth transition between page indicator items.
+ */
+ fun calculateSelectedRatio(targetPage: Int, offset: Float): Float =
+ (1 - abs(visibleDotIndex + offset - targetPage)).coerceAtLeast(0f)
+
+ // Main function responsible for recalculation of all parameters regarding
+ // to the [selectedPage] and [offset]
+ fun recalculateState(selectedPage: Int, offset: Float) {
+ val pageWithOffset = selectedPage + offset
+
+ // Calculating offsetInPages relating to the [selectedPage].
+
+ // For example, for [selectedPage] = 4 we will see this picture :
+ // O O O O X o. [offsetInPages] will be 0.
+ // But when [selectedPage] will be incremented to 5, it will be seen as
+ // o O O O X o, with [offsetInPages] = 1
+ if (selectedPage > hiddenPagesToTheLeft + pagesOnScreen - 2) {
+ // Set an offset as a difference between current page and pages on the screen,
+ // except if this is not the last page - then offsetInPages is not changed
+ hiddenPagesToTheLeft = (selectedPage - (pagesOnScreen - 2))
+ .coerceAtMost(totalPages - pagesOnScreen)
+ } else if (pageWithOffset <= hiddenPagesToTheLeft) {
+ hiddenPagesToTheLeft = (selectedPage - 1).coerceAtLeast(0)
+ }
+
+ // Condition for scrolling to the right. A smooth scroll to the right is only triggered
+ // when we have more than 2 pages to the right, and currently we're on the right edge.
+ // For example -> o O O O X o -> a small "o" shows that there're more pages to the right
+ val scrolledToTheRight = pageWithOffset > hiddenPagesToTheLeft + pagesOnScreen - 2 &&
+ pageWithOffset < totalPages - 2
+
+ // Condition for scrolling to the left. A smooth scroll to the left is only triggered
+ // when we have more than 2 pages to the left, and currently we're on the left edge.
+ // For example -> o X O O O o -> a small "o" shows that there're more pages to the left
+ val scrolledToTheLeft = pageWithOffset > 1 && pageWithOffset < hiddenPagesToTheLeft + 1
+
+ smoothProgress = if (scrolledToTheLeft || scrolledToTheRight) offset else 0f
+
+ // Calculating exact parameters for border indicators like [firstAlpha], [lastSize], etc.
+ firstAlpha = 1 - smoothProgress
+ lastAlpha = smoothProgress
+ secondSize = 1 - 0.5f * smoothProgress
+
+ // Depending on offsetInPages we'll either show a shrinked first indicator, or full-size
+ firstSize = if (hiddenPagesToTheLeft == 0 ||
+ hiddenPagesToTheLeft == 1 && scrolledToTheLeft
+ ) {
+ 1 - smoothProgress
+ } else {
+ 0.5f * (1 - smoothProgress)
+ }
+
+ // Depending on offsetInPages and other parameters, we'll either show a shrinked
+ // last indicator, or full-size
+ lastSize =
+ if (hiddenPagesToTheLeft == totalPages - pagesOnScreen - 1 && scrolledToTheRight ||
+ hiddenPagesToTheLeft == totalPages - pagesOnScreen && scrolledToTheLeft
+ ) {
+ smoothProgress
+ } else {
+ 0.5f * smoothProgress
+ }
+
+ lastButOneSize = if (scrolledToTheRight || scrolledToTheLeft) {
+ 0.5f * (1 + smoothProgress)
+ } else if (hiddenPagesToTheLeft < totalPages - pagesOnScreen) 0.5f else 1f
+
+ // A visibleDot represents a currently selected page on the screen
+ // As we scroll to the left, we add an invisible indicator to the left, shifting all other
+ // indicators to the right. The shift is only possible when a visibleDot = 1,
+ // thus we have to leave it at 1 as we always add a positive offset
+ visibleDotIndex = if (scrolledToTheLeft) 1
+ else selectedPage - hiddenPagesToTheLeft
+ }
}
\ No newline at end of file
diff --git a/wear/compose/compose-material/src/commonMain/kotlin/androidx/wear/compose/material/Picker.kt b/wear/compose/compose-material/src/commonMain/kotlin/androidx/wear/compose/material/Picker.kt
index ebeee907..ce05fb3 100644
--- a/wear/compose/compose-material/src/commonMain/kotlin/androidx/wear/compose/material/Picker.kt
+++ b/wear/compose/compose-material/src/commonMain/kotlin/androidx/wear/compose/material/Picker.kt
@@ -31,6 +31,7 @@
import androidx.compose.foundation.layout.padding
import androidx.compose.runtime.Composable
import androidx.compose.runtime.LaunchedEffect
+import androidx.compose.runtime.SideEffect
import androidx.compose.runtime.Stable
import androidx.compose.runtime.getValue
import androidx.compose.runtime.mutableStateOf
@@ -43,8 +44,10 @@
import androidx.compose.ui.Modifier
import androidx.compose.ui.draw.drawWithContent
import androidx.compose.ui.geometry.Offset
+import androidx.compose.ui.geometry.Size
import androidx.compose.ui.graphics.Brush
import androidx.compose.ui.graphics.Color
+import androidx.compose.ui.graphics.drawscope.ContentDrawScope
import androidx.compose.ui.unit.Constraints
import androidx.compose.ui.unit.Dp
import androidx.compose.ui.unit.dp
@@ -61,10 +64,10 @@
*
* @param state The state of the component
* @param modifier Modifier to be applied to the Picker
- * @param readOnly Determines whether the Picker should allow the currently selected option
- * to be changed - otherwise, displays the currently selected option (and optionally a label).
- * This is intended to be used for screens that display multiple Pickers, only one of which is
- * editable at a time, the others being shown as read-only.
+ * @param readOnly Determines whether the Picker should display other available options for this
+ * field, inviting the user to scroll to change the value. When readOnly = true,
+ * only displays the currently selected option (and optionally a label). This is intended to be
+ * used for screens that display multiple Pickers, only one of which has the focus at a time.
* @param readOnlyLabel A slot for providing a label, displayed above the selected option
* when the [Picker] is read-only. The label is overlaid with the currently selected
* option within a Box, so it is recommended that the label is given [Alignment.TopCenter].
@@ -100,37 +103,31 @@
require(gradientRatio in 0f..0.5f) { "gradientRatio should be between 0.0 and 0.5" }
val pickerScope = remember(state) { PickerScopeImpl(state) }
var forceScrollWhenReadOnly by remember { mutableStateOf(false) }
- if (readOnly) {
- Box(modifier = modifier) {
- if (readOnlyLabel != null) {
- readOnlyLabel()
- }
- with(pickerScope) {
- option(state.selectedOption)
- }
- }
- } else {
- forceScrollWhenReadOnly = true
+ Box(modifier = modifier) {
ScalingLazyColumn(
- modifier = if (gradientRatio > 0.0f) {
- modifier.drawWithContent {
+ modifier = if (!readOnly && gradientRatio > 0.0f) {
+ Modifier.drawWithContent {
drawContent()
- // Apply a fade-out gradient on the top and bottom.
- drawRect(Brush.linearGradient(
- colors = listOf(gradientColor, Color.Transparent),
- start = Offset(size.width / 2, 0f),
- end = Offset(size.width / 2, size.height * gradientRatio)
- ))
- drawRect(Brush.linearGradient(
- colors = listOf(Color.Transparent, gradientColor),
- start = Offset(size.width / 2, size.height * (1 - gradientRatio)),
- end = Offset(size.width / 2, size.height)
- ))
+ drawGradient(gradientColor, gradientRatio)
}
- // b/223386180 - prevent artefacts left on screen when scaling gradient by padding.
- .padding(vertical = 1.dp)
+ // b/223386180 - add padding when drawing rectangles to prevent jitter on screen.
+ .padding(vertical = 1.dp).align(Alignment.Center)
+ } else if (readOnly) {
+ Modifier.drawWithContent {
+ drawContent()
+ val visibleItems = state.scalingLazyListState.layoutInfo.visibleItemsInfo
+ val centerItem =
+ visibleItems.find {
+ info -> info.index == state.scalingLazyListState.centerItemIndex
+ } ?: visibleItems[visibleItems.size / 2]
+ val shimHeight = (size.height - centerItem.unadjustedSize.toFloat() -
+ separation.toPx()) / 2.0f
+ drawShim(gradientColor, shimHeight)
+ }
+ // b/223386180 - add padding when drawing rectangles to prevent jitter on screen.
+ .padding(vertical = 1.dp).align(Alignment.Center)
} else {
- modifier
+ Modifier
},
state = state.scalingLazyListState,
content = {
@@ -148,8 +145,15 @@
),
flingBehavior = flingBehavior
)
+ if (readOnly && readOnlyLabel != null) {
+ readOnlyLabel()
+ }
}
-
+ SideEffect {
+ if (!readOnly) {
+ forceScrollWhenReadOnly = true
+ }
+ }
// If a Picker switches to read-only during animation, the ScalingLazyColumn can be
// out of position, so we force an instant scroll to the selected option so that it is
// correctly lined up when the Picker is next displayed.
@@ -161,6 +165,43 @@
}
}
+// Apply a shim on the top and bottom of the Picker to hide all but the selected option.
+private fun ContentDrawScope.drawShim(
+ gradientColor: Color,
+ height: Float
+) {
+ drawRect(
+ color = gradientColor,
+ size = Size(size.width, height)
+ )
+ drawRect(
+ color = gradientColor,
+ topLeft = Offset(0f, size.height - height),
+ size = Size(size.width, height)
+ )
+}
+
+// Apply a fade-out gradient on the top and bottom of the Picker.
+private fun ContentDrawScope.drawGradient(
+ gradientColor: Color,
+ gradientRatio: Float
+) {
+ drawRect(
+ Brush.linearGradient(
+ colors = listOf(gradientColor, Color.Transparent),
+ start = Offset(size.width / 2, 0f),
+ end = Offset(size.width / 2, size.height * gradientRatio)
+ )
+ )
+ drawRect(
+ Brush.linearGradient(
+ colors = listOf(Color.Transparent, gradientColor),
+ start = Offset(size.width / 2, size.height * (1 - gradientRatio)),
+ end = Offset(size.width / 2, size.height)
+ )
+ )
+}
+
/**
* Creates a [PickerState] that is remembered across compositions.
*
diff --git a/wear/compose/compose-material/src/commonMain/kotlin/androidx/wear/compose/material/ScalingLazyColumnSnapFlingBehavior.kt b/wear/compose/compose-material/src/commonMain/kotlin/androidx/wear/compose/material/ScalingLazyColumnSnapFlingBehavior.kt
index a2a5af7..1b9b957 100644
--- a/wear/compose/compose-material/src/commonMain/kotlin/androidx/wear/compose/material/ScalingLazyColumnSnapFlingBehavior.kt
+++ b/wear/compose/compose-material/src/commonMain/kotlin/androidx/wear/compose/material/ScalingLazyColumnSnapFlingBehavior.kt
@@ -16,18 +16,20 @@
package androidx.wear.compose.material
-import androidx.compose.animation.core.AnimationScope
import androidx.compose.animation.core.AnimationState
-import androidx.compose.animation.core.AnimationVector
+import androidx.compose.animation.core.CubicBezierEasing
import androidx.compose.animation.core.DecayAnimationSpec
import androidx.compose.animation.core.animateDecay
import androidx.compose.animation.core.animateTo
import androidx.compose.animation.core.calculateTargetValue
import androidx.compose.animation.core.exponentialDecay
+import androidx.compose.animation.core.tween
import androidx.compose.foundation.gestures.FlingBehavior
import androidx.compose.foundation.gestures.ScrollScope
+import androidx.compose.ui.util.lerp
import kotlin.math.abs
import kotlin.math.roundToInt
+import kotlin.math.sqrt
internal class ScalingLazyColumnSnapFlingBehavior(
val state: ScalingLazyListState,
@@ -41,85 +43,91 @@
initialVelocity = initialVelocity,
)
- // Is it actually a fling?
+ var lastValue = 0f
val visibleItemsInfo = state.layoutInfo.visibleItemsInfo
- if (abs(initialVelocity) > 1f && visibleItemsInfo.size > 1) {
+ val isAFling = abs(initialVelocity) > 1f && visibleItemsInfo.size > 1
+ val finalTarget = if (isAFling) {
// Target we will land on given initialVelocity & decay
- val unmodifiedTarget = decay.calculateTargetValue(0f, initialVelocity)
- val viewPortHeight = state.viewportHeightPx.value!!
+ val decayTarget = decay.calculateTargetValue(0f, initialVelocity)
+ var endOfListReached = false
- // Estimate the item closest to the target, and adjust our aim.
- val totalSize = visibleItemsInfo.last().unadjustedOffset -
- visibleItemsInfo.first().unadjustedOffset
- val estimatedItemDistance = totalSize.toFloat() / (visibleItemsInfo.size - 1)
- val centerOffset = state.centerItemScrollOffset
- val itemsToTarget = (unmodifiedTarget + centerOffset) / estimatedItemDistance
-
- val estimatedTarget = itemsToTarget.roundToInt() * estimatedItemDistance -
- centerOffset + snapOffset
-
- animationState.animateDecayTo(estimatedTarget, decay) { delta ->
+ animationState.animateDecay(decay) {
+ val delta = value - lastValue
val consumed = scrollBy(delta)
-
- // Check if the target entered the screen
- if (abs(value - estimatedTarget) < viewPortHeight / 2) {
- this.cancelAnimation()
- }
- consumed
- }
-
- // Now that the target position is visible, adjust the animation to land on the
- // closest item.
- val finalTarget = (state.layoutInfo.visibleItemsInfo
- .map { animationState.value + it.unadjustedOffset + snapOffset }
- .minByOrNull { abs(it - estimatedTarget) } ?: estimatedTarget)
-
- animationState.animateDecayTo(
- finalTarget,
- decay,
- sequentialAnimation = true
- ) { delta -> scrollBy(delta) }
-
- // Since the previous animation can finish a bit early, do a final scroll to ensure we
- // have an item properly positioned.
- scrollBy((snapOffset - state.centerItemScrollOffset).toFloat())
- } else {
- // The fling was too slow (or not even a fling), just animate a snap to the item
- // already in the center.
- var lastValue = 0f
- animationState.animateTo(
- targetValue = (snapOffset - state.centerItemScrollOffset).toFloat(),
- sequentialAnimation = true
- ) {
- scrollBy(value - lastValue)
lastValue = value
+
+ // When we are "slow" enough, switch from decay to the final snap.
+ if (abs(velocity) < SNAP_SPEED_THRESHOLD) cancelAnimation()
+
+ // If we can't consume the scroll, also stop.
+ if (abs(delta - consumed) > 0.1f) {
+ endOfListReached = true
+ cancelAnimation()
+ }
}
+
+ if (endOfListReached) {
+ // We couldn't scroll as much as we wanted, likely we reached the end of the list,
+ // Snap to the current item and finish.
+ scrollBy((snapOffset - state.centerItemScrollOffset).toFloat())
+ return animationState.velocity
+ } else {
+ // Now that scrolling slowed down, adjust the animation to land in the item closest
+ // to the original target. Note that the target may be off-screen, in that case we
+ // will land on the last visible item in that direction.
+ (state.layoutInfo.visibleItemsInfo
+ .map { animationState.value + it.unadjustedOffset + snapOffset }
+ .minByOrNull { abs(it - decayTarget) } ?: decayTarget)
+ }
+ } else {
+ // Not a fling, just snap to the current item.
+ (snapOffset - state.centerItemScrollOffset).toFloat()
}
+
+ // We have a velocity (animationState.velocity), and a target (finalTarget),
+ // Construct a cubic bezier with the given initial velocity, and ending at 0 speed,
+ // unless that will mean that we need to accelerate and decelerate.
+ // We can also control the inertia of these speeds, i.e. how much it will accelerate/
+ // decelerate at the beginning and end.
+ val distance = finalTarget - animationState.value
+ val initialSpeed = animationState.velocity
+
+ // Inertia of the initial speed.
+ val initialInertia = 0.5f
+
+ // Compute how much time we want to spend on the final snap, depending on the speed
+ val finalSnapDuration = lerp(FINAL_SNAP_DURATION_MIN, FINAL_SNAP_DURATION_MAX,
+ abs(initialSpeed) / SNAP_SPEED_THRESHOLD)
+
+ // Initial control point. Has slope (velocity) adjustedSpeed and magnitude (inertia)
+ // initialInertia
+ val adjustedSpeed = initialSpeed * finalSnapDuration / distance
+ val easingX0 = initialInertia / sqrt(1f + adjustedSpeed * adjustedSpeed)
+ val easingY0 = easingX0 * adjustedSpeed
+
+ // Final control point. Has slope 0, unless that will make us accelerate then decelerate,
+ // in that case we set the slope to 1.
+ val easingX1 = 0.8f
+ val easingY1 = if (easingX0 > easingY0) 0.8f else 1f
+
+ animationState.animateTo(finalTarget, tween((finalSnapDuration * 1000).roundToInt(),
+ easing = CubicBezierEasing(easingX0, easingY0, easingX1, easingY1)
+ )) {
+ scrollBy(value - lastValue)
+ lastValue = value
+ }
+
return animationState.velocity
}
- private suspend fun <V : AnimationVector> AnimationState<Float, V>.animateDecayTo(
- targetValue: Float,
- decay: DecayAnimationSpec<Float>,
- // Indicates whether the animation should start from last frame
- sequentialAnimation: Boolean = false,
- block: AnimationScope<Float, V>.(delta: Float) -> Float
- ) {
- var lastValue = value
- val initialValue = value
- val target = decay.calculateTargetValue(initialValue = value, initialVelocity = velocity)
- val velocityAdjustment = (targetValue - value) / (target - value)
- animateDecay(decay, sequentialAnimation = sequentialAnimation) {
- val delta = (value - lastValue) * velocityAdjustment
- val consumed = block(delta)
- lastValue = value
+ // Speed, in pixels per second, to switch between decay and final snap.
+ private val SNAP_SPEED_THRESHOLD = 1200
- // avoid rounding errors and stop if anything is unconsumed
- if (abs(delta - consumed) > 0.5f) this.cancelAnimation()
+ // Minimum duration for the final snap after the fling, in seconds, used when the initial speed
+ // is 0
+ private val FINAL_SNAP_DURATION_MIN = .1f
- // Stop when we are there.
- val projectedTarget = initialValue + (lastValue - initialValue) * velocityAdjustment
- if (abs(projectedTarget - targetValue) < 1f) this.cancelAnimation()
- }
- }
+ // Maximum duration for the final snap after the fling, in seconds, used when the speed is
+ // SNAP_SPEED_THRESHOLD
+ private val FINAL_SNAP_DURATION_MAX = .35f
}
\ No newline at end of file
diff --git a/wear/compose/compose-material/src/commonMain/kotlin/androidx/wear/compose/material/SwipeToDismissBox.kt b/wear/compose/compose-material/src/commonMain/kotlin/androidx/wear/compose/material/SwipeToDismissBox.kt
index 824eee3..05ff127 100644
--- a/wear/compose/compose-material/src/commonMain/kotlin/androidx/wear/compose/material/SwipeToDismissBox.kt
+++ b/wear/compose/compose-material/src/commonMain/kotlin/androidx/wear/compose/material/SwipeToDismissBox.kt
@@ -313,9 +313,9 @@
get() = swipeableState.isAnimationRunning
internal fun edgeNestedScrollConnection(
- edgeTouched: State<Boolean>
+ swipeState: State<SwipeState>
): NestedScrollConnection =
- swipeableState.edgeNestedScrollConnection(edgeTouched)
+ swipeableState.edgeNestedScrollConnection(swipeState)
/**
* Set the state without any animation and suspend until it's set
@@ -326,22 +326,20 @@
private companion object {
private fun <T> SwipeableState<T>.edgeNestedScrollConnection(
- edgeTouched: State<Boolean>
+ swipeState: State<SwipeState>
): NestedScrollConnection =
object : NestedScrollConnection {
override fun onPreScroll(available: Offset, source: NestedScrollSource): Offset {
val delta = available.x
- // If edge was clicked - perform swipe drag and consume everything
- if (edgeTouched.value && delta > 0) {
+ // If swipeState = SwipeState.SWIPING_TO_DISMISS - perform swipeToDismiss
+ // drag and consume everything
+ return if (swipeState.value == SwipeState.SwipingToDismiss &&
+ source == NestedScrollSource.Drag
+ ) {
performDrag(delta)
- return available
+ available
} else {
- // Swipe back if drag has started but swiped in a different direction
- return if (delta < 0 && source == NestedScrollSource.Drag) {
- performDrag(delta).toOffsetX()
- } else {
- Offset.Zero
- }
+ Offset.Zero
}
}
@@ -349,26 +347,13 @@
consumed: Offset,
available: Offset,
source: NestedScrollSource
- ): Offset {
- // If edge was touched and not all scroll was consumed, assume it was
- // consumed by the parent
- if (edgeTouched.value && available.x > 0) {
- return available
- } else {
- // Finish scroll if it wasn't an edge touch
- return if (source == NestedScrollSource.Drag) {
- performDrag(available.x).toOffsetX()
- } else {
- Offset.Zero
- }
- }
- }
+ ): Offset = Offset.Zero
override suspend fun onPreFling(available: Velocity): Velocity {
val toFling = available.x
// Consumes fling by SwipeToDismiss
- return if (edgeTouched.value && toFling > 0 ||
- toFling < 0 && offset.value > minBound
+ return if (swipeState.value == SwipeState.SwipingToDismiss ||
+ swipeState.value == SwipeState.SwipeToDismissInProgress
) {
performFling(velocity = toFling)
available
@@ -383,8 +368,6 @@
performFling(velocity = available.x)
return available
}
-
- private fun Float.toOffsetX(): Offset = Offset(this, 0f)
}
}
@@ -490,43 +473,84 @@
properties["edgeWidth"] = edgeWidth
}
) {
- // Tracks whether a touch has landed on the edge area. Becomes false after finger
- // touches a non-edge area after it was raised
- val edgeTouched = remember { mutableStateOf(false) }
+ // Tracks the current swipe status
+ val swipeState = remember { mutableStateOf(SwipeState.WaitingForTouch) }
val nestedScrollConnection =
remember(swipeToDismissBoxState) {
- swipeToDismissBoxState.edgeNestedScrollConnection(edgeTouched)
+ swipeToDismissBoxState.edgeNestedScrollConnection(swipeState)
}
val nestedPointerInput: suspend PointerInputScope.() -> Unit = {
coroutineScope {
awaitPointerEventScope {
- var trackFirstTouch = true
while (isActive) {
awaitPointerEvent(PointerEventPass.Initial).changes.forEach { change ->
- // If it was a first touch and it hit an edge area, we
- // set edgeTouched to true.
- // trackFirstTouch is set to false as we don't handle
- // any other touches before the finger is lifted up
- if (trackFirstTouch) {
- edgeTouched.value = change.position.x < edgeWidth.toPx()
- trackFirstTouch = false
+ // By default swipeState is WaitingForTouch.
+ // If it is in this state and a first touch hit an edge area, we
+ // set swipeState to EdgeClickedWaitingForDirection.
+ // After that to track which direction the swipe will go, we check
+ // the next touch. If it lands to the left of the first, we consider
+ // it as a swipe left and set the state to SwipingToPage. Otherwise,
+ // set the state to SwipingToDismiss
+ when (swipeState.value) {
+ SwipeState.SwipeToDismissInProgress,
+ SwipeState.WaitingForTouch -> {
+ swipeState.value =
+ if (change.position.x < edgeWidth.toPx())
+ SwipeState.EdgeClickedWaitingForDirection
+ else
+ SwipeState.SwipingToPage
+ }
+ SwipeState.EdgeClickedWaitingForDirection -> {
+ swipeState.value =
+ if (change.position.x < change.previousPosition.x)
+ SwipeState.SwipingToPage
+ else
+ SwipeState.SwipingToDismiss
+ }
+ else -> {} // Do nothing
}
- // When finger is up - reset trackFirstTouch to true
+ // When finger is up - reset swipeState to WaitingForTouch
+ // or to SwipeToDismissInProgress if current
+ // state is SwipingToDismiss
if (change.changedToUp()) {
- trackFirstTouch = true
+ swipeState.value =
+ if (swipeState.value == SwipeState.SwipingToDismiss)
+ SwipeState.SwipeToDismissInProgress
+ else
+ SwipeState.WaitingForTouch
}
}
}
}
}
}
-
pointerInput(edgeWidth, nestedPointerInput)
.nestedScroll(nestedScrollConnection)
}
/**
+ * An enum which represents a current state of swipe action.
+ */
+internal enum class SwipeState {
+ // Waiting for touch, edge was not touched before.
+ WaitingForTouch,
+
+ // Edge was touched, now waiting for the second touch
+ // to determine whether we swipe left or right.
+ EdgeClickedWaitingForDirection,
+
+ // Direction was determined, swiping to dismiss.
+ SwipingToDismiss,
+
+ // Direction was determined, all gestures are handled by the page itself.
+ SwipingToPage,
+
+ // Swipe was finished, used to handle fling.
+ SwipeToDismissInProgress
+}
+
+/**
* A class which is responsible for squeezing animation and all computations related to it
*/
private class SqueezeMotion(
diff --git a/wear/compose/compose-material/src/commonMain/kotlin/androidx/wear/compose/material/ToggleChip.kt b/wear/compose/compose-material/src/commonMain/kotlin/androidx/wear/compose/material/ToggleChip.kt
index 82220ca..4afdc02 100644
--- a/wear/compose/compose-material/src/commonMain/kotlin/androidx/wear/compose/material/ToggleChip.kt
+++ b/wear/compose/compose-material/src/commonMain/kotlin/androidx/wear/compose/material/ToggleChip.kt
@@ -22,6 +22,7 @@
import androidx.compose.foundation.layout.Box
import androidx.compose.foundation.layout.BoxScope
import androidx.compose.foundation.layout.Column
+import androidx.compose.foundation.layout.IntrinsicSize
import androidx.compose.foundation.layout.PaddingValues
import androidx.compose.foundation.layout.Row
import androidx.compose.foundation.layout.RowScope
@@ -29,7 +30,6 @@
import androidx.compose.foundation.layout.calculateEndPadding
import androidx.compose.foundation.layout.calculateStartPadding
import androidx.compose.foundation.layout.fillMaxHeight
-import androidx.compose.foundation.layout.fillMaxSize
import androidx.compose.foundation.layout.height
import androidx.compose.foundation.layout.padding
import androidx.compose.foundation.layout.size
@@ -59,6 +59,7 @@
import androidx.compose.ui.graphics.Shape
import androidx.compose.ui.graphics.painter.Painter
import androidx.compose.ui.graphics.vector.ImageVector
+import androidx.compose.ui.layout.ContentScale
import androidx.compose.ui.platform.LocalLayoutDirection
import androidx.compose.ui.semantics.Role
import androidx.compose.ui.unit.Dp
@@ -140,7 +141,11 @@
modifier = modifier
.height(ToggleChipDefaults.Height)
.clip(shape = shape)
- .paint(painter = colors.background(enabled = enabled, checked = checked).value)
+ .width(IntrinsicSize.Max)
+ .paint(
+ painter = colors.background(enabled = enabled, checked = checked).value,
+ contentScale = ContentScale.Crop
+ )
.toggleable(
enabled = enabled,
value = checked,
@@ -149,11 +154,10 @@
indication = rememberRipple(),
interactionSource = interactionSource
)
- .fillMaxSize()
) {
Row(
modifier = Modifier
- .fillMaxSize()
+ .fillMaxHeight()
.padding(contentPadding),
verticalAlignment = Alignment.CenterVertically
) {
@@ -301,12 +305,13 @@
Box(
modifier = modifier
.height(ToggleChipDefaults.Height)
+ .width(IntrinsicSize.Max)
.clip(shape = shape)
.background(colors.backgroundColor(enabled = enabled).value)
) {
Row(
verticalAlignment = Alignment.CenterVertically,
- modifier = Modifier.fillMaxSize()
+ modifier = Modifier.fillMaxHeight()
) {
Row(
modifier = Modifier
@@ -317,7 +322,7 @@
indication = rememberRipple(),
interactionSource = clickInteractionSource,
)
- .fillMaxSize()
+ .fillMaxHeight()
.padding(
start = contentPadding
.calculateStartPadding(LocalLayoutDirection.current),
diff --git a/wear/compose/compose-navigation/api/1.0.0-beta02.txt b/wear/compose/compose-navigation/api/1.0.0-beta02.txt
new file mode 100644
index 0000000..49ccd87d
--- /dev/null
+++ b/wear/compose/compose-navigation/api/1.0.0-beta02.txt
@@ -0,0 +1,33 @@
+// Signature format: 4.0
+package androidx.wear.compose.navigation {
+
+ public final class NavGraphBuilderKt {
+ method public static void composable(androidx.navigation.NavGraphBuilder, String route, optional java.util.List<androidx.navigation.NamedNavArgument> arguments, optional java.util.List<androidx.navigation.NavDeepLink> deepLinks, kotlin.jvm.functions.Function1<? super androidx.navigation.NavBackStackEntry,kotlin.Unit> content);
+ }
+
+ public final class SwipeDismissableNavHostControllerKt {
+ method @androidx.compose.runtime.Composable public static androidx.compose.runtime.State<androidx.navigation.NavBackStackEntry> currentBackStackEntryAsState(androidx.navigation.NavController);
+ method @androidx.compose.runtime.Composable public static androidx.navigation.NavHostController rememberSwipeDismissableNavController();
+ }
+
+ public final class SwipeDismissableNavHostKt {
+ method @androidx.compose.runtime.Composable public static void SwipeDismissableNavHost(androidx.navigation.NavHostController navController, String startDestination, optional androidx.compose.ui.Modifier modifier, optional androidx.wear.compose.navigation.SwipeDismissableNavHostState state, optional String? route, kotlin.jvm.functions.Function1<? super androidx.navigation.NavGraphBuilder,kotlin.Unit> builder);
+ method @androidx.compose.runtime.Composable public static void SwipeDismissableNavHost(androidx.navigation.NavHostController navController, androidx.navigation.NavGraph graph, optional androidx.compose.ui.Modifier modifier, optional androidx.wear.compose.navigation.SwipeDismissableNavHostState state);
+ method @androidx.compose.runtime.Composable public static androidx.wear.compose.navigation.SwipeDismissableNavHostState rememberSwipeDismissableNavHostState(optional androidx.wear.compose.material.SwipeToDismissBoxState swipeToDismissBoxState);
+ }
+
+ public final class SwipeDismissableNavHostState {
+ ctor public SwipeDismissableNavHostState(androidx.wear.compose.material.SwipeToDismissBoxState swipeToDismissBoxState);
+ }
+
+ @androidx.navigation.Navigator.Name("wear-navigator") public final class WearNavigator extends androidx.navigation.Navigator<androidx.wear.compose.navigation.WearNavigator.Destination> {
+ ctor public WearNavigator();
+ method public androidx.wear.compose.navigation.WearNavigator.Destination createDestination();
+ }
+
+ @androidx.navigation.NavDestination.ClassType(Composable::class) public static final class WearNavigator.Destination extends androidx.navigation.NavDestination {
+ ctor public WearNavigator.Destination(androidx.wear.compose.navigation.WearNavigator navigator, kotlin.jvm.functions.Function1<? super androidx.navigation.NavBackStackEntry,kotlin.Unit> content);
+ }
+
+}
+
diff --git a/wear/compose/compose-navigation/api/public_plus_experimental_1.0.0-beta02.txt b/wear/compose/compose-navigation/api/public_plus_experimental_1.0.0-beta02.txt
new file mode 100644
index 0000000..49ccd87d
--- /dev/null
+++ b/wear/compose/compose-navigation/api/public_plus_experimental_1.0.0-beta02.txt
@@ -0,0 +1,33 @@
+// Signature format: 4.0
+package androidx.wear.compose.navigation {
+
+ public final class NavGraphBuilderKt {
+ method public static void composable(androidx.navigation.NavGraphBuilder, String route, optional java.util.List<androidx.navigation.NamedNavArgument> arguments, optional java.util.List<androidx.navigation.NavDeepLink> deepLinks, kotlin.jvm.functions.Function1<? super androidx.navigation.NavBackStackEntry,kotlin.Unit> content);
+ }
+
+ public final class SwipeDismissableNavHostControllerKt {
+ method @androidx.compose.runtime.Composable public static androidx.compose.runtime.State<androidx.navigation.NavBackStackEntry> currentBackStackEntryAsState(androidx.navigation.NavController);
+ method @androidx.compose.runtime.Composable public static androidx.navigation.NavHostController rememberSwipeDismissableNavController();
+ }
+
+ public final class SwipeDismissableNavHostKt {
+ method @androidx.compose.runtime.Composable public static void SwipeDismissableNavHost(androidx.navigation.NavHostController navController, String startDestination, optional androidx.compose.ui.Modifier modifier, optional androidx.wear.compose.navigation.SwipeDismissableNavHostState state, optional String? route, kotlin.jvm.functions.Function1<? super androidx.navigation.NavGraphBuilder,kotlin.Unit> builder);
+ method @androidx.compose.runtime.Composable public static void SwipeDismissableNavHost(androidx.navigation.NavHostController navController, androidx.navigation.NavGraph graph, optional androidx.compose.ui.Modifier modifier, optional androidx.wear.compose.navigation.SwipeDismissableNavHostState state);
+ method @androidx.compose.runtime.Composable public static androidx.wear.compose.navigation.SwipeDismissableNavHostState rememberSwipeDismissableNavHostState(optional androidx.wear.compose.material.SwipeToDismissBoxState swipeToDismissBoxState);
+ }
+
+ public final class SwipeDismissableNavHostState {
+ ctor public SwipeDismissableNavHostState(androidx.wear.compose.material.SwipeToDismissBoxState swipeToDismissBoxState);
+ }
+
+ @androidx.navigation.Navigator.Name("wear-navigator") public final class WearNavigator extends androidx.navigation.Navigator<androidx.wear.compose.navigation.WearNavigator.Destination> {
+ ctor public WearNavigator();
+ method public androidx.wear.compose.navigation.WearNavigator.Destination createDestination();
+ }
+
+ @androidx.navigation.NavDestination.ClassType(Composable::class) public static final class WearNavigator.Destination extends androidx.navigation.NavDestination {
+ ctor public WearNavigator.Destination(androidx.wear.compose.navigation.WearNavigator navigator, kotlin.jvm.functions.Function1<? super androidx.navigation.NavBackStackEntry,kotlin.Unit> content);
+ }
+
+}
+
diff --git a/wear/compose/compose-navigation/api/res-1.0.0-beta02.txt b/wear/compose/compose-navigation/api/res-1.0.0-beta02.txt
new file mode 100644
index 0000000..e69de29
--- /dev/null
+++ b/wear/compose/compose-navigation/api/res-1.0.0-beta02.txt
diff --git a/wear/compose/compose-navigation/api/restricted_1.0.0-beta02.txt b/wear/compose/compose-navigation/api/restricted_1.0.0-beta02.txt
new file mode 100644
index 0000000..49ccd87d
--- /dev/null
+++ b/wear/compose/compose-navigation/api/restricted_1.0.0-beta02.txt
@@ -0,0 +1,33 @@
+// Signature format: 4.0
+package androidx.wear.compose.navigation {
+
+ public final class NavGraphBuilderKt {
+ method public static void composable(androidx.navigation.NavGraphBuilder, String route, optional java.util.List<androidx.navigation.NamedNavArgument> arguments, optional java.util.List<androidx.navigation.NavDeepLink> deepLinks, kotlin.jvm.functions.Function1<? super androidx.navigation.NavBackStackEntry,kotlin.Unit> content);
+ }
+
+ public final class SwipeDismissableNavHostControllerKt {
+ method @androidx.compose.runtime.Composable public static androidx.compose.runtime.State<androidx.navigation.NavBackStackEntry> currentBackStackEntryAsState(androidx.navigation.NavController);
+ method @androidx.compose.runtime.Composable public static androidx.navigation.NavHostController rememberSwipeDismissableNavController();
+ }
+
+ public final class SwipeDismissableNavHostKt {
+ method @androidx.compose.runtime.Composable public static void SwipeDismissableNavHost(androidx.navigation.NavHostController navController, String startDestination, optional androidx.compose.ui.Modifier modifier, optional androidx.wear.compose.navigation.SwipeDismissableNavHostState state, optional String? route, kotlin.jvm.functions.Function1<? super androidx.navigation.NavGraphBuilder,kotlin.Unit> builder);
+ method @androidx.compose.runtime.Composable public static void SwipeDismissableNavHost(androidx.navigation.NavHostController navController, androidx.navigation.NavGraph graph, optional androidx.compose.ui.Modifier modifier, optional androidx.wear.compose.navigation.SwipeDismissableNavHostState state);
+ method @androidx.compose.runtime.Composable public static androidx.wear.compose.navigation.SwipeDismissableNavHostState rememberSwipeDismissableNavHostState(optional androidx.wear.compose.material.SwipeToDismissBoxState swipeToDismissBoxState);
+ }
+
+ public final class SwipeDismissableNavHostState {
+ ctor public SwipeDismissableNavHostState(androidx.wear.compose.material.SwipeToDismissBoxState swipeToDismissBoxState);
+ }
+
+ @androidx.navigation.Navigator.Name("wear-navigator") public final class WearNavigator extends androidx.navigation.Navigator<androidx.wear.compose.navigation.WearNavigator.Destination> {
+ ctor public WearNavigator();
+ method public androidx.wear.compose.navigation.WearNavigator.Destination createDestination();
+ }
+
+ @androidx.navigation.NavDestination.ClassType(Composable::class) public static final class WearNavigator.Destination extends androidx.navigation.NavDestination {
+ ctor public WearNavigator.Destination(androidx.wear.compose.navigation.WearNavigator navigator, kotlin.jvm.functions.Function1<? super androidx.navigation.NavBackStackEntry,kotlin.Unit> content);
+ }
+
+}
+
diff --git a/wear/tiles/tiles-material/api/current.txt b/wear/tiles/tiles-material/api/current.txt
index c9eafb2..28f59be 100644
--- a/wear/tiles/tiles-material/api/current.txt
+++ b/wear/tiles/tiles-material/api/current.txt
@@ -5,7 +5,7 @@
method public androidx.wear.tiles.material.ButtonColors getButtonColors();
method public androidx.wear.tiles.ModifiersBuilders.Clickable getClickable();
method public androidx.wear.tiles.LayoutElementBuilders.LayoutElement getContent();
- method public CharSequence getContentDescription();
+ method public CharSequence? getContentDescription();
method public androidx.wear.tiles.DimensionBuilders.ContainerDimension getSize();
}
@@ -47,7 +47,7 @@
method public androidx.wear.tiles.material.ChipColors getChipColors();
method public androidx.wear.tiles.ModifiersBuilders.Clickable getClickable();
method public androidx.wear.tiles.LayoutElementBuilders.LayoutElement getContent();
- method public CharSequence getContentDescription();
+ method public CharSequence? getContentDescription();
method public androidx.wear.tiles.DimensionBuilders.ContainerDimension getHeight();
method public int getHorizontalAlignment();
method public androidx.wear.tiles.DimensionBuilders.ContainerDimension getWidth();
@@ -75,7 +75,7 @@
ctor public ChipColors(androidx.wear.tiles.ColorBuilders.ColorProp, androidx.wear.tiles.ColorBuilders.ColorProp);
method public androidx.wear.tiles.ColorBuilders.ColorProp getBackgroundColor();
method public androidx.wear.tiles.ColorBuilders.ColorProp getContentColor();
- method public androidx.wear.tiles.ColorBuilders.ColorProp getIconTintColor();
+ method public androidx.wear.tiles.ColorBuilders.ColorProp getIconColor();
method public androidx.wear.tiles.ColorBuilders.ColorProp getSecondaryContentColor();
method public static androidx.wear.tiles.material.ChipColors primaryChipColors(androidx.wear.tiles.material.Colors);
method public static androidx.wear.tiles.material.ChipColors secondaryChipColors(androidx.wear.tiles.material.Colors);
@@ -92,7 +92,7 @@
public class CircularProgressIndicator implements androidx.wear.tiles.LayoutElementBuilders.LayoutElement {
method public androidx.wear.tiles.material.ProgressIndicatorColors getCircularProgressIndicatorColors();
- method public String getContentDescription();
+ method public CharSequence? getContentDescription();
method public androidx.wear.tiles.DimensionBuilders.DegreesProp getEndAngle();
method public androidx.wear.tiles.DimensionBuilders.DegreesProp getProgress();
method public androidx.wear.tiles.DimensionBuilders.DegreesProp getStartAngle();
@@ -246,6 +246,11 @@
}
public class PrimaryLayout implements androidx.wear.tiles.LayoutElementBuilders.LayoutElement {
+ method public androidx.wear.tiles.LayoutElementBuilders.LayoutElement? getContent();
+ method public androidx.wear.tiles.LayoutElementBuilders.LayoutElement? getPrimaryChipContent();
+ method public androidx.wear.tiles.LayoutElementBuilders.LayoutElement? getPrimaryLabelTextContent();
+ method public androidx.wear.tiles.LayoutElementBuilders.LayoutElement? getSecondaryLabelTextContent();
+ method @Dimension(unit=androidx.annotation.Dimension.DP) public float getVerticalSpacerHeight();
}
public static final class PrimaryLayout.Builder implements androidx.wear.tiles.LayoutElementBuilders.LayoutElement.Builder {
@@ -259,7 +264,8 @@
}
public class ProgressIndicatorLayout implements androidx.wear.tiles.LayoutElementBuilders.LayoutElement {
- method public androidx.wear.tiles.LayoutElementBuilders.LayoutElement getContent();
+ method public androidx.wear.tiles.LayoutElementBuilders.LayoutElement? getContent();
+ method public androidx.wear.tiles.LayoutElementBuilders.LayoutElement? getProgressIndicatorContent();
}
public static final class ProgressIndicatorLayout.Builder implements androidx.wear.tiles.LayoutElementBuilders.LayoutElement.Builder {
diff --git a/wear/tiles/tiles-material/api/public_plus_experimental_current.txt b/wear/tiles/tiles-material/api/public_plus_experimental_current.txt
index c9eafb2..28f59be 100644
--- a/wear/tiles/tiles-material/api/public_plus_experimental_current.txt
+++ b/wear/tiles/tiles-material/api/public_plus_experimental_current.txt
@@ -5,7 +5,7 @@
method public androidx.wear.tiles.material.ButtonColors getButtonColors();
method public androidx.wear.tiles.ModifiersBuilders.Clickable getClickable();
method public androidx.wear.tiles.LayoutElementBuilders.LayoutElement getContent();
- method public CharSequence getContentDescription();
+ method public CharSequence? getContentDescription();
method public androidx.wear.tiles.DimensionBuilders.ContainerDimension getSize();
}
@@ -47,7 +47,7 @@
method public androidx.wear.tiles.material.ChipColors getChipColors();
method public androidx.wear.tiles.ModifiersBuilders.Clickable getClickable();
method public androidx.wear.tiles.LayoutElementBuilders.LayoutElement getContent();
- method public CharSequence getContentDescription();
+ method public CharSequence? getContentDescription();
method public androidx.wear.tiles.DimensionBuilders.ContainerDimension getHeight();
method public int getHorizontalAlignment();
method public androidx.wear.tiles.DimensionBuilders.ContainerDimension getWidth();
@@ -75,7 +75,7 @@
ctor public ChipColors(androidx.wear.tiles.ColorBuilders.ColorProp, androidx.wear.tiles.ColorBuilders.ColorProp);
method public androidx.wear.tiles.ColorBuilders.ColorProp getBackgroundColor();
method public androidx.wear.tiles.ColorBuilders.ColorProp getContentColor();
- method public androidx.wear.tiles.ColorBuilders.ColorProp getIconTintColor();
+ method public androidx.wear.tiles.ColorBuilders.ColorProp getIconColor();
method public androidx.wear.tiles.ColorBuilders.ColorProp getSecondaryContentColor();
method public static androidx.wear.tiles.material.ChipColors primaryChipColors(androidx.wear.tiles.material.Colors);
method public static androidx.wear.tiles.material.ChipColors secondaryChipColors(androidx.wear.tiles.material.Colors);
@@ -92,7 +92,7 @@
public class CircularProgressIndicator implements androidx.wear.tiles.LayoutElementBuilders.LayoutElement {
method public androidx.wear.tiles.material.ProgressIndicatorColors getCircularProgressIndicatorColors();
- method public String getContentDescription();
+ method public CharSequence? getContentDescription();
method public androidx.wear.tiles.DimensionBuilders.DegreesProp getEndAngle();
method public androidx.wear.tiles.DimensionBuilders.DegreesProp getProgress();
method public androidx.wear.tiles.DimensionBuilders.DegreesProp getStartAngle();
@@ -246,6 +246,11 @@
}
public class PrimaryLayout implements androidx.wear.tiles.LayoutElementBuilders.LayoutElement {
+ method public androidx.wear.tiles.LayoutElementBuilders.LayoutElement? getContent();
+ method public androidx.wear.tiles.LayoutElementBuilders.LayoutElement? getPrimaryChipContent();
+ method public androidx.wear.tiles.LayoutElementBuilders.LayoutElement? getPrimaryLabelTextContent();
+ method public androidx.wear.tiles.LayoutElementBuilders.LayoutElement? getSecondaryLabelTextContent();
+ method @Dimension(unit=androidx.annotation.Dimension.DP) public float getVerticalSpacerHeight();
}
public static final class PrimaryLayout.Builder implements androidx.wear.tiles.LayoutElementBuilders.LayoutElement.Builder {
@@ -259,7 +264,8 @@
}
public class ProgressIndicatorLayout implements androidx.wear.tiles.LayoutElementBuilders.LayoutElement {
- method public androidx.wear.tiles.LayoutElementBuilders.LayoutElement getContent();
+ method public androidx.wear.tiles.LayoutElementBuilders.LayoutElement? getContent();
+ method public androidx.wear.tiles.LayoutElementBuilders.LayoutElement? getProgressIndicatorContent();
}
public static final class ProgressIndicatorLayout.Builder implements androidx.wear.tiles.LayoutElementBuilders.LayoutElement.Builder {
diff --git a/wear/tiles/tiles-material/api/restricted_current.txt b/wear/tiles/tiles-material/api/restricted_current.txt
index c9eafb2..28f59be 100644
--- a/wear/tiles/tiles-material/api/restricted_current.txt
+++ b/wear/tiles/tiles-material/api/restricted_current.txt
@@ -5,7 +5,7 @@
method public androidx.wear.tiles.material.ButtonColors getButtonColors();
method public androidx.wear.tiles.ModifiersBuilders.Clickable getClickable();
method public androidx.wear.tiles.LayoutElementBuilders.LayoutElement getContent();
- method public CharSequence getContentDescription();
+ method public CharSequence? getContentDescription();
method public androidx.wear.tiles.DimensionBuilders.ContainerDimension getSize();
}
@@ -47,7 +47,7 @@
method public androidx.wear.tiles.material.ChipColors getChipColors();
method public androidx.wear.tiles.ModifiersBuilders.Clickable getClickable();
method public androidx.wear.tiles.LayoutElementBuilders.LayoutElement getContent();
- method public CharSequence getContentDescription();
+ method public CharSequence? getContentDescription();
method public androidx.wear.tiles.DimensionBuilders.ContainerDimension getHeight();
method public int getHorizontalAlignment();
method public androidx.wear.tiles.DimensionBuilders.ContainerDimension getWidth();
@@ -75,7 +75,7 @@
ctor public ChipColors(androidx.wear.tiles.ColorBuilders.ColorProp, androidx.wear.tiles.ColorBuilders.ColorProp);
method public androidx.wear.tiles.ColorBuilders.ColorProp getBackgroundColor();
method public androidx.wear.tiles.ColorBuilders.ColorProp getContentColor();
- method public androidx.wear.tiles.ColorBuilders.ColorProp getIconTintColor();
+ method public androidx.wear.tiles.ColorBuilders.ColorProp getIconColor();
method public androidx.wear.tiles.ColorBuilders.ColorProp getSecondaryContentColor();
method public static androidx.wear.tiles.material.ChipColors primaryChipColors(androidx.wear.tiles.material.Colors);
method public static androidx.wear.tiles.material.ChipColors secondaryChipColors(androidx.wear.tiles.material.Colors);
@@ -92,7 +92,7 @@
public class CircularProgressIndicator implements androidx.wear.tiles.LayoutElementBuilders.LayoutElement {
method public androidx.wear.tiles.material.ProgressIndicatorColors getCircularProgressIndicatorColors();
- method public String getContentDescription();
+ method public CharSequence? getContentDescription();
method public androidx.wear.tiles.DimensionBuilders.DegreesProp getEndAngle();
method public androidx.wear.tiles.DimensionBuilders.DegreesProp getProgress();
method public androidx.wear.tiles.DimensionBuilders.DegreesProp getStartAngle();
@@ -246,6 +246,11 @@
}
public class PrimaryLayout implements androidx.wear.tiles.LayoutElementBuilders.LayoutElement {
+ method public androidx.wear.tiles.LayoutElementBuilders.LayoutElement? getContent();
+ method public androidx.wear.tiles.LayoutElementBuilders.LayoutElement? getPrimaryChipContent();
+ method public androidx.wear.tiles.LayoutElementBuilders.LayoutElement? getPrimaryLabelTextContent();
+ method public androidx.wear.tiles.LayoutElementBuilders.LayoutElement? getSecondaryLabelTextContent();
+ method @Dimension(unit=androidx.annotation.Dimension.DP) public float getVerticalSpacerHeight();
}
public static final class PrimaryLayout.Builder implements androidx.wear.tiles.LayoutElementBuilders.LayoutElement.Builder {
@@ -259,7 +264,8 @@
}
public class ProgressIndicatorLayout implements androidx.wear.tiles.LayoutElementBuilders.LayoutElement {
- method public androidx.wear.tiles.LayoutElementBuilders.LayoutElement getContent();
+ method public androidx.wear.tiles.LayoutElementBuilders.LayoutElement? getContent();
+ method public androidx.wear.tiles.LayoutElementBuilders.LayoutElement? getProgressIndicatorContent();
}
public static final class ProgressIndicatorLayout.Builder implements androidx.wear.tiles.LayoutElementBuilders.LayoutElement.Builder {
diff --git a/wear/tiles/tiles-material/build.gradle b/wear/tiles/tiles-material/build.gradle
index 026ad71..014dcf7 100644
--- a/wear/tiles/tiles-material/build.gradle
+++ b/wear/tiles/tiles-material/build.gradle
@@ -37,7 +37,7 @@
androidTestImplementation(project(":test:screenshot:screenshot"))
androidTestImplementation(project(":wear:tiles:tiles-renderer"))
androidTestRuntimeOnly(project(path: ":wear:tiles:tiles-proto", configuration: "shadow"))
- androidTestImplementation("com.google.protobuf:protobuf-java:3.10.0")
+ androidTestImplementation(libs.protobuf)
testImplementation(libs.junit)
testImplementation(libs.mockitoCore)
diff --git a/wear/tiles/tiles-material/src/androidTest/java/androidx/wear/tiles/material/MaterialGoldenTest.java b/wear/tiles/tiles-material/src/androidTest/java/androidx/wear/tiles/material/MaterialGoldenTest.java
index 3022faf..b719e27 100644
--- a/wear/tiles/tiles-material/src/androidTest/java/androidx/wear/tiles/material/MaterialGoldenTest.java
+++ b/wear/tiles/tiles-material/src/androidTest/java/androidx/wear/tiles/material/MaterialGoldenTest.java
@@ -38,7 +38,7 @@
import org.junit.runners.Parameterized;
import java.util.Collection;
-import java.util.HashMap;
+import java.util.Map;
import java.util.stream.Collectors;
@RunWith(Parameterized.class)
@@ -78,7 +78,6 @@
.getDisplayMetrics()
.setTo(displayMetrics);
-
DeviceParameters deviceParameters =
new DeviceParameters.Builder()
.setScreenWidthDp(pxToDp(SCREEN_WIDTH, scale))
@@ -88,12 +87,10 @@
.setScreenShape(DeviceParametersBuilders.SCREEN_SHAPE_RECT)
.build();
- HashMap<LayoutElement, String> testCases =
- generateTestCases(context, deviceParameters, "");
+ Map<LayoutElement, String> testCases = generateTestCases(context, deviceParameters, "");
- return testCases.entrySet()
- .stream()
- .map(test -> new Object[]{test.getKey(), test.getValue()})
+ return testCases.entrySet().stream()
+ .map(test -> new Object[] {test.getKey(), test.getValue()})
.collect(Collectors.toList());
}
diff --git a/wear/tiles/tiles-material/src/androidTest/java/androidx/wear/tiles/material/MaterialGoldenXLTest.java b/wear/tiles/tiles-material/src/androidTest/java/androidx/wear/tiles/material/MaterialGoldenXLTest.java
index 25b116e..6b611c5 100644
--- a/wear/tiles/tiles-material/src/androidTest/java/androidx/wear/tiles/material/MaterialGoldenXLTest.java
+++ b/wear/tiles/tiles-material/src/androidTest/java/androidx/wear/tiles/material/MaterialGoldenXLTest.java
@@ -40,7 +40,7 @@
import org.junit.runners.Parameterized;
import java.util.Collection;
-import java.util.HashMap;
+import java.util.Map;
import java.util.stream.Collectors;
@RunWith(Parameterized.class)
@@ -103,7 +103,7 @@
.setScreenShape(DeviceParametersBuilders.SCREEN_SHAPE_RECT)
.build();
- HashMap<LayoutElement, String> testCases =
+ Map<LayoutElement, String> testCases =
generateTestCases(context, deviceParameters, XXXL_SCALE_SUFFIX);
// Restore state before this method, so other test have correct context.
@@ -118,9 +118,8 @@
.getDisplayMetrics()
.setTo(currentDisplayMetrics);
- return testCases.entrySet()
- .stream()
- .map(test -> new Object[]{test.getKey(), test.getValue()})
+ return testCases.entrySet().stream()
+ .map(test -> new Object[] {test.getKey(), test.getValue()})
.collect(Collectors.toList());
}
diff --git a/wear/tiles/tiles-material/src/androidTest/java/androidx/wear/tiles/material/RunnerUtils.java b/wear/tiles/tiles-material/src/androidTest/java/androidx/wear/tiles/material/RunnerUtils.java
index f707b14..0d137b1 100644
--- a/wear/tiles/tiles-material/src/androidTest/java/androidx/wear/tiles/material/RunnerUtils.java
+++ b/wear/tiles/tiles-material/src/androidTest/java/androidx/wear/tiles/material/RunnerUtils.java
@@ -37,7 +37,8 @@
private RunnerUtils() {}
- static void runSingleScreenshotTest(@NonNull AndroidXScreenshotTestRule rule,
+ public static void runSingleScreenshotTest(
+ @NonNull AndroidXScreenshotTestRule rule,
@NonNull LayoutElementBuilders.LayoutElement layoutElement,
@NonNull String expected) {
byte[] layoutElementPayload = layoutElement.toLayoutElementProto().toByteArray();
@@ -62,10 +63,15 @@
Log.e("MaterialGoldenTest", "Error sleeping", ex);
}
- Bitmap bitmap = Bitmap.createBitmap(
- InstrumentationRegistry.getInstrumentation().getUiAutomation().takeScreenshot(),
- 0, 0, SCREEN_WIDTH, SCREEN_HEIGHT
- );
+ Bitmap bitmap =
+ Bitmap.createBitmap(
+ InstrumentationRegistry.getInstrumentation()
+ .getUiAutomation()
+ .takeScreenshot(),
+ 0,
+ 0,
+ SCREEN_WIDTH,
+ SCREEN_HEIGHT);
rule.assertBitmapAgainstGolden(bitmap, expected, new MSSIMMatcher());
// There's a weird bug (related to b/159805732) where, when calling .close() on
diff --git a/wear/tiles/tiles-material/src/androidTest/java/androidx/wear/tiles/material/TestCasesGenerator.java b/wear/tiles/tiles-material/src/androidTest/java/androidx/wear/tiles/material/TestCasesGenerator.java
index 60f61f3..81a5e6f 100644
--- a/wear/tiles/tiles-material/src/androidTest/java/androidx/wear/tiles/material/TestCasesGenerator.java
+++ b/wear/tiles/tiles-material/src/androidTest/java/androidx/wear/tiles/material/TestCasesGenerator.java
@@ -29,20 +29,23 @@
import androidx.annotation.NonNull;
import androidx.wear.tiles.ActionBuilders.LaunchAction;
-import androidx.wear.tiles.DeviceParametersBuilders.DeviceParameters;
+import androidx.wear.tiles.DeviceParametersBuilders;
import androidx.wear.tiles.LayoutElementBuilders;
+import androidx.wear.tiles.LayoutElementBuilders.Box;
import androidx.wear.tiles.LayoutElementBuilders.LayoutElement;
+import androidx.wear.tiles.LayoutElementBuilders.Row;
import androidx.wear.tiles.ModifiersBuilders.Clickable;
import java.util.HashMap;
+import java.util.Map;
public class TestCasesGenerator {
private TestCasesGenerator() {}
- private static final String ICON_ID = "tile_icon";
- private static final String AVATAR = "avatar_image";
public static final String NORMAL_SCALE_SUFFIX = "";
public static final String XXXL_SCALE_SUFFIX = "_xxxl";
+ private static final String ICON_ID = "tile_icon";
+ private static final String AVATAR = "avatar_image";
/**
* This function will append goldenSuffix on the name of the golden images that should be
@@ -50,9 +53,10 @@
* as it should point on the same size independent image.
*/
@NonNull
- static HashMap<LayoutElement, String> generateTestCases(
+ // TODO(b/229188628): Reverse map to be <String,LayoutElement>.
+ static Map<LayoutElement, String> generateTestCases(
@NonNull Context context,
- @NonNull DeviceParameters deviceParameters,
+ @NonNull DeviceParametersBuilders.DeviceParameters deviceParameters,
@NonNull String goldenSuffix) {
Clickable clickable =
new Clickable.Builder()
@@ -157,7 +161,7 @@
new Chip.Builder(context, clickable, deviceParameters)
.setHorizontalAlignment(HORIZONTAL_ALIGN_CENTER)
.setContent(
- new LayoutElementBuilders.Box.Builder()
+ new Box.Builder()
.addContent(
new Text.Builder(context, "random text")
.setTypography(Typography.TYPOGRAPHY_TITLE3)
@@ -171,7 +175,7 @@
.setChipColors(ChipDefaults.SECONDARY_COLORS)
.setHorizontalAlignment(HORIZONTAL_ALIGN_START)
.setContent(
- new LayoutElementBuilders.Row.Builder()
+ new Row.Builder()
.addContent(
new Text.Builder(context, "text1")
.setTypography(Typography.TYPOGRAPHY_TITLE3)
@@ -205,8 +209,8 @@
new CompactChip.Builder(context, "Abcdefghi", clickable, deviceParameters).build(),
"compactchip_default_len9_golden" + goldenSuffix);
testCases.put(
- new CompactChip.Builder(context, "AbcdefghiEXTRA", clickable,
- deviceParameters).build(),
+ new CompactChip.Builder(context, "AbcdefghiEXTRA", clickable, deviceParameters)
+ .build(),
"compactchip_default_toolong_golden" + goldenSuffix);
testCases.put(
new CompactChip.Builder(context, "Action", clickable, deviceParameters)
@@ -218,8 +222,8 @@
new TitleChip.Builder(context, largeChipText, clickable, deviceParameters).build(),
"titlechip_default_golden" + goldenSuffix);
testCases.put(
- new TitleChip.Builder(context, "abcdeabcdeabcdeEXTRA", clickable,
- deviceParameters).build(),
+ new TitleChip.Builder(context, "abcdeabcdeabcdeEXTRA", clickable, deviceParameters)
+ .build(),
"titlechip_default_texttoolong_golden" + goldenSuffix);
testCases.put(
new TitleChip.Builder(context, largeChipText, clickable, deviceParameters)
@@ -266,12 +270,12 @@
"custom_gap_45_circularprogressindicator");
testCases.put(
- new Text.Builder(context, "Testing").build(),
- "default_text_golden" + goldenSuffix);
+ new Text.Builder(context, "Testing").build(), "default_text_golden" + goldenSuffix);
testCases.put(
new Text.Builder(context, "Testing text.")
.setItalic(true)
.setColor(argb(Color.YELLOW))
+ .setWeight(LayoutElementBuilders.FONT_WEIGHT_BOLD)
.setTypography(Typography.TYPOGRAPHY_BODY2)
.build(),
"custom_text_golden" + goldenSuffix);
diff --git a/wear/tiles/tiles-material/src/androidTest/java/androidx/wear/tiles/material/layouts/LayoutsGoldenTest.java b/wear/tiles/tiles-material/src/androidTest/java/androidx/wear/tiles/material/layouts/LayoutsGoldenTest.java
new file mode 100644
index 0000000..82a144a
--- /dev/null
+++ b/wear/tiles/tiles-material/src/androidTest/java/androidx/wear/tiles/material/layouts/LayoutsGoldenTest.java
@@ -0,0 +1,101 @@
+/*
+ * Copyright 2022 The Android Open Source Project
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package androidx.wear.tiles.material.layouts;
+
+import static androidx.wear.tiles.material.RunnerUtils.SCREEN_HEIGHT;
+import static androidx.wear.tiles.material.RunnerUtils.SCREEN_WIDTH;
+import static androidx.wear.tiles.material.RunnerUtils.runSingleScreenshotTest;
+import static androidx.wear.tiles.material.layouts.TestCasesGenerator.generateTestCases;
+
+import android.content.Context;
+import android.util.DisplayMetrics;
+
+import androidx.annotation.Dimension;
+import androidx.test.filters.LargeTest;
+import androidx.test.platform.app.InstrumentationRegistry;
+import androidx.test.screenshot.AndroidXScreenshotTestRule;
+import androidx.wear.tiles.DeviceParametersBuilders;
+import androidx.wear.tiles.DeviceParametersBuilders.DeviceParameters;
+import androidx.wear.tiles.LayoutElementBuilders.LayoutElement;
+
+import org.junit.Rule;
+import org.junit.Test;
+import org.junit.runner.RunWith;
+import org.junit.runners.Parameterized;
+
+import java.util.Collection;
+import java.util.Map;
+import java.util.stream.Collectors;
+
+@RunWith(Parameterized.class)
+@LargeTest
+public class LayoutsGoldenTest {
+ private final LayoutElement mLayoutElement;
+ private final String mExpected;
+
+ @Rule
+ public AndroidXScreenshotTestRule mScreenshotRule =
+ new AndroidXScreenshotTestRule("wear/wear-tiles-material");
+
+ public LayoutsGoldenTest(LayoutElement layoutElement, String expected) {
+ mLayoutElement = layoutElement;
+ mExpected = expected;
+ }
+
+ @Dimension(unit = Dimension.DP)
+ static int pxToDp(int px, float scale) {
+ return (int) ((px - 0.5f) / scale);
+ }
+
+ @Parameterized.Parameters(name = "{1}")
+ public static Collection<Object[]> data() {
+ Context context = InstrumentationRegistry.getInstrumentation().getContext();
+ DisplayMetrics displayMetrics = context.getResources().getDisplayMetrics();
+ float scale = displayMetrics.density;
+
+ InstrumentationRegistry.getInstrumentation()
+ .getContext()
+ .getResources()
+ .getDisplayMetrics()
+ .setTo(displayMetrics);
+ InstrumentationRegistry.getInstrumentation()
+ .getTargetContext()
+ .getResources()
+ .getDisplayMetrics()
+ .setTo(displayMetrics);
+
+ DeviceParameters deviceParameters =
+ new DeviceParameters.Builder()
+ .setScreenWidthDp(pxToDp(SCREEN_WIDTH, scale))
+ .setScreenHeightDp(pxToDp(SCREEN_HEIGHT, scale))
+ .setScreenDensity(displayMetrics.density)
+ // TODO(b/231543947): Add test cases for round screen.
+ .setScreenShape(DeviceParametersBuilders.SCREEN_SHAPE_RECT)
+ .build();
+
+ Map<LayoutElement, String> testCases = generateTestCases(context, deviceParameters, "");
+
+ return testCases.entrySet().stream()
+ .map(test -> new Object[] {test.getKey(), test.getValue()})
+ .collect(Collectors.toList());
+ }
+
+ @Test
+ public void test() {
+ runSingleScreenshotTest(mScreenshotRule, mLayoutElement, mExpected);
+ }
+}
diff --git a/wear/tiles/tiles-material/src/androidTest/java/androidx/wear/tiles/material/layouts/LayoutsGoldenXLTest.java b/wear/tiles/tiles-material/src/androidTest/java/androidx/wear/tiles/material/layouts/LayoutsGoldenXLTest.java
new file mode 100644
index 0000000..71565f7
--- /dev/null
+++ b/wear/tiles/tiles-material/src/androidTest/java/androidx/wear/tiles/material/layouts/LayoutsGoldenXLTest.java
@@ -0,0 +1,150 @@
+/*
+ * Copyright 2022 The Android Open Source Project
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package androidx.wear.tiles.material.layouts;
+
+import static androidx.test.core.app.ApplicationProvider.getApplicationContext;
+import static androidx.wear.tiles.material.RunnerUtils.SCREEN_HEIGHT;
+import static androidx.wear.tiles.material.RunnerUtils.SCREEN_WIDTH;
+import static androidx.wear.tiles.material.RunnerUtils.runSingleScreenshotTest;
+import static androidx.wear.tiles.material.layouts.TestCasesGenerator.XXXL_SCALE_SUFFIX;
+import static androidx.wear.tiles.material.layouts.TestCasesGenerator.generateTestCases;
+
+import android.content.Context;
+import android.util.DisplayMetrics;
+
+import androidx.annotation.Dimension;
+import androidx.test.filters.LargeTest;
+import androidx.test.platform.app.InstrumentationRegistry;
+import androidx.test.screenshot.AndroidXScreenshotTestRule;
+import androidx.wear.tiles.DeviceParametersBuilders;
+import androidx.wear.tiles.DeviceParametersBuilders.DeviceParameters;
+import androidx.wear.tiles.LayoutElementBuilders.LayoutElement;
+
+import org.junit.Rule;
+import org.junit.Test;
+import org.junit.runner.RunWith;
+import org.junit.runners.Parameterized;
+
+import java.util.Collection;
+import java.util.Map;
+import java.util.stream.Collectors;
+
+@RunWith(Parameterized.class)
+@LargeTest
+public class LayoutsGoldenXLTest {
+ /* We set DisplayMetrics in the data() method for creating test cases. However, when running all
+ tests together, first all parametrization (data()) methods are called, and then individual
+ tests, causing that actual DisplayMetrics will be different. So we need to restore it before
+ each test. */
+ private static final DisplayMetrics DISPLAY_METRICS_FOR_TEST = new DisplayMetrics();
+ private static final DisplayMetrics OLD_DISPLAY_METRICS = new DisplayMetrics();
+
+ private static final float FONT_SCALE_XXXL = 1.24f;
+
+ private final LayoutElement mLayoutElement;
+ private final String mExpected;
+
+ @Rule
+ public AndroidXScreenshotTestRule mScreenshotRule =
+ new AndroidXScreenshotTestRule("wear/wear-tiles-material");
+
+ public LayoutsGoldenXLTest(LayoutElement layoutElement, String expected) {
+ mLayoutElement = layoutElement;
+ mExpected = expected;
+ }
+
+ @Dimension(unit = Dimension.DP)
+ static int pxToDp(int px, float scale) {
+ return (int) ((px - 0.5f) / scale);
+ }
+
+ @Parameterized.Parameters(name = "{1}")
+ public static Collection<Object[]> data() {
+ Context context = InstrumentationRegistry.getInstrumentation().getTargetContext();
+ DisplayMetrics currentDisplayMetrics = new DisplayMetrics();
+ DisplayMetrics displayMetrics = context.getResources().getDisplayMetrics();
+ currentDisplayMetrics.setTo(displayMetrics);
+ displayMetrics.scaledDensity *= FONT_SCALE_XXXL;
+
+ InstrumentationRegistry.getInstrumentation()
+ .getContext()
+ .getResources()
+ .getDisplayMetrics()
+ .setTo(displayMetrics);
+ InstrumentationRegistry.getInstrumentation()
+ .getTargetContext()
+ .getResources()
+ .getDisplayMetrics()
+ .setTo(displayMetrics);
+
+ DISPLAY_METRICS_FOR_TEST.setTo(displayMetrics);
+
+ float scale = displayMetrics.density;
+ DeviceParameters deviceParameters =
+ new DeviceParameters.Builder()
+ .setScreenWidthDp(pxToDp(SCREEN_WIDTH, scale))
+ .setScreenHeightDp(pxToDp(SCREEN_HEIGHT, scale))
+ .setScreenDensity(displayMetrics.density)
+ // TODO(b/231543947): Add test cases for round screen.
+ .setScreenShape(DeviceParametersBuilders.SCREEN_SHAPE_RECT)
+ .build();
+
+ Map<LayoutElement, String> testCases =
+ generateTestCases(context, deviceParameters, XXXL_SCALE_SUFFIX);
+
+ // Restore state before this method, so other test have correct context. This is needed here
+ // too, besides in restoreBefore and restoreAfter as the test cases builder uses the context
+ // to apply font scaling, so we need that display metrics passed in. However, after
+ // generating cases we need to restore the state as other data() methods in this package can
+ // work correctly with the default state, as when the tests are run, first all data() static
+ // methods are called, and then parameterized test cases.
+ InstrumentationRegistry.getInstrumentation()
+ .getContext()
+ .getResources()
+ .getDisplayMetrics()
+ .setTo(currentDisplayMetrics);
+ InstrumentationRegistry.getInstrumentation()
+ .getTargetContext()
+ .getResources()
+ .getDisplayMetrics()
+ .setTo(currentDisplayMetrics);
+
+ return testCases.entrySet().stream()
+ .map(test -> new Object[] {test.getKey(), test.getValue()})
+ .collect(Collectors.toList());
+ }
+
+ @Parameterized.BeforeParam
+ public static void restoreBefore() {
+ // Set the state as it was in data() method when we generated test cases. This was
+ // overridden by other static data() methods, so we need to restore it.
+ OLD_DISPLAY_METRICS.setTo(getApplicationContext().getResources().getDisplayMetrics());
+ getApplicationContext().getResources().getDisplayMetrics().setTo(DISPLAY_METRICS_FOR_TEST);
+ }
+
+ @Parameterized.AfterParam
+ public static void restoreAfter() {
+ // Restore the state to default, so the other tests and emulator have the correct starter
+ // state.
+ getApplicationContext().getResources().getDisplayMetrics().setTo(OLD_DISPLAY_METRICS);
+ }
+
+ @Test
+ public void test() {
+ runSingleScreenshotTest(mScreenshotRule, mLayoutElement, mExpected);
+ }
+}
diff --git a/wear/tiles/tiles-material/src/androidTest/java/androidx/wear/tiles/material/layouts/TestCasesGenerator.java b/wear/tiles/tiles-material/src/androidTest/java/androidx/wear/tiles/material/layouts/TestCasesGenerator.java
new file mode 100644
index 0000000..843ef63
--- /dev/null
+++ b/wear/tiles/tiles-material/src/androidTest/java/androidx/wear/tiles/material/layouts/TestCasesGenerator.java
@@ -0,0 +1,572 @@
+/*
+ * Copyright 2022 The Android Open Source Project
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package androidx.wear.tiles.material.layouts;
+
+import static androidx.wear.tiles.ColorBuilders.argb;
+import static androidx.wear.tiles.DimensionBuilders.expand;
+
+import android.content.Context;
+import android.graphics.Color;
+
+import androidx.annotation.Dimension;
+import androidx.annotation.NonNull;
+import androidx.wear.tiles.ActionBuilders.LaunchAction;
+import androidx.wear.tiles.DeviceParametersBuilders.DeviceParameters;
+import androidx.wear.tiles.LayoutElementBuilders.Box;
+import androidx.wear.tiles.LayoutElementBuilders.LayoutElement;
+import androidx.wear.tiles.ModifiersBuilders.Background;
+import androidx.wear.tiles.ModifiersBuilders.Clickable;
+import androidx.wear.tiles.ModifiersBuilders.Modifiers;
+import androidx.wear.tiles.material.Button;
+import androidx.wear.tiles.material.ButtonDefaults;
+import androidx.wear.tiles.material.ChipColors;
+import androidx.wear.tiles.material.CircularProgressIndicator;
+import androidx.wear.tiles.material.CompactChip;
+import androidx.wear.tiles.material.ProgressIndicatorColors;
+import androidx.wear.tiles.material.ProgressIndicatorDefaults;
+import androidx.wear.tiles.material.Text;
+import androidx.wear.tiles.material.TitleChip;
+import androidx.wear.tiles.material.Typography;
+
+import java.util.HashMap;
+import java.util.Map;
+
+public class TestCasesGenerator {
+ private TestCasesGenerator() {}
+
+ public static final String NORMAL_SCALE_SUFFIX = "";
+ public static final String XXXL_SCALE_SUFFIX = "_xxxl";
+
+ /**
+ * This function will append goldenSuffix on the name of the golden images that should be
+ * different for different user font sizes. Note that some of the golden will have the same name
+ * as it should point on the same size independent image.
+ */
+ @NonNull
+ static Map<LayoutElement, String> generateTestCases(
+ @NonNull Context context,
+ @NonNull DeviceParameters deviceParameters,
+ @NonNull String goldenSuffix) {
+ Clickable clickable =
+ new Clickable.Builder()
+ .setOnClick(new LaunchAction.Builder().build())
+ .setId("action_id")
+ .build();
+ HashMap<LayoutElement, String> testCases = new HashMap<>();
+
+ TitleChip content =
+ new TitleChip.Builder(context, "Action", clickable, deviceParameters).build();
+ CompactChip.Builder primaryChipBuilder =
+ new CompactChip.Builder(context, "Action", clickable, deviceParameters);
+
+ testCases.put(
+ new PrimaryLayout.Builder(deviceParameters)
+ .setPrimaryChipContent(primaryChipBuilder.build())
+ .build(),
+ "default_empty_primarychiplayout_golden" + goldenSuffix);
+
+ testCases.put(
+ new PrimaryLayout.Builder(deviceParameters)
+ .setPrimaryChipContent(primaryChipBuilder.build())
+ .setContent(buildColoredBox(Color.YELLOW))
+ .setPrimaryLabelTextContent(buildTextLabel(context, "Primary label"))
+ .build(),
+ "coloredbox_primarylabel_primarychiplayout_golden" + goldenSuffix);
+ testCases.put(
+ new PrimaryLayout.Builder(deviceParameters)
+ .setPrimaryChipContent(primaryChipBuilder.build())
+ .setContent(buildColoredBox(Color.YELLOW))
+ .setPrimaryLabelTextContent(buildTextLabel(context, "Primary label"))
+ .setSecondaryLabelTextContent(buildTextLabel(context, "Secondary label"))
+ .build(),
+ "coloredbox_primarylabel_secondarylabel_primarychiplayout_golden" + goldenSuffix);
+ testCases.put(
+ new PrimaryLayout.Builder(deviceParameters)
+ .setPrimaryChipContent(primaryChipBuilder.build())
+ .setContent(buildColoredBox(Color.YELLOW))
+ .setSecondaryLabelTextContent(buildTextLabel(context, "Secondary label"))
+ .build(),
+ "coloredbox_secondarylabel_primarychiplayout_golden" + goldenSuffix);
+
+ testCases.put(
+ new PrimaryLayout.Builder(deviceParameters)
+ .setContent(content)
+ .setPrimaryChipContent(
+ primaryChipBuilder
+ .setChipColors(new ChipColors(Color.YELLOW, Color.GREEN))
+ .build())
+ .build(),
+ "custom_primarychiplayout_golden" + goldenSuffix);
+ testCases.put(
+ new PrimaryLayout.Builder(deviceParameters)
+ .setPrimaryChipContent(primaryChipBuilder.build())
+ .setContent(buildColoredBox(Color.YELLOW))
+ .build(),
+ "coloredbox_primarychiplayout_golden" + goldenSuffix);
+
+ primaryChipBuilder =
+ new CompactChip.Builder(context, "Action", clickable, deviceParameters);
+ testCases.put(
+ new PrimaryLayout.Builder(deviceParameters)
+ .setPrimaryChipContent(primaryChipBuilder.build())
+ .setContent(
+ new MultiSlotLayout.Builder()
+ .addSlotContent(buildColoredBox(Color.YELLOW))
+ .build())
+ .build(),
+ "coloredbox_1_chip_columnslayout_golden" + goldenSuffix);
+ testCases.put(
+ new PrimaryLayout.Builder(deviceParameters)
+ .setPrimaryChipContent(primaryChipBuilder.build())
+ .setContent(
+ new MultiSlotLayout.Builder()
+ .addSlotContent(buildColoredBox(Color.YELLOW))
+ .addSlotContent(buildColoredBox(Color.BLUE))
+ .build())
+ .build(),
+ "coloredbox_2_chip_columnslayout_golden" + goldenSuffix);
+ testCases.put(
+ new PrimaryLayout.Builder(deviceParameters)
+ .setPrimaryChipContent(primaryChipBuilder.build())
+ .setContent(
+ new MultiSlotLayout.Builder()
+ .addSlotContent(buildColoredBox(Color.YELLOW))
+ .addSlotContent(buildColoredBox(Color.BLUE))
+ .addSlotContent(buildColoredBox(Color.MAGENTA))
+ .build())
+ .build(),
+ "coloredbox_3_chip_columnslayout_golden" + goldenSuffix);
+ testCases.put(
+ new PrimaryLayout.Builder(deviceParameters)
+ .setPrimaryChipContent(primaryChipBuilder.build())
+ .setContent(
+ new MultiSlotLayout.Builder()
+ .addSlotContent(buildColoredBox(Color.YELLOW))
+ .addSlotContent(buildColoredBox(Color.BLUE))
+ .build())
+ .setPrimaryLabelTextContent(buildTextLabel(context, "Primary label"))
+ .build(),
+ "coloredbox_2_chip_primary_columnslayout_golden" + goldenSuffix);
+ testCases.put(
+ new PrimaryLayout.Builder(deviceParameters)
+ .setPrimaryChipContent(primaryChipBuilder.build())
+ .setContent(
+ new MultiSlotLayout.Builder()
+ .addSlotContent(buildColoredBox(Color.YELLOW))
+ .addSlotContent(buildColoredBox(Color.BLUE))
+ .build())
+ .setPrimaryLabelTextContent(buildTextLabel(context, "Primary label"))
+ .setSecondaryLabelTextContent(buildTextLabel(context, "Secondary label"))
+ .build(),
+ "coloredbox_2_chip_primary_secondary_columnslayout_golden" + goldenSuffix);
+ testCases.put(
+ new PrimaryLayout.Builder(deviceParameters)
+ .setContent(
+ new MultiSlotLayout.Builder()
+ .addSlotContent(buildColoredBox(Color.YELLOW))
+ .addSlotContent(buildColoredBox(Color.BLUE))
+ .build())
+ .build(),
+ "coloredbox_2_columnslayout_golden" + NORMAL_SCALE_SUFFIX);
+ testCases.put(
+ new PrimaryLayout.Builder(deviceParameters)
+ .setContent(
+ new MultiSlotLayout.Builder()
+ .addSlotContent(buildColoredBox(Color.YELLOW))
+ .addSlotContent(buildColoredBox(Color.BLUE))
+ .build())
+ .setPrimaryLabelTextContent(buildTextLabel(context, "Primary label"))
+ .build(),
+ "coloredbox_2_primary_columnslayout_golden" + goldenSuffix);
+ testCases.put(
+ new PrimaryLayout.Builder(deviceParameters)
+ .setContent(
+ new MultiSlotLayout.Builder()
+ .addSlotContent(buildColoredBox(Color.YELLOW))
+ .addSlotContent(buildColoredBox(Color.BLUE))
+ .build())
+ .setPrimaryLabelTextContent(buildTextLabel(context, "Primary label"))
+ .setSecondaryLabelTextContent(buildTextLabel(context, "Secondary label"))
+ .build(),
+ "coloredbox_2_primary_secondary_columnslayout_golden" + goldenSuffix);
+ testCases.put(
+ new PrimaryLayout.Builder(deviceParameters)
+ .setPrimaryChipContent(primaryChipBuilder.build())
+ .setContent(
+ new MultiSlotLayout.Builder()
+ .addSlotContent(buildColoredBox(Color.YELLOW))
+ .addSlotContent(buildColoredBox(Color.BLUE))
+ .addSlotContent(buildColoredBox(Color.MAGENTA))
+ .build())
+ .setPrimaryLabelTextContent(buildTextLabel(context, "Primary label"))
+ .build(),
+ "coloredbox_3_chip_primary_columnslayout_golden" + goldenSuffix);
+ testCases.put(
+ new PrimaryLayout.Builder(deviceParameters)
+ .setPrimaryChipContent(primaryChipBuilder.build())
+ .setContent(
+ new MultiSlotLayout.Builder()
+ .addSlotContent(buildColoredBox(Color.YELLOW))
+ .addSlotContent(buildColoredBox(Color.BLUE))
+ .addSlotContent(buildColoredBox(Color.MAGENTA))
+ .build())
+ .setPrimaryLabelTextContent(buildTextLabel(context, "Primary label"))
+ .setSecondaryLabelTextContent(buildTextLabel(context, "Secondary label"))
+ .build(),
+ "coloredbox_3_chip_primary_secondary_columnslayout_golden" + goldenSuffix);
+ testCases.put(
+ new PrimaryLayout.Builder(deviceParameters)
+ .setContent(
+ new MultiSlotLayout.Builder()
+ .addSlotContent(buildColoredBox(Color.YELLOW))
+ .addSlotContent(buildColoredBox(Color.BLUE))
+ .addSlotContent(buildColoredBox(Color.MAGENTA))
+ .build())
+ .build(),
+ "coloredbox_3_columnslayout_golden" + NORMAL_SCALE_SUFFIX);
+ testCases.put(
+ new PrimaryLayout.Builder(deviceParameters)
+ .setContent(
+ new MultiSlotLayout.Builder()
+ .addSlotContent(buildColoredBox(Color.YELLOW))
+ .addSlotContent(buildColoredBox(Color.BLUE))
+ .addSlotContent(buildColoredBox(Color.MAGENTA))
+ .build())
+ .setPrimaryLabelTextContent(buildTextLabel(context, "Primary label"))
+ .build(),
+ "coloredbox_3_primary_columnslayout_golden" + goldenSuffix);
+ testCases.put(
+ new PrimaryLayout.Builder(deviceParameters)
+ .setContent(
+ new MultiSlotLayout.Builder()
+ .addSlotContent(buildColoredBox(Color.YELLOW))
+ .addSlotContent(buildColoredBox(Color.BLUE))
+ .addSlotContent(buildColoredBox(Color.MAGENTA))
+ .build())
+ .setPrimaryLabelTextContent(buildTextLabel(context, "Primary label"))
+ .setSecondaryLabelTextContent(buildTextLabel(context, "Secondary label"))
+ .build(),
+ "coloredbox_3_primary_secondary_columnslayout_golden" + goldenSuffix);
+ testCases.put(
+ new PrimaryLayout.Builder(deviceParameters)
+ .setPrimaryChipContent(primaryChipBuilder.build())
+ .setContent(
+ new MultiSlotLayout.Builder()
+ .addSlotContent(buildColoredBox(Color.YELLOW))
+ .addSlotContent(buildColoredBox(Color.BLUE))
+ .addSlotContent(buildColoredBox(Color.MAGENTA))
+ .setHorizontalSpacerWidth(20)
+ .build())
+ .setPrimaryLabelTextContent(buildTextLabel(context, "Primary label"))
+ .setSecondaryLabelTextContent(buildTextLabel(context, "Secondary label"))
+ .setVerticalSpacerHeight(1)
+ .build(),
+ "custom_spacer_coloredbox_3_chip_primary_secondary_columnslayout_golden"
+ + goldenSuffix);
+
+ CircularProgressIndicator.Builder progressIndicatorBuilder =
+ new CircularProgressIndicator.Builder().setProgress(0.3f);
+ Text textContent =
+ new Text.Builder(context, "Text")
+ .setColor(argb(Color.WHITE))
+ .setTypography(Typography.TYPOGRAPHY_DISPLAY1)
+ .build();
+ testCases.put(
+ new ProgressIndicatorLayout.Builder(deviceParameters)
+ .setProgressIndicatorContent(progressIndicatorBuilder.build())
+ .build(),
+ "default_empty_progressindicatorlayout_golden" + NORMAL_SCALE_SUFFIX);
+ testCases.put(
+ new ProgressIndicatorLayout.Builder(deviceParameters)
+ .setContent(textContent)
+ .setProgressIndicatorContent(
+ progressIndicatorBuilder
+ .setCircularProgressIndicatorColors(
+ new ProgressIndicatorColors(
+ Color.YELLOW, Color.GREEN))
+ .build())
+ .build(),
+ "custom_progressindicatorlayout_golden" + goldenSuffix);
+ testCases.put(
+ new ProgressIndicatorLayout.Builder(deviceParameters)
+ .setProgressIndicatorContent(
+ progressIndicatorBuilder
+ .setCircularProgressIndicatorColors(
+ ProgressIndicatorDefaults.DEFAULT_COLORS)
+ .build())
+ .setContent(
+ new Box.Builder()
+ .setWidth(expand())
+ .setHeight(expand())
+ .setModifiers(
+ new Modifiers.Builder()
+ .setBackground(
+ new Background.Builder()
+ .setColor(
+ argb(Color.YELLOW))
+ .build())
+ .build())
+ .build())
+ .build(),
+ "coloredbox_progressindicatorlayout_golden" + NORMAL_SCALE_SUFFIX);
+
+ Button button1 = new Button.Builder(context, clickable).setTextContent("1").build();
+ Button button2 = new Button.Builder(context, clickable).setTextContent("2").build();
+ Button button3 = new Button.Builder(context, clickable).setTextContent("3").build();
+ Button button4 = new Button.Builder(context, clickable).setTextContent("4").build();
+ Button button5 = new Button.Builder(context, clickable).setTextContent("5").build();
+ Button button6 = new Button.Builder(context, clickable).setTextContent("6").build();
+ Button button7 = new Button.Builder(context, clickable).setTextContent("7").build();
+ Button largeButton1 =
+ new Button.Builder(context, clickable)
+ .setTextContent("1")
+ .setSize(ButtonDefaults.LARGE_BUTTON_SIZE)
+ .build();
+ Button largeButton2 =
+ new Button.Builder(context, clickable)
+ .setTextContent("2")
+ .setSize(ButtonDefaults.LARGE_BUTTON_SIZE)
+ .build();
+ Button extraLargeButton =
+ new Button.Builder(context, clickable)
+ .setTextContent("1")
+ .setSize(ButtonDefaults.EXTRA_LARGE_BUTTON_SIZE)
+ .build();
+ testCases.put(
+ new PrimaryLayout.Builder(deviceParameters)
+ .setContent(
+ new MultiButtonLayout.Builder()
+ .addButtonContent(extraLargeButton)
+ .build())
+ .build(),
+ "multibutton_layout_1button_golden" + goldenSuffix);
+ testCases.put(
+ new PrimaryLayout.Builder(deviceParameters)
+ .setContent(
+ new MultiButtonLayout.Builder()
+ .addButtonContent(extraLargeButton)
+ .build())
+ .setPrimaryChipContent(primaryChipBuilder.build())
+ .build(),
+ "multibutton_layout_1button_chip_golden" + goldenSuffix);
+ testCases.put(
+ new PrimaryLayout.Builder(deviceParameters)
+ .setContent(
+ new MultiButtonLayout.Builder()
+ .addButtonContent(largeButton1)
+ .addButtonContent(largeButton2)
+ .build())
+ .build(),
+ "multibutton_layout_2button_golden" + goldenSuffix);
+ testCases.put(
+ new PrimaryLayout.Builder(deviceParameters)
+ .setContent(
+ new MultiButtonLayout.Builder()
+ .addButtonContent(largeButton1)
+ .addButtonContent(largeButton2)
+ .build())
+ .setPrimaryChipContent(primaryChipBuilder.build())
+ .build(),
+ "multibutton_layout_2button_chip_golden" + goldenSuffix);
+ testCases.put(
+ new PrimaryLayout.Builder(deviceParameters)
+ .setContent(
+ new MultiButtonLayout.Builder()
+ .addButtonContent(largeButton1)
+ .addButtonContent(largeButton2)
+ .build())
+ .setPrimaryLabelTextContent(buildTextLabel(context, "Primary label"))
+ .build(),
+ "multibutton_layout_2button_primarylabel_golden" + goldenSuffix);
+ testCases.put(
+ new PrimaryLayout.Builder(deviceParameters)
+ .setContent(
+ new MultiButtonLayout.Builder()
+ .addButtonContent(largeButton1)
+ .addButtonContent(largeButton2)
+ .build())
+ .setPrimaryLabelTextContent(buildTextLabel(context, "Primary label"))
+ .setPrimaryChipContent(primaryChipBuilder.build())
+ .build(),
+ "multibutton_layout_2button_chip_primarylabel_golden" + goldenSuffix);
+ testCases.put(
+ new PrimaryLayout.Builder(deviceParameters)
+ .setContent(
+ new MultiButtonLayout.Builder()
+ .addButtonContent(button1)
+ .addButtonContent(button2)
+ .addButtonContent(button3)
+ .build())
+ .build(),
+ "multibutton_layout_3button_golden" + goldenSuffix);
+ testCases.put(
+ new PrimaryLayout.Builder(deviceParameters)
+ .setContent(
+ new MultiButtonLayout.Builder()
+ .addButtonContent(button1)
+ .addButtonContent(button2)
+ .addButtonContent(button3)
+ .build())
+ .setPrimaryChipContent(primaryChipBuilder.build())
+ .build(),
+ "multibutton_layout_3button_chip_golden" + goldenSuffix);
+ testCases.put(
+ new PrimaryLayout.Builder(deviceParameters)
+ .setContent(
+ new MultiButtonLayout.Builder()
+ .addButtonContent(button1)
+ .addButtonContent(button2)
+ .addButtonContent(button3)
+ .build())
+ .setPrimaryLabelTextContent(buildTextLabel(context, "Primary label"))
+ .build(),
+ "multibutton_layout_3button_primarylabel_golden" + goldenSuffix);
+ testCases.put(
+ new PrimaryLayout.Builder(deviceParameters)
+ .setContent(
+ new MultiButtonLayout.Builder()
+ .addButtonContent(button1)
+ .addButtonContent(button2)
+ .addButtonContent(button3)
+ .build())
+ .setPrimaryChipContent(primaryChipBuilder.build())
+ .setPrimaryLabelTextContent(buildTextLabel(context, "Primary label"))
+ .build(),
+ "multibutton_layout_3button_chip_primarylabel_golden" + goldenSuffix);
+ testCases.put(
+ new PrimaryLayout.Builder(deviceParameters)
+ .setContent(
+ new MultiButtonLayout.Builder()
+ .addButtonContent(button1)
+ .addButtonContent(button2)
+ .addButtonContent(button3)
+ .addButtonContent(button4)
+ .build())
+ .build(),
+ "multibutton_layout_4button_golden" + goldenSuffix);
+ testCases.put(
+ new PrimaryLayout.Builder(deviceParameters)
+ .setContent(
+ new MultiButtonLayout.Builder()
+ .addButtonContent(button1)
+ .addButtonContent(button2)
+ .addButtonContent(button3)
+ .addButtonContent(button4)
+ .build())
+ .setPrimaryChipContent(primaryChipBuilder.build())
+ .build(),
+ "multibutton_layout_4button_chip_golden" + goldenSuffix);
+ testCases.put(
+ new PrimaryLayout.Builder(deviceParameters)
+ .setContent(
+ new MultiButtonLayout.Builder()
+ .addButtonContent(button1)
+ .addButtonContent(button2)
+ .addButtonContent(button3)
+ .addButtonContent(button4)
+ .addButtonContent(button5)
+ .setFiveButtonDistribution(
+ MultiButtonLayout
+ .FIVE_BUTTON_DISTRIBUTION_TOP_HEAVY)
+ .build())
+ .build(),
+ "multibutton_layout_5button_top_golden" + goldenSuffix);
+ testCases.put(
+ new PrimaryLayout.Builder(deviceParameters)
+ .setContent(
+ new MultiButtonLayout.Builder()
+ .addButtonContent(button1)
+ .addButtonContent(button2)
+ .addButtonContent(button3)
+ .addButtonContent(button4)
+ .addButtonContent(button5)
+ .setFiveButtonDistribution(
+ MultiButtonLayout
+ .FIVE_BUTTON_DISTRIBUTION_BOTTOM_HEAVY)
+ .build())
+ .build(),
+ "multibutton_layout_5button_bottom_golden" + goldenSuffix);
+ testCases.put(
+ new PrimaryLayout.Builder(deviceParameters)
+ .setContent(
+ new MultiButtonLayout.Builder()
+ .addButtonContent(button1)
+ .addButtonContent(button2)
+ .addButtonContent(button3)
+ .addButtonContent(button4)
+ .addButtonContent(button5)
+ .setFiveButtonDistribution(
+ MultiButtonLayout
+ .FIVE_BUTTON_DISTRIBUTION_BOTTOM_HEAVY)
+ .build())
+ .setPrimaryChipContent(primaryChipBuilder.build())
+ .build(),
+ "multibutton_layout_5button_bottom_chip_golden" + goldenSuffix);
+ testCases.put(
+ new PrimaryLayout.Builder(deviceParameters)
+ .setContent(
+ new MultiButtonLayout.Builder()
+ .addButtonContent(button1)
+ .addButtonContent(button2)
+ .addButtonContent(button3)
+ .addButtonContent(button4)
+ .addButtonContent(button5)
+ .addButtonContent(button6)
+ .build())
+ .build(),
+ "multibutton_layout_6button_golden" + goldenSuffix);
+ testCases.put(
+ new MultiButtonLayout.Builder()
+ .addButtonContent(button1)
+ .addButtonContent(button2)
+ .addButtonContent(button3)
+ .addButtonContent(button4)
+ .addButtonContent(button5)
+ .addButtonContent(button6)
+ .addButtonContent(button7)
+ .build(),
+ "multibutton_layout_7button_golden" + goldenSuffix);
+
+ return testCases;
+ }
+
+ @NonNull
+ private static Text buildTextLabel(@NonNull Context context, @NonNull String text) {
+ return new Text.Builder(context, text)
+ .setTypography(Typography.TYPOGRAPHY_CAPTION1)
+ .setColor(argb(Color.WHITE))
+ .build();
+ }
+
+ @NonNull
+ private static Box buildColoredBox(int color) {
+ return new Box.Builder()
+ .setWidth(expand())
+ .setHeight(expand())
+ .setModifiers(
+ new Modifiers.Builder()
+ .setBackground(
+ new Background.Builder().setColor(argb(color)).build())
+ .build())
+ .build();
+ }
+
+ @Dimension(unit = Dimension.DP)
+ static int pxToDp(int px, float scale) {
+ return (int) ((px - 0.5f) / scale);
+ }
+}
diff --git a/wear/tiles/tiles-material/src/androidTest/java/androidx/wear/tiles/material/testapp/GoldenTestActivity.java b/wear/tiles/tiles-material/src/androidTest/java/androidx/wear/tiles/material/testapp/GoldenTestActivity.java
index f775a6f..c9c23f7e 100644
--- a/wear/tiles/tiles-material/src/androidTest/java/androidx/wear/tiles/material/testapp/GoldenTestActivity.java
+++ b/wear/tiles/tiles-material/src/androidTest/java/androidx/wear/tiles/material/testapp/GoldenTestActivity.java
@@ -43,7 +43,6 @@
import java.util.concurrent.Executor;
-
public class GoldenTestActivity extends Activity {
private static final String ICON_ID = "tile_icon";
private static final String AVATAR = "avatar_image";
@@ -55,8 +54,7 @@
LayoutElement layoutElementProto;
try {
- layoutElementProto =
- LayoutElement.parseFrom(layoutPayload);
+ layoutElementProto = LayoutElement.parseFrom(layoutPayload);
} catch (Exception ex) {
// It's a test, just rethrow.
throw new IllegalArgumentException("Could not deserialize layout proto", ex);
@@ -75,12 +73,7 @@
Resources resources = generateResources();
TileRenderer renderer =
- new TileRenderer(
- appContext,
- layout,
- resources,
- mainExecutor,
- i -> {});
+ new TileRenderer(appContext, layout, resources, mainExecutor, i -> {});
View firstChild = renderer.inflate(root);
@@ -90,8 +83,10 @@
// Set the activity to be full screen so when we crop the Bitmap we don't get time bar etc.
requestWindowFeature(Window.FEATURE_NO_TITLE);
- getWindow().setFlags(WindowManager.LayoutParams.FLAG_FULLSCREEN,
- WindowManager.LayoutParams.FLAG_FULLSCREEN);
+ getWindow()
+ .setFlags(
+ WindowManager.LayoutParams.FLAG_FULLSCREEN,
+ WindowManager.LayoutParams.FLAG_FULLSCREEN);
setContentView(root, new ViewGroup.LayoutParams(SCREEN_WIDTH, SCREEN_HEIGHT));
super.onCreate(savedInstanceState);
@@ -118,4 +113,3 @@
.build();
}
}
-
diff --git a/wear/tiles/tiles-material/src/main/java/androidx/wear/tiles/material/Button.java b/wear/tiles/tiles-material/src/main/java/androidx/wear/tiles/material/Button.java
index c4b8537..7e2cab9 100644
--- a/wear/tiles/tiles-material/src/main/java/androidx/wear/tiles/material/Button.java
+++ b/wear/tiles/tiles-material/src/main/java/androidx/wear/tiles/material/Button.java
@@ -48,6 +48,7 @@
import androidx.wear.tiles.ModifiersBuilders.Clickable;
import androidx.wear.tiles.ModifiersBuilders.Corner;
import androidx.wear.tiles.ModifiersBuilders.Modifiers;
+import androidx.wear.tiles.ModifiersBuilders.Semantics;
import androidx.wear.tiles.material.Typography.TypographyName;
import androidx.wear.tiles.proto.LayoutElementProto;
@@ -294,9 +295,8 @@
.setWidth(mSize)
.setModifiers(modifiers.build());
- if (mType != NOT_SET) {
- element.addContent(getCorrectContent());
- }
+ element.addContent(getCorrectContent());
+
return new Button(element.build());
}
@@ -374,7 +374,7 @@
if (mCustomContent != null) {
numOfNonNull++;
}
- if (numOfNonNull == 0) {
+ if (numOfNonNull == 0 || mType == NOT_SET) {
throw new IllegalArgumentException("Content is not set.");
}
if (numOfNonNull > 1) {
@@ -409,11 +409,13 @@
}
/** Returns content description for this Button. */
- @NonNull
+ @Nullable
public CharSequence getContentDescription() {
- return checkNotNull(
- checkNotNull(checkNotNull(mElement.getModifiers()).getSemantics())
- .getContentDescription());
+ Semantics semantics = checkNotNull(mElement.getModifiers()).getSemantics();
+ if (semantics == null) {
+ return null;
+ }
+ return semantics.getContentDescription();
}
/** Returns size for this Button. */
@@ -431,32 +433,38 @@
@NonNull
public ButtonColors getButtonColors() {
ColorProp backgroundColor = getBackgroundColor();
- LayoutElement mainElement = checkNotNull(mElement.getContents().get(0));
- int type = getType(mainElement);
ColorProp contentColor;
- switch (type) {
- case Builder.ICON:
- contentColor =
- checkNotNull(
- checkNotNull(((Image) mainElement).getColorFilter()).getTint());
- break;
- case Builder.TEXT:
- contentColor =
- checkNotNull(
- checkNotNull(
- ((LayoutElementBuilders.Text) mainElement)
- .getFontStyle())
- .getColor());
- break;
- case Builder.IMAGE:
- case Builder.CUSTOM_CONTENT:
- case Builder.NOT_SET:
- default:
- // Default color so we can construct ButtonColors object in case where content color
- // is not set (i.e. button with an actual image doesn't use content color, or
- // content is set to custom one by the user.
- contentColor = new ColorProp.Builder().build();
- break;
+
+ if (mElement.getContents().size() > 0) {
+ LayoutElement mainElement = mElement.getContents().get(0);
+ int type = getType(mainElement);
+ // Default color so we can construct ButtonColors object in case where content color is
+ // not set (i.e. button with an actual image doesn't use content color, or content is
+ // set to custom one by the user.
+ switch (type) {
+ case Builder.ICON:
+ contentColor =
+ checkNotNull(
+ checkNotNull(((Image) mainElement).getColorFilter()).getTint());
+ break;
+ case Builder.TEXT:
+ contentColor =
+ checkNotNull(
+ checkNotNull(
+ ((LayoutElementBuilders.Text) mainElement)
+ .getFontStyle())
+ .getColor());
+ break;
+ case Builder.IMAGE:
+ case Builder.CUSTOM_CONTENT:
+ case Builder.NOT_SET:
+ default:
+ // No content color.
+ contentColor = new ColorProp.Builder().build();
+ break;
+ }
+ } else {
+ contentColor = new ColorProp.Builder().build();
}
return new ButtonColors(backgroundColor, contentColor);
diff --git a/wear/tiles/tiles-material/src/main/java/androidx/wear/tiles/material/Chip.java b/wear/tiles/tiles-material/src/main/java/androidx/wear/tiles/material/Chip.java
index 695baa2..f6d1faa 100644
--- a/wear/tiles/tiles-material/src/main/java/androidx/wear/tiles/material/Chip.java
+++ b/wear/tiles/tiles-material/src/main/java/androidx/wear/tiles/material/Chip.java
@@ -55,6 +55,7 @@
import androidx.wear.tiles.ModifiersBuilders.Corner;
import androidx.wear.tiles.ModifiersBuilders.Modifiers;
import androidx.wear.tiles.ModifiersBuilders.Padding;
+import androidx.wear.tiles.ModifiersBuilders.Semantics;
import androidx.wear.tiles.material.Typography.TypographyName;
import androidx.wear.tiles.proto.LayoutElementProto;
@@ -270,8 +271,8 @@
* Sets the colors for the {@link Chip}. If set, {@link ChipColors#getBackgroundColor()}
* will be used for the background of the button, {@link ChipColors#getContentColor()} for
* main text, {@link ChipColors#getSecondaryContentColor()} for label text and {@link
- * ChipColors#getIconTintColor()} will be used as tint color for the icon itself. If not
- * set, {@link ChipDefaults#PRIMARY_COLORS} will be used.
+ * ChipColors#getIconColor()} will be used as color for the icon itself. If not set, {@link
+ * ChipDefaults#PRIMARY_COLORS} will be used.
*/
@NonNull
public Builder setChipColors(@NonNull ChipColors chipColors) {
@@ -399,7 +400,7 @@
.setHeight(ICON_SIZE)
.setColorFilter(
new ColorFilter.Builder()
- .setTint(mChipColors.getIconTintColor())
+ .setTint(mChipColors.getIconColor())
.build())
.build())
.addContent(
@@ -539,11 +540,13 @@
}
/** Returns content description of this Chip. */
- @NonNull
+ @Nullable
public CharSequence getContentDescription() {
- return checkNotNull(
- checkNotNull(checkNotNull(mElement.getModifiers()).getSemantics())
- .getContentDescription());
+ Semantics semantics = checkNotNull(mElement.getModifiers()).getSemantics();
+ if (semantics == null) {
+ return null;
+ }
+ return semantics.getContentDescription();
}
/** Returns content of this Chip. */
diff --git a/wear/tiles/tiles-material/src/main/java/androidx/wear/tiles/material/ChipColors.java b/wear/tiles/tiles-material/src/main/java/androidx/wear/tiles/material/ChipColors.java
index 012d20f..e739b1d 100644
--- a/wear/tiles/tiles-material/src/main/java/androidx/wear/tiles/material/ChipColors.java
+++ b/wear/tiles/tiles-material/src/main/java/androidx/wear/tiles/material/ChipColors.java
@@ -31,7 +31,7 @@
*/
public class ChipColors {
@NonNull private final ColorProp mBackgroundColor;
- @NonNull private final ColorProp mIconTintColor;
+ @NonNull private final ColorProp mIconColor;
@NonNull private final ColorProp mContentColor;
@NonNull private final ColorProp mSecondaryContentColor;
@@ -40,8 +40,8 @@
*
* @param backgroundColor The background color to be used for a chip Tiles component. Should be
* in ARGB format.
- * @param iconTintColor The tint color to be used for an icon in a chip Tiles component. Should
- * be in ARGB format.
+ * @param iconColor The color to be used for an icon in a chip Tiles component. Should be in
+ * ARGB format.
* @param contentColor The text color to be used for a main text in a chip Tiles component.
* Should be in ARGB format.
* @param secondaryContentColor The text color to be used for a label text in a chip Tiles
@@ -49,11 +49,11 @@
*/
public ChipColors(
@ColorInt int backgroundColor,
- @ColorInt int iconTintColor,
+ @ColorInt int iconColor,
@ColorInt int contentColor,
@ColorInt int secondaryContentColor) {
mBackgroundColor = argb(backgroundColor);
- mIconTintColor = argb(iconTintColor);
+ mIconColor = argb(iconColor);
mContentColor = argb(contentColor);
mSecondaryContentColor = argb(secondaryContentColor);
}
@@ -68,7 +68,7 @@
*/
public ChipColors(@ColorInt int backgroundColor, @ColorInt int contentColor) {
mBackgroundColor = argb(backgroundColor);
- mIconTintColor = argb(contentColor);
+ mIconColor = argb(contentColor);
mContentColor = argb(contentColor);
mSecondaryContentColor = argb(contentColor);
}
@@ -77,18 +77,18 @@
* Constructor for the {@link ChipColors} object.
*
* @param backgroundColor The background color to be used for a chip Tiles component.
- * @param iconTintColor The tint color to be used for an icon in a chip Tiles component.
+ * @param iconColor The color to be used for an icon in a chip Tiles component.
* @param contentColor The text color to be used for a main text in a chip Tiles component.
* @param secondaryContentColor The text color to be used for a label text in a chip Tiles
* component.
*/
public ChipColors(
@NonNull ColorProp backgroundColor,
- @NonNull ColorProp iconTintColor,
+ @NonNull ColorProp iconColor,
@NonNull ColorProp contentColor,
@NonNull ColorProp secondaryContentColor) {
mBackgroundColor = backgroundColor;
- mIconTintColor = iconTintColor;
+ mIconColor = iconColor;
mContentColor = contentColor;
mSecondaryContentColor = secondaryContentColor;
}
@@ -101,7 +101,7 @@
*/
public ChipColors(@NonNull ColorProp backgroundColor, @NonNull ColorProp contentColor) {
mBackgroundColor = backgroundColor;
- mIconTintColor = contentColor;
+ mIconColor = contentColor;
mContentColor = contentColor;
mSecondaryContentColor = contentColor;
}
@@ -130,10 +130,10 @@
return mBackgroundColor;
}
- /** The icon tint color to be used on a chip Tiles components. */
+ /** The icon color to be used on a chip Tiles components. */
@NonNull
- public ColorProp getIconTintColor() {
- return mIconTintColor;
+ public ColorProp getIconColor() {
+ return mIconColor;
}
/** The main text color to be used on a chip Tiles components. */
diff --git a/wear/tiles/tiles-material/src/main/java/androidx/wear/tiles/material/CircularProgressIndicator.java b/wear/tiles/tiles-material/src/main/java/androidx/wear/tiles/material/CircularProgressIndicator.java
index 7861631..f9f40c4 100644
--- a/wear/tiles/tiles-material/src/main/java/androidx/wear/tiles/material/CircularProgressIndicator.java
+++ b/wear/tiles/tiles-material/src/main/java/androidx/wear/tiles/material/CircularProgressIndicator.java
@@ -29,6 +29,7 @@
import androidx.annotation.Dimension;
import androidx.annotation.FloatRange;
import androidx.annotation.NonNull;
+import androidx.annotation.Nullable;
import androidx.annotation.RestrictTo;
import androidx.annotation.RestrictTo.Scope;
import androidx.wear.tiles.DimensionBuilders.DegreesProp;
@@ -38,6 +39,7 @@
import androidx.wear.tiles.LayoutElementBuilders.ArcLine;
import androidx.wear.tiles.LayoutElementBuilders.ArcSpacer;
import androidx.wear.tiles.LayoutElementBuilders.LayoutElement;
+import androidx.wear.tiles.ModifiersBuilders;
import androidx.wear.tiles.ModifiersBuilders.Modifiers;
import androidx.wear.tiles.ModifiersBuilders.Padding;
import androidx.wear.tiles.ModifiersBuilders.Semantics;
@@ -170,22 +172,22 @@
checkAngles();
DegreesProp length = getLength();
+ Modifiers.Builder modifiers =
+ new Modifiers.Builder()
+ .setPadding(new Padding.Builder().setAll(DEFAULT_PADDING).build());
+
+ if (mContentDescription.length() > 0) {
+ modifiers.setSemantics(
+ new ModifiersBuilders.Semantics.Builder()
+ .setContentDescription(mContentDescription.toString())
+ .build());
+ }
+
Arc.Builder element =
new Arc.Builder()
.setAnchorType(LayoutElementBuilders.ARC_ANCHOR_START)
.setAnchorAngle(mStartAngle)
- .setModifiers(
- new Modifiers.Builder()
- .setSemantics(
- new Semantics.Builder()
- .setContentDescription(
- mContentDescription.toString())
- .build())
- .setPadding(
- new Padding.Builder()
- .setAll(DEFAULT_PADDING)
- .build())
- .build())
+ .setModifiers(modifiers.build())
.addContent(
new ArcLine.Builder()
.setColor(
@@ -261,10 +263,13 @@
}
/** Returns content description of this CircularProgressIndicator. */
- @NonNull
- public String getContentDescription() {
- return checkNotNull(checkNotNull(mElement.getModifiers()).getSemantics())
- .getContentDescription();
+ @Nullable
+ public CharSequence getContentDescription() {
+ Semantics semantics = checkNotNull(mElement.getModifiers()).getSemantics();
+ if (semantics == null) {
+ return null;
+ }
+ return semantics.getContentDescription();
}
/** @hide */
diff --git a/wear/tiles/tiles-material/src/main/java/androidx/wear/tiles/material/Text.java b/wear/tiles/tiles-material/src/main/java/androidx/wear/tiles/material/Text.java
index bb2cb4a..ae3ef02 100644
--- a/wear/tiles/tiles-material/src/main/java/androidx/wear/tiles/material/Text.java
+++ b/wear/tiles/tiles-material/src/main/java/androidx/wear/tiles/material/Text.java
@@ -88,8 +88,8 @@
@NonNull
@SuppressWarnings("MissingGetterMatchingBuilder")
// There is getFontStyle matching getter for this setter as the serialized format of the
- // Tiles do not allow for a direct reconstruction of the all arguments, but it has
- // FontStyle object of that text.
+ // Tiles do not allow for a direct reconstruction of the all arguments, but it has FontStyle
+ // object of that text.
public Builder setTypography(@TypographyName int typography) {
this.mTypographyName = typography;
return this;
diff --git a/wear/tiles/tiles-material/src/main/java/androidx/wear/tiles/material/layouts/MultiButtonLayout.java b/wear/tiles/tiles-material/src/main/java/androidx/wear/tiles/material/layouts/MultiButtonLayout.java
index d35089d..af498ef 100644
--- a/wear/tiles/tiles-material/src/main/java/androidx/wear/tiles/material/layouts/MultiButtonLayout.java
+++ b/wear/tiles/tiles-material/src/main/java/androidx/wear/tiles/material/layouts/MultiButtonLayout.java
@@ -27,6 +27,7 @@
import androidx.annotation.IntDef;
import androidx.annotation.NonNull;
import androidx.annotation.RestrictTo;
+import androidx.annotation.RestrictTo.Scope;
import androidx.wear.tiles.DimensionBuilders.DpProp;
import androidx.wear.tiles.LayoutElementBuilders.Box;
import androidx.wear.tiles.LayoutElementBuilders.Column;
@@ -112,9 +113,9 @@
int buttonNum = mButtonsContent.size();
if (buttonNum > MULTI_BUTTON_MAX_NUMBER) {
throw new IllegalArgumentException(
- "Too many button are added. Maximum number is "
- + MULTI_BUTTON_MAX_NUMBER + "."
- );
+ "Too many buttons are added. Maximum number is "
+ + MULTI_BUTTON_MAX_NUMBER
+ + ".");
}
LayoutElement buttons = buildButtons(buttonNum);
@@ -263,7 +264,7 @@
public List<LayoutElement> getButtonContents() {
List<LayoutElement> buttons = new ArrayList<>();
List<LayoutElement> contents = mElement.getContents();
- if (contents.size() == 0) {
+ if (contents.isEmpty()) {
return buttons;
}
LayoutElement innerContent = contents.get(0);
@@ -295,8 +296,7 @@
LayoutElement innerContent = contents.get(0);
if (innerContent instanceof Column && ((Column) innerContent).getContents().size() == 3) {
// 1st and 3rd row are buttons. Check whether the first row has 5 (3 buttons + 2 spacer)
- // - top
- // heavy or 3 (2 buttons + spacer) - bottom heavy elements.
+ // - top heavy or 3 (2 buttons + spacer) - bottom heavy elements.
LayoutElement firstElement = ((Column) innerContent).getContents().get(0);
if (firstElement instanceof Row && ((Row) firstElement).getContents().size() == 5) {
return FIVE_BUTTON_DISTRIBUTION_TOP_HEAVY;
@@ -318,7 +318,7 @@
/** @hide */
@NonNull
@Override
- @RestrictTo(RestrictTo.Scope.LIBRARY_GROUP)
+ @RestrictTo(Scope.LIBRARY_GROUP)
public LayoutElementProto.LayoutElement toLayoutElementProto() {
return mElement.toLayoutElementProto();
}
diff --git a/wear/tiles/tiles-material/src/main/java/androidx/wear/tiles/material/layouts/MultiSlotLayout.java b/wear/tiles/tiles-material/src/main/java/androidx/wear/tiles/material/layouts/MultiSlotLayout.java
index 710266e..884dbbe 100644
--- a/wear/tiles/tiles-material/src/main/java/androidx/wear/tiles/material/layouts/MultiSlotLayout.java
+++ b/wear/tiles/tiles-material/src/main/java/androidx/wear/tiles/material/layouts/MultiSlotLayout.java
@@ -137,9 +137,9 @@
}
/** Gets the width of horizontal spacer that is between slots. */
- // The @Dimension(unit = DP) on getLinearDimension.getValue() is seemingly being ignored,
- // so lint complains that we're passing PX to something expecting DP. Just suppress the
- // warning for now.
+ // The @Dimension(unit = DP) on getLinearDimension.getValue() is seemingly being ignored, so
+ // lint complains that we're passing PX to something expecting DP. Just suppress the warning for
+ // now.
@SuppressLint("ResourceType")
@Dimension(unit = DP)
public float getHorizontalSpacerWidth() {
diff --git a/wear/tiles/tiles-material/src/main/java/androidx/wear/tiles/material/layouts/PrimaryLayout.java b/wear/tiles/tiles-material/src/main/java/androidx/wear/tiles/material/layouts/PrimaryLayout.java
index 2b8876c..abd3fc4 100644
--- a/wear/tiles/tiles-material/src/main/java/androidx/wear/tiles/material/layouts/PrimaryLayout.java
+++ b/wear/tiles/tiles-material/src/main/java/androidx/wear/tiles/material/layouts/PrimaryLayout.java
@@ -40,6 +40,7 @@
import androidx.annotation.RestrictTo.Scope;
import androidx.wear.tiles.DeviceParametersBuilders.DeviceParameters;
import androidx.wear.tiles.DimensionBuilders.DpProp;
+import androidx.wear.tiles.DimensionBuilders.SpacerDimension;
import androidx.wear.tiles.LayoutElementBuilders;
import androidx.wear.tiles.LayoutElementBuilders.Box;
import androidx.wear.tiles.LayoutElementBuilders.Column;
@@ -50,6 +51,8 @@
import androidx.wear.tiles.material.CompactChip;
import androidx.wear.tiles.proto.LayoutElementProto;
+import java.util.List;
+
/**
* Tiles layout that represents a suggested layout style for Material Tiles with the primary
* (compact) chip at the bottom with the given content in the center and the recommended margin and
@@ -57,10 +60,18 @@
*/
// TODO(b/215323986): Link visuals.
public class PrimaryLayout implements LayoutElement {
- @NonNull private final LayoutElement mElement;
+ @NonNull private final Box mImpl;
- PrimaryLayout(@NonNull LayoutElement layoutElement) {
- this.mElement = layoutElement;
+ // This contains inner columns and primary chip.
+ @NonNull private final List<LayoutElement> mAllContent;
+
+ // This contains optional labels, spacers and main content.
+ @NonNull private final List<LayoutElement> mInnerColumn;
+
+ PrimaryLayout(@NonNull Box layoutElement) {
+ this.mImpl = layoutElement;
+ this.mAllContent = ((Column) layoutElement.getContents().get(0)).getContents();
+ this.mInnerColumn = ((Column) mAllContent.get(0)).getContents();
}
/** Builder class for {@link PrimaryLayout}. */
@@ -88,10 +99,6 @@
* {@link CompactChip} as the layout is optimized for it.
*/
@NonNull
- @SuppressWarnings("MissingGetterMatchingBuilder")
- // There is no direct matching getter for this setter as the serialized format of the
- // Tiles do not allow for a direct reconstruction of the arguments. Instead there are
- // methods to get the contents a whole for rendering.
public Builder setPrimaryChipContent(@NonNull LayoutElement compactChip) {
this.mPrimaryChip = compactChip;
return this;
@@ -99,10 +106,6 @@
/** Sets the content in the primary label slot which will be above the main content. */
@NonNull
- @SuppressWarnings("MissingGetterMatchingBuilder")
- // There is no direct matching getter for this setter as the serialized format of the
- // Tiles do not allow for a direct reconstruction of the arguments. Instead there are
- // methods to get the contents a whole for rendering.
public Builder setPrimaryLabelTextContent(@NonNull LayoutElement primaryLabelText) {
this.mPrimaryLabelText = primaryLabelText;
return this;
@@ -113,10 +116,6 @@
* highly recommended to have primary label set when having secondary label.
*/
@NonNull
- @SuppressWarnings("MissingGetterMatchingBuilder")
- // There is no direct matching getter for this setter as the serialized format of the
- // Tiles do not allow for a direct reconstruction of the arguments. Instead there are
- // methods to get the contents a whole for rendering.
public Builder setSecondaryLabelTextContent(@NonNull LayoutElement secondaryLabelText) {
this.mSecondaryLabelText = secondaryLabelText;
return this;
@@ -124,9 +123,6 @@
/** Sets the additional content to this layout, above the primary chip. */
@NonNull
- @SuppressWarnings("MissingGetterMatchingBuilder")
- // TODO(b/221427609): Add getter - there is a problem when serialising this to the Tiles
- // as we can't easily reconstruct the position of the actual content vs additional labels.
public Builder setContent(@NonNull LayoutElement content) {
this.mContent = content;
return this;
@@ -141,10 +137,6 @@
// The @Dimension(unit = DP) on dp() is seemingly being ignored, so lint complains that
// we're passing PX to something expecting DP. Just suppress the warning for now.
@SuppressLint("ResourceType")
- @SuppressWarnings("MissingGetterMatchingBuilder")
- // There is no direct matching getter for this setter as the serialized format of the
- // Tiles do not allow for a direct reconstruction of the arguments. Instead there are
- // methods to get the contents a whole for rendering.
public Builder setVerticalSpacerHeight(@Dimension(unit = DP) float height) {
this.mVerticalSpacerHeight = dp(height);
return this;
@@ -241,7 +233,7 @@
.build());
}
- LayoutElement.Builder element =
+ Box.Builder element =
new Box.Builder()
.setWidth(expand())
.setHeight(expand())
@@ -263,11 +255,118 @@
}
}
+ private int getFirstInnerSpacerPosition() {
+ for (int i = 0; i < mInnerColumn.size(); i++) {
+ LayoutElement element = mInnerColumn.get(i);
+ if (element instanceof Spacer) {
+ return i;
+ }
+ }
+ return -1;
+ }
+
+ private int getLastInnerSpacerPosition() {
+ for (int i = mInnerColumn.size() - 1; i >= 0; i--) {
+ LayoutElement element = mInnerColumn.get(i);
+ if (element instanceof Spacer) {
+ return i;
+ }
+ }
+ return -1;
+ }
+
+ /** Get the primary label content from this layout. */
+ @Nullable
+ public LayoutElement getPrimaryLabelTextContent() {
+ if (mInnerColumn.size() >= 3) {
+ int spacerPosition = getFirstInnerSpacerPosition();
+ if (spacerPosition != -1) {
+ LayoutElement potentialLabel = mInnerColumn.get(spacerPosition - 1);
+ // Primary label is the one before the first spacer.
+ // TODO(b/231289666): Use tags to perform this check.
+ if (!(potentialLabel instanceof Box)) {
+ return potentialLabel;
+ }
+ }
+ }
+ return null;
+ }
+
+ /** Get the secondary label content from this layout. */
+ @Nullable
+ public LayoutElement getSecondaryLabelTextContent() {
+ if (mInnerColumn.size() >= 3) {
+ int spacerPosition = getLastInnerSpacerPosition();
+ if (spacerPosition != -1) {
+ LayoutElement potentialLabel = mInnerColumn.get(spacerPosition + 1);
+ // Secondary label is the one after the last spacer.
+ // TODO(b/231289666): Use tags to perform this check.
+ if (!(potentialLabel instanceof Box)) {
+ return potentialLabel;
+ }
+ }
+ }
+ return null;
+ }
+
+ /** Get the inner content from this layout. */
+ @Nullable
+ public LayoutElement getContent() {
+ if (mInnerColumn.size() == 1) {
+ return ((Box) mInnerColumn.get(0)).getContents().get(0);
+ } else {
+ int spacerPosition = getFirstInnerSpacerPosition();
+ if (spacerPosition != -1) {
+ // Here we found where the first spacer is. There are couple of cases: 1. Both label
+ // are present -> content is after found spacer. 2. Primary label is present ->
+ // content is after found spacer. 3. Secondary label is present -> content is before
+ // found spacer. Cases 2 & 3 are only differentiated by whether the element before
+ // or after spacer is Box
+ // (then we're fairly sure it's a content).
+ LayoutElement potentialContent = mInnerColumn.get(spacerPosition + 1);
+ if (potentialContent instanceof Box) {
+ return ((Box) potentialContent).getContents().get(0);
+ } else {
+ potentialContent = mInnerColumn.get(spacerPosition - 1);
+ if (potentialContent instanceof Box) {
+ return ((Box) potentialContent).getContents().get(0);
+ }
+ }
+ }
+ }
+ return null;
+ }
+
+ /** Get the primary chip content from this layout. */
+ @Nullable
+ public LayoutElement getPrimaryChipContent() {
+ if (mAllContent.size() == 3) {
+ return ((Box) mAllContent.get(2)).getContents().get(0);
+ }
+ return null;
+ }
+
+ /** Get the primary chip content from this layout. */
+ // The @Dimension(unit = DP) on getValue() is seemingly being ignored, so lint complains that
+ // we're passing PX to something expecting DP. Just suppress the warning for now.
+ @SuppressLint("ResourceType")
+ @Dimension(unit = DP)
+ public float getVerticalSpacerHeight() {
+ int spacerPosition = getFirstInnerSpacerPosition();
+ if (spacerPosition >= 0) {
+ SpacerDimension height = ((Spacer) mInnerColumn.get(spacerPosition)).getHeight();
+ if (height instanceof DpProp) {
+ return ((DpProp) height).getValue();
+ }
+ }
+ return DEFAULT_VERTICAL_SPACER_HEIGHT.getValue();
+ }
+
/** @hide */
@NonNull
@Override
@RestrictTo(Scope.LIBRARY_GROUP)
public LayoutElementProto.LayoutElement toLayoutElementProto() {
- return mElement.toLayoutElementProto();
+ return mImpl.toLayoutElementProto();
}
}
diff --git a/wear/tiles/tiles-material/src/main/java/androidx/wear/tiles/material/layouts/ProgressIndicatorLayout.java b/wear/tiles/tiles-material/src/main/java/androidx/wear/tiles/material/layouts/ProgressIndicatorLayout.java
index ea680c5..b0f01c9 100644
--- a/wear/tiles/tiles-material/src/main/java/androidx/wear/tiles/material/layouts/ProgressIndicatorLayout.java
+++ b/wear/tiles/tiles-material/src/main/java/androidx/wear/tiles/material/layouts/ProgressIndicatorLayout.java
@@ -38,6 +38,8 @@
import androidx.wear.tiles.material.CircularProgressIndicator;
import androidx.wear.tiles.proto.LayoutElementProto;
+import java.util.List;
+
/**
* Tiles layout that represents the suggested layout style for Material Tiles with the progress
* indicator around the edges of the screen and the given content inside of it and the recommended
@@ -45,9 +47,9 @@
*/
// TODO(b/215323986): Link visuals.
public class ProgressIndicatorLayout implements LayoutElement {
- @NonNull private final LayoutElement mElement;
+ @NonNull private final Box mElement;
- ProgressIndicatorLayout(@NonNull LayoutElement layoutElement) {
+ ProgressIndicatorLayout(@NonNull Box layoutElement) {
this.mElement = layoutElement;
}
@@ -67,10 +69,6 @@
/** Sets the progress indicator which will be around the edges. */
@NonNull
- // There is no direct matching getter for this setter as the serialized format of the
- // Tiles do not allow for a direct reconstruction of the arguments. Instead there are
- // methods to get the contents a whole for rendering.
- @SuppressWarnings("MissingGetterMatchingBuilder")
public Builder setProgressIndicatorContent(@NonNull LayoutElement progressIndicator) {
this.mProgressIndicator = progressIndicator;
return this;
@@ -144,10 +142,35 @@
}
}
- /** Get the inner content from this layout. */
- @NonNull
+ /** Returns the inner content from this layout. */
+ @Nullable
public LayoutElement getContent() {
- return checkNotNull(((Box) ((Box) mElement).getContents().get(0)).getContents().get(0));
+ List<LayoutElement> contents = mElement.getContents();
+ if (contents.size() > 0) {
+ // If content exists, it will always be the first one in the list. If that element is
+ // not Box, than this layout only has indicator, so we'll return null.
+ LayoutElement element = contents.get(0);
+ if (element instanceof Box) {
+ return checkNotNull(((Box) element).getContents().get(0));
+ }
+ }
+ return null;
+ }
+
+ /** Returns the progress indicator content from this layout. */
+ @Nullable
+ public LayoutElement getProgressIndicatorContent() {
+ List<LayoutElement> contents = mElement.getContents();
+ int size = contents.size();
+ if (size > 0) {
+ // If progress indicator exists, it will always be the last one in the list and not
+ // wrapped in the Box.
+ LayoutElement element = contents.get(size - 1);
+ if (!(element instanceof Box)) {
+ return element;
+ }
+ }
+ return null;
}
/** @hide */
diff --git a/wear/tiles/tiles-material/src/test/java/androidx/wear/tiles/material/ButtonColorsTest.java b/wear/tiles/tiles-material/src/test/java/androidx/wear/tiles/material/ButtonColorsTest.java
new file mode 100644
index 0000000..19a2a39
--- /dev/null
+++ b/wear/tiles/tiles-material/src/test/java/androidx/wear/tiles/material/ButtonColorsTest.java
@@ -0,0 +1,72 @@
+/*
+ * Copyright 2022 The Android Open Source Project
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package androidx.wear.tiles.material;
+
+import static androidx.wear.tiles.ColorBuilders.argb;
+
+import static com.google.common.truth.Truth.assertThat;
+
+import androidx.test.ext.junit.runners.AndroidJUnit4;
+import androidx.wear.tiles.ColorBuilders.ColorProp;
+
+import org.junit.Test;
+import org.junit.runner.RunWith;
+import org.robolectric.annotation.internal.DoNotInstrument;
+
+@RunWith(AndroidJUnit4.class)
+@DoNotInstrument
+public class ButtonColorsTest {
+ private static final int ARGB_BACKGROUND_COLOR = 0x12345678;
+ private static final int ARGB_CONTENT_COLOR = 0x11223344;
+ private final ColorProp mBackgroundColor = argb(ARGB_BACKGROUND_COLOR);
+ private final ColorProp mContentColor = argb(ARGB_CONTENT_COLOR);
+ private final Colors mColors = new Colors(0x123, 0x234, 0x345, 0x456);
+
+ @Test
+ public void testCreateButtonColorsFromArgb() {
+ ButtonColors buttonColors = new ButtonColors(ARGB_BACKGROUND_COLOR, ARGB_CONTENT_COLOR);
+
+ assertThat(buttonColors.getBackgroundColor().getArgb())
+ .isEqualTo(mBackgroundColor.getArgb());
+ assertThat(buttonColors.getContentColor().getArgb()).isEqualTo(mContentColor.getArgb());
+ }
+
+ @Test
+ public void testCreateButtonColorsFromColorProp() {
+ ButtonColors buttonColors = new ButtonColors(mBackgroundColor, mContentColor);
+
+ assertThat(buttonColors.getBackgroundColor().getArgb())
+ .isEqualTo(mBackgroundColor.getArgb());
+ assertThat(buttonColors.getContentColor().getArgb()).isEqualTo(mContentColor.getArgb());
+ }
+
+ @Test
+ public void testCreateButtonColorsFromHelperPrimary() {
+ ButtonColors buttonColors = ButtonColors.primaryButtonColors(mColors);
+
+ assertThat(buttonColors.getBackgroundColor().getArgb()).isEqualTo(mColors.getPrimary());
+ assertThat(buttonColors.getContentColor().getArgb()).isEqualTo(mColors.getOnPrimary());
+ }
+
+ @Test
+ public void testCreateButtonColorsFromHelperSurface() {
+ ButtonColors buttonColors = ButtonColors.secondaryButtonColors(mColors);
+
+ assertThat(buttonColors.getBackgroundColor().getArgb()).isEqualTo(mColors.getSurface());
+ assertThat(buttonColors.getContentColor().getArgb()).isEqualTo(mColors.getOnSurface());
+ }
+}
diff --git a/wear/tiles/tiles-material/src/test/java/androidx/wear/tiles/material/ButtonTest.java b/wear/tiles/tiles-material/src/test/java/androidx/wear/tiles/material/ButtonTest.java
index 66727e3..733f4e1 100644
--- a/wear/tiles/tiles-material/src/test/java/androidx/wear/tiles/material/ButtonTest.java
+++ b/wear/tiles/tiles-material/src/test/java/androidx/wear/tiles/material/ButtonTest.java
@@ -26,8 +26,12 @@
import static com.google.common.truth.Truth.assertThat;
+import static org.junit.Assert.assertThrows;
+
import android.content.Context;
+import androidx.annotation.NonNull;
+import androidx.annotation.Nullable;
import androidx.test.core.app.ApplicationProvider;
import androidx.test.ext.junit.runners.AndroidJUnit4;
import androidx.wear.tiles.ActionBuilders.LaunchAction;
@@ -57,6 +61,21 @@
new Text.Builder(mContext, "ABC").setColor(argb(0)).build();
@Test
+ public void testButtonEmpty() {
+ assertThrows(
+ IllegalArgumentException.class,
+ () -> new Button.Builder(mContext, CLICKABLE).build());
+ }
+
+ @Test
+ public void testButtonCustomAddedContentNoContentDesc() {
+ Button button = new Button.Builder(mContext, CLICKABLE).setContent(mContent).build();
+
+ assertButtonIsEqual(
+ button, mContent, DEFAULT_BUTTON_SIZE, new ButtonColors(Colors.PRIMARY, 0), null);
+ }
+
+ @Test
public void testButtonCustom() {
DpProp mSize = LARGE_BUTTON_SIZE;
ButtonColors mButtonColors = new ButtonColors(0x11223344, 0);
@@ -195,16 +214,20 @@
.build();
assertButtonIsEqual(
- button, content, EXTRA_LARGE_BUTTON_SIZE, PRIMARY_BUTTON_COLORS, CONTENT_DESCRIPTION
- );
+ button,
+ content,
+ EXTRA_LARGE_BUTTON_SIZE,
+ PRIMARY_BUTTON_COLORS,
+ CONTENT_DESCRIPTION);
}
private void assertButtonIsEqual(
- Button actualButton,
- LayoutElement expectedContent,
- DpProp expectedSize,
- ButtonColors expectedButtonColors,
- String expectedContentDescription) {
+ @NonNull Button actualButton,
+ @NonNull LayoutElement expectedContent,
+ @NonNull DpProp expectedSize,
+ @NonNull ButtonColors expectedButtonColors,
+ @Nullable String expectedContentDescription) {
+ // Mandatory
assertThat(actualButton.getClickable().toProto()).isEqualTo(CLICKABLE.toProto());
assertThat(actualButton.getSize().toContainerDimensionProto())
.isEqualTo(expectedSize.toContainerDimensionProto());
@@ -214,7 +237,13 @@
.isEqualTo(expectedButtonColors.getContentColor().getArgb());
assertThat(actualButton.getContent().toLayoutElementProto())
.isEqualTo(expectedContent.toLayoutElementProto());
- assertThat(actualButton.getContentDescription().toString())
- .isEqualTo(expectedContentDescription);
+
+ // Nullable
+ if (expectedContentDescription == null) {
+ assertThat(actualButton.getContentDescription()).isNull();
+ } else {
+ assertThat(actualButton.getContentDescription().toString())
+ .isEqualTo(expectedContentDescription);
+ }
}
}
diff --git a/wear/tiles/tiles-material/src/test/java/androidx/wear/tiles/material/ChipColorsTest.java b/wear/tiles/tiles-material/src/test/java/androidx/wear/tiles/material/ChipColorsTest.java
new file mode 100644
index 0000000..899c1e0
--- /dev/null
+++ b/wear/tiles/tiles-material/src/test/java/androidx/wear/tiles/material/ChipColorsTest.java
@@ -0,0 +1,114 @@
+/*
+ * Copyright 2022 The Android Open Source Project
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package androidx.wear.tiles.material;
+
+import static androidx.wear.tiles.ColorBuilders.argb;
+
+import static com.google.common.truth.Truth.assertThat;
+
+import androidx.test.ext.junit.runners.AndroidJUnit4;
+import androidx.wear.tiles.ColorBuilders.ColorProp;
+
+import org.junit.Test;
+import org.junit.runner.RunWith;
+import org.robolectric.annotation.internal.DoNotInstrument;
+
+@RunWith(AndroidJUnit4.class)
+@DoNotInstrument
+public class ChipColorsTest {
+ private static final int ARGB_BACKGROUND_COLOR = 0x12345678;
+ private static final int ARGB_CONTENT_COLOR = 0x11223344;
+ private static final int ARGB_SECONDARY_CONTENT_COLOR = 0x11223355;
+ private static final int ARGB_ICON_COLOR = 0x11223366;
+ private final ColorProp mBackgroundColor = argb(ARGB_BACKGROUND_COLOR);
+ private final ColorProp mContentColor = argb(ARGB_CONTENT_COLOR);
+ private final ColorProp mIconColor = argb(ARGB_ICON_COLOR);
+ private final ColorProp mSecondaryContentColor = argb(ARGB_SECONDARY_CONTENT_COLOR);
+ private final Colors mColors = new Colors(0x123, 0x234, 0x345, 0x456);
+
+ @Test
+ public void testCreateChipColorsFromArgb() {
+ ChipColors chipColors = new ChipColors(ARGB_BACKGROUND_COLOR, ARGB_CONTENT_COLOR);
+
+ assertThat(chipColors.getBackgroundColor().getArgb()).isEqualTo(mBackgroundColor.getArgb());
+ assertThat(chipColors.getIconColor().getArgb()).isEqualTo(mContentColor.getArgb());
+ assertThat(chipColors.getContentColor().getArgb()).isEqualTo(mContentColor.getArgb());
+ assertThat(chipColors.getSecondaryContentColor().getArgb())
+ .isEqualTo(mContentColor.getArgb());
+ }
+
+ @Test
+ public void testCreateChipColorsFromColorProp() {
+ ChipColors chipColors = new ChipColors(mBackgroundColor, mContentColor);
+
+ assertThat(chipColors.getBackgroundColor().getArgb()).isEqualTo(mBackgroundColor.getArgb());
+ assertThat(chipColors.getIconColor().getArgb()).isEqualTo(mContentColor.getArgb());
+ assertThat(chipColors.getContentColor().getArgb()).isEqualTo(mContentColor.getArgb());
+ assertThat(chipColors.getSecondaryContentColor().getArgb())
+ .isEqualTo(mContentColor.getArgb());
+ }
+
+ @Test
+ public void testCreateChipColorsFullFromArgb() {
+ ChipColors chipColors =
+ new ChipColors(
+ ARGB_BACKGROUND_COLOR,
+ ARGB_ICON_COLOR,
+ ARGB_CONTENT_COLOR,
+ ARGB_SECONDARY_CONTENT_COLOR);
+
+ assertThat(chipColors.getBackgroundColor().getArgb()).isEqualTo(mBackgroundColor.getArgb());
+ assertThat(chipColors.getIconColor().getArgb()).isEqualTo(mIconColor.getArgb());
+ assertThat(chipColors.getContentColor().getArgb()).isEqualTo(mContentColor.getArgb());
+ assertThat(chipColors.getSecondaryContentColor().getArgb())
+ .isEqualTo(mSecondaryContentColor.getArgb());
+ }
+
+ @Test
+ public void testCreateChipColorsFullFromColorProp() {
+ ChipColors chipColors =
+ new ChipColors(mBackgroundColor, mIconColor, mContentColor, mSecondaryContentColor);
+
+ assertThat(chipColors.getBackgroundColor().getArgb()).isEqualTo(mBackgroundColor.getArgb());
+ assertThat(chipColors.getIconColor().getArgb()).isEqualTo(mIconColor.getArgb());
+ assertThat(chipColors.getContentColor().getArgb()).isEqualTo(mContentColor.getArgb());
+ assertThat(chipColors.getSecondaryContentColor().getArgb())
+ .isEqualTo(mSecondaryContentColor.getArgb());
+ }
+
+ @Test
+ public void testCreateChipColorsFromHelperPrimary() {
+ ChipColors chipColors = ChipColors.primaryChipColors(mColors);
+
+ assertThat(chipColors.getBackgroundColor().getArgb()).isEqualTo(mColors.getPrimary());
+ assertThat(chipColors.getIconColor().getArgb()).isEqualTo(mColors.getOnPrimary());
+ assertThat(chipColors.getContentColor().getArgb()).isEqualTo(mColors.getOnPrimary());
+ assertThat(chipColors.getSecondaryContentColor().getArgb())
+ .isEqualTo(mColors.getOnPrimary());
+ }
+
+ @Test
+ public void testCreateChipColorsFromHelperSurface() {
+ ChipColors chipColors = ChipColors.secondaryChipColors(mColors);
+
+ assertThat(chipColors.getBackgroundColor().getArgb()).isEqualTo(mColors.getSurface());
+ assertThat(chipColors.getIconColor().getArgb()).isEqualTo(mColors.getOnSurface());
+ assertThat(chipColors.getContentColor().getArgb()).isEqualTo(mColors.getOnSurface());
+ assertThat(chipColors.getSecondaryContentColor().getArgb())
+ .isEqualTo(mColors.getOnSurface());
+ }
+}
diff --git a/wear/tiles/tiles-material/src/test/java/androidx/wear/tiles/material/ChipTest.java b/wear/tiles/tiles-material/src/test/java/androidx/wear/tiles/material/ChipTest.java
new file mode 100644
index 0000000..b65609c
--- /dev/null
+++ b/wear/tiles/tiles-material/src/test/java/androidx/wear/tiles/material/ChipTest.java
@@ -0,0 +1,168 @@
+/*
+ * Copyright 2022 The Android Open Source Project
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package androidx.wear.tiles.material;
+
+import static androidx.wear.tiles.ColorBuilders.argb;
+import static androidx.wear.tiles.DimensionBuilders.dp;
+import static androidx.wear.tiles.LayoutElementBuilders.HORIZONTAL_ALIGN_CENTER;
+import static androidx.wear.tiles.LayoutElementBuilders.HORIZONTAL_ALIGN_START;
+import static androidx.wear.tiles.material.Utils.areChipColorsEqual;
+
+import static com.google.common.truth.Truth.assertThat;
+
+import static org.junit.Assert.assertThrows;
+
+import android.content.Context;
+import android.graphics.Color;
+
+import androidx.annotation.NonNull;
+import androidx.annotation.Nullable;
+import androidx.test.core.app.ApplicationProvider;
+import androidx.test.ext.junit.runners.AndroidJUnit4;
+import androidx.wear.tiles.ActionBuilders.LaunchAction;
+import androidx.wear.tiles.ColorBuilders.ColorProp;
+import androidx.wear.tiles.DeviceParametersBuilders.DeviceParameters;
+import androidx.wear.tiles.DimensionBuilders.DpProp;
+import androidx.wear.tiles.LayoutElementBuilders.HorizontalAlignment;
+import androidx.wear.tiles.LayoutElementBuilders.LayoutElement;
+import androidx.wear.tiles.LayoutElementBuilders.Row;
+import androidx.wear.tiles.ModifiersBuilders.Clickable;
+
+import org.junit.Test;
+import org.junit.runner.RunWith;
+import org.robolectric.annotation.internal.DoNotInstrument;
+
+@RunWith(AndroidJUnit4.class)
+@DoNotInstrument
+// This test is testing that defaults of skeleton are set. More detailed tests that everything is in
+// place are in Scuba tests.
+public class ChipTest {
+ private static final String MAIN_TEXT = "Primary text";
+ private static final Clickable CLICKABLE =
+ new Clickable.Builder()
+ .setOnClick(new LaunchAction.Builder().build())
+ .setId("action_id")
+ .build();
+ private static final DeviceParameters DEVICE_PARAMETERS =
+ new DeviceParameters.Builder().setScreenWidthDp(192).setScreenHeightDp(192).build();
+ private final Context mContext = ApplicationProvider.getApplicationContext();
+ private static final DpProp EXPECTED_WIDTH =
+ dp(
+ DEVICE_PARAMETERS.getScreenWidthDp()
+ * (100 - 2 * ChipDefaults.DEFAULT_MARGIN_PERCENT) / 100);
+
+ @Test
+ public void testChipSkeleton() {
+ String contentDescription = "Chip";
+ Chip chip =
+ new Chip.Builder(mContext, CLICKABLE, DEVICE_PARAMETERS)
+ .setPrimaryTextContent(MAIN_TEXT)
+ .setHorizontalAlignment(HORIZONTAL_ALIGN_CENTER)
+ .setContentDescription(contentDescription)
+ .build();
+ assertChipSkeletonIsEqual(
+ chip, HORIZONTAL_ALIGN_CENTER, ChipDefaults.PRIMARY_COLORS, contentDescription);
+ }
+
+ @Test
+ public void testFullChipColors() {
+ ChipColors colors = new ChipColors(Color.YELLOW, Color.WHITE, Color.BLUE, Color.MAGENTA);
+ Chip chip =
+ new Chip.Builder(mContext, CLICKABLE, DEVICE_PARAMETERS)
+ .setChipColors(colors)
+ .setPrimaryTextLabelIconContent(MAIN_TEXT, "Label", "ICON_ID")
+ .build();
+ assertChipSkeletonIsEqual(chip, HORIZONTAL_ALIGN_START, colors);
+ }
+
+ @Test
+ public void testChipSkeletonLeftAligned() {
+ Chip chip =
+ new Chip.Builder(mContext, CLICKABLE, DEVICE_PARAMETERS)
+ .setHorizontalAlignment(HORIZONTAL_ALIGN_START)
+ .setPrimaryTextContent(MAIN_TEXT)
+ .build();
+ assertChipSkeletonIsEqual(chip, HORIZONTAL_ALIGN_START, ChipDefaults.PRIMARY_COLORS);
+ }
+
+ @Test
+ public void testChipEmptyFails() {
+ assertThrows(
+ IllegalStateException.class,
+ () -> new Chip.Builder(mContext, CLICKABLE, DEVICE_PARAMETERS).build());
+ }
+
+ @Test
+ public void testChipCustomContent() {
+ ColorProp yellow = argb(Color.YELLOW);
+ ColorProp blue = argb(Color.BLUE);
+ LayoutElement content =
+ new Row.Builder()
+ .addContent(
+ new Text.Builder(mContext, "text1")
+ .setTypography(Typography.TYPOGRAPHY_TITLE3)
+ .setColor(yellow)
+ .setItalic(true)
+ .build())
+ .addContent(
+ new Text.Builder(mContext, "text2")
+ .setTypography(Typography.TYPOGRAPHY_TITLE2)
+ .setColor(blue)
+ .build())
+ .build();
+
+ Chip chip =
+ new Chip.Builder(mContext, CLICKABLE, DEVICE_PARAMETERS)
+ .setContent(content)
+ .setHorizontalAlignment(HORIZONTAL_ALIGN_START)
+ .build();
+
+ assertChipSkeletonIsEqual(
+ chip,
+ HORIZONTAL_ALIGN_START,
+ new ChipColors(
+ ChipDefaults.PRIMARY_COLORS.getBackgroundColor(),
+ new ColorProp.Builder().build()));
+ assertThat(chip.getContent().toLayoutElementProto())
+ .isEqualTo(content.toLayoutElementProto());
+ }
+
+ private void assertChipSkeletonIsEqual(
+ @NonNull Chip actualChip, @HorizontalAlignment int hAlign, @NonNull ChipColors colors) {
+ assertChipSkeletonIsEqual(actualChip, hAlign, colors, null);
+ }
+
+ private void assertChipSkeletonIsEqual(
+ @NonNull Chip actualChip,
+ @HorizontalAlignment int hAlign,
+ @NonNull ChipColors colors,
+ @Nullable String expectedContDesc) {
+ assertThat(actualChip.getClickable().toProto()).isEqualTo(CLICKABLE.toProto());
+ assertThat(actualChip.getWidth().toContainerDimensionProto())
+ .isEqualTo(EXPECTED_WIDTH.toContainerDimensionProto());
+ assertThat(actualChip.getHeight().toContainerDimensionProto())
+ .isEqualTo(ChipDefaults.DEFAULT_HEIGHT.toContainerDimensionProto());
+ assertThat(areChipColorsEqual(actualChip.getChipColors(), colors)).isTrue();
+ assertThat(actualChip.getHorizontalAlignment()).isEqualTo(hAlign);
+
+ if (expectedContDesc == null) {
+ assertThat(actualChip.getContentDescription()).isNull();
+ } else {
+ assertThat(actualChip.getContentDescription().toString()).isEqualTo(expectedContDesc);
+ }
+ }
+}
diff --git a/wear/tiles/tiles-material/src/test/java/androidx/wear/tiles/material/CircularProgressIndicatorTest.java b/wear/tiles/tiles-material/src/test/java/androidx/wear/tiles/material/CircularProgressIndicatorTest.java
new file mode 100644
index 0000000..1ae023c
--- /dev/null
+++ b/wear/tiles/tiles-material/src/test/java/androidx/wear/tiles/material/CircularProgressIndicatorTest.java
@@ -0,0 +1,120 @@
+/*
+ * Copyright 2022 The Android Open Source Project
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package androidx.wear.tiles.material;
+
+import static androidx.wear.tiles.material.ProgressIndicatorDefaults.DEFAULT_COLORS;
+import static androidx.wear.tiles.material.ProgressIndicatorDefaults.DEFAULT_END_ANGLE;
+import static androidx.wear.tiles.material.ProgressIndicatorDefaults.DEFAULT_START_ANGLE;
+import static androidx.wear.tiles.material.ProgressIndicatorDefaults.DEFAULT_STROKE_WIDTH;
+
+import static com.google.common.truth.Truth.assertThat;
+
+import android.graphics.Color;
+
+import androidx.annotation.NonNull;
+import androidx.annotation.Nullable;
+import androidx.test.ext.junit.runners.AndroidJUnit4;
+
+import org.junit.Test;
+import org.junit.runner.RunWith;
+import org.robolectric.annotation.internal.DoNotInstrument;
+
+@RunWith(AndroidJUnit4.class)
+@DoNotInstrument
+public class CircularProgressIndicatorTest {
+ @Test
+ public void testOpenRingIndicatorDefault() {
+ CircularProgressIndicator circularProgressIndicator =
+ new CircularProgressIndicator.Builder().build();
+
+ assertProgressIndicatorIsEqual(
+ circularProgressIndicator,
+ 0,
+ DEFAULT_START_ANGLE,
+ DEFAULT_END_ANGLE,
+ DEFAULT_COLORS,
+ DEFAULT_STROKE_WIDTH.getValue(),
+ null);
+ }
+
+ @Test
+ public void testProgressIndicatorCustom() {
+ float progress = 0.25f;
+ String contentDescription = "60 degrees progress";
+ ProgressIndicatorColors colors = new ProgressIndicatorColors(Color.YELLOW, Color.BLACK);
+ int thickness = 16;
+ float startAngle = -24;
+ float endAngle = 24;
+
+ CircularProgressIndicator circularProgressIndicator =
+ new CircularProgressIndicator.Builder()
+ .setProgress(progress)
+ .setStartAngle(startAngle)
+ .setEndAngle(endAngle)
+ .setCircularProgressIndicatorColors(colors)
+ .setStrokeWidth(thickness)
+ .setContentDescription(contentDescription)
+ .build();
+
+ assertProgressIndicatorIsEqual(
+ circularProgressIndicator,
+ progress,
+ startAngle,
+ endAngle,
+ colors,
+ thickness,
+ contentDescription);
+ }
+
+ private void assertProgressIndicatorIsEqual(
+ @NonNull CircularProgressIndicator circularProgressIndicator,
+ float progress,
+ float startAngle,
+ float endAngle,
+ @NonNull ProgressIndicatorColors colors,
+ float thickness,
+ @Nullable String contentDescription) {
+ float total = endAngle + (endAngle <= startAngle ? 360 : 0) - startAngle;
+ assertThat(circularProgressIndicator.getProgress().getValue())
+ .isWithin(0.01f)
+ .of(progress * total);
+ assertThat(circularProgressIndicator.getStartAngle().getValue())
+ .isWithin(0.01f)
+ .of(startAngle);
+ assertThat(circularProgressIndicator.getEndAngle().getValue()).isWithin(0.01f).of(endAngle);
+ assertThat(
+ circularProgressIndicator
+ .getCircularProgressIndicatorColors()
+ .getIndicatorColor()
+ .getArgb())
+ .isEqualTo(colors.getIndicatorColor().getArgb());
+ assertThat(
+ circularProgressIndicator
+ .getCircularProgressIndicatorColors()
+ .getTrackColor()
+ .getArgb())
+ .isEqualTo(colors.getTrackColor().getArgb());
+ assertThat(circularProgressIndicator.getStrokeWidth().getValue()).isEqualTo(thickness);
+
+ if (contentDescription == null) {
+ assertThat(circularProgressIndicator.getContentDescription()).isNull();
+ } else {
+ assertThat(circularProgressIndicator.getContentDescription())
+ .isEqualTo(contentDescription);
+ }
+ }
+}
diff --git a/wear/tiles/tiles-material/src/test/java/androidx/wear/tiles/material/CompactChipTest.java b/wear/tiles/tiles-material/src/test/java/androidx/wear/tiles/material/CompactChipTest.java
new file mode 100644
index 0000000..20957cc
--- /dev/null
+++ b/wear/tiles/tiles-material/src/test/java/androidx/wear/tiles/material/CompactChipTest.java
@@ -0,0 +1,74 @@
+/*
+ * Copyright 2022 The Android Open Source Project
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package androidx.wear.tiles.material;
+
+import static androidx.wear.tiles.material.Utils.areChipColorsEqual;
+
+import static com.google.common.truth.Truth.assertThat;
+
+import android.content.Context;
+import android.graphics.Color;
+
+import androidx.test.core.app.ApplicationProvider;
+import androidx.test.ext.junit.runners.AndroidJUnit4;
+import androidx.wear.tiles.ActionBuilders.LaunchAction;
+import androidx.wear.tiles.DeviceParametersBuilders.DeviceParameters;
+import androidx.wear.tiles.ModifiersBuilders.Clickable;
+
+import org.junit.Test;
+import org.junit.runner.RunWith;
+import org.robolectric.annotation.internal.DoNotInstrument;
+
+@RunWith(AndroidJUnit4.class)
+@DoNotInstrument
+// This test is testing that defaults of skeleton are set. More detailed tests that everything is in
+// // place are in Scuba tests.
+public class CompactChipTest {
+ private static final String MAIN_TEXT = "Action";
+ private static final Clickable CLICKABLE =
+ new Clickable.Builder()
+ .setOnClick(new LaunchAction.Builder().build())
+ .setId("action_id")
+ .build();
+ private static final DeviceParameters DEVICE_PARAMETERS =
+ new DeviceParameters.Builder().setScreenWidthDp(192).setScreenHeightDp(192).build();
+ private static final ChipColors COLORS = new ChipColors(Color.YELLOW, Color.BLUE);
+ private final Context mContext = ApplicationProvider.getApplicationContext();
+
+ @Test
+ public void testCompactChipDefault() {
+ CompactChip compactChip =
+ new CompactChip.Builder(mContext, MAIN_TEXT, CLICKABLE, DEVICE_PARAMETERS).build();
+
+ assertChipSkeletonIsEqual(compactChip, ChipDefaults.COMPACT_PRIMARY_COLORS);
+ }
+
+ @Test
+ public void testCompactChipCustomColor() {
+ CompactChip compactChip =
+ new CompactChip.Builder(mContext, MAIN_TEXT, CLICKABLE, DEVICE_PARAMETERS)
+ .setChipColors(COLORS)
+ .build();
+
+ assertChipSkeletonIsEqual(compactChip, COLORS);
+ }
+
+ private void assertChipSkeletonIsEqual(CompactChip actualCompactChip, ChipColors colors) {
+ assertThat(actualCompactChip.getClickable().toProto()).isEqualTo(CLICKABLE.toProto());
+ assertThat(areChipColorsEqual(actualCompactChip.getChipColors(), colors)).isTrue();
+ }
+}
diff --git a/wear/tiles/tiles-material/src/test/java/androidx/wear/tiles/material/ProgressIndicatorColorsTest.java b/wear/tiles/tiles-material/src/test/java/androidx/wear/tiles/material/ProgressIndicatorColorsTest.java
new file mode 100644
index 0000000..877a4ce
--- /dev/null
+++ b/wear/tiles/tiles-material/src/test/java/androidx/wear/tiles/material/ProgressIndicatorColorsTest.java
@@ -0,0 +1,71 @@
+/*
+ * Copyright 2022 The Android Open Source Project
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package androidx.wear.tiles.material;
+
+import static androidx.wear.tiles.ColorBuilders.argb;
+
+import static com.google.common.truth.Truth.assertThat;
+
+import androidx.test.ext.junit.runners.AndroidJUnit4;
+import androidx.wear.tiles.ColorBuilders.ColorProp;
+
+import org.junit.Test;
+import org.junit.runner.RunWith;
+import org.robolectric.annotation.internal.DoNotInstrument;
+
+@RunWith(AndroidJUnit4.class)
+@DoNotInstrument
+public class ProgressIndicatorColorsTest {
+ private static final int ARGB_BACKGROUND_COLOR = 0x12345678;
+ private static final int ARGB_CONTENT_COLOR = 0x11223344;
+ private final ColorProp mTrackColor = argb(ARGB_BACKGROUND_COLOR);
+ private final ColorProp mIndicatorColor = argb(ARGB_CONTENT_COLOR);
+ private final Colors mColors = new Colors(0x123, 0x234, 0x345, 0x456);
+
+ @Test
+ public void testCreateProgressIndicatorColorsFromArgb() {
+ ProgressIndicatorColors progressIndicatorColors =
+ new ProgressIndicatorColors(ARGB_CONTENT_COLOR, ARGB_BACKGROUND_COLOR);
+
+ assertThat(progressIndicatorColors.getTrackColor().getArgb())
+ .isEqualTo(mTrackColor.getArgb());
+ assertThat(progressIndicatorColors.getIndicatorColor().getArgb())
+ .isEqualTo(mIndicatorColor.getArgb());
+ }
+
+ @Test
+ public void testCreateProgressIndicatorColorsFromColorProp() {
+ ProgressIndicatorColors progressIndicatorColors =
+ new ProgressIndicatorColors(mIndicatorColor, mTrackColor);
+
+ assertThat(progressIndicatorColors.getTrackColor().getArgb())
+ .isEqualTo(mTrackColor.getArgb());
+ assertThat(progressIndicatorColors.getIndicatorColor().getArgb())
+ .isEqualTo(mIndicatorColor.getArgb());
+ }
+
+ @Test
+ public void testCreateProgressIndicatorColorsFromHelper() {
+ ProgressIndicatorColors progressIndicatorColors =
+ ProgressIndicatorColors.progressIndicatorColors(mColors);
+
+ assertThat(progressIndicatorColors.getTrackColor().getArgb())
+ .isEqualTo(mColors.getSurface());
+ assertThat(progressIndicatorColors.getIndicatorColor().getArgb())
+ .isEqualTo(mColors.getPrimary());
+ }
+}
diff --git a/wear/tiles/tiles-material/src/test/java/androidx/wear/tiles/material/TextTest.java b/wear/tiles/tiles-material/src/test/java/androidx/wear/tiles/material/TextTest.java
new file mode 100644
index 0000000..c0e184c
--- /dev/null
+++ b/wear/tiles/tiles-material/src/test/java/androidx/wear/tiles/material/TextTest.java
@@ -0,0 +1,148 @@
+/*
+ * Copyright 2022 The Android Open Source Project
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package androidx.wear.tiles.material;
+
+import static androidx.wear.tiles.ColorBuilders.argb;
+import static androidx.wear.tiles.LayoutElementBuilders.FONT_WEIGHT_BOLD;
+import static androidx.wear.tiles.LayoutElementBuilders.FONT_WEIGHT_MEDIUM;
+import static androidx.wear.tiles.LayoutElementBuilders.FONT_WEIGHT_NORMAL;
+import static androidx.wear.tiles.LayoutElementBuilders.TEXT_ALIGN_END;
+import static androidx.wear.tiles.LayoutElementBuilders.TEXT_OVERFLOW_ELLIPSIZE_END;
+import static androidx.wear.tiles.material.Typography.TYPOGRAPHY_BODY1;
+import static androidx.wear.tiles.material.Typography.TYPOGRAPHY_CAPTION2;
+import static androidx.wear.tiles.material.Typography.TYPOGRAPHY_TITLE1;
+import static androidx.wear.tiles.material.Typography.getFontStyleBuilder;
+import static androidx.wear.tiles.material.Typography.getLineHeightForTypography;
+
+import static com.google.common.truth.Truth.assertThat;
+
+import static org.junit.Assert.assertThrows;
+
+import android.content.Context;
+import android.graphics.Color;
+
+import androidx.test.core.app.ApplicationProvider;
+import androidx.test.ext.junit.runners.AndroidJUnit4;
+import androidx.wear.tiles.LayoutElementBuilders.FontStyle;
+import androidx.wear.tiles.ModifiersBuilders.Background;
+import androidx.wear.tiles.ModifiersBuilders.Modifiers;
+
+import org.junit.Test;
+import org.junit.runner.RunWith;
+import org.robolectric.annotation.internal.DoNotInstrument;
+
+@RunWith(AndroidJUnit4.class)
+@DoNotInstrument
+public class TextTest {
+
+ public static final int NUM_OF_FONT_STYLE_CONST = 12;
+ private final Context mContext = ApplicationProvider.getApplicationContext();
+
+ @Test
+ public void testTypography_incorrectTypography_negativeValue() {
+ assertThrows(IllegalArgumentException.class, () -> getFontStyleBuilder(-1, mContext));
+ }
+
+ @Test
+ public void testTypography_incorrectTypography_positiveValue() {
+ assertThrows(
+ IllegalArgumentException.class,
+ () -> getFontStyleBuilder(NUM_OF_FONT_STYLE_CONST + 1, mContext));
+ }
+
+ @Test
+ public void testLineHeight_incorrectTypography_negativeValue() {
+ assertThrows(IllegalArgumentException.class, () -> getLineHeightForTypography(-1));
+ }
+
+ @Test
+ public void testLineHeight_incorrectTypography_positiveValue() {
+ assertThrows(
+ IllegalArgumentException.class,
+ () -> getLineHeightForTypography(NUM_OF_FONT_STYLE_CONST + 1));
+ }
+
+ @Test
+ public void testTypography_body1() {
+ FontStyle fontStyle = getFontStyleBuilder(TYPOGRAPHY_BODY1, mContext).build();
+ assertFontStyle(fontStyle, 16, FONT_WEIGHT_NORMAL, 0.01f, 20, TYPOGRAPHY_BODY1);
+ }
+
+ @Test
+ public void testTypography_caption2() {
+ FontStyle fontStyle = getFontStyleBuilder(TYPOGRAPHY_CAPTION2, mContext).build();
+ assertFontStyle(fontStyle, 12, FONT_WEIGHT_MEDIUM, 0.01f, 16, TYPOGRAPHY_CAPTION2);
+ }
+
+ @Test
+ public void testText() {
+ String textContent = "Testing text.";
+ Modifiers modifiers =
+ new Modifiers.Builder()
+ .setBackground(new Background.Builder().setColor(argb(Color.BLUE)).build())
+ .build();
+ int color = Color.YELLOW;
+ Text text =
+ new Text.Builder(mContext, textContent)
+ .setItalic(true)
+ .setColor(argb(color))
+ .setTypography(TYPOGRAPHY_TITLE1)
+ .setUnderline(true)
+ .setMaxLines(2)
+ .setModifiers(modifiers)
+ .setOverflow(TEXT_OVERFLOW_ELLIPSIZE_END)
+ .setMultilineAlignment(TEXT_ALIGN_END)
+ .setWeight(FONT_WEIGHT_BOLD)
+ .build();
+
+ FontStyle expectedFontStyle =
+ getFontStyleBuilder(TYPOGRAPHY_TITLE1, mContext)
+ .setItalic(true)
+ .setUnderline(true)
+ .setColor(argb(color))
+ .setWeight(FONT_WEIGHT_BOLD)
+ .build();
+
+ assertThat(text.getFontStyle().toProto()).isEqualTo(expectedFontStyle.toProto());
+ assertThat(text.getText()).isEqualTo(textContent);
+ assertThat(text.getColor().getArgb()).isEqualTo(color);
+ assertThat(text.getModifiers().toProto()).isEqualTo(modifiers.toProto());
+ assertThat(text.getOverflow()).isEqualTo(TEXT_OVERFLOW_ELLIPSIZE_END);
+ assertThat(text.getMultilineAlignment()).isEqualTo(TEXT_ALIGN_END);
+ assertThat(text.getMaxLines()).isEqualTo(2);
+ assertThat(text.getLineHeight())
+ .isEqualTo(getLineHeightForTypography(TYPOGRAPHY_TITLE1).getValue());
+ }
+
+ private void assertFontStyle(
+ FontStyle actualFontStyle,
+ int expectedSize,
+ int expectedWeight,
+ float expectedLetterSpacing,
+ float expectedLineHeight,
+ int typographyCode) {
+ assertThat(actualFontStyle.getSize()).isNotNull();
+ assertThat(actualFontStyle.getWeight()).isNotNull();
+ assertThat(actualFontStyle.getLetterSpacing()).isNotNull();
+ assertThat(actualFontStyle.getSize().getValue()).isEqualTo(expectedSize);
+ assertThat(actualFontStyle.getWeight().getValue()).isEqualTo(expectedWeight);
+ assertThat(actualFontStyle.getLetterSpacing().getValue()).isEqualTo(expectedLetterSpacing);
+ assertThat(getLineHeightForTypography(typographyCode).getValue())
+ .isEqualTo(expectedLineHeight);
+ }
+
+}
diff --git a/wear/tiles/tiles-material/src/test/java/androidx/wear/tiles/material/TitleChipTest.java b/wear/tiles/tiles-material/src/test/java/androidx/wear/tiles/material/TitleChipTest.java
new file mode 100644
index 0000000..fec04b5
--- /dev/null
+++ b/wear/tiles/tiles-material/src/test/java/androidx/wear/tiles/material/TitleChipTest.java
@@ -0,0 +1,86 @@
+/*
+ * Copyright 2022 The Android Open Source Project
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package androidx.wear.tiles.material;
+
+import static androidx.wear.tiles.DimensionBuilders.dp;
+import static androidx.wear.tiles.material.Utils.areChipColorsEqual;
+
+import static com.google.common.truth.Truth.assertThat;
+
+import android.content.Context;
+import android.graphics.Color;
+
+import androidx.test.core.app.ApplicationProvider;
+import androidx.test.ext.junit.runners.AndroidJUnit4;
+import androidx.wear.tiles.ActionBuilders.LaunchAction;
+import androidx.wear.tiles.DeviceParametersBuilders.DeviceParameters;
+import androidx.wear.tiles.DimensionBuilders.DpProp;
+import androidx.wear.tiles.ModifiersBuilders.Clickable;
+
+import org.junit.Test;
+import org.junit.runner.RunWith;
+import org.robolectric.annotation.internal.DoNotInstrument;
+
+@RunWith(AndroidJUnit4.class)
+@DoNotInstrument
+// This test is testing that defaults of skeleton are set. More detailed tests that everything is in
+// // place are in Scuba tests.
+public class TitleChipTest {
+ private static final String MAIN_TEXT = "Action";
+ private static final Clickable CLICKABLE =
+ new Clickable.Builder()
+ .setOnClick(new LaunchAction.Builder().build())
+ .setId("action_id")
+ .build();
+ private static final DeviceParameters DEVICE_PARAMETERS =
+ new DeviceParameters.Builder().setScreenWidthDp(192).setScreenHeightDp(192).build();
+ private static final ChipColors COLORS = new ChipColors(Color.YELLOW, Color.BLUE);
+ private final Context mContext = ApplicationProvider.getApplicationContext();
+ private static final DpProp EXPECTED_WIDTH =
+ dp(
+ DEVICE_PARAMETERS.getScreenWidthDp()
+ * (100 - 2 * ChipDefaults.DEFAULT_MARGIN_PERCENT)
+ / 100);
+
+ @Test
+ public void testTitleChipDefault() {
+ TitleChip titleChip =
+ new TitleChip.Builder(mContext, MAIN_TEXT, CLICKABLE, DEVICE_PARAMETERS).build();
+
+ assertChipSkeletonIsEqual(titleChip, ChipDefaults.TITLE_PRIMARY_COLORS, EXPECTED_WIDTH);
+ }
+
+ @Test
+ public void testTitleChipCustom() {
+ DpProp width = dp(150);
+ TitleChip titleChip =
+ new TitleChip.Builder(mContext, MAIN_TEXT, CLICKABLE, DEVICE_PARAMETERS)
+ .setChipColors(COLORS)
+ .setWidth(width)
+ .build();
+
+ assertChipSkeletonIsEqual(titleChip, COLORS, width);
+ }
+
+ private void assertChipSkeletonIsEqual(
+ TitleChip actualTitleChip, ChipColors colors, DpProp width) {
+ assertThat(actualTitleChip.getClickable().toProto()).isEqualTo(CLICKABLE.toProto());
+ assertThat(actualTitleChip.getWidth().toContainerDimensionProto())
+ .isEqualTo(width.toContainerDimensionProto());
+ assertThat(areChipColorsEqual(actualTitleChip.getChipColors(), colors)).isTrue();
+ }
+}
diff --git a/wear/tiles/tiles-material/src/test/java/androidx/wear/tiles/material/Utils.java b/wear/tiles/tiles-material/src/test/java/androidx/wear/tiles/material/Utils.java
new file mode 100644
index 0000000..a1d44a5
--- /dev/null
+++ b/wear/tiles/tiles-material/src/test/java/androidx/wear/tiles/material/Utils.java
@@ -0,0 +1,37 @@
+/*
+ * Copyright 2022 The Android Open Source Project
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package androidx.wear.tiles.material;
+
+import androidx.annotation.Dimension;
+
+public final class Utils {
+ /** Returns true if the given ChipColors have the same colored content. */
+ static boolean areChipColorsEqual(ChipColors colors1, ChipColors colors2) {
+ return colors1.getBackgroundColor().getArgb() == colors2.getBackgroundColor().getArgb()
+ && colors1.getContentColor().getArgb() == colors2.getContentColor().getArgb()
+ && colors1.getSecondaryContentColor().getArgb()
+ == colors2.getSecondaryContentColor().getArgb()
+ && colors1.getIconColor().getArgb() == colors2.getIconColor().getArgb();
+ }
+
+ @Dimension(unit = Dimension.DP)
+ public static int pxToDp(int px, float scale) {
+ return (int) ((px - 0.5f) / scale);
+ }
+
+ private Utils() {}
+}
diff --git a/wear/tiles/tiles-material/src/test/java/androidx/wear/tiles/material/layouts/MultiButtonLayoutTest.java b/wear/tiles/tiles-material/src/test/java/androidx/wear/tiles/material/layouts/MultiButtonLayoutTest.java
new file mode 100644
index 0000000..200320c
--- /dev/null
+++ b/wear/tiles/tiles-material/src/test/java/androidx/wear/tiles/material/layouts/MultiButtonLayoutTest.java
@@ -0,0 +1,118 @@
+/*
+ * Copyright 2022 The Android Open Source Project
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package androidx.wear.tiles.material.layouts;
+
+import static com.google.common.truth.Truth.assertThat;
+
+import static org.junit.Assert.assertThrows;
+
+import android.content.Context;
+
+import androidx.test.core.app.ApplicationProvider;
+import androidx.test.ext.junit.runners.AndroidJUnit4;
+import androidx.wear.tiles.ActionBuilders.LaunchAction;
+import androidx.wear.tiles.ModifiersBuilders.Clickable;
+import androidx.wear.tiles.material.Button;
+import androidx.wear.tiles.material.ButtonDefaults;
+
+import org.junit.Test;
+import org.junit.runner.RunWith;
+import org.robolectric.annotation.internal.DoNotInstrument;
+
+import java.util.ArrayList;
+import java.util.List;
+
+@RunWith(AndroidJUnit4.class)
+@DoNotInstrument
+public class MultiButtonLayoutTest {
+ private final Context mContext = ApplicationProvider.getApplicationContext();
+ private final Clickable mClickable =
+ new Clickable.Builder()
+ .setOnClick(new LaunchAction.Builder().build())
+ .setId("action_id")
+ .build();
+
+ @Test
+ public void test_1button() {
+ Button button1 =
+ new Button.Builder(mContext, mClickable)
+ .setTextContent("1")
+ .setSize(ButtonDefaults.EXTRA_LARGE_BUTTON_SIZE)
+ .build();
+
+ MultiButtonLayout layout =
+ new MultiButtonLayout.Builder().addButtonContent(button1).build();
+
+ assertThat(layout.getButtonContents()).hasSize(1);
+ assertThat(layout.getButtonContents().get(0).toLayoutElementProto())
+ .isEqualTo(button1.toLayoutElementProto());
+ }
+
+ @Test
+ public void test_2buttons() {
+ Button button1 = new Button.Builder(mContext, mClickable).setTextContent("1").build();
+ Button button2 = new Button.Builder(mContext, mClickable).setTextContent("2").build();
+
+ MultiButtonLayout layout =
+ new MultiButtonLayout.Builder()
+ .addButtonContent(button1)
+ .addButtonContent(button2)
+ .build();
+
+ assertThat(layout.getButtonContents()).hasSize(2);
+ assertThat(layout.getButtonContents().get(0).toLayoutElementProto())
+ .isEqualTo(button1.toLayoutElementProto());
+ assertThat(layout.getButtonContents().get(1).toLayoutElementProto())
+ .isEqualTo(button2.toLayoutElementProto());
+ }
+
+ @Test
+ public void test_5buttons() {
+ List<Button> buttons = new ArrayList<>();
+ int size = 5;
+ for (int i = 0; i < size; i++) {
+ buttons.add(new Button.Builder(mContext, mClickable).setTextContent("" + i).build());
+ }
+
+ MultiButtonLayout.Builder layoutBuilder = new MultiButtonLayout.Builder();
+ for (Button b : buttons) {
+ layoutBuilder.addButtonContent(b);
+ }
+ layoutBuilder.setFiveButtonDistribution(
+ MultiButtonLayout.FIVE_BUTTON_DISTRIBUTION_TOP_HEAVY);
+ MultiButtonLayout layout = layoutBuilder.build();
+
+ assertThat(layout.getButtonContents()).hasSize(size);
+ assertThat(layout.getFiveButtonDistribution())
+ .isEqualTo(MultiButtonLayout.FIVE_BUTTON_DISTRIBUTION_TOP_HEAVY);
+ for (int i = 0; i < size; i++) {
+ assertThat(layout.getButtonContents().get(i).toLayoutElementProto())
+ .isEqualTo(buttons.get(i).toLayoutElementProto());
+ }
+ }
+
+ @Test
+ public void test_too_many_button() {
+ Button button = new Button.Builder(mContext, mClickable).setTextContent("1").build();
+ MultiButtonLayout.Builder layoutBuilder = new MultiButtonLayout.Builder();
+ for (int i = 0; i < LayoutDefaults.MULTI_BUTTON_MAX_NUMBER + 1; i++) {
+ layoutBuilder.addButtonContent(button);
+ }
+
+ assertThrows(IllegalArgumentException.class, layoutBuilder::build);
+ }
+}
diff --git a/wear/tiles/tiles-material/src/test/java/androidx/wear/tiles/material/layouts/PrimaryLayoutTest.java b/wear/tiles/tiles-material/src/test/java/androidx/wear/tiles/material/layouts/PrimaryLayoutTest.java
new file mode 100644
index 0000000..bf90f2a
--- /dev/null
+++ b/wear/tiles/tiles-material/src/test/java/androidx/wear/tiles/material/layouts/PrimaryLayoutTest.java
@@ -0,0 +1,162 @@
+/*
+ * Copyright 2022 The Android Open Source Project
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package androidx.wear.tiles.material.layouts;
+
+import static androidx.wear.tiles.material.layouts.LayoutDefaults.DEFAULT_VERTICAL_SPACER_HEIGHT;
+
+import static com.google.common.truth.Truth.assertThat;
+
+import android.content.Context;
+
+import androidx.test.core.app.ApplicationProvider;
+import androidx.test.ext.junit.runners.AndroidJUnit4;
+import androidx.wear.tiles.ActionBuilders.LaunchAction;
+import androidx.wear.tiles.DeviceParametersBuilders.DeviceParameters;
+import androidx.wear.tiles.LayoutElementBuilders.Box;
+import androidx.wear.tiles.LayoutElementBuilders.LayoutElement;
+import androidx.wear.tiles.ModifiersBuilders.Clickable;
+import androidx.wear.tiles.material.CompactChip;
+import androidx.wear.tiles.material.Text;
+
+import org.junit.Test;
+import org.junit.runner.RunWith;
+import org.robolectric.annotation.internal.DoNotInstrument;
+
+@RunWith(AndroidJUnit4.class)
+@DoNotInstrument
+public class PrimaryLayoutTest {
+ private static final Clickable CLICKABLE =
+ new Clickable.Builder()
+ .setOnClick(new LaunchAction.Builder().build())
+ .setId("action_id")
+ .build();
+ private static final Context CONTEXT = ApplicationProvider.getApplicationContext();
+ private static final DeviceParameters DEVICE_PARAMETERS =
+ new DeviceParameters.Builder().setScreenWidthDp(192).setScreenHeightDp(192).build();
+ private static final LayoutElement CONTENT = new Box.Builder().build();
+ private static final CompactChip PRIMARY_CHIP =
+ new CompactChip.Builder(CONTEXT, "Compact", CLICKABLE, DEVICE_PARAMETERS).build();
+ private static final Text PRIMARY_LABEL = new Text.Builder(CONTEXT, "Primary label").build();
+ private static final Text SECONDARY_LABEL =
+ new Text.Builder(CONTEXT, "Secondary label").build();
+
+ @Test
+ public void testOnlyContent() {
+ PrimaryLayout layout =
+ new PrimaryLayout.Builder(DEVICE_PARAMETERS).setContent(CONTENT).build();
+
+ assertThat(layout.getContent()).isNotNull();
+ assertThat(layout.getContent().toLayoutElementProto())
+ .isEqualTo(CONTENT.toLayoutElementProto());
+ assertThat(layout.getVerticalSpacerHeight())
+ .isEqualTo(DEFAULT_VERTICAL_SPACER_HEIGHT.getValue());
+
+ assertThat(layout.getPrimaryChipContent()).isNull();
+ assertThat(layout.getPrimaryLabelTextContent()).isNull();
+ assertThat(layout.getSecondaryLabelTextContent()).isNull();
+ }
+
+ @Test
+ public void testContentChip() {
+ PrimaryLayout layout =
+ new PrimaryLayout.Builder(DEVICE_PARAMETERS)
+ .setContent(CONTENT)
+ .setPrimaryChipContent(PRIMARY_CHIP)
+ .build();
+
+ assertThat(layout.getContent()).isNotNull();
+ assertThat(layout.getContent().toLayoutElementProto())
+ .isEqualTo(CONTENT.toLayoutElementProto());
+ assertThat(layout.getVerticalSpacerHeight())
+ .isEqualTo(DEFAULT_VERTICAL_SPACER_HEIGHT.getValue());
+ assertThat(layout.getPrimaryChipContent()).isNotNull();
+ assertThat(layout.getPrimaryChipContent().toLayoutElementProto())
+ .isEqualTo(PRIMARY_CHIP.toLayoutElementProto());
+
+ assertThat(layout.getPrimaryLabelTextContent()).isNull();
+ assertThat(layout.getSecondaryLabelTextContent()).isNull();
+ }
+
+ @Test
+ public void testContentPrimaryLabel() {
+ PrimaryLayout layout =
+ new PrimaryLayout.Builder(DEVICE_PARAMETERS)
+ .setContent(CONTENT)
+ .setPrimaryLabelTextContent(PRIMARY_LABEL)
+ .build();
+
+ assertThat(layout.getContent()).isNotNull();
+ assertThat(layout.getContent().toLayoutElementProto())
+ .isEqualTo(CONTENT.toLayoutElementProto());
+ assertThat(layout.getVerticalSpacerHeight())
+ .isEqualTo(DEFAULT_VERTICAL_SPACER_HEIGHT.getValue());
+ assertThat(layout.getPrimaryLabelTextContent()).isNotNull();
+ assertThat(layout.getPrimaryLabelTextContent().toLayoutElementProto())
+ .isEqualTo(PRIMARY_LABEL.toLayoutElementProto());
+
+ assertThat(layout.getPrimaryChipContent()).isNull();
+ assertThat(layout.getSecondaryLabelTextContent()).isNull();
+ }
+
+ @Test
+ public void testContentSecondaryLabel() {
+ PrimaryLayout layout =
+ new PrimaryLayout.Builder(DEVICE_PARAMETERS)
+ .setContent(CONTENT)
+ .setSecondaryLabelTextContent(SECONDARY_LABEL)
+ .build();
+
+ assertThat(layout.getContent()).isNotNull();
+ assertThat(layout.getContent().toLayoutElementProto())
+ .isEqualTo(CONTENT.toLayoutElementProto());
+ assertThat(layout.getVerticalSpacerHeight())
+ .isEqualTo(DEFAULT_VERTICAL_SPACER_HEIGHT.getValue());
+ assertThat(layout.getSecondaryLabelTextContent()).isNotNull();
+ assertThat(layout.getSecondaryLabelTextContent().toLayoutElementProto())
+ .isEqualTo(SECONDARY_LABEL.toLayoutElementProto());
+
+ assertThat(layout.getPrimaryChipContent()).isNull();
+ assertThat(layout.getPrimaryLabelTextContent()).isNull();
+ }
+
+ @Test
+ public void testAll() {
+ float height = 12;
+ PrimaryLayout layout =
+ new PrimaryLayout.Builder(DEVICE_PARAMETERS)
+ .setContent(CONTENT)
+ .setPrimaryChipContent(PRIMARY_CHIP)
+ .setPrimaryLabelTextContent(PRIMARY_LABEL)
+ .setSecondaryLabelTextContent(SECONDARY_LABEL)
+ .setVerticalSpacerHeight(height)
+ .build();
+
+ assertThat(layout.getContent()).isNotNull();
+ assertThat(layout.getContent().toLayoutElementProto())
+ .isEqualTo(CONTENT.toLayoutElementProto());
+ assertThat(layout.getPrimaryChipContent()).isNotNull();
+ assertThat(layout.getPrimaryChipContent().toLayoutElementProto())
+ .isEqualTo(PRIMARY_CHIP.toLayoutElementProto());
+ assertThat(layout.getVerticalSpacerHeight()).isEqualTo(height);
+ assertThat(layout.getPrimaryLabelTextContent()).isNotNull();
+ assertThat(layout.getPrimaryLabelTextContent().toLayoutElementProto())
+ .isEqualTo(PRIMARY_LABEL.toLayoutElementProto());
+ assertThat(layout.getSecondaryLabelTextContent()).isNotNull();
+ assertThat(layout.getSecondaryLabelTextContent().toLayoutElementProto())
+ .isEqualTo(SECONDARY_LABEL.toLayoutElementProto());
+ }
+}
diff --git a/wear/tiles/tiles-material/src/test/java/androidx/wear/tiles/material/layouts/ProgressIndicatorLayoutTest.java b/wear/tiles/tiles-material/src/test/java/androidx/wear/tiles/material/layouts/ProgressIndicatorLayoutTest.java
new file mode 100644
index 0000000..f7720e9
--- /dev/null
+++ b/wear/tiles/tiles-material/src/test/java/androidx/wear/tiles/material/layouts/ProgressIndicatorLayoutTest.java
@@ -0,0 +1,91 @@
+/*
+ * Copyright 2022 The Android Open Source Project
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package androidx.wear.tiles.material.layouts;
+
+import static com.google.common.truth.Truth.assertThat;
+
+import androidx.test.ext.junit.runners.AndroidJUnit4;
+import androidx.wear.tiles.DeviceParametersBuilders.DeviceParameters;
+import androidx.wear.tiles.LayoutElementBuilders.Box;
+import androidx.wear.tiles.LayoutElementBuilders.LayoutElement;
+import androidx.wear.tiles.material.CircularProgressIndicator;
+
+import org.junit.Test;
+import org.junit.runner.RunWith;
+import org.robolectric.annotation.internal.DoNotInstrument;
+
+@RunWith(AndroidJUnit4.class)
+@DoNotInstrument
+public class ProgressIndicatorLayoutTest {
+ private final DeviceParameters mDeviceParameters =
+ new DeviceParameters.Builder().setScreenWidthDp(192).setScreenHeightDp(192).build();
+
+ @Test
+ public void testAll() {
+ LayoutElement content = new Box.Builder().build();
+ CircularProgressIndicator progressIndicator =
+ new CircularProgressIndicator.Builder().build();
+ ProgressIndicatorLayout layout =
+ new ProgressIndicatorLayout.Builder(mDeviceParameters)
+ .setContent(content)
+ .setProgressIndicatorContent(progressIndicator)
+ .build();
+
+ assertThat(layout.getContent()).isNotNull();
+ assertThat(layout.getContent().toLayoutElementProto())
+ .isEqualTo(content.toLayoutElementProto());
+ assertThat(layout.getProgressIndicatorContent()).isNotNull();
+ assertThat(layout.getProgressIndicatorContent().toLayoutElementProto())
+ .isEqualTo(progressIndicator.toLayoutElementProto());
+ }
+
+ @Test
+ public void testContentOnly() {
+ LayoutElement content = new Box.Builder().build();
+ ProgressIndicatorLayout layout =
+ new ProgressIndicatorLayout.Builder(mDeviceParameters).setContent(content).build();
+
+ assertThat(layout.getContent()).isNotNull();
+ assertThat(layout.getContent().toLayoutElementProto())
+ .isEqualTo(content.toLayoutElementProto());
+ assertThat(layout.getProgressIndicatorContent()).isNull();
+ }
+
+ @Test
+ public void testIndicatorOnly() {
+ CircularProgressIndicator progressIndicator =
+ new CircularProgressIndicator.Builder().build();
+ ProgressIndicatorLayout layout =
+ new ProgressIndicatorLayout.Builder(mDeviceParameters)
+ .setProgressIndicatorContent(progressIndicator)
+ .build();
+
+ assertThat(layout.getContent()).isNull();
+ assertThat(layout.getProgressIndicatorContent()).isNotNull();
+ assertThat(layout.getProgressIndicatorContent().toLayoutElementProto())
+ .isEqualTo(progressIndicator.toLayoutElementProto());
+ }
+
+ @Test
+ public void testEmpty() {
+ ProgressIndicatorLayout layout =
+ new ProgressIndicatorLayout.Builder(mDeviceParameters).build();
+
+ assertThat(layout.getContent()).isNull();
+ assertThat(layout.getProgressIndicatorContent()).isNull();
+ }
+}
diff --git a/wear/watchface/watchface-client-guava/api/1.1.0-beta03.txt b/wear/watchface/watchface-client-guava/api/1.1.0-beta03.txt
new file mode 100644
index 0000000..ace6824
--- /dev/null
+++ b/wear/watchface/watchface-client-guava/api/1.1.0-beta03.txt
@@ -0,0 +1,32 @@
+// Signature format: 4.0
+package androidx.wear.watchface.client {
+
+ public class ListenableWatchFaceControlClient implements androidx.wear.watchface.client.WatchFaceControlClient {
+ ctor public ListenableWatchFaceControlClient(androidx.wear.watchface.client.WatchFaceControlClient watchFaceControlClient);
+ method public void close();
+ method @Deprecated public androidx.wear.watchface.client.HeadlessWatchFaceClient? createHeadlessWatchFaceClient(android.content.ComponentName watchFaceName, androidx.wear.watchface.client.DeviceConfig deviceConfig, int surfaceWidth, int surfaceHeight);
+ method public androidx.wear.watchface.client.HeadlessWatchFaceClient? createHeadlessWatchFaceClient(String id, android.content.ComponentName watchFaceName, androidx.wear.watchface.client.DeviceConfig deviceConfig, int surfaceWidth, int surfaceHeight);
+ method public static final com.google.common.util.concurrent.ListenableFuture<androidx.wear.watchface.client.ListenableWatchFaceControlClient> createWatchFaceControlClient(android.content.Context context, String watchFacePackageName);
+ method @Deprecated public java.util.Map<java.lang.Integer,androidx.wear.watchface.client.DefaultComplicationDataSourcePolicyAndType> getDefaultComplicationDataSourcePoliciesAndType(android.content.ComponentName watchFaceName);
+ method public androidx.wear.watchface.client.EditorServiceClient getEditorServiceClient();
+ method public androidx.wear.watchface.client.InteractiveWatchFaceClient? getInteractiveWatchFaceClientInstance(String instanceId);
+ method public suspend Object? getOrCreateInteractiveWatchFaceClient(String id, androidx.wear.watchface.client.DeviceConfig deviceConfig, androidx.wear.watchface.client.WatchUiState watchUiState, androidx.wear.watchface.style.UserStyleData? userStyle, java.util.Map<java.lang.Integer,? extends androidx.wear.watchface.complications.data.ComplicationData>? slotIdToComplicationData, kotlin.coroutines.Continuation<? super androidx.wear.watchface.client.InteractiveWatchFaceClient>);
+ method public com.google.common.util.concurrent.ListenableFuture<androidx.wear.watchface.client.InteractiveWatchFaceClient> listenableGetOrCreateInteractiveWatchFaceClient(String id, androidx.wear.watchface.client.DeviceConfig deviceConfig, androidx.wear.watchface.client.WatchUiState watchUiState, androidx.wear.watchface.style.UserStyleData? userStyle, java.util.Map<java.lang.Integer,? extends androidx.wear.watchface.complications.data.ComplicationData>? slotIdToComplicationData);
+ field public static final androidx.wear.watchface.client.ListenableWatchFaceControlClient.Companion Companion;
+ }
+
+ public static final class ListenableWatchFaceControlClient.Companion {
+ method public com.google.common.util.concurrent.ListenableFuture<androidx.wear.watchface.client.ListenableWatchFaceControlClient> createWatchFaceControlClient(android.content.Context context, String watchFacePackageName);
+ }
+
+ public final class ListenableWatchFaceMetadataClient {
+ method public static com.google.common.util.concurrent.ListenableFuture<androidx.wear.watchface.client.WatchFaceMetadataClient> create(android.content.Context context, android.content.ComponentName watchFaceName);
+ field public static final androidx.wear.watchface.client.ListenableWatchFaceMetadataClient.Companion Companion;
+ }
+
+ public static final class ListenableWatchFaceMetadataClient.Companion {
+ method public com.google.common.util.concurrent.ListenableFuture<androidx.wear.watchface.client.WatchFaceMetadataClient> create(android.content.Context context, android.content.ComponentName watchFaceName);
+ }
+
+}
+
diff --git a/wear/watchface/watchface-client-guava/api/public_plus_experimental_1.1.0-beta03.txt b/wear/watchface/watchface-client-guava/api/public_plus_experimental_1.1.0-beta03.txt
new file mode 100644
index 0000000..ace6824
--- /dev/null
+++ b/wear/watchface/watchface-client-guava/api/public_plus_experimental_1.1.0-beta03.txt
@@ -0,0 +1,32 @@
+// Signature format: 4.0
+package androidx.wear.watchface.client {
+
+ public class ListenableWatchFaceControlClient implements androidx.wear.watchface.client.WatchFaceControlClient {
+ ctor public ListenableWatchFaceControlClient(androidx.wear.watchface.client.WatchFaceControlClient watchFaceControlClient);
+ method public void close();
+ method @Deprecated public androidx.wear.watchface.client.HeadlessWatchFaceClient? createHeadlessWatchFaceClient(android.content.ComponentName watchFaceName, androidx.wear.watchface.client.DeviceConfig deviceConfig, int surfaceWidth, int surfaceHeight);
+ method public androidx.wear.watchface.client.HeadlessWatchFaceClient? createHeadlessWatchFaceClient(String id, android.content.ComponentName watchFaceName, androidx.wear.watchface.client.DeviceConfig deviceConfig, int surfaceWidth, int surfaceHeight);
+ method public static final com.google.common.util.concurrent.ListenableFuture<androidx.wear.watchface.client.ListenableWatchFaceControlClient> createWatchFaceControlClient(android.content.Context context, String watchFacePackageName);
+ method @Deprecated public java.util.Map<java.lang.Integer,androidx.wear.watchface.client.DefaultComplicationDataSourcePolicyAndType> getDefaultComplicationDataSourcePoliciesAndType(android.content.ComponentName watchFaceName);
+ method public androidx.wear.watchface.client.EditorServiceClient getEditorServiceClient();
+ method public androidx.wear.watchface.client.InteractiveWatchFaceClient? getInteractiveWatchFaceClientInstance(String instanceId);
+ method public suspend Object? getOrCreateInteractiveWatchFaceClient(String id, androidx.wear.watchface.client.DeviceConfig deviceConfig, androidx.wear.watchface.client.WatchUiState watchUiState, androidx.wear.watchface.style.UserStyleData? userStyle, java.util.Map<java.lang.Integer,? extends androidx.wear.watchface.complications.data.ComplicationData>? slotIdToComplicationData, kotlin.coroutines.Continuation<? super androidx.wear.watchface.client.InteractiveWatchFaceClient>);
+ method public com.google.common.util.concurrent.ListenableFuture<androidx.wear.watchface.client.InteractiveWatchFaceClient> listenableGetOrCreateInteractiveWatchFaceClient(String id, androidx.wear.watchface.client.DeviceConfig deviceConfig, androidx.wear.watchface.client.WatchUiState watchUiState, androidx.wear.watchface.style.UserStyleData? userStyle, java.util.Map<java.lang.Integer,? extends androidx.wear.watchface.complications.data.ComplicationData>? slotIdToComplicationData);
+ field public static final androidx.wear.watchface.client.ListenableWatchFaceControlClient.Companion Companion;
+ }
+
+ public static final class ListenableWatchFaceControlClient.Companion {
+ method public com.google.common.util.concurrent.ListenableFuture<androidx.wear.watchface.client.ListenableWatchFaceControlClient> createWatchFaceControlClient(android.content.Context context, String watchFacePackageName);
+ }
+
+ public final class ListenableWatchFaceMetadataClient {
+ method public static com.google.common.util.concurrent.ListenableFuture<androidx.wear.watchface.client.WatchFaceMetadataClient> create(android.content.Context context, android.content.ComponentName watchFaceName);
+ field public static final androidx.wear.watchface.client.ListenableWatchFaceMetadataClient.Companion Companion;
+ }
+
+ public static final class ListenableWatchFaceMetadataClient.Companion {
+ method public com.google.common.util.concurrent.ListenableFuture<androidx.wear.watchface.client.WatchFaceMetadataClient> create(android.content.Context context, android.content.ComponentName watchFaceName);
+ }
+
+}
+
diff --git a/wear/watchface/watchface-client-guava/api/res-1.1.0-beta03.txt b/wear/watchface/watchface-client-guava/api/res-1.1.0-beta03.txt
new file mode 100644
index 0000000..e69de29
--- /dev/null
+++ b/wear/watchface/watchface-client-guava/api/res-1.1.0-beta03.txt
diff --git a/wear/watchface/watchface-client-guava/api/restricted_1.1.0-beta03.txt b/wear/watchface/watchface-client-guava/api/restricted_1.1.0-beta03.txt
new file mode 100644
index 0000000..ace6824
--- /dev/null
+++ b/wear/watchface/watchface-client-guava/api/restricted_1.1.0-beta03.txt
@@ -0,0 +1,32 @@
+// Signature format: 4.0
+package androidx.wear.watchface.client {
+
+ public class ListenableWatchFaceControlClient implements androidx.wear.watchface.client.WatchFaceControlClient {
+ ctor public ListenableWatchFaceControlClient(androidx.wear.watchface.client.WatchFaceControlClient watchFaceControlClient);
+ method public void close();
+ method @Deprecated public androidx.wear.watchface.client.HeadlessWatchFaceClient? createHeadlessWatchFaceClient(android.content.ComponentName watchFaceName, androidx.wear.watchface.client.DeviceConfig deviceConfig, int surfaceWidth, int surfaceHeight);
+ method public androidx.wear.watchface.client.HeadlessWatchFaceClient? createHeadlessWatchFaceClient(String id, android.content.ComponentName watchFaceName, androidx.wear.watchface.client.DeviceConfig deviceConfig, int surfaceWidth, int surfaceHeight);
+ method public static final com.google.common.util.concurrent.ListenableFuture<androidx.wear.watchface.client.ListenableWatchFaceControlClient> createWatchFaceControlClient(android.content.Context context, String watchFacePackageName);
+ method @Deprecated public java.util.Map<java.lang.Integer,androidx.wear.watchface.client.DefaultComplicationDataSourcePolicyAndType> getDefaultComplicationDataSourcePoliciesAndType(android.content.ComponentName watchFaceName);
+ method public androidx.wear.watchface.client.EditorServiceClient getEditorServiceClient();
+ method public androidx.wear.watchface.client.InteractiveWatchFaceClient? getInteractiveWatchFaceClientInstance(String instanceId);
+ method public suspend Object? getOrCreateInteractiveWatchFaceClient(String id, androidx.wear.watchface.client.DeviceConfig deviceConfig, androidx.wear.watchface.client.WatchUiState watchUiState, androidx.wear.watchface.style.UserStyleData? userStyle, java.util.Map<java.lang.Integer,? extends androidx.wear.watchface.complications.data.ComplicationData>? slotIdToComplicationData, kotlin.coroutines.Continuation<? super androidx.wear.watchface.client.InteractiveWatchFaceClient>);
+ method public com.google.common.util.concurrent.ListenableFuture<androidx.wear.watchface.client.InteractiveWatchFaceClient> listenableGetOrCreateInteractiveWatchFaceClient(String id, androidx.wear.watchface.client.DeviceConfig deviceConfig, androidx.wear.watchface.client.WatchUiState watchUiState, androidx.wear.watchface.style.UserStyleData? userStyle, java.util.Map<java.lang.Integer,? extends androidx.wear.watchface.complications.data.ComplicationData>? slotIdToComplicationData);
+ field public static final androidx.wear.watchface.client.ListenableWatchFaceControlClient.Companion Companion;
+ }
+
+ public static final class ListenableWatchFaceControlClient.Companion {
+ method public com.google.common.util.concurrent.ListenableFuture<androidx.wear.watchface.client.ListenableWatchFaceControlClient> createWatchFaceControlClient(android.content.Context context, String watchFacePackageName);
+ }
+
+ public final class ListenableWatchFaceMetadataClient {
+ method public static com.google.common.util.concurrent.ListenableFuture<androidx.wear.watchface.client.WatchFaceMetadataClient> create(android.content.Context context, android.content.ComponentName watchFaceName);
+ field public static final androidx.wear.watchface.client.ListenableWatchFaceMetadataClient.Companion Companion;
+ }
+
+ public static final class ListenableWatchFaceMetadataClient.Companion {
+ method public com.google.common.util.concurrent.ListenableFuture<androidx.wear.watchface.client.WatchFaceMetadataClient> create(android.content.Context context, android.content.ComponentName watchFaceName);
+ }
+
+}
+
diff --git a/wear/watchface/watchface-client/api/1.1.0-beta03.txt b/wear/watchface/watchface-client/api/1.1.0-beta03.txt
new file mode 100644
index 0000000..6937121
--- /dev/null
+++ b/wear/watchface/watchface-client/api/1.1.0-beta03.txt
@@ -0,0 +1,244 @@
+// Signature format: 4.0
+package androidx.wear.watchface.client {
+
+ public final class ComplicationSlotMetadata {
+ ctor public ComplicationSlotMetadata(androidx.wear.watchface.complications.ComplicationSlotBounds? bounds, int boundsType, java.util.List<? extends androidx.wear.watchface.complications.data.ComplicationType> supportedTypes, androidx.wear.watchface.complications.DefaultComplicationDataSourcePolicy defaultDataSourcePolicy, boolean isInitiallyEnabled, boolean fixedComplicationDataSource, android.os.Bundle complicationConfigExtras);
+ method public androidx.wear.watchface.complications.ComplicationSlotBounds? getBounds();
+ method public int getBoundsType();
+ method public android.os.Bundle getComplicationConfigExtras();
+ method public androidx.wear.watchface.complications.DefaultComplicationDataSourcePolicy getDefaultDataSourcePolicy();
+ method public boolean getFixedComplicationDataSource();
+ method public java.util.List<androidx.wear.watchface.complications.data.ComplicationType> getSupportedTypes();
+ method public boolean isInitiallyEnabled();
+ property public final androidx.wear.watchface.complications.ComplicationSlotBounds? bounds;
+ property public final int boundsType;
+ property public final android.os.Bundle complicationConfigExtras;
+ property public final androidx.wear.watchface.complications.DefaultComplicationDataSourcePolicy defaultDataSourcePolicy;
+ property public final boolean fixedComplicationDataSource;
+ property public final boolean isInitiallyEnabled;
+ property public final java.util.List<androidx.wear.watchface.complications.data.ComplicationType> supportedTypes;
+ }
+
+ public final class ComplicationSlotState {
+ ctor public ComplicationSlotState(android.graphics.Rect bounds, int boundsType, java.util.List<? extends androidx.wear.watchface.complications.data.ComplicationType> supportedTypes, androidx.wear.watchface.complications.DefaultComplicationDataSourcePolicy defaultDataSourcePolicy, boolean isEnabled, boolean isInitiallyEnabled, androidx.wear.watchface.complications.data.ComplicationType currentType, boolean fixedComplicationDataSource, android.os.Bundle complicationConfigExtras, Integer? nameResourceId, Integer? screenReaderNameResourceId);
+ ctor @Deprecated public ComplicationSlotState(android.graphics.Rect bounds, int boundsType, java.util.List<? extends androidx.wear.watchface.complications.data.ComplicationType> supportedTypes, androidx.wear.watchface.complications.DefaultComplicationDataSourcePolicy defaultDataSourcePolicy, androidx.wear.watchface.complications.data.ComplicationType defaultDataSourceType, boolean isEnabled, boolean isInitiallyEnabled, androidx.wear.watchface.complications.data.ComplicationType currentType, boolean fixedComplicationDataSource, android.os.Bundle complicationConfigExtras);
+ method public android.graphics.Rect getBounds();
+ method public int getBoundsType();
+ method public android.os.Bundle getComplicationConfigExtras();
+ method public androidx.wear.watchface.complications.data.ComplicationType getCurrentType();
+ method public androidx.wear.watchface.complications.DefaultComplicationDataSourcePolicy getDefaultDataSourcePolicy();
+ method @Deprecated public androidx.wear.watchface.complications.data.ComplicationType getDefaultDataSourceType();
+ method public boolean getFixedComplicationDataSource();
+ method public Integer? getNameResourceId();
+ method public Integer? getScreenReaderNameResourceId();
+ method public java.util.List<androidx.wear.watchface.complications.data.ComplicationType> getSupportedTypes();
+ method public boolean isEnabled();
+ method public boolean isInitiallyEnabled();
+ property public final android.graphics.Rect bounds;
+ property public final int boundsType;
+ property public final android.os.Bundle complicationConfigExtras;
+ property public final androidx.wear.watchface.complications.data.ComplicationType currentType;
+ property public final androidx.wear.watchface.complications.DefaultComplicationDataSourcePolicy defaultDataSourcePolicy;
+ property @Deprecated public final androidx.wear.watchface.complications.data.ComplicationType defaultDataSourceType;
+ property public final boolean fixedComplicationDataSource;
+ property public final boolean isEnabled;
+ property public final boolean isInitiallyEnabled;
+ property public final Integer? nameResourceId;
+ property public final Integer? screenReaderNameResourceId;
+ property public final java.util.List<androidx.wear.watchface.complications.data.ComplicationType> supportedTypes;
+ }
+
+ @Deprecated public final class DefaultComplicationDataSourcePolicyAndType {
+ ctor @Deprecated public DefaultComplicationDataSourcePolicyAndType(androidx.wear.watchface.complications.DefaultComplicationDataSourcePolicy policy, androidx.wear.watchface.complications.data.ComplicationType type);
+ method @Deprecated public androidx.wear.watchface.complications.DefaultComplicationDataSourcePolicy getPolicy();
+ method @Deprecated public androidx.wear.watchface.complications.data.ComplicationType getType();
+ property public final androidx.wear.watchface.complications.DefaultComplicationDataSourcePolicy policy;
+ property public final androidx.wear.watchface.complications.data.ComplicationType type;
+ }
+
+ public final class DeviceConfig {
+ ctor public DeviceConfig(boolean hasLowBitAmbient, boolean hasBurnInProtection, long analogPreviewReferenceTimeMillis, long digitalPreviewReferenceTimeMillis);
+ method public long getAnalogPreviewReferenceTimeMillis();
+ method public long getDigitalPreviewReferenceTimeMillis();
+ method public boolean getHasBurnInProtection();
+ method public boolean getHasLowBitAmbient();
+ property public final long analogPreviewReferenceTimeMillis;
+ property public final long digitalPreviewReferenceTimeMillis;
+ property public final boolean hasBurnInProtection;
+ property public final boolean hasLowBitAmbient;
+ }
+
+ public final class DeviceConfigKt {
+ }
+
+ public interface EditorListener {
+ method public void onEditorStateChanged(androidx.wear.watchface.client.EditorState editorState);
+ }
+
+ public interface EditorServiceClient {
+ method public void addListener(androidx.wear.watchface.client.EditorListener editorListener, java.util.concurrent.Executor listenerExecutor);
+ method @kotlin.jvm.Throws(exceptionClasses=RemoteException::class) public void closeEditor() throws android.os.RemoteException;
+ method public void removeListener(androidx.wear.watchface.client.EditorListener editorListener);
+ }
+
+ public final class EditorState {
+ method public java.util.Map<java.lang.Integer,androidx.wear.watchface.complications.data.ComplicationData> getPreviewComplicationsData();
+ method public android.graphics.Bitmap? getPreviewImage();
+ method public boolean getShouldCommitChanges();
+ method public androidx.wear.watchface.style.UserStyleData getUserStyle();
+ method public androidx.wear.watchface.client.WatchFaceId getWatchFaceId();
+ property public final java.util.Map<java.lang.Integer,androidx.wear.watchface.complications.data.ComplicationData> previewComplicationsData;
+ property public final android.graphics.Bitmap? previewImage;
+ property public final boolean shouldCommitChanges;
+ property public final androidx.wear.watchface.style.UserStyleData userStyle;
+ property public final androidx.wear.watchface.client.WatchFaceId watchFaceId;
+ }
+
+ public final class EditorStateKt {
+ }
+
+ public interface HeadlessWatchFaceClient extends java.lang.AutoCloseable {
+ method @AnyThread public void addClientDisconnectListener(androidx.wear.watchface.client.HeadlessWatchFaceClient.ClientDisconnectListener listener, java.util.concurrent.Executor executor);
+ method public default static androidx.wear.watchface.client.HeadlessWatchFaceClient createFromBundle(android.os.Bundle bundle);
+ method @kotlin.jvm.Throws(exceptionClasses=RemoteException::class) public java.util.Map<java.lang.Integer,androidx.wear.watchface.client.ComplicationSlotState> getComplicationSlotsState();
+ method @kotlin.jvm.Throws(exceptionClasses=RemoteException::class) public java.time.Instant getPreviewReferenceInstant();
+ method @kotlin.jvm.Throws(exceptionClasses=RemoteException::class) public androidx.wear.watchface.style.UserStyleSchema getUserStyleSchema();
+ method @kotlin.jvm.Throws(exceptionClasses=RemoteException::class) public default byte[] getUserStyleSchemaDigestHash() throws android.os.RemoteException;
+ method @AnyThread public boolean isConnectionAlive();
+ method @AnyThread public void removeClientDisconnectListener(androidx.wear.watchface.client.HeadlessWatchFaceClient.ClientDisconnectListener listener);
+ method @RequiresApi(27) @kotlin.jvm.Throws(exceptionClasses=RemoteException::class) public android.graphics.Bitmap? renderComplicationToBitmap(int complicationSlotId, androidx.wear.watchface.RenderParameters renderParameters, java.time.Instant instant, androidx.wear.watchface.complications.data.ComplicationData complicationData, androidx.wear.watchface.style.UserStyle? userStyle) throws android.os.RemoteException;
+ method @RequiresApi(27) @kotlin.jvm.Throws(exceptionClasses=RemoteException::class) public android.graphics.Bitmap renderWatchFaceToBitmap(androidx.wear.watchface.RenderParameters renderParameters, java.time.Instant instant, androidx.wear.watchface.style.UserStyle? userStyle, java.util.Map<java.lang.Integer,? extends androidx.wear.watchface.complications.data.ComplicationData>? slotIdToComplicationData) throws android.os.RemoteException;
+ method public android.os.Bundle toBundle();
+ property @kotlin.jvm.Throws(exceptionClasses=RemoteException::class) public abstract java.util.Map<java.lang.Integer,androidx.wear.watchface.client.ComplicationSlotState> complicationSlotsState;
+ property @kotlin.jvm.Throws(exceptionClasses=RemoteException::class) public abstract java.time.Instant previewReferenceInstant;
+ property @kotlin.jvm.Throws(exceptionClasses=RemoteException::class) public abstract androidx.wear.watchface.style.UserStyleSchema userStyleSchema;
+ field public static final String BINDER_KEY = "HeadlessWatchFaceClient";
+ field public static final androidx.wear.watchface.client.HeadlessWatchFaceClient.Companion Companion;
+ }
+
+ public static interface HeadlessWatchFaceClient.ClientDisconnectListener {
+ method public void onClientDisconnected();
+ }
+
+ public static final class HeadlessWatchFaceClient.Companion {
+ method public androidx.wear.watchface.client.HeadlessWatchFaceClient createFromBundle(android.os.Bundle bundle);
+ }
+
+ public interface InteractiveWatchFaceClient extends java.lang.AutoCloseable {
+ method @AnyThread public void addClientDisconnectListener(androidx.wear.watchface.client.InteractiveWatchFaceClient.ClientDisconnectListener listener, java.util.concurrent.Executor executor);
+ method public void addOnWatchFaceReadyListener(java.util.concurrent.Executor executor, androidx.wear.watchface.client.InteractiveWatchFaceClient.OnWatchFaceReadyListener listener);
+ method @kotlin.jvm.Throws(exceptionClasses=RemoteException::class) public default Integer? getComplicationIdAt(@Px int x, @Px int y) throws android.os.RemoteException;
+ method @kotlin.jvm.Throws(exceptionClasses=RemoteException::class) public java.util.Map<java.lang.Integer,androidx.wear.watchface.client.ComplicationSlotState> getComplicationSlotsState();
+ method @kotlin.jvm.Throws(exceptionClasses=RemoteException::class) public java.util.List<androidx.wear.watchface.ContentDescriptionLabel> getContentDescriptionLabels();
+ method @kotlin.jvm.Throws(exceptionClasses=RemoteException::class) public String getInstanceId();
+ method @kotlin.jvm.Throws(exceptionClasses=RemoteException::class) public default androidx.wear.watchface.client.OverlayStyle getOverlayStyle();
+ method @kotlin.jvm.Throws(exceptionClasses=RemoteException::class) public java.time.Instant getPreviewReferenceInstant();
+ method @kotlin.jvm.Throws(exceptionClasses=RemoteException::class) public androidx.wear.watchface.style.UserStyleSchema getUserStyleSchema();
+ method @AnyThread public boolean isConnectionAlive();
+ method @kotlin.jvm.Throws(exceptionClasses=RemoteException::class) public void performAmbientTick() throws android.os.RemoteException;
+ method @AnyThread public void removeClientDisconnectListener(androidx.wear.watchface.client.InteractiveWatchFaceClient.ClientDisconnectListener listener);
+ method public void removeOnWatchFaceReadyListener(androidx.wear.watchface.client.InteractiveWatchFaceClient.OnWatchFaceReadyListener listener);
+ method @RequiresApi(27) @kotlin.jvm.Throws(exceptionClasses=RemoteException::class) public android.graphics.Bitmap renderWatchFaceToBitmap(androidx.wear.watchface.RenderParameters renderParameters, java.time.Instant instant, androidx.wear.watchface.style.UserStyle? userStyle, java.util.Map<java.lang.Integer,? extends androidx.wear.watchface.complications.data.ComplicationData>? idAndComplicationData) throws android.os.RemoteException;
+ method @kotlin.jvm.Throws(exceptionClasses=RemoteException::class) public void sendTouchEvent(@Px int xPosition, @Px int yPosition, @androidx.wear.watchface.TapType int tapType) throws android.os.RemoteException;
+ method @kotlin.jvm.Throws(exceptionClasses=RemoteException::class) public void setWatchUiState(androidx.wear.watchface.client.WatchUiState watchUiState) throws android.os.RemoteException;
+ method @kotlin.jvm.Throws(exceptionClasses=RemoteException::class) public void updateComplicationData(java.util.Map<java.lang.Integer,? extends androidx.wear.watchface.complications.data.ComplicationData> slotIdToComplicationData) throws android.os.RemoteException;
+ method @kotlin.jvm.Throws(exceptionClasses=RemoteException::class) public void updateWatchFaceInstance(String newInstanceId, androidx.wear.watchface.style.UserStyle userStyle) throws android.os.RemoteException;
+ method @kotlin.jvm.Throws(exceptionClasses=RemoteException::class) public void updateWatchFaceInstance(String newInstanceId, androidx.wear.watchface.style.UserStyleData userStyle) throws android.os.RemoteException;
+ property @kotlin.jvm.Throws(exceptionClasses=RemoteException::class) public abstract java.util.Map<java.lang.Integer,androidx.wear.watchface.client.ComplicationSlotState> complicationSlotsState;
+ property @kotlin.jvm.Throws(exceptionClasses=RemoteException::class) public abstract java.util.List<androidx.wear.watchface.ContentDescriptionLabel> contentDescriptionLabels;
+ property @kotlin.jvm.Throws(exceptionClasses=RemoteException::class) public abstract String instanceId;
+ property @kotlin.jvm.Throws(exceptionClasses=RemoteException::class) public default androidx.wear.watchface.client.OverlayStyle overlayStyle;
+ property @kotlin.jvm.Throws(exceptionClasses=RemoteException::class) public abstract java.time.Instant previewReferenceInstant;
+ property @kotlin.jvm.Throws(exceptionClasses=RemoteException::class) public abstract androidx.wear.watchface.style.UserStyleSchema userStyleSchema;
+ field public static final androidx.wear.watchface.client.InteractiveWatchFaceClient.Companion Companion;
+ field public static final int TAP_TYPE_CANCEL = 1; // 0x1
+ field public static final int TAP_TYPE_DOWN = 0; // 0x0
+ field public static final int TAP_TYPE_UP = 2; // 0x2
+ }
+
+ public static interface InteractiveWatchFaceClient.ClientDisconnectListener {
+ method public void onClientDisconnected();
+ }
+
+ public static final class InteractiveWatchFaceClient.Companion {
+ field public static final int TAP_TYPE_CANCEL = 1; // 0x1
+ field public static final int TAP_TYPE_DOWN = 0; // 0x0
+ field public static final int TAP_TYPE_UP = 2; // 0x2
+ }
+
+ public static fun interface InteractiveWatchFaceClient.OnWatchFaceReadyListener {
+ method public void onWatchFaceReady();
+ }
+
+ public final class OverlayStyle {
+ ctor public OverlayStyle(android.graphics.Color? backgroundColor, android.graphics.Color? foregroundColor);
+ ctor public OverlayStyle();
+ method public android.graphics.Color? getBackgroundColor();
+ method public android.graphics.Color? getForegroundColor();
+ property public final android.graphics.Color? backgroundColor;
+ property public final android.graphics.Color? foregroundColor;
+ }
+
+ public interface WatchFaceControlClient extends java.lang.AutoCloseable {
+ method @Deprecated @kotlin.jvm.Throws(exceptionClasses=RemoteException::class) public androidx.wear.watchface.client.HeadlessWatchFaceClient? createHeadlessWatchFaceClient(android.content.ComponentName watchFaceName, androidx.wear.watchface.client.DeviceConfig deviceConfig, @Px int surfaceWidth, @Px int surfaceHeight) throws android.os.RemoteException;
+ method @kotlin.jvm.Throws(exceptionClasses=RemoteException::class) public default androidx.wear.watchface.client.HeadlessWatchFaceClient? createHeadlessWatchFaceClient(String id, android.content.ComponentName watchFaceName, androidx.wear.watchface.client.DeviceConfig deviceConfig, @Px int surfaceWidth, @Px int surfaceHeight) throws android.os.RemoteException;
+ method @kotlin.jvm.Throws(exceptionClasses={ServiceNotBoundException::class, ServiceStartFailureException::class}) public default static suspend Object? createWatchFaceControlClient(android.content.Context context, String watchFacePackageName, kotlin.coroutines.Continuation<? super androidx.wear.watchface.client.WatchFaceControlClient>) throws androidx.wear.watchface.client.WatchFaceControlClient.ServiceNotBoundException, androidx.wear.watchface.client.WatchFaceControlClient.ServiceStartFailureException;
+ method @Deprecated @kotlin.jvm.Throws(exceptionClasses=RemoteException::class) public java.util.Map<java.lang.Integer,androidx.wear.watchface.client.DefaultComplicationDataSourcePolicyAndType> getDefaultComplicationDataSourcePoliciesAndType(android.content.ComponentName watchFaceName) throws android.os.RemoteException;
+ method @kotlin.jvm.Throws(exceptionClasses=RemoteException::class) public androidx.wear.watchface.client.EditorServiceClient getEditorServiceClient() throws android.os.RemoteException;
+ method @kotlin.jvm.Throws(exceptionClasses=RemoteException::class) public androidx.wear.watchface.client.InteractiveWatchFaceClient? getInteractiveWatchFaceClientInstance(String instanceId) throws android.os.RemoteException;
+ method @kotlin.jvm.Throws(exceptionClasses=RemoteException::class) public suspend Object? getOrCreateInteractiveWatchFaceClient(String id, androidx.wear.watchface.client.DeviceConfig deviceConfig, androidx.wear.watchface.client.WatchUiState watchUiState, androidx.wear.watchface.style.UserStyleData? userStyle, java.util.Map<java.lang.Integer,? extends androidx.wear.watchface.complications.data.ComplicationData>? slotIdToComplicationData, kotlin.coroutines.Continuation<? super androidx.wear.watchface.client.InteractiveWatchFaceClient>) throws android.os.RemoteException;
+ method public default boolean hasComplicationDataCache();
+ field public static final androidx.wear.watchface.client.WatchFaceControlClient.Companion Companion;
+ }
+
+ public static final class WatchFaceControlClient.Companion {
+ method @kotlin.jvm.Throws(exceptionClasses={ServiceNotBoundException::class, ServiceStartFailureException::class}) public suspend Object? createWatchFaceControlClient(android.content.Context context, String watchFacePackageName, kotlin.coroutines.Continuation<? super androidx.wear.watchface.client.WatchFaceControlClient>) throws androidx.wear.watchface.client.WatchFaceControlClient.ServiceNotBoundException, androidx.wear.watchface.client.WatchFaceControlClient.ServiceStartFailureException;
+ }
+
+ public static final class WatchFaceControlClient.ServiceNotBoundException extends java.lang.Exception {
+ ctor public WatchFaceControlClient.ServiceNotBoundException();
+ }
+
+ public static final class WatchFaceControlClient.ServiceStartFailureException extends java.lang.Exception {
+ ctor public WatchFaceControlClient.ServiceStartFailureException(optional String message);
+ }
+
+ public final class WatchFaceExceptionKt {
+ }
+
+ public final class WatchFaceId {
+ ctor public WatchFaceId(String id);
+ method public String getId();
+ property public final String id;
+ }
+
+ public interface WatchFaceMetadataClient extends java.lang.AutoCloseable {
+ method public java.util.Map<java.lang.Integer,androidx.wear.watchface.client.ComplicationSlotMetadata> getComplicationSlotMetadataMap();
+ method public androidx.wear.watchface.style.UserStyleSchema getUserStyleSchema();
+ method public boolean isUserStyleSchemaStatic();
+ property public abstract boolean isUserStyleSchemaStatic;
+ field public static final androidx.wear.watchface.client.WatchFaceMetadataClient.Companion Companion;
+ }
+
+ public static final class WatchFaceMetadataClient.Companion {
+ method @kotlin.jvm.Throws(exceptionClasses={ServiceNotBoundException::class, ServiceStartFailureException::class, PackageManager.NameNotFoundException::class}) public suspend Object? create(android.content.Context context, android.content.ComponentName watchFaceName, kotlin.coroutines.Continuation<? super androidx.wear.watchface.client.WatchFaceMetadataClient>) throws android.content.pm.PackageManager.NameNotFoundException, androidx.wear.watchface.client.WatchFaceMetadataClient.ServiceNotBoundException, androidx.wear.watchface.client.WatchFaceMetadataClient.ServiceStartFailureException;
+ }
+
+ public static final class WatchFaceMetadataClient.ServiceNotBoundException extends java.lang.Exception {
+ ctor public WatchFaceMetadataClient.ServiceNotBoundException();
+ }
+
+ public static final class WatchFaceMetadataClient.ServiceStartFailureException extends java.lang.Exception {
+ ctor public WatchFaceMetadataClient.ServiceStartFailureException(optional String message);
+ }
+
+ public final class WatchUiState {
+ ctor public WatchUiState(boolean inAmbientMode, int interruptionFilter);
+ method public boolean getInAmbientMode();
+ method public int getInterruptionFilter();
+ property public final boolean inAmbientMode;
+ property public final int interruptionFilter;
+ }
+
+}
+
diff --git a/wear/watchface/watchface-client/api/public_plus_experimental_1.1.0-beta03.txt b/wear/watchface/watchface-client/api/public_plus_experimental_1.1.0-beta03.txt
new file mode 100644
index 0000000..1926f07
--- /dev/null
+++ b/wear/watchface/watchface-client/api/public_plus_experimental_1.1.0-beta03.txt
@@ -0,0 +1,253 @@
+// Signature format: 4.0
+package androidx.wear.watchface.client {
+
+ public final class ComplicationSlotMetadata {
+ ctor @androidx.wear.watchface.complications.data.ComplicationExperimental public ComplicationSlotMetadata(androidx.wear.watchface.complications.ComplicationSlotBounds? bounds, int boundsType, java.util.List<? extends androidx.wear.watchface.complications.data.ComplicationType> supportedTypes, androidx.wear.watchface.complications.DefaultComplicationDataSourcePolicy defaultDataSourcePolicy, boolean isInitiallyEnabled, boolean fixedComplicationDataSource, android.os.Bundle complicationConfigExtras, androidx.wear.watchface.BoundingArc? boundingArc);
+ ctor public ComplicationSlotMetadata(androidx.wear.watchface.complications.ComplicationSlotBounds? bounds, int boundsType, java.util.List<? extends androidx.wear.watchface.complications.data.ComplicationType> supportedTypes, androidx.wear.watchface.complications.DefaultComplicationDataSourcePolicy defaultDataSourcePolicy, boolean isInitiallyEnabled, boolean fixedComplicationDataSource, android.os.Bundle complicationConfigExtras);
+ method @androidx.wear.watchface.complications.data.ComplicationExperimental public androidx.wear.watchface.BoundingArc? getBoundingArc();
+ method public androidx.wear.watchface.complications.ComplicationSlotBounds? getBounds();
+ method public int getBoundsType();
+ method public android.os.Bundle getComplicationConfigExtras();
+ method public androidx.wear.watchface.complications.DefaultComplicationDataSourcePolicy getDefaultDataSourcePolicy();
+ method public boolean getFixedComplicationDataSource();
+ method public java.util.List<androidx.wear.watchface.complications.data.ComplicationType> getSupportedTypes();
+ method public boolean isInitiallyEnabled();
+ property public final androidx.wear.watchface.complications.ComplicationSlotBounds? bounds;
+ property public final int boundsType;
+ property public final android.os.Bundle complicationConfigExtras;
+ property public final androidx.wear.watchface.complications.DefaultComplicationDataSourcePolicy defaultDataSourcePolicy;
+ property public final boolean fixedComplicationDataSource;
+ property public final boolean isInitiallyEnabled;
+ property public final java.util.List<androidx.wear.watchface.complications.data.ComplicationType> supportedTypes;
+ }
+
+ public final class ComplicationSlotState {
+ ctor public ComplicationSlotState(android.graphics.Rect bounds, int boundsType, java.util.List<? extends androidx.wear.watchface.complications.data.ComplicationType> supportedTypes, androidx.wear.watchface.complications.DefaultComplicationDataSourcePolicy defaultDataSourcePolicy, boolean isEnabled, boolean isInitiallyEnabled, androidx.wear.watchface.complications.data.ComplicationType currentType, boolean fixedComplicationDataSource, android.os.Bundle complicationConfigExtras, Integer? nameResourceId, Integer? screenReaderNameResourceId);
+ ctor @androidx.wear.watchface.complications.data.ComplicationExperimental public ComplicationSlotState(android.graphics.Rect bounds, int boundsType, java.util.List<? extends androidx.wear.watchface.complications.data.ComplicationType> supportedTypes, androidx.wear.watchface.complications.DefaultComplicationDataSourcePolicy defaultDataSourcePolicy, boolean isEnabled, boolean isInitiallyEnabled, androidx.wear.watchface.complications.data.ComplicationType currentType, boolean fixedComplicationDataSource, android.os.Bundle complicationConfigExtras, Integer? nameResourceId, Integer? screenReaderNameResourceId, androidx.wear.watchface.BoundingArc? edgeComplicationBoundingArc);
+ ctor @Deprecated public ComplicationSlotState(android.graphics.Rect bounds, int boundsType, java.util.List<? extends androidx.wear.watchface.complications.data.ComplicationType> supportedTypes, androidx.wear.watchface.complications.DefaultComplicationDataSourcePolicy defaultDataSourcePolicy, androidx.wear.watchface.complications.data.ComplicationType defaultDataSourceType, boolean isEnabled, boolean isInitiallyEnabled, androidx.wear.watchface.complications.data.ComplicationType currentType, boolean fixedComplicationDataSource, android.os.Bundle complicationConfigExtras);
+ method @androidx.wear.watchface.complications.data.ComplicationExperimental public androidx.wear.watchface.BoundingArc? getBoundingArc();
+ method public android.graphics.Rect getBounds();
+ method public int getBoundsType();
+ method public android.os.Bundle getComplicationConfigExtras();
+ method public androidx.wear.watchface.complications.data.ComplicationType getCurrentType();
+ method public androidx.wear.watchface.complications.DefaultComplicationDataSourcePolicy getDefaultDataSourcePolicy();
+ method @Deprecated public androidx.wear.watchface.complications.data.ComplicationType getDefaultDataSourceType();
+ method public boolean getFixedComplicationDataSource();
+ method public Integer? getNameResourceId();
+ method public Integer? getScreenReaderNameResourceId();
+ method public java.util.List<androidx.wear.watchface.complications.data.ComplicationType> getSupportedTypes();
+ method public boolean isEnabled();
+ method public boolean isInitiallyEnabled();
+ property public final android.graphics.Rect bounds;
+ property public final int boundsType;
+ property public final android.os.Bundle complicationConfigExtras;
+ property public final androidx.wear.watchface.complications.data.ComplicationType currentType;
+ property public final androidx.wear.watchface.complications.DefaultComplicationDataSourcePolicy defaultDataSourcePolicy;
+ property @Deprecated public final androidx.wear.watchface.complications.data.ComplicationType defaultDataSourceType;
+ property public final boolean fixedComplicationDataSource;
+ property public final boolean isEnabled;
+ property public final boolean isInitiallyEnabled;
+ property public final Integer? nameResourceId;
+ property public final Integer? screenReaderNameResourceId;
+ property public final java.util.List<androidx.wear.watchface.complications.data.ComplicationType> supportedTypes;
+ }
+
+ @Deprecated public final class DefaultComplicationDataSourcePolicyAndType {
+ ctor @Deprecated public DefaultComplicationDataSourcePolicyAndType(androidx.wear.watchface.complications.DefaultComplicationDataSourcePolicy policy, androidx.wear.watchface.complications.data.ComplicationType type);
+ method @Deprecated public androidx.wear.watchface.complications.DefaultComplicationDataSourcePolicy getPolicy();
+ method @Deprecated public androidx.wear.watchface.complications.data.ComplicationType getType();
+ property public final androidx.wear.watchface.complications.DefaultComplicationDataSourcePolicy policy;
+ property public final androidx.wear.watchface.complications.data.ComplicationType type;
+ }
+
+ public final class DeviceConfig {
+ ctor public DeviceConfig(boolean hasLowBitAmbient, boolean hasBurnInProtection, long analogPreviewReferenceTimeMillis, long digitalPreviewReferenceTimeMillis);
+ method public long getAnalogPreviewReferenceTimeMillis();
+ method public long getDigitalPreviewReferenceTimeMillis();
+ method public boolean getHasBurnInProtection();
+ method public boolean getHasLowBitAmbient();
+ property public final long analogPreviewReferenceTimeMillis;
+ property public final long digitalPreviewReferenceTimeMillis;
+ property public final boolean hasBurnInProtection;
+ property public final boolean hasLowBitAmbient;
+ }
+
+ public final class DeviceConfigKt {
+ }
+
+ public interface EditorListener {
+ method public void onEditorStateChanged(androidx.wear.watchface.client.EditorState editorState);
+ }
+
+ public interface EditorServiceClient {
+ method public void addListener(androidx.wear.watchface.client.EditorListener editorListener, java.util.concurrent.Executor listenerExecutor);
+ method @kotlin.jvm.Throws(exceptionClasses=RemoteException::class) public void closeEditor() throws android.os.RemoteException;
+ method public void removeListener(androidx.wear.watchface.client.EditorListener editorListener);
+ }
+
+ public final class EditorState {
+ method public java.util.Map<java.lang.Integer,androidx.wear.watchface.complications.data.ComplicationData> getPreviewComplicationsData();
+ method public android.graphics.Bitmap? getPreviewImage();
+ method public boolean getShouldCommitChanges();
+ method public androidx.wear.watchface.style.UserStyleData getUserStyle();
+ method public androidx.wear.watchface.client.WatchFaceId getWatchFaceId();
+ property public final java.util.Map<java.lang.Integer,androidx.wear.watchface.complications.data.ComplicationData> previewComplicationsData;
+ property public final android.graphics.Bitmap? previewImage;
+ property public final boolean shouldCommitChanges;
+ property public final androidx.wear.watchface.style.UserStyleData userStyle;
+ property public final androidx.wear.watchface.client.WatchFaceId watchFaceId;
+ }
+
+ public final class EditorStateKt {
+ }
+
+ public interface HeadlessWatchFaceClient extends java.lang.AutoCloseable {
+ method @AnyThread public void addClientDisconnectListener(androidx.wear.watchface.client.HeadlessWatchFaceClient.ClientDisconnectListener listener, java.util.concurrent.Executor executor);
+ method public default static androidx.wear.watchface.client.HeadlessWatchFaceClient createFromBundle(android.os.Bundle bundle);
+ method @kotlin.jvm.Throws(exceptionClasses=RemoteException::class) public java.util.Map<java.lang.Integer,androidx.wear.watchface.client.ComplicationSlotState> getComplicationSlotsState();
+ method @kotlin.jvm.Throws(exceptionClasses=RemoteException::class) public java.time.Instant getPreviewReferenceInstant();
+ method @androidx.wear.watchface.WatchFaceFlavorsExperimental public default androidx.wear.watchface.UserStyleFlavors getUserStyleFlavors();
+ method @kotlin.jvm.Throws(exceptionClasses=RemoteException::class) public androidx.wear.watchface.style.UserStyleSchema getUserStyleSchema();
+ method @kotlin.jvm.Throws(exceptionClasses=RemoteException::class) public default byte[] getUserStyleSchemaDigestHash() throws android.os.RemoteException;
+ method @AnyThread public boolean isConnectionAlive();
+ method @AnyThread public void removeClientDisconnectListener(androidx.wear.watchface.client.HeadlessWatchFaceClient.ClientDisconnectListener listener);
+ method @RequiresApi(27) @kotlin.jvm.Throws(exceptionClasses=RemoteException::class) public android.graphics.Bitmap? renderComplicationToBitmap(int complicationSlotId, androidx.wear.watchface.RenderParameters renderParameters, java.time.Instant instant, androidx.wear.watchface.complications.data.ComplicationData complicationData, androidx.wear.watchface.style.UserStyle? userStyle) throws android.os.RemoteException;
+ method @RequiresApi(27) @kotlin.jvm.Throws(exceptionClasses=RemoteException::class) public android.graphics.Bitmap renderWatchFaceToBitmap(androidx.wear.watchface.RenderParameters renderParameters, java.time.Instant instant, androidx.wear.watchface.style.UserStyle? userStyle, java.util.Map<java.lang.Integer,? extends androidx.wear.watchface.complications.data.ComplicationData>? slotIdToComplicationData) throws android.os.RemoteException;
+ method public android.os.Bundle toBundle();
+ property @kotlin.jvm.Throws(exceptionClasses=RemoteException::class) public abstract java.util.Map<java.lang.Integer,androidx.wear.watchface.client.ComplicationSlotState> complicationSlotsState;
+ property @kotlin.jvm.Throws(exceptionClasses=RemoteException::class) public abstract java.time.Instant previewReferenceInstant;
+ property @kotlin.jvm.Throws(exceptionClasses=RemoteException::class) public abstract androidx.wear.watchface.style.UserStyleSchema userStyleSchema;
+ field public static final String BINDER_KEY = "HeadlessWatchFaceClient";
+ field public static final androidx.wear.watchface.client.HeadlessWatchFaceClient.Companion Companion;
+ }
+
+ public static interface HeadlessWatchFaceClient.ClientDisconnectListener {
+ method public void onClientDisconnected();
+ }
+
+ public static final class HeadlessWatchFaceClient.Companion {
+ method public androidx.wear.watchface.client.HeadlessWatchFaceClient createFromBundle(android.os.Bundle bundle);
+ }
+
+ public interface InteractiveWatchFaceClient extends java.lang.AutoCloseable {
+ method @AnyThread public void addClientDisconnectListener(androidx.wear.watchface.client.InteractiveWatchFaceClient.ClientDisconnectListener listener, java.util.concurrent.Executor executor);
+ method public void addOnWatchFaceReadyListener(java.util.concurrent.Executor executor, androidx.wear.watchface.client.InteractiveWatchFaceClient.OnWatchFaceReadyListener listener);
+ method @kotlin.jvm.Throws(exceptionClasses=RemoteException::class) public default Integer? getComplicationIdAt(@Px int x, @Px int y) throws android.os.RemoteException;
+ method @kotlin.jvm.Throws(exceptionClasses=RemoteException::class) public java.util.Map<java.lang.Integer,androidx.wear.watchface.client.ComplicationSlotState> getComplicationSlotsState();
+ method @kotlin.jvm.Throws(exceptionClasses=RemoteException::class) public java.util.List<androidx.wear.watchface.ContentDescriptionLabel> getContentDescriptionLabels();
+ method @kotlin.jvm.Throws(exceptionClasses=RemoteException::class) public String getInstanceId();
+ method @kotlin.jvm.Throws(exceptionClasses=RemoteException::class) public default androidx.wear.watchface.client.OverlayStyle getOverlayStyle();
+ method @kotlin.jvm.Throws(exceptionClasses=RemoteException::class) public java.time.Instant getPreviewReferenceInstant();
+ method @kotlin.jvm.Throws(exceptionClasses=RemoteException::class) public androidx.wear.watchface.style.UserStyleSchema getUserStyleSchema();
+ method @AnyThread public boolean isConnectionAlive();
+ method @kotlin.jvm.Throws(exceptionClasses=RemoteException::class) public void performAmbientTick() throws android.os.RemoteException;
+ method @AnyThread public void removeClientDisconnectListener(androidx.wear.watchface.client.InteractiveWatchFaceClient.ClientDisconnectListener listener);
+ method public void removeOnWatchFaceReadyListener(androidx.wear.watchface.client.InteractiveWatchFaceClient.OnWatchFaceReadyListener listener);
+ method @RequiresApi(27) @kotlin.jvm.Throws(exceptionClasses=RemoteException::class) public android.graphics.Bitmap renderWatchFaceToBitmap(androidx.wear.watchface.RenderParameters renderParameters, java.time.Instant instant, androidx.wear.watchface.style.UserStyle? userStyle, java.util.Map<java.lang.Integer,? extends androidx.wear.watchface.complications.data.ComplicationData>? idAndComplicationData) throws android.os.RemoteException;
+ method @kotlin.jvm.Throws(exceptionClasses=RemoteException::class) public void sendTouchEvent(@Px int xPosition, @Px int yPosition, @androidx.wear.watchface.TapType int tapType) throws android.os.RemoteException;
+ method @kotlin.jvm.Throws(exceptionClasses=RemoteException::class) public void setWatchUiState(androidx.wear.watchface.client.WatchUiState watchUiState) throws android.os.RemoteException;
+ method @kotlin.jvm.Throws(exceptionClasses=RemoteException::class) public void updateComplicationData(java.util.Map<java.lang.Integer,? extends androidx.wear.watchface.complications.data.ComplicationData> slotIdToComplicationData) throws android.os.RemoteException;
+ method @kotlin.jvm.Throws(exceptionClasses=RemoteException::class) public void updateWatchFaceInstance(String newInstanceId, androidx.wear.watchface.style.UserStyle userStyle) throws android.os.RemoteException;
+ method @kotlin.jvm.Throws(exceptionClasses=RemoteException::class) public void updateWatchFaceInstance(String newInstanceId, androidx.wear.watchface.style.UserStyleData userStyle) throws android.os.RemoteException;
+ property @kotlin.jvm.Throws(exceptionClasses=RemoteException::class) public abstract java.util.Map<java.lang.Integer,androidx.wear.watchface.client.ComplicationSlotState> complicationSlotsState;
+ property @kotlin.jvm.Throws(exceptionClasses=RemoteException::class) public abstract java.util.List<androidx.wear.watchface.ContentDescriptionLabel> contentDescriptionLabels;
+ property @kotlin.jvm.Throws(exceptionClasses=RemoteException::class) public abstract String instanceId;
+ property @kotlin.jvm.Throws(exceptionClasses=RemoteException::class) public default androidx.wear.watchface.client.OverlayStyle overlayStyle;
+ property @kotlin.jvm.Throws(exceptionClasses=RemoteException::class) public abstract java.time.Instant previewReferenceInstant;
+ property @kotlin.jvm.Throws(exceptionClasses=RemoteException::class) public abstract androidx.wear.watchface.style.UserStyleSchema userStyleSchema;
+ field public static final androidx.wear.watchface.client.InteractiveWatchFaceClient.Companion Companion;
+ field public static final int TAP_TYPE_CANCEL = 1; // 0x1
+ field public static final int TAP_TYPE_DOWN = 0; // 0x0
+ field public static final int TAP_TYPE_UP = 2; // 0x2
+ }
+
+ public static interface InteractiveWatchFaceClient.ClientDisconnectListener {
+ method public void onClientDisconnected();
+ }
+
+ public static final class InteractiveWatchFaceClient.Companion {
+ field public static final int TAP_TYPE_CANCEL = 1; // 0x1
+ field public static final int TAP_TYPE_DOWN = 0; // 0x0
+ field public static final int TAP_TYPE_UP = 2; // 0x2
+ }
+
+ public static fun interface InteractiveWatchFaceClient.OnWatchFaceReadyListener {
+ method public void onWatchFaceReady();
+ }
+
+ public final class OverlayStyle {
+ ctor public OverlayStyle(android.graphics.Color? backgroundColor, android.graphics.Color? foregroundColor);
+ ctor public OverlayStyle();
+ method public android.graphics.Color? getBackgroundColor();
+ method public android.graphics.Color? getForegroundColor();
+ property public final android.graphics.Color? backgroundColor;
+ property public final android.graphics.Color? foregroundColor;
+ }
+
+ @kotlin.RequiresOptIn(message="This is an experimental API that may change or be removed without warning.") @kotlin.annotation.Retention(kotlin.annotation.AnnotationRetention.BINARY) public @interface WatchFaceClientExperimental {
+ }
+
+ public interface WatchFaceControlClient extends java.lang.AutoCloseable {
+ method @Deprecated @kotlin.jvm.Throws(exceptionClasses=RemoteException::class) public androidx.wear.watchface.client.HeadlessWatchFaceClient? createHeadlessWatchFaceClient(android.content.ComponentName watchFaceName, androidx.wear.watchface.client.DeviceConfig deviceConfig, @Px int surfaceWidth, @Px int surfaceHeight) throws android.os.RemoteException;
+ method @kotlin.jvm.Throws(exceptionClasses=RemoteException::class) public default androidx.wear.watchface.client.HeadlessWatchFaceClient? createHeadlessWatchFaceClient(String id, android.content.ComponentName watchFaceName, androidx.wear.watchface.client.DeviceConfig deviceConfig, @Px int surfaceWidth, @Px int surfaceHeight) throws android.os.RemoteException;
+ method @kotlin.jvm.Throws(exceptionClasses={ServiceNotBoundException::class, ServiceStartFailureException::class}) public default static suspend Object? createWatchFaceControlClient(android.content.Context context, String watchFacePackageName, kotlin.coroutines.Continuation<? super androidx.wear.watchface.client.WatchFaceControlClient>) throws androidx.wear.watchface.client.WatchFaceControlClient.ServiceNotBoundException, androidx.wear.watchface.client.WatchFaceControlClient.ServiceStartFailureException;
+ method @Deprecated @kotlin.jvm.Throws(exceptionClasses=RemoteException::class) public java.util.Map<java.lang.Integer,androidx.wear.watchface.client.DefaultComplicationDataSourcePolicyAndType> getDefaultComplicationDataSourcePoliciesAndType(android.content.ComponentName watchFaceName) throws android.os.RemoteException;
+ method @kotlin.jvm.Throws(exceptionClasses=RemoteException::class) public androidx.wear.watchface.client.EditorServiceClient getEditorServiceClient() throws android.os.RemoteException;
+ method @kotlin.jvm.Throws(exceptionClasses=RemoteException::class) public androidx.wear.watchface.client.InteractiveWatchFaceClient? getInteractiveWatchFaceClientInstance(String instanceId) throws android.os.RemoteException;
+ method @kotlin.jvm.Throws(exceptionClasses=RemoteException::class) public suspend Object? getOrCreateInteractiveWatchFaceClient(String id, androidx.wear.watchface.client.DeviceConfig deviceConfig, androidx.wear.watchface.client.WatchUiState watchUiState, androidx.wear.watchface.style.UserStyleData? userStyle, java.util.Map<java.lang.Integer,? extends androidx.wear.watchface.complications.data.ComplicationData>? slotIdToComplicationData, kotlin.coroutines.Continuation<? super androidx.wear.watchface.client.InteractiveWatchFaceClient>) throws android.os.RemoteException;
+ method public default boolean hasComplicationDataCache();
+ field public static final androidx.wear.watchface.client.WatchFaceControlClient.Companion Companion;
+ }
+
+ public static final class WatchFaceControlClient.Companion {
+ method @kotlin.jvm.Throws(exceptionClasses={ServiceNotBoundException::class, ServiceStartFailureException::class}) public suspend Object? createWatchFaceControlClient(android.content.Context context, String watchFacePackageName, kotlin.coroutines.Continuation<? super androidx.wear.watchface.client.WatchFaceControlClient>) throws androidx.wear.watchface.client.WatchFaceControlClient.ServiceNotBoundException, androidx.wear.watchface.client.WatchFaceControlClient.ServiceStartFailureException;
+ }
+
+ public static final class WatchFaceControlClient.ServiceNotBoundException extends java.lang.Exception {
+ ctor public WatchFaceControlClient.ServiceNotBoundException();
+ }
+
+ public static final class WatchFaceControlClient.ServiceStartFailureException extends java.lang.Exception {
+ ctor public WatchFaceControlClient.ServiceStartFailureException(optional String message);
+ }
+
+ public final class WatchFaceExceptionKt {
+ }
+
+ public final class WatchFaceId {
+ ctor public WatchFaceId(String id);
+ method public String getId();
+ property public final String id;
+ }
+
+ public interface WatchFaceMetadataClient extends java.lang.AutoCloseable {
+ method public java.util.Map<java.lang.Integer,androidx.wear.watchface.client.ComplicationSlotMetadata> getComplicationSlotMetadataMap();
+ method @androidx.wear.watchface.WatchFaceFlavorsExperimental public androidx.wear.watchface.UserStyleFlavors getUserStyleFlavors();
+ method public androidx.wear.watchface.style.UserStyleSchema getUserStyleSchema();
+ method public boolean isUserStyleSchemaStatic();
+ property public abstract boolean isUserStyleSchemaStatic;
+ field public static final androidx.wear.watchface.client.WatchFaceMetadataClient.Companion Companion;
+ }
+
+ public static final class WatchFaceMetadataClient.Companion {
+ method @kotlin.jvm.Throws(exceptionClasses={ServiceNotBoundException::class, ServiceStartFailureException::class, PackageManager.NameNotFoundException::class}) public suspend Object? create(android.content.Context context, android.content.ComponentName watchFaceName, kotlin.coroutines.Continuation<? super androidx.wear.watchface.client.WatchFaceMetadataClient>) throws android.content.pm.PackageManager.NameNotFoundException, androidx.wear.watchface.client.WatchFaceMetadataClient.ServiceNotBoundException, androidx.wear.watchface.client.WatchFaceMetadataClient.ServiceStartFailureException;
+ }
+
+ public static final class WatchFaceMetadataClient.ServiceNotBoundException extends java.lang.Exception {
+ ctor public WatchFaceMetadataClient.ServiceNotBoundException();
+ }
+
+ public static final class WatchFaceMetadataClient.ServiceStartFailureException extends java.lang.Exception {
+ ctor public WatchFaceMetadataClient.ServiceStartFailureException(optional String message);
+ }
+
+ public final class WatchUiState {
+ ctor public WatchUiState(boolean inAmbientMode, int interruptionFilter);
+ method public boolean getInAmbientMode();
+ method public int getInterruptionFilter();
+ property public final boolean inAmbientMode;
+ property public final int interruptionFilter;
+ }
+
+}
+
diff --git a/wear/watchface/watchface-client/api/res-1.1.0-beta03.txt b/wear/watchface/watchface-client/api/res-1.1.0-beta03.txt
new file mode 100644
index 0000000..e69de29
--- /dev/null
+++ b/wear/watchface/watchface-client/api/res-1.1.0-beta03.txt
diff --git a/wear/watchface/watchface-client/api/restricted_1.1.0-beta03.txt b/wear/watchface/watchface-client/api/restricted_1.1.0-beta03.txt
new file mode 100644
index 0000000..6937121
--- /dev/null
+++ b/wear/watchface/watchface-client/api/restricted_1.1.0-beta03.txt
@@ -0,0 +1,244 @@
+// Signature format: 4.0
+package androidx.wear.watchface.client {
+
+ public final class ComplicationSlotMetadata {
+ ctor public ComplicationSlotMetadata(androidx.wear.watchface.complications.ComplicationSlotBounds? bounds, int boundsType, java.util.List<? extends androidx.wear.watchface.complications.data.ComplicationType> supportedTypes, androidx.wear.watchface.complications.DefaultComplicationDataSourcePolicy defaultDataSourcePolicy, boolean isInitiallyEnabled, boolean fixedComplicationDataSource, android.os.Bundle complicationConfigExtras);
+ method public androidx.wear.watchface.complications.ComplicationSlotBounds? getBounds();
+ method public int getBoundsType();
+ method public android.os.Bundle getComplicationConfigExtras();
+ method public androidx.wear.watchface.complications.DefaultComplicationDataSourcePolicy getDefaultDataSourcePolicy();
+ method public boolean getFixedComplicationDataSource();
+ method public java.util.List<androidx.wear.watchface.complications.data.ComplicationType> getSupportedTypes();
+ method public boolean isInitiallyEnabled();
+ property public final androidx.wear.watchface.complications.ComplicationSlotBounds? bounds;
+ property public final int boundsType;
+ property public final android.os.Bundle complicationConfigExtras;
+ property public final androidx.wear.watchface.complications.DefaultComplicationDataSourcePolicy defaultDataSourcePolicy;
+ property public final boolean fixedComplicationDataSource;
+ property public final boolean isInitiallyEnabled;
+ property public final java.util.List<androidx.wear.watchface.complications.data.ComplicationType> supportedTypes;
+ }
+
+ public final class ComplicationSlotState {
+ ctor public ComplicationSlotState(android.graphics.Rect bounds, int boundsType, java.util.List<? extends androidx.wear.watchface.complications.data.ComplicationType> supportedTypes, androidx.wear.watchface.complications.DefaultComplicationDataSourcePolicy defaultDataSourcePolicy, boolean isEnabled, boolean isInitiallyEnabled, androidx.wear.watchface.complications.data.ComplicationType currentType, boolean fixedComplicationDataSource, android.os.Bundle complicationConfigExtras, Integer? nameResourceId, Integer? screenReaderNameResourceId);
+ ctor @Deprecated public ComplicationSlotState(android.graphics.Rect bounds, int boundsType, java.util.List<? extends androidx.wear.watchface.complications.data.ComplicationType> supportedTypes, androidx.wear.watchface.complications.DefaultComplicationDataSourcePolicy defaultDataSourcePolicy, androidx.wear.watchface.complications.data.ComplicationType defaultDataSourceType, boolean isEnabled, boolean isInitiallyEnabled, androidx.wear.watchface.complications.data.ComplicationType currentType, boolean fixedComplicationDataSource, android.os.Bundle complicationConfigExtras);
+ method public android.graphics.Rect getBounds();
+ method public int getBoundsType();
+ method public android.os.Bundle getComplicationConfigExtras();
+ method public androidx.wear.watchface.complications.data.ComplicationType getCurrentType();
+ method public androidx.wear.watchface.complications.DefaultComplicationDataSourcePolicy getDefaultDataSourcePolicy();
+ method @Deprecated public androidx.wear.watchface.complications.data.ComplicationType getDefaultDataSourceType();
+ method public boolean getFixedComplicationDataSource();
+ method public Integer? getNameResourceId();
+ method public Integer? getScreenReaderNameResourceId();
+ method public java.util.List<androidx.wear.watchface.complications.data.ComplicationType> getSupportedTypes();
+ method public boolean isEnabled();
+ method public boolean isInitiallyEnabled();
+ property public final android.graphics.Rect bounds;
+ property public final int boundsType;
+ property public final android.os.Bundle complicationConfigExtras;
+ property public final androidx.wear.watchface.complications.data.ComplicationType currentType;
+ property public final androidx.wear.watchface.complications.DefaultComplicationDataSourcePolicy defaultDataSourcePolicy;
+ property @Deprecated public final androidx.wear.watchface.complications.data.ComplicationType defaultDataSourceType;
+ property public final boolean fixedComplicationDataSource;
+ property public final boolean isEnabled;
+ property public final boolean isInitiallyEnabled;
+ property public final Integer? nameResourceId;
+ property public final Integer? screenReaderNameResourceId;
+ property public final java.util.List<androidx.wear.watchface.complications.data.ComplicationType> supportedTypes;
+ }
+
+ @Deprecated public final class DefaultComplicationDataSourcePolicyAndType {
+ ctor @Deprecated public DefaultComplicationDataSourcePolicyAndType(androidx.wear.watchface.complications.DefaultComplicationDataSourcePolicy policy, androidx.wear.watchface.complications.data.ComplicationType type);
+ method @Deprecated public androidx.wear.watchface.complications.DefaultComplicationDataSourcePolicy getPolicy();
+ method @Deprecated public androidx.wear.watchface.complications.data.ComplicationType getType();
+ property public final androidx.wear.watchface.complications.DefaultComplicationDataSourcePolicy policy;
+ property public final androidx.wear.watchface.complications.data.ComplicationType type;
+ }
+
+ public final class DeviceConfig {
+ ctor public DeviceConfig(boolean hasLowBitAmbient, boolean hasBurnInProtection, long analogPreviewReferenceTimeMillis, long digitalPreviewReferenceTimeMillis);
+ method public long getAnalogPreviewReferenceTimeMillis();
+ method public long getDigitalPreviewReferenceTimeMillis();
+ method public boolean getHasBurnInProtection();
+ method public boolean getHasLowBitAmbient();
+ property public final long analogPreviewReferenceTimeMillis;
+ property public final long digitalPreviewReferenceTimeMillis;
+ property public final boolean hasBurnInProtection;
+ property public final boolean hasLowBitAmbient;
+ }
+
+ public final class DeviceConfigKt {
+ }
+
+ public interface EditorListener {
+ method public void onEditorStateChanged(androidx.wear.watchface.client.EditorState editorState);
+ }
+
+ public interface EditorServiceClient {
+ method public void addListener(androidx.wear.watchface.client.EditorListener editorListener, java.util.concurrent.Executor listenerExecutor);
+ method @kotlin.jvm.Throws(exceptionClasses=RemoteException::class) public void closeEditor() throws android.os.RemoteException;
+ method public void removeListener(androidx.wear.watchface.client.EditorListener editorListener);
+ }
+
+ public final class EditorState {
+ method public java.util.Map<java.lang.Integer,androidx.wear.watchface.complications.data.ComplicationData> getPreviewComplicationsData();
+ method public android.graphics.Bitmap? getPreviewImage();
+ method public boolean getShouldCommitChanges();
+ method public androidx.wear.watchface.style.UserStyleData getUserStyle();
+ method public androidx.wear.watchface.client.WatchFaceId getWatchFaceId();
+ property public final java.util.Map<java.lang.Integer,androidx.wear.watchface.complications.data.ComplicationData> previewComplicationsData;
+ property public final android.graphics.Bitmap? previewImage;
+ property public final boolean shouldCommitChanges;
+ property public final androidx.wear.watchface.style.UserStyleData userStyle;
+ property public final androidx.wear.watchface.client.WatchFaceId watchFaceId;
+ }
+
+ public final class EditorStateKt {
+ }
+
+ public interface HeadlessWatchFaceClient extends java.lang.AutoCloseable {
+ method @AnyThread public void addClientDisconnectListener(androidx.wear.watchface.client.HeadlessWatchFaceClient.ClientDisconnectListener listener, java.util.concurrent.Executor executor);
+ method public default static androidx.wear.watchface.client.HeadlessWatchFaceClient createFromBundle(android.os.Bundle bundle);
+ method @kotlin.jvm.Throws(exceptionClasses=RemoteException::class) public java.util.Map<java.lang.Integer,androidx.wear.watchface.client.ComplicationSlotState> getComplicationSlotsState();
+ method @kotlin.jvm.Throws(exceptionClasses=RemoteException::class) public java.time.Instant getPreviewReferenceInstant();
+ method @kotlin.jvm.Throws(exceptionClasses=RemoteException::class) public androidx.wear.watchface.style.UserStyleSchema getUserStyleSchema();
+ method @kotlin.jvm.Throws(exceptionClasses=RemoteException::class) public default byte[] getUserStyleSchemaDigestHash() throws android.os.RemoteException;
+ method @AnyThread public boolean isConnectionAlive();
+ method @AnyThread public void removeClientDisconnectListener(androidx.wear.watchface.client.HeadlessWatchFaceClient.ClientDisconnectListener listener);
+ method @RequiresApi(27) @kotlin.jvm.Throws(exceptionClasses=RemoteException::class) public android.graphics.Bitmap? renderComplicationToBitmap(int complicationSlotId, androidx.wear.watchface.RenderParameters renderParameters, java.time.Instant instant, androidx.wear.watchface.complications.data.ComplicationData complicationData, androidx.wear.watchface.style.UserStyle? userStyle) throws android.os.RemoteException;
+ method @RequiresApi(27) @kotlin.jvm.Throws(exceptionClasses=RemoteException::class) public android.graphics.Bitmap renderWatchFaceToBitmap(androidx.wear.watchface.RenderParameters renderParameters, java.time.Instant instant, androidx.wear.watchface.style.UserStyle? userStyle, java.util.Map<java.lang.Integer,? extends androidx.wear.watchface.complications.data.ComplicationData>? slotIdToComplicationData) throws android.os.RemoteException;
+ method public android.os.Bundle toBundle();
+ property @kotlin.jvm.Throws(exceptionClasses=RemoteException::class) public abstract java.util.Map<java.lang.Integer,androidx.wear.watchface.client.ComplicationSlotState> complicationSlotsState;
+ property @kotlin.jvm.Throws(exceptionClasses=RemoteException::class) public abstract java.time.Instant previewReferenceInstant;
+ property @kotlin.jvm.Throws(exceptionClasses=RemoteException::class) public abstract androidx.wear.watchface.style.UserStyleSchema userStyleSchema;
+ field public static final String BINDER_KEY = "HeadlessWatchFaceClient";
+ field public static final androidx.wear.watchface.client.HeadlessWatchFaceClient.Companion Companion;
+ }
+
+ public static interface HeadlessWatchFaceClient.ClientDisconnectListener {
+ method public void onClientDisconnected();
+ }
+
+ public static final class HeadlessWatchFaceClient.Companion {
+ method public androidx.wear.watchface.client.HeadlessWatchFaceClient createFromBundle(android.os.Bundle bundle);
+ }
+
+ public interface InteractiveWatchFaceClient extends java.lang.AutoCloseable {
+ method @AnyThread public void addClientDisconnectListener(androidx.wear.watchface.client.InteractiveWatchFaceClient.ClientDisconnectListener listener, java.util.concurrent.Executor executor);
+ method public void addOnWatchFaceReadyListener(java.util.concurrent.Executor executor, androidx.wear.watchface.client.InteractiveWatchFaceClient.OnWatchFaceReadyListener listener);
+ method @kotlin.jvm.Throws(exceptionClasses=RemoteException::class) public default Integer? getComplicationIdAt(@Px int x, @Px int y) throws android.os.RemoteException;
+ method @kotlin.jvm.Throws(exceptionClasses=RemoteException::class) public java.util.Map<java.lang.Integer,androidx.wear.watchface.client.ComplicationSlotState> getComplicationSlotsState();
+ method @kotlin.jvm.Throws(exceptionClasses=RemoteException::class) public java.util.List<androidx.wear.watchface.ContentDescriptionLabel> getContentDescriptionLabels();
+ method @kotlin.jvm.Throws(exceptionClasses=RemoteException::class) public String getInstanceId();
+ method @kotlin.jvm.Throws(exceptionClasses=RemoteException::class) public default androidx.wear.watchface.client.OverlayStyle getOverlayStyle();
+ method @kotlin.jvm.Throws(exceptionClasses=RemoteException::class) public java.time.Instant getPreviewReferenceInstant();
+ method @kotlin.jvm.Throws(exceptionClasses=RemoteException::class) public androidx.wear.watchface.style.UserStyleSchema getUserStyleSchema();
+ method @AnyThread public boolean isConnectionAlive();
+ method @kotlin.jvm.Throws(exceptionClasses=RemoteException::class) public void performAmbientTick() throws android.os.RemoteException;
+ method @AnyThread public void removeClientDisconnectListener(androidx.wear.watchface.client.InteractiveWatchFaceClient.ClientDisconnectListener listener);
+ method public void removeOnWatchFaceReadyListener(androidx.wear.watchface.client.InteractiveWatchFaceClient.OnWatchFaceReadyListener listener);
+ method @RequiresApi(27) @kotlin.jvm.Throws(exceptionClasses=RemoteException::class) public android.graphics.Bitmap renderWatchFaceToBitmap(androidx.wear.watchface.RenderParameters renderParameters, java.time.Instant instant, androidx.wear.watchface.style.UserStyle? userStyle, java.util.Map<java.lang.Integer,? extends androidx.wear.watchface.complications.data.ComplicationData>? idAndComplicationData) throws android.os.RemoteException;
+ method @kotlin.jvm.Throws(exceptionClasses=RemoteException::class) public void sendTouchEvent(@Px int xPosition, @Px int yPosition, @androidx.wear.watchface.TapType int tapType) throws android.os.RemoteException;
+ method @kotlin.jvm.Throws(exceptionClasses=RemoteException::class) public void setWatchUiState(androidx.wear.watchface.client.WatchUiState watchUiState) throws android.os.RemoteException;
+ method @kotlin.jvm.Throws(exceptionClasses=RemoteException::class) public void updateComplicationData(java.util.Map<java.lang.Integer,? extends androidx.wear.watchface.complications.data.ComplicationData> slotIdToComplicationData) throws android.os.RemoteException;
+ method @kotlin.jvm.Throws(exceptionClasses=RemoteException::class) public void updateWatchFaceInstance(String newInstanceId, androidx.wear.watchface.style.UserStyle userStyle) throws android.os.RemoteException;
+ method @kotlin.jvm.Throws(exceptionClasses=RemoteException::class) public void updateWatchFaceInstance(String newInstanceId, androidx.wear.watchface.style.UserStyleData userStyle) throws android.os.RemoteException;
+ property @kotlin.jvm.Throws(exceptionClasses=RemoteException::class) public abstract java.util.Map<java.lang.Integer,androidx.wear.watchface.client.ComplicationSlotState> complicationSlotsState;
+ property @kotlin.jvm.Throws(exceptionClasses=RemoteException::class) public abstract java.util.List<androidx.wear.watchface.ContentDescriptionLabel> contentDescriptionLabels;
+ property @kotlin.jvm.Throws(exceptionClasses=RemoteException::class) public abstract String instanceId;
+ property @kotlin.jvm.Throws(exceptionClasses=RemoteException::class) public default androidx.wear.watchface.client.OverlayStyle overlayStyle;
+ property @kotlin.jvm.Throws(exceptionClasses=RemoteException::class) public abstract java.time.Instant previewReferenceInstant;
+ property @kotlin.jvm.Throws(exceptionClasses=RemoteException::class) public abstract androidx.wear.watchface.style.UserStyleSchema userStyleSchema;
+ field public static final androidx.wear.watchface.client.InteractiveWatchFaceClient.Companion Companion;
+ field public static final int TAP_TYPE_CANCEL = 1; // 0x1
+ field public static final int TAP_TYPE_DOWN = 0; // 0x0
+ field public static final int TAP_TYPE_UP = 2; // 0x2
+ }
+
+ public static interface InteractiveWatchFaceClient.ClientDisconnectListener {
+ method public void onClientDisconnected();
+ }
+
+ public static final class InteractiveWatchFaceClient.Companion {
+ field public static final int TAP_TYPE_CANCEL = 1; // 0x1
+ field public static final int TAP_TYPE_DOWN = 0; // 0x0
+ field public static final int TAP_TYPE_UP = 2; // 0x2
+ }
+
+ public static fun interface InteractiveWatchFaceClient.OnWatchFaceReadyListener {
+ method public void onWatchFaceReady();
+ }
+
+ public final class OverlayStyle {
+ ctor public OverlayStyle(android.graphics.Color? backgroundColor, android.graphics.Color? foregroundColor);
+ ctor public OverlayStyle();
+ method public android.graphics.Color? getBackgroundColor();
+ method public android.graphics.Color? getForegroundColor();
+ property public final android.graphics.Color? backgroundColor;
+ property public final android.graphics.Color? foregroundColor;
+ }
+
+ public interface WatchFaceControlClient extends java.lang.AutoCloseable {
+ method @Deprecated @kotlin.jvm.Throws(exceptionClasses=RemoteException::class) public androidx.wear.watchface.client.HeadlessWatchFaceClient? createHeadlessWatchFaceClient(android.content.ComponentName watchFaceName, androidx.wear.watchface.client.DeviceConfig deviceConfig, @Px int surfaceWidth, @Px int surfaceHeight) throws android.os.RemoteException;
+ method @kotlin.jvm.Throws(exceptionClasses=RemoteException::class) public default androidx.wear.watchface.client.HeadlessWatchFaceClient? createHeadlessWatchFaceClient(String id, android.content.ComponentName watchFaceName, androidx.wear.watchface.client.DeviceConfig deviceConfig, @Px int surfaceWidth, @Px int surfaceHeight) throws android.os.RemoteException;
+ method @kotlin.jvm.Throws(exceptionClasses={ServiceNotBoundException::class, ServiceStartFailureException::class}) public default static suspend Object? createWatchFaceControlClient(android.content.Context context, String watchFacePackageName, kotlin.coroutines.Continuation<? super androidx.wear.watchface.client.WatchFaceControlClient>) throws androidx.wear.watchface.client.WatchFaceControlClient.ServiceNotBoundException, androidx.wear.watchface.client.WatchFaceControlClient.ServiceStartFailureException;
+ method @Deprecated @kotlin.jvm.Throws(exceptionClasses=RemoteException::class) public java.util.Map<java.lang.Integer,androidx.wear.watchface.client.DefaultComplicationDataSourcePolicyAndType> getDefaultComplicationDataSourcePoliciesAndType(android.content.ComponentName watchFaceName) throws android.os.RemoteException;
+ method @kotlin.jvm.Throws(exceptionClasses=RemoteException::class) public androidx.wear.watchface.client.EditorServiceClient getEditorServiceClient() throws android.os.RemoteException;
+ method @kotlin.jvm.Throws(exceptionClasses=RemoteException::class) public androidx.wear.watchface.client.InteractiveWatchFaceClient? getInteractiveWatchFaceClientInstance(String instanceId) throws android.os.RemoteException;
+ method @kotlin.jvm.Throws(exceptionClasses=RemoteException::class) public suspend Object? getOrCreateInteractiveWatchFaceClient(String id, androidx.wear.watchface.client.DeviceConfig deviceConfig, androidx.wear.watchface.client.WatchUiState watchUiState, androidx.wear.watchface.style.UserStyleData? userStyle, java.util.Map<java.lang.Integer,? extends androidx.wear.watchface.complications.data.ComplicationData>? slotIdToComplicationData, kotlin.coroutines.Continuation<? super androidx.wear.watchface.client.InteractiveWatchFaceClient>) throws android.os.RemoteException;
+ method public default boolean hasComplicationDataCache();
+ field public static final androidx.wear.watchface.client.WatchFaceControlClient.Companion Companion;
+ }
+
+ public static final class WatchFaceControlClient.Companion {
+ method @kotlin.jvm.Throws(exceptionClasses={ServiceNotBoundException::class, ServiceStartFailureException::class}) public suspend Object? createWatchFaceControlClient(android.content.Context context, String watchFacePackageName, kotlin.coroutines.Continuation<? super androidx.wear.watchface.client.WatchFaceControlClient>) throws androidx.wear.watchface.client.WatchFaceControlClient.ServiceNotBoundException, androidx.wear.watchface.client.WatchFaceControlClient.ServiceStartFailureException;
+ }
+
+ public static final class WatchFaceControlClient.ServiceNotBoundException extends java.lang.Exception {
+ ctor public WatchFaceControlClient.ServiceNotBoundException();
+ }
+
+ public static final class WatchFaceControlClient.ServiceStartFailureException extends java.lang.Exception {
+ ctor public WatchFaceControlClient.ServiceStartFailureException(optional String message);
+ }
+
+ public final class WatchFaceExceptionKt {
+ }
+
+ public final class WatchFaceId {
+ ctor public WatchFaceId(String id);
+ method public String getId();
+ property public final String id;
+ }
+
+ public interface WatchFaceMetadataClient extends java.lang.AutoCloseable {
+ method public java.util.Map<java.lang.Integer,androidx.wear.watchface.client.ComplicationSlotMetadata> getComplicationSlotMetadataMap();
+ method public androidx.wear.watchface.style.UserStyleSchema getUserStyleSchema();
+ method public boolean isUserStyleSchemaStatic();
+ property public abstract boolean isUserStyleSchemaStatic;
+ field public static final androidx.wear.watchface.client.WatchFaceMetadataClient.Companion Companion;
+ }
+
+ public static final class WatchFaceMetadataClient.Companion {
+ method @kotlin.jvm.Throws(exceptionClasses={ServiceNotBoundException::class, ServiceStartFailureException::class, PackageManager.NameNotFoundException::class}) public suspend Object? create(android.content.Context context, android.content.ComponentName watchFaceName, kotlin.coroutines.Continuation<? super androidx.wear.watchface.client.WatchFaceMetadataClient>) throws android.content.pm.PackageManager.NameNotFoundException, androidx.wear.watchface.client.WatchFaceMetadataClient.ServiceNotBoundException, androidx.wear.watchface.client.WatchFaceMetadataClient.ServiceStartFailureException;
+ }
+
+ public static final class WatchFaceMetadataClient.ServiceNotBoundException extends java.lang.Exception {
+ ctor public WatchFaceMetadataClient.ServiceNotBoundException();
+ }
+
+ public static final class WatchFaceMetadataClient.ServiceStartFailureException extends java.lang.Exception {
+ ctor public WatchFaceMetadataClient.ServiceStartFailureException(optional String message);
+ }
+
+ public final class WatchUiState {
+ ctor public WatchUiState(boolean inAmbientMode, int interruptionFilter);
+ method public boolean getInAmbientMode();
+ method public int getInterruptionFilter();
+ property public final boolean inAmbientMode;
+ property public final int interruptionFilter;
+ }
+
+}
+
diff --git a/wear/watchface/watchface-complications-data-source-ktx/api/1.1.0-beta03.txt b/wear/watchface/watchface-complications-data-source-ktx/api/1.1.0-beta03.txt
new file mode 100644
index 0000000..55d30d5
--- /dev/null
+++ b/wear/watchface/watchface-complications-data-source-ktx/api/1.1.0-beta03.txt
@@ -0,0 +1,17 @@
+// Signature format: 4.0
+package androidx.wear.watchface.complications.datasource {
+
+ public abstract class SuspendingComplicationDataSourceService extends androidx.wear.watchface.complications.datasource.ComplicationDataSourceService {
+ ctor public SuspendingComplicationDataSourceService();
+ method public final void onComplicationRequest(androidx.wear.watchface.complications.datasource.ComplicationRequest request, androidx.wear.watchface.complications.datasource.ComplicationDataSourceService.ComplicationRequestListener listener);
+ method @UiThread public abstract suspend Object? onComplicationRequest(androidx.wear.watchface.complications.datasource.ComplicationRequest request, kotlin.coroutines.Continuation<? super androidx.wear.watchface.complications.data.ComplicationData>);
+ }
+
+ public abstract class SuspendingTimelineComplicationDataSourceService extends androidx.wear.watchface.complications.datasource.ComplicationDataSourceService {
+ ctor public SuspendingTimelineComplicationDataSourceService();
+ method public final void onComplicationRequest(androidx.wear.watchface.complications.datasource.ComplicationRequest request, androidx.wear.watchface.complications.datasource.ComplicationDataSourceService.ComplicationRequestListener listener);
+ method @UiThread public abstract suspend Object? onComplicationRequest(androidx.wear.watchface.complications.datasource.ComplicationRequest request, kotlin.coroutines.Continuation<? super androidx.wear.watchface.complications.datasource.ComplicationDataTimeline>);
+ }
+
+}
+
diff --git a/wear/watchface/watchface-complications-data-source-ktx/api/public_plus_experimental_1.1.0-beta03.txt b/wear/watchface/watchface-complications-data-source-ktx/api/public_plus_experimental_1.1.0-beta03.txt
new file mode 100644
index 0000000..55d30d5
--- /dev/null
+++ b/wear/watchface/watchface-complications-data-source-ktx/api/public_plus_experimental_1.1.0-beta03.txt
@@ -0,0 +1,17 @@
+// Signature format: 4.0
+package androidx.wear.watchface.complications.datasource {
+
+ public abstract class SuspendingComplicationDataSourceService extends androidx.wear.watchface.complications.datasource.ComplicationDataSourceService {
+ ctor public SuspendingComplicationDataSourceService();
+ method public final void onComplicationRequest(androidx.wear.watchface.complications.datasource.ComplicationRequest request, androidx.wear.watchface.complications.datasource.ComplicationDataSourceService.ComplicationRequestListener listener);
+ method @UiThread public abstract suspend Object? onComplicationRequest(androidx.wear.watchface.complications.datasource.ComplicationRequest request, kotlin.coroutines.Continuation<? super androidx.wear.watchface.complications.data.ComplicationData>);
+ }
+
+ public abstract class SuspendingTimelineComplicationDataSourceService extends androidx.wear.watchface.complications.datasource.ComplicationDataSourceService {
+ ctor public SuspendingTimelineComplicationDataSourceService();
+ method public final void onComplicationRequest(androidx.wear.watchface.complications.datasource.ComplicationRequest request, androidx.wear.watchface.complications.datasource.ComplicationDataSourceService.ComplicationRequestListener listener);
+ method @UiThread public abstract suspend Object? onComplicationRequest(androidx.wear.watchface.complications.datasource.ComplicationRequest request, kotlin.coroutines.Continuation<? super androidx.wear.watchface.complications.datasource.ComplicationDataTimeline>);
+ }
+
+}
+
diff --git a/wear/watchface/watchface-complications-data-source-ktx/api/res-1.1.0-beta03.txt b/wear/watchface/watchface-complications-data-source-ktx/api/res-1.1.0-beta03.txt
new file mode 100644
index 0000000..e69de29
--- /dev/null
+++ b/wear/watchface/watchface-complications-data-source-ktx/api/res-1.1.0-beta03.txt
diff --git a/wear/watchface/watchface-complications-data-source-ktx/api/restricted_1.1.0-beta03.txt b/wear/watchface/watchface-complications-data-source-ktx/api/restricted_1.1.0-beta03.txt
new file mode 100644
index 0000000..55d30d5
--- /dev/null
+++ b/wear/watchface/watchface-complications-data-source-ktx/api/restricted_1.1.0-beta03.txt
@@ -0,0 +1,17 @@
+// Signature format: 4.0
+package androidx.wear.watchface.complications.datasource {
+
+ public abstract class SuspendingComplicationDataSourceService extends androidx.wear.watchface.complications.datasource.ComplicationDataSourceService {
+ ctor public SuspendingComplicationDataSourceService();
+ method public final void onComplicationRequest(androidx.wear.watchface.complications.datasource.ComplicationRequest request, androidx.wear.watchface.complications.datasource.ComplicationDataSourceService.ComplicationRequestListener listener);
+ method @UiThread public abstract suspend Object? onComplicationRequest(androidx.wear.watchface.complications.datasource.ComplicationRequest request, kotlin.coroutines.Continuation<? super androidx.wear.watchface.complications.data.ComplicationData>);
+ }
+
+ public abstract class SuspendingTimelineComplicationDataSourceService extends androidx.wear.watchface.complications.datasource.ComplicationDataSourceService {
+ ctor public SuspendingTimelineComplicationDataSourceService();
+ method public final void onComplicationRequest(androidx.wear.watchface.complications.datasource.ComplicationRequest request, androidx.wear.watchface.complications.datasource.ComplicationDataSourceService.ComplicationRequestListener listener);
+ method @UiThread public abstract suspend Object? onComplicationRequest(androidx.wear.watchface.complications.datasource.ComplicationRequest request, kotlin.coroutines.Continuation<? super androidx.wear.watchface.complications.datasource.ComplicationDataTimeline>);
+ }
+
+}
+
diff --git a/wear/watchface/watchface-complications-data-source/api/1.1.0-beta03.txt b/wear/watchface/watchface-complications-data-source/api/1.1.0-beta03.txt
new file mode 100644
index 0000000..d57c497
--- /dev/null
+++ b/wear/watchface/watchface-complications-data-source/api/1.1.0-beta03.txt
@@ -0,0 +1,89 @@
+// Signature format: 4.0
+package androidx.wear.watchface.complications.datasource {
+
+ public abstract class ComplicationDataSourceService extends android.app.Service {
+ ctor public ComplicationDataSourceService();
+ method public abstract androidx.wear.watchface.complications.data.ComplicationData? getPreviewData(androidx.wear.watchface.complications.data.ComplicationType type);
+ method public final android.os.IBinder? onBind(android.content.Intent intent);
+ method @MainThread public void onComplicationActivated(int complicationInstanceId, androidx.wear.watchface.complications.data.ComplicationType type);
+ method @MainThread public void onComplicationDeactivated(int complicationInstanceId);
+ method @MainThread public abstract void onComplicationRequest(androidx.wear.watchface.complications.datasource.ComplicationRequest request, androidx.wear.watchface.complications.datasource.ComplicationDataSourceService.ComplicationRequestListener listener);
+ method @MainThread public void onStartImmediateComplicationRequests(int complicationInstanceId);
+ method @MainThread public void onStopImmediateComplicationRequests(int complicationInstanceId);
+ field public static final String ACTION_COMPLICATION_UPDATE_REQUEST = "android.support.wearable.complications.ACTION_COMPLICATION_UPDATE_REQUEST";
+ field public static final String CATEGORY_DATA_SOURCE_CONFIG = "android.support.wearable.complications.category.PROVIDER_CONFIG";
+ field public static final androidx.wear.watchface.complications.datasource.ComplicationDataSourceService.Companion Companion;
+ field public static final String EXTRA_CONFIG_COMPLICATION_ID = "android.support.wearable.complications.EXTRA_CONFIG_COMPLICATION_ID";
+ field public static final String EXTRA_CONFIG_COMPLICATION_TYPE = "android.support.wearable.complications.EXTRA_CONFIG_COMPLICATION_TYPE";
+ field public static final String EXTRA_CONFIG_DATA_SOURCE_COMPONENT = "android.support.wearable.complications.EXTRA_CONFIG_PROVIDER_COMPONENT";
+ field public static final String METADATA_KEY_DATA_SOURCE_CONFIG_ACTION = "android.support.wearable.complications.PROVIDER_CONFIG_ACTION";
+ field public static final String METADATA_KEY_DATA_SOURCE_DEFAULT_CONFIG_SUPPORTED = "androidx.watchface.complications.datasource.DEFAULT_CONFIG_SUPPORTED";
+ field public static final String METADATA_KEY_IMMEDIATE_UPDATE_PERIOD_MILLISECONDS = "androidx.wear.watchface.complications.data.source.IMMEDIATE_UPDATE_PERIOD_MILLISECONDS";
+ field public static final String METADATA_KEY_SAFE_WATCH_FACES = "android.support.wearable.complications.SAFE_WATCH_FACES";
+ field public static final String METADATA_KEY_SUPPORTED_TYPES = "android.support.wearable.complications.SUPPORTED_TYPES";
+ field public static final String METADATA_KEY_UPDATE_PERIOD_SECONDS = "android.support.wearable.complications.UPDATE_PERIOD_SECONDS";
+ }
+
+ public static final class ComplicationDataSourceService.Companion {
+ }
+
+ public static interface ComplicationDataSourceService.ComplicationRequestListener {
+ method @kotlin.jvm.Throws(exceptionClasses=RemoteException::class) public void onComplicationData(androidx.wear.watchface.complications.data.ComplicationData? complicationData) throws android.os.RemoteException;
+ method @kotlin.jvm.Throws(exceptionClasses=RemoteException::class) public default void onComplicationDataTimeline(androidx.wear.watchface.complications.datasource.ComplicationDataTimeline? complicationDataTimeline) throws android.os.RemoteException;
+ }
+
+ public interface ComplicationDataSourceUpdateRequester {
+ method public default static androidx.wear.watchface.complications.datasource.ComplicationDataSourceUpdateRequester create(android.content.Context context, android.content.ComponentName complicationDataSourceComponent);
+ method public void requestUpdate(int... complicationInstanceIds);
+ method public void requestUpdateAll();
+ field public static final androidx.wear.watchface.complications.datasource.ComplicationDataSourceUpdateRequester.Companion Companion;
+ }
+
+ public static final class ComplicationDataSourceUpdateRequester.Companion {
+ method public androidx.wear.watchface.complications.datasource.ComplicationDataSourceUpdateRequester create(android.content.Context context, android.content.ComponentName complicationDataSourceComponent);
+ }
+
+ public final class ComplicationDataTimeline {
+ ctor public ComplicationDataTimeline(androidx.wear.watchface.complications.data.ComplicationData defaultComplicationData, java.util.Collection<androidx.wear.watchface.complications.datasource.TimelineEntry> timelineEntries);
+ method public androidx.wear.watchface.complications.data.ComplicationData getDefaultComplicationData();
+ method public java.util.Collection<androidx.wear.watchface.complications.datasource.TimelineEntry> getTimelineEntries();
+ property public final androidx.wear.watchface.complications.data.ComplicationData defaultComplicationData;
+ property public final java.util.Collection<androidx.wear.watchface.complications.datasource.TimelineEntry> timelineEntries;
+ }
+
+ public final class ComplicationDataTimelineKt {
+ }
+
+ public final class ComplicationRequest {
+ ctor public ComplicationRequest(int complicationInstanceId, androidx.wear.watchface.complications.data.ComplicationType complicationType, boolean immediateResponseRequired);
+ ctor @Deprecated public ComplicationRequest(int complicationInstanceId, androidx.wear.watchface.complications.data.ComplicationType complicationType);
+ method public int getComplicationInstanceId();
+ method public androidx.wear.watchface.complications.data.ComplicationType getComplicationType();
+ method public boolean isImmediateResponseRequired();
+ property public final int complicationInstanceId;
+ property public final androidx.wear.watchface.complications.data.ComplicationType complicationType;
+ property public final boolean immediateResponseRequired;
+ }
+
+ public final class TimeInterval {
+ ctor public TimeInterval(java.time.Instant start, java.time.Instant end);
+ method public java.time.Instant getEnd();
+ method public java.time.Instant getStart();
+ method public void setEnd(java.time.Instant);
+ method public void setStart(java.time.Instant);
+ property public final java.time.Instant end;
+ property public final java.time.Instant start;
+ }
+
+ public final class TimelineEntry {
+ ctor public TimelineEntry(androidx.wear.watchface.complications.datasource.TimeInterval validity, androidx.wear.watchface.complications.data.ComplicationData complicationData);
+ method public androidx.wear.watchface.complications.data.ComplicationData getComplicationData();
+ method public androidx.wear.watchface.complications.datasource.TimeInterval getValidity();
+ method public void setComplicationData(androidx.wear.watchface.complications.data.ComplicationData);
+ method public void setValidity(androidx.wear.watchface.complications.datasource.TimeInterval);
+ property public final androidx.wear.watchface.complications.data.ComplicationData complicationData;
+ property public final androidx.wear.watchface.complications.datasource.TimeInterval validity;
+ }
+
+}
+
diff --git a/wear/watchface/watchface-complications-data-source/api/public_plus_experimental_1.1.0-beta03.txt b/wear/watchface/watchface-complications-data-source/api/public_plus_experimental_1.1.0-beta03.txt
new file mode 100644
index 0000000..d57c497
--- /dev/null
+++ b/wear/watchface/watchface-complications-data-source/api/public_plus_experimental_1.1.0-beta03.txt
@@ -0,0 +1,89 @@
+// Signature format: 4.0
+package androidx.wear.watchface.complications.datasource {
+
+ public abstract class ComplicationDataSourceService extends android.app.Service {
+ ctor public ComplicationDataSourceService();
+ method public abstract androidx.wear.watchface.complications.data.ComplicationData? getPreviewData(androidx.wear.watchface.complications.data.ComplicationType type);
+ method public final android.os.IBinder? onBind(android.content.Intent intent);
+ method @MainThread public void onComplicationActivated(int complicationInstanceId, androidx.wear.watchface.complications.data.ComplicationType type);
+ method @MainThread public void onComplicationDeactivated(int complicationInstanceId);
+ method @MainThread public abstract void onComplicationRequest(androidx.wear.watchface.complications.datasource.ComplicationRequest request, androidx.wear.watchface.complications.datasource.ComplicationDataSourceService.ComplicationRequestListener listener);
+ method @MainThread public void onStartImmediateComplicationRequests(int complicationInstanceId);
+ method @MainThread public void onStopImmediateComplicationRequests(int complicationInstanceId);
+ field public static final String ACTION_COMPLICATION_UPDATE_REQUEST = "android.support.wearable.complications.ACTION_COMPLICATION_UPDATE_REQUEST";
+ field public static final String CATEGORY_DATA_SOURCE_CONFIG = "android.support.wearable.complications.category.PROVIDER_CONFIG";
+ field public static final androidx.wear.watchface.complications.datasource.ComplicationDataSourceService.Companion Companion;
+ field public static final String EXTRA_CONFIG_COMPLICATION_ID = "android.support.wearable.complications.EXTRA_CONFIG_COMPLICATION_ID";
+ field public static final String EXTRA_CONFIG_COMPLICATION_TYPE = "android.support.wearable.complications.EXTRA_CONFIG_COMPLICATION_TYPE";
+ field public static final String EXTRA_CONFIG_DATA_SOURCE_COMPONENT = "android.support.wearable.complications.EXTRA_CONFIG_PROVIDER_COMPONENT";
+ field public static final String METADATA_KEY_DATA_SOURCE_CONFIG_ACTION = "android.support.wearable.complications.PROVIDER_CONFIG_ACTION";
+ field public static final String METADATA_KEY_DATA_SOURCE_DEFAULT_CONFIG_SUPPORTED = "androidx.watchface.complications.datasource.DEFAULT_CONFIG_SUPPORTED";
+ field public static final String METADATA_KEY_IMMEDIATE_UPDATE_PERIOD_MILLISECONDS = "androidx.wear.watchface.complications.data.source.IMMEDIATE_UPDATE_PERIOD_MILLISECONDS";
+ field public static final String METADATA_KEY_SAFE_WATCH_FACES = "android.support.wearable.complications.SAFE_WATCH_FACES";
+ field public static final String METADATA_KEY_SUPPORTED_TYPES = "android.support.wearable.complications.SUPPORTED_TYPES";
+ field public static final String METADATA_KEY_UPDATE_PERIOD_SECONDS = "android.support.wearable.complications.UPDATE_PERIOD_SECONDS";
+ }
+
+ public static final class ComplicationDataSourceService.Companion {
+ }
+
+ public static interface ComplicationDataSourceService.ComplicationRequestListener {
+ method @kotlin.jvm.Throws(exceptionClasses=RemoteException::class) public void onComplicationData(androidx.wear.watchface.complications.data.ComplicationData? complicationData) throws android.os.RemoteException;
+ method @kotlin.jvm.Throws(exceptionClasses=RemoteException::class) public default void onComplicationDataTimeline(androidx.wear.watchface.complications.datasource.ComplicationDataTimeline? complicationDataTimeline) throws android.os.RemoteException;
+ }
+
+ public interface ComplicationDataSourceUpdateRequester {
+ method public default static androidx.wear.watchface.complications.datasource.ComplicationDataSourceUpdateRequester create(android.content.Context context, android.content.ComponentName complicationDataSourceComponent);
+ method public void requestUpdate(int... complicationInstanceIds);
+ method public void requestUpdateAll();
+ field public static final androidx.wear.watchface.complications.datasource.ComplicationDataSourceUpdateRequester.Companion Companion;
+ }
+
+ public static final class ComplicationDataSourceUpdateRequester.Companion {
+ method public androidx.wear.watchface.complications.datasource.ComplicationDataSourceUpdateRequester create(android.content.Context context, android.content.ComponentName complicationDataSourceComponent);
+ }
+
+ public final class ComplicationDataTimeline {
+ ctor public ComplicationDataTimeline(androidx.wear.watchface.complications.data.ComplicationData defaultComplicationData, java.util.Collection<androidx.wear.watchface.complications.datasource.TimelineEntry> timelineEntries);
+ method public androidx.wear.watchface.complications.data.ComplicationData getDefaultComplicationData();
+ method public java.util.Collection<androidx.wear.watchface.complications.datasource.TimelineEntry> getTimelineEntries();
+ property public final androidx.wear.watchface.complications.data.ComplicationData defaultComplicationData;
+ property public final java.util.Collection<androidx.wear.watchface.complications.datasource.TimelineEntry> timelineEntries;
+ }
+
+ public final class ComplicationDataTimelineKt {
+ }
+
+ public final class ComplicationRequest {
+ ctor public ComplicationRequest(int complicationInstanceId, androidx.wear.watchface.complications.data.ComplicationType complicationType, boolean immediateResponseRequired);
+ ctor @Deprecated public ComplicationRequest(int complicationInstanceId, androidx.wear.watchface.complications.data.ComplicationType complicationType);
+ method public int getComplicationInstanceId();
+ method public androidx.wear.watchface.complications.data.ComplicationType getComplicationType();
+ method public boolean isImmediateResponseRequired();
+ property public final int complicationInstanceId;
+ property public final androidx.wear.watchface.complications.data.ComplicationType complicationType;
+ property public final boolean immediateResponseRequired;
+ }
+
+ public final class TimeInterval {
+ ctor public TimeInterval(java.time.Instant start, java.time.Instant end);
+ method public java.time.Instant getEnd();
+ method public java.time.Instant getStart();
+ method public void setEnd(java.time.Instant);
+ method public void setStart(java.time.Instant);
+ property public final java.time.Instant end;
+ property public final java.time.Instant start;
+ }
+
+ public final class TimelineEntry {
+ ctor public TimelineEntry(androidx.wear.watchface.complications.datasource.TimeInterval validity, androidx.wear.watchface.complications.data.ComplicationData complicationData);
+ method public androidx.wear.watchface.complications.data.ComplicationData getComplicationData();
+ method public androidx.wear.watchface.complications.datasource.TimeInterval getValidity();
+ method public void setComplicationData(androidx.wear.watchface.complications.data.ComplicationData);
+ method public void setValidity(androidx.wear.watchface.complications.datasource.TimeInterval);
+ property public final androidx.wear.watchface.complications.data.ComplicationData complicationData;
+ property public final androidx.wear.watchface.complications.datasource.TimeInterval validity;
+ }
+
+}
+
diff --git a/wear/watchface/watchface-complications-data-source/api/res-1.1.0-beta03.txt b/wear/watchface/watchface-complications-data-source/api/res-1.1.0-beta03.txt
new file mode 100644
index 0000000..e69de29
--- /dev/null
+++ b/wear/watchface/watchface-complications-data-source/api/res-1.1.0-beta03.txt
diff --git a/wear/watchface/watchface-complications-data-source/api/restricted_1.1.0-beta03.txt b/wear/watchface/watchface-complications-data-source/api/restricted_1.1.0-beta03.txt
new file mode 100644
index 0000000..d57c497
--- /dev/null
+++ b/wear/watchface/watchface-complications-data-source/api/restricted_1.1.0-beta03.txt
@@ -0,0 +1,89 @@
+// Signature format: 4.0
+package androidx.wear.watchface.complications.datasource {
+
+ public abstract class ComplicationDataSourceService extends android.app.Service {
+ ctor public ComplicationDataSourceService();
+ method public abstract androidx.wear.watchface.complications.data.ComplicationData? getPreviewData(androidx.wear.watchface.complications.data.ComplicationType type);
+ method public final android.os.IBinder? onBind(android.content.Intent intent);
+ method @MainThread public void onComplicationActivated(int complicationInstanceId, androidx.wear.watchface.complications.data.ComplicationType type);
+ method @MainThread public void onComplicationDeactivated(int complicationInstanceId);
+ method @MainThread public abstract void onComplicationRequest(androidx.wear.watchface.complications.datasource.ComplicationRequest request, androidx.wear.watchface.complications.datasource.ComplicationDataSourceService.ComplicationRequestListener listener);
+ method @MainThread public void onStartImmediateComplicationRequests(int complicationInstanceId);
+ method @MainThread public void onStopImmediateComplicationRequests(int complicationInstanceId);
+ field public static final String ACTION_COMPLICATION_UPDATE_REQUEST = "android.support.wearable.complications.ACTION_COMPLICATION_UPDATE_REQUEST";
+ field public static final String CATEGORY_DATA_SOURCE_CONFIG = "android.support.wearable.complications.category.PROVIDER_CONFIG";
+ field public static final androidx.wear.watchface.complications.datasource.ComplicationDataSourceService.Companion Companion;
+ field public static final String EXTRA_CONFIG_COMPLICATION_ID = "android.support.wearable.complications.EXTRA_CONFIG_COMPLICATION_ID";
+ field public static final String EXTRA_CONFIG_COMPLICATION_TYPE = "android.support.wearable.complications.EXTRA_CONFIG_COMPLICATION_TYPE";
+ field public static final String EXTRA_CONFIG_DATA_SOURCE_COMPONENT = "android.support.wearable.complications.EXTRA_CONFIG_PROVIDER_COMPONENT";
+ field public static final String METADATA_KEY_DATA_SOURCE_CONFIG_ACTION = "android.support.wearable.complications.PROVIDER_CONFIG_ACTION";
+ field public static final String METADATA_KEY_DATA_SOURCE_DEFAULT_CONFIG_SUPPORTED = "androidx.watchface.complications.datasource.DEFAULT_CONFIG_SUPPORTED";
+ field public static final String METADATA_KEY_IMMEDIATE_UPDATE_PERIOD_MILLISECONDS = "androidx.wear.watchface.complications.data.source.IMMEDIATE_UPDATE_PERIOD_MILLISECONDS";
+ field public static final String METADATA_KEY_SAFE_WATCH_FACES = "android.support.wearable.complications.SAFE_WATCH_FACES";
+ field public static final String METADATA_KEY_SUPPORTED_TYPES = "android.support.wearable.complications.SUPPORTED_TYPES";
+ field public static final String METADATA_KEY_UPDATE_PERIOD_SECONDS = "android.support.wearable.complications.UPDATE_PERIOD_SECONDS";
+ }
+
+ public static final class ComplicationDataSourceService.Companion {
+ }
+
+ public static interface ComplicationDataSourceService.ComplicationRequestListener {
+ method @kotlin.jvm.Throws(exceptionClasses=RemoteException::class) public void onComplicationData(androidx.wear.watchface.complications.data.ComplicationData? complicationData) throws android.os.RemoteException;
+ method @kotlin.jvm.Throws(exceptionClasses=RemoteException::class) public default void onComplicationDataTimeline(androidx.wear.watchface.complications.datasource.ComplicationDataTimeline? complicationDataTimeline) throws android.os.RemoteException;
+ }
+
+ public interface ComplicationDataSourceUpdateRequester {
+ method public default static androidx.wear.watchface.complications.datasource.ComplicationDataSourceUpdateRequester create(android.content.Context context, android.content.ComponentName complicationDataSourceComponent);
+ method public void requestUpdate(int... complicationInstanceIds);
+ method public void requestUpdateAll();
+ field public static final androidx.wear.watchface.complications.datasource.ComplicationDataSourceUpdateRequester.Companion Companion;
+ }
+
+ public static final class ComplicationDataSourceUpdateRequester.Companion {
+ method public androidx.wear.watchface.complications.datasource.ComplicationDataSourceUpdateRequester create(android.content.Context context, android.content.ComponentName complicationDataSourceComponent);
+ }
+
+ public final class ComplicationDataTimeline {
+ ctor public ComplicationDataTimeline(androidx.wear.watchface.complications.data.ComplicationData defaultComplicationData, java.util.Collection<androidx.wear.watchface.complications.datasource.TimelineEntry> timelineEntries);
+ method public androidx.wear.watchface.complications.data.ComplicationData getDefaultComplicationData();
+ method public java.util.Collection<androidx.wear.watchface.complications.datasource.TimelineEntry> getTimelineEntries();
+ property public final androidx.wear.watchface.complications.data.ComplicationData defaultComplicationData;
+ property public final java.util.Collection<androidx.wear.watchface.complications.datasource.TimelineEntry> timelineEntries;
+ }
+
+ public final class ComplicationDataTimelineKt {
+ }
+
+ public final class ComplicationRequest {
+ ctor public ComplicationRequest(int complicationInstanceId, androidx.wear.watchface.complications.data.ComplicationType complicationType, boolean immediateResponseRequired);
+ ctor @Deprecated public ComplicationRequest(int complicationInstanceId, androidx.wear.watchface.complications.data.ComplicationType complicationType);
+ method public int getComplicationInstanceId();
+ method public androidx.wear.watchface.complications.data.ComplicationType getComplicationType();
+ method public boolean isImmediateResponseRequired();
+ property public final int complicationInstanceId;
+ property public final androidx.wear.watchface.complications.data.ComplicationType complicationType;
+ property public final boolean immediateResponseRequired;
+ }
+
+ public final class TimeInterval {
+ ctor public TimeInterval(java.time.Instant start, java.time.Instant end);
+ method public java.time.Instant getEnd();
+ method public java.time.Instant getStart();
+ method public void setEnd(java.time.Instant);
+ method public void setStart(java.time.Instant);
+ property public final java.time.Instant end;
+ property public final java.time.Instant start;
+ }
+
+ public final class TimelineEntry {
+ ctor public TimelineEntry(androidx.wear.watchface.complications.datasource.TimeInterval validity, androidx.wear.watchface.complications.data.ComplicationData complicationData);
+ method public androidx.wear.watchface.complications.data.ComplicationData getComplicationData();
+ method public androidx.wear.watchface.complications.datasource.TimeInterval getValidity();
+ method public void setComplicationData(androidx.wear.watchface.complications.data.ComplicationData);
+ method public void setValidity(androidx.wear.watchface.complications.datasource.TimeInterval);
+ property public final androidx.wear.watchface.complications.data.ComplicationData complicationData;
+ property public final androidx.wear.watchface.complications.datasource.TimeInterval validity;
+ }
+
+}
+
diff --git a/wear/watchface/watchface-complications-data/api/1.1.0-beta03.txt b/wear/watchface/watchface-complications-data/api/1.1.0-beta03.txt
new file mode 100644
index 0000000..cb5f04a
--- /dev/null
+++ b/wear/watchface/watchface-complications-data/api/1.1.0-beta03.txt
@@ -0,0 +1,356 @@
+// Signature format: 4.0
+package androidx.wear.watchface.complications.data {
+
+ public abstract sealed class ComplicationData {
+ method public final android.content.ComponentName? getDataSource();
+ method public java.time.Instant getNextChangeInstant(java.time.Instant afterInstant);
+ method public final android.app.PendingIntent? getTapAction();
+ method public final androidx.wear.watchface.complications.data.ComplicationType getType();
+ method public final androidx.wear.watchface.complications.data.TimeRange getValidTimeRange();
+ method public boolean hasPlaceholderFields();
+ method public final boolean isTapActionLostDueToSerialization();
+ method public final void setTapActionLostDueToSerialization(boolean);
+ property public final android.content.ComponentName? dataSource;
+ property public final android.app.PendingIntent? tapAction;
+ property public final boolean tapActionLostDueToSerialization;
+ property public final androidx.wear.watchface.complications.data.ComplicationType type;
+ property public final androidx.wear.watchface.complications.data.TimeRange validTimeRange;
+ }
+
+ public interface ComplicationText {
+ method public java.time.Instant getNextChangeTime(java.time.Instant afterInstant);
+ method public CharSequence getTextAt(android.content.res.Resources resources, java.time.Instant instant);
+ method public boolean isAlwaysEmpty();
+ method public boolean returnsSameText(java.time.Instant firstInstant, java.time.Instant secondInstant);
+ field public static final androidx.wear.watchface.complications.data.ComplicationText.Companion Companion;
+ field public static final androidx.wear.watchface.complications.data.ComplicationText EMPTY;
+ field public static final androidx.wear.watchface.complications.data.ComplicationText PLACEHOLDER;
+ }
+
+ public static final class ComplicationText.Companion {
+ }
+
+ public enum ComplicationType {
+ enum_constant public static final androidx.wear.watchface.complications.data.ComplicationType EMPTY;
+ enum_constant public static final androidx.wear.watchface.complications.data.ComplicationType LONG_TEXT;
+ enum_constant public static final androidx.wear.watchface.complications.data.ComplicationType MONOCHROMATIC_IMAGE;
+ enum_constant public static final androidx.wear.watchface.complications.data.ComplicationType NOT_CONFIGURED;
+ enum_constant public static final androidx.wear.watchface.complications.data.ComplicationType NO_DATA;
+ enum_constant public static final androidx.wear.watchface.complications.data.ComplicationType NO_PERMISSION;
+ enum_constant public static final androidx.wear.watchface.complications.data.ComplicationType PHOTO_IMAGE;
+ enum_constant public static final androidx.wear.watchface.complications.data.ComplicationType RANGED_VALUE;
+ enum_constant public static final androidx.wear.watchface.complications.data.ComplicationType SHORT_TEXT;
+ enum_constant public static final androidx.wear.watchface.complications.data.ComplicationType SMALL_IMAGE;
+ }
+
+ public final class CountDownTimeReference {
+ ctor public CountDownTimeReference(java.time.Instant instant);
+ method public java.time.Instant getInstant();
+ property public final java.time.Instant instant;
+ }
+
+ public final class CountUpTimeReference {
+ ctor public CountUpTimeReference(java.time.Instant instant);
+ method public java.time.Instant getInstant();
+ property public final java.time.Instant instant;
+ }
+
+ public final class DataKt {
+ }
+
+ public final class EmptyComplicationData extends androidx.wear.watchface.complications.data.ComplicationData {
+ ctor public EmptyComplicationData();
+ field public static final androidx.wear.watchface.complications.data.ComplicationType TYPE;
+ }
+
+ public final class ImageKt {
+ }
+
+ public final class LongTextComplicationData extends androidx.wear.watchface.complications.data.ComplicationData {
+ method public androidx.wear.watchface.complications.data.ComplicationText? getContentDescription();
+ method public androidx.wear.watchface.complications.data.MonochromaticImage? getMonochromaticImage();
+ method public androidx.wear.watchface.complications.data.SmallImage? getSmallImage();
+ method public androidx.wear.watchface.complications.data.ComplicationText getText();
+ method public androidx.wear.watchface.complications.data.ComplicationText? getTitle();
+ property public final androidx.wear.watchface.complications.data.ComplicationText? contentDescription;
+ property public final androidx.wear.watchface.complications.data.MonochromaticImage? monochromaticImage;
+ property public final androidx.wear.watchface.complications.data.SmallImage? smallImage;
+ property public final androidx.wear.watchface.complications.data.ComplicationText text;
+ property public final androidx.wear.watchface.complications.data.ComplicationText? title;
+ field public static final androidx.wear.watchface.complications.data.ComplicationType TYPE;
+ }
+
+ public static final class LongTextComplicationData.Builder {
+ ctor public LongTextComplicationData.Builder(androidx.wear.watchface.complications.data.ComplicationText text, androidx.wear.watchface.complications.data.ComplicationText contentDescription);
+ method public androidx.wear.watchface.complications.data.LongTextComplicationData build();
+ method public androidx.wear.watchface.complications.data.LongTextComplicationData.Builder setDataSource(android.content.ComponentName? dataSource);
+ method public androidx.wear.watchface.complications.data.LongTextComplicationData.Builder setMonochromaticImage(androidx.wear.watchface.complications.data.MonochromaticImage? icon);
+ method public androidx.wear.watchface.complications.data.LongTextComplicationData.Builder setSmallImage(androidx.wear.watchface.complications.data.SmallImage? smallImage);
+ method public androidx.wear.watchface.complications.data.LongTextComplicationData.Builder setTapAction(android.app.PendingIntent? tapAction);
+ method public androidx.wear.watchface.complications.data.LongTextComplicationData.Builder setTitle(androidx.wear.watchface.complications.data.ComplicationText? title);
+ method public androidx.wear.watchface.complications.data.LongTextComplicationData.Builder setValidTimeRange(androidx.wear.watchface.complications.data.TimeRange? validTimeRange);
+ }
+
+ public final class MonochromaticImage {
+ method public android.graphics.drawable.Icon? getAmbientImage();
+ method public android.graphics.drawable.Icon getImage();
+ property public final android.graphics.drawable.Icon? ambientImage;
+ property public final android.graphics.drawable.Icon image;
+ field public static final androidx.wear.watchface.complications.data.MonochromaticImage PLACEHOLDER;
+ }
+
+ public static final class MonochromaticImage.Builder {
+ ctor public MonochromaticImage.Builder(android.graphics.drawable.Icon image);
+ method public androidx.wear.watchface.complications.data.MonochromaticImage build();
+ method public androidx.wear.watchface.complications.data.MonochromaticImage.Builder setAmbientImage(android.graphics.drawable.Icon? ambientImage);
+ }
+
+ public final class MonochromaticImageComplicationData extends androidx.wear.watchface.complications.data.ComplicationData {
+ method public androidx.wear.watchface.complications.data.ComplicationText? getContentDescription();
+ method public androidx.wear.watchface.complications.data.MonochromaticImage getMonochromaticImage();
+ property public final androidx.wear.watchface.complications.data.ComplicationText? contentDescription;
+ property public final androidx.wear.watchface.complications.data.MonochromaticImage monochromaticImage;
+ field public static final androidx.wear.watchface.complications.data.ComplicationType TYPE;
+ }
+
+ public static final class MonochromaticImageComplicationData.Builder {
+ ctor public MonochromaticImageComplicationData.Builder(androidx.wear.watchface.complications.data.MonochromaticImage monochromaticImage, androidx.wear.watchface.complications.data.ComplicationText contentDescription);
+ method public androidx.wear.watchface.complications.data.MonochromaticImageComplicationData build();
+ method public androidx.wear.watchface.complications.data.MonochromaticImageComplicationData.Builder setDataSource(android.content.ComponentName? dataSource);
+ method public androidx.wear.watchface.complications.data.MonochromaticImageComplicationData.Builder setTapAction(android.app.PendingIntent? tapAction);
+ method public androidx.wear.watchface.complications.data.MonochromaticImageComplicationData.Builder setValidTimeRange(androidx.wear.watchface.complications.data.TimeRange? validTimeRange);
+ }
+
+ public final class NoDataComplicationData extends androidx.wear.watchface.complications.data.ComplicationData {
+ ctor public NoDataComplicationData();
+ ctor public NoDataComplicationData(androidx.wear.watchface.complications.data.ComplicationData placeholder);
+ method public androidx.wear.watchface.complications.data.ComplicationText? getContentDescription();
+ method public androidx.wear.watchface.complications.data.ComplicationData? getPlaceholder();
+ property public final androidx.wear.watchface.complications.data.ComplicationText? contentDescription;
+ property public final androidx.wear.watchface.complications.data.ComplicationData? placeholder;
+ field public static final androidx.wear.watchface.complications.data.ComplicationType TYPE;
+ }
+
+ public final class NoPermissionComplicationData extends androidx.wear.watchface.complications.data.ComplicationData {
+ method public androidx.wear.watchface.complications.data.MonochromaticImage? getMonochromaticImage();
+ method public androidx.wear.watchface.complications.data.ComplicationText? getText();
+ method public androidx.wear.watchface.complications.data.ComplicationText? getTitle();
+ property public final androidx.wear.watchface.complications.data.MonochromaticImage? monochromaticImage;
+ property public final androidx.wear.watchface.complications.data.ComplicationText? text;
+ property public final androidx.wear.watchface.complications.data.ComplicationText? title;
+ field public static final androidx.wear.watchface.complications.data.ComplicationType TYPE;
+ }
+
+ public static final class NoPermissionComplicationData.Builder {
+ ctor public NoPermissionComplicationData.Builder();
+ method public androidx.wear.watchface.complications.data.NoPermissionComplicationData build();
+ method public androidx.wear.watchface.complications.data.NoPermissionComplicationData.Builder setDataSource(android.content.ComponentName? dataSource);
+ method public androidx.wear.watchface.complications.data.NoPermissionComplicationData.Builder setMonochromaticImage(androidx.wear.watchface.complications.data.MonochromaticImage? monochromaticImage);
+ method public androidx.wear.watchface.complications.data.NoPermissionComplicationData.Builder setText(androidx.wear.watchface.complications.data.ComplicationText? text);
+ method public androidx.wear.watchface.complications.data.NoPermissionComplicationData.Builder setTitle(androidx.wear.watchface.complications.data.ComplicationText? title);
+ }
+
+ public final class NotConfiguredComplicationData extends androidx.wear.watchface.complications.data.ComplicationData {
+ ctor public NotConfiguredComplicationData();
+ field public static final androidx.wear.watchface.complications.data.ComplicationType TYPE;
+ }
+
+ public final class PhotoImageComplicationData extends androidx.wear.watchface.complications.data.ComplicationData {
+ method public androidx.wear.watchface.complications.data.ComplicationText? getContentDescription();
+ method public android.graphics.drawable.Icon getPhotoImage();
+ property public final androidx.wear.watchface.complications.data.ComplicationText? contentDescription;
+ property public final android.graphics.drawable.Icon photoImage;
+ field public static final android.graphics.drawable.Icon PLACEHOLDER;
+ field public static final androidx.wear.watchface.complications.data.ComplicationType TYPE;
+ }
+
+ public static final class PhotoImageComplicationData.Builder {
+ ctor public PhotoImageComplicationData.Builder(android.graphics.drawable.Icon photoImage, androidx.wear.watchface.complications.data.ComplicationText contentDescription);
+ method public androidx.wear.watchface.complications.data.PhotoImageComplicationData build();
+ method public androidx.wear.watchface.complications.data.PhotoImageComplicationData.Builder setDataSource(android.content.ComponentName? dataSource);
+ method public androidx.wear.watchface.complications.data.PhotoImageComplicationData.Builder setTapAction(android.app.PendingIntent? tapAction);
+ method public androidx.wear.watchface.complications.data.PhotoImageComplicationData.Builder setValidTimeRange(androidx.wear.watchface.complications.data.TimeRange? validTimeRange);
+ }
+
+ public final class PlainComplicationText implements androidx.wear.watchface.complications.data.ComplicationText {
+ method public java.time.Instant getNextChangeTime(java.time.Instant afterInstant);
+ method public CharSequence getTextAt(android.content.res.Resources resources, java.time.Instant instant);
+ method public boolean isAlwaysEmpty();
+ method public boolean returnsSameText(java.time.Instant firstInstant, java.time.Instant secondInstant);
+ }
+
+ public static final class PlainComplicationText.Builder {
+ ctor public PlainComplicationText.Builder(CharSequence text);
+ method public androidx.wear.watchface.complications.data.PlainComplicationText build();
+ }
+
+ public final class RangedValueComplicationData extends androidx.wear.watchface.complications.data.ComplicationData {
+ method public androidx.wear.watchface.complications.data.ComplicationText? getContentDescription();
+ method public float getMax();
+ method public float getMin();
+ method public androidx.wear.watchface.complications.data.MonochromaticImage? getMonochromaticImage();
+ method public androidx.wear.watchface.complications.data.ComplicationText? getText();
+ method public androidx.wear.watchface.complications.data.ComplicationText? getTitle();
+ method public float getValue();
+ property public final androidx.wear.watchface.complications.data.ComplicationText? contentDescription;
+ property public final float max;
+ property public final float min;
+ property public final androidx.wear.watchface.complications.data.MonochromaticImage? monochromaticImage;
+ property public final androidx.wear.watchface.complications.data.ComplicationText? text;
+ property public final androidx.wear.watchface.complications.data.ComplicationText? title;
+ property public final float value;
+ field public static final float PLACEHOLDER;
+ field public static final androidx.wear.watchface.complications.data.ComplicationType TYPE;
+ }
+
+ public static final class RangedValueComplicationData.Builder {
+ ctor public RangedValueComplicationData.Builder(float value, float min, float max, androidx.wear.watchface.complications.data.ComplicationText contentDescription);
+ method public androidx.wear.watchface.complications.data.RangedValueComplicationData build();
+ method public androidx.wear.watchface.complications.data.RangedValueComplicationData.Builder setDataSource(android.content.ComponentName? dataSource);
+ method public androidx.wear.watchface.complications.data.RangedValueComplicationData.Builder setMonochromaticImage(androidx.wear.watchface.complications.data.MonochromaticImage? monochromaticImage);
+ method public androidx.wear.watchface.complications.data.RangedValueComplicationData.Builder setTapAction(android.app.PendingIntent? tapAction);
+ method public androidx.wear.watchface.complications.data.RangedValueComplicationData.Builder setText(androidx.wear.watchface.complications.data.ComplicationText? text);
+ method public androidx.wear.watchface.complications.data.RangedValueComplicationData.Builder setTitle(androidx.wear.watchface.complications.data.ComplicationText? title);
+ method public androidx.wear.watchface.complications.data.RangedValueComplicationData.Builder setValidTimeRange(androidx.wear.watchface.complications.data.TimeRange? validTimeRange);
+ }
+
+ public final class ShortTextComplicationData extends androidx.wear.watchface.complications.data.ComplicationData {
+ method public androidx.wear.watchface.complications.data.ComplicationText? getContentDescription();
+ method public androidx.wear.watchface.complications.data.MonochromaticImage? getMonochromaticImage();
+ method public androidx.wear.watchface.complications.data.ComplicationText getText();
+ method public androidx.wear.watchface.complications.data.ComplicationText? getTitle();
+ property public final androidx.wear.watchface.complications.data.ComplicationText? contentDescription;
+ property public final androidx.wear.watchface.complications.data.MonochromaticImage? monochromaticImage;
+ property public final androidx.wear.watchface.complications.data.ComplicationText text;
+ property public final androidx.wear.watchface.complications.data.ComplicationText? title;
+ field public static final int MAX_TEXT_LENGTH;
+ field public static final androidx.wear.watchface.complications.data.ComplicationType TYPE;
+ }
+
+ public static final class ShortTextComplicationData.Builder {
+ ctor public ShortTextComplicationData.Builder(androidx.wear.watchface.complications.data.ComplicationText text, androidx.wear.watchface.complications.data.ComplicationText contentDescription);
+ method public androidx.wear.watchface.complications.data.ShortTextComplicationData build();
+ method public androidx.wear.watchface.complications.data.ShortTextComplicationData.Builder setDataSource(android.content.ComponentName? dataSource);
+ method public androidx.wear.watchface.complications.data.ShortTextComplicationData.Builder setMonochromaticImage(androidx.wear.watchface.complications.data.MonochromaticImage? monochromaticImage);
+ method public androidx.wear.watchface.complications.data.ShortTextComplicationData.Builder setTapAction(android.app.PendingIntent? tapAction);
+ method public androidx.wear.watchface.complications.data.ShortTextComplicationData.Builder setTitle(androidx.wear.watchface.complications.data.ComplicationText? title);
+ method public androidx.wear.watchface.complications.data.ShortTextComplicationData.Builder setValidTimeRange(androidx.wear.watchface.complications.data.TimeRange? validTimeRange);
+ }
+
+ public final class SmallImage {
+ method public android.graphics.drawable.Icon? getAmbientImage();
+ method public android.graphics.drawable.Icon getImage();
+ method public androidx.wear.watchface.complications.data.SmallImageType getType();
+ property public final android.graphics.drawable.Icon? ambientImage;
+ property public final android.graphics.drawable.Icon image;
+ property public final androidx.wear.watchface.complications.data.SmallImageType type;
+ field public static final androidx.wear.watchface.complications.data.SmallImage PLACEHOLDER;
+ }
+
+ public static final class SmallImage.Builder {
+ ctor public SmallImage.Builder(android.graphics.drawable.Icon image, androidx.wear.watchface.complications.data.SmallImageType type);
+ method public androidx.wear.watchface.complications.data.SmallImage build();
+ method public androidx.wear.watchface.complications.data.SmallImage.Builder setAmbientImage(android.graphics.drawable.Icon? ambientImage);
+ }
+
+ public final class SmallImageComplicationData extends androidx.wear.watchface.complications.data.ComplicationData {
+ method public androidx.wear.watchface.complications.data.ComplicationText? getContentDescription();
+ method public androidx.wear.watchface.complications.data.SmallImage getSmallImage();
+ property public final androidx.wear.watchface.complications.data.ComplicationText? contentDescription;
+ property public final androidx.wear.watchface.complications.data.SmallImage smallImage;
+ field public static final androidx.wear.watchface.complications.data.ComplicationType TYPE;
+ }
+
+ public static final class SmallImageComplicationData.Builder {
+ ctor public SmallImageComplicationData.Builder(androidx.wear.watchface.complications.data.SmallImage smallImage, androidx.wear.watchface.complications.data.ComplicationText contentDescription);
+ method public androidx.wear.watchface.complications.data.SmallImageComplicationData build();
+ method public androidx.wear.watchface.complications.data.SmallImageComplicationData.Builder setDataSource(android.content.ComponentName? dataSource);
+ method public androidx.wear.watchface.complications.data.SmallImageComplicationData.Builder setTapAction(android.app.PendingIntent? tapAction);
+ method public androidx.wear.watchface.complications.data.SmallImageComplicationData.Builder setValidTimeRange(androidx.wear.watchface.complications.data.TimeRange? validTimeRange);
+ }
+
+ public enum SmallImageType {
+ enum_constant public static final androidx.wear.watchface.complications.data.SmallImageType ICON;
+ enum_constant public static final androidx.wear.watchface.complications.data.SmallImageType PHOTO;
+ }
+
+ public final class TextKt {
+ }
+
+ public final class TimeDifferenceComplicationText implements androidx.wear.watchface.complications.data.ComplicationText {
+ method public java.util.concurrent.TimeUnit? getMinimumTimeUnit();
+ method public java.time.Instant getNextChangeTime(java.time.Instant afterInstant);
+ method public CharSequence getTextAt(android.content.res.Resources resources, java.time.Instant instant);
+ method public boolean isAlwaysEmpty();
+ method public boolean returnsSameText(java.time.Instant firstInstant, java.time.Instant secondInstant);
+ }
+
+ public static final class TimeDifferenceComplicationText.Builder {
+ ctor public TimeDifferenceComplicationText.Builder(androidx.wear.watchface.complications.data.TimeDifferenceStyle style, androidx.wear.watchface.complications.data.CountUpTimeReference countUpTimeReference);
+ ctor public TimeDifferenceComplicationText.Builder(androidx.wear.watchface.complications.data.TimeDifferenceStyle style, androidx.wear.watchface.complications.data.CountDownTimeReference countDownTimeReference);
+ method public androidx.wear.watchface.complications.data.TimeDifferenceComplicationText build();
+ method public androidx.wear.watchface.complications.data.TimeDifferenceComplicationText.Builder setDisplayAsNow(boolean displayAsNow);
+ method public androidx.wear.watchface.complications.data.TimeDifferenceComplicationText.Builder setMinimumTimeUnit(java.util.concurrent.TimeUnit? minimumUnit);
+ method public androidx.wear.watchface.complications.data.TimeDifferenceComplicationText.Builder setText(CharSequence? text);
+ }
+
+ public enum TimeDifferenceStyle {
+ enum_constant public static final androidx.wear.watchface.complications.data.TimeDifferenceStyle SHORT_DUAL_UNIT;
+ enum_constant public static final androidx.wear.watchface.complications.data.TimeDifferenceStyle SHORT_SINGLE_UNIT;
+ enum_constant public static final androidx.wear.watchface.complications.data.TimeDifferenceStyle SHORT_WORDS_SINGLE_UNIT;
+ enum_constant public static final androidx.wear.watchface.complications.data.TimeDifferenceStyle STOPWATCH;
+ enum_constant public static final androidx.wear.watchface.complications.data.TimeDifferenceStyle WORDS_SINGLE_UNIT;
+ }
+
+ public final class TimeFormatComplicationText implements androidx.wear.watchface.complications.data.ComplicationText {
+ method public java.time.Instant getNextChangeTime(java.time.Instant afterInstant);
+ method public CharSequence getTextAt(android.content.res.Resources resources, java.time.Instant instant);
+ method public boolean isAlwaysEmpty();
+ method public boolean returnsSameText(java.time.Instant firstInstant, java.time.Instant secondInstant);
+ }
+
+ public static final class TimeFormatComplicationText.Builder {
+ ctor public TimeFormatComplicationText.Builder(String format);
+ method public androidx.wear.watchface.complications.data.TimeFormatComplicationText build();
+ method public androidx.wear.watchface.complications.data.TimeFormatComplicationText.Builder setStyle(androidx.wear.watchface.complications.data.TimeFormatStyle style);
+ method public androidx.wear.watchface.complications.data.TimeFormatComplicationText.Builder setText(CharSequence text);
+ method public androidx.wear.watchface.complications.data.TimeFormatComplicationText.Builder setTimeZone(android.icu.util.TimeZone timeZone);
+ }
+
+ public enum TimeFormatStyle {
+ enum_constant public static final androidx.wear.watchface.complications.data.TimeFormatStyle DEFAULT;
+ enum_constant public static final androidx.wear.watchface.complications.data.TimeFormatStyle LOWER_CASE;
+ enum_constant public static final androidx.wear.watchface.complications.data.TimeFormatStyle UPPER_CASE;
+ }
+
+ public final class TimeRange {
+ method public static androidx.wear.watchface.complications.data.TimeRange after(java.time.Instant startInstant);
+ method public static androidx.wear.watchface.complications.data.TimeRange before(java.time.Instant endInstant);
+ method public static androidx.wear.watchface.complications.data.TimeRange between(java.time.Instant startInstant, java.time.Instant endInstant);
+ method public operator boolean contains(java.time.Instant dateTimeMillis);
+ method public java.time.Instant getEndDateTimeMillis();
+ method public java.time.Instant getStartDateTimeMillis();
+ property public final java.time.Instant endDateTimeMillis;
+ property public final java.time.Instant startDateTimeMillis;
+ field public static final androidx.wear.watchface.complications.data.TimeRange ALWAYS;
+ field public static final androidx.wear.watchface.complications.data.TimeRange.Companion Companion;
+ }
+
+ public static final class TimeRange.Companion {
+ method public androidx.wear.watchface.complications.data.TimeRange after(java.time.Instant startInstant);
+ method public androidx.wear.watchface.complications.data.TimeRange before(java.time.Instant endInstant);
+ method public androidx.wear.watchface.complications.data.TimeRange between(java.time.Instant startInstant, java.time.Instant endInstant);
+ }
+
+ public final class TypeKt {
+ }
+
+}
+
+package androidx.wear.watchface.utility {
+
+ public final class TraceEventKt {
+ }
+
+}
+
diff --git a/wear/watchface/watchface-complications-data/api/public_plus_experimental_1.1.0-beta03.txt b/wear/watchface/watchface-complications-data/api/public_plus_experimental_1.1.0-beta03.txt
new file mode 100644
index 0000000..ffbb413
--- /dev/null
+++ b/wear/watchface/watchface-complications-data/api/public_plus_experimental_1.1.0-beta03.txt
@@ -0,0 +1,406 @@
+// Signature format: 4.0
+package androidx.wear.watchface.complications.data {
+
+ public abstract sealed class ComplicationData {
+ method public final android.content.ComponentName? getDataSource();
+ method public java.time.Instant getNextChangeInstant(java.time.Instant afterInstant);
+ method public final android.app.PendingIntent? getTapAction();
+ method public final androidx.wear.watchface.complications.data.ComplicationType getType();
+ method public final androidx.wear.watchface.complications.data.TimeRange getValidTimeRange();
+ method public boolean hasPlaceholderFields();
+ method public final boolean isTapActionLostDueToSerialization();
+ method public final void setTapActionLostDueToSerialization(boolean);
+ property public final android.content.ComponentName? dataSource;
+ property public final android.app.PendingIntent? tapAction;
+ property public final boolean tapActionLostDueToSerialization;
+ property public final androidx.wear.watchface.complications.data.ComplicationType type;
+ property public final androidx.wear.watchface.complications.data.TimeRange validTimeRange;
+ }
+
+ @kotlin.RequiresOptIn(message="This is an experimental API that may change or be removed without warning.") @kotlin.annotation.Retention(kotlin.annotation.AnnotationRetention.BINARY) public @interface ComplicationExperimental {
+ }
+
+ public interface ComplicationText {
+ method public java.time.Instant getNextChangeTime(java.time.Instant afterInstant);
+ method public CharSequence getTextAt(android.content.res.Resources resources, java.time.Instant instant);
+ method public boolean isAlwaysEmpty();
+ method public boolean returnsSameText(java.time.Instant firstInstant, java.time.Instant secondInstant);
+ field public static final androidx.wear.watchface.complications.data.ComplicationText.Companion Companion;
+ field public static final androidx.wear.watchface.complications.data.ComplicationText EMPTY;
+ field public static final androidx.wear.watchface.complications.data.ComplicationText PLACEHOLDER;
+ }
+
+ public static final class ComplicationText.Companion {
+ }
+
+ public enum ComplicationType {
+ enum_constant public static final androidx.wear.watchface.complications.data.ComplicationType EMPTY;
+ enum_constant @androidx.wear.watchface.complications.data.ComplicationExperimental public static final androidx.wear.watchface.complications.data.ComplicationType LIST;
+ enum_constant public static final androidx.wear.watchface.complications.data.ComplicationType LONG_TEXT;
+ enum_constant public static final androidx.wear.watchface.complications.data.ComplicationType MONOCHROMATIC_IMAGE;
+ enum_constant public static final androidx.wear.watchface.complications.data.ComplicationType NOT_CONFIGURED;
+ enum_constant public static final androidx.wear.watchface.complications.data.ComplicationType NO_DATA;
+ enum_constant public static final androidx.wear.watchface.complications.data.ComplicationType NO_PERMISSION;
+ enum_constant public static final androidx.wear.watchface.complications.data.ComplicationType PHOTO_IMAGE;
+ enum_constant @androidx.wear.watchface.complications.data.ComplicationExperimental public static final androidx.wear.watchface.complications.data.ComplicationType PROTO_LAYOUT;
+ enum_constant public static final androidx.wear.watchface.complications.data.ComplicationType RANGED_VALUE;
+ enum_constant public static final androidx.wear.watchface.complications.data.ComplicationType SHORT_TEXT;
+ enum_constant public static final androidx.wear.watchface.complications.data.ComplicationType SMALL_IMAGE;
+ }
+
+ public final class CountDownTimeReference {
+ ctor public CountDownTimeReference(java.time.Instant instant);
+ method public java.time.Instant getInstant();
+ property public final java.time.Instant instant;
+ }
+
+ public final class CountUpTimeReference {
+ ctor public CountUpTimeReference(java.time.Instant instant);
+ method public java.time.Instant getInstant();
+ property public final java.time.Instant instant;
+ }
+
+ public final class DataKt {
+ }
+
+ public final class EmptyComplicationData extends androidx.wear.watchface.complications.data.ComplicationData {
+ ctor public EmptyComplicationData();
+ field public static final androidx.wear.watchface.complications.data.ComplicationType TYPE;
+ }
+
+ public final class ImageKt {
+ }
+
+ @androidx.wear.watchface.complications.data.ComplicationExperimental public final class ListComplicationData extends androidx.wear.watchface.complications.data.ComplicationData {
+ method public java.util.List<androidx.wear.watchface.complications.data.ComplicationData> getComplicationList();
+ method public androidx.wear.watchface.complications.data.ComplicationText? getContentDescription();
+ method public androidx.wear.watchface.complications.data.ListComplicationData.StyleHint getStyleHint();
+ property public final java.util.List<androidx.wear.watchface.complications.data.ComplicationData> complicationList;
+ property public final androidx.wear.watchface.complications.data.ComplicationText? contentDescription;
+ property public final androidx.wear.watchface.complications.data.ListComplicationData.StyleHint styleHint;
+ field public static final int MAX_ITEMS = 5; // 0x5
+ field public static final androidx.wear.watchface.complications.data.ComplicationType TYPE;
+ }
+
+ public static final class ListComplicationData.Builder {
+ ctor public ListComplicationData.Builder(java.util.List<? extends androidx.wear.watchface.complications.data.ComplicationData> complicationList, androidx.wear.watchface.complications.data.ListComplicationData.StyleHint styleHint, androidx.wear.watchface.complications.data.ComplicationText contentDescription);
+ method public androidx.wear.watchface.complications.data.ListComplicationData build();
+ method public androidx.wear.watchface.complications.data.ListComplicationData.Builder setDataSource(android.content.ComponentName? dataSource);
+ method public androidx.wear.watchface.complications.data.ListComplicationData.Builder setTapAction(android.app.PendingIntent? tapAction);
+ method public androidx.wear.watchface.complications.data.ListComplicationData.Builder setValidTimeRange(androidx.wear.watchface.complications.data.TimeRange? validTimeRange);
+ }
+
+ @androidx.wear.watchface.complications.data.ComplicationExperimental public enum ListComplicationData.StyleHint {
+ enum_constant public static final androidx.wear.watchface.complications.data.ListComplicationData.StyleHint ColumnOfRows;
+ enum_constant public static final androidx.wear.watchface.complications.data.ListComplicationData.StyleHint RowOfColumns;
+ }
+
+ public final class LongTextComplicationData extends androidx.wear.watchface.complications.data.ComplicationData {
+ method public androidx.wear.watchface.complications.data.ComplicationText? getContentDescription();
+ method public androidx.wear.watchface.complications.data.MonochromaticImage? getMonochromaticImage();
+ method public androidx.wear.watchface.complications.data.SmallImage? getSmallImage();
+ method public androidx.wear.watchface.complications.data.ComplicationText getText();
+ method public androidx.wear.watchface.complications.data.ComplicationText? getTitle();
+ property public final androidx.wear.watchface.complications.data.ComplicationText? contentDescription;
+ property public final androidx.wear.watchface.complications.data.MonochromaticImage? monochromaticImage;
+ property public final androidx.wear.watchface.complications.data.SmallImage? smallImage;
+ property public final androidx.wear.watchface.complications.data.ComplicationText text;
+ property public final androidx.wear.watchface.complications.data.ComplicationText? title;
+ field public static final androidx.wear.watchface.complications.data.ComplicationType TYPE;
+ }
+
+ public static final class LongTextComplicationData.Builder {
+ ctor public LongTextComplicationData.Builder(androidx.wear.watchface.complications.data.ComplicationText text, androidx.wear.watchface.complications.data.ComplicationText contentDescription);
+ method public androidx.wear.watchface.complications.data.LongTextComplicationData build();
+ method public androidx.wear.watchface.complications.data.LongTextComplicationData.Builder setDataSource(android.content.ComponentName? dataSource);
+ method public androidx.wear.watchface.complications.data.LongTextComplicationData.Builder setMonochromaticImage(androidx.wear.watchface.complications.data.MonochromaticImage? icon);
+ method public androidx.wear.watchface.complications.data.LongTextComplicationData.Builder setSmallImage(androidx.wear.watchface.complications.data.SmallImage? smallImage);
+ method public androidx.wear.watchface.complications.data.LongTextComplicationData.Builder setTapAction(android.app.PendingIntent? tapAction);
+ method public androidx.wear.watchface.complications.data.LongTextComplicationData.Builder setTitle(androidx.wear.watchface.complications.data.ComplicationText? title);
+ method public androidx.wear.watchface.complications.data.LongTextComplicationData.Builder setValidTimeRange(androidx.wear.watchface.complications.data.TimeRange? validTimeRange);
+ }
+
+ public final class MonochromaticImage {
+ method public android.graphics.drawable.Icon? getAmbientImage();
+ method public android.graphics.drawable.Icon getImage();
+ property public final android.graphics.drawable.Icon? ambientImage;
+ property public final android.graphics.drawable.Icon image;
+ field public static final androidx.wear.watchface.complications.data.MonochromaticImage PLACEHOLDER;
+ }
+
+ public static final class MonochromaticImage.Builder {
+ ctor public MonochromaticImage.Builder(android.graphics.drawable.Icon image);
+ method public androidx.wear.watchface.complications.data.MonochromaticImage build();
+ method public androidx.wear.watchface.complications.data.MonochromaticImage.Builder setAmbientImage(android.graphics.drawable.Icon? ambientImage);
+ }
+
+ public final class MonochromaticImageComplicationData extends androidx.wear.watchface.complications.data.ComplicationData {
+ method public androidx.wear.watchface.complications.data.ComplicationText? getContentDescription();
+ method public androidx.wear.watchface.complications.data.MonochromaticImage getMonochromaticImage();
+ property public final androidx.wear.watchface.complications.data.ComplicationText? contentDescription;
+ property public final androidx.wear.watchface.complications.data.MonochromaticImage monochromaticImage;
+ field public static final androidx.wear.watchface.complications.data.ComplicationType TYPE;
+ }
+
+ public static final class MonochromaticImageComplicationData.Builder {
+ ctor public MonochromaticImageComplicationData.Builder(androidx.wear.watchface.complications.data.MonochromaticImage monochromaticImage, androidx.wear.watchface.complications.data.ComplicationText contentDescription);
+ method public androidx.wear.watchface.complications.data.MonochromaticImageComplicationData build();
+ method public androidx.wear.watchface.complications.data.MonochromaticImageComplicationData.Builder setDataSource(android.content.ComponentName? dataSource);
+ method public androidx.wear.watchface.complications.data.MonochromaticImageComplicationData.Builder setTapAction(android.app.PendingIntent? tapAction);
+ method public androidx.wear.watchface.complications.data.MonochromaticImageComplicationData.Builder setValidTimeRange(androidx.wear.watchface.complications.data.TimeRange? validTimeRange);
+ }
+
+ public final class NoDataComplicationData extends androidx.wear.watchface.complications.data.ComplicationData {
+ ctor public NoDataComplicationData();
+ ctor public NoDataComplicationData(androidx.wear.watchface.complications.data.ComplicationData placeholder);
+ method public androidx.wear.watchface.complications.data.ComplicationText? getContentDescription();
+ method public androidx.wear.watchface.complications.data.ComplicationData? getPlaceholder();
+ property public final androidx.wear.watchface.complications.data.ComplicationText? contentDescription;
+ property public final androidx.wear.watchface.complications.data.ComplicationData? placeholder;
+ field public static final androidx.wear.watchface.complications.data.ComplicationType TYPE;
+ }
+
+ public final class NoPermissionComplicationData extends androidx.wear.watchface.complications.data.ComplicationData {
+ method public androidx.wear.watchface.complications.data.MonochromaticImage? getMonochromaticImage();
+ method public androidx.wear.watchface.complications.data.ComplicationText? getText();
+ method public androidx.wear.watchface.complications.data.ComplicationText? getTitle();
+ property public final androidx.wear.watchface.complications.data.MonochromaticImage? monochromaticImage;
+ property public final androidx.wear.watchface.complications.data.ComplicationText? text;
+ property public final androidx.wear.watchface.complications.data.ComplicationText? title;
+ field public static final androidx.wear.watchface.complications.data.ComplicationType TYPE;
+ }
+
+ public static final class NoPermissionComplicationData.Builder {
+ ctor public NoPermissionComplicationData.Builder();
+ method public androidx.wear.watchface.complications.data.NoPermissionComplicationData build();
+ method public androidx.wear.watchface.complications.data.NoPermissionComplicationData.Builder setDataSource(android.content.ComponentName? dataSource);
+ method public androidx.wear.watchface.complications.data.NoPermissionComplicationData.Builder setMonochromaticImage(androidx.wear.watchface.complications.data.MonochromaticImage? monochromaticImage);
+ method public androidx.wear.watchface.complications.data.NoPermissionComplicationData.Builder setText(androidx.wear.watchface.complications.data.ComplicationText? text);
+ method public androidx.wear.watchface.complications.data.NoPermissionComplicationData.Builder setTitle(androidx.wear.watchface.complications.data.ComplicationText? title);
+ }
+
+ public final class NotConfiguredComplicationData extends androidx.wear.watchface.complications.data.ComplicationData {
+ ctor public NotConfiguredComplicationData();
+ field public static final androidx.wear.watchface.complications.data.ComplicationType TYPE;
+ }
+
+ public final class PhotoImageComplicationData extends androidx.wear.watchface.complications.data.ComplicationData {
+ method public androidx.wear.watchface.complications.data.ComplicationText? getContentDescription();
+ method public android.graphics.drawable.Icon getPhotoImage();
+ property public final androidx.wear.watchface.complications.data.ComplicationText? contentDescription;
+ property public final android.graphics.drawable.Icon photoImage;
+ field public static final android.graphics.drawable.Icon PLACEHOLDER;
+ field public static final androidx.wear.watchface.complications.data.ComplicationType TYPE;
+ }
+
+ public static final class PhotoImageComplicationData.Builder {
+ ctor public PhotoImageComplicationData.Builder(android.graphics.drawable.Icon photoImage, androidx.wear.watchface.complications.data.ComplicationText contentDescription);
+ method public androidx.wear.watchface.complications.data.PhotoImageComplicationData build();
+ method public androidx.wear.watchface.complications.data.PhotoImageComplicationData.Builder setDataSource(android.content.ComponentName? dataSource);
+ method public androidx.wear.watchface.complications.data.PhotoImageComplicationData.Builder setTapAction(android.app.PendingIntent? tapAction);
+ method public androidx.wear.watchface.complications.data.PhotoImageComplicationData.Builder setValidTimeRange(androidx.wear.watchface.complications.data.TimeRange? validTimeRange);
+ }
+
+ public final class PlainComplicationText implements androidx.wear.watchface.complications.data.ComplicationText {
+ method public java.time.Instant getNextChangeTime(java.time.Instant afterInstant);
+ method public CharSequence getTextAt(android.content.res.Resources resources, java.time.Instant instant);
+ method public boolean isAlwaysEmpty();
+ method public boolean returnsSameText(java.time.Instant firstInstant, java.time.Instant secondInstant);
+ }
+
+ public static final class PlainComplicationText.Builder {
+ ctor public PlainComplicationText.Builder(CharSequence text);
+ method public androidx.wear.watchface.complications.data.PlainComplicationText build();
+ }
+
+ @androidx.wear.watchface.complications.data.ComplicationExperimental public final class ProtoLayoutComplicationData extends androidx.wear.watchface.complications.data.ComplicationData {
+ method public androidx.wear.tiles.LayoutElementBuilders.Layout getAmbientLayout();
+ method public androidx.wear.watchface.complications.data.ComplicationText? getContentDescription();
+ method public androidx.wear.tiles.LayoutElementBuilders.Layout getInteractiveLayout();
+ method public androidx.wear.tiles.ResourceBuilders.Resources getLayoutResources();
+ property public final androidx.wear.tiles.LayoutElementBuilders.Layout ambientLayout;
+ property public final androidx.wear.watchface.complications.data.ComplicationText? contentDescription;
+ property public final androidx.wear.tiles.LayoutElementBuilders.Layout interactiveLayout;
+ property public final androidx.wear.tiles.ResourceBuilders.Resources layoutResources;
+ field public static final androidx.wear.watchface.complications.data.ComplicationType TYPE;
+ }
+
+ public static final class ProtoLayoutComplicationData.Builder {
+ ctor public ProtoLayoutComplicationData.Builder(byte[] ambientLayout, byte[] interactiveLayout, byte[] layoutResources, androidx.wear.watchface.complications.data.ComplicationText contentDescription);
+ ctor public ProtoLayoutComplicationData.Builder(androidx.wear.tiles.LayoutElementBuilders.Layout ambientLayout, androidx.wear.tiles.LayoutElementBuilders.Layout interactiveLayout, androidx.wear.tiles.ResourceBuilders.Resources resources, androidx.wear.watchface.complications.data.ComplicationText contentDescription);
+ method public androidx.wear.watchface.complications.data.ProtoLayoutComplicationData build();
+ method public androidx.wear.watchface.complications.data.ProtoLayoutComplicationData.Builder setDataSource(android.content.ComponentName? dataSource);
+ method public androidx.wear.watchface.complications.data.ProtoLayoutComplicationData.Builder setTapAction(android.app.PendingIntent? tapAction);
+ method public androidx.wear.watchface.complications.data.ProtoLayoutComplicationData.Builder setValidTimeRange(androidx.wear.watchface.complications.data.TimeRange? validTimeRange);
+ }
+
+ public final class RangedValueComplicationData extends androidx.wear.watchface.complications.data.ComplicationData {
+ method public androidx.wear.watchface.complications.data.ComplicationText? getContentDescription();
+ method public float getMax();
+ method public float getMin();
+ method public androidx.wear.watchface.complications.data.MonochromaticImage? getMonochromaticImage();
+ method public androidx.wear.watchface.complications.data.ComplicationText? getText();
+ method public androidx.wear.watchface.complications.data.ComplicationText? getTitle();
+ method public float getValue();
+ property public final androidx.wear.watchface.complications.data.ComplicationText? contentDescription;
+ property public final float max;
+ property public final float min;
+ property public final androidx.wear.watchface.complications.data.MonochromaticImage? monochromaticImage;
+ property public final androidx.wear.watchface.complications.data.ComplicationText? text;
+ property public final androidx.wear.watchface.complications.data.ComplicationText? title;
+ property public final float value;
+ field public static final float PLACEHOLDER;
+ field public static final androidx.wear.watchface.complications.data.ComplicationType TYPE;
+ }
+
+ public static final class RangedValueComplicationData.Builder {
+ ctor public RangedValueComplicationData.Builder(float value, float min, float max, androidx.wear.watchface.complications.data.ComplicationText contentDescription);
+ method public androidx.wear.watchface.complications.data.RangedValueComplicationData build();
+ method public androidx.wear.watchface.complications.data.RangedValueComplicationData.Builder setDataSource(android.content.ComponentName? dataSource);
+ method public androidx.wear.watchface.complications.data.RangedValueComplicationData.Builder setMonochromaticImage(androidx.wear.watchface.complications.data.MonochromaticImage? monochromaticImage);
+ method public androidx.wear.watchface.complications.data.RangedValueComplicationData.Builder setTapAction(android.app.PendingIntent? tapAction);
+ method public androidx.wear.watchface.complications.data.RangedValueComplicationData.Builder setText(androidx.wear.watchface.complications.data.ComplicationText? text);
+ method public androidx.wear.watchface.complications.data.RangedValueComplicationData.Builder setTitle(androidx.wear.watchface.complications.data.ComplicationText? title);
+ method public androidx.wear.watchface.complications.data.RangedValueComplicationData.Builder setValidTimeRange(androidx.wear.watchface.complications.data.TimeRange? validTimeRange);
+ }
+
+ public final class ShortTextComplicationData extends androidx.wear.watchface.complications.data.ComplicationData {
+ method public androidx.wear.watchface.complications.data.ComplicationText? getContentDescription();
+ method public androidx.wear.watchface.complications.data.MonochromaticImage? getMonochromaticImage();
+ method public androidx.wear.watchface.complications.data.ComplicationText getText();
+ method public androidx.wear.watchface.complications.data.ComplicationText? getTitle();
+ property public final androidx.wear.watchface.complications.data.ComplicationText? contentDescription;
+ property public final androidx.wear.watchface.complications.data.MonochromaticImage? monochromaticImage;
+ property public final androidx.wear.watchface.complications.data.ComplicationText text;
+ property public final androidx.wear.watchface.complications.data.ComplicationText? title;
+ field public static final int MAX_TEXT_LENGTH;
+ field public static final androidx.wear.watchface.complications.data.ComplicationType TYPE;
+ }
+
+ public static final class ShortTextComplicationData.Builder {
+ ctor public ShortTextComplicationData.Builder(androidx.wear.watchface.complications.data.ComplicationText text, androidx.wear.watchface.complications.data.ComplicationText contentDescription);
+ method public androidx.wear.watchface.complications.data.ShortTextComplicationData build();
+ method public androidx.wear.watchface.complications.data.ShortTextComplicationData.Builder setDataSource(android.content.ComponentName? dataSource);
+ method public androidx.wear.watchface.complications.data.ShortTextComplicationData.Builder setMonochromaticImage(androidx.wear.watchface.complications.data.MonochromaticImage? monochromaticImage);
+ method public androidx.wear.watchface.complications.data.ShortTextComplicationData.Builder setTapAction(android.app.PendingIntent? tapAction);
+ method public androidx.wear.watchface.complications.data.ShortTextComplicationData.Builder setTitle(androidx.wear.watchface.complications.data.ComplicationText? title);
+ method public androidx.wear.watchface.complications.data.ShortTextComplicationData.Builder setValidTimeRange(androidx.wear.watchface.complications.data.TimeRange? validTimeRange);
+ }
+
+ public final class SmallImage {
+ method public android.graphics.drawable.Icon? getAmbientImage();
+ method public android.graphics.drawable.Icon getImage();
+ method public androidx.wear.watchface.complications.data.SmallImageType getType();
+ property public final android.graphics.drawable.Icon? ambientImage;
+ property public final android.graphics.drawable.Icon image;
+ property public final androidx.wear.watchface.complications.data.SmallImageType type;
+ field public static final androidx.wear.watchface.complications.data.SmallImage PLACEHOLDER;
+ }
+
+ public static final class SmallImage.Builder {
+ ctor public SmallImage.Builder(android.graphics.drawable.Icon image, androidx.wear.watchface.complications.data.SmallImageType type);
+ method public androidx.wear.watchface.complications.data.SmallImage build();
+ method public androidx.wear.watchface.complications.data.SmallImage.Builder setAmbientImage(android.graphics.drawable.Icon? ambientImage);
+ }
+
+ public final class SmallImageComplicationData extends androidx.wear.watchface.complications.data.ComplicationData {
+ method public androidx.wear.watchface.complications.data.ComplicationText? getContentDescription();
+ method public androidx.wear.watchface.complications.data.SmallImage getSmallImage();
+ property public final androidx.wear.watchface.complications.data.ComplicationText? contentDescription;
+ property public final androidx.wear.watchface.complications.data.SmallImage smallImage;
+ field public static final androidx.wear.watchface.complications.data.ComplicationType TYPE;
+ }
+
+ public static final class SmallImageComplicationData.Builder {
+ ctor public SmallImageComplicationData.Builder(androidx.wear.watchface.complications.data.SmallImage smallImage, androidx.wear.watchface.complications.data.ComplicationText contentDescription);
+ method public androidx.wear.watchface.complications.data.SmallImageComplicationData build();
+ method public androidx.wear.watchface.complications.data.SmallImageComplicationData.Builder setDataSource(android.content.ComponentName? dataSource);
+ method public androidx.wear.watchface.complications.data.SmallImageComplicationData.Builder setTapAction(android.app.PendingIntent? tapAction);
+ method public androidx.wear.watchface.complications.data.SmallImageComplicationData.Builder setValidTimeRange(androidx.wear.watchface.complications.data.TimeRange? validTimeRange);
+ }
+
+ public enum SmallImageType {
+ enum_constant public static final androidx.wear.watchface.complications.data.SmallImageType ICON;
+ enum_constant public static final androidx.wear.watchface.complications.data.SmallImageType PHOTO;
+ }
+
+ public final class TextKt {
+ }
+
+ public final class TimeDifferenceComplicationText implements androidx.wear.watchface.complications.data.ComplicationText {
+ method public java.util.concurrent.TimeUnit? getMinimumTimeUnit();
+ method public java.time.Instant getNextChangeTime(java.time.Instant afterInstant);
+ method public CharSequence getTextAt(android.content.res.Resources resources, java.time.Instant instant);
+ method public boolean isAlwaysEmpty();
+ method public boolean returnsSameText(java.time.Instant firstInstant, java.time.Instant secondInstant);
+ }
+
+ public static final class TimeDifferenceComplicationText.Builder {
+ ctor public TimeDifferenceComplicationText.Builder(androidx.wear.watchface.complications.data.TimeDifferenceStyle style, androidx.wear.watchface.complications.data.CountUpTimeReference countUpTimeReference);
+ ctor public TimeDifferenceComplicationText.Builder(androidx.wear.watchface.complications.data.TimeDifferenceStyle style, androidx.wear.watchface.complications.data.CountDownTimeReference countDownTimeReference);
+ method public androidx.wear.watchface.complications.data.TimeDifferenceComplicationText build();
+ method public androidx.wear.watchface.complications.data.TimeDifferenceComplicationText.Builder setDisplayAsNow(boolean displayAsNow);
+ method public androidx.wear.watchface.complications.data.TimeDifferenceComplicationText.Builder setMinimumTimeUnit(java.util.concurrent.TimeUnit? minimumUnit);
+ method public androidx.wear.watchface.complications.data.TimeDifferenceComplicationText.Builder setText(CharSequence? text);
+ }
+
+ public enum TimeDifferenceStyle {
+ enum_constant public static final androidx.wear.watchface.complications.data.TimeDifferenceStyle SHORT_DUAL_UNIT;
+ enum_constant public static final androidx.wear.watchface.complications.data.TimeDifferenceStyle SHORT_SINGLE_UNIT;
+ enum_constant public static final androidx.wear.watchface.complications.data.TimeDifferenceStyle SHORT_WORDS_SINGLE_UNIT;
+ enum_constant public static final androidx.wear.watchface.complications.data.TimeDifferenceStyle STOPWATCH;
+ enum_constant public static final androidx.wear.watchface.complications.data.TimeDifferenceStyle WORDS_SINGLE_UNIT;
+ }
+
+ public final class TimeFormatComplicationText implements androidx.wear.watchface.complications.data.ComplicationText {
+ method public java.time.Instant getNextChangeTime(java.time.Instant afterInstant);
+ method public CharSequence getTextAt(android.content.res.Resources resources, java.time.Instant instant);
+ method public boolean isAlwaysEmpty();
+ method public boolean returnsSameText(java.time.Instant firstInstant, java.time.Instant secondInstant);
+ }
+
+ public static final class TimeFormatComplicationText.Builder {
+ ctor public TimeFormatComplicationText.Builder(String format);
+ method public androidx.wear.watchface.complications.data.TimeFormatComplicationText build();
+ method public androidx.wear.watchface.complications.data.TimeFormatComplicationText.Builder setStyle(androidx.wear.watchface.complications.data.TimeFormatStyle style);
+ method public androidx.wear.watchface.complications.data.TimeFormatComplicationText.Builder setText(CharSequence text);
+ method public androidx.wear.watchface.complications.data.TimeFormatComplicationText.Builder setTimeZone(android.icu.util.TimeZone timeZone);
+ }
+
+ public enum TimeFormatStyle {
+ enum_constant public static final androidx.wear.watchface.complications.data.TimeFormatStyle DEFAULT;
+ enum_constant public static final androidx.wear.watchface.complications.data.TimeFormatStyle LOWER_CASE;
+ enum_constant public static final androidx.wear.watchface.complications.data.TimeFormatStyle UPPER_CASE;
+ }
+
+ public final class TimeRange {
+ method public static androidx.wear.watchface.complications.data.TimeRange after(java.time.Instant startInstant);
+ method public static androidx.wear.watchface.complications.data.TimeRange before(java.time.Instant endInstant);
+ method public static androidx.wear.watchface.complications.data.TimeRange between(java.time.Instant startInstant, java.time.Instant endInstant);
+ method public operator boolean contains(java.time.Instant dateTimeMillis);
+ method public java.time.Instant getEndDateTimeMillis();
+ method public java.time.Instant getStartDateTimeMillis();
+ property public final java.time.Instant endDateTimeMillis;
+ property public final java.time.Instant startDateTimeMillis;
+ field public static final androidx.wear.watchface.complications.data.TimeRange ALWAYS;
+ field public static final androidx.wear.watchface.complications.data.TimeRange.Companion Companion;
+ }
+
+ public static final class TimeRange.Companion {
+ method public androidx.wear.watchface.complications.data.TimeRange after(java.time.Instant startInstant);
+ method public androidx.wear.watchface.complications.data.TimeRange before(java.time.Instant endInstant);
+ method public androidx.wear.watchface.complications.data.TimeRange between(java.time.Instant startInstant, java.time.Instant endInstant);
+ }
+
+ public final class TypeKt {
+ }
+
+}
+
+package androidx.wear.watchface.utility {
+
+ public final class TraceEventKt {
+ }
+
+}
+
diff --git a/wear/watchface/watchface-complications-data/api/res-1.1.0-beta03.txt b/wear/watchface/watchface-complications-data/api/res-1.1.0-beta03.txt
new file mode 100644
index 0000000..e69de29
--- /dev/null
+++ b/wear/watchface/watchface-complications-data/api/res-1.1.0-beta03.txt
diff --git a/wear/watchface/watchface-complications-data/api/restricted_1.1.0-beta03.txt b/wear/watchface/watchface-complications-data/api/restricted_1.1.0-beta03.txt
new file mode 100644
index 0000000..355944f
--- /dev/null
+++ b/wear/watchface/watchface-complications-data/api/restricted_1.1.0-beta03.txt
@@ -0,0 +1,371 @@
+// Signature format: 4.0
+package androidx.wear.watchface.complications.data {
+
+ public abstract sealed class ComplicationData {
+ method public final android.content.ComponentName? getDataSource();
+ method public java.time.Instant getNextChangeInstant(java.time.Instant afterInstant);
+ method public final android.app.PendingIntent? getTapAction();
+ method public final androidx.wear.watchface.complications.data.ComplicationType getType();
+ method public final androidx.wear.watchface.complications.data.TimeRange getValidTimeRange();
+ method public boolean hasPlaceholderFields();
+ method public final boolean isTapActionLostDueToSerialization();
+ method public final void setTapActionLostDueToSerialization(boolean);
+ property public final android.content.ComponentName? dataSource;
+ property public final android.app.PendingIntent? tapAction;
+ property public final boolean tapActionLostDueToSerialization;
+ property public final androidx.wear.watchface.complications.data.ComplicationType type;
+ property public final androidx.wear.watchface.complications.data.TimeRange validTimeRange;
+ }
+
+ public interface ComplicationText {
+ method public java.time.Instant getNextChangeTime(java.time.Instant afterInstant);
+ method public CharSequence getTextAt(android.content.res.Resources resources, java.time.Instant instant);
+ method public boolean isAlwaysEmpty();
+ method public boolean returnsSameText(java.time.Instant firstInstant, java.time.Instant secondInstant);
+ field public static final androidx.wear.watchface.complications.data.ComplicationText.Companion Companion;
+ field public static final androidx.wear.watchface.complications.data.ComplicationText EMPTY;
+ field public static final androidx.wear.watchface.complications.data.ComplicationText PLACEHOLDER;
+ }
+
+ public static final class ComplicationText.Companion {
+ }
+
+ public enum ComplicationType {
+ enum_constant public static final androidx.wear.watchface.complications.data.ComplicationType EMPTY;
+ enum_constant public static final androidx.wear.watchface.complications.data.ComplicationType LONG_TEXT;
+ enum_constant public static final androidx.wear.watchface.complications.data.ComplicationType MONOCHROMATIC_IMAGE;
+ enum_constant public static final androidx.wear.watchface.complications.data.ComplicationType NOT_CONFIGURED;
+ enum_constant public static final androidx.wear.watchface.complications.data.ComplicationType NO_DATA;
+ enum_constant public static final androidx.wear.watchface.complications.data.ComplicationType NO_PERMISSION;
+ enum_constant public static final androidx.wear.watchface.complications.data.ComplicationType PHOTO_IMAGE;
+ enum_constant public static final androidx.wear.watchface.complications.data.ComplicationType RANGED_VALUE;
+ enum_constant public static final androidx.wear.watchface.complications.data.ComplicationType SHORT_TEXT;
+ enum_constant public static final androidx.wear.watchface.complications.data.ComplicationType SMALL_IMAGE;
+ }
+
+ public final class CountDownTimeReference {
+ ctor public CountDownTimeReference(java.time.Instant instant);
+ method public java.time.Instant getInstant();
+ property public final java.time.Instant instant;
+ }
+
+ public final class CountUpTimeReference {
+ ctor public CountUpTimeReference(java.time.Instant instant);
+ method public java.time.Instant getInstant();
+ property public final java.time.Instant instant;
+ }
+
+ public final class DataKt {
+ }
+
+ @RestrictTo(androidx.annotation.RestrictTo.Scope.LIBRARY_GROUP_PREFIX) @androidx.versionedparcelable.VersionedParcelize public final class DefaultComplicationDataSourcePolicyWireFormat implements android.os.Parcelable androidx.versionedparcelable.VersionedParcelable {
+ ctor public DefaultComplicationDataSourcePolicyWireFormat(java.util.List<android.content.ComponentName!>, int, int, int, int);
+ method public int describeContents();
+ method public void writeToParcel(android.os.Parcel, int);
+ field public static final android.os.Parcelable.Creator<androidx.wear.watchface.complications.data.DefaultComplicationDataSourcePolicyWireFormat!>! CREATOR;
+ field @androidx.versionedparcelable.ParcelField(1) public java.util.List<android.content.ComponentName!> mDefaultDataSourcesToTry;
+ field @androidx.versionedparcelable.ParcelField(3) public int mDefaultType;
+ field @androidx.versionedparcelable.ParcelField(2) public int mFallbackSystemDataSource;
+ field @androidx.versionedparcelable.ParcelField(4) public int mPrimaryDataSourceDefaultType;
+ field @androidx.versionedparcelable.ParcelField(5) public int mSecondaryDataSourceDefaultType;
+ }
+
+ public final class EmptyComplicationData extends androidx.wear.watchface.complications.data.ComplicationData {
+ ctor public EmptyComplicationData();
+ field public static final androidx.wear.watchface.complications.data.ComplicationType TYPE;
+ }
+
+ public final class ImageKt {
+ }
+
+ public final class LongTextComplicationData extends androidx.wear.watchface.complications.data.ComplicationData {
+ method public androidx.wear.watchface.complications.data.ComplicationText? getContentDescription();
+ method public androidx.wear.watchface.complications.data.MonochromaticImage? getMonochromaticImage();
+ method public androidx.wear.watchface.complications.data.SmallImage? getSmallImage();
+ method public androidx.wear.watchface.complications.data.ComplicationText getText();
+ method public androidx.wear.watchface.complications.data.ComplicationText? getTitle();
+ property public final androidx.wear.watchface.complications.data.ComplicationText? contentDescription;
+ property public final androidx.wear.watchface.complications.data.MonochromaticImage? monochromaticImage;
+ property public final androidx.wear.watchface.complications.data.SmallImage? smallImage;
+ property public final androidx.wear.watchface.complications.data.ComplicationText text;
+ property public final androidx.wear.watchface.complications.data.ComplicationText? title;
+ field public static final androidx.wear.watchface.complications.data.ComplicationType TYPE;
+ }
+
+ public static final class LongTextComplicationData.Builder {
+ ctor public LongTextComplicationData.Builder(androidx.wear.watchface.complications.data.ComplicationText text, androidx.wear.watchface.complications.data.ComplicationText contentDescription);
+ method public androidx.wear.watchface.complications.data.LongTextComplicationData build();
+ method public androidx.wear.watchface.complications.data.LongTextComplicationData.Builder setDataSource(android.content.ComponentName? dataSource);
+ method public androidx.wear.watchface.complications.data.LongTextComplicationData.Builder setMonochromaticImage(androidx.wear.watchface.complications.data.MonochromaticImage? icon);
+ method public androidx.wear.watchface.complications.data.LongTextComplicationData.Builder setSmallImage(androidx.wear.watchface.complications.data.SmallImage? smallImage);
+ method public androidx.wear.watchface.complications.data.LongTextComplicationData.Builder setTapAction(android.app.PendingIntent? tapAction);
+ method public androidx.wear.watchface.complications.data.LongTextComplicationData.Builder setTitle(androidx.wear.watchface.complications.data.ComplicationText? title);
+ method public androidx.wear.watchface.complications.data.LongTextComplicationData.Builder setValidTimeRange(androidx.wear.watchface.complications.data.TimeRange? validTimeRange);
+ }
+
+ public final class MonochromaticImage {
+ method public android.graphics.drawable.Icon? getAmbientImage();
+ method public android.graphics.drawable.Icon getImage();
+ property public final android.graphics.drawable.Icon? ambientImage;
+ property public final android.graphics.drawable.Icon image;
+ field public static final androidx.wear.watchface.complications.data.MonochromaticImage PLACEHOLDER;
+ }
+
+ public static final class MonochromaticImage.Builder {
+ ctor public MonochromaticImage.Builder(android.graphics.drawable.Icon image);
+ method public androidx.wear.watchface.complications.data.MonochromaticImage build();
+ method public androidx.wear.watchface.complications.data.MonochromaticImage.Builder setAmbientImage(android.graphics.drawable.Icon? ambientImage);
+ }
+
+ public final class MonochromaticImageComplicationData extends androidx.wear.watchface.complications.data.ComplicationData {
+ method public androidx.wear.watchface.complications.data.ComplicationText? getContentDescription();
+ method public androidx.wear.watchface.complications.data.MonochromaticImage getMonochromaticImage();
+ property public final androidx.wear.watchface.complications.data.ComplicationText? contentDescription;
+ property public final androidx.wear.watchface.complications.data.MonochromaticImage monochromaticImage;
+ field public static final androidx.wear.watchface.complications.data.ComplicationType TYPE;
+ }
+
+ public static final class MonochromaticImageComplicationData.Builder {
+ ctor public MonochromaticImageComplicationData.Builder(androidx.wear.watchface.complications.data.MonochromaticImage monochromaticImage, androidx.wear.watchface.complications.data.ComplicationText contentDescription);
+ method public androidx.wear.watchface.complications.data.MonochromaticImageComplicationData build();
+ method public androidx.wear.watchface.complications.data.MonochromaticImageComplicationData.Builder setDataSource(android.content.ComponentName? dataSource);
+ method public androidx.wear.watchface.complications.data.MonochromaticImageComplicationData.Builder setTapAction(android.app.PendingIntent? tapAction);
+ method public androidx.wear.watchface.complications.data.MonochromaticImageComplicationData.Builder setValidTimeRange(androidx.wear.watchface.complications.data.TimeRange? validTimeRange);
+ }
+
+ public final class NoDataComplicationData extends androidx.wear.watchface.complications.data.ComplicationData {
+ ctor public NoDataComplicationData();
+ ctor public NoDataComplicationData(androidx.wear.watchface.complications.data.ComplicationData placeholder);
+ method public androidx.wear.watchface.complications.data.ComplicationText? getContentDescription();
+ method public androidx.wear.watchface.complications.data.ComplicationData? getPlaceholder();
+ property public final androidx.wear.watchface.complications.data.ComplicationText? contentDescription;
+ property public final androidx.wear.watchface.complications.data.ComplicationData? placeholder;
+ field public static final androidx.wear.watchface.complications.data.ComplicationType TYPE;
+ }
+
+ public final class NoPermissionComplicationData extends androidx.wear.watchface.complications.data.ComplicationData {
+ method public androidx.wear.watchface.complications.data.MonochromaticImage? getMonochromaticImage();
+ method public androidx.wear.watchface.complications.data.ComplicationText? getText();
+ method public androidx.wear.watchface.complications.data.ComplicationText? getTitle();
+ property public final androidx.wear.watchface.complications.data.MonochromaticImage? monochromaticImage;
+ property public final androidx.wear.watchface.complications.data.ComplicationText? text;
+ property public final androidx.wear.watchface.complications.data.ComplicationText? title;
+ field public static final androidx.wear.watchface.complications.data.ComplicationType TYPE;
+ }
+
+ public static final class NoPermissionComplicationData.Builder {
+ ctor public NoPermissionComplicationData.Builder();
+ method public androidx.wear.watchface.complications.data.NoPermissionComplicationData build();
+ method public androidx.wear.watchface.complications.data.NoPermissionComplicationData.Builder setDataSource(android.content.ComponentName? dataSource);
+ method public androidx.wear.watchface.complications.data.NoPermissionComplicationData.Builder setMonochromaticImage(androidx.wear.watchface.complications.data.MonochromaticImage? monochromaticImage);
+ method public androidx.wear.watchface.complications.data.NoPermissionComplicationData.Builder setText(androidx.wear.watchface.complications.data.ComplicationText? text);
+ method public androidx.wear.watchface.complications.data.NoPermissionComplicationData.Builder setTitle(androidx.wear.watchface.complications.data.ComplicationText? title);
+ }
+
+ public final class NotConfiguredComplicationData extends androidx.wear.watchface.complications.data.ComplicationData {
+ ctor public NotConfiguredComplicationData();
+ field public static final androidx.wear.watchface.complications.data.ComplicationType TYPE;
+ }
+
+ public final class PhotoImageComplicationData extends androidx.wear.watchface.complications.data.ComplicationData {
+ method public androidx.wear.watchface.complications.data.ComplicationText? getContentDescription();
+ method public android.graphics.drawable.Icon getPhotoImage();
+ property public final androidx.wear.watchface.complications.data.ComplicationText? contentDescription;
+ property public final android.graphics.drawable.Icon photoImage;
+ field public static final android.graphics.drawable.Icon PLACEHOLDER;
+ field public static final androidx.wear.watchface.complications.data.ComplicationType TYPE;
+ }
+
+ public static final class PhotoImageComplicationData.Builder {
+ ctor public PhotoImageComplicationData.Builder(android.graphics.drawable.Icon photoImage, androidx.wear.watchface.complications.data.ComplicationText contentDescription);
+ method public androidx.wear.watchface.complications.data.PhotoImageComplicationData build();
+ method public androidx.wear.watchface.complications.data.PhotoImageComplicationData.Builder setDataSource(android.content.ComponentName? dataSource);
+ method public androidx.wear.watchface.complications.data.PhotoImageComplicationData.Builder setTapAction(android.app.PendingIntent? tapAction);
+ method public androidx.wear.watchface.complications.data.PhotoImageComplicationData.Builder setValidTimeRange(androidx.wear.watchface.complications.data.TimeRange? validTimeRange);
+ }
+
+ public final class PlainComplicationText implements androidx.wear.watchface.complications.data.ComplicationText {
+ method public java.time.Instant getNextChangeTime(java.time.Instant afterInstant);
+ method public CharSequence getTextAt(android.content.res.Resources resources, java.time.Instant instant);
+ method @RestrictTo(androidx.annotation.RestrictTo.Scope.SUBCLASSES) public android.support.wearable.complications.TimeDependentText getTimeDependentText();
+ method public boolean isAlwaysEmpty();
+ method public boolean returnsSameText(java.time.Instant firstInstant, java.time.Instant secondInstant);
+ }
+
+ public static final class PlainComplicationText.Builder {
+ ctor public PlainComplicationText.Builder(CharSequence text);
+ method public androidx.wear.watchface.complications.data.PlainComplicationText build();
+ }
+
+ public final class RangedValueComplicationData extends androidx.wear.watchface.complications.data.ComplicationData {
+ method public androidx.wear.watchface.complications.data.ComplicationText? getContentDescription();
+ method public float getMax();
+ method public float getMin();
+ method public androidx.wear.watchface.complications.data.MonochromaticImage? getMonochromaticImage();
+ method public androidx.wear.watchface.complications.data.ComplicationText? getText();
+ method public androidx.wear.watchface.complications.data.ComplicationText? getTitle();
+ method public float getValue();
+ property public final androidx.wear.watchface.complications.data.ComplicationText? contentDescription;
+ property public final float max;
+ property public final float min;
+ property public final androidx.wear.watchface.complications.data.MonochromaticImage? monochromaticImage;
+ property public final androidx.wear.watchface.complications.data.ComplicationText? text;
+ property public final androidx.wear.watchface.complications.data.ComplicationText? title;
+ property public final float value;
+ field public static final float PLACEHOLDER;
+ field public static final androidx.wear.watchface.complications.data.ComplicationType TYPE;
+ }
+
+ public static final class RangedValueComplicationData.Builder {
+ ctor public RangedValueComplicationData.Builder(float value, float min, float max, androidx.wear.watchface.complications.data.ComplicationText contentDescription);
+ method public androidx.wear.watchface.complications.data.RangedValueComplicationData build();
+ method public androidx.wear.watchface.complications.data.RangedValueComplicationData.Builder setDataSource(android.content.ComponentName? dataSource);
+ method public androidx.wear.watchface.complications.data.RangedValueComplicationData.Builder setMonochromaticImage(androidx.wear.watchface.complications.data.MonochromaticImage? monochromaticImage);
+ method public androidx.wear.watchface.complications.data.RangedValueComplicationData.Builder setTapAction(android.app.PendingIntent? tapAction);
+ method public androidx.wear.watchface.complications.data.RangedValueComplicationData.Builder setText(androidx.wear.watchface.complications.data.ComplicationText? text);
+ method public androidx.wear.watchface.complications.data.RangedValueComplicationData.Builder setTitle(androidx.wear.watchface.complications.data.ComplicationText? title);
+ method public androidx.wear.watchface.complications.data.RangedValueComplicationData.Builder setValidTimeRange(androidx.wear.watchface.complications.data.TimeRange? validTimeRange);
+ }
+
+ public final class ShortTextComplicationData extends androidx.wear.watchface.complications.data.ComplicationData {
+ method public androidx.wear.watchface.complications.data.ComplicationText? getContentDescription();
+ method public androidx.wear.watchface.complications.data.MonochromaticImage? getMonochromaticImage();
+ method public androidx.wear.watchface.complications.data.ComplicationText getText();
+ method public androidx.wear.watchface.complications.data.ComplicationText? getTitle();
+ property public final androidx.wear.watchface.complications.data.ComplicationText? contentDescription;
+ property public final androidx.wear.watchface.complications.data.MonochromaticImage? monochromaticImage;
+ property public final androidx.wear.watchface.complications.data.ComplicationText text;
+ property public final androidx.wear.watchface.complications.data.ComplicationText? title;
+ field public static final int MAX_TEXT_LENGTH;
+ field public static final androidx.wear.watchface.complications.data.ComplicationType TYPE;
+ }
+
+ public static final class ShortTextComplicationData.Builder {
+ ctor public ShortTextComplicationData.Builder(androidx.wear.watchface.complications.data.ComplicationText text, androidx.wear.watchface.complications.data.ComplicationText contentDescription);
+ method public androidx.wear.watchface.complications.data.ShortTextComplicationData build();
+ method public androidx.wear.watchface.complications.data.ShortTextComplicationData.Builder setDataSource(android.content.ComponentName? dataSource);
+ method public androidx.wear.watchface.complications.data.ShortTextComplicationData.Builder setMonochromaticImage(androidx.wear.watchface.complications.data.MonochromaticImage? monochromaticImage);
+ method public androidx.wear.watchface.complications.data.ShortTextComplicationData.Builder setTapAction(android.app.PendingIntent? tapAction);
+ method public androidx.wear.watchface.complications.data.ShortTextComplicationData.Builder setTitle(androidx.wear.watchface.complications.data.ComplicationText? title);
+ method public androidx.wear.watchface.complications.data.ShortTextComplicationData.Builder setValidTimeRange(androidx.wear.watchface.complications.data.TimeRange? validTimeRange);
+ }
+
+ public final class SmallImage {
+ method public android.graphics.drawable.Icon? getAmbientImage();
+ method public android.graphics.drawable.Icon getImage();
+ method public androidx.wear.watchface.complications.data.SmallImageType getType();
+ property public final android.graphics.drawable.Icon? ambientImage;
+ property public final android.graphics.drawable.Icon image;
+ property public final androidx.wear.watchface.complications.data.SmallImageType type;
+ field public static final androidx.wear.watchface.complications.data.SmallImage PLACEHOLDER;
+ }
+
+ public static final class SmallImage.Builder {
+ ctor public SmallImage.Builder(android.graphics.drawable.Icon image, androidx.wear.watchface.complications.data.SmallImageType type);
+ method public androidx.wear.watchface.complications.data.SmallImage build();
+ method public androidx.wear.watchface.complications.data.SmallImage.Builder setAmbientImage(android.graphics.drawable.Icon? ambientImage);
+ }
+
+ public final class SmallImageComplicationData extends androidx.wear.watchface.complications.data.ComplicationData {
+ method public androidx.wear.watchface.complications.data.ComplicationText? getContentDescription();
+ method public androidx.wear.watchface.complications.data.SmallImage getSmallImage();
+ property public final androidx.wear.watchface.complications.data.ComplicationText? contentDescription;
+ property public final androidx.wear.watchface.complications.data.SmallImage smallImage;
+ field public static final androidx.wear.watchface.complications.data.ComplicationType TYPE;
+ }
+
+ public static final class SmallImageComplicationData.Builder {
+ ctor public SmallImageComplicationData.Builder(androidx.wear.watchface.complications.data.SmallImage smallImage, androidx.wear.watchface.complications.data.ComplicationText contentDescription);
+ method public androidx.wear.watchface.complications.data.SmallImageComplicationData build();
+ method public androidx.wear.watchface.complications.data.SmallImageComplicationData.Builder setDataSource(android.content.ComponentName? dataSource);
+ method public androidx.wear.watchface.complications.data.SmallImageComplicationData.Builder setTapAction(android.app.PendingIntent? tapAction);
+ method public androidx.wear.watchface.complications.data.SmallImageComplicationData.Builder setValidTimeRange(androidx.wear.watchface.complications.data.TimeRange? validTimeRange);
+ }
+
+ public enum SmallImageType {
+ enum_constant public static final androidx.wear.watchface.complications.data.SmallImageType ICON;
+ enum_constant public static final androidx.wear.watchface.complications.data.SmallImageType PHOTO;
+ }
+
+ public final class TextKt {
+ }
+
+ public final class TimeDifferenceComplicationText implements androidx.wear.watchface.complications.data.ComplicationText {
+ method public java.util.concurrent.TimeUnit? getMinimumTimeUnit();
+ method public java.time.Instant getNextChangeTime(java.time.Instant afterInstant);
+ method public CharSequence getTextAt(android.content.res.Resources resources, java.time.Instant instant);
+ method @RestrictTo(androidx.annotation.RestrictTo.Scope.SUBCLASSES) public android.support.wearable.complications.TimeDependentText getTimeDependentText();
+ method public boolean isAlwaysEmpty();
+ method public boolean returnsSameText(java.time.Instant firstInstant, java.time.Instant secondInstant);
+ }
+
+ public static final class TimeDifferenceComplicationText.Builder {
+ ctor public TimeDifferenceComplicationText.Builder(androidx.wear.watchface.complications.data.TimeDifferenceStyle style, androidx.wear.watchface.complications.data.CountUpTimeReference countUpTimeReference);
+ ctor public TimeDifferenceComplicationText.Builder(androidx.wear.watchface.complications.data.TimeDifferenceStyle style, androidx.wear.watchface.complications.data.CountDownTimeReference countDownTimeReference);
+ method public androidx.wear.watchface.complications.data.TimeDifferenceComplicationText build();
+ method public androidx.wear.watchface.complications.data.TimeDifferenceComplicationText.Builder setDisplayAsNow(boolean displayAsNow);
+ method public androidx.wear.watchface.complications.data.TimeDifferenceComplicationText.Builder setMinimumTimeUnit(java.util.concurrent.TimeUnit? minimumUnit);
+ method public androidx.wear.watchface.complications.data.TimeDifferenceComplicationText.Builder setText(CharSequence? text);
+ }
+
+ public enum TimeDifferenceStyle {
+ enum_constant public static final androidx.wear.watchface.complications.data.TimeDifferenceStyle SHORT_DUAL_UNIT;
+ enum_constant public static final androidx.wear.watchface.complications.data.TimeDifferenceStyle SHORT_SINGLE_UNIT;
+ enum_constant public static final androidx.wear.watchface.complications.data.TimeDifferenceStyle SHORT_WORDS_SINGLE_UNIT;
+ enum_constant public static final androidx.wear.watchface.complications.data.TimeDifferenceStyle STOPWATCH;
+ enum_constant public static final androidx.wear.watchface.complications.data.TimeDifferenceStyle WORDS_SINGLE_UNIT;
+ }
+
+ public final class TimeFormatComplicationText implements androidx.wear.watchface.complications.data.ComplicationText {
+ method public java.time.Instant getNextChangeTime(java.time.Instant afterInstant);
+ method public CharSequence getTextAt(android.content.res.Resources resources, java.time.Instant instant);
+ method @RestrictTo(androidx.annotation.RestrictTo.Scope.SUBCLASSES) public android.support.wearable.complications.TimeDependentText getTimeDependentText();
+ method public boolean isAlwaysEmpty();
+ method public boolean returnsSameText(java.time.Instant firstInstant, java.time.Instant secondInstant);
+ }
+
+ public static final class TimeFormatComplicationText.Builder {
+ ctor public TimeFormatComplicationText.Builder(String format);
+ method public androidx.wear.watchface.complications.data.TimeFormatComplicationText build();
+ method public androidx.wear.watchface.complications.data.TimeFormatComplicationText.Builder setStyle(androidx.wear.watchface.complications.data.TimeFormatStyle style);
+ method public androidx.wear.watchface.complications.data.TimeFormatComplicationText.Builder setText(CharSequence text);
+ method public androidx.wear.watchface.complications.data.TimeFormatComplicationText.Builder setTimeZone(android.icu.util.TimeZone timeZone);
+ }
+
+ public enum TimeFormatStyle {
+ enum_constant public static final androidx.wear.watchface.complications.data.TimeFormatStyle DEFAULT;
+ enum_constant public static final androidx.wear.watchface.complications.data.TimeFormatStyle LOWER_CASE;
+ enum_constant public static final androidx.wear.watchface.complications.data.TimeFormatStyle UPPER_CASE;
+ }
+
+ public final class TimeRange {
+ method public static androidx.wear.watchface.complications.data.TimeRange after(java.time.Instant startInstant);
+ method public static androidx.wear.watchface.complications.data.TimeRange before(java.time.Instant endInstant);
+ method public static androidx.wear.watchface.complications.data.TimeRange between(java.time.Instant startInstant, java.time.Instant endInstant);
+ method public operator boolean contains(java.time.Instant dateTimeMillis);
+ method public java.time.Instant getEndDateTimeMillis();
+ method public java.time.Instant getStartDateTimeMillis();
+ property public final java.time.Instant endDateTimeMillis;
+ property public final java.time.Instant startDateTimeMillis;
+ field public static final androidx.wear.watchface.complications.data.TimeRange ALWAYS;
+ field public static final androidx.wear.watchface.complications.data.TimeRange.Companion Companion;
+ }
+
+ public static final class TimeRange.Companion {
+ method public androidx.wear.watchface.complications.data.TimeRange after(java.time.Instant startInstant);
+ method public androidx.wear.watchface.complications.data.TimeRange before(java.time.Instant endInstant);
+ method public androidx.wear.watchface.complications.data.TimeRange between(java.time.Instant startInstant, java.time.Instant endInstant);
+ }
+
+ public final class TypeKt {
+ }
+
+}
+
+package androidx.wear.watchface.utility {
+
+ public final class TraceEventKt {
+ }
+
+}
+
diff --git a/wear/watchface/watchface-complications-rendering/api/1.1.0-beta03.txt b/wear/watchface/watchface-complications-rendering/api/1.1.0-beta03.txt
new file mode 100644
index 0000000..97f9d47
--- /dev/null
+++ b/wear/watchface/watchface-complications-rendering/api/1.1.0-beta03.txt
@@ -0,0 +1,153 @@
+// Signature format: 4.0
+package androidx.wear.watchface.complications.rendering {
+
+ public class CanvasComplicationDrawable implements androidx.wear.watchface.CanvasComplication {
+ ctor public CanvasComplicationDrawable(androidx.wear.watchface.complications.rendering.ComplicationDrawable drawable, androidx.wear.watchface.WatchState watchState, androidx.wear.watchface.CanvasComplication.InvalidateCallback invalidateCallback);
+ method public void drawHighlight(android.graphics.Canvas canvas, android.graphics.Rect bounds, int boundsType, java.time.ZonedDateTime zonedDateTime, @ColorInt int color);
+ method public androidx.wear.watchface.complications.data.ComplicationData getData();
+ method public final androidx.wear.watchface.complications.rendering.ComplicationDrawable getDrawable();
+ method @CallSuper public void loadData(androidx.wear.watchface.complications.data.ComplicationData complicationData, boolean loadDrawablesAsynchronous);
+ method public void render(android.graphics.Canvas canvas, android.graphics.Rect bounds, java.time.ZonedDateTime zonedDateTime, androidx.wear.watchface.RenderParameters renderParameters, int slotId);
+ method public final void setDrawable(androidx.wear.watchface.complications.rendering.ComplicationDrawable);
+ property public final androidx.wear.watchface.complications.rendering.ComplicationDrawable drawable;
+ }
+
+ public final class ComplicationDrawable extends android.graphics.drawable.Drawable {
+ ctor public ComplicationDrawable();
+ ctor public ComplicationDrawable(android.content.Context context);
+ ctor public ComplicationDrawable(androidx.wear.watchface.complications.rendering.ComplicationDrawable drawable);
+ method public void draw(android.graphics.Canvas canvas);
+ method public androidx.wear.watchface.complications.rendering.ComplicationStyle getActiveStyle();
+ method public androidx.wear.watchface.complications.rendering.ComplicationStyle getAmbientStyle();
+ method public androidx.wear.watchface.complications.data.ComplicationData getComplicationData();
+ method public android.content.Context? getContext();
+ method public java.time.Instant getCurrentTime();
+ method public static androidx.wear.watchface.complications.rendering.ComplicationDrawable? getDrawable(android.content.Context context, int id);
+ method public long getHighlightDuration();
+ method public CharSequence? getNoDataText();
+ method @Deprecated public int getOpacity();
+ method public boolean isBurnInProtectionOn();
+ method public boolean isHighlighted();
+ method public boolean isInAmbientMode();
+ method public boolean isLowBitAmbient();
+ method public boolean isRangedValueProgressHidden();
+ method public boolean onTap(@Px int x, @Px int y);
+ method public void setAlpha(@IntRange(from=0L, to=255L) int alpha);
+ method public void setBurnInProtectionOn(boolean);
+ method public void setColorFilter(android.graphics.ColorFilter? colorFilter);
+ method public void setComplicationData(androidx.wear.watchface.complications.data.ComplicationData complicationData, boolean loadDrawablesAsync);
+ method public void setContext(android.content.Context context);
+ method public void setCurrentTime(java.time.Instant);
+ method public void setHighlightDuration(@IntRange(from=0L) long);
+ method public void setHighlighted(boolean);
+ method public void setInAmbientMode(boolean);
+ method public void setLowBitAmbient(boolean);
+ method public void setNoDataText(CharSequence?);
+ method public void setRangedValueProgressHidden(boolean);
+ property public final androidx.wear.watchface.complications.rendering.ComplicationStyle activeStyle;
+ property public final androidx.wear.watchface.complications.rendering.ComplicationStyle ambientStyle;
+ property public final androidx.wear.watchface.complications.data.ComplicationData complicationData;
+ property public final android.content.Context? context;
+ property public final java.time.Instant currentTime;
+ property public final long highlightDuration;
+ property public final boolean isBurnInProtectionOn;
+ property public final boolean isHighlighted;
+ property public final boolean isInAmbientMode;
+ property public final boolean isLowBitAmbient;
+ property public final boolean isRangedValueProgressHidden;
+ property public final CharSequence? noDataText;
+ field public static final androidx.wear.watchface.complications.rendering.ComplicationDrawable.Companion Companion;
+ }
+
+ public static final class ComplicationDrawable.Companion {
+ method public androidx.wear.watchface.complications.rendering.ComplicationDrawable? getDrawable(android.content.Context context, int id);
+ }
+
+ public final class ComplicationHighlightRenderer {
+ ctor public ComplicationHighlightRenderer(@Px float outlineExpansion, @Px float outlineStrokeWidth);
+ method public void drawComplicationHighlight(android.graphics.Canvas canvas, android.graphics.Rect bounds, @ColorInt int color);
+ }
+
+ public final class ComplicationStyle {
+ ctor public ComplicationStyle();
+ ctor public ComplicationStyle(androidx.wear.watchface.complications.rendering.ComplicationStyle style);
+ method @ColorInt public int getBackgroundColor();
+ method public android.graphics.drawable.Drawable? getBackgroundDrawable();
+ method @ColorInt public int getBorderColor();
+ method @Px public int getBorderDashGap();
+ method @Px public int getBorderDashWidth();
+ method @Px public int getBorderRadius();
+ method public int getBorderStyle();
+ method @Px public int getBorderWidth();
+ method @ColorInt public int getHighlightColor();
+ method @ColorInt public int getIconColor();
+ method public android.graphics.ColorFilter? getImageColorFilter();
+ method @ColorInt public int getRangedValuePrimaryColor();
+ method @Px public int getRangedValueRingWidth();
+ method @ColorInt public int getRangedValueSecondaryColor();
+ method @ColorInt public int getTextColor();
+ method @Px public int getTextSize();
+ method public android.graphics.Typeface getTextTypeface();
+ method @ColorInt public int getTitleColor();
+ method @Px public int getTitleSize();
+ method public android.graphics.Typeface getTitleTypeface();
+ method public void setBackgroundColor(@ColorInt int);
+ method public void setBackgroundDrawable(android.graphics.drawable.Drawable?);
+ method public void setBorderColor(@ColorInt int);
+ method public void setBorderDashGap(@Px int);
+ method public void setBorderDashWidth(@Px int);
+ method public void setBorderRadius(@Px int);
+ method public void setBorderStyle(int);
+ method public void setBorderWidth(@Px int);
+ method public void setHighlightColor(@ColorInt int);
+ method public void setIconColor(@ColorInt int);
+ method public void setImageColorFilter(android.graphics.ColorFilter?);
+ method public void setRangedValuePrimaryColor(@ColorInt int);
+ method public void setRangedValueRingWidth(@Px int);
+ method public void setRangedValueSecondaryColor(@ColorInt int);
+ method public void setTextColor(@ColorInt int);
+ method public void setTextSize(@Px int);
+ method public void setTextTypeface(android.graphics.Typeface textTypeface);
+ method public void setTitleColor(@ColorInt int);
+ method public void setTitleSize(@Px int);
+ method public void setTitleTypeface(android.graphics.Typeface titleTypeface);
+ property @ColorInt public final int backgroundColor;
+ property public final android.graphics.drawable.Drawable? backgroundDrawable;
+ property @ColorInt public final int borderColor;
+ property @Px public final int borderDashGap;
+ property @Px public final int borderDashWidth;
+ property @Px public final int borderRadius;
+ property public final int borderStyle;
+ property @Px public final int borderWidth;
+ property @ColorInt public final int highlightColor;
+ property @ColorInt public final int iconColor;
+ property public final android.graphics.ColorFilter? imageColorFilter;
+ property @ColorInt public final int rangedValuePrimaryColor;
+ property @Px public final int rangedValueRingWidth;
+ property @ColorInt public final int rangedValueSecondaryColor;
+ property @ColorInt public final int textColor;
+ property @Px public final int textSize;
+ property public final android.graphics.Typeface textTypeface;
+ property @ColorInt public final int titleColor;
+ property @Px public final int titleSize;
+ property public final android.graphics.Typeface titleTypeface;
+ field @Px public static final int BORDER_RADIUS_DEFAULT = 2147483647; // 0x7fffffff
+ field public static final int BORDER_STYLE_DASHED = 2; // 0x2
+ field public static final int BORDER_STYLE_NONE = 0; // 0x0
+ field public static final int BORDER_STYLE_SOLID = 1; // 0x1
+ field public static final androidx.wear.watchface.complications.rendering.ComplicationStyle.Companion Companion;
+ }
+
+ public static final class ComplicationStyle.Companion {
+ }
+
+ public final class GlesTextureComplication {
+ ctor public GlesTextureComplication(androidx.wear.watchface.ComplicationSlot complicationSlot, @Px int textureWidth, @Px int textureHeight, int textureType);
+ method public void bind();
+ method public androidx.wear.watchface.ComplicationSlot getComplicationSlot();
+ method public void renderToTexture(java.time.ZonedDateTime zonedDateTime, androidx.wear.watchface.RenderParameters renderParameters);
+ property public final androidx.wear.watchface.ComplicationSlot complicationSlot;
+ }
+
+}
+
diff --git a/wear/watchface/watchface-complications-rendering/api/public_plus_experimental_1.1.0-beta03.txt b/wear/watchface/watchface-complications-rendering/api/public_plus_experimental_1.1.0-beta03.txt
new file mode 100644
index 0000000..97f9d47
--- /dev/null
+++ b/wear/watchface/watchface-complications-rendering/api/public_plus_experimental_1.1.0-beta03.txt
@@ -0,0 +1,153 @@
+// Signature format: 4.0
+package androidx.wear.watchface.complications.rendering {
+
+ public class CanvasComplicationDrawable implements androidx.wear.watchface.CanvasComplication {
+ ctor public CanvasComplicationDrawable(androidx.wear.watchface.complications.rendering.ComplicationDrawable drawable, androidx.wear.watchface.WatchState watchState, androidx.wear.watchface.CanvasComplication.InvalidateCallback invalidateCallback);
+ method public void drawHighlight(android.graphics.Canvas canvas, android.graphics.Rect bounds, int boundsType, java.time.ZonedDateTime zonedDateTime, @ColorInt int color);
+ method public androidx.wear.watchface.complications.data.ComplicationData getData();
+ method public final androidx.wear.watchface.complications.rendering.ComplicationDrawable getDrawable();
+ method @CallSuper public void loadData(androidx.wear.watchface.complications.data.ComplicationData complicationData, boolean loadDrawablesAsynchronous);
+ method public void render(android.graphics.Canvas canvas, android.graphics.Rect bounds, java.time.ZonedDateTime zonedDateTime, androidx.wear.watchface.RenderParameters renderParameters, int slotId);
+ method public final void setDrawable(androidx.wear.watchface.complications.rendering.ComplicationDrawable);
+ property public final androidx.wear.watchface.complications.rendering.ComplicationDrawable drawable;
+ }
+
+ public final class ComplicationDrawable extends android.graphics.drawable.Drawable {
+ ctor public ComplicationDrawable();
+ ctor public ComplicationDrawable(android.content.Context context);
+ ctor public ComplicationDrawable(androidx.wear.watchface.complications.rendering.ComplicationDrawable drawable);
+ method public void draw(android.graphics.Canvas canvas);
+ method public androidx.wear.watchface.complications.rendering.ComplicationStyle getActiveStyle();
+ method public androidx.wear.watchface.complications.rendering.ComplicationStyle getAmbientStyle();
+ method public androidx.wear.watchface.complications.data.ComplicationData getComplicationData();
+ method public android.content.Context? getContext();
+ method public java.time.Instant getCurrentTime();
+ method public static androidx.wear.watchface.complications.rendering.ComplicationDrawable? getDrawable(android.content.Context context, int id);
+ method public long getHighlightDuration();
+ method public CharSequence? getNoDataText();
+ method @Deprecated public int getOpacity();
+ method public boolean isBurnInProtectionOn();
+ method public boolean isHighlighted();
+ method public boolean isInAmbientMode();
+ method public boolean isLowBitAmbient();
+ method public boolean isRangedValueProgressHidden();
+ method public boolean onTap(@Px int x, @Px int y);
+ method public void setAlpha(@IntRange(from=0L, to=255L) int alpha);
+ method public void setBurnInProtectionOn(boolean);
+ method public void setColorFilter(android.graphics.ColorFilter? colorFilter);
+ method public void setComplicationData(androidx.wear.watchface.complications.data.ComplicationData complicationData, boolean loadDrawablesAsync);
+ method public void setContext(android.content.Context context);
+ method public void setCurrentTime(java.time.Instant);
+ method public void setHighlightDuration(@IntRange(from=0L) long);
+ method public void setHighlighted(boolean);
+ method public void setInAmbientMode(boolean);
+ method public void setLowBitAmbient(boolean);
+ method public void setNoDataText(CharSequence?);
+ method public void setRangedValueProgressHidden(boolean);
+ property public final androidx.wear.watchface.complications.rendering.ComplicationStyle activeStyle;
+ property public final androidx.wear.watchface.complications.rendering.ComplicationStyle ambientStyle;
+ property public final androidx.wear.watchface.complications.data.ComplicationData complicationData;
+ property public final android.content.Context? context;
+ property public final java.time.Instant currentTime;
+ property public final long highlightDuration;
+ property public final boolean isBurnInProtectionOn;
+ property public final boolean isHighlighted;
+ property public final boolean isInAmbientMode;
+ property public final boolean isLowBitAmbient;
+ property public final boolean isRangedValueProgressHidden;
+ property public final CharSequence? noDataText;
+ field public static final androidx.wear.watchface.complications.rendering.ComplicationDrawable.Companion Companion;
+ }
+
+ public static final class ComplicationDrawable.Companion {
+ method public androidx.wear.watchface.complications.rendering.ComplicationDrawable? getDrawable(android.content.Context context, int id);
+ }
+
+ public final class ComplicationHighlightRenderer {
+ ctor public ComplicationHighlightRenderer(@Px float outlineExpansion, @Px float outlineStrokeWidth);
+ method public void drawComplicationHighlight(android.graphics.Canvas canvas, android.graphics.Rect bounds, @ColorInt int color);
+ }
+
+ public final class ComplicationStyle {
+ ctor public ComplicationStyle();
+ ctor public ComplicationStyle(androidx.wear.watchface.complications.rendering.ComplicationStyle style);
+ method @ColorInt public int getBackgroundColor();
+ method public android.graphics.drawable.Drawable? getBackgroundDrawable();
+ method @ColorInt public int getBorderColor();
+ method @Px public int getBorderDashGap();
+ method @Px public int getBorderDashWidth();
+ method @Px public int getBorderRadius();
+ method public int getBorderStyle();
+ method @Px public int getBorderWidth();
+ method @ColorInt public int getHighlightColor();
+ method @ColorInt public int getIconColor();
+ method public android.graphics.ColorFilter? getImageColorFilter();
+ method @ColorInt public int getRangedValuePrimaryColor();
+ method @Px public int getRangedValueRingWidth();
+ method @ColorInt public int getRangedValueSecondaryColor();
+ method @ColorInt public int getTextColor();
+ method @Px public int getTextSize();
+ method public android.graphics.Typeface getTextTypeface();
+ method @ColorInt public int getTitleColor();
+ method @Px public int getTitleSize();
+ method public android.graphics.Typeface getTitleTypeface();
+ method public void setBackgroundColor(@ColorInt int);
+ method public void setBackgroundDrawable(android.graphics.drawable.Drawable?);
+ method public void setBorderColor(@ColorInt int);
+ method public void setBorderDashGap(@Px int);
+ method public void setBorderDashWidth(@Px int);
+ method public void setBorderRadius(@Px int);
+ method public void setBorderStyle(int);
+ method public void setBorderWidth(@Px int);
+ method public void setHighlightColor(@ColorInt int);
+ method public void setIconColor(@ColorInt int);
+ method public void setImageColorFilter(android.graphics.ColorFilter?);
+ method public void setRangedValuePrimaryColor(@ColorInt int);
+ method public void setRangedValueRingWidth(@Px int);
+ method public void setRangedValueSecondaryColor(@ColorInt int);
+ method public void setTextColor(@ColorInt int);
+ method public void setTextSize(@Px int);
+ method public void setTextTypeface(android.graphics.Typeface textTypeface);
+ method public void setTitleColor(@ColorInt int);
+ method public void setTitleSize(@Px int);
+ method public void setTitleTypeface(android.graphics.Typeface titleTypeface);
+ property @ColorInt public final int backgroundColor;
+ property public final android.graphics.drawable.Drawable? backgroundDrawable;
+ property @ColorInt public final int borderColor;
+ property @Px public final int borderDashGap;
+ property @Px public final int borderDashWidth;
+ property @Px public final int borderRadius;
+ property public final int borderStyle;
+ property @Px public final int borderWidth;
+ property @ColorInt public final int highlightColor;
+ property @ColorInt public final int iconColor;
+ property public final android.graphics.ColorFilter? imageColorFilter;
+ property @ColorInt public final int rangedValuePrimaryColor;
+ property @Px public final int rangedValueRingWidth;
+ property @ColorInt public final int rangedValueSecondaryColor;
+ property @ColorInt public final int textColor;
+ property @Px public final int textSize;
+ property public final android.graphics.Typeface textTypeface;
+ property @ColorInt public final int titleColor;
+ property @Px public final int titleSize;
+ property public final android.graphics.Typeface titleTypeface;
+ field @Px public static final int BORDER_RADIUS_DEFAULT = 2147483647; // 0x7fffffff
+ field public static final int BORDER_STYLE_DASHED = 2; // 0x2
+ field public static final int BORDER_STYLE_NONE = 0; // 0x0
+ field public static final int BORDER_STYLE_SOLID = 1; // 0x1
+ field public static final androidx.wear.watchface.complications.rendering.ComplicationStyle.Companion Companion;
+ }
+
+ public static final class ComplicationStyle.Companion {
+ }
+
+ public final class GlesTextureComplication {
+ ctor public GlesTextureComplication(androidx.wear.watchface.ComplicationSlot complicationSlot, @Px int textureWidth, @Px int textureHeight, int textureType);
+ method public void bind();
+ method public androidx.wear.watchface.ComplicationSlot getComplicationSlot();
+ method public void renderToTexture(java.time.ZonedDateTime zonedDateTime, androidx.wear.watchface.RenderParameters renderParameters);
+ property public final androidx.wear.watchface.ComplicationSlot complicationSlot;
+ }
+
+}
+
diff --git a/wear/watchface/watchface-complications-rendering/api/res-1.1.0-beta03.txt b/wear/watchface/watchface-complications-rendering/api/res-1.1.0-beta03.txt
new file mode 100644
index 0000000..e69de29
--- /dev/null
+++ b/wear/watchface/watchface-complications-rendering/api/res-1.1.0-beta03.txt
diff --git a/wear/watchface/watchface-complications-rendering/api/restricted_1.1.0-beta03.txt b/wear/watchface/watchface-complications-rendering/api/restricted_1.1.0-beta03.txt
new file mode 100644
index 0000000..97f9d47
--- /dev/null
+++ b/wear/watchface/watchface-complications-rendering/api/restricted_1.1.0-beta03.txt
@@ -0,0 +1,153 @@
+// Signature format: 4.0
+package androidx.wear.watchface.complications.rendering {
+
+ public class CanvasComplicationDrawable implements androidx.wear.watchface.CanvasComplication {
+ ctor public CanvasComplicationDrawable(androidx.wear.watchface.complications.rendering.ComplicationDrawable drawable, androidx.wear.watchface.WatchState watchState, androidx.wear.watchface.CanvasComplication.InvalidateCallback invalidateCallback);
+ method public void drawHighlight(android.graphics.Canvas canvas, android.graphics.Rect bounds, int boundsType, java.time.ZonedDateTime zonedDateTime, @ColorInt int color);
+ method public androidx.wear.watchface.complications.data.ComplicationData getData();
+ method public final androidx.wear.watchface.complications.rendering.ComplicationDrawable getDrawable();
+ method @CallSuper public void loadData(androidx.wear.watchface.complications.data.ComplicationData complicationData, boolean loadDrawablesAsynchronous);
+ method public void render(android.graphics.Canvas canvas, android.graphics.Rect bounds, java.time.ZonedDateTime zonedDateTime, androidx.wear.watchface.RenderParameters renderParameters, int slotId);
+ method public final void setDrawable(androidx.wear.watchface.complications.rendering.ComplicationDrawable);
+ property public final androidx.wear.watchface.complications.rendering.ComplicationDrawable drawable;
+ }
+
+ public final class ComplicationDrawable extends android.graphics.drawable.Drawable {
+ ctor public ComplicationDrawable();
+ ctor public ComplicationDrawable(android.content.Context context);
+ ctor public ComplicationDrawable(androidx.wear.watchface.complications.rendering.ComplicationDrawable drawable);
+ method public void draw(android.graphics.Canvas canvas);
+ method public androidx.wear.watchface.complications.rendering.ComplicationStyle getActiveStyle();
+ method public androidx.wear.watchface.complications.rendering.ComplicationStyle getAmbientStyle();
+ method public androidx.wear.watchface.complications.data.ComplicationData getComplicationData();
+ method public android.content.Context? getContext();
+ method public java.time.Instant getCurrentTime();
+ method public static androidx.wear.watchface.complications.rendering.ComplicationDrawable? getDrawable(android.content.Context context, int id);
+ method public long getHighlightDuration();
+ method public CharSequence? getNoDataText();
+ method @Deprecated public int getOpacity();
+ method public boolean isBurnInProtectionOn();
+ method public boolean isHighlighted();
+ method public boolean isInAmbientMode();
+ method public boolean isLowBitAmbient();
+ method public boolean isRangedValueProgressHidden();
+ method public boolean onTap(@Px int x, @Px int y);
+ method public void setAlpha(@IntRange(from=0L, to=255L) int alpha);
+ method public void setBurnInProtectionOn(boolean);
+ method public void setColorFilter(android.graphics.ColorFilter? colorFilter);
+ method public void setComplicationData(androidx.wear.watchface.complications.data.ComplicationData complicationData, boolean loadDrawablesAsync);
+ method public void setContext(android.content.Context context);
+ method public void setCurrentTime(java.time.Instant);
+ method public void setHighlightDuration(@IntRange(from=0L) long);
+ method public void setHighlighted(boolean);
+ method public void setInAmbientMode(boolean);
+ method public void setLowBitAmbient(boolean);
+ method public void setNoDataText(CharSequence?);
+ method public void setRangedValueProgressHidden(boolean);
+ property public final androidx.wear.watchface.complications.rendering.ComplicationStyle activeStyle;
+ property public final androidx.wear.watchface.complications.rendering.ComplicationStyle ambientStyle;
+ property public final androidx.wear.watchface.complications.data.ComplicationData complicationData;
+ property public final android.content.Context? context;
+ property public final java.time.Instant currentTime;
+ property public final long highlightDuration;
+ property public final boolean isBurnInProtectionOn;
+ property public final boolean isHighlighted;
+ property public final boolean isInAmbientMode;
+ property public final boolean isLowBitAmbient;
+ property public final boolean isRangedValueProgressHidden;
+ property public final CharSequence? noDataText;
+ field public static final androidx.wear.watchface.complications.rendering.ComplicationDrawable.Companion Companion;
+ }
+
+ public static final class ComplicationDrawable.Companion {
+ method public androidx.wear.watchface.complications.rendering.ComplicationDrawable? getDrawable(android.content.Context context, int id);
+ }
+
+ public final class ComplicationHighlightRenderer {
+ ctor public ComplicationHighlightRenderer(@Px float outlineExpansion, @Px float outlineStrokeWidth);
+ method public void drawComplicationHighlight(android.graphics.Canvas canvas, android.graphics.Rect bounds, @ColorInt int color);
+ }
+
+ public final class ComplicationStyle {
+ ctor public ComplicationStyle();
+ ctor public ComplicationStyle(androidx.wear.watchface.complications.rendering.ComplicationStyle style);
+ method @ColorInt public int getBackgroundColor();
+ method public android.graphics.drawable.Drawable? getBackgroundDrawable();
+ method @ColorInt public int getBorderColor();
+ method @Px public int getBorderDashGap();
+ method @Px public int getBorderDashWidth();
+ method @Px public int getBorderRadius();
+ method public int getBorderStyle();
+ method @Px public int getBorderWidth();
+ method @ColorInt public int getHighlightColor();
+ method @ColorInt public int getIconColor();
+ method public android.graphics.ColorFilter? getImageColorFilter();
+ method @ColorInt public int getRangedValuePrimaryColor();
+ method @Px public int getRangedValueRingWidth();
+ method @ColorInt public int getRangedValueSecondaryColor();
+ method @ColorInt public int getTextColor();
+ method @Px public int getTextSize();
+ method public android.graphics.Typeface getTextTypeface();
+ method @ColorInt public int getTitleColor();
+ method @Px public int getTitleSize();
+ method public android.graphics.Typeface getTitleTypeface();
+ method public void setBackgroundColor(@ColorInt int);
+ method public void setBackgroundDrawable(android.graphics.drawable.Drawable?);
+ method public void setBorderColor(@ColorInt int);
+ method public void setBorderDashGap(@Px int);
+ method public void setBorderDashWidth(@Px int);
+ method public void setBorderRadius(@Px int);
+ method public void setBorderStyle(int);
+ method public void setBorderWidth(@Px int);
+ method public void setHighlightColor(@ColorInt int);
+ method public void setIconColor(@ColorInt int);
+ method public void setImageColorFilter(android.graphics.ColorFilter?);
+ method public void setRangedValuePrimaryColor(@ColorInt int);
+ method public void setRangedValueRingWidth(@Px int);
+ method public void setRangedValueSecondaryColor(@ColorInt int);
+ method public void setTextColor(@ColorInt int);
+ method public void setTextSize(@Px int);
+ method public void setTextTypeface(android.graphics.Typeface textTypeface);
+ method public void setTitleColor(@ColorInt int);
+ method public void setTitleSize(@Px int);
+ method public void setTitleTypeface(android.graphics.Typeface titleTypeface);
+ property @ColorInt public final int backgroundColor;
+ property public final android.graphics.drawable.Drawable? backgroundDrawable;
+ property @ColorInt public final int borderColor;
+ property @Px public final int borderDashGap;
+ property @Px public final int borderDashWidth;
+ property @Px public final int borderRadius;
+ property public final int borderStyle;
+ property @Px public final int borderWidth;
+ property @ColorInt public final int highlightColor;
+ property @ColorInt public final int iconColor;
+ property public final android.graphics.ColorFilter? imageColorFilter;
+ property @ColorInt public final int rangedValuePrimaryColor;
+ property @Px public final int rangedValueRingWidth;
+ property @ColorInt public final int rangedValueSecondaryColor;
+ property @ColorInt public final int textColor;
+ property @Px public final int textSize;
+ property public final android.graphics.Typeface textTypeface;
+ property @ColorInt public final int titleColor;
+ property @Px public final int titleSize;
+ property public final android.graphics.Typeface titleTypeface;
+ field @Px public static final int BORDER_RADIUS_DEFAULT = 2147483647; // 0x7fffffff
+ field public static final int BORDER_STYLE_DASHED = 2; // 0x2
+ field public static final int BORDER_STYLE_NONE = 0; // 0x0
+ field public static final int BORDER_STYLE_SOLID = 1; // 0x1
+ field public static final androidx.wear.watchface.complications.rendering.ComplicationStyle.Companion Companion;
+ }
+
+ public static final class ComplicationStyle.Companion {
+ }
+
+ public final class GlesTextureComplication {
+ ctor public GlesTextureComplication(androidx.wear.watchface.ComplicationSlot complicationSlot, @Px int textureWidth, @Px int textureHeight, int textureType);
+ method public void bind();
+ method public androidx.wear.watchface.ComplicationSlot getComplicationSlot();
+ method public void renderToTexture(java.time.ZonedDateTime zonedDateTime, androidx.wear.watchface.RenderParameters renderParameters);
+ property public final androidx.wear.watchface.ComplicationSlot complicationSlot;
+ }
+
+}
+
diff --git a/wear/watchface/watchface-complications/api/1.1.0-beta03.txt b/wear/watchface/watchface-complications/api/1.1.0-beta03.txt
new file mode 100644
index 0000000..c7efd47
--- /dev/null
+++ b/wear/watchface/watchface-complications/api/1.1.0-beta03.txt
@@ -0,0 +1,92 @@
+// Signature format: 4.0
+package androidx.wear.watchface.complications {
+
+ public final class ComplicationDataSourceInfo {
+ ctor public ComplicationDataSourceInfo(String appName, String name, android.graphics.drawable.Icon icon, androidx.wear.watchface.complications.data.ComplicationType type, android.content.ComponentName? componentName);
+ method public String getAppName();
+ method public android.content.ComponentName? getComponentName();
+ method public androidx.wear.watchface.complications.data.ComplicationData getFallbackPreviewData();
+ method public android.graphics.drawable.Icon getIcon();
+ method public String getName();
+ method public androidx.wear.watchface.complications.data.ComplicationType getType();
+ property public final String appName;
+ property public final android.content.ComponentName? componentName;
+ property public final androidx.wear.watchface.complications.data.ComplicationData fallbackPreviewData;
+ property public final android.graphics.drawable.Icon icon;
+ property public final String name;
+ property public final androidx.wear.watchface.complications.data.ComplicationType type;
+ }
+
+ public final class ComplicationDataSourceInfoRetriever implements java.lang.AutoCloseable {
+ ctor public ComplicationDataSourceInfoRetriever(android.content.Context context);
+ method public void close();
+ method @kotlin.jvm.Throws(exceptionClasses=ServiceDisconnectedException::class) public suspend Object? retrieveComplicationDataSourceInfo(android.content.ComponentName watchFaceComponent, int[] watchFaceComplicationIds, kotlin.coroutines.Continuation<? super androidx.wear.watchface.complications.ComplicationDataSourceInfoRetriever.Result[]>) throws androidx.wear.watchface.complications.ComplicationDataSourceInfoRetriever.ServiceDisconnectedException;
+ method @RequiresApi(android.os.Build.VERSION_CODES.R) @kotlin.jvm.Throws(exceptionClasses=ServiceDisconnectedException::class) public suspend Object? retrievePreviewComplicationData(android.content.ComponentName complicationDataSourceComponent, androidx.wear.watchface.complications.data.ComplicationType complicationType, kotlin.coroutines.Continuation<? super androidx.wear.watchface.complications.data.ComplicationData>) throws androidx.wear.watchface.complications.ComplicationDataSourceInfoRetriever.ServiceDisconnectedException;
+ }
+
+ public static final class ComplicationDataSourceInfoRetriever.Result {
+ method public androidx.wear.watchface.complications.ComplicationDataSourceInfo? getInfo();
+ method public int getSlotId();
+ property public final androidx.wear.watchface.complications.ComplicationDataSourceInfo? info;
+ property public final int slotId;
+ }
+
+ public static final class ComplicationDataSourceInfoRetriever.ServiceDisconnectedException extends java.lang.Exception {
+ ctor public ComplicationDataSourceInfoRetriever.ServiceDisconnectedException();
+ }
+
+ public final class ComplicationDataSourceInfoRetrieverKt {
+ }
+
+ public final class ComplicationSlotBounds {
+ ctor public ComplicationSlotBounds(java.util.Map<androidx.wear.watchface.complications.data.ComplicationType,? extends android.graphics.RectF> perComplicationTypeBounds);
+ ctor public ComplicationSlotBounds(android.graphics.RectF bounds);
+ method public java.util.Map<androidx.wear.watchface.complications.data.ComplicationType,android.graphics.RectF> getPerComplicationTypeBounds();
+ property public final java.util.Map<androidx.wear.watchface.complications.data.ComplicationType,android.graphics.RectF> perComplicationTypeBounds;
+ }
+
+ public final class DefaultComplicationDataSourcePolicy {
+ ctor public DefaultComplicationDataSourcePolicy();
+ ctor @Deprecated public DefaultComplicationDataSourcePolicy(int systemProvider);
+ ctor public DefaultComplicationDataSourcePolicy(int systemDataSource, androidx.wear.watchface.complications.data.ComplicationType systemDataSourceDefaultType);
+ ctor @Deprecated public DefaultComplicationDataSourcePolicy(android.content.ComponentName dataSource, int systemDataSourceFallback);
+ ctor public DefaultComplicationDataSourcePolicy(android.content.ComponentName primaryDataSource, androidx.wear.watchface.complications.data.ComplicationType primaryDataSourceDefaultType, int systemDataSourceFallback, androidx.wear.watchface.complications.data.ComplicationType systemDataSourceFallbackDefaultType);
+ ctor @Deprecated public DefaultComplicationDataSourcePolicy(android.content.ComponentName primaryDataSource, android.content.ComponentName secondaryDataSource, int systemDataSourceFallback);
+ ctor public DefaultComplicationDataSourcePolicy(android.content.ComponentName primaryDataSource, androidx.wear.watchface.complications.data.ComplicationType primaryDataSourceDefaultType, android.content.ComponentName secondaryDataSource, androidx.wear.watchface.complications.data.ComplicationType secondaryDataSourceDefaultType, int systemDataSourceFallback, androidx.wear.watchface.complications.data.ComplicationType systemDataSourceFallbackDefaultType);
+ method public android.content.ComponentName? getPrimaryDataSource();
+ method public androidx.wear.watchface.complications.data.ComplicationType? getPrimaryDataSourceDefaultType();
+ method public android.content.ComponentName? getSecondaryDataSource();
+ method public androidx.wear.watchface.complications.data.ComplicationType? getSecondaryDataSourceDefaultType();
+ method public int getSystemDataSourceFallback();
+ method public androidx.wear.watchface.complications.data.ComplicationType getSystemDataSourceFallbackDefaultType();
+ method public boolean isEmpty();
+ property public final android.content.ComponentName? primaryDataSource;
+ property public final androidx.wear.watchface.complications.data.ComplicationType? primaryDataSourceDefaultType;
+ property public final android.content.ComponentName? secondaryDataSource;
+ property public final androidx.wear.watchface.complications.data.ComplicationType? secondaryDataSourceDefaultType;
+ property public final int systemDataSourceFallback;
+ property public final androidx.wear.watchface.complications.data.ComplicationType systemDataSourceFallbackDefaultType;
+ }
+
+ public final class SystemDataSources {
+ field public static final androidx.wear.watchface.complications.SystemDataSources.Companion Companion;
+ field public static final int DATA_SOURCE_APP_SHORTCUT = 6; // 0x6
+ field public static final int DATA_SOURCE_DATE = 2; // 0x2
+ field public static final int DATA_SOURCE_DAY_AND_DATE = 16; // 0x10
+ field public static final int DATA_SOURCE_DAY_OF_WEEK = 13; // 0xd
+ field public static final int DATA_SOURCE_FAVORITE_CONTACT = 14; // 0xe
+ field public static final int DATA_SOURCE_NEXT_EVENT = 9; // 0x9
+ field public static final int DATA_SOURCE_STEP_COUNT = 4; // 0x4
+ field public static final int DATA_SOURCE_SUNRISE_SUNSET = 12; // 0xc
+ field public static final int DATA_SOURCE_TIME_AND_DATE = 3; // 0x3
+ field public static final int DATA_SOURCE_UNREAD_NOTIFICATION_COUNT = 7; // 0x7
+ field public static final int DATA_SOURCE_WATCH_BATTERY = 1; // 0x1
+ field public static final int DATA_SOURCE_WORLD_CLOCK = 5; // 0x5
+ field public static final int NO_DATA_SOURCE = -1; // 0xffffffff
+ }
+
+ public static final class SystemDataSources.Companion {
+ }
+
+}
+
diff --git a/wear/watchface/watchface-complications/api/public_plus_experimental_1.1.0-beta03.txt b/wear/watchface/watchface-complications/api/public_plus_experimental_1.1.0-beta03.txt
new file mode 100644
index 0000000..c7efd47
--- /dev/null
+++ b/wear/watchface/watchface-complications/api/public_plus_experimental_1.1.0-beta03.txt
@@ -0,0 +1,92 @@
+// Signature format: 4.0
+package androidx.wear.watchface.complications {
+
+ public final class ComplicationDataSourceInfo {
+ ctor public ComplicationDataSourceInfo(String appName, String name, android.graphics.drawable.Icon icon, androidx.wear.watchface.complications.data.ComplicationType type, android.content.ComponentName? componentName);
+ method public String getAppName();
+ method public android.content.ComponentName? getComponentName();
+ method public androidx.wear.watchface.complications.data.ComplicationData getFallbackPreviewData();
+ method public android.graphics.drawable.Icon getIcon();
+ method public String getName();
+ method public androidx.wear.watchface.complications.data.ComplicationType getType();
+ property public final String appName;
+ property public final android.content.ComponentName? componentName;
+ property public final androidx.wear.watchface.complications.data.ComplicationData fallbackPreviewData;
+ property public final android.graphics.drawable.Icon icon;
+ property public final String name;
+ property public final androidx.wear.watchface.complications.data.ComplicationType type;
+ }
+
+ public final class ComplicationDataSourceInfoRetriever implements java.lang.AutoCloseable {
+ ctor public ComplicationDataSourceInfoRetriever(android.content.Context context);
+ method public void close();
+ method @kotlin.jvm.Throws(exceptionClasses=ServiceDisconnectedException::class) public suspend Object? retrieveComplicationDataSourceInfo(android.content.ComponentName watchFaceComponent, int[] watchFaceComplicationIds, kotlin.coroutines.Continuation<? super androidx.wear.watchface.complications.ComplicationDataSourceInfoRetriever.Result[]>) throws androidx.wear.watchface.complications.ComplicationDataSourceInfoRetriever.ServiceDisconnectedException;
+ method @RequiresApi(android.os.Build.VERSION_CODES.R) @kotlin.jvm.Throws(exceptionClasses=ServiceDisconnectedException::class) public suspend Object? retrievePreviewComplicationData(android.content.ComponentName complicationDataSourceComponent, androidx.wear.watchface.complications.data.ComplicationType complicationType, kotlin.coroutines.Continuation<? super androidx.wear.watchface.complications.data.ComplicationData>) throws androidx.wear.watchface.complications.ComplicationDataSourceInfoRetriever.ServiceDisconnectedException;
+ }
+
+ public static final class ComplicationDataSourceInfoRetriever.Result {
+ method public androidx.wear.watchface.complications.ComplicationDataSourceInfo? getInfo();
+ method public int getSlotId();
+ property public final androidx.wear.watchface.complications.ComplicationDataSourceInfo? info;
+ property public final int slotId;
+ }
+
+ public static final class ComplicationDataSourceInfoRetriever.ServiceDisconnectedException extends java.lang.Exception {
+ ctor public ComplicationDataSourceInfoRetriever.ServiceDisconnectedException();
+ }
+
+ public final class ComplicationDataSourceInfoRetrieverKt {
+ }
+
+ public final class ComplicationSlotBounds {
+ ctor public ComplicationSlotBounds(java.util.Map<androidx.wear.watchface.complications.data.ComplicationType,? extends android.graphics.RectF> perComplicationTypeBounds);
+ ctor public ComplicationSlotBounds(android.graphics.RectF bounds);
+ method public java.util.Map<androidx.wear.watchface.complications.data.ComplicationType,android.graphics.RectF> getPerComplicationTypeBounds();
+ property public final java.util.Map<androidx.wear.watchface.complications.data.ComplicationType,android.graphics.RectF> perComplicationTypeBounds;
+ }
+
+ public final class DefaultComplicationDataSourcePolicy {
+ ctor public DefaultComplicationDataSourcePolicy();
+ ctor @Deprecated public DefaultComplicationDataSourcePolicy(int systemProvider);
+ ctor public DefaultComplicationDataSourcePolicy(int systemDataSource, androidx.wear.watchface.complications.data.ComplicationType systemDataSourceDefaultType);
+ ctor @Deprecated public DefaultComplicationDataSourcePolicy(android.content.ComponentName dataSource, int systemDataSourceFallback);
+ ctor public DefaultComplicationDataSourcePolicy(android.content.ComponentName primaryDataSource, androidx.wear.watchface.complications.data.ComplicationType primaryDataSourceDefaultType, int systemDataSourceFallback, androidx.wear.watchface.complications.data.ComplicationType systemDataSourceFallbackDefaultType);
+ ctor @Deprecated public DefaultComplicationDataSourcePolicy(android.content.ComponentName primaryDataSource, android.content.ComponentName secondaryDataSource, int systemDataSourceFallback);
+ ctor public DefaultComplicationDataSourcePolicy(android.content.ComponentName primaryDataSource, androidx.wear.watchface.complications.data.ComplicationType primaryDataSourceDefaultType, android.content.ComponentName secondaryDataSource, androidx.wear.watchface.complications.data.ComplicationType secondaryDataSourceDefaultType, int systemDataSourceFallback, androidx.wear.watchface.complications.data.ComplicationType systemDataSourceFallbackDefaultType);
+ method public android.content.ComponentName? getPrimaryDataSource();
+ method public androidx.wear.watchface.complications.data.ComplicationType? getPrimaryDataSourceDefaultType();
+ method public android.content.ComponentName? getSecondaryDataSource();
+ method public androidx.wear.watchface.complications.data.ComplicationType? getSecondaryDataSourceDefaultType();
+ method public int getSystemDataSourceFallback();
+ method public androidx.wear.watchface.complications.data.ComplicationType getSystemDataSourceFallbackDefaultType();
+ method public boolean isEmpty();
+ property public final android.content.ComponentName? primaryDataSource;
+ property public final androidx.wear.watchface.complications.data.ComplicationType? primaryDataSourceDefaultType;
+ property public final android.content.ComponentName? secondaryDataSource;
+ property public final androidx.wear.watchface.complications.data.ComplicationType? secondaryDataSourceDefaultType;
+ property public final int systemDataSourceFallback;
+ property public final androidx.wear.watchface.complications.data.ComplicationType systemDataSourceFallbackDefaultType;
+ }
+
+ public final class SystemDataSources {
+ field public static final androidx.wear.watchface.complications.SystemDataSources.Companion Companion;
+ field public static final int DATA_SOURCE_APP_SHORTCUT = 6; // 0x6
+ field public static final int DATA_SOURCE_DATE = 2; // 0x2
+ field public static final int DATA_SOURCE_DAY_AND_DATE = 16; // 0x10
+ field public static final int DATA_SOURCE_DAY_OF_WEEK = 13; // 0xd
+ field public static final int DATA_SOURCE_FAVORITE_CONTACT = 14; // 0xe
+ field public static final int DATA_SOURCE_NEXT_EVENT = 9; // 0x9
+ field public static final int DATA_SOURCE_STEP_COUNT = 4; // 0x4
+ field public static final int DATA_SOURCE_SUNRISE_SUNSET = 12; // 0xc
+ field public static final int DATA_SOURCE_TIME_AND_DATE = 3; // 0x3
+ field public static final int DATA_SOURCE_UNREAD_NOTIFICATION_COUNT = 7; // 0x7
+ field public static final int DATA_SOURCE_WATCH_BATTERY = 1; // 0x1
+ field public static final int DATA_SOURCE_WORLD_CLOCK = 5; // 0x5
+ field public static final int NO_DATA_SOURCE = -1; // 0xffffffff
+ }
+
+ public static final class SystemDataSources.Companion {
+ }
+
+}
+
diff --git a/wear/watchface/watchface-complications/api/res-1.1.0-beta03.txt b/wear/watchface/watchface-complications/api/res-1.1.0-beta03.txt
new file mode 100644
index 0000000..e69de29
--- /dev/null
+++ b/wear/watchface/watchface-complications/api/res-1.1.0-beta03.txt
diff --git a/wear/watchface/watchface-complications/api/restricted_1.1.0-beta03.txt b/wear/watchface/watchface-complications/api/restricted_1.1.0-beta03.txt
new file mode 100644
index 0000000..8d0a8d7
--- /dev/null
+++ b/wear/watchface/watchface-complications/api/restricted_1.1.0-beta03.txt
@@ -0,0 +1,94 @@
+// Signature format: 4.0
+package androidx.wear.watchface.complications {
+
+ public final class ComplicationDataSourceInfo {
+ ctor public ComplicationDataSourceInfo(String appName, String name, android.graphics.drawable.Icon icon, androidx.wear.watchface.complications.data.ComplicationType type, android.content.ComponentName? componentName);
+ method public String getAppName();
+ method public android.content.ComponentName? getComponentName();
+ method public androidx.wear.watchface.complications.data.ComplicationData getFallbackPreviewData();
+ method public android.graphics.drawable.Icon getIcon();
+ method public String getName();
+ method public androidx.wear.watchface.complications.data.ComplicationType getType();
+ property public final String appName;
+ property public final android.content.ComponentName? componentName;
+ property public final androidx.wear.watchface.complications.data.ComplicationData fallbackPreviewData;
+ property public final android.graphics.drawable.Icon icon;
+ property public final String name;
+ property public final androidx.wear.watchface.complications.data.ComplicationType type;
+ }
+
+ public final class ComplicationDataSourceInfoRetriever implements java.lang.AutoCloseable {
+ ctor public ComplicationDataSourceInfoRetriever(android.content.Context context);
+ method public void close();
+ method @kotlin.jvm.Throws(exceptionClasses=ServiceDisconnectedException::class) public suspend Object? retrieveComplicationDataSourceInfo(android.content.ComponentName watchFaceComponent, int[] watchFaceComplicationIds, kotlin.coroutines.Continuation<? super androidx.wear.watchface.complications.ComplicationDataSourceInfoRetriever.Result[]>) throws androidx.wear.watchface.complications.ComplicationDataSourceInfoRetriever.ServiceDisconnectedException;
+ method @RequiresApi(android.os.Build.VERSION_CODES.R) @kotlin.jvm.Throws(exceptionClasses=ServiceDisconnectedException::class) public suspend Object? retrievePreviewComplicationData(android.content.ComponentName complicationDataSourceComponent, androidx.wear.watchface.complications.data.ComplicationType complicationType, kotlin.coroutines.Continuation<? super androidx.wear.watchface.complications.data.ComplicationData>) throws androidx.wear.watchface.complications.ComplicationDataSourceInfoRetriever.ServiceDisconnectedException;
+ }
+
+ public static final class ComplicationDataSourceInfoRetriever.Result {
+ method public androidx.wear.watchface.complications.ComplicationDataSourceInfo? getInfo();
+ method public int getSlotId();
+ property public final androidx.wear.watchface.complications.ComplicationDataSourceInfo? info;
+ property public final int slotId;
+ }
+
+ public static final class ComplicationDataSourceInfoRetriever.ServiceDisconnectedException extends java.lang.Exception {
+ ctor public ComplicationDataSourceInfoRetriever.ServiceDisconnectedException();
+ }
+
+ public final class ComplicationDataSourceInfoRetrieverKt {
+ }
+
+ public final class ComplicationSlotBounds {
+ ctor public ComplicationSlotBounds(java.util.Map<androidx.wear.watchface.complications.data.ComplicationType,? extends android.graphics.RectF> perComplicationTypeBounds);
+ ctor public ComplicationSlotBounds(android.graphics.RectF bounds);
+ method public java.util.Map<androidx.wear.watchface.complications.data.ComplicationType,android.graphics.RectF> getPerComplicationTypeBounds();
+ property public final java.util.Map<androidx.wear.watchface.complications.data.ComplicationType,android.graphics.RectF> perComplicationTypeBounds;
+ }
+
+ public final class DefaultComplicationDataSourcePolicy {
+ ctor public DefaultComplicationDataSourcePolicy();
+ ctor @Deprecated public DefaultComplicationDataSourcePolicy(int systemProvider);
+ ctor public DefaultComplicationDataSourcePolicy(int systemDataSource, androidx.wear.watchface.complications.data.ComplicationType systemDataSourceDefaultType);
+ ctor @Deprecated public DefaultComplicationDataSourcePolicy(android.content.ComponentName dataSource, int systemDataSourceFallback);
+ ctor public DefaultComplicationDataSourcePolicy(android.content.ComponentName primaryDataSource, androidx.wear.watchface.complications.data.ComplicationType primaryDataSourceDefaultType, int systemDataSourceFallback, androidx.wear.watchface.complications.data.ComplicationType systemDataSourceFallbackDefaultType);
+ ctor @Deprecated public DefaultComplicationDataSourcePolicy(android.content.ComponentName primaryDataSource, android.content.ComponentName secondaryDataSource, int systemDataSourceFallback);
+ ctor public DefaultComplicationDataSourcePolicy(android.content.ComponentName primaryDataSource, androidx.wear.watchface.complications.data.ComplicationType primaryDataSourceDefaultType, android.content.ComponentName secondaryDataSource, androidx.wear.watchface.complications.data.ComplicationType secondaryDataSourceDefaultType, int systemDataSourceFallback, androidx.wear.watchface.complications.data.ComplicationType systemDataSourceFallbackDefaultType);
+ ctor @RestrictTo(androidx.annotation.RestrictTo.Scope.LIBRARY_GROUP_PREFIX) public DefaultComplicationDataSourcePolicy(androidx.wear.watchface.complications.data.DefaultComplicationDataSourcePolicyWireFormat wireFormat);
+ method public android.content.ComponentName? getPrimaryDataSource();
+ method public androidx.wear.watchface.complications.data.ComplicationType? getPrimaryDataSourceDefaultType();
+ method public android.content.ComponentName? getSecondaryDataSource();
+ method public androidx.wear.watchface.complications.data.ComplicationType? getSecondaryDataSourceDefaultType();
+ method public int getSystemDataSourceFallback();
+ method public androidx.wear.watchface.complications.data.ComplicationType getSystemDataSourceFallbackDefaultType();
+ method public boolean isEmpty();
+ method @RestrictTo(androidx.annotation.RestrictTo.Scope.LIBRARY_GROUP_PREFIX) public androidx.wear.watchface.complications.data.DefaultComplicationDataSourcePolicyWireFormat toWireFormat();
+ property public final android.content.ComponentName? primaryDataSource;
+ property public final androidx.wear.watchface.complications.data.ComplicationType? primaryDataSourceDefaultType;
+ property public final android.content.ComponentName? secondaryDataSource;
+ property public final androidx.wear.watchface.complications.data.ComplicationType? secondaryDataSourceDefaultType;
+ property public final int systemDataSourceFallback;
+ property public final androidx.wear.watchface.complications.data.ComplicationType systemDataSourceFallbackDefaultType;
+ }
+
+ public final class SystemDataSources {
+ field public static final androidx.wear.watchface.complications.SystemDataSources.Companion Companion;
+ field public static final int DATA_SOURCE_APP_SHORTCUT = 6; // 0x6
+ field public static final int DATA_SOURCE_DATE = 2; // 0x2
+ field public static final int DATA_SOURCE_DAY_AND_DATE = 16; // 0x10
+ field public static final int DATA_SOURCE_DAY_OF_WEEK = 13; // 0xd
+ field public static final int DATA_SOURCE_FAVORITE_CONTACT = 14; // 0xe
+ field public static final int DATA_SOURCE_NEXT_EVENT = 9; // 0x9
+ field public static final int DATA_SOURCE_STEP_COUNT = 4; // 0x4
+ field public static final int DATA_SOURCE_SUNRISE_SUNSET = 12; // 0xc
+ field public static final int DATA_SOURCE_TIME_AND_DATE = 3; // 0x3
+ field public static final int DATA_SOURCE_UNREAD_NOTIFICATION_COUNT = 7; // 0x7
+ field public static final int DATA_SOURCE_WATCH_BATTERY = 1; // 0x1
+ field public static final int DATA_SOURCE_WORLD_CLOCK = 5; // 0x5
+ field public static final int NO_DATA_SOURCE = -1; // 0xffffffff
+ }
+
+ public static final class SystemDataSources.Companion {
+ }
+
+}
+
diff --git a/wear/watchface/watchface-data/api/1.1.0-beta03.txt b/wear/watchface/watchface-data/api/1.1.0-beta03.txt
new file mode 100644
index 0000000..e6f50d0
--- /dev/null
+++ b/wear/watchface/watchface-data/api/1.1.0-beta03.txt
@@ -0,0 +1 @@
+// Signature format: 4.0
diff --git a/wear/watchface/watchface-data/api/public_plus_experimental_1.1.0-beta03.txt b/wear/watchface/watchface-data/api/public_plus_experimental_1.1.0-beta03.txt
new file mode 100644
index 0000000..fdd04f4
--- /dev/null
+++ b/wear/watchface/watchface-data/api/public_plus_experimental_1.1.0-beta03.txt
@@ -0,0 +1,15 @@
+// Signature format: 4.0
+package androidx.wear.watchface.data {
+
+ @androidx.wear.watchface.complications.data.ComplicationExperimental public final class BoundingArcWireFormat implements android.os.Parcelable androidx.versionedparcelable.VersionedParcelable {
+ ctor public BoundingArcWireFormat(float, float, float);
+ method public int describeContents();
+ method public float getArcStartAngle();
+ method public float getArcThickness();
+ method public float getTotalArcAngle();
+ method public void writeToParcel(android.os.Parcel?, int);
+ field public static final android.os.Parcelable.Creator<androidx.wear.watchface.data.BoundingArcWireFormat!> CREATOR;
+ }
+
+}
+
diff --git a/wear/watchface/watchface-data/api/res-1.1.0-beta03.txt b/wear/watchface/watchface-data/api/res-1.1.0-beta03.txt
new file mode 100644
index 0000000..e69de29
--- /dev/null
+++ b/wear/watchface/watchface-data/api/res-1.1.0-beta03.txt
diff --git a/wear/watchface/watchface-data/api/restricted_1.1.0-beta03.txt b/wear/watchface/watchface-data/api/restricted_1.1.0-beta03.txt
new file mode 100644
index 0000000..4b060f3
--- /dev/null
+++ b/wear/watchface/watchface-data/api/restricted_1.1.0-beta03.txt
@@ -0,0 +1,396 @@
+// Signature format: 4.0
+package androidx.wear.watchface.control.data {
+
+ @RestrictTo(androidx.annotation.RestrictTo.Scope.LIBRARY_GROUP_PREFIX) @androidx.versionedparcelable.VersionedParcelize public class ComplicationRenderParams implements android.os.Parcelable androidx.versionedparcelable.VersionedParcelable {
+ ctor public ComplicationRenderParams(int, androidx.wear.watchface.data.RenderParametersWireFormat, long, android.support.wearable.complications.ComplicationData?, androidx.wear.watchface.style.data.UserStyleWireFormat?);
+ method public int describeContents();
+ method public long getCalendarTimeMillis();
+ method public android.support.wearable.complications.ComplicationData? getComplicationData();
+ method public int getComplicationSlotId();
+ method public androidx.wear.watchface.data.RenderParametersWireFormat getRenderParametersWireFormat();
+ method public androidx.wear.watchface.style.data.UserStyleWireFormat? getUserStyle();
+ method public void writeToParcel(android.os.Parcel, int);
+ field public static final android.os.Parcelable.Creator<androidx.wear.watchface.control.data.ComplicationRenderParams!>! CREATOR;
+ }
+
+ @RestrictTo(androidx.annotation.RestrictTo.Scope.LIBRARY_GROUP_PREFIX) public class CrashInfoParcel implements android.os.Parcelable {
+ ctor public CrashInfoParcel(Throwable);
+ method public int describeContents();
+ method public void writeToParcel(android.os.Parcel, int);
+ field public static final android.os.Parcelable.Creator<androidx.wear.watchface.control.data.CrashInfoParcel!>! CREATOR;
+ field public final android.app.ApplicationErrorReport.CrashInfo crashInfo;
+ }
+
+ @RestrictTo(androidx.annotation.RestrictTo.Scope.LIBRARY_GROUP_PREFIX) @androidx.versionedparcelable.VersionedParcelize public class DefaultProviderPoliciesParams implements android.os.Parcelable androidx.versionedparcelable.VersionedParcelable {
+ ctor public DefaultProviderPoliciesParams(android.content.ComponentName);
+ method public int describeContents();
+ method public android.content.ComponentName getWatchFaceName();
+ method public void writeToParcel(android.os.Parcel, int);
+ field public static final android.os.Parcelable.Creator<androidx.wear.watchface.control.data.DefaultProviderPoliciesParams!>! CREATOR;
+ }
+
+ @RestrictTo(androidx.annotation.RestrictTo.Scope.LIBRARY_GROUP_PREFIX) @androidx.versionedparcelable.VersionedParcelize public class GetComplicationSlotMetadataParams implements android.os.Parcelable androidx.versionedparcelable.VersionedParcelable {
+ ctor public GetComplicationSlotMetadataParams(android.content.ComponentName);
+ method public int describeContents();
+ method public android.content.ComponentName getWatchFaceName();
+ method public void writeToParcel(android.os.Parcel, int);
+ field public static final android.os.Parcelable.Creator<androidx.wear.watchface.control.data.GetComplicationSlotMetadataParams!>! CREATOR;
+ }
+
+ @RestrictTo(androidx.annotation.RestrictTo.Scope.LIBRARY_GROUP_PREFIX) @androidx.versionedparcelable.VersionedParcelize public class GetUserStyleFlavorsParams implements android.os.Parcelable androidx.versionedparcelable.VersionedParcelable {
+ ctor public GetUserStyleFlavorsParams(android.content.ComponentName);
+ method public int describeContents();
+ method public android.content.ComponentName getWatchFaceName();
+ method public void writeToParcel(android.os.Parcel, int);
+ field public static final android.os.Parcelable.Creator<androidx.wear.watchface.control.data.GetUserStyleFlavorsParams!>! CREATOR;
+ }
+
+ @RestrictTo(androidx.annotation.RestrictTo.Scope.LIBRARY_GROUP_PREFIX) @androidx.versionedparcelable.VersionedParcelize public class GetUserStyleSchemaParams implements android.os.Parcelable androidx.versionedparcelable.VersionedParcelable {
+ ctor public GetUserStyleSchemaParams(android.content.ComponentName);
+ method public int describeContents();
+ method public android.content.ComponentName getWatchFaceName();
+ method public void writeToParcel(android.os.Parcel, int);
+ field public static final android.os.Parcelable.Creator<androidx.wear.watchface.control.data.GetUserStyleSchemaParams!>! CREATOR;
+ }
+
+ @RestrictTo(androidx.annotation.RestrictTo.Scope.LIBRARY_GROUP_PREFIX) @androidx.versionedparcelable.VersionedParcelize public class HeadlessWatchFaceInstanceParams implements android.os.Parcelable androidx.versionedparcelable.VersionedParcelable {
+ ctor @Deprecated public HeadlessWatchFaceInstanceParams(android.content.ComponentName, androidx.wear.watchface.data.DeviceConfig, int, int);
+ ctor public HeadlessWatchFaceInstanceParams(android.content.ComponentName, androidx.wear.watchface.data.DeviceConfig, int, int, String?);
+ method public int describeContents();
+ method public androidx.wear.watchface.data.DeviceConfig getDeviceConfig();
+ method public int getHeight();
+ method public String? getInstanceId();
+ method public android.content.ComponentName getWatchFaceName();
+ method public int getWidth();
+ method public void writeToParcel(android.os.Parcel, int);
+ field public static final android.os.Parcelable.Creator<androidx.wear.watchface.control.data.HeadlessWatchFaceInstanceParams!>! CREATOR;
+ }
+
+ @RestrictTo(androidx.annotation.RestrictTo.Scope.LIBRARY_GROUP_PREFIX) @androidx.versionedparcelable.VersionedParcelize public final class IdTypeAndDefaultProviderPolicyWireFormat implements android.os.Parcelable androidx.versionedparcelable.VersionedParcelable {
+ ctor public IdTypeAndDefaultProviderPolicyWireFormat(int, java.util.List<android.content.ComponentName!>?, int, int);
+ method public int describeContents();
+ method public int getDefaultProviderType();
+ method public java.util.List<android.content.ComponentName!>? getDefaultProvidersToTry();
+ method public int getFallbackSystemProvider();
+ method public int getId();
+ method public void writeToParcel(android.os.Parcel, int);
+ field public static final android.os.Parcelable.Creator<androidx.wear.watchface.control.data.IdTypeAndDefaultProviderPolicyWireFormat!>! CREATOR;
+ }
+
+ @RestrictTo(androidx.annotation.RestrictTo.Scope.LIBRARY_GROUP_PREFIX) @androidx.versionedparcelable.VersionedParcelize(allowSerialization=true) public class WallpaperInteractiveWatchFaceInstanceParams implements android.os.Parcelable androidx.versionedparcelable.VersionedParcelable {
+ ctor public WallpaperInteractiveWatchFaceInstanceParams(String, androidx.wear.watchface.data.DeviceConfig, androidx.wear.watchface.data.WatchUiState, androidx.wear.watchface.style.data.UserStyleWireFormat, java.util.List<androidx.wear.watchface.data.IdAndComplicationDataWireFormat!>?);
+ method public int describeContents();
+ method public androidx.wear.watchface.data.DeviceConfig getDeviceConfig();
+ method public java.util.List<androidx.wear.watchface.data.IdAndComplicationDataWireFormat!>? getIdAndComplicationDataWireFormats();
+ method public String getInstanceId();
+ method public androidx.wear.watchface.style.data.UserStyleWireFormat getUserStyle();
+ method public androidx.wear.watchface.data.WatchUiState getWatchUiState();
+ method public void setIdAndComplicationDataWireFormats(java.util.List<androidx.wear.watchface.data.IdAndComplicationDataWireFormat!>?);
+ method public void setUserStyle(androidx.wear.watchface.style.data.UserStyleWireFormat);
+ method public void writeToParcel(android.os.Parcel, int);
+ field public static final android.os.Parcelable.Creator<androidx.wear.watchface.control.data.WallpaperInteractiveWatchFaceInstanceParams!>! CREATOR;
+ }
+
+ @RestrictTo(androidx.annotation.RestrictTo.Scope.LIBRARY_GROUP_PREFIX) @androidx.versionedparcelable.VersionedParcelize public class WatchFaceRenderParams implements android.os.Parcelable androidx.versionedparcelable.VersionedParcelable {
+ ctor public WatchFaceRenderParams(androidx.wear.watchface.data.RenderParametersWireFormat, long, androidx.wear.watchface.style.data.UserStyleWireFormat?, java.util.List<androidx.wear.watchface.data.IdAndComplicationDataWireFormat!>?);
+ method public int describeContents();
+ method public long getCalendarTimeMillis();
+ method public java.util.List<androidx.wear.watchface.data.IdAndComplicationDataWireFormat!>? getIdAndComplicationDatumWireFormats();
+ method public androidx.wear.watchface.data.RenderParametersWireFormat getRenderParametersWireFormat();
+ method public androidx.wear.watchface.style.data.UserStyleWireFormat? getUserStyle();
+ method public void writeToParcel(android.os.Parcel, int);
+ field public static final android.os.Parcelable.Creator<androidx.wear.watchface.control.data.WatchFaceRenderParams!>! CREATOR;
+ }
+
+}
+
+package androidx.wear.watchface.data {
+
+ @RestrictTo(androidx.annotation.RestrictTo.Scope.LIBRARY_GROUP_PREFIX) @androidx.versionedparcelable.VersionedParcelize public final class ComplicationSlotMetadataWireFormat implements android.os.Parcelable androidx.versionedparcelable.VersionedParcelable {
+ ctor public ComplicationSlotMetadataWireFormat(int, int[], android.graphics.RectF![], int, int[], java.util.List<android.content.ComponentName!>?, int, int, int, int, boolean, boolean, android.os.Bundle);
+ ctor @Deprecated public ComplicationSlotMetadataWireFormat(int, int[], android.graphics.RectF![], int, int[], java.util.List<android.content.ComponentName!>?, int, int, boolean, boolean, android.os.Bundle);
+ method public int describeContents();
+ method public int getBoundsType();
+ method public android.graphics.RectF![] getComplicationBounds();
+ method public int[] getComplicationBoundsType();
+ method public android.os.Bundle getComplicationConfigExtras();
+ method public int getDefaultDataSourceType();
+ method public java.util.List<android.content.ComponentName!>? getDefaultDataSourcesToTry();
+ method public int getFallbackSystemDataSource();
+ method public int getId();
+ method public int getPrimaryDataSourceDefaultType();
+ method public int getSecondaryDataSourceDefaultType();
+ method public int[] getSupportedTypes();
+ method public boolean isFixedComplicationDataSource();
+ method public boolean isInitiallyEnabled();
+ method public void writeToParcel(android.os.Parcel, int);
+ field public static final android.os.Parcelable.Creator<androidx.wear.watchface.data.ComplicationSlotMetadataWireFormat!>! CREATOR;
+ }
+
+ @RestrictTo(androidx.annotation.RestrictTo.Scope.LIBRARY_GROUP_PREFIX) @androidx.versionedparcelable.VersionedParcelize public final class ComplicationStateWireFormat implements android.os.Parcelable androidx.versionedparcelable.VersionedParcelable {
+ ctor public ComplicationStateWireFormat(android.graphics.Rect, int, int[], java.util.List<android.content.ComponentName!>?, int, int, int, int, boolean, boolean, int, boolean, android.os.Bundle, Integer?, Integer?);
+ ctor @Deprecated public ComplicationStateWireFormat(android.graphics.Rect, int, int[], java.util.List<android.content.ComponentName!>?, int, int, boolean, boolean, int, boolean, android.os.Bundle);
+ method public int describeContents();
+ method public android.graphics.Rect getBounds();
+ method public int getBoundsType();
+ method public android.os.Bundle getComplicationConfigExtras();
+ method public int getCurrentType();
+ method public int getDefaultDataSourceType();
+ method public java.util.List<android.content.ComponentName!>? getDefaultDataSourcesToTry();
+ method @Deprecated public int getDefaultProviderType();
+ method @Deprecated public java.util.List<android.content.ComponentName!>? getDefaultProvidersToTry();
+ method public int getFallbackSystemProvider();
+ method public Integer? getNameResourceId();
+ method public int getPrimaryDataSourceDefaultType();
+ method public Integer? getScreenReaderNameResourceId();
+ method public int getSecondaryDataSourceDefaultType();
+ method public int[] getSupportedTypes();
+ method public boolean isEnabled();
+ method public boolean isFixedComplicationProvider();
+ method public boolean isInitiallyEnabled();
+ method public void writeToParcel(android.os.Parcel, int);
+ field public static final android.os.Parcelable.Creator<androidx.wear.watchface.data.ComplicationStateWireFormat!>! CREATOR;
+ }
+
+ @RestrictTo(androidx.annotation.RestrictTo.Scope.LIBRARY_GROUP_PREFIX) @androidx.versionedparcelable.VersionedParcelize(allowSerialization=true) public final class DeviceConfig implements android.os.Parcelable androidx.versionedparcelable.VersionedParcelable {
+ ctor public DeviceConfig(boolean, boolean, long, long);
+ method public int describeContents();
+ method public long getAnalogPreviewReferenceTimeMillis();
+ method public long getDigitalPreviewReferenceTimeMillis();
+ method public boolean getHasBurnInProtection();
+ method public boolean getHasLowBitAmbient();
+ method public void writeToParcel(android.os.Parcel, int);
+ field public static final android.os.Parcelable.Creator<androidx.wear.watchface.data.DeviceConfig!>! CREATOR;
+ }
+
+ @RestrictTo(androidx.annotation.RestrictTo.Scope.LIBRARY_GROUP_PREFIX) @androidx.versionedparcelable.VersionedParcelize public final class IdAndComplicationDataWireFormat implements android.os.Parcelable androidx.versionedparcelable.VersionedParcelable {
+ ctor public IdAndComplicationDataWireFormat(int, android.support.wearable.complications.ComplicationData);
+ method public int describeContents();
+ method public android.support.wearable.complications.ComplicationData getComplicationData();
+ method public int getId();
+ method public void writeToParcel(android.os.Parcel, int);
+ field public static final android.os.Parcelable.Creator<androidx.wear.watchface.data.IdAndComplicationDataWireFormat!>! CREATOR;
+ }
+
+ @RestrictTo(androidx.annotation.RestrictTo.Scope.LIBRARY_GROUP_PREFIX) @androidx.versionedparcelable.VersionedParcelize public final class IdAndComplicationStateWireFormat implements android.os.Parcelable androidx.versionedparcelable.VersionedParcelable {
+ ctor public IdAndComplicationStateWireFormat(int, androidx.wear.watchface.data.ComplicationStateWireFormat);
+ method public int describeContents();
+ method public androidx.wear.watchface.data.ComplicationStateWireFormat getComplicationState();
+ method public int getId();
+ method public void writeToParcel(android.os.Parcel, int);
+ field public static final android.os.Parcelable.Creator<androidx.wear.watchface.data.IdAndComplicationStateWireFormat!>! CREATOR;
+ }
+
+ @RestrictTo(androidx.annotation.RestrictTo.Scope.LIBRARY_GROUP_PREFIX) @androidx.versionedparcelable.VersionedParcelize(allowSerialization=true) public final class IdAndTapEventWireFormat implements android.os.Parcelable androidx.versionedparcelable.VersionedParcelable {
+ ctor public IdAndTapEventWireFormat(int, int, int, long);
+ method public int describeContents();
+ method public long getCalendarTapTimeMillis();
+ method public int getId();
+ method public int getX();
+ method public int getY();
+ method public void writeToParcel(android.os.Parcel, int);
+ field public static final android.os.Parcelable.Creator<androidx.wear.watchface.data.IdAndTapEventWireFormat!>! CREATOR;
+ }
+
+ @RestrictTo(androidx.annotation.RestrictTo.Scope.LIBRARY_GROUP_PREFIX) @androidx.versionedparcelable.VersionedParcelize public class LayerParameterWireFormat implements android.os.Parcelable androidx.versionedparcelable.VersionedParcelable {
+ ctor public LayerParameterWireFormat(int, int);
+ method public int describeContents();
+ method public int getLayer();
+ method public int getLayerMode();
+ method public void writeToParcel(android.os.Parcel, int);
+ field public static final android.os.Parcelable.Creator<androidx.wear.watchface.data.LayerParameterWireFormat!>! CREATOR;
+ }
+
+ @RestrictTo(androidx.annotation.RestrictTo.Scope.LIBRARY_GROUP_PREFIX) @androidx.versionedparcelable.VersionedParcelize public class RenderParametersWireFormat implements android.os.Parcelable androidx.versionedparcelable.VersionedParcelable {
+ ctor public RenderParametersWireFormat(int, int, int, int, String?, @ColorInt int, @ColorInt int, java.util.List<androidx.wear.watchface.data.IdAndTapEventWireFormat!>);
+ method public int describeContents();
+ method @ColorInt public int getBackgroundTint();
+ method public int getDrawMode();
+ method public int getElementComplicationSlotId();
+ method public int getElementType();
+ method public String? getElementUserStyleSettingId();
+ method @ColorInt public int getHighlightTint();
+ method public java.util.List<androidx.wear.watchface.data.IdAndTapEventWireFormat!>? getIdAndTapEventWireFormat();
+ method public int getWatchFaceLayerSetBitfield();
+ method public void writeToParcel(android.os.Parcel, int);
+ field public static final android.os.Parcelable.Creator<androidx.wear.watchface.data.RenderParametersWireFormat!>! CREATOR;
+ field public static int ELEMENT_TYPE_ALL_COMPLICATIONS;
+ field public static int ELEMENT_TYPE_COMPLICATION;
+ field public static int ELEMENT_TYPE_NONE;
+ field public static int ELEMENT_TYPE_USER_STYLE;
+ }
+
+ @RestrictTo(androidx.annotation.RestrictTo.Scope.LIBRARY_GROUP_PREFIX) @androidx.versionedparcelable.VersionedParcelize public class WatchFaceOverlayStyleWireFormat implements android.os.Parcelable androidx.versionedparcelable.VersionedParcelable {
+ ctor public WatchFaceOverlayStyleWireFormat(android.graphics.Color?, android.graphics.Color?);
+ method public int describeContents();
+ method public android.graphics.Color? getBackgroundColor();
+ method public android.graphics.Color? getForegroundColor();
+ method public void writeToParcel(android.os.Parcel, int);
+ field public static final android.os.Parcelable.Creator<androidx.wear.watchface.data.WatchFaceOverlayStyleWireFormat!>! CREATOR;
+ }
+
+ @RestrictTo(androidx.annotation.RestrictTo.Scope.LIBRARY_GROUP_PREFIX) @androidx.versionedparcelable.VersionedParcelize(allowSerialization=true) public final class WatchUiState implements android.os.Parcelable androidx.versionedparcelable.VersionedParcelable {
+ ctor public WatchUiState(boolean, int);
+ method public int describeContents();
+ method public boolean getInAmbientMode();
+ method public int getInterruptionFilter();
+ method public void writeToParcel(android.os.Parcel, int);
+ field public static final android.os.Parcelable.Creator<androidx.wear.watchface.data.WatchUiState!>! CREATOR;
+ }
+
+}
+
+package androidx.wear.watchface.editor.data {
+
+ @RestrictTo(androidx.annotation.RestrictTo.Scope.LIBRARY_GROUP_PREFIX) @androidx.versionedparcelable.VersionedParcelize(allowSerialization=true) public final class EditorStateWireFormat implements android.os.Parcelable androidx.versionedparcelable.VersionedParcelable {
+ ctor public EditorStateWireFormat(String?, androidx.wear.watchface.style.data.UserStyleWireFormat, java.util.List<androidx.wear.watchface.data.IdAndComplicationDataWireFormat!>, boolean, android.os.Bundle?);
+ method public int describeContents();
+ method public boolean getCommitChanges();
+ method public java.util.List<androidx.wear.watchface.data.IdAndComplicationDataWireFormat!> getPreviewComplicationData();
+ method public android.os.Bundle? getPreviewImageBundle();
+ method public androidx.wear.watchface.style.data.UserStyleWireFormat getUserStyle();
+ method public String? getWatchFaceInstanceId();
+ method public void writeToParcel(android.os.Parcel, int);
+ field public static final android.os.Parcelable.Creator<androidx.wear.watchface.editor.data.EditorStateWireFormat!>! CREATOR;
+ }
+
+}
+
+package androidx.wear.watchface.style.data {
+
+ @RestrictTo(androidx.annotation.RestrictTo.Scope.LIBRARY_GROUP_PREFIX) @androidx.versionedparcelable.VersionedParcelize public class BooleanOptionWireFormat extends androidx.wear.watchface.style.data.OptionWireFormat {
+ ctor public BooleanOptionWireFormat(byte[]);
+ }
+
+ @RestrictTo(androidx.annotation.RestrictTo.Scope.LIBRARY_GROUP_PREFIX) @androidx.versionedparcelable.VersionedParcelize public class BooleanUserStyleSettingWireFormat extends androidx.wear.watchface.style.data.UserStyleSettingWireFormat {
+ ctor @Deprecated public BooleanUserStyleSettingWireFormat(String, CharSequence, CharSequence, android.graphics.drawable.Icon?, java.util.List<androidx.wear.watchface.style.data.OptionWireFormat!>, int, java.util.List<java.lang.Integer!>);
+ ctor public BooleanUserStyleSettingWireFormat(String, CharSequence, CharSequence, android.graphics.drawable.Icon?, java.util.List<androidx.wear.watchface.style.data.OptionWireFormat!>, int, java.util.List<java.lang.Integer!>, android.os.Bundle?, java.util.List<android.os.Bundle!>?);
+ }
+
+ @RestrictTo(androidx.annotation.RestrictTo.Scope.LIBRARY_GROUP_PREFIX) @androidx.versionedparcelable.VersionedParcelize public class ComplicationOverlayWireFormat implements android.os.Parcelable androidx.versionedparcelable.VersionedParcelable {
+ ctor public ComplicationOverlayWireFormat(int, Boolean?, java.util.Map<java.lang.Integer!,android.graphics.RectF!>?, Integer?);
+ method public int describeContents();
+ method public Integer? getAccessibilityTraversalIndex();
+ method public void writeToParcel(android.os.Parcel, int);
+ field public static final android.os.Parcelable.Creator<androidx.wear.watchface.style.data.ComplicationOverlayWireFormat!>! CREATOR;
+ field public static final int ENABLED_NO = 0; // 0x0
+ field public static final int ENABLED_UNKNOWN = -1; // 0xffffffff
+ field public static final int ENABLED_YES = 1; // 0x1
+ field public static final long NULL_ACCESSIBILITY_TRAVERSAL_INDEX = 4294967296L; // 0x100000000L
+ field @androidx.versionedparcelable.ParcelField(1) public int mComplicationSlotId;
+ field @androidx.versionedparcelable.ParcelField(2) public int mEnabled;
+ field @androidx.versionedparcelable.ParcelField(3) public java.util.Map<java.lang.Integer!,android.graphics.RectF!>? mPerComplicationTypeBounds;
+ }
+
+ @RestrictTo(androidx.annotation.RestrictTo.Scope.LIBRARY_GROUP_PREFIX) @androidx.versionedparcelable.VersionedParcelize public class ComplicationsOptionWireFormat extends androidx.wear.watchface.style.data.OptionWireFormat {
+ ctor public ComplicationsOptionWireFormat(byte[], CharSequence, android.graphics.drawable.Icon?, androidx.wear.watchface.style.data.ComplicationOverlayWireFormat![]);
+ field @androidx.versionedparcelable.ParcelField(100) public androidx.wear.watchface.style.data.ComplicationOverlayWireFormat![] mComplicationOverlays;
+ field @androidx.versionedparcelable.ParcelField(2) public CharSequence mDisplayName;
+ field @androidx.versionedparcelable.ParcelField(3) public android.graphics.drawable.Icon? mIcon;
+ }
+
+ @RestrictTo(androidx.annotation.RestrictTo.Scope.LIBRARY_GROUP_PREFIX) @androidx.versionedparcelable.VersionedParcelize public class ComplicationsUserStyleSettingWireFormat extends androidx.wear.watchface.style.data.UserStyleSettingWireFormat {
+ ctor @Deprecated public ComplicationsUserStyleSettingWireFormat(String, CharSequence, CharSequence, android.graphics.drawable.Icon?, java.util.List<androidx.wear.watchface.style.data.OptionWireFormat!>, int, java.util.List<java.lang.Integer!>);
+ ctor public ComplicationsUserStyleSettingWireFormat(String, CharSequence, CharSequence, android.graphics.drawable.Icon?, java.util.List<androidx.wear.watchface.style.data.OptionWireFormat!>, int, java.util.List<java.lang.Integer!>, android.os.Bundle?, java.util.List<android.os.Bundle!>?);
+ }
+
+ @RestrictTo(androidx.annotation.RestrictTo.Scope.LIBRARY_GROUP_PREFIX) @androidx.versionedparcelable.VersionedParcelize public class CustomValueOptionWireFormat extends androidx.wear.watchface.style.data.OptionWireFormat {
+ ctor public CustomValueOptionWireFormat(byte[]);
+ }
+
+ @RestrictTo(androidx.annotation.RestrictTo.Scope.LIBRARY_GROUP_PREFIX) @androidx.versionedparcelable.VersionedParcelize public class CustomValueUserStyleSettingWireFormat extends androidx.wear.watchface.style.data.UserStyleSettingWireFormat {
+ ctor @Deprecated public CustomValueUserStyleSettingWireFormat(String, CharSequence, CharSequence, android.graphics.drawable.Icon?, java.util.List<androidx.wear.watchface.style.data.OptionWireFormat!>, java.util.List<java.lang.Integer!>);
+ ctor public CustomValueUserStyleSettingWireFormat(String, CharSequence, CharSequence, android.graphics.drawable.Icon?, java.util.List<androidx.wear.watchface.style.data.OptionWireFormat!>, java.util.List<java.lang.Integer!>, android.os.Bundle?, java.util.List<android.os.Bundle!>?);
+ }
+
+ @RestrictTo(androidx.annotation.RestrictTo.Scope.LIBRARY_GROUP_PREFIX) @androidx.versionedparcelable.VersionedParcelize public class DoubleRangeOptionWireFormat extends androidx.wear.watchface.style.data.OptionWireFormat {
+ ctor public DoubleRangeOptionWireFormat(byte[]);
+ }
+
+ @RestrictTo(androidx.annotation.RestrictTo.Scope.LIBRARY_GROUP_PREFIX) @androidx.versionedparcelable.VersionedParcelize public class DoubleRangeUserStyleSettingWireFormat extends androidx.wear.watchface.style.data.UserStyleSettingWireFormat {
+ ctor @Deprecated public DoubleRangeUserStyleSettingWireFormat(String, CharSequence, CharSequence, android.graphics.drawable.Icon?, java.util.List<androidx.wear.watchface.style.data.OptionWireFormat!>, int, java.util.List<java.lang.Integer!>);
+ ctor public DoubleRangeUserStyleSettingWireFormat(String, CharSequence, CharSequence, android.graphics.drawable.Icon?, java.util.List<androidx.wear.watchface.style.data.OptionWireFormat!>, int, java.util.List<java.lang.Integer!>, android.os.Bundle?, java.util.List<android.os.Bundle!>?);
+ }
+
+ @RestrictTo(androidx.annotation.RestrictTo.Scope.LIBRARY_GROUP_PREFIX) @androidx.versionedparcelable.VersionedParcelize public class ListOptionWireFormat extends androidx.wear.watchface.style.data.OptionWireFormat {
+ ctor public ListOptionWireFormat(byte[], CharSequence, android.graphics.drawable.Icon?);
+ field @androidx.versionedparcelable.ParcelField(2) public CharSequence mDisplayName;
+ field @androidx.versionedparcelable.ParcelField(3) public android.graphics.drawable.Icon? mIcon;
+ }
+
+ @RestrictTo(androidx.annotation.RestrictTo.Scope.LIBRARY_GROUP_PREFIX) @androidx.versionedparcelable.VersionedParcelize public class ListUserStyleSettingWireFormat extends androidx.wear.watchface.style.data.UserStyleSettingWireFormat {
+ ctor @Deprecated public ListUserStyleSettingWireFormat(String, CharSequence, CharSequence, android.graphics.drawable.Icon?, java.util.List<androidx.wear.watchface.style.data.OptionWireFormat!>, int, java.util.List<java.lang.Integer!>);
+ ctor public ListUserStyleSettingWireFormat(String, CharSequence, CharSequence, android.graphics.drawable.Icon?, java.util.List<androidx.wear.watchface.style.data.OptionWireFormat!>, int, java.util.List<java.lang.Integer!>, android.os.Bundle?, java.util.List<android.os.Bundle!>?);
+ }
+
+ @RestrictTo(androidx.annotation.RestrictTo.Scope.LIBRARY_GROUP_PREFIX) @androidx.versionedparcelable.VersionedParcelize public class LongRangeOptionWireFormat extends androidx.wear.watchface.style.data.OptionWireFormat {
+ ctor public LongRangeOptionWireFormat(byte[]);
+ }
+
+ @RestrictTo(androidx.annotation.RestrictTo.Scope.LIBRARY_GROUP_PREFIX) @androidx.versionedparcelable.VersionedParcelize public class LongRangeUserStyleSettingWireFormat extends androidx.wear.watchface.style.data.UserStyleSettingWireFormat {
+ ctor @Deprecated public LongRangeUserStyleSettingWireFormat(String, CharSequence, CharSequence, android.graphics.drawable.Icon?, java.util.List<androidx.wear.watchface.style.data.OptionWireFormat!>, int, java.util.List<java.lang.Integer!>);
+ ctor public LongRangeUserStyleSettingWireFormat(String, CharSequence, CharSequence, android.graphics.drawable.Icon?, java.util.List<androidx.wear.watchface.style.data.OptionWireFormat!>, int, java.util.List<java.lang.Integer!>, android.os.Bundle?, java.util.List<android.os.Bundle!>?);
+ }
+
+ @RestrictTo(androidx.annotation.RestrictTo.Scope.LIBRARY_GROUP_PREFIX) @androidx.versionedparcelable.VersionedParcelize public class OptionWireFormat implements android.os.Parcelable androidx.versionedparcelable.VersionedParcelable {
+ ctor public OptionWireFormat(byte[]);
+ method public int describeContents();
+ method public void writeToParcel(android.os.Parcel, int);
+ field public static final android.os.Parcelable.Creator<androidx.wear.watchface.style.data.OptionWireFormat!>! CREATOR;
+ field @androidx.versionedparcelable.ParcelField(1) public byte[] mId;
+ }
+
+ @RestrictTo(androidx.annotation.RestrictTo.Scope.LIBRARY_GROUP_PREFIX) @androidx.versionedparcelable.VersionedParcelize public class UserStyleFlavorWireFormat implements android.os.Parcelable androidx.versionedparcelable.VersionedParcelable {
+ ctor public UserStyleFlavorWireFormat(String, androidx.wear.watchface.style.data.UserStyleWireFormat, java.util.Map<java.lang.Integer!,androidx.wear.watchface.complications.data.DefaultComplicationDataSourcePolicyWireFormat!>);
+ method public int describeContents();
+ method public void writeToParcel(android.os.Parcel, int);
+ field public static final android.os.Parcelable.Creator<androidx.wear.watchface.style.data.UserStyleFlavorWireFormat!>! CREATOR;
+ field @androidx.versionedparcelable.ParcelField(3) public java.util.Map<java.lang.Integer!,androidx.wear.watchface.complications.data.DefaultComplicationDataSourcePolicyWireFormat!> mComplications;
+ field @androidx.versionedparcelable.ParcelField(1) public String mId;
+ field @androidx.versionedparcelable.ParcelField(2) public androidx.wear.watchface.style.data.UserStyleWireFormat mStyle;
+ }
+
+ @RestrictTo(androidx.annotation.RestrictTo.Scope.LIBRARY_GROUP_PREFIX) @androidx.versionedparcelable.VersionedParcelize public class UserStyleFlavorsWireFormat implements android.os.Parcelable androidx.versionedparcelable.VersionedParcelable {
+ ctor public UserStyleFlavorsWireFormat(java.util.List<androidx.wear.watchface.style.data.UserStyleFlavorWireFormat!>);
+ method public int describeContents();
+ method public void writeToParcel(android.os.Parcel, int);
+ field public static final android.os.Parcelable.Creator<androidx.wear.watchface.style.data.UserStyleFlavorsWireFormat!>! CREATOR;
+ field @androidx.versionedparcelable.ParcelField(1) public java.util.List<androidx.wear.watchface.style.data.UserStyleFlavorWireFormat!> mFlavors;
+ }
+
+ @RestrictTo(androidx.annotation.RestrictTo.Scope.LIBRARY_GROUP_PREFIX) @androidx.versionedparcelable.VersionedParcelize public class UserStyleSchemaWireFormat implements android.os.Parcelable androidx.versionedparcelable.VersionedParcelable {
+ ctor public UserStyleSchemaWireFormat(java.util.List<androidx.wear.watchface.style.data.UserStyleSettingWireFormat!>);
+ method public int describeContents();
+ method public void writeToParcel(android.os.Parcel, int);
+ field public static final android.os.Parcelable.Creator<androidx.wear.watchface.style.data.UserStyleSchemaWireFormat!>! CREATOR;
+ field @androidx.versionedparcelable.ParcelField(1) public java.util.List<androidx.wear.watchface.style.data.UserStyleSettingWireFormat!> mSchema;
+ }
+
+ @RestrictTo(androidx.annotation.RestrictTo.Scope.LIBRARY_GROUP_PREFIX) @androidx.versionedparcelable.VersionedParcelize public class UserStyleSettingWireFormat implements android.os.Parcelable androidx.versionedparcelable.VersionedParcelable {
+ ctor @Deprecated public UserStyleSettingWireFormat(String, CharSequence, CharSequence, android.graphics.drawable.Icon?, java.util.List<androidx.wear.watchface.style.data.OptionWireFormat!>, int, java.util.List<java.lang.Integer!>);
+ ctor public UserStyleSettingWireFormat(String, CharSequence, CharSequence, android.graphics.drawable.Icon?, java.util.List<androidx.wear.watchface.style.data.OptionWireFormat!>, int, java.util.List<java.lang.Integer!>, android.os.Bundle?, java.util.List<android.os.Bundle!>?);
+ method public int describeContents();
+ method public void writeToParcel(android.os.Parcel, int);
+ field public static final android.os.Parcelable.Creator<androidx.wear.watchface.style.data.UserStyleSettingWireFormat!>! CREATOR;
+ field @androidx.versionedparcelable.ParcelField(6) public java.util.List<java.lang.Integer!> mAffectsLayers;
+ field @androidx.versionedparcelable.ParcelField(5) public int mDefaultOptionIndex;
+ field @androidx.versionedparcelable.ParcelField(3) public CharSequence mDescription;
+ field @androidx.versionedparcelable.ParcelField(2) public CharSequence mDisplayName;
+ field @androidx.versionedparcelable.ParcelField(4) public android.graphics.drawable.Icon? mIcon;
+ field @androidx.versionedparcelable.ParcelField(1) public String mId;
+ field @androidx.versionedparcelable.ParcelField(102) public android.os.Bundle? mOnWatchFaceEditorBundle;
+ field @androidx.versionedparcelable.ParcelField(101) public java.util.List<java.lang.Integer!>? mOptionChildIndices;
+ field @androidx.versionedparcelable.ParcelField(100) public java.util.List<androidx.wear.watchface.style.data.OptionWireFormat!> mOptions;
+ field @androidx.versionedparcelable.ParcelField(103) public java.util.List<android.os.Bundle!>? mPerOptionOnWatchFaceEditorBundles;
+ }
+
+ @RestrictTo(androidx.annotation.RestrictTo.Scope.LIBRARY_GROUP_PREFIX) @androidx.versionedparcelable.VersionedParcelize(allowSerialization=true) public class UserStyleWireFormat implements android.os.Parcelable androidx.versionedparcelable.VersionedParcelable {
+ ctor public UserStyleWireFormat(java.util.Map<java.lang.String!,byte[]!>);
+ method public int describeContents();
+ method public void writeToParcel(android.os.Parcel, int);
+ field public static final android.os.Parcelable.Creator<androidx.wear.watchface.style.data.UserStyleWireFormat!>! CREATOR;
+ field @androidx.versionedparcelable.ParcelField(1) public java.util.Map<java.lang.String!,byte[]!> mUserStyle;
+ }
+
+}
+
diff --git a/wear/watchface/watchface-editor-guava/api/1.1.0-beta03.txt b/wear/watchface/watchface-editor-guava/api/1.1.0-beta03.txt
new file mode 100644
index 0000000..1e5a0c8
--- /dev/null
+++ b/wear/watchface/watchface-editor-guava/api/1.1.0-beta03.txt
@@ -0,0 +1,43 @@
+// Signature format: 4.0
+package androidx.wear.watchface.editor {
+
+ public final class ListenableEditorSession implements androidx.wear.watchface.editor.EditorSession {
+ ctor public ListenableEditorSession(androidx.wear.watchface.editor.EditorSession wrappedEditorSession);
+ method public void close();
+ method @RequiresApi(27) @UiThread public static androidx.wear.watchface.editor.ListenableEditorSession createHeadlessEditorSession(androidx.activity.ComponentActivity activity, android.content.Intent editIntent, androidx.wear.watchface.client.HeadlessWatchFaceClient headlessWatchFaceClient);
+ method public Integer? getBackgroundComplicationSlotId();
+ method public Integer? getComplicationSlotIdAt(int x, int y);
+ method public kotlinx.coroutines.flow.StateFlow<java.util.Map<java.lang.Integer,androidx.wear.watchface.client.ComplicationSlotState>> getComplicationSlotsState();
+ method public kotlinx.coroutines.flow.StateFlow<java.util.Map<java.lang.Integer,androidx.wear.watchface.complications.ComplicationDataSourceInfo>> getComplicationsDataSourceInfo();
+ method public kotlinx.coroutines.flow.StateFlow<java.util.Map<java.lang.Integer,androidx.wear.watchface.complications.data.ComplicationData>> getComplicationsPreviewData();
+ method public java.time.Instant getPreviewReferenceInstant();
+ method public kotlinx.coroutines.flow.MutableStateFlow<androidx.wear.watchface.style.UserStyle> getUserStyle();
+ method public androidx.wear.watchface.style.UserStyleSchema getUserStyleSchema();
+ method public android.content.ComponentName getWatchFaceComponentName();
+ method @RequiresApi(android.os.Build.VERSION_CODES.R) public androidx.wear.watchface.client.WatchFaceId getWatchFaceId();
+ method public boolean isCommitChangesOnClose();
+ method @UiThread public static com.google.common.util.concurrent.ListenableFuture<androidx.wear.watchface.editor.ListenableEditorSession> listenableCreateOnWatchEditorSession(androidx.activity.ComponentActivity activity);
+ method public com.google.common.util.concurrent.ListenableFuture<androidx.wear.watchface.editor.ChosenComplicationDataSource> listenableOpenComplicationDataSourceChooser(int complicationSlotId);
+ method public suspend Object? openComplicationDataSourceChooser(int complicationSlotId, kotlin.coroutines.Continuation<? super androidx.wear.watchface.editor.ChosenComplicationDataSource>);
+ method public android.graphics.Bitmap renderWatchFaceToBitmap(androidx.wear.watchface.RenderParameters renderParameters, java.time.Instant instant, java.util.Map<java.lang.Integer,? extends androidx.wear.watchface.complications.data.ComplicationData>? slotIdToComplicationData);
+ method public void setCommitChangesOnClose(boolean);
+ property public Integer? backgroundComplicationSlotId;
+ property public boolean commitChangesOnClose;
+ property public kotlinx.coroutines.flow.StateFlow<java.util.Map<java.lang.Integer,androidx.wear.watchface.client.ComplicationSlotState>> complicationSlotsState;
+ property public kotlinx.coroutines.flow.StateFlow<java.util.Map<java.lang.Integer,androidx.wear.watchface.complications.ComplicationDataSourceInfo>> complicationsDataSourceInfo;
+ property public kotlinx.coroutines.flow.StateFlow<java.util.Map<java.lang.Integer,androidx.wear.watchface.complications.data.ComplicationData>> complicationsPreviewData;
+ property public java.time.Instant previewReferenceInstant;
+ property public kotlinx.coroutines.flow.MutableStateFlow<androidx.wear.watchface.style.UserStyle> userStyle;
+ property public androidx.wear.watchface.style.UserStyleSchema userStyleSchema;
+ property public android.content.ComponentName watchFaceComponentName;
+ property @RequiresApi(android.os.Build.VERSION_CODES.R) public androidx.wear.watchface.client.WatchFaceId watchFaceId;
+ field public static final androidx.wear.watchface.editor.ListenableEditorSession.Companion Companion;
+ }
+
+ public static final class ListenableEditorSession.Companion {
+ method @RequiresApi(27) @UiThread public androidx.wear.watchface.editor.ListenableEditorSession createHeadlessEditorSession(androidx.activity.ComponentActivity activity, android.content.Intent editIntent, androidx.wear.watchface.client.HeadlessWatchFaceClient headlessWatchFaceClient);
+ method @UiThread public com.google.common.util.concurrent.ListenableFuture<androidx.wear.watchface.editor.ListenableEditorSession> listenableCreateOnWatchEditorSession(androidx.activity.ComponentActivity activity);
+ }
+
+}
+
diff --git a/wear/watchface/watchface-editor-guava/api/public_plus_experimental_1.1.0-beta03.txt b/wear/watchface/watchface-editor-guava/api/public_plus_experimental_1.1.0-beta03.txt
new file mode 100644
index 0000000..1e5a0c8
--- /dev/null
+++ b/wear/watchface/watchface-editor-guava/api/public_plus_experimental_1.1.0-beta03.txt
@@ -0,0 +1,43 @@
+// Signature format: 4.0
+package androidx.wear.watchface.editor {
+
+ public final class ListenableEditorSession implements androidx.wear.watchface.editor.EditorSession {
+ ctor public ListenableEditorSession(androidx.wear.watchface.editor.EditorSession wrappedEditorSession);
+ method public void close();
+ method @RequiresApi(27) @UiThread public static androidx.wear.watchface.editor.ListenableEditorSession createHeadlessEditorSession(androidx.activity.ComponentActivity activity, android.content.Intent editIntent, androidx.wear.watchface.client.HeadlessWatchFaceClient headlessWatchFaceClient);
+ method public Integer? getBackgroundComplicationSlotId();
+ method public Integer? getComplicationSlotIdAt(int x, int y);
+ method public kotlinx.coroutines.flow.StateFlow<java.util.Map<java.lang.Integer,androidx.wear.watchface.client.ComplicationSlotState>> getComplicationSlotsState();
+ method public kotlinx.coroutines.flow.StateFlow<java.util.Map<java.lang.Integer,androidx.wear.watchface.complications.ComplicationDataSourceInfo>> getComplicationsDataSourceInfo();
+ method public kotlinx.coroutines.flow.StateFlow<java.util.Map<java.lang.Integer,androidx.wear.watchface.complications.data.ComplicationData>> getComplicationsPreviewData();
+ method public java.time.Instant getPreviewReferenceInstant();
+ method public kotlinx.coroutines.flow.MutableStateFlow<androidx.wear.watchface.style.UserStyle> getUserStyle();
+ method public androidx.wear.watchface.style.UserStyleSchema getUserStyleSchema();
+ method public android.content.ComponentName getWatchFaceComponentName();
+ method @RequiresApi(android.os.Build.VERSION_CODES.R) public androidx.wear.watchface.client.WatchFaceId getWatchFaceId();
+ method public boolean isCommitChangesOnClose();
+ method @UiThread public static com.google.common.util.concurrent.ListenableFuture<androidx.wear.watchface.editor.ListenableEditorSession> listenableCreateOnWatchEditorSession(androidx.activity.ComponentActivity activity);
+ method public com.google.common.util.concurrent.ListenableFuture<androidx.wear.watchface.editor.ChosenComplicationDataSource> listenableOpenComplicationDataSourceChooser(int complicationSlotId);
+ method public suspend Object? openComplicationDataSourceChooser(int complicationSlotId, kotlin.coroutines.Continuation<? super androidx.wear.watchface.editor.ChosenComplicationDataSource>);
+ method public android.graphics.Bitmap renderWatchFaceToBitmap(androidx.wear.watchface.RenderParameters renderParameters, java.time.Instant instant, java.util.Map<java.lang.Integer,? extends androidx.wear.watchface.complications.data.ComplicationData>? slotIdToComplicationData);
+ method public void setCommitChangesOnClose(boolean);
+ property public Integer? backgroundComplicationSlotId;
+ property public boolean commitChangesOnClose;
+ property public kotlinx.coroutines.flow.StateFlow<java.util.Map<java.lang.Integer,androidx.wear.watchface.client.ComplicationSlotState>> complicationSlotsState;
+ property public kotlinx.coroutines.flow.StateFlow<java.util.Map<java.lang.Integer,androidx.wear.watchface.complications.ComplicationDataSourceInfo>> complicationsDataSourceInfo;
+ property public kotlinx.coroutines.flow.StateFlow<java.util.Map<java.lang.Integer,androidx.wear.watchface.complications.data.ComplicationData>> complicationsPreviewData;
+ property public java.time.Instant previewReferenceInstant;
+ property public kotlinx.coroutines.flow.MutableStateFlow<androidx.wear.watchface.style.UserStyle> userStyle;
+ property public androidx.wear.watchface.style.UserStyleSchema userStyleSchema;
+ property public android.content.ComponentName watchFaceComponentName;
+ property @RequiresApi(android.os.Build.VERSION_CODES.R) public androidx.wear.watchface.client.WatchFaceId watchFaceId;
+ field public static final androidx.wear.watchface.editor.ListenableEditorSession.Companion Companion;
+ }
+
+ public static final class ListenableEditorSession.Companion {
+ method @RequiresApi(27) @UiThread public androidx.wear.watchface.editor.ListenableEditorSession createHeadlessEditorSession(androidx.activity.ComponentActivity activity, android.content.Intent editIntent, androidx.wear.watchface.client.HeadlessWatchFaceClient headlessWatchFaceClient);
+ method @UiThread public com.google.common.util.concurrent.ListenableFuture<androidx.wear.watchface.editor.ListenableEditorSession> listenableCreateOnWatchEditorSession(androidx.activity.ComponentActivity activity);
+ }
+
+}
+
diff --git a/wear/watchface/watchface-editor-guava/api/res-1.1.0-beta03.txt b/wear/watchface/watchface-editor-guava/api/res-1.1.0-beta03.txt
new file mode 100644
index 0000000..e69de29
--- /dev/null
+++ b/wear/watchface/watchface-editor-guava/api/res-1.1.0-beta03.txt
diff --git a/wear/watchface/watchface-editor-guava/api/restricted_1.1.0-beta03.txt b/wear/watchface/watchface-editor-guava/api/restricted_1.1.0-beta03.txt
new file mode 100644
index 0000000..1e5a0c8
--- /dev/null
+++ b/wear/watchface/watchface-editor-guava/api/restricted_1.1.0-beta03.txt
@@ -0,0 +1,43 @@
+// Signature format: 4.0
+package androidx.wear.watchface.editor {
+
+ public final class ListenableEditorSession implements androidx.wear.watchface.editor.EditorSession {
+ ctor public ListenableEditorSession(androidx.wear.watchface.editor.EditorSession wrappedEditorSession);
+ method public void close();
+ method @RequiresApi(27) @UiThread public static androidx.wear.watchface.editor.ListenableEditorSession createHeadlessEditorSession(androidx.activity.ComponentActivity activity, android.content.Intent editIntent, androidx.wear.watchface.client.HeadlessWatchFaceClient headlessWatchFaceClient);
+ method public Integer? getBackgroundComplicationSlotId();
+ method public Integer? getComplicationSlotIdAt(int x, int y);
+ method public kotlinx.coroutines.flow.StateFlow<java.util.Map<java.lang.Integer,androidx.wear.watchface.client.ComplicationSlotState>> getComplicationSlotsState();
+ method public kotlinx.coroutines.flow.StateFlow<java.util.Map<java.lang.Integer,androidx.wear.watchface.complications.ComplicationDataSourceInfo>> getComplicationsDataSourceInfo();
+ method public kotlinx.coroutines.flow.StateFlow<java.util.Map<java.lang.Integer,androidx.wear.watchface.complications.data.ComplicationData>> getComplicationsPreviewData();
+ method public java.time.Instant getPreviewReferenceInstant();
+ method public kotlinx.coroutines.flow.MutableStateFlow<androidx.wear.watchface.style.UserStyle> getUserStyle();
+ method public androidx.wear.watchface.style.UserStyleSchema getUserStyleSchema();
+ method public android.content.ComponentName getWatchFaceComponentName();
+ method @RequiresApi(android.os.Build.VERSION_CODES.R) public androidx.wear.watchface.client.WatchFaceId getWatchFaceId();
+ method public boolean isCommitChangesOnClose();
+ method @UiThread public static com.google.common.util.concurrent.ListenableFuture<androidx.wear.watchface.editor.ListenableEditorSession> listenableCreateOnWatchEditorSession(androidx.activity.ComponentActivity activity);
+ method public com.google.common.util.concurrent.ListenableFuture<androidx.wear.watchface.editor.ChosenComplicationDataSource> listenableOpenComplicationDataSourceChooser(int complicationSlotId);
+ method public suspend Object? openComplicationDataSourceChooser(int complicationSlotId, kotlin.coroutines.Continuation<? super androidx.wear.watchface.editor.ChosenComplicationDataSource>);
+ method public android.graphics.Bitmap renderWatchFaceToBitmap(androidx.wear.watchface.RenderParameters renderParameters, java.time.Instant instant, java.util.Map<java.lang.Integer,? extends androidx.wear.watchface.complications.data.ComplicationData>? slotIdToComplicationData);
+ method public void setCommitChangesOnClose(boolean);
+ property public Integer? backgroundComplicationSlotId;
+ property public boolean commitChangesOnClose;
+ property public kotlinx.coroutines.flow.StateFlow<java.util.Map<java.lang.Integer,androidx.wear.watchface.client.ComplicationSlotState>> complicationSlotsState;
+ property public kotlinx.coroutines.flow.StateFlow<java.util.Map<java.lang.Integer,androidx.wear.watchface.complications.ComplicationDataSourceInfo>> complicationsDataSourceInfo;
+ property public kotlinx.coroutines.flow.StateFlow<java.util.Map<java.lang.Integer,androidx.wear.watchface.complications.data.ComplicationData>> complicationsPreviewData;
+ property public java.time.Instant previewReferenceInstant;
+ property public kotlinx.coroutines.flow.MutableStateFlow<androidx.wear.watchface.style.UserStyle> userStyle;
+ property public androidx.wear.watchface.style.UserStyleSchema userStyleSchema;
+ property public android.content.ComponentName watchFaceComponentName;
+ property @RequiresApi(android.os.Build.VERSION_CODES.R) public androidx.wear.watchface.client.WatchFaceId watchFaceId;
+ field public static final androidx.wear.watchface.editor.ListenableEditorSession.Companion Companion;
+ }
+
+ public static final class ListenableEditorSession.Companion {
+ method @RequiresApi(27) @UiThread public androidx.wear.watchface.editor.ListenableEditorSession createHeadlessEditorSession(androidx.activity.ComponentActivity activity, android.content.Intent editIntent, androidx.wear.watchface.client.HeadlessWatchFaceClient headlessWatchFaceClient);
+ method @UiThread public com.google.common.util.concurrent.ListenableFuture<androidx.wear.watchface.editor.ListenableEditorSession> listenableCreateOnWatchEditorSession(androidx.activity.ComponentActivity activity);
+ }
+
+}
+
diff --git a/wear/watchface/watchface-editor/api/1.1.0-beta03.txt b/wear/watchface/watchface-editor/api/1.1.0-beta03.txt
new file mode 100644
index 0000000..817f024
--- /dev/null
+++ b/wear/watchface/watchface-editor/api/1.1.0-beta03.txt
@@ -0,0 +1,100 @@
+// Signature format: 4.0
+package androidx.wear.watchface.editor {
+
+ public final class ChosenComplicationDataSource {
+ ctor public ChosenComplicationDataSource(int complicationSlotId, androidx.wear.watchface.complications.ComplicationDataSourceInfo? complicationDataSourceInfo, android.os.Bundle extras);
+ method public androidx.wear.watchface.complications.ComplicationDataSourceInfo? getComplicationDataSourceInfo();
+ method public int getComplicationSlotId();
+ method public android.os.Bundle getExtras();
+ property public final androidx.wear.watchface.complications.ComplicationDataSourceInfo? complicationDataSourceInfo;
+ property public final int complicationSlotId;
+ property public final android.os.Bundle extras;
+ }
+
+ public final class EditorRequest {
+ ctor @RequiresApi(android.os.Build.VERSION_CODES.R) public EditorRequest(android.content.ComponentName watchFaceComponentName, String editorPackageName, androidx.wear.watchface.style.UserStyleData? initialUserStyle, @RequiresApi(android.os.Build.VERSION_CODES.R) androidx.wear.watchface.client.WatchFaceId watchFaceId, androidx.wear.watchface.client.DeviceConfig? headlessDeviceConfig, androidx.wear.watchface.editor.PreviewScreenshotParams? previewScreenshotParams);
+ ctor public EditorRequest(android.content.ComponentName watchFaceComponentName, String editorPackageName, androidx.wear.watchface.style.UserStyleData? initialUserStyle);
+ method @kotlin.jvm.Throws(exceptionClasses=TimeoutCancellationException::class) public static androidx.wear.watchface.editor.EditorRequest createFromIntent(android.content.Intent intent) throws kotlinx.coroutines.TimeoutCancellationException;
+ method public String getEditorPackageName();
+ method public androidx.wear.watchface.client.DeviceConfig? getHeadlessDeviceConfig();
+ method public androidx.wear.watchface.style.UserStyleData? getInitialUserStyle();
+ method public androidx.wear.watchface.editor.PreviewScreenshotParams? getPreviewScreenshotParams();
+ method public android.content.ComponentName getWatchFaceComponentName();
+ method @RequiresApi(android.os.Build.VERSION_CODES.R) public androidx.wear.watchface.client.WatchFaceId getWatchFaceId();
+ property public final String editorPackageName;
+ property public final androidx.wear.watchface.client.DeviceConfig? headlessDeviceConfig;
+ property public final androidx.wear.watchface.style.UserStyleData? initialUserStyle;
+ property public final androidx.wear.watchface.editor.PreviewScreenshotParams? previewScreenshotParams;
+ property public final android.content.ComponentName watchFaceComponentName;
+ property @RequiresApi(android.os.Build.VERSION_CODES.R) public final androidx.wear.watchface.client.WatchFaceId watchFaceId;
+ field public static final androidx.wear.watchface.editor.EditorRequest.Companion Companion;
+ }
+
+ public static final class EditorRequest.Companion {
+ method @kotlin.jvm.Throws(exceptionClasses=TimeoutCancellationException::class) public androidx.wear.watchface.editor.EditorRequest createFromIntent(android.content.Intent intent) throws kotlinx.coroutines.TimeoutCancellationException;
+ }
+
+ public interface EditorSession extends java.lang.AutoCloseable {
+ method @RequiresApi(27) @UiThread public default static androidx.wear.watchface.editor.EditorSession createHeadlessEditorSession(androidx.activity.ComponentActivity activity, android.content.Intent editIntent, androidx.wear.watchface.client.HeadlessWatchFaceClient headlessWatchFaceClient);
+ method @UiThread @kotlin.jvm.Throws(exceptionClasses=TimeoutCancellationException::class) public default static suspend Object? createOnWatchEditorSession(androidx.activity.ComponentActivity activity, kotlin.coroutines.Continuation<? super androidx.wear.watchface.editor.EditorSession>) throws kotlinx.coroutines.TimeoutCancellationException;
+ method public Integer? getBackgroundComplicationSlotId();
+ method @UiThread public Integer? getComplicationSlotIdAt(@Px int x, @Px int y);
+ method public kotlinx.coroutines.flow.StateFlow<java.util.Map<java.lang.Integer,androidx.wear.watchface.client.ComplicationSlotState>> getComplicationSlotsState();
+ method public kotlinx.coroutines.flow.StateFlow<java.util.Map<java.lang.Integer,androidx.wear.watchface.complications.ComplicationDataSourceInfo>> getComplicationsDataSourceInfo();
+ method public kotlinx.coroutines.flow.StateFlow<java.util.Map<java.lang.Integer,androidx.wear.watchface.complications.data.ComplicationData>> getComplicationsPreviewData();
+ method public java.time.Instant getPreviewReferenceInstant();
+ method public kotlinx.coroutines.flow.MutableStateFlow<androidx.wear.watchface.style.UserStyle> getUserStyle();
+ method public androidx.wear.watchface.style.UserStyleSchema getUserStyleSchema();
+ method public android.content.ComponentName getWatchFaceComponentName();
+ method public androidx.wear.watchface.client.WatchFaceId getWatchFaceId();
+ method @UiThread public boolean isCommitChangesOnClose();
+ method @UiThread public suspend Object? openComplicationDataSourceChooser(int complicationSlotId, kotlin.coroutines.Continuation<? super androidx.wear.watchface.editor.ChosenComplicationDataSource>);
+ method @UiThread public android.graphics.Bitmap renderWatchFaceToBitmap(androidx.wear.watchface.RenderParameters renderParameters, java.time.Instant instant, java.util.Map<java.lang.Integer,? extends androidx.wear.watchface.complications.data.ComplicationData>? slotIdToComplicationData);
+ method @UiThread public void setCommitChangesOnClose(boolean);
+ property public abstract Integer? backgroundComplicationSlotId;
+ property @UiThread public abstract boolean commitChangesOnClose;
+ property public abstract kotlinx.coroutines.flow.StateFlow<java.util.Map<java.lang.Integer,androidx.wear.watchface.client.ComplicationSlotState>> complicationSlotsState;
+ property public abstract kotlinx.coroutines.flow.StateFlow<java.util.Map<java.lang.Integer,androidx.wear.watchface.complications.ComplicationDataSourceInfo>> complicationsDataSourceInfo;
+ property public abstract kotlinx.coroutines.flow.StateFlow<java.util.Map<java.lang.Integer,androidx.wear.watchface.complications.data.ComplicationData>> complicationsPreviewData;
+ property public abstract java.time.Instant previewReferenceInstant;
+ property public abstract kotlinx.coroutines.flow.MutableStateFlow<androidx.wear.watchface.style.UserStyle> userStyle;
+ property public abstract androidx.wear.watchface.style.UserStyleSchema userStyleSchema;
+ property public abstract android.content.ComponentName watchFaceComponentName;
+ property public abstract androidx.wear.watchface.client.WatchFaceId watchFaceId;
+ field public static final androidx.wear.watchface.editor.EditorSession.Companion Companion;
+ field public static final java.time.Instant DEFAULT_PREVIEW_INSTANT;
+ field public static final java.time.Duration EDITING_SESSION_TIMEOUT;
+ }
+
+ public static final class EditorSession.Companion {
+ method @RequiresApi(27) @UiThread public androidx.wear.watchface.editor.EditorSession createHeadlessEditorSession(androidx.activity.ComponentActivity activity, android.content.Intent editIntent, androidx.wear.watchface.client.HeadlessWatchFaceClient headlessWatchFaceClient);
+ method @UiThread @kotlin.jvm.Throws(exceptionClasses=TimeoutCancellationException::class) public suspend Object? createOnWatchEditorSession(androidx.activity.ComponentActivity activity, kotlin.coroutines.Continuation<? super androidx.wear.watchface.editor.EditorSession>) throws kotlinx.coroutines.TimeoutCancellationException;
+ }
+
+ public final class EditorSessionKt {
+ }
+
+ public final class PreviewScreenshotParams {
+ ctor public PreviewScreenshotParams(androidx.wear.watchface.RenderParameters renderParameters, java.time.Instant instant);
+ method public java.time.Instant getInstant();
+ method public androidx.wear.watchface.RenderParameters getRenderParameters();
+ property public final java.time.Instant instant;
+ property public final androidx.wear.watchface.RenderParameters renderParameters;
+ }
+
+ public class WatchFaceEditorContract extends androidx.activity.result.contract.ActivityResultContract<androidx.wear.watchface.editor.EditorRequest,kotlin.Unit> {
+ ctor public WatchFaceEditorContract();
+ method public android.content.Intent createIntent(android.content.Context context, androidx.wear.watchface.editor.EditorRequest input);
+ method public void parseResult(int resultCode, android.content.Intent? intent);
+ field public static final String ACTION_WATCH_FACE_EDITOR = "androidx.wear.watchface.editor.action.WATCH_FACE_EDITOR";
+ field public static final androidx.wear.watchface.editor.WatchFaceEditorContract.Companion Companion;
+ }
+
+ public static final class WatchFaceEditorContract.Companion {
+ }
+
+ public final class WatchFaceEditorContractKt {
+ }
+
+}
+
diff --git a/wear/watchface/watchface-editor/api/public_plus_experimental_1.1.0-beta03.txt b/wear/watchface/watchface-editor/api/public_plus_experimental_1.1.0-beta03.txt
new file mode 100644
index 0000000..817f024
--- /dev/null
+++ b/wear/watchface/watchface-editor/api/public_plus_experimental_1.1.0-beta03.txt
@@ -0,0 +1,100 @@
+// Signature format: 4.0
+package androidx.wear.watchface.editor {
+
+ public final class ChosenComplicationDataSource {
+ ctor public ChosenComplicationDataSource(int complicationSlotId, androidx.wear.watchface.complications.ComplicationDataSourceInfo? complicationDataSourceInfo, android.os.Bundle extras);
+ method public androidx.wear.watchface.complications.ComplicationDataSourceInfo? getComplicationDataSourceInfo();
+ method public int getComplicationSlotId();
+ method public android.os.Bundle getExtras();
+ property public final androidx.wear.watchface.complications.ComplicationDataSourceInfo? complicationDataSourceInfo;
+ property public final int complicationSlotId;
+ property public final android.os.Bundle extras;
+ }
+
+ public final class EditorRequest {
+ ctor @RequiresApi(android.os.Build.VERSION_CODES.R) public EditorRequest(android.content.ComponentName watchFaceComponentName, String editorPackageName, androidx.wear.watchface.style.UserStyleData? initialUserStyle, @RequiresApi(android.os.Build.VERSION_CODES.R) androidx.wear.watchface.client.WatchFaceId watchFaceId, androidx.wear.watchface.client.DeviceConfig? headlessDeviceConfig, androidx.wear.watchface.editor.PreviewScreenshotParams? previewScreenshotParams);
+ ctor public EditorRequest(android.content.ComponentName watchFaceComponentName, String editorPackageName, androidx.wear.watchface.style.UserStyleData? initialUserStyle);
+ method @kotlin.jvm.Throws(exceptionClasses=TimeoutCancellationException::class) public static androidx.wear.watchface.editor.EditorRequest createFromIntent(android.content.Intent intent) throws kotlinx.coroutines.TimeoutCancellationException;
+ method public String getEditorPackageName();
+ method public androidx.wear.watchface.client.DeviceConfig? getHeadlessDeviceConfig();
+ method public androidx.wear.watchface.style.UserStyleData? getInitialUserStyle();
+ method public androidx.wear.watchface.editor.PreviewScreenshotParams? getPreviewScreenshotParams();
+ method public android.content.ComponentName getWatchFaceComponentName();
+ method @RequiresApi(android.os.Build.VERSION_CODES.R) public androidx.wear.watchface.client.WatchFaceId getWatchFaceId();
+ property public final String editorPackageName;
+ property public final androidx.wear.watchface.client.DeviceConfig? headlessDeviceConfig;
+ property public final androidx.wear.watchface.style.UserStyleData? initialUserStyle;
+ property public final androidx.wear.watchface.editor.PreviewScreenshotParams? previewScreenshotParams;
+ property public final android.content.ComponentName watchFaceComponentName;
+ property @RequiresApi(android.os.Build.VERSION_CODES.R) public final androidx.wear.watchface.client.WatchFaceId watchFaceId;
+ field public static final androidx.wear.watchface.editor.EditorRequest.Companion Companion;
+ }
+
+ public static final class EditorRequest.Companion {
+ method @kotlin.jvm.Throws(exceptionClasses=TimeoutCancellationException::class) public androidx.wear.watchface.editor.EditorRequest createFromIntent(android.content.Intent intent) throws kotlinx.coroutines.TimeoutCancellationException;
+ }
+
+ public interface EditorSession extends java.lang.AutoCloseable {
+ method @RequiresApi(27) @UiThread public default static androidx.wear.watchface.editor.EditorSession createHeadlessEditorSession(androidx.activity.ComponentActivity activity, android.content.Intent editIntent, androidx.wear.watchface.client.HeadlessWatchFaceClient headlessWatchFaceClient);
+ method @UiThread @kotlin.jvm.Throws(exceptionClasses=TimeoutCancellationException::class) public default static suspend Object? createOnWatchEditorSession(androidx.activity.ComponentActivity activity, kotlin.coroutines.Continuation<? super androidx.wear.watchface.editor.EditorSession>) throws kotlinx.coroutines.TimeoutCancellationException;
+ method public Integer? getBackgroundComplicationSlotId();
+ method @UiThread public Integer? getComplicationSlotIdAt(@Px int x, @Px int y);
+ method public kotlinx.coroutines.flow.StateFlow<java.util.Map<java.lang.Integer,androidx.wear.watchface.client.ComplicationSlotState>> getComplicationSlotsState();
+ method public kotlinx.coroutines.flow.StateFlow<java.util.Map<java.lang.Integer,androidx.wear.watchface.complications.ComplicationDataSourceInfo>> getComplicationsDataSourceInfo();
+ method public kotlinx.coroutines.flow.StateFlow<java.util.Map<java.lang.Integer,androidx.wear.watchface.complications.data.ComplicationData>> getComplicationsPreviewData();
+ method public java.time.Instant getPreviewReferenceInstant();
+ method public kotlinx.coroutines.flow.MutableStateFlow<androidx.wear.watchface.style.UserStyle> getUserStyle();
+ method public androidx.wear.watchface.style.UserStyleSchema getUserStyleSchema();
+ method public android.content.ComponentName getWatchFaceComponentName();
+ method public androidx.wear.watchface.client.WatchFaceId getWatchFaceId();
+ method @UiThread public boolean isCommitChangesOnClose();
+ method @UiThread public suspend Object? openComplicationDataSourceChooser(int complicationSlotId, kotlin.coroutines.Continuation<? super androidx.wear.watchface.editor.ChosenComplicationDataSource>);
+ method @UiThread public android.graphics.Bitmap renderWatchFaceToBitmap(androidx.wear.watchface.RenderParameters renderParameters, java.time.Instant instant, java.util.Map<java.lang.Integer,? extends androidx.wear.watchface.complications.data.ComplicationData>? slotIdToComplicationData);
+ method @UiThread public void setCommitChangesOnClose(boolean);
+ property public abstract Integer? backgroundComplicationSlotId;
+ property @UiThread public abstract boolean commitChangesOnClose;
+ property public abstract kotlinx.coroutines.flow.StateFlow<java.util.Map<java.lang.Integer,androidx.wear.watchface.client.ComplicationSlotState>> complicationSlotsState;
+ property public abstract kotlinx.coroutines.flow.StateFlow<java.util.Map<java.lang.Integer,androidx.wear.watchface.complications.ComplicationDataSourceInfo>> complicationsDataSourceInfo;
+ property public abstract kotlinx.coroutines.flow.StateFlow<java.util.Map<java.lang.Integer,androidx.wear.watchface.complications.data.ComplicationData>> complicationsPreviewData;
+ property public abstract java.time.Instant previewReferenceInstant;
+ property public abstract kotlinx.coroutines.flow.MutableStateFlow<androidx.wear.watchface.style.UserStyle> userStyle;
+ property public abstract androidx.wear.watchface.style.UserStyleSchema userStyleSchema;
+ property public abstract android.content.ComponentName watchFaceComponentName;
+ property public abstract androidx.wear.watchface.client.WatchFaceId watchFaceId;
+ field public static final androidx.wear.watchface.editor.EditorSession.Companion Companion;
+ field public static final java.time.Instant DEFAULT_PREVIEW_INSTANT;
+ field public static final java.time.Duration EDITING_SESSION_TIMEOUT;
+ }
+
+ public static final class EditorSession.Companion {
+ method @RequiresApi(27) @UiThread public androidx.wear.watchface.editor.EditorSession createHeadlessEditorSession(androidx.activity.ComponentActivity activity, android.content.Intent editIntent, androidx.wear.watchface.client.HeadlessWatchFaceClient headlessWatchFaceClient);
+ method @UiThread @kotlin.jvm.Throws(exceptionClasses=TimeoutCancellationException::class) public suspend Object? createOnWatchEditorSession(androidx.activity.ComponentActivity activity, kotlin.coroutines.Continuation<? super androidx.wear.watchface.editor.EditorSession>) throws kotlinx.coroutines.TimeoutCancellationException;
+ }
+
+ public final class EditorSessionKt {
+ }
+
+ public final class PreviewScreenshotParams {
+ ctor public PreviewScreenshotParams(androidx.wear.watchface.RenderParameters renderParameters, java.time.Instant instant);
+ method public java.time.Instant getInstant();
+ method public androidx.wear.watchface.RenderParameters getRenderParameters();
+ property public final java.time.Instant instant;
+ property public final androidx.wear.watchface.RenderParameters renderParameters;
+ }
+
+ public class WatchFaceEditorContract extends androidx.activity.result.contract.ActivityResultContract<androidx.wear.watchface.editor.EditorRequest,kotlin.Unit> {
+ ctor public WatchFaceEditorContract();
+ method public android.content.Intent createIntent(android.content.Context context, androidx.wear.watchface.editor.EditorRequest input);
+ method public void parseResult(int resultCode, android.content.Intent? intent);
+ field public static final String ACTION_WATCH_FACE_EDITOR = "androidx.wear.watchface.editor.action.WATCH_FACE_EDITOR";
+ field public static final androidx.wear.watchface.editor.WatchFaceEditorContract.Companion Companion;
+ }
+
+ public static final class WatchFaceEditorContract.Companion {
+ }
+
+ public final class WatchFaceEditorContractKt {
+ }
+
+}
+
diff --git a/wear/watchface/watchface-editor/api/res-1.1.0-beta03.txt b/wear/watchface/watchface-editor/api/res-1.1.0-beta03.txt
new file mode 100644
index 0000000..e69de29
--- /dev/null
+++ b/wear/watchface/watchface-editor/api/res-1.1.0-beta03.txt
diff --git a/wear/watchface/watchface-editor/api/restricted_1.1.0-beta03.txt b/wear/watchface/watchface-editor/api/restricted_1.1.0-beta03.txt
new file mode 100644
index 0000000..817f024
--- /dev/null
+++ b/wear/watchface/watchface-editor/api/restricted_1.1.0-beta03.txt
@@ -0,0 +1,100 @@
+// Signature format: 4.0
+package androidx.wear.watchface.editor {
+
+ public final class ChosenComplicationDataSource {
+ ctor public ChosenComplicationDataSource(int complicationSlotId, androidx.wear.watchface.complications.ComplicationDataSourceInfo? complicationDataSourceInfo, android.os.Bundle extras);
+ method public androidx.wear.watchface.complications.ComplicationDataSourceInfo? getComplicationDataSourceInfo();
+ method public int getComplicationSlotId();
+ method public android.os.Bundle getExtras();
+ property public final androidx.wear.watchface.complications.ComplicationDataSourceInfo? complicationDataSourceInfo;
+ property public final int complicationSlotId;
+ property public final android.os.Bundle extras;
+ }
+
+ public final class EditorRequest {
+ ctor @RequiresApi(android.os.Build.VERSION_CODES.R) public EditorRequest(android.content.ComponentName watchFaceComponentName, String editorPackageName, androidx.wear.watchface.style.UserStyleData? initialUserStyle, @RequiresApi(android.os.Build.VERSION_CODES.R) androidx.wear.watchface.client.WatchFaceId watchFaceId, androidx.wear.watchface.client.DeviceConfig? headlessDeviceConfig, androidx.wear.watchface.editor.PreviewScreenshotParams? previewScreenshotParams);
+ ctor public EditorRequest(android.content.ComponentName watchFaceComponentName, String editorPackageName, androidx.wear.watchface.style.UserStyleData? initialUserStyle);
+ method @kotlin.jvm.Throws(exceptionClasses=TimeoutCancellationException::class) public static androidx.wear.watchface.editor.EditorRequest createFromIntent(android.content.Intent intent) throws kotlinx.coroutines.TimeoutCancellationException;
+ method public String getEditorPackageName();
+ method public androidx.wear.watchface.client.DeviceConfig? getHeadlessDeviceConfig();
+ method public androidx.wear.watchface.style.UserStyleData? getInitialUserStyle();
+ method public androidx.wear.watchface.editor.PreviewScreenshotParams? getPreviewScreenshotParams();
+ method public android.content.ComponentName getWatchFaceComponentName();
+ method @RequiresApi(android.os.Build.VERSION_CODES.R) public androidx.wear.watchface.client.WatchFaceId getWatchFaceId();
+ property public final String editorPackageName;
+ property public final androidx.wear.watchface.client.DeviceConfig? headlessDeviceConfig;
+ property public final androidx.wear.watchface.style.UserStyleData? initialUserStyle;
+ property public final androidx.wear.watchface.editor.PreviewScreenshotParams? previewScreenshotParams;
+ property public final android.content.ComponentName watchFaceComponentName;
+ property @RequiresApi(android.os.Build.VERSION_CODES.R) public final androidx.wear.watchface.client.WatchFaceId watchFaceId;
+ field public static final androidx.wear.watchface.editor.EditorRequest.Companion Companion;
+ }
+
+ public static final class EditorRequest.Companion {
+ method @kotlin.jvm.Throws(exceptionClasses=TimeoutCancellationException::class) public androidx.wear.watchface.editor.EditorRequest createFromIntent(android.content.Intent intent) throws kotlinx.coroutines.TimeoutCancellationException;
+ }
+
+ public interface EditorSession extends java.lang.AutoCloseable {
+ method @RequiresApi(27) @UiThread public default static androidx.wear.watchface.editor.EditorSession createHeadlessEditorSession(androidx.activity.ComponentActivity activity, android.content.Intent editIntent, androidx.wear.watchface.client.HeadlessWatchFaceClient headlessWatchFaceClient);
+ method @UiThread @kotlin.jvm.Throws(exceptionClasses=TimeoutCancellationException::class) public default static suspend Object? createOnWatchEditorSession(androidx.activity.ComponentActivity activity, kotlin.coroutines.Continuation<? super androidx.wear.watchface.editor.EditorSession>) throws kotlinx.coroutines.TimeoutCancellationException;
+ method public Integer? getBackgroundComplicationSlotId();
+ method @UiThread public Integer? getComplicationSlotIdAt(@Px int x, @Px int y);
+ method public kotlinx.coroutines.flow.StateFlow<java.util.Map<java.lang.Integer,androidx.wear.watchface.client.ComplicationSlotState>> getComplicationSlotsState();
+ method public kotlinx.coroutines.flow.StateFlow<java.util.Map<java.lang.Integer,androidx.wear.watchface.complications.ComplicationDataSourceInfo>> getComplicationsDataSourceInfo();
+ method public kotlinx.coroutines.flow.StateFlow<java.util.Map<java.lang.Integer,androidx.wear.watchface.complications.data.ComplicationData>> getComplicationsPreviewData();
+ method public java.time.Instant getPreviewReferenceInstant();
+ method public kotlinx.coroutines.flow.MutableStateFlow<androidx.wear.watchface.style.UserStyle> getUserStyle();
+ method public androidx.wear.watchface.style.UserStyleSchema getUserStyleSchema();
+ method public android.content.ComponentName getWatchFaceComponentName();
+ method public androidx.wear.watchface.client.WatchFaceId getWatchFaceId();
+ method @UiThread public boolean isCommitChangesOnClose();
+ method @UiThread public suspend Object? openComplicationDataSourceChooser(int complicationSlotId, kotlin.coroutines.Continuation<? super androidx.wear.watchface.editor.ChosenComplicationDataSource>);
+ method @UiThread public android.graphics.Bitmap renderWatchFaceToBitmap(androidx.wear.watchface.RenderParameters renderParameters, java.time.Instant instant, java.util.Map<java.lang.Integer,? extends androidx.wear.watchface.complications.data.ComplicationData>? slotIdToComplicationData);
+ method @UiThread public void setCommitChangesOnClose(boolean);
+ property public abstract Integer? backgroundComplicationSlotId;
+ property @UiThread public abstract boolean commitChangesOnClose;
+ property public abstract kotlinx.coroutines.flow.StateFlow<java.util.Map<java.lang.Integer,androidx.wear.watchface.client.ComplicationSlotState>> complicationSlotsState;
+ property public abstract kotlinx.coroutines.flow.StateFlow<java.util.Map<java.lang.Integer,androidx.wear.watchface.complications.ComplicationDataSourceInfo>> complicationsDataSourceInfo;
+ property public abstract kotlinx.coroutines.flow.StateFlow<java.util.Map<java.lang.Integer,androidx.wear.watchface.complications.data.ComplicationData>> complicationsPreviewData;
+ property public abstract java.time.Instant previewReferenceInstant;
+ property public abstract kotlinx.coroutines.flow.MutableStateFlow<androidx.wear.watchface.style.UserStyle> userStyle;
+ property public abstract androidx.wear.watchface.style.UserStyleSchema userStyleSchema;
+ property public abstract android.content.ComponentName watchFaceComponentName;
+ property public abstract androidx.wear.watchface.client.WatchFaceId watchFaceId;
+ field public static final androidx.wear.watchface.editor.EditorSession.Companion Companion;
+ field public static final java.time.Instant DEFAULT_PREVIEW_INSTANT;
+ field public static final java.time.Duration EDITING_SESSION_TIMEOUT;
+ }
+
+ public static final class EditorSession.Companion {
+ method @RequiresApi(27) @UiThread public androidx.wear.watchface.editor.EditorSession createHeadlessEditorSession(androidx.activity.ComponentActivity activity, android.content.Intent editIntent, androidx.wear.watchface.client.HeadlessWatchFaceClient headlessWatchFaceClient);
+ method @UiThread @kotlin.jvm.Throws(exceptionClasses=TimeoutCancellationException::class) public suspend Object? createOnWatchEditorSession(androidx.activity.ComponentActivity activity, kotlin.coroutines.Continuation<? super androidx.wear.watchface.editor.EditorSession>) throws kotlinx.coroutines.TimeoutCancellationException;
+ }
+
+ public final class EditorSessionKt {
+ }
+
+ public final class PreviewScreenshotParams {
+ ctor public PreviewScreenshotParams(androidx.wear.watchface.RenderParameters renderParameters, java.time.Instant instant);
+ method public java.time.Instant getInstant();
+ method public androidx.wear.watchface.RenderParameters getRenderParameters();
+ property public final java.time.Instant instant;
+ property public final androidx.wear.watchface.RenderParameters renderParameters;
+ }
+
+ public class WatchFaceEditorContract extends androidx.activity.result.contract.ActivityResultContract<androidx.wear.watchface.editor.EditorRequest,kotlin.Unit> {
+ ctor public WatchFaceEditorContract();
+ method public android.content.Intent createIntent(android.content.Context context, androidx.wear.watchface.editor.EditorRequest input);
+ method public void parseResult(int resultCode, android.content.Intent? intent);
+ field public static final String ACTION_WATCH_FACE_EDITOR = "androidx.wear.watchface.editor.action.WATCH_FACE_EDITOR";
+ field public static final androidx.wear.watchface.editor.WatchFaceEditorContract.Companion Companion;
+ }
+
+ public static final class WatchFaceEditorContract.Companion {
+ }
+
+ public final class WatchFaceEditorContractKt {
+ }
+
+}
+
diff --git a/wear/watchface/watchface-editor/src/main/java/androidx/wear/watchface/editor/EditorSession.kt b/wear/watchface/watchface-editor/src/main/java/androidx/wear/watchface/editor/EditorSession.kt
index 3f0ac7b..7199dd1 100644
--- a/wear/watchface/watchface-editor/src/main/java/androidx/wear/watchface/editor/EditorSession.kt
+++ b/wear/watchface/watchface-editor/src/main/java/androidx/wear/watchface/editor/EditorSession.kt
@@ -673,8 +673,10 @@
}
requireNotClosed()
EditorService.globalEditorService.removeCloseCallback(closeCallback)
- // We need to send the preview data which we obtain asynchronously.
- coroutineScope.launchWithTracing("BaseEditorSession.close") {
+ // We need to send the preview data which we obtain asynchronously, however we need to
+ // shutdown gracefully in the same task or we risk leaking the
+ // ComplicationDataSourceInfoRetriever.
+ runBlocking {
try {
withTimeout(CLOSE_BROADCAST_TIMEOUT_MILLIS) {
deferredComplicationPreviewDataAvailable.await()
diff --git a/wear/watchface/watchface-guava/api/1.1.0-beta03.txt b/wear/watchface/watchface-guava/api/1.1.0-beta03.txt
new file mode 100644
index 0000000..98993bd
--- /dev/null
+++ b/wear/watchface/watchface-guava/api/1.1.0-beta03.txt
@@ -0,0 +1,56 @@
+// Signature format: 4.0
+package androidx.wear.watchface {
+
+ @Deprecated public abstract class ListenableCanvasRenderer extends androidx.wear.watchface.Renderer.CanvasRenderer {
+ ctor @Deprecated public ListenableCanvasRenderer(android.view.SurfaceHolder surfaceHolder, androidx.wear.watchface.style.CurrentUserStyleRepository currentUserStyleRepository, androidx.wear.watchface.WatchState watchState, @androidx.wear.watchface.CanvasType int canvasType, @IntRange(from=0L, to=60000L) long interactiveDrawModeUpdateDelayMillis, optional boolean clearWithBackgroundTintBeforeRenderingHighlightLayer);
+ ctor @Deprecated public ListenableCanvasRenderer(android.view.SurfaceHolder surfaceHolder, androidx.wear.watchface.style.CurrentUserStyleRepository currentUserStyleRepository, androidx.wear.watchface.WatchState watchState, @androidx.wear.watchface.CanvasType int canvasType, @IntRange(from=0L, to=60000L) long interactiveDrawModeUpdateDelayMillis);
+ method @Deprecated public suspend Object? init(kotlin.coroutines.Continuation<? super kotlin.Unit>);
+ method @Deprecated @UiThread public com.google.common.util.concurrent.ListenableFuture<kotlin.Unit> initFuture();
+ }
+
+ public abstract class ListenableCanvasRenderer2<SharedAssetsT extends androidx.wear.watchface.Renderer.SharedAssets> extends androidx.wear.watchface.Renderer.CanvasRenderer2<SharedAssetsT> {
+ ctor public ListenableCanvasRenderer2(android.view.SurfaceHolder surfaceHolder, androidx.wear.watchface.style.CurrentUserStyleRepository currentUserStyleRepository, androidx.wear.watchface.WatchState watchState, @androidx.wear.watchface.CanvasType int canvasType, @IntRange(from=0L, to=60000L) long interactiveDrawModeUpdateDelayMillis, optional boolean clearWithBackgroundTintBeforeRenderingHighlightLayer);
+ ctor public ListenableCanvasRenderer2(android.view.SurfaceHolder surfaceHolder, androidx.wear.watchface.style.CurrentUserStyleRepository currentUserStyleRepository, androidx.wear.watchface.WatchState watchState, @androidx.wear.watchface.CanvasType int canvasType, @IntRange(from=0L, to=60000L) long interactiveDrawModeUpdateDelayMillis);
+ method protected final suspend Object? createSharedAssets(kotlin.coroutines.Continuation<? super SharedAssetsT>);
+ method @WorkerThread public abstract com.google.common.util.concurrent.ListenableFuture<SharedAssetsT> createSharedAssetsFuture();
+ method public final suspend Object? init(kotlin.coroutines.Continuation<? super kotlin.Unit>);
+ method @UiThread public com.google.common.util.concurrent.ListenableFuture<kotlin.Unit> initFuture();
+ }
+
+ @Deprecated public abstract class ListenableGlesRenderer extends androidx.wear.watchface.Renderer.GlesRenderer {
+ ctor @Deprecated @kotlin.jvm.Throws(exceptionClasses=GlesException::class) public ListenableGlesRenderer(android.view.SurfaceHolder surfaceHolder, androidx.wear.watchface.style.CurrentUserStyleRepository currentUserStyleRepository, androidx.wear.watchface.WatchState watchState, @IntRange(from=0L, to=60000L) long interactiveDrawModeUpdateDelayMillis, optional int[] eglConfigAttribList, optional int[] eglSurfaceAttribList) throws androidx.wear.watchface.Renderer.GlesRenderer.GlesException;
+ ctor @Deprecated @kotlin.jvm.Throws(exceptionClasses=GlesException::class) public ListenableGlesRenderer(android.view.SurfaceHolder surfaceHolder, androidx.wear.watchface.style.CurrentUserStyleRepository currentUserStyleRepository, androidx.wear.watchface.WatchState watchState, @IntRange(from=0L, to=60000L) long interactiveDrawModeUpdateDelayMillis, optional int[] eglConfigAttribList) throws androidx.wear.watchface.Renderer.GlesRenderer.GlesException;
+ ctor @Deprecated @kotlin.jvm.Throws(exceptionClasses=GlesException::class) public ListenableGlesRenderer(android.view.SurfaceHolder surfaceHolder, androidx.wear.watchface.style.CurrentUserStyleRepository currentUserStyleRepository, androidx.wear.watchface.WatchState watchState, @IntRange(from=0L, to=60000L) long interactiveDrawModeUpdateDelayMillis) throws androidx.wear.watchface.Renderer.GlesRenderer.GlesException;
+ method @Deprecated public suspend Object? onBackgroundThreadGlContextCreated(kotlin.coroutines.Continuation<? super kotlin.Unit>);
+ method @Deprecated protected com.google.common.util.concurrent.ListenableFuture<kotlin.Unit> onBackgroundThreadGlContextCreatedFuture();
+ method @Deprecated public suspend Object? onUiThreadGlSurfaceCreated(@Px int width, @Px int height, kotlin.coroutines.Continuation<? super kotlin.Unit>);
+ method @Deprecated @UiThread protected com.google.common.util.concurrent.ListenableFuture<kotlin.Unit> onUiThreadGlSurfaceCreatedFuture(@Px int width, @Px int height);
+ method @Deprecated @WorkerThread public final void runBackgroundThreadGlCommands(Runnable runnable);
+ method @Deprecated @UiThread public final void runUiThreadGlCommands(Runnable runnable);
+ }
+
+ public abstract class ListenableGlesRenderer2<SharedAssetsT extends androidx.wear.watchface.Renderer.SharedAssets> extends androidx.wear.watchface.Renderer.GlesRenderer2<SharedAssetsT> {
+ ctor @kotlin.jvm.Throws(exceptionClasses=GlesException::class) public ListenableGlesRenderer2(android.view.SurfaceHolder surfaceHolder, androidx.wear.watchface.style.CurrentUserStyleRepository currentUserStyleRepository, androidx.wear.watchface.WatchState watchState, @IntRange(from=0L, to=60000L) long interactiveDrawModeUpdateDelayMillis, optional int[] eglConfigAttribList, optional int[] eglSurfaceAttribList) throws androidx.wear.watchface.Renderer.GlesRenderer.GlesException;
+ ctor @kotlin.jvm.Throws(exceptionClasses=GlesException::class) public ListenableGlesRenderer2(android.view.SurfaceHolder surfaceHolder, androidx.wear.watchface.style.CurrentUserStyleRepository currentUserStyleRepository, androidx.wear.watchface.WatchState watchState, @IntRange(from=0L, to=60000L) long interactiveDrawModeUpdateDelayMillis, optional int[] eglConfigAttribList) throws androidx.wear.watchface.Renderer.GlesRenderer.GlesException;
+ ctor @kotlin.jvm.Throws(exceptionClasses=GlesException::class) public ListenableGlesRenderer2(android.view.SurfaceHolder surfaceHolder, androidx.wear.watchface.style.CurrentUserStyleRepository currentUserStyleRepository, androidx.wear.watchface.WatchState watchState, @IntRange(from=0L, to=60000L) long interactiveDrawModeUpdateDelayMillis) throws androidx.wear.watchface.Renderer.GlesRenderer.GlesException;
+ method protected final suspend Object? createSharedAssets(kotlin.coroutines.Continuation<? super SharedAssetsT>);
+ method @WorkerThread public abstract com.google.common.util.concurrent.ListenableFuture<SharedAssetsT> createSharedAssetsFuture();
+ method public final suspend Object? onBackgroundThreadGlContextCreated(kotlin.coroutines.Continuation<? super kotlin.Unit>);
+ method protected com.google.common.util.concurrent.ListenableFuture<kotlin.Unit> onBackgroundThreadGlContextCreatedFuture();
+ method public final suspend Object? onUiThreadGlSurfaceCreated(@Px int width, @Px int height, kotlin.coroutines.Continuation<? super kotlin.Unit>);
+ method @UiThread protected com.google.common.util.concurrent.ListenableFuture<kotlin.Unit> onUiThreadGlSurfaceCreatedFuture(@Px int width, @Px int height);
+ method @WorkerThread public final void runBackgroundThreadGlCommands(Runnable runnable);
+ method @UiThread public final void runUiThreadGlCommands(Runnable runnable);
+ }
+
+ public final class ListenableGlesRendererKt {
+ }
+
+ public abstract class ListenableWatchFaceService extends androidx.wear.watchface.WatchFaceService {
+ ctor public ListenableWatchFaceService();
+ method protected suspend Object? createWatchFace(android.view.SurfaceHolder surfaceHolder, androidx.wear.watchface.WatchState watchState, androidx.wear.watchface.ComplicationSlotsManager complicationSlotsManager, androidx.wear.watchface.style.CurrentUserStyleRepository currentUserStyleRepository, kotlin.coroutines.Continuation<? super androidx.wear.watchface.WatchFace>);
+ method protected abstract com.google.common.util.concurrent.ListenableFuture<androidx.wear.watchface.WatchFace> createWatchFaceFuture(android.view.SurfaceHolder surfaceHolder, androidx.wear.watchface.WatchState watchState, androidx.wear.watchface.ComplicationSlotsManager complicationSlotsManager, androidx.wear.watchface.style.CurrentUserStyleRepository currentUserStyleRepository);
+ }
+
+}
+
diff --git a/wear/watchface/watchface-guava/api/public_plus_experimental_1.1.0-beta03.txt b/wear/watchface/watchface-guava/api/public_plus_experimental_1.1.0-beta03.txt
new file mode 100644
index 0000000..98993bd
--- /dev/null
+++ b/wear/watchface/watchface-guava/api/public_plus_experimental_1.1.0-beta03.txt
@@ -0,0 +1,56 @@
+// Signature format: 4.0
+package androidx.wear.watchface {
+
+ @Deprecated public abstract class ListenableCanvasRenderer extends androidx.wear.watchface.Renderer.CanvasRenderer {
+ ctor @Deprecated public ListenableCanvasRenderer(android.view.SurfaceHolder surfaceHolder, androidx.wear.watchface.style.CurrentUserStyleRepository currentUserStyleRepository, androidx.wear.watchface.WatchState watchState, @androidx.wear.watchface.CanvasType int canvasType, @IntRange(from=0L, to=60000L) long interactiveDrawModeUpdateDelayMillis, optional boolean clearWithBackgroundTintBeforeRenderingHighlightLayer);
+ ctor @Deprecated public ListenableCanvasRenderer(android.view.SurfaceHolder surfaceHolder, androidx.wear.watchface.style.CurrentUserStyleRepository currentUserStyleRepository, androidx.wear.watchface.WatchState watchState, @androidx.wear.watchface.CanvasType int canvasType, @IntRange(from=0L, to=60000L) long interactiveDrawModeUpdateDelayMillis);
+ method @Deprecated public suspend Object? init(kotlin.coroutines.Continuation<? super kotlin.Unit>);
+ method @Deprecated @UiThread public com.google.common.util.concurrent.ListenableFuture<kotlin.Unit> initFuture();
+ }
+
+ public abstract class ListenableCanvasRenderer2<SharedAssetsT extends androidx.wear.watchface.Renderer.SharedAssets> extends androidx.wear.watchface.Renderer.CanvasRenderer2<SharedAssetsT> {
+ ctor public ListenableCanvasRenderer2(android.view.SurfaceHolder surfaceHolder, androidx.wear.watchface.style.CurrentUserStyleRepository currentUserStyleRepository, androidx.wear.watchface.WatchState watchState, @androidx.wear.watchface.CanvasType int canvasType, @IntRange(from=0L, to=60000L) long interactiveDrawModeUpdateDelayMillis, optional boolean clearWithBackgroundTintBeforeRenderingHighlightLayer);
+ ctor public ListenableCanvasRenderer2(android.view.SurfaceHolder surfaceHolder, androidx.wear.watchface.style.CurrentUserStyleRepository currentUserStyleRepository, androidx.wear.watchface.WatchState watchState, @androidx.wear.watchface.CanvasType int canvasType, @IntRange(from=0L, to=60000L) long interactiveDrawModeUpdateDelayMillis);
+ method protected final suspend Object? createSharedAssets(kotlin.coroutines.Continuation<? super SharedAssetsT>);
+ method @WorkerThread public abstract com.google.common.util.concurrent.ListenableFuture<SharedAssetsT> createSharedAssetsFuture();
+ method public final suspend Object? init(kotlin.coroutines.Continuation<? super kotlin.Unit>);
+ method @UiThread public com.google.common.util.concurrent.ListenableFuture<kotlin.Unit> initFuture();
+ }
+
+ @Deprecated public abstract class ListenableGlesRenderer extends androidx.wear.watchface.Renderer.GlesRenderer {
+ ctor @Deprecated @kotlin.jvm.Throws(exceptionClasses=GlesException::class) public ListenableGlesRenderer(android.view.SurfaceHolder surfaceHolder, androidx.wear.watchface.style.CurrentUserStyleRepository currentUserStyleRepository, androidx.wear.watchface.WatchState watchState, @IntRange(from=0L, to=60000L) long interactiveDrawModeUpdateDelayMillis, optional int[] eglConfigAttribList, optional int[] eglSurfaceAttribList) throws androidx.wear.watchface.Renderer.GlesRenderer.GlesException;
+ ctor @Deprecated @kotlin.jvm.Throws(exceptionClasses=GlesException::class) public ListenableGlesRenderer(android.view.SurfaceHolder surfaceHolder, androidx.wear.watchface.style.CurrentUserStyleRepository currentUserStyleRepository, androidx.wear.watchface.WatchState watchState, @IntRange(from=0L, to=60000L) long interactiveDrawModeUpdateDelayMillis, optional int[] eglConfigAttribList) throws androidx.wear.watchface.Renderer.GlesRenderer.GlesException;
+ ctor @Deprecated @kotlin.jvm.Throws(exceptionClasses=GlesException::class) public ListenableGlesRenderer(android.view.SurfaceHolder surfaceHolder, androidx.wear.watchface.style.CurrentUserStyleRepository currentUserStyleRepository, androidx.wear.watchface.WatchState watchState, @IntRange(from=0L, to=60000L) long interactiveDrawModeUpdateDelayMillis) throws androidx.wear.watchface.Renderer.GlesRenderer.GlesException;
+ method @Deprecated public suspend Object? onBackgroundThreadGlContextCreated(kotlin.coroutines.Continuation<? super kotlin.Unit>);
+ method @Deprecated protected com.google.common.util.concurrent.ListenableFuture<kotlin.Unit> onBackgroundThreadGlContextCreatedFuture();
+ method @Deprecated public suspend Object? onUiThreadGlSurfaceCreated(@Px int width, @Px int height, kotlin.coroutines.Continuation<? super kotlin.Unit>);
+ method @Deprecated @UiThread protected com.google.common.util.concurrent.ListenableFuture<kotlin.Unit> onUiThreadGlSurfaceCreatedFuture(@Px int width, @Px int height);
+ method @Deprecated @WorkerThread public final void runBackgroundThreadGlCommands(Runnable runnable);
+ method @Deprecated @UiThread public final void runUiThreadGlCommands(Runnable runnable);
+ }
+
+ public abstract class ListenableGlesRenderer2<SharedAssetsT extends androidx.wear.watchface.Renderer.SharedAssets> extends androidx.wear.watchface.Renderer.GlesRenderer2<SharedAssetsT> {
+ ctor @kotlin.jvm.Throws(exceptionClasses=GlesException::class) public ListenableGlesRenderer2(android.view.SurfaceHolder surfaceHolder, androidx.wear.watchface.style.CurrentUserStyleRepository currentUserStyleRepository, androidx.wear.watchface.WatchState watchState, @IntRange(from=0L, to=60000L) long interactiveDrawModeUpdateDelayMillis, optional int[] eglConfigAttribList, optional int[] eglSurfaceAttribList) throws androidx.wear.watchface.Renderer.GlesRenderer.GlesException;
+ ctor @kotlin.jvm.Throws(exceptionClasses=GlesException::class) public ListenableGlesRenderer2(android.view.SurfaceHolder surfaceHolder, androidx.wear.watchface.style.CurrentUserStyleRepository currentUserStyleRepository, androidx.wear.watchface.WatchState watchState, @IntRange(from=0L, to=60000L) long interactiveDrawModeUpdateDelayMillis, optional int[] eglConfigAttribList) throws androidx.wear.watchface.Renderer.GlesRenderer.GlesException;
+ ctor @kotlin.jvm.Throws(exceptionClasses=GlesException::class) public ListenableGlesRenderer2(android.view.SurfaceHolder surfaceHolder, androidx.wear.watchface.style.CurrentUserStyleRepository currentUserStyleRepository, androidx.wear.watchface.WatchState watchState, @IntRange(from=0L, to=60000L) long interactiveDrawModeUpdateDelayMillis) throws androidx.wear.watchface.Renderer.GlesRenderer.GlesException;
+ method protected final suspend Object? createSharedAssets(kotlin.coroutines.Continuation<? super SharedAssetsT>);
+ method @WorkerThread public abstract com.google.common.util.concurrent.ListenableFuture<SharedAssetsT> createSharedAssetsFuture();
+ method public final suspend Object? onBackgroundThreadGlContextCreated(kotlin.coroutines.Continuation<? super kotlin.Unit>);
+ method protected com.google.common.util.concurrent.ListenableFuture<kotlin.Unit> onBackgroundThreadGlContextCreatedFuture();
+ method public final suspend Object? onUiThreadGlSurfaceCreated(@Px int width, @Px int height, kotlin.coroutines.Continuation<? super kotlin.Unit>);
+ method @UiThread protected com.google.common.util.concurrent.ListenableFuture<kotlin.Unit> onUiThreadGlSurfaceCreatedFuture(@Px int width, @Px int height);
+ method @WorkerThread public final void runBackgroundThreadGlCommands(Runnable runnable);
+ method @UiThread public final void runUiThreadGlCommands(Runnable runnable);
+ }
+
+ public final class ListenableGlesRendererKt {
+ }
+
+ public abstract class ListenableWatchFaceService extends androidx.wear.watchface.WatchFaceService {
+ ctor public ListenableWatchFaceService();
+ method protected suspend Object? createWatchFace(android.view.SurfaceHolder surfaceHolder, androidx.wear.watchface.WatchState watchState, androidx.wear.watchface.ComplicationSlotsManager complicationSlotsManager, androidx.wear.watchface.style.CurrentUserStyleRepository currentUserStyleRepository, kotlin.coroutines.Continuation<? super androidx.wear.watchface.WatchFace>);
+ method protected abstract com.google.common.util.concurrent.ListenableFuture<androidx.wear.watchface.WatchFace> createWatchFaceFuture(android.view.SurfaceHolder surfaceHolder, androidx.wear.watchface.WatchState watchState, androidx.wear.watchface.ComplicationSlotsManager complicationSlotsManager, androidx.wear.watchface.style.CurrentUserStyleRepository currentUserStyleRepository);
+ }
+
+}
+
diff --git a/wear/watchface/watchface-guava/api/res-1.1.0-beta03.txt b/wear/watchface/watchface-guava/api/res-1.1.0-beta03.txt
new file mode 100644
index 0000000..e69de29
--- /dev/null
+++ b/wear/watchface/watchface-guava/api/res-1.1.0-beta03.txt
diff --git a/wear/watchface/watchface-guava/api/restricted_1.1.0-beta03.txt b/wear/watchface/watchface-guava/api/restricted_1.1.0-beta03.txt
new file mode 100644
index 0000000..98993bd
--- /dev/null
+++ b/wear/watchface/watchface-guava/api/restricted_1.1.0-beta03.txt
@@ -0,0 +1,56 @@
+// Signature format: 4.0
+package androidx.wear.watchface {
+
+ @Deprecated public abstract class ListenableCanvasRenderer extends androidx.wear.watchface.Renderer.CanvasRenderer {
+ ctor @Deprecated public ListenableCanvasRenderer(android.view.SurfaceHolder surfaceHolder, androidx.wear.watchface.style.CurrentUserStyleRepository currentUserStyleRepository, androidx.wear.watchface.WatchState watchState, @androidx.wear.watchface.CanvasType int canvasType, @IntRange(from=0L, to=60000L) long interactiveDrawModeUpdateDelayMillis, optional boolean clearWithBackgroundTintBeforeRenderingHighlightLayer);
+ ctor @Deprecated public ListenableCanvasRenderer(android.view.SurfaceHolder surfaceHolder, androidx.wear.watchface.style.CurrentUserStyleRepository currentUserStyleRepository, androidx.wear.watchface.WatchState watchState, @androidx.wear.watchface.CanvasType int canvasType, @IntRange(from=0L, to=60000L) long interactiveDrawModeUpdateDelayMillis);
+ method @Deprecated public suspend Object? init(kotlin.coroutines.Continuation<? super kotlin.Unit>);
+ method @Deprecated @UiThread public com.google.common.util.concurrent.ListenableFuture<kotlin.Unit> initFuture();
+ }
+
+ public abstract class ListenableCanvasRenderer2<SharedAssetsT extends androidx.wear.watchface.Renderer.SharedAssets> extends androidx.wear.watchface.Renderer.CanvasRenderer2<SharedAssetsT> {
+ ctor public ListenableCanvasRenderer2(android.view.SurfaceHolder surfaceHolder, androidx.wear.watchface.style.CurrentUserStyleRepository currentUserStyleRepository, androidx.wear.watchface.WatchState watchState, @androidx.wear.watchface.CanvasType int canvasType, @IntRange(from=0L, to=60000L) long interactiveDrawModeUpdateDelayMillis, optional boolean clearWithBackgroundTintBeforeRenderingHighlightLayer);
+ ctor public ListenableCanvasRenderer2(android.view.SurfaceHolder surfaceHolder, androidx.wear.watchface.style.CurrentUserStyleRepository currentUserStyleRepository, androidx.wear.watchface.WatchState watchState, @androidx.wear.watchface.CanvasType int canvasType, @IntRange(from=0L, to=60000L) long interactiveDrawModeUpdateDelayMillis);
+ method protected final suspend Object? createSharedAssets(kotlin.coroutines.Continuation<? super SharedAssetsT>);
+ method @WorkerThread public abstract com.google.common.util.concurrent.ListenableFuture<SharedAssetsT> createSharedAssetsFuture();
+ method public final suspend Object? init(kotlin.coroutines.Continuation<? super kotlin.Unit>);
+ method @UiThread public com.google.common.util.concurrent.ListenableFuture<kotlin.Unit> initFuture();
+ }
+
+ @Deprecated public abstract class ListenableGlesRenderer extends androidx.wear.watchface.Renderer.GlesRenderer {
+ ctor @Deprecated @kotlin.jvm.Throws(exceptionClasses=GlesException::class) public ListenableGlesRenderer(android.view.SurfaceHolder surfaceHolder, androidx.wear.watchface.style.CurrentUserStyleRepository currentUserStyleRepository, androidx.wear.watchface.WatchState watchState, @IntRange(from=0L, to=60000L) long interactiveDrawModeUpdateDelayMillis, optional int[] eglConfigAttribList, optional int[] eglSurfaceAttribList) throws androidx.wear.watchface.Renderer.GlesRenderer.GlesException;
+ ctor @Deprecated @kotlin.jvm.Throws(exceptionClasses=GlesException::class) public ListenableGlesRenderer(android.view.SurfaceHolder surfaceHolder, androidx.wear.watchface.style.CurrentUserStyleRepository currentUserStyleRepository, androidx.wear.watchface.WatchState watchState, @IntRange(from=0L, to=60000L) long interactiveDrawModeUpdateDelayMillis, optional int[] eglConfigAttribList) throws androidx.wear.watchface.Renderer.GlesRenderer.GlesException;
+ ctor @Deprecated @kotlin.jvm.Throws(exceptionClasses=GlesException::class) public ListenableGlesRenderer(android.view.SurfaceHolder surfaceHolder, androidx.wear.watchface.style.CurrentUserStyleRepository currentUserStyleRepository, androidx.wear.watchface.WatchState watchState, @IntRange(from=0L, to=60000L) long interactiveDrawModeUpdateDelayMillis) throws androidx.wear.watchface.Renderer.GlesRenderer.GlesException;
+ method @Deprecated public suspend Object? onBackgroundThreadGlContextCreated(kotlin.coroutines.Continuation<? super kotlin.Unit>);
+ method @Deprecated protected com.google.common.util.concurrent.ListenableFuture<kotlin.Unit> onBackgroundThreadGlContextCreatedFuture();
+ method @Deprecated public suspend Object? onUiThreadGlSurfaceCreated(@Px int width, @Px int height, kotlin.coroutines.Continuation<? super kotlin.Unit>);
+ method @Deprecated @UiThread protected com.google.common.util.concurrent.ListenableFuture<kotlin.Unit> onUiThreadGlSurfaceCreatedFuture(@Px int width, @Px int height);
+ method @Deprecated @WorkerThread public final void runBackgroundThreadGlCommands(Runnable runnable);
+ method @Deprecated @UiThread public final void runUiThreadGlCommands(Runnable runnable);
+ }
+
+ public abstract class ListenableGlesRenderer2<SharedAssetsT extends androidx.wear.watchface.Renderer.SharedAssets> extends androidx.wear.watchface.Renderer.GlesRenderer2<SharedAssetsT> {
+ ctor @kotlin.jvm.Throws(exceptionClasses=GlesException::class) public ListenableGlesRenderer2(android.view.SurfaceHolder surfaceHolder, androidx.wear.watchface.style.CurrentUserStyleRepository currentUserStyleRepository, androidx.wear.watchface.WatchState watchState, @IntRange(from=0L, to=60000L) long interactiveDrawModeUpdateDelayMillis, optional int[] eglConfigAttribList, optional int[] eglSurfaceAttribList) throws androidx.wear.watchface.Renderer.GlesRenderer.GlesException;
+ ctor @kotlin.jvm.Throws(exceptionClasses=GlesException::class) public ListenableGlesRenderer2(android.view.SurfaceHolder surfaceHolder, androidx.wear.watchface.style.CurrentUserStyleRepository currentUserStyleRepository, androidx.wear.watchface.WatchState watchState, @IntRange(from=0L, to=60000L) long interactiveDrawModeUpdateDelayMillis, optional int[] eglConfigAttribList) throws androidx.wear.watchface.Renderer.GlesRenderer.GlesException;
+ ctor @kotlin.jvm.Throws(exceptionClasses=GlesException::class) public ListenableGlesRenderer2(android.view.SurfaceHolder surfaceHolder, androidx.wear.watchface.style.CurrentUserStyleRepository currentUserStyleRepository, androidx.wear.watchface.WatchState watchState, @IntRange(from=0L, to=60000L) long interactiveDrawModeUpdateDelayMillis) throws androidx.wear.watchface.Renderer.GlesRenderer.GlesException;
+ method protected final suspend Object? createSharedAssets(kotlin.coroutines.Continuation<? super SharedAssetsT>);
+ method @WorkerThread public abstract com.google.common.util.concurrent.ListenableFuture<SharedAssetsT> createSharedAssetsFuture();
+ method public final suspend Object? onBackgroundThreadGlContextCreated(kotlin.coroutines.Continuation<? super kotlin.Unit>);
+ method protected com.google.common.util.concurrent.ListenableFuture<kotlin.Unit> onBackgroundThreadGlContextCreatedFuture();
+ method public final suspend Object? onUiThreadGlSurfaceCreated(@Px int width, @Px int height, kotlin.coroutines.Continuation<? super kotlin.Unit>);
+ method @UiThread protected com.google.common.util.concurrent.ListenableFuture<kotlin.Unit> onUiThreadGlSurfaceCreatedFuture(@Px int width, @Px int height);
+ method @WorkerThread public final void runBackgroundThreadGlCommands(Runnable runnable);
+ method @UiThread public final void runUiThreadGlCommands(Runnable runnable);
+ }
+
+ public final class ListenableGlesRendererKt {
+ }
+
+ public abstract class ListenableWatchFaceService extends androidx.wear.watchface.WatchFaceService {
+ ctor public ListenableWatchFaceService();
+ method protected suspend Object? createWatchFace(android.view.SurfaceHolder surfaceHolder, androidx.wear.watchface.WatchState watchState, androidx.wear.watchface.ComplicationSlotsManager complicationSlotsManager, androidx.wear.watchface.style.CurrentUserStyleRepository currentUserStyleRepository, kotlin.coroutines.Continuation<? super androidx.wear.watchface.WatchFace>);
+ method protected abstract com.google.common.util.concurrent.ListenableFuture<androidx.wear.watchface.WatchFace> createWatchFaceFuture(android.view.SurfaceHolder surfaceHolder, androidx.wear.watchface.WatchState watchState, androidx.wear.watchface.ComplicationSlotsManager complicationSlotsManager, androidx.wear.watchface.style.CurrentUserStyleRepository currentUserStyleRepository);
+ }
+
+}
+
diff --git a/wear/watchface/watchface-samples-minimal-instances/build.gradle b/wear/watchface/watchface-samples-minimal-instances/build.gradle
new file mode 100644
index 0000000..2931105
--- /dev/null
+++ b/wear/watchface/watchface-samples-minimal-instances/build.gradle
@@ -0,0 +1,62 @@
+/*
+ * Copyright 2021 The Android Open Source Project
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+import androidx.build.LibraryType
+
+plugins {
+ id("AndroidXPlugin")
+ id("com.android.application")
+ id("kotlin-android")
+}
+
+dependencies {
+ api("androidx.activity:activity:1.3.1")
+ api(project(":wear:watchface:watchface"))
+ api(project(":wear:watchface:watchface-editor"))
+ api(project(":wear:watchface:watchface-editor-guava"))
+ api(project(":wear:watchface:watchface-guava"))
+ api(project(":wear:wear"))
+ implementation(libs.guavaAndroid)
+ implementation("androidx.lifecycle:lifecycle-livedata-ktx:2.3.1")
+}
+
+androidx {
+ name = "AndroidX Wear Watchface Minimal Style Sample"
+ type = LibraryType.SAMPLES
+ mavenGroup = LibraryGroups.WEAR_WATCHFACE
+ inceptionYear = "2021"
+ description = "Contains the sample code for the Androidx Wear Watchface library"
+}
+
+android {
+ defaultConfig {
+ minSdkVersion 26
+ }
+
+ buildTypes {
+ release {
+ minifyEnabled true
+ shrinkResources true
+ proguardFiles getDefaultProguardFile('proguard-android.txt')
+ }
+ }
+
+ compileOptions {
+ sourceCompatibility 1.8
+ targetCompatibility 1.8
+ }
+ namespace "androidx.wear.watchface.samples.minimal.instances"
+}
diff --git a/wear/watchface/watchface-samples-minimal-instances/src/main/AndroidManifest.xml b/wear/watchface/watchface-samples-minimal-instances/src/main/AndroidManifest.xml
new file mode 100644
index 0000000..2b1f8b1
--- /dev/null
+++ b/wear/watchface/watchface-samples-minimal-instances/src/main/AndroidManifest.xml
@@ -0,0 +1,68 @@
+<?xml version="1.0" encoding="utf-8"?>
+<manifest xmlns:android="http://schemas.android.com/apk/res/android">
+
+ <uses-feature android:name="android.hardware.type.watch" />
+
+ <uses-permission android:name="android.permission.WAKE_LOCK" />
+
+ <application
+ android:allowBackup="true"
+ android:icon="@mipmap/ic_launcher"
+ android:label="@string/app_name"
+ android:supportsRtl="true"
+ android:theme="@android:style/Theme.DeviceDefault"
+ android:fullBackupContent="false">
+
+ <activity
+ android:name="androidx.wear.watchface.samples.minimal.instances.ConfigActivity"
+ android:exported="true"
+ android:label="@string/configuration_title">
+ <intent-filter>
+ <action android:name="androidx.wear.watchface.editor.action.WATCH_FACE_EDITOR" />
+
+ <category
+ android:name="com.google.android.wearable.watchface.category.WEARABLE_CONFIGURATION" />
+ <category android:name="android.intent.category.DEFAULT" />
+ </intent-filter>
+ </activity>
+
+ <service
+ android:name="androidx.wear.watchface.samples.minimal.instances.WatchFaceService"
+ android:directBootAware="true"
+ android:exported="true"
+ android:label="@string/app_name"
+ android:permission="android.permission.BIND_WALLPAPER">
+
+ <intent-filter>
+ <action android:name="android.service.wallpaper.WallpaperService" />
+ <category android:name="com.google.android.wearable.watchface.category.WATCH_FACE" />
+ </intent-filter>
+
+ <meta-data
+ android:name="com.google.android.wearable.watchface.preview"
+ android:resource="@drawable/preview" />
+
+ <meta-data
+ android:name="android.service.wallpaper"
+ android:resource="@xml/watch_face" />
+
+ <meta-data
+ android:name="com.google.android.wearable.watchface.wearableConfigurationAction"
+ android:value="androidx.wear.watchface.editor.action.WATCH_FACE_EDITOR" />
+
+ <meta-data
+ android:name="com.google.android.wearable.watchface.companionBuiltinConfigurationEnabled"
+ android:value="true" />
+
+ <meta-data
+ android:name="androidx.wear.watchface.MULTIPLE_INSTANCES_ALLOWED"
+ android:value="true" />
+
+ <meta-data
+ android:name="androidx.wear.watchface.XmlSchemaAndComplicationSlotsDefinition"
+ android:resource="@xml/xml_watchface" />
+ </service>
+
+ </application>
+
+</manifest>
diff --git a/wear/watchface/watchface-samples-minimal-instances/src/main/java/androidx/wear/watchface/samples/minimal/instances/BaseFutureCallback.java b/wear/watchface/watchface-samples-minimal-instances/src/main/java/androidx/wear/watchface/samples/minimal/instances/BaseFutureCallback.java
new file mode 100644
index 0000000..3f7d131
--- /dev/null
+++ b/wear/watchface/watchface-samples-minimal-instances/src/main/java/androidx/wear/watchface/samples/minimal/instances/BaseFutureCallback.java
@@ -0,0 +1,64 @@
+/*
+ * Copyright 2021 The Android Open Source Project
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package androidx.wear.watchface.samples.minimal.instances;
+
+import android.content.Context;
+import android.util.Log;
+import android.widget.Toast;
+
+/** A base class for a {@link FutureCallback} that logs the outcome. */
+abstract class BaseFutureCallback<T> implements FutureCallback<T> {
+
+ private final Context mContext;
+ private final String mTag;
+ private final String mName;
+
+ BaseFutureCallback(Context context, String tag, String name) {
+ mContext = context;
+ mTag = tag;
+ mName = name;
+ }
+
+ @Override
+ public void onPending() {
+ Log.d(mTag, mName + ".onPending()");
+ }
+
+ @Override
+ public void onSuccess(T value) {
+ Log.d(mTag, mName + ".onSuccess(" + value + ")");
+ }
+
+ @Override
+ public void onFailure(Throwable throwable) {
+ Log.d(mTag, mName + ".onFailure(" + throwable.getMessage() + ")", throwable);
+ Toast.makeText(mContext, "Failure", Toast.LENGTH_LONG).show();
+ }
+
+ @Override
+ public void onCancelled() {
+ Log.d(mTag, mName + ".onCancelled()");
+ Toast.makeText(mContext, "Cancelled", Toast.LENGTH_LONG).show();
+ }
+
+ @Override
+ public void onInterrupted() {
+ Thread.currentThread().interrupt();
+ Log.d(mTag, mName + ".onInterrupted()");
+ Toast.makeText(mContext, "Interrupted", Toast.LENGTH_LONG).show();
+ }
+}
diff --git a/wear/watchface/watchface-samples-minimal-instances/src/main/java/androidx/wear/watchface/samples/minimal/instances/ConfigActivity.java b/wear/watchface/watchface-samples-minimal-instances/src/main/java/androidx/wear/watchface/samples/minimal/instances/ConfigActivity.java
new file mode 100644
index 0000000..837dbdb
--- /dev/null
+++ b/wear/watchface/watchface-samples-minimal-instances/src/main/java/androidx/wear/watchface/samples/minimal/instances/ConfigActivity.java
@@ -0,0 +1,146 @@
+/*
+ * Copyright 2021 The Android Open Source Project
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package androidx.wear.watchface.samples.minimal.instances;
+
+import static androidx.wear.watchface.style.UserStyleSetting.ListUserStyleSetting;
+import static androidx.wear.watchface.style.UserStyleSetting.ListUserStyleSetting.ListOption;
+
+import android.os.Bundle;
+import android.os.Handler;
+import android.os.Looper;
+import android.util.Log;
+import android.widget.TextView;
+
+import androidx.activity.ComponentActivity;
+import androidx.annotation.Nullable;
+import androidx.wear.watchface.editor.ListenableEditorSession;
+import androidx.wear.watchface.style.MutableUserStyle;
+import androidx.wear.watchface.style.UserStyleSetting;
+import androidx.wear.widget.CurvedTextView;
+
+import com.google.common.util.concurrent.ListenableFuture;
+
+import java.util.Objects;
+import java.util.concurrent.Executor;
+
+import kotlin.OptIn;
+
+/** Configuration activity for the watch face. */
+public class ConfigActivity extends ComponentActivity {
+
+ private static final String TAG = "ConfigActivity";
+
+ private final Executor mMainExecutor = new Executor() {
+ private final Handler mHandler = new Handler(Looper.getMainLooper());
+
+ @Override
+ public void execute(Runnable runnable) {
+ mHandler.post(runnable);
+ }
+ };
+
+ private CurvedTextView mInstanceId;
+ private TextView mStyleValue;
+ private final UserStyleSetting.Id mTimeStyleId = new UserStyleSetting.Id("TimeStyle");
+
+ @Nullable
+ private ListenableEditorSession mEditorSession;
+
+ public ConfigActivity() {
+ addCallback(
+ ListenableEditorSession.listenableCreateOnWatchEditorSession(this),
+ new BaseFutureCallback<ListenableEditorSession>(
+ this, TAG, "listenableCreateOnWatchEditingSession") {
+ @Override
+ public void onSuccess(ListenableEditorSession editorSession) {
+ super.onSuccess(editorSession);
+ mEditorSession = editorSession;
+ updateInstanceId();
+ updateStyleValue();
+ }
+ });
+ }
+
+ @Override
+ protected void onCreate(@Nullable Bundle savedInstanceState) {
+ super.onCreate(savedInstanceState);
+ setContentView(R.layout.config_activity_layout);
+
+ mInstanceId = findViewById(R.id.instance_id);
+ mStyleValue = findViewById(R.id.style_value);
+
+ findViewById(R.id.style_change).setOnClickListener((view) -> changeStyle());
+ }
+
+ @Override
+ protected void onResume() {
+ super.onResume();
+ updateStyleValue();
+ }
+
+ @Override
+ protected void onDestroy() {
+ finish();
+ super.onDestroy();
+ }
+
+ private void changeStyle() {
+ Log.d(TAG, "changeStyle");
+ if (mEditorSession == null) {
+ return;
+ }
+
+ MutableUserStyle userStyle = mEditorSession.getUserStyle().getValue().toMutableUserStyle();
+ ListOption currentOption = (ListOption) userStyle.get(mTimeStyleId);
+ @OptIn(markerClass = androidx.wear.watchface.style.ExperimentalHierarchicalStyle.class)
+ ListUserStyleSetting listUserStyleSetting =
+ (ListUserStyleSetting) mEditorSession.getUserStyleSchema()
+ .getRootUserStyleSettings()
+ .get(0);
+
+ // Choose the first option in the list of options that isn't currentOption. We only expect
+ // two options here, so this will flip flop between them.
+ for (UserStyleSetting.Option option : listUserStyleSetting.getOptions()) {
+ if (!option.getId().equals(currentOption.getId())) {
+ userStyle.set(mTimeStyleId, option);
+ break;
+ }
+ }
+ mEditorSession.getUserStyle().setValue(userStyle.toUserStyle());
+ updateStyleValue();
+ }
+
+ private void updateInstanceId() {
+ if (mEditorSession == null) {
+ return;
+ }
+ mInstanceId.setText(Objects.toString(mEditorSession.getWatchFaceId()));
+ }
+
+ private void updateStyleValue() {
+ if (mEditorSession == null) {
+ return;
+ }
+ ListOption option =
+ (ListOption) mEditorSession.getUserStyle().getValue().get(mTimeStyleId);
+ mStyleValue.setText(option.getDisplayName());
+ }
+
+ private <T> void addCallback(ListenableFuture<T> future, FutureCallback<T> callback) {
+ FutureCallback.addCallback(future, callback, mMainExecutor);
+ }
+}
diff --git a/wear/watchface/watchface-samples-minimal-instances/src/main/java/androidx/wear/watchface/samples/minimal/instances/FutureCallback.java b/wear/watchface/watchface-samples-minimal-instances/src/main/java/androidx/wear/watchface/samples/minimal/instances/FutureCallback.java
new file mode 100644
index 0000000..4c12b45
--- /dev/null
+++ b/wear/watchface/watchface-samples-minimal-instances/src/main/java/androidx/wear/watchface/samples/minimal/instances/FutureCallback.java
@@ -0,0 +1,63 @@
+/*
+ * Copyright 2021 The Android Open Source Project
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package androidx.wear.watchface.samples.minimal.instances;
+
+import com.google.common.util.concurrent.ListenableFuture;
+
+import java.util.concurrent.ExecutionException;
+import java.util.concurrent.Executor;
+
+/** A callback for a future that explicitly handles different types of outcomes. */
+interface FutureCallback<T> {
+
+ static <T> void addCallback(
+ ListenableFuture<T> future, FutureCallback<T> callback, Executor executor) {
+ if (!future.isDone()) {
+ callback.onPending();
+ }
+ future.addListener(
+ () -> {
+ if (future.isCancelled()) {
+ callback.onCancelled();
+ } else {
+ try {
+ callback.onSuccess(future.get());
+ } catch (InterruptedException e) {
+ callback.onInterrupted();
+ } catch (ExecutionException e) {
+ callback.onFailure(e.getCause());
+ }
+ }
+ },
+ executor);
+ }
+
+ /** Called immediately if a callback is added to a future that is not yet done. */
+ void onPending();
+
+ /** Called if the future returns a value. */
+ void onSuccess(T value);
+
+ /** Called if the future throws an exception. */
+ void onFailure(Throwable throwable);
+
+ /** Called if the future is interrupted. */
+ void onInterrupted();
+
+ /** Called if the future is cancelled. */
+ void onCancelled();
+}
diff --git a/wear/watchface/watchface-samples-minimal-instances/src/main/java/androidx/wear/watchface/samples/minimal/instances/WatchFaceRenderer.java b/wear/watchface/watchface-samples-minimal-instances/src/main/java/androidx/wear/watchface/samples/minimal/instances/WatchFaceRenderer.java
new file mode 100644
index 0000000..8e13885
--- /dev/null
+++ b/wear/watchface/watchface-samples-minimal-instances/src/main/java/androidx/wear/watchface/samples/minimal/instances/WatchFaceRenderer.java
@@ -0,0 +1,305 @@
+/*
+ * Copyright 2021 The Android Open Source Project
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package androidx.wear.watchface.samples.minimal.instances;
+
+import android.content.res.Resources;
+import android.graphics.Canvas;
+import android.graphics.Color;
+import android.graphics.Paint;
+import android.graphics.Paint.Align;
+import android.graphics.Path;
+import android.graphics.Rect;
+import android.graphics.RectF;
+import android.view.SurfaceHolder;
+
+import androidx.annotation.NonNull;
+import androidx.annotation.Px;
+import androidx.annotation.UiThread;
+import androidx.lifecycle.FlowLiveDataConversions;
+import androidx.wear.watchface.CanvasType;
+import androidx.wear.watchface.DrawMode;
+import androidx.wear.watchface.ListenableCanvasRenderer;
+import androidx.wear.watchface.RenderParameters;
+import androidx.wear.watchface.WatchState;
+import androidx.wear.watchface.style.CurrentUserStyleRepository;
+import androidx.wear.watchface.style.UserStyle;
+import androidx.wear.watchface.style.UserStyleSetting;
+
+import com.google.common.util.concurrent.Futures;
+import com.google.common.util.concurrent.ListenableFuture;
+
+import org.jetbrains.annotations.NotNull;
+
+import java.time.ZonedDateTime;
+import java.util.Objects;
+import java.util.concurrent.TimeUnit;
+import java.util.concurrent.atomic.AtomicReference;
+
+import kotlin.Unit;
+
+/**
+ * Minimal rendered for the watch face, using canvas to render hours, minutes, and a blinking
+ * separator.
+ */
+public class WatchFaceRenderer extends ListenableCanvasRenderer {
+
+ private static final long UPDATE_DELAY_MILLIS = TimeUnit.SECONDS.toMillis(1);
+ private static final char[] DIGITS = {'0', '1', '2', '3', '4', '5', '6', '7', '8', '9'};
+
+ private final InstanceIdRenderer mInstanceIdRenderer;
+ private final TimeRenderer mMinimalRenderer;
+ private final TimeRenderer mSecondsRenderer;
+ private final Paint mHighlightPaint;
+ private final CurrentUserStyleRepository mCurrentUserStyleRepository;
+ private final UserStyleSetting.Id mTimeStyleId;
+ private final Resources mResources;
+
+ private TimeRenderer mTimeRenderer;
+
+ public WatchFaceRenderer(
+ @NotNull SurfaceHolder surfaceHolder,
+ @NotNull CurrentUserStyleRepository currentUserStyleRepository,
+ @NotNull WatchState watchState,
+ @NotNull Resources resources) {
+ super(surfaceHolder, currentUserStyleRepository, watchState, CanvasType.HARDWARE,
+ UPDATE_DELAY_MILLIS);
+ mInstanceIdRenderer = new InstanceIdRenderer(watchState);
+ mMinimalRenderer = new MinimalRenderer(watchState, mInstanceIdRenderer);
+ mSecondsRenderer = new SecondsRenderer(watchState, mInstanceIdRenderer);
+ mHighlightPaint = new Paint();
+ mCurrentUserStyleRepository = currentUserStyleRepository;
+ mTimeStyleId = new UserStyleSetting.Id(resources.getString(R.string.setting_id_time_style));
+ mResources = resources;
+ }
+
+ @UiThread
+ @NonNull
+ @Override
+ public ListenableFuture<Unit> initFuture() {
+ // observeForever has to be called from the UI thread but the WatchFaceRenderer is called
+ // from a background thread.
+ FlowLiveDataConversions.asLiveData(mCurrentUserStyleRepository.getUserStyle())
+ .observeForever(this::updateTimeStyle);
+ mInstanceIdRenderer.registerObservers();
+ return Futures.immediateFuture(Unit.INSTANCE);
+ }
+
+ @Override
+ public void render(@NotNull Canvas canvas, @NotNull Rect rect,
+ @NotNull ZonedDateTime zonedDateTime) {
+ mTimeRenderer.render(canvas, rect, zonedDateTime, getRenderParameters());
+ }
+
+ @Override
+ public void renderHighlightLayer(@NonNull Canvas canvas, @NonNull Rect bounds,
+ @NonNull ZonedDateTime zonedDateTime) {
+ RenderParameters.HighlightLayer highlightLayer = getRenderParameters().getHighlightLayer();
+ canvas.drawColor(highlightLayer.getBackgroundTint());
+ mHighlightPaint.setColor(highlightLayer.getHighlightTint());
+ mHighlightPaint.setStrokeWidth(2f);
+ canvas.drawCircle(
+ bounds.centerX(), bounds.centerY(), bounds.width() / 2 - 2, mHighlightPaint);
+ }
+
+ private void updateTimeStyle(UserStyle userStyle) {
+ String option = userStyle.get(mTimeStyleId).getId().toString();
+ if (option.equals(mResources.getString(R.string.option_id_time_style_minimal))) {
+ mTimeRenderer = mMinimalRenderer;
+ } else if (option.equals(mResources.getString(R.string.option_id_time_style_seconds))) {
+ mTimeRenderer = mSecondsRenderer;
+ }
+ }
+
+ private interface TimeRenderer {
+ void render(
+ @NotNull Canvas canvas, @NotNull Rect rect, @NotNull ZonedDateTime zonedDateTime,
+ RenderParameters renderParameters);
+ }
+
+ private static class InstanceIdRenderer implements TimeRenderer {
+ private final WatchState mWatchState;
+ private final Path mInstanceIdPath;
+ private final RectF mInstanceIdPathRect;
+ private final Paint mInstanceIdPaint;
+ private final AtomicReference<String> mInstanceId;
+
+ private InstanceIdRenderer(WatchState watchState) {
+ mWatchState = watchState;
+ mInstanceIdPath = new Path();
+ mInstanceIdPathRect = new RectF();
+ mInstanceIdPaint = new Paint();
+ mInstanceIdPaint.setTextAlign(Align.CENTER);
+ mInstanceIdPaint.setTextSize(20f);
+ mInstanceIdPaint.setColor(Color.WHITE);
+ mInstanceId = new AtomicReference<>(
+ Objects.toString(watchState.getWatchFaceInstanceId().getValue()));
+ }
+
+ @UiThread
+ public void registerObservers() {
+ FlowLiveDataConversions.asLiveData(mWatchState.getWatchFaceInstanceId())
+ .observeForever(mInstanceId::set);
+ }
+
+ @Override
+ public void render(@NonNull Canvas canvas, @NonNull Rect rect,
+ @NonNull ZonedDateTime zonedDateTime, RenderParameters renderParameters) {
+ canvas.save();
+ canvas.scale(0.9f, 0.9f);
+ canvas.translate(0.144f * rect.width() / 2, 0.1f * rect.height() / 2);
+ mInstanceIdPath.reset();
+ mInstanceIdPathRect.set(rect);
+ mInstanceIdPath.addArc(mInstanceIdPathRect, -180, 180);
+ canvas.drawTextOnPath(mInstanceId.get(), mInstanceIdPath, 0f, 0f, mInstanceIdPaint);
+ canvas.restore();
+ }
+ }
+
+ private static class MinimalRenderer implements TimeRenderer {
+ private final WatchState mWatchState;
+ private final InstanceIdRenderer mInstanceIdRenderer;
+ private final Paint mPaint;
+ private final char[] mTimeText = new char[5];
+
+ private MinimalRenderer(WatchState watchState, InstanceIdRenderer instanceIdRenderer) {
+ mWatchState = watchState;
+ mInstanceIdRenderer = instanceIdRenderer;
+ mPaint = new Paint();
+ mPaint.setTextAlign(Align.CENTER);
+ mPaint.setTextSize(64f);
+ }
+
+ @Override
+ public void render(
+ @NotNull Canvas canvas, @NotNull Rect rect, @NotNull ZonedDateTime zonedDateTime,
+ RenderParameters renderParameters) {
+ mPaint.setColor(Color.BLACK);
+ canvas.drawRect(rect, mPaint);
+ mPaint.setColor(Color.WHITE);
+ int hour = zonedDateTime.getHour() % 12;
+ int minute = zonedDateTime.getMinute();
+ int second = zonedDateTime.getSecond();
+ mTimeText[0] = DIGITS[hour / 10];
+ mTimeText[1] = DIGITS[hour % 10];
+ mTimeText[2] = second % 2 == 0 ? ':' : ' ';
+ mTimeText[3] = DIGITS[minute / 10];
+ mTimeText[4] = DIGITS[minute % 10];
+ canvas.drawText(mTimeText,
+ 0,
+ 5,
+ rect.centerX(),
+ rect.centerY() - mWatchState.getChinHeight(),
+ mPaint);
+
+ mInstanceIdRenderer.render(canvas, rect, zonedDateTime, renderParameters);
+ }
+ }
+
+ private static class SecondsRenderer implements TimeRenderer {
+ @Px
+ public static final float SECONDS_TEXT_HEIGHT = 256f;
+ @Px
+ public static final float TIME_TEXT_ACTIVE_HEIGHT = 64f;
+ @Px
+ public static final float TIME_TEXT_AMBIENT_HEIGHT = 96f;
+ @Px
+ private static final int TEXT_PADDING = 12;
+
+ private final WatchState mWatchState;
+ private final InstanceIdRenderer mInstanceIdRenderer;
+ private final Paint mPaint;
+ private final char[] mTimeText = new char[]{'1', '0', ':', '0', '9'};
+ private final char[] mSecondsText = new char[]{'3', '0'};
+ @Px
+ private final int mTimeActiveOffset;
+ @Px
+ private final int mTimeAmbientOffset;
+ @Px
+ private final int mSecondsActiveOffset;
+
+ private SecondsRenderer(WatchState watchState, InstanceIdRenderer instanceIdRenderer) {
+ mWatchState = watchState;
+ mInstanceIdRenderer = instanceIdRenderer;
+ mPaint = new Paint();
+ mPaint.setTextAlign(Align.CENTER);
+
+ // Compute location of text.
+ Rect textBounds = new Rect();
+
+ mPaint.setTextSize(TIME_TEXT_ACTIVE_HEIGHT);
+ mPaint.getTextBounds(mTimeText, 0, mTimeText.length, textBounds);
+ @Px int timeActiveHeight = textBounds.height();
+
+ mPaint.setTextSize(TIME_TEXT_AMBIENT_HEIGHT);
+ mPaint.getTextBounds(mTimeText, 0, mTimeText.length, textBounds);
+ @Px int timeAmbientHeight = textBounds.height();
+
+ mPaint.setTextSize(SECONDS_TEXT_HEIGHT);
+ mPaint.getTextBounds(mSecondsText, 0, mSecondsText.length, textBounds);
+ @Px int secondsHeight = textBounds.height();
+
+ mTimeActiveOffset =
+ (timeActiveHeight + secondsHeight + TEXT_PADDING) / 2 - timeActiveHeight;
+ mTimeAmbientOffset = timeAmbientHeight / 2 - timeAmbientHeight;
+ mSecondsActiveOffset = mTimeActiveOffset - secondsHeight - TEXT_PADDING;
+ }
+
+ @Override
+ public void render(
+ @NotNull Canvas canvas, @NotNull Rect rect, @NotNull ZonedDateTime zonedDateTime,
+ RenderParameters renderParameters) {
+ boolean isActive = renderParameters.getDrawMode() != DrawMode.AMBIENT;
+ int hour = zonedDateTime.getHour() % 12;
+ int minute = zonedDateTime.getMinute();
+ int second = zonedDateTime.getSecond();
+
+ if (isActive) {
+ mPaint.setColor(Color.rgb(64 + 192 * second / 60, 0, 0));
+ } else {
+ mPaint.setColor(Color.BLACK);
+ }
+ canvas.drawRect(rect, mPaint);
+ mPaint.setColor(Color.WHITE);
+ mTimeText[0] = DIGITS[hour / 10];
+ mTimeText[1] = DIGITS[hour % 10];
+ mTimeText[2] = second % 2 == 0 ? ':' : ' ';
+ mTimeText[3] = DIGITS[minute / 10];
+ mTimeText[4] = DIGITS[minute % 10];
+ mPaint.setTextSize(isActive ? TIME_TEXT_ACTIVE_HEIGHT : TIME_TEXT_AMBIENT_HEIGHT);
+ @Px int timeOffset = isActive ? mTimeActiveOffset : mTimeAmbientOffset;
+ canvas.drawText(mTimeText,
+ 0,
+ mTimeText.length,
+ rect.centerX(),
+ rect.centerY() - mWatchState.getChinHeight() - timeOffset,
+ mPaint);
+ mPaint.setTextSize(SECONDS_TEXT_HEIGHT);
+ if (isActive) {
+ mSecondsText[0] = DIGITS[second / 10];
+ mSecondsText[1] = DIGITS[second % 10];
+ canvas.drawText(mSecondsText,
+ 0,
+ mSecondsText.length,
+ rect.centerX(),
+ rect.centerY() - mWatchState.getChinHeight() - mSecondsActiveOffset,
+ mPaint);
+ }
+
+ mInstanceIdRenderer.render(canvas, rect, zonedDateTime, renderParameters);
+ }
+ }
+}
diff --git a/wear/watchface/watchface-samples-minimal-instances/src/main/java/androidx/wear/watchface/samples/minimal/instances/WatchFaceService.java b/wear/watchface/watchface-samples-minimal-instances/src/main/java/androidx/wear/watchface/samples/minimal/instances/WatchFaceService.java
new file mode 100644
index 0000000..6dd1761
--- /dev/null
+++ b/wear/watchface/watchface-samples-minimal-instances/src/main/java/androidx/wear/watchface/samples/minimal/instances/WatchFaceService.java
@@ -0,0 +1,50 @@
+/*
+ * Copyright 2021 The Android Open Source Project
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package androidx.wear.watchface.samples.minimal.instances;
+
+import android.view.SurfaceHolder;
+
+import androidx.annotation.NonNull;
+import androidx.wear.watchface.ComplicationSlotsManager;
+import androidx.wear.watchface.ListenableWatchFaceService;
+import androidx.wear.watchface.Renderer;
+import androidx.wear.watchface.WatchFace;
+import androidx.wear.watchface.WatchFaceType;
+import androidx.wear.watchface.WatchState;
+import androidx.wear.watchface.style.CurrentUserStyleRepository;
+
+import com.google.common.util.concurrent.Futures;
+import com.google.common.util.concurrent.ListenableFuture;
+
+import org.jetbrains.annotations.NotNull;
+
+/** The service that defines the watch face. */
+public class WatchFaceService extends ListenableWatchFaceService {
+
+ @NotNull
+ @Override
+ protected ListenableFuture<WatchFace> createWatchFaceFuture(
+ @NotNull SurfaceHolder surfaceHolder, @NotNull WatchState watchState,
+ @NonNull ComplicationSlotsManager complicationSlotsManager,
+ @NonNull CurrentUserStyleRepository currentUserStyleRepository) {
+ Renderer renderer =
+ new WatchFaceRenderer(
+ surfaceHolder, currentUserStyleRepository, watchState, getResources());
+ WatchFace watchFace = new WatchFace(WatchFaceType.DIGITAL, renderer);
+ return Futures.immediateFuture(watchFace);
+ }
+}
diff --git a/wear/watchface/watchface-samples-minimal-instances/src/main/res/drawable-nodpi/time_style_icon.png b/wear/watchface/watchface-samples-minimal-instances/src/main/res/drawable-nodpi/time_style_icon.png
new file mode 100644
index 0000000..1cb166f
--- /dev/null
+++ b/wear/watchface/watchface-samples-minimal-instances/src/main/res/drawable-nodpi/time_style_icon.png
Binary files differ
diff --git a/wear/watchface/watchface-samples-minimal-instances/src/main/res/drawable-nodpi/time_style_minimal_icon.png b/wear/watchface/watchface-samples-minimal-instances/src/main/res/drawable-nodpi/time_style_minimal_icon.png
new file mode 100644
index 0000000..015a123
--- /dev/null
+++ b/wear/watchface/watchface-samples-minimal-instances/src/main/res/drawable-nodpi/time_style_minimal_icon.png
Binary files differ
diff --git a/wear/watchface/watchface-samples-minimal-instances/src/main/res/drawable-nodpi/time_style_seconds_icon.png b/wear/watchface/watchface-samples-minimal-instances/src/main/res/drawable-nodpi/time_style_seconds_icon.png
new file mode 100644
index 0000000..ffa4949
--- /dev/null
+++ b/wear/watchface/watchface-samples-minimal-instances/src/main/res/drawable-nodpi/time_style_seconds_icon.png
Binary files differ
diff --git a/wear/watchface/watchface-samples-minimal-instances/src/main/res/drawable/ic_launcher_background.xml b/wear/watchface/watchface-samples-minimal-instances/src/main/res/drawable/ic_launcher_background.xml
new file mode 100644
index 0000000..69d8a24
--- /dev/null
+++ b/wear/watchface/watchface-samples-minimal-instances/src/main/res/drawable/ic_launcher_background.xml
@@ -0,0 +1,78 @@
+<?xml version="1.0" encoding="utf-8"?>
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+ android:width="108dp"
+ android:height="108dp"
+ android:viewportWidth="108"
+ android:viewportHeight="108">
+ <group android:scaleX="0.7"
+ android:scaleY="0.7"
+ android:translateX="16.2"
+ android:translateY="16.2">
+ <path android:fillColor="#3DDC84"
+ android:pathData="M0,0h108v108h-108z"/>
+ <path android:fillColor="#00000000" android:pathData="M9,0L9,108"
+ android:strokeColor="#33FFFFFF" android:strokeWidth="0.8"/>
+ <path android:fillColor="#00000000" android:pathData="M19,0L19,108"
+ android:strokeColor="#33FFFFFF" android:strokeWidth="0.8"/>
+ <path android:fillColor="#00000000" android:pathData="M29,0L29,108"
+ android:strokeColor="#33FFFFFF" android:strokeWidth="0.8"/>
+ <path android:fillColor="#00000000" android:pathData="M39,0L39,108"
+ android:strokeColor="#33FFFFFF" android:strokeWidth="0.8"/>
+ <path android:fillColor="#00000000" android:pathData="M49,0L49,108"
+ android:strokeColor="#33FFFFFF" android:strokeWidth="0.8"/>
+ <path android:fillColor="#00000000" android:pathData="M59,0L59,108"
+ android:strokeColor="#33FFFFFF" android:strokeWidth="0.8"/>
+ <path android:fillColor="#00000000" android:pathData="M69,0L69,108"
+ android:strokeColor="#33FFFFFF" android:strokeWidth="0.8"/>
+ <path android:fillColor="#00000000" android:pathData="M79,0L79,108"
+ android:strokeColor="#33FFFFFF" android:strokeWidth="0.8"/>
+ <path android:fillColor="#00000000" android:pathData="M89,0L89,108"
+ android:strokeColor="#33FFFFFF" android:strokeWidth="0.8"/>
+ <path android:fillColor="#00000000" android:pathData="M99,0L99,108"
+ android:strokeColor="#33FFFFFF" android:strokeWidth="0.8"/>
+ <path android:fillColor="#00000000" android:pathData="M0,9L108,9"
+ android:strokeColor="#33FFFFFF" android:strokeWidth="0.8"/>
+ <path android:fillColor="#00000000" android:pathData="M0,19L108,19"
+ android:strokeColor="#33FFFFFF" android:strokeWidth="0.8"/>
+ <path android:fillColor="#00000000" android:pathData="M0,29L108,29"
+ android:strokeColor="#33FFFFFF" android:strokeWidth="0.8"/>
+ <path android:fillColor="#00000000" android:pathData="M0,39L108,39"
+ android:strokeColor="#33FFFFFF" android:strokeWidth="0.8"/>
+ <path android:fillColor="#00000000" android:pathData="M0,49L108,49"
+ android:strokeColor="#33FFFFFF" android:strokeWidth="0.8"/>
+ <path android:fillColor="#00000000" android:pathData="M0,59L108,59"
+ android:strokeColor="#33FFFFFF" android:strokeWidth="0.8"/>
+ <path android:fillColor="#00000000" android:pathData="M0,69L108,69"
+ android:strokeColor="#33FFFFFF" android:strokeWidth="0.8"/>
+ <path android:fillColor="#00000000" android:pathData="M0,79L108,79"
+ android:strokeColor="#33FFFFFF" android:strokeWidth="0.8"/>
+ <path android:fillColor="#00000000" android:pathData="M0,89L108,89"
+ android:strokeColor="#33FFFFFF" android:strokeWidth="0.8"/>
+ <path android:fillColor="#00000000" android:pathData="M0,99L108,99"
+ android:strokeColor="#33FFFFFF" android:strokeWidth="0.8"/>
+ <path android:fillColor="#00000000" android:pathData="M19,29L89,29"
+ android:strokeColor="#33FFFFFF" android:strokeWidth="0.8"/>
+ <path android:fillColor="#00000000" android:pathData="M19,39L89,39"
+ android:strokeColor="#33FFFFFF" android:strokeWidth="0.8"/>
+ <path android:fillColor="#00000000" android:pathData="M19,49L89,49"
+ android:strokeColor="#33FFFFFF" android:strokeWidth="0.8"/>
+ <path android:fillColor="#00000000" android:pathData="M19,59L89,59"
+ android:strokeColor="#33FFFFFF" android:strokeWidth="0.8"/>
+ <path android:fillColor="#00000000" android:pathData="M19,69L89,69"
+ android:strokeColor="#33FFFFFF" android:strokeWidth="0.8"/>
+ <path android:fillColor="#00000000" android:pathData="M19,79L89,79"
+ android:strokeColor="#33FFFFFF" android:strokeWidth="0.8"/>
+ <path android:fillColor="#00000000" android:pathData="M29,19L29,89"
+ android:strokeColor="#33FFFFFF" android:strokeWidth="0.8"/>
+ <path android:fillColor="#00000000" android:pathData="M39,19L39,89"
+ android:strokeColor="#33FFFFFF" android:strokeWidth="0.8"/>
+ <path android:fillColor="#00000000" android:pathData="M49,19L49,89"
+ android:strokeColor="#33FFFFFF" android:strokeWidth="0.8"/>
+ <path android:fillColor="#00000000" android:pathData="M59,19L59,89"
+ android:strokeColor="#33FFFFFF" android:strokeWidth="0.8"/>
+ <path android:fillColor="#00000000" android:pathData="M69,19L69,89"
+ android:strokeColor="#33FFFFFF" android:strokeWidth="0.8"/>
+ <path android:fillColor="#00000000" android:pathData="M79,19L79,89"
+ android:strokeColor="#33FFFFFF" android:strokeWidth="0.8"/>
+ </group>
+</vector>
diff --git a/wear/watchface/watchface-samples-minimal-instances/src/main/res/drawable/ic_launcher_foreground.xml b/wear/watchface/watchface-samples-minimal-instances/src/main/res/drawable/ic_launcher_foreground.xml
new file mode 100644
index 0000000..74f38c8
--- /dev/null
+++ b/wear/watchface/watchface-samples-minimal-instances/src/main/res/drawable/ic_launcher_foreground.xml
@@ -0,0 +1,15 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+ android:width="108dp"
+ android:height="108dp"
+ android:viewportWidth="108"
+ android:viewportHeight="108"
+ android:tint="#000000">
+ <group android:scaleX="2.61"
+ android:scaleY="2.61"
+ android:translateX="22.68"
+ android:translateY="22.68">
+ <path
+ android:fillColor="@android:color/white"
+ android:pathData="M12,2C6.5,2 2,6.5 2,12s4.5,10 10,10s10,-4.5 10,-10S17.5,2 12,2zM16.2,16.2L11,13V7h1.5v5.2l4.5,2.7L16.2,16.2z"/>
+ </group>
+</vector>
diff --git a/wear/watchface/watchface-samples-minimal-instances/src/main/res/drawable/preview.png b/wear/watchface/watchface-samples-minimal-instances/src/main/res/drawable/preview.png
new file mode 100644
index 0000000..24eadcb
--- /dev/null
+++ b/wear/watchface/watchface-samples-minimal-instances/src/main/res/drawable/preview.png
Binary files differ
diff --git a/wear/watchface/watchface-samples-minimal-instances/src/main/res/drawable/tyme_style_bold_icon.xml b/wear/watchface/watchface-samples-minimal-instances/src/main/res/drawable/tyme_style_bold_icon.xml
new file mode 100644
index 0000000..07eb505
--- /dev/null
+++ b/wear/watchface/watchface-samples-minimal-instances/src/main/res/drawable/tyme_style_bold_icon.xml
@@ -0,0 +1,19 @@
+<?xml version="1.0" encoding="utf-8"?><!--
+ Copyright 2021 The Android Open Source Project
+
+ Licensed under the Apache License, Version 2.0 (the "License");
+ you may not use this file except in compliance with the License.
+ You may obtain a copy of the License at
+
+ http://www.apache.org/licenses/LICENSE-2.0
+
+ Unless required by applicable law or agreed to in writing, software
+ distributed under the License is distributed on an "AS IS" BASIS,
+ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ See the License for the specific language governing permissions and
+ limitations under the License.
+ -->
+
+<selector xmlns:android="http://schemas.android.com/apk/res/android">
+
+</selector>
\ No newline at end of file
diff --git a/wear/watchface/watchface-samples-minimal-instances/src/main/res/layout/config_activity_layout.xml b/wear/watchface/watchface-samples-minimal-instances/src/main/res/layout/config_activity_layout.xml
new file mode 100644
index 0000000..529c053
--- /dev/null
+++ b/wear/watchface/watchface-samples-minimal-instances/src/main/res/layout/config_activity_layout.xml
@@ -0,0 +1,54 @@
+<?xml version="1.0" encoding="utf-8"?>
+<FrameLayout
+ xmlns:android="http://schemas.android.com/apk/res/android"
+ xmlns:tools="http://schemas.android.com/tools"
+ xmlns:app="http://schemas.android.com/apk/res-auto"
+ android:layout_width="match_parent"
+ android:layout_height="match_parent">
+
+ <androidx.wear.widget.CurvedTextView
+ android:id="@+id/instance_id"
+ android:layout_width="match_parent"
+ android:layout_height="match_parent"
+ tools:text="instance-id"
+ android:background="#66FF0000"
+ android:textAlignment="textStart"
+ android:textSize="10sp"
+ app:clockwise="true"
+ app:minSweepDegrees="10"
+ />
+
+ <TextView
+ android:layout_width="wrap_content"
+ android:layout_height="wrap_content"
+ android:layout_marginBottom="30dp"
+ tools:text="instance-id"
+ android:textSize="9sp"
+ android:textColor="@android:color/white"
+ android:textFontWeight="800" />
+
+ <LinearLayout
+ android:layout_width="match_parent"
+ android:layout_height="match_parent"
+ android:gravity="center"
+ android:orientation="vertical">
+
+ <TextView
+ android:layout_width="wrap_content"
+ android:layout_height="wrap_content"
+ android:text="@string/style_header"
+ android:textColor="@android:color/white"
+ android:textFontWeight="800" />
+
+ <TextView
+ android:id="@+id/style_value"
+ android:layout_width="wrap_content"
+ android:layout_height="wrap_content" />
+
+ <Button
+ android:id="@+id/style_change"
+ android:layout_width="wrap_content"
+ android:layout_height="wrap_content"
+ android:text="@string/style_change" />
+ </LinearLayout>
+</FrameLayout>
\ No newline at end of file
diff --git a/wear/watchface/watchface-samples-minimal-instances/src/main/res/mipmap-anydpi/ic_launcher.xml b/wear/watchface/watchface-samples-minimal-instances/src/main/res/mipmap-anydpi/ic_launcher.xml
new file mode 100644
index 0000000..bbd3e02
--- /dev/null
+++ b/wear/watchface/watchface-samples-minimal-instances/src/main/res/mipmap-anydpi/ic_launcher.xml
@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="utf-8"?>
+<adaptive-icon xmlns:android="http://schemas.android.com/apk/res/android">
+ <background android:drawable="@drawable/ic_launcher_background"/>
+ <foreground android:drawable="@drawable/ic_launcher_foreground"/>
+</adaptive-icon>
\ No newline at end of file
diff --git a/wear/watchface/watchface-samples-minimal-instances/src/main/res/mipmap-hdpi/ic_launcher.png b/wear/watchface/watchface-samples-minimal-instances/src/main/res/mipmap-hdpi/ic_launcher.png
new file mode 100644
index 0000000..837401a
--- /dev/null
+++ b/wear/watchface/watchface-samples-minimal-instances/src/main/res/mipmap-hdpi/ic_launcher.png
Binary files differ
diff --git a/wear/watchface/watchface-samples-minimal-instances/src/main/res/mipmap-mdpi/ic_launcher.png b/wear/watchface/watchface-samples-minimal-instances/src/main/res/mipmap-mdpi/ic_launcher.png
new file mode 100644
index 0000000..f208553
--- /dev/null
+++ b/wear/watchface/watchface-samples-minimal-instances/src/main/res/mipmap-mdpi/ic_launcher.png
Binary files differ
diff --git a/wear/watchface/watchface-samples-minimal-instances/src/main/res/mipmap-xhdpi/ic_launcher.png b/wear/watchface/watchface-samples-minimal-instances/src/main/res/mipmap-xhdpi/ic_launcher.png
new file mode 100644
index 0000000..c9f75b4
--- /dev/null
+++ b/wear/watchface/watchface-samples-minimal-instances/src/main/res/mipmap-xhdpi/ic_launcher.png
Binary files differ
diff --git a/wear/watchface/watchface-samples-minimal-instances/src/main/res/mipmap-xxhdpi/ic_launcher.png b/wear/watchface/watchface-samples-minimal-instances/src/main/res/mipmap-xxhdpi/ic_launcher.png
new file mode 100644
index 0000000..5c6c342
--- /dev/null
+++ b/wear/watchface/watchface-samples-minimal-instances/src/main/res/mipmap-xxhdpi/ic_launcher.png
Binary files differ
diff --git a/wear/watchface/watchface-samples-minimal-instances/src/main/res/mipmap-xxxhdpi/ic_launcher.png b/wear/watchface/watchface-samples-minimal-instances/src/main/res/mipmap-xxxhdpi/ic_launcher.png
new file mode 100644
index 0000000..4b7cddf
--- /dev/null
+++ b/wear/watchface/watchface-samples-minimal-instances/src/main/res/mipmap-xxxhdpi/ic_launcher.png
Binary files differ
diff --git a/wear/watchface/watchface-samples-minimal-instances/src/main/res/values/dimens.xml b/wear/watchface/watchface-samples-minimal-instances/src/main/res/values/dimens.xml
new file mode 100644
index 0000000..6da0d58
--- /dev/null
+++ b/wear/watchface/watchface-samples-minimal-instances/src/main/res/values/dimens.xml
@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+ <dimen name="highlight_stroke_width">2dp</dimen>
+ <dimen name="highlight_extra_radius">1px</dimen>
+</resources>
diff --git a/wear/watchface/watchface-samples-minimal-instances/src/main/res/values/schema_ids.xml b/wear/watchface/watchface-samples-minimal-instances/src/main/res/values/schema_ids.xml
new file mode 100644
index 0000000..06e9ca1
--- /dev/null
+++ b/wear/watchface/watchface-samples-minimal-instances/src/main/res/values/schema_ids.xml
@@ -0,0 +1,21 @@
+<?xml version="1.0" encoding="utf-8"?><!--
+ Copyright 2022 The Android Open Source Project
+
+ Licensed under the Apache License, Version 2.0 (the "License");
+ you may not use this file except in compliance with the License.
+ You may obtain a copy of the License at
+
+ http://www.apache.org/licenses/LICENSE-2.0
+
+ Unless required by applicable law or agreed to in writing, software
+ distributed under the License is distributed on an "AS IS" BASIS,
+ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ See the License for the specific language governing permissions and
+ limitations under the License.
+ -->
+
+<resources>
+ <string name="setting_id_time_style" translatable="false">TimeStyle</string>
+ <string name="option_id_time_style_minimal" translatable="false">minimal</string>
+ <string name="option_id_time_style_seconds" translatable="false">seconds</string>
+</resources>
\ No newline at end of file
diff --git a/wear/watchface/watchface-samples-minimal-instances/src/main/res/values/strings.xml b/wear/watchface/watchface-samples-minimal-instances/src/main/res/values/strings.xml
new file mode 100644
index 0000000..32f9ab6
--- /dev/null
+++ b/wear/watchface/watchface-samples-minimal-instances/src/main/res/values/strings.xml
@@ -0,0 +1,11 @@
+<resources>
+ <string name="app_name">Minimal Instances</string>
+ <string name="configuration_title">Configuration</string>
+ <string name="style_change">Change</string>
+ <string name="style_header">Time Style</string>
+ <string name="time_style_name">Time</string>
+ <string name="time_style_description">How the time is displayed on the watch face</string>
+ <string name="time_style_minimal_name">Minimal</string>
+ <string name="time_style_seconds_name">Seconds</string>
+ <string name="time_style_bold_name">Bold</string>
+</resources>
diff --git a/wear/watchface/watchface-samples-minimal-instances/src/main/res/xml/watch_face.xml b/wear/watchface/watchface-samples-minimal-instances/src/main/res/xml/watch_face.xml
new file mode 100644
index 0000000..7e7098f
--- /dev/null
+++ b/wear/watchface/watchface-samples-minimal-instances/src/main/res/xml/watch_face.xml
@@ -0,0 +1,2 @@
+<?xml version="1.0" encoding="utf-8"?>
+<wallpaper/>
\ No newline at end of file
diff --git a/wear/watchface/watchface-samples-minimal-instances/src/main/res/xml/xml_watchface.xml b/wear/watchface/watchface-samples-minimal-instances/src/main/res/xml/xml_watchface.xml
new file mode 100644
index 0000000..cf25b88
--- /dev/null
+++ b/wear/watchface/watchface-samples-minimal-instances/src/main/res/xml/xml_watchface.xml
@@ -0,0 +1,36 @@
+<?xml version="1.0" encoding="utf-8"?><!--
+ Copyright 2021 The Android Open Source Project
+
+ Licensed under the Apache License, Version 2.0 (the "License");
+ you may not use this file except in compliance with the License.
+ You may obtain a copy of the License at
+
+ http://www.apache.org/licenses/LICENSE-2.0
+
+ Unless required by applicable law or agreed to in writing, software
+ distributed under the License is distributed on an "AS IS" BASIS,
+ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ See the License for the specific language governing permissions and
+ limitations under the License.
+ -->
+<XmlWatchFace xmlns:android="http://schemas.android.com/apk/res/android"
+ xmlns:app="http://schemas.android.com/apk/res-auto">
+ <UserStyleSchema>
+ <ListUserStyleSetting
+ android:icon="@drawable/time_style_icon"
+ app:affectedWatchFaceLayers="BASE|COMPLICATIONS|COMPLICATIONS_OVERLAY"
+ app:defaultOptionIndex="1"
+ app:description="@string/time_style_description"
+ app:displayName="@string/time_style_name"
+ app:id="@string/setting_id_time_style">
+ <ListOption
+ android:icon="@drawable/time_style_minimal_icon"
+ app:displayName="@string/time_style_minimal_name"
+ app:id="@string/option_id_time_style_minimal" />
+ <ListOption
+ android:icon="@drawable/time_style_seconds_icon"
+ app:displayName="@string/time_style_seconds_name"
+ app:id="@string/option_id_time_style_seconds" />
+ </ListUserStyleSetting>
+ </UserStyleSchema>
+</XmlWatchFace>
diff --git a/wear/watchface/watchface-style/api/1.1.0-beta03.txt b/wear/watchface/watchface-style/api/1.1.0-beta03.txt
new file mode 100644
index 0000000..a2df1b0
--- /dev/null
+++ b/wear/watchface/watchface-style/api/1.1.0-beta03.txt
@@ -0,0 +1,259 @@
+// Signature format: 4.0
+package androidx.wear.watchface.style {
+
+ public final class CurrentUserStyleRepository {
+ ctor public CurrentUserStyleRepository(androidx.wear.watchface.style.UserStyleSchema schema);
+ method public androidx.wear.watchface.style.UserStyleSchema getSchema();
+ method public kotlinx.coroutines.flow.StateFlow<androidx.wear.watchface.style.UserStyle> getUserStyle();
+ property public final androidx.wear.watchface.style.UserStyleSchema schema;
+ property public final kotlinx.coroutines.flow.StateFlow<androidx.wear.watchface.style.UserStyle> userStyle;
+ }
+
+ public final class MutableUserStyle implements java.lang.Iterable<java.util.Map.Entry<? extends androidx.wear.watchface.style.UserStyleSetting,? extends androidx.wear.watchface.style.UserStyleSetting.Option>> kotlin.jvm.internal.markers.KMappedMarker {
+ method public operator androidx.wear.watchface.style.UserStyleSetting.Option? get(androidx.wear.watchface.style.UserStyleSetting setting);
+ method public operator androidx.wear.watchface.style.UserStyleSetting.Option? get(androidx.wear.watchface.style.UserStyleSetting.Id settingId);
+ method public int getSize();
+ method public java.util.Iterator<java.util.Map.Entry<androidx.wear.watchface.style.UserStyleSetting,androidx.wear.watchface.style.UserStyleSetting.Option>> iterator();
+ method public operator void set(androidx.wear.watchface.style.UserStyleSetting setting, androidx.wear.watchface.style.UserStyleSetting.Option option);
+ method public operator void set(androidx.wear.watchface.style.UserStyleSetting.Id settingId, androidx.wear.watchface.style.UserStyleSetting.Option option);
+ method public operator void set(androidx.wear.watchface.style.UserStyleSetting setting, androidx.wear.watchface.style.UserStyleSetting.Option.Id optionId);
+ method public operator void set(androidx.wear.watchface.style.UserStyleSetting.Id settingId, androidx.wear.watchface.style.UserStyleSetting.Option.Id optionId);
+ method public androidx.wear.watchface.style.UserStyle toUserStyle();
+ property public final int size;
+ }
+
+ public final class UserStyle implements kotlin.jvm.internal.markers.KMappedMarker java.util.Map<androidx.wear.watchface.style.UserStyleSetting,androidx.wear.watchface.style.UserStyleSetting.Option> {
+ ctor public UserStyle(androidx.wear.watchface.style.UserStyle userStyle);
+ ctor public UserStyle(java.util.Map<androidx.wear.watchface.style.UserStyleSetting,? extends androidx.wear.watchface.style.UserStyleSetting.Option> selectedOptions);
+ ctor public UserStyle(androidx.wear.watchface.style.UserStyleData userStyle, androidx.wear.watchface.style.UserStyleSchema styleSchema);
+ method public boolean containsKey(androidx.wear.watchface.style.UserStyleSetting key);
+ method public boolean containsValue(androidx.wear.watchface.style.UserStyleSetting.Option value);
+ method public operator androidx.wear.watchface.style.UserStyleSetting.Option? get(androidx.wear.watchface.style.UserStyleSetting key);
+ method public operator androidx.wear.watchface.style.UserStyleSetting.Option? get(androidx.wear.watchface.style.UserStyleSetting.Id settingId);
+ method public java.util.Set<java.util.Map.Entry<androidx.wear.watchface.style.UserStyleSetting,androidx.wear.watchface.style.UserStyleSetting.Option>> getEntries();
+ method public java.util.Set<androidx.wear.watchface.style.UserStyleSetting> getKeys();
+ method public int getSize();
+ method public java.util.Collection<androidx.wear.watchface.style.UserStyleSetting.Option> getValues();
+ method public boolean isEmpty();
+ method public androidx.wear.watchface.style.MutableUserStyle toMutableUserStyle();
+ method public androidx.wear.watchface.style.UserStyleData toUserStyleData();
+ property public java.util.Set<java.util.Map.Entry<androidx.wear.watchface.style.UserStyleSetting,androidx.wear.watchface.style.UserStyleSetting.Option>> entries;
+ property public java.util.Set<androidx.wear.watchface.style.UserStyleSetting> keys;
+ property public int size;
+ property public java.util.Collection<androidx.wear.watchface.style.UserStyleSetting.Option> values;
+ }
+
+ public final class UserStyleData {
+ ctor public UserStyleData(java.util.Map<java.lang.String,byte[]> userStyleMap);
+ method public java.util.Map<java.lang.String,byte[]> getUserStyleMap();
+ property public final java.util.Map<java.lang.String,byte[]> userStyleMap;
+ }
+
+ public final class UserStyleSchema {
+ ctor public UserStyleSchema(java.util.List<? extends androidx.wear.watchface.style.UserStyleSetting> userStyleSettings);
+ method public operator androidx.wear.watchface.style.UserStyleSetting? get(androidx.wear.watchface.style.UserStyleSetting.Id settingId);
+ method public byte[] getDigestHash();
+ method public java.util.List<androidx.wear.watchface.style.UserStyleSetting> getUserStyleSettings();
+ property public final java.util.List<androidx.wear.watchface.style.UserStyleSetting> userStyleSettings;
+ }
+
+ public abstract sealed class UserStyleSetting {
+ method public final java.util.Collection<androidx.wear.watchface.style.WatchFaceLayer> getAffectedWatchFaceLayers();
+ method public final androidx.wear.watchface.style.UserStyleSetting.Option getDefaultOption();
+ method public final int getDefaultOptionIndex();
+ method public final CharSequence getDescription();
+ method public final CharSequence getDisplayName();
+ method public final android.graphics.drawable.Icon? getIcon();
+ method public final androidx.wear.watchface.style.UserStyleSetting.Id getId();
+ method public androidx.wear.watchface.style.UserStyleSetting.Option getOptionForId(androidx.wear.watchface.style.UserStyleSetting.Option.Id optionId);
+ method public final java.util.List<androidx.wear.watchface.style.UserStyleSetting.Option> getOptions();
+ method public final androidx.wear.watchface.style.UserStyleSetting.WatchFaceEditorData? getWatchFaceEditorData();
+ property public final java.util.Collection<androidx.wear.watchface.style.WatchFaceLayer> affectedWatchFaceLayers;
+ property public final androidx.wear.watchface.style.UserStyleSetting.Option defaultOption;
+ property public final int defaultOptionIndex;
+ property public final CharSequence description;
+ property public final CharSequence displayName;
+ property public final android.graphics.drawable.Icon? icon;
+ property public final androidx.wear.watchface.style.UserStyleSetting.Id id;
+ property public final java.util.List<androidx.wear.watchface.style.UserStyleSetting.Option> options;
+ property public final androidx.wear.watchface.style.UserStyleSetting.WatchFaceEditorData? watchFaceEditorData;
+ field public static final androidx.wear.watchface.style.UserStyleSetting.Companion Companion;
+ }
+
+ public static final class UserStyleSetting.BooleanUserStyleSetting extends androidx.wear.watchface.style.UserStyleSetting {
+ ctor public UserStyleSetting.BooleanUserStyleSetting(androidx.wear.watchface.style.UserStyleSetting.Id id, android.content.res.Resources resources, @StringRes int displayNameResourceId, @StringRes int descriptionResourceId, android.graphics.drawable.Icon? icon, java.util.Collection<? extends androidx.wear.watchface.style.WatchFaceLayer> affectsWatchFaceLayers, boolean defaultValue, optional androidx.wear.watchface.style.UserStyleSetting.WatchFaceEditorData? watchFaceEditorData);
+ ctor public UserStyleSetting.BooleanUserStyleSetting(androidx.wear.watchface.style.UserStyleSetting.Id id, android.content.res.Resources resources, @StringRes int displayNameResourceId, @StringRes int descriptionResourceId, android.graphics.drawable.Icon? icon, java.util.Collection<? extends androidx.wear.watchface.style.WatchFaceLayer> affectsWatchFaceLayers, boolean defaultValue);
+ method public boolean getDefaultValue();
+ }
+
+ public static final class UserStyleSetting.BooleanUserStyleSetting.BooleanOption extends androidx.wear.watchface.style.UserStyleSetting.Option {
+ method public static androidx.wear.watchface.style.UserStyleSetting.BooleanUserStyleSetting.BooleanOption from(boolean value);
+ method public boolean getValue();
+ property public final boolean value;
+ field public static final androidx.wear.watchface.style.UserStyleSetting.BooleanUserStyleSetting.BooleanOption.Companion Companion;
+ field public static final androidx.wear.watchface.style.UserStyleSetting.BooleanUserStyleSetting.BooleanOption FALSE;
+ field public static final androidx.wear.watchface.style.UserStyleSetting.BooleanUserStyleSetting.BooleanOption TRUE;
+ }
+
+ public static final class UserStyleSetting.BooleanUserStyleSetting.BooleanOption.Companion {
+ method public androidx.wear.watchface.style.UserStyleSetting.BooleanUserStyleSetting.BooleanOption from(boolean value);
+ }
+
+ public static final class UserStyleSetting.Companion {
+ }
+
+ public static final class UserStyleSetting.ComplicationSlotsUserStyleSetting extends androidx.wear.watchface.style.UserStyleSetting {
+ ctor public UserStyleSetting.ComplicationSlotsUserStyleSetting(androidx.wear.watchface.style.UserStyleSetting.Id id, android.content.res.Resources resources, @StringRes int displayNameResourceId, @StringRes int descriptionResourceId, android.graphics.drawable.Icon? icon, java.util.List<androidx.wear.watchface.style.UserStyleSetting.ComplicationSlotsUserStyleSetting.ComplicationSlotsOption> complicationConfig, java.util.Collection<? extends androidx.wear.watchface.style.WatchFaceLayer> affectsWatchFaceLayers, optional androidx.wear.watchface.style.UserStyleSetting.ComplicationSlotsUserStyleSetting.ComplicationSlotsOption defaultOption, optional androidx.wear.watchface.style.UserStyleSetting.WatchFaceEditorData? watchFaceEditorData);
+ ctor public UserStyleSetting.ComplicationSlotsUserStyleSetting(androidx.wear.watchface.style.UserStyleSetting.Id id, android.content.res.Resources resources, @StringRes int displayNameResourceId, @StringRes int descriptionResourceId, android.graphics.drawable.Icon? icon, java.util.List<androidx.wear.watchface.style.UserStyleSetting.ComplicationSlotsUserStyleSetting.ComplicationSlotsOption> complicationConfig, java.util.Collection<? extends androidx.wear.watchface.style.WatchFaceLayer> affectsWatchFaceLayers, optional androidx.wear.watchface.style.UserStyleSetting.ComplicationSlotsUserStyleSetting.ComplicationSlotsOption defaultOption);
+ ctor public UserStyleSetting.ComplicationSlotsUserStyleSetting(androidx.wear.watchface.style.UserStyleSetting.Id id, android.content.res.Resources resources, @StringRes int displayNameResourceId, @StringRes int descriptionResourceId, android.graphics.drawable.Icon? icon, java.util.List<androidx.wear.watchface.style.UserStyleSetting.ComplicationSlotsUserStyleSetting.ComplicationSlotsOption> complicationConfig, java.util.Collection<? extends androidx.wear.watchface.style.WatchFaceLayer> affectsWatchFaceLayers);
+ }
+
+ public static final class UserStyleSetting.ComplicationSlotsUserStyleSetting.ComplicationSlotOverlay {
+ ctor public UserStyleSetting.ComplicationSlotsUserStyleSetting.ComplicationSlotOverlay(int complicationSlotId, optional Boolean? enabled, optional androidx.wear.watchface.complications.ComplicationSlotBounds? complicationSlotBounds, optional Integer? accessibilityTraversalIndex);
+ method public Integer? getAccessibilityTraversalIndex();
+ method public androidx.wear.watchface.complications.ComplicationSlotBounds? getComplicationSlotBounds();
+ method public int getComplicationSlotId();
+ method public Boolean? getEnabled();
+ property public final Integer? accessibilityTraversalIndex;
+ property public final androidx.wear.watchface.complications.ComplicationSlotBounds? complicationSlotBounds;
+ property public final int complicationSlotId;
+ property public final Boolean? enabled;
+ }
+
+ public static final class UserStyleSetting.ComplicationSlotsUserStyleSetting.ComplicationSlotOverlay.Builder {
+ ctor public UserStyleSetting.ComplicationSlotsUserStyleSetting.ComplicationSlotOverlay.Builder(int complicationSlotId);
+ method public androidx.wear.watchface.style.UserStyleSetting.ComplicationSlotsUserStyleSetting.ComplicationSlotOverlay build();
+ method public androidx.wear.watchface.style.UserStyleSetting.ComplicationSlotsUserStyleSetting.ComplicationSlotOverlay.Builder setAccessibilityTraversalIndex(int accessibilityTraversalIndex);
+ method public androidx.wear.watchface.style.UserStyleSetting.ComplicationSlotsUserStyleSetting.ComplicationSlotOverlay.Builder setComplicationSlotBounds(androidx.wear.watchface.complications.ComplicationSlotBounds complicationSlotBounds);
+ method public androidx.wear.watchface.style.UserStyleSetting.ComplicationSlotsUserStyleSetting.ComplicationSlotOverlay.Builder setEnabled(boolean enabled);
+ }
+
+ public static final class UserStyleSetting.ComplicationSlotsUserStyleSetting.ComplicationSlotsOption extends androidx.wear.watchface.style.UserStyleSetting.Option {
+ ctor public UserStyleSetting.ComplicationSlotsUserStyleSetting.ComplicationSlotsOption(androidx.wear.watchface.style.UserStyleSetting.Option.Id id, android.content.res.Resources resources, @StringRes int displayNameResourceId, android.graphics.drawable.Icon? icon, java.util.Collection<androidx.wear.watchface.style.UserStyleSetting.ComplicationSlotsUserStyleSetting.ComplicationSlotOverlay> complicationSlotOverlays, optional androidx.wear.watchface.style.UserStyleSetting.WatchFaceEditorData? watchFaceEditorData);
+ ctor public UserStyleSetting.ComplicationSlotsUserStyleSetting.ComplicationSlotsOption(androidx.wear.watchface.style.UserStyleSetting.Option.Id id, android.content.res.Resources resources, @StringRes int displayNameResourceId, android.graphics.drawable.Icon? icon, java.util.Collection<androidx.wear.watchface.style.UserStyleSetting.ComplicationSlotsUserStyleSetting.ComplicationSlotOverlay> complicationSlotOverlays);
+ method public java.util.Collection<androidx.wear.watchface.style.UserStyleSetting.ComplicationSlotsUserStyleSetting.ComplicationSlotOverlay> getComplicationSlotOverlays();
+ method public CharSequence getDisplayName();
+ method public android.graphics.drawable.Icon? getIcon();
+ method public androidx.wear.watchface.style.UserStyleSetting.WatchFaceEditorData? getWatchFaceEditorData();
+ property public final java.util.Collection<androidx.wear.watchface.style.UserStyleSetting.ComplicationSlotsUserStyleSetting.ComplicationSlotOverlay> complicationSlotOverlays;
+ property public final CharSequence displayName;
+ property public final android.graphics.drawable.Icon? icon;
+ property public final androidx.wear.watchface.style.UserStyleSetting.WatchFaceEditorData? watchFaceEditorData;
+ }
+
+ public static final class UserStyleSetting.CustomValueUserStyleSetting extends androidx.wear.watchface.style.UserStyleSetting {
+ ctor public UserStyleSetting.CustomValueUserStyleSetting(java.util.Collection<? extends androidx.wear.watchface.style.WatchFaceLayer> affectsWatchFaceLayers, byte[] defaultValue);
+ }
+
+ public static final class UserStyleSetting.CustomValueUserStyleSetting.CustomValueOption extends androidx.wear.watchface.style.UserStyleSetting.Option {
+ ctor public UserStyleSetting.CustomValueUserStyleSetting.CustomValueOption(byte[] customValue);
+ method public byte[] getCustomValue();
+ property public final byte[] customValue;
+ }
+
+ public static final class UserStyleSetting.DoubleRangeUserStyleSetting extends androidx.wear.watchface.style.UserStyleSetting {
+ ctor public UserStyleSetting.DoubleRangeUserStyleSetting(androidx.wear.watchface.style.UserStyleSetting.Id id, android.content.res.Resources resources, @StringRes int displayNameResourceId, @StringRes int descriptionResourceId, android.graphics.drawable.Icon? icon, double minimumValue, double maximumValue, java.util.Collection<? extends androidx.wear.watchface.style.WatchFaceLayer> affectsWatchFaceLayers, double defaultValue, optional androidx.wear.watchface.style.UserStyleSetting.WatchFaceEditorData? watchFaceEditorData);
+ ctor public UserStyleSetting.DoubleRangeUserStyleSetting(androidx.wear.watchface.style.UserStyleSetting.Id id, android.content.res.Resources resources, @StringRes int displayNameResourceId, @StringRes int descriptionResourceId, android.graphics.drawable.Icon? icon, double minimumValue, double maximumValue, java.util.Collection<? extends androidx.wear.watchface.style.WatchFaceLayer> affectsWatchFaceLayers, double defaultValue);
+ method public double getDefaultValue();
+ method public double getMaximumValue();
+ method public double getMinimumValue();
+ property public final double defaultValue;
+ property public final double maximumValue;
+ property public final double minimumValue;
+ }
+
+ public static final class UserStyleSetting.DoubleRangeUserStyleSetting.DoubleRangeOption extends androidx.wear.watchface.style.UserStyleSetting.Option {
+ ctor public UserStyleSetting.DoubleRangeUserStyleSetting.DoubleRangeOption(double value);
+ method public double getValue();
+ property public final double value;
+ }
+
+ public static final class UserStyleSetting.Id {
+ ctor public UserStyleSetting.Id(String value);
+ method public String getValue();
+ property public final String value;
+ field public static final androidx.wear.watchface.style.UserStyleSetting.Id.Companion Companion;
+ field public static final int MAX_LENGTH = 40; // 0x28
+ }
+
+ public static final class UserStyleSetting.Id.Companion {
+ }
+
+ public static class UserStyleSetting.ListUserStyleSetting extends androidx.wear.watchface.style.UserStyleSetting {
+ ctor public UserStyleSetting.ListUserStyleSetting(androidx.wear.watchface.style.UserStyleSetting.Id id, android.content.res.Resources resources, @StringRes int displayNameResourceId, @StringRes int descriptionResourceId, android.graphics.drawable.Icon? icon, java.util.List<androidx.wear.watchface.style.UserStyleSetting.ListUserStyleSetting.ListOption> options, java.util.Collection<? extends androidx.wear.watchface.style.WatchFaceLayer> affectsWatchFaceLayers, optional androidx.wear.watchface.style.UserStyleSetting.ListUserStyleSetting.ListOption defaultOption, optional androidx.wear.watchface.style.UserStyleSetting.WatchFaceEditorData? watchFaceEditorData);
+ ctor public UserStyleSetting.ListUserStyleSetting(androidx.wear.watchface.style.UserStyleSetting.Id id, android.content.res.Resources resources, @StringRes int displayNameResourceId, @StringRes int descriptionResourceId, android.graphics.drawable.Icon? icon, java.util.List<androidx.wear.watchface.style.UserStyleSetting.ListUserStyleSetting.ListOption> options, java.util.Collection<? extends androidx.wear.watchface.style.WatchFaceLayer> affectsWatchFaceLayers, optional androidx.wear.watchface.style.UserStyleSetting.ListUserStyleSetting.ListOption defaultOption);
+ ctor public UserStyleSetting.ListUserStyleSetting(androidx.wear.watchface.style.UserStyleSetting.Id id, android.content.res.Resources resources, @StringRes int displayNameResourceId, @StringRes int descriptionResourceId, android.graphics.drawable.Icon? icon, java.util.List<androidx.wear.watchface.style.UserStyleSetting.ListUserStyleSetting.ListOption> options, java.util.Collection<? extends androidx.wear.watchface.style.WatchFaceLayer> affectsWatchFaceLayers);
+ }
+
+ public static final class UserStyleSetting.ListUserStyleSetting.ListOption extends androidx.wear.watchface.style.UserStyleSetting.Option {
+ ctor public UserStyleSetting.ListUserStyleSetting.ListOption(androidx.wear.watchface.style.UserStyleSetting.Option.Id id, android.content.res.Resources resources, @StringRes int displayNameResourceId, android.graphics.drawable.Icon? icon, optional androidx.wear.watchface.style.UserStyleSetting.WatchFaceEditorData? watchFaceEditorData);
+ ctor public UserStyleSetting.ListUserStyleSetting.ListOption(androidx.wear.watchface.style.UserStyleSetting.Option.Id id, android.content.res.Resources resources, @StringRes int displayNameResourceId, android.graphics.drawable.Icon? icon);
+ method public CharSequence getDisplayName();
+ method public android.graphics.drawable.Icon? getIcon();
+ method public androidx.wear.watchface.style.UserStyleSetting.WatchFaceEditorData? getWatchFaceEditorData();
+ property public final CharSequence displayName;
+ property public final android.graphics.drawable.Icon? icon;
+ property public final androidx.wear.watchface.style.UserStyleSetting.WatchFaceEditorData? watchFaceEditorData;
+ }
+
+ public static final class UserStyleSetting.LongRangeUserStyleSetting extends androidx.wear.watchface.style.UserStyleSetting {
+ ctor public UserStyleSetting.LongRangeUserStyleSetting(androidx.wear.watchface.style.UserStyleSetting.Id id, android.content.res.Resources resources, @StringRes int displayNameResourceId, @StringRes int descriptionResourceId, android.graphics.drawable.Icon? icon, long minimumValue, long maximumValue, java.util.Collection<? extends androidx.wear.watchface.style.WatchFaceLayer> affectsWatchFaceLayers, long defaultValue, optional androidx.wear.watchface.style.UserStyleSetting.WatchFaceEditorData? watchFaceEditorData);
+ ctor public UserStyleSetting.LongRangeUserStyleSetting(androidx.wear.watchface.style.UserStyleSetting.Id id, android.content.res.Resources resources, @StringRes int displayNameResourceId, @StringRes int descriptionResourceId, android.graphics.drawable.Icon? icon, long minimumValue, long maximumValue, java.util.Collection<? extends androidx.wear.watchface.style.WatchFaceLayer> affectsWatchFaceLayers, long defaultValue);
+ method public long getDefaultValue();
+ method public long getMaximumValue();
+ method public long getMinimumValue();
+ property public final long defaultValue;
+ property public final long maximumValue;
+ property public final long minimumValue;
+ }
+
+ public static final class UserStyleSetting.LongRangeUserStyleSetting.LongRangeOption extends androidx.wear.watchface.style.UserStyleSetting.Option {
+ ctor public UserStyleSetting.LongRangeUserStyleSetting.LongRangeOption(long value);
+ method public long getValue();
+ property public final long value;
+ }
+
+ public abstract static class UserStyleSetting.Option {
+ ctor public UserStyleSetting.Option(androidx.wear.watchface.style.UserStyleSetting.Option.Id id);
+ method public final androidx.wear.watchface.style.UserStyleSetting.Option.Id getId();
+ property public final androidx.wear.watchface.style.UserStyleSetting.Option.Id id;
+ field public static final androidx.wear.watchface.style.UserStyleSetting.Option.Companion Companion;
+ }
+
+ public static final class UserStyleSetting.Option.Companion {
+ }
+
+ public static final class UserStyleSetting.Option.Id {
+ ctor public UserStyleSetting.Option.Id(byte[] value);
+ ctor public UserStyleSetting.Option.Id(String value);
+ method public byte[] getValue();
+ property public final byte[] value;
+ field public static final androidx.wear.watchface.style.UserStyleSetting.Option.Id.Companion Companion;
+ field public static final int MAX_LENGTH = 1024; // 0x400
+ }
+
+ public static final class UserStyleSetting.Option.Id.Companion {
+ }
+
+ public static final class UserStyleSetting.WatchFaceEditorData {
+ ctor public UserStyleSetting.WatchFaceEditorData(android.graphics.drawable.Icon? icon);
+ method public android.graphics.drawable.Icon? getIcon();
+ property public final android.graphics.drawable.Icon? icon;
+ }
+
+ public final class UserStyleSettingKt {
+ }
+
+ public enum WatchFaceLayer {
+ enum_constant public static final androidx.wear.watchface.style.WatchFaceLayer BASE;
+ enum_constant public static final androidx.wear.watchface.style.WatchFaceLayer COMPLICATIONS;
+ enum_constant public static final androidx.wear.watchface.style.WatchFaceLayer COMPLICATIONS_OVERLAY;
+ field public static final java.util.Set<androidx.wear.watchface.style.WatchFaceLayer> ALL_WATCH_FACE_LAYERS;
+ field public static final androidx.wear.watchface.style.WatchFaceLayer.Companion Companion;
+ }
+
+ public static final class WatchFaceLayer.Companion {
+ }
+
+}
+
diff --git a/wear/watchface/watchface-style/api/public_plus_experimental_1.1.0-beta03.txt b/wear/watchface/watchface-style/api/public_plus_experimental_1.1.0-beta03.txt
new file mode 100644
index 0000000..8ce237a
--- /dev/null
+++ b/wear/watchface/watchface-style/api/public_plus_experimental_1.1.0-beta03.txt
@@ -0,0 +1,267 @@
+// Signature format: 4.0
+package androidx.wear.watchface.style {
+
+ public final class CurrentUserStyleRepository {
+ ctor public CurrentUserStyleRepository(androidx.wear.watchface.style.UserStyleSchema schema);
+ method public androidx.wear.watchface.style.UserStyleSchema getSchema();
+ method public kotlinx.coroutines.flow.StateFlow<androidx.wear.watchface.style.UserStyle> getUserStyle();
+ property public final androidx.wear.watchface.style.UserStyleSchema schema;
+ property public final kotlinx.coroutines.flow.StateFlow<androidx.wear.watchface.style.UserStyle> userStyle;
+ }
+
+ @kotlin.RequiresOptIn(message="This is an experimental API that may change or be removed without warning.") @kotlin.annotation.Retention(kotlin.annotation.AnnotationRetention.BINARY) public @interface ExperimentalHierarchicalStyle {
+ }
+
+ public final class MutableUserStyle implements java.lang.Iterable<java.util.Map.Entry<? extends androidx.wear.watchface.style.UserStyleSetting,? extends androidx.wear.watchface.style.UserStyleSetting.Option>> kotlin.jvm.internal.markers.KMappedMarker {
+ method public operator androidx.wear.watchface.style.UserStyleSetting.Option? get(androidx.wear.watchface.style.UserStyleSetting setting);
+ method public operator androidx.wear.watchface.style.UserStyleSetting.Option? get(androidx.wear.watchface.style.UserStyleSetting.Id settingId);
+ method public int getSize();
+ method public java.util.Iterator<java.util.Map.Entry<androidx.wear.watchface.style.UserStyleSetting,androidx.wear.watchface.style.UserStyleSetting.Option>> iterator();
+ method public operator void set(androidx.wear.watchface.style.UserStyleSetting setting, androidx.wear.watchface.style.UserStyleSetting.Option option);
+ method public operator void set(androidx.wear.watchface.style.UserStyleSetting.Id settingId, androidx.wear.watchface.style.UserStyleSetting.Option option);
+ method public operator void set(androidx.wear.watchface.style.UserStyleSetting setting, androidx.wear.watchface.style.UserStyleSetting.Option.Id optionId);
+ method public operator void set(androidx.wear.watchface.style.UserStyleSetting.Id settingId, androidx.wear.watchface.style.UserStyleSetting.Option.Id optionId);
+ method public androidx.wear.watchface.style.UserStyle toUserStyle();
+ property public final int size;
+ }
+
+ public final class UserStyle implements kotlin.jvm.internal.markers.KMappedMarker java.util.Map<androidx.wear.watchface.style.UserStyleSetting,androidx.wear.watchface.style.UserStyleSetting.Option> {
+ ctor public UserStyle(androidx.wear.watchface.style.UserStyle userStyle);
+ ctor public UserStyle(java.util.Map<androidx.wear.watchface.style.UserStyleSetting,? extends androidx.wear.watchface.style.UserStyleSetting.Option> selectedOptions);
+ ctor public UserStyle(androidx.wear.watchface.style.UserStyleData userStyle, androidx.wear.watchface.style.UserStyleSchema styleSchema);
+ method public boolean containsKey(androidx.wear.watchface.style.UserStyleSetting key);
+ method public boolean containsValue(androidx.wear.watchface.style.UserStyleSetting.Option value);
+ method public operator androidx.wear.watchface.style.UserStyleSetting.Option? get(androidx.wear.watchface.style.UserStyleSetting key);
+ method public operator androidx.wear.watchface.style.UserStyleSetting.Option? get(androidx.wear.watchface.style.UserStyleSetting.Id settingId);
+ method public java.util.Set<java.util.Map.Entry<androidx.wear.watchface.style.UserStyleSetting,androidx.wear.watchface.style.UserStyleSetting.Option>> getEntries();
+ method public java.util.Set<androidx.wear.watchface.style.UserStyleSetting> getKeys();
+ method public int getSize();
+ method public java.util.Collection<androidx.wear.watchface.style.UserStyleSetting.Option> getValues();
+ method public boolean isEmpty();
+ method public androidx.wear.watchface.style.MutableUserStyle toMutableUserStyle();
+ method public androidx.wear.watchface.style.UserStyleData toUserStyleData();
+ property public java.util.Set<java.util.Map.Entry<androidx.wear.watchface.style.UserStyleSetting,androidx.wear.watchface.style.UserStyleSetting.Option>> entries;
+ property public java.util.Set<androidx.wear.watchface.style.UserStyleSetting> keys;
+ property public int size;
+ property public java.util.Collection<androidx.wear.watchface.style.UserStyleSetting.Option> values;
+ }
+
+ public final class UserStyleData {
+ ctor public UserStyleData(java.util.Map<java.lang.String,byte[]> userStyleMap);
+ method public java.util.Map<java.lang.String,byte[]> getUserStyleMap();
+ property public final java.util.Map<java.lang.String,byte[]> userStyleMap;
+ }
+
+ public final class UserStyleSchema {
+ ctor public UserStyleSchema(java.util.List<? extends androidx.wear.watchface.style.UserStyleSetting> userStyleSettings);
+ method public operator androidx.wear.watchface.style.UserStyleSetting? get(androidx.wear.watchface.style.UserStyleSetting.Id settingId);
+ method public byte[] getDigestHash();
+ method @androidx.wear.watchface.style.ExperimentalHierarchicalStyle public java.util.List<androidx.wear.watchface.style.UserStyleSetting> getRootUserStyleSettings();
+ method public java.util.List<androidx.wear.watchface.style.UserStyleSetting> getUserStyleSettings();
+ property @androidx.wear.watchface.style.ExperimentalHierarchicalStyle public final java.util.List<androidx.wear.watchface.style.UserStyleSetting> rootUserStyleSettings;
+ property public final java.util.List<androidx.wear.watchface.style.UserStyleSetting> userStyleSettings;
+ }
+
+ public abstract sealed class UserStyleSetting {
+ method public final java.util.Collection<androidx.wear.watchface.style.WatchFaceLayer> getAffectedWatchFaceLayers();
+ method public final androidx.wear.watchface.style.UserStyleSetting.Option getDefaultOption();
+ method public final int getDefaultOptionIndex();
+ method public final CharSequence getDescription();
+ method public final CharSequence getDisplayName();
+ method public final android.graphics.drawable.Icon? getIcon();
+ method public final androidx.wear.watchface.style.UserStyleSetting.Id getId();
+ method public androidx.wear.watchface.style.UserStyleSetting.Option getOptionForId(androidx.wear.watchface.style.UserStyleSetting.Option.Id optionId);
+ method public final java.util.List<androidx.wear.watchface.style.UserStyleSetting.Option> getOptions();
+ method public final androidx.wear.watchface.style.UserStyleSetting.WatchFaceEditorData? getWatchFaceEditorData();
+ property public final java.util.Collection<androidx.wear.watchface.style.WatchFaceLayer> affectedWatchFaceLayers;
+ property public final androidx.wear.watchface.style.UserStyleSetting.Option defaultOption;
+ property public final int defaultOptionIndex;
+ property public final CharSequence description;
+ property public final CharSequence displayName;
+ property public final android.graphics.drawable.Icon? icon;
+ property public final androidx.wear.watchface.style.UserStyleSetting.Id id;
+ property public final java.util.List<androidx.wear.watchface.style.UserStyleSetting.Option> options;
+ property public final androidx.wear.watchface.style.UserStyleSetting.WatchFaceEditorData? watchFaceEditorData;
+ field public static final androidx.wear.watchface.style.UserStyleSetting.Companion Companion;
+ }
+
+ public static final class UserStyleSetting.BooleanUserStyleSetting extends androidx.wear.watchface.style.UserStyleSetting {
+ ctor public UserStyleSetting.BooleanUserStyleSetting(androidx.wear.watchface.style.UserStyleSetting.Id id, android.content.res.Resources resources, @StringRes int displayNameResourceId, @StringRes int descriptionResourceId, android.graphics.drawable.Icon? icon, java.util.Collection<? extends androidx.wear.watchface.style.WatchFaceLayer> affectsWatchFaceLayers, boolean defaultValue, optional androidx.wear.watchface.style.UserStyleSetting.WatchFaceEditorData? watchFaceEditorData);
+ ctor public UserStyleSetting.BooleanUserStyleSetting(androidx.wear.watchface.style.UserStyleSetting.Id id, android.content.res.Resources resources, @StringRes int displayNameResourceId, @StringRes int descriptionResourceId, android.graphics.drawable.Icon? icon, java.util.Collection<? extends androidx.wear.watchface.style.WatchFaceLayer> affectsWatchFaceLayers, boolean defaultValue);
+ method public boolean getDefaultValue();
+ }
+
+ public static final class UserStyleSetting.BooleanUserStyleSetting.BooleanOption extends androidx.wear.watchface.style.UserStyleSetting.Option {
+ method public static androidx.wear.watchface.style.UserStyleSetting.BooleanUserStyleSetting.BooleanOption from(boolean value);
+ method public boolean getValue();
+ property public final boolean value;
+ field public static final androidx.wear.watchface.style.UserStyleSetting.BooleanUserStyleSetting.BooleanOption.Companion Companion;
+ field public static final androidx.wear.watchface.style.UserStyleSetting.BooleanUserStyleSetting.BooleanOption FALSE;
+ field public static final androidx.wear.watchface.style.UserStyleSetting.BooleanUserStyleSetting.BooleanOption TRUE;
+ }
+
+ public static final class UserStyleSetting.BooleanUserStyleSetting.BooleanOption.Companion {
+ method public androidx.wear.watchface.style.UserStyleSetting.BooleanUserStyleSetting.BooleanOption from(boolean value);
+ }
+
+ public static final class UserStyleSetting.Companion {
+ }
+
+ public static final class UserStyleSetting.ComplicationSlotsUserStyleSetting extends androidx.wear.watchface.style.UserStyleSetting {
+ ctor public UserStyleSetting.ComplicationSlotsUserStyleSetting(androidx.wear.watchface.style.UserStyleSetting.Id id, android.content.res.Resources resources, @StringRes int displayNameResourceId, @StringRes int descriptionResourceId, android.graphics.drawable.Icon? icon, java.util.List<androidx.wear.watchface.style.UserStyleSetting.ComplicationSlotsUserStyleSetting.ComplicationSlotsOption> complicationConfig, java.util.Collection<? extends androidx.wear.watchface.style.WatchFaceLayer> affectsWatchFaceLayers, optional androidx.wear.watchface.style.UserStyleSetting.ComplicationSlotsUserStyleSetting.ComplicationSlotsOption defaultOption, optional androidx.wear.watchface.style.UserStyleSetting.WatchFaceEditorData? watchFaceEditorData);
+ ctor public UserStyleSetting.ComplicationSlotsUserStyleSetting(androidx.wear.watchface.style.UserStyleSetting.Id id, android.content.res.Resources resources, @StringRes int displayNameResourceId, @StringRes int descriptionResourceId, android.graphics.drawable.Icon? icon, java.util.List<androidx.wear.watchface.style.UserStyleSetting.ComplicationSlotsUserStyleSetting.ComplicationSlotsOption> complicationConfig, java.util.Collection<? extends androidx.wear.watchface.style.WatchFaceLayer> affectsWatchFaceLayers, optional androidx.wear.watchface.style.UserStyleSetting.ComplicationSlotsUserStyleSetting.ComplicationSlotsOption defaultOption);
+ ctor public UserStyleSetting.ComplicationSlotsUserStyleSetting(androidx.wear.watchface.style.UserStyleSetting.Id id, android.content.res.Resources resources, @StringRes int displayNameResourceId, @StringRes int descriptionResourceId, android.graphics.drawable.Icon? icon, java.util.List<androidx.wear.watchface.style.UserStyleSetting.ComplicationSlotsUserStyleSetting.ComplicationSlotsOption> complicationConfig, java.util.Collection<? extends androidx.wear.watchface.style.WatchFaceLayer> affectsWatchFaceLayers);
+ }
+
+ public static final class UserStyleSetting.ComplicationSlotsUserStyleSetting.ComplicationSlotOverlay {
+ ctor public UserStyleSetting.ComplicationSlotsUserStyleSetting.ComplicationSlotOverlay(int complicationSlotId, optional Boolean? enabled, optional androidx.wear.watchface.complications.ComplicationSlotBounds? complicationSlotBounds, optional Integer? accessibilityTraversalIndex);
+ method public Integer? getAccessibilityTraversalIndex();
+ method public androidx.wear.watchface.complications.ComplicationSlotBounds? getComplicationSlotBounds();
+ method public int getComplicationSlotId();
+ method public Boolean? getEnabled();
+ property public final Integer? accessibilityTraversalIndex;
+ property public final androidx.wear.watchface.complications.ComplicationSlotBounds? complicationSlotBounds;
+ property public final int complicationSlotId;
+ property public final Boolean? enabled;
+ }
+
+ public static final class UserStyleSetting.ComplicationSlotsUserStyleSetting.ComplicationSlotOverlay.Builder {
+ ctor public UserStyleSetting.ComplicationSlotsUserStyleSetting.ComplicationSlotOverlay.Builder(int complicationSlotId);
+ method public androidx.wear.watchface.style.UserStyleSetting.ComplicationSlotsUserStyleSetting.ComplicationSlotOverlay build();
+ method public androidx.wear.watchface.style.UserStyleSetting.ComplicationSlotsUserStyleSetting.ComplicationSlotOverlay.Builder setAccessibilityTraversalIndex(int accessibilityTraversalIndex);
+ method public androidx.wear.watchface.style.UserStyleSetting.ComplicationSlotsUserStyleSetting.ComplicationSlotOverlay.Builder setComplicationSlotBounds(androidx.wear.watchface.complications.ComplicationSlotBounds complicationSlotBounds);
+ method public androidx.wear.watchface.style.UserStyleSetting.ComplicationSlotsUserStyleSetting.ComplicationSlotOverlay.Builder setEnabled(boolean enabled);
+ }
+
+ public static final class UserStyleSetting.ComplicationSlotsUserStyleSetting.ComplicationSlotsOption extends androidx.wear.watchface.style.UserStyleSetting.Option {
+ ctor public UserStyleSetting.ComplicationSlotsUserStyleSetting.ComplicationSlotsOption(androidx.wear.watchface.style.UserStyleSetting.Option.Id id, android.content.res.Resources resources, @StringRes int displayNameResourceId, android.graphics.drawable.Icon? icon, java.util.Collection<androidx.wear.watchface.style.UserStyleSetting.ComplicationSlotsUserStyleSetting.ComplicationSlotOverlay> complicationSlotOverlays, optional androidx.wear.watchface.style.UserStyleSetting.WatchFaceEditorData? watchFaceEditorData);
+ ctor public UserStyleSetting.ComplicationSlotsUserStyleSetting.ComplicationSlotsOption(androidx.wear.watchface.style.UserStyleSetting.Option.Id id, android.content.res.Resources resources, @StringRes int displayNameResourceId, android.graphics.drawable.Icon? icon, java.util.Collection<androidx.wear.watchface.style.UserStyleSetting.ComplicationSlotsUserStyleSetting.ComplicationSlotOverlay> complicationSlotOverlays);
+ method public java.util.Collection<androidx.wear.watchface.style.UserStyleSetting.ComplicationSlotsUserStyleSetting.ComplicationSlotOverlay> getComplicationSlotOverlays();
+ method public CharSequence getDisplayName();
+ method public android.graphics.drawable.Icon? getIcon();
+ method public androidx.wear.watchface.style.UserStyleSetting.WatchFaceEditorData? getWatchFaceEditorData();
+ property public final java.util.Collection<androidx.wear.watchface.style.UserStyleSetting.ComplicationSlotsUserStyleSetting.ComplicationSlotOverlay> complicationSlotOverlays;
+ property public final CharSequence displayName;
+ property public final android.graphics.drawable.Icon? icon;
+ property public final androidx.wear.watchface.style.UserStyleSetting.WatchFaceEditorData? watchFaceEditorData;
+ }
+
+ public static final class UserStyleSetting.CustomValueUserStyleSetting extends androidx.wear.watchface.style.UserStyleSetting {
+ ctor public UserStyleSetting.CustomValueUserStyleSetting(java.util.Collection<? extends androidx.wear.watchface.style.WatchFaceLayer> affectsWatchFaceLayers, byte[] defaultValue);
+ }
+
+ public static final class UserStyleSetting.CustomValueUserStyleSetting.CustomValueOption extends androidx.wear.watchface.style.UserStyleSetting.Option {
+ ctor public UserStyleSetting.CustomValueUserStyleSetting.CustomValueOption(byte[] customValue);
+ method public byte[] getCustomValue();
+ property public final byte[] customValue;
+ }
+
+ public static final class UserStyleSetting.DoubleRangeUserStyleSetting extends androidx.wear.watchface.style.UserStyleSetting {
+ ctor public UserStyleSetting.DoubleRangeUserStyleSetting(androidx.wear.watchface.style.UserStyleSetting.Id id, android.content.res.Resources resources, @StringRes int displayNameResourceId, @StringRes int descriptionResourceId, android.graphics.drawable.Icon? icon, double minimumValue, double maximumValue, java.util.Collection<? extends androidx.wear.watchface.style.WatchFaceLayer> affectsWatchFaceLayers, double defaultValue, optional androidx.wear.watchface.style.UserStyleSetting.WatchFaceEditorData? watchFaceEditorData);
+ ctor public UserStyleSetting.DoubleRangeUserStyleSetting(androidx.wear.watchface.style.UserStyleSetting.Id id, android.content.res.Resources resources, @StringRes int displayNameResourceId, @StringRes int descriptionResourceId, android.graphics.drawable.Icon? icon, double minimumValue, double maximumValue, java.util.Collection<? extends androidx.wear.watchface.style.WatchFaceLayer> affectsWatchFaceLayers, double defaultValue);
+ method public double getDefaultValue();
+ method public double getMaximumValue();
+ method public double getMinimumValue();
+ property public final double defaultValue;
+ property public final double maximumValue;
+ property public final double minimumValue;
+ }
+
+ public static final class UserStyleSetting.DoubleRangeUserStyleSetting.DoubleRangeOption extends androidx.wear.watchface.style.UserStyleSetting.Option {
+ ctor public UserStyleSetting.DoubleRangeUserStyleSetting.DoubleRangeOption(double value);
+ method public double getValue();
+ property public final double value;
+ }
+
+ public static final class UserStyleSetting.Id {
+ ctor public UserStyleSetting.Id(String value);
+ method public String getValue();
+ property public final String value;
+ field public static final androidx.wear.watchface.style.UserStyleSetting.Id.Companion Companion;
+ field public static final int MAX_LENGTH = 40; // 0x28
+ }
+
+ public static final class UserStyleSetting.Id.Companion {
+ }
+
+ public static class UserStyleSetting.ListUserStyleSetting extends androidx.wear.watchface.style.UserStyleSetting {
+ ctor public UserStyleSetting.ListUserStyleSetting(androidx.wear.watchface.style.UserStyleSetting.Id id, android.content.res.Resources resources, @StringRes int displayNameResourceId, @StringRes int descriptionResourceId, android.graphics.drawable.Icon? icon, java.util.List<androidx.wear.watchface.style.UserStyleSetting.ListUserStyleSetting.ListOption> options, java.util.Collection<? extends androidx.wear.watchface.style.WatchFaceLayer> affectsWatchFaceLayers, optional androidx.wear.watchface.style.UserStyleSetting.ListUserStyleSetting.ListOption defaultOption, optional androidx.wear.watchface.style.UserStyleSetting.WatchFaceEditorData? watchFaceEditorData);
+ ctor public UserStyleSetting.ListUserStyleSetting(androidx.wear.watchface.style.UserStyleSetting.Id id, android.content.res.Resources resources, @StringRes int displayNameResourceId, @StringRes int descriptionResourceId, android.graphics.drawable.Icon? icon, java.util.List<androidx.wear.watchface.style.UserStyleSetting.ListUserStyleSetting.ListOption> options, java.util.Collection<? extends androidx.wear.watchface.style.WatchFaceLayer> affectsWatchFaceLayers, optional androidx.wear.watchface.style.UserStyleSetting.ListUserStyleSetting.ListOption defaultOption);
+ ctor public UserStyleSetting.ListUserStyleSetting(androidx.wear.watchface.style.UserStyleSetting.Id id, android.content.res.Resources resources, @StringRes int displayNameResourceId, @StringRes int descriptionResourceId, android.graphics.drawable.Icon? icon, java.util.List<androidx.wear.watchface.style.UserStyleSetting.ListUserStyleSetting.ListOption> options, java.util.Collection<? extends androidx.wear.watchface.style.WatchFaceLayer> affectsWatchFaceLayers);
+ }
+
+ public static final class UserStyleSetting.ListUserStyleSetting.ListOption extends androidx.wear.watchface.style.UserStyleSetting.Option {
+ ctor public UserStyleSetting.ListUserStyleSetting.ListOption(androidx.wear.watchface.style.UserStyleSetting.Option.Id id, android.content.res.Resources resources, @StringRes int displayNameResourceId, android.graphics.drawable.Icon? icon, optional androidx.wear.watchface.style.UserStyleSetting.WatchFaceEditorData? watchFaceEditorData);
+ ctor public UserStyleSetting.ListUserStyleSetting.ListOption(androidx.wear.watchface.style.UserStyleSetting.Option.Id id, android.content.res.Resources resources, @StringRes int displayNameResourceId, android.graphics.drawable.Icon? icon);
+ ctor @androidx.wear.watchface.style.ExperimentalHierarchicalStyle public UserStyleSetting.ListUserStyleSetting.ListOption(androidx.wear.watchface.style.UserStyleSetting.Option.Id id, android.content.res.Resources resources, @StringRes int displayNameResourceId, android.graphics.drawable.Icon? icon, optional java.util.Collection<? extends androidx.wear.watchface.style.UserStyleSetting> childSettings, optional androidx.wear.watchface.style.UserStyleSetting.WatchFaceEditorData? watchFaceEditorData);
+ method public CharSequence getDisplayName();
+ method public android.graphics.drawable.Icon? getIcon();
+ method public androidx.wear.watchface.style.UserStyleSetting.WatchFaceEditorData? getWatchFaceEditorData();
+ property public final CharSequence displayName;
+ property public final android.graphics.drawable.Icon? icon;
+ property public final androidx.wear.watchface.style.UserStyleSetting.WatchFaceEditorData? watchFaceEditorData;
+ }
+
+ public static final class UserStyleSetting.LongRangeUserStyleSetting extends androidx.wear.watchface.style.UserStyleSetting {
+ ctor public UserStyleSetting.LongRangeUserStyleSetting(androidx.wear.watchface.style.UserStyleSetting.Id id, android.content.res.Resources resources, @StringRes int displayNameResourceId, @StringRes int descriptionResourceId, android.graphics.drawable.Icon? icon, long minimumValue, long maximumValue, java.util.Collection<? extends androidx.wear.watchface.style.WatchFaceLayer> affectsWatchFaceLayers, long defaultValue, optional androidx.wear.watchface.style.UserStyleSetting.WatchFaceEditorData? watchFaceEditorData);
+ ctor public UserStyleSetting.LongRangeUserStyleSetting(androidx.wear.watchface.style.UserStyleSetting.Id id, android.content.res.Resources resources, @StringRes int displayNameResourceId, @StringRes int descriptionResourceId, android.graphics.drawable.Icon? icon, long minimumValue, long maximumValue, java.util.Collection<? extends androidx.wear.watchface.style.WatchFaceLayer> affectsWatchFaceLayers, long defaultValue);
+ method public long getDefaultValue();
+ method public long getMaximumValue();
+ method public long getMinimumValue();
+ property public final long defaultValue;
+ property public final long maximumValue;
+ property public final long minimumValue;
+ }
+
+ public static final class UserStyleSetting.LongRangeUserStyleSetting.LongRangeOption extends androidx.wear.watchface.style.UserStyleSetting.Option {
+ ctor public UserStyleSetting.LongRangeUserStyleSetting.LongRangeOption(long value);
+ method public long getValue();
+ property public final long value;
+ }
+
+ public abstract static class UserStyleSetting.Option {
+ ctor public UserStyleSetting.Option(androidx.wear.watchface.style.UserStyleSetting.Option.Id id);
+ method @androidx.wear.watchface.style.ExperimentalHierarchicalStyle public final java.util.Collection<androidx.wear.watchface.style.UserStyleSetting> getChildSettings();
+ method public final androidx.wear.watchface.style.UserStyleSetting.Option.Id getId();
+ property @androidx.wear.watchface.style.ExperimentalHierarchicalStyle public final java.util.Collection<androidx.wear.watchface.style.UserStyleSetting> childSettings;
+ property public final androidx.wear.watchface.style.UserStyleSetting.Option.Id id;
+ field public static final androidx.wear.watchface.style.UserStyleSetting.Option.Companion Companion;
+ }
+
+ public static final class UserStyleSetting.Option.Companion {
+ }
+
+ public static final class UserStyleSetting.Option.Id {
+ ctor public UserStyleSetting.Option.Id(byte[] value);
+ ctor public UserStyleSetting.Option.Id(String value);
+ method public byte[] getValue();
+ property public final byte[] value;
+ field public static final androidx.wear.watchface.style.UserStyleSetting.Option.Id.Companion Companion;
+ field public static final int MAX_LENGTH = 1024; // 0x400
+ }
+
+ public static final class UserStyleSetting.Option.Id.Companion {
+ }
+
+ public static final class UserStyleSetting.WatchFaceEditorData {
+ ctor public UserStyleSetting.WatchFaceEditorData(android.graphics.drawable.Icon? icon);
+ method public android.graphics.drawable.Icon? getIcon();
+ property public final android.graphics.drawable.Icon? icon;
+ }
+
+ public final class UserStyleSettingKt {
+ }
+
+ public enum WatchFaceLayer {
+ enum_constant public static final androidx.wear.watchface.style.WatchFaceLayer BASE;
+ enum_constant public static final androidx.wear.watchface.style.WatchFaceLayer COMPLICATIONS;
+ enum_constant public static final androidx.wear.watchface.style.WatchFaceLayer COMPLICATIONS_OVERLAY;
+ field public static final java.util.Set<androidx.wear.watchface.style.WatchFaceLayer> ALL_WATCH_FACE_LAYERS;
+ field public static final androidx.wear.watchface.style.WatchFaceLayer.Companion Companion;
+ }
+
+ public static final class WatchFaceLayer.Companion {
+ }
+
+}
+
diff --git a/wear/watchface/watchface-style/api/res-1.1.0-beta03.txt b/wear/watchface/watchface-style/api/res-1.1.0-beta03.txt
new file mode 100644
index 0000000..e69de29
--- /dev/null
+++ b/wear/watchface/watchface-style/api/res-1.1.0-beta03.txt
diff --git a/wear/watchface/watchface-style/api/restricted_1.1.0-beta03.txt b/wear/watchface/watchface-style/api/restricted_1.1.0-beta03.txt
new file mode 100644
index 0000000..aa7175d
--- /dev/null
+++ b/wear/watchface/watchface-style/api/restricted_1.1.0-beta03.txt
@@ -0,0 +1,284 @@
+// Signature format: 4.0
+package androidx.wear.watchface.style {
+
+ public final class CurrentUserStyleRepository {
+ ctor public CurrentUserStyleRepository(androidx.wear.watchface.style.UserStyleSchema schema);
+ method public androidx.wear.watchface.style.UserStyleSchema getSchema();
+ method public kotlinx.coroutines.flow.StateFlow<androidx.wear.watchface.style.UserStyle> getUserStyle();
+ property public final androidx.wear.watchface.style.UserStyleSchema schema;
+ property public final kotlinx.coroutines.flow.StateFlow<androidx.wear.watchface.style.UserStyle> userStyle;
+ }
+
+ public final class MutableUserStyle implements java.lang.Iterable<java.util.Map.Entry<? extends androidx.wear.watchface.style.UserStyleSetting,? extends androidx.wear.watchface.style.UserStyleSetting.Option>> kotlin.jvm.internal.markers.KMappedMarker {
+ method public operator androidx.wear.watchface.style.UserStyleSetting.Option? get(androidx.wear.watchface.style.UserStyleSetting setting);
+ method public operator androidx.wear.watchface.style.UserStyleSetting.Option? get(androidx.wear.watchface.style.UserStyleSetting.Id settingId);
+ method public int getSize();
+ method public java.util.Iterator<java.util.Map.Entry<androidx.wear.watchface.style.UserStyleSetting,androidx.wear.watchface.style.UserStyleSetting.Option>> iterator();
+ method public operator void set(androidx.wear.watchface.style.UserStyleSetting setting, androidx.wear.watchface.style.UserStyleSetting.Option option);
+ method public operator void set(androidx.wear.watchface.style.UserStyleSetting.Id settingId, androidx.wear.watchface.style.UserStyleSetting.Option option);
+ method public operator void set(androidx.wear.watchface.style.UserStyleSetting setting, androidx.wear.watchface.style.UserStyleSetting.Option.Id optionId);
+ method public operator void set(androidx.wear.watchface.style.UserStyleSetting.Id settingId, androidx.wear.watchface.style.UserStyleSetting.Option.Id optionId);
+ method public androidx.wear.watchface.style.UserStyle toUserStyle();
+ property public final int size;
+ }
+
+ public final class UserStyle implements kotlin.jvm.internal.markers.KMappedMarker java.util.Map<androidx.wear.watchface.style.UserStyleSetting,androidx.wear.watchface.style.UserStyleSetting.Option> {
+ ctor public UserStyle(androidx.wear.watchface.style.UserStyle userStyle);
+ ctor public UserStyle(java.util.Map<androidx.wear.watchface.style.UserStyleSetting,? extends androidx.wear.watchface.style.UserStyleSetting.Option> selectedOptions);
+ ctor public UserStyle(androidx.wear.watchface.style.UserStyleData userStyle, androidx.wear.watchface.style.UserStyleSchema styleSchema);
+ method public boolean containsKey(androidx.wear.watchface.style.UserStyleSetting key);
+ method public boolean containsValue(androidx.wear.watchface.style.UserStyleSetting.Option value);
+ method public operator androidx.wear.watchface.style.UserStyleSetting.Option? get(androidx.wear.watchface.style.UserStyleSetting key);
+ method public operator androidx.wear.watchface.style.UserStyleSetting.Option? get(androidx.wear.watchface.style.UserStyleSetting.Id settingId);
+ method public java.util.Set<java.util.Map.Entry<androidx.wear.watchface.style.UserStyleSetting,androidx.wear.watchface.style.UserStyleSetting.Option>> getEntries();
+ method public java.util.Set<androidx.wear.watchface.style.UserStyleSetting> getKeys();
+ method public int getSize();
+ method public java.util.Collection<androidx.wear.watchface.style.UserStyleSetting.Option> getValues();
+ method public boolean isEmpty();
+ method public androidx.wear.watchface.style.MutableUserStyle toMutableUserStyle();
+ method public androidx.wear.watchface.style.UserStyleData toUserStyleData();
+ method @RestrictTo(androidx.annotation.RestrictTo.Scope.LIBRARY_GROUP_PREFIX) public androidx.wear.watchface.style.data.UserStyleWireFormat toWireFormat();
+ property public java.util.Set<java.util.Map.Entry<androidx.wear.watchface.style.UserStyleSetting,androidx.wear.watchface.style.UserStyleSetting.Option>> entries;
+ property public java.util.Set<androidx.wear.watchface.style.UserStyleSetting> keys;
+ property public int size;
+ property public java.util.Collection<androidx.wear.watchface.style.UserStyleSetting.Option> values;
+ }
+
+ public final class UserStyleData {
+ ctor public UserStyleData(java.util.Map<java.lang.String,byte[]> userStyleMap);
+ ctor @RestrictTo(androidx.annotation.RestrictTo.Scope.LIBRARY_GROUP_PREFIX) public UserStyleData(androidx.wear.watchface.style.data.UserStyleWireFormat userStyle);
+ method public java.util.Map<java.lang.String,byte[]> getUserStyleMap();
+ method @RestrictTo(androidx.annotation.RestrictTo.Scope.LIBRARY_GROUP_PREFIX) public androidx.wear.watchface.style.data.UserStyleWireFormat toWireFormat();
+ property public final java.util.Map<java.lang.String,byte[]> userStyleMap;
+ }
+
+ public final class UserStyleSchema {
+ ctor public UserStyleSchema(java.util.List<? extends androidx.wear.watchface.style.UserStyleSetting> userStyleSettings);
+ ctor @RestrictTo(androidx.annotation.RestrictTo.Scope.LIBRARY_GROUP_PREFIX) public UserStyleSchema(androidx.wear.watchface.style.data.UserStyleSchemaWireFormat wireFormat);
+ method public operator androidx.wear.watchface.style.UserStyleSetting? get(androidx.wear.watchface.style.UserStyleSetting.Id settingId);
+ method @RestrictTo(androidx.annotation.RestrictTo.Scope.LIBRARY_GROUP_PREFIX) public androidx.wear.watchface.style.UserStyle getDefaultUserStyle();
+ method public byte[] getDigestHash();
+ method public java.util.List<androidx.wear.watchface.style.UserStyleSetting> getUserStyleSettings();
+ method @RestrictTo(androidx.annotation.RestrictTo.Scope.LIBRARY_GROUP_PREFIX) public androidx.wear.watchface.style.data.UserStyleSchemaWireFormat toWireFormat();
+ property public final java.util.List<androidx.wear.watchface.style.UserStyleSetting> userStyleSettings;
+ }
+
+ public abstract sealed class UserStyleSetting {
+ method public final java.util.Collection<androidx.wear.watchface.style.WatchFaceLayer> getAffectedWatchFaceLayers();
+ method public final androidx.wear.watchface.style.UserStyleSetting.Option getDefaultOption();
+ method public final int getDefaultOptionIndex();
+ method public final CharSequence getDescription();
+ method public final CharSequence getDisplayName();
+ method public final android.graphics.drawable.Icon? getIcon();
+ method public final androidx.wear.watchface.style.UserStyleSetting.Id getId();
+ method public androidx.wear.watchface.style.UserStyleSetting.Option getOptionForId(androidx.wear.watchface.style.UserStyleSetting.Option.Id optionId);
+ method public final java.util.List<androidx.wear.watchface.style.UserStyleSetting.Option> getOptions();
+ method public final androidx.wear.watchface.style.UserStyleSetting.WatchFaceEditorData? getWatchFaceEditorData();
+ method @RestrictTo(androidx.annotation.RestrictTo.Scope.LIBRARY_GROUP_PREFIX) public final java.util.List<androidx.wear.watchface.style.data.OptionWireFormat> getWireFormatOptionsList();
+ method @RestrictTo(androidx.annotation.RestrictTo.Scope.LIBRARY_GROUP_PREFIX) public abstract androidx.wear.watchface.style.data.UserStyleSettingWireFormat toWireFormat();
+ property public final java.util.Collection<androidx.wear.watchface.style.WatchFaceLayer> affectedWatchFaceLayers;
+ property public final androidx.wear.watchface.style.UserStyleSetting.Option defaultOption;
+ property public final int defaultOptionIndex;
+ property public final CharSequence description;
+ property public final CharSequence displayName;
+ property public final android.graphics.drawable.Icon? icon;
+ property public final androidx.wear.watchface.style.UserStyleSetting.Id id;
+ property public final java.util.List<androidx.wear.watchface.style.UserStyleSetting.Option> options;
+ property public final androidx.wear.watchface.style.UserStyleSetting.WatchFaceEditorData? watchFaceEditorData;
+ field public static final androidx.wear.watchface.style.UserStyleSetting.Companion Companion;
+ }
+
+ public static final class UserStyleSetting.BooleanUserStyleSetting extends androidx.wear.watchface.style.UserStyleSetting {
+ ctor public UserStyleSetting.BooleanUserStyleSetting(androidx.wear.watchface.style.UserStyleSetting.Id id, android.content.res.Resources resources, @StringRes int displayNameResourceId, @StringRes int descriptionResourceId, android.graphics.drawable.Icon? icon, java.util.Collection<? extends androidx.wear.watchface.style.WatchFaceLayer> affectsWatchFaceLayers, boolean defaultValue, optional androidx.wear.watchface.style.UserStyleSetting.WatchFaceEditorData? watchFaceEditorData);
+ ctor public UserStyleSetting.BooleanUserStyleSetting(androidx.wear.watchface.style.UserStyleSetting.Id id, android.content.res.Resources resources, @StringRes int displayNameResourceId, @StringRes int descriptionResourceId, android.graphics.drawable.Icon? icon, java.util.Collection<? extends androidx.wear.watchface.style.WatchFaceLayer> affectsWatchFaceLayers, boolean defaultValue);
+ method public boolean getDefaultValue();
+ method @RestrictTo(androidx.annotation.RestrictTo.Scope.LIBRARY_GROUP_PREFIX) public androidx.wear.watchface.style.data.BooleanUserStyleSettingWireFormat toWireFormat();
+ }
+
+ public static final class UserStyleSetting.BooleanUserStyleSetting.BooleanOption extends androidx.wear.watchface.style.UserStyleSetting.Option {
+ method public static androidx.wear.watchface.style.UserStyleSetting.BooleanUserStyleSetting.BooleanOption from(boolean value);
+ method public boolean getValue();
+ method @RestrictTo(androidx.annotation.RestrictTo.Scope.LIBRARY_GROUP_PREFIX) public androidx.wear.watchface.style.data.BooleanOptionWireFormat toWireFormat();
+ property public final boolean value;
+ field public static final androidx.wear.watchface.style.UserStyleSetting.BooleanUserStyleSetting.BooleanOption.Companion Companion;
+ field public static final androidx.wear.watchface.style.UserStyleSetting.BooleanUserStyleSetting.BooleanOption FALSE;
+ field public static final androidx.wear.watchface.style.UserStyleSetting.BooleanUserStyleSetting.BooleanOption TRUE;
+ }
+
+ public static final class UserStyleSetting.BooleanUserStyleSetting.BooleanOption.Companion {
+ method public androidx.wear.watchface.style.UserStyleSetting.BooleanUserStyleSetting.BooleanOption from(boolean value);
+ }
+
+ public static final class UserStyleSetting.Companion {
+ }
+
+ public static final class UserStyleSetting.ComplicationSlotsUserStyleSetting extends androidx.wear.watchface.style.UserStyleSetting {
+ ctor public UserStyleSetting.ComplicationSlotsUserStyleSetting(androidx.wear.watchface.style.UserStyleSetting.Id id, android.content.res.Resources resources, @StringRes int displayNameResourceId, @StringRes int descriptionResourceId, android.graphics.drawable.Icon? icon, java.util.List<androidx.wear.watchface.style.UserStyleSetting.ComplicationSlotsUserStyleSetting.ComplicationSlotsOption> complicationConfig, java.util.Collection<? extends androidx.wear.watchface.style.WatchFaceLayer> affectsWatchFaceLayers, optional androidx.wear.watchface.style.UserStyleSetting.ComplicationSlotsUserStyleSetting.ComplicationSlotsOption defaultOption, optional androidx.wear.watchface.style.UserStyleSetting.WatchFaceEditorData? watchFaceEditorData);
+ ctor public UserStyleSetting.ComplicationSlotsUserStyleSetting(androidx.wear.watchface.style.UserStyleSetting.Id id, android.content.res.Resources resources, @StringRes int displayNameResourceId, @StringRes int descriptionResourceId, android.graphics.drawable.Icon? icon, java.util.List<androidx.wear.watchface.style.UserStyleSetting.ComplicationSlotsUserStyleSetting.ComplicationSlotsOption> complicationConfig, java.util.Collection<? extends androidx.wear.watchface.style.WatchFaceLayer> affectsWatchFaceLayers, optional androidx.wear.watchface.style.UserStyleSetting.ComplicationSlotsUserStyleSetting.ComplicationSlotsOption defaultOption);
+ ctor public UserStyleSetting.ComplicationSlotsUserStyleSetting(androidx.wear.watchface.style.UserStyleSetting.Id id, android.content.res.Resources resources, @StringRes int displayNameResourceId, @StringRes int descriptionResourceId, android.graphics.drawable.Icon? icon, java.util.List<androidx.wear.watchface.style.UserStyleSetting.ComplicationSlotsUserStyleSetting.ComplicationSlotsOption> complicationConfig, java.util.Collection<? extends androidx.wear.watchface.style.WatchFaceLayer> affectsWatchFaceLayers);
+ method @RestrictTo(androidx.annotation.RestrictTo.Scope.LIBRARY_GROUP_PREFIX) public androidx.wear.watchface.style.data.ComplicationsUserStyleSettingWireFormat toWireFormat();
+ }
+
+ public static final class UserStyleSetting.ComplicationSlotsUserStyleSetting.ComplicationSlotOverlay {
+ ctor public UserStyleSetting.ComplicationSlotsUserStyleSetting.ComplicationSlotOverlay(int complicationSlotId, optional Boolean? enabled, optional androidx.wear.watchface.complications.ComplicationSlotBounds? complicationSlotBounds, optional Integer? accessibilityTraversalIndex);
+ method public Integer? getAccessibilityTraversalIndex();
+ method public androidx.wear.watchface.complications.ComplicationSlotBounds? getComplicationSlotBounds();
+ method public int getComplicationSlotId();
+ method public Boolean? getEnabled();
+ property public final Integer? accessibilityTraversalIndex;
+ property public final androidx.wear.watchface.complications.ComplicationSlotBounds? complicationSlotBounds;
+ property public final int complicationSlotId;
+ property public final Boolean? enabled;
+ }
+
+ public static final class UserStyleSetting.ComplicationSlotsUserStyleSetting.ComplicationSlotOverlay.Builder {
+ ctor public UserStyleSetting.ComplicationSlotsUserStyleSetting.ComplicationSlotOverlay.Builder(int complicationSlotId);
+ method public androidx.wear.watchface.style.UserStyleSetting.ComplicationSlotsUserStyleSetting.ComplicationSlotOverlay build();
+ method public androidx.wear.watchface.style.UserStyleSetting.ComplicationSlotsUserStyleSetting.ComplicationSlotOverlay.Builder setAccessibilityTraversalIndex(int accessibilityTraversalIndex);
+ method public androidx.wear.watchface.style.UserStyleSetting.ComplicationSlotsUserStyleSetting.ComplicationSlotOverlay.Builder setComplicationSlotBounds(androidx.wear.watchface.complications.ComplicationSlotBounds complicationSlotBounds);
+ method public androidx.wear.watchface.style.UserStyleSetting.ComplicationSlotsUserStyleSetting.ComplicationSlotOverlay.Builder setEnabled(boolean enabled);
+ }
+
+ public static final class UserStyleSetting.ComplicationSlotsUserStyleSetting.ComplicationSlotsOption extends androidx.wear.watchface.style.UserStyleSetting.Option {
+ ctor public UserStyleSetting.ComplicationSlotsUserStyleSetting.ComplicationSlotsOption(androidx.wear.watchface.style.UserStyleSetting.Option.Id id, android.content.res.Resources resources, @StringRes int displayNameResourceId, android.graphics.drawable.Icon? icon, java.util.Collection<androidx.wear.watchface.style.UserStyleSetting.ComplicationSlotsUserStyleSetting.ComplicationSlotOverlay> complicationSlotOverlays, optional androidx.wear.watchface.style.UserStyleSetting.WatchFaceEditorData? watchFaceEditorData);
+ ctor public UserStyleSetting.ComplicationSlotsUserStyleSetting.ComplicationSlotsOption(androidx.wear.watchface.style.UserStyleSetting.Option.Id id, android.content.res.Resources resources, @StringRes int displayNameResourceId, android.graphics.drawable.Icon? icon, java.util.Collection<androidx.wear.watchface.style.UserStyleSetting.ComplicationSlotsUserStyleSetting.ComplicationSlotOverlay> complicationSlotOverlays);
+ method public java.util.Collection<androidx.wear.watchface.style.UserStyleSetting.ComplicationSlotsUserStyleSetting.ComplicationSlotOverlay> getComplicationSlotOverlays();
+ method public CharSequence getDisplayName();
+ method public android.graphics.drawable.Icon? getIcon();
+ method public androidx.wear.watchface.style.UserStyleSetting.WatchFaceEditorData? getWatchFaceEditorData();
+ method @RestrictTo(androidx.annotation.RestrictTo.Scope.LIBRARY_GROUP_PREFIX) public androidx.wear.watchface.style.data.ComplicationsOptionWireFormat toWireFormat();
+ property public final java.util.Collection<androidx.wear.watchface.style.UserStyleSetting.ComplicationSlotsUserStyleSetting.ComplicationSlotOverlay> complicationSlotOverlays;
+ property public final CharSequence displayName;
+ property public final android.graphics.drawable.Icon? icon;
+ property public final androidx.wear.watchface.style.UserStyleSetting.WatchFaceEditorData? watchFaceEditorData;
+ }
+
+ public static final class UserStyleSetting.CustomValueUserStyleSetting extends androidx.wear.watchface.style.UserStyleSetting {
+ ctor public UserStyleSetting.CustomValueUserStyleSetting(java.util.Collection<? extends androidx.wear.watchface.style.WatchFaceLayer> affectsWatchFaceLayers, byte[] defaultValue);
+ method @RestrictTo(androidx.annotation.RestrictTo.Scope.LIBRARY_GROUP_PREFIX) public androidx.wear.watchface.style.data.CustomValueUserStyleSettingWireFormat toWireFormat();
+ }
+
+ public static final class UserStyleSetting.CustomValueUserStyleSetting.CustomValueOption extends androidx.wear.watchface.style.UserStyleSetting.Option {
+ ctor public UserStyleSetting.CustomValueUserStyleSetting.CustomValueOption(byte[] customValue);
+ method public byte[] getCustomValue();
+ method @RestrictTo(androidx.annotation.RestrictTo.Scope.LIBRARY_GROUP_PREFIX) public androidx.wear.watchface.style.data.CustomValueOptionWireFormat toWireFormat();
+ property public final byte[] customValue;
+ }
+
+ public static final class UserStyleSetting.DoubleRangeUserStyleSetting extends androidx.wear.watchface.style.UserStyleSetting {
+ ctor public UserStyleSetting.DoubleRangeUserStyleSetting(androidx.wear.watchface.style.UserStyleSetting.Id id, android.content.res.Resources resources, @StringRes int displayNameResourceId, @StringRes int descriptionResourceId, android.graphics.drawable.Icon? icon, double minimumValue, double maximumValue, java.util.Collection<? extends androidx.wear.watchface.style.WatchFaceLayer> affectsWatchFaceLayers, double defaultValue, optional androidx.wear.watchface.style.UserStyleSetting.WatchFaceEditorData? watchFaceEditorData);
+ ctor public UserStyleSetting.DoubleRangeUserStyleSetting(androidx.wear.watchface.style.UserStyleSetting.Id id, android.content.res.Resources resources, @StringRes int displayNameResourceId, @StringRes int descriptionResourceId, android.graphics.drawable.Icon? icon, double minimumValue, double maximumValue, java.util.Collection<? extends androidx.wear.watchface.style.WatchFaceLayer> affectsWatchFaceLayers, double defaultValue);
+ method public double getDefaultValue();
+ method public double getMaximumValue();
+ method public double getMinimumValue();
+ method @RestrictTo(androidx.annotation.RestrictTo.Scope.LIBRARY_GROUP_PREFIX) public androidx.wear.watchface.style.data.DoubleRangeUserStyleSettingWireFormat toWireFormat();
+ property public final double defaultValue;
+ property public final double maximumValue;
+ property public final double minimumValue;
+ }
+
+ public static final class UserStyleSetting.DoubleRangeUserStyleSetting.DoubleRangeOption extends androidx.wear.watchface.style.UserStyleSetting.Option {
+ ctor public UserStyleSetting.DoubleRangeUserStyleSetting.DoubleRangeOption(double value);
+ method public double getValue();
+ method @RestrictTo(androidx.annotation.RestrictTo.Scope.LIBRARY_GROUP_PREFIX) public androidx.wear.watchface.style.data.DoubleRangeOptionWireFormat toWireFormat();
+ property public final double value;
+ }
+
+ public static final class UserStyleSetting.Id {
+ ctor public UserStyleSetting.Id(String value);
+ method public String getValue();
+ property public final String value;
+ field public static final androidx.wear.watchface.style.UserStyleSetting.Id.Companion Companion;
+ field public static final int MAX_LENGTH = 40; // 0x28
+ }
+
+ public static final class UserStyleSetting.Id.Companion {
+ }
+
+ public static class UserStyleSetting.ListUserStyleSetting extends androidx.wear.watchface.style.UserStyleSetting {
+ ctor public UserStyleSetting.ListUserStyleSetting(androidx.wear.watchface.style.UserStyleSetting.Id id, android.content.res.Resources resources, @StringRes int displayNameResourceId, @StringRes int descriptionResourceId, android.graphics.drawable.Icon? icon, java.util.List<androidx.wear.watchface.style.UserStyleSetting.ListUserStyleSetting.ListOption> options, java.util.Collection<? extends androidx.wear.watchface.style.WatchFaceLayer> affectsWatchFaceLayers, optional androidx.wear.watchface.style.UserStyleSetting.ListUserStyleSetting.ListOption defaultOption, optional androidx.wear.watchface.style.UserStyleSetting.WatchFaceEditorData? watchFaceEditorData);
+ ctor public UserStyleSetting.ListUserStyleSetting(androidx.wear.watchface.style.UserStyleSetting.Id id, android.content.res.Resources resources, @StringRes int displayNameResourceId, @StringRes int descriptionResourceId, android.graphics.drawable.Icon? icon, java.util.List<androidx.wear.watchface.style.UserStyleSetting.ListUserStyleSetting.ListOption> options, java.util.Collection<? extends androidx.wear.watchface.style.WatchFaceLayer> affectsWatchFaceLayers, optional androidx.wear.watchface.style.UserStyleSetting.ListUserStyleSetting.ListOption defaultOption);
+ ctor public UserStyleSetting.ListUserStyleSetting(androidx.wear.watchface.style.UserStyleSetting.Id id, android.content.res.Resources resources, @StringRes int displayNameResourceId, @StringRes int descriptionResourceId, android.graphics.drawable.Icon? icon, java.util.List<androidx.wear.watchface.style.UserStyleSetting.ListUserStyleSetting.ListOption> options, java.util.Collection<? extends androidx.wear.watchface.style.WatchFaceLayer> affectsWatchFaceLayers);
+ method @RestrictTo(androidx.annotation.RestrictTo.Scope.LIBRARY_GROUP_PREFIX) public androidx.wear.watchface.style.data.ListUserStyleSettingWireFormat toWireFormat();
+ }
+
+ public static final class UserStyleSetting.ListUserStyleSetting.ListOption extends androidx.wear.watchface.style.UserStyleSetting.Option {
+ ctor public UserStyleSetting.ListUserStyleSetting.ListOption(androidx.wear.watchface.style.UserStyleSetting.Option.Id id, android.content.res.Resources resources, @StringRes int displayNameResourceId, android.graphics.drawable.Icon? icon, optional androidx.wear.watchface.style.UserStyleSetting.WatchFaceEditorData? watchFaceEditorData);
+ ctor public UserStyleSetting.ListUserStyleSetting.ListOption(androidx.wear.watchface.style.UserStyleSetting.Option.Id id, android.content.res.Resources resources, @StringRes int displayNameResourceId, android.graphics.drawable.Icon? icon);
+ method public CharSequence getDisplayName();
+ method public android.graphics.drawable.Icon? getIcon();
+ method public androidx.wear.watchface.style.UserStyleSetting.WatchFaceEditorData? getWatchFaceEditorData();
+ method @RestrictTo(androidx.annotation.RestrictTo.Scope.LIBRARY_GROUP_PREFIX) public androidx.wear.watchface.style.data.ListOptionWireFormat toWireFormat();
+ property public final CharSequence displayName;
+ property public final android.graphics.drawable.Icon? icon;
+ property public final androidx.wear.watchface.style.UserStyleSetting.WatchFaceEditorData? watchFaceEditorData;
+ }
+
+ public static final class UserStyleSetting.LongRangeUserStyleSetting extends androidx.wear.watchface.style.UserStyleSetting {
+ ctor public UserStyleSetting.LongRangeUserStyleSetting(androidx.wear.watchface.style.UserStyleSetting.Id id, android.content.res.Resources resources, @StringRes int displayNameResourceId, @StringRes int descriptionResourceId, android.graphics.drawable.Icon? icon, long minimumValue, long maximumValue, java.util.Collection<? extends androidx.wear.watchface.style.WatchFaceLayer> affectsWatchFaceLayers, long defaultValue, optional androidx.wear.watchface.style.UserStyleSetting.WatchFaceEditorData? watchFaceEditorData);
+ ctor public UserStyleSetting.LongRangeUserStyleSetting(androidx.wear.watchface.style.UserStyleSetting.Id id, android.content.res.Resources resources, @StringRes int displayNameResourceId, @StringRes int descriptionResourceId, android.graphics.drawable.Icon? icon, long minimumValue, long maximumValue, java.util.Collection<? extends androidx.wear.watchface.style.WatchFaceLayer> affectsWatchFaceLayers, long defaultValue);
+ method public long getDefaultValue();
+ method public long getMaximumValue();
+ method public long getMinimumValue();
+ method @RestrictTo(androidx.annotation.RestrictTo.Scope.LIBRARY_GROUP_PREFIX) public androidx.wear.watchface.style.data.LongRangeUserStyleSettingWireFormat toWireFormat();
+ property public final long defaultValue;
+ property public final long maximumValue;
+ property public final long minimumValue;
+ }
+
+ public static final class UserStyleSetting.LongRangeUserStyleSetting.LongRangeOption extends androidx.wear.watchface.style.UserStyleSetting.Option {
+ ctor public UserStyleSetting.LongRangeUserStyleSetting.LongRangeOption(long value);
+ method public long getValue();
+ method @RestrictTo(androidx.annotation.RestrictTo.Scope.LIBRARY_GROUP_PREFIX) public androidx.wear.watchface.style.data.LongRangeOptionWireFormat toWireFormat();
+ property public final long value;
+ }
+
+ public abstract static class UserStyleSetting.Option {
+ ctor public UserStyleSetting.Option(androidx.wear.watchface.style.UserStyleSetting.Option.Id id);
+ method public final androidx.wear.watchface.style.UserStyleSetting.Option.Id getId();
+ method @RestrictTo(androidx.annotation.RestrictTo.Scope.LIBRARY_GROUP_PREFIX) public abstract androidx.wear.watchface.style.data.OptionWireFormat toWireFormat();
+ property public final androidx.wear.watchface.style.UserStyleSetting.Option.Id id;
+ field public static final androidx.wear.watchface.style.UserStyleSetting.Option.Companion Companion;
+ }
+
+ public static final class UserStyleSetting.Option.Companion {
+ method @RestrictTo(androidx.annotation.RestrictTo.Scope.LIBRARY_GROUP_PREFIX) public androidx.wear.watchface.style.UserStyleSetting.Option createFromWireFormat(androidx.wear.watchface.style.data.OptionWireFormat wireFormat);
+ }
+
+ public static final class UserStyleSetting.Option.Id {
+ ctor public UserStyleSetting.Option.Id(byte[] value);
+ ctor public UserStyleSetting.Option.Id(String value);
+ method public byte[] getValue();
+ property public final byte[] value;
+ field public static final androidx.wear.watchface.style.UserStyleSetting.Option.Id.Companion Companion;
+ field public static final int MAX_LENGTH = 1024; // 0x400
+ }
+
+ public static final class UserStyleSetting.Option.Id.Companion {
+ }
+
+ public static final class UserStyleSetting.WatchFaceEditorData {
+ ctor public UserStyleSetting.WatchFaceEditorData(android.graphics.drawable.Icon? icon);
+ method public android.graphics.drawable.Icon? getIcon();
+ property public final android.graphics.drawable.Icon? icon;
+ }
+
+ public final class UserStyleSettingKt {
+ method @RestrictTo(androidx.annotation.RestrictTo.Scope.LIBRARY_GROUP_PREFIX) public static Integer? getIntRefAttribute(android.content.res.Resources resources, android.content.res.XmlResourceParser parser, String name);
+ method @RestrictTo(androidx.annotation.RestrictTo.Scope.LIBRARY_GROUP_PREFIX) public static String? getStringRefAttribute(android.content.res.Resources resources, android.content.res.XmlResourceParser parser, String name);
+ method @RestrictTo(androidx.annotation.RestrictTo.Scope.LIBRARY_GROUP_PREFIX) public static void moveToStart(org.xmlpull.v1.XmlPullParser, String expectedNode);
+ }
+
+ public enum WatchFaceLayer {
+ enum_constant public static final androidx.wear.watchface.style.WatchFaceLayer BASE;
+ enum_constant public static final androidx.wear.watchface.style.WatchFaceLayer COMPLICATIONS;
+ enum_constant public static final androidx.wear.watchface.style.WatchFaceLayer COMPLICATIONS_OVERLAY;
+ field public static final java.util.Set<androidx.wear.watchface.style.WatchFaceLayer> ALL_WATCH_FACE_LAYERS;
+ field public static final androidx.wear.watchface.style.WatchFaceLayer.Companion Companion;
+ }
+
+ public static final class WatchFaceLayer.Companion {
+ }
+
+}
+
diff --git a/wear/watchface/watchface/api/1.1.0-beta03.txt b/wear/watchface/watchface/api/1.1.0-beta03.txt
new file mode 100644
index 0000000..027672b
--- /dev/null
+++ b/wear/watchface/watchface/api/1.1.0-beta03.txt
@@ -0,0 +1,398 @@
+// Signature format: 4.0
+package androidx.wear.watchface {
+
+ public final class BackgroundComplicationTapFilter implements androidx.wear.watchface.ComplicationTapFilter {
+ ctor public BackgroundComplicationTapFilter();
+ method public boolean hitTest(androidx.wear.watchface.ComplicationSlot complicationSlot, android.graphics.Rect screenBounds, @Px int x, @Px int y);
+ }
+
+ public interface CanvasComplication {
+ method public void drawHighlight(android.graphics.Canvas canvas, android.graphics.Rect bounds, int boundsType, java.time.ZonedDateTime zonedDateTime, @ColorInt int color);
+ method public androidx.wear.watchface.complications.data.ComplicationData getData();
+ method public void loadData(androidx.wear.watchface.complications.data.ComplicationData complicationData, boolean loadDrawablesAsynchronous);
+ method @WorkerThread public default void onRendererCreated(androidx.wear.watchface.Renderer renderer);
+ method @UiThread public void render(android.graphics.Canvas canvas, android.graphics.Rect bounds, java.time.ZonedDateTime zonedDateTime, androidx.wear.watchface.RenderParameters renderParameters, int slotId);
+ }
+
+ public static interface CanvasComplication.InvalidateCallback {
+ method public void onInvalidate();
+ }
+
+ public interface CanvasComplicationFactory {
+ method @WorkerThread public androidx.wear.watchface.CanvasComplication create(androidx.wear.watchface.WatchState, androidx.wear.watchface.CanvasComplication.InvalidateCallback);
+ }
+
+ public final class ComplicationSlot {
+ method public android.graphics.Rect computeBounds(android.graphics.Rect screen);
+ method public static androidx.wear.watchface.ComplicationSlot.Builder createBackgroundComplicationSlotBuilder(int id, androidx.wear.watchface.CanvasComplicationFactory canvasComplicationFactory, java.util.List<? extends androidx.wear.watchface.complications.data.ComplicationType> supportedTypes, androidx.wear.watchface.complications.DefaultComplicationDataSourcePolicy defaultDataSourcePolicy);
+ method public static androidx.wear.watchface.ComplicationSlot.Builder createEdgeComplicationSlotBuilder(int id, androidx.wear.watchface.CanvasComplicationFactory canvasComplicationFactory, java.util.List<? extends androidx.wear.watchface.complications.data.ComplicationType> supportedTypes, androidx.wear.watchface.complications.DefaultComplicationDataSourcePolicy defaultDataSourcePolicy, androidx.wear.watchface.complications.ComplicationSlotBounds bounds, androidx.wear.watchface.ComplicationTapFilter complicationTapFilter);
+ method public static androidx.wear.watchface.ComplicationSlot.Builder createRoundRectComplicationSlotBuilder(int id, androidx.wear.watchface.CanvasComplicationFactory canvasComplicationFactory, java.util.List<? extends androidx.wear.watchface.complications.data.ComplicationType> supportedTypes, androidx.wear.watchface.complications.DefaultComplicationDataSourcePolicy defaultDataSourcePolicy, androidx.wear.watchface.complications.ComplicationSlotBounds bounds);
+ method @UiThread public int getAccessibilityTraversalIndex();
+ method public int getBoundsType();
+ method public androidx.wear.watchface.CanvasComplicationFactory getCanvasComplicationFactory();
+ method public kotlinx.coroutines.flow.StateFlow<androidx.wear.watchface.complications.data.ComplicationData> getComplicationData();
+ method @UiThread public androidx.wear.watchface.complications.ComplicationSlotBounds getComplicationSlotBounds();
+ method public android.os.Bundle getConfigExtras();
+ method @UiThread public androidx.wear.watchface.complications.DefaultComplicationDataSourcePolicy getDefaultDataSourcePolicy();
+ method @Deprecated @UiThread public androidx.wear.watchface.complications.data.ComplicationType getDefaultDataSourceType();
+ method public boolean getFixedComplicationDataSource();
+ method public int getId();
+ method public boolean getInitiallyEnabled();
+ method public Integer? getNameResourceId();
+ method public androidx.wear.watchface.CanvasComplication getRenderer();
+ method public Integer? getScreenReaderNameResourceId();
+ method @UiThread public java.util.List<androidx.wear.watchface.complications.data.ComplicationType> getSupportedTypes();
+ method public androidx.wear.watchface.ComplicationTapFilter getTapFilter();
+ method public boolean isActiveAt(java.time.Instant instant);
+ method @UiThread public boolean isEnabled();
+ method @UiThread public void render(android.graphics.Canvas canvas, java.time.ZonedDateTime zonedDateTime, androidx.wear.watchface.RenderParameters renderParameters);
+ method @UiThread public void renderHighlightLayer(android.graphics.Canvas canvas, java.time.ZonedDateTime zonedDateTime, androidx.wear.watchface.RenderParameters renderParameters);
+ method public void setConfigExtras(android.os.Bundle);
+ property @UiThread public final int accessibilityTraversalIndex;
+ property public final int boundsType;
+ property public final androidx.wear.watchface.CanvasComplicationFactory canvasComplicationFactory;
+ property public final kotlinx.coroutines.flow.StateFlow<androidx.wear.watchface.complications.data.ComplicationData> complicationData;
+ property @UiThread public final androidx.wear.watchface.complications.ComplicationSlotBounds complicationSlotBounds;
+ property public final android.os.Bundle configExtras;
+ property @UiThread public final androidx.wear.watchface.complications.DefaultComplicationDataSourcePolicy defaultDataSourcePolicy;
+ property @Deprecated @UiThread public final androidx.wear.watchface.complications.data.ComplicationType defaultDataSourceType;
+ property @UiThread public final boolean enabled;
+ property public final boolean fixedComplicationDataSource;
+ property public final int id;
+ property public final boolean initiallyEnabled;
+ property public final Integer? nameResourceId;
+ property public final androidx.wear.watchface.CanvasComplication renderer;
+ property public final Integer? screenReaderNameResourceId;
+ property @UiThread public final java.util.List<androidx.wear.watchface.complications.data.ComplicationType> supportedTypes;
+ property public final androidx.wear.watchface.ComplicationTapFilter tapFilter;
+ field public static final androidx.wear.watchface.ComplicationSlot.Companion Companion;
+ }
+
+ public static final class ComplicationSlot.Builder {
+ method public androidx.wear.watchface.ComplicationSlot build();
+ method public androidx.wear.watchface.ComplicationSlot.Builder setAccessibilityTraversalIndex(int accessibilityTraversalIndex);
+ method public androidx.wear.watchface.ComplicationSlot.Builder setConfigExtras(android.os.Bundle extras);
+ method @Deprecated public androidx.wear.watchface.ComplicationSlot.Builder setDefaultDataSourceType(androidx.wear.watchface.complications.data.ComplicationType defaultDataSourceType);
+ method public androidx.wear.watchface.ComplicationSlot.Builder setEnabled(boolean enabled);
+ method public androidx.wear.watchface.ComplicationSlot.Builder setFixedComplicationDataSource(boolean fixedComplicationDataSource);
+ method public androidx.wear.watchface.ComplicationSlot.Builder setNameResourceId(Integer? nameResourceId);
+ method public androidx.wear.watchface.ComplicationSlot.Builder setScreenReaderNameResourceId(Integer? screenReaderNameResourceId);
+ }
+
+ public static final class ComplicationSlot.Companion {
+ method public androidx.wear.watchface.ComplicationSlot.Builder createBackgroundComplicationSlotBuilder(int id, androidx.wear.watchface.CanvasComplicationFactory canvasComplicationFactory, java.util.List<? extends androidx.wear.watchface.complications.data.ComplicationType> supportedTypes, androidx.wear.watchface.complications.DefaultComplicationDataSourcePolicy defaultDataSourcePolicy);
+ method public androidx.wear.watchface.ComplicationSlot.Builder createEdgeComplicationSlotBuilder(int id, androidx.wear.watchface.CanvasComplicationFactory canvasComplicationFactory, java.util.List<? extends androidx.wear.watchface.complications.data.ComplicationType> supportedTypes, androidx.wear.watchface.complications.DefaultComplicationDataSourcePolicy defaultDataSourcePolicy, androidx.wear.watchface.complications.ComplicationSlotBounds bounds, androidx.wear.watchface.ComplicationTapFilter complicationTapFilter);
+ method public androidx.wear.watchface.ComplicationSlot.Builder createRoundRectComplicationSlotBuilder(int id, androidx.wear.watchface.CanvasComplicationFactory canvasComplicationFactory, java.util.List<? extends androidx.wear.watchface.complications.data.ComplicationType> supportedTypes, androidx.wear.watchface.complications.DefaultComplicationDataSourcePolicy defaultDataSourcePolicy, androidx.wear.watchface.complications.ComplicationSlotBounds bounds);
+ }
+
+ public abstract class ComplicationSlotInflationFactory {
+ ctor public ComplicationSlotInflationFactory();
+ method public abstract androidx.wear.watchface.CanvasComplicationFactory getCanvasComplicationFactory(int slotId);
+ method public androidx.wear.watchface.ComplicationTapFilter getEdgeComplicationTapFilter(int slotId);
+ }
+
+ public final class ComplicationSlotsManager {
+ ctor public ComplicationSlotsManager(java.util.Collection<androidx.wear.watchface.ComplicationSlot> complicationSlotCollection, androidx.wear.watchface.style.CurrentUserStyleRepository currentUserStyleRepository);
+ method @UiThread public void addTapListener(androidx.wear.watchface.ComplicationSlotsManager.TapCallback tapCallback);
+ method public operator androidx.wear.watchface.ComplicationSlot? get(int id);
+ method public androidx.wear.watchface.ComplicationSlot? getBackgroundComplicationSlot();
+ method public androidx.wear.watchface.ComplicationSlot? getComplicationSlotAt(@Px int x, @Px int y);
+ method public java.util.Map<java.lang.Integer,androidx.wear.watchface.ComplicationSlot> getComplicationSlots();
+ method public java.util.Map<java.lang.Integer,androidx.wear.watchface.TapEvent> getLastComplicationTapDownEvents();
+ method @UiThread public void removeTapListener(androidx.wear.watchface.ComplicationSlotsManager.TapCallback tapCallback);
+ property public final java.util.Map<java.lang.Integer,androidx.wear.watchface.ComplicationSlot> complicationSlots;
+ property public final java.util.Map<java.lang.Integer,androidx.wear.watchface.TapEvent> lastComplicationTapDownEvents;
+ }
+
+ public static interface ComplicationSlotsManager.TapCallback {
+ method public default void onComplicationSlotTapped(int complicationSlotId);
+ }
+
+ public final class ComplicationSlotsManagerKt {
+ }
+
+ public interface ComplicationTapFilter {
+ method public boolean hitTest(androidx.wear.watchface.ComplicationSlot complicationSlot, android.graphics.Rect screenBounds, @Px int x, @Px int y);
+ }
+
+ public final class ContentDescriptionLabel {
+ ctor public ContentDescriptionLabel(androidx.wear.watchface.complications.data.ComplicationText text, android.graphics.Rect bounds, android.app.PendingIntent? tapAction);
+ method public android.graphics.Rect getBounds();
+ method public android.app.PendingIntent? getTapAction();
+ method public androidx.wear.watchface.complications.data.ComplicationText getText();
+ method public CharSequence getTextAt(android.content.res.Resources resources, java.time.Instant instant);
+ property public final android.graphics.Rect bounds;
+ property public final android.app.PendingIntent? tapAction;
+ property public final androidx.wear.watchface.complications.data.ComplicationText text;
+ }
+
+ public enum DrawMode {
+ enum_constant public static final androidx.wear.watchface.DrawMode AMBIENT;
+ enum_constant public static final androidx.wear.watchface.DrawMode INTERACTIVE;
+ enum_constant public static final androidx.wear.watchface.DrawMode LOW_BATTERY_INTERACTIVE;
+ enum_constant public static final androidx.wear.watchface.DrawMode MUTE;
+ }
+
+ public final class RenderBufferTextureKt {
+ }
+
+ public final class RenderParameters {
+ ctor public RenderParameters(androidx.wear.watchface.DrawMode drawMode, java.util.Set<? extends androidx.wear.watchface.style.WatchFaceLayer> watchFaceLayers, optional androidx.wear.watchface.RenderParameters.HighlightLayer? highlightLayer, optional java.util.Map<java.lang.Integer,androidx.wear.watchface.TapEvent> lastComplicationTapDownEvents);
+ ctor public RenderParameters(androidx.wear.watchface.DrawMode drawMode, java.util.Set<? extends androidx.wear.watchface.style.WatchFaceLayer> watchFaceLayers, optional androidx.wear.watchface.RenderParameters.HighlightLayer? highlightLayer);
+ ctor public RenderParameters(androidx.wear.watchface.DrawMode drawMode, java.util.Set<? extends androidx.wear.watchface.style.WatchFaceLayer> watchFaceLayers);
+ method public androidx.wear.watchface.DrawMode getDrawMode();
+ method public androidx.wear.watchface.RenderParameters.HighlightLayer? getHighlightLayer();
+ method public java.util.Map<java.lang.Integer,androidx.wear.watchface.TapEvent> getLastComplicationTapDownEvents();
+ method public java.util.Set<androidx.wear.watchface.style.WatchFaceLayer> getWatchFaceLayers();
+ method public boolean isForScreenshot();
+ property public final androidx.wear.watchface.DrawMode drawMode;
+ property public final androidx.wear.watchface.RenderParameters.HighlightLayer? highlightLayer;
+ property public final boolean isForScreenshot;
+ property public final java.util.Map<java.lang.Integer,androidx.wear.watchface.TapEvent> lastComplicationTapDownEvents;
+ property public final java.util.Set<androidx.wear.watchface.style.WatchFaceLayer> watchFaceLayers;
+ field public static final androidx.wear.watchface.RenderParameters.Companion Companion;
+ field public static final androidx.wear.watchface.RenderParameters DEFAULT_INTERACTIVE;
+ }
+
+ public static final class RenderParameters.Companion {
+ }
+
+ public static final class RenderParameters.HighlightLayer {
+ ctor public RenderParameters.HighlightLayer(androidx.wear.watchface.RenderParameters.HighlightedElement highlightedElement, @ColorInt int highlightTint, @ColorInt int backgroundTint);
+ method @ColorInt public int getBackgroundTint();
+ method @ColorInt public int getHighlightTint();
+ method public androidx.wear.watchface.RenderParameters.HighlightedElement getHighlightedElement();
+ property @ColorInt public final int backgroundTint;
+ property @ColorInt public final int highlightTint;
+ property public final androidx.wear.watchface.RenderParameters.HighlightedElement highlightedElement;
+ }
+
+ public abstract static sealed class RenderParameters.HighlightedElement {
+ }
+
+ public static final class RenderParameters.HighlightedElement.AllComplicationSlots extends androidx.wear.watchface.RenderParameters.HighlightedElement {
+ field public static final androidx.wear.watchface.RenderParameters.HighlightedElement.AllComplicationSlots INSTANCE;
+ }
+
+ public static final class RenderParameters.HighlightedElement.ComplicationSlot extends androidx.wear.watchface.RenderParameters.HighlightedElement {
+ ctor public RenderParameters.HighlightedElement.ComplicationSlot(int id);
+ method public int getId();
+ property public final int id;
+ }
+
+ public static final class RenderParameters.HighlightedElement.UserStyle extends androidx.wear.watchface.RenderParameters.HighlightedElement {
+ ctor public RenderParameters.HighlightedElement.UserStyle(androidx.wear.watchface.style.UserStyleSetting.Id id);
+ method public androidx.wear.watchface.style.UserStyleSetting.Id getId();
+ property public final androidx.wear.watchface.style.UserStyleSetting.Id id;
+ }
+
+ public abstract sealed class Renderer {
+ method public final java.util.Collection<kotlin.Pair<java.lang.Integer,androidx.wear.watchface.ContentDescriptionLabel>> getAdditionalContentDescriptionLabels();
+ method public final float getCenterX();
+ method public final float getCenterY();
+ method public final long getInteractiveDrawModeUpdateDelayMillis();
+ method @UiThread public android.graphics.Rect getMainClockElementBounds();
+ method public final androidx.wear.watchface.RenderParameters getRenderParameters();
+ method public final android.graphics.Rect getScreenBounds();
+ method public final android.view.SurfaceHolder getSurfaceHolder();
+ method @UiThread public final void invalidate();
+ method @UiThread public void onDestroy();
+ method @UiThread public abstract void onDump(java.io.PrintWriter writer);
+ method @UiThread protected void onRenderParametersChanged(androidx.wear.watchface.RenderParameters renderParameters);
+ method public final void postInvalidate();
+ method public final void setAdditionalContentDescriptionLabels(java.util.Collection<kotlin.Pair<java.lang.Integer,androidx.wear.watchface.ContentDescriptionLabel>>);
+ method public final void setInteractiveDrawModeUpdateDelayMillis(long);
+ method @UiThread public boolean shouldAnimate();
+ property public final java.util.Collection<kotlin.Pair<java.lang.Integer,androidx.wear.watchface.ContentDescriptionLabel>> additionalContentDescriptionLabels;
+ property public final float centerX;
+ property public final float centerY;
+ property public final long interactiveDrawModeUpdateDelayMillis;
+ property public final androidx.wear.watchface.RenderParameters renderParameters;
+ property public final android.graphics.Rect screenBounds;
+ property public final android.view.SurfaceHolder surfaceHolder;
+ }
+
+ @Deprecated public abstract static class Renderer.CanvasRenderer extends androidx.wear.watchface.Renderer {
+ ctor @Deprecated @WorkerThread public Renderer.CanvasRenderer(android.view.SurfaceHolder surfaceHolder, androidx.wear.watchface.style.CurrentUserStyleRepository currentUserStyleRepository, androidx.wear.watchface.WatchState watchState, int canvasType, @IntRange(from=0L, to=60000L) long interactiveDrawModeUpdateDelayMillis, optional boolean clearWithBackgroundTintBeforeRenderingHighlightLayer);
+ ctor @Deprecated @WorkerThread public Renderer.CanvasRenderer(android.view.SurfaceHolder surfaceHolder, androidx.wear.watchface.style.CurrentUserStyleRepository currentUserStyleRepository, androidx.wear.watchface.WatchState watchState, int canvasType, @IntRange(from=0L, to=60000L) long interactiveDrawModeUpdateDelayMillis);
+ method @Deprecated public final boolean getClearWithBackgroundTintBeforeRenderingHighlightLayer();
+ method @Deprecated @UiThread public suspend Object? init(kotlin.coroutines.Continuation<? super kotlin.Unit>);
+ method @Deprecated public void onDump(java.io.PrintWriter writer);
+ method @Deprecated @UiThread public abstract void render(android.graphics.Canvas canvas, android.graphics.Rect bounds, java.time.ZonedDateTime zonedDateTime);
+ method @Deprecated @UiThread public abstract void renderHighlightLayer(android.graphics.Canvas canvas, android.graphics.Rect bounds, java.time.ZonedDateTime zonedDateTime);
+ property public final boolean clearWithBackgroundTintBeforeRenderingHighlightLayer;
+ }
+
+ public abstract static class Renderer.CanvasRenderer2<SharedAssetsT extends androidx.wear.watchface.Renderer.SharedAssets> extends androidx.wear.watchface.Renderer.CanvasRenderer {
+ ctor @WorkerThread public Renderer.CanvasRenderer2(android.view.SurfaceHolder surfaceHolder, androidx.wear.watchface.style.CurrentUserStyleRepository currentUserStyleRepository, androidx.wear.watchface.WatchState watchState, int canvasType, @IntRange(from=0L, to=60000L) long interactiveDrawModeUpdateDelayMillis, boolean clearWithBackgroundTintBeforeRenderingHighlightLayer);
+ method @WorkerThread protected abstract suspend Object? createSharedAssets(kotlin.coroutines.Continuation<? super SharedAssetsT>);
+ method @UiThread public abstract void render(android.graphics.Canvas canvas, android.graphics.Rect bounds, java.time.ZonedDateTime zonedDateTime, SharedAssetsT sharedAssets);
+ method public final void render(android.graphics.Canvas canvas, android.graphics.Rect bounds, java.time.ZonedDateTime zonedDateTime);
+ method @UiThread public abstract void renderHighlightLayer(android.graphics.Canvas canvas, android.graphics.Rect bounds, java.time.ZonedDateTime zonedDateTime, SharedAssetsT sharedAssets);
+ method public final void renderHighlightLayer(android.graphics.Canvas canvas, android.graphics.Rect bounds, java.time.ZonedDateTime zonedDateTime);
+ }
+
+ @Deprecated public abstract static class Renderer.GlesRenderer extends androidx.wear.watchface.Renderer {
+ ctor @Deprecated @WorkerThread @kotlin.jvm.Throws(exceptionClasses=GlesException::class) public Renderer.GlesRenderer(android.view.SurfaceHolder surfaceHolder, androidx.wear.watchface.style.CurrentUserStyleRepository currentUserStyleRepository, androidx.wear.watchface.WatchState watchState, @IntRange(from=0L, to=60000L) long interactiveDrawModeUpdateDelayMillis, optional int[] eglConfigAttribList, optional int[] eglSurfaceAttribList) throws androidx.wear.watchface.Renderer.GlesRenderer.GlesException;
+ ctor @Deprecated @WorkerThread @kotlin.jvm.Throws(exceptionClasses=GlesException::class) public Renderer.GlesRenderer(android.view.SurfaceHolder surfaceHolder, androidx.wear.watchface.style.CurrentUserStyleRepository currentUserStyleRepository, androidx.wear.watchface.WatchState watchState, @IntRange(from=0L, to=60000L) long interactiveDrawModeUpdateDelayMillis, optional int[] eglConfigAttribList) throws androidx.wear.watchface.Renderer.GlesRenderer.GlesException;
+ ctor @Deprecated @WorkerThread @kotlin.jvm.Throws(exceptionClasses=GlesException::class) public Renderer.GlesRenderer(android.view.SurfaceHolder surfaceHolder, androidx.wear.watchface.style.CurrentUserStyleRepository currentUserStyleRepository, androidx.wear.watchface.WatchState watchState, @IntRange(from=0L, to=60000L) long interactiveDrawModeUpdateDelayMillis) throws androidx.wear.watchface.Renderer.GlesRenderer.GlesException;
+ method @Deprecated public final android.opengl.EGLContext getEglBackgroundThreadContext();
+ method @Deprecated public final android.opengl.EGLConfig getEglConfig();
+ method @Deprecated public final android.opengl.EGLDisplay getEglDisplay();
+ method @Deprecated public final android.opengl.EGLContext getEglUiThreadContext();
+ method @Deprecated @WorkerThread public suspend Object? onBackgroundThreadGlContextCreated(kotlin.coroutines.Continuation<? super kotlin.Unit>);
+ method @Deprecated public void onDump(java.io.PrintWriter writer);
+ method @Deprecated @UiThread public suspend Object? onUiThreadGlSurfaceCreated(@Px int width, @Px int height, kotlin.coroutines.Continuation<? super kotlin.Unit>);
+ method @Deprecated @UiThread public abstract void render(java.time.ZonedDateTime zonedDateTime);
+ method @Deprecated @UiThread public abstract void renderHighlightLayer(java.time.ZonedDateTime zonedDateTime);
+ method @Deprecated @WorkerThread public final suspend Object? runBackgroundThreadGlCommands(kotlin.jvm.functions.Function1<? super kotlin.coroutines.Continuation<? super kotlin.Unit>,?> commands, kotlin.coroutines.Continuation<? super kotlin.Unit>);
+ method @Deprecated public final suspend Object? runUiThreadGlCommands(kotlin.jvm.functions.Function1<? super kotlin.coroutines.Continuation<? super kotlin.Unit>,?> commands, kotlin.coroutines.Continuation<? super kotlin.Unit>);
+ method @Deprecated public final void setEglConfig(android.opengl.EGLConfig);
+ method @Deprecated public final void setEglDisplay(android.opengl.EGLDisplay);
+ property public final android.opengl.EGLContext eglBackgroundThreadContext;
+ property public final android.opengl.EGLConfig eglConfig;
+ property public final android.opengl.EGLDisplay eglDisplay;
+ property public final android.opengl.EGLContext eglUiThreadContext;
+ }
+
+ @Deprecated public static final class Renderer.GlesRenderer.GlesException extends java.lang.Exception {
+ ctor @Deprecated public Renderer.GlesRenderer.GlesException(String message);
+ }
+
+ public abstract static class Renderer.GlesRenderer2<SharedAssetsT extends androidx.wear.watchface.Renderer.SharedAssets> extends androidx.wear.watchface.Renderer.GlesRenderer {
+ ctor @WorkerThread @kotlin.jvm.Throws(exceptionClasses=GlesException::class) public Renderer.GlesRenderer2(android.view.SurfaceHolder surfaceHolder, androidx.wear.watchface.style.CurrentUserStyleRepository currentUserStyleRepository, androidx.wear.watchface.WatchState watchState, @IntRange(from=0L, to=60000L) long interactiveDrawModeUpdateDelayMillis, optional int[] eglConfigAttribList, optional int[] eglSurfaceAttribList) throws androidx.wear.watchface.Renderer.GlesRenderer.GlesException;
+ ctor @WorkerThread @kotlin.jvm.Throws(exceptionClasses=GlesException::class) public Renderer.GlesRenderer2(android.view.SurfaceHolder surfaceHolder, androidx.wear.watchface.style.CurrentUserStyleRepository currentUserStyleRepository, androidx.wear.watchface.WatchState watchState, @IntRange(from=0L, to=60000L) long interactiveDrawModeUpdateDelayMillis, optional int[] eglConfigAttribList) throws androidx.wear.watchface.Renderer.GlesRenderer.GlesException;
+ ctor @WorkerThread @kotlin.jvm.Throws(exceptionClasses=GlesException::class) public Renderer.GlesRenderer2(android.view.SurfaceHolder surfaceHolder, androidx.wear.watchface.style.CurrentUserStyleRepository currentUserStyleRepository, androidx.wear.watchface.WatchState watchState, @IntRange(from=0L, to=60000L) long interactiveDrawModeUpdateDelayMillis) throws androidx.wear.watchface.Renderer.GlesRenderer.GlesException;
+ method @WorkerThread protected abstract suspend Object? createSharedAssets(kotlin.coroutines.Continuation<? super SharedAssetsT>);
+ method @UiThread public abstract void render(java.time.ZonedDateTime zonedDateTime, SharedAssetsT sharedAssets);
+ method public final void render(java.time.ZonedDateTime zonedDateTime);
+ method @UiThread public abstract void renderHighlightLayer(java.time.ZonedDateTime zonedDateTime, SharedAssetsT sharedAssets);
+ method public final void renderHighlightLayer(java.time.ZonedDateTime zonedDateTime);
+ }
+
+ public static interface Renderer.SharedAssets {
+ method @UiThread public void onDestroy();
+ }
+
+ public final class RendererKt {
+ }
+
+ public final class RoundRectComplicationTapFilter implements androidx.wear.watchface.ComplicationTapFilter {
+ ctor public RoundRectComplicationTapFilter();
+ method public boolean hitTest(androidx.wear.watchface.ComplicationSlot complicationSlot, android.graphics.Rect screenBounds, @Px int x, @Px int y);
+ }
+
+ public final class TapEvent {
+ ctor public TapEvent(@Px int xPos, @Px int yPos, java.time.Instant tapTime);
+ method public java.time.Instant getTapTime();
+ method public int getXPos();
+ method public int getYPos();
+ property public final java.time.Instant tapTime;
+ property public final int xPos;
+ property public final int yPos;
+ }
+
+ public final class WatchFace {
+ ctor public WatchFace(int watchFaceType, androidx.wear.watchface.Renderer renderer);
+ method public androidx.wear.watchface.WatchFace.LegacyWatchFaceOverlayStyle getLegacyWatchFaceStyle();
+ method public androidx.wear.watchface.WatchFace.OverlayStyle getOverlayStyle();
+ method public java.time.Instant? getOverridePreviewReferenceInstant();
+ method public androidx.wear.watchface.Renderer getRenderer();
+ method public int getWatchFaceType();
+ method public static boolean isLegacyWatchFaceOverlayStyleSupported();
+ method public androidx.wear.watchface.WatchFace setComplicationDeniedDialogIntent(android.content.Intent? complicationDeniedDialogIntent);
+ method public androidx.wear.watchface.WatchFace setComplicationRationaleDialogIntent(android.content.Intent? complicationRationaleDialogIntent);
+ method public androidx.wear.watchface.WatchFace setLegacyWatchFaceStyle(androidx.wear.watchface.WatchFace.LegacyWatchFaceOverlayStyle legacyWatchFaceStyle);
+ method public androidx.wear.watchface.WatchFace setOverlayStyle(androidx.wear.watchface.WatchFace.OverlayStyle watchFaceOverlayStyle);
+ method public androidx.wear.watchface.WatchFace setOverridePreviewReferenceInstant(java.time.Instant previewReferenceTimeMillis);
+ method public androidx.wear.watchface.WatchFace setTapListener(androidx.wear.watchface.WatchFace.TapListener? tapListener);
+ method public void setWatchFaceType(int);
+ property public final androidx.wear.watchface.WatchFace.LegacyWatchFaceOverlayStyle legacyWatchFaceStyle;
+ property public final androidx.wear.watchface.WatchFace.OverlayStyle overlayStyle;
+ property public final java.time.Instant? overridePreviewReferenceInstant;
+ property public final androidx.wear.watchface.Renderer renderer;
+ property public final int watchFaceType;
+ field public static final androidx.wear.watchface.WatchFace.Companion Companion;
+ }
+
+ public static final class WatchFace.Companion {
+ method public boolean isLegacyWatchFaceOverlayStyleSupported();
+ }
+
+ public static final class WatchFace.LegacyWatchFaceOverlayStyle {
+ ctor public WatchFace.LegacyWatchFaceOverlayStyle(int viewProtectionMode, int statusBarGravity, boolean tapEventsAccepted, optional @ColorInt int accentColor);
+ ctor public WatchFace.LegacyWatchFaceOverlayStyle(int viewProtectionMode, int statusBarGravity, boolean tapEventsAccepted);
+ method public int getAccentColor();
+ method public int getStatusBarGravity();
+ method public boolean getTapEventsAccepted();
+ method public int getViewProtectionMode();
+ property public final int accentColor;
+ property public final int statusBarGravity;
+ property public final boolean tapEventsAccepted;
+ property public final int viewProtectionMode;
+ }
+
+ public static final class WatchFace.OverlayStyle {
+ ctor public WatchFace.OverlayStyle(android.graphics.Color? backgroundColor, android.graphics.Color? foregroundColor);
+ ctor public WatchFace.OverlayStyle();
+ method public android.graphics.Color? getBackgroundColor();
+ method public android.graphics.Color? getForegroundColor();
+ property public final android.graphics.Color? backgroundColor;
+ property public final android.graphics.Color? foregroundColor;
+ }
+
+ public static interface WatchFace.TapListener {
+ method @UiThread public void onTapEvent(int tapType, androidx.wear.watchface.TapEvent tapEvent, androidx.wear.watchface.ComplicationSlot? complicationSlot);
+ }
+
+ public final class WatchFaceKt {
+ }
+
+ public abstract class WatchFaceService extends android.service.wallpaper.WallpaperService {
+ ctor public WatchFaceService();
+ method @WorkerThread protected androidx.wear.watchface.ComplicationSlotsManager createComplicationSlotsManager(androidx.wear.watchface.style.CurrentUserStyleRepository currentUserStyleRepository);
+ method @WorkerThread protected androidx.wear.watchface.style.UserStyleSchema createUserStyleSchema();
+ method @WorkerThread protected abstract suspend Object? createWatchFace(android.view.SurfaceHolder surfaceHolder, androidx.wear.watchface.WatchState watchState, androidx.wear.watchface.ComplicationSlotsManager complicationSlotsManager, androidx.wear.watchface.style.CurrentUserStyleRepository currentUserStyleRepository, kotlin.coroutines.Continuation<? super androidx.wear.watchface.WatchFace>);
+ method public final android.os.Handler getBackgroundThreadHandler();
+ method @WorkerThread protected androidx.wear.watchface.ComplicationSlotInflationFactory? getComplicationSlotInflationFactory();
+ method public final android.os.Handler getUiThreadHandler();
+ method public final android.service.wallpaper.WallpaperService.Engine onCreateEngine();
+ field public static final androidx.wear.watchface.WatchFaceService.Companion Companion;
+ field public static final int MAX_CREATE_WATCHFACE_TIME_MILLIS = 5000; // 0x1388
+ }
+
+ public static final class WatchFaceService.Companion {
+ }
+
+ public final class WatchFaceServiceKt {
+ }
+
+ public final class WatchState {
+ ctor public WatchState(kotlinx.coroutines.flow.StateFlow<java.lang.Integer> interruptionFilter, kotlinx.coroutines.flow.StateFlow<java.lang.Boolean> isAmbient, kotlinx.coroutines.flow.StateFlow<java.lang.Boolean> isBatteryLowAndNotCharging, kotlinx.coroutines.flow.StateFlow<java.lang.Boolean> isVisible, boolean hasLowBitAmbient, boolean hasBurnInProtection, long analogPreviewReferenceTimeMillis, long digitalPreviewReferenceTimeMillis, @Px int chinHeight, boolean isHeadless, kotlinx.coroutines.flow.StateFlow<java.lang.String> watchFaceInstanceId);
+ ctor @Deprecated public WatchState(kotlinx.coroutines.flow.StateFlow<java.lang.Integer> interruptionFilter, kotlinx.coroutines.flow.StateFlow<java.lang.Boolean> isAmbient, kotlinx.coroutines.flow.StateFlow<java.lang.Boolean> isBatteryLowAndNotCharging, kotlinx.coroutines.flow.StateFlow<java.lang.Boolean> isVisible, boolean hasLowBitAmbient, boolean hasBurnInProtection, long analogPreviewReferenceTimeMillis, long digitalPreviewReferenceTimeMillis, int chinHeight, boolean isHeadless);
+ method public long getAnalogPreviewReferenceTimeMillis();
+ method @Px public int getChinHeight();
+ method public long getDigitalPreviewReferenceTimeMillis();
+ method public boolean getHasBurnInProtection();
+ method public boolean getHasLowBitAmbient();
+ method public kotlinx.coroutines.flow.StateFlow<java.lang.Integer> getInterruptionFilter();
+ method public kotlinx.coroutines.flow.StateFlow<java.lang.String> getWatchFaceInstanceId();
+ method public kotlinx.coroutines.flow.StateFlow<java.lang.Boolean> isAmbient();
+ method public kotlinx.coroutines.flow.StateFlow<java.lang.Boolean> isBatteryLowAndNotCharging();
+ method public boolean isHeadless();
+ method public kotlinx.coroutines.flow.StateFlow<java.lang.Boolean> isVisible();
+ property public final long analogPreviewReferenceTimeMillis;
+ property @Px public final int chinHeight;
+ property public final long digitalPreviewReferenceTimeMillis;
+ property public final boolean hasBurnInProtection;
+ property public final boolean hasLowBitAmbient;
+ property public final kotlinx.coroutines.flow.StateFlow<java.lang.Integer> interruptionFilter;
+ property public final kotlinx.coroutines.flow.StateFlow<java.lang.Boolean> isAmbient;
+ property public final kotlinx.coroutines.flow.StateFlow<java.lang.Boolean> isBatteryLowAndNotCharging;
+ property public final boolean isHeadless;
+ property public final kotlinx.coroutines.flow.StateFlow<java.lang.Boolean> isVisible;
+ property public final kotlinx.coroutines.flow.StateFlow<java.lang.String> watchFaceInstanceId;
+ }
+
+}
+
diff --git a/wear/watchface/watchface/api/public_plus_experimental_1.1.0-beta02.txt b/wear/watchface/watchface/api/public_plus_experimental_1.1.0-beta02.txt
index 6bb09938..463a042 100644
--- a/wear/watchface/watchface/api/public_plus_experimental_1.1.0-beta02.txt
+++ b/wear/watchface/watchface/api/public_plus_experimental_1.1.0-beta02.txt
@@ -22,6 +22,7 @@
public interface CanvasComplication {
method public void drawHighlight(android.graphics.Canvas canvas, android.graphics.Rect bounds, int boundsType, java.time.ZonedDateTime zonedDateTime, @ColorInt int color);
+ method @androidx.wear.watchface.complications.data.ComplicationExperimental public default void drawHighlight(android.graphics.Canvas canvas, android.graphics.Rect bounds, int boundsType, java.time.ZonedDateTime zonedDateTime, @ColorInt int color, androidx.wear.watchface.BoundingArc? boundingArc);
method public androidx.wear.watchface.complications.data.ComplicationData getData();
method public void loadData(androidx.wear.watchface.complications.data.ComplicationData complicationData, boolean loadDrawablesAsynchronous);
method @WorkerThread public default void onRendererCreated(androidx.wear.watchface.Renderer renderer);
diff --git a/wear/watchface/watchface/api/public_plus_experimental_1.1.0-beta03.txt b/wear/watchface/watchface/api/public_plus_experimental_1.1.0-beta03.txt
new file mode 100644
index 0000000..463a042
--- /dev/null
+++ b/wear/watchface/watchface/api/public_plus_experimental_1.1.0-beta03.txt
@@ -0,0 +1,439 @@
+// Signature format: 4.0
+package androidx.wear.watchface {
+
+ public final class BackgroundComplicationTapFilter implements androidx.wear.watchface.ComplicationTapFilter {
+ ctor public BackgroundComplicationTapFilter();
+ method public boolean hitTest(androidx.wear.watchface.ComplicationSlot complicationSlot, android.graphics.Rect screenBounds, @Px int x, @Px int y);
+ }
+
+ @androidx.wear.watchface.complications.data.ComplicationExperimental public final class BoundingArc {
+ ctor public BoundingArc(float startAngle, float totalAngle, @Px float thickness);
+ method public float getStartAngle();
+ method public float getThickness();
+ method public float getTotalAngle();
+ method public boolean hitTest(android.graphics.Rect rect, @Px float x, @Px float y);
+ method public void setStartAngle(float);
+ method public void setThickness(float);
+ method public void setTotalAngle(float);
+ property public final float startAngle;
+ property public final float thickness;
+ property public final float totalAngle;
+ }
+
+ public interface CanvasComplication {
+ method public void drawHighlight(android.graphics.Canvas canvas, android.graphics.Rect bounds, int boundsType, java.time.ZonedDateTime zonedDateTime, @ColorInt int color);
+ method @androidx.wear.watchface.complications.data.ComplicationExperimental public default void drawHighlight(android.graphics.Canvas canvas, android.graphics.Rect bounds, int boundsType, java.time.ZonedDateTime zonedDateTime, @ColorInt int color, androidx.wear.watchface.BoundingArc? boundingArc);
+ method public androidx.wear.watchface.complications.data.ComplicationData getData();
+ method public void loadData(androidx.wear.watchface.complications.data.ComplicationData complicationData, boolean loadDrawablesAsynchronous);
+ method @WorkerThread public default void onRendererCreated(androidx.wear.watchface.Renderer renderer);
+ method @UiThread public void render(android.graphics.Canvas canvas, android.graphics.Rect bounds, java.time.ZonedDateTime zonedDateTime, androidx.wear.watchface.RenderParameters renderParameters, int slotId);
+ }
+
+ public static interface CanvasComplication.InvalidateCallback {
+ method public void onInvalidate();
+ }
+
+ public interface CanvasComplicationFactory {
+ method @WorkerThread public androidx.wear.watchface.CanvasComplication create(androidx.wear.watchface.WatchState, androidx.wear.watchface.CanvasComplication.InvalidateCallback);
+ }
+
+ public final class ComplicationSlot {
+ method public android.graphics.Rect computeBounds(android.graphics.Rect screen);
+ method public static androidx.wear.watchface.ComplicationSlot.Builder createBackgroundComplicationSlotBuilder(int id, androidx.wear.watchface.CanvasComplicationFactory canvasComplicationFactory, java.util.List<? extends androidx.wear.watchface.complications.data.ComplicationType> supportedTypes, androidx.wear.watchface.complications.DefaultComplicationDataSourcePolicy defaultDataSourcePolicy);
+ method public static androidx.wear.watchface.ComplicationSlot.Builder createEdgeComplicationSlotBuilder(int id, androidx.wear.watchface.CanvasComplicationFactory canvasComplicationFactory, java.util.List<? extends androidx.wear.watchface.complications.data.ComplicationType> supportedTypes, androidx.wear.watchface.complications.DefaultComplicationDataSourcePolicy defaultDataSourcePolicy, androidx.wear.watchface.complications.ComplicationSlotBounds bounds, androidx.wear.watchface.ComplicationTapFilter complicationTapFilter);
+ method @androidx.wear.watchface.complications.data.ComplicationExperimental public static androidx.wear.watchface.ComplicationSlot.Builder createEdgeComplicationSlotBuilder(int id, androidx.wear.watchface.CanvasComplicationFactory canvasComplicationFactory, java.util.List<? extends androidx.wear.watchface.complications.data.ComplicationType> supportedTypes, androidx.wear.watchface.complications.DefaultComplicationDataSourcePolicy defaultDataSourcePolicy, androidx.wear.watchface.complications.ComplicationSlotBounds bounds, androidx.wear.watchface.BoundingArc boundingArc, optional androidx.wear.watchface.ComplicationTapFilter complicationTapFilter);
+ method @androidx.wear.watchface.complications.data.ComplicationExperimental public static androidx.wear.watchface.ComplicationSlot.Builder createEdgeComplicationSlotBuilder(int id, androidx.wear.watchface.CanvasComplicationFactory canvasComplicationFactory, java.util.List<? extends androidx.wear.watchface.complications.data.ComplicationType> supportedTypes, androidx.wear.watchface.complications.DefaultComplicationDataSourcePolicy defaultDataSourcePolicy, androidx.wear.watchface.complications.ComplicationSlotBounds bounds, androidx.wear.watchface.BoundingArc boundingArc);
+ method public static androidx.wear.watchface.ComplicationSlot.Builder createRoundRectComplicationSlotBuilder(int id, androidx.wear.watchface.CanvasComplicationFactory canvasComplicationFactory, java.util.List<? extends androidx.wear.watchface.complications.data.ComplicationType> supportedTypes, androidx.wear.watchface.complications.DefaultComplicationDataSourcePolicy defaultDataSourcePolicy, androidx.wear.watchface.complications.ComplicationSlotBounds bounds);
+ method @UiThread public int getAccessibilityTraversalIndex();
+ method public int getBoundsType();
+ method public androidx.wear.watchface.CanvasComplicationFactory getCanvasComplicationFactory();
+ method public kotlinx.coroutines.flow.StateFlow<androidx.wear.watchface.complications.data.ComplicationData> getComplicationData();
+ method @UiThread public androidx.wear.watchface.complications.ComplicationSlotBounds getComplicationSlotBounds();
+ method public android.os.Bundle getConfigExtras();
+ method @UiThread public androidx.wear.watchface.complications.DefaultComplicationDataSourcePolicy getDefaultDataSourcePolicy();
+ method @Deprecated @UiThread public androidx.wear.watchface.complications.data.ComplicationType getDefaultDataSourceType();
+ method public boolean getFixedComplicationDataSource();
+ method public int getId();
+ method public boolean getInitiallyEnabled();
+ method public Integer? getNameResourceId();
+ method public androidx.wear.watchface.CanvasComplication getRenderer();
+ method public Integer? getScreenReaderNameResourceId();
+ method @UiThread public java.util.List<androidx.wear.watchface.complications.data.ComplicationType> getSupportedTypes();
+ method public androidx.wear.watchface.ComplicationTapFilter getTapFilter();
+ method public boolean isActiveAt(java.time.Instant instant);
+ method @UiThread public boolean isEnabled();
+ method @UiThread public void render(android.graphics.Canvas canvas, java.time.ZonedDateTime zonedDateTime, androidx.wear.watchface.RenderParameters renderParameters);
+ method @UiThread public void renderHighlightLayer(android.graphics.Canvas canvas, java.time.ZonedDateTime zonedDateTime, androidx.wear.watchface.RenderParameters renderParameters);
+ method public void setConfigExtras(android.os.Bundle);
+ property @UiThread public final int accessibilityTraversalIndex;
+ property public final int boundsType;
+ property public final androidx.wear.watchface.CanvasComplicationFactory canvasComplicationFactory;
+ property public final kotlinx.coroutines.flow.StateFlow<androidx.wear.watchface.complications.data.ComplicationData> complicationData;
+ property @UiThread public final androidx.wear.watchface.complications.ComplicationSlotBounds complicationSlotBounds;
+ property public final android.os.Bundle configExtras;
+ property @UiThread public final androidx.wear.watchface.complications.DefaultComplicationDataSourcePolicy defaultDataSourcePolicy;
+ property @Deprecated @UiThread public final androidx.wear.watchface.complications.data.ComplicationType defaultDataSourceType;
+ property @UiThread public final boolean enabled;
+ property public final boolean fixedComplicationDataSource;
+ property public final int id;
+ property public final boolean initiallyEnabled;
+ property public final Integer? nameResourceId;
+ property public final androidx.wear.watchface.CanvasComplication renderer;
+ property public final Integer? screenReaderNameResourceId;
+ property @UiThread public final java.util.List<androidx.wear.watchface.complications.data.ComplicationType> supportedTypes;
+ property public final androidx.wear.watchface.ComplicationTapFilter tapFilter;
+ field public static final androidx.wear.watchface.ComplicationSlot.Companion Companion;
+ }
+
+ public static final class ComplicationSlot.Builder {
+ method public androidx.wear.watchface.ComplicationSlot build();
+ method public androidx.wear.watchface.ComplicationSlot.Builder setAccessibilityTraversalIndex(int accessibilityTraversalIndex);
+ method public androidx.wear.watchface.ComplicationSlot.Builder setConfigExtras(android.os.Bundle extras);
+ method @Deprecated public androidx.wear.watchface.ComplicationSlot.Builder setDefaultDataSourceType(androidx.wear.watchface.complications.data.ComplicationType defaultDataSourceType);
+ method public androidx.wear.watchface.ComplicationSlot.Builder setEnabled(boolean enabled);
+ method public androidx.wear.watchface.ComplicationSlot.Builder setFixedComplicationDataSource(boolean fixedComplicationDataSource);
+ method public androidx.wear.watchface.ComplicationSlot.Builder setNameResourceId(Integer? nameResourceId);
+ method public androidx.wear.watchface.ComplicationSlot.Builder setScreenReaderNameResourceId(Integer? screenReaderNameResourceId);
+ }
+
+ public static final class ComplicationSlot.Companion {
+ method public androidx.wear.watchface.ComplicationSlot.Builder createBackgroundComplicationSlotBuilder(int id, androidx.wear.watchface.CanvasComplicationFactory canvasComplicationFactory, java.util.List<? extends androidx.wear.watchface.complications.data.ComplicationType> supportedTypes, androidx.wear.watchface.complications.DefaultComplicationDataSourcePolicy defaultDataSourcePolicy);
+ method public androidx.wear.watchface.ComplicationSlot.Builder createEdgeComplicationSlotBuilder(int id, androidx.wear.watchface.CanvasComplicationFactory canvasComplicationFactory, java.util.List<? extends androidx.wear.watchface.complications.data.ComplicationType> supportedTypes, androidx.wear.watchface.complications.DefaultComplicationDataSourcePolicy defaultDataSourcePolicy, androidx.wear.watchface.complications.ComplicationSlotBounds bounds, androidx.wear.watchface.ComplicationTapFilter complicationTapFilter);
+ method @androidx.wear.watchface.complications.data.ComplicationExperimental public androidx.wear.watchface.ComplicationSlot.Builder createEdgeComplicationSlotBuilder(int id, androidx.wear.watchface.CanvasComplicationFactory canvasComplicationFactory, java.util.List<? extends androidx.wear.watchface.complications.data.ComplicationType> supportedTypes, androidx.wear.watchface.complications.DefaultComplicationDataSourcePolicy defaultDataSourcePolicy, androidx.wear.watchface.complications.ComplicationSlotBounds bounds, androidx.wear.watchface.BoundingArc boundingArc, optional androidx.wear.watchface.ComplicationTapFilter complicationTapFilter);
+ method @androidx.wear.watchface.complications.data.ComplicationExperimental public androidx.wear.watchface.ComplicationSlot.Builder createEdgeComplicationSlotBuilder(int id, androidx.wear.watchface.CanvasComplicationFactory canvasComplicationFactory, java.util.List<? extends androidx.wear.watchface.complications.data.ComplicationType> supportedTypes, androidx.wear.watchface.complications.DefaultComplicationDataSourcePolicy defaultDataSourcePolicy, androidx.wear.watchface.complications.ComplicationSlotBounds bounds, androidx.wear.watchface.BoundingArc boundingArc);
+ method public androidx.wear.watchface.ComplicationSlot.Builder createRoundRectComplicationSlotBuilder(int id, androidx.wear.watchface.CanvasComplicationFactory canvasComplicationFactory, java.util.List<? extends androidx.wear.watchface.complications.data.ComplicationType> supportedTypes, androidx.wear.watchface.complications.DefaultComplicationDataSourcePolicy defaultDataSourcePolicy, androidx.wear.watchface.complications.ComplicationSlotBounds bounds);
+ }
+
+ public abstract class ComplicationSlotInflationFactory {
+ ctor public ComplicationSlotInflationFactory();
+ method public abstract androidx.wear.watchface.CanvasComplicationFactory getCanvasComplicationFactory(int slotId);
+ method public androidx.wear.watchface.ComplicationTapFilter getEdgeComplicationTapFilter(int slotId);
+ }
+
+ public final class ComplicationSlotsManager {
+ ctor public ComplicationSlotsManager(java.util.Collection<androidx.wear.watchface.ComplicationSlot> complicationSlotCollection, androidx.wear.watchface.style.CurrentUserStyleRepository currentUserStyleRepository);
+ method @UiThread public void addTapListener(androidx.wear.watchface.ComplicationSlotsManager.TapCallback tapCallback);
+ method public operator androidx.wear.watchface.ComplicationSlot? get(int id);
+ method public androidx.wear.watchface.ComplicationSlot? getBackgroundComplicationSlot();
+ method public androidx.wear.watchface.ComplicationSlot? getComplicationSlotAt(@Px int x, @Px int y);
+ method public java.util.Map<java.lang.Integer,androidx.wear.watchface.ComplicationSlot> getComplicationSlots();
+ method public java.util.Map<java.lang.Integer,androidx.wear.watchface.TapEvent> getLastComplicationTapDownEvents();
+ method @UiThread public void removeTapListener(androidx.wear.watchface.ComplicationSlotsManager.TapCallback tapCallback);
+ property public final java.util.Map<java.lang.Integer,androidx.wear.watchface.ComplicationSlot> complicationSlots;
+ property public final java.util.Map<java.lang.Integer,androidx.wear.watchface.TapEvent> lastComplicationTapDownEvents;
+ }
+
+ public static interface ComplicationSlotsManager.TapCallback {
+ method public default void onComplicationSlotTapped(int complicationSlotId);
+ }
+
+ public final class ComplicationSlotsManagerKt {
+ }
+
+ public interface ComplicationTapFilter {
+ method public boolean hitTest(androidx.wear.watchface.ComplicationSlot complicationSlot, android.graphics.Rect screenBounds, @Px int x, @Px int y);
+ }
+
+ public final class ContentDescriptionLabel {
+ ctor public ContentDescriptionLabel(androidx.wear.watchface.complications.data.ComplicationText text, android.graphics.Rect bounds, android.app.PendingIntent? tapAction);
+ method public android.graphics.Rect getBounds();
+ method public android.app.PendingIntent? getTapAction();
+ method public androidx.wear.watchface.complications.data.ComplicationText getText();
+ method public CharSequence getTextAt(android.content.res.Resources resources, java.time.Instant instant);
+ property public final android.graphics.Rect bounds;
+ property public final android.app.PendingIntent? tapAction;
+ property public final androidx.wear.watchface.complications.data.ComplicationText text;
+ }
+
+ public enum DrawMode {
+ enum_constant public static final androidx.wear.watchface.DrawMode AMBIENT;
+ enum_constant public static final androidx.wear.watchface.DrawMode INTERACTIVE;
+ enum_constant public static final androidx.wear.watchface.DrawMode LOW_BATTERY_INTERACTIVE;
+ enum_constant public static final androidx.wear.watchface.DrawMode MUTE;
+ }
+
+ public final class RenderBufferTextureKt {
+ }
+
+ public final class RenderParameters {
+ ctor public RenderParameters(androidx.wear.watchface.DrawMode drawMode, java.util.Set<? extends androidx.wear.watchface.style.WatchFaceLayer> watchFaceLayers, optional androidx.wear.watchface.RenderParameters.HighlightLayer? highlightLayer, optional java.util.Map<java.lang.Integer,androidx.wear.watchface.TapEvent> lastComplicationTapDownEvents);
+ ctor public RenderParameters(androidx.wear.watchface.DrawMode drawMode, java.util.Set<? extends androidx.wear.watchface.style.WatchFaceLayer> watchFaceLayers, optional androidx.wear.watchface.RenderParameters.HighlightLayer? highlightLayer);
+ ctor public RenderParameters(androidx.wear.watchface.DrawMode drawMode, java.util.Set<? extends androidx.wear.watchface.style.WatchFaceLayer> watchFaceLayers);
+ method public androidx.wear.watchface.DrawMode getDrawMode();
+ method public androidx.wear.watchface.RenderParameters.HighlightLayer? getHighlightLayer();
+ method public java.util.Map<java.lang.Integer,androidx.wear.watchface.TapEvent> getLastComplicationTapDownEvents();
+ method public java.util.Set<androidx.wear.watchface.style.WatchFaceLayer> getWatchFaceLayers();
+ method public boolean isForScreenshot();
+ property public final androidx.wear.watchface.DrawMode drawMode;
+ property public final androidx.wear.watchface.RenderParameters.HighlightLayer? highlightLayer;
+ property public final boolean isForScreenshot;
+ property public final java.util.Map<java.lang.Integer,androidx.wear.watchface.TapEvent> lastComplicationTapDownEvents;
+ property public final java.util.Set<androidx.wear.watchface.style.WatchFaceLayer> watchFaceLayers;
+ field public static final androidx.wear.watchface.RenderParameters.Companion Companion;
+ field public static final androidx.wear.watchface.RenderParameters DEFAULT_INTERACTIVE;
+ }
+
+ public static final class RenderParameters.Companion {
+ }
+
+ public static final class RenderParameters.HighlightLayer {
+ ctor public RenderParameters.HighlightLayer(androidx.wear.watchface.RenderParameters.HighlightedElement highlightedElement, @ColorInt int highlightTint, @ColorInt int backgroundTint);
+ method @ColorInt public int getBackgroundTint();
+ method @ColorInt public int getHighlightTint();
+ method public androidx.wear.watchface.RenderParameters.HighlightedElement getHighlightedElement();
+ property @ColorInt public final int backgroundTint;
+ property @ColorInt public final int highlightTint;
+ property public final androidx.wear.watchface.RenderParameters.HighlightedElement highlightedElement;
+ }
+
+ public abstract static sealed class RenderParameters.HighlightedElement {
+ }
+
+ public static final class RenderParameters.HighlightedElement.AllComplicationSlots extends androidx.wear.watchface.RenderParameters.HighlightedElement {
+ field public static final androidx.wear.watchface.RenderParameters.HighlightedElement.AllComplicationSlots INSTANCE;
+ }
+
+ public static final class RenderParameters.HighlightedElement.ComplicationSlot extends androidx.wear.watchface.RenderParameters.HighlightedElement {
+ ctor public RenderParameters.HighlightedElement.ComplicationSlot(int id);
+ method public int getId();
+ property public final int id;
+ }
+
+ public static final class RenderParameters.HighlightedElement.UserStyle extends androidx.wear.watchface.RenderParameters.HighlightedElement {
+ ctor public RenderParameters.HighlightedElement.UserStyle(androidx.wear.watchface.style.UserStyleSetting.Id id);
+ method public androidx.wear.watchface.style.UserStyleSetting.Id getId();
+ property public final androidx.wear.watchface.style.UserStyleSetting.Id id;
+ }
+
+ public abstract sealed class Renderer {
+ method public final java.util.Collection<kotlin.Pair<java.lang.Integer,androidx.wear.watchface.ContentDescriptionLabel>> getAdditionalContentDescriptionLabels();
+ method public final float getCenterX();
+ method public final float getCenterY();
+ method public final long getInteractiveDrawModeUpdateDelayMillis();
+ method @UiThread public android.graphics.Rect getMainClockElementBounds();
+ method public final androidx.wear.watchface.RenderParameters getRenderParameters();
+ method public final android.graphics.Rect getScreenBounds();
+ method public final android.view.SurfaceHolder getSurfaceHolder();
+ method @UiThread public final void invalidate();
+ method @UiThread public void onDestroy();
+ method @UiThread public abstract void onDump(java.io.PrintWriter writer);
+ method @UiThread protected void onRenderParametersChanged(androidx.wear.watchface.RenderParameters renderParameters);
+ method public final void postInvalidate();
+ method public final void setAdditionalContentDescriptionLabels(java.util.Collection<kotlin.Pair<java.lang.Integer,androidx.wear.watchface.ContentDescriptionLabel>>);
+ method public final void setInteractiveDrawModeUpdateDelayMillis(long);
+ method @UiThread public boolean shouldAnimate();
+ property public final java.util.Collection<kotlin.Pair<java.lang.Integer,androidx.wear.watchface.ContentDescriptionLabel>> additionalContentDescriptionLabels;
+ property public final float centerX;
+ property public final float centerY;
+ property public final long interactiveDrawModeUpdateDelayMillis;
+ property public final androidx.wear.watchface.RenderParameters renderParameters;
+ property public final android.graphics.Rect screenBounds;
+ property public final android.view.SurfaceHolder surfaceHolder;
+ }
+
+ @Deprecated public abstract static class Renderer.CanvasRenderer extends androidx.wear.watchface.Renderer {
+ ctor @Deprecated @WorkerThread public Renderer.CanvasRenderer(android.view.SurfaceHolder surfaceHolder, androidx.wear.watchface.style.CurrentUserStyleRepository currentUserStyleRepository, androidx.wear.watchface.WatchState watchState, int canvasType, @IntRange(from=0L, to=60000L) long interactiveDrawModeUpdateDelayMillis, optional boolean clearWithBackgroundTintBeforeRenderingHighlightLayer);
+ ctor @Deprecated @WorkerThread public Renderer.CanvasRenderer(android.view.SurfaceHolder surfaceHolder, androidx.wear.watchface.style.CurrentUserStyleRepository currentUserStyleRepository, androidx.wear.watchface.WatchState watchState, int canvasType, @IntRange(from=0L, to=60000L) long interactiveDrawModeUpdateDelayMillis);
+ method @Deprecated public final boolean getClearWithBackgroundTintBeforeRenderingHighlightLayer();
+ method @Deprecated @UiThread public suspend Object? init(kotlin.coroutines.Continuation<? super kotlin.Unit>);
+ method @Deprecated public void onDump(java.io.PrintWriter writer);
+ method @Deprecated @UiThread public abstract void render(android.graphics.Canvas canvas, android.graphics.Rect bounds, java.time.ZonedDateTime zonedDateTime);
+ method @Deprecated @UiThread public abstract void renderHighlightLayer(android.graphics.Canvas canvas, android.graphics.Rect bounds, java.time.ZonedDateTime zonedDateTime);
+ property public final boolean clearWithBackgroundTintBeforeRenderingHighlightLayer;
+ }
+
+ public abstract static class Renderer.CanvasRenderer2<SharedAssetsT extends androidx.wear.watchface.Renderer.SharedAssets> extends androidx.wear.watchface.Renderer.CanvasRenderer {
+ ctor @WorkerThread public Renderer.CanvasRenderer2(android.view.SurfaceHolder surfaceHolder, androidx.wear.watchface.style.CurrentUserStyleRepository currentUserStyleRepository, androidx.wear.watchface.WatchState watchState, int canvasType, @IntRange(from=0L, to=60000L) long interactiveDrawModeUpdateDelayMillis, boolean clearWithBackgroundTintBeforeRenderingHighlightLayer);
+ method @WorkerThread protected abstract suspend Object? createSharedAssets(kotlin.coroutines.Continuation<? super SharedAssetsT>);
+ method @UiThread public abstract void render(android.graphics.Canvas canvas, android.graphics.Rect bounds, java.time.ZonedDateTime zonedDateTime, SharedAssetsT sharedAssets);
+ method public final void render(android.graphics.Canvas canvas, android.graphics.Rect bounds, java.time.ZonedDateTime zonedDateTime);
+ method @UiThread public abstract void renderHighlightLayer(android.graphics.Canvas canvas, android.graphics.Rect bounds, java.time.ZonedDateTime zonedDateTime, SharedAssetsT sharedAssets);
+ method public final void renderHighlightLayer(android.graphics.Canvas canvas, android.graphics.Rect bounds, java.time.ZonedDateTime zonedDateTime);
+ }
+
+ @Deprecated public abstract static class Renderer.GlesRenderer extends androidx.wear.watchface.Renderer {
+ ctor @Deprecated @WorkerThread @kotlin.jvm.Throws(exceptionClasses=GlesException::class) public Renderer.GlesRenderer(android.view.SurfaceHolder surfaceHolder, androidx.wear.watchface.style.CurrentUserStyleRepository currentUserStyleRepository, androidx.wear.watchface.WatchState watchState, @IntRange(from=0L, to=60000L) long interactiveDrawModeUpdateDelayMillis, optional int[] eglConfigAttribList, optional int[] eglSurfaceAttribList) throws androidx.wear.watchface.Renderer.GlesRenderer.GlesException;
+ ctor @Deprecated @WorkerThread @kotlin.jvm.Throws(exceptionClasses=GlesException::class) public Renderer.GlesRenderer(android.view.SurfaceHolder surfaceHolder, androidx.wear.watchface.style.CurrentUserStyleRepository currentUserStyleRepository, androidx.wear.watchface.WatchState watchState, @IntRange(from=0L, to=60000L) long interactiveDrawModeUpdateDelayMillis, optional int[] eglConfigAttribList) throws androidx.wear.watchface.Renderer.GlesRenderer.GlesException;
+ ctor @Deprecated @WorkerThread @kotlin.jvm.Throws(exceptionClasses=GlesException::class) public Renderer.GlesRenderer(android.view.SurfaceHolder surfaceHolder, androidx.wear.watchface.style.CurrentUserStyleRepository currentUserStyleRepository, androidx.wear.watchface.WatchState watchState, @IntRange(from=0L, to=60000L) long interactiveDrawModeUpdateDelayMillis) throws androidx.wear.watchface.Renderer.GlesRenderer.GlesException;
+ method @Deprecated public final android.opengl.EGLContext getEglBackgroundThreadContext();
+ method @Deprecated public final android.opengl.EGLConfig getEglConfig();
+ method @Deprecated public final android.opengl.EGLDisplay getEglDisplay();
+ method @Deprecated public final android.opengl.EGLContext getEglUiThreadContext();
+ method @Deprecated @WorkerThread public suspend Object? onBackgroundThreadGlContextCreated(kotlin.coroutines.Continuation<? super kotlin.Unit>);
+ method @Deprecated public void onDump(java.io.PrintWriter writer);
+ method @Deprecated @UiThread public suspend Object? onUiThreadGlSurfaceCreated(@Px int width, @Px int height, kotlin.coroutines.Continuation<? super kotlin.Unit>);
+ method @Deprecated @UiThread public abstract void render(java.time.ZonedDateTime zonedDateTime);
+ method @Deprecated @UiThread public abstract void renderHighlightLayer(java.time.ZonedDateTime zonedDateTime);
+ method @Deprecated @WorkerThread public final suspend Object? runBackgroundThreadGlCommands(kotlin.jvm.functions.Function1<? super kotlin.coroutines.Continuation<? super kotlin.Unit>,?> commands, kotlin.coroutines.Continuation<? super kotlin.Unit>);
+ method @Deprecated public final suspend Object? runUiThreadGlCommands(kotlin.jvm.functions.Function1<? super kotlin.coroutines.Continuation<? super kotlin.Unit>,?> commands, kotlin.coroutines.Continuation<? super kotlin.Unit>);
+ method @Deprecated public final void setEglConfig(android.opengl.EGLConfig);
+ method @Deprecated public final void setEglDisplay(android.opengl.EGLDisplay);
+ property public final android.opengl.EGLContext eglBackgroundThreadContext;
+ property public final android.opengl.EGLConfig eglConfig;
+ property public final android.opengl.EGLDisplay eglDisplay;
+ property public final android.opengl.EGLContext eglUiThreadContext;
+ }
+
+ @Deprecated public static final class Renderer.GlesRenderer.GlesException extends java.lang.Exception {
+ ctor @Deprecated public Renderer.GlesRenderer.GlesException(String message);
+ }
+
+ public abstract static class Renderer.GlesRenderer2<SharedAssetsT extends androidx.wear.watchface.Renderer.SharedAssets> extends androidx.wear.watchface.Renderer.GlesRenderer {
+ ctor @WorkerThread @kotlin.jvm.Throws(exceptionClasses=GlesException::class) public Renderer.GlesRenderer2(android.view.SurfaceHolder surfaceHolder, androidx.wear.watchface.style.CurrentUserStyleRepository currentUserStyleRepository, androidx.wear.watchface.WatchState watchState, @IntRange(from=0L, to=60000L) long interactiveDrawModeUpdateDelayMillis, optional int[] eglConfigAttribList, optional int[] eglSurfaceAttribList) throws androidx.wear.watchface.Renderer.GlesRenderer.GlesException;
+ ctor @WorkerThread @kotlin.jvm.Throws(exceptionClasses=GlesException::class) public Renderer.GlesRenderer2(android.view.SurfaceHolder surfaceHolder, androidx.wear.watchface.style.CurrentUserStyleRepository currentUserStyleRepository, androidx.wear.watchface.WatchState watchState, @IntRange(from=0L, to=60000L) long interactiveDrawModeUpdateDelayMillis, optional int[] eglConfigAttribList) throws androidx.wear.watchface.Renderer.GlesRenderer.GlesException;
+ ctor @WorkerThread @kotlin.jvm.Throws(exceptionClasses=GlesException::class) public Renderer.GlesRenderer2(android.view.SurfaceHolder surfaceHolder, androidx.wear.watchface.style.CurrentUserStyleRepository currentUserStyleRepository, androidx.wear.watchface.WatchState watchState, @IntRange(from=0L, to=60000L) long interactiveDrawModeUpdateDelayMillis) throws androidx.wear.watchface.Renderer.GlesRenderer.GlesException;
+ method @WorkerThread protected abstract suspend Object? createSharedAssets(kotlin.coroutines.Continuation<? super SharedAssetsT>);
+ method @UiThread public abstract void render(java.time.ZonedDateTime zonedDateTime, SharedAssetsT sharedAssets);
+ method public final void render(java.time.ZonedDateTime zonedDateTime);
+ method @UiThread public abstract void renderHighlightLayer(java.time.ZonedDateTime zonedDateTime, SharedAssetsT sharedAssets);
+ method public final void renderHighlightLayer(java.time.ZonedDateTime zonedDateTime);
+ }
+
+ public static interface Renderer.SharedAssets {
+ method @UiThread public void onDestroy();
+ }
+
+ public final class RendererKt {
+ }
+
+ public final class RoundRectComplicationTapFilter implements androidx.wear.watchface.ComplicationTapFilter {
+ ctor public RoundRectComplicationTapFilter();
+ method public boolean hitTest(androidx.wear.watchface.ComplicationSlot complicationSlot, android.graphics.Rect screenBounds, @Px int x, @Px int y);
+ }
+
+ public final class TapEvent {
+ ctor public TapEvent(@Px int xPos, @Px int yPos, java.time.Instant tapTime);
+ method public java.time.Instant getTapTime();
+ method public int getXPos();
+ method public int getYPos();
+ property public final java.time.Instant tapTime;
+ property public final int xPos;
+ property public final int yPos;
+ }
+
+ @androidx.wear.watchface.WatchFaceFlavorsExperimental public final class UserStyleFlavor {
+ ctor public UserStyleFlavor(String id, androidx.wear.watchface.style.UserStyleData style, java.util.Map<java.lang.Integer,androidx.wear.watchface.complications.DefaultComplicationDataSourcePolicy> complications);
+ ctor public UserStyleFlavor(String id, androidx.wear.watchface.style.UserStyle style, java.util.Map<java.lang.Integer,androidx.wear.watchface.complications.DefaultComplicationDataSourcePolicy> complications);
+ method public java.util.Map<java.lang.Integer,androidx.wear.watchface.complications.DefaultComplicationDataSourcePolicy> getComplications();
+ method public String getId();
+ method public androidx.wear.watchface.style.UserStyleData getStyle();
+ property public final java.util.Map<java.lang.Integer,androidx.wear.watchface.complications.DefaultComplicationDataSourcePolicy> complications;
+ property public final String id;
+ property public final androidx.wear.watchface.style.UserStyleData style;
+ }
+
+ @androidx.wear.watchface.WatchFaceFlavorsExperimental public final class UserStyleFlavors {
+ ctor public UserStyleFlavors(java.util.List<androidx.wear.watchface.UserStyleFlavor> flavors);
+ ctor public UserStyleFlavors();
+ method public java.util.List<androidx.wear.watchface.UserStyleFlavor> getFlavors();
+ property public final java.util.List<androidx.wear.watchface.UserStyleFlavor> flavors;
+ }
+
+ public final class WatchFace {
+ ctor public WatchFace(int watchFaceType, androidx.wear.watchface.Renderer renderer);
+ method public androidx.wear.watchface.WatchFace.LegacyWatchFaceOverlayStyle getLegacyWatchFaceStyle();
+ method public androidx.wear.watchface.WatchFace.OverlayStyle getOverlayStyle();
+ method public java.time.Instant? getOverridePreviewReferenceInstant();
+ method public androidx.wear.watchface.Renderer getRenderer();
+ method public int getWatchFaceType();
+ method public static boolean isLegacyWatchFaceOverlayStyleSupported();
+ method public androidx.wear.watchface.WatchFace setComplicationDeniedDialogIntent(android.content.Intent? complicationDeniedDialogIntent);
+ method public androidx.wear.watchface.WatchFace setComplicationRationaleDialogIntent(android.content.Intent? complicationRationaleDialogIntent);
+ method public androidx.wear.watchface.WatchFace setLegacyWatchFaceStyle(androidx.wear.watchface.WatchFace.LegacyWatchFaceOverlayStyle legacyWatchFaceStyle);
+ method public androidx.wear.watchface.WatchFace setOverlayStyle(androidx.wear.watchface.WatchFace.OverlayStyle watchFaceOverlayStyle);
+ method public androidx.wear.watchface.WatchFace setOverridePreviewReferenceInstant(java.time.Instant previewReferenceTimeMillis);
+ method public androidx.wear.watchface.WatchFace setTapListener(androidx.wear.watchface.WatchFace.TapListener? tapListener);
+ method public void setWatchFaceType(int);
+ property public final androidx.wear.watchface.WatchFace.LegacyWatchFaceOverlayStyle legacyWatchFaceStyle;
+ property public final androidx.wear.watchface.WatchFace.OverlayStyle overlayStyle;
+ property public final java.time.Instant? overridePreviewReferenceInstant;
+ property public final androidx.wear.watchface.Renderer renderer;
+ property public final int watchFaceType;
+ field public static final androidx.wear.watchface.WatchFace.Companion Companion;
+ }
+
+ public static final class WatchFace.Companion {
+ method public boolean isLegacyWatchFaceOverlayStyleSupported();
+ }
+
+ public static final class WatchFace.LegacyWatchFaceOverlayStyle {
+ ctor public WatchFace.LegacyWatchFaceOverlayStyle(int viewProtectionMode, int statusBarGravity, boolean tapEventsAccepted, optional @ColorInt int accentColor);
+ ctor public WatchFace.LegacyWatchFaceOverlayStyle(int viewProtectionMode, int statusBarGravity, boolean tapEventsAccepted);
+ method public int getAccentColor();
+ method public int getStatusBarGravity();
+ method public boolean getTapEventsAccepted();
+ method public int getViewProtectionMode();
+ property public final int accentColor;
+ property public final int statusBarGravity;
+ property public final boolean tapEventsAccepted;
+ property public final int viewProtectionMode;
+ }
+
+ public static final class WatchFace.OverlayStyle {
+ ctor public WatchFace.OverlayStyle(android.graphics.Color? backgroundColor, android.graphics.Color? foregroundColor);
+ ctor public WatchFace.OverlayStyle();
+ method public android.graphics.Color? getBackgroundColor();
+ method public android.graphics.Color? getForegroundColor();
+ property public final android.graphics.Color? backgroundColor;
+ property public final android.graphics.Color? foregroundColor;
+ }
+
+ public static interface WatchFace.TapListener {
+ method @UiThread public void onTapEvent(int tapType, androidx.wear.watchface.TapEvent tapEvent, androidx.wear.watchface.ComplicationSlot? complicationSlot);
+ }
+
+ @kotlin.RequiresOptIn(message="This is an experimental API that may change or be removed without warning.") @kotlin.annotation.Retention(kotlin.annotation.AnnotationRetention.BINARY) public @interface WatchFaceFlavorsExperimental {
+ }
+
+ public final class WatchFaceKt {
+ }
+
+ public abstract class WatchFaceService extends android.service.wallpaper.WallpaperService {
+ ctor public WatchFaceService();
+ method @WorkerThread protected androidx.wear.watchface.ComplicationSlotsManager createComplicationSlotsManager(androidx.wear.watchface.style.CurrentUserStyleRepository currentUserStyleRepository);
+ method @WorkerThread @androidx.wear.watchface.WatchFaceFlavorsExperimental protected androidx.wear.watchface.UserStyleFlavors createUserStyleFlavors(androidx.wear.watchface.style.CurrentUserStyleRepository currentUserStyleRepository, androidx.wear.watchface.ComplicationSlotsManager complicationSlotsManager);
+ method @WorkerThread protected androidx.wear.watchface.style.UserStyleSchema createUserStyleSchema();
+ method @WorkerThread protected abstract suspend Object? createWatchFace(android.view.SurfaceHolder surfaceHolder, androidx.wear.watchface.WatchState watchState, androidx.wear.watchface.ComplicationSlotsManager complicationSlotsManager, androidx.wear.watchface.style.CurrentUserStyleRepository currentUserStyleRepository, kotlin.coroutines.Continuation<? super androidx.wear.watchface.WatchFace>);
+ method public final android.os.Handler getBackgroundThreadHandler();
+ method @WorkerThread protected androidx.wear.watchface.ComplicationSlotInflationFactory? getComplicationSlotInflationFactory();
+ method public final android.os.Handler getUiThreadHandler();
+ method public final android.service.wallpaper.WallpaperService.Engine onCreateEngine();
+ field public static final androidx.wear.watchface.WatchFaceService.Companion Companion;
+ field public static final int MAX_CREATE_WATCHFACE_TIME_MILLIS = 5000; // 0x1388
+ }
+
+ public static final class WatchFaceService.Companion {
+ }
+
+ public final class WatchFaceServiceKt {
+ }
+
+ public final class WatchState {
+ ctor public WatchState(kotlinx.coroutines.flow.StateFlow<java.lang.Integer> interruptionFilter, kotlinx.coroutines.flow.StateFlow<java.lang.Boolean> isAmbient, kotlinx.coroutines.flow.StateFlow<java.lang.Boolean> isBatteryLowAndNotCharging, kotlinx.coroutines.flow.StateFlow<java.lang.Boolean> isVisible, boolean hasLowBitAmbient, boolean hasBurnInProtection, long analogPreviewReferenceTimeMillis, long digitalPreviewReferenceTimeMillis, @Px int chinHeight, boolean isHeadless, kotlinx.coroutines.flow.StateFlow<java.lang.String> watchFaceInstanceId);
+ ctor @Deprecated public WatchState(kotlinx.coroutines.flow.StateFlow<java.lang.Integer> interruptionFilter, kotlinx.coroutines.flow.StateFlow<java.lang.Boolean> isAmbient, kotlinx.coroutines.flow.StateFlow<java.lang.Boolean> isBatteryLowAndNotCharging, kotlinx.coroutines.flow.StateFlow<java.lang.Boolean> isVisible, boolean hasLowBitAmbient, boolean hasBurnInProtection, long analogPreviewReferenceTimeMillis, long digitalPreviewReferenceTimeMillis, int chinHeight, boolean isHeadless);
+ method public long getAnalogPreviewReferenceTimeMillis();
+ method @Px public int getChinHeight();
+ method public long getDigitalPreviewReferenceTimeMillis();
+ method public boolean getHasBurnInProtection();
+ method public boolean getHasLowBitAmbient();
+ method public kotlinx.coroutines.flow.StateFlow<java.lang.Integer> getInterruptionFilter();
+ method public kotlinx.coroutines.flow.StateFlow<java.lang.String> getWatchFaceInstanceId();
+ method public kotlinx.coroutines.flow.StateFlow<java.lang.Boolean> isAmbient();
+ method public kotlinx.coroutines.flow.StateFlow<java.lang.Boolean> isBatteryLowAndNotCharging();
+ method public boolean isHeadless();
+ method public kotlinx.coroutines.flow.StateFlow<java.lang.Boolean> isVisible();
+ property public final long analogPreviewReferenceTimeMillis;
+ property @Px public final int chinHeight;
+ property public final long digitalPreviewReferenceTimeMillis;
+ property public final boolean hasBurnInProtection;
+ property public final boolean hasLowBitAmbient;
+ property public final kotlinx.coroutines.flow.StateFlow<java.lang.Integer> interruptionFilter;
+ property public final kotlinx.coroutines.flow.StateFlow<java.lang.Boolean> isAmbient;
+ property public final kotlinx.coroutines.flow.StateFlow<java.lang.Boolean> isBatteryLowAndNotCharging;
+ property public final boolean isHeadless;
+ property public final kotlinx.coroutines.flow.StateFlow<java.lang.Boolean> isVisible;
+ property public final kotlinx.coroutines.flow.StateFlow<java.lang.String> watchFaceInstanceId;
+ }
+
+}
+
diff --git a/wear/watchface/watchface/api/public_plus_experimental_current.txt b/wear/watchface/watchface/api/public_plus_experimental_current.txt
index 6bb09938..463a042 100644
--- a/wear/watchface/watchface/api/public_plus_experimental_current.txt
+++ b/wear/watchface/watchface/api/public_plus_experimental_current.txt
@@ -22,6 +22,7 @@
public interface CanvasComplication {
method public void drawHighlight(android.graphics.Canvas canvas, android.graphics.Rect bounds, int boundsType, java.time.ZonedDateTime zonedDateTime, @ColorInt int color);
+ method @androidx.wear.watchface.complications.data.ComplicationExperimental public default void drawHighlight(android.graphics.Canvas canvas, android.graphics.Rect bounds, int boundsType, java.time.ZonedDateTime zonedDateTime, @ColorInt int color, androidx.wear.watchface.BoundingArc? boundingArc);
method public androidx.wear.watchface.complications.data.ComplicationData getData();
method public void loadData(androidx.wear.watchface.complications.data.ComplicationData complicationData, boolean loadDrawablesAsynchronous);
method @WorkerThread public default void onRendererCreated(androidx.wear.watchface.Renderer renderer);
diff --git a/wear/watchface/watchface/api/res-1.1.0-beta03.txt b/wear/watchface/watchface/api/res-1.1.0-beta03.txt
new file mode 100644
index 0000000..e69de29
--- /dev/null
+++ b/wear/watchface/watchface/api/res-1.1.0-beta03.txt
diff --git a/wear/watchface/watchface/api/restricted_1.1.0-beta03.txt b/wear/watchface/watchface/api/restricted_1.1.0-beta03.txt
new file mode 100644
index 0000000..be6af4f
--- /dev/null
+++ b/wear/watchface/watchface/api/restricted_1.1.0-beta03.txt
@@ -0,0 +1,400 @@
+// Signature format: 4.0
+package androidx.wear.watchface {
+
+ public final class BackgroundComplicationTapFilter implements androidx.wear.watchface.ComplicationTapFilter {
+ ctor public BackgroundComplicationTapFilter();
+ method public boolean hitTest(androidx.wear.watchface.ComplicationSlot complicationSlot, android.graphics.Rect screenBounds, @Px int x, @Px int y);
+ }
+
+ public interface CanvasComplication {
+ method public void drawHighlight(android.graphics.Canvas canvas, android.graphics.Rect bounds, int boundsType, java.time.ZonedDateTime zonedDateTime, @ColorInt int color);
+ method public androidx.wear.watchface.complications.data.ComplicationData getData();
+ method public void loadData(androidx.wear.watchface.complications.data.ComplicationData complicationData, boolean loadDrawablesAsynchronous);
+ method @WorkerThread public default void onRendererCreated(androidx.wear.watchface.Renderer renderer);
+ method @UiThread public void render(android.graphics.Canvas canvas, android.graphics.Rect bounds, java.time.ZonedDateTime zonedDateTime, androidx.wear.watchface.RenderParameters renderParameters, int slotId);
+ }
+
+ public static interface CanvasComplication.InvalidateCallback {
+ method public void onInvalidate();
+ }
+
+ public interface CanvasComplicationFactory {
+ method @WorkerThread public androidx.wear.watchface.CanvasComplication create(androidx.wear.watchface.WatchState, androidx.wear.watchface.CanvasComplication.InvalidateCallback);
+ }
+
+ public final class ComplicationSlot {
+ method public android.graphics.Rect computeBounds(android.graphics.Rect screen);
+ method public static androidx.wear.watchface.ComplicationSlot.Builder createBackgroundComplicationSlotBuilder(int id, androidx.wear.watchface.CanvasComplicationFactory canvasComplicationFactory, java.util.List<? extends androidx.wear.watchface.complications.data.ComplicationType> supportedTypes, androidx.wear.watchface.complications.DefaultComplicationDataSourcePolicy defaultDataSourcePolicy);
+ method public static androidx.wear.watchface.ComplicationSlot.Builder createEdgeComplicationSlotBuilder(int id, androidx.wear.watchface.CanvasComplicationFactory canvasComplicationFactory, java.util.List<? extends androidx.wear.watchface.complications.data.ComplicationType> supportedTypes, androidx.wear.watchface.complications.DefaultComplicationDataSourcePolicy defaultDataSourcePolicy, androidx.wear.watchface.complications.ComplicationSlotBounds bounds, androidx.wear.watchface.ComplicationTapFilter complicationTapFilter);
+ method public static androidx.wear.watchface.ComplicationSlot.Builder createRoundRectComplicationSlotBuilder(int id, androidx.wear.watchface.CanvasComplicationFactory canvasComplicationFactory, java.util.List<? extends androidx.wear.watchface.complications.data.ComplicationType> supportedTypes, androidx.wear.watchface.complications.DefaultComplicationDataSourcePolicy defaultDataSourcePolicy, androidx.wear.watchface.complications.ComplicationSlotBounds bounds);
+ method @UiThread public int getAccessibilityTraversalIndex();
+ method public int getBoundsType();
+ method public androidx.wear.watchface.CanvasComplicationFactory getCanvasComplicationFactory();
+ method public kotlinx.coroutines.flow.StateFlow<androidx.wear.watchface.complications.data.ComplicationData> getComplicationData();
+ method @UiThread public androidx.wear.watchface.complications.ComplicationSlotBounds getComplicationSlotBounds();
+ method public android.os.Bundle getConfigExtras();
+ method @UiThread public androidx.wear.watchface.complications.DefaultComplicationDataSourcePolicy getDefaultDataSourcePolicy();
+ method @Deprecated @UiThread public androidx.wear.watchface.complications.data.ComplicationType getDefaultDataSourceType();
+ method public boolean getFixedComplicationDataSource();
+ method public int getId();
+ method public boolean getInitiallyEnabled();
+ method public Integer? getNameResourceId();
+ method public androidx.wear.watchface.CanvasComplication getRenderer();
+ method public Integer? getScreenReaderNameResourceId();
+ method @UiThread public java.util.List<androidx.wear.watchface.complications.data.ComplicationType> getSupportedTypes();
+ method public androidx.wear.watchface.ComplicationTapFilter getTapFilter();
+ method public boolean isActiveAt(java.time.Instant instant);
+ method @UiThread public boolean isEnabled();
+ method @UiThread public void render(android.graphics.Canvas canvas, java.time.ZonedDateTime zonedDateTime, androidx.wear.watchface.RenderParameters renderParameters);
+ method @UiThread public void renderHighlightLayer(android.graphics.Canvas canvas, java.time.ZonedDateTime zonedDateTime, androidx.wear.watchface.RenderParameters renderParameters);
+ method public void setConfigExtras(android.os.Bundle);
+ property @UiThread public final int accessibilityTraversalIndex;
+ property public final int boundsType;
+ property public final androidx.wear.watchface.CanvasComplicationFactory canvasComplicationFactory;
+ property public final kotlinx.coroutines.flow.StateFlow<androidx.wear.watchface.complications.data.ComplicationData> complicationData;
+ property @UiThread public final androidx.wear.watchface.complications.ComplicationSlotBounds complicationSlotBounds;
+ property public final android.os.Bundle configExtras;
+ property @UiThread public final androidx.wear.watchface.complications.DefaultComplicationDataSourcePolicy defaultDataSourcePolicy;
+ property @Deprecated @UiThread public final androidx.wear.watchface.complications.data.ComplicationType defaultDataSourceType;
+ property @UiThread public final boolean enabled;
+ property public final boolean fixedComplicationDataSource;
+ property public final int id;
+ property public final boolean initiallyEnabled;
+ property public final Integer? nameResourceId;
+ property public final androidx.wear.watchface.CanvasComplication renderer;
+ property public final Integer? screenReaderNameResourceId;
+ property @UiThread public final java.util.List<androidx.wear.watchface.complications.data.ComplicationType> supportedTypes;
+ property public final androidx.wear.watchface.ComplicationTapFilter tapFilter;
+ field public static final androidx.wear.watchface.ComplicationSlot.Companion Companion;
+ }
+
+ public static final class ComplicationSlot.Builder {
+ method public androidx.wear.watchface.ComplicationSlot build();
+ method public androidx.wear.watchface.ComplicationSlot.Builder setAccessibilityTraversalIndex(int accessibilityTraversalIndex);
+ method public androidx.wear.watchface.ComplicationSlot.Builder setConfigExtras(android.os.Bundle extras);
+ method @Deprecated public androidx.wear.watchface.ComplicationSlot.Builder setDefaultDataSourceType(androidx.wear.watchface.complications.data.ComplicationType defaultDataSourceType);
+ method public androidx.wear.watchface.ComplicationSlot.Builder setEnabled(boolean enabled);
+ method public androidx.wear.watchface.ComplicationSlot.Builder setFixedComplicationDataSource(boolean fixedComplicationDataSource);
+ method public androidx.wear.watchface.ComplicationSlot.Builder setNameResourceId(Integer? nameResourceId);
+ method public androidx.wear.watchface.ComplicationSlot.Builder setScreenReaderNameResourceId(Integer? screenReaderNameResourceId);
+ }
+
+ public static final class ComplicationSlot.Companion {
+ method public androidx.wear.watchface.ComplicationSlot.Builder createBackgroundComplicationSlotBuilder(int id, androidx.wear.watchface.CanvasComplicationFactory canvasComplicationFactory, java.util.List<? extends androidx.wear.watchface.complications.data.ComplicationType> supportedTypes, androidx.wear.watchface.complications.DefaultComplicationDataSourcePolicy defaultDataSourcePolicy);
+ method public androidx.wear.watchface.ComplicationSlot.Builder createEdgeComplicationSlotBuilder(int id, androidx.wear.watchface.CanvasComplicationFactory canvasComplicationFactory, java.util.List<? extends androidx.wear.watchface.complications.data.ComplicationType> supportedTypes, androidx.wear.watchface.complications.DefaultComplicationDataSourcePolicy defaultDataSourcePolicy, androidx.wear.watchface.complications.ComplicationSlotBounds bounds, androidx.wear.watchface.ComplicationTapFilter complicationTapFilter);
+ method public androidx.wear.watchface.ComplicationSlot.Builder createRoundRectComplicationSlotBuilder(int id, androidx.wear.watchface.CanvasComplicationFactory canvasComplicationFactory, java.util.List<? extends androidx.wear.watchface.complications.data.ComplicationType> supportedTypes, androidx.wear.watchface.complications.DefaultComplicationDataSourcePolicy defaultDataSourcePolicy, androidx.wear.watchface.complications.ComplicationSlotBounds bounds);
+ }
+
+ public abstract class ComplicationSlotInflationFactory {
+ ctor public ComplicationSlotInflationFactory();
+ method public abstract androidx.wear.watchface.CanvasComplicationFactory getCanvasComplicationFactory(int slotId);
+ method public androidx.wear.watchface.ComplicationTapFilter getEdgeComplicationTapFilter(int slotId);
+ }
+
+ public final class ComplicationSlotsManager {
+ ctor public ComplicationSlotsManager(java.util.Collection<androidx.wear.watchface.ComplicationSlot> complicationSlotCollection, androidx.wear.watchface.style.CurrentUserStyleRepository currentUserStyleRepository);
+ method @UiThread public void addTapListener(androidx.wear.watchface.ComplicationSlotsManager.TapCallback tapCallback);
+ method public operator androidx.wear.watchface.ComplicationSlot? get(int id);
+ method public androidx.wear.watchface.ComplicationSlot? getBackgroundComplicationSlot();
+ method public androidx.wear.watchface.ComplicationSlot? getComplicationSlotAt(@Px int x, @Px int y);
+ method public java.util.Map<java.lang.Integer,androidx.wear.watchface.ComplicationSlot> getComplicationSlots();
+ method public java.util.Map<java.lang.Integer,androidx.wear.watchface.TapEvent> getLastComplicationTapDownEvents();
+ method @UiThread public void removeTapListener(androidx.wear.watchface.ComplicationSlotsManager.TapCallback tapCallback);
+ property public final java.util.Map<java.lang.Integer,androidx.wear.watchface.ComplicationSlot> complicationSlots;
+ property public final java.util.Map<java.lang.Integer,androidx.wear.watchface.TapEvent> lastComplicationTapDownEvents;
+ }
+
+ public static interface ComplicationSlotsManager.TapCallback {
+ method public default void onComplicationSlotTapped(int complicationSlotId);
+ }
+
+ public final class ComplicationSlotsManagerKt {
+ }
+
+ public interface ComplicationTapFilter {
+ method public boolean hitTest(androidx.wear.watchface.ComplicationSlot complicationSlot, android.graphics.Rect screenBounds, @Px int x, @Px int y);
+ }
+
+ public final class ContentDescriptionLabel {
+ ctor public ContentDescriptionLabel(androidx.wear.watchface.complications.data.ComplicationText text, android.graphics.Rect bounds, android.app.PendingIntent? tapAction);
+ method public android.graphics.Rect getBounds();
+ method public android.app.PendingIntent? getTapAction();
+ method public androidx.wear.watchface.complications.data.ComplicationText getText();
+ method public CharSequence getTextAt(android.content.res.Resources resources, java.time.Instant instant);
+ property public final android.graphics.Rect bounds;
+ property public final android.app.PendingIntent? tapAction;
+ property public final androidx.wear.watchface.complications.data.ComplicationText text;
+ }
+
+ public enum DrawMode {
+ enum_constant public static final androidx.wear.watchface.DrawMode AMBIENT;
+ enum_constant public static final androidx.wear.watchface.DrawMode INTERACTIVE;
+ enum_constant public static final androidx.wear.watchface.DrawMode LOW_BATTERY_INTERACTIVE;
+ enum_constant public static final androidx.wear.watchface.DrawMode MUTE;
+ }
+
+ public final class RenderBufferTextureKt {
+ }
+
+ public final class RenderParameters {
+ ctor public RenderParameters(androidx.wear.watchface.DrawMode drawMode, java.util.Set<? extends androidx.wear.watchface.style.WatchFaceLayer> watchFaceLayers, optional androidx.wear.watchface.RenderParameters.HighlightLayer? highlightLayer, optional java.util.Map<java.lang.Integer,androidx.wear.watchface.TapEvent> lastComplicationTapDownEvents);
+ ctor public RenderParameters(androidx.wear.watchface.DrawMode drawMode, java.util.Set<? extends androidx.wear.watchface.style.WatchFaceLayer> watchFaceLayers, optional androidx.wear.watchface.RenderParameters.HighlightLayer? highlightLayer);
+ ctor public RenderParameters(androidx.wear.watchface.DrawMode drawMode, java.util.Set<? extends androidx.wear.watchface.style.WatchFaceLayer> watchFaceLayers);
+ ctor @RestrictTo(androidx.annotation.RestrictTo.Scope.LIBRARY_GROUP_PREFIX) public RenderParameters(androidx.wear.watchface.data.RenderParametersWireFormat wireFormat);
+ method public androidx.wear.watchface.DrawMode getDrawMode();
+ method public androidx.wear.watchface.RenderParameters.HighlightLayer? getHighlightLayer();
+ method public java.util.Map<java.lang.Integer,androidx.wear.watchface.TapEvent> getLastComplicationTapDownEvents();
+ method public java.util.Set<androidx.wear.watchface.style.WatchFaceLayer> getWatchFaceLayers();
+ method public boolean isForScreenshot();
+ method @RestrictTo(androidx.annotation.RestrictTo.Scope.LIBRARY_GROUP_PREFIX) public androidx.wear.watchface.data.RenderParametersWireFormat toWireFormat();
+ property public final androidx.wear.watchface.DrawMode drawMode;
+ property public final androidx.wear.watchface.RenderParameters.HighlightLayer? highlightLayer;
+ property public final boolean isForScreenshot;
+ property public final java.util.Map<java.lang.Integer,androidx.wear.watchface.TapEvent> lastComplicationTapDownEvents;
+ property public final java.util.Set<androidx.wear.watchface.style.WatchFaceLayer> watchFaceLayers;
+ field public static final androidx.wear.watchface.RenderParameters.Companion Companion;
+ field public static final androidx.wear.watchface.RenderParameters DEFAULT_INTERACTIVE;
+ }
+
+ public static final class RenderParameters.Companion {
+ }
+
+ public static final class RenderParameters.HighlightLayer {
+ ctor public RenderParameters.HighlightLayer(androidx.wear.watchface.RenderParameters.HighlightedElement highlightedElement, @ColorInt int highlightTint, @ColorInt int backgroundTint);
+ method @ColorInt public int getBackgroundTint();
+ method @ColorInt public int getHighlightTint();
+ method public androidx.wear.watchface.RenderParameters.HighlightedElement getHighlightedElement();
+ property @ColorInt public final int backgroundTint;
+ property @ColorInt public final int highlightTint;
+ property public final androidx.wear.watchface.RenderParameters.HighlightedElement highlightedElement;
+ }
+
+ public abstract static sealed class RenderParameters.HighlightedElement {
+ }
+
+ public static final class RenderParameters.HighlightedElement.AllComplicationSlots extends androidx.wear.watchface.RenderParameters.HighlightedElement {
+ field public static final androidx.wear.watchface.RenderParameters.HighlightedElement.AllComplicationSlots INSTANCE;
+ }
+
+ public static final class RenderParameters.HighlightedElement.ComplicationSlot extends androidx.wear.watchface.RenderParameters.HighlightedElement {
+ ctor public RenderParameters.HighlightedElement.ComplicationSlot(int id);
+ method public int getId();
+ property public final int id;
+ }
+
+ public static final class RenderParameters.HighlightedElement.UserStyle extends androidx.wear.watchface.RenderParameters.HighlightedElement {
+ ctor public RenderParameters.HighlightedElement.UserStyle(androidx.wear.watchface.style.UserStyleSetting.Id id);
+ method public androidx.wear.watchface.style.UserStyleSetting.Id getId();
+ property public final androidx.wear.watchface.style.UserStyleSetting.Id id;
+ }
+
+ public abstract sealed class Renderer {
+ method public final java.util.Collection<kotlin.Pair<java.lang.Integer,androidx.wear.watchface.ContentDescriptionLabel>> getAdditionalContentDescriptionLabels();
+ method public final float getCenterX();
+ method public final float getCenterY();
+ method public final long getInteractiveDrawModeUpdateDelayMillis();
+ method @UiThread public android.graphics.Rect getMainClockElementBounds();
+ method public final androidx.wear.watchface.RenderParameters getRenderParameters();
+ method public final android.graphics.Rect getScreenBounds();
+ method public final android.view.SurfaceHolder getSurfaceHolder();
+ method @UiThread public final void invalidate();
+ method @UiThread public void onDestroy();
+ method @UiThread public abstract void onDump(java.io.PrintWriter writer);
+ method @UiThread protected void onRenderParametersChanged(androidx.wear.watchface.RenderParameters renderParameters);
+ method public final void postInvalidate();
+ method public final void setAdditionalContentDescriptionLabels(java.util.Collection<kotlin.Pair<java.lang.Integer,androidx.wear.watchface.ContentDescriptionLabel>>);
+ method public final void setInteractiveDrawModeUpdateDelayMillis(long);
+ method @UiThread public boolean shouldAnimate();
+ property public final java.util.Collection<kotlin.Pair<java.lang.Integer,androidx.wear.watchface.ContentDescriptionLabel>> additionalContentDescriptionLabels;
+ property public final float centerX;
+ property public final float centerY;
+ property public final long interactiveDrawModeUpdateDelayMillis;
+ property public final androidx.wear.watchface.RenderParameters renderParameters;
+ property public final android.graphics.Rect screenBounds;
+ property public final android.view.SurfaceHolder surfaceHolder;
+ }
+
+ @Deprecated public abstract static class Renderer.CanvasRenderer extends androidx.wear.watchface.Renderer {
+ ctor @Deprecated @WorkerThread public Renderer.CanvasRenderer(android.view.SurfaceHolder surfaceHolder, androidx.wear.watchface.style.CurrentUserStyleRepository currentUserStyleRepository, androidx.wear.watchface.WatchState watchState, int canvasType, @IntRange(from=0L, to=60000L) long interactiveDrawModeUpdateDelayMillis, optional boolean clearWithBackgroundTintBeforeRenderingHighlightLayer);
+ ctor @Deprecated @WorkerThread public Renderer.CanvasRenderer(android.view.SurfaceHolder surfaceHolder, androidx.wear.watchface.style.CurrentUserStyleRepository currentUserStyleRepository, androidx.wear.watchface.WatchState watchState, int canvasType, @IntRange(from=0L, to=60000L) long interactiveDrawModeUpdateDelayMillis);
+ method @Deprecated public final boolean getClearWithBackgroundTintBeforeRenderingHighlightLayer();
+ method @Deprecated @UiThread public suspend Object? init(kotlin.coroutines.Continuation<? super kotlin.Unit>);
+ method @Deprecated public void onDump(java.io.PrintWriter writer);
+ method @Deprecated @UiThread public abstract void render(android.graphics.Canvas canvas, android.graphics.Rect bounds, java.time.ZonedDateTime zonedDateTime);
+ method @Deprecated @UiThread public abstract void renderHighlightLayer(android.graphics.Canvas canvas, android.graphics.Rect bounds, java.time.ZonedDateTime zonedDateTime);
+ property public final boolean clearWithBackgroundTintBeforeRenderingHighlightLayer;
+ }
+
+ public abstract static class Renderer.CanvasRenderer2<SharedAssetsT extends androidx.wear.watchface.Renderer.SharedAssets> extends androidx.wear.watchface.Renderer.CanvasRenderer {
+ ctor @WorkerThread public Renderer.CanvasRenderer2(android.view.SurfaceHolder surfaceHolder, androidx.wear.watchface.style.CurrentUserStyleRepository currentUserStyleRepository, androidx.wear.watchface.WatchState watchState, int canvasType, @IntRange(from=0L, to=60000L) long interactiveDrawModeUpdateDelayMillis, boolean clearWithBackgroundTintBeforeRenderingHighlightLayer);
+ method @WorkerThread protected abstract suspend Object? createSharedAssets(kotlin.coroutines.Continuation<? super SharedAssetsT>);
+ method @UiThread public abstract void render(android.graphics.Canvas canvas, android.graphics.Rect bounds, java.time.ZonedDateTime zonedDateTime, SharedAssetsT sharedAssets);
+ method public final void render(android.graphics.Canvas canvas, android.graphics.Rect bounds, java.time.ZonedDateTime zonedDateTime);
+ method @UiThread public abstract void renderHighlightLayer(android.graphics.Canvas canvas, android.graphics.Rect bounds, java.time.ZonedDateTime zonedDateTime, SharedAssetsT sharedAssets);
+ method public final void renderHighlightLayer(android.graphics.Canvas canvas, android.graphics.Rect bounds, java.time.ZonedDateTime zonedDateTime);
+ }
+
+ @Deprecated public abstract static class Renderer.GlesRenderer extends androidx.wear.watchface.Renderer {
+ ctor @Deprecated @WorkerThread @kotlin.jvm.Throws(exceptionClasses=GlesException::class) public Renderer.GlesRenderer(android.view.SurfaceHolder surfaceHolder, androidx.wear.watchface.style.CurrentUserStyleRepository currentUserStyleRepository, androidx.wear.watchface.WatchState watchState, @IntRange(from=0L, to=60000L) long interactiveDrawModeUpdateDelayMillis, optional int[] eglConfigAttribList, optional int[] eglSurfaceAttribList) throws androidx.wear.watchface.Renderer.GlesRenderer.GlesException;
+ ctor @Deprecated @WorkerThread @kotlin.jvm.Throws(exceptionClasses=GlesException::class) public Renderer.GlesRenderer(android.view.SurfaceHolder surfaceHolder, androidx.wear.watchface.style.CurrentUserStyleRepository currentUserStyleRepository, androidx.wear.watchface.WatchState watchState, @IntRange(from=0L, to=60000L) long interactiveDrawModeUpdateDelayMillis, optional int[] eglConfigAttribList) throws androidx.wear.watchface.Renderer.GlesRenderer.GlesException;
+ ctor @Deprecated @WorkerThread @kotlin.jvm.Throws(exceptionClasses=GlesException::class) public Renderer.GlesRenderer(android.view.SurfaceHolder surfaceHolder, androidx.wear.watchface.style.CurrentUserStyleRepository currentUserStyleRepository, androidx.wear.watchface.WatchState watchState, @IntRange(from=0L, to=60000L) long interactiveDrawModeUpdateDelayMillis) throws androidx.wear.watchface.Renderer.GlesRenderer.GlesException;
+ method @Deprecated public final android.opengl.EGLContext getEglBackgroundThreadContext();
+ method @Deprecated public final android.opengl.EGLConfig getEglConfig();
+ method @Deprecated public final android.opengl.EGLDisplay getEglDisplay();
+ method @Deprecated public final android.opengl.EGLContext getEglUiThreadContext();
+ method @Deprecated @WorkerThread public suspend Object? onBackgroundThreadGlContextCreated(kotlin.coroutines.Continuation<? super kotlin.Unit>);
+ method @Deprecated public void onDump(java.io.PrintWriter writer);
+ method @Deprecated @UiThread public suspend Object? onUiThreadGlSurfaceCreated(@Px int width, @Px int height, kotlin.coroutines.Continuation<? super kotlin.Unit>);
+ method @Deprecated @UiThread public abstract void render(java.time.ZonedDateTime zonedDateTime);
+ method @Deprecated @UiThread public abstract void renderHighlightLayer(java.time.ZonedDateTime zonedDateTime);
+ method @Deprecated @WorkerThread public final suspend Object? runBackgroundThreadGlCommands(kotlin.jvm.functions.Function1<? super kotlin.coroutines.Continuation<? super kotlin.Unit>,?> commands, kotlin.coroutines.Continuation<? super kotlin.Unit>);
+ method @Deprecated public final suspend Object? runUiThreadGlCommands(kotlin.jvm.functions.Function1<? super kotlin.coroutines.Continuation<? super kotlin.Unit>,?> commands, kotlin.coroutines.Continuation<? super kotlin.Unit>);
+ method @Deprecated public final void setEglConfig(android.opengl.EGLConfig);
+ method @Deprecated public final void setEglDisplay(android.opengl.EGLDisplay);
+ property public final android.opengl.EGLContext eglBackgroundThreadContext;
+ property public final android.opengl.EGLConfig eglConfig;
+ property public final android.opengl.EGLDisplay eglDisplay;
+ property public final android.opengl.EGLContext eglUiThreadContext;
+ }
+
+ @Deprecated public static final class Renderer.GlesRenderer.GlesException extends java.lang.Exception {
+ ctor @Deprecated public Renderer.GlesRenderer.GlesException(String message);
+ }
+
+ public abstract static class Renderer.GlesRenderer2<SharedAssetsT extends androidx.wear.watchface.Renderer.SharedAssets> extends androidx.wear.watchface.Renderer.GlesRenderer {
+ ctor @WorkerThread @kotlin.jvm.Throws(exceptionClasses=GlesException::class) public Renderer.GlesRenderer2(android.view.SurfaceHolder surfaceHolder, androidx.wear.watchface.style.CurrentUserStyleRepository currentUserStyleRepository, androidx.wear.watchface.WatchState watchState, @IntRange(from=0L, to=60000L) long interactiveDrawModeUpdateDelayMillis, optional int[] eglConfigAttribList, optional int[] eglSurfaceAttribList) throws androidx.wear.watchface.Renderer.GlesRenderer.GlesException;
+ ctor @WorkerThread @kotlin.jvm.Throws(exceptionClasses=GlesException::class) public Renderer.GlesRenderer2(android.view.SurfaceHolder surfaceHolder, androidx.wear.watchface.style.CurrentUserStyleRepository currentUserStyleRepository, androidx.wear.watchface.WatchState watchState, @IntRange(from=0L, to=60000L) long interactiveDrawModeUpdateDelayMillis, optional int[] eglConfigAttribList) throws androidx.wear.watchface.Renderer.GlesRenderer.GlesException;
+ ctor @WorkerThread @kotlin.jvm.Throws(exceptionClasses=GlesException::class) public Renderer.GlesRenderer2(android.view.SurfaceHolder surfaceHolder, androidx.wear.watchface.style.CurrentUserStyleRepository currentUserStyleRepository, androidx.wear.watchface.WatchState watchState, @IntRange(from=0L, to=60000L) long interactiveDrawModeUpdateDelayMillis) throws androidx.wear.watchface.Renderer.GlesRenderer.GlesException;
+ method @WorkerThread protected abstract suspend Object? createSharedAssets(kotlin.coroutines.Continuation<? super SharedAssetsT>);
+ method @UiThread public abstract void render(java.time.ZonedDateTime zonedDateTime, SharedAssetsT sharedAssets);
+ method public final void render(java.time.ZonedDateTime zonedDateTime);
+ method @UiThread public abstract void renderHighlightLayer(java.time.ZonedDateTime zonedDateTime, SharedAssetsT sharedAssets);
+ method public final void renderHighlightLayer(java.time.ZonedDateTime zonedDateTime);
+ }
+
+ public static interface Renderer.SharedAssets {
+ method @UiThread public void onDestroy();
+ }
+
+ public final class RendererKt {
+ }
+
+ public final class RoundRectComplicationTapFilter implements androidx.wear.watchface.ComplicationTapFilter {
+ ctor public RoundRectComplicationTapFilter();
+ method public boolean hitTest(androidx.wear.watchface.ComplicationSlot complicationSlot, android.graphics.Rect screenBounds, @Px int x, @Px int y);
+ }
+
+ public final class TapEvent {
+ ctor public TapEvent(@Px int xPos, @Px int yPos, java.time.Instant tapTime);
+ method public java.time.Instant getTapTime();
+ method public int getXPos();
+ method public int getYPos();
+ property public final java.time.Instant tapTime;
+ property public final int xPos;
+ property public final int yPos;
+ }
+
+ public final class WatchFace {
+ ctor public WatchFace(int watchFaceType, androidx.wear.watchface.Renderer renderer);
+ method public androidx.wear.watchface.WatchFace.LegacyWatchFaceOverlayStyle getLegacyWatchFaceStyle();
+ method public androidx.wear.watchface.WatchFace.OverlayStyle getOverlayStyle();
+ method public java.time.Instant? getOverridePreviewReferenceInstant();
+ method public androidx.wear.watchface.Renderer getRenderer();
+ method public int getWatchFaceType();
+ method public static boolean isLegacyWatchFaceOverlayStyleSupported();
+ method public androidx.wear.watchface.WatchFace setComplicationDeniedDialogIntent(android.content.Intent? complicationDeniedDialogIntent);
+ method public androidx.wear.watchface.WatchFace setComplicationRationaleDialogIntent(android.content.Intent? complicationRationaleDialogIntent);
+ method public androidx.wear.watchface.WatchFace setLegacyWatchFaceStyle(androidx.wear.watchface.WatchFace.LegacyWatchFaceOverlayStyle legacyWatchFaceStyle);
+ method public androidx.wear.watchface.WatchFace setOverlayStyle(androidx.wear.watchface.WatchFace.OverlayStyle watchFaceOverlayStyle);
+ method public androidx.wear.watchface.WatchFace setOverridePreviewReferenceInstant(java.time.Instant previewReferenceTimeMillis);
+ method public androidx.wear.watchface.WatchFace setTapListener(androidx.wear.watchface.WatchFace.TapListener? tapListener);
+ method public void setWatchFaceType(int);
+ property public final androidx.wear.watchface.WatchFace.LegacyWatchFaceOverlayStyle legacyWatchFaceStyle;
+ property public final androidx.wear.watchface.WatchFace.OverlayStyle overlayStyle;
+ property public final java.time.Instant? overridePreviewReferenceInstant;
+ property public final androidx.wear.watchface.Renderer renderer;
+ property public final int watchFaceType;
+ field public static final androidx.wear.watchface.WatchFace.Companion Companion;
+ }
+
+ public static final class WatchFace.Companion {
+ method public boolean isLegacyWatchFaceOverlayStyleSupported();
+ }
+
+ public static final class WatchFace.LegacyWatchFaceOverlayStyle {
+ ctor public WatchFace.LegacyWatchFaceOverlayStyle(int viewProtectionMode, int statusBarGravity, boolean tapEventsAccepted, optional @ColorInt int accentColor);
+ ctor public WatchFace.LegacyWatchFaceOverlayStyle(int viewProtectionMode, int statusBarGravity, boolean tapEventsAccepted);
+ method public int getAccentColor();
+ method public int getStatusBarGravity();
+ method public boolean getTapEventsAccepted();
+ method public int getViewProtectionMode();
+ property public final int accentColor;
+ property public final int statusBarGravity;
+ property public final boolean tapEventsAccepted;
+ property public final int viewProtectionMode;
+ }
+
+ public static final class WatchFace.OverlayStyle {
+ ctor public WatchFace.OverlayStyle(android.graphics.Color? backgroundColor, android.graphics.Color? foregroundColor);
+ ctor public WatchFace.OverlayStyle();
+ method public android.graphics.Color? getBackgroundColor();
+ method public android.graphics.Color? getForegroundColor();
+ property public final android.graphics.Color? backgroundColor;
+ property public final android.graphics.Color? foregroundColor;
+ }
+
+ public static interface WatchFace.TapListener {
+ method @UiThread public void onTapEvent(int tapType, androidx.wear.watchface.TapEvent tapEvent, androidx.wear.watchface.ComplicationSlot? complicationSlot);
+ }
+
+ public final class WatchFaceKt {
+ }
+
+ public abstract class WatchFaceService extends android.service.wallpaper.WallpaperService {
+ ctor public WatchFaceService();
+ method @WorkerThread protected androidx.wear.watchface.ComplicationSlotsManager createComplicationSlotsManager(androidx.wear.watchface.style.CurrentUserStyleRepository currentUserStyleRepository);
+ method @WorkerThread protected androidx.wear.watchface.style.UserStyleSchema createUserStyleSchema();
+ method @WorkerThread protected abstract suspend Object? createWatchFace(android.view.SurfaceHolder surfaceHolder, androidx.wear.watchface.WatchState watchState, androidx.wear.watchface.ComplicationSlotsManager complicationSlotsManager, androidx.wear.watchface.style.CurrentUserStyleRepository currentUserStyleRepository, kotlin.coroutines.Continuation<? super androidx.wear.watchface.WatchFace>);
+ method public final android.os.Handler getBackgroundThreadHandler();
+ method @WorkerThread protected androidx.wear.watchface.ComplicationSlotInflationFactory? getComplicationSlotInflationFactory();
+ method public final android.os.Handler getUiThreadHandler();
+ method public final android.service.wallpaper.WallpaperService.Engine onCreateEngine();
+ field public static final androidx.wear.watchface.WatchFaceService.Companion Companion;
+ field public static final int MAX_CREATE_WATCHFACE_TIME_MILLIS = 5000; // 0x1388
+ }
+
+ public static final class WatchFaceService.Companion {
+ }
+
+ public final class WatchFaceServiceKt {
+ }
+
+ public final class WatchState {
+ ctor public WatchState(kotlinx.coroutines.flow.StateFlow<java.lang.Integer> interruptionFilter, kotlinx.coroutines.flow.StateFlow<java.lang.Boolean> isAmbient, kotlinx.coroutines.flow.StateFlow<java.lang.Boolean> isBatteryLowAndNotCharging, kotlinx.coroutines.flow.StateFlow<java.lang.Boolean> isVisible, boolean hasLowBitAmbient, boolean hasBurnInProtection, long analogPreviewReferenceTimeMillis, long digitalPreviewReferenceTimeMillis, @Px int chinHeight, boolean isHeadless, kotlinx.coroutines.flow.StateFlow<java.lang.String> watchFaceInstanceId);
+ ctor @Deprecated public WatchState(kotlinx.coroutines.flow.StateFlow<java.lang.Integer> interruptionFilter, kotlinx.coroutines.flow.StateFlow<java.lang.Boolean> isAmbient, kotlinx.coroutines.flow.StateFlow<java.lang.Boolean> isBatteryLowAndNotCharging, kotlinx.coroutines.flow.StateFlow<java.lang.Boolean> isVisible, boolean hasLowBitAmbient, boolean hasBurnInProtection, long analogPreviewReferenceTimeMillis, long digitalPreviewReferenceTimeMillis, int chinHeight, boolean isHeadless);
+ method public long getAnalogPreviewReferenceTimeMillis();
+ method @Px public int getChinHeight();
+ method public long getDigitalPreviewReferenceTimeMillis();
+ method public boolean getHasBurnInProtection();
+ method public boolean getHasLowBitAmbient();
+ method public kotlinx.coroutines.flow.StateFlow<java.lang.Integer> getInterruptionFilter();
+ method public kotlinx.coroutines.flow.StateFlow<java.lang.String> getWatchFaceInstanceId();
+ method public kotlinx.coroutines.flow.StateFlow<java.lang.Boolean> isAmbient();
+ method public kotlinx.coroutines.flow.StateFlow<java.lang.Boolean> isBatteryLowAndNotCharging();
+ method public boolean isHeadless();
+ method public kotlinx.coroutines.flow.StateFlow<java.lang.Boolean> isVisible();
+ property public final long analogPreviewReferenceTimeMillis;
+ property @Px public final int chinHeight;
+ property public final long digitalPreviewReferenceTimeMillis;
+ property public final boolean hasBurnInProtection;
+ property public final boolean hasLowBitAmbient;
+ property public final kotlinx.coroutines.flow.StateFlow<java.lang.Integer> interruptionFilter;
+ property public final kotlinx.coroutines.flow.StateFlow<java.lang.Boolean> isAmbient;
+ property public final kotlinx.coroutines.flow.StateFlow<java.lang.Boolean> isBatteryLowAndNotCharging;
+ property public final boolean isHeadless;
+ property public final kotlinx.coroutines.flow.StateFlow<java.lang.Boolean> isVisible;
+ property public final kotlinx.coroutines.flow.StateFlow<java.lang.String> watchFaceInstanceId;
+ }
+
+}
+
diff --git a/wear/watchface/watchface/src/androidTest/java/androidx/wear/watchface/ComplicationHelperActivityTest.kt b/wear/watchface/watchface/src/androidTest/java/androidx/wear/watchface/ComplicationHelperActivityTest.kt
index 2294c89..55aafa0 100644
--- a/wear/watchface/watchface/src/androidTest/java/androidx/wear/watchface/ComplicationHelperActivityTest.kt
+++ b/wear/watchface/watchface/src/androidTest/java/androidx/wear/watchface/ComplicationHelperActivityTest.kt
@@ -204,6 +204,7 @@
)
verify(helper.mDelegate).startComplicationDataSourceChooser()
+ verify(helper.mDelegate).requestUpdateAll()
}
}
@@ -221,6 +222,7 @@
)
verify(helper.mDelegate, never()).startComplicationDataSourceChooser()
+ verify(helper.mDelegate).requestUpdateAll()
}
}
diff --git a/wear/watchface/watchface/src/main/java/androidx/wear/watchface/ComplicationHelperActivity.java b/wear/watchface/watchface/src/main/java/androidx/wear/watchface/ComplicationHelperActivity.java
index b5853f9..f0a97aa 100644
--- a/wear/watchface/watchface/src/main/java/androidx/wear/watchface/ComplicationHelperActivity.java
+++ b/wear/watchface/watchface/src/main/java/androidx/wear/watchface/ComplicationHelperActivity.java
@@ -17,6 +17,7 @@
package androidx.wear.watchface;
import android.app.Activity;
+import android.app.PendingIntent;
import android.content.ComponentName;
import android.content.Context;
import android.content.Intent;
@@ -30,6 +31,7 @@
import androidx.annotation.RestrictTo;
import androidx.core.app.ActivityCompat;
import androidx.fragment.app.FragmentActivity;
+import androidx.wear.watchface.complications.ComplicationDataSourceUpdateRequesterConstants;
import androidx.wear.watchface.complications.data.ComplicationType;
import java.util.Collection;
@@ -96,6 +98,9 @@
public static final String ACTION_PERMISSION_REQUEST_ONLY =
"android.support.wearable.complications.ACTION_PERMISSION_REQUEST_ONLY";
+ /** The package of the service that accepts complication data source requests. */
+ private static final String UPDATE_REQUEST_RECEIVER_PACKAGE = "com.google.android.wearable.app";
+
static final int PERMISSION_REQUEST_CODE_PROVIDER_CHOOSER = 1;
static final int PERMISSION_REQUEST_CODE_PROVIDER_CHOOSER_NO_DENIED_INTENT = 2;
static final int PERMISSION_REQUEST_CODE_REQUEST_ONLY = 3;
@@ -134,6 +139,9 @@
void launchComplicationDeniedActivity();
void startComplicationDataSourceChooser();
+
+ /** Requests that the system update all active complications on the watch face. */
+ void requestUpdateAll();
}
private static class DelegateImpl implements Delegate {
@@ -214,6 +222,19 @@
}
mActivity.startActivityForResult(intent, START_REQUEST_CODE_PROVIDER_CHOOSER);
}
+
+ @Override
+ public void requestUpdateAll() {
+ Intent intent = new Intent(ACTION_REQUEST_UPDATE_ALL_ACTIVE);
+ intent.setPackage(UPDATE_REQUEST_RECEIVER_PACKAGE);
+ intent.putExtra(EXTRA_WATCH_FACE_COMPONENT, mActivity.mWatchFace);
+ // Add a placeholder PendingIntent to allow the UID to be checked.
+ intent.putExtra(
+ ComplicationDataSourceUpdateRequesterConstants.EXTRA_PENDING_INTENT,
+ PendingIntent.getActivity(
+ mActivity, 0, new Intent(""), PendingIntent.FLAG_IMMUTABLE));
+ mActivity.sendBroadcast(intent);
+ }
}
@Override
@@ -285,6 +306,7 @@
} else {
finish();
}
+ mDelegate.requestUpdateAll();
} else {
if (requestCode == PERMISSION_REQUEST_CODE_PROVIDER_CHOOSER
|| requestCode == PERMISSION_REQUEST_CODE_REQUEST_ONLY) {
diff --git a/wear/watchface/watchface/src/main/java/androidx/wear/watchface/ComplicationSlot.kt b/wear/watchface/watchface/src/main/java/androidx/wear/watchface/ComplicationSlot.kt
index 3fb8f56..eb29d97 100644
--- a/wear/watchface/watchface/src/main/java/androidx/wear/watchface/ComplicationSlot.kt
+++ b/wear/watchface/watchface/src/main/java/androidx/wear/watchface/ComplicationSlot.kt
@@ -105,6 +105,7 @@
* @param zonedDateTime The [ZonedDateTime] to render the highlight with
* @param color The color to render the highlight with
*/
+ // TODO(b/230364881): Deprecate this when BoundingArc is no longer experimental.
public fun drawHighlight(
canvas: Canvas,
bounds: Rect,
@@ -113,6 +114,29 @@
@ColorInt color: Int
)
+ /**
+ * Draws a highlight for a [ComplicationSlotBoundsType.ROUND_RECT] complication. The default
+ * implementation does this by drawing a dashed line around the complication, other visual effects
+ * may be used if desired.
+ *
+ * @param canvas The [Canvas] to render into
+ * @param bounds A [Rect] describing the bounds of the complication
+ * @param boundsType The [ComplicationSlotBoundsType] of the complication
+ * @param zonedDateTime The [ZonedDateTime] to render the highlight with
+ * @param color The color to render the highlight with
+ */
+ @ComplicationExperimental
+ public fun drawHighlight(
+ canvas: Canvas,
+ bounds: Rect,
+ @ComplicationSlotBoundsType boundsType: Int,
+ zonedDateTime: ZonedDateTime,
+ @ColorInt color: Int,
+ boundingArc: BoundingArc?
+ ) {
+ drawHighlight(canvas, bounds, boundsType, zonedDateTime, color)
+ }
+
/** Returns the [ComplicationData] to render with. */
public fun getData(): ComplicationData
@@ -926,6 +950,7 @@
* @param renderParameters The current [RenderParameters]
*/
@UiThread
+ @OptIn(ComplicationExperimental::class)
public fun renderHighlightLayer(
canvas: Canvas,
zonedDateTime: ZonedDateTime,
@@ -945,7 +970,8 @@
bounds,
boundsType,
zonedDateTime,
- renderParameters.highlightLayer.highlightTint
+ renderParameters.highlightLayer.highlightTint,
+ boundingArc
)
}
@@ -956,7 +982,8 @@
bounds,
boundsType,
zonedDateTime,
- renderParameters.highlightLayer.highlightTint
+ renderParameters.highlightLayer.highlightTint,
+ boundingArc
)
}
}
diff --git a/wear/watchface/watchface/src/main/java/androidx/wear/watchface/WatchFaceService.kt b/wear/watchface/watchface/src/main/java/androidx/wear/watchface/WatchFaceService.kt
index d4a682d..cf14c70 100644
--- a/wear/watchface/watchface/src/main/java/androidx/wear/watchface/WatchFaceService.kt
+++ b/wear/watchface/watchface/src/main/java/androidx/wear/watchface/WatchFaceService.kt
@@ -2433,8 +2433,10 @@
task: suspend () -> R
): R = TraceEvent(traceEventName).use {
try {
+ // Inside runBlocking, coroutineContext has a different value.
+ val desiredContext = coroutineContext
return runBlocking {
- withContext(coroutineContext) {
+ withContext(desiredContext) {
task()
}
}
diff --git a/webkit/integration-tests/testapp/src/main/java/com/example/androidx/webkit/GetVariationsHeaderActivity.java b/webkit/integration-tests/testapp/src/main/java/com/example/androidx/webkit/GetVariationsHeaderActivity.java
index 0082e3c..7d21392 100644
--- a/webkit/integration-tests/testapp/src/main/java/com/example/androidx/webkit/GetVariationsHeaderActivity.java
+++ b/webkit/integration-tests/testapp/src/main/java/com/example/androidx/webkit/GetVariationsHeaderActivity.java
@@ -18,6 +18,7 @@
import android.os.Bundle;
import android.webkit.WebView;
+import android.webkit.WebViewClient;
import android.widget.TextView;
import androidx.annotation.Nullable;
@@ -41,6 +42,7 @@
WebView webView = findViewById(R.id.webview);
String headerValue = WebViewCompat.getVariationsHeader();
textView.setText(getString(R.string.variations_header_message, headerValue));
+ webView.setWebViewClient(new WebViewClient());
webView.loadUrl(
"https://www.google.com", ImmutableMap.of("X-Client-Data", headerValue));
} else {
diff --git a/webkit/webkit/lint-baseline.xml b/webkit/webkit/lint-baseline.xml
index 7a1290a..b05b3c9d 100644
--- a/webkit/webkit/lint-baseline.xml
+++ b/webkit/webkit/lint-baseline.xml
@@ -3,1157 +3,24 @@
<issue
id="NewApi"
- message="Call requires API level 23 (current min is 14): `android.os.Looper#isCurrentThread`"
- errorLine1=" messageHandlerThread.getLooper().isCurrentThread());"
- errorLine2=" ~~~~~~~~~~~~~~~">
- <location
- file="src/androidTest/java/androidx/webkit/PostMessageTest.java"
- line="314"
- column="62"/>
- </issue>
-
- <issue
- id="NewApi"
- message="Call requires API level 23 (current min is 14): `android.os.Looper#isCurrentThread`"
- errorLine1=" messageMainLooperFuture.set(Looper.getMainLooper().isCurrentThread());"
- errorLine2=" ~~~~~~~~~~~~~~~">
- <location
- file="src/androidTest/java/androidx/webkit/PostMessageTest.java"
- line="348"
- column="72"/>
- </issue>
-
- <issue
- id="NewApi"
- message="Call requires API level 27 (current min is 14): `android.webkit.SafeBrowsingResponse#showInterstitial`"
- errorLine1=" getFrameworksImpl().showInterstitial(allowReporting);"
- errorLine2=" ~~~~~~~~~~~~~~~~">
- <location
- file="src/main/java/androidx/webkit/internal/SafeBrowsingResponseImpl.java"
- line="84"
- column="33"/>
- </issue>
-
- <issue
- id="NewApi"
- message="Call requires API level 27 (current min is 14): `getFrameworksImpl`"
- errorLine1=" getFrameworksImpl().showInterstitial(allowReporting);"
- errorLine2=" ~~~~~~~~~~~~~~~~~">
- <location
- file="src/main/java/androidx/webkit/internal/SafeBrowsingResponseImpl.java"
- line="84"
- column="13"/>
- </issue>
-
- <issue
- id="NewApi"
- message="Call requires API level 27 (current min is 14): `android.webkit.SafeBrowsingResponse#proceed`"
- errorLine1=" getFrameworksImpl().proceed(report);"
- errorLine2=" ~~~~~~~">
- <location
- file="src/main/java/androidx/webkit/internal/SafeBrowsingResponseImpl.java"
- line="97"
- column="33"/>
- </issue>
-
- <issue
- id="NewApi"
- message="Call requires API level 27 (current min is 14): `getFrameworksImpl`"
- errorLine1=" getFrameworksImpl().proceed(report);"
- errorLine2=" ~~~~~~~~~~~~~~~~~">
- <location
- file="src/main/java/androidx/webkit/internal/SafeBrowsingResponseImpl.java"
- line="97"
- column="13"/>
- </issue>
-
- <issue
- id="NewApi"
- message="Call requires API level 27 (current min is 14): `android.webkit.SafeBrowsingResponse#backToSafety`"
- errorLine1=" getFrameworksImpl().backToSafety(report);"
- errorLine2=" ~~~~~~~~~~~~">
- <location
- file="src/main/java/androidx/webkit/internal/SafeBrowsingResponseImpl.java"
- line="110"
- column="33"/>
- </issue>
-
- <issue
- id="NewApi"
- message="Call requires API level 27 (current min is 14): `getFrameworksImpl`"
- errorLine1=" getFrameworksImpl().backToSafety(report);"
- errorLine2=" ~~~~~~~~~~~~~~~~~">
- <location
- file="src/main/java/androidx/webkit/internal/SafeBrowsingResponseImpl.java"
- line="110"
- column="13"/>
- </issue>
-
- <issue
- id="NewApi"
- message="Call requires API level 21 (current min is 14): `android.webkit.WebResourceRequest#getUrl`"
- errorLine1=" if (request.getUrl().toString().equals(INDEX_URL)) {"
- errorLine2=" ~~~~~~">
- <location
- file="src/androidTest/java/androidx/webkit/ServiceWorkerClientCompatTest.java"
- line="95"
- column="29"/>
- </issue>
-
- <issue
- id="NewApi"
- message="Call requires API level 21 (current min is 14): `android.webkit.WebResourceRequest#getUrl`"
- errorLine1=" if (request.getUrl().toString().equals(SW_URL)) {"
- errorLine2=" ~~~~~~">
- <location
- file="src/androidTest/java/androidx/webkit/ServiceWorkerClientCompatTest.java"
- line="112"
- column="29"/>
- </issue>
-
- <issue
- id="NewApi"
- message="Call requires API level 21 (current min is 14): `android.webkit.WebResourceRequest#getUrl`"
- errorLine1=" assertEquals(SW_URL, requests.get(0).getUrl().toString());"
- errorLine2=" ~~~~~~">
- <location
- file="src/androidTest/java/androidx/webkit/ServiceWorkerClientCompatTest.java"
- line="176"
- column="46"/>
- </issue>
-
- <issue
- id="NewApi"
- message="Call requires API level 21 (current min is 14): `android.webkit.WebResourceRequest#getUrl`"
- errorLine1=" assertEquals(FETCH_URL, requests.get(1).getUrl().toString());"
- errorLine2=" ~~~~~~">
- <location
- file="src/androidTest/java/androidx/webkit/ServiceWorkerClientCompatTest.java"
- line="177"
- column="49"/>
- </issue>
-
- <issue
- id="NewApi"
- message="Call requires API level 24 (current min is 14): `android.webkit.ServiceWorkerController#getInstance`"
- errorLine1=" mFrameworksImpl = ServiceWorkerController.getInstance();"
- errorLine2=" ~~~~~~~~~~~">
- <location
- file="src/main/java/androidx/webkit/internal/ServiceWorkerControllerImpl.java"
- line="44"
- column="55"/>
- </issue>
-
- <issue
- id="NewApi"
- message="Call requires API level 24 (current min is 14): `android.webkit.ServiceWorkerController#getServiceWorkerWebSettings`"
- errorLine1=" mFrameworksImpl.getServiceWorkerWebSettings());"
- errorLine2=" ~~~~~~~~~~~~~~~~~~~~~~~~~~~">
- <location
- file="src/main/java/androidx/webkit/internal/ServiceWorkerControllerImpl.java"
- line="49"
- column="37"/>
- </issue>
-
- <issue
- id="NewApi"
- message="Call requires API level 24 (current min is 14): `android.webkit.ServiceWorkerController#setServiceWorkerClient`"
- errorLine1=" getFrameworksImpl().setServiceWorkerClient(null);"
- errorLine2=" ~~~~~~~~~~~~~~~~~~~~~~">
- <location
- file="src/main/java/androidx/webkit/internal/ServiceWorkerControllerImpl.java"
- line="86"
- column="37"/>
- </issue>
-
- <issue
- id="NewApi"
- message="Call requires API level 24 (current min is 14): `getFrameworksImpl`"
- errorLine1=" getFrameworksImpl().setServiceWorkerClient(null);"
- errorLine2=" ~~~~~~~~~~~~~~~~~">
- <location
- file="src/main/java/androidx/webkit/internal/ServiceWorkerControllerImpl.java"
- line="86"
- column="17"/>
- </issue>
-
- <issue
- id="NewApi"
- message="Call requires API level 24 (current min is 14): `android.webkit.ServiceWorkerController#setServiceWorkerClient`"
- errorLine1=" getFrameworksImpl().setServiceWorkerClient("
- errorLine2=" ~~~~~~~~~~~~~~~~~~~~~~">
- <location
- file="src/main/java/androidx/webkit/internal/ServiceWorkerControllerImpl.java"
- line="88"
- column="37"/>
- </issue>
-
- <issue
- id="NewApi"
- message="Call requires API level 24 (current min is 14): `getFrameworksImpl`"
- errorLine1=" getFrameworksImpl().setServiceWorkerClient("
- errorLine2=" ~~~~~~~~~~~~~~~~~">
- <location
- file="src/main/java/androidx/webkit/internal/ServiceWorkerControllerImpl.java"
- line="88"
- column="17"/>
- </issue>
-
- <issue
- id="NewApi"
- message="Call requires API level 24 (current min is 14): `FrameworkServiceWorkerClient`"
- errorLine1=" new FrameworkServiceWorkerClient(client));"
- errorLine2=" ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
- <location
- file="src/main/java/androidx/webkit/internal/ServiceWorkerControllerImpl.java"
- line="89"
- column="25"/>
- </issue>
-
- <issue
- id="NewApi"
- message="Call requires API level 24 (current min is 14): `android.webkit.ServiceWorkerWebSettings#setCacheMode`"
- errorLine1=" getFrameworksImpl().setCacheMode(mode);"
- errorLine2=" ~~~~~~~~~~~~">
- <location
- file="src/main/java/androidx/webkit/internal/ServiceWorkerWebSettingsImpl.java"
- line="93"
- column="33"/>
- </issue>
-
- <issue
- id="NewApi"
- message="Call requires API level 24 (current min is 14): `getFrameworksImpl`"
- errorLine1=" getFrameworksImpl().setCacheMode(mode);"
- errorLine2=" ~~~~~~~~~~~~~~~~~">
- <location
- file="src/main/java/androidx/webkit/internal/ServiceWorkerWebSettingsImpl.java"
- line="93"
- column="13"/>
- </issue>
-
- <issue
- id="NewApi"
- message="Call requires API level 24 (current min is 14): `android.webkit.ServiceWorkerWebSettings#getCacheMode`"
- errorLine1=" return getFrameworksImpl().getCacheMode();"
- errorLine2=" ~~~~~~~~~~~~">
- <location
- file="src/main/java/androidx/webkit/internal/ServiceWorkerWebSettingsImpl.java"
- line="105"
- column="40"/>
- </issue>
-
- <issue
- id="NewApi"
- message="Call requires API level 24 (current min is 14): `getFrameworksImpl`"
- errorLine1=" return getFrameworksImpl().getCacheMode();"
- errorLine2=" ~~~~~~~~~~~~~~~~~">
- <location
- file="src/main/java/androidx/webkit/internal/ServiceWorkerWebSettingsImpl.java"
- line="105"
- column="20"/>
- </issue>
-
- <issue
- id="NewApi"
- message="Call requires API level 24 (current min is 14): `android.webkit.ServiceWorkerWebSettings#setAllowContentAccess`"
- errorLine1=" getFrameworksImpl().setAllowContentAccess(allow);"
- errorLine2=" ~~~~~~~~~~~~~~~~~~~~~">
- <location
- file="src/main/java/androidx/webkit/internal/ServiceWorkerWebSettingsImpl.java"
- line="117"
- column="33"/>
- </issue>
-
- <issue
- id="NewApi"
- message="Call requires API level 24 (current min is 14): `getFrameworksImpl`"
- errorLine1=" getFrameworksImpl().setAllowContentAccess(allow);"
- errorLine2=" ~~~~~~~~~~~~~~~~~">
- <location
- file="src/main/java/androidx/webkit/internal/ServiceWorkerWebSettingsImpl.java"
- line="117"
- column="13"/>
- </issue>
-
- <issue
- id="NewApi"
- message="Call requires API level 24 (current min is 14): `android.webkit.ServiceWorkerWebSettings#getAllowContentAccess`"
- errorLine1=" return getFrameworksImpl().getAllowContentAccess();"
- errorLine2=" ~~~~~~~~~~~~~~~~~~~~~">
- <location
- file="src/main/java/androidx/webkit/internal/ServiceWorkerWebSettingsImpl.java"
- line="129"
- column="40"/>
- </issue>
-
- <issue
- id="NewApi"
- message="Call requires API level 24 (current min is 14): `getFrameworksImpl`"
- errorLine1=" return getFrameworksImpl().getAllowContentAccess();"
- errorLine2=" ~~~~~~~~~~~~~~~~~">
- <location
- file="src/main/java/androidx/webkit/internal/ServiceWorkerWebSettingsImpl.java"
- line="129"
- column="20"/>
- </issue>
-
- <issue
- id="NewApi"
- message="Call requires API level 24 (current min is 14): `android.webkit.ServiceWorkerWebSettings#setAllowFileAccess`"
- errorLine1=" getFrameworksImpl().setAllowFileAccess(allow);"
- errorLine2=" ~~~~~~~~~~~~~~~~~~">
- <location
- file="src/main/java/androidx/webkit/internal/ServiceWorkerWebSettingsImpl.java"
- line="141"
- column="33"/>
- </issue>
-
- <issue
- id="NewApi"
- message="Call requires API level 24 (current min is 14): `getFrameworksImpl`"
- errorLine1=" getFrameworksImpl().setAllowFileAccess(allow);"
- errorLine2=" ~~~~~~~~~~~~~~~~~">
- <location
- file="src/main/java/androidx/webkit/internal/ServiceWorkerWebSettingsImpl.java"
- line="141"
- column="13"/>
- </issue>
-
- <issue
- id="NewApi"
- message="Call requires API level 24 (current min is 14): `android.webkit.ServiceWorkerWebSettings#getAllowFileAccess`"
- errorLine1=" return getFrameworksImpl().getAllowFileAccess();"
- errorLine2=" ~~~~~~~~~~~~~~~~~~">
- <location
- file="src/main/java/androidx/webkit/internal/ServiceWorkerWebSettingsImpl.java"
- line="153"
- column="40"/>
- </issue>
-
- <issue
- id="NewApi"
- message="Call requires API level 24 (current min is 14): `getFrameworksImpl`"
- errorLine1=" return getFrameworksImpl().getAllowFileAccess();"
- errorLine2=" ~~~~~~~~~~~~~~~~~">
- <location
- file="src/main/java/androidx/webkit/internal/ServiceWorkerWebSettingsImpl.java"
- line="153"
- column="20"/>
- </issue>
-
- <issue
- id="NewApi"
- message="Call requires API level 24 (current min is 14): `android.webkit.ServiceWorkerWebSettings#setBlockNetworkLoads`"
- errorLine1=" getFrameworksImpl().setBlockNetworkLoads(flag);"
- errorLine2=" ~~~~~~~~~~~~~~~~~~~~">
- <location
- file="src/main/java/androidx/webkit/internal/ServiceWorkerWebSettingsImpl.java"
- line="166"
- column="33"/>
- </issue>
-
- <issue
- id="NewApi"
- message="Call requires API level 24 (current min is 14): `getFrameworksImpl`"
- errorLine1=" getFrameworksImpl().setBlockNetworkLoads(flag);"
- errorLine2=" ~~~~~~~~~~~~~~~~~">
- <location
- file="src/main/java/androidx/webkit/internal/ServiceWorkerWebSettingsImpl.java"
- line="166"
- column="13"/>
- </issue>
-
- <issue
- id="NewApi"
- message="Call requires API level 24 (current min is 14): `android.webkit.ServiceWorkerWebSettings#getBlockNetworkLoads`"
- errorLine1=" return getFrameworksImpl().getBlockNetworkLoads();"
- errorLine2=" ~~~~~~~~~~~~~~~~~~~~">
- <location
- file="src/main/java/androidx/webkit/internal/ServiceWorkerWebSettingsImpl.java"
- line="179"
- column="40"/>
- </issue>
-
- <issue
- id="NewApi"
- message="Call requires API level 24 (current min is 14): `getFrameworksImpl`"
- errorLine1=" return getFrameworksImpl().getBlockNetworkLoads();"
- errorLine2=" ~~~~~~~~~~~~~~~~~">
- <location
- file="src/main/java/androidx/webkit/internal/ServiceWorkerWebSettingsImpl.java"
- line="179"
- column="20"/>
- </issue>
-
- <issue
- id="NewApi"
- message="Call requires API level 28 (current min is 14): `android.webkit.TracingController#getInstance`"
- errorLine1=" mFrameworksImpl = android.webkit.TracingController.getInstance();"
- errorLine2=" ~~~~~~~~~~~">
- <location
- file="src/main/java/androidx/webkit/internal/TracingControllerImpl.java"
- line="42"
- column="64"/>
- </issue>
-
- <issue
- id="NewApi"
- message="Call requires API level 28 (current min is 14): `android.webkit.TracingController#isTracing`"
- errorLine1=" return getFrameworksImpl().isTracing();"
- errorLine2=" ~~~~~~~~~">
- <location
- file="src/main/java/androidx/webkit/internal/TracingControllerImpl.java"
- line="72"
- column="40"/>
- </issue>
-
- <issue
- id="NewApi"
- message="Call requires API level 28 (current min is 14): `getFrameworksImpl`"
- errorLine1=" return getFrameworksImpl().isTracing();"
- errorLine2=" ~~~~~~~~~~~~~~~~~">
- <location
- file="src/main/java/androidx/webkit/internal/TracingControllerImpl.java"
- line="72"
- column="20"/>
- </issue>
-
- <issue
- id="NewApi"
- message="Call requires API level 28 (current min is 14): `new android.webkit.TracingConfig.Builder`"
- errorLine1=" android.webkit.TracingConfig config = new android.webkit.TracingConfig.Builder()"
- errorLine2=" ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
- <location
- file="src/main/java/androidx/webkit/internal/TracingControllerImpl.java"
- line="89"
- column="51"/>
- </issue>
-
- <issue
- id="NewApi"
- message="Call requires API level 28 (current min is 14): `android.webkit.TracingConfig.Builder#addCategories`"
- errorLine1=" .addCategories(tracingConfig.getPredefinedCategories())"
- errorLine2=" ~~~~~~~~~~~~~">
- <location
- file="src/main/java/androidx/webkit/internal/TracingControllerImpl.java"
- line="90"
- column="22"/>
- </issue>
-
- <issue
- id="NewApi"
- message="Call requires API level 28 (current min is 14): `android.webkit.TracingConfig.Builder#addCategories`"
- errorLine1=" .addCategories(tracingConfig.getCustomIncludedCategories())"
- errorLine2=" ~~~~~~~~~~~~~">
- <location
- file="src/main/java/androidx/webkit/internal/TracingControllerImpl.java"
- line="91"
- column="22"/>
- </issue>
-
- <issue
- id="NewApi"
- message="Call requires API level 28 (current min is 14): `android.webkit.TracingConfig.Builder#setTracingMode`"
- errorLine1=" .setTracingMode(tracingConfig.getTracingMode())"
- errorLine2=" ~~~~~~~~~~~~~~">
- <location
- file="src/main/java/androidx/webkit/internal/TracingControllerImpl.java"
- line="92"
- column="22"/>
- </issue>
-
- <issue
- id="NewApi"
- message="Call requires API level 28 (current min is 14): `android.webkit.TracingConfig.Builder#build`"
- errorLine1=" .build();"
- errorLine2=" ~~~~~">
- <location
- file="src/main/java/androidx/webkit/internal/TracingControllerImpl.java"
- line="93"
- column="22"/>
- </issue>
-
- <issue
- id="NewApi"
- message="Call requires API level 28 (current min is 14): `android.webkit.TracingController#start`"
- errorLine1=" getFrameworksImpl().start(config);"
- errorLine2=" ~~~~~">
- <location
- file="src/main/java/androidx/webkit/internal/TracingControllerImpl.java"
- line="94"
- column="33"/>
- </issue>
-
- <issue
- id="NewApi"
- message="Call requires API level 28 (current min is 14): `getFrameworksImpl`"
- errorLine1=" getFrameworksImpl().start(config);"
- errorLine2=" ~~~~~~~~~~~~~~~~~">
- <location
- file="src/main/java/androidx/webkit/internal/TracingControllerImpl.java"
- line="94"
- column="13"/>
- </issue>
-
- <issue
- id="NewApi"
- message="Call requires API level 28 (current min is 14): `android.webkit.TracingController#stop`"
- errorLine1=" return getFrameworksImpl().stop(outputStream, executor);"
- errorLine2=" ~~~~">
- <location
- file="src/main/java/androidx/webkit/internal/TracingControllerImpl.java"
- line="108"
- column="40"/>
- </issue>
-
- <issue
- id="NewApi"
- message="Call requires API level 28 (current min is 14): `getFrameworksImpl`"
- errorLine1=" return getFrameworksImpl().stop(outputStream, executor);"
- errorLine2=" ~~~~~~~~~~~~~~~~~">
- <location
- file="src/main/java/androidx/webkit/internal/TracingControllerImpl.java"
- line="108"
- column="20"/>
- </issue>
-
- <issue
- id="NewApi"
- message="Call requires API level 23 (current min is 14): `android.webkit.WebMessagePort#postMessage`"
- errorLine1=" getFrameworksImpl().postMessage(compatToFrameworkMessage(message));"
- errorLine2=" ~~~~~~~~~~~">
- <location
- file="src/main/java/androidx/webkit/internal/WebMessagePortImpl.java"
- line="76"
- column="33"/>
- </issue>
-
- <issue
- id="NewApi"
- message="Call requires API level 23 (current min is 14): `compatToFrameworkMessage`"
- errorLine1=" getFrameworksImpl().postMessage(compatToFrameworkMessage(message));"
- errorLine2=" ~~~~~~~~~~~~~~~~~~~~~~~~">
- <location
- file="src/main/java/androidx/webkit/internal/WebMessagePortImpl.java"
- line="76"
- column="45"/>
- </issue>
-
- <issue
- id="NewApi"
- message="Call requires API level 23 (current min is 14): `getFrameworksImpl`"
- errorLine1=" getFrameworksImpl().postMessage(compatToFrameworkMessage(message));"
- errorLine2=" ~~~~~~~~~~~~~~~~~">
- <location
- file="src/main/java/androidx/webkit/internal/WebMessagePortImpl.java"
- line="76"
- column="13"/>
- </issue>
-
- <issue
- id="NewApi"
- message="Call requires API level 23 (current min is 14): `android.webkit.WebMessagePort#close`"
- errorLine1=" getFrameworksImpl().close();"
- errorLine2=" ~~~~~">
- <location
- file="src/main/java/androidx/webkit/internal/WebMessagePortImpl.java"
- line="90"
- column="33"/>
- </issue>
-
- <issue
- id="NewApi"
- message="Call requires API level 23 (current min is 14): `getFrameworksImpl`"
- errorLine1=" getFrameworksImpl().close();"
- errorLine2=" ~~~~~~~~~~~~~~~~~">
- <location
- file="src/main/java/androidx/webkit/internal/WebMessagePortImpl.java"
- line="90"
- column="13"/>
- </issue>
-
- <issue
- id="NewApi"
- message="Call requires API level 23 (current min is 14): `android.webkit.WebMessagePort#setWebMessageCallback`"
- errorLine1=" getFrameworksImpl().setWebMessageCallback(new WebMessagePort.WebMessageCallback() {"
- errorLine2=" ~~~~~~~~~~~~~~~~~~~~~">
- <location
- file="src/main/java/androidx/webkit/internal/WebMessagePortImpl.java"
- line="103"
- column="33"/>
- </issue>
-
- <issue
- id="NewApi"
- message="Call requires API level 23 (current min is 14): `getFrameworksImpl`"
- errorLine1=" getFrameworksImpl().setWebMessageCallback(new WebMessagePort.WebMessageCallback() {"
- errorLine2=" ~~~~~~~~~~~~~~~~~">
- <location
- file="src/main/java/androidx/webkit/internal/WebMessagePortImpl.java"
- line="103"
- column="13"/>
- </issue>
-
- <issue
- id="NewApi"
- message="Cast to `WebMessageCallback` requires API level 23 (current min is 14)"
- errorLine1=" getFrameworksImpl().setWebMessageCallback(new WebMessagePort.WebMessageCallback() {"
- errorLine2=" ^">
- <location
- file="src/main/java/androidx/webkit/internal/WebMessagePortImpl.java"
- line="103"
- column="55"/>
- </issue>
-
- <issue
- id="NewApi"
- message="Class requires API level 23 (current min is 14): `android.webkit.WebMessagePort.WebMessageCallback`"
- errorLine1=" getFrameworksImpl().setWebMessageCallback(new WebMessagePort.WebMessageCallback() {"
- errorLine2=" ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
- <location
- file="src/main/java/androidx/webkit/internal/WebMessagePortImpl.java"
- line="103"
- column="59"/>
- </issue>
-
- <issue
- id="NewApi"
- message="Call requires API level 23 (current min is 14): `frameworkMessageToCompat`"
- errorLine1=" frameworkMessageToCompat(message));"
- errorLine2=" ~~~~~~~~~~~~~~~~~~~~~~~~">
- <location
- file="src/main/java/androidx/webkit/internal/WebMessagePortImpl.java"
- line="107"
- column="29"/>
- </issue>
-
- <issue
- id="NewApi"
- message="Call requires API level 23 (current min is 14): `android.webkit.WebMessagePort#setWebMessageCallback`"
- errorLine1=" getFrameworksImpl().setWebMessageCallback(new WebMessagePort.WebMessageCallback() {"
- errorLine2=" ~~~~~~~~~~~~~~~~~~~~~">
- <location
- file="src/main/java/androidx/webkit/internal/WebMessagePortImpl.java"
- line="124"
- column="33"/>
- </issue>
-
- <issue
- id="NewApi"
- message="Call requires API level 23 (current min is 14): `getFrameworksImpl`"
- errorLine1=" getFrameworksImpl().setWebMessageCallback(new WebMessagePort.WebMessageCallback() {"
- errorLine2=" ~~~~~~~~~~~~~~~~~">
- <location
- file="src/main/java/androidx/webkit/internal/WebMessagePortImpl.java"
- line="124"
- column="13"/>
- </issue>
-
- <issue
- id="NewApi"
- message="Cast to `WebMessageCallback` requires API level 23 (current min is 14)"
- errorLine1=" getFrameworksImpl().setWebMessageCallback(new WebMessagePort.WebMessageCallback() {"
- errorLine2=" ^">
- <location
- file="src/main/java/androidx/webkit/internal/WebMessagePortImpl.java"
- line="124"
- column="55"/>
- </issue>
-
- <issue
- id="NewApi"
- message="Class requires API level 23 (current min is 14): `android.webkit.WebMessagePort.WebMessageCallback`"
- errorLine1=" getFrameworksImpl().setWebMessageCallback(new WebMessagePort.WebMessageCallback() {"
- errorLine2=" ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
- <location
- file="src/main/java/androidx/webkit/internal/WebMessagePortImpl.java"
- line="124"
- column="59"/>
- </issue>
-
- <issue
- id="NewApi"
- message="Call requires API level 23 (current min is 14): `frameworkMessageToCompat`"
- errorLine1=" frameworkMessageToCompat(message));"
- errorLine2=" ~~~~~~~~~~~~~~~~~~~~~~~~">
- <location
- file="src/main/java/androidx/webkit/internal/WebMessagePortImpl.java"
- line="128"
- column="29"/>
- </issue>
-
- <issue
- id="NewApi"
- message="Call requires API level 23 (current min is 14): `android.webkit.WebResourceError#getErrorCode`"
- errorLine1=" return getFrameworksImpl().getErrorCode();"
- errorLine2=" ~~~~~~~~~~~~">
- <location
- file="src/main/java/androidx/webkit/internal/WebResourceErrorImpl.java"
- line="82"
- column="40"/>
- </issue>
-
- <issue
- id="NewApi"
- message="Call requires API level 23 (current min is 14): `getFrameworksImpl`"
- errorLine1=" return getFrameworksImpl().getErrorCode();"
- errorLine2=" ~~~~~~~~~~~~~~~~~">
- <location
- file="src/main/java/androidx/webkit/internal/WebResourceErrorImpl.java"
- line="82"
- column="20"/>
- </issue>
-
- <issue
- id="NewApi"
- message="Call requires API level 23 (current min is 14): `android.webkit.WebResourceError#getDescription`"
- errorLine1=" return getFrameworksImpl().getDescription();"
- errorLine2=" ~~~~~~~~~~~~~~">
- <location
- file="src/main/java/androidx/webkit/internal/WebResourceErrorImpl.java"
- line="96"
- column="40"/>
- </issue>
-
- <issue
- id="NewApi"
- message="Call requires API level 23 (current min is 14): `getFrameworksImpl`"
- errorLine1=" return getFrameworksImpl().getDescription();"
- errorLine2=" ~~~~~~~~~~~~~~~~~">
- <location
- file="src/main/java/androidx/webkit/internal/WebResourceErrorImpl.java"
- line="96"
- column="20"/>
- </issue>
-
- <issue
- id="NewApi"
- message="Call requires API level 24 (current min is 14): `android.webkit.WebResourceRequest#isRedirect`"
- errorLine1=" return request.isRedirect();"
- errorLine2=" ~~~~~~~~~~">
- <location
- file="src/main/java/androidx/webkit/WebResourceRequestCompat.java"
- line="50"
- column="28"/>
- </issue>
-
- <issue
- id="NewApi"
- message="Call requires API level 23 (current min is 14): `android.webkit.WebSettings#setOffscreenPreRaster`"
- errorLine1=" settings.setOffscreenPreRaster(enabled);"
- errorLine2=" ~~~~~~~~~~~~~~~~~~~~~">
+ message="Call requires API level 29 (current min is 14): `setForceDark`"
+ errorLine1=" ApiHelperForQ.setForceDark(settings, forceDarkMode);"
+ errorLine2=" ~~~~~~~~~~~~">
<location
file="src/main/java/androidx/webkit/WebSettingsCompat.java"
- line="65"
- column="22"/>
+ line="361"
+ column="27"/>
</issue>
<issue
id="NewApi"
- message="Call requires API level 23 (current min is 14): `android.webkit.WebSettings#getOffscreenPreRaster`"
- errorLine1=" return settings.getOffscreenPreRaster();"
- errorLine2=" ~~~~~~~~~~~~~~~~~~~~~">
+ message="Call requires API level 29 (current min is 14): `getForceDark`"
+ errorLine1=" return ApiHelperForQ.getForceDark(settings);"
+ errorLine2=" ~~~~~~~~~~~~">
<location
file="src/main/java/androidx/webkit/WebSettingsCompat.java"
- line="90"
- column="29"/>
- </issue>
-
- <issue
- id="NewApi"
- message="Call requires API level 26 (current min is 14): `android.webkit.WebSettings#setSafeBrowsingEnabled`"
- errorLine1=" settings.setSafeBrowsingEnabled(enabled);"
- errorLine2=" ~~~~~~~~~~~~~~~~~~~~~~">
- <location
- file="src/main/java/androidx/webkit/WebSettingsCompat.java"
- line="122"
- column="22"/>
- </issue>
-
- <issue
- id="NewApi"
- message="Call requires API level 26 (current min is 14): `android.webkit.WebSettings#getSafeBrowsingEnabled`"
- errorLine1=" return settings.getSafeBrowsingEnabled();"
- errorLine2=" ~~~~~~~~~~~~~~~~~~~~~~">
- <location
- file="src/main/java/androidx/webkit/WebSettingsCompat.java"
- line="146"
- column="29"/>
- </issue>
-
- <issue
- id="NewApi"
- message="Call requires API level 24 (current min is 14): `android.webkit.WebSettings#setDisabledActionModeMenuItems`"
- errorLine1=" settings.setDisabledActionModeMenuItems(menuItems);"
- errorLine2=" ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
- <location
- file="src/main/java/androidx/webkit/WebSettingsCompat.java"
- line="185"
- column="22"/>
- </issue>
-
- <issue
- id="NewApi"
- message="Call requires API level 24 (current min is 14): `android.webkit.WebSettings#getDisabledActionModeMenuItems`"
- errorLine1=" return settings.getDisabledActionModeMenuItems();"
- errorLine2=" ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
- <location
- file="src/main/java/androidx/webkit/WebSettingsCompat.java"
- line="210"
- column="29"/>
- </issue>
-
- <issue
- id="NewApi"
- message="Call requires API level 29 (current min is 14): `android.webkit.WebSettings#setForceDark`"
- errorLine1=" settings.setForceDark(forceDarkMode);"
- errorLine2=" ~~~~~~~~~~~~">
- <location
- file="src/main/java/androidx/webkit/WebSettingsCompat.java"
- line="358"
- column="22"/>
- </issue>
-
- <issue
- id="NewApi"
- message="Call requires API level 29 (current min is 14): `android.webkit.WebSettings#getForceDark`"
- errorLine1=" return settings.getForceDark();"
- errorLine2=" ~~~~~~~~~~~~">
- <location
- file="src/main/java/androidx/webkit/WebSettingsCompat.java"
- line="387"
- column="29"/>
- </issue>
-
- <issue
- id="NewApi"
- message="Call requires API level 21 (current min is 14): `android.webkit.WebResourceRequest#getUrl`"
- errorLine1=" webViewClient.getLastShouldOverrideResourceRequest().getUrl().toString());"
- errorLine2=" ~~~~~~">
- <location
- file="src/androidTest/java/androidx/webkit/WebViewClientCompatTest.java"
- line="168"
- column="70"/>
- </issue>
-
- <issue
- id="NewApi"
- message="Call requires API level 21 (current min is 14): `android.webkit.WebResourceRequest#isForMainFrame`"
- errorLine1=" Assert.assertTrue(request.isForMainFrame());"
- errorLine2=" ~~~~~~~~~~~~~~">
- <location
- file="src/androidTest/java/androidx/webkit/WebViewClientCompatTest.java"
- line="172"
- column="35"/>
- </issue>
-
- <issue
- id="NewApi"
- message="Call requires API level 21 (current min is 14): `android.webkit.WebResourceRequest#hasGesture`"
- errorLine1=" Assert.assertFalse(request.hasGesture());"
- errorLine2=" ~~~~~~~~~~">
- <location
- file="src/androidTest/java/androidx/webkit/WebViewClientCompatTest.java"
- line="174"
- column="36"/>
- </issue>
-
- <issue
- id="NewApi"
- message="Call requires API level 21 (current min is 14): `android.webkit.WebResourceResponse#getStatusCode`"
- errorLine1=" Assert.assertEquals(404, webViewClient.getOnReceivedHttpError().getStatusCode());"
- errorLine2=" ~~~~~~~~~~~~~">
- <location
- file="src/androidTest/java/androidx/webkit/WebViewClientCompatTest.java"
- line="256"
- column="73"/>
- </issue>
-
- <issue
- id="NewApi"
- message="Call requires API level 21 (current min is 14): `android.webkit.WebResourceRequest#getUrl`"
- errorLine1=" backToSafetyWebViewClient.getOnSafeBrowsingHitRequest().getUrl().toString());"
- errorLine2=" ~~~~~~">
- <location
- file="src/androidTest/java/androidx/webkit/WebViewClientCompatTest.java"
- line="340"
- column="77"/>
- </issue>
-
- <issue
- id="NewApi"
- message="Call requires API level 21 (current min is 14): `android.webkit.WebResourceRequest#getUrl`"
- errorLine1=" client.getOnSafeBrowsingHitRequest().getUrl().toString());"
- errorLine2=" ~~~~~~">
- <location
- file="src/androidTest/java/androidx/webkit/WebViewClientCompatTest.java"
- line="405"
- column="54"/>
- </issue>
-
- <issue
- id="NewApi"
- message="Call requires API level 21 (current min is 14): `android.webkit.WebResourceRequest#isForMainFrame`"
- errorLine1=" Assert.assertTrue(client.getOnSafeBrowsingHitRequest().isForMainFrame());"
- errorLine2=" ~~~~~~~~~~~~~~">
- <location
- file="src/androidTest/java/androidx/webkit/WebViewClientCompatTest.java"
- line="406"
- column="64"/>
- </issue>
-
- <issue
- id="NewApi"
- message="Call requires API level 23 (current min is 14): `android.webkit.WebView#postVisualStateCallback`"
- errorLine1=" webview.postVisualStateCallback(requestId,"
- errorLine2=" ~~~~~~~~~~~~~~~~~~~~~~~">
- <location
- file="src/main/java/androidx/webkit/WebViewCompat.java"
- line="166"
- column="21"/>
- </issue>
-
- <issue
- id="NewApi"
- message="Cast to `VisualStateCallback` requires API level 23 (current min is 14)"
- errorLine1=" new android.webkit.WebView.VisualStateCallback() {"
- errorLine2=" ^">
- <location
- file="src/main/java/androidx/webkit/WebViewCompat.java"
- line="167"
- column="21"/>
- </issue>
-
- <issue
- id="NewApi"
- message="Class requires API level 23 (current min is 14): `android.webkit.WebView.VisualStateCallback`"
- errorLine1=" new android.webkit.WebView.VisualStateCallback() {"
- errorLine2=" ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
- <location
- file="src/main/java/androidx/webkit/WebViewCompat.java"
- line="167"
- column="25"/>
- </issue>
-
- <issue
- id="NewApi"
- message="Call requires API level 27 (current min is 14): `android.webkit.WebView#startSafeBrowsing`"
- errorLine1=" WebView.startSafeBrowsing(context, callback);"
- errorLine2=" ~~~~~~~~~~~~~~~~~">
- <location
- file="src/main/java/androidx/webkit/WebViewCompat.java"
- line="210"
- column="21"/>
- </issue>
-
- <issue
- id="NewApi"
- message="Call requires API level 27 (current min is 14): `android.webkit.WebView#setSafeBrowsingWhitelist`"
- errorLine1=" WebView.setSafeBrowsingWhitelist(hostsList, callback);"
- errorLine2=" ~~~~~~~~~~~~~~~~~~~~~~~~">
- <location
- file="src/main/java/androidx/webkit/WebViewCompat.java"
- line="260"
- column="21"/>
- </issue>
-
- <issue
- id="NewApi"
- message="Call requires API level 27 (current min is 14): `android.webkit.WebView#getSafeBrowsingPrivacyPolicyUrl`"
- errorLine1=" return WebView.getSafeBrowsingPrivacyPolicyUrl();"
- errorLine2=" ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
- <location
- file="src/main/java/androidx/webkit/WebViewCompat.java"
- line="323"
- column="28"/>
- </issue>
-
- <issue
- id="NewApi"
- message="Call requires API level 23 (current min is 14): `android.webkit.WebView#createWebMessageChannel`"
- errorLine1=" return WebMessagePortImpl.portsToCompat(webview.createWebMessageChannel());"
- errorLine2=" ~~~~~~~~~~~~~~~~~~~~~~~">
- <location
- file="src/main/java/androidx/webkit/WebViewCompat.java"
- line="448"
- column="61"/>
- </issue>
-
- <issue
- id="NewApi"
- message="Call requires API level 23 (current min is 14): `android.webkit.WebView#postWebMessage`"
- errorLine1=" webview.postWebMessage("
- errorLine2=" ~~~~~~~~~~~~~~">
- <location
- file="src/main/java/androidx/webkit/WebViewCompat.java"
- line="487"
- column="21"/>
- </issue>
-
- <issue
- id="NewApi"
- message="Call requires API level 23 (current min is 14): `compatToFrameworkMessage`"
- errorLine1=" WebMessagePortImpl.compatToFrameworkMessage(message),"
- errorLine2=" ~~~~~~~~~~~~~~~~~~~~~~~~">
- <location
- file="src/main/java/androidx/webkit/WebViewCompat.java"
- line="488"
- column="40"/>
- </issue>
-
- <issue
- id="NewApi"
- message="Call requires API level 26 (current min is 14): `android.webkit.WebView#getWebViewClient`"
- errorLine1=" return webview.getWebViewClient();"
- errorLine2=" ~~~~~~~~~~~~~~~~">
- <location
- file="src/main/java/androidx/webkit/WebViewCompat.java"
- line="759"
- column="28"/>
- </issue>
-
- <issue
- id="NewApi"
- message="Call requires API level 26 (current min is 14): `android.webkit.WebView#getWebChromeClient`"
- errorLine1=" return webview.getWebChromeClient();"
- errorLine2=" ~~~~~~~~~~~~~~~~~~">
- <location
- file="src/main/java/androidx/webkit/WebViewCompat.java"
- line="782"
- column="28"/>
- </issue>
-
- <issue
- id="NewApi"
- message="Call requires API level 29 (current min is 14): `android.webkit.WebView#getWebViewRenderProcess`"
- errorLine1=" android.webkit.WebViewRenderProcess renderer = webview.getWebViewRenderProcess();"
- errorLine2=" ~~~~~~~~~~~~~~~~~~~~~~~">
- <location
- file="src/main/java/androidx/webkit/WebViewCompat.java"
- line="816"
- column="68"/>
- </issue>
-
- <issue
- id="NewApi"
- message="Call requires API level 29 (current min is 14): `android.webkit.WebView#setWebViewRenderProcessClient`"
- errorLine1=" webview.setWebViewRenderProcessClient(executor, webViewRenderProcessClient != null"
- errorLine2=" ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
- <location
- file="src/main/java/androidx/webkit/WebViewCompat.java"
- line="867"
- column="21"/>
- </issue>
-
- <issue
- id="NewApi"
- message="Call requires API level 29 (current min is 14): `WebViewRenderProcessClientFrameworkAdapter`"
- errorLine1=" ? new WebViewRenderProcessClientFrameworkAdapter(webViewRenderProcessClient)"
- errorLine2=" ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
- <location
- file="src/main/java/androidx/webkit/WebViewCompat.java"
- line="868"
- column="23"/>
- </issue>
-
- <issue
- id="NewApi"
- message="Call requires API level 29 (current min is 14): `android.webkit.WebView#setWebViewRenderProcessClient`"
- errorLine1=" webview.setWebViewRenderProcessClient(webViewRenderProcessClient != null"
- errorLine2=" ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
- <location
- file="src/main/java/androidx/webkit/WebViewCompat.java"
- line="905"
- column="21"/>
- </issue>
-
- <issue
- id="NewApi"
- message="Call requires API level 29 (current min is 14): `WebViewRenderProcessClientFrameworkAdapter`"
- errorLine1=" ? new WebViewRenderProcessClientFrameworkAdapter(webViewRenderProcessClient)"
- errorLine2=" ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
- <location
- file="src/main/java/androidx/webkit/WebViewCompat.java"
- line="906"
- column="23"/>
- </issue>
-
- <issue
- id="NewApi"
- message="Call requires API level 29 (current min is 14): `android.webkit.WebView#getWebViewRenderProcessClient`"
- errorLine1=" webview.getWebViewRenderProcessClient();"
- errorLine2=" ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
- <location
- file="src/main/java/androidx/webkit/WebViewCompat.java"
- line="935"
- column="29"/>
- </issue>
-
- <issue
- id="NewApi"
- message="Call requires API level 29 (current min is 14): `getFrameworkRenderProcessClient`"
- errorLine1=" .getFrameworkRenderProcessClient();"
- errorLine2=" ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
- <location
- file="src/main/java/androidx/webkit/WebViewCompat.java"
- line="941"
- column="18"/>
- </issue>
-
- <issue
- id="NewApi"
- message="Call requires API level 23 (current min is 14): `android.os.Looper#isCurrentThread`"
- errorLine1=" value -> startSafeBrowsingFuture.set(Looper.getMainLooper().isCurrentThread()));"
- errorLine2=" ~~~~~~~~~~~~~~~">
- <location
- file="src/androidTest/java/androidx/webkit/WebViewCompatTest.java"
- line="163"
- column="77"/>
- </issue>
-
- <issue
- id="NewApi"
- message="Class requires API level 19 (current min is 14): `java.lang.AutoCloseable`"
- errorLine1="public class WebViewOnUiThread implements AutoCloseable{"
- errorLine2=" ~~~~~~~~~~~~~">
- <location
- file="src/androidTest/java/androidx/webkit/WebViewOnUiThread.java"
- line="53"
- column="43"/>
- </issue>
-
- <issue
- id="NewApi"
- message="Call requires API level 19 (current min is 14): `android.webkit.WebView#evaluateJavascript`"
- errorLine1=" WebkitUtils.onMainThread(() -> mWebView.evaluateJavascript(script, result));"
- errorLine2=" ~~~~~~~~~~~~~~~~~~">
- <location
- file="src/androidTest/java/androidx/webkit/WebViewOnUiThread.java"
- line="335"
- column="49"/>
- </issue>
-
- <issue
- id="NewApi"
- message="Call requires API level 19 (current min is 14): `android.webkit.WebView#evaluateJavascript`"
- errorLine1=" webView.evaluateJavascript("blocker.block();", null);"
- errorLine2=" ~~~~~~~~~~~~~~~~~~">
- <location
- file="src/androidTest/java/androidx/webkit/WebViewRenderProcessClientTest.java"
- line="116"
- column="21"/>
- </issue>
-
- <issue
- id="NewApi"
- message="Call requires API level 29 (current min is 14): `android.webkit.WebViewRenderProcess#terminate`"
- errorLine1=" return renderer != null ? renderer.terminate() : false;"
- errorLine2=" ~~~~~~~~~">
- <location
- file="src/main/java/androidx/webkit/internal/WebViewRenderProcessImpl.java"
- line="91"
- column="48"/>
+ line="390"
+ column="34"/>
</issue>
</issues>
diff --git a/webkit/webkit/lint.xml b/webkit/webkit/lint.xml
index 805cb01..dd56e16 100644
--- a/webkit/webkit/lint.xml
+++ b/webkit/webkit/lint.xml
@@ -22,6 +22,18 @@
<!-- Webkit-specific lint rules: -->
+
+ <!-- We cannot cause ClassVerificationFailure in embedding apps -->
+ <issue id="ClassVerificationFailure" severity="fatal" />
+ <!-- Developers need to call our code from Kotlin code, so nullness is important.-->
+ <issue id="UnknownNullness" severity="fatal" >
+ <!-- The boundary interfaces are not annotated, and they represent external chromium code,
+ so skip them.
+ The catch-all ignore below does not disable this check,
+ so it needs to be done here too. -->
+ <ignore path="**/org/chromium/support_lib_boundary/**" />
+ </issue>
+
<!-- Ignore all warnings for webview-support-interfaces, since it's external chromium code. -->
<issue id="all" severity="ignore">
<ignore path="**/org/chromium/support_lib_boundary/**" />
diff --git a/webkit/webkit/src/androidTest/java/androidx/webkit/IncompatibilityTest.java b/webkit/webkit/src/androidTest/java/androidx/webkit/IncompatibilityTest.java
index 47f9ffc..ae9196c 100644
--- a/webkit/webkit/src/androidTest/java/androidx/webkit/IncompatibilityTest.java
+++ b/webkit/webkit/src/androidTest/java/androidx/webkit/IncompatibilityTest.java
@@ -22,7 +22,7 @@
import androidx.test.ext.junit.runners.AndroidJUnit4;
import androidx.test.filters.MediumTest;
import androidx.test.filters.SdkSuppress;
-import androidx.webkit.internal.WebViewFeatureInternal;
+import androidx.webkit.internal.ApiFeature;
import org.junit.Test;
import org.junit.runner.RunWith;
@@ -41,7 +41,7 @@
@Test
@SdkSuppress(maxSdkVersion = 20)
public void testPreLDeviceHasNoWebViewFeatures() {
- assertEquals(0, WebViewFeatureInternal.getWebViewApkFeaturesForTesting().size());
+ assertEquals(0, ApiFeature.getWebViewApkFeaturesForTesting().size());
}
@Test
diff --git a/webkit/webkit/src/androidTest/java/androidx/webkit/PollingCheck.java b/webkit/webkit/src/androidTest/java/androidx/webkit/PollingCheck.java
index d660b99..f7098fb 100644
--- a/webkit/webkit/src/androidTest/java/androidx/webkit/PollingCheck.java
+++ b/webkit/webkit/src/androidTest/java/androidx/webkit/PollingCheck.java
@@ -16,6 +16,8 @@
package androidx.webkit;
+import androidx.annotation.NonNull;
+
import org.junit.Assert;
import java.util.concurrent.Callable;
@@ -61,7 +63,8 @@
Assert.fail("unexpected timeout");
}
- public static void check(CharSequence message, long timeout, Callable<Boolean> condition)
+ public static void check(@NonNull CharSequence message, long timeout,
+ @NonNull Callable<Boolean> condition)
throws Exception {
while (timeout > 0) {
if (condition.call()) {
diff --git a/webkit/webkit/src/androidTest/java/androidx/webkit/PostMessageTest.java b/webkit/webkit/src/androidTest/java/androidx/webkit/PostMessageTest.java
index 14d5b04..2283a2e 100644
--- a/webkit/webkit/src/androidTest/java/androidx/webkit/PostMessageTest.java
+++ b/webkit/webkit/src/androidTest/java/androidx/webkit/PostMessageTest.java
@@ -17,15 +17,16 @@
package androidx.webkit;
import android.net.Uri;
+import android.os.Build;
import android.os.Handler;
import android.os.HandlerThread;
import android.os.Looper;
-import android.webkit.WebView;
import androidx.annotation.NonNull;
import androidx.concurrent.futures.ResolvableFuture;
import androidx.test.ext.junit.runners.AndroidJUnit4;
import androidx.test.filters.LargeTest;
+import androidx.test.filters.SdkSuppress;
import androidx.webkit.WebMessagePortCompat.WebMessageCallbackCompat;
import org.junit.After;
@@ -39,10 +40,10 @@
@LargeTest
@RunWith(AndroidJUnit4.class)
+@SdkSuppress(minSdkVersion = Build.VERSION_CODES.LOLLIPOP)
public class PostMessageTest {
public static final long TIMEOUT = 6000L;
- private WebView mWebView;
private WebViewOnUiThread mOnUiThread;
private static final String WEBVIEW_MESSAGE = "from_webview";
@@ -297,7 +298,6 @@
WebMessageCompat message = new WebMessageCompat(WEBVIEW_MESSAGE, new
WebMessagePortCompat[]{channel[1]});
mOnUiThread.postWebMessageCompat(message, Uri.parse(BASE_URI));
- final int messageCount = 1;
final ResolvableFuture<Boolean> messageHandlerThreadFuture = ResolvableFuture.create();
// Create a new thread for the WebMessageCallbackCompat.
@@ -309,9 +309,10 @@
channel[0].postMessage(new WebMessageCompat(WEBVIEW_MESSAGE));
channel[0].setWebMessageCallback(messageHandler, new WebMessageCallbackCompat() {
@Override
- public void onMessage(WebMessagePortCompat port, WebMessageCompat message) {
+ public void onMessage(@NonNull WebMessagePortCompat port,
+ WebMessageCompat message) {
messageHandlerThreadFuture.set(
- messageHandlerThread.getLooper().isCurrentThread());
+ WebkitUtils.isCurrentThread(messageHandlerThread.getLooper()));
}
});
});
@@ -337,15 +338,16 @@
WebMessageCompat message = new WebMessageCompat(WEBVIEW_MESSAGE,
new WebMessagePortCompat[]{channel[1]});
mOnUiThread.postWebMessageCompat(message, Uri.parse(BASE_URI));
- final int messageCount = 1;
final ResolvableFuture<Boolean> messageMainLooperFuture = ResolvableFuture.create();
WebkitUtils.onMainThread(() -> {
channel[0].postMessage(new WebMessageCompat(WEBVIEW_MESSAGE));
channel[0].setWebMessageCallback(new WebMessageCallbackCompat() {
@Override
- public void onMessage(WebMessagePortCompat port, WebMessageCompat message) {
- messageMainLooperFuture.set(Looper.getMainLooper().isCurrentThread());
+ public void onMessage(@NonNull WebMessagePortCompat port,
+ WebMessageCompat message) {
+ messageMainLooperFuture.set(
+ WebkitUtils.isCurrentThread(Looper.getMainLooper()));
}
});
});
diff --git a/webkit/webkit/src/androidTest/java/androidx/webkit/ProxyControllerTest.java b/webkit/webkit/src/androidTest/java/androidx/webkit/ProxyControllerTest.java
index 8a5ff6d..5d23fb0 100644
--- a/webkit/webkit/src/androidTest/java/androidx/webkit/ProxyControllerTest.java
+++ b/webkit/webkit/src/androidTest/java/androidx/webkit/ProxyControllerTest.java
@@ -23,9 +23,12 @@
import static org.junit.Assert.assertNotNull;
import static org.junit.Assert.fail;
+import android.os.Build;
+
import androidx.concurrent.futures.ResolvableFuture;
import androidx.test.ext.junit.runners.AndroidJUnit4;
import androidx.test.filters.MediumTest;
+import androidx.test.filters.SdkSuppress;
import androidx.webkit.internal.ProxyControllerImpl;
import org.junit.After;
@@ -43,6 +46,7 @@
@MediumTest
@RunWith(AndroidJUnit4.class)
+@SdkSuppress(minSdkVersion = Build.VERSION_CODES.LOLLIPOP)
public class ProxyControllerTest {
private WebViewOnUiThread mWebViewOnUiThread;
private MockWebServer mContentServer;
diff --git a/webkit/webkit/src/androidTest/java/androidx/webkit/ServiceWorkerClientCompatTest.java b/webkit/webkit/src/androidTest/java/androidx/webkit/ServiceWorkerClientCompatTest.java
index 2c9f0f6..180fea3 100644
--- a/webkit/webkit/src/androidTest/java/androidx/webkit/ServiceWorkerClientCompatTest.java
+++ b/webkit/webkit/src/androidTest/java/androidx/webkit/ServiceWorkerClientCompatTest.java
@@ -26,6 +26,8 @@
import android.webkit.WebView;
import androidx.annotation.NonNull;
+import androidx.annotation.Nullable;
+import androidx.annotation.RequiresApi;
import androidx.test.ext.junit.runners.AndroidJUnit4;
import androidx.test.filters.MediumTest;
import androidx.test.filters.SdkSuppress;
@@ -37,6 +39,7 @@
import org.junit.runner.RunWith;
import java.io.ByteArrayInputStream;
+import java.io.UnsupportedEncodingException;
import java.util.ArrayList;
import java.util.List;
import java.util.concurrent.Callable;
@@ -44,6 +47,7 @@
@MediumTest
@RunWith(AndroidJUnit4.class)
@SdkSuppress(minSdkVersion = Build.VERSION_CODES.LOLLIPOP)
+@RequiresApi(Build.VERSION_CODES.LOLLIPOP)
public class ServiceWorkerClientCompatTest {
// This test relies on
@@ -107,14 +111,15 @@
return new WebResourceResponse("text/html", "utf-8",
new ByteArrayInputStream(INDEX_RAW_HTML.getBytes("UTF-8")));
}
- } catch (java.io.UnsupportedEncodingException e) { }
+ } catch (UnsupportedEncodingException e) { }
return new WebResourceResponse("text/html", "UTF-8", null);
}
}
public static class InterceptServiceWorkerClient extends ServiceWorkerClientCompat {
- private List<WebResourceRequest> mInterceptedRequests = new ArrayList<>();
+ private final List<WebResourceRequest> mInterceptedRequests = new ArrayList<>();
+ @Nullable
@Override
public WebResourceResponse shouldInterceptRequest(@NonNull WebResourceRequest request) {
// Records intercepted requests and only return content for SW_URL.
diff --git a/webkit/webkit/src/androidTest/java/androidx/webkit/ServiceWorkerWebSettingsCompatTest.java b/webkit/webkit/src/androidTest/java/androidx/webkit/ServiceWorkerWebSettingsCompatTest.java
index 3f6e0f4..2642c09 100644
--- a/webkit/webkit/src/androidTest/java/androidx/webkit/ServiceWorkerWebSettingsCompatTest.java
+++ b/webkit/webkit/src/androidTest/java/androidx/webkit/ServiceWorkerWebSettingsCompatTest.java
@@ -18,10 +18,13 @@
import static androidx.webkit.WebViewFeature.isFeatureSupported;
+import android.os.Build;
+import android.os.SystemClock;
import android.webkit.WebSettings;
import androidx.test.ext.junit.runners.AndroidJUnit4;
import androidx.test.filters.LargeTest;
+import androidx.test.filters.SdkSuppress;
import org.junit.After;
import org.junit.Assert;
@@ -39,34 +42,54 @@
@LargeTest
@RunWith(AndroidJUnit4.class)
+@SdkSuppress(minSdkVersion = Build.VERSION_CODES.LOLLIPOP)
public class ServiceWorkerWebSettingsCompatTest {
+
+ private static final long POLL_TIMEOUT_DURATION_MS = 5000;
+ private static final long POLL_INTERVAL_MS = 10;
+
private ServiceWorkerWebSettingsCompat mSettings;
private static final String INDEX_HTML_PATH = "/";
// Website which installs a service worker and sends an empty message to it once it's ready.
+ // Once the serviceworker responds to the message, the website then unregisters any installed
+ // serviceworkers again to clean up.
private static final String INDEX_HTML_DOCUMENT = "<!DOCTYPE html>\n"
+ "<link rel=\"icon\" href=\"data:;base64,=\">\n"
+ "<script>\n"
- + " function swReady(sw) {\n"
- + " sw.postMessage({});\n"
- + " }\n"
- + " navigator.serviceWorker.register('sw.js')\n"
- + " .then(sw_reg => {\n"
- + " let sw = sw_reg.installing || sw_reg.waiting || sw_reg.active;\n"
- + " if (sw.state == 'activated') {\n"
- + " swReady(sw);\n"
- + " } else {\n"
- + " sw.addEventListener('statechange', e => {\n"
- + " if(e.target.state == 'activated') swReady(e.target); \n"
- + " });\n"
- + " }\n"
- + " });\n"
- + "</script>\n";
+ + "window.done=false;\n"
+ + "function swReady(sw) {\n"
+ + " sw.postMessage({});\n"
+ + "}\n"
+ + "navigator.serviceWorker.register('sw.js')\n"
+ + " .then(sw_reg => {\n"
+ + " let sw = sw_reg.installing || sw_reg.waiting || sw_reg.active;\n"
+ + " if (sw.state == 'activated') {\n"
+ + " swReady(sw);\n"
+ + " } else {\n"
+ + " sw.addEventListener('statechange', e => {\n"
+ + " if(e.target.state == 'activated') swReady(e.target); \n"
+ + " });\n"
+ + " }\n"
+ + " });\n"
+ + "navigator.serviceWorker.addEventListener('message', _ => {\n"
+ + " navigator.serviceWorker.getRegistrations()\n"
+ + " .then(registrations => {\n"
+ + " registrations.forEach(reg => reg.unregister());\n"
+ + " window.done=true;\n"
+ + " }\n"
+ + " );\n"
+ + "});\n"
+ + "</script>";
private static final String SERVICE_WORKER_PATH = "/sw.js";
- // ServiceWorker which registers a message event listener that fetches a file.
+ // ServiceWorker which registers a message event listener that fetches a file and then sends
+ // an empty response back to the requester.
private static final String SERVICE_WORKER_JAVASCRIPT =
- "self.addEventListener('message', async event => await fetch('content.txt') );\n";
+ "self.addEventListener('message', async event => {\n"
+ + " await fetch('content.txt');\n"
+ + " event.source.postMessage({});\n"
+ + "});\n";
private static final String TEXT_CONTENT_PATH = "/content.txt";
private static final String TEXT_CONTENT = "fetch_ok";
@@ -268,6 +291,7 @@
Assert.assertNotNull("Test timed out while waiting for expected request", request);
Assert.assertNull("No X-Requested-With header is expected",
request.getHeader("X-Requested-With"));
+ webViewOnUiThread.setCleanupTask(() -> waitForServiceWorkerDone(webViewOnUiThread));
}
}
@@ -295,6 +319,28 @@
} while (request != null && !TEXT_CONTENT_PATH.equals(request.getPath()));
Assert.assertNotNull("Test timed out while waiting for expected request", request);
Assert.assertEquals("androidx.webkit.test", request.getHeader("X-Requested-With"));
+ webViewOnUiThread.setCleanupTask(() -> waitForServiceWorkerDone(webViewOnUiThread));
}
}
+
+ /**
+ * Wait for the done boolean to be set, to indicate that serviceworkers have been unregistered.
+ * This is crucial to clean up any remaining renderer processes that otherwise cause problems
+ * for other tests.
+ * See b/230078824.
+ */
+ private void waitForServiceWorkerDone(final WebViewOnUiThread webViewOnUiThread) {
+ long timeout = SystemClock.uptimeMillis() + POLL_TIMEOUT_DURATION_MS;
+ while (SystemClock.uptimeMillis() < timeout
+ && !"true".equals(webViewOnUiThread.evaluateJavascriptSync("window.done"))) {
+ try {
+ //noinspection BusyWait We want to wait, to let the WebView finish the test
+ Thread.sleep(POLL_INTERVAL_MS);
+ } catch (InterruptedException e) {
+ // If we haven't reached our timeout yet, keep waiting
+ }
+ }
+ Assert.assertEquals("true", webViewOnUiThread.evaluateJavascriptSync("window.done"));
+ }
}
+
diff --git a/webkit/webkit/src/androidTest/java/androidx/webkit/TargetSdkActivityTestRule.java b/webkit/webkit/src/androidTest/java/androidx/webkit/TargetSdkActivityTestRule.java
index 1b70b672..2059802 100644
--- a/webkit/webkit/src/androidTest/java/androidx/webkit/TargetSdkActivityTestRule.java
+++ b/webkit/webkit/src/androidTest/java/androidx/webkit/TargetSdkActivityTestRule.java
@@ -23,6 +23,7 @@
import android.content.Context;
import android.content.pm.ApplicationInfo;
+import androidx.annotation.NonNull;
import androidx.test.platform.app.InstrumentationRegistry;
/**
@@ -34,7 +35,7 @@
private int mTargetSdk;
private Context mAppContext;
- public TargetSdkActivityTestRule(Class<T> activityClass, int targetSdk) {
+ public TargetSdkActivityTestRule(@NonNull Class<T> activityClass, int targetSdk) {
super(activityClass);
mTargetSdk = targetSdk;
}
diff --git a/webkit/webkit/src/androidTest/java/androidx/webkit/TracingControllerTest.java b/webkit/webkit/src/androidTest/java/androidx/webkit/TracingControllerTest.java
index cc84a35..6f15592 100644
--- a/webkit/webkit/src/androidTest/java/androidx/webkit/TracingControllerTest.java
+++ b/webkit/webkit/src/androidTest/java/androidx/webkit/TracingControllerTest.java
@@ -19,8 +19,11 @@
import static org.hamcrest.MatcherAssert.assertThat;
import static org.hamcrest.Matchers.greaterThan;
+import android.os.Build;
+
import androidx.test.ext.junit.runners.AndroidJUnit4;
import androidx.test.filters.LargeTest;
+import androidx.test.filters.SdkSuppress;
import org.junit.After;
import org.junit.Assert;
@@ -43,6 +46,7 @@
@LargeTest
@RunWith(AndroidJUnit4.class)
+@SdkSuppress(minSdkVersion = Build.VERSION_CODES.LOLLIPOP)
public class TracingControllerTest {
private TracingController mTracingController;
private WebViewOnUiThread mWebViewOnUiThread;
diff --git a/webkit/webkit/src/androidTest/java/androidx/webkit/WebSettingsCompatDarkModeTestBase.java b/webkit/webkit/src/androidTest/java/androidx/webkit/WebSettingsCompatDarkModeTestBase.java
index 920fe70..568cf60 100644
--- a/webkit/webkit/src/androidTest/java/androidx/webkit/WebSettingsCompatDarkModeTestBase.java
+++ b/webkit/webkit/src/androidTest/java/androidx/webkit/WebSettingsCompatDarkModeTestBase.java
@@ -21,12 +21,14 @@
import android.app.Activity;
import android.graphics.Bitmap;
import android.graphics.Color;
+import android.os.Build;
import android.util.Base64;
import android.view.ViewGroup;
import android.webkit.WebSettings;
import android.webkit.WebView;
import androidx.annotation.NonNull;
+import androidx.annotation.RequiresApi;
import org.hamcrest.Description;
import org.hamcrest.Matcher;
@@ -41,6 +43,7 @@
/**
* Base class for dark mode related test.
*/
+@RequiresApi(Build.VERSION_CODES.KITKAT)
public class WebSettingsCompatDarkModeTestBase<T extends Activity> {
public final String mDarkThemeSupport = Base64.encodeToString((
"<html>"
@@ -65,7 +68,7 @@
@Rule
public final TargetSdkActivityTestRule<T> mActivityRule;
- public WebSettingsCompatDarkModeTestBase(Class<T> activityClass, int targetSdk) {
+ public WebSettingsCompatDarkModeTestBase(@NonNull Class<T> activityClass, int targetSdk) {
mActivityRule = new TargetSdkActivityTestRule<T>(activityClass,
targetSdk);
}
@@ -151,6 +154,7 @@
/**
* Returns a matcher to check if a color int is mostly green.
*/
+ @NonNull
public static Matcher<Integer> isGreen() {
return new TypeSafeMatcher<Integer>() {
private int mPageColor;
diff --git a/webkit/webkit/src/androidTest/java/androidx/webkit/WebSettingsCompatDarkThemeTest.java b/webkit/webkit/src/androidTest/java/androidx/webkit/WebSettingsCompatDarkThemeTest.java
index 81c7a37..0dc59a3 100644
--- a/webkit/webkit/src/androidTest/java/androidx/webkit/WebSettingsCompatDarkThemeTest.java
+++ b/webkit/webkit/src/androidTest/java/androidx/webkit/WebSettingsCompatDarkThemeTest.java
@@ -25,6 +25,7 @@
import androidx.core.graphics.ColorUtils;
import androidx.test.ext.junit.runners.AndroidJUnit4;
import androidx.test.filters.MediumTest;
+import androidx.test.filters.SdkSuppress;
import org.junit.Ignore;
import org.junit.Test;
@@ -33,6 +34,7 @@
@MediumTest
@RunWith(AndroidJUnit4.class)
+@SdkSuppress(minSdkVersion = VERSION_CODES.LOLLIPOP)
public class WebSettingsCompatDarkThemeTest extends
WebSettingsCompatDarkModeTestBase<WebViewDarkThemeTestActivity> {
public WebSettingsCompatDarkThemeTest() {
diff --git a/webkit/webkit/src/androidTest/java/androidx/webkit/WebSettingsCompatForceDarkTest.java b/webkit/webkit/src/androidTest/java/androidx/webkit/WebSettingsCompatForceDarkTest.java
index d911b9c..07146b1 100644
--- a/webkit/webkit/src/androidTest/java/androidx/webkit/WebSettingsCompatForceDarkTest.java
+++ b/webkit/webkit/src/androidTest/java/androidx/webkit/WebSettingsCompatForceDarkTest.java
@@ -26,6 +26,7 @@
import androidx.core.graphics.ColorUtils;
import androidx.test.ext.junit.runners.AndroidJUnit4;
import androidx.test.filters.MediumTest;
+import androidx.test.filters.SdkSuppress;
import org.junit.Ignore;
import org.junit.Test;
@@ -34,6 +35,7 @@
@MediumTest
@RunWith(AndroidJUnit4.class)
+@SdkSuppress(minSdkVersion = VERSION_CODES.LOLLIPOP)
public class WebSettingsCompatForceDarkTest extends
WebSettingsCompatDarkModeTestBase<WebViewLightThemeTestActivity> {
public WebSettingsCompatForceDarkTest() {
diff --git a/webkit/webkit/src/androidTest/java/androidx/webkit/WebSettingsCompatLightThemeTest.java b/webkit/webkit/src/androidTest/java/androidx/webkit/WebSettingsCompatLightThemeTest.java
index 14049ab..c9b203c 100644
--- a/webkit/webkit/src/androidTest/java/androidx/webkit/WebSettingsCompatLightThemeTest.java
+++ b/webkit/webkit/src/androidTest/java/androidx/webkit/WebSettingsCompatLightThemeTest.java
@@ -24,6 +24,7 @@
import androidx.core.graphics.ColorUtils;
import androidx.test.ext.junit.runners.AndroidJUnit4;
import androidx.test.filters.MediumTest;
+import androidx.test.filters.SdkSuppress;
import org.junit.Test;
import org.junit.runner.RunWith;
@@ -31,6 +32,7 @@
@MediumTest
@RunWith(AndroidJUnit4.class)
+@SdkSuppress(minSdkVersion = VERSION_CODES.LOLLIPOP)
public class WebSettingsCompatLightThemeTest extends
WebSettingsCompatDarkModeTestBase<WebViewLightThemeTestActivity> {
public WebSettingsCompatLightThemeTest() {
diff --git a/webkit/webkit/src/androidTest/java/androidx/webkit/WebSettingsCompatTest.java b/webkit/webkit/src/androidTest/java/androidx/webkit/WebSettingsCompatTest.java
index b7e49e6..f657cc2 100644
--- a/webkit/webkit/src/androidTest/java/androidx/webkit/WebSettingsCompatTest.java
+++ b/webkit/webkit/src/androidTest/java/androidx/webkit/WebSettingsCompatTest.java
@@ -20,9 +20,11 @@
import static org.junit.Assert.assertFalse;
import static org.junit.Assert.assertTrue;
+import android.os.Build;
import android.webkit.WebSettings;
import androidx.test.ext.junit.runners.AndroidJUnit4;
+import androidx.test.filters.SdkSuppress;
import androidx.test.filters.SmallTest;
import org.junit.After;
@@ -36,6 +38,7 @@
@SmallTest
@RunWith(AndroidJUnit4.class)
+@SdkSuppress(minSdkVersion = Build.VERSION_CODES.LOLLIPOP)
public class WebSettingsCompatTest {
WebViewOnUiThread mWebViewOnUiThread;
diff --git a/webkit/webkit/src/androidTest/java/androidx/webkit/WebViewClientCompatTest.java b/webkit/webkit/src/androidTest/java/androidx/webkit/WebViewClientCompatTest.java
index f161bfc..fb9b636 100644
--- a/webkit/webkit/src/androidTest/java/androidx/webkit/WebViewClientCompatTest.java
+++ b/webkit/webkit/src/androidTest/java/androidx/webkit/WebViewClientCompatTest.java
@@ -18,12 +18,14 @@
import android.graphics.Bitmap;
import android.net.Uri;
+import android.os.Build;
import android.webkit.WebResourceRequest;
import android.webkit.WebResourceResponse;
import android.webkit.WebView;
import android.webkit.WebViewClient;
import androidx.annotation.NonNull;
+import androidx.annotation.RequiresApi;
import androidx.concurrent.futures.ResolvableFuture;
import androidx.test.ext.junit.runners.AndroidJUnit4;
import androidx.test.filters.LargeTest;
@@ -49,6 +51,8 @@
@LargeTest
@RunWith(AndroidJUnit4.class)
+@SdkSuppress(minSdkVersion = Build.VERSION_CODES.LOLLIPOP)
+@RequiresApi(Build.VERSION_CODES.LOLLIPOP)
public class WebViewClientCompatTest {
private WebViewOnUiThread mWebViewOnUiThread;
private MockWebServer mWebServer;
@@ -87,7 +91,6 @@
* this test should be reflected in that test as necessary. See http://go/modifying-webview-cts.
*/
@Test
- @SdkSuppress(minSdkVersion = 21) // to instantiate WebResourceRequest
public void testShouldOverrideUrlLoadingDefault() {
// This never calls into chromium, so we don't need to do any feature checks.
@@ -253,7 +256,8 @@
Assert.assertEquals("/non_existent_page", request.getPath());
Assert.assertNotNull(webViewClient.getOnReceivedHttpError());
- Assert.assertEquals(404, webViewClient.getOnReceivedHttpError().getStatusCode());
+ Assert.assertEquals(404,
+ webViewClient.getOnReceivedHttpError().getStatusCode());
}
/**
@@ -403,7 +407,8 @@
Assert.assertEquals(TEST_SAFE_BROWSING_MALWARE_URL,
client.getOnSafeBrowsingHitRequest().getUrl().toString());
- Assert.assertTrue(client.getOnSafeBrowsingHitRequest().isForMainFrame());
+ Assert.assertTrue(
+ client.getOnSafeBrowsingHitRequest().isForMainFrame());
}
/**
diff --git a/webkit/webkit/src/androidTest/java/androidx/webkit/WebViewCompatTest.java b/webkit/webkit/src/androidTest/java/androidx/webkit/WebViewCompatTest.java
index 6a74605..e23d850 100644
--- a/webkit/webkit/src/androidTest/java/androidx/webkit/WebViewCompatTest.java
+++ b/webkit/webkit/src/androidTest/java/androidx/webkit/WebViewCompatTest.java
@@ -39,6 +39,7 @@
import androidx.test.core.app.ApplicationProvider;
import androidx.test.ext.junit.runners.AndroidJUnit4;
import androidx.test.filters.MediumTest;
+import androidx.test.filters.SdkSuppress;
import org.junit.After;
import org.junit.Assert;
@@ -53,6 +54,7 @@
@MediumTest
@RunWith(AndroidJUnit4.class)
+@SdkSuppress(minSdkVersion = Build.VERSION_CODES.LOLLIPOP)
public class WebViewCompatTest {
WebViewOnUiThread mWebViewOnUiThread;
@@ -160,7 +162,8 @@
final ResolvableFuture<Boolean> startSafeBrowsingFuture = ResolvableFuture.create();
WebViewCompat.startSafeBrowsing(
ApplicationProvider.getApplicationContext().getApplicationContext(),
- value -> startSafeBrowsingFuture.set(Looper.getMainLooper().isCurrentThread()));
+ value -> startSafeBrowsingFuture.set(
+ WebkitUtils.isCurrentThread(Looper.getMainLooper())));
assertTrue(WebkitUtils.waitForFuture(startSafeBrowsingFuture));
}
diff --git a/webkit/webkit/src/androidTest/java/androidx/webkit/WebViewDocumentStartJavaScriptTest.java b/webkit/webkit/src/androidTest/java/androidx/webkit/WebViewDocumentStartJavaScriptTest.java
index 96a0e84..b8ae25db 100644
--- a/webkit/webkit/src/androidTest/java/androidx/webkit/WebViewDocumentStartJavaScriptTest.java
+++ b/webkit/webkit/src/androidTest/java/androidx/webkit/WebViewDocumentStartJavaScriptTest.java
@@ -17,10 +17,13 @@
package androidx.webkit;
import android.net.Uri;
+import android.os.Build;
import android.webkit.WebView;
+import androidx.annotation.NonNull;
import androidx.test.ext.junit.runners.AndroidJUnit4;
import androidx.test.filters.MediumTest;
+import androidx.test.filters.SdkSuppress;
import org.junit.After;
import org.junit.Assert;
@@ -35,12 +38,14 @@
import java.util.concurrent.LinkedBlockingQueue;
/**
- * Test {@link WebViewCompat#addDocumentStartJavaScript()}
+ * Test
+ * {@link WebViewCompat#addDocumentStartJavaScript}
*
* Test in Chromium JsJavaInteractionTest.java for these APIs are more comprehensive.
*/
@MediumTest
@RunWith(AndroidJUnit4.class)
+@SdkSuppress(minSdkVersion = Build.VERSION_CODES.LOLLIPOP)
public class WebViewDocumentStartJavaScriptTest {
private static final String BASE_URI = "http://www.example.com";
private static final String JS_OBJECT_NAME = "myObject";
@@ -54,11 +59,11 @@
private static class TestWebMessageListener implements WebViewCompat.WebMessageListener {
private BlockingQueue<Data> mQueue = new LinkedBlockingQueue<>();
- public static class Data {
- public WebMessageCompat mMessage;
- public Uri mSourceOrigin;
- public boolean mIsMainFrame;
- public JavaScriptReplyProxy mReplyProxy;
+ static class Data {
+ WebMessageCompat mMessage;
+ Uri mSourceOrigin;
+ boolean mIsMainFrame;
+ JavaScriptReplyProxy mReplyProxy;
Data(WebMessageCompat message, Uri sourceOrigin, boolean isMainFrame,
JavaScriptReplyProxy replyProxy) {
@@ -70,8 +75,9 @@
}
@Override
- public void onPostMessage(WebView webView, WebMessageCompat message, Uri sourceOrigin,
- boolean isMainFrame, JavaScriptReplyProxy replyProxy) {
+ public void onPostMessage(@NonNull WebView webView, @NonNull WebMessageCompat message,
+ @NonNull Uri sourceOrigin,
+ boolean isMainFrame, @NonNull JavaScriptReplyProxy replyProxy) {
mQueue.add(new Data(message, sourceOrigin, isMainFrame, replyProxy));
}
diff --git a/webkit/webkit/src/androidTest/java/androidx/webkit/WebViewOnUiThread.java b/webkit/webkit/src/androidTest/java/androidx/webkit/WebViewOnUiThread.java
index 566ffe0..f28c63c 100644
--- a/webkit/webkit/src/androidTest/java/androidx/webkit/WebViewOnUiThread.java
+++ b/webkit/webkit/src/androidTest/java/androidx/webkit/WebViewOnUiThread.java
@@ -16,6 +16,7 @@
package androidx.webkit;
+import static org.junit.Assert.assertFalse;
import static org.junit.Assert.assertTrue;
import static org.junit.Assert.fail;
@@ -23,6 +24,7 @@
import android.graphics.Bitmap;
import android.graphics.Canvas;
import android.net.Uri;
+import android.os.Build;
import android.os.Looper;
import android.os.SystemClock;
import android.webkit.ValueCallback;
@@ -34,6 +36,7 @@
import androidx.annotation.CallSuper;
import androidx.annotation.NonNull;
import androidx.annotation.Nullable;
+import androidx.annotation.RequiresApi;
import androidx.concurrent.futures.ResolvableFuture;
import androidx.test.core.app.ApplicationProvider;
@@ -50,6 +53,7 @@
* Modifications to this class should be reflected in that class as necessary. See
* http://go/modifying-webview-cts.
*/
+@RequiresApi(api = Build.VERSION_CODES.KITKAT)
public class WebViewOnUiThread implements AutoCloseable{
/**
* The maximum time, in milliseconds (10 seconds) to wait for a load
@@ -79,6 +83,11 @@
private boolean mOwnsWebView;
/**
+ * Optional extra steps to execute during cleanup.
+ */
+ private Runnable mCleanupTask;
+
+ /**
* Create a new WebViewOnUiThread that owns its own WebView instance.
*/
public WebViewOnUiThread() {
@@ -90,7 +99,7 @@
*
* The caller is responsible for destroying the WebView instance.
*/
- public WebViewOnUiThread(final WebView webView) {
+ public WebViewOnUiThread(final @NonNull WebView webView) {
this(webView, false);
}
@@ -112,6 +121,7 @@
volatile WebView mView;
}
+ @NonNull
public static WebView createWebView() {
final Holder h = new Holder();
final Context ctx = ApplicationProvider.getApplicationContext();
@@ -130,6 +140,9 @@
* the view hierarchy, if needed.
*/
public void cleanUp() {
+ if (mCleanupTask != null) {
+ mCleanupTask.run();
+ }
WebkitUtils.onMainThreadSync(() -> {
mWebView.clearHistory();
mWebView.clearCache(true);
@@ -142,6 +155,15 @@
}
/**
+ * set a task that will be executed before any other cleanup code.
+ *
+ * The task will be executed on the same thread that executes the cleanup.
+ */
+ public void setCleanupTask(@Nullable Runnable cleanupTask) {
+ mCleanupTask = cleanupTask;
+ }
+
+ /**
* Called from WaitForLoadedClient.
*/
@SuppressWarnings("EmptyMethod")
@@ -166,89 +188,97 @@
this.notifyAll();
}
- public static void destroy(final WebView webView) {
+ public static void destroy(final @NonNull WebView webView) {
WebkitUtils.onMainThreadSync(webView::destroy);
}
- public void setWebViewClient(final WebViewClient webviewClient) {
+ public void setWebViewClient(final @NonNull WebViewClient webviewClient) {
setWebViewClient(mWebView, webviewClient);
}
public static void setWebViewClient(
- final WebView webView, final WebViewClient webviewClient) {
+ final @NonNull WebView webView, final @NonNull WebViewClient webviewClient) {
WebkitUtils.onMainThreadSync(() -> webView.setWebViewClient(webviewClient));
}
- public void setWebChromeClient(final WebChromeClient webChromeClient) {
+ public void setWebChromeClient(final @Nullable WebChromeClient webChromeClient) {
setWebChromeClient(mWebView, webChromeClient);
}
public static void setWebChromeClient(
- final WebView webView, final WebChromeClient webChromeClient) {
+ final @NonNull WebView webView, final @Nullable WebChromeClient webChromeClient) {
WebkitUtils.onMainThreadSync(() -> webView.setWebChromeClient(webChromeClient));
}
public void setWebViewRenderProcessClient(
- final WebViewRenderProcessClient webViewRenderProcessClient) {
+ final @NonNull WebViewRenderProcessClient webViewRenderProcessClient) {
setWebViewRenderProcessClient(mWebView, webViewRenderProcessClient);
}
public static void setWebViewRenderProcessClient(
- final WebView webView, final WebViewRenderProcessClient webViewRenderProcessClient) {
+ final @NonNull WebView webView,
+ final @NonNull WebViewRenderProcessClient webViewRenderProcessClient) {
WebkitUtils.onMainThreadSync(() -> WebViewCompat.setWebViewRenderProcessClient(
webView, webViewRenderProcessClient));
}
public void setWebViewRenderProcessClient(
- final Executor executor, final WebViewRenderProcessClient webViewRenderProcessClient) {
+ final @NonNull Executor executor,
+ final @NonNull WebViewRenderProcessClient webViewRenderProcessClient) {
setWebViewRenderProcessClient(mWebView, executor, webViewRenderProcessClient);
}
public static void setWebViewRenderProcessClient(
- final WebView webView,
- final Executor executor,
- final WebViewRenderProcessClient webViewRenderProcessClient) {
+ final @NonNull WebView webView,
+ final @NonNull Executor executor,
+ final @NonNull WebViewRenderProcessClient webViewRenderProcessClient) {
WebkitUtils.onMainThreadSync(() -> WebViewCompat.setWebViewRenderProcessClient(
webView, executor, webViewRenderProcessClient));
}
+ @Nullable
public WebViewRenderProcessClient getWebViewRenderProcessClient() {
return getWebViewRenderProcessClient(mWebView);
}
+ @Nullable
public static WebViewRenderProcessClient getWebViewRenderProcessClient(
- final WebView webView) {
+ final @NonNull WebView webView) {
return WebkitUtils.onMainThreadSync(
() -> WebViewCompat.getWebViewRenderProcessClient(webView));
}
+ @NonNull
public WebMessagePortCompat[] createWebMessageChannelCompat() {
return WebkitUtils.onMainThreadSync(() -> WebViewCompat.createWebMessageChannel(mWebView));
}
- public void postWebMessageCompat(final WebMessageCompat message, final Uri targetOrigin) {
+ public void postWebMessageCompat(final @NonNull WebMessageCompat message,
+ final @NonNull Uri targetOrigin) {
WebkitUtils.onMainThreadSync(
() -> WebViewCompat.postWebMessage(mWebView, message, targetOrigin));
}
- public void addWebMessageListener(String jsObjectName, Set<String> allowedOriginRules,
- final WebViewCompat.WebMessageListener listener) {
+ public void addWebMessageListener(@NonNull String jsObjectName,
+ @NonNull Set<String> allowedOriginRules,
+ final @NonNull WebViewCompat.WebMessageListener listener) {
WebkitUtils.onMainThreadSync(() -> WebViewCompat.addWebMessageListener(
mWebView, jsObjectName, allowedOriginRules, listener));
}
- public void removeWebMessageListener(final String jsObjectName) {
+ public void removeWebMessageListener(final @NonNull String jsObjectName) {
WebkitUtils.onMainThreadSync(
() -> WebViewCompat.removeWebMessageListener(mWebView, jsObjectName));
}
+ @NonNull
public ScriptHandler addDocumentStartJavaScript(
- String script, Set<String> allowedOriginRules) {
+ @NonNull String script, @NonNull Set<String> allowedOriginRules) {
return WebkitUtils.onMainThreadSync(() -> WebViewCompat.addDocumentStartJavaScript(
mWebView, script, allowedOriginRules));
}
- public void addJavascriptInterface(final Object object, final String name) {
+ public void addJavascriptInterface(final @NonNull Object object, final @NonNull String name) {
WebkitUtils.onMainThreadSync(() -> mWebView.addJavascriptInterface(object, name));
}
@@ -262,7 +292,7 @@
callAndWait(() -> mWebView.loadUrl(url));
}
- public void loadUrl(final String url) {
+ public void loadUrl(final @NonNull String url) {
WebkitUtils.onMainThreadSync(() -> mWebView.loadUrl(url));
}
@@ -279,9 +309,10 @@
callAndWait(() -> mWebView.loadData(data, mimeType, encoding));
}
- public void loadDataWithBaseURLAndWaitForCompletion(final String baseUrl,
- final String data, final String mimeType, final String encoding,
- final String historyUrl) {
+ public void loadDataWithBaseURLAndWaitForCompletion(final @Nullable String baseUrl,
+ final @NonNull String data, final @Nullable String mimeType,
+ final @Nullable String encoding,
+ final @Nullable String historyUrl) {
callAndWait(() -> mWebView.loadDataWithBaseURL(
baseUrl, data, mimeType, encoding, historyUrl));
}
@@ -304,20 +335,23 @@
}
}
+ @Nullable
public String getTitle() {
return WebkitUtils.onMainThreadSync(() -> mWebView.getTitle());
}
+ @NonNull
public WebSettings getSettings() {
return WebkitUtils.onMainThreadSync(() -> mWebView.getSettings());
}
+ @Nullable
public String getUrl() {
return WebkitUtils.onMainThreadSync(() -> mWebView.getUrl());
}
public void postVisualStateCallbackCompat(final long requestId,
- final WebViewCompat.VisualStateCallback callback) {
+ final @NonNull WebViewCompat.VisualStateCallback callback) {
WebkitUtils.onMainThreadSync(() -> WebViewCompat.postVisualStateCallback(
mWebView, requestId, callback));
}
@@ -325,29 +359,35 @@
/**
* Execute javascript synchronously, returning the result.
*/
- public String evaluateJavascriptSync(final String script) {
+ @Nullable
+ public String evaluateJavascriptSync(final @NonNull String script) {
final ResolvableFuture<String> future = ResolvableFuture.create();
evaluateJavascript(script, future::set);
return WebkitUtils.waitForFuture(future);
}
- public void evaluateJavascript(final String script, final ValueCallback<String> result) {
+ public void evaluateJavascript(final @NonNull String script,
+ final @Nullable ValueCallback<String> result) {
WebkitUtils.onMainThread(() -> mWebView.evaluateJavascript(script, result));
}
+ @NonNull
public WebViewClient getWebViewClient() {
return getWebViewClient(mWebView);
}
- public static WebViewClient getWebViewClient(final WebView webView) {
+ @NonNull
+ public static WebViewClient getWebViewClient(final @NonNull WebView webView) {
return WebkitUtils.onMainThreadSync(() -> WebViewCompat.getWebViewClient(webView));
}
+ @Nullable
public WebChromeClient getWebChromeClient() {
return getWebChromeClient(mWebView);
}
- public static WebChromeClient getWebChromeClient(final WebView webView) {
+ @Nullable
+ public static WebChromeClient getWebChromeClient(final @NonNull WebView webView) {
return WebkitUtils.onMainThreadSync(() -> WebViewCompat.getWebChromeClient(webView));
}
@@ -382,6 +422,7 @@
* This synchronises so that the bitmap contents reflects the current DOM state, rather than
* potentially capturing a previously generated frame.
*/
+ @NonNull
public Bitmap captureBitmap() {
WebSettingsCompat.setOffscreenPreRaster(getSettings(), true);
waitForDOMReadyToRender();
@@ -415,10 +456,9 @@
* @param call The call to make on the UI thread prior to waiting.
*/
private void callAndWait(Runnable call) {
- assertTrue("WebViewOnUiThread.load*AndWaitForCompletion calls "
- + "may not be mixed with load* calls directly on WebView "
- + "without calling waitForLoadCompletion after the load",
- !isLoaded());
+ assertFalse("WebViewOnUiThread.load*AndWaitForCompletion calls "
+ + "may not be mixed with load* calls directly on WebView "
+ + "without calling waitForLoadCompletion after the load", isLoaded());
clearLoad(); // clear any extraneous signals from a previous load.
if (Looper.myLooper() == Looper.getMainLooper()) {
call.run();
@@ -502,7 +542,7 @@
* directly.
*/
public static class WaitForProgressClient extends WebChromeClient {
- private WebViewOnUiThread mOnUiThread;
+ private final WebViewOnUiThread mOnUiThread;
WaitForProgressClient(WebViewOnUiThread onUiThread) {
mOnUiThread = onUiThread;
@@ -524,7 +564,7 @@
* WaitForLoadedClient or call WebViewOnUiThread.onPageFinished.
*/
public static class WaitForLoadedClient extends WebViewClientCompat {
- private WebViewOnUiThread mOnUiThread;
+ private final WebViewOnUiThread mOnUiThread;
WaitForLoadedClient(WebViewOnUiThread onUiThread) {
mOnUiThread = onUiThread;
@@ -544,4 +584,5 @@
mOnUiThread.onPageStarted();
}
}
+
}
diff --git a/webkit/webkit/src/androidTest/java/androidx/webkit/WebViewRenderProcessClientTest.java b/webkit/webkit/src/androidTest/java/androidx/webkit/WebViewRenderProcessClientTest.java
index c31bb07..8289f40 100644
--- a/webkit/webkit/src/androidTest/java/androidx/webkit/WebViewRenderProcessClientTest.java
+++ b/webkit/webkit/src/androidTest/java/androidx/webkit/WebViewRenderProcessClientTest.java
@@ -16,14 +16,18 @@
package androidx.webkit;
+import android.os.Build;
import android.view.KeyEvent;
import android.webkit.JavascriptInterface;
import android.webkit.WebView;
+import androidx.annotation.NonNull;
import androidx.annotation.Nullable;
+import androidx.annotation.RequiresApi;
import androidx.concurrent.futures.ResolvableFuture;
import androidx.test.ext.junit.runners.AndroidJUnit4;
import androidx.test.filters.LargeTest;
+import androidx.test.filters.SdkSuppress;
import org.junit.After;
import org.junit.Assert;
@@ -38,6 +42,8 @@
@LargeTest
@RunWith(AndroidJUnit4.class)
+@SdkSuppress(minSdkVersion = Build.VERSION_CODES.LOLLIPOP)
+@RequiresApi(Build.VERSION_CODES.LOLLIPOP)
public class WebViewRenderProcessClientTest {
WebViewOnUiThread mWebViewOnUiThread;
@@ -91,14 +97,16 @@
@Nullable Runnable onUnresponsive) {
return new WebViewRenderProcessClient() {
@Override
- public void onRenderProcessUnresponsive(WebView view, WebViewRenderProcess renderer) {
+ public void onRenderProcessUnresponsive(@NonNull WebView view,
+ WebViewRenderProcess renderer) {
if (onResponsive != null) {
onResponsive.run();
}
}
@Override
- public void onRenderProcessResponsive(WebView view, WebViewRenderProcess renderer) {
+ public void onRenderProcessResponsive(@NonNull WebView view,
+ WebViewRenderProcess renderer) {
if (onUnresponsive != null) {
onUnresponsive.run();
}
diff --git a/webkit/webkit/src/androidTest/java/androidx/webkit/WebViewRenderProcessTest.java b/webkit/webkit/src/androidTest/java/androidx/webkit/WebViewRenderProcessTest.java
index c9ead51..a935e52 100644
--- a/webkit/webkit/src/androidTest/java/androidx/webkit/WebViewRenderProcessTest.java
+++ b/webkit/webkit/src/androidTest/java/androidx/webkit/WebViewRenderProcessTest.java
@@ -31,12 +31,14 @@
import com.google.common.util.concurrent.ListenableFuture;
import org.junit.Assert;
+import org.junit.Assume;
import org.junit.Before;
import org.junit.Test;
import org.junit.runner.RunWith;
@MediumTest
@RunWith(AndroidJUnit4.class)
+@SdkSuppress(minSdkVersion = Build.VERSION_CODES.LOLLIPOP)
public class WebViewRenderProcessTest {
private boolean terminateRenderProcessOnUiThread(
final WebViewRenderProcess renderer) {
@@ -115,10 +117,9 @@
@RequiresApi(Build.VERSION_CODES.O)
@SdkSuppress(minSdkVersion = Build.VERSION_CODES.O)
public void testGetWebViewRenderProcess() throws Throwable {
- if (WebViewFeature.isFeatureSupported(WebViewFeature.MULTI_PROCESS)
- && !WebViewCompat.isMultiProcessEnabled()) {
- return;
- }
+ Assume.assumeTrue("Test requires multi-process mode",
+ WebViewFeature.isFeatureSupported(WebViewFeature.MULTI_PROCESS)
+ && WebViewCompat.isMultiProcessEnabled());
final WebView webView = WebViewOnUiThread.createWebView();
diff --git a/webkit/webkit/src/androidTest/java/androidx/webkit/WebViewTestActivity.java b/webkit/webkit/src/androidTest/java/androidx/webkit/WebViewTestActivity.java
index 9401537..0cd87a3 100644
--- a/webkit/webkit/src/androidTest/java/androidx/webkit/WebViewTestActivity.java
+++ b/webkit/webkit/src/androidTest/java/androidx/webkit/WebViewTestActivity.java
@@ -21,15 +21,19 @@
import android.view.ViewGroup;
import android.webkit.WebView;
+import androidx.annotation.NonNull;
+import androidx.annotation.Nullable;
+
public class WebViewTestActivity extends Activity {
private WebView mWebView;
+ @NonNull
public WebView getWebView() {
return mWebView;
}
@Override
- protected void onCreate(Bundle savedInstanceState) {
+ protected void onCreate(@Nullable Bundle savedInstanceState) {
super.onCreate(savedInstanceState);
mWebView = new WebView(this);
diff --git a/webkit/webkit/src/androidTest/java/androidx/webkit/WebViewWebMessageListenerTest.java b/webkit/webkit/src/androidTest/java/androidx/webkit/WebViewWebMessageListenerTest.java
index ad67acc..f532071 100644
--- a/webkit/webkit/src/androidTest/java/androidx/webkit/WebViewWebMessageListenerTest.java
+++ b/webkit/webkit/src/androidTest/java/androidx/webkit/WebViewWebMessageListenerTest.java
@@ -17,10 +17,13 @@
package androidx.webkit;
import android.net.Uri;
+import android.os.Build;
import android.webkit.WebView;
+import androidx.annotation.NonNull;
import androidx.test.ext.junit.runners.AndroidJUnit4;
import androidx.test.filters.MediumTest;
+import androidx.test.filters.SdkSuppress;
import org.junit.After;
import org.junit.Assert;
@@ -35,13 +38,14 @@
import java.util.concurrent.LinkedBlockingQueue;
/**
- * Test {@link WebViewCompat#addWebMessageListener()} and {@link
- * WebViewCompat#removeWebMessageListener()} basic usages.
+ * Test {@link WebViewCompat#addWebMessageListener} and {@link
+ * WebViewCompat#removeWebMessageListener} basic usages.
*
* Test in Chromium tree JsJavaInteractionTest.java for these APIs are more comprehensive.
*/
@MediumTest
@RunWith(AndroidJUnit4.class)
+@SdkSuppress(minSdkVersion = Build.VERSION_CODES.LOLLIPOP)
public class WebViewWebMessageListenerTest {
private static final String BASE_URI = "http://www.example.com";
private static final String JS_OBJECT_NAME = "myObject";
@@ -61,16 +65,16 @@
private static final Set<String> MATCH_EXAMPLE_COM = new HashSet<>(Arrays.asList(BASE_URI));
private WebViewOnUiThread mWebViewOnUiThread;
- private TestWebMessageListener mListener = new TestWebMessageListener();
+ private final TestWebMessageListener mListener = new TestWebMessageListener();
private static class TestWebMessageListener implements WebViewCompat.WebMessageListener {
- private BlockingQueue<Data> mQueue = new LinkedBlockingQueue<>();
+ private final BlockingQueue<Data> mQueue = new LinkedBlockingQueue<>();
- public static class Data {
- public WebMessageCompat mMessage;
- public Uri mSourceOrigin;
- public boolean mIsMainFrame;
- public JavaScriptReplyProxy mReplyProxy;
+ static class Data {
+ WebMessageCompat mMessage;
+ Uri mSourceOrigin;
+ boolean mIsMainFrame;
+ JavaScriptReplyProxy mReplyProxy;
Data(WebMessageCompat message, Uri sourceOrigin, boolean isMainFrame,
JavaScriptReplyProxy replyProxy) {
@@ -82,8 +86,9 @@
}
@Override
- public void onPostMessage(WebView webView, WebMessageCompat message, Uri sourceOrigin,
- boolean isMainFrame, JavaScriptReplyProxy replyProxy) {
+ public void onPostMessage(@NonNull WebView webView, @NonNull WebMessageCompat message,
+ @NonNull Uri sourceOrigin,
+ boolean isMainFrame, @NonNull JavaScriptReplyProxy replyProxy) {
mQueue.add(new Data(message, sourceOrigin, isMainFrame, replyProxy));
}
diff --git a/webkit/webkit/src/androidTest/java/androidx/webkit/WebkitUtils.java b/webkit/webkit/src/androidTest/java/androidx/webkit/WebkitUtils.java
index 8d50f61..62bd52e 100644
--- a/webkit/webkit/src/androidTest/java/androidx/webkit/WebkitUtils.java
+++ b/webkit/webkit/src/androidTest/java/androidx/webkit/WebkitUtils.java
@@ -19,6 +19,8 @@
import android.os.Handler;
import android.os.Looper;
+import androidx.annotation.NonNull;
+import androidx.annotation.RequiresApi;
import androidx.concurrent.futures.ResolvableFuture;
import com.google.common.util.concurrent.ListenableFuture;
@@ -64,7 +66,8 @@
* @param callable the {@link Callable} to execute.
* @return a {@link ListenableFuture} representing the result of {@code callable}.
*/
- public static <T> ListenableFuture<T> onMainThread(final Callable<T> callable) {
+ @NonNull
+ public static <T> ListenableFuture<T> onMainThread(final @NonNull Callable<T> callable) {
return onMainThreadDelayed(0, callable);
}
@@ -73,7 +76,7 @@
*
* @param runnable the {@link Runnable} to execute.
*/
- public static void onMainThread(final Runnable runnable) {
+ public static void onMainThread(final @NonNull Runnable runnable) {
onMainThreadDelayed(0, runnable);
}
@@ -84,8 +87,9 @@
* @param callable the {@link Callable} to execute.
* @return a {@link ListenableFuture} representing the result of {@code callable}.
*/
+ @NonNull
public static <T> ListenableFuture<T> onMainThreadDelayed(
- long delayMs, final Callable<T> callable) {
+ long delayMs, final @NonNull Callable<T> callable) {
final ResolvableFuture<T> future = ResolvableFuture.create();
sMainHandler.postDelayed(() -> {
try {
@@ -103,7 +107,7 @@
* @param delayMs the delay in milliseconds
* @param runnable the {@link Runnable} to execute.
*/
- public static void onMainThreadDelayed(long delayMs, final Runnable runnable) {
+ public static void onMainThreadDelayed(long delayMs, final @NonNull Runnable runnable) {
sMainHandler.postDelayed(runnable, delayMs);
}
@@ -118,7 +122,7 @@
* @param callable the {@link Callable} to execute.
* @return the result of the {@link Callable}.
*/
- public static <T> T onMainThreadSync(final Callable<T> callable) {
+ public static <T> T onMainThreadSync(final @NonNull Callable<T> callable) {
if (Looper.myLooper() == Looper.getMainLooper()) {
throw new IllegalStateException("This cannot be called from the UI thread.");
}
@@ -133,9 +137,9 @@
*
* <p class="note"><b>Note:</b> this should not be called from the UI thread.
*
- * @param Runnable the {@link Runnable} to execute.
+ * @param runnable the {@link Runnable} to execute.
*/
- public static void onMainThreadSync(final Runnable runnable) {
+ public static void onMainThreadSync(final @NonNull Runnable runnable) {
if (Looper.myLooper() == Looper.getMainLooper()) {
throw new IllegalStateException("This cannot be called from the UI thread.");
}
@@ -161,9 +165,16 @@
* <p>
* Note that this method is AndroidX-specific, and is not reflected in the CTS class.
*
+ * <p>
+ * This method does not actually require API 21, but it will always fail for API < 21, so the
+ * annotation has been added to make it easier to spot instances where this is being called
+ * in a test. AffectedTests should be annotated with
+ * {@code @SdkSuppress(minSdkVersion = Build.VERSION_CODES.LOLLIPOP)}
+ *
* @param featureName the feature to be checked
*/
- public static void checkFeature(String featureName) {
+ @RequiresApi(21)
+ public static void checkFeature(@NonNull String featureName) {
final String msg = "This device does not have the feature '" + featureName + "'";
final boolean hasFeature = WebViewFeature.isFeatureSupported(featureName);
Assume.assumeTrue(msg, hasFeature);
@@ -178,7 +189,7 @@
* @param future the {@link Future} representing a value of interest.
* @return the value {@code future} represents.
*/
- public static <T> T waitForFuture(Future<T> future) {
+ public static <T> T waitForFuture(@NonNull Future<T> future) {
try {
return future.get(TEST_TIMEOUT_MS, TimeUnit.MILLISECONDS);
} catch (ExecutionException e) {
@@ -210,7 +221,7 @@
/**
* Takes an element out of the {@link BlockingQueue} (or times out).
*/
- public static <T> T waitForNextQueueElement(BlockingQueue<T> queue) {
+ public static <T> T waitForNextQueueElement(@NonNull BlockingQueue<T> queue) {
try {
T value = queue.poll(TEST_TIMEOUT_MS, TimeUnit.MILLISECONDS);
if (value == null) {
@@ -233,14 +244,11 @@
/**
* Write a string to a file, and create the whole parent directories if they don't exist.
*/
- public static void writeToFile(File file, String content)
+ public static void writeToFile(@NonNull File file, @NonNull String content)
throws IOException {
file.getParentFile().mkdirs();
- FileOutputStream fos = new FileOutputStream(file);
- try {
+ try (FileOutputStream fos = new FileOutputStream(file)) {
fos.write(content.getBytes("utf-8"));
- } finally {
- fos.close();
}
}
@@ -249,7 +257,7 @@
* @param currentFile The file or directory to delete. Does not need to exist.
* @return Whether currentFile does not exist afterwards.
*/
- public static boolean recursivelyDeleteFile(File currentFile) {
+ public static boolean recursivelyDeleteFile(@NonNull File currentFile) {
if (!currentFile.exists()) {
return true;
}
@@ -262,8 +270,20 @@
}
}
- boolean ret = currentFile.delete();
- return ret;
+ return currentFile.delete();
+ }
+
+ /**
+ * Check if the given looper is the current thread.
+ *
+ * <p>
+ * Note that this method is AndroidX-specific, and is not reflected in the CTS class.
+ *
+ * Backwards-compatible implementation of {@link Looper#isCurrentThread()}
+ * @return {@code true} if the current thread is the loopers thread
+ */
+ static boolean isCurrentThread(@NonNull Looper looper) {
+ return Thread.currentThread().equals(looper.getThread());
}
// Do not instantiate this class.
diff --git a/webkit/webkit/src/androidTest/java/androidx/webkit/internal/WebViewFeatureInternalTest.java b/webkit/webkit/src/androidTest/java/androidx/webkit/internal/WebViewFeatureInternalTest.java
index aca72cd..3a1ba43 100644
--- a/webkit/webkit/src/androidTest/java/androidx/webkit/internal/WebViewFeatureInternalTest.java
+++ b/webkit/webkit/src/androidTest/java/androidx/webkit/internal/WebViewFeatureInternalTest.java
@@ -14,7 +14,7 @@
* limitations under the License.
*/
-package androidx.webkit;
+package androidx.webkit.internal;
import static org.junit.Assert.assertFalse;
import static org.junit.Assert.assertTrue;
diff --git a/webkit/webkit/src/main/java/androidx/webkit/WebResourceRequestCompat.java b/webkit/webkit/src/main/java/androidx/webkit/WebResourceRequestCompat.java
index a1f7c0d..e2f97fa 100644
--- a/webkit/webkit/src/main/java/androidx/webkit/WebResourceRequestCompat.java
+++ b/webkit/webkit/src/main/java/androidx/webkit/WebResourceRequestCompat.java
@@ -20,6 +20,8 @@
import androidx.annotation.NonNull;
import androidx.annotation.RequiresFeature;
+import androidx.webkit.internal.ApiFeature;
+import androidx.webkit.internal.ApiHelperForN;
import androidx.webkit.internal.WebResourceRequestAdapter;
import androidx.webkit.internal.WebViewFeatureInternal;
import androidx.webkit.internal.WebViewGlueCommunicator;
@@ -45,9 +47,9 @@
@RequiresFeature(name = WebViewFeature.WEB_RESOURCE_REQUEST_IS_REDIRECT,
enforcement = "androidx.webkit.WebViewFeature#isFeatureSupported")
public static boolean isRedirect(@NonNull WebResourceRequest request) {
- WebViewFeatureInternal feature = WebViewFeatureInternal.WEB_RESOURCE_REQUEST_IS_REDIRECT;
+ ApiFeature.N feature = WebViewFeatureInternal.WEB_RESOURCE_REQUEST_IS_REDIRECT;
if (feature.isSupportedByFramework()) {
- return request.isRedirect();
+ return ApiHelperForN.isRedirect(request);
} else if (feature.isSupportedByWebView()) {
return getAdapter(request).isRedirect();
} else {
diff --git a/webkit/webkit/src/main/java/androidx/webkit/WebSettingsCompat.java b/webkit/webkit/src/main/java/androidx/webkit/WebSettingsCompat.java
index dc78c65..117531a 100644
--- a/webkit/webkit/src/main/java/androidx/webkit/WebSettingsCompat.java
+++ b/webkit/webkit/src/main/java/androidx/webkit/WebSettingsCompat.java
@@ -22,6 +22,11 @@
import androidx.annotation.NonNull;
import androidx.annotation.RequiresFeature;
import androidx.annotation.RestrictTo;
+import androidx.webkit.internal.ApiFeature;
+import androidx.webkit.internal.ApiHelperForM;
+import androidx.webkit.internal.ApiHelperForN;
+import androidx.webkit.internal.ApiHelperForO;
+import androidx.webkit.internal.ApiHelperForQ;
import androidx.webkit.internal.WebSettingsAdapter;
import androidx.webkit.internal.WebViewFeatureInternal;
import androidx.webkit.internal.WebViewGlueCommunicator;
@@ -60,9 +65,9 @@
@RequiresFeature(name = WebViewFeature.OFF_SCREEN_PRERASTER,
enforcement = "androidx.webkit.WebViewFeature#isFeatureSupported")
public static void setOffscreenPreRaster(@NonNull WebSettings settings, boolean enabled) {
- WebViewFeatureInternal feature = WebViewFeatureInternal.OFF_SCREEN_PRERASTER;
+ ApiFeature.M feature = WebViewFeatureInternal.OFF_SCREEN_PRERASTER;
if (feature.isSupportedByFramework()) {
- settings.setOffscreenPreRaster(enabled);
+ ApiHelperForM.setOffscreenPreRaster(settings, enabled);
} else if (feature.isSupportedByWebView()) {
getAdapter(settings).setOffscreenPreRaster(enabled);
} else {
@@ -85,9 +90,9 @@
@RequiresFeature(name = WebViewFeature.OFF_SCREEN_PRERASTER,
enforcement = "androidx.webkit.WebViewFeature#isFeatureSupported")
public static boolean getOffscreenPreRaster(@NonNull WebSettings settings) {
- WebViewFeatureInternal feature = WebViewFeatureInternal.OFF_SCREEN_PRERASTER;
+ ApiFeature.M feature = WebViewFeatureInternal.OFF_SCREEN_PRERASTER;
if (feature.isSupportedByFramework()) {
- return settings.getOffscreenPreRaster();
+ return ApiHelperForM.getOffscreenPreRaster(settings);
} else if (feature.isSupportedByWebView()) {
return getAdapter(settings).getOffscreenPreRaster();
} else {
@@ -117,9 +122,9 @@
@RequiresFeature(name = WebViewFeature.SAFE_BROWSING_ENABLE,
enforcement = "androidx.webkit.WebViewFeature#isFeatureSupported")
public static void setSafeBrowsingEnabled(@NonNull WebSettings settings, boolean enabled) {
- WebViewFeatureInternal feature = WebViewFeatureInternal.SAFE_BROWSING_ENABLE;
+ ApiFeature.O feature = WebViewFeatureInternal.SAFE_BROWSING_ENABLE;
if (feature.isSupportedByFramework()) {
- settings.setSafeBrowsingEnabled(enabled);
+ ApiHelperForO.setSafeBrowsingEnabled(settings, enabled);
} else if (feature.isSupportedByWebView()) {
getAdapter(settings).setSafeBrowsingEnabled(enabled);
} else {
@@ -141,9 +146,9 @@
@RequiresFeature(name = WebViewFeature.SAFE_BROWSING_ENABLE,
enforcement = "androidx.webkit.WebViewFeature#isFeatureSupported")
public static boolean getSafeBrowsingEnabled(@NonNull WebSettings settings) {
- WebViewFeatureInternal feature = WebViewFeatureInternal.SAFE_BROWSING_ENABLE;
+ ApiFeature.O feature = WebViewFeatureInternal.SAFE_BROWSING_ENABLE;
if (feature.isSupportedByFramework()) {
- return settings.getSafeBrowsingEnabled();
+ return ApiHelperForO.getSafeBrowsingEnabled(settings);
} else if (feature.isSupportedByWebView()) {
return getAdapter(settings).getSafeBrowsingEnabled();
} else {
@@ -179,10 +184,9 @@
enforcement = "androidx.webkit.WebViewFeature#isFeatureSupported")
public static void setDisabledActionModeMenuItems(@NonNull WebSettings settings,
@MenuItemFlags int menuItems) {
- WebViewFeatureInternal feature =
- WebViewFeatureInternal.DISABLED_ACTION_MODE_MENU_ITEMS;
+ ApiFeature.N feature = WebViewFeatureInternal.DISABLED_ACTION_MODE_MENU_ITEMS;
if (feature.isSupportedByFramework()) {
- settings.setDisabledActionModeMenuItems(menuItems);
+ ApiHelperForN.setDisabledActionModeMenuItems(settings, menuItems);
} else if (feature.isSupportedByWebView()) {
getAdapter(settings).setDisabledActionModeMenuItems(menuItems);
} else {
@@ -204,10 +208,9 @@
@RequiresFeature(name = WebViewFeature.DISABLED_ACTION_MODE_MENU_ITEMS,
enforcement = "androidx.webkit.WebViewFeature#isFeatureSupported")
public static @MenuItemFlags int getDisabledActionModeMenuItems(@NonNull WebSettings settings) {
- WebViewFeatureInternal feature =
- WebViewFeatureInternal.DISABLED_ACTION_MODE_MENU_ITEMS;
+ ApiFeature.N feature = WebViewFeatureInternal.DISABLED_ACTION_MODE_MENU_ITEMS;
if (feature.isSupportedByFramework()) {
- return settings.getDisabledActionModeMenuItems();
+ return ApiHelperForN.getDisabledActionModeMenuItems(settings);
} else if (feature.isSupportedByWebView()) {
return getAdapter(settings).getDisabledActionModeMenuItems();
} else {
@@ -236,7 +239,7 @@
enforcement = "androidx.webkit.WebViewFeature#isFeatureSupported")
public static void setWillSuppressErrorPage(@NonNull WebSettings settings,
boolean suppressed) {
- WebViewFeatureInternal feature = WebViewFeatureInternal.SUPPRESS_ERROR_PAGE;
+ ApiFeature.NoFramework feature = WebViewFeatureInternal.SUPPRESS_ERROR_PAGE;
if (feature.isSupportedByWebView()) {
getAdapter(settings).setWillSuppressErrorPage(suppressed);
} else {
@@ -263,7 +266,7 @@
@RequiresFeature(name = WebViewFeature.SUPPRESS_ERROR_PAGE,
enforcement = "androidx.webkit.WebViewFeature#isFeatureSupported")
public static boolean willSuppressErrorPage(@NonNull WebSettings settings) {
- WebViewFeatureInternal feature = WebViewFeatureInternal.SUPPRESS_ERROR_PAGE;
+ ApiFeature.NoFramework feature = WebViewFeatureInternal.SUPPRESS_ERROR_PAGE;
if (feature.isSupportedByWebView()) {
return getAdapter(settings).willSuppressErrorPage();
} else {
@@ -353,9 +356,9 @@
enforcement = "androidx.webkit.WebViewFeature#isFeatureSupported")
public static void setForceDark(@NonNull WebSettings settings,
@ForceDark int forceDarkMode) {
- WebViewFeatureInternal feature = WebViewFeatureInternal.FORCE_DARK;
+ ApiFeature.NoFramework feature = WebViewFeatureInternal.FORCE_DARK;
if (feature.isSupportedByFramework()) {
- settings.setForceDark(forceDarkMode);
+ ApiHelperForQ.setForceDark(settings, forceDarkMode);
} else if (feature.isSupportedByWebView()) {
getAdapter(settings).setForceDark(forceDarkMode);
} else {
@@ -382,9 +385,9 @@
@RequiresFeature(name = WebViewFeature.FORCE_DARK,
enforcement = "androidx.webkit.WebViewFeature#isFeatureSupported")
public static @ForceDark int getForceDark(@NonNull WebSettings settings) {
- WebViewFeatureInternal feature = WebViewFeatureInternal.FORCE_DARK;
+ ApiFeature.NoFramework feature = WebViewFeatureInternal.FORCE_DARK;
if (feature.isSupportedByFramework()) {
- return settings.getForceDark();
+ return ApiHelperForQ.getForceDark(settings);
} else if (feature.isSupportedByWebView()) {
return getAdapter(settings).getForceDark();
} else {
@@ -478,7 +481,7 @@
enforcement = "androidx.webkit.WebViewFeature#isFeatureSupported")
public static void setAlgorithmicDarkeningAllowed(@NonNull WebSettings settings,
boolean allow) {
- WebViewFeatureInternal feature = WebViewFeatureInternal.ALGORITHMIC_DARKENING;
+ ApiFeature.NoFramework feature = WebViewFeatureInternal.ALGORITHMIC_DARKENING;
if (feature.isSupportedByWebView()) {
getAdapter(settings).setAlgorithmicDarkeningAllowed(allow);
} else {
@@ -496,7 +499,7 @@
@RequiresFeature(name = WebViewFeature.ALGORITHMIC_DARKENING,
enforcement = "androidx.webkit.WebViewFeature#isFeatureSupported")
public static boolean isAlgorithmicDarkeningAllowed(@NonNull WebSettings settings) {
- WebViewFeatureInternal feature = WebViewFeatureInternal.ALGORITHMIC_DARKENING;
+ ApiFeature.NoFramework feature = WebViewFeatureInternal.ALGORITHMIC_DARKENING;
if (feature.isSupportedByWebView()) {
return getAdapter(settings).isAlgorithmicDarkeningAllowed();
} else {
@@ -586,7 +589,7 @@
@Deprecated
public static void setForceDarkStrategy(@NonNull WebSettings settings,
@ForceDarkStrategy int forceDarkBehavior) {
- WebViewFeatureInternal feature = WebViewFeatureInternal.FORCE_DARK_STRATEGY;
+ ApiFeature.NoFramework feature = WebViewFeatureInternal.FORCE_DARK_STRATEGY;
if (feature.isSupportedByWebView()) {
getAdapter(settings).setForceDarkStrategy(forceDarkBehavior);
} else {
@@ -614,7 +617,7 @@
enforcement = "androidx.webkit.WebViewFeature#isFeatureSupported")
@Deprecated
public static @ForceDarkStrategy int getForceDarkStrategy(@NonNull WebSettings settings) {
- WebViewFeatureInternal feature = WebViewFeatureInternal.FORCE_DARK_STRATEGY;
+ ApiFeature.NoFramework feature = WebViewFeatureInternal.FORCE_DARK_STRATEGY;
if (feature.isSupportedByWebView()) {
return getAdapter(settings).getForceDark();
} else {
@@ -684,7 +687,7 @@
enforcement = "androidx.webkit.WebViewFeature#isFeatureSupported")
public static void setRequestedWithHeaderMode(@NonNull WebSettings settings,
@RequestedWithHeaderMode int requestedWithHeaderMode) {
- WebViewFeatureInternal feature = WebViewFeatureInternal.REQUESTED_WITH_HEADER_CONTROL;
+ ApiFeature.NoFramework feature = WebViewFeatureInternal.REQUESTED_WITH_HEADER_CONTROL;
if (feature.isSupportedByWebView()) {
getAdapter(settings).setRequestedWithHeaderMode(requestedWithHeaderMode);
} else {
@@ -709,7 +712,7 @@
enforcement = "androidx.webkit.WebViewFeature#isFeatureSupported")
@RequestedWithHeaderMode
public static int getRequestedWithHeaderMode(@NonNull WebSettings settings) {
- WebViewFeatureInternal feature = WebViewFeatureInternal.REQUESTED_WITH_HEADER_CONTROL;
+ ApiFeature.NoFramework feature = WebViewFeatureInternal.REQUESTED_WITH_HEADER_CONTROL;
if (feature.isSupportedByWebView()) {
return getAdapter(settings).getRequestedWithHeaderMode();
} else {
diff --git a/webkit/webkit/src/main/java/androidx/webkit/WebViewClientCompat.java b/webkit/webkit/src/main/java/androidx/webkit/WebViewClientCompat.java
index f538531..4091cfc 100644
--- a/webkit/webkit/src/main/java/androidx/webkit/WebViewClientCompat.java
+++ b/webkit/webkit/src/main/java/androidx/webkit/WebViewClientCompat.java
@@ -30,6 +30,7 @@
import androidx.annotation.RequiresApi;
import androidx.annotation.RestrictTo;
import androidx.annotation.UiThread;
+import androidx.webkit.internal.ApiHelperForLollipop;
import androidx.webkit.internal.SafeBrowsingResponseImpl;
import androidx.webkit.internal.WebResourceErrorImpl;
import androidx.webkit.internal.WebViewFeatureInternal;
@@ -175,10 +176,10 @@
// If the WebView APK drops supports for these APIs in the future, simply do nothing.
return;
}
- if (request.isForMainFrame()) {
+ if (ApiHelperForLollipop.isForMainFrame(request)) {
onReceivedError(view,
error.getErrorCode(), error.getDescription().toString(),
- request.getUrl().toString());
+ ApiHelperForLollipop.getUrl(request).toString());
}
}
@@ -295,7 +296,7 @@
public boolean shouldOverrideUrlLoading(@NonNull WebView view,
@NonNull WebResourceRequest request) {
if (Build.VERSION.SDK_INT < 21) return false;
- return shouldOverrideUrlLoading(view, request.getUrl().toString());
+ return shouldOverrideUrlLoading(view, ApiHelperForLollipop.getUrl(request).toString());
}
/**
diff --git a/webkit/webkit/src/main/java/androidx/webkit/WebViewCompat.java b/webkit/webkit/src/main/java/androidx/webkit/WebViewCompat.java
index b06109c..1970130 100644
--- a/webkit/webkit/src/main/java/androidx/webkit/WebViewCompat.java
+++ b/webkit/webkit/src/main/java/androidx/webkit/WebViewCompat.java
@@ -33,6 +33,12 @@
import androidx.annotation.RequiresFeature;
import androidx.annotation.RestrictTo;
import androidx.annotation.UiThread;
+import androidx.webkit.internal.ApiFeature;
+import androidx.webkit.internal.ApiHelperForM;
+import androidx.webkit.internal.ApiHelperForO;
+import androidx.webkit.internal.ApiHelperForOMR1;
+import androidx.webkit.internal.ApiHelperForP;
+import androidx.webkit.internal.ApiHelperForQ;
import androidx.webkit.internal.WebMessagePortImpl;
import androidx.webkit.internal.WebViewFeatureInternal;
import androidx.webkit.internal.WebViewGlueCommunicator;
@@ -161,15 +167,9 @@
enforcement = "androidx.webkit.WebViewFeature#isFeatureSupported")
public static void postVisualStateCallback(@NonNull WebView webview, long requestId,
@NonNull final VisualStateCallback callback) {
- WebViewFeatureInternal feature = WebViewFeatureInternal.VISUAL_STATE_CALLBACK;
+ ApiFeature.M feature = WebViewFeatureInternal.VISUAL_STATE_CALLBACK;
if (feature.isSupportedByFramework()) {
- webview.postVisualStateCallback(requestId,
- new android.webkit.WebView.VisualStateCallback() {
- @Override
- public void onComplete(long l) {
- callback.onComplete(l);
- }
- });
+ ApiHelperForM.postVisualStateCallback(webview, requestId, callback);
} else if (feature.isSupportedByWebView()) {
checkThread(webview);
getProvider(webview).insertVisualStateCallback(requestId, callback);
@@ -205,9 +205,9 @@
enforcement = "androidx.webkit.WebViewFeature#isFeatureSupported")
public static void startSafeBrowsing(@NonNull Context context,
@Nullable ValueCallback<Boolean> callback) {
- WebViewFeatureInternal feature = WebViewFeatureInternal.START_SAFE_BROWSING;
+ ApiFeature.O_MR1 feature = WebViewFeatureInternal.START_SAFE_BROWSING;
if (feature.isSupportedByFramework()) {
- WebView.startSafeBrowsing(context, callback);
+ ApiHelperForOMR1.startSafeBrowsing(context, callback);
} else if (feature.isSupportedByWebView()) {
getFactory().getStatics().initSafeBrowsing(context, callback);
} else {
@@ -247,9 +247,9 @@
enforcement = "androidx.webkit.WebViewFeature#isFeatureSupported")
public static void setSafeBrowsingAllowlist(@NonNull Set<String> hosts,
@Nullable ValueCallback<Boolean> callback) {
- WebViewFeatureInternal preferredFeature =
+ ApiFeature.O_MR1 preferredFeature =
WebViewFeatureInternal.SAFE_BROWSING_ALLOWLIST_PREFERRED_TO_PREFERRED;
- WebViewFeatureInternal deprecatedFeature =
+ ApiFeature.O_MR1 deprecatedFeature =
WebViewFeatureInternal.SAFE_BROWSING_ALLOWLIST_PREFERRED_TO_DEPRECATED;
if (preferredFeature.isSupportedByWebView()) {
getFactory().getStatics().setSafeBrowsingAllowlist(hosts, callback);
@@ -257,7 +257,7 @@
}
List<String> hostsList = new ArrayList<>(hosts);
if (deprecatedFeature.isSupportedByFramework()) {
- WebView.setSafeBrowsingWhitelist(hostsList, callback);
+ ApiHelperForOMR1.setSafeBrowsingWhitelist(hostsList, callback);
} else if (deprecatedFeature.isSupportedByWebView()) {
getFactory().getStatics().setSafeBrowsingWhitelist(hostsList, callback);
} else {
@@ -317,10 +317,10 @@
@RequiresFeature(name = WebViewFeature.SAFE_BROWSING_PRIVACY_POLICY_URL,
enforcement = "androidx.webkit.WebViewFeature#isFeatureSupported")
public static Uri getSafeBrowsingPrivacyPolicyUrl() {
- WebViewFeatureInternal feature =
+ ApiFeature.O_MR1 feature =
WebViewFeatureInternal.SAFE_BROWSING_PRIVACY_POLICY_URL;
if (feature.isSupportedByFramework()) {
- return WebView.getSafeBrowsingPrivacyPolicyUrl();
+ return ApiHelperForOMR1.getSafeBrowsingPrivacyPolicyUrl();
} else if (feature.isSupportedByWebView()) {
return getFactory().getStatics().getSafeBrowsingPrivacyPolicyUrl();
} else {
@@ -350,7 +350,7 @@
}
if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.O) {
- return WebView.getCurrentWebViewPackage();
+ return ApiHelperForO.getCurrentWebViewPackage();
} else { // L-N
try {
PackageInfo loadedWebViewPackageInfo = getLoadedWebViewPackageInfo();
@@ -443,9 +443,9 @@
enforcement = "androidx.webkit.WebViewFeature#isFeatureSupported")
public static @NonNull WebMessagePortCompat[] createWebMessageChannel(
@NonNull WebView webview) {
- final WebViewFeatureInternal feature = WebViewFeatureInternal.CREATE_WEB_MESSAGE_CHANNEL;
+ final ApiFeature.M feature = WebViewFeatureInternal.CREATE_WEB_MESSAGE_CHANNEL;
if (feature.isSupportedByFramework()) {
- return WebMessagePortImpl.portsToCompat(webview.createWebMessageChannel());
+ return WebMessagePortImpl.portsToCompat(ApiHelperForM.createWebMessageChannel(webview));
} else if (feature.isSupportedByWebView()) {
return getProvider(webview).createWebMessageChannel();
} else {
@@ -482,11 +482,10 @@
targetOrigin = EMPTY_URI;
}
- final WebViewFeatureInternal feature = WebViewFeatureInternal.POST_WEB_MESSAGE;
+ final ApiFeature.M feature = WebViewFeatureInternal.POST_WEB_MESSAGE;
if (feature.isSupportedByFramework()) {
- webview.postWebMessage(
- WebMessagePortImpl.compatToFrameworkMessage(message),
- targetOrigin);
+ ApiHelperForM.postWebMessage(webview,
+ WebMessagePortImpl.compatToFrameworkMessage(message), targetOrigin);
} else if (feature.isSupportedByWebView()) {
getProvider(webview).postWebMessage(message, targetOrigin);
} else {
@@ -649,7 +648,7 @@
enforcement = "androidx.webkit.WebViewFeature#isFeatureSupported")
public static void addWebMessageListener(@NonNull WebView webView, @NonNull String jsObjectName,
@NonNull Set<String> allowedOriginRules, @NonNull WebMessageListener listener) {
- final WebViewFeatureInternal feature = WebViewFeatureInternal.WEB_MESSAGE_LISTENER;
+ final ApiFeature.NoFramework feature = WebViewFeatureInternal.WEB_MESSAGE_LISTENER;
if (feature.isSupportedByWebView()) {
getProvider(webView).addWebMessageListener(
jsObjectName, allowedOriginRules.toArray(new String[0]), listener);
@@ -680,7 +679,7 @@
enforcement = "androidx.webkit.WebViewFeature#isFeatureSupported")
public static void removeWebMessageListener(
@NonNull WebView webview, @NonNull String jsObjectName) {
- final WebViewFeatureInternal feature = WebViewFeatureInternal.WEB_MESSAGE_LISTENER;
+ final ApiFeature.NoFramework feature = WebViewFeatureInternal.WEB_MESSAGE_LISTENER;
if (feature.isSupportedByWebView()) {
getProvider(webview).removeWebMessageListener(jsObjectName);
} else {
@@ -732,7 +731,7 @@
@NonNull WebView webview,
@NonNull String script,
@NonNull Set<String> allowedOriginRules) {
- final WebViewFeatureInternal feature = WebViewFeatureInternal.DOCUMENT_START_SCRIPT;
+ final ApiFeature.NoFramework feature = WebViewFeatureInternal.DOCUMENT_START_SCRIPT;
if (feature.isSupportedByWebView()) {
return getProvider(webview)
.addDocumentStartJavaScript(script, allowedOriginRules.toArray(new String[0]));
@@ -754,9 +753,9 @@
@RequiresFeature(name = WebViewFeature.GET_WEB_VIEW_CLIENT,
enforcement = "androidx.webkit.WebViewFeature#isFeatureSupported")
public static @NonNull WebViewClient getWebViewClient(@NonNull WebView webview) {
- final WebViewFeatureInternal feature = WebViewFeatureInternal.GET_WEB_VIEW_CLIENT;
+ final ApiFeature.O feature = WebViewFeatureInternal.GET_WEB_VIEW_CLIENT;
if (feature.isSupportedByFramework()) {
- return webview.getWebViewClient();
+ return ApiHelperForO.getWebViewClient(webview);
} else if (feature.isSupportedByWebView()) {
return getProvider(webview).getWebViewClient();
} else {
@@ -777,9 +776,9 @@
@RequiresFeature(name = WebViewFeature.GET_WEB_CHROME_CLIENT,
enforcement = "androidx.webkit.WebViewFeature#isFeatureSupported")
public static @Nullable WebChromeClient getWebChromeClient(@NonNull WebView webview) {
- final WebViewFeatureInternal feature = WebViewFeatureInternal.GET_WEB_CHROME_CLIENT;
+ final ApiFeature.O feature = WebViewFeatureInternal.GET_WEB_CHROME_CLIENT;
if (feature.isSupportedByFramework()) {
- return webview.getWebChromeClient();
+ return ApiHelperForO.getWebChromeClient(webview);
} else if (feature.isSupportedByWebView()) {
return getProvider(webview).getWebChromeClient();
} else {
@@ -811,9 +810,10 @@
@RequiresFeature(name = WebViewFeature.GET_WEB_VIEW_RENDERER,
enforcement = "androidx.webkit.WebViewFeature#isFeatureSupported")
public static @Nullable WebViewRenderProcess getWebViewRenderProcess(@NonNull WebView webview) {
- final WebViewFeatureInternal feature = WebViewFeatureInternal.GET_WEB_VIEW_RENDERER;
+ final ApiFeature.Q feature = WebViewFeatureInternal.GET_WEB_VIEW_RENDERER;
if (feature.isSupportedByFramework()) {
- android.webkit.WebViewRenderProcess renderer = webview.getWebViewRenderProcess();
+ android.webkit.WebViewRenderProcess renderer = ApiHelperForQ.getWebViewRenderProcess(
+ webview);
return renderer != null ? WebViewRenderProcessImpl.forFrameworkObject(renderer) : null;
} else if (feature.isSupportedByWebView()) {
return getProvider(webview).getWebViewRenderProcess();
@@ -854,19 +854,18 @@
*/
// WebViewRenderProcessClient is a callback class, so it should be last. See
// https://issuetracker.google.com/issues/139770271.
- @SuppressLint({"LambdaLast"})
+ @SuppressLint("LambdaLast")
@RequiresFeature(name = WebViewFeature.WEB_VIEW_RENDERER_CLIENT_BASIC_USAGE,
enforcement = "androidx.webkit.WebViewFeature#isFeatureSupported")
public static void setWebViewRenderProcessClient(
@NonNull WebView webview,
@NonNull /* @CallbackExecutor */ Executor executor,
@NonNull WebViewRenderProcessClient webViewRenderProcessClient) {
- final WebViewFeatureInternal feature =
+ final ApiFeature.Q feature =
WebViewFeatureInternal.WEB_VIEW_RENDERER_CLIENT_BASIC_USAGE;
if (feature.isSupportedByFramework()) {
- webview.setWebViewRenderProcessClient(executor, webViewRenderProcessClient != null
- ? new WebViewRenderProcessClientFrameworkAdapter(webViewRenderProcessClient)
- : null);
+ ApiHelperForQ.setWebViewRenderProcessClient(webview, executor,
+ webViewRenderProcessClient);
} else if (feature.isSupportedByWebView()) {
getProvider(webview).setWebViewRenderProcessClient(
executor, webViewRenderProcessClient);
@@ -899,12 +898,10 @@
public static void setWebViewRenderProcessClient(
@NonNull WebView webview,
@Nullable WebViewRenderProcessClient webViewRenderProcessClient) {
- final WebViewFeatureInternal feature =
+ final ApiFeature.Q feature =
WebViewFeatureInternal.WEB_VIEW_RENDERER_CLIENT_BASIC_USAGE;
if (feature.isSupportedByFramework()) {
- webview.setWebViewRenderProcessClient(webViewRenderProcessClient != null
- ? new WebViewRenderProcessClientFrameworkAdapter(webViewRenderProcessClient)
- : null);
+ ApiHelperForQ.setWebViewRenderProcessClient(webview, webViewRenderProcessClient);
} else if (feature.isSupportedByWebView()) {
getProvider(webview).setWebViewRenderProcessClient(null, webViewRenderProcessClient);
} else {
@@ -928,11 +925,11 @@
enforcement = "androidx.webkit.WebViewFeature#isFeatureSupported")
public static @Nullable WebViewRenderProcessClient getWebViewRenderProcessClient(
@NonNull WebView webview) {
- final WebViewFeatureInternal feature =
+ final ApiFeature.Q feature =
WebViewFeatureInternal.WEB_VIEW_RENDERER_CLIENT_BASIC_USAGE;
if (feature.isSupportedByFramework()) {
android.webkit.WebViewRenderProcessClient renderer =
- webview.getWebViewRenderProcessClient();
+ ApiHelperForQ.getWebViewRenderProcessClient(webview);
if (renderer == null
|| !(renderer instanceof WebViewRenderProcessClientFrameworkAdapter)) {
return null;
@@ -958,7 +955,7 @@
@RequiresFeature(name = WebViewFeature.MULTI_PROCESS,
enforcement = "androidx.webkit.WebViewFeature#isFeatureSupported")
public static boolean isMultiProcessEnabled() {
- final WebViewFeatureInternal feature = WebViewFeatureInternal.MULTI_PROCESS;
+ final ApiFeature.NoFramework feature = WebViewFeatureInternal.MULTI_PROCESS;
if (feature.isSupportedByWebView()) {
return getFactory().getStatics().isMultiProcessEnabled();
} else {
@@ -975,13 +972,13 @@
* https://source.chromium.org/chromium/chromium/src/+/main:components/variations/proto/client_variations.proto
*
* @return the variations header. The string may be empty if the header is not available.
- * @see WebView#loadUrl(java.lang.String, java.util.Map<java.lang.String, java.lang.String>)
+ * @see WebView#loadUrl(String, java.util.Map<String, String>)
*/
@RequiresFeature(
name = WebViewFeature.GET_VARIATIONS_HEADER,
enforcement = "androidx.webkit.WebViewFeature#isFeatureSupported")
public static @NonNull String getVariationsHeader() {
- final WebViewFeatureInternal feature = WebViewFeatureInternal.GET_VARIATIONS_HEADER;
+ final ApiFeature.NoFramework feature = WebViewFeatureInternal.GET_VARIATIONS_HEADER;
if (feature.isSupportedByWebView()) {
return getFactory().getStatics().getVariationsHeader();
} else {
@@ -1000,11 +997,12 @@
@SuppressWarnings({"JavaReflectionMemberAccess", "PrivateApi"})
private static void checkThread(WebView webview) {
if (Build.VERSION.SDK_INT >= 28) {
- if (webview.getWebViewLooper() != Looper.myLooper()) {
+ Looper webViewLooper = ApiHelperForP.getWebViewLooper(webview);
+ if (webViewLooper != Looper.myLooper()) {
throw new RuntimeException("A WebView method was called on thread '"
+ Thread.currentThread().getName() + "'. "
+ "All WebView methods must be called on the same thread. "
- + "(Expected Looper " + webview.getWebViewLooper() + " called on "
+ + "(Expected Looper " + webViewLooper + " called on "
+ Looper.myLooper() + ", FYI main Looper is " + Looper.getMainLooper()
+ ")");
}
diff --git a/webkit/webkit/src/main/java/androidx/webkit/internal/ApiFeature.java b/webkit/webkit/src/main/java/androidx/webkit/internal/ApiFeature.java
new file mode 100644
index 0000000..7760609
--- /dev/null
+++ b/webkit/webkit/src/main/java/androidx/webkit/internal/ApiFeature.java
@@ -0,0 +1,223 @@
+/*
+ * Copyright 2022 The Android Open Source Project
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT 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.webkit.internal;
+
+import android.os.Build;
+
+import androidx.annotation.ChecksSdkIntAtLeast;
+import androidx.annotation.NonNull;
+import androidx.annotation.VisibleForTesting;
+
+import org.chromium.support_lib_boundary.util.BoundaryInterfaceReflectionUtil;
+
+import java.util.Arrays;
+import java.util.Collections;
+import java.util.HashSet;
+import java.util.Set;
+
+/**
+ * Enum-like class to represent features that are supported by the AndroidX webview API.
+ *
+ * Features that have framework support should be represented by the appropriate subclass
+ * matching the SDK version where the feature became available, which allows static analysis to
+ * verify that calling the feature is safe through the {@link #isSupportedByFramework()} method.
+ *
+ * To gain this benefit, variables containing {@link ApiFeature} should always be declared as the
+ * specific subtype.
+ *
+ * To add support for a new API version, add a new subclass representing the desired API level.
+ *
+ * This class should only be instantiated as constants in {@link WebViewFeatureInternal} and is
+ * meant to act as enum values for that class.
+ */
+public abstract class ApiFeature implements ConditionallySupportedFeature {
+
+ // Collection of declared values, populated by the constructor, to allow enum-like
+ // iteration over all declared values.
+ private static final Set<ApiFeature> sValues = new HashSet<>();
+
+ private final String mPublicFeatureValue;
+ private final String mInternalFeatureValue;
+
+ ApiFeature(@NonNull String publicFeatureValue, @NonNull String internalFeatureValue) {
+ mPublicFeatureValue = publicFeatureValue;
+ mInternalFeatureValue = internalFeatureValue;
+ sValues.add(this);
+ }
+
+ @NonNull
+ @Override
+ public String getPublicFeatureName() {
+ return mPublicFeatureValue;
+ }
+
+ @Override
+ public boolean isSupported() {
+ return isSupportedByFramework() || isSupportedByWebView();
+ }
+
+ /**
+ * Return whether this {@link ApiFeature} is supported by the framework of the
+ * current device.
+ *
+ * <p>Make sure the static type of the object you are calling this method on corresponds to one
+ * of the subtypes of {@link ApiFeature} to ensure static analysis of the correct framework
+ * level.
+ */
+ public abstract boolean isSupportedByFramework();
+
+ /**
+ * Return whether this {@link ApiFeature} is supported by the current WebView APK.
+ *
+ * <p>WebView updates were only supported starting in Android L and the preinstalled WebView in
+ * earlier OS versions is not compatible with this library. If this returns true, then that
+ * implies we're on Android L or above.
+ */
+ @ChecksSdkIntAtLeast(api = Build.VERSION_CODES.LOLLIPOP)
+ public boolean isSupportedByWebView() {
+ return BoundaryInterfaceReflectionUtil.containsFeature(LAZY_HOLDER.WEBVIEW_APK_FEATURES,
+ mInternalFeatureValue);
+ }
+
+ /**
+ * Get all instantiated values of this class as if it was an enum.
+ */
+ @NonNull
+ public static Set<ApiFeature> values() {
+ return Collections.unmodifiableSet(sValues);
+ }
+
+
+ @NonNull
+ @VisibleForTesting
+ public static Set<String> getWebViewApkFeaturesForTesting() {
+ return LAZY_HOLDER.WEBVIEW_APK_FEATURES;
+ }
+
+ private static class LAZY_HOLDER {
+ static final Set<String> WEBVIEW_APK_FEATURES = new HashSet<>(
+ Arrays.asList(WebViewGlueCommunicator.getFactory().getWebViewFeatures()));
+ }
+
+ // --- Implement API version specific subclasses below this line ---
+
+ /**
+ * Represents a feature that has no framework support.
+ */
+ public static final class NoFramework extends ApiFeature {
+
+ NoFramework(@NonNull String publicFeatureValue, @NonNull String internalFeatureValue) {
+ super(publicFeatureValue, internalFeatureValue);
+ }
+
+ @Override
+ public boolean isSupportedByFramework() {
+ return false;
+ }
+ }
+
+ /**
+ * Represents a feature that was added in M.
+ */
+ public static final class M extends ApiFeature {
+
+ M(@NonNull String publicFeatureValue, @NonNull String internalFeatureValue) {
+ super(publicFeatureValue, internalFeatureValue);
+ }
+
+ @Override
+ public boolean isSupportedByFramework() {
+ return Build.VERSION.SDK_INT >= Build.VERSION_CODES.M;
+ }
+ }
+
+ /**
+ * Represents a feature that was added in N.
+ */
+ public static final class N extends ApiFeature {
+
+ N(@NonNull String publicFeatureValue, @NonNull String internalFeatureValue) {
+ super(publicFeatureValue, internalFeatureValue);
+ }
+
+ @Override
+ public boolean isSupportedByFramework() {
+ return Build.VERSION.SDK_INT >= Build.VERSION_CODES.N;
+ }
+ }
+
+ /**
+ * Represents a feature that was added in O.
+ */
+ public static final class O extends ApiFeature {
+
+ O(@NonNull String publicFeatureValue, @NonNull String internalFeatureValue) {
+ super(publicFeatureValue, internalFeatureValue);
+ }
+
+ @Override
+ public boolean isSupportedByFramework() {
+ return Build.VERSION.SDK_INT >= Build.VERSION_CODES.O;
+ }
+ }
+
+ /**
+ * Represents a feature that was added in O_MR1.
+ */
+ public static final class O_MR1 extends ApiFeature {
+
+ O_MR1(@NonNull String publicFeatureValue, @NonNull String internalFeatureValue) {
+ super(publicFeatureValue, internalFeatureValue);
+ }
+
+ @Override
+ public boolean isSupportedByFramework() {
+ return Build.VERSION.SDK_INT >= Build.VERSION_CODES.O_MR1;
+ }
+ }
+
+ /**
+ * Represents a feature that was added in P.
+ */
+ public static final class P extends ApiFeature {
+
+ P(@NonNull String publicFeatureValue, @NonNull String internalFeatureValue) {
+ super(publicFeatureValue, internalFeatureValue);
+ }
+
+ @Override
+ public boolean isSupportedByFramework() {
+ return Build.VERSION.SDK_INT >= Build.VERSION_CODES.P;
+ }
+ }
+
+ /**
+ * Represents a feature that was added in Q.
+ */
+ public static final class Q extends ApiFeature {
+
+ Q(@NonNull String publicFeatureValue, @NonNull String internalFeatureValue) {
+ super(publicFeatureValue, internalFeatureValue);
+ }
+
+ @Override
+ public boolean isSupportedByFramework() {
+ return Build.VERSION.SDK_INT >= Build.VERSION_CODES.Q;
+ }
+ }
+
+}
diff --git a/webkit/webkit/src/main/java/androidx/webkit/internal/ApiHelperForLollipop.java b/webkit/webkit/src/main/java/androidx/webkit/internal/ApiHelperForLollipop.java
new file mode 100644
index 0000000..6a77a82
--- /dev/null
+++ b/webkit/webkit/src/main/java/androidx/webkit/internal/ApiHelperForLollipop.java
@@ -0,0 +1,53 @@
+/*
+ * Copyright 2022 The Android Open Source Project
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT 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.webkit.internal;
+
+import android.net.Uri;
+import android.os.Build;
+import android.webkit.WebResourceRequest;
+
+import androidx.annotation.DoNotInline;
+import androidx.annotation.NonNull;
+import androidx.annotation.RequiresApi;
+
+/**
+ * Utility class to use new APIs that were added in Lollipop (API level 21).
+ * These need to exist in a separate class so that Android framework can successfully verify
+ * classes without encountering the new APIs.
+ */
+@RequiresApi(Build.VERSION_CODES.LOLLIPOP)
+public class ApiHelperForLollipop {
+ private ApiHelperForLollipop() {
+ }
+
+ /**
+ * @see WebResourceRequest#isForMainFrame()
+ */
+ @DoNotInline
+ public static boolean isForMainFrame(@NonNull WebResourceRequest webResourceRequest) {
+ return webResourceRequest.isForMainFrame();
+ }
+
+ /**
+ * @see WebResourceRequest#getUrl()
+ */
+ @DoNotInline
+ @NonNull
+ public static Uri getUrl(@NonNull WebResourceRequest webResourceRequest) {
+ return webResourceRequest.getUrl();
+ }
+}
diff --git a/webkit/webkit/src/main/java/androidx/webkit/internal/ApiHelperForM.java b/webkit/webkit/src/main/java/androidx/webkit/internal/ApiHelperForM.java
new file mode 100644
index 0000000..cb66c5b
--- /dev/null
+++ b/webkit/webkit/src/main/java/androidx/webkit/internal/ApiHelperForM.java
@@ -0,0 +1,183 @@
+/*
+ * Copyright 2022 The Android Open Source Project
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT 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.webkit.internal;
+
+import android.net.Uri;
+import android.os.Build;
+import android.os.Handler;
+import android.webkit.WebMessage;
+import android.webkit.WebMessagePort;
+import android.webkit.WebResourceError;
+import android.webkit.WebSettings;
+import android.webkit.WebView;
+
+import androidx.annotation.DoNotInline;
+import androidx.annotation.NonNull;
+import androidx.annotation.Nullable;
+import androidx.annotation.RequiresApi;
+import androidx.webkit.WebMessageCompat;
+import androidx.webkit.WebMessagePortCompat;
+import androidx.webkit.WebViewCompat;
+
+/**
+ * Utility class to use new APIs that were added in M (API level 23).
+ * These need to exist in a separate class so that Android framework can successfully verify
+ * classes without encountering the new APIs.
+ */
+@RequiresApi(Build.VERSION_CODES.M)
+public class ApiHelperForM {
+ private ApiHelperForM() {
+ }
+
+ /**
+ * @see WebMessagePort#postMessage(WebMessage)
+ */
+ @DoNotInline
+ public static void postMessage(@NonNull WebMessagePort webMessagePort,
+ @NonNull WebMessage webMessage) {
+ webMessagePort.postMessage(webMessage);
+ }
+
+ /**
+ * @see WebMessagePort#close()
+ */
+ @DoNotInline
+ public static void close(@NonNull WebMessagePort webMessagePort) {
+ webMessagePort.close();
+ }
+
+ /**
+ * Wraps the passed callback in the framework callback type to isolate new types in this class.
+ * @see WebMessagePort#setWebMessageCallback(WebMessagePort.WebMessageCallback)
+ */
+ @DoNotInline
+ public static void setWebMessageCallback(@NonNull WebMessagePort frameworksImpl,
+ @NonNull WebMessagePortCompat.WebMessageCallbackCompat callback) {
+ frameworksImpl.setWebMessageCallback(new WebMessagePort.WebMessageCallback() {
+ @Override
+ public void onMessage(WebMessagePort port, WebMessage message) {
+ callback.onMessage(new WebMessagePortImpl(port),
+ WebMessagePortImpl.frameworkMessageToCompat(message));
+ }
+ });
+ }
+
+ /**
+ * Calls
+ * {@link WebMessagePort#setWebMessageCallback(WebMessagePort.WebMessageCallback, Handler)}
+ * Wraps the passed callback in the framework callback type to isolate new types in this class.
+ */
+ @DoNotInline
+ public static void setWebMessageCallback(@NonNull WebMessagePort frameworksImpl,
+ @NonNull WebMessagePortCompat.WebMessageCallbackCompat callback,
+ @Nullable Handler handler) {
+ frameworksImpl.setWebMessageCallback(new WebMessagePort.WebMessageCallback() {
+ @Override
+ public void onMessage(WebMessagePort port, WebMessage message) {
+ callback.onMessage(new WebMessagePortImpl(port),
+ WebMessagePortImpl.frameworkMessageToCompat(message));
+ }
+ }, handler);
+ }
+
+ /**
+ * @see WebMessage#WebMessage(String, WebMessagePort[])} WebMessage
+ */
+ @DoNotInline
+ @NonNull
+ public static WebMessage createWebMessage(@NonNull WebMessageCompat message) {
+ return new WebMessage(message.getData(),
+ WebMessagePortImpl.compatToPorts(message.getPorts()));
+ }
+
+ /**
+ * @see WebMessageCompat#WebMessageCompat(String, WebMessagePortCompat[])
+ */
+ @DoNotInline
+ @NonNull
+ public static WebMessageCompat createWebMessageCompat(@NonNull WebMessage webMessage) {
+ return new WebMessageCompat(webMessage.getData(),
+ WebMessagePortImpl.portsToCompat(webMessage.getPorts()));
+ }
+
+ /**
+ * @see WebResourceError#getErrorCode()
+ */
+ @DoNotInline
+ public static int getErrorCode(@NonNull WebResourceError webResourceError) {
+ return webResourceError.getErrorCode();
+ }
+
+
+ /**
+ * @see WebResourceError#getDescription()
+ */
+ @DoNotInline
+ @NonNull
+ public static CharSequence getDescription(@NonNull WebResourceError webResourceError) {
+ return webResourceError.getDescription();
+ }
+
+ /**
+ * @see WebSettings#setOffscreenPreRaster(boolean)
+ */
+ @DoNotInline
+ public static void setOffscreenPreRaster(@NonNull WebSettings webSettings, boolean b) {
+ webSettings.setOffscreenPreRaster(b);
+ }
+
+ /**
+ * @see WebSettings#getOffscreenPreRaster()
+ */
+ @DoNotInline
+ public static boolean getOffscreenPreRaster(@NonNull WebSettings webSettings) {
+ return webSettings.getOffscreenPreRaster();
+ }
+
+ /**
+ * Wraps the passed callback in the framework callback type to isolate new types in this class.
+ * @see WebView#postVisualStateCallback(long, WebView.VisualStateCallback)
+ */
+ @DoNotInline
+ public static void postVisualStateCallback(@NonNull WebView webView, long requestId,
+ final @NonNull WebViewCompat.VisualStateCallback callback) {
+ webView.postVisualStateCallback(requestId, new WebView.VisualStateCallback() {
+ @Override
+ public void onComplete(long l) {
+ callback.onComplete(l);
+ }
+ });
+ }
+
+ /**
+ * @see WebView#postWebMessage(WebMessage, Uri)
+ */
+ @DoNotInline
+ public static void postWebMessage(@NonNull WebView webView, @NonNull WebMessage message,
+ @NonNull Uri targetOrigin) {
+ webView.postWebMessage(message, targetOrigin);
+ }
+
+ /**
+ * @see WebView#createWebMessageChannel()
+ */
+ @DoNotInline
+ @NonNull
+ public static WebMessagePort[] createWebMessageChannel(@NonNull WebView webView) {
+ return webView.createWebMessageChannel();
+ }
+}
diff --git a/webkit/webkit/src/main/java/androidx/webkit/internal/ApiHelperForN.java b/webkit/webkit/src/main/java/androidx/webkit/internal/ApiHelperForN.java
new file mode 100644
index 0000000..76260d7
--- /dev/null
+++ b/webkit/webkit/src/main/java/androidx/webkit/internal/ApiHelperForN.java
@@ -0,0 +1,200 @@
+/*
+ * Copyright 2022 The Android Open Source Project
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT 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.webkit.internal;
+
+import android.content.Context;
+import android.os.Build;
+import android.webkit.ServiceWorkerClient;
+import android.webkit.ServiceWorkerController;
+import android.webkit.ServiceWorkerWebSettings;
+import android.webkit.WebResourceRequest;
+import android.webkit.WebSettings;
+
+import androidx.annotation.DoNotInline;
+import androidx.annotation.NonNull;
+import androidx.annotation.Nullable;
+import androidx.annotation.RequiresApi;
+import androidx.webkit.ServiceWorkerClientCompat;
+
+import java.io.File;
+
+/**
+ * Utility class to use new APIs that were added in N (API level 24).
+ * These need to exist in a separate class so that Android framework can successfully verify
+ * classes without encountering the new APIs.
+ */
+@RequiresApi(Build.VERSION_CODES.N)
+public class ApiHelperForN {
+ private ApiHelperForN() {
+ }
+
+ /**
+ * @see Context#getDataDir()
+ */
+ @DoNotInline
+ @NonNull
+ public static File getDataDir(@NonNull Context context) {
+ return context.getDataDir();
+ }
+
+ /**
+ * @see ServiceWorkerController#getInstance()
+ */
+ @DoNotInline
+ @NonNull
+ public static ServiceWorkerController getServiceWorkerControllerInstance() {
+ return ServiceWorkerController.getInstance();
+ }
+
+ /**
+ * @see ServiceWorkerController#getServiceWorkerWebSettings()
+ */
+ @DoNotInline
+ @NonNull
+ public static ServiceWorkerWebSettings getServiceWorkerWebSettings(
+ @NonNull ServiceWorkerController serviceWorkerController) {
+ return serviceWorkerController.getServiceWorkerWebSettings();
+ }
+
+ /**
+ * @see ServiceWorkerController#getServiceWorkerWebSettings()
+ */
+ @DoNotInline
+ @NonNull
+ public static ServiceWorkerWebSettingsImpl getServiceWorkerWebSettingsImpl(
+ @NonNull ServiceWorkerController serviceWorkerController) {
+ return new ServiceWorkerWebSettingsImpl(
+ getServiceWorkerWebSettings(serviceWorkerController));
+ }
+
+ /**
+ * @see ServiceWorkerController#setServiceWorkerClient(ServiceWorkerClient)
+ */
+ @DoNotInline
+ public static void setServiceWorkerClient(
+ @NonNull ServiceWorkerController serviceWorkerController,
+ @Nullable ServiceWorkerClient serviceWorkerClient) {
+ serviceWorkerController.setServiceWorkerClient(serviceWorkerClient);
+ }
+
+ /**
+ * @see ServiceWorkerController#setServiceWorkerClient(ServiceWorkerClient)
+ */
+ @DoNotInline
+ public static void setServiceWorkerClientCompat(
+ @NonNull ServiceWorkerController serviceWorkerController,
+ @NonNull ServiceWorkerClientCompat serviceWorkerClientCompat) {
+ serviceWorkerController.setServiceWorkerClient(
+ new FrameworkServiceWorkerClient(serviceWorkerClientCompat));
+ }
+
+ /**
+ * @see ServiceWorkerWebSettings#setCacheMode(int)
+ */
+ @DoNotInline
+ public static void setCacheMode(@NonNull ServiceWorkerWebSettings serviceWorkerWebSettings,
+ int cacheMode) {
+ serviceWorkerWebSettings.setCacheMode(cacheMode);
+ }
+
+ /**
+ * @see ServiceWorkerWebSettings#getCacheMode()
+ */
+ @DoNotInline
+ public static int getCacheMode(@NonNull ServiceWorkerWebSettings serviceWorkerWebSettings) {
+ return serviceWorkerWebSettings.getCacheMode();
+ }
+
+ /**
+ * @see ServiceWorkerWebSettings#setAllowContentAccess(boolean)
+ */
+ @DoNotInline
+ public static void setAllowContentAccess(
+ @NonNull ServiceWorkerWebSettings serviceWorkerWebSettings,
+ boolean allowContentAccess) {
+ serviceWorkerWebSettings.setAllowContentAccess(allowContentAccess);
+ }
+
+ /**
+ * @see ServiceWorkerWebSettings#getAllowContentAccess()
+ */
+ @DoNotInline
+ public static boolean getAllowContentAccess(
+ @NonNull ServiceWorkerWebSettings serviceWorkerWebSettings) {
+ return serviceWorkerWebSettings.getAllowContentAccess();
+ }
+
+ /**
+ * @see ServiceWorkerWebSettings#setAllowFileAccess(boolean)
+ */
+ @DoNotInline
+ public static void setAllowFileAccess(
+ @NonNull ServiceWorkerWebSettings serviceWorkerWebSettings, boolean allowFileAccess) {
+ serviceWorkerWebSettings.setAllowFileAccess(allowFileAccess);
+ }
+
+ /**
+ * @see ServiceWorkerWebSettings#getAllowFileAccess()
+ */
+ @DoNotInline
+ public static boolean getAllowFileAccess(
+ @NonNull ServiceWorkerWebSettings serviceWorkerWebSettings) {
+ return serviceWorkerWebSettings.getAllowFileAccess();
+ }
+
+ /**
+ * @see ServiceWorkerWebSettings#setBlockNetworkLoads(boolean)
+ */
+ @DoNotInline
+ public static void setBlockNetworkLoads(
+ @NonNull ServiceWorkerWebSettings serviceWorkerWebSettings, boolean blockNetworkLoads) {
+ serviceWorkerWebSettings.setBlockNetworkLoads(blockNetworkLoads);
+ }
+
+ /**
+ * @see ServiceWorkerWebSettings#getBlockNetworkLoads()
+ */
+ @DoNotInline
+ public static boolean getBlockNetworkLoads(
+ @NonNull ServiceWorkerWebSettings serviceWorkerWebSettings) {
+ return serviceWorkerWebSettings.getBlockNetworkLoads();
+ }
+
+ /**
+ * @see WebResourceRequest#isRedirect()
+ */
+ @DoNotInline
+ public static boolean isRedirect(@NonNull WebResourceRequest webResourceRequest) {
+ return webResourceRequest.isRedirect();
+ }
+
+ /**
+ * @see WebSettings#setDisabledActionModeMenuItems(int)
+ */
+ @DoNotInline
+ public static void setDisabledActionModeMenuItems(@NonNull WebSettings webSettings, int i) {
+ webSettings.setDisabledActionModeMenuItems(i);
+ }
+
+ /**
+ * @see WebSettings#getDisabledActionModeMenuItems()
+ */
+ @DoNotInline
+ public static int getDisabledActionModeMenuItems(@NonNull WebSettings webSettings) {
+ return webSettings.getDisabledActionModeMenuItems();
+ }
+}
diff --git a/webkit/webkit/src/main/java/androidx/webkit/internal/ApiHelperForO.java b/webkit/webkit/src/main/java/androidx/webkit/internal/ApiHelperForO.java
new file mode 100644
index 0000000..b4efe99
--- /dev/null
+++ b/webkit/webkit/src/main/java/androidx/webkit/internal/ApiHelperForO.java
@@ -0,0 +1,83 @@
+/*
+ * Copyright 2022 The Android Open Source Project
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT 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.webkit.internal;
+
+import android.content.pm.PackageInfo;
+import android.os.Build;
+import android.webkit.WebChromeClient;
+import android.webkit.WebSettings;
+import android.webkit.WebView;
+import android.webkit.WebViewClient;
+
+import androidx.annotation.DoNotInline;
+import androidx.annotation.NonNull;
+import androidx.annotation.Nullable;
+import androidx.annotation.RequiresApi;
+
+/**
+ * Utility class to use new APIs that were added in O (API level 26).
+ * These need to exist in a separate class so that Android framework can successfully verify
+ * classes without encountering the new APIs.
+ */
+@RequiresApi(Build.VERSION_CODES.O)
+public class ApiHelperForO {
+ private ApiHelperForO() {}
+
+
+ /**
+ * @see WebSettings#setSafeBrowsingEnabled(boolean)
+ */
+ @DoNotInline
+ public static void setSafeBrowsingEnabled(@NonNull WebSettings webSettings, boolean b) {
+ webSettings.setSafeBrowsingEnabled(b);
+ }
+
+ /**
+ * @see WebSettings#getSafeBrowsingEnabled()
+ */
+ @DoNotInline
+ public static boolean getSafeBrowsingEnabled(@NonNull WebSettings webSettings) {
+ return webSettings.getSafeBrowsingEnabled();
+ }
+
+ /**
+ * @see WebView#getWebViewClient()
+ */
+ @DoNotInline
+ @Nullable
+ public static WebViewClient getWebViewClient(@NonNull WebView webView) {
+ return webView.getWebViewClient();
+ }
+
+ /**
+ * @see WebView#getWebChromeClient()
+ */
+ @DoNotInline
+ @Nullable
+ public static WebChromeClient getWebChromeClient(@NonNull WebView webView) {
+ return webView.getWebChromeClient();
+ }
+
+ /**
+ * @see WebView#getCurrentWebViewPackage()
+ */
+ @DoNotInline
+ @NonNull
+ public static PackageInfo getCurrentWebViewPackage() {
+ return WebView.getCurrentWebViewPackage();
+ }
+}
diff --git a/webkit/webkit/src/main/java/androidx/webkit/internal/ApiHelperForOMR1.java b/webkit/webkit/src/main/java/androidx/webkit/internal/ApiHelperForOMR1.java
new file mode 100644
index 0000000..0630f2f
--- /dev/null
+++ b/webkit/webkit/src/main/java/androidx/webkit/internal/ApiHelperForOMR1.java
@@ -0,0 +1,96 @@
+/*
+ * Copyright 2022 The Android Open Source Project
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT 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.webkit.internal;
+
+import android.content.Context;
+import android.net.Uri;
+import android.os.Build;
+import android.webkit.SafeBrowsingResponse;
+import android.webkit.ValueCallback;
+import android.webkit.WebView;
+
+import androidx.annotation.DoNotInline;
+import androidx.annotation.NonNull;
+import androidx.annotation.Nullable;
+import androidx.annotation.RequiresApi;
+
+import java.util.List;
+
+/**
+ * Utility class to use new APIs that were added in O_MR1 (API level 27).
+ * These need to exist in a separate class so that Android framework can successfully verify
+ * classes without encountering the new APIs.
+ */
+@RequiresApi(Build.VERSION_CODES.O_MR1)
+public class ApiHelperForOMR1 {
+ private ApiHelperForOMR1() {
+ }
+
+
+ /**
+ * @see SafeBrowsingResponse#showInterstitial(boolean)
+ */
+ @DoNotInline
+ public static void showInterstitial(@NonNull SafeBrowsingResponse safeBrowsingResponse,
+ boolean showInterstitial) {
+ safeBrowsingResponse.showInterstitial(showInterstitial);
+ }
+
+ /**
+ * @see SafeBrowsingResponse#proceed(boolean)
+ */
+ @DoNotInline
+ public static void proceed(@NonNull SafeBrowsingResponse frameworksImpl, boolean proceed) {
+ frameworksImpl.proceed(proceed);
+ }
+
+ /**
+ * @see SafeBrowsingResponse#backToSafety(boolean)
+ */
+ @DoNotInline
+ public static void backToSafety(@NonNull SafeBrowsingResponse safeBrowsingResponse,
+ boolean backToSafety) {
+ safeBrowsingResponse.backToSafety(backToSafety);
+ }
+
+ /**
+ * @see WebView#startSafeBrowsing(Context, ValueCallback)
+ */
+ @DoNotInline
+ public static void startSafeBrowsing(@NonNull Context context,
+ @Nullable ValueCallback<Boolean> callback) {
+ WebView.startSafeBrowsing(context, callback);
+ }
+
+ /**
+ * @see WebView#setSafeBrowsingWhitelist(List, ValueCallback)
+ */
+ @DoNotInline
+ public static void setSafeBrowsingWhitelist(@NonNull List<String> hosts,
+ @Nullable ValueCallback<Boolean> callback) {
+ WebView.setSafeBrowsingWhitelist(hosts, callback);
+ }
+
+ /**
+ * @see WebView#getSafeBrowsingPrivacyPolicyUrl()
+ */
+ @DoNotInline
+ @NonNull
+ public static Uri getSafeBrowsingPrivacyPolicyUrl() {
+ return WebView.getSafeBrowsingPrivacyPolicyUrl();
+ }
+}
diff --git a/webkit/webkit/src/main/java/androidx/webkit/internal/ApiHelperForP.java b/webkit/webkit/src/main/java/androidx/webkit/internal/ApiHelperForP.java
new file mode 100644
index 0000000..ed57a83
--- /dev/null
+++ b/webkit/webkit/src/main/java/androidx/webkit/internal/ApiHelperForP.java
@@ -0,0 +1,103 @@
+/*
+ * Copyright 2022 The Android Open Source Project
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT 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.webkit.internal;
+
+import android.os.Build;
+import android.os.Looper;
+import android.webkit.TracingController;
+import android.webkit.WebView;
+
+import androidx.annotation.DoNotInline;
+import androidx.annotation.NonNull;
+import androidx.annotation.Nullable;
+import androidx.annotation.RequiresApi;
+import androidx.webkit.TracingConfig;
+
+import java.io.OutputStream;
+import java.util.concurrent.Executor;
+
+/**
+ * Utility class to use new APIs that were added in P (API level 28).
+ * These need to exist in a separate class so that Android framework can successfully verify
+ * classes without encountering the new APIs.
+ */
+@RequiresApi(Build.VERSION_CODES.P)
+public class ApiHelperForP {
+ private ApiHelperForP() {
+ }
+
+ /**
+ * @see TracingController#getInstance()
+ */
+ @DoNotInline
+ @NonNull
+ public static TracingController getTracingControllerInstance() {
+ return TracingController.getInstance();
+ }
+
+ /**
+ * @see TracingController#isTracing()
+ */
+ @DoNotInline
+ public static boolean isTracing(@NonNull TracingController tracingController) {
+ return tracingController.isTracing();
+ }
+
+ /**
+ * Converts the passed {@link TracingConfig} to {@link android.webkit.TracingConfig} to
+ * isolate new types in this class.
+ * @see TracingController#start(android.webkit.TracingConfig)
+ */
+ @DoNotInline
+ public static void start(@NonNull TracingController tracingController,
+ @NonNull TracingConfig tracingConfig) {
+ android.webkit.TracingConfig config =
+ new android.webkit.TracingConfig.Builder()
+ .addCategories(tracingConfig.getPredefinedCategories())
+ .addCategories(tracingConfig.getCustomIncludedCategories())
+ .setTracingMode(tracingConfig.getTracingMode())
+ .build();
+ tracingController.start(config);
+ }
+
+ /**
+ * @see TracingController#stop(OutputStream, Executor)
+ */
+ @DoNotInline
+ public static boolean stop(@NonNull TracingController tracingController,
+ @Nullable OutputStream os, @NonNull Executor ex) {
+ return tracingController.stop(os, ex);
+ }
+
+ /**
+ * @see WebView#getWebViewClassLoader()
+ */
+ @DoNotInline
+ @NonNull
+ public static ClassLoader getWebViewClassLoader() {
+ return WebView.getWebViewClassLoader();
+ }
+
+ /**
+ * @see WebView#getWebViewLooper()
+ */
+ @DoNotInline
+ @NonNull
+ public static Looper getWebViewLooper(@NonNull WebView webView) {
+ return webView.getWebViewLooper();
+ }
+}
diff --git a/webkit/webkit/src/main/java/androidx/webkit/internal/ApiHelperForQ.java b/webkit/webkit/src/main/java/androidx/webkit/internal/ApiHelperForQ.java
new file mode 100644
index 0000000..4e93fca
--- /dev/null
+++ b/webkit/webkit/src/main/java/androidx/webkit/internal/ApiHelperForQ.java
@@ -0,0 +1,112 @@
+/*
+ * Copyright 2022 The Android Open Source Project
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT 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.webkit.internal;
+
+import android.os.Build;
+import android.webkit.WebSettings;
+import android.webkit.WebView;
+import android.webkit.WebViewRenderProcess;
+
+import androidx.annotation.DoNotInline;
+import androidx.annotation.NonNull;
+import androidx.annotation.Nullable;
+import androidx.annotation.RequiresApi;
+import androidx.webkit.WebViewRenderProcessClient;
+
+import java.util.concurrent.Executor;
+
+/**
+ * Utility class to use new APIs that were added in Q (API level 29).
+ * These need to exist in a separate class so that Android framework can successfully verify
+ * classes without encountering the new APIs.
+ */
+@RequiresApi(Build.VERSION_CODES.Q)
+public class ApiHelperForQ {
+ private ApiHelperForQ() {
+ }
+
+ /**
+ * @see WebSettings#setForceDark(int)
+ * @deprecated in 31
+ */
+ @DoNotInline
+ @Deprecated
+ public static void setForceDark(@NonNull WebSettings webSettings, int forceDark) {
+ webSettings.setForceDark(forceDark);
+ }
+
+ /**
+ * @see WebSettings#getForceDark()
+ * @deprecated in 31
+ */
+ @DoNotInline
+ @Deprecated
+ public static int getForceDark(@NonNull WebSettings webSettings) {
+ return webSettings.getForceDark();
+ }
+
+ /**
+ * @see WebView#getWebViewRenderProcess()
+ */
+ @DoNotInline
+ @Nullable
+ public static WebViewRenderProcess getWebViewRenderProcess(@NonNull WebView webView) {
+ return webView.getWebViewRenderProcess();
+ }
+
+ /**
+ * @see WebViewRenderProcess#terminate()
+ */
+ @DoNotInline
+ public static boolean terminate(@NonNull WebViewRenderProcess webViewRenderProcess) {
+ return webViewRenderProcess.terminate();
+ }
+
+ /**
+ * @see WebView#setWebViewRenderProcessClient(Executor,
+ * android.webkit.WebViewRenderProcessClient)
+ */
+ @DoNotInline
+ public static void setWebViewRenderProcessClient(@NonNull WebView webView,
+ @NonNull Executor executor,
+ @Nullable WebViewRenderProcessClient client) {
+ WebViewRenderProcessClientFrameworkAdapter clientAdapter =
+ client != null ? new WebViewRenderProcessClientFrameworkAdapter(client) : null;
+ webView.setWebViewRenderProcessClient(executor, clientAdapter);
+ }
+
+ /**
+ * @see WebView#setWebViewRenderProcessClient(android.webkit.WebViewRenderProcessClient)
+ */
+ @DoNotInline
+ public static void setWebViewRenderProcessClient(@NonNull WebView webView,
+ @Nullable WebViewRenderProcessClient client) {
+ WebViewRenderProcessClientFrameworkAdapter clientAdapter =
+ client != null ? new WebViewRenderProcessClientFrameworkAdapter(client) : null;
+ webView.setWebViewRenderProcessClient(clientAdapter);
+ }
+
+ /**
+ * @see WebView#getWebViewRenderProcessClient()
+ */
+ @DoNotInline
+ @Nullable
+ public static android.webkit.WebViewRenderProcessClient getWebViewRenderProcessClient(
+ @NonNull WebView webView) {
+ return webView.getWebViewRenderProcessClient();
+ }
+}
diff --git a/webkit/webkit/src/main/java/androidx/webkit/internal/AssetHelper.java b/webkit/webkit/src/main/java/androidx/webkit/internal/AssetHelper.java
index 1931e06..e6bbf7b 100644
--- a/webkit/webkit/src/main/java/androidx/webkit/internal/AssetHelper.java
+++ b/webkit/webkit/src/main/java/androidx/webkit/internal/AssetHelper.java
@@ -39,7 +39,6 @@
* Forked from the chromuim project org.chromium.android_webview.AndroidProtocolHandler
*/
public class AssetHelper {
- private static final String TAG = "AssetHelper";
/**
* Default value to be used as MIME type if guessing MIME type failed.
@@ -185,7 +184,7 @@
public static File getDataDir(@NonNull Context context) {
// Context#getDataDir is only available in APIs >= 24.
if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.N) {
- return context.getDataDir();
+ return ApiHelperForN.getDataDir(context);
} else {
// For APIs < 24 cache dir is created under the data dir.
return context.getCacheDir().getParentFile();
@@ -204,4 +203,5 @@
String mimeType = URLConnection.guessContentTypeFromName(filePath);
return mimeType == null ? DEFAULT_MIME_TYPE : mimeType;
}
+
}
diff --git a/webkit/webkit/src/main/java/androidx/webkit/internal/JavaScriptReplyProxyImpl.java b/webkit/webkit/src/main/java/androidx/webkit/internal/JavaScriptReplyProxyImpl.java
index 3a5fece..56e6565 100644
--- a/webkit/webkit/src/main/java/androidx/webkit/internal/JavaScriptReplyProxyImpl.java
+++ b/webkit/webkit/src/main/java/androidx/webkit/internal/JavaScriptReplyProxyImpl.java
@@ -55,7 +55,7 @@
@Override
public void postMessage(@NonNull final String message) {
- final WebViewFeatureInternal feature = WebViewFeatureInternal.WEB_MESSAGE_LISTENER;
+ final ApiFeature.NoFramework feature = WebViewFeatureInternal.WEB_MESSAGE_LISTENER;
if (feature.isSupportedByWebView()) {
mBoundaryInterface.postMessage(message);
} else {
diff --git a/webkit/webkit/src/main/java/androidx/webkit/internal/ProxyControllerImpl.java b/webkit/webkit/src/main/java/androidx/webkit/internal/ProxyControllerImpl.java
index ea85232..3ec5036 100644
--- a/webkit/webkit/src/main/java/androidx/webkit/internal/ProxyControllerImpl.java
+++ b/webkit/webkit/src/main/java/androidx/webkit/internal/ProxyControllerImpl.java
@@ -36,8 +36,8 @@
@Override
public void setProxyOverride(@NonNull ProxyConfig proxyConfig, @NonNull Executor executor,
@NonNull Runnable listener) {
- WebViewFeatureInternal proxyOverride = WebViewFeatureInternal.PROXY_OVERRIDE;
- WebViewFeatureInternal reverseBypass = WebViewFeatureInternal.PROXY_OVERRIDE_REVERSE_BYPASS;
+ ApiFeature.NoFramework proxyOverride = WebViewFeatureInternal.PROXY_OVERRIDE;
+ ApiFeature.NoFramework reverseBypass = WebViewFeatureInternal.PROXY_OVERRIDE_REVERSE_BYPASS;
// A 2D String array representation is required by reflection
String[][] proxyRuleArray = proxyRulesToStringArray(proxyConfig.getProxyRules());
@@ -60,7 +60,7 @@
@Override
public void clearProxyOverride(@NonNull Executor executor, @NonNull Runnable listener) {
- WebViewFeatureInternal feature = WebViewFeatureInternal.PROXY_OVERRIDE;
+ ApiFeature.NoFramework feature = WebViewFeatureInternal.PROXY_OVERRIDE;
if (feature.isSupportedByWebView()) {
getBoundaryInterface().clearProxyOverride(listener, executor);
} else {
diff --git a/webkit/webkit/src/main/java/androidx/webkit/internal/SafeBrowsingResponseImpl.java b/webkit/webkit/src/main/java/androidx/webkit/internal/SafeBrowsingResponseImpl.java
index f4a0ecd..12c266a 100644
--- a/webkit/webkit/src/main/java/androidx/webkit/internal/SafeBrowsingResponseImpl.java
+++ b/webkit/webkit/src/main/java/androidx/webkit/internal/SafeBrowsingResponseImpl.java
@@ -78,10 +78,10 @@
@Override
public void showInterstitial(boolean allowReporting) {
- final WebViewFeatureInternal feature =
+ final ApiFeature.O_MR1 feature =
WebViewFeatureInternal.SAFE_BROWSING_RESPONSE_SHOW_INTERSTITIAL;
if (feature.isSupportedByFramework()) {
- getFrameworksImpl().showInterstitial(allowReporting);
+ ApiHelperForOMR1.showInterstitial(getFrameworksImpl(), allowReporting);
} else if (feature.isSupportedByWebView()) {
getBoundaryInterface().showInterstitial(allowReporting);
} else {
@@ -91,10 +91,9 @@
@Override
public void proceed(boolean report) {
- final WebViewFeatureInternal feature =
- WebViewFeatureInternal.SAFE_BROWSING_RESPONSE_PROCEED;
+ final ApiFeature.O_MR1 feature = WebViewFeatureInternal.SAFE_BROWSING_RESPONSE_PROCEED;
if (feature.isSupportedByFramework()) {
- getFrameworksImpl().proceed(report);
+ ApiHelperForOMR1.proceed(getFrameworksImpl(), report);
} else if (feature.isSupportedByWebView()) {
getBoundaryInterface().proceed(report);
} else {
@@ -104,10 +103,10 @@
@Override
public void backToSafety(boolean report) {
- final WebViewFeatureInternal feature =
+ final ApiFeature.O_MR1 feature =
WebViewFeatureInternal.SAFE_BROWSING_RESPONSE_BACK_TO_SAFETY;
if (feature.isSupportedByFramework()) {
- getFrameworksImpl().backToSafety(report);
+ ApiHelperForOMR1.backToSafety(getFrameworksImpl(), report);
} else if (feature.isSupportedByWebView()) {
getBoundaryInterface().backToSafety(report);
} else {
diff --git a/webkit/webkit/src/main/java/androidx/webkit/internal/ServiceWorkerControllerImpl.java b/webkit/webkit/src/main/java/androidx/webkit/internal/ServiceWorkerControllerImpl.java
index 9d69879..151714b 100644
--- a/webkit/webkit/src/main/java/androidx/webkit/internal/ServiceWorkerControllerImpl.java
+++ b/webkit/webkit/src/main/java/androidx/webkit/internal/ServiceWorkerControllerImpl.java
@@ -39,14 +39,13 @@
private final ServiceWorkerWebSettingsCompat mWebSettings;
public ServiceWorkerControllerImpl() {
- final WebViewFeatureInternal feature = WebViewFeatureInternal.SERVICE_WORKER_BASIC_USAGE;
+ final ApiFeature.N feature = WebViewFeatureInternal.SERVICE_WORKER_BASIC_USAGE;
if (feature.isSupportedByFramework()) {
- mFrameworksImpl = ServiceWorkerController.getInstance();
+ mFrameworksImpl = ApiHelperForN.getServiceWorkerControllerInstance();
// The current WebView APK might not be compatible with the support library, so set the
// boundary interface to null for now.
mBoundaryInterface = null;
- mWebSettings = new ServiceWorkerWebSettingsImpl(
- mFrameworksImpl.getServiceWorkerWebSettings());
+ mWebSettings = ApiHelperForN.getServiceWorkerWebSettingsImpl(getFrameworksImpl());
} else if (feature.isSupportedByWebView()) {
mFrameworksImpl = null;
mBoundaryInterface = WebViewGlueCommunicator.getFactory().getServiceWorkerController();
@@ -60,7 +59,7 @@
@RequiresApi(24)
private ServiceWorkerController getFrameworksImpl() {
if (mFrameworksImpl == null) {
- mFrameworksImpl = ServiceWorkerController.getInstance();
+ mFrameworksImpl = ApiHelperForN.getServiceWorkerControllerInstance();
}
return mFrameworksImpl;
}
@@ -80,13 +79,12 @@
@Override
public void setServiceWorkerClient(@Nullable ServiceWorkerClientCompat client) {
- final WebViewFeatureInternal feature = WebViewFeatureInternal.SERVICE_WORKER_BASIC_USAGE;
+ final ApiFeature.N feature = WebViewFeatureInternal.SERVICE_WORKER_BASIC_USAGE;
if (feature.isSupportedByFramework()) {
if (client == null) {
- getFrameworksImpl().setServiceWorkerClient(null);
+ ApiHelperForN.setServiceWorkerClient(getFrameworksImpl(), null);
} else {
- getFrameworksImpl().setServiceWorkerClient(
- new FrameworkServiceWorkerClient(client));
+ ApiHelperForN.setServiceWorkerClientCompat(getFrameworksImpl(), client);
}
} else if (feature.isSupportedByWebView()) {
if (client == null) {
diff --git a/webkit/webkit/src/main/java/androidx/webkit/internal/ServiceWorkerWebSettingsImpl.java b/webkit/webkit/src/main/java/androidx/webkit/internal/ServiceWorkerWebSettingsImpl.java
index 6706532..e5519e9 100644
--- a/webkit/webkit/src/main/java/androidx/webkit/internal/ServiceWorkerWebSettingsImpl.java
+++ b/webkit/webkit/src/main/java/androidx/webkit/internal/ServiceWorkerWebSettingsImpl.java
@@ -88,9 +88,9 @@
@Override
public void setCacheMode(int mode) {
- final WebViewFeatureInternal feature = WebViewFeatureInternal.SERVICE_WORKER_CACHE_MODE;
+ final ApiFeature.N feature = WebViewFeatureInternal.SERVICE_WORKER_CACHE_MODE;
if (feature.isSupportedByFramework()) {
- getFrameworksImpl().setCacheMode(mode);
+ ApiHelperForN.setCacheMode(getFrameworksImpl(), mode);
} else if (feature.isSupportedByWebView()) {
getBoundaryInterface().setCacheMode(mode);
} else {
@@ -100,9 +100,9 @@
@Override
public int getCacheMode() {
- final WebViewFeatureInternal feature = WebViewFeatureInternal.SERVICE_WORKER_CACHE_MODE;
+ final ApiFeature.N feature = WebViewFeatureInternal.SERVICE_WORKER_CACHE_MODE;
if (feature.isSupportedByFramework()) {
- return getFrameworksImpl().getCacheMode();
+ return ApiHelperForN.getCacheMode(getFrameworksImpl());
} else if (feature.isSupportedByWebView()) {
return getBoundaryInterface().getCacheMode();
} else {
@@ -112,9 +112,9 @@
@Override
public void setAllowContentAccess(boolean allow) {
- final WebViewFeatureInternal feature = WebViewFeatureInternal.SERVICE_WORKER_CONTENT_ACCESS;
+ final ApiFeature.N feature = WebViewFeatureInternal.SERVICE_WORKER_CONTENT_ACCESS;
if (feature.isSupportedByFramework()) {
- getFrameworksImpl().setAllowContentAccess(allow);
+ ApiHelperForN.setAllowContentAccess(getFrameworksImpl(), allow);
} else if (feature.isSupportedByWebView()) {
getBoundaryInterface().setAllowContentAccess(allow);
} else {
@@ -124,9 +124,9 @@
@Override
public boolean getAllowContentAccess() {
- final WebViewFeatureInternal feature = WebViewFeatureInternal.SERVICE_WORKER_CONTENT_ACCESS;
+ final ApiFeature.N feature = WebViewFeatureInternal.SERVICE_WORKER_CONTENT_ACCESS;
if (feature.isSupportedByFramework()) {
- return getFrameworksImpl().getAllowContentAccess();
+ return ApiHelperForN.getAllowContentAccess(getFrameworksImpl());
} else if (feature.isSupportedByWebView()) {
return getBoundaryInterface().getAllowContentAccess();
} else {
@@ -136,9 +136,9 @@
@Override
public void setAllowFileAccess(boolean allow) {
- final WebViewFeatureInternal feature = WebViewFeatureInternal.SERVICE_WORKER_FILE_ACCESS;
+ final ApiFeature.N feature = WebViewFeatureInternal.SERVICE_WORKER_FILE_ACCESS;
if (feature.isSupportedByFramework()) {
- getFrameworksImpl().setAllowFileAccess(allow);
+ ApiHelperForN.setAllowFileAccess(getFrameworksImpl(), allow);
} else if (feature.isSupportedByWebView()) {
getBoundaryInterface().setAllowFileAccess(allow);
} else {
@@ -148,9 +148,9 @@
@Override
public boolean getAllowFileAccess() {
- final WebViewFeatureInternal feature = WebViewFeatureInternal.SERVICE_WORKER_FILE_ACCESS;
+ final ApiFeature.N feature = WebViewFeatureInternal.SERVICE_WORKER_FILE_ACCESS;
if (feature.isSupportedByFramework()) {
- return getFrameworksImpl().getAllowFileAccess();
+ return ApiHelperForN.getAllowFileAccess(getFrameworksImpl());
} else if (feature.isSupportedByWebView()) {
return getBoundaryInterface().getAllowFileAccess();
} else {
@@ -160,10 +160,9 @@
@Override
public void setBlockNetworkLoads(boolean flag) {
- final WebViewFeatureInternal feature =
- WebViewFeatureInternal.SERVICE_WORKER_BLOCK_NETWORK_LOADS;
+ final ApiFeature.N feature = WebViewFeatureInternal.SERVICE_WORKER_BLOCK_NETWORK_LOADS;
if (feature.isSupportedByFramework()) {
- getFrameworksImpl().setBlockNetworkLoads(flag);
+ ApiHelperForN.setBlockNetworkLoads(getFrameworksImpl(), flag);
} else if (feature.isSupportedByWebView()) {
getBoundaryInterface().setBlockNetworkLoads(flag);
} else {
@@ -173,10 +172,9 @@
@Override
public boolean getBlockNetworkLoads() {
- final WebViewFeatureInternal feature =
- WebViewFeatureInternal.SERVICE_WORKER_BLOCK_NETWORK_LOADS;
+ final ApiFeature.N feature = WebViewFeatureInternal.SERVICE_WORKER_BLOCK_NETWORK_LOADS;
if (feature.isSupportedByFramework()) {
- return getFrameworksImpl().getBlockNetworkLoads();
+ return ApiHelperForN.getBlockNetworkLoads(getFrameworksImpl());
} else if (feature.isSupportedByWebView()) {
return getBoundaryInterface().getBlockNetworkLoads();
} else {
@@ -186,8 +184,7 @@
@Override
public void setRequestedWithHeaderMode(int requestedWithHeaderMode) {
- final WebViewFeatureInternal feature =
- WebViewFeatureInternal.REQUESTED_WITH_HEADER_CONTROL;
+ final ApiFeature.NoFramework feature = WebViewFeatureInternal.REQUESTED_WITH_HEADER_CONTROL;
if (feature.isSupportedByWebView()) {
getBoundaryInterface().setRequestedWithHeaderMode(requestedWithHeaderMode);
} else {
@@ -197,8 +194,7 @@
@Override
public int getRequestedWithHeaderMode() {
- final WebViewFeatureInternal feature =
- WebViewFeatureInternal.REQUESTED_WITH_HEADER_CONTROL;
+ final ApiFeature.NoFramework feature = WebViewFeatureInternal.REQUESTED_WITH_HEADER_CONTROL;
if (feature.isSupportedByWebView()) {
return getBoundaryInterface().getRequestedWithHeaderMode();
} else {
diff --git a/webkit/webkit/src/main/java/androidx/webkit/internal/TracingControllerImpl.java b/webkit/webkit/src/main/java/androidx/webkit/internal/TracingControllerImpl.java
index 9492e87..6355172 100644
--- a/webkit/webkit/src/main/java/androidx/webkit/internal/TracingControllerImpl.java
+++ b/webkit/webkit/src/main/java/androidx/webkit/internal/TracingControllerImpl.java
@@ -17,6 +17,7 @@
package androidx.webkit.internal;
import androidx.annotation.NonNull;
+import androidx.annotation.Nullable;
import androidx.annotation.RequiresApi;
import androidx.webkit.TracingConfig;
import androidx.webkit.TracingController;
@@ -36,10 +37,9 @@
private TracingControllerBoundaryInterface mBoundaryInterface;
public TracingControllerImpl() {
- final WebViewFeatureInternal feature =
- WebViewFeatureInternal.TRACING_CONTROLLER_BASIC_USAGE;
+ final ApiFeature.P feature = WebViewFeatureInternal.TRACING_CONTROLLER_BASIC_USAGE;
if (feature.isSupportedByFramework()) {
- mFrameworksImpl = android.webkit.TracingController.getInstance();
+ mFrameworksImpl = ApiHelperForP.getTracingControllerInstance();
mBoundaryInterface = null;
} else if (feature.isSupportedByWebView()) {
mFrameworksImpl = null;
@@ -52,7 +52,7 @@
@RequiresApi(28)
private android.webkit.TracingController getFrameworksImpl() {
if (mFrameworksImpl == null) {
- mFrameworksImpl = android.webkit.TracingController.getInstance();
+ mFrameworksImpl = ApiHelperForP.getTracingControllerInstance();
}
return mFrameworksImpl;
}
@@ -66,10 +66,9 @@
@Override
public boolean isTracing() {
- final WebViewFeatureInternal feature =
- WebViewFeatureInternal.TRACING_CONTROLLER_BASIC_USAGE;
+ final ApiFeature.P feature = WebViewFeatureInternal.TRACING_CONTROLLER_BASIC_USAGE;
if (feature.isSupportedByFramework()) {
- return getFrameworksImpl().isTracing();
+ return ApiHelperForP.isTracing(getFrameworksImpl());
} else if (feature.isSupportedByWebView()) {
return getBoundaryInterface().isTracing();
} else {
@@ -83,15 +82,9 @@
throw new IllegalArgumentException("Tracing config must be non null");
}
- final WebViewFeatureInternal feature =
- WebViewFeatureInternal.TRACING_CONTROLLER_BASIC_USAGE;
+ final ApiFeature.P feature = WebViewFeatureInternal.TRACING_CONTROLLER_BASIC_USAGE;
if (feature.isSupportedByFramework()) {
- android.webkit.TracingConfig config = new android.webkit.TracingConfig.Builder()
- .addCategories(tracingConfig.getPredefinedCategories())
- .addCategories(tracingConfig.getCustomIncludedCategories())
- .setTracingMode(tracingConfig.getTracingMode())
- .build();
- getFrameworksImpl().start(config);
+ ApiHelperForP.start(getFrameworksImpl(), tracingConfig);
} else if (feature.isSupportedByWebView()) {
getBoundaryInterface().start(tracingConfig.getPredefinedCategories(),
tracingConfig.getCustomIncludedCategories(), tracingConfig.getTracingMode());
@@ -101,11 +94,10 @@
}
@Override
- public boolean stop(OutputStream outputStream, Executor executor) {
- final WebViewFeatureInternal feature =
- WebViewFeatureInternal.TRACING_CONTROLLER_BASIC_USAGE;
+ public boolean stop(@Nullable OutputStream outputStream, @NonNull Executor executor) {
+ final ApiFeature.P feature = WebViewFeatureInternal.TRACING_CONTROLLER_BASIC_USAGE;
if (feature.isSupportedByFramework()) {
- return getFrameworksImpl().stop(outputStream, executor);
+ return ApiHelperForP.stop(getFrameworksImpl(), outputStream, executor);
} else if (feature.isSupportedByWebView()) {
return getBoundaryInterface().stop(outputStream, executor);
} else {
diff --git a/webkit/webkit/src/main/java/androidx/webkit/internal/VisualStateCallbackAdapter.java b/webkit/webkit/src/main/java/androidx/webkit/internal/VisualStateCallbackAdapter.java
index 4e95e22..29529c5 100644
--- a/webkit/webkit/src/main/java/androidx/webkit/internal/VisualStateCallbackAdapter.java
+++ b/webkit/webkit/src/main/java/androidx/webkit/internal/VisualStateCallbackAdapter.java
@@ -16,6 +16,7 @@
package androidx.webkit.internal;
+import androidx.annotation.NonNull;
import androidx.webkit.WebViewCompat;
import org.chromium.support_lib_boundary.VisualStateCallbackBoundaryInterface;
@@ -25,9 +26,10 @@
* corresponding interface shared with the support library glue in the WebView APK).
*/
public class VisualStateCallbackAdapter implements VisualStateCallbackBoundaryInterface {
- private WebViewCompat.VisualStateCallback mVisualStateCallback;
+ private final WebViewCompat.VisualStateCallback mVisualStateCallback;
- public VisualStateCallbackAdapter(WebViewCompat.VisualStateCallback visualStateCallback) {
+ public VisualStateCallbackAdapter(
+ @NonNull WebViewCompat.VisualStateCallback visualStateCallback) {
mVisualStateCallback = visualStateCallback;
}
diff --git a/webkit/webkit/src/main/java/androidx/webkit/internal/WebMessageCallbackAdapter.java b/webkit/webkit/src/main/java/androidx/webkit/internal/WebMessageCallbackAdapter.java
index 9fe9b21..f68ba94 100644
--- a/webkit/webkit/src/main/java/androidx/webkit/internal/WebMessageCallbackAdapter.java
+++ b/webkit/webkit/src/main/java/androidx/webkit/internal/WebMessageCallbackAdapter.java
@@ -30,14 +30,14 @@
* Adapter between {@link WebMessageCallbackCompat} and {@link WebMessageCallbackBoundaryInterface}.
*/
public class WebMessageCallbackAdapter implements WebMessageCallbackBoundaryInterface {
- WebMessageCallbackCompat mImpl;
+ private final WebMessageCallbackCompat mImpl;
public WebMessageCallbackAdapter(@NonNull WebMessageCallbackCompat impl) {
mImpl = impl;
}
@Override
- public void onMessage(InvocationHandler port, InvocationHandler message) {
+ public void onMessage(@NonNull InvocationHandler port, @NonNull InvocationHandler message) {
mImpl.onMessage(new WebMessagePortImpl(port),
WebMessageAdapter.webMessageCompatFromBoundaryInterface(
BoundaryInterfaceReflectionUtil.castToSuppLibClass(
diff --git a/webkit/webkit/src/main/java/androidx/webkit/internal/WebMessagePortImpl.java b/webkit/webkit/src/main/java/androidx/webkit/internal/WebMessagePortImpl.java
index 8f41bdc5..551bf4c 100644
--- a/webkit/webkit/src/main/java/androidx/webkit/internal/WebMessagePortImpl.java
+++ b/webkit/webkit/src/main/java/androidx/webkit/internal/WebMessagePortImpl.java
@@ -41,11 +41,11 @@
private WebMessagePort mFrameworksImpl;
private WebMessagePortBoundaryInterface mBoundaryInterface;
- public WebMessagePortImpl(WebMessagePort frameworksImpl) {
+ public WebMessagePortImpl(@NonNull WebMessagePort frameworksImpl) {
mFrameworksImpl = frameworksImpl;
}
- public WebMessagePortImpl(InvocationHandler invocationHandler) {
+ public WebMessagePortImpl(@NonNull InvocationHandler invocationHandler) {
mBoundaryInterface = BoundaryInterfaceReflectionUtil.castToSuppLibClass(
WebMessagePortBoundaryInterface.class, invocationHandler);
}
@@ -71,9 +71,9 @@
@Override
public void postMessage(@NonNull WebMessageCompat message) {
- final WebViewFeatureInternal feature = WebViewFeatureInternal.WEB_MESSAGE_PORT_POST_MESSAGE;
+ final ApiFeature.M feature = WebViewFeatureInternal.WEB_MESSAGE_PORT_POST_MESSAGE;
if (feature.isSupportedByFramework()) {
- getFrameworksImpl().postMessage(compatToFrameworkMessage(message));
+ ApiHelperForM.postMessage(getFrameworksImpl(), compatToFrameworkMessage(message));
} else if (feature.isSupportedByWebView()) {
getBoundaryInterface().postMessage(
BoundaryInterfaceReflectionUtil.createInvocationHandlerFor(
@@ -85,9 +85,9 @@
@Override
public void close() {
- final WebViewFeatureInternal feature = WebViewFeatureInternal.WEB_MESSAGE_PORT_CLOSE;
+ final ApiFeature.M feature = WebViewFeatureInternal.WEB_MESSAGE_PORT_CLOSE;
if (feature.isSupportedByFramework()) {
- getFrameworksImpl().close();
+ ApiHelperForM.close(getFrameworksImpl());
} else if (feature.isSupportedByWebView()) {
getBoundaryInterface().close();
} else {
@@ -97,16 +97,9 @@
@Override
public void setWebMessageCallback(@NonNull final WebMessageCallbackCompat callback) {
- final WebViewFeatureInternal feature =
- WebViewFeatureInternal.WEB_MESSAGE_PORT_SET_MESSAGE_CALLBACK;
+ final ApiFeature.M feature = WebViewFeatureInternal.WEB_MESSAGE_PORT_SET_MESSAGE_CALLBACK;
if (feature.isSupportedByFramework()) {
- getFrameworksImpl().setWebMessageCallback(new WebMessagePort.WebMessageCallback() {
- @Override
- public void onMessage(WebMessagePort port, WebMessage message) {
- callback.onMessage(new WebMessagePortImpl(port),
- frameworkMessageToCompat(message));
- }
- });
+ ApiHelperForM.setWebMessageCallback(getFrameworksImpl(), callback);
} else if (feature.isSupportedByWebView()) {
getBoundaryInterface().setWebMessageCallback(
BoundaryInterfaceReflectionUtil.createInvocationHandlerFor(
@@ -117,17 +110,11 @@
}
@Override
- public void setWebMessageCallback(Handler handler,
+ public void setWebMessageCallback(@Nullable Handler handler,
@NonNull final WebMessageCallbackCompat callback) {
- final WebViewFeatureInternal feature = WebViewFeatureInternal.CREATE_WEB_MESSAGE_CHANNEL;
+ final ApiFeature.M feature = WebViewFeatureInternal.CREATE_WEB_MESSAGE_CHANNEL;
if (feature.isSupportedByFramework()) {
- getFrameworksImpl().setWebMessageCallback(new WebMessagePort.WebMessageCallback() {
- @Override
- public void onMessage(WebMessagePort port, WebMessage message) {
- callback.onMessage(new WebMessagePortImpl(port),
- frameworkMessageToCompat(message));
- }
- }, handler);
+ ApiHelperForM.setWebMessageCallback(getFrameworksImpl(), callback, handler);
} else if (feature.isSupportedByWebView()) {
getBoundaryInterface().setWebMessageCallback(
BoundaryInterfaceReflectionUtil.createInvocationHandlerFor(
@@ -137,12 +124,14 @@
}
}
+ @NonNull
@RequiresApi(23)
@Override
public WebMessagePort getFrameworkPort() {
return getFrameworksImpl();
}
+ @NonNull
@Override
public InvocationHandler getInvocationHandler() {
return Proxy.getInvocationHandler(getBoundaryInterface());
@@ -153,7 +142,7 @@
* corresponding support library class {@link WebMessagePortCompat}.
*/
@Nullable
- public static WebMessagePortCompat[] portsToCompat(WebMessagePort[] ports) {
+ public static WebMessagePortCompat[] portsToCompat(@Nullable WebMessagePort[] ports) {
if (ports == null) return null;
WebMessagePortCompat[] compatPorts = new WebMessagePortCompat[ports.length];
for (int n = 0; n < ports.length; n++) {
@@ -168,7 +157,7 @@
*/
@RequiresApi(23)
@Nullable
- public static WebMessagePort[] compatToPorts(WebMessagePortCompat[] compatPorts) {
+ public static WebMessagePort[] compatToPorts(@Nullable WebMessagePortCompat[] compatPorts) {
if (compatPorts == null) return null;
WebMessagePort[] ports = new WebMessagePort[compatPorts.length];
for (int n = 0; n < ports.length; n++) {
@@ -182,10 +171,8 @@
*/
@RequiresApi(23)
@NonNull
- public static WebMessage compatToFrameworkMessage(WebMessageCompat message) {
- return new WebMessage(
- message.getData(),
- compatToPorts(message.getPorts()));
+ public static WebMessage compatToFrameworkMessage(@NonNull WebMessageCompat message) {
+ return ApiHelperForM.createWebMessage(message);
}
/**
@@ -194,9 +181,7 @@
*/
@RequiresApi(23)
@NonNull
- public static WebMessageCompat frameworkMessageToCompat(WebMessage message) {
- return new WebMessageCompat(
- message.getData(),
- portsToCompat(message.getPorts()));
+ public static WebMessageCompat frameworkMessageToCompat(@NonNull WebMessage message) {
+ return ApiHelperForM.createWebMessageCompat(message);
}
}
diff --git a/webkit/webkit/src/main/java/androidx/webkit/internal/WebResourceErrorImpl.java b/webkit/webkit/src/main/java/androidx/webkit/internal/WebResourceErrorImpl.java
index 2a79eae..312e461 100644
--- a/webkit/webkit/src/main/java/androidx/webkit/internal/WebResourceErrorImpl.java
+++ b/webkit/webkit/src/main/java/androidx/webkit/internal/WebResourceErrorImpl.java
@@ -77,9 +77,9 @@
@Override
public int getErrorCode() {
- final WebViewFeatureInternal feature = WebViewFeatureInternal.WEB_RESOURCE_ERROR_GET_CODE;
+ final ApiFeature.M feature = WebViewFeatureInternal.WEB_RESOURCE_ERROR_GET_CODE;
if (feature.isSupportedByFramework()) {
- return getFrameworksImpl().getErrorCode();
+ return ApiHelperForM.getErrorCode(getFrameworksImpl());
} else if (feature.isSupportedByWebView()) {
return getBoundaryInterface().getErrorCode();
} else {
@@ -90,10 +90,9 @@
@NonNull
@Override
public CharSequence getDescription() {
- final WebViewFeatureInternal feature =
- WebViewFeatureInternal.WEB_RESOURCE_ERROR_GET_DESCRIPTION;
+ final ApiFeature.M feature = WebViewFeatureInternal.WEB_RESOURCE_ERROR_GET_DESCRIPTION;
if (feature.isSupportedByFramework()) {
- return getFrameworksImpl().getDescription();
+ return ApiHelperForM.getDescription(getFrameworksImpl());
} else if (feature.isSupportedByWebView()) {
return getBoundaryInterface().getDescription();
}
diff --git a/webkit/webkit/src/main/java/androidx/webkit/internal/WebResourceRequestAdapter.java b/webkit/webkit/src/main/java/androidx/webkit/internal/WebResourceRequestAdapter.java
index 0d6a05d..5fbd02e 100644
--- a/webkit/webkit/src/main/java/androidx/webkit/internal/WebResourceRequestAdapter.java
+++ b/webkit/webkit/src/main/java/androidx/webkit/internal/WebResourceRequestAdapter.java
@@ -18,6 +18,8 @@
import android.webkit.WebResourceRequest;
+import androidx.annotation.NonNull;
+
import org.chromium.support_lib_boundary.WebResourceRequestBoundaryInterface;
/**
@@ -27,7 +29,8 @@
public class WebResourceRequestAdapter {
private final WebResourceRequestBoundaryInterface mBoundaryInterface;
- public WebResourceRequestAdapter(WebResourceRequestBoundaryInterface boundaryInterface) {
+ public WebResourceRequestAdapter(
+ @NonNull WebResourceRequestBoundaryInterface boundaryInterface) {
mBoundaryInterface = boundaryInterface;
}
diff --git a/webkit/webkit/src/main/java/androidx/webkit/internal/WebSettingsAdapter.java b/webkit/webkit/src/main/java/androidx/webkit/internal/WebSettingsAdapter.java
index 1b7e334..963fb99 100644
--- a/webkit/webkit/src/main/java/androidx/webkit/internal/WebSettingsAdapter.java
+++ b/webkit/webkit/src/main/java/androidx/webkit/internal/WebSettingsAdapter.java
@@ -16,6 +16,8 @@
package androidx.webkit.internal;
+import androidx.annotation.NonNull;
+
import org.chromium.support_lib_boundary.WebSettingsBoundaryInterface;
/**
@@ -24,9 +26,9 @@
* corresponding interface shared with the support library glue in the WebView APK).
*/
public class WebSettingsAdapter {
- private WebSettingsBoundaryInterface mBoundaryInterface;
+ private final WebSettingsBoundaryInterface mBoundaryInterface;
- public WebSettingsAdapter(WebSettingsBoundaryInterface boundaryInterface) {
+ public WebSettingsAdapter(@NonNull WebSettingsBoundaryInterface boundaryInterface) {
mBoundaryInterface = boundaryInterface;
}
diff --git a/webkit/webkit/src/main/java/androidx/webkit/internal/WebViewFeatureInternal.java b/webkit/webkit/src/main/java/androidx/webkit/internal/WebViewFeatureInternal.java
index 06a581e..fc179e8 100644
--- a/webkit/webkit/src/main/java/androidx/webkit/internal/WebViewFeatureInternal.java
+++ b/webkit/webkit/src/main/java/androidx/webkit/internal/WebViewFeatureInternal.java
@@ -18,7 +18,6 @@
import android.content.Context;
import android.net.Uri;
-import android.os.Build;
import android.os.Handler;
import android.webkit.ValueCallback;
import android.webkit.WebResourceRequest;
@@ -26,7 +25,6 @@
import android.webkit.WebSettings;
import android.webkit.WebView;
-import androidx.annotation.ChecksSdkIntAtLeast;
import androidx.annotation.NonNull;
import androidx.annotation.VisibleForTesting;
import androidx.webkit.ProxyConfig;
@@ -43,11 +41,9 @@
import androidx.webkit.WebViewCompat;
import androidx.webkit.WebViewFeature;
-import org.chromium.support_lib_boundary.util.BoundaryInterfaceReflectionUtil;
import org.chromium.support_lib_boundary.util.Features;
import java.io.OutputStream;
-import java.util.Arrays;
import java.util.Collection;
import java.util.HashSet;
import java.util.Set;
@@ -57,46 +53,48 @@
* Enum representing a WebView feature, this provides functionality for determining whether a
* feature is supported by the current framework and/or WebView APK.
*/
-public enum WebViewFeatureInternal implements ConditionallySupportedFeature {
+public class WebViewFeatureInternal {
/**
* This feature covers
* {@link androidx.webkit.WebViewCompat#postVisualStateCallback(android.webkit.WebView, long,
* androidx.webkit.WebViewCompat.VisualStateCallback)}, and
* {@link WebViewClientCompat#onPageCommitVisible(android.webkit.WebView, String)}.
*/
- VISUAL_STATE_CALLBACK(WebViewFeature.VISUAL_STATE_CALLBACK,
- Features.VISUAL_STATE_CALLBACK, Build.VERSION_CODES.M),
+ public static final ApiFeature.M VISUAL_STATE_CALLBACK = new ApiFeature.M(
+ WebViewFeature.VISUAL_STATE_CALLBACK, Features.VISUAL_STATE_CALLBACK);
/**
* This feature covers
* {@link androidx.webkit.WebSettingsCompat#getOffscreenPreRaster(WebSettings)}, and
* {@link androidx.webkit.WebSettingsCompat#setOffscreenPreRaster(WebSettings, boolean)}.
*/
- OFF_SCREEN_PRERASTER(WebViewFeature.OFF_SCREEN_PRERASTER, Features.OFF_SCREEN_PRERASTER,
- Build.VERSION_CODES.M),
+ public static final ApiFeature.M OFF_SCREEN_PRERASTER = new ApiFeature.M(
+ WebViewFeature.OFF_SCREEN_PRERASTER, Features.OFF_SCREEN_PRERASTER);
/**
* This feature covers
* {@link androidx.webkit.WebSettingsCompat#getSafeBrowsingEnabled(WebSettings)}, and
* {@link androidx.webkit.WebSettingsCompat#setSafeBrowsingEnabled(WebSettings, boolean)}.
*/
- SAFE_BROWSING_ENABLE(WebViewFeature.SAFE_BROWSING_ENABLE, Features.SAFE_BROWSING_ENABLE,
- Build.VERSION_CODES.O),
+ public static final ApiFeature.O SAFE_BROWSING_ENABLE = new ApiFeature.O(
+ WebViewFeature.SAFE_BROWSING_ENABLE, Features.SAFE_BROWSING_ENABLE);
/**
* This feature covers
* {@link androidx.webkit.WebSettingsCompat#getDisabledActionModeMenuItems(WebSettings)}, and
* {@link androidx.webkit.WebSettingsCompat#setDisabledActionModeMenuItems(WebSettings, int)}.
*/
- DISABLED_ACTION_MODE_MENU_ITEMS(WebViewFeature.DISABLED_ACTION_MODE_MENU_ITEMS,
- Features.DISABLED_ACTION_MODE_MENU_ITEMS, Build.VERSION_CODES.N),
+ public static final ApiFeature.N DISABLED_ACTION_MODE_MENU_ITEMS = new ApiFeature.N(
+ WebViewFeature.DISABLED_ACTION_MODE_MENU_ITEMS,
+ Features.DISABLED_ACTION_MODE_MENU_ITEMS);
/**
* This feature covers
* {@link androidx.webkit.WebViewCompat#startSafeBrowsing(Context, ValueCallback)}.
*/
- START_SAFE_BROWSING(WebViewFeature.START_SAFE_BROWSING, Features.START_SAFE_BROWSING,
- Build.VERSION_CODES.O_MR1),
+ public static final ApiFeature.O_MR1 START_SAFE_BROWSING = new ApiFeature.O_MR1(
+ WebViewFeature.START_SAFE_BROWSING,
+ Features.START_SAFE_BROWSING);
/**
* This feature covers {@link androidx.webkit.WebViewCompat#setSafeBrowsingWhitelist(Set,
@@ -110,8 +108,9 @@
* <b>old</b> boundary interface
*/
@Deprecated
- SAFE_BROWSING_ALLOWLIST_DEPRECATED_TO_DEPRECATED(WebViewFeature.SAFE_BROWSING_WHITELIST,
- Features.SAFE_BROWSING_WHITELIST, Build.VERSION_CODES.O_MR1),
+ public static final ApiFeature.O_MR1 SAFE_BROWSING_ALLOWLIST_DEPRECATED_TO_DEPRECATED =
+ new ApiFeature.O_MR1(WebViewFeature.SAFE_BROWSING_WHITELIST,
+ Features.SAFE_BROWSING_WHITELIST);
/**
* This feature covers {@link androidx.webkit.WebViewCompat#setSafeBrowsingWhitelist(Set,
@@ -125,212 +124,235 @@
* <b>new</b> boundary interface.
*/
@Deprecated
- SAFE_BROWSING_ALLOWLIST_DEPRECATED_TO_PREFERRED(WebViewFeature.SAFE_BROWSING_WHITELIST,
- Features.SAFE_BROWSING_ALLOWLIST, Build.VERSION_CODES.O_MR1),
+ public static final ApiFeature.O_MR1 SAFE_BROWSING_ALLOWLIST_DEPRECATED_TO_PREFERRED =
+ new ApiFeature.O_MR1(WebViewFeature.SAFE_BROWSING_WHITELIST,
+ Features.SAFE_BROWSING_ALLOWLIST);
/**
* This feature covers {@link androidx.webkit.WebViewCompat#setSafeBrowsingAllowlist(Set,
* ValueCallback)}, plumbing through the deprecated boundary interface.
*/
- SAFE_BROWSING_ALLOWLIST_PREFERRED_TO_DEPRECATED(WebViewFeature.SAFE_BROWSING_ALLOWLIST,
- Features.SAFE_BROWSING_WHITELIST, Build.VERSION_CODES.O_MR1),
+ public static final ApiFeature.O_MR1 SAFE_BROWSING_ALLOWLIST_PREFERRED_TO_DEPRECATED =
+ new ApiFeature.O_MR1(WebViewFeature.SAFE_BROWSING_ALLOWLIST,
+ Features.SAFE_BROWSING_WHITELIST);
/**
* This feature covers {@link androidx.webkit.WebViewCompat#setSafeBrowsingAllowlist(Set,
* ValueCallback)}, plumbing through the new boundary interface.
*/
- SAFE_BROWSING_ALLOWLIST_PREFERRED_TO_PREFERRED(WebViewFeature.SAFE_BROWSING_ALLOWLIST,
- Features.SAFE_BROWSING_ALLOWLIST, Build.VERSION_CODES.O_MR1),
+ public static final ApiFeature.O_MR1 SAFE_BROWSING_ALLOWLIST_PREFERRED_TO_PREFERRED =
+ new ApiFeature.O_MR1(WebViewFeature.SAFE_BROWSING_ALLOWLIST,
+ Features.SAFE_BROWSING_ALLOWLIST);
/**
* This feature covers
* {@link WebViewCompat#getSafeBrowsingPrivacyPolicyUrl()}.
*/
- SAFE_BROWSING_PRIVACY_POLICY_URL(WebViewFeature.SAFE_BROWSING_PRIVACY_POLICY_URL,
- Features.SAFE_BROWSING_PRIVACY_POLICY_URL, Build.VERSION_CODES.O_MR1),
+ public static final ApiFeature.O_MR1 SAFE_BROWSING_PRIVACY_POLICY_URL =
+ new ApiFeature.O_MR1(WebViewFeature.SAFE_BROWSING_PRIVACY_POLICY_URL,
+ Features.SAFE_BROWSING_PRIVACY_POLICY_URL);
/**
* This feature covers
* {@link androidx.webkit.ServiceWorkerControllerCompat#getInstance()}.
*/
- SERVICE_WORKER_BASIC_USAGE(WebViewFeature.SERVICE_WORKER_BASIC_USAGE,
- Features.SERVICE_WORKER_BASIC_USAGE, Build.VERSION_CODES.N),
+ public static final ApiFeature.N SERVICE_WORKER_BASIC_USAGE =
+ new ApiFeature.N(WebViewFeature.SERVICE_WORKER_BASIC_USAGE,
+ Features.SERVICE_WORKER_BASIC_USAGE);
/**
* This feature covers
* {@link androidx.webkit.ServiceWorkerWebSettingsCompat#getCacheMode()}, and
* {@link androidx.webkit.ServiceWorkerWebSettingsCompat#setCacheMode(int)}.
*/
- SERVICE_WORKER_CACHE_MODE(WebViewFeature.SERVICE_WORKER_CACHE_MODE,
- Features.SERVICE_WORKER_CACHE_MODE, Build.VERSION_CODES.N),
+ public static final ApiFeature.N SERVICE_WORKER_CACHE_MODE =
+ new ApiFeature.N(WebViewFeature.SERVICE_WORKER_CACHE_MODE,
+ Features.SERVICE_WORKER_CACHE_MODE);
/**
* This feature covers
* {@link androidx.webkit.ServiceWorkerWebSettingsCompat#getAllowContentAccess()}, and
* {@link androidx.webkit.ServiceWorkerWebSettingsCompat#setAllowContentAccess(boolean)}.
*/
- SERVICE_WORKER_CONTENT_ACCESS(WebViewFeature.SERVICE_WORKER_CONTENT_ACCESS,
- Features.SERVICE_WORKER_CONTENT_ACCESS, Build.VERSION_CODES.N),
+ public static final ApiFeature.N SERVICE_WORKER_CONTENT_ACCESS =
+ new ApiFeature.N(WebViewFeature.SERVICE_WORKER_CONTENT_ACCESS,
+ Features.SERVICE_WORKER_CONTENT_ACCESS);
/**
* This feature covers
* {@link androidx.webkit.ServiceWorkerWebSettingsCompat#getAllowFileAccess()}, and
* {@link androidx.webkit.ServiceWorkerWebSettingsCompat#setAllowFileAccess(boolean)}.
*/
- SERVICE_WORKER_FILE_ACCESS(WebViewFeature.SERVICE_WORKER_FILE_ACCESS,
- Features.SERVICE_WORKER_FILE_ACCESS, Build.VERSION_CODES.N),
+ public static final ApiFeature.N SERVICE_WORKER_FILE_ACCESS =
+ new ApiFeature.N(WebViewFeature.SERVICE_WORKER_FILE_ACCESS,
+ Features.SERVICE_WORKER_FILE_ACCESS);
/**
* This feature covers
* {@link androidx.webkit.ServiceWorkerWebSettingsCompat#getBlockNetworkLoads()}, and
* {@link androidx.webkit.ServiceWorkerWebSettingsCompat#setBlockNetworkLoads(boolean)}.
*/
- SERVICE_WORKER_BLOCK_NETWORK_LOADS(WebViewFeature.SERVICE_WORKER_BLOCK_NETWORK_LOADS,
- Features.SERVICE_WORKER_BLOCK_NETWORK_LOADS, Build.VERSION_CODES.N),
+ public static final ApiFeature.N SERVICE_WORKER_BLOCK_NETWORK_LOADS =
+ new ApiFeature.N(WebViewFeature.SERVICE_WORKER_BLOCK_NETWORK_LOADS,
+ Features.SERVICE_WORKER_BLOCK_NETWORK_LOADS);
/**
* This feature covers
* {@link ServiceWorkerClientCompat#shouldInterceptRequest(WebResourceRequest)}.
*/
- SERVICE_WORKER_SHOULD_INTERCEPT_REQUEST(WebViewFeature.SERVICE_WORKER_SHOULD_INTERCEPT_REQUEST,
- Features.SERVICE_WORKER_SHOULD_INTERCEPT_REQUEST, Build.VERSION_CODES.N),
+ public static final ApiFeature.N SERVICE_WORKER_SHOULD_INTERCEPT_REQUEST =
+ new ApiFeature.N(WebViewFeature.SERVICE_WORKER_SHOULD_INTERCEPT_REQUEST,
+ Features.SERVICE_WORKER_SHOULD_INTERCEPT_REQUEST);
/**
* This feature covers
* {@link WebViewClientCompat#onReceivedError(android.webkit.WebView, WebResourceRequest,
* WebResourceErrorCompat)}.
*/
- RECEIVE_WEB_RESOURCE_ERROR(WebViewFeature.RECEIVE_WEB_RESOURCE_ERROR,
- Features.RECEIVE_WEB_RESOURCE_ERROR, Build.VERSION_CODES.M),
+ public static final ApiFeature.M RECEIVE_WEB_RESOURCE_ERROR =
+ new ApiFeature.M(WebViewFeature.RECEIVE_WEB_RESOURCE_ERROR,
+ Features.RECEIVE_WEB_RESOURCE_ERROR);
/**
* This feature covers
* {@link WebViewClientCompat#onReceivedHttpError(android.webkit.WebView, WebResourceRequest,
* WebResourceResponse)}.
*/
- RECEIVE_HTTP_ERROR(WebViewFeature.RECEIVE_HTTP_ERROR, Features.RECEIVE_HTTP_ERROR,
- Build.VERSION_CODES.M),
+ public static final ApiFeature.M RECEIVE_HTTP_ERROR = new ApiFeature.M(
+ WebViewFeature.RECEIVE_HTTP_ERROR, Features.RECEIVE_HTTP_ERROR);
/**
* This feature covers
* {@link WebViewClientCompat#shouldOverrideUrlLoading(android.webkit.WebView,
* WebResourceRequest)}.
*/
- SHOULD_OVERRIDE_WITH_REDIRECTS(WebViewFeature.SHOULD_OVERRIDE_WITH_REDIRECTS,
- Features.SHOULD_OVERRIDE_WITH_REDIRECTS, Build.VERSION_CODES.N),
+ public static final ApiFeature.N SHOULD_OVERRIDE_WITH_REDIRECTS =
+ new ApiFeature.N(WebViewFeature.SHOULD_OVERRIDE_WITH_REDIRECTS,
+ Features.SHOULD_OVERRIDE_WITH_REDIRECTS);
/**
* This feature covers
* {@link WebViewClientCompat#onSafeBrowsingHit(android.webkit.WebView,
* WebResourceRequest, int, SafeBrowsingResponseCompat)}.
*/
- SAFE_BROWSING_HIT(WebViewFeature.SAFE_BROWSING_HIT, Features.SAFE_BROWSING_HIT,
- Build.VERSION_CODES.O_MR1),
+ public static final ApiFeature.O_MR1 SAFE_BROWSING_HIT = new ApiFeature.O_MR1(
+ WebViewFeature.SAFE_BROWSING_HIT, Features.SAFE_BROWSING_HIT);
/**
* This feature covers
* {@link WebResourceRequestCompat#isRedirect(WebResourceRequest)}.
*/
- WEB_RESOURCE_REQUEST_IS_REDIRECT(WebViewFeature.WEB_RESOURCE_REQUEST_IS_REDIRECT,
- Features.WEB_RESOURCE_REQUEST_IS_REDIRECT, Build.VERSION_CODES.N),
+ public static final ApiFeature.N WEB_RESOURCE_REQUEST_IS_REDIRECT =
+ new ApiFeature.N(WebViewFeature.WEB_RESOURCE_REQUEST_IS_REDIRECT,
+ Features.WEB_RESOURCE_REQUEST_IS_REDIRECT);
/**
* This feature covers
* {@link WebResourceErrorCompat#getDescription()}.
*/
- WEB_RESOURCE_ERROR_GET_DESCRIPTION(WebViewFeature.WEB_RESOURCE_ERROR_GET_DESCRIPTION,
- Features.WEB_RESOURCE_ERROR_GET_DESCRIPTION, Build.VERSION_CODES.M),
+ public static final ApiFeature.M WEB_RESOURCE_ERROR_GET_DESCRIPTION =
+ new ApiFeature.M(WebViewFeature.WEB_RESOURCE_ERROR_GET_DESCRIPTION,
+ Features.WEB_RESOURCE_ERROR_GET_DESCRIPTION);
/**
* This feature covers
* {@link WebResourceErrorCompat#getErrorCode()}.
*/
- WEB_RESOURCE_ERROR_GET_CODE(WebViewFeature.WEB_RESOURCE_ERROR_GET_CODE,
- Features.WEB_RESOURCE_ERROR_GET_CODE, Build.VERSION_CODES.M),
+ public static final ApiFeature.M WEB_RESOURCE_ERROR_GET_CODE =
+ new ApiFeature.M(WebViewFeature.WEB_RESOURCE_ERROR_GET_CODE,
+ Features.WEB_RESOURCE_ERROR_GET_CODE);
/**
* This feature covers
* {@link SafeBrowsingResponseCompat#backToSafety(boolean)}.
*/
- SAFE_BROWSING_RESPONSE_BACK_TO_SAFETY(WebViewFeature.SAFE_BROWSING_RESPONSE_BACK_TO_SAFETY,
- Features.SAFE_BROWSING_RESPONSE_BACK_TO_SAFETY, Build.VERSION_CODES.O_MR1),
+ public static final ApiFeature.O_MR1 SAFE_BROWSING_RESPONSE_BACK_TO_SAFETY =
+ new ApiFeature.O_MR1(WebViewFeature.SAFE_BROWSING_RESPONSE_BACK_TO_SAFETY,
+ Features.SAFE_BROWSING_RESPONSE_BACK_TO_SAFETY);
/**
* This feature covers
* {@link SafeBrowsingResponseCompat#proceed(boolean)}.
*/
- SAFE_BROWSING_RESPONSE_PROCEED(WebViewFeature.SAFE_BROWSING_RESPONSE_PROCEED,
- Features.SAFE_BROWSING_RESPONSE_PROCEED, Build.VERSION_CODES.O_MR1),
+ public static final ApiFeature.O_MR1 SAFE_BROWSING_RESPONSE_PROCEED =
+ new ApiFeature.O_MR1(WebViewFeature.SAFE_BROWSING_RESPONSE_PROCEED,
+ Features.SAFE_BROWSING_RESPONSE_PROCEED);
/**
* This feature covers
* {@link SafeBrowsingResponseCompat#showInterstitial(boolean)}.
*/
- SAFE_BROWSING_RESPONSE_SHOW_INTERSTITIAL(
- WebViewFeature.SAFE_BROWSING_RESPONSE_SHOW_INTERSTITIAL,
- Features.SAFE_BROWSING_RESPONSE_SHOW_INTERSTITIAL, Build.VERSION_CODES.O_MR1),
+ public static final ApiFeature.O_MR1 SAFE_BROWSING_RESPONSE_SHOW_INTERSTITIAL =
+ new ApiFeature.O_MR1(WebViewFeature.SAFE_BROWSING_RESPONSE_SHOW_INTERSTITIAL,
+ Features.SAFE_BROWSING_RESPONSE_SHOW_INTERSTITIAL);
/**
* This feature covers
* {@link WebMessagePortCompat#postMessage(WebMessageCompat)}.
*/
- WEB_MESSAGE_PORT_POST_MESSAGE(WebViewFeature.WEB_MESSAGE_PORT_POST_MESSAGE,
- Features.WEB_MESSAGE_PORT_POST_MESSAGE, Build.VERSION_CODES.M),
+ public static final ApiFeature.M WEB_MESSAGE_PORT_POST_MESSAGE =
+ new ApiFeature.M(WebViewFeature.WEB_MESSAGE_PORT_POST_MESSAGE,
+ Features.WEB_MESSAGE_PORT_POST_MESSAGE);
/**
* * This feature covers
* {@link androidx.webkit.WebMessagePortCompat#close()}.
*/
- WEB_MESSAGE_PORT_CLOSE(WebViewFeature.WEB_MESSAGE_PORT_CLOSE, Features.WEB_MESSAGE_PORT_CLOSE,
- Build.VERSION_CODES.M),
+ public static final ApiFeature.M WEB_MESSAGE_PORT_CLOSE =
+ new ApiFeature.M(WebViewFeature.WEB_MESSAGE_PORT_CLOSE,
+ Features.WEB_MESSAGE_PORT_CLOSE);
/**
* This feature covers
* {@link WebMessagePortCompat#setWebMessageCallback(
- * WebMessagePortCompat.WebMessageCallbackCompat)}, and
+ *WebMessagePortCompat.WebMessageCallbackCompat)}, and
* {@link WebMessagePortCompat#setWebMessageCallback(Handler,
* WebMessagePortCompat.WebMessageCallbackCompat)}.
*/
- WEB_MESSAGE_PORT_SET_MESSAGE_CALLBACK(WebViewFeature.WEB_MESSAGE_PORT_SET_MESSAGE_CALLBACK,
- Features.WEB_MESSAGE_PORT_SET_MESSAGE_CALLBACK, Build.VERSION_CODES.M),
+ public static final ApiFeature.M WEB_MESSAGE_PORT_SET_MESSAGE_CALLBACK =
+ new ApiFeature.M(WebViewFeature.WEB_MESSAGE_PORT_SET_MESSAGE_CALLBACK,
+ Features.WEB_MESSAGE_PORT_SET_MESSAGE_CALLBACK);
/**
* This feature covers
* {@link WebViewCompat#createWebMessageChannel(WebView)}.
*/
- CREATE_WEB_MESSAGE_CHANNEL(WebViewFeature.CREATE_WEB_MESSAGE_CHANNEL,
- Features.CREATE_WEB_MESSAGE_CHANNEL, Build.VERSION_CODES.M),
+ public static final ApiFeature.M CREATE_WEB_MESSAGE_CHANNEL =
+ new ApiFeature.M(WebViewFeature.CREATE_WEB_MESSAGE_CHANNEL,
+ Features.CREATE_WEB_MESSAGE_CHANNEL);
/**
* This feature covers
* {@link WebViewCompat#postWebMessage(WebView, WebMessageCompat, Uri)}.
*/
- POST_WEB_MESSAGE(WebViewFeature.POST_WEB_MESSAGE, Features.POST_WEB_MESSAGE,
- Build.VERSION_CODES.M),
+ public static final ApiFeature.M POST_WEB_MESSAGE = new ApiFeature.M(
+ WebViewFeature.POST_WEB_MESSAGE, Features.POST_WEB_MESSAGE);
/**
* This feature covers
* {@link WebViewCompat#postWebMessage(WebView, WebMessageCompat, Uri)}.
*/
- WEB_MESSAGE_CALLBACK_ON_MESSAGE(WebViewFeature.WEB_MESSAGE_CALLBACK_ON_MESSAGE,
- Features.WEB_MESSAGE_CALLBACK_ON_MESSAGE, Build.VERSION_CODES.M),
+ public static final ApiFeature.M WEB_MESSAGE_CALLBACK_ON_MESSAGE =
+ new ApiFeature.M(WebViewFeature.WEB_MESSAGE_CALLBACK_ON_MESSAGE,
+ Features.WEB_MESSAGE_CALLBACK_ON_MESSAGE);
/**
* This feature covers {@link WebViewCompat#getWebViewClient(WebView)}.
*/
- GET_WEB_VIEW_CLIENT(WebViewFeature.GET_WEB_VIEW_CLIENT, Features.GET_WEB_VIEW_CLIENT,
- Build.VERSION_CODES.O),
+ public static final ApiFeature.O GET_WEB_VIEW_CLIENT = new ApiFeature.O(
+ WebViewFeature.GET_WEB_VIEW_CLIENT, Features.GET_WEB_VIEW_CLIENT);
/**
* This feature covers {@link WebViewCompat#getWebChromeClient(WebView)}.
*/
- GET_WEB_CHROME_CLIENT(WebViewFeature.GET_WEB_CHROME_CLIENT, Features.GET_WEB_CHROME_CLIENT,
- Build.VERSION_CODES.O),
+ public static final ApiFeature.O GET_WEB_CHROME_CLIENT =
+ new ApiFeature.O(WebViewFeature.GET_WEB_CHROME_CLIENT, Features.GET_WEB_CHROME_CLIENT);
- GET_WEB_VIEW_RENDERER(WebViewFeature.GET_WEB_VIEW_RENDERER, Features.GET_WEB_VIEW_RENDERER,
- Build.VERSION_CODES.Q),
- WEB_VIEW_RENDERER_TERMINATE(WebViewFeature.WEB_VIEW_RENDERER_TERMINATE,
- Features.WEB_VIEW_RENDERER_TERMINATE, Build.VERSION_CODES.Q),
+ public static final ApiFeature.Q GET_WEB_VIEW_RENDERER =
+ new ApiFeature.Q(WebViewFeature.GET_WEB_VIEW_RENDERER, Features.GET_WEB_VIEW_RENDERER);
+ public static final ApiFeature.Q WEB_VIEW_RENDERER_TERMINATE =
+ new ApiFeature.Q(WebViewFeature.WEB_VIEW_RENDERER_TERMINATE,
+ Features.WEB_VIEW_RENDERER_TERMINATE);
/**
* This feature covers
@@ -339,18 +361,20 @@
* {@link TracingController#start(TracingConfig)},
* {@link TracingController#stop(OutputStream, Executor)}.
*/
- TRACING_CONTROLLER_BASIC_USAGE(WebViewFeature.TRACING_CONTROLLER_BASIC_USAGE,
- Features.TRACING_CONTROLLER_BASIC_USAGE, Build.VERSION_CODES.P),
+ public static final ApiFeature.P TRACING_CONTROLLER_BASIC_USAGE =
+ new ApiFeature.P(WebViewFeature.TRACING_CONTROLLER_BASIC_USAGE,
+ Features.TRACING_CONTROLLER_BASIC_USAGE);
/**
* This feature covers
* {@link WebViewCompat#getWebViewRenderProcessClient()},
* {@link WebViewCompat#setWebViewRenderProcessClient(WebViewRenderProcessClient)},
- * {@link WebViewRenderProcessClient#onRenderProcessUnresponsive(WebView,WebViewRenderProcess)},
- * {@link WebViewRenderProcessClient#onRenderProcessResponsive(WebView,WebViewRenderProcess)}
+ * {@link WebViewRenderProcessClient#onRenderProcessUnresponsive(WebView, WebViewRenderProcess)},
+ * {@link WebViewRenderProcessClient#onRenderProcessResponsive(WebView, WebViewRenderProcess)}
*/
- WEB_VIEW_RENDERER_CLIENT_BASIC_USAGE(WebViewFeature.WEB_VIEW_RENDERER_CLIENT_BASIC_USAGE,
- Features.WEB_VIEW_RENDERER_CLIENT_BASIC_USAGE, Build.VERSION_CODES.Q),
+ public static final ApiFeature.Q WEB_VIEW_RENDERER_CLIENT_BASIC_USAGE =
+ new ApiFeature.Q(WebViewFeature.WEB_VIEW_RENDERER_CLIENT_BASIC_USAGE,
+ Features.WEB_VIEW_RENDERER_CLIENT_BASIC_USAGE);
/**
* This feature covers
@@ -359,40 +383,49 @@
* {@link ProxyController#clearProxyOverride(Executor, Runnable)}, and
* {@link ProxyController#clearProxyOverride(Runnable)}.
*/
- PROXY_OVERRIDE(WebViewFeature.PROXY_OVERRIDE, Features.PROXY_OVERRIDE),
+ public static final ApiFeature.NoFramework PROXY_OVERRIDE = new ApiFeature.NoFramework(
+ WebViewFeature.PROXY_OVERRIDE, Features.PROXY_OVERRIDE);
/**
* This feature covers
* {@link androidx.webkit.WebSettingsCompat#willSuppressErrorPage(WebSettings)} and
* {@link androidx.webkit.WebSettingsCompat#setWillSuppressErrorPage(WebSettings, boolean)}.
*/
- SUPPRESS_ERROR_PAGE(WebViewFeature.SUPPRESS_ERROR_PAGE, Features.SUPPRESS_ERROR_PAGE),
+ public static final ApiFeature.NoFramework SUPPRESS_ERROR_PAGE =
+ new ApiFeature.NoFramework(WebViewFeature.SUPPRESS_ERROR_PAGE,
+ Features.SUPPRESS_ERROR_PAGE);
/**
* This feature covers {@link WebViewCompat#isMultiProcessEnabled()}.
*/
- MULTI_PROCESS(WebViewFeature.MULTI_PROCESS, Features.MULTI_PROCESS_QUERY),
+ public static final ApiFeature.NoFramework MULTI_PROCESS = new ApiFeature.NoFramework(
+ WebViewFeature.MULTI_PROCESS, Features.MULTI_PROCESS_QUERY);
/**
* This feature covers
* {@link androidx.webkit.WebSettingsCompat#setForceDark(WebSettings, int)} and
* {@link androidx.webkit.WebSettingsCompat#getForceDark(WebSettings)}.
*/
- FORCE_DARK(WebViewFeature.FORCE_DARK, Features.FORCE_DARK),
+ public static final ApiFeature.NoFramework FORCE_DARK = new ApiFeature.NoFramework(
+ WebViewFeature.FORCE_DARK, Features.FORCE_DARK);
/**
* This feature covers
* {@link androidx.webkit.WebSettingsCompat#setForceDarkStrategy(WebSettings, int)} and
* {@link androidx.webkit.WebSettingsCompat#getForceDarkStrategy(WebSettings)}.
*/
- FORCE_DARK_STRATEGY(WebViewFeature.FORCE_DARK_STRATEGY, Features.FORCE_DARK_BEHAVIOR),
+ public static final ApiFeature.NoFramework FORCE_DARK_STRATEGY =
+ new ApiFeature.NoFramework(WebViewFeature.FORCE_DARK_STRATEGY,
+ Features.FORCE_DARK_BEHAVIOR);
/**
* This feature covers
* {@link androidx.webkit.WebSettingsCompat#setAlgorithmicDarkeningAllowed(WebSettings, boolean)} and
* {@link androidx.webkit.WebSettingsCompat#isAlgorithmicDarkeningAllowed(WebSettings)}.
*/
- ALGORITHMIC_DARKENING(WebViewFeature.ALGORITHMIC_DARKENING, Features.ALGORITHMIC_DARKENING),
+ public static final ApiFeature.NoFramework ALGORITHMIC_DARKENING =
+ new ApiFeature.NoFramework(WebViewFeature.ALGORITHMIC_DARKENING,
+ Features.ALGORITHMIC_DARKENING);
/**
* This feature covers
@@ -400,7 +433,9 @@
* androidx.webkit.WebViewCompat.WebMessageListener, String, String[])} and
* {@link androidx.webkit.WebViewCompat#removeWebMessageListener()}
*/
- WEB_MESSAGE_LISTENER(WebViewFeature.WEB_MESSAGE_LISTENER, Features.WEB_MESSAGE_LISTENER),
+ public static final ApiFeature.NoFramework WEB_MESSAGE_LISTENER =
+ new ApiFeature.NoFramework(WebViewFeature.WEB_MESSAGE_LISTENER,
+ Features.WEB_MESSAGE_LISTENER);
/**
* This feature covers
@@ -408,19 +443,24 @@
* androidx.webkit.WebViewCompat#addDocumentStartJavaScript(android.webkit.WebView, String,
* Set)}
*/
- DOCUMENT_START_SCRIPT(WebViewFeature.DOCUMENT_START_SCRIPT, Features.DOCUMENT_START_SCRIPT),
+ public static final ApiFeature.NoFramework DOCUMENT_START_SCRIPT =
+ new ApiFeature.NoFramework(WebViewFeature.DOCUMENT_START_SCRIPT,
+ Features.DOCUMENT_START_SCRIPT);
/**
* This feature covers {@link androidx.webkit.ProxyConfig.Builder.setReverseBypass(boolean)}
*/
- PROXY_OVERRIDE_REVERSE_BYPASS(WebViewFeature.PROXY_OVERRIDE_REVERSE_BYPASS,
- Features.PROXY_OVERRIDE_REVERSE_BYPASS),
+ public static final ApiFeature.NoFramework PROXY_OVERRIDE_REVERSE_BYPASS =
+ new ApiFeature.NoFramework(WebViewFeature.PROXY_OVERRIDE_REVERSE_BYPASS,
+ Features.PROXY_OVERRIDE_REVERSE_BYPASS);
/**
* This feature covers
* {@link androidx.webkit.WebViewCompat#getVariationsHeader()}
*/
- GET_VARIATIONS_HEADER(WebViewFeature.GET_VARIATIONS_HEADER, Features.GET_VARIATIONS_HEADER),
+ public static final ApiFeature.NoFramework GET_VARIATIONS_HEADER =
+ new ApiFeature.NoFramework(WebViewFeature.GET_VARIATIONS_HEADER,
+ Features.GET_VARIATIONS_HEADER);
/**
* This feature covers
@@ -429,55 +469,22 @@
* {@link androidx.webkit.ServiceWorkerWebSettingsCompat#setRequestedWithHeaderMode(int)},
* and {@link androidx.webkit.ServiceWorkerWebSettingsCompat#getRequestedWithHeaderMode()}
*/
- REQUESTED_WITH_HEADER_CONTROL(WebViewFeature.REQUESTED_WITH_HEADER_CONTROL,
- Features.REQUESTED_WITH_HEADER_CONTROL),
+ public static final ApiFeature.NoFramework REQUESTED_WITH_HEADER_CONTROL =
+ new ApiFeature.NoFramework(WebViewFeature.REQUESTED_WITH_HEADER_CONTROL,
+ Features.REQUESTED_WITH_HEADER_CONTROL);
- ; // This semicolon ends the enum. Add new features with a trailing comma above this line.
+ // --- Add new feature constants above this line ---
- private static final int NOT_SUPPORTED_BY_FRAMEWORK = -1;
- private final String mPublicFeatureValue;
- private final String mInternalFeatureValue;
- private final int mOsVersion;
-
- /**
- * Creates a WebViewFeatureInternal that does not correspond to a framework API.
- *
- * <p>Features constructed with this constructor can be later converted to use the
- * other constructor if framework support is added.
- *
- * @param publicFeatureValue The public facing feature string denoting this feature
- * @param internalFeatureValue The internal feature string denoting this feature
- */
- WebViewFeatureInternal(@NonNull @WebViewFeature.WebViewSupportFeature String publicFeatureValue,
- @NonNull String internalFeatureValue) {
- this(publicFeatureValue, internalFeatureValue, NOT_SUPPORTED_BY_FRAMEWORK);
+ private WebViewFeatureInternal() {
+ // Class should not be instantiated
}
/**
- * Creates a WebViewFeatureInternal that is implemented in the framework.
- *
- * @param publicFeatureValue The public facing feature string denoting this feature
- * @param internalFeatureValue The internal feature string denoting this feature
- * @param osVersion The Android SDK level after which this feature is implemented
- * in the framework.
- */
- WebViewFeatureInternal(@NonNull @WebViewFeature.WebViewSupportFeature String publicFeatureValue,
- @NonNull String internalFeatureValue, int osVersion) {
- mPublicFeatureValue = publicFeatureValue;
- mInternalFeatureValue = internalFeatureValue;
- mOsVersion = osVersion;
- }
-
- /**
- * Return whether a public feature is supported by any internal features defined in this enum.
+ * Return whether a public feature is supported by any internal features defined in this class.
*/
public static boolean isSupported(
@NonNull @WebViewFeature.WebViewSupportFeature String publicFeatureValue) {
- Set<ConditionallySupportedFeature> features = new HashSet<>();
- for (WebViewFeatureInternal feature : WebViewFeatureInternal.values()) {
- features.add(feature);
- }
- return isSupported(publicFeatureValue, features);
+ return isSupported(publicFeatureValue, ApiFeature.values());
}
/**
@@ -488,9 +495,9 @@
* {@code internalFeatures}
*/
@VisibleForTesting
- public static boolean isSupported(
+ public static <T extends ConditionallySupportedFeature> boolean isSupported(
@NonNull @WebViewFeature.WebViewSupportFeature String publicFeatureValue,
- @NonNull Collection<ConditionallySupportedFeature> internalFeatures) {
+ @NonNull Collection<T> internalFeatures) {
Set<ConditionallySupportedFeature> matchingFeatures = new HashSet<>();
for (ConditionallySupportedFeature feature : internalFeatures) {
if (feature.getPublicFeatureName().equals(publicFeatureValue)) {
@@ -507,58 +514,6 @@
}
/**
- * Return whether this {@link WebViewFeatureInternal} is supported by the framework of the
- * current device. By design, this library does not include any APIs added to the framework in
- * Android L or earlier, so if this returns true it implies L or above.
- *
- * <p>By design, this library does not provide compat versions of any APIs added to the platform
- * in Android L or earlier, so all APIs have mOsVersion strictly greater than LOLLIPOP. If this
- * returns true, then that implies we're on Android L or above.
- */
- @ChecksSdkIntAtLeast(api = Build.VERSION_CODES.LOLLIPOP)
- public boolean isSupportedByFramework() {
- if (mOsVersion == NOT_SUPPORTED_BY_FRAMEWORK) {
- return false;
- }
- return Build.VERSION.SDK_INT >= mOsVersion;
- }
-
- /**
- * Return whether this {@link WebViewFeatureInternal} is supported by the current WebView APK.
- *
- * <p>WebView updates were only supported starting in Android L and the preinstalled WebView in
- * earlier OS versions is not compatible with this library. If this returns true, then that
- * implies we're on Android L or above.
- */
- @ChecksSdkIntAtLeast(api = Build.VERSION_CODES.LOLLIPOP)
- public boolean isSupportedByWebView() {
- return BoundaryInterfaceReflectionUtil.containsFeature(
- LAZY_HOLDER.WEBVIEW_APK_FEATURES, mInternalFeatureValue);
- }
-
- @Override
- @NonNull
- public String getPublicFeatureName() {
- return mPublicFeatureValue;
- }
-
- @Override
- public boolean isSupported() {
- return isSupportedByFramework() || isSupportedByWebView();
- }
-
- private static class LAZY_HOLDER {
- static final Set<String> WEBVIEW_APK_FEATURES =
- new HashSet<>(
- Arrays.asList(WebViewGlueCommunicator.getFactory().getWebViewFeatures()));
- }
-
- @NonNull
- public static Set<String> getWebViewApkFeaturesForTesting() {
- return LAZY_HOLDER.WEBVIEW_APK_FEATURES;
- }
-
- /**
* Utility method for throwing an exception explaining that the feature the app trying to use
* isn't supported.
*/
diff --git a/webkit/webkit/src/main/java/androidx/webkit/internal/WebViewGlueCommunicator.java b/webkit/webkit/src/main/java/androidx/webkit/internal/WebViewGlueCommunicator.java
index 5223926..52c9dd5 100644
--- a/webkit/webkit/src/main/java/androidx/webkit/internal/WebViewGlueCommunicator.java
+++ b/webkit/webkit/src/main/java/androidx/webkit/internal/WebViewGlueCommunicator.java
@@ -100,9 +100,10 @@
/**
* Load the WebView code from the WebView APK and return the classloader containing that code.
*/
+ @NonNull
public static ClassLoader getWebViewClassLoader() {
- if (Build.VERSION.SDK_INT >= 28) {
- return WebView.getWebViewClassLoader();
+ if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.P) {
+ return ApiHelperForP.getWebViewClassLoader();
} else {
return getWebViewProviderFactory().getClass().getClassLoader();
}
diff --git a/webkit/webkit/src/main/java/androidx/webkit/internal/WebViewProviderFactory.java b/webkit/webkit/src/main/java/androidx/webkit/internal/WebViewProviderFactory.java
index 080233e..9eb736b 100644
--- a/webkit/webkit/src/main/java/androidx/webkit/internal/WebViewProviderFactory.java
+++ b/webkit/webkit/src/main/java/androidx/webkit/internal/WebViewProviderFactory.java
@@ -16,6 +16,7 @@
package androidx.webkit.internal;
+import android.webkit.TracingController;
import android.webkit.WebView;
import androidx.annotation.NonNull;
@@ -39,23 +40,27 @@
/**
* Create a support library version of {@link android.webkit.WebViewProvider}.
*/
- WebViewProviderBoundaryInterface createWebView(WebView webview);
+ @NonNull
+ WebViewProviderBoundaryInterface createWebView(@NonNull WebView webview);
/**
- * Create the boundary interface for {@link androidx.webkit.internal.WebkitToCompatConverter}
+ * Create the boundary interface for {@link WebkitToCompatConverter}
* which converts android.webkit classes into their corresponding support library classes.
*/
+ @NonNull
WebkitToCompatConverterBoundaryInterface getWebkitToCompatConverter();
/**
* Fetch the boundary interface representing
* {@link android.webkit.WebViewFactoryProvider#Statics}.
*/
+ @NonNull
StaticsBoundaryInterface getStatics();
/**
* Fetch the features supported by the current WebView APK.
*/
+ @NonNull
String[] getWebViewFeatures();
/**
@@ -65,12 +70,14 @@
ServiceWorkerControllerBoundaryInterface getServiceWorkerController();
/**
- * Fetch the boundary interface representing {@link android.webkit.TracingController}.
+ * Fetch the boundary interface representing {@link TracingController}.
*/
+ @NonNull
TracingControllerBoundaryInterface getTracingController();
/**
* Fetch the boundary interface representing {@link android.webkit.ProxyController}.
*/
+ @NonNull
ProxyControllerBoundaryInterface getProxyController();
}
diff --git a/webkit/webkit/src/main/java/androidx/webkit/internal/WebViewProviderFactoryAdapter.java b/webkit/webkit/src/main/java/androidx/webkit/internal/WebViewProviderFactoryAdapter.java
index 7f0a6b2..b30a66b 100644
--- a/webkit/webkit/src/main/java/androidx/webkit/internal/WebViewProviderFactoryAdapter.java
+++ b/webkit/webkit/src/main/java/androidx/webkit/internal/WebViewProviderFactoryAdapter.java
@@ -35,9 +35,9 @@
*/
@SuppressWarnings("JavadocReference") // WebViewFactoryProvider and WebViewProvider are hidden.
public class WebViewProviderFactoryAdapter implements WebViewProviderFactory {
- WebViewProviderFactoryBoundaryInterface mImpl;
+ final WebViewProviderFactoryBoundaryInterface mImpl;
- public WebViewProviderFactoryAdapter(WebViewProviderFactoryBoundaryInterface impl) {
+ public WebViewProviderFactoryAdapter(@NonNull WebViewProviderFactoryBoundaryInterface impl) {
mImpl = impl;
}
@@ -46,8 +46,9 @@
* {@link android.webkit.WebViewProvider} - the class used to implement
* {@link androidx.webkit.WebViewCompat}.
*/
+ @NonNull
@Override
- public WebViewProviderBoundaryInterface createWebView(WebView webview) {
+ public WebViewProviderBoundaryInterface createWebView(@NonNull WebView webview) {
return BoundaryInterfaceReflectionUtil.castToSuppLibClass(
WebViewProviderBoundaryInterface.class, mImpl.createWebView(webview));
}
@@ -57,6 +58,7 @@
* {@link androidx.webkit.internal.WebkitToCompatConverter}, which converts android.webkit
* classes into their corresponding support library classes.
*/
+ @NonNull
@Override
public WebkitToCompatConverterBoundaryInterface getWebkitToCompatConverter() {
return BoundaryInterfaceReflectionUtil.castToSuppLibClass(
@@ -67,6 +69,7 @@
* Adapter method for fetching the support library class representing
* {@link android.webkit.WebViewFactoryProvider#Statics}.
*/
+ @NonNull
@Override
public StaticsBoundaryInterface getStatics() {
return BoundaryInterfaceReflectionUtil.castToSuppLibClass(
@@ -76,6 +79,7 @@
/**
* Adapter method for fetching the features supported by the current WebView APK.
*/
+ @NonNull
@Override
public String[] getWebViewFeatures() {
return mImpl.getSupportedFeatures();
@@ -96,6 +100,7 @@
* Adapter method for fetching the support library class representing
* {@link android.webkit.TracingController}.
*/
+ @NonNull
@Override
public TracingControllerBoundaryInterface getTracingController() {
return BoundaryInterfaceReflectionUtil.castToSuppLibClass(
@@ -106,6 +111,7 @@
* Adapter method for fetching the support library class representing
* {@link android.webkit.ProxyController}.
*/
+ @NonNull
@Override
public ProxyControllerBoundaryInterface getProxyController() {
return BoundaryInterfaceReflectionUtil.castToSuppLibClass(
diff --git a/webkit/webkit/src/main/java/androidx/webkit/internal/WebViewRenderProcessImpl.java b/webkit/webkit/src/main/java/androidx/webkit/internal/WebViewRenderProcessImpl.java
index d8308fe..92d2aa7 100644
--- a/webkit/webkit/src/main/java/androidx/webkit/internal/WebViewRenderProcessImpl.java
+++ b/webkit/webkit/src/main/java/androidx/webkit/internal/WebViewRenderProcessImpl.java
@@ -35,7 +35,7 @@
public class WebViewRenderProcessImpl extends WebViewRenderProcess {
private WebViewRendererBoundaryInterface mBoundaryInterface;
private WeakReference<android.webkit.WebViewRenderProcess> mFrameworkObject;
- private static WeakHashMap<android.webkit.WebViewRenderProcess,
+ private static final WeakHashMap<android.webkit.WebViewRenderProcess,
WebViewRenderProcessImpl> sFrameworkMap = new WeakHashMap<>();
public WebViewRenderProcessImpl(@NonNull WebViewRendererBoundaryInterface boundaryInterface) {
@@ -85,10 +85,10 @@
@Override
public boolean terminate() {
- final WebViewFeatureInternal feature = WebViewFeatureInternal.WEB_VIEW_RENDERER_TERMINATE;
+ final ApiFeature.Q feature = WebViewFeatureInternal.WEB_VIEW_RENDERER_TERMINATE;
if (feature.isSupportedByFramework()) {
android.webkit.WebViewRenderProcess renderer = mFrameworkObject.get();
- return renderer != null ? renderer.terminate() : false;
+ return renderer != null && ApiHelperForQ.terminate(renderer);
} else if (feature.isSupportedByWebView()) {
return mBoundaryInterface.terminate();
} else {
diff --git a/webkit/webkit/src/main/java/androidx/webkit/internal/WebkitToCompatConverter.java b/webkit/webkit/src/main/java/androidx/webkit/internal/WebkitToCompatConverter.java
index c7c51d2..ef80a91 100644
--- a/webkit/webkit/src/main/java/androidx/webkit/internal/WebkitToCompatConverter.java
+++ b/webkit/webkit/src/main/java/androidx/webkit/internal/WebkitToCompatConverter.java
@@ -43,7 +43,7 @@
public class WebkitToCompatConverter {
private final WebkitToCompatConverterBoundaryInterface mImpl;
- public WebkitToCompatConverter(WebkitToCompatConverterBoundaryInterface impl) {
+ public WebkitToCompatConverter(@NonNull WebkitToCompatConverterBoundaryInterface impl) {
mImpl = impl;
}
@@ -53,7 +53,7 @@
* {@link androidx.webkit.WebSettingsCompat}.
*/
@NonNull
- public WebSettingsAdapter convertSettings(WebSettings webSettings) {
+ public WebSettingsAdapter convertSettings(@NonNull WebSettings webSettings) {
return new WebSettingsAdapter(BoundaryInterfaceReflectionUtil.castToSuppLibClass(
WebSettingsBoundaryInterface.class, mImpl.convertSettings(webSettings)));
}
@@ -63,7 +63,8 @@
* that calls on either of those objects affect the other object.
*/
@NonNull
- public WebResourceRequestAdapter convertWebResourceRequest(WebResourceRequest request) {
+ public WebResourceRequestAdapter convertWebResourceRequest(
+ @NonNull WebResourceRequest request) {
return new WebResourceRequestAdapter(BoundaryInterfaceReflectionUtil.castToSuppLibClass(
WebResourceRequestBoundaryInterface.class,
mImpl.convertWebResourceRequest(request)));
diff --git a/window/integration-tests/configuration-change-tests/build.gradle b/window/integration-tests/configuration-change-tests/build.gradle
index d6e24f6..5c5493d 100644
--- a/window/integration-tests/configuration-change-tests/build.gradle
+++ b/window/integration-tests/configuration-change-tests/build.gradle
@@ -36,11 +36,10 @@
// Dependencies for coroutines.
androidTestImplementation(libs.kotlinCoroutinesTest)
// Project dependencies.
- androidTestImplementation project(path: ':lifecycle:lifecycle-runtime-ktx')
- androidTestImplementation project(path: ':window:window')
- androidTestImplementation project(path: ":core:core")
- implementation project(path: ':activity:activity')
-
+ implementation("androidx.lifecycle:lifecycle-runtime-ktx:2.5.0-rc01")
+ implementation(project(":window:window"))
+ implementation("androidx.core:core:1.8.0-rc01")
+ implementation("androidx.activity:activity:1.5.0-beta01")
}
// Allow usage of Kotlin's @OptIn.
