Move Navigation 2.2.0 to beta01
Test: ./gradlew checkApi
Change-Id: I5ec102286eadccb6bf0c99465ac10d48e6c6cb75
diff --git a/navigation/navigation-runtime/api/2.2.0-alpha04.txt b/navigation/navigation-runtime/api/2.2.0-beta01.txt
similarity index 100%
rename from navigation/navigation-runtime/api/2.2.0-alpha04.txt
rename to navigation/navigation-runtime/api/2.2.0-beta01.txt
diff --git a/navigation/navigation-runtime/api/public_plus_experimental_2.2.0-alpha04.txt b/navigation/navigation-runtime/api/public_plus_experimental_2.2.0-alpha04.txt
deleted file mode 100644
index a62443f..0000000
--- a/navigation/navigation-runtime/api/public_plus_experimental_2.2.0-alpha04.txt
+++ /dev/null
@@ -1,127 +0,0 @@
-// Signature format: 3.0
-package androidx.navigation {
-
- @androidx.navigation.Navigator.Name("activity") public class ActivityNavigator extends androidx.navigation.Navigator<androidx.navigation.ActivityNavigator.Destination> {
- ctor public ActivityNavigator(android.content.Context);
- method public static void applyPopAnimationsToPendingTransition(android.app.Activity);
- method public androidx.navigation.ActivityNavigator.Destination createDestination();
- method public androidx.navigation.NavDestination? navigate(androidx.navigation.ActivityNavigator.Destination, android.os.Bundle?, androidx.navigation.NavOptions?, androidx.navigation.Navigator.Extras?);
- method public boolean popBackStack();
- }
-
- @androidx.navigation.NavDestination.ClassType(Activity.class) public static class ActivityNavigator.Destination extends androidx.navigation.NavDestination {
- ctor public ActivityNavigator.Destination(androidx.navigation.NavigatorProvider);
- ctor public ActivityNavigator.Destination(androidx.navigation.Navigator<? extends androidx.navigation.ActivityNavigator.Destination>);
- method public final String? getAction();
- method public final android.content.ComponentName? getComponent();
- method public final android.net.Uri? getData();
- method public final String? getDataPattern();
- method public final android.content.Intent? getIntent();
- method public final String? getTargetPackage();
- method public final androidx.navigation.ActivityNavigator.Destination setAction(String?);
- method public final androidx.navigation.ActivityNavigator.Destination setComponentName(android.content.ComponentName?);
- method public final androidx.navigation.ActivityNavigator.Destination setData(android.net.Uri?);
- method public final androidx.navigation.ActivityNavigator.Destination setDataPattern(String?);
- method public final androidx.navigation.ActivityNavigator.Destination setIntent(android.content.Intent?);
- method public final androidx.navigation.ActivityNavigator.Destination setTargetPackage(String?);
- }
-
- public static final class ActivityNavigator.Extras implements androidx.navigation.Navigator.Extras {
- method public androidx.core.app.ActivityOptionsCompat? getActivityOptions();
- method public int getFlags();
- }
-
- public static final class ActivityNavigator.Extras.Builder {
- ctor public ActivityNavigator.Extras.Builder();
- method public androidx.navigation.ActivityNavigator.Extras.Builder addFlags(int);
- method public androidx.navigation.ActivityNavigator.Extras build();
- method public androidx.navigation.ActivityNavigator.Extras.Builder setActivityOptions(androidx.core.app.ActivityOptionsCompat);
- }
-
- public final class NavBackStackEntry implements androidx.lifecycle.HasDefaultViewModelProviderFactory androidx.lifecycle.LifecycleOwner androidx.savedstate.SavedStateRegistryOwner androidx.lifecycle.ViewModelStoreOwner {
- method public android.os.Bundle? getArguments();
- method public androidx.lifecycle.ViewModelProvider.Factory getDefaultViewModelProviderFactory();
- method public androidx.navigation.NavDestination getDestination();
- method public androidx.lifecycle.Lifecycle getLifecycle();
- method public androidx.savedstate.SavedStateRegistry getSavedStateRegistry();
- method public androidx.lifecycle.ViewModelStore getViewModelStore();
- }
-
- public class NavController {
- ctor public NavController(android.content.Context);
- method public void addOnDestinationChangedListener(androidx.navigation.NavController.OnDestinationChangedListener);
- method public androidx.navigation.NavDeepLinkBuilder createDeepLink();
- method public androidx.navigation.NavBackStackEntry getBackStackEntry(@IdRes int);
- method public androidx.navigation.NavDestination? getCurrentDestination();
- method public androidx.navigation.NavGraph getGraph();
- method public androidx.navigation.NavInflater getNavInflater();
- method public androidx.navigation.NavigatorProvider getNavigatorProvider();
- method public androidx.lifecycle.ViewModelStoreOwner getViewModelStoreOwner(@IdRes int);
- method public boolean handleDeepLink(android.content.Intent?);
- method public void navigate(@IdRes int);
- method public void navigate(@IdRes int, android.os.Bundle?);
- method public void navigate(@IdRes int, android.os.Bundle?, androidx.navigation.NavOptions?);
- method public void navigate(@IdRes int, android.os.Bundle?, androidx.navigation.NavOptions?, androidx.navigation.Navigator.Extras?);
- method public void navigate(android.net.Uri);
- method public void navigate(android.net.Uri, androidx.navigation.NavOptions?);
- method public void navigate(android.net.Uri, androidx.navigation.NavOptions?, androidx.navigation.Navigator.Extras?);
- method public void navigate(androidx.navigation.NavDirections);
- method public void navigate(androidx.navigation.NavDirections, androidx.navigation.NavOptions?);
- method public void navigate(androidx.navigation.NavDirections, androidx.navigation.Navigator.Extras);
- method public boolean navigateUp();
- method public boolean popBackStack();
- method public boolean popBackStack(@IdRes int, boolean);
- method public void removeOnDestinationChangedListener(androidx.navigation.NavController.OnDestinationChangedListener);
- method @CallSuper public void restoreState(android.os.Bundle?);
- method @CallSuper public android.os.Bundle? saveState();
- method @CallSuper public void setGraph(@NavigationRes int);
- method @CallSuper public void setGraph(@NavigationRes int, android.os.Bundle?);
- method @CallSuper public void setGraph(androidx.navigation.NavGraph);
- method @CallSuper public void setGraph(androidx.navigation.NavGraph, android.os.Bundle?);
- field public static final String KEY_DEEP_LINK_INTENT = "android-support-nav:controller:deepLinkIntent";
- }
-
- public static interface NavController.OnDestinationChangedListener {
- method public void onDestinationChanged(androidx.navigation.NavController, androidx.navigation.NavDestination, android.os.Bundle?);
- }
-
- public final class NavDeepLinkBuilder {
- ctor public NavDeepLinkBuilder(android.content.Context);
- method public android.app.PendingIntent createPendingIntent();
- method public androidx.core.app.TaskStackBuilder createTaskStackBuilder();
- method public androidx.navigation.NavDeepLinkBuilder setArguments(android.os.Bundle?);
- method public androidx.navigation.NavDeepLinkBuilder setComponentName(Class<? extends android.app.Activity>);
- method public androidx.navigation.NavDeepLinkBuilder setComponentName(android.content.ComponentName);
- method public androidx.navigation.NavDeepLinkBuilder setDestination(@IdRes int);
- method public androidx.navigation.NavDeepLinkBuilder setGraph(@NavigationRes int);
- method public androidx.navigation.NavDeepLinkBuilder setGraph(androidx.navigation.NavGraph);
- }
-
- public interface NavHost {
- method public androidx.navigation.NavController getNavController();
- }
-
- public final class NavHostController extends androidx.navigation.NavController {
- ctor public NavHostController(android.content.Context);
- method public void enableOnBackPressed(boolean);
- method public void setLifecycleOwner(androidx.lifecycle.LifecycleOwner);
- method public void setOnBackPressedDispatcher(androidx.activity.OnBackPressedDispatcher);
- method public void setViewModelStore(androidx.lifecycle.ViewModelStore);
- }
-
- public final class NavInflater {
- ctor public NavInflater(android.content.Context, androidx.navigation.NavigatorProvider);
- method public androidx.navigation.NavGraph inflate(@NavigationRes int);
- }
-
- public final class Navigation {
- method public static android.view.View.OnClickListener createNavigateOnClickListener(@IdRes int);
- method public static android.view.View.OnClickListener createNavigateOnClickListener(@IdRes int, android.os.Bundle?);
- method public static android.view.View.OnClickListener createNavigateOnClickListener(androidx.navigation.NavDirections);
- method public static androidx.navigation.NavController findNavController(android.app.Activity, @IdRes int);
- method public static androidx.navigation.NavController findNavController(android.view.View);
- method public static void setViewNavController(android.view.View, androidx.navigation.NavController?);
- }
-
-}
-
diff --git a/navigation/navigation-runtime/api/2.2.0-alpha04.txt b/navigation/navigation-runtime/api/public_plus_experimental_2.2.0-beta01.txt
similarity index 100%
copy from navigation/navigation-runtime/api/2.2.0-alpha04.txt
copy to navigation/navigation-runtime/api/public_plus_experimental_2.2.0-beta01.txt
diff --git a/navigation/navigation-runtime/api/res-2.2.0-alpha04.txt b/navigation/navigation-runtime/api/res-2.2.0-beta01.txt
similarity index 100%
rename from navigation/navigation-runtime/api/res-2.2.0-alpha04.txt
rename to navigation/navigation-runtime/api/res-2.2.0-beta01.txt
diff --git a/navigation/navigation-runtime/api/restricted_2.2.0-alpha04.txt b/navigation/navigation-runtime/api/restricted_2.2.0-alpha04.txt
deleted file mode 100644
index a62443f..0000000
--- a/navigation/navigation-runtime/api/restricted_2.2.0-alpha04.txt
+++ /dev/null
@@ -1,127 +0,0 @@
-// Signature format: 3.0
-package androidx.navigation {
-
- @androidx.navigation.Navigator.Name("activity") public class ActivityNavigator extends androidx.navigation.Navigator<androidx.navigation.ActivityNavigator.Destination> {
- ctor public ActivityNavigator(android.content.Context);
- method public static void applyPopAnimationsToPendingTransition(android.app.Activity);
- method public androidx.navigation.ActivityNavigator.Destination createDestination();
- method public androidx.navigation.NavDestination? navigate(androidx.navigation.ActivityNavigator.Destination, android.os.Bundle?, androidx.navigation.NavOptions?, androidx.navigation.Navigator.Extras?);
- method public boolean popBackStack();
- }
-
- @androidx.navigation.NavDestination.ClassType(Activity.class) public static class ActivityNavigator.Destination extends androidx.navigation.NavDestination {
- ctor public ActivityNavigator.Destination(androidx.navigation.NavigatorProvider);
- ctor public ActivityNavigator.Destination(androidx.navigation.Navigator<? extends androidx.navigation.ActivityNavigator.Destination>);
- method public final String? getAction();
- method public final android.content.ComponentName? getComponent();
- method public final android.net.Uri? getData();
- method public final String? getDataPattern();
- method public final android.content.Intent? getIntent();
- method public final String? getTargetPackage();
- method public final androidx.navigation.ActivityNavigator.Destination setAction(String?);
- method public final androidx.navigation.ActivityNavigator.Destination setComponentName(android.content.ComponentName?);
- method public final androidx.navigation.ActivityNavigator.Destination setData(android.net.Uri?);
- method public final androidx.navigation.ActivityNavigator.Destination setDataPattern(String?);
- method public final androidx.navigation.ActivityNavigator.Destination setIntent(android.content.Intent?);
- method public final androidx.navigation.ActivityNavigator.Destination setTargetPackage(String?);
- }
-
- public static final class ActivityNavigator.Extras implements androidx.navigation.Navigator.Extras {
- method public androidx.core.app.ActivityOptionsCompat? getActivityOptions();
- method public int getFlags();
- }
-
- public static final class ActivityNavigator.Extras.Builder {
- ctor public ActivityNavigator.Extras.Builder();
- method public androidx.navigation.ActivityNavigator.Extras.Builder addFlags(int);
- method public androidx.navigation.ActivityNavigator.Extras build();
- method public androidx.navigation.ActivityNavigator.Extras.Builder setActivityOptions(androidx.core.app.ActivityOptionsCompat);
- }
-
- public final class NavBackStackEntry implements androidx.lifecycle.HasDefaultViewModelProviderFactory androidx.lifecycle.LifecycleOwner androidx.savedstate.SavedStateRegistryOwner androidx.lifecycle.ViewModelStoreOwner {
- method public android.os.Bundle? getArguments();
- method public androidx.lifecycle.ViewModelProvider.Factory getDefaultViewModelProviderFactory();
- method public androidx.navigation.NavDestination getDestination();
- method public androidx.lifecycle.Lifecycle getLifecycle();
- method public androidx.savedstate.SavedStateRegistry getSavedStateRegistry();
- method public androidx.lifecycle.ViewModelStore getViewModelStore();
- }
-
- public class NavController {
- ctor public NavController(android.content.Context);
- method public void addOnDestinationChangedListener(androidx.navigation.NavController.OnDestinationChangedListener);
- method public androidx.navigation.NavDeepLinkBuilder createDeepLink();
- method public androidx.navigation.NavBackStackEntry getBackStackEntry(@IdRes int);
- method public androidx.navigation.NavDestination? getCurrentDestination();
- method public androidx.navigation.NavGraph getGraph();
- method public androidx.navigation.NavInflater getNavInflater();
- method public androidx.navigation.NavigatorProvider getNavigatorProvider();
- method public androidx.lifecycle.ViewModelStoreOwner getViewModelStoreOwner(@IdRes int);
- method public boolean handleDeepLink(android.content.Intent?);
- method public void navigate(@IdRes int);
- method public void navigate(@IdRes int, android.os.Bundle?);
- method public void navigate(@IdRes int, android.os.Bundle?, androidx.navigation.NavOptions?);
- method public void navigate(@IdRes int, android.os.Bundle?, androidx.navigation.NavOptions?, androidx.navigation.Navigator.Extras?);
- method public void navigate(android.net.Uri);
- method public void navigate(android.net.Uri, androidx.navigation.NavOptions?);
- method public void navigate(android.net.Uri, androidx.navigation.NavOptions?, androidx.navigation.Navigator.Extras?);
- method public void navigate(androidx.navigation.NavDirections);
- method public void navigate(androidx.navigation.NavDirections, androidx.navigation.NavOptions?);
- method public void navigate(androidx.navigation.NavDirections, androidx.navigation.Navigator.Extras);
- method public boolean navigateUp();
- method public boolean popBackStack();
- method public boolean popBackStack(@IdRes int, boolean);
- method public void removeOnDestinationChangedListener(androidx.navigation.NavController.OnDestinationChangedListener);
- method @CallSuper public void restoreState(android.os.Bundle?);
- method @CallSuper public android.os.Bundle? saveState();
- method @CallSuper public void setGraph(@NavigationRes int);
- method @CallSuper public void setGraph(@NavigationRes int, android.os.Bundle?);
- method @CallSuper public void setGraph(androidx.navigation.NavGraph);
- method @CallSuper public void setGraph(androidx.navigation.NavGraph, android.os.Bundle?);
- field public static final String KEY_DEEP_LINK_INTENT = "android-support-nav:controller:deepLinkIntent";
- }
-
- public static interface NavController.OnDestinationChangedListener {
- method public void onDestinationChanged(androidx.navigation.NavController, androidx.navigation.NavDestination, android.os.Bundle?);
- }
-
- public final class NavDeepLinkBuilder {
- ctor public NavDeepLinkBuilder(android.content.Context);
- method public android.app.PendingIntent createPendingIntent();
- method public androidx.core.app.TaskStackBuilder createTaskStackBuilder();
- method public androidx.navigation.NavDeepLinkBuilder setArguments(android.os.Bundle?);
- method public androidx.navigation.NavDeepLinkBuilder setComponentName(Class<? extends android.app.Activity>);
- method public androidx.navigation.NavDeepLinkBuilder setComponentName(android.content.ComponentName);
- method public androidx.navigation.NavDeepLinkBuilder setDestination(@IdRes int);
- method public androidx.navigation.NavDeepLinkBuilder setGraph(@NavigationRes int);
- method public androidx.navigation.NavDeepLinkBuilder setGraph(androidx.navigation.NavGraph);
- }
-
- public interface NavHost {
- method public androidx.navigation.NavController getNavController();
- }
-
- public final class NavHostController extends androidx.navigation.NavController {
- ctor public NavHostController(android.content.Context);
- method public void enableOnBackPressed(boolean);
- method public void setLifecycleOwner(androidx.lifecycle.LifecycleOwner);
- method public void setOnBackPressedDispatcher(androidx.activity.OnBackPressedDispatcher);
- method public void setViewModelStore(androidx.lifecycle.ViewModelStore);
- }
-
- public final class NavInflater {
- ctor public NavInflater(android.content.Context, androidx.navigation.NavigatorProvider);
- method public androidx.navigation.NavGraph inflate(@NavigationRes int);
- }
-
- public final class Navigation {
- method public static android.view.View.OnClickListener createNavigateOnClickListener(@IdRes int);
- method public static android.view.View.OnClickListener createNavigateOnClickListener(@IdRes int, android.os.Bundle?);
- method public static android.view.View.OnClickListener createNavigateOnClickListener(androidx.navigation.NavDirections);
- method public static androidx.navigation.NavController findNavController(android.app.Activity, @IdRes int);
- method public static androidx.navigation.NavController findNavController(android.view.View);
- method public static void setViewNavController(android.view.View, androidx.navigation.NavController?);
- }
-
-}
-
diff --git a/navigation/navigation-runtime/api/2.2.0-alpha04.txt b/navigation/navigation-runtime/api/restricted_2.2.0-beta01.txt
similarity index 100%
copy from navigation/navigation-runtime/api/2.2.0-alpha04.txt
copy to navigation/navigation-runtime/api/restricted_2.2.0-beta01.txt
diff --git a/navigation/navigation-runtime/build.gradle b/navigation/navigation-runtime/build.gradle
index 81c9ab9..b2ad1c3 100644
--- a/navigation/navigation-runtime/build.gradle
+++ b/navigation/navigation-runtime/build.gradle
@@ -28,7 +28,7 @@
dependencies {
api(project(":navigation:navigation-common"))
- api("androidx.activity:activity:1.1.0-alpha03")
+ api(project(":activity:activity"))
api(project(":lifecycle:lifecycle-viewmodel"))
api("androidx.savedstate:savedstate:1.0.0")
api(project(":lifecycle:lifecycle-viewmodel-savedstate"))
