diff --git a/dev/benchmarks/macrobenchmarks/android/app/src/main/AndroidManifest.xml b/dev/benchmarks/macrobenchmarks/android/app/src/main/AndroidManifest.xml index 70e48f2767..7a65065d3c 100644 --- a/dev/benchmarks/macrobenchmarks/android/app/src/main/AndroidManifest.xml +++ b/dev/benchmarks/macrobenchmarks/android/app/src/main/AndroidManifest.xml @@ -23,15 +23,17 @@ android:configChanges="orientation|keyboardHidden|keyboard|screenSize|locale|layoutDirection|fontScale|screenLayout|density|uiMode" android:hardwareAccelerated="true" android:windowSoftInputMode="adjustResize"> + + - - diff --git a/dev/benchmarks/macrobenchmarks/android/app/src/main/java/com/example/macrobenchmarks/MainActivity.java b/dev/benchmarks/macrobenchmarks/android/app/src/main/java/com/example/macrobenchmarks/MainActivity.java index d71d90b679..4e5d4f1137 100644 --- a/dev/benchmarks/macrobenchmarks/android/app/src/main/java/com/example/macrobenchmarks/MainActivity.java +++ b/dev/benchmarks/macrobenchmarks/android/app/src/main/java/com/example/macrobenchmarks/MainActivity.java @@ -1,13 +1,13 @@ package com.example.macrobenchmarks; -import androidx.annotation.NonNull; -import dev.flutter.plugins.GeneratedPluginRegistrant; -import io.flutter.embedding.android.FlutterActivity; -import io.flutter.embedding.engine.FlutterEngine; +import android.os.Bundle; +import io.flutter.app.FlutterActivity; +import io.flutter.plugins.GeneratedPluginRegistrant; public class MainActivity extends FlutterActivity { @Override - public void configureFlutterEngine(@NonNull FlutterEngine flutterEngine) { - GeneratedPluginRegistrant.registerWith(flutterEngine); + protected void onCreate(Bundle savedInstanceState) { + super.onCreate(savedInstanceState); + GeneratedPluginRegistrant.registerWith(this); } } diff --git a/dev/integration_tests/abstract_method_smoke_test/android/app/src/main/AndroidManifest.xml b/dev/integration_tests/abstract_method_smoke_test/android/app/src/main/AndroidManifest.xml index 9b35b9cec3..40f8e84de7 100644 --- a/dev/integration_tests/abstract_method_smoke_test/android/app/src/main/AndroidManifest.xml +++ b/dev/integration_tests/abstract_method_smoke_test/android/app/src/main/AndroidManifest.xml @@ -17,15 +17,17 @@ android:configChanges="orientation|keyboardHidden|keyboard|screenSize|locale|layoutDirection|fontScale|screenLayout|density|uiMode" android:hardwareAccelerated="true" android:windowSoftInputMode="stateVisible|adjustResize"> + + - - diff --git a/dev/integration_tests/abstract_method_smoke_test/android/app/src/main/kotlin/com/example/abstract_method_smoke_test/MainActivity.kt b/dev/integration_tests/abstract_method_smoke_test/android/app/src/main/kotlin/com/example/abstract_method_smoke_test/MainActivity.kt index 4660329014..6b555695b3 100644 --- a/dev/integration_tests/abstract_method_smoke_test/android/app/src/main/kotlin/com/example/abstract_method_smoke_test/MainActivity.kt +++ b/dev/integration_tests/abstract_method_smoke_test/android/app/src/main/kotlin/com/example/abstract_method_smoke_test/MainActivity.kt @@ -5,15 +5,12 @@ import android.graphics.Color import android.os.Bundle import android.view.View import android.view.inputmethod.InputMethodManager -import androidx.annotation.NonNull -import dev.flutter.plugins.GeneratedPluginRegistrant -import io.flutter.embedding.android.FlutterActivity -import io.flutter.embedding.engine.FlutterEngine -import io.flutter.embedding.engine.plugins.shim.ShimPluginRegistry +import io.flutter.app.FlutterActivity import io.flutter.plugin.common.MethodChannel import io.flutter.plugin.common.StandardMessageCodec import io.flutter.plugin.platform.PlatformView import io.flutter.plugin.platform.PlatformViewFactory +import io.flutter.plugins.GeneratedPluginRegistrant class MainActivity : FlutterActivity() { class SimplePlatformView(context: Context) : PlatformView { @@ -30,11 +27,11 @@ class MainActivity : FlutterActivity() { } } - override fun configureFlutterEngine(@NonNull flutterEngine: FlutterEngine) { - GeneratedPluginRegistrant.registerWith(flutterEngine); + override fun onCreate(savedInstanceState: Bundle?) { + super.onCreate(savedInstanceState) + GeneratedPluginRegistrant.registerWith(this) - val shimPluginRegistry = ShimPluginRegistry(flutterEngine); - shimPluginRegistry.registrarFor("com.example.abstract_method_smoke_test") + registrarFor("com.example.abstract_method_smoke_test") .platformViewRegistry() .registerViewFactory("simple", object : PlatformViewFactory(StandardMessageCodec.INSTANCE) { override fun create(context: Context?, viewId: Int, args: Any?): PlatformView { @@ -44,7 +41,7 @@ class MainActivity : FlutterActivity() { // Triggers the Android keyboard, which causes the resize of the Flutter view. // We need to wait for the app to complete. - MethodChannel(flutterEngine.getDartExecutor(), "com.example.abstract_method_smoke_test") + MethodChannel(flutterView, "com.example.abstract_method_smoke_test") .setMethodCallHandler { _, result -> toggleInput() result.success(null) diff --git a/dev/integration_tests/android_splash_screens/splash_screen_kitchen_sink/android/app/src/main/java/io/flutter/splash_screen_kitchen_sink/MainActivity.java b/dev/integration_tests/android_splash_screens/splash_screen_kitchen_sink/android/app/src/main/java/io/flutter/splash_screen_kitchen_sink/MainActivity.java index e2e7bedf61..8892ea9547 100644 --- a/dev/integration_tests/android_splash_screens/splash_screen_kitchen_sink/android/app/src/main/java/io/flutter/splash_screen_kitchen_sink/MainActivity.java +++ b/dev/integration_tests/android_splash_screens/splash_screen_kitchen_sink/android/app/src/main/java/io/flutter/splash_screen_kitchen_sink/MainActivity.java @@ -5,9 +5,12 @@ import android.util.Log; import android.view.View; import android.view.ViewGroup; import android.view.ViewTreeObserver; + import androidx.annotation.Nullable; + import java.util.ArrayList; import java.util.List; + import io.flutter.embedding.android.FlutterActivity; import io.flutter.embedding.android.FlutterView; import io.flutter.embedding.android.SplashScreen; diff --git a/dev/integration_tests/channels/android/app/src/main/AndroidManifest.xml b/dev/integration_tests/channels/android/app/src/main/AndroidManifest.xml index 40f5ef6a8f..a80ca4ba5e 100644 --- a/dev/integration_tests/channels/android/app/src/main/AndroidManifest.xml +++ b/dev/integration_tests/channels/android/app/src/main/AndroidManifest.xml @@ -24,10 +24,5 @@ - - diff --git a/dev/integration_tests/channels/android/app/src/main/java/com/yourcompany/channels/MainActivity.java b/dev/integration_tests/channels/android/app/src/main/java/com/yourcompany/channels/MainActivity.java index 5ec45292b2..4347f5b08f 100644 --- a/dev/integration_tests/channels/android/app/src/main/java/com/yourcompany/channels/MainActivity.java +++ b/dev/integration_tests/channels/android/app/src/main/java/com/yourcompany/channels/MainActivity.java @@ -9,26 +9,22 @@ import java.nio.ByteBuffer; import java.util.Date; import android.os.Bundle; -import androidx.annotation.NonNull; -import dev.flutter.plugins.GeneratedPluginRegistrant; -import io.flutter.embedding.android.FlutterActivity; -import io.flutter.embedding.engine.dart.DartExecutor; -import io.flutter.embedding.engine.FlutterEngine; +import io.flutter.app.FlutterActivity; import io.flutter.plugin.common.*; +import io.flutter.plugins.GeneratedPluginRegistrant; public class MainActivity extends FlutterActivity { @Override - public void configureFlutterEngine(@NonNull FlutterEngine flutterEngine) { - GeneratedPluginRegistrant.registerWith(flutterEngine); - - DartExecutor dartExecutor = flutterEngine.getDartExecutor(); - setupMessageHandshake(new BasicMessageChannel<>(dartExecutor, "binary-msg", BinaryCodec.INSTANCE)); - setupMessageHandshake(new BasicMessageChannel<>(dartExecutor, "string-msg", StringCodec.INSTANCE)); - setupMessageHandshake(new BasicMessageChannel<>(dartExecutor, "json-msg", JSONMessageCodec.INSTANCE)); - setupMessageHandshake(new BasicMessageChannel<>(dartExecutor, "std-msg", ExtendedStandardMessageCodec.INSTANCE)); - setupMethodHandshake(new MethodChannel(dartExecutor, "json-method", JSONMethodCodec.INSTANCE)); - setupMethodHandshake(new MethodChannel(dartExecutor, "std-method", new StandardMethodCodec(ExtendedStandardMessageCodec.INSTANCE))); + protected void onCreate(Bundle savedInstanceState) { + super.onCreate(savedInstanceState); + GeneratedPluginRegistrant.registerWith(this); + setupMessageHandshake(new BasicMessageChannel<>(getFlutterView(), "binary-msg", BinaryCodec.INSTANCE)); + setupMessageHandshake(new BasicMessageChannel<>(getFlutterView(), "string-msg", StringCodec.INSTANCE)); + setupMessageHandshake(new BasicMessageChannel<>(getFlutterView(), "json-msg", JSONMessageCodec.INSTANCE)); + setupMessageHandshake(new BasicMessageChannel<>(getFlutterView(), "std-msg", ExtendedStandardMessageCodec.INSTANCE)); + setupMethodHandshake(new MethodChannel(getFlutterView(), "json-method", JSONMethodCodec.INSTANCE)); + setupMethodHandshake(new MethodChannel(getFlutterView(), "std-method", new StandardMethodCodec(ExtendedStandardMessageCodec.INSTANCE))); } private void setupMessageHandshake(final BasicMessageChannel channel) { diff --git a/dev/integration_tests/codegen/android/app/src/main/AndroidManifest.xml b/dev/integration_tests/codegen/android/app/src/main/AndroidManifest.xml index 9ae0fccf2d..6703641433 100644 --- a/dev/integration_tests/codegen/android/app/src/main/AndroidManifest.xml +++ b/dev/integration_tests/codegen/android/app/src/main/AndroidManifest.xml @@ -24,10 +24,5 @@ - - diff --git a/dev/integration_tests/codegen/android/app/src/main/java/com/yourcompany/platforminteraction/MainActivity.java b/dev/integration_tests/codegen/android/app/src/main/java/com/yourcompany/platforminteraction/MainActivity.java index b0d639a7ca..73b7e51bb9 100644 --- a/dev/integration_tests/codegen/android/app/src/main/java/com/yourcompany/platforminteraction/MainActivity.java +++ b/dev/integration_tests/codegen/android/app/src/main/java/com/yourcompany/platforminteraction/MainActivity.java @@ -4,14 +4,14 @@ package com.yourcompany.platforminteraction; -import androidx.annotation.NonNull; -import dev.flutter.plugins.GeneratedPluginRegistrant; -import io.flutter.embedding.android.FlutterActivity; -import io.flutter.embedding.engine.FlutterEngine; +import android.os.Bundle; +import io.flutter.app.FlutterActivity; +import io.flutter.plugins.GeneratedPluginRegistrant; public class MainActivity extends FlutterActivity { @Override - public void configureFlutterEngine(@NonNull FlutterEngine flutterEngine) { - GeneratedPluginRegistrant.registerWith(flutterEngine); + protected void onCreate(Bundle savedInstanceState) { + super.onCreate(savedInstanceState); + GeneratedPluginRegistrant.registerWith(this); } } diff --git a/examples/catalog/android/app/src/main/AndroidManifest.xml b/examples/catalog/android/app/src/main/AndroidManifest.xml index 332f2bf364..e5c2a44968 100644 --- a/examples/catalog/android/app/src/main/AndroidManifest.xml +++ b/examples/catalog/android/app/src/main/AndroidManifest.xml @@ -24,10 +24,5 @@ - - diff --git a/examples/catalog/android/app/src/main/java/com/yourcompany/animated_list/MainActivity.java b/examples/catalog/android/app/src/main/java/com/yourcompany/animated_list/MainActivity.java index 7df95cae96..4b45672f6a 100644 --- a/examples/catalog/android/app/src/main/java/com/yourcompany/animated_list/MainActivity.java +++ b/examples/catalog/android/app/src/main/java/com/yourcompany/animated_list/MainActivity.java @@ -1,13 +1,13 @@ package com.yourcompany.animated_list; -import androidx.annotation.NonNull; -import dev.flutter.plugins.GeneratedPluginRegistrant; -import io.flutter.embedding.android.FlutterActivity; -import io.flutter.embedding.engine.FlutterEngine; +import android.os.Bundle; +import io.flutter.app.FlutterActivity; +import io.flutter.plugins.GeneratedPluginRegistrant; public class MainActivity extends FlutterActivity { @Override - public void configureFlutterEngine(@NonNull FlutterEngine flutterEngine) { - GeneratedPluginRegistrant.registerWith(flutterEngine); + protected void onCreate(Bundle savedInstanceState) { + super.onCreate(savedInstanceState); + GeneratedPluginRegistrant.registerWith(this); } } diff --git a/examples/flutter_gallery/android/app/src/main/AndroidManifest.xml b/examples/flutter_gallery/android/app/src/main/AndroidManifest.xml index 7b4cbbbae1..454073b8c9 100644 --- a/examples/flutter_gallery/android/app/src/main/AndroidManifest.xml +++ b/examples/flutter_gallery/android/app/src/main/AndroidManifest.xml @@ -29,10 +29,5 @@ - - diff --git a/examples/flutter_gallery/android/app/src/main/java/io/flutter/demo/gallery/FlutterGalleryInstrumentation.java b/examples/flutter_gallery/android/app/src/main/java/io/flutter/demo/gallery/FlutterGalleryInstrumentation.java index ba97f91881..ecd4cbf4f2 100644 --- a/examples/flutter_gallery/android/app/src/main/java/io/flutter/demo/gallery/FlutterGalleryInstrumentation.java +++ b/examples/flutter_gallery/android/app/src/main/java/io/flutter/demo/gallery/FlutterGalleryInstrumentation.java @@ -5,26 +5,25 @@ package io.flutter.demo.gallery; import android.os.ConditionVariable; -import androidx.annotation.NonNull; - -import io.flutter.plugin.common.BinaryMessenger; import io.flutter.plugin.common.MethodCall; import io.flutter.plugin.common.MethodChannel; import io.flutter.plugin.common.MethodChannel.MethodCallHandler; import io.flutter.plugin.common.MethodChannel.Result; +import io.flutter.view.FlutterView; /** Instrumentation for testing using Android Espresso framework. */ public class FlutterGalleryInstrumentation implements MethodCallHandler { + private final ConditionVariable testFinished = new ConditionVariable(); private volatile boolean testSuccessful; - FlutterGalleryInstrumentation(@NonNull BinaryMessenger messenger) { - new MethodChannel(messenger, "io.flutter.demo.gallery/TestLifecycleListener") + FlutterGalleryInstrumentation(FlutterView view) { + new MethodChannel(view, "io.flutter.demo.gallery/TestLifecycleListener") .setMethodCallHandler(this); } @Override - public void onMethodCall(@NonNull MethodCall call, @NonNull Result result) { + public void onMethodCall(MethodCall call, Result result) { testSuccessful = call.method.equals("success"); testFinished.open(); result.success(null); diff --git a/examples/flutter_gallery/android/app/src/main/java/io/flutter/demo/gallery/MainActivity.java b/examples/flutter_gallery/android/app/src/main/java/io/flutter/demo/gallery/MainActivity.java index 741474ede3..dcfc139538 100644 --- a/examples/flutter_gallery/android/app/src/main/java/io/flutter/demo/gallery/MainActivity.java +++ b/examples/flutter_gallery/android/app/src/main/java/io/flutter/demo/gallery/MainActivity.java @@ -4,12 +4,15 @@ package io.flutter.demo.gallery; -import androidx.annotation.NonNull; -import dev.flutter.plugins.GeneratedPluginRegistrant; -import io.flutter.embedding.android.FlutterActivity; -import io.flutter.embedding.engine.FlutterEngine; +import android.os.Build; +import android.os.Bundle; + +import io.flutter.app.FlutterActivity; +import io.flutter.view.FlutterView; +import io.flutter.plugins.GeneratedPluginRegistrant; public class MainActivity extends FlutterActivity { + private FlutterGalleryInstrumentation instrumentation; /** Instrumentation for testing. */ @@ -18,8 +21,19 @@ public class MainActivity extends FlutterActivity { } @Override - public void configureFlutterEngine(@NonNull FlutterEngine flutterEngine) { - GeneratedPluginRegistrant.registerWith(flutterEngine); - instrumentation = new FlutterGalleryInstrumentation(flutterEngine.getDartExecutor()); + protected void onCreate(Bundle savedInstanceState) { + super.onCreate(savedInstanceState); + GeneratedPluginRegistrant.registerWith(this); + instrumentation = new FlutterGalleryInstrumentation(this.getFlutterView()); + getFlutterView().addFirstFrameListener(new FlutterView.FirstFrameListener() { + @Override + public void onFirstFrame() { + // Report fully drawn time for Play Store Console. + if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.LOLLIPOP) { + MainActivity.this.reportFullyDrawn(); + } + MainActivity.this.getFlutterView().removeFirstFrameListener(this); + } + }); } } diff --git a/examples/hello_world/android/app/src/main/AndroidManifest.xml b/examples/hello_world/android/app/src/main/AndroidManifest.xml index 0cd05a28fb..37de797ac9 100644 --- a/examples/hello_world/android/app/src/main/AndroidManifest.xml +++ b/examples/hello_world/android/app/src/main/AndroidManifest.xml @@ -29,10 +29,5 @@ - - diff --git a/examples/hello_world/android/app/src/main/java/io/flutter/examples/hello_world/MainActivity.java b/examples/hello_world/android/app/src/main/java/io/flutter/examples/hello_world/MainActivity.java index d4bc7c9e9e..34dd67f807 100644 --- a/examples/hello_world/android/app/src/main/java/io/flutter/examples/hello_world/MainActivity.java +++ b/examples/hello_world/android/app/src/main/java/io/flutter/examples/hello_world/MainActivity.java @@ -1,13 +1,13 @@ package io.flutter.examples.hello_world; -import androidx.annotation.NonNull; -import dev.flutter.plugins.GeneratedPluginRegistrant; -import io.flutter.embedding.android.FlutterActivity; -import io.flutter.embedding.engine.FlutterEngine; +import android.os.Bundle; +import io.flutter.app.FlutterActivity; +import io.flutter.plugins.GeneratedPluginRegistrant; public class MainActivity extends FlutterActivity { @Override - public void configureFlutterEngine(@NonNull FlutterEngine flutterEngine) { - GeneratedPluginRegistrant.registerWith(flutterEngine); + protected void onCreate(Bundle savedInstanceState) { + super.onCreate(savedInstanceState); + GeneratedPluginRegistrant.registerWith(this); } } diff --git a/examples/image_list/android/app/src/main/AndroidManifest.xml b/examples/image_list/android/app/src/main/AndroidManifest.xml index 6e81f05e6d..6d9ce1cd89 100644 --- a/examples/image_list/android/app/src/main/AndroidManifest.xml +++ b/examples/image_list/android/app/src/main/AndroidManifest.xml @@ -18,15 +18,17 @@ android:configChanges="orientation|keyboardHidden|keyboard|screenSize|locale|layoutDirection|fontScale|screenLayout|density|uiMode" android:hardwareAccelerated="true" android:windowSoftInputMode="adjustResize"> + + - - diff --git a/examples/image_list/android/app/src/main/java/com/example/image_list/MainActivity.java b/examples/image_list/android/app/src/main/java/com/example/image_list/MainActivity.java index 3e5f5b8e55..ff9b177117 100644 --- a/examples/image_list/android/app/src/main/java/com/example/image_list/MainActivity.java +++ b/examples/image_list/android/app/src/main/java/com/example/image_list/MainActivity.java @@ -1,13 +1,13 @@ package com.example.image_list; -import androidx.annotation.NonNull; -import dev.flutter.plugins.GeneratedPluginRegistrant; -import io.flutter.embedding.android.FlutterActivity; -import io.flutter.embedding.engine.FlutterEngine; +import android.os.Bundle; +import io.flutter.app.FlutterActivity; +import io.flutter.plugins.GeneratedPluginRegistrant; public class MainActivity extends FlutterActivity { @Override - public void configureFlutterEngine(@NonNull FlutterEngine flutterEngine) { - GeneratedPluginRegistrant.registerWith(flutterEngine); + protected void onCreate(Bundle savedInstanceState) { + super.onCreate(savedInstanceState); + GeneratedPluginRegistrant.registerWith(this); } } diff --git a/examples/layers/android/app/src/main/AndroidManifest.xml b/examples/layers/android/app/src/main/AndroidManifest.xml index 5cb9382936..c23efafd28 100644 --- a/examples/layers/android/app/src/main/AndroidManifest.xml +++ b/examples/layers/android/app/src/main/AndroidManifest.xml @@ -24,10 +24,5 @@ - - diff --git a/examples/layers/android/app/src/main/java/io/flutter/examples/Layers/MainActivity.java b/examples/layers/android/app/src/main/java/io/flutter/examples/Layers/MainActivity.java index b829e9ba90..016102ea04 100644 --- a/examples/layers/android/app/src/main/java/io/flutter/examples/Layers/MainActivity.java +++ b/examples/layers/android/app/src/main/java/io/flutter/examples/Layers/MainActivity.java @@ -4,14 +4,15 @@ package io.flutter.examples.Layers; -import androidx.annotation.NonNull; -import dev.flutter.plugins.GeneratedPluginRegistrant; -import io.flutter.embedding.android.FlutterActivity; -import io.flutter.embedding.engine.FlutterEngine; +import android.os.Bundle; +import io.flutter.app.FlutterActivity; +import io.flutter.plugins.GeneratedPluginRegistrant; public class MainActivity extends FlutterActivity { @Override - public void configureFlutterEngine(@NonNull FlutterEngine flutterEngine) { - GeneratedPluginRegistrant.registerWith(flutterEngine); + protected void onCreate(Bundle savedInstanceState) { + super.onCreate(savedInstanceState); + GeneratedPluginRegistrant.registerWith(this); } } + diff --git a/examples/platform_channel/android/app/src/main/AndroidManifest.xml b/examples/platform_channel/android/app/src/main/AndroidManifest.xml index f340c091c0..fe87a8a9df 100644 --- a/examples/platform_channel/android/app/src/main/AndroidManifest.xml +++ b/examples/platform_channel/android/app/src/main/AndroidManifest.xml @@ -21,10 +21,5 @@ - - diff --git a/examples/platform_channel/android/app/src/main/java/com/example/platformchannel/MainActivity.java b/examples/platform_channel/android/app/src/main/java/com/example/platformchannel/MainActivity.java index bca8d3f3b7..19db060372 100644 --- a/examples/platform_channel/android/app/src/main/java/com/example/platformchannel/MainActivity.java +++ b/examples/platform_channel/android/app/src/main/java/com/example/platformchannel/MainActivity.java @@ -13,10 +13,8 @@ import android.os.BatteryManager; import android.os.Build.VERSION; import android.os.Build.VERSION_CODES; import android.os.Bundle; -import androidx.annotation.NonNull; -import dev.flutter.plugins.GeneratedPluginRegistrant; -import io.flutter.embedding.android.FlutterActivity; -import io.flutter.embedding.engine.FlutterEngine; + +import io.flutter.app.FlutterActivity; import io.flutter.plugin.common.EventChannel; import io.flutter.plugin.common.EventChannel.EventSink; import io.flutter.plugin.common.EventChannel.StreamHandler; @@ -24,50 +22,51 @@ import io.flutter.plugin.common.MethodChannel; import io.flutter.plugin.common.MethodChannel.MethodCallHandler; import io.flutter.plugin.common.MethodChannel.Result; import io.flutter.plugin.common.MethodCall; +import io.flutter.plugins.GeneratedPluginRegistrant; public class MainActivity extends FlutterActivity { private static final String BATTERY_CHANNEL = "samples.flutter.io/battery"; private static final String CHARGING_CHANNEL = "samples.flutter.io/charging"; @Override - public void configureFlutterEngine(@NonNull FlutterEngine flutterEngine) { - GeneratedPluginRegistrant.registerWith(flutterEngine); + public void onCreate(Bundle savedInstanceState) { + super.onCreate(savedInstanceState); + GeneratedPluginRegistrant.registerWith(this); + new EventChannel(getFlutterView(), CHARGING_CHANNEL).setStreamHandler( + new StreamHandler() { + private BroadcastReceiver chargingStateChangeReceiver; + @Override + public void onListen(Object arguments, EventSink events) { + chargingStateChangeReceiver = createChargingStateChangeReceiver(events); + registerReceiver( + chargingStateChangeReceiver, new IntentFilter(Intent.ACTION_BATTERY_CHANGED)); + } - new EventChannel(flutterEngine.getDartExecutor(), CHARGING_CHANNEL).setStreamHandler( - new StreamHandler() { - private BroadcastReceiver chargingStateChangeReceiver; - @Override - public void onListen(Object arguments, EventSink events) { - chargingStateChangeReceiver = createChargingStateChangeReceiver(events); - registerReceiver( - chargingStateChangeReceiver, new IntentFilter(Intent.ACTION_BATTERY_CHANGED)); - } - - @Override - public void onCancel(Object arguments) { - unregisterReceiver(chargingStateChangeReceiver); - chargingStateChangeReceiver = null; - } - } - ); - - new MethodChannel(flutterEngine.getDartExecutor(), BATTERY_CHANNEL).setMethodCallHandler( - new MethodCallHandler() { - @Override - public void onMethodCall(MethodCall call, Result result) { - if (call.method.equals("getBatteryLevel")) { - int batteryLevel = getBatteryLevel(); - - if (batteryLevel != -1) { - result.success(batteryLevel); - } else { - result.error("UNAVAILABLE", "Battery level not available.", null); - } - } else { - result.notImplemented(); + @Override + public void onCancel(Object arguments) { + unregisterReceiver(chargingStateChangeReceiver); + chargingStateChangeReceiver = null; + } + } + ); + + new MethodChannel(getFlutterView(), BATTERY_CHANNEL).setMethodCallHandler( + new MethodCallHandler() { + @Override + public void onMethodCall(MethodCall call, Result result) { + if (call.method.equals("getBatteryLevel")) { + int batteryLevel = getBatteryLevel(); + + if (batteryLevel != -1) { + result.success(batteryLevel); + } else { + result.error("UNAVAILABLE", "Battery level not available.", null); + } + } else { + result.notImplemented(); + } } } - } ); } diff --git a/examples/platform_channel_swift/android/app/src/androidTest/java/com/example/platformchannel/ExampleInstrumentedTest.java b/examples/platform_channel_swift/android/app/src/androidTest/java/com/example/platformchannel/ExampleInstrumentedTest.java index c3935755e6..8c1bf37ee2 100644 --- a/examples/platform_channel_swift/android/app/src/androidTest/java/com/example/platformchannel/ExampleInstrumentedTest.java +++ b/examples/platform_channel_swift/android/app/src/androidTest/java/com/example/platformchannel/ExampleInstrumentedTest.java @@ -1,19 +1,21 @@ package com.example.platformchannel; -import static org.junit.Assert.*; - -import android.app.Instrumentation; import android.graphics.Bitmap; import android.support.test.InstrumentationRegistry; import android.support.test.rule.ActivityTestRule; import android.support.test.runner.AndroidJUnit4; + import io.flutter.view.FlutterView; + +import android.app.Instrumentation; import java.util.concurrent.CountDownLatch; import java.util.concurrent.TimeUnit; import org.junit.Rule; import org.junit.Test; import org.junit.runner.RunWith; +import static org.junit.Assert.*; + @RunWith(AndroidJUnit4.class) public class ExampleInstrumentedTest { @Rule diff --git a/examples/platform_channel_swift/android/app/src/main/AndroidManifest.xml b/examples/platform_channel_swift/android/app/src/main/AndroidManifest.xml index f340c091c0..fe87a8a9df 100644 --- a/examples/platform_channel_swift/android/app/src/main/AndroidManifest.xml +++ b/examples/platform_channel_swift/android/app/src/main/AndroidManifest.xml @@ -21,10 +21,5 @@ - - diff --git a/examples/platform_channel_swift/android/app/src/main/java/com/example/platformchannel/MainActivity.java b/examples/platform_channel_swift/android/app/src/main/java/com/example/platformchannel/MainActivity.java index bca8d3f3b7..19db060372 100644 --- a/examples/platform_channel_swift/android/app/src/main/java/com/example/platformchannel/MainActivity.java +++ b/examples/platform_channel_swift/android/app/src/main/java/com/example/platformchannel/MainActivity.java @@ -13,10 +13,8 @@ import android.os.BatteryManager; import android.os.Build.VERSION; import android.os.Build.VERSION_CODES; import android.os.Bundle; -import androidx.annotation.NonNull; -import dev.flutter.plugins.GeneratedPluginRegistrant; -import io.flutter.embedding.android.FlutterActivity; -import io.flutter.embedding.engine.FlutterEngine; + +import io.flutter.app.FlutterActivity; import io.flutter.plugin.common.EventChannel; import io.flutter.plugin.common.EventChannel.EventSink; import io.flutter.plugin.common.EventChannel.StreamHandler; @@ -24,50 +22,51 @@ import io.flutter.plugin.common.MethodChannel; import io.flutter.plugin.common.MethodChannel.MethodCallHandler; import io.flutter.plugin.common.MethodChannel.Result; import io.flutter.plugin.common.MethodCall; +import io.flutter.plugins.GeneratedPluginRegistrant; public class MainActivity extends FlutterActivity { private static final String BATTERY_CHANNEL = "samples.flutter.io/battery"; private static final String CHARGING_CHANNEL = "samples.flutter.io/charging"; @Override - public void configureFlutterEngine(@NonNull FlutterEngine flutterEngine) { - GeneratedPluginRegistrant.registerWith(flutterEngine); + public void onCreate(Bundle savedInstanceState) { + super.onCreate(savedInstanceState); + GeneratedPluginRegistrant.registerWith(this); + new EventChannel(getFlutterView(), CHARGING_CHANNEL).setStreamHandler( + new StreamHandler() { + private BroadcastReceiver chargingStateChangeReceiver; + @Override + public void onListen(Object arguments, EventSink events) { + chargingStateChangeReceiver = createChargingStateChangeReceiver(events); + registerReceiver( + chargingStateChangeReceiver, new IntentFilter(Intent.ACTION_BATTERY_CHANGED)); + } - new EventChannel(flutterEngine.getDartExecutor(), CHARGING_CHANNEL).setStreamHandler( - new StreamHandler() { - private BroadcastReceiver chargingStateChangeReceiver; - @Override - public void onListen(Object arguments, EventSink events) { - chargingStateChangeReceiver = createChargingStateChangeReceiver(events); - registerReceiver( - chargingStateChangeReceiver, new IntentFilter(Intent.ACTION_BATTERY_CHANGED)); - } - - @Override - public void onCancel(Object arguments) { - unregisterReceiver(chargingStateChangeReceiver); - chargingStateChangeReceiver = null; - } - } - ); - - new MethodChannel(flutterEngine.getDartExecutor(), BATTERY_CHANNEL).setMethodCallHandler( - new MethodCallHandler() { - @Override - public void onMethodCall(MethodCall call, Result result) { - if (call.method.equals("getBatteryLevel")) { - int batteryLevel = getBatteryLevel(); - - if (batteryLevel != -1) { - result.success(batteryLevel); - } else { - result.error("UNAVAILABLE", "Battery level not available.", null); - } - } else { - result.notImplemented(); + @Override + public void onCancel(Object arguments) { + unregisterReceiver(chargingStateChangeReceiver); + chargingStateChangeReceiver = null; + } + } + ); + + new MethodChannel(getFlutterView(), BATTERY_CHANNEL).setMethodCallHandler( + new MethodCallHandler() { + @Override + public void onMethodCall(MethodCall call, Result result) { + if (call.method.equals("getBatteryLevel")) { + int batteryLevel = getBatteryLevel(); + + if (batteryLevel != -1) { + result.success(batteryLevel); + } else { + result.error("UNAVAILABLE", "Battery level not available.", null); + } + } else { + result.notImplemented(); + } } } - } ); } diff --git a/examples/platform_view/android/app/src/main/AndroidManifest.xml b/examples/platform_view/android/app/src/main/AndroidManifest.xml index 34c1822553..afb36b14a6 100644 --- a/examples/platform_view/android/app/src/main/AndroidManifest.xml +++ b/examples/platform_view/android/app/src/main/AndroidManifest.xml @@ -33,10 +33,5 @@ android:parentActivityName="io.flutter.examples.platform_view.MainActivity" android:theme="@style/Theme.AppCompat.NoActionBar" android:configChanges="orientation|keyboardHidden|keyboard|screenSize|locale|layoutDirection|fontScale"> - - diff --git a/examples/platform_view/android/app/src/main/java/io/flutter/examples/platform_view/MainActivity.java b/examples/platform_view/android/app/src/main/java/io/flutter/examples/platform_view/MainActivity.java index 03bca70b6e..faa45fb4bc 100644 --- a/examples/platform_view/android/app/src/main/java/io/flutter/examples/platform_view/MainActivity.java +++ b/examples/platform_view/android/app/src/main/java/io/flutter/examples/platform_view/MainActivity.java @@ -5,12 +5,13 @@ package io.flutter.examples.platform_view; import android.content.Intent; -import androidx.annotation.NonNull; -import dev.flutter.plugins.GeneratedPluginRegistrant; +import android.os.Bundle; + +import io.flutter.plugins.GeneratedPluginRegistrant; + +import io.flutter.app.FlutterActivity; import io.flutter.plugin.common.MethodCall; import io.flutter.plugin.common.MethodChannel; -import io.flutter.embedding.android.FlutterActivity; -import io.flutter.embedding.engine.FlutterEngine; public class MainActivity extends FlutterActivity { private static final String CHANNEL = "samples.flutter.io/platform_view"; @@ -20,22 +21,23 @@ public class MainActivity extends FlutterActivity { private MethodChannel.Result result; @Override - public void configureFlutterEngine(@NonNull FlutterEngine flutterEngine) { - GeneratedPluginRegistrant.registerWith(flutterEngine); + protected void onCreate(Bundle savedInstanceState) { + super.onCreate(savedInstanceState); + GeneratedPluginRegistrant.registerWith(this); - new MethodChannel(flutterEngine.getDartExecutor(), CHANNEL).setMethodCallHandler( - new MethodChannel.MethodCallHandler() { - @Override - public void onMethodCall(MethodCall methodCall, MethodChannel.Result result) { - MainActivity.this.result = result; - int count = methodCall.arguments(); - if (methodCall.method.equals(METHOD_SWITCH_VIEW)) { - onLaunchFullScreen(count); - } else { - result.notImplemented(); - } - } - } + new MethodChannel(getFlutterView(), CHANNEL).setMethodCallHandler( + new MethodChannel.MethodCallHandler() { + @Override + public void onMethodCall(MethodCall methodCall, MethodChannel.Result result) { + MainActivity.this.result = result; + int count = methodCall.arguments(); + if (methodCall.method.equals(METHOD_SWITCH_VIEW)) { + onLaunchFullScreen(count); + } else { + result.notImplemented(); + } + } + } ); } diff --git a/examples/stocks/android/app/src/main/AndroidManifest.xml b/examples/stocks/android/app/src/main/AndroidManifest.xml index 20abea8d35..1d78389f4b 100644 --- a/examples/stocks/android/app/src/main/AndroidManifest.xml +++ b/examples/stocks/android/app/src/main/AndroidManifest.xml @@ -29,10 +29,5 @@ - - diff --git a/examples/stocks/android/app/src/main/java/io/flutter/examples/stocks/MainActivity.java b/examples/stocks/android/app/src/main/java/io/flutter/examples/stocks/MainActivity.java index 3d4d328ff3..49886b8a16 100644 --- a/examples/stocks/android/app/src/main/java/io/flutter/examples/stocks/MainActivity.java +++ b/examples/stocks/android/app/src/main/java/io/flutter/examples/stocks/MainActivity.java @@ -4,14 +4,14 @@ package io.flutter.examples.stocks; -import androidx.annotation.NonNull; -import dev.flutter.plugins.GeneratedPluginRegistrant; -import io.flutter.embedding.android.FlutterActivity; -import io.flutter.embedding.engine.FlutterEngine; +import android.os.Bundle; +import io.flutter.app.FlutterActivity; +import io.flutter.plugins.GeneratedPluginRegistrant; public class MainActivity extends FlutterActivity { @Override - public void configureFlutterEngine(@NonNull FlutterEngine flutterEngine) { - GeneratedPluginRegistrant.registerWith(flutterEngine); + protected void onCreate(Bundle savedInstanceState) { + super.onCreate(savedInstanceState); + GeneratedPluginRegistrant.registerWith(this); } }