Revert "Deprecate Android v1 embedding classes (flutter#20868)" (flut…

…ter#21338) This reverts commit 3011b14.
engine-flutter-autoroll · Sep 22, 2020 · c62d665 · c62d665
1 parent 7e879a9
commit c62d665
Show file tree

Hide file tree

Showing 8 changed files with 16 additions and 24 deletions.
diff --git a/shell/platform/android/io/flutter/app/FlutterActivity.java b/shell/platform/android/io/flutter/app/FlutterActivity.java
@@ -18,10 +18,10 @@
 /**
  * Deprecated base class for activities that use Flutter.
  *
- * @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.
+ * <p>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
@@ -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.
+ * <p>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
@@ -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}.
  *
+ * <p>Deprecation: this class is replaced by {@link
+ * io.flutter.embedding.android.FlutterFragmentActivity}.
+ *
  * <p>Applications that don't have this need will likely want to use {@link FlutterActivity}
  * instead.
  *
@@ -28,10 +31,7 @@
  *
  * @see <a target="_new"
  *     href="https://developer.android.com/training/testing/set-up-project">https://developer.android.com/training/testing/set-up-project</a>
- * @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
@@ -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
@@ -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.
+ * <p>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
@@ -14,9 +14,8 @@
 /**
  * A legacy class to initialize the Flutter engine.
  *
- * @deprecated Replaced by {@link io.flutter.embedding.engine.loader.FlutterLoader}.
+ * <p>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
@@ -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
@@ -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.
+ * <p>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 {
   /**