From 577ce7766a7479795baadb648ea9c7eefcf14d81 Mon Sep 17 00:00:00 2001 From: Xiao Yu Date: Fri, 28 Aug 2020 15:47:02 -0700 Subject: [PATCH 1/2] Deprecate Android v1 embedding classes --- shell/platform/android/io/flutter/app/FlutterActivity.java | 3 ++- .../android/io/flutter/app/FlutterActivityDelegate.java | 3 ++- .../android/io/flutter/app/FlutterFragmentActivity.java | 7 ++++--- .../android/io/flutter/app/FlutterPluginRegistry.java | 7 +++++-- .../android/io/flutter/plugin/common/PluginRegistry.java | 3 ++- shell/platform/android/io/flutter/view/FlutterMain.java | 3 ++- .../android/io/flutter/view/FlutterNativeView.java | 5 +++++ shell/platform/android/io/flutter/view/FlutterView.java | 4 +++- 8 files changed, 25 insertions(+), 10 deletions(-) diff --git a/shell/platform/android/io/flutter/app/FlutterActivity.java b/shell/platform/android/io/flutter/app/FlutterActivity.java index be689873684a1..adb271f91e81d 100644 --- a/shell/platform/android/io/flutter/app/FlutterActivity.java +++ b/shell/platform/android/io/flutter/app/FlutterActivity.java @@ -18,10 +18,11 @@ /** * Deprecated base class for activities that use Flutter. * - *

Deprecation: {@link io.flutter.embedding.android.FlutterActivity} is the new API that now + * @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/shell/platform/android/io/flutter/app/FlutterActivityDelegate.java b/shell/platform/android/io/flutter/app/FlutterActivityDelegate.java index ee96cd072443b..5908f1abf3de0 100644 --- a/shell/platform/android/io/flutter/app/FlutterActivityDelegate.java +++ b/shell/platform/android/io/flutter/app/FlutterActivityDelegate.java @@ -50,10 +50,11 @@ * 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 + * @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/shell/platform/android/io/flutter/app/FlutterFragmentActivity.java b/shell/platform/android/io/flutter/app/FlutterFragmentActivity.java index 936f0b2315aeb..d6a4f83d485c6 100644 --- a/shell/platform/android/io/flutter/app/FlutterFragmentActivity.java +++ b/shell/platform/android/io/flutter/app/FlutterFragmentActivity.java @@ -18,9 +18,6 @@ * 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,11 @@ * * @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 2a7173634ec6b..ce443187bf007 100644 --- a/shell/platform/android/io/flutter/app/FlutterPluginRegistry.java +++ b/shell/platform/android/io/flutter/app/FlutterPluginRegistry.java @@ -21,8 +21,11 @@ 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/shell/platform/android/io/flutter/plugin/common/PluginRegistry.java b/shell/platform/android/io/flutter/plugin/common/PluginRegistry.java index 62ac2b7b665b6..3b54bff60871a 100644 --- a/shell/platform/android/io/flutter/plugin/common/PluginRegistry.java +++ b/shell/platform/android/io/flutter/plugin/common/PluginRegistry.java @@ -25,9 +25,10 @@ * 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 + * @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 1b13b45aee208..2092830111fa1 100644 --- a/shell/platform/android/io/flutter/view/FlutterMain.java +++ b/shell/platform/android/io/flutter/view/FlutterMain.java @@ -14,8 +14,9 @@ /** * 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/shell/platform/android/io/flutter/view/FlutterNativeView.java b/shell/platform/android/io/flutter/view/FlutterNativeView.java index 01e3434d89d7c..da8647c5ad806 100644 --- a/shell/platform/android/io/flutter/view/FlutterNativeView.java +++ b/shell/platform/android/io/flutter/view/FlutterNativeView.java @@ -17,6 +17,11 @@ 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 2ed917b9f918d..cdd4b05498877 100644 --- a/shell/platform/android/io/flutter/view/FlutterView.java +++ b/shell/platform/android/io/flutter/view/FlutterView.java @@ -63,6 +63,7 @@ import io.flutter.plugin.mouse.MouseCursorPlugin; import io.flutter.plugin.platform.PlatformPlugin; import io.flutter.plugin.platform.PlatformViewsController; + import java.nio.ByteBuffer; import java.util.ArrayList; import java.util.List; @@ -71,9 +72,10 @@ /** * Deprecated Android view containing a Flutter app. * - *

Deprecation: {@link io.flutter.embedding.android.FlutterView} is the new API that now replaces + * @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 { /** From bb5393f7a37d4cd79cd314658f554a5a1d8a178d Mon Sep 17 00:00:00 2001 From: Xiao Yu Date: Fri, 18 Sep 2020 10:55:50 -0700 Subject: [PATCH 2/2] autoformat --- shell/platform/android/io/flutter/app/FlutterActivity.java | 5 ++--- .../android/io/flutter/app/FlutterActivityDelegate.java | 6 +++--- .../android/io/flutter/app/FlutterFragmentActivity.java | 3 +-- .../android/io/flutter/app/FlutterPluginRegistry.java | 5 +---- .../android/io/flutter/plugin/common/PluginRegistry.java | 3 +-- .../platform/android/io/flutter/view/FlutterNativeView.java | 2 +- shell/platform/android/io/flutter/view/FlutterView.java | 3 +-- 7 files changed, 10 insertions(+), 17 deletions(-) diff --git a/shell/platform/android/io/flutter/app/FlutterActivity.java b/shell/platform/android/io/flutter/app/FlutterActivity.java index adb271f91e81d..a28176b0f799b 100644 --- a/shell/platform/android/io/flutter/app/FlutterActivity.java +++ b/shell/platform/android/io/flutter/app/FlutterActivity.java @@ -18,9 +18,8 @@ /** * 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. + * @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 diff --git a/shell/platform/android/io/flutter/app/FlutterActivityDelegate.java b/shell/platform/android/io/flutter/app/FlutterActivityDelegate.java index 5908f1abf3de0..970f09775a385 100644 --- a/shell/platform/android/io/flutter/app/FlutterActivityDelegate.java +++ b/shell/platform/android/io/flutter/app/FlutterActivityDelegate.java @@ -50,9 +50,9 @@ * 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. + * @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 diff --git a/shell/platform/android/io/flutter/app/FlutterFragmentActivity.java b/shell/platform/android/io/flutter/app/FlutterFragmentActivity.java index d6a4f83d485c6..798fbdc3dc905 100644 --- a/shell/platform/android/io/flutter/app/FlutterFragmentActivity.java +++ b/shell/platform/android/io/flutter/app/FlutterFragmentActivity.java @@ -28,9 +28,8 @@ * * @see https://developer.android.com/training/testing/set-up-project - * * @deprecated this class is replaced by {@link - * io.flutter.embedding.android.FlutterFragmentActivity}. + * io.flutter.embedding.android.FlutterFragmentActivity}. */ @Deprecated public class FlutterFragmentActivity extends FragmentActivity diff --git a/shell/platform/android/io/flutter/app/FlutterPluginRegistry.java b/shell/platform/android/io/flutter/app/FlutterPluginRegistry.java index ce443187bf007..023e723e93c8e 100644 --- a/shell/platform/android/io/flutter/app/FlutterPluginRegistry.java +++ b/shell/platform/android/io/flutter/app/FlutterPluginRegistry.java @@ -21,10 +21,7 @@ import java.util.List; import java.util.Map; -/** - * @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, diff --git a/shell/platform/android/io/flutter/plugin/common/PluginRegistry.java b/shell/platform/android/io/flutter/plugin/common/PluginRegistry.java index 3b54bff60871a..5724ce7ab2f3b 100644 --- a/shell/platform/android/io/flutter/plugin/common/PluginRegistry.java +++ b/shell/platform/android/io/flutter/plugin/common/PluginRegistry.java @@ -25,8 +25,7 @@ * 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. + * @deprecated See https://flutter.dev/go/android-project-migration for migration details. */ @Deprecated public interface PluginRegistry { diff --git a/shell/platform/android/io/flutter/view/FlutterNativeView.java b/shell/platform/android/io/flutter/view/FlutterNativeView.java index da8647c5ad806..ea01176ebcec6 100644 --- a/shell/platform/android/io/flutter/view/FlutterNativeView.java +++ b/shell/platform/android/io/flutter/view/FlutterNativeView.java @@ -19,7 +19,7 @@ /** * @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. + * this class. See https://flutter.dev/go/android-project-migration for more migration details. */ @Deprecated public class FlutterNativeView implements BinaryMessenger { diff --git a/shell/platform/android/io/flutter/view/FlutterView.java b/shell/platform/android/io/flutter/view/FlutterView.java index cdd4b05498877..9899e1714b255 100644 --- a/shell/platform/android/io/flutter/view/FlutterView.java +++ b/shell/platform/android/io/flutter/view/FlutterView.java @@ -63,7 +63,6 @@ import io.flutter.plugin.mouse.MouseCursorPlugin; import io.flutter.plugin.platform.PlatformPlugin; import io.flutter.plugin.platform.PlatformViewsController; - import java.nio.ByteBuffer; import java.util.ArrayList; import java.util.List; @@ -73,7 +72,7 @@ * 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. + * this class. See https://flutter.dev/go/android-project-migration for more migration details. */ @Deprecated public class FlutterView extends SurfaceView