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 {@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/engine/src/flutter/shell/platform/android/io/flutter/app/FlutterActivityDelegate.java b/engine/src/flutter/shell/platform/android/io/flutter/app/FlutterActivityDelegate.java index ee96cd07244..970f09775a3 100644 --- a/engine/src/flutter/shell/platform/android/io/flutter/app/FlutterActivityDelegate.java +++ b/engine/src/flutter/shell/platform/android/io/flutter/app/FlutterActivityDelegate.java @@ -50,10 +50,11 @@ import java.util.ArrayList; * your activity implement {@link PluginRegistry} and/or {@link * io.flutter.view.FlutterView.Provider} and forward those methods to this class as well. * - *
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 {@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/engine/src/flutter/shell/platform/android/io/flutter/app/FlutterFragmentActivity.java b/engine/src/flutter/shell/platform/android/io/flutter/app/FlutterFragmentActivity.java index 936f0b2315a..798fbdc3dc9 100644 --- a/engine/src/flutter/shell/platform/android/io/flutter/app/FlutterFragmentActivity.java +++ b/engine/src/flutter/shell/platform/android/io/flutter/app/FlutterFragmentActivity.java @@ -18,9 +18,6 @@ import io.flutter.view.FlutterView; * 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. * @@ -31,7 +28,10 @@ import io.flutter.view.FlutterView; * * @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/engine/src/flutter/shell/platform/android/io/flutter/app/FlutterPluginRegistry.java b/engine/src/flutter/shell/platform/android/io/flutter/app/FlutterPluginRegistry.java index 2a7173634ec..023e723e93c 100644 --- a/engine/src/flutter/shell/platform/android/io/flutter/app/FlutterPluginRegistry.java +++ b/engine/src/flutter/shell/platform/android/io/flutter/app/FlutterPluginRegistry.java @@ -21,8 +21,8 @@ import java.util.LinkedHashMap; import java.util.List; import java.util.Map; -/// This class is now deprecated. See https://flutter.dev/go/android-project-migration for -/// migration instructions. +/** @deprecated See https://flutter.dev/go/android-project-migration for migration instructions. */ +@Deprecated public class FlutterPluginRegistry implements PluginRegistry, PluginRegistry.RequestPermissionsResultListener, diff --git a/engine/src/flutter/shell/platform/android/io/flutter/plugin/common/PluginRegistry.java b/engine/src/flutter/shell/platform/android/io/flutter/plugin/common/PluginRegistry.java index 62ac2b7b665..5724ce7ab2f 100644 --- a/engine/src/flutter/shell/platform/android/io/flutter/plugin/common/PluginRegistry.java +++ b/engine/src/flutter/shell/platform/android/io/flutter/plugin/common/PluginRegistry.java @@ -25,9 +25,9 @@ import io.flutter.view.TextureRegistry; * defaults to an instance of {@link io.flutter.app.FlutterActivity}, itself a {@link * PluginRegistry}. * - *
This class is now deprecated. See https://flutter.dev/go/android-project-migration for - * migration details. + * @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/engine/src/flutter/shell/platform/android/io/flutter/view/FlutterMain.java b/engine/src/flutter/shell/platform/android/io/flutter/view/FlutterMain.java index 1b13b45aee2..2092830111f 100644 --- a/engine/src/flutter/shell/platform/android/io/flutter/view/FlutterMain.java +++ b/engine/src/flutter/shell/platform/android/io/flutter/view/FlutterMain.java @@ -14,8 +14,9 @@ import io.flutter.embedding.engine.loader.FlutterLoader; /** * A legacy class to initialize the Flutter engine. * - *
Replaced by {@link io.flutter.embedding.engine.loader.FlutterLoader}. + * @deprecated Replaced by {@link io.flutter.embedding.engine.loader.FlutterLoader}. */ +@Deprecated public class FlutterMain { public static class Settings { diff --git a/engine/src/flutter/shell/platform/android/io/flutter/view/FlutterNativeView.java b/engine/src/flutter/shell/platform/android/io/flutter/view/FlutterNativeView.java index 01e3434d89d..ea01176ebce 100644 --- a/engine/src/flutter/shell/platform/android/io/flutter/view/FlutterNativeView.java +++ b/engine/src/flutter/shell/platform/android/io/flutter/view/FlutterNativeView.java @@ -17,6 +17,11 @@ import io.flutter.embedding.engine.renderer.FlutterUiDisplayListener; 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/engine/src/flutter/shell/platform/android/io/flutter/view/FlutterView.java b/engine/src/flutter/shell/platform/android/io/flutter/view/FlutterView.java index 2ed917b9f91..9899e1714b2 100644 --- a/engine/src/flutter/shell/platform/android/io/flutter/view/FlutterView.java +++ b/engine/src/flutter/shell/platform/android/io/flutter/view/FlutterView.java @@ -71,9 +71,10 @@ import java.util.concurrent.atomic.AtomicLong; /** * Deprecated Android view containing a Flutter app. * - *
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 {@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 { /**