Skip to content
This repository was archived by the owner on Feb 25, 2025. It is now read-only.

Commit 577ce77

Browse files
committed
Deprecate Android v1 embedding classes
1 parent aec855d commit 577ce77

8 files changed

Lines changed: 25 additions & 10 deletions

File tree

shell/platform/android/io/flutter/app/FlutterActivity.java

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,10 +18,11 @@
1818
/**
1919
* Deprecated base class for activities that use Flutter.
2020
*
21-
* <p>Deprecation: {@link io.flutter.embedding.android.FlutterActivity} is the new API that now
21+
* @deprecated {@link io.flutter.embedding.android.FlutterActivity} is the new API that now
2222
* replaces this class. See https://flutter.dev/go/android-project-migration for more migration
2323
* details.
2424
*/
25+
@Deprecated
2526
public class FlutterActivity extends Activity
2627
implements FlutterView.Provider, PluginRegistry, ViewFactory {
2728
private static final String TAG = "FlutterActivity";

shell/platform/android/io/flutter/app/FlutterActivityDelegate.java

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -50,10 +50,11 @@
5050
* your activity implement {@link PluginRegistry} and/or {@link
5151
* io.flutter.view.FlutterView.Provider} and forward those methods to this class as well.
5252
*
53-
* <p>Deprecation: {@link io.flutter.embedding.android.FlutterActivity} is the new API that now
53+
* @deprecated {@link io.flutter.embedding.android.FlutterActivity} is the new API that now
5454
* replaces this class and {@link io.flutter.app.FlutterActivity}. See
5555
* https://flutter.dev/go/android-project-migration for more migration details.
5656
*/
57+
@Deprecated
5758
public final class FlutterActivityDelegate
5859
implements FlutterActivityEvents, FlutterView.Provider, PluginRegistry {
5960
private static final String SPLASH_SCREEN_META_DATA_KEY =

shell/platform/android/io/flutter/app/FlutterFragmentActivity.java

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -18,9 +18,6 @@
1818
* Deprecated class for activities that use Flutter who also require the use of the Android v4
1919
* Support library's {@link FragmentActivity}.
2020
*
21-
* <p>Deprecation: this class is replaced by {@link
22-
* io.flutter.embedding.android.FlutterFragmentActivity}.
23-
*
2421
* <p>Applications that don't have this need will likely want to use {@link FlutterActivity}
2522
* instead.
2623
*
@@ -31,7 +28,11 @@
3128
*
3229
* @see <a target="_new"
3330
* href="https://developer.android.com/training/testing/set-up-project">https://developer.android.com/training/testing/set-up-project</a>
31+
*
32+
* @deprecated this class is replaced by {@link
33+
* io.flutter.embedding.android.FlutterFragmentActivity}.
3434
*/
35+
@Deprecated
3536
public class FlutterFragmentActivity extends FragmentActivity
3637
implements FlutterView.Provider, PluginRegistry, ViewFactory {
3738
private final FlutterActivityDelegate delegate = new FlutterActivityDelegate(this, this);

shell/platform/android/io/flutter/app/FlutterPluginRegistry.java

Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -21,8 +21,11 @@
2121
import java.util.List;
2222
import java.util.Map;
2323

24-
/// This class is now deprecated. See https://flutter.dev/go/android-project-migration for
25-
/// migration instructions.
24+
/**
25+
* @deprecated See https://flutter.dev/go/android-project-migration for
26+
* migration instructions.
27+
*/
28+
@Deprecated
2629
public class FlutterPluginRegistry
2730
implements PluginRegistry,
2831
PluginRegistry.RequestPermissionsResultListener,

shell/platform/android/io/flutter/plugin/common/PluginRegistry.java

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -25,9 +25,10 @@
2525
* defaults to an instance of {@link io.flutter.app.FlutterActivity}, itself a {@link
2626
* PluginRegistry}.
2727
*
28-
* <p>This class is now deprecated. See https://flutter.dev/go/android-project-migration for
28+
* @deprecated See https://flutter.dev/go/android-project-migration for
2929
* migration details.
3030
*/
31+
@Deprecated
3132
public interface PluginRegistry {
3233
/**
3334
* Returns a {@link Registrar} for receiving the registrations pertaining to the specified plugin.

shell/platform/android/io/flutter/view/FlutterMain.java

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,8 +14,9 @@
1414
/**
1515
* A legacy class to initialize the Flutter engine.
1616
*
17-
* <p>Replaced by {@link io.flutter.embedding.engine.loader.FlutterLoader}.
17+
* @deprecated Replaced by {@link io.flutter.embedding.engine.loader.FlutterLoader}.
1818
*/
19+
@Deprecated
1920
public class FlutterMain {
2021

2122
public static class Settings {

shell/platform/android/io/flutter/view/FlutterNativeView.java

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -17,6 +17,11 @@
1717
import io.flutter.plugin.common.*;
1818
import java.nio.ByteBuffer;
1919

20+
/**
21+
* @deprecated {@link io.flutter.embedding.android.FlutterView} is the new API that now replaces
22+
* this class. See https://flutter.dev/go/android-project-migration for more migration details.
23+
*/
24+
@Deprecated
2025
public class FlutterNativeView implements BinaryMessenger {
2126
private static final String TAG = "FlutterNativeView";
2227

shell/platform/android/io/flutter/view/FlutterView.java

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -63,6 +63,7 @@
6363
import io.flutter.plugin.mouse.MouseCursorPlugin;
6464
import io.flutter.plugin.platform.PlatformPlugin;
6565
import io.flutter.plugin.platform.PlatformViewsController;
66+
6667
import java.nio.ByteBuffer;
6768
import java.util.ArrayList;
6869
import java.util.List;
@@ -71,9 +72,10 @@
7172
/**
7273
* Deprecated Android view containing a Flutter app.
7374
*
74-
* <p>Deprecation: {@link io.flutter.embedding.android.FlutterView} is the new API that now replaces
75+
* @deprecated {@link io.flutter.embedding.android.FlutterView} is the new API that now replaces
7576
* this class. See https://flutter.dev/go/android-project-migration for more migration details.
7677
*/
78+
@Deprecated
7779
public class FlutterView extends SurfaceView
7880
implements BinaryMessenger, TextureRegistry, MouseCursorPlugin.MouseCursorViewDelegate {
7981
/**

0 commit comments

Comments
 (0)