From 8092f6a2b62781d0bdd1fdff74b1a23252dd858c Mon Sep 17 00:00:00 2001 From: Jason Simmons Date: Tue, 14 Jan 2020 18:23:01 -0800 Subject: [PATCH] Reland: Migrate some more integration tests to Android embedding v2 (#48840) --- .../android/app/src/main/AndroidManifest.xml | 5 +++++ .../yourcompany/platforminteraction/MainActivity.java | 11 +++++------ .../android/app/src/main/AndroidManifest.xml | 5 +++++ .../com/example/release_smoke_test/MainActivity.java | 10 +++++----- .../ui/android/app/src/main/AndroidManifest.xml | 5 +++++ .../com/yourcompany/integration_ui/MainActivity.java | 10 +++++----- 6 files changed, 30 insertions(+), 16 deletions(-) diff --git a/dev/integration_tests/image_loading/android/app/src/main/AndroidManifest.xml b/dev/integration_tests/image_loading/android/app/src/main/AndroidManifest.xml index 3002b1b3517..5ffd3d37eeb 100644 --- a/dev/integration_tests/image_loading/android/app/src/main/AndroidManifest.xml +++ b/dev/integration_tests/image_loading/android/app/src/main/AndroidManifest.xml @@ -28,5 +28,10 @@ found in the LICENSE file. --> + + diff --git a/dev/integration_tests/image_loading/android/app/src/main/java/com/yourcompany/platforminteraction/MainActivity.java b/dev/integration_tests/image_loading/android/app/src/main/java/com/yourcompany/platforminteraction/MainActivity.java index 37bd36203d5..d701d4e6a01 100644 --- a/dev/integration_tests/image_loading/android/app/src/main/java/com/yourcompany/platforminteraction/MainActivity.java +++ b/dev/integration_tests/image_loading/android/app/src/main/java/com/yourcompany/platforminteraction/MainActivity.java @@ -4,15 +4,14 @@ package com.yourcompany.platforminteraction; -import android.os.Bundle; -import io.flutter.app.FlutterActivity; +import androidx.annotation.NonNull; +import io.flutter.embedding.android.FlutterActivity; +import io.flutter.embedding.engine.FlutterEngine; import io.flutter.plugins.GeneratedPluginRegistrant; -import io.flutter.view.FlutterView; public class MainActivity extends FlutterActivity { @Override - protected void onCreate(Bundle savedInstanceState) { - super.onCreate(savedInstanceState); - GeneratedPluginRegistrant.registerWith(this); + public void configureFlutterEngine(@NonNull FlutterEngine flutterEngine) { + GeneratedPluginRegistrant.registerWith(flutterEngine); } } diff --git a/dev/integration_tests/release_smoke_test/android/app/src/main/AndroidManifest.xml b/dev/integration_tests/release_smoke_test/android/app/src/main/AndroidManifest.xml index 6d6bc99ce3d..f93ecc4b9e0 100644 --- a/dev/integration_tests/release_smoke_test/android/app/src/main/AndroidManifest.xml +++ b/dev/integration_tests/release_smoke_test/android/app/src/main/AndroidManifest.xml @@ -33,5 +33,10 @@ found in the LICENSE file. --> + + diff --git a/dev/integration_tests/release_smoke_test/android/app/src/main/java/com/example/release_smoke_test/MainActivity.java b/dev/integration_tests/release_smoke_test/android/app/src/main/java/com/example/release_smoke_test/MainActivity.java index 2d980d61261..abd9bf87599 100644 --- a/dev/integration_tests/release_smoke_test/android/app/src/main/java/com/example/release_smoke_test/MainActivity.java +++ b/dev/integration_tests/release_smoke_test/android/app/src/main/java/com/example/release_smoke_test/MainActivity.java @@ -4,14 +4,14 @@ package com.example.release_smoke_test; -import android.os.Bundle; -import io.flutter.app.FlutterActivity; +import androidx.annotation.NonNull; +import io.flutter.embedding.android.FlutterActivity; +import io.flutter.embedding.engine.FlutterEngine; import io.flutter.plugins.GeneratedPluginRegistrant; public class MainActivity extends FlutterActivity { @Override - protected void onCreate(Bundle savedInstanceState) { - super.onCreate(savedInstanceState); - GeneratedPluginRegistrant.registerWith(this); + public void configureFlutterEngine(@NonNull FlutterEngine flutterEngine) { + GeneratedPluginRegistrant.registerWith(flutterEngine); } } diff --git a/dev/integration_tests/ui/android/app/src/main/AndroidManifest.xml b/dev/integration_tests/ui/android/app/src/main/AndroidManifest.xml index de543053d11..897ab0cc111 100644 --- a/dev/integration_tests/ui/android/app/src/main/AndroidManifest.xml +++ b/dev/integration_tests/ui/android/app/src/main/AndroidManifest.xml @@ -28,5 +28,10 @@ found in the LICENSE file. --> + + diff --git a/dev/integration_tests/ui/android/app/src/main/java/com/yourcompany/integration_ui/MainActivity.java b/dev/integration_tests/ui/android/app/src/main/java/com/yourcompany/integration_ui/MainActivity.java index 98f51d49f4b..cab904f567c 100644 --- a/dev/integration_tests/ui/android/app/src/main/java/com/yourcompany/integration_ui/MainActivity.java +++ b/dev/integration_tests/ui/android/app/src/main/java/com/yourcompany/integration_ui/MainActivity.java @@ -4,14 +4,14 @@ package com.yourcompany.integration_ui; -import android.os.Bundle; -import io.flutter.app.FlutterActivity; +import androidx.annotation.NonNull; +import io.flutter.embedding.android.FlutterActivity; +import io.flutter.embedding.engine.FlutterEngine; import io.flutter.plugins.GeneratedPluginRegistrant; public class MainActivity extends FlutterActivity { @Override - protected void onCreate(Bundle savedInstanceState) { - super.onCreate(savedInstanceState); - GeneratedPluginRegistrant.registerWith(this); + public void configureFlutterEngine(@NonNull FlutterEngine flutterEngine) { + GeneratedPluginRegistrant.registerWith(flutterEngine); } }