Deprecation: {@link io.flutter.embedding.android.FlutterActivity} is the new API that now + * replaces this class. See https://flutter.dev/go/android-project-migration for more migration + * details. */ -@Deprecated public class FlutterActivity extends Activity implements FlutterView.Provider, PluginRegistry, ViewFactory { private static final String TAG = "FlutterActivity"; diff --git a/shell/platform/android/io/flutter/app/FlutterActivityDelegate.java b/shell/platform/android/io/flutter/app/FlutterActivityDelegate.java index 970f09775a385..ee96cd072443b 100644 --- a/shell/platform/android/io/flutter/app/FlutterActivityDelegate.java +++ b/shell/platform/android/io/flutter/app/FlutterActivityDelegate.java @@ -50,11 +50,10 @@ * your activity implement {@link PluginRegistry} and/or {@link * io.flutter.view.FlutterView.Provider} and forward those methods to this class as well. * - * @deprecated {@link io.flutter.embedding.android.FlutterActivity} is the new API that now replaces - * this class and {@link io.flutter.app.FlutterActivity}. See - * https://flutter.dev/go/android-project-migration for more migration details. + *
Deprecation: {@link io.flutter.embedding.android.FlutterActivity} is the new API that now + * replaces this class and {@link io.flutter.app.FlutterActivity}. See + * https://flutter.dev/go/android-project-migration for more migration details. */ -@Deprecated public final class FlutterActivityDelegate implements FlutterActivityEvents, FlutterView.Provider, PluginRegistry { private static final String SPLASH_SCREEN_META_DATA_KEY = diff --git a/shell/platform/android/io/flutter/app/FlutterFragmentActivity.java b/shell/platform/android/io/flutter/app/FlutterFragmentActivity.java index 798fbdc3dc905..936f0b2315aeb 100644 --- a/shell/platform/android/io/flutter/app/FlutterFragmentActivity.java +++ b/shell/platform/android/io/flutter/app/FlutterFragmentActivity.java @@ -18,6 +18,9 @@ * Deprecated class for activities that use Flutter who also require the use of the Android v4 * Support library's {@link FragmentActivity}. * + *
Deprecation: this class is replaced by {@link + * io.flutter.embedding.android.FlutterFragmentActivity}. + * *
Applications that don't have this need will likely want to use {@link FlutterActivity} * instead. * @@ -28,10 +31,7 @@ * * @see https://developer.android.com/training/testing/set-up-project - * @deprecated this class is replaced by {@link - * io.flutter.embedding.android.FlutterFragmentActivity}. */ -@Deprecated public class FlutterFragmentActivity extends FragmentActivity implements FlutterView.Provider, PluginRegistry, ViewFactory { private final FlutterActivityDelegate delegate = new FlutterActivityDelegate(this, this); diff --git a/shell/platform/android/io/flutter/app/FlutterPluginRegistry.java b/shell/platform/android/io/flutter/app/FlutterPluginRegistry.java index 023e723e93c8e..2a7173634ec6b 100644 --- a/shell/platform/android/io/flutter/app/FlutterPluginRegistry.java +++ b/shell/platform/android/io/flutter/app/FlutterPluginRegistry.java @@ -21,8 +21,8 @@ import java.util.List; import java.util.Map; -/** @deprecated See https://flutter.dev/go/android-project-migration for migration instructions. */ -@Deprecated +/// This class is now deprecated. See https://flutter.dev/go/android-project-migration for +/// migration instructions. public class FlutterPluginRegistry implements PluginRegistry, PluginRegistry.RequestPermissionsResultListener, diff --git a/shell/platform/android/io/flutter/plugin/common/PluginRegistry.java b/shell/platform/android/io/flutter/plugin/common/PluginRegistry.java index 5724ce7ab2f3b..62ac2b7b665b6 100644 --- a/shell/platform/android/io/flutter/plugin/common/PluginRegistry.java +++ b/shell/platform/android/io/flutter/plugin/common/PluginRegistry.java @@ -25,9 +25,9 @@ * defaults to an instance of {@link io.flutter.app.FlutterActivity}, itself a {@link * PluginRegistry}. * - * @deprecated See https://flutter.dev/go/android-project-migration for migration details. + *
This class is now deprecated. See https://flutter.dev/go/android-project-migration for + * migration details. */ -@Deprecated public interface PluginRegistry { /** * Returns a {@link Registrar} for receiving the registrations pertaining to the specified plugin. diff --git a/shell/platform/android/io/flutter/view/FlutterMain.java b/shell/platform/android/io/flutter/view/FlutterMain.java index 2092830111fa1..1b13b45aee208 100644 --- a/shell/platform/android/io/flutter/view/FlutterMain.java +++ b/shell/platform/android/io/flutter/view/FlutterMain.java @@ -14,9 +14,8 @@ /** * A legacy class to initialize the Flutter engine. * - * @deprecated Replaced by {@link io.flutter.embedding.engine.loader.FlutterLoader}. + *
Replaced by {@link io.flutter.embedding.engine.loader.FlutterLoader}. */ -@Deprecated public class FlutterMain { public static class Settings { diff --git a/shell/platform/android/io/flutter/view/FlutterNativeView.java b/shell/platform/android/io/flutter/view/FlutterNativeView.java index ea01176ebcec6..01e3434d89d7c 100644 --- a/shell/platform/android/io/flutter/view/FlutterNativeView.java +++ b/shell/platform/android/io/flutter/view/FlutterNativeView.java @@ -17,11 +17,6 @@ import io.flutter.plugin.common.*; import java.nio.ByteBuffer; -/** - * @deprecated {@link io.flutter.embedding.android.FlutterView} is the new API that now replaces - * this class. See https://flutter.dev/go/android-project-migration for more migration details. - */ -@Deprecated public class FlutterNativeView implements BinaryMessenger { private static final String TAG = "FlutterNativeView"; diff --git a/shell/platform/android/io/flutter/view/FlutterView.java b/shell/platform/android/io/flutter/view/FlutterView.java index 9899e1714b255..2ed917b9f918d 100644 --- a/shell/platform/android/io/flutter/view/FlutterView.java +++ b/shell/platform/android/io/flutter/view/FlutterView.java @@ -71,10 +71,9 @@ /** * Deprecated Android view containing a Flutter app. * - * @deprecated {@link io.flutter.embedding.android.FlutterView} is the new API that now replaces - * this class. See https://flutter.dev/go/android-project-migration for more migration details. + *
Deprecation: {@link io.flutter.embedding.android.FlutterView} is the new API that now replaces + * this class. See https://flutter.dev/go/android-project-migration for more migration details. */ -@Deprecated public class FlutterView extends SurfaceView implements BinaryMessenger, TextureRegistry, MouseCursorPlugin.MouseCursorViewDelegate { /**