Update public_plus_experimental to hide @RestrictTo items
Relnote: N/A
Test: ./gradlew updateApi
Change-Id: Ib2e7239cc13b33bbc3631989976b77874d6db3a4
diff --git a/activity/activity/api/public_plus_experimental_1.3.0-beta02.txt b/activity/activity/api/public_plus_experimental_1.3.0-beta02.txt
index 5ae7716..4d4be33 100644
--- a/activity/activity/api/public_plus_experimental_1.3.0-beta02.txt
+++ b/activity/activity/api/public_plus_experimental_1.3.0-beta02.txt
@@ -1,13 +1,14 @@
// Signature format: 4.0
package androidx.activity {
- public class ComponentActivity extends androidx.core.app.ComponentActivity implements androidx.activity.result.ActivityResultCaller androidx.activity.result.ActivityResultRegistryOwner androidx.activity.contextaware.ContextAware androidx.lifecycle.HasDefaultViewModelProviderFactory androidx.lifecycle.LifecycleOwner androidx.activity.OnBackPressedDispatcherOwner androidx.savedstate.SavedStateRegistryOwner androidx.lifecycle.ViewModelStoreOwner {
+ public class ComponentActivity extends android.app.Activity implements androidx.activity.result.ActivityResultCaller androidx.activity.result.ActivityResultRegistryOwner androidx.activity.contextaware.ContextAware androidx.lifecycle.HasDefaultViewModelProviderFactory androidx.lifecycle.LifecycleOwner androidx.activity.OnBackPressedDispatcherOwner androidx.savedstate.SavedStateRegistryOwner androidx.lifecycle.ViewModelStoreOwner {
ctor public ComponentActivity();
ctor @ContentView public ComponentActivity(@LayoutRes int);
method public final void addOnContextAvailableListener(androidx.activity.contextaware.OnContextAvailableListener);
method public final androidx.activity.result.ActivityResultRegistry getActivityResultRegistry();
method public androidx.lifecycle.ViewModelProvider.Factory getDefaultViewModelProviderFactory();
method @Deprecated public Object? getLastCustomNonConfigurationInstance();
+ method public androidx.lifecycle.Lifecycle getLifecycle();
method public final androidx.activity.OnBackPressedDispatcher getOnBackPressedDispatcher();
method public final androidx.savedstate.SavedStateRegistry getSavedStateRegistry();
method public androidx.lifecycle.ViewModelStore getViewModelStore();
diff --git a/activity/activity/api/public_plus_experimental_current.txt b/activity/activity/api/public_plus_experimental_current.txt
index 5ae7716..4d4be33 100644
--- a/activity/activity/api/public_plus_experimental_current.txt
+++ b/activity/activity/api/public_plus_experimental_current.txt
@@ -1,13 +1,14 @@
// Signature format: 4.0
package androidx.activity {
- public class ComponentActivity extends androidx.core.app.ComponentActivity implements androidx.activity.result.ActivityResultCaller androidx.activity.result.ActivityResultRegistryOwner androidx.activity.contextaware.ContextAware androidx.lifecycle.HasDefaultViewModelProviderFactory androidx.lifecycle.LifecycleOwner androidx.activity.OnBackPressedDispatcherOwner androidx.savedstate.SavedStateRegistryOwner androidx.lifecycle.ViewModelStoreOwner {
+ public class ComponentActivity extends android.app.Activity implements androidx.activity.result.ActivityResultCaller androidx.activity.result.ActivityResultRegistryOwner androidx.activity.contextaware.ContextAware androidx.lifecycle.HasDefaultViewModelProviderFactory androidx.lifecycle.LifecycleOwner androidx.activity.OnBackPressedDispatcherOwner androidx.savedstate.SavedStateRegistryOwner androidx.lifecycle.ViewModelStoreOwner {
ctor public ComponentActivity();
ctor @ContentView public ComponentActivity(@LayoutRes int);
method public final void addOnContextAvailableListener(androidx.activity.contextaware.OnContextAvailableListener);
method public final androidx.activity.result.ActivityResultRegistry getActivityResultRegistry();
method public androidx.lifecycle.ViewModelProvider.Factory getDefaultViewModelProviderFactory();
method @Deprecated public Object? getLastCustomNonConfigurationInstance();
+ method public androidx.lifecycle.Lifecycle getLifecycle();
method public final androidx.activity.OnBackPressedDispatcher getOnBackPressedDispatcher();
method public final androidx.savedstate.SavedStateRegistry getSavedStateRegistry();
method public androidx.lifecycle.ViewModelStore getViewModelStore();
diff --git a/appcompat/appcompat-resources/api/public_plus_experimental_current.txt b/appcompat/appcompat-resources/api/public_plus_experimental_current.txt
index fdef64c..b0256cf 100644
--- a/appcompat/appcompat-resources/api/public_plus_experimental_current.txt
+++ b/appcompat/appcompat-resources/api/public_plus_experimental_current.txt
@@ -10,7 +10,7 @@
package androidx.appcompat.graphics.drawable {
- public class AnimatedStateListDrawableCompat extends android.graphics.drawable.Drawable implements android.graphics.drawable.Drawable.Callback androidx.core.graphics.drawable.TintAwareDrawable {
+ public class AnimatedStateListDrawableCompat extends android.graphics.drawable.Drawable implements android.graphics.drawable.Drawable.Callback {
ctor public AnimatedStateListDrawableCompat();
method public void addState(int[], android.graphics.drawable.Drawable, int);
method public void addState(int[]!, android.graphics.drawable.Drawable!);
diff --git a/appcompat/appcompat/api/public_plus_experimental_current.txt b/appcompat/appcompat/api/public_plus_experimental_current.txt
index 32cf56d..9311e6d 100644
--- a/appcompat/appcompat/api/public_plus_experimental_current.txt
+++ b/appcompat/appcompat/api/public_plus_experimental_current.txt
@@ -216,7 +216,7 @@
method public androidx.appcompat.app.AlertDialog! show();
}
- public class AppCompatActivity extends androidx.fragment.app.FragmentActivity implements androidx.appcompat.app.ActionBarDrawerToggle.DelegateProvider androidx.appcompat.app.AppCompatCallback androidx.core.app.TaskStackBuilder.SupportParentable {
+ public class AppCompatActivity extends androidx.fragment.app.FragmentActivity implements androidx.appcompat.app.ActionBarDrawerToggle.DelegateProvider androidx.appcompat.app.AppCompatCallback androidx.lifecycle.LifecycleOwner androidx.core.app.TaskStackBuilder.SupportParentable {
ctor public AppCompatActivity();
ctor @ContentView public AppCompatActivity(@LayoutRes int);
method public androidx.appcompat.app.AppCompatDelegate getDelegate();
@@ -461,7 +461,7 @@
method public boolean onMenuItemClick(android.view.MenuItem!);
}
- @androidx.resourceinspection.annotation.AppCompatShadowedAttributes public class AppCompatAutoCompleteTextView extends android.widget.AutoCompleteTextView implements androidx.core.view.TintableBackgroundView {
+ public class AppCompatAutoCompleteTextView extends android.widget.AutoCompleteTextView implements androidx.core.view.TintableBackgroundView {
ctor public AppCompatAutoCompleteTextView(android.content.Context);
ctor public AppCompatAutoCompleteTextView(android.content.Context, android.util.AttributeSet?);
ctor public AppCompatAutoCompleteTextView(android.content.Context, android.util.AttributeSet?, int);
@@ -473,7 +473,7 @@
method public void setTextAppearance(android.content.Context!, int);
}
- @androidx.resourceinspection.annotation.AppCompatShadowedAttributes public class AppCompatButton extends android.widget.Button implements androidx.core.widget.AutoSizeableTextView androidx.appcompat.widget.EmojiCompatConfigurationView androidx.core.view.TintableBackgroundView androidx.core.widget.TintableCompoundDrawablesView {
+ public class AppCompatButton extends android.widget.Button implements androidx.appcompat.widget.EmojiCompatConfigurationView androidx.core.view.TintableBackgroundView androidx.core.widget.TintableCompoundDrawablesView {
ctor public AppCompatButton(android.content.Context);
ctor public AppCompatButton(android.content.Context, android.util.AttributeSet?);
ctor public AppCompatButton(android.content.Context, android.util.AttributeSet?, int);
@@ -494,7 +494,7 @@
method public void setTextAppearance(android.content.Context!, int);
}
- @androidx.resourceinspection.annotation.AppCompatShadowedAttributes public class AppCompatCheckBox extends android.widget.CheckBox implements androidx.core.view.TintableBackgroundView androidx.core.widget.TintableCompoundButton {
+ public class AppCompatCheckBox extends android.widget.CheckBox implements androidx.core.view.TintableBackgroundView androidx.core.widget.TintableCompoundButton {
ctor public AppCompatCheckBox(android.content.Context);
ctor public AppCompatCheckBox(android.content.Context, android.util.AttributeSet?);
ctor public AppCompatCheckBox(android.content.Context, android.util.AttributeSet?, int);
@@ -509,25 +509,21 @@
method @RestrictTo(androidx.annotation.RestrictTo.Scope.LIBRARY_GROUP_PREFIX) public void setSupportButtonTintMode(android.graphics.PorterDuff.Mode?);
}
- @androidx.resourceinspection.annotation.AppCompatShadowedAttributes public class AppCompatCheckedTextView extends android.widget.CheckedTextView implements androidx.appcompat.widget.EmojiCompatConfigurationView androidx.core.view.TintableBackgroundView androidx.core.widget.TintableCheckedTextView {
+ public class AppCompatCheckedTextView extends android.widget.CheckedTextView implements androidx.appcompat.widget.EmojiCompatConfigurationView androidx.core.view.TintableBackgroundView {
ctor public AppCompatCheckedTextView(android.content.Context);
ctor public AppCompatCheckedTextView(android.content.Context, android.util.AttributeSet?);
ctor public AppCompatCheckedTextView(android.content.Context, android.util.AttributeSet?, int);
method @RestrictTo(androidx.annotation.RestrictTo.Scope.LIBRARY_GROUP_PREFIX) public android.content.res.ColorStateList? getSupportBackgroundTintList();
method @RestrictTo(androidx.annotation.RestrictTo.Scope.LIBRARY_GROUP_PREFIX) public android.graphics.PorterDuff.Mode? getSupportBackgroundTintMode();
- method @RestrictTo(androidx.annotation.RestrictTo.Scope.LIBRARY_GROUP_PREFIX) public android.content.res.ColorStateList? getSupportCheckMarkTintList();
- method @RestrictTo(androidx.annotation.RestrictTo.Scope.LIBRARY_GROUP_PREFIX) public android.graphics.PorterDuff.Mode? getSupportCheckMarkTintMode();
method public boolean isEmojiCompatEnabled();
method public void setBackgroundDrawable(android.graphics.drawable.Drawable?);
method public void setEmojiCompatEnabled(boolean);
method @RestrictTo(androidx.annotation.RestrictTo.Scope.LIBRARY_GROUP_PREFIX) public void setSupportBackgroundTintList(android.content.res.ColorStateList?);
method @RestrictTo(androidx.annotation.RestrictTo.Scope.LIBRARY_GROUP_PREFIX) public void setSupportBackgroundTintMode(android.graphics.PorterDuff.Mode?);
- method @RestrictTo(androidx.annotation.RestrictTo.Scope.LIBRARY_GROUP_PREFIX) public void setSupportCheckMarkTintList(android.content.res.ColorStateList?);
- method @RestrictTo(androidx.annotation.RestrictTo.Scope.LIBRARY_GROUP_PREFIX) public void setSupportCheckMarkTintMode(android.graphics.PorterDuff.Mode?);
method public void setTextAppearance(android.content.Context, int);
}
- @androidx.resourceinspection.annotation.AppCompatShadowedAttributes public class AppCompatEditText extends android.widget.EditText implements androidx.appcompat.widget.EmojiCompatConfigurationView androidx.core.view.OnReceiveContentViewBehavior androidx.core.view.TintableBackgroundView {
+ public class AppCompatEditText extends android.widget.EditText implements androidx.appcompat.widget.EmojiCompatConfigurationView androidx.core.view.OnReceiveContentViewBehavior androidx.core.view.TintableBackgroundView {
ctor public AppCompatEditText(android.content.Context);
ctor public AppCompatEditText(android.content.Context, android.util.AttributeSet?);
ctor public AppCompatEditText(android.content.Context, android.util.AttributeSet?, int);
@@ -542,37 +538,29 @@
method public void setTextAppearance(android.content.Context!, int);
}
- @androidx.resourceinspection.annotation.AppCompatShadowedAttributes public class AppCompatImageButton extends android.widget.ImageButton implements androidx.core.view.TintableBackgroundView androidx.core.widget.TintableImageSourceView {
+ public class AppCompatImageButton extends android.widget.ImageButton implements androidx.core.view.TintableBackgroundView {
ctor public AppCompatImageButton(android.content.Context);
ctor public AppCompatImageButton(android.content.Context, android.util.AttributeSet?);
ctor public AppCompatImageButton(android.content.Context, android.util.AttributeSet?, int);
method @RestrictTo(androidx.annotation.RestrictTo.Scope.LIBRARY_GROUP_PREFIX) public android.content.res.ColorStateList? getSupportBackgroundTintList();
method @RestrictTo(androidx.annotation.RestrictTo.Scope.LIBRARY_GROUP_PREFIX) public android.graphics.PorterDuff.Mode? getSupportBackgroundTintMode();
- method @RestrictTo(androidx.annotation.RestrictTo.Scope.LIBRARY_GROUP_PREFIX) public android.content.res.ColorStateList? getSupportImageTintList();
- method @RestrictTo(androidx.annotation.RestrictTo.Scope.LIBRARY_GROUP_PREFIX) public android.graphics.PorterDuff.Mode? getSupportImageTintMode();
method public void setBackgroundDrawable(android.graphics.drawable.Drawable?);
method @RestrictTo(androidx.annotation.RestrictTo.Scope.LIBRARY_GROUP_PREFIX) public void setSupportBackgroundTintList(android.content.res.ColorStateList?);
method @RestrictTo(androidx.annotation.RestrictTo.Scope.LIBRARY_GROUP_PREFIX) public void setSupportBackgroundTintMode(android.graphics.PorterDuff.Mode?);
- method @RestrictTo(androidx.annotation.RestrictTo.Scope.LIBRARY_GROUP_PREFIX) public void setSupportImageTintList(android.content.res.ColorStateList?);
- method @RestrictTo(androidx.annotation.RestrictTo.Scope.LIBRARY_GROUP_PREFIX) public void setSupportImageTintMode(android.graphics.PorterDuff.Mode?);
}
- @androidx.resourceinspection.annotation.AppCompatShadowedAttributes public class AppCompatImageView extends android.widget.ImageView implements androidx.core.view.TintableBackgroundView androidx.core.widget.TintableImageSourceView {
+ public class AppCompatImageView extends android.widget.ImageView implements androidx.core.view.TintableBackgroundView {
ctor public AppCompatImageView(android.content.Context);
ctor public AppCompatImageView(android.content.Context, android.util.AttributeSet?);
ctor public AppCompatImageView(android.content.Context, android.util.AttributeSet?, int);
method @RestrictTo(androidx.annotation.RestrictTo.Scope.LIBRARY_GROUP_PREFIX) public android.content.res.ColorStateList? getSupportBackgroundTintList();
method @RestrictTo(androidx.annotation.RestrictTo.Scope.LIBRARY_GROUP_PREFIX) public android.graphics.PorterDuff.Mode? getSupportBackgroundTintMode();
- method @RestrictTo(androidx.annotation.RestrictTo.Scope.LIBRARY_GROUP_PREFIX) public android.content.res.ColorStateList? getSupportImageTintList();
- method @RestrictTo(androidx.annotation.RestrictTo.Scope.LIBRARY_GROUP_PREFIX) public android.graphics.PorterDuff.Mode? getSupportImageTintMode();
method public void setBackgroundDrawable(android.graphics.drawable.Drawable?);
method @RestrictTo(androidx.annotation.RestrictTo.Scope.LIBRARY_GROUP_PREFIX) public void setSupportBackgroundTintList(android.content.res.ColorStateList?);
method @RestrictTo(androidx.annotation.RestrictTo.Scope.LIBRARY_GROUP_PREFIX) public void setSupportBackgroundTintMode(android.graphics.PorterDuff.Mode?);
- method @RestrictTo(androidx.annotation.RestrictTo.Scope.LIBRARY_GROUP_PREFIX) public void setSupportImageTintList(android.content.res.ColorStateList?);
- method @RestrictTo(androidx.annotation.RestrictTo.Scope.LIBRARY_GROUP_PREFIX) public void setSupportImageTintMode(android.graphics.PorterDuff.Mode?);
}
- @androidx.resourceinspection.annotation.AppCompatShadowedAttributes public class AppCompatMultiAutoCompleteTextView extends android.widget.MultiAutoCompleteTextView implements androidx.core.view.TintableBackgroundView {
+ public class AppCompatMultiAutoCompleteTextView extends android.widget.MultiAutoCompleteTextView implements androidx.core.view.TintableBackgroundView {
ctor public AppCompatMultiAutoCompleteTextView(android.content.Context);
ctor public AppCompatMultiAutoCompleteTextView(android.content.Context, android.util.AttributeSet?);
ctor public AppCompatMultiAutoCompleteTextView(android.content.Context, android.util.AttributeSet?, int);
@@ -584,7 +572,7 @@
method public void setTextAppearance(android.content.Context!, int);
}
- @androidx.resourceinspection.annotation.AppCompatShadowedAttributes public class AppCompatRadioButton extends android.widget.RadioButton implements androidx.core.view.TintableBackgroundView androidx.core.widget.TintableCompoundButton {
+ public class AppCompatRadioButton extends android.widget.RadioButton implements androidx.core.view.TintableBackgroundView androidx.core.widget.TintableCompoundButton {
ctor public AppCompatRadioButton(android.content.Context!);
ctor public AppCompatRadioButton(android.content.Context!, android.util.AttributeSet?);
ctor public AppCompatRadioButton(android.content.Context!, android.util.AttributeSet?, int);
@@ -611,7 +599,7 @@
ctor public AppCompatSeekBar(android.content.Context, android.util.AttributeSet?, int);
}
- @androidx.resourceinspection.annotation.AppCompatShadowedAttributes public class AppCompatSpinner extends android.widget.Spinner implements androidx.core.view.TintableBackgroundView {
+ public class AppCompatSpinner extends android.widget.Spinner implements androidx.core.view.TintableBackgroundView {
ctor public AppCompatSpinner(android.content.Context);
ctor public AppCompatSpinner(android.content.Context, int);
ctor public AppCompatSpinner(android.content.Context, android.util.AttributeSet?);
@@ -625,7 +613,7 @@
method @RestrictTo(androidx.annotation.RestrictTo.Scope.LIBRARY_GROUP_PREFIX) public void setSupportBackgroundTintMode(android.graphics.PorterDuff.Mode?);
}
- @androidx.resourceinspection.annotation.AppCompatShadowedAttributes public class AppCompatTextView extends android.widget.TextView implements androidx.core.widget.AutoSizeableTextView androidx.appcompat.widget.EmojiCompatConfigurationView androidx.core.view.TintableBackgroundView androidx.core.widget.TintableCompoundDrawablesView {
+ public class AppCompatTextView extends android.widget.TextView implements androidx.appcompat.widget.EmojiCompatConfigurationView androidx.core.view.TintableBackgroundView androidx.core.widget.TintableCompoundDrawablesView {
ctor public AppCompatTextView(android.content.Context);
ctor public AppCompatTextView(android.content.Context, android.util.AttributeSet?);
ctor public AppCompatTextView(android.content.Context, android.util.AttributeSet?, int);
@@ -649,7 +637,7 @@
method public void setTextMetricsParamsCompat(androidx.core.text.PrecomputedTextCompat.Params);
}
- @androidx.resourceinspection.annotation.AppCompatShadowedAttributes public class AppCompatToggleButton extends android.widget.ToggleButton implements androidx.appcompat.widget.EmojiCompatConfigurationView androidx.core.view.TintableBackgroundView {
+ public class AppCompatToggleButton extends android.widget.ToggleButton implements androidx.appcompat.widget.EmojiCompatConfigurationView androidx.core.view.TintableBackgroundView {
ctor public AppCompatToggleButton(android.content.Context);
ctor public AppCompatToggleButton(android.content.Context, android.util.AttributeSet?);
ctor public AppCompatToggleButton(android.content.Context, android.util.AttributeSet?, int);
diff --git a/benchmark/common/api/public_plus_experimental_current.txt b/benchmark/common/api/public_plus_experimental_current.txt
index 6f98a41..2ff6806 100644
--- a/benchmark/common/api/public_plus_experimental_current.txt
+++ b/benchmark/common/api/public_plus_experimental_current.txt
@@ -4,37 +4,10 @@
public final class ArgumentsKt {
}
- @RestrictTo(androidx.annotation.RestrictTo.Scope.LIBRARY_GROUP) public final class BenchmarkResult {
- ctor public BenchmarkResult(String className, String testName, long totalRunTimeNs, java.util.List<androidx.benchmark.MetricResult> metrics, int repeatIterations, long thermalThrottleSleepSeconds, int warmupIterations);
- method public String component1();
- method public String component2();
- method public long component3();
- method public java.util.List<androidx.benchmark.MetricResult> component4();
- method public int component5();
- method public long component6();
- method public int component7();
- method @RestrictTo(androidx.annotation.RestrictTo.Scope.LIBRARY_GROUP) public androidx.benchmark.BenchmarkResult copy(String className, String testName, long totalRunTimeNs, java.util.List<androidx.benchmark.MetricResult> metrics, int repeatIterations, long thermalThrottleSleepSeconds, int warmupIterations);
- method public String getClassName();
- method public java.util.List<androidx.benchmark.MetricResult> getMetrics();
- method public int getRepeatIterations();
- method public androidx.benchmark.Stats getStats(String which);
- method public String getTestName();
- method public int getWarmupIterations();
- property public final String className;
- property public final java.util.List<androidx.benchmark.MetricResult> metrics;
- property public final int repeatIterations;
- property public final String testName;
- property public final int warmupIterations;
- field public final long thermalThrottleSleepSeconds;
- field public final long totalRunTimeNs;
- }
-
public final class BenchmarkResultKt {
}
public final class BenchmarkState {
- ctor @RestrictTo(androidx.annotation.RestrictTo.Scope.LIBRARY_GROUP) public BenchmarkState();
- method @RestrictTo(androidx.annotation.RestrictTo.Scope.LIBRARY_GROUP) public long getMinTimeNanos();
method public boolean keepRunning();
method public void pauseTiming();
method @androidx.benchmark.BenchmarkState.Companion.ExperimentalExternalReport public static void reportData(String className, String testName, @IntRange(from=0) long totalRunTimeNs, java.util.List<java.lang.Long> dataNs, @IntRange(from=0) int warmupIterations, @IntRange(from=0) long thermalThrottleSleepSeconds, @IntRange(from=1) int repeatIterations);
@@ -49,65 +22,11 @@
@kotlin.Experimental @kotlin.annotation.Retention(kotlin.annotation.AnnotationRetention) @kotlin.annotation.Target(allowedTargets=kotlin.annotation.AnnotationTarget) public static @interface BenchmarkState.Companion.ExperimentalExternalReport {
}
- @RestrictTo(androidx.annotation.RestrictTo.Scope.LIBRARY_GROUP) public final class InstrumentationResultScope {
- ctor public InstrumentationResultScope(optional android.os.Bundle bundle);
- method public void fileRecord(String key, String path);
- method public android.os.Bundle getBundle();
- method public void ideSummaryRecord(String summaryV1, optional String summaryV2);
- property public final android.os.Bundle bundle;
- }
-
- @RestrictTo(androidx.annotation.RestrictTo.Scope.LIBRARY_GROUP) public final class InstrumentationResults {
- method public android.os.Bundle getRunEndResultBundle();
- method public void instrumentationReport(kotlin.jvm.functions.Function1<? super androidx.benchmark.InstrumentationResultScope,kotlin.Unit> block);
- method public void reportAdditionalFileToCopy(String key, String absoluteFilePath, optional boolean reportOnRunEndOnly);
- property public final android.os.Bundle runEndResultBundle;
- field public static final androidx.benchmark.InstrumentationResults INSTANCE;
- }
-
public final class MetricNameUtilsKt {
}
- @RestrictTo(androidx.annotation.RestrictTo.Scope.LIBRARY_GROUP) public final class MetricResult {
- ctor public MetricResult(java.util.List<java.lang.Long> data, androidx.benchmark.Stats stats);
- ctor public MetricResult(String name, long[] data);
- method public java.util.List<java.lang.Long> component1();
- method public androidx.benchmark.Stats component2();
- method @RestrictTo(androidx.annotation.RestrictTo.Scope.LIBRARY_GROUP) public androidx.benchmark.MetricResult copy(java.util.List<java.lang.Long> data, androidx.benchmark.Stats stats);
- method public java.util.List<java.lang.Long> getData();
- method public androidx.benchmark.Stats getStats();
- property public final java.util.List<java.lang.Long> data;
- property public final androidx.benchmark.Stats stats;
- }
-
public final class ProfilerKt {
}
- @RestrictTo(androidx.annotation.RestrictTo.Scope.LIBRARY_GROUP) public final class ResultWriter {
- method public void appendReport(androidx.benchmark.BenchmarkResult benchmarkResult);
- field public static final androidx.benchmark.ResultWriter INSTANCE;
- }
-
- @RestrictTo(androidx.annotation.RestrictTo.Scope.LIBRARY_GROUP) public final class Stats {
- ctor public Stats(long[] data, String name);
- method public long getMax();
- method public int getMaxIndex();
- method public long getMedian();
- method public int getMedianIndex();
- method public long getMin();
- method public int getMinIndex();
- method public String getName();
- method public double getStandardDeviation();
- method public void putInBundle(android.os.Bundle status, String prefix);
- property public final long max;
- property public final int maxIndex;
- property public final long median;
- property public final int medianIndex;
- property public final long min;
- property public final int minIndex;
- property public final String name;
- property public final double standardDeviation;
- }
-
}
diff --git a/benchmark/macro-junit4/api/public_plus_experimental_current.txt b/benchmark/macro-junit4/api/public_plus_experimental_current.txt
index 431728d..5d2528d 100644
--- a/benchmark/macro-junit4/api/public_plus_experimental_current.txt
+++ b/benchmark/macro-junit4/api/public_plus_experimental_current.txt
@@ -10,11 +10,6 @@
method public void measureRepeated(String packageName, java.util.List<? extends androidx.benchmark.macro.Metric> metrics, @IntRange(from=1) int iterations, kotlin.jvm.functions.Function1<? super androidx.benchmark.macro.MacrobenchmarkScope,kotlin.Unit> measureBlock);
}
- @RestrictTo(androidx.annotation.RestrictTo.Scope.LIBRARY_GROUP_PREFIX) public final class PerfettoRule implements org.junit.rules.TestRule {
- ctor public PerfettoRule();
- method public org.junit.runners.model.Statement apply(org.junit.runners.model.Statement base, org.junit.runner.Description description);
- }
-
public final class PerfettoRuleKt {
}
diff --git a/buildSrc/src/main/kotlin/androidx/build/metalava/MetalavaRunner.kt b/buildSrc/src/main/kotlin/androidx/build/metalava/MetalavaRunner.kt
index 5e2508a..0d29425 100644
--- a/buildSrc/src/main/kotlin/androidx/build/metalava/MetalavaRunner.kt
+++ b/buildSrc/src/main/kotlin/androidx/build/metalava/MetalavaRunner.kt
@@ -307,7 +307,10 @@
args += HIDE_EXPERIMENTAL_ARGS
}
is GenerateApiMode.ExperimentalApi -> {
- // No additional args needed.
+ args += listOf(
+ "--hide-annotation", "androidx.annotation.RestrictTo"
+ )
+ args += listOf("--show-unannotated")
}
}
diff --git a/camera/camera-camera2/api/public_plus_experimental_current.txt b/camera/camera-camera2/api/public_plus_experimental_current.txt
index dce72bc..e66fe9e 100644
--- a/camera/camera-camera2/api/public_plus_experimental_current.txt
+++ b/camera/camera-camera2/api/public_plus_experimental_current.txt
@@ -33,17 +33,15 @@
method public androidx.camera.camera2.interop.Camera2Interop.Extender<T!> setSessionStateCallback(android.hardware.camera2.CameraCaptureSession.StateCallback);
}
- @androidx.camera.camera2.interop.ExperimentalCamera2Interop public class CaptureRequestOptions implements androidx.camera.core.impl.ReadableConfig {
+ @androidx.camera.camera2.interop.ExperimentalCamera2Interop public class CaptureRequestOptions {
ctor public CaptureRequestOptions(androidx.camera.core.impl.Config);
method public <ValueT> ValueT? getCaptureRequestOption(android.hardware.camera2.CaptureRequest.Key<ValueT!>);
- method @RestrictTo(androidx.annotation.RestrictTo.Scope.LIBRARY) public androidx.camera.core.impl.Config getConfig();
}
public static final class CaptureRequestOptions.Builder implements androidx.camera.core.ExtendableBuilder<androidx.camera.camera2.interop.CaptureRequestOptions> {
ctor public CaptureRequestOptions.Builder();
method public androidx.camera.camera2.interop.CaptureRequestOptions build();
method public <ValueT> androidx.camera.camera2.interop.CaptureRequestOptions.Builder clearCaptureRequestOption(android.hardware.camera2.CaptureRequest.Key<ValueT!>);
- method @RestrictTo(androidx.annotation.RestrictTo.Scope.LIBRARY) public androidx.camera.core.impl.MutableConfig getMutableConfig();
method public <ValueT> androidx.camera.camera2.interop.CaptureRequestOptions.Builder setCaptureRequestOption(android.hardware.camera2.CaptureRequest.Key<ValueT!>, ValueT);
}
diff --git a/camera/camera-view/api/public_plus_experimental_current.txt b/camera/camera-view/api/public_plus_experimental_current.txt
index c0bc551..991872b 100644
--- a/camera/camera-view/api/public_plus_experimental_current.txt
+++ b/camera/camera-view/api/public_plus_experimental_current.txt
@@ -8,10 +8,10 @@
method @MainThread public androidx.camera.core.CameraInfo? getCameraInfo();
method @MainThread public androidx.camera.core.CameraSelector getCameraSelector();
method @MainThread public java.util.concurrent.Executor? getImageAnalysisBackgroundExecutor();
- method @MainThread @androidx.camera.core.ImageAnalysis.BackpressureStrategy public int getImageAnalysisBackpressureStrategy();
+ method @MainThread public int getImageAnalysisBackpressureStrategy();
method @MainThread public int getImageAnalysisImageQueueDepth();
method @MainThread public androidx.camera.view.CameraController.OutputSize? getImageAnalysisTargetSize();
- method @MainThread @androidx.camera.core.ImageCapture.FlashMode public int getImageCaptureFlashMode();
+ method @MainThread public int getImageCaptureFlashMode();
method @MainThread public java.util.concurrent.Executor? getImageCaptureIoExecutor();
method @MainThread public int getImageCaptureMode();
method @MainThread public androidx.camera.view.CameraController.OutputSize? getImageCaptureTargetSize();
@@ -32,12 +32,12 @@
method @MainThread public void setEnabledUseCases(int);
method @MainThread public void setImageAnalysisAnalyzer(java.util.concurrent.Executor, androidx.camera.core.ImageAnalysis.Analyzer);
method @MainThread public void setImageAnalysisBackgroundExecutor(java.util.concurrent.Executor?);
- method @MainThread public void setImageAnalysisBackpressureStrategy(@androidx.camera.core.ImageAnalysis.BackpressureStrategy int);
+ method @MainThread public void setImageAnalysisBackpressureStrategy(int);
method @MainThread public void setImageAnalysisImageQueueDepth(int);
method @MainThread public void setImageAnalysisTargetSize(androidx.camera.view.CameraController.OutputSize?);
- method @MainThread public void setImageCaptureFlashMode(@androidx.camera.core.ImageCapture.FlashMode int);
+ method @MainThread public void setImageCaptureFlashMode(int);
method @MainThread public void setImageCaptureIoExecutor(java.util.concurrent.Executor?);
- method @MainThread public void setImageCaptureMode(@androidx.camera.core.ImageCapture.CaptureMode int);
+ method @MainThread public void setImageCaptureMode(int);
method @MainThread public void setImageCaptureTargetSize(androidx.camera.view.CameraController.OutputSize?);
method @MainThread public com.google.common.util.concurrent.ListenableFuture<java.lang.Void!> setLinearZoom(@FloatRange(from=0.0f, to=1.0f) float);
method @MainThread public void setPinchToZoomEnabled(boolean);
@@ -60,7 +60,7 @@
}
public static class CameraController.OutputSize {
- ctor public CameraController.OutputSize(@androidx.camera.core.AspectRatio.Ratio int);
+ ctor public CameraController.OutputSize(int);
ctor public CameraController.OutputSize(android.util.Size);
method public int getAspectRatio();
method public android.util.Size? getResolution();
@@ -87,7 +87,7 @@
method @UiThread public androidx.camera.view.PreviewView.ScaleType getScaleType();
method @UiThread public androidx.camera.core.Preview.SurfaceProvider getSurfaceProvider();
method @UiThread @androidx.camera.core.ExperimentalUseCaseGroup public androidx.camera.core.ViewPort? getViewPort();
- method @UiThread @androidx.camera.core.ExperimentalUseCaseGroup public androidx.camera.core.ViewPort? getViewPort(@androidx.camera.core.impl.ImageOutputConfig.RotationValue int);
+ method @UiThread @androidx.camera.core.ExperimentalUseCaseGroup public androidx.camera.core.ViewPort? getViewPort(int);
method @UiThread public void setController(androidx.camera.view.CameraController?);
method @UiThread public void setImplementationMode(androidx.camera.view.PreviewView.ImplementationMode);
method @UiThread public void setScaleType(androidx.camera.view.PreviewView.ScaleType);
diff --git a/car/app/app-automotive/api/public_plus_experimental_current.txt b/car/app/app-automotive/api/public_plus_experimental_current.txt
index 3f11cc2..cd0d094 100644
--- a/car/app/app-automotive/api/public_plus_experimental_current.txt
+++ b/car/app/app-automotive/api/public_plus_experimental_current.txt
@@ -1,7 +1,7 @@
// Signature format: 4.0
package androidx.car.app.activity {
- public final class CarAppActivity extends androidx.fragment.app.FragmentActivity {
+ public final class CarAppActivity extends androidx.fragment.app.FragmentActivity implements androidx.lifecycle.LifecycleOwner {
ctor public CarAppActivity();
}
diff --git a/coordinatorlayout/coordinatorlayout/api/public_plus_experimental_current.txt b/coordinatorlayout/coordinatorlayout/api/public_plus_experimental_current.txt
index 0020f85..b334abc 100644
--- a/coordinatorlayout/coordinatorlayout/api/public_plus_experimental_current.txt
+++ b/coordinatorlayout/coordinatorlayout/api/public_plus_experimental_current.txt
@@ -21,7 +21,7 @@
method public void onMeasureChild(android.view.View!, int, int, int, int);
method public void onNestedPreScroll(android.view.View!, int, int, int[]!, int);
method public void onNestedScroll(android.view.View!, int, int, int, int, int);
- method public void onNestedScroll(android.view.View, int, int, int, int, @androidx.core.view.ViewCompat.NestedScrollType int, int[]);
+ method public void onNestedScroll(android.view.View, int, int, int, int, int, int[]);
method public void onNestedScrollAccepted(android.view.View!, android.view.View!, int, int);
method public boolean onStartNestedScroll(android.view.View!, android.view.View!, int, int);
method public void onStopNestedScroll(android.view.View!, int);
@@ -54,19 +54,19 @@
method public boolean onNestedFling(androidx.coordinatorlayout.widget.CoordinatorLayout, V, android.view.View, float, float, boolean);
method public boolean onNestedPreFling(androidx.coordinatorlayout.widget.CoordinatorLayout, V, android.view.View, float, float);
method @Deprecated public void onNestedPreScroll(androidx.coordinatorlayout.widget.CoordinatorLayout, V, android.view.View, int, int, int[]);
- method public void onNestedPreScroll(androidx.coordinatorlayout.widget.CoordinatorLayout, V, android.view.View, int, int, int[], @androidx.core.view.ViewCompat.NestedScrollType int);
+ method public void onNestedPreScroll(androidx.coordinatorlayout.widget.CoordinatorLayout, V, android.view.View, int, int, int[], int);
method @Deprecated public void onNestedScroll(androidx.coordinatorlayout.widget.CoordinatorLayout, V, android.view.View, int, int, int, int);
- method @Deprecated public void onNestedScroll(androidx.coordinatorlayout.widget.CoordinatorLayout, V, android.view.View, int, int, int, int, @androidx.core.view.ViewCompat.NestedScrollType int);
- method public void onNestedScroll(androidx.coordinatorlayout.widget.CoordinatorLayout, V, android.view.View, int, int, int, int, @androidx.core.view.ViewCompat.NestedScrollType int, int[]);
- method @Deprecated public void onNestedScrollAccepted(androidx.coordinatorlayout.widget.CoordinatorLayout, V, android.view.View, android.view.View, @androidx.core.view.ViewCompat.ScrollAxis int);
- method public void onNestedScrollAccepted(androidx.coordinatorlayout.widget.CoordinatorLayout, V, android.view.View, android.view.View, @androidx.core.view.ViewCompat.ScrollAxis int, @androidx.core.view.ViewCompat.NestedScrollType int);
+ method @Deprecated public void onNestedScroll(androidx.coordinatorlayout.widget.CoordinatorLayout, V, android.view.View, int, int, int, int, int);
+ method public void onNestedScroll(androidx.coordinatorlayout.widget.CoordinatorLayout, V, android.view.View, int, int, int, int, int, int[]);
+ method @Deprecated public void onNestedScrollAccepted(androidx.coordinatorlayout.widget.CoordinatorLayout, V, android.view.View, android.view.View, int);
+ method public void onNestedScrollAccepted(androidx.coordinatorlayout.widget.CoordinatorLayout, V, android.view.View, android.view.View, int, int);
method public boolean onRequestChildRectangleOnScreen(androidx.coordinatorlayout.widget.CoordinatorLayout, V, android.graphics.Rect, boolean);
method public void onRestoreInstanceState(androidx.coordinatorlayout.widget.CoordinatorLayout, V, android.os.Parcelable);
method public android.os.Parcelable? onSaveInstanceState(androidx.coordinatorlayout.widget.CoordinatorLayout, V);
- method @Deprecated public boolean onStartNestedScroll(androidx.coordinatorlayout.widget.CoordinatorLayout, V, android.view.View, android.view.View, @androidx.core.view.ViewCompat.ScrollAxis int);
- method public boolean onStartNestedScroll(androidx.coordinatorlayout.widget.CoordinatorLayout, V, android.view.View, android.view.View, @androidx.core.view.ViewCompat.ScrollAxis int, @androidx.core.view.ViewCompat.NestedScrollType int);
+ method @Deprecated public boolean onStartNestedScroll(androidx.coordinatorlayout.widget.CoordinatorLayout, V, android.view.View, android.view.View, int);
+ method public boolean onStartNestedScroll(androidx.coordinatorlayout.widget.CoordinatorLayout, V, android.view.View, android.view.View, int, int);
method @Deprecated public void onStopNestedScroll(androidx.coordinatorlayout.widget.CoordinatorLayout, V, android.view.View);
- method public void onStopNestedScroll(androidx.coordinatorlayout.widget.CoordinatorLayout, V, android.view.View, @androidx.core.view.ViewCompat.NestedScrollType int);
+ method public void onStopNestedScroll(androidx.coordinatorlayout.widget.CoordinatorLayout, V, android.view.View, int);
method public boolean onTouchEvent(androidx.coordinatorlayout.widget.CoordinatorLayout, V, android.view.MotionEvent);
method public static void setTag(android.view.View, Object?);
}
diff --git a/core/core/api/public_plus_experimental_1.6.0-beta03.txt b/core/core/api/public_plus_experimental_1.6.0-beta03.txt
index 5945c41..9f282f7 100644
--- a/core/core/api/public_plus_experimental_1.6.0-beta03.txt
+++ b/core/core/api/public_plus_experimental_1.6.0-beta03.txt
@@ -783,7 +783,7 @@
method public androidx.core.app.Person.Builder setUri(String?);
}
- @androidx.versionedparcelable.VersionedParcelize(jetifyAs="android.support.v4.app.RemoteActionCompat") public final class RemoteActionCompat implements androidx.versionedparcelable.VersionedParcelable {
+ public final class RemoteActionCompat implements androidx.versionedparcelable.VersionedParcelable {
ctor public RemoteActionCompat(androidx.core.graphics.drawable.IconCompat, CharSequence, CharSequence, android.app.PendingIntent);
ctor public RemoteActionCompat(androidx.core.app.RemoteActionCompat);
method @RequiresApi(26) public static androidx.core.app.RemoteActionCompat createFromRemoteAction(android.app.RemoteAction);
@@ -1309,7 +1309,7 @@
method public static android.graphics.drawable.Drawable! wrap(android.graphics.drawable.Drawable);
}
- @androidx.versionedparcelable.VersionedParcelize(allowSerialization=true, ignoreParcelables=true, isCustom=true, jetifyAs="android.support.v4.graphics.drawable.IconCompat") public class IconCompat extends androidx.versionedparcelable.CustomVersionedParcelable {
+ public class IconCompat implements androidx.versionedparcelable.VersionedParcelable {
method public static androidx.core.graphics.drawable.IconCompat? createFromBundle(android.os.Bundle);
method @RequiresApi(23) public static androidx.core.graphics.drawable.IconCompat? createFromIcon(android.content.Context, android.graphics.drawable.Icon);
method public static androidx.core.graphics.drawable.IconCompat! createWithAdaptiveBitmap(android.graphics.Bitmap!);
@@ -1325,6 +1325,8 @@
method public int getType();
method public android.net.Uri getUri();
method public android.graphics.drawable.Drawable? loadDrawable(android.content.Context);
+ method public void onPostParceling();
+ method public void onPreParceling(boolean);
method public androidx.core.graphics.drawable.IconCompat! setTint(@ColorInt int);
method public androidx.core.graphics.drawable.IconCompat! setTintList(android.content.res.ColorStateList!);
method public androidx.core.graphics.drawable.IconCompat! setTintMode(android.graphics.PorterDuff.Mode!);
diff --git a/core/core/api/public_plus_experimental_current.txt b/core/core/api/public_plus_experimental_current.txt
index 5945c41..9f282f7 100644
--- a/core/core/api/public_plus_experimental_current.txt
+++ b/core/core/api/public_plus_experimental_current.txt
@@ -783,7 +783,7 @@
method public androidx.core.app.Person.Builder setUri(String?);
}
- @androidx.versionedparcelable.VersionedParcelize(jetifyAs="android.support.v4.app.RemoteActionCompat") public final class RemoteActionCompat implements androidx.versionedparcelable.VersionedParcelable {
+ public final class RemoteActionCompat implements androidx.versionedparcelable.VersionedParcelable {
ctor public RemoteActionCompat(androidx.core.graphics.drawable.IconCompat, CharSequence, CharSequence, android.app.PendingIntent);
ctor public RemoteActionCompat(androidx.core.app.RemoteActionCompat);
method @RequiresApi(26) public static androidx.core.app.RemoteActionCompat createFromRemoteAction(android.app.RemoteAction);
@@ -1309,7 +1309,7 @@
method public static android.graphics.drawable.Drawable! wrap(android.graphics.drawable.Drawable);
}
- @androidx.versionedparcelable.VersionedParcelize(allowSerialization=true, ignoreParcelables=true, isCustom=true, jetifyAs="android.support.v4.graphics.drawable.IconCompat") public class IconCompat extends androidx.versionedparcelable.CustomVersionedParcelable {
+ public class IconCompat implements androidx.versionedparcelable.VersionedParcelable {
method public static androidx.core.graphics.drawable.IconCompat? createFromBundle(android.os.Bundle);
method @RequiresApi(23) public static androidx.core.graphics.drawable.IconCompat? createFromIcon(android.content.Context, android.graphics.drawable.Icon);
method public static androidx.core.graphics.drawable.IconCompat! createWithAdaptiveBitmap(android.graphics.Bitmap!);
@@ -1325,6 +1325,8 @@
method public int getType();
method public android.net.Uri getUri();
method public android.graphics.drawable.Drawable? loadDrawable(android.content.Context);
+ method public void onPostParceling();
+ method public void onPreParceling(boolean);
method public androidx.core.graphics.drawable.IconCompat! setTint(@ColorInt int);
method public androidx.core.graphics.drawable.IconCompat! setTintList(android.content.res.ColorStateList!);
method public androidx.core.graphics.drawable.IconCompat! setTintMode(android.graphics.PorterDuff.Mode!);
diff --git a/emoji2/emoji2-views/api/public_plus_experimental_current.txt b/emoji2/emoji2-views/api/public_plus_experimental_current.txt
index b77930a..879b30e 100644
--- a/emoji2/emoji2-views/api/public_plus_experimental_current.txt
+++ b/emoji2/emoji2-views/api/public_plus_experimental_current.txt
@@ -21,7 +21,7 @@
ctor public EmojiExtractTextLayout(android.content.Context, android.util.AttributeSet?, int);
method public int getEmojiReplaceStrategy();
method public void onUpdateExtractingViews(android.inputmethodservice.InputMethodService, android.view.inputmethod.EditorInfo);
- method public void setEmojiReplaceStrategy(@androidx.emoji2.text.EmojiCompat.ReplaceStrategy int);
+ method public void setEmojiReplaceStrategy(int);
}
public class EmojiTextView extends android.widget.TextView {
diff --git a/fragment/fragment/api/public_plus_experimental_current.txt b/fragment/fragment/api/public_plus_experimental_current.txt
index 23c97fe..f56726e 100644
--- a/fragment/fragment/api/public_plus_experimental_current.txt
+++ b/fragment/fragment/api/public_plus_experimental_current.txt
@@ -163,7 +163,7 @@
field public static final android.os.Parcelable.Creator<androidx.fragment.app.Fragment.SavedState!> CREATOR;
}
- public class FragmentActivity extends androidx.activity.ComponentActivity implements androidx.core.app.ActivityCompat.OnRequestPermissionsResultCallback androidx.core.app.ActivityCompat.RequestPermissionsRequestCodeValidator {
+ public class FragmentActivity extends androidx.activity.ComponentActivity implements androidx.core.app.ActivityCompat.OnRequestPermissionsResultCallback androidx.lifecycle.LifecycleOwner {
ctor public FragmentActivity();
ctor @ContentView public FragmentActivity(@LayoutRes int);
method public androidx.fragment.app.FragmentManager getSupportFragmentManager();
diff --git a/leanback/leanback/api/public_plus_experimental_current.txt b/leanback/leanback/api/public_plus_experimental_current.txt
index e046040..de3d795 100644
--- a/leanback/leanback/api/public_plus_experimental_current.txt
+++ b/leanback/leanback/api/public_plus_experimental_current.txt
@@ -1894,7 +1894,7 @@
public final class GridLayoutManager extends androidx.recyclerview.widget.RecyclerView.LayoutManager {
ctor public GridLayoutManager();
method public androidx.recyclerview.widget.RecyclerView.LayoutParams generateDefaultLayoutParams();
- method public void setOrientation(@androidx.recyclerview.widget.RecyclerView.Orientation int);
+ method public void setOrientation(int);
}
public class GuidanceStylist implements androidx.leanback.widget.FragmentAnimationProvider {
diff --git a/media/media/api/public_plus_experimental_current.txt b/media/media/api/public_plus_experimental_current.txt
index d9037ca..e82dbe2 100644
--- a/media/media/api/public_plus_experimental_current.txt
+++ b/media/media/api/public_plus_experimental_current.txt
@@ -530,7 +530,7 @@
package androidx.media {
- @androidx.versionedparcelable.VersionedParcelize(jetifyAs="android.support.v4.media.AudioAttributesCompat") public class AudioAttributesCompat implements androidx.versionedparcelable.VersionedParcelable {
+ public class AudioAttributesCompat implements androidx.versionedparcelable.VersionedParcelable {
method public int getContentType();
method public int getFlags();
method public int getLegacyStreamType();
@@ -594,8 +594,8 @@
public final class AudioManagerCompat {
method public static int abandonAudioFocusRequest(android.media.AudioManager, androidx.media.AudioFocusRequestCompat);
- method @IntRange(from=0) public static int getStreamMaxVolume(android.media.AudioManager, @androidx.core.app.NotificationCompat.StreamType int);
- method @IntRange(from=0) public static int getStreamMinVolume(android.media.AudioManager, @androidx.core.app.NotificationCompat.StreamType int);
+ method @IntRange(from=0) public static int getStreamMaxVolume(android.media.AudioManager, int);
+ method @IntRange(from=0) public static int getStreamMinVolume(android.media.AudioManager, int);
method public static int requestAudioFocus(android.media.AudioManager, androidx.media.AudioFocusRequestCompat);
field public static final int AUDIOFOCUS_GAIN = 1; // 0x1
field public static final int AUDIOFOCUS_GAIN_TRANSIENT = 2; // 0x2
diff --git a/media2/media2-common/api/public_plus_experimental_current.txt b/media2/media2-common/api/public_plus_experimental_current.txt
index 097aa96..7992d7b 100644
--- a/media2/media2-common/api/public_plus_experimental_current.txt
+++ b/media2/media2-common/api/public_plus_experimental_current.txt
@@ -1,7 +1,7 @@
// Signature format: 4.0
package androidx.media2.common {
- public class CallbackMediaItem extends androidx.media2.common.MediaItem {
+ public class CallbackMediaItem extends androidx.media2.common.MediaItem implements androidx.versionedparcelable.VersionedParcelable {
method public androidx.media2.common.DataSourceCallback getDataSourceCallback();
}
@@ -19,7 +19,7 @@
method public abstract int readAt(long, byte[], int, int) throws java.io.IOException;
}
- public class FileMediaItem extends androidx.media2.common.MediaItem {
+ public class FileMediaItem extends androidx.media2.common.MediaItem implements androidx.versionedparcelable.VersionedParcelable {
method public long getFileDescriptorLength();
method public long getFileDescriptorOffset();
method public android.os.ParcelFileDescriptor getParcelFileDescriptor();
@@ -36,7 +36,7 @@
method public androidx.media2.common.FileMediaItem.Builder setStartPosition(long);
}
- @androidx.versionedparcelable.VersionedParcelize(isCustom=true) public class MediaItem extends androidx.versionedparcelable.CustomVersionedParcelable {
+ public class MediaItem implements androidx.versionedparcelable.VersionedParcelable {
method public long getEndPosition();
method public androidx.media2.common.MediaMetadata? getMetadata();
method public long getStartPosition();
@@ -52,7 +52,7 @@
method public androidx.media2.common.MediaItem.Builder setStartPosition(long);
}
- @androidx.versionedparcelable.VersionedParcelize(isCustom=true) public final class MediaMetadata extends androidx.versionedparcelable.CustomVersionedParcelable {
+ public final class MediaMetadata implements androidx.versionedparcelable.VersionedParcelable {
method public boolean containsKey(String);
method public android.graphics.Bitmap? getBitmap(String);
method public android.os.Bundle? getExtras();
@@ -226,7 +226,7 @@
field public static final int RESULT_SUCCESS = 0; // 0x0
}
- @androidx.versionedparcelable.VersionedParcelize(isCustom=true) public static class SessionPlayer.TrackInfo extends androidx.versionedparcelable.CustomVersionedParcelable {
+ public static class SessionPlayer.TrackInfo implements androidx.versionedparcelable.VersionedParcelable {
ctor public SessionPlayer.TrackInfo(int, int, android.media.MediaFormat?);
ctor public SessionPlayer.TrackInfo(int, int, android.media.MediaFormat?, boolean);
method public android.media.MediaFormat? getFormat();
@@ -241,14 +241,14 @@
field public static final int MEDIA_TRACK_TYPE_VIDEO = 1; // 0x1
}
- @androidx.versionedparcelable.VersionedParcelize public final class SubtitleData implements androidx.versionedparcelable.VersionedParcelable {
+ public final class SubtitleData implements androidx.versionedparcelable.VersionedParcelable {
ctor public SubtitleData(long, long, byte[]);
method public byte[] getData();
method public long getDurationUs();
method public long getStartTimeUs();
}
- public class UriMediaItem extends androidx.media2.common.MediaItem {
+ public class UriMediaItem extends androidx.media2.common.MediaItem implements androidx.versionedparcelable.VersionedParcelable {
method public android.net.Uri getUri();
method public java.util.List<java.net.HttpCookie!>? getUriCookies();
method public java.util.Map<java.lang.String!,java.lang.String!>? getUriHeaders();
@@ -263,7 +263,7 @@
method public androidx.media2.common.UriMediaItem.Builder setStartPosition(long);
}
- @androidx.versionedparcelable.VersionedParcelize public class VideoSize implements androidx.versionedparcelable.VersionedParcelable {
+ public class VideoSize implements androidx.versionedparcelable.VersionedParcelable {
ctor public VideoSize(@IntRange(from=0) int, @IntRange(from=0) int);
method @IntRange(from=0) public int getHeight();
method @IntRange(from=0) public int getWidth();
diff --git a/media2/media2-player/api/public_plus_experimental_current.txt b/media2/media2-player/api/public_plus_experimental_current.txt
index 5ae3ddb..c5e968d 100644
--- a/media2/media2-player/api/public_plus_experimental_current.txt
+++ b/media2/media2-player/api/public_plus_experimental_current.txt
@@ -8,7 +8,7 @@
method public androidx.media.AudioAttributesCompat? getAudioAttributes();
method public int getAudioSessionId();
method public long getBufferedPosition();
- method @androidx.media2.common.SessionPlayer.BuffState public int getBufferingState();
+ method public int getBufferingState();
method public androidx.media2.common.MediaItem? getCurrentMediaItem();
method public int getCurrentMediaItemIndex();
method public long getCurrentPosition();
@@ -17,7 +17,7 @@
method public int getNextMediaItemIndex();
method public androidx.media2.player.PlaybackParams getPlaybackParams();
method @FloatRange(from=0.0f, to=java.lang.Float.MAX_VALUE, fromInclusive=false) public float getPlaybackSpeed();
- method @androidx.media2.common.SessionPlayer.PlayerState public int getPlayerState();
+ method public int getPlayerState();
method public float getPlayerVolume();
method public java.util.List<androidx.media2.common.MediaItem!>? getPlaylist();
method public androidx.media2.common.MediaMetadata? getPlaylistMetadata();
@@ -82,7 +82,7 @@
method @Deprecated public void onVideoSizeChanged(androidx.media2.player.MediaPlayer, androidx.media2.common.MediaItem, androidx.media2.player.VideoSize);
}
- public static final class MediaPlayer.TrackInfo extends androidx.media2.common.SessionPlayer.TrackInfo {
+ public static final class MediaPlayer.TrackInfo extends androidx.media2.common.SessionPlayer.TrackInfo implements androidx.versionedparcelable.VersionedParcelable {
}
public final class MediaTimestamp {
diff --git a/media2/media2-session/api/public_plus_experimental_current.txt b/media2/media2-session/api/public_plus_experimental_current.txt
index e75539b..95e39e3 100644
--- a/media2/media2-session/api/public_plus_experimental_current.txt
+++ b/media2/media2-session/api/public_plus_experimental_current.txt
@@ -1,14 +1,14 @@
// Signature format: 4.0
package androidx.media2.session {
- @androidx.versionedparcelable.VersionedParcelize public final class HeartRating implements androidx.media2.common.Rating {
+ public final class HeartRating implements androidx.media2.common.Rating {
ctor public HeartRating();
ctor public HeartRating(boolean);
method public boolean hasHeart();
method public boolean isRated();
}
- @androidx.versionedparcelable.VersionedParcelize(isCustom=true) public class LibraryResult extends androidx.versionedparcelable.CustomVersionedParcelable implements androidx.media2.common.BaseResult {
+ public class LibraryResult implements androidx.versionedparcelable.VersionedParcelable {
ctor public LibraryResult(int);
ctor public LibraryResult(int, androidx.media2.common.MediaItem?, androidx.media2.session.MediaLibraryService.LibraryParams?);
ctor public LibraryResult(int, java.util.List<androidx.media2.common.MediaItem!>?, androidx.media2.session.MediaLibraryService.LibraryParams?);
@@ -17,6 +17,11 @@
method public androidx.media2.common.MediaItem? getMediaItem();
method public java.util.List<androidx.media2.common.MediaItem!>? getMediaItems();
method public int getResultCode();
+ field public static final int RESULT_ERROR_BAD_VALUE = -3; // 0xfffffffd
+ field public static final int RESULT_ERROR_INVALID_STATE = -2; // 0xfffffffe
+ field public static final int RESULT_ERROR_IO = -5; // 0xfffffffb
+ field public static final int RESULT_ERROR_NOT_SUPPORTED = -6; // 0xfffffffa
+ field public static final int RESULT_ERROR_PERMISSION_DENIED = -4; // 0xfffffffc
field public static final int RESULT_ERROR_SESSION_AUTHENTICATION_EXPIRED = -102; // 0xffffff9a
field public static final int RESULT_ERROR_SESSION_CONCURRENT_STREAM_LIMIT = -104; // 0xffffff98
field public static final int RESULT_ERROR_SESSION_DISCONNECTED = -100; // 0xffffff9c
@@ -25,6 +30,9 @@
field public static final int RESULT_ERROR_SESSION_PREMIUM_ACCOUNT_REQUIRED = -103; // 0xffffff99
field public static final int RESULT_ERROR_SESSION_SETUP_REQUIRED = -108; // 0xffffff94
field public static final int RESULT_ERROR_SESSION_SKIP_LIMIT_REACHED = -107; // 0xffffff95
+ field public static final int RESULT_ERROR_UNKNOWN = -1; // 0xffffffff
+ field public static final int RESULT_INFO_SKIPPED = 1; // 0x1
+ field public static final int RESULT_SUCCESS = 0; // 0x0
}
public class MediaBrowser extends androidx.media2.session.MediaController {
@@ -73,7 +81,7 @@
method public com.google.common.util.concurrent.ListenableFuture<androidx.media2.session.SessionResult!> fastForward();
method public androidx.media2.session.SessionCommandGroup? getAllowedCommands();
method public long getBufferedPosition();
- method @androidx.media2.common.SessionPlayer.BuffState public int getBufferingState();
+ method public int getBufferingState();
method public androidx.media2.session.SessionToken? getConnectedToken();
method public androidx.media2.common.MediaItem? getCurrentMediaItem();
method public int getCurrentMediaItemIndex();
@@ -86,10 +94,10 @@
method public java.util.List<androidx.media2.common.MediaItem!>? getPlaylist();
method public androidx.media2.common.MediaMetadata? getPlaylistMetadata();
method public int getPreviousMediaItemIndex();
- method @androidx.media2.common.SessionPlayer.RepeatMode public int getRepeatMode();
- method public androidx.media2.common.SessionPlayer.TrackInfo? getSelectedTrack(@androidx.media2.common.SessionPlayer.TrackInfo.MediaTrackType int);
+ method public int getRepeatMode();
+ method public androidx.media2.common.SessionPlayer.TrackInfo? getSelectedTrack(int);
method public android.app.PendingIntent? getSessionActivity();
- method @androidx.media2.common.SessionPlayer.ShuffleMode public int getShuffleMode();
+ method public int getShuffleMode();
method public java.util.List<androidx.media2.common.SessionPlayer.TrackInfo!> getTracks();
method public androidx.media2.common.VideoSize getVideoSize();
method public boolean isConnected();
@@ -108,8 +116,8 @@
method public com.google.common.util.concurrent.ListenableFuture<androidx.media2.session.SessionResult!> setPlaybackSpeed(float);
method public com.google.common.util.concurrent.ListenableFuture<androidx.media2.session.SessionResult!> setPlaylist(java.util.List<java.lang.String!>, androidx.media2.common.MediaMetadata?);
method public com.google.common.util.concurrent.ListenableFuture<androidx.media2.session.SessionResult!> setRating(String, androidx.media2.common.Rating);
- method public com.google.common.util.concurrent.ListenableFuture<androidx.media2.session.SessionResult!> setRepeatMode(@androidx.media2.common.SessionPlayer.RepeatMode int);
- method public com.google.common.util.concurrent.ListenableFuture<androidx.media2.session.SessionResult!> setShuffleMode(@androidx.media2.common.SessionPlayer.ShuffleMode int);
+ method public com.google.common.util.concurrent.ListenableFuture<androidx.media2.session.SessionResult!> setRepeatMode(int);
+ method public com.google.common.util.concurrent.ListenableFuture<androidx.media2.session.SessionResult!> setShuffleMode(int);
method public com.google.common.util.concurrent.ListenableFuture<androidx.media2.session.SessionResult!> setSurface(android.view.Surface?);
method public com.google.common.util.concurrent.ListenableFuture<androidx.media2.session.SessionResult!> setVolumeTo(int, int);
method public com.google.common.util.concurrent.ListenableFuture<androidx.media2.session.SessionResult!> skipBackward();
@@ -132,7 +140,7 @@
public abstract static class MediaController.ControllerCallback {
ctor public MediaController.ControllerCallback();
method public void onAllowedCommandsChanged(androidx.media2.session.MediaController, androidx.media2.session.SessionCommandGroup);
- method public void onBufferingStateChanged(androidx.media2.session.MediaController, androidx.media2.common.MediaItem, @androidx.media2.common.SessionPlayer.BuffState int);
+ method public void onBufferingStateChanged(androidx.media2.session.MediaController, androidx.media2.common.MediaItem, int);
method public void onConnected(androidx.media2.session.MediaController, androidx.media2.session.SessionCommandGroup);
method public void onCurrentMediaItemChanged(androidx.media2.session.MediaController, androidx.media2.common.MediaItem?);
method public androidx.media2.session.SessionResult onCustomCommand(androidx.media2.session.MediaController, androidx.media2.session.SessionCommand, android.os.Bundle?);
@@ -140,13 +148,13 @@
method public void onPlaybackCompleted(androidx.media2.session.MediaController);
method public void onPlaybackInfoChanged(androidx.media2.session.MediaController, androidx.media2.session.MediaController.PlaybackInfo);
method public void onPlaybackSpeedChanged(androidx.media2.session.MediaController, float);
- method public void onPlayerStateChanged(androidx.media2.session.MediaController, @androidx.media2.common.SessionPlayer.PlayerState int);
+ method public void onPlayerStateChanged(androidx.media2.session.MediaController, int);
method public void onPlaylistChanged(androidx.media2.session.MediaController, java.util.List<androidx.media2.common.MediaItem!>?, androidx.media2.common.MediaMetadata?);
method public void onPlaylistMetadataChanged(androidx.media2.session.MediaController, androidx.media2.common.MediaMetadata?);
- method public void onRepeatModeChanged(androidx.media2.session.MediaController, @androidx.media2.common.SessionPlayer.RepeatMode int);
+ method public void onRepeatModeChanged(androidx.media2.session.MediaController, int);
method public void onSeekCompleted(androidx.media2.session.MediaController, long);
method public int onSetCustomLayout(androidx.media2.session.MediaController, java.util.List<androidx.media2.session.MediaSession.CommandButton!>);
- method public void onShuffleModeChanged(androidx.media2.session.MediaController, @androidx.media2.common.SessionPlayer.ShuffleMode int);
+ method public void onShuffleModeChanged(androidx.media2.session.MediaController, int);
method public void onSubtitleData(androidx.media2.session.MediaController, androidx.media2.common.MediaItem, androidx.media2.common.SessionPlayer.TrackInfo, androidx.media2.common.SubtitleData);
method public void onTrackDeselected(androidx.media2.session.MediaController, androidx.media2.common.SessionPlayer.TrackInfo);
method public void onTrackSelected(androidx.media2.session.MediaController, androidx.media2.common.SessionPlayer.TrackInfo);
@@ -154,7 +162,7 @@
method public void onVideoSizeChanged(androidx.media2.session.MediaController, androidx.media2.common.VideoSize);
}
- @androidx.versionedparcelable.VersionedParcelize public static final class MediaController.PlaybackInfo implements androidx.versionedparcelable.VersionedParcelable {
+ public static final class MediaController.PlaybackInfo implements androidx.versionedparcelable.VersionedParcelable {
method public androidx.media.AudioAttributesCompat? getAudioAttributes();
method public int getControlType();
method public int getCurrentVolume();
@@ -170,7 +178,7 @@
field public static final String SERVICE_INTERFACE = "androidx.media2.session.MediaLibraryService";
}
- @androidx.versionedparcelable.VersionedParcelize public static final class MediaLibraryService.LibraryParams implements androidx.versionedparcelable.VersionedParcelable {
+ public static final class MediaLibraryService.LibraryParams implements androidx.versionedparcelable.VersionedParcelable {
method public android.os.Bundle? getExtras();
method public boolean isOffline();
method public boolean isRecent();
@@ -234,7 +242,7 @@
method public androidx.media2.session.MediaSession.Builder setSessionCallback(java.util.concurrent.Executor, androidx.media2.session.MediaSession.SessionCallback);
}
- @androidx.versionedparcelable.VersionedParcelize public static final class MediaSession.CommandButton implements androidx.versionedparcelable.VersionedParcelable {
+ public static final class MediaSession.CommandButton implements androidx.versionedparcelable.VersionedParcelable {
method public androidx.media2.session.SessionCommand? getCommand();
method public CharSequence? getDisplayName();
method public android.os.Bundle? getExtras();
@@ -296,7 +304,7 @@
method public int getNotificationId();
}
- @androidx.versionedparcelable.VersionedParcelize public final class PercentageRating implements androidx.media2.common.Rating {
+ public final class PercentageRating implements androidx.media2.common.Rating {
ctor public PercentageRating();
ctor public PercentageRating(float);
method public float getPercentRating();
@@ -320,7 +328,7 @@
method public void onVolumeChanged(androidx.media2.session.RemoteSessionPlayer, int);
}
- @androidx.versionedparcelable.VersionedParcelize public final class SessionCommand implements androidx.versionedparcelable.VersionedParcelable {
+ public final class SessionCommand implements androidx.versionedparcelable.VersionedParcelable {
ctor public SessionCommand(int);
ctor public SessionCommand(String, android.os.Bundle?);
method public int getCommandCode();
@@ -369,7 +377,7 @@
field public static final int COMMAND_VERSION_2 = 2; // 0x2
}
- @androidx.versionedparcelable.VersionedParcelize public final class SessionCommandGroup implements androidx.versionedparcelable.VersionedParcelable {
+ public final class SessionCommandGroup implements androidx.versionedparcelable.VersionedParcelable {
ctor public SessionCommandGroup();
ctor public SessionCommandGroup(java.util.Collection<androidx.media2.session.SessionCommand!>?);
method public java.util.Set<androidx.media2.session.SessionCommand!> getCommands();
@@ -386,12 +394,17 @@
method public androidx.media2.session.SessionCommandGroup.Builder removeCommand(androidx.media2.session.SessionCommand);
}
- @androidx.versionedparcelable.VersionedParcelize(isCustom=true) public class SessionResult extends androidx.versionedparcelable.CustomVersionedParcelable implements androidx.media2.common.BaseResult {
+ public class SessionResult implements androidx.versionedparcelable.VersionedParcelable {
ctor public SessionResult(int, android.os.Bundle?);
method public long getCompletionTime();
method public android.os.Bundle? getCustomCommandResult();
method public androidx.media2.common.MediaItem? getMediaItem();
method public int getResultCode();
+ field public static final int RESULT_ERROR_BAD_VALUE = -3; // 0xfffffffd
+ field public static final int RESULT_ERROR_INVALID_STATE = -2; // 0xfffffffe
+ field public static final int RESULT_ERROR_IO = -5; // 0xfffffffb
+ field public static final int RESULT_ERROR_NOT_SUPPORTED = -6; // 0xfffffffa
+ field public static final int RESULT_ERROR_PERMISSION_DENIED = -4; // 0xfffffffc
field public static final int RESULT_ERROR_SESSION_AUTHENTICATION_EXPIRED = -102; // 0xffffff9a
field public static final int RESULT_ERROR_SESSION_CONCURRENT_STREAM_LIMIT = -104; // 0xffffff98
field public static final int RESULT_ERROR_SESSION_DISCONNECTED = -100; // 0xffffff9c
@@ -400,10 +413,12 @@
field public static final int RESULT_ERROR_SESSION_PREMIUM_ACCOUNT_REQUIRED = -103; // 0xffffff99
field public static final int RESULT_ERROR_SESSION_SETUP_REQUIRED = -108; // 0xffffff94
field public static final int RESULT_ERROR_SESSION_SKIP_LIMIT_REACHED = -107; // 0xffffff95
+ field public static final int RESULT_ERROR_UNKNOWN = -1; // 0xffffffff
+ field public static final int RESULT_INFO_SKIPPED = 1; // 0x1
field public static final int RESULT_SUCCESS = 0; // 0x0
}
- @androidx.versionedparcelable.VersionedParcelize public final class SessionToken implements androidx.versionedparcelable.VersionedParcelable {
+ public final class SessionToken implements androidx.versionedparcelable.VersionedParcelable {
ctor public SessionToken(android.content.Context, android.content.ComponentName);
method public android.os.Bundle getExtras();
method public String getPackageName();
@@ -415,7 +430,7 @@
field public static final int TYPE_SESSION_SERVICE = 1; // 0x1
}
- @androidx.versionedparcelable.VersionedParcelize public final class StarRating implements androidx.media2.common.Rating {
+ public final class StarRating implements androidx.media2.common.Rating {
ctor public StarRating(@IntRange(from=1) int);
ctor public StarRating(@IntRange(from=1) int, float);
method public int getMaxStars();
@@ -423,7 +438,7 @@
method public boolean isRated();
}
- @androidx.versionedparcelable.VersionedParcelize public final class ThumbRating implements androidx.media2.common.Rating {
+ public final class ThumbRating implements androidx.media2.common.Rating {
ctor public ThumbRating();
ctor public ThumbRating(boolean);
method public boolean isRated();
diff --git a/navigation/navigation-common/api/public_plus_experimental_current.txt b/navigation/navigation-common/api/public_plus_experimental_current.txt
index 5f83f73..18da36a 100644
--- a/navigation/navigation-common/api/public_plus_experimental_current.txt
+++ b/navigation/navigation-common/api/public_plus_experimental_current.txt
@@ -72,8 +72,6 @@
method public androidx.navigation.NavType<java.lang.Object> getType();
method public boolean isDefaultValuePresent();
method public boolean isNullable();
- method @RestrictTo(androidx.annotation.RestrictTo.Scope.LIBRARY_GROUP) public void putDefaultValue(String name, android.os.Bundle bundle);
- method @RestrictTo(androidx.annotation.RestrictTo.Scope.LIBRARY_GROUP) public boolean verify(String name, android.os.Bundle bundle);
property public final Object? defaultValue;
property public final boolean isDefaultValuePresent;
property public final boolean isNullable;
@@ -108,39 +106,25 @@
method public androidx.navigation.NavDestination getDestination();
method public String getId();
method public androidx.lifecycle.Lifecycle getLifecycle();
- method @RestrictTo(androidx.annotation.RestrictTo.Scope.LIBRARY_GROUP) public androidx.lifecycle.Lifecycle.State getMaxLifecycle();
method public androidx.lifecycle.SavedStateHandle getSavedStateHandle();
method public androidx.savedstate.SavedStateRegistry getSavedStateRegistry();
method public androidx.lifecycle.ViewModelStore getViewModelStore();
- method @RestrictTo(androidx.annotation.RestrictTo.Scope.LIBRARY_GROUP) public void handleLifecycleEvent(androidx.lifecycle.Lifecycle.Event event);
- method @RestrictTo(androidx.annotation.RestrictTo.Scope.LIBRARY_GROUP) public void replaceArguments(android.os.Bundle? newArgs);
- method @RestrictTo(androidx.annotation.RestrictTo.Scope.LIBRARY_GROUP) public void saveState(android.os.Bundle outBundle);
- method @RestrictTo(androidx.annotation.RestrictTo.Scope.LIBRARY_GROUP) public void setArguments(android.os.Bundle? p);
- method @RestrictTo(androidx.annotation.RestrictTo.Scope.LIBRARY_GROUP) public void setMaxLifecycle(androidx.lifecycle.Lifecycle.State maxState);
- method @RestrictTo(androidx.annotation.RestrictTo.Scope.LIBRARY_GROUP) public void updateState();
property public final android.os.Bundle? arguments;
property public final androidx.navigation.NavDestination destination;
property public final String id;
- property @RestrictTo(androidx.annotation.RestrictTo.Scope.LIBRARY_GROUP) public final androidx.lifecycle.Lifecycle.State maxLifecycle;
property public final androidx.lifecycle.SavedStateHandle savedStateHandle;
}
public final class NavDeepLink {
- ctor @RestrictTo(androidx.annotation.RestrictTo.Scope.LIBRARY_GROUP) public NavDeepLink(String uri);
method public String? getAction();
- method @RestrictTo(androidx.annotation.RestrictTo.Scope.LIBRARY_GROUP) public android.os.Bundle? getMatchingArguments(android.net.Uri deepLink, java.util.Map<java.lang.String,androidx.navigation.NavArgument> arguments);
method public String? getMimeType();
- method @RestrictTo(androidx.annotation.RestrictTo.Scope.LIBRARY_GROUP) public int getMimeTypeMatchRating(String mimeType);
method public String? getUriPattern();
- method @RestrictTo(androidx.annotation.RestrictTo.Scope.LIBRARY_GROUP) public boolean isExactDeepLink();
property public final String? action;
- property @RestrictTo(androidx.annotation.RestrictTo.Scope.LIBRARY_GROUP) public final boolean isExactDeepLink;
property public final String? mimeType;
property public final String? uriPattern;
}
public static final class NavDeepLink.Builder {
- ctor @RestrictTo(androidx.annotation.RestrictTo.Scope.LIBRARY_GROUP) public NavDeepLink.Builder();
method public androidx.navigation.NavDeepLink build();
method public static androidx.navigation.NavDeepLink.Builder fromAction(String action);
method public static androidx.navigation.NavDeepLink.Builder fromMimeType(String mimeType);
@@ -171,8 +155,6 @@
}
public class NavDeepLinkRequest {
- ctor @RestrictTo(androidx.annotation.RestrictTo.Scope.LIBRARY_GROUP) public NavDeepLinkRequest(android.net.Uri? uri, String? action, String? mimeType);
- ctor @RestrictTo(androidx.annotation.RestrictTo.Scope.LIBRARY_GROUP) public NavDeepLinkRequest(android.content.Intent intent);
method public String? getAction();
method public String? getMimeType();
method public android.net.Uri? getUri();
@@ -204,12 +186,8 @@
method public final void addArgument(String argumentName, androidx.navigation.NavArgument argument);
method public final void addDeepLink(String uriPattern);
method public final void addDeepLink(androidx.navigation.NavDeepLink navDeepLink);
- method @RestrictTo(androidx.annotation.RestrictTo.Scope.LIBRARY_GROUP) public final android.os.Bundle? addInDefaultArgs(android.os.Bundle? args);
- method @RestrictTo(androidx.annotation.RestrictTo.Scope.LIBRARY_GROUP) public final int[] buildDeepLinkIds(optional androidx.navigation.NavDestination? previousDestination);
- method @RestrictTo(androidx.annotation.RestrictTo.Scope.LIBRARY_GROUP) public final int[] buildDeepLinkIds();
method public final androidx.navigation.NavAction? getAction(@IdRes int id);
method public final java.util.Map<java.lang.String,androidx.navigation.NavArgument> getArguments();
- method @RestrictTo(androidx.annotation.RestrictTo.Scope.LIBRARY_GROUP) public String getDisplayName();
method public static final kotlin.sequences.Sequence<androidx.navigation.NavDestination> getHierarchy(androidx.navigation.NavDestination);
method @IdRes public final int getId();
method public final CharSequence? getLabel();
@@ -218,21 +196,16 @@
method public final String? getRoute();
method public boolean hasDeepLink(android.net.Uri deepLink);
method public boolean hasDeepLink(androidx.navigation.NavDeepLinkRequest deepLinkRequest);
- method @RestrictTo(androidx.annotation.RestrictTo.Scope.LIBRARY_GROUP) public androidx.navigation.NavDestination.DeepLinkMatch? matchDeepLink(androidx.navigation.NavDeepLinkRequest navDeepLinkRequest);
method @CallSuper public void onInflate(android.content.Context context, android.util.AttributeSet attrs);
method protected static final <C> Class<? extends C> parseClassFromName(android.content.Context context, String name, Class<? extends C> expectedClassType);
- method @RestrictTo(androidx.annotation.RestrictTo.Scope.LIBRARY_GROUP) public static final <C> Class<? extends C> parseClassFromNameInternal(android.content.Context context, String name, Class<? extends C> expectedClassType);
method public final void putAction(@IdRes int actionId, @IdRes int destId);
method public final void putAction(@IdRes int actionId, androidx.navigation.NavAction action);
method public final void removeAction(@IdRes int actionId);
method public final void removeArgument(String argumentName);
method public final void setId(@IdRes int id);
method public final void setLabel(CharSequence? p);
- method @RestrictTo(androidx.annotation.RestrictTo.Scope.LIBRARY_GROUP) public final void setParent(androidx.navigation.NavGraph? p);
method public final void setRoute(String? route);
- method @RestrictTo(androidx.annotation.RestrictTo.Scope.LIBRARY_GROUP) public boolean supportsActions();
property public final java.util.Map<java.lang.String,androidx.navigation.NavArgument> arguments;
- property @RestrictTo(androidx.annotation.RestrictTo.Scope.LIBRARY_GROUP) public String displayName;
property @IdRes public final int id;
property public final CharSequence? label;
property public final String navigatorName;
@@ -249,19 +222,9 @@
public static final class NavDestination.Companion {
method public kotlin.sequences.Sequence<androidx.navigation.NavDestination> getHierarchy(androidx.navigation.NavDestination);
method protected <C> Class<? extends C> parseClassFromName(android.content.Context context, String name, Class<? extends C> expectedClassType);
- method @RestrictTo(androidx.annotation.RestrictTo.Scope.LIBRARY_GROUP) public <C> Class<? extends C> parseClassFromNameInternal(android.content.Context context, String name, Class<? extends C> expectedClassType);
property public final kotlin.sequences.Sequence<androidx.navigation.NavDestination> hierarchy;
}
- @RestrictTo(androidx.annotation.RestrictTo.Scope.LIBRARY_GROUP) public static final class NavDestination.DeepLinkMatch implements java.lang.Comparable<androidx.navigation.NavDestination.DeepLinkMatch> {
- ctor public NavDestination.DeepLinkMatch(androidx.navigation.NavDestination destination, android.os.Bundle? matchingArgs, boolean isExactDeepLink, boolean hasMatchingAction, int mimeTypeMatchLevel);
- method public int compareTo(androidx.navigation.NavDestination.DeepLinkMatch other);
- method public androidx.navigation.NavDestination getDestination();
- method public android.os.Bundle? getMatchingArgs();
- property public final androidx.navigation.NavDestination destination;
- property public final android.os.Bundle? matchingArgs;
- }
-
@androidx.navigation.NavDestinationDsl public class NavDestinationBuilder<D extends androidx.navigation.NavDestination> {
ctor @Deprecated public NavDestinationBuilder(androidx.navigation.Navigator<? extends D> navigator, @IdRes int id);
ctor public NavDestinationBuilder(androidx.navigation.Navigator<? extends D> navigator, String? route);
@@ -301,8 +264,6 @@
method public final androidx.navigation.NavDestination? findNode(@IdRes int resId);
method public final androidx.navigation.NavDestination? findNode(String? route);
method public static final androidx.navigation.NavDestination findStartDestination(androidx.navigation.NavGraph);
- method @RestrictTo(androidx.annotation.RestrictTo.Scope.LIBRARY_GROUP) public final androidx.collection.SparseArrayCompat<androidx.navigation.NavDestination> getNodes();
- method @RestrictTo(androidx.annotation.RestrictTo.Scope.LIBRARY_GROUP) public final String getStartDestDisplayName();
method @Deprecated @IdRes public final int getStartDestination();
method @IdRes public final int getStartDestinationId();
method public final String? getStartDestinationRoute();
@@ -310,8 +271,6 @@
method public final void remove(androidx.navigation.NavDestination node);
method public final void setStartDestination(int startDestId);
method public final void setStartDestination(String startDestRoute);
- property @RestrictTo(androidx.annotation.RestrictTo.Scope.LIBRARY_GROUP) public final androidx.collection.SparseArrayCompat<androidx.navigation.NavDestination> nodes;
- property @RestrictTo(androidx.annotation.RestrictTo.Scope.LIBRARY_GROUP) public final String startDestDisplayName;
property @IdRes public final int startDestinationId;
property public final String? startDestinationRoute;
field public static final androidx.navigation.NavGraph.Companion Companion;
@@ -420,10 +379,7 @@
method public static androidx.navigation.NavType<?> fromArgType(String? type, String? packageName);
method public abstract operator T? get(android.os.Bundle bundle, String key);
method public abstract String getName();
- method @RestrictTo(androidx.annotation.RestrictTo.Scope.LIBRARY_GROUP) public static final androidx.navigation.NavType<java.lang.Object> inferFromValue(String value);
- method @RestrictTo(androidx.annotation.RestrictTo.Scope.LIBRARY_GROUP) public static final androidx.navigation.NavType<java.lang.Object> inferFromValueType(Object? value);
method public boolean isNullableAllowed();
- method @RestrictTo(androidx.annotation.RestrictTo.Scope.LIBRARY_GROUP) public final T! parseAndPut(android.os.Bundle bundle, String key, String value);
method public abstract T! parseValue(String value);
method public abstract void put(android.os.Bundle bundle, String key, T? value);
property public boolean isNullableAllowed;
@@ -444,8 +400,6 @@
public static final class NavType.Companion {
method public androidx.navigation.NavType<?> fromArgType(String? type, String? packageName);
- method @RestrictTo(androidx.annotation.RestrictTo.Scope.LIBRARY_GROUP) public androidx.navigation.NavType<java.lang.Object> inferFromValue(String value);
- method @RestrictTo(androidx.annotation.RestrictTo.Scope.LIBRARY_GROUP) public androidx.navigation.NavType<java.lang.Object> inferFromValueType(Object? value);
}
public static final class NavType.EnumType<D extends java.lang.Enum<?>> extends androidx.navigation.NavType.SerializableType<D> {
@@ -520,8 +474,6 @@
method @CallSuper public androidx.navigation.Navigator<? extends androidx.navigation.NavDestination>? addNavigator(String name, androidx.navigation.Navigator<? extends androidx.navigation.NavDestination> navigator);
method public final <T extends androidx.navigation.Navigator<?>> T getNavigator(Class<T> navigatorClass);
method @CallSuper public <T extends androidx.navigation.Navigator<?>> T getNavigator(String name);
- method @RestrictTo(androidx.annotation.RestrictTo.Scope.LIBRARY_GROUP) public final java.util.Map<java.lang.String,androidx.navigation.Navigator<? extends androidx.navigation.NavDestination>> getNavigators();
- property @RestrictTo(androidx.annotation.RestrictTo.Scope.LIBRARY_GROUP) public final java.util.Map<java.lang.String,androidx.navigation.Navigator<? extends androidx.navigation.NavDestination>> navigators;
}
public final class NavigatorProviderKt {
diff --git a/navigation/navigation-runtime/api/public_plus_experimental_current.txt b/navigation/navigation-runtime/api/public_plus_experimental_current.txt
index 1a5eb2b..33808c0 100644
--- a/navigation/navigation-runtime/api/public_plus_experimental_current.txt
+++ b/navigation/navigation-runtime/api/public_plus_experimental_current.txt
@@ -13,9 +13,7 @@
ctor public ActivityNavigator(android.content.Context context);
method public static final void applyPopAnimationsToPendingTransition(android.app.Activity activity);
method public androidx.navigation.ActivityNavigator.Destination createDestination();
- method @RestrictTo(androidx.annotation.RestrictTo.Scope.LIBRARY_GROUP) public final android.content.Context getContext();
method public androidx.navigation.NavDestination? navigate(androidx.navigation.ActivityNavigator.Destination destination, android.os.Bundle? args, androidx.navigation.NavOptions? navOptions, androidx.navigation.Navigator.Extras? navigatorExtras);
- property @RestrictTo(androidx.annotation.RestrictTo.Scope.LIBRARY_GROUP) public final android.content.Context context;
field public static final androidx.navigation.ActivityNavigator.Companion Companion;
}
@@ -94,12 +92,8 @@
ctor public NavController(android.content.Context context);
method public void addOnDestinationChangedListener(androidx.navigation.NavController.OnDestinationChangedListener listener);
method public androidx.navigation.NavDeepLinkBuilder createDeepLink();
- method @RestrictTo(androidx.annotation.RestrictTo.Scope.LIBRARY_GROUP) public void enableOnBackPressed(boolean enabled);
- method @RestrictTo(androidx.annotation.RestrictTo.Scope.LIBRARY_GROUP) public final androidx.navigation.NavDestination? findDestination(@IdRes int destinationId);
- method @RestrictTo(androidx.annotation.RestrictTo.Scope.LIBRARY_GROUP) public final androidx.navigation.NavDestination? findDestination(String destinationRoute);
method public androidx.navigation.NavBackStackEntry getBackStackEntry(@IdRes int destinationId);
method public final androidx.navigation.NavBackStackEntry getBackStackEntry(String route);
- method @RestrictTo(androidx.annotation.RestrictTo.Scope.LIBRARY_GROUP) public final android.content.Context getContext();
method public androidx.navigation.NavBackStackEntry? getCurrentBackStackEntry();
method public final kotlinx.coroutines.flow.Flow<androidx.navigation.NavBackStackEntry> getCurrentBackStackEntryFlow();
method public androidx.navigation.NavDestination? getCurrentDestination();
@@ -139,10 +133,6 @@
method @CallSuper @MainThread public void setGraph(@NavigationRes int graphResId);
method @CallSuper @MainThread public void setGraph(@NavigationRes int graphResId, android.os.Bundle? startDestinationArgs);
method @CallSuper @MainThread public void setGraph(androidx.navigation.NavGraph graph, android.os.Bundle? startDestinationArgs);
- method @RestrictTo(androidx.annotation.RestrictTo.Scope.LIBRARY_GROUP) public void setLifecycleOwner(androidx.lifecycle.LifecycleOwner owner);
- method @RestrictTo(androidx.annotation.RestrictTo.Scope.LIBRARY_GROUP) public void setOnBackPressedDispatcher(androidx.activity.OnBackPressedDispatcher dispatcher);
- method @RestrictTo(androidx.annotation.RestrictTo.Scope.LIBRARY_GROUP) public void setViewModelStore(androidx.lifecycle.ViewModelStore viewModelStore);
- property @RestrictTo(androidx.annotation.RestrictTo.Scope.LIBRARY_GROUP) public final android.content.Context context;
property public androidx.navigation.NavBackStackEntry? currentBackStackEntry;
property public final kotlinx.coroutines.flow.Flow<androidx.navigation.NavBackStackEntry> currentBackStackEntryFlow;
property public androidx.navigation.NavDestination? currentDestination;
@@ -151,10 +141,6 @@
property public androidx.navigation.NavigatorProvider navigatorProvider;
property public androidx.navigation.NavBackStackEntry? previousBackStackEntry;
field public static final androidx.navigation.NavController.Companion Companion;
- field @RestrictTo(androidx.annotation.RestrictTo.Scope.LIBRARY_GROUP) public static final String KEY_DEEP_LINK_ARGS = "android-support-nav:controller:deepLinkArgs";
- field @RestrictTo(androidx.annotation.RestrictTo.Scope.LIBRARY_GROUP) public static final String KEY_DEEP_LINK_EXTRAS = "android-support-nav:controller:deepLinkExtras";
- field @RestrictTo(androidx.annotation.RestrictTo.Scope.LIBRARY_GROUP) public static final String KEY_DEEP_LINK_HANDLED = "android-support-nav:controller:deepLinkHandled";
- field @RestrictTo(androidx.annotation.RestrictTo.Scope.LIBRARY_GROUP) public static final String KEY_DEEP_LINK_IDS = "android-support-nav:controller:deepLinkIds";
field public static final String KEY_DEEP_LINK_INTENT = "android-support-nav:controller:deepLinkIntent";
}
diff --git a/navigation/navigation-ui/api/public_plus_experimental_current.txt b/navigation/navigation-ui/api/public_plus_experimental_current.txt
index 188dc9f..ce4e91b 100644
--- a/navigation/navigation-ui/api/public_plus_experimental_current.txt
+++ b/navigation/navigation-ui/api/public_plus_experimental_current.txt
@@ -57,7 +57,6 @@
}
public final class NavigationUI {
- method @RestrictTo(androidx.annotation.RestrictTo.Scope.LIBRARY_GROUP) public static com.google.android.material.bottomsheet.BottomSheetBehavior<?>? findBottomSheetBehavior(android.view.View view);
method public static boolean navigateUp(androidx.navigation.NavController navController, androidx.customview.widget.Openable? openableLayout);
method public static boolean navigateUp(androidx.navigation.NavController navController, androidx.navigation.ui.AppBarConfiguration configuration);
method public static boolean onNavDestinationSelected(android.view.MenuItem item, androidx.navigation.NavController navController);
diff --git a/paging/common/api/public_plus_experimental_current.txt b/paging/common/api/public_plus_experimental_current.txt
index 5565ae2..641dd69 100644
--- a/paging/common/api/public_plus_experimental_current.txt
+++ b/paging/common/api/public_plus_experimental_current.txt
@@ -45,12 +45,6 @@
method @AnyThread public void onInvalidated();
}
- @RestrictTo(androidx.annotation.RestrictTo.Scope.LIBRARY_GROUP) public enum DiffingChangePayload {
- enum_constant public static final androidx.paging.DiffingChangePayload ITEM_TO_PLACEHOLDER;
- enum_constant public static final androidx.paging.DiffingChangePayload PLACEHOLDER_POSITION_CHANGE;
- enum_constant public static final androidx.paging.DiffingChangePayload PLACEHOLDER_TO_ITEM;
- }
-
@kotlin.RequiresOptIn public @interface ExperimentalPagingApi {
}
@@ -136,7 +130,6 @@
method public androidx.paging.LoadState component2();
method public androidx.paging.LoadState component3();
method public androidx.paging.LoadStates copy(androidx.paging.LoadState refresh, androidx.paging.LoadState prepend, androidx.paging.LoadState append);
- method @RestrictTo(androidx.annotation.RestrictTo.Scope.LIBRARY_GROUP) public inline void forEach(kotlin.jvm.functions.Function2<? super androidx.paging.LoadType,? super androidx.paging.LoadState,kotlin.Unit> op);
method public androidx.paging.LoadState getAppend();
method public androidx.paging.LoadState getPrepend();
method public androidx.paging.LoadState getRefresh();
diff --git a/room/runtime/api/public_plus_experimental_current.txt b/room/runtime/api/public_plus_experimental_current.txt
index bc1f3c0..5a24224 100644
--- a/room/runtime/api/public_plus_experimental_current.txt
+++ b/room/runtime/api/public_plus_experimental_current.txt
@@ -42,7 +42,6 @@
public class Room {
ctor @Deprecated public Room();
method public static <T extends androidx.room.RoomDatabase> androidx.room.RoomDatabase.Builder<T!> databaseBuilder(android.content.Context, Class<T!>, String);
- method @RestrictTo(androidx.annotation.RestrictTo.Scope.LIBRARY_GROUP) public static <T, C> T getGeneratedImplementation(Class<C!>, String);
method public static <T extends androidx.room.RoomDatabase> androidx.room.RoomDatabase.Builder<T!> inMemoryDatabaseBuilder(android.content.Context, Class<T!>);
field public static final String MASTER_TABLE_NAME = "room_master_table";
}
@@ -59,7 +58,6 @@
method public androidx.room.InvalidationTracker getInvalidationTracker();
method public androidx.sqlite.db.SupportSQLiteOpenHelper getOpenHelper();
method public java.util.concurrent.Executor getQueryExecutor();
- method @RestrictTo(androidx.annotation.RestrictTo.Scope.LIBRARY_GROUP) protected java.util.Map<java.lang.Class<?>!,java.util.List<java.lang.Class<?>!>!> getRequiredTypeConverters();
method public java.util.concurrent.Executor getTransactionExecutor();
method public <T> T? getTypeConverter(Class<T!>);
method public boolean inTransaction();
diff --git a/slices/builders/ktx/api/public_plus_experimental_current.txt b/slices/builders/ktx/api/public_plus_experimental_current.txt
index 01051a5..05623ec 100644
--- a/slices/builders/ktx/api/public_plus_experimental_current.txt
+++ b/slices/builders/ktx/api/public_plus_experimental_current.txt
@@ -34,7 +34,7 @@
method public static inline androidx.slice.builders.ListBuilder range(androidx.slice.builders.ListBuilderDsl, kotlin.jvm.functions.Function1<? super androidx.slice.builders.RangeBuilderDsl,kotlin.Unit> buildRange);
method public static inline androidx.slice.builders.ListBuilder row(androidx.slice.builders.ListBuilderDsl, kotlin.jvm.functions.Function1<? super androidx.slice.builders.RowBuilderDsl,kotlin.Unit> buildRow);
method public static inline androidx.slice.builders.ListBuilder seeMoreRow(androidx.slice.builders.ListBuilderDsl, kotlin.jvm.functions.Function1<? super androidx.slice.builders.RowBuilderDsl,kotlin.Unit> buildRow);
- method public static androidx.slice.builders.SliceAction tapSliceAction(android.app.PendingIntent pendingIntent, androidx.core.graphics.drawable.IconCompat icon, optional @androidx.slice.builders.ListBuilder.ImageMode int imageMode, CharSequence title);
+ method public static androidx.slice.builders.SliceAction tapSliceAction(android.app.PendingIntent pendingIntent, androidx.core.graphics.drawable.IconCompat icon, optional int imageMode, CharSequence title);
method public static androidx.slice.builders.SliceAction toggleSliceAction(android.app.PendingIntent pendingIntent, optional androidx.core.graphics.drawable.IconCompat? icon, CharSequence title, boolean isChecked);
}
diff --git a/slices/core/api/public_plus_experimental_current.txt b/slices/core/api/public_plus_experimental_current.txt
index be9a826..4fa5dd0 100644
--- a/slices/core/api/public_plus_experimental_current.txt
+++ b/slices/core/api/public_plus_experimental_current.txt
@@ -1,7 +1,7 @@
// Signature format: 4.0
package androidx.slice {
- @RequiresApi(19) @androidx.versionedparcelable.VersionedParcelize(allowSerialization=true, isCustom=true) public final class Slice extends androidx.versionedparcelable.CustomVersionedParcelable implements androidx.versionedparcelable.VersionedParcelable {
+ @RequiresApi(19) public final class Slice implements androidx.versionedparcelable.VersionedParcelable {
method public java.util.List<java.lang.String!>! getHints();
method public java.util.List<androidx.slice.SliceItem!>! getItems();
method public android.net.Uri! getUri();
@@ -13,7 +13,7 @@
method public static androidx.slice.Slice! wrap(android.app.slice.Slice!, android.content.Context!);
}
- @RequiresApi(19) @androidx.versionedparcelable.VersionedParcelize(allowSerialization=true, ignoreParcelables=true, isCustom=true) public final class SliceItem extends androidx.versionedparcelable.CustomVersionedParcelable {
+ @RequiresApi(19) public final class SliceItem implements androidx.versionedparcelable.VersionedParcelable {
method public static android.text.ParcelableSpan createSensitiveSpan();
method public void fireAction(android.content.Context?, android.content.Intent?) throws android.app.PendingIntent.CanceledException;
method public android.app.PendingIntent! getAction();
@@ -27,17 +27,19 @@
method public String! getSubType();
method public CharSequence! getText();
method public boolean hasHint(String!);
+ method public void onPostParceling();
+ method public void onPreParceling(boolean);
}
@RequiresApi(19) public abstract class SliceManager {
- method @androidx.core.content.PermissionChecker.PermissionResult public abstract int checkSlicePermission(android.net.Uri, int, int);
+ method public abstract int checkSlicePermission(android.net.Uri, int, int);
method public static androidx.slice.SliceManager getInstance(android.content.Context);
method public abstract java.util.List<android.net.Uri!> getPinnedSlices();
method public abstract void grantSlicePermission(String, android.net.Uri);
method public abstract void revokeSlicePermission(String, android.net.Uri);
}
- public abstract class SliceProvider extends android.content.ContentProvider implements androidx.core.app.CoreComponentFactory.CompatWrapped {
+ public abstract class SliceProvider extends android.content.ContentProvider {
ctor public SliceProvider(java.lang.String!...);
ctor public SliceProvider();
method public final int bulkInsert(android.net.Uri, android.content.ContentValues![]);
@@ -45,7 +47,6 @@
method public final int delete(android.net.Uri, String?, String![]?);
method @RequiresApi(19) public java.util.List<android.net.Uri!> getPinnedSlices();
method public final String? getType(android.net.Uri);
- method @RequiresApi(19) @RestrictTo(androidx.annotation.RestrictTo.Scope.LIBRARY) public Object? getWrapper();
method public final android.net.Uri? insert(android.net.Uri, android.content.ContentValues?);
method @RequiresApi(19) public abstract androidx.slice.Slice? onBindSlice(android.net.Uri);
method public final boolean onCreate();
diff --git a/slices/remotecallback/api/public_plus_experimental_current.txt b/slices/remotecallback/api/public_plus_experimental_current.txt
index 0be2fa03..5eed69e 100644
--- a/slices/remotecallback/api/public_plus_experimental_current.txt
+++ b/slices/remotecallback/api/public_plus_experimental_current.txt
@@ -1,10 +1,9 @@
// Signature format: 4.0
package androidx.slice.remotecallback {
- public abstract class RemoteSliceProvider<T extends androidx.slice.remotecallback.RemoteSliceProvider> extends androidx.slice.SliceProvider implements androidx.remotecallback.CallbackBase<T> androidx.remotecallback.CallbackReceiver<T> {
+ public abstract class RemoteSliceProvider<T extends androidx.slice.remotecallback.RemoteSliceProvider> extends androidx.slice.SliceProvider implements androidx.remotecallback.CallbackReceiver<T> {
ctor public RemoteSliceProvider();
method public T createRemoteCallback(android.content.Context);
- method @RestrictTo(androidx.annotation.RestrictTo.Scope.LIBRARY_GROUP_PREFIX) public androidx.remotecallback.RemoteCallback toRemoteCallback(Class<T!>, android.content.Context, String, android.os.Bundle, String?);
}
}
diff --git a/swiperefreshlayout/swiperefreshlayout/api/public_plus_experimental_current.txt b/swiperefreshlayout/swiperefreshlayout/api/public_plus_experimental_current.txt
index 4e18f19..b591080 100644
--- a/swiperefreshlayout/swiperefreshlayout/api/public_plus_experimental_current.txt
+++ b/swiperefreshlayout/swiperefreshlayout/api/public_plus_experimental_current.txt
@@ -42,7 +42,7 @@
ctor public SwipeRefreshLayout(android.content.Context, android.util.AttributeSet?);
method public boolean canChildScrollUp();
method public boolean dispatchNestedPreScroll(int, int, int[]!, int[]!, int);
- method public void dispatchNestedScroll(int, int, int, int, int[]?, @androidx.core.view.ViewCompat.NestedScrollType int, int[]);
+ method public void dispatchNestedScroll(int, int, int, int, int[]?, int, int[]);
method public boolean dispatchNestedScroll(int, int, int, int, int[]!, int);
method public int getProgressCircleDiameter();
method public int getProgressViewEndOffset();
@@ -51,7 +51,7 @@
method public boolean isRefreshing();
method public void onMeasure(int, int);
method public void onNestedPreScroll(android.view.View!, int, int, int[]!, int);
- method public void onNestedScroll(android.view.View, int, int, int, int, @androidx.core.view.ViewCompat.NestedScrollType int, int[]);
+ method public void onNestedScroll(android.view.View, int, int, int, int, int, int[]);
method public void onNestedScroll(android.view.View!, int, int, int, int, int);
method public void onNestedScrollAccepted(android.view.View!, android.view.View!, int, int);
method public boolean onStartNestedScroll(android.view.View!, android.view.View!, int, int);
diff --git a/vectordrawable/vectordrawable-animated/api/public_plus_experimental_current.txt b/vectordrawable/vectordrawable-animated/api/public_plus_experimental_current.txt
index 89cf85c..4c7b6cc 100644
--- a/vectordrawable/vectordrawable-animated/api/public_plus_experimental_current.txt
+++ b/vectordrawable/vectordrawable-animated/api/public_plus_experimental_current.txt
@@ -13,7 +13,7 @@
method public void onAnimationStart(android.graphics.drawable.Drawable!);
}
- public class AnimatedVectorDrawableCompat extends android.graphics.drawable.Drawable implements androidx.vectordrawable.graphics.drawable.Animatable2Compat androidx.core.graphics.drawable.TintAwareDrawable {
+ public class AnimatedVectorDrawableCompat extends android.graphics.drawable.Drawable implements androidx.vectordrawable.graphics.drawable.Animatable2Compat {
method public void clearAnimationCallbacks();
method public static void clearAnimationCallbacks(android.graphics.drawable.Drawable!);
method public static androidx.vectordrawable.graphics.drawable.AnimatedVectorDrawableCompat? create(android.content.Context, @DrawableRes int);
diff --git a/vectordrawable/vectordrawable/api/public_plus_experimental_current.txt b/vectordrawable/vectordrawable/api/public_plus_experimental_current.txt
index 168b55a..5a6c00b 100644
--- a/vectordrawable/vectordrawable/api/public_plus_experimental_current.txt
+++ b/vectordrawable/vectordrawable/api/public_plus_experimental_current.txt
@@ -1,7 +1,7 @@
// Signature format: 4.0
package androidx.vectordrawable.graphics.drawable {
- public class VectorDrawableCompat extends android.graphics.drawable.Drawable implements androidx.core.graphics.drawable.TintAwareDrawable {
+ public class VectorDrawableCompat extends android.graphics.drawable.Drawable {
method public static androidx.vectordrawable.graphics.drawable.VectorDrawableCompat? create(android.content.res.Resources, @DrawableRes int, android.content.res.Resources.Theme?);
method public static androidx.vectordrawable.graphics.drawable.VectorDrawableCompat! createFromXmlInner(android.content.res.Resources!, org.xmlpull.v1.XmlPullParser!, android.util.AttributeSet!, android.content.res.Resources.Theme!) throws java.io.IOException, org.xmlpull.v1.XmlPullParserException;
method public void draw(android.graphics.Canvas!);
diff --git a/wear/wear-complications-data/api/public_plus_experimental_current.txt b/wear/wear-complications-data/api/public_plus_experimental_current.txt
index 9251073..e6b77b8 100644
--- a/wear/wear-complications-data/api/public_plus_experimental_current.txt
+++ b/wear/wear-complications-data/api/public_plus_experimental_current.txt
@@ -134,12 +134,10 @@
public final class EmptyComplicationData extends androidx.wear.complications.data.ComplicationData {
ctor public EmptyComplicationData();
- method @RestrictTo(androidx.annotation.RestrictTo.Scope.LIBRARY_GROUP) public android.support.wearable.complications.ComplicationData asWireComplicationData();
field public static final androidx.wear.complications.data.ComplicationType TYPE;
}
public final class LongTextComplicationData extends androidx.wear.complications.data.ComplicationData {
- method @RestrictTo(androidx.annotation.RestrictTo.Scope.LIBRARY_GROUP) public android.support.wearable.complications.ComplicationData asWireComplicationData();
method public androidx.wear.complications.data.ComplicationText? getContentDescription();
method public androidx.wear.complications.data.MonochromaticImage? getMonochromaticImage();
method public androidx.wear.complications.data.SmallImage? getSmallImage();
@@ -177,7 +175,6 @@
}
public final class MonochromaticImageComplicationData extends androidx.wear.complications.data.ComplicationData {
- method @RestrictTo(androidx.annotation.RestrictTo.Scope.LIBRARY_GROUP) public android.support.wearable.complications.ComplicationData asWireComplicationData();
method public androidx.wear.complications.data.ComplicationText? getContentDescription();
method public androidx.wear.complications.data.MonochromaticImage getMonochromaticImage();
property public final androidx.wear.complications.data.ComplicationText? contentDescription;
@@ -194,12 +191,10 @@
public final class NoDataComplicationData extends androidx.wear.complications.data.ComplicationData {
ctor public NoDataComplicationData();
- method @RestrictTo(androidx.annotation.RestrictTo.Scope.LIBRARY_GROUP) public android.support.wearable.complications.ComplicationData asWireComplicationData();
field public static final androidx.wear.complications.data.ComplicationType TYPE;
}
public final class NoPermissionComplicationData extends androidx.wear.complications.data.ComplicationData {
- method @RestrictTo(androidx.annotation.RestrictTo.Scope.LIBRARY_GROUP) public android.support.wearable.complications.ComplicationData asWireComplicationData();
method public androidx.wear.complications.data.MonochromaticImage? getMonochromaticImage();
method public androidx.wear.complications.data.ComplicationText? getText();
method public androidx.wear.complications.data.ComplicationText? getTitle();
@@ -219,12 +214,10 @@
public final class NotConfiguredComplicationData extends androidx.wear.complications.data.ComplicationData {
ctor public NotConfiguredComplicationData();
- method @RestrictTo(androidx.annotation.RestrictTo.Scope.LIBRARY_GROUP) public android.support.wearable.complications.ComplicationData asWireComplicationData();
field public static final androidx.wear.complications.data.ComplicationType TYPE;
}
public final class PhotoImageComplicationData extends androidx.wear.complications.data.ComplicationData {
- method @RestrictTo(androidx.annotation.RestrictTo.Scope.LIBRARY_GROUP) public android.support.wearable.complications.ComplicationData asWireComplicationData();
method public androidx.wear.complications.data.ComplicationText? getContentDescription();
method public android.graphics.drawable.Icon getPhotoImage();
property public final androidx.wear.complications.data.ComplicationText? contentDescription;
@@ -248,7 +241,6 @@
}
public final class RangedValueComplicationData extends androidx.wear.complications.data.ComplicationData {
- method @RestrictTo(androidx.annotation.RestrictTo.Scope.LIBRARY_GROUP) public android.support.wearable.complications.ComplicationData asWireComplicationData();
method public androidx.wear.complications.data.ComplicationText? getContentDescription();
method public float getMax();
method public float getMin();
@@ -277,7 +269,6 @@
}
public final class ShortTextComplicationData extends androidx.wear.complications.data.ComplicationData {
- method @RestrictTo(androidx.annotation.RestrictTo.Scope.LIBRARY_GROUP) public android.support.wearable.complications.ComplicationData asWireComplicationData();
method public androidx.wear.complications.data.ComplicationText? getContentDescription();
method public androidx.wear.complications.data.MonochromaticImage? getMonochromaticImage();
method public androidx.wear.complications.data.ComplicationText getText();
@@ -314,7 +305,6 @@
}
public final class SmallImageComplicationData extends androidx.wear.complications.data.ComplicationData {
- method @RestrictTo(androidx.annotation.RestrictTo.Scope.LIBRARY_GROUP) public android.support.wearable.complications.ComplicationData asWireComplicationData();
method public androidx.wear.complications.data.ComplicationText? getContentDescription();
method public androidx.wear.complications.data.SmallImage getSmallImage();
property public final androidx.wear.complications.data.ComplicationText? contentDescription;
diff --git a/wear/wear-watchface-client/api/public_plus_experimental_current.txt b/wear/wear-watchface-client/api/public_plus_experimental_current.txt
index a0c9980..086a2c9 100644
--- a/wear/wear-watchface-client/api/public_plus_experimental_current.txt
+++ b/wear/wear-watchface-client/api/public_plus_experimental_current.txt
@@ -2,7 +2,7 @@
package androidx.wear.watchface.client {
public final class ComplicationState {
- ctor public ComplicationState(android.graphics.Rect bounds, @androidx.wear.watchface.data.ComplicationBoundsType int boundsType, java.util.List<? extends androidx.wear.complications.data.ComplicationType> supportedTypes, androidx.wear.complications.DefaultComplicationProviderPolicy defaultProviderPolicy, androidx.wear.complications.data.ComplicationType defaultProviderType, boolean isEnabled, boolean isInitiallyEnabled, androidx.wear.complications.data.ComplicationType currentType, boolean fixedComplicationProvider, android.os.Bundle complicationConfigExtras);
+ ctor public ComplicationState(android.graphics.Rect bounds, int boundsType, java.util.List<? extends androidx.wear.complications.data.ComplicationType> supportedTypes, androidx.wear.complications.DefaultComplicationProviderPolicy defaultProviderPolicy, androidx.wear.complications.data.ComplicationType defaultProviderType, boolean isEnabled, boolean isInitiallyEnabled, androidx.wear.complications.data.ComplicationType currentType, boolean fixedComplicationProvider, android.os.Bundle complicationConfigExtras);
method public android.graphics.Rect getBounds();
method public int getBoundsType();
method public android.os.Bundle getComplicationConfigExtras();
diff --git a/wear/wear-watchface-style/api/public_plus_experimental_current.txt b/wear/wear-watchface-style/api/public_plus_experimental_current.txt
index 52c0c01..c3bd688 100644
--- a/wear/wear-watchface-style/api/public_plus_experimental_current.txt
+++ b/wear/wear-watchface-style/api/public_plus_experimental_current.txt
@@ -62,13 +62,11 @@
public static final class UserStyleSetting.BooleanUserStyleSetting extends androidx.wear.watchface.style.UserStyleSetting {
ctor public UserStyleSetting.BooleanUserStyleSetting(androidx.wear.watchface.style.UserStyleSetting.Id id, CharSequence displayName, CharSequence description, 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 {
ctor public UserStyleSetting.BooleanUserStyleSetting.BooleanOption(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;
}
@@ -78,7 +76,6 @@
public static final class UserStyleSetting.ComplicationsUserStyleSetting extends androidx.wear.watchface.style.UserStyleSetting {
ctor public UserStyleSetting.ComplicationsUserStyleSetting(androidx.wear.watchface.style.UserStyleSetting.Id id, CharSequence displayName, CharSequence description, android.graphics.drawable.Icon? icon, java.util.List<androidx.wear.watchface.style.UserStyleSetting.ComplicationsUserStyleSetting.ComplicationsOption> complicationConfig, java.util.Collection<? extends androidx.wear.watchface.style.WatchFaceLayer> affectsWatchFaceLayers, optional androidx.wear.watchface.style.UserStyleSetting.ComplicationsUserStyleSetting.ComplicationsOption defaultOption);
ctor public UserStyleSetting.ComplicationsUserStyleSetting(androidx.wear.watchface.style.UserStyleSetting.Id id, CharSequence displayName, CharSequence description, android.graphics.drawable.Icon? icon, java.util.List<androidx.wear.watchface.style.UserStyleSetting.ComplicationsUserStyleSetting.ComplicationsOption> 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.ComplicationsUserStyleSetting.ComplicationOverlay {
@@ -106,7 +103,6 @@
method public java.util.Collection<androidx.wear.watchface.style.UserStyleSetting.ComplicationsUserStyleSetting.ComplicationOverlay> getComplicationOverlays();
method public CharSequence getDisplayName();
method public android.graphics.drawable.Icon? getIcon();
- 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.ComplicationsUserStyleSetting.ComplicationOverlay> complicationOverlays;
property public final CharSequence displayName;
property public final android.graphics.drawable.Icon? icon;
@@ -114,13 +110,11 @@
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;
}
@@ -129,7 +123,6 @@
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;
@@ -138,7 +131,6 @@
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;
}
@@ -156,14 +148,12 @@
public static class UserStyleSetting.ListUserStyleSetting extends androidx.wear.watchface.style.UserStyleSetting {
ctor public UserStyleSetting.ListUserStyleSetting(androidx.wear.watchface.style.UserStyleSetting.Id id, CharSequence displayName, CharSequence description, 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, CharSequence displayName, CharSequence description, 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, CharSequence displayName, android.graphics.drawable.Icon? icon);
method public CharSequence getDisplayName();
method public android.graphics.drawable.Icon? getIcon();
- 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;
}
@@ -173,7 +163,6 @@
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;
@@ -182,7 +171,6 @@
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;
}
diff --git a/wear/wear-watchface/api/public_plus_experimental_current.txt b/wear/wear-watchface/api/public_plus_experimental_current.txt
index b12e928..3e4c282 100644
--- a/wear/wear-watchface/api/public_plus_experimental_current.txt
+++ b/wear/wear-watchface/api/public_plus_experimental_current.txt
@@ -7,7 +7,7 @@
}
public interface CanvasComplication {
- method public void drawHighlight(android.graphics.Canvas canvas, android.graphics.Rect bounds, @androidx.wear.watchface.data.ComplicationBoundsType int boundsType, android.icu.util.Calendar calendar, @ColorInt int color);
+ method public void drawHighlight(android.graphics.Canvas canvas, android.graphics.Rect bounds, int boundsType, android.icu.util.Calendar calendar, @ColorInt int color);
method public androidx.wear.complications.data.ComplicationData? getData();
method public boolean isHighlighted();
method public void loadData(androidx.wear.complications.data.ComplicationData? complicationData, boolean loadDrawablesAsynchronous);
diff --git a/window/window/api/public_plus_experimental_current.txt b/window/window/api/public_plus_experimental_current.txt
index 5ef6e22..5afd4dd 100644
--- a/window/window/api/public_plus_experimental_current.txt
+++ b/window/window/api/public_plus_experimental_current.txt
@@ -46,8 +46,6 @@
method public androidx.window.WindowMetrics getCurrentWindowMetrics();
method public androidx.window.WindowMetrics getMaximumWindowMetrics();
method public kotlinx.coroutines.flow.Flow<androidx.window.WindowLayoutInfo> getWindowLayoutInfo();
- method @RestrictTo(androidx.annotation.RestrictTo.Scope.LIBRARY_GROUP) public default static void overrideDecorator(androidx.window.WindowInfoRepoDecorator overridingDecorator);
- method @RestrictTo(androidx.annotation.RestrictTo.Scope.LIBRARY_GROUP) public default static void reset();
property public abstract androidx.window.WindowMetrics currentWindowMetrics;
property public abstract androidx.window.WindowMetrics maximumWindowMetrics;
property public abstract kotlinx.coroutines.flow.Flow<androidx.window.WindowLayoutInfo> windowLayoutInfo;
@@ -56,12 +54,6 @@
public static final class WindowInfoRepo.Companion {
method @kotlinx.coroutines.ExperimentalCoroutinesApi public androidx.window.WindowInfoRepo create(android.app.Activity activity);
- method @RestrictTo(androidx.annotation.RestrictTo.Scope.LIBRARY_GROUP) public void overrideDecorator(androidx.window.WindowInfoRepoDecorator overridingDecorator);
- method @RestrictTo(androidx.annotation.RestrictTo.Scope.LIBRARY_GROUP) public void reset();
- }
-
- @RestrictTo(androidx.annotation.RestrictTo.Scope.LIBRARY_GROUP) public interface WindowInfoRepoDecorator {
- method @RestrictTo(androidx.annotation.RestrictTo.Scope.LIBRARY_GROUP) public androidx.window.WindowInfoRepo decorate(androidx.window.WindowInfoRepo repo);
}
public final class WindowLayoutInfo {
