diff --git a/examples/catalog/android/app/src/main/AndroidManifest.xml b/examples/catalog/android/app/src/main/AndroidManifest.xml index 332f2bf364..353c810793 100644 --- a/examples/catalog/android/app/src/main/AndroidManifest.xml +++ b/examples/catalog/android/app/src/main/AndroidManifest.xml @@ -7,14 +7,8 @@ --> - - - + - - + - - + (flutterView, CHANNEL, StringCodec.INSTANCE); + messageChannel = new BasicMessageChannel<>(flutterEngine.getDartExecutor(), CHANNEL, StringCodec.INSTANCE); messageChannel. setMessageHandler(new MessageHandler() { @Override @@ -97,22 +99,26 @@ public class MainActivity extends AppCompatActivity { } @Override - protected void onDestroy() { - if (flutterView != null) { - flutterView.destroy(); - } - super.onDestroy(); + protected void onResume() { + super.onResume(); + flutterEngine.getLifecycleChannel().appIsResumed(); } @Override protected void onPause() { super.onPause(); - flutterView.onPause(); + flutterEngine.getLifecycleChannel().appIsInactive(); } @Override - protected void onPostResume() { - super.onPostResume(); - flutterView.onPostResume(); + protected void onStop() { + super.onStop(); + flutterEngine.getLifecycleChannel().appIsPaused(); + } + + @Override + protected void onDestroy() { + flutterView.detachFromFlutterEngine(); + super.onDestroy(); } } diff --git a/examples/flutter_view/android/app/src/main/res/layout/flutter_view_layout.xml b/examples/flutter_view/android/app/src/main/res/layout/flutter_view_layout.xml index e78a0a215a..e434c3dab1 100644 --- a/examples/flutter_view/android/app/src/main/res/layout/flutter_view_layout.xml +++ b/examples/flutter_view/android/app/src/main/res/layout/flutter_view_layout.xml @@ -6,7 +6,7 @@ android:layout_height="match_parent" > - - - - + - + - - - + - + - - - - +