Merge "Fixes window and window-java API files" into androidx-main
diff --git a/window/window-java/api/public_plus_experimental_1.1.0-beta01.txt b/window/window-java/api/public_plus_experimental_1.1.0-beta01.txt
index bcbb1e7..d621966 100644
--- a/window/window-java/api/public_plus_experimental_1.1.0-beta01.txt
+++ b/window/window-java/api/public_plus_experimental_1.1.0-beta01.txt
@@ -1,15 +1,4 @@
// Signature format: 4.0
-package androidx.window.java.area {
-
- @androidx.window.core.ExperimentalWindowApi public final class WindowAreaControllerJavaAdapter implements androidx.window.area.WindowAreaController {
- ctor public WindowAreaControllerJavaAdapter(androidx.window.area.WindowAreaController controller);
- method public void addRearDisplayStatusListener(java.util.concurrent.Executor executor, androidx.core.util.Consumer<androidx.window.area.WindowAreaStatus> consumer);
- method public void removeRearDisplayStatusListener(androidx.core.util.Consumer<androidx.window.area.WindowAreaStatus> consumer);
- method public void startRearDisplayModeSession(android.app.Activity activity, java.util.concurrent.Executor executor, androidx.window.area.WindowAreaSessionCallback windowAreaSessionCallback);
- }
-
-}
-
package androidx.window.java.embedding {
@androidx.window.core.ExperimentalWindowApi public final class SplitControllerCallbackAdapter {
diff --git a/window/window/api/public_plus_experimental_1.1.0-beta01.txt b/window/window/api/public_plus_experimental_1.1.0-beta01.txt
index d7170f2..650afbe 100644
--- a/window/window/api/public_plus_experimental_1.1.0-beta01.txt
+++ b/window/window/api/public_plus_experimental_1.1.0-beta01.txt
@@ -9,40 +9,6 @@
}
-package androidx.window.area {
-
- @androidx.window.core.ExperimentalWindowApi public interface WindowAreaController {
- method public default static androidx.window.area.WindowAreaController getOrCreate();
- method public void rearDisplayMode(android.app.Activity activity, java.util.concurrent.Executor executor, androidx.window.area.WindowAreaSessionCallback windowAreaSessionCallback);
- method public kotlinx.coroutines.flow.Flow<androidx.window.area.WindowAreaStatus> rearDisplayStatus();
- field public static final androidx.window.area.WindowAreaController.Companion Companion;
- }
-
- public static final class WindowAreaController.Companion {
- method public androidx.window.area.WindowAreaController getOrCreate();
- }
-
- @androidx.window.core.ExperimentalWindowApi public interface WindowAreaSession {
- method public void close();
- }
-
- @androidx.window.core.ExperimentalWindowApi public interface WindowAreaSessionCallback {
- method public void onSessionEnded();
- method public void onSessionStarted(androidx.window.area.WindowAreaSession session);
- }
-
- @androidx.window.core.ExperimentalWindowApi public final class WindowAreaStatus {
- field public static final androidx.window.area.WindowAreaStatus AVAILABLE;
- field public static final androidx.window.area.WindowAreaStatus.Companion Companion;
- field public static final androidx.window.area.WindowAreaStatus UNAVAILABLE;
- field public static final androidx.window.area.WindowAreaStatus UNSUPPORTED;
- }
-
- public static final class WindowAreaStatus.Companion {
- }
-
-}
-
package androidx.window.core {
@kotlin.RequiresOptIn(level=kotlin.RequiresOptIn.Level.WARNING) @kotlin.annotation.MustBeDocumented @kotlin.annotation.Retention(kotlin.annotation.AnnotationRetention.BINARY) public @interface ExperimentalWindowApi {
