Add support for initializing and hidden to iOS and Android

Author: gspencergoog

lib/ui/hooks.dart

@@ -66,11 +66,6 @@ void _updateUserSettingsData(String jsonData) {
   PlatformDispatcher.instance._updateUserSettingsData(jsonData);
 }
 
-@pragma('vm:entry-point')
-void _updateInitialLifecycleState(String state) {
-  PlatformDispatcher.instance._updateInitialLifecycleState(state);
-}
-
 @pragma('vm:entry-point')
 void _updateSemanticsEnabled(bool enabled) {
   PlatformDispatcher.instance._updateSemanticsEnabled(enabled);

lib/ui/platform_dispatcher.dart

@@ -910,24 +910,7 @@ class PlatformDispatcher {
   /// It is used to initialize [SchedulerBinding.lifecycleState] at startup with
   /// any buffered lifecycle state events.
   String get initialLifecycleState {
-    _initialLifecycleStateAccessed = true;
-    return _initialLifecycleState;
-  }
-
-  late String _initialLifecycleState;
-
-  /// Tracks if the initial state has been accessed. Once accessed, we will stop
-  /// updating the [initialLifecycleState], as it is not the preferred way to
-  /// access the state.
-  bool _initialLifecycleStateAccessed = false;
-
-  // Called from the engine, via hooks.dart
-  void _updateInitialLifecycleState(String state) {
-    // We do not update the state if the state has already been used to initialize
-    // the lifecycleState.
-    if (!_initialLifecycleStateAccessed) {
-      _initialLifecycleState = state;
-    }
+    return AppLifecycleState.detached.toString();
   }
 
   /// The setting indicating whether time should always be shown in the 24-hour

lib/ui/window/platform_configuration.cc

@@ -48,9 +48,6 @@ void PlatformConfiguration::DidCreateIsolate() {
   update_user_settings_data_.Set(
       tonic::DartState::Current(),
       Dart_GetField(library, tonic::ToDart("_updateUserSettingsData")));
-  update_initial_lifecycle_state_.Set(
-      tonic::DartState::Current(),
-      Dart_GetField(library, tonic::ToDart("_updateInitialLifecycleState")));
   update_semantics_enabled_.Set(
       tonic::DartState::Current(),
       Dart_GetField(library, tonic::ToDart("_updateSemanticsEnabled")));
@@ -108,20 +105,6 @@ void PlatformConfiguration::UpdateUserSettingsData(const std::string& data) {
                                                }));
 }
 
-void PlatformConfiguration::UpdateInitialLifecycleState(
-    const std::string& data) {
-  std::shared_ptr<tonic::DartState> dart_state =
-      update_initial_lifecycle_state_.dart_state().lock();
-  if (!dart_state) {
-    return;
-  }
-  tonic::DartState::Scope scope(dart_state);
-  tonic::CheckAndHandleError(tonic::DartInvoke(
-      update_initial_lifecycle_state_.Get(), {
-                                                 tonic::StdStringToDart(data),
-                                             }));
-}
-
 void PlatformConfiguration::UpdateSemanticsEnabled(bool enabled) {
   std::shared_ptr<tonic::DartState> dart_state =
       update_semantics_enabled_.dart_state().lock();

lib/ui/window/platform_configuration.h

@@ -288,16 +288,6 @@ class PlatformConfiguration final {
   ///
   void UpdateUserSettingsData(const std::string& data);
 
-  //----------------------------------------------------------------------------
-  /// @brief      Updates the lifecycle state data in the framework.
-  ///
-  /// @deprecated The persistent isolate data must be used for this purpose
-  ///             instead.
-  ///
-  /// @param[in]  data  The lifecycle state data.
-  ///
-  void UpdateInitialLifecycleState(const std::string& data);
-
   //----------------------------------------------------------------------------
   /// @brief      Notifies the PlatformConfiguration that the embedder has
   ///             expressed an opinion about whether the accessibility tree
@@ -436,7 +426,6 @@ class PlatformConfiguration final {
   tonic::DartPersistentValue on_error_;
   tonic::DartPersistentValue update_locales_;
   tonic::DartPersistentValue update_user_settings_data_;
-  tonic::DartPersistentValue update_initial_lifecycle_state_;
   tonic::DartPersistentValue update_semantics_enabled_;
   tonic::DartPersistentValue update_accessibility_features_;
   tonic::DartPersistentValue dispatch_platform_message_;

runtime/runtime_controller.cc

@@ -118,8 +118,7 @@ bool RuntimeController::FlushRuntimeStateToIsolate() {
          SetSemanticsEnabled(platform_data_.semantics_enabled) &&
          SetAccessibilityFeatures(
              platform_data_.accessibility_feature_flags_) &&
-         SetUserSettingsData(platform_data_.user_settings_data) &&
-         SetInitialLifecycleState(platform_data_.lifecycle_state);
+         SetUserSettingsData(platform_data_.user_settings_data);
 }
 
 bool RuntimeController::SetViewportMetrics(const ViewportMetrics& metrics) {
@@ -157,18 +156,6 @@ bool RuntimeController::SetUserSettingsData(const std::string& data) {
   return false;
 }
 
-bool RuntimeController::SetInitialLifecycleState(const std::string& data) {
-  platform_data_.lifecycle_state = data;
-
-  if (auto* platform_configuration = GetPlatformConfigurationIfAvailable()) {
-    platform_configuration->UpdateInitialLifecycleState(
-        platform_data_.lifecycle_state);
-    return true;
-  }
-
-  return false;
-}
-
 bool RuntimeController::SetSemanticsEnabled(bool enabled) {
   platform_data_.semantics_enabled = enabled;
 

runtime/runtime_controller.h

@@ -204,23 +204,6 @@ class RuntimeController : public PlatformConfigurationClient {
   ///
   bool SetUserSettingsData(const std::string& data);
 
-  //----------------------------------------------------------------------------
-  /// @brief      Forward the initial lifecycle state data to the running
-  ///             isolate. If the isolate is not running, this data will be
-  ///             saved and flushed to the isolate when it starts running.
-  ///             After the isolate starts running, the current lifecycle
-  ///             state is pushed to it via the "flutter/lifecycle" channel.
-  ///
-  /// @deprecated The persistent isolate data must be used for this purpose
-  ///             instead.
-  ///
-  /// @param[in]  data  The lifecycle state data.
-  ///
-  /// @return     If the lifecycle state data was forwarded to the running
-  ///             isolate.
-  ///
-  bool SetInitialLifecycleState(const std::string& data);
-
   //----------------------------------------------------------------------------
   /// @brief      Notifies the running isolate about whether the semantics tree
   ///             should be generated or not. If the isolate is not running,

shell/common/engine.cc

@@ -331,7 +331,6 @@ bool Engine::HandleLifecyclePlatformMessage(PlatformMessage* message) {
       state == "AppLifecycleState.inactive") {
     ScheduleFrame();
   }
-  runtime_controller_->SetInitialLifecycleState(state);
   // Always forward these messages to the framework by returning false.
   return false;
 }

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

@@ -159,6 +159,8 @@ public void onCreate(Bundle savedInstanceState) {
       }
     }
 
+    flutterView.onCreate();
+
     if (loadIntent(activity.getIntent())) {
       return;
     }

shell/platform/android/io/flutter/embedding/engine/systemchannels/LifecycleChannel.java

@@ -19,6 +19,17 @@ public class LifecycleChannel {
   public LifecycleChannel(@NonNull DartExecutor dartExecutor) {
     this.channel =
         new BasicMessageChannel<>(dartExecutor, "flutter/lifecycle", StringCodec.INSTANCE);
+    this.channel.resizeChannelBuffer(1000);
+  }
+
+  public void appIsHidden() {
+    Log.v(TAG, "Sending AppLifecycleState.hidden message.");
+    channel.send("AppLifecycleState.hidden");
+  }
+
+  public void appIsInitializing() {
+    Log.v(TAG, "Sending AppLifecycleState.initializing message.");
+    channel.send("AppLifecycleState.initializing");
   }
 
   public void appIsInactive() {

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

@@ -297,7 +297,12 @@ public void addActivityLifecycleListener(ActivityLifecycleListener listener) {
     mActivityLifecycleListeners.add(listener);
   }
 
+  public void onCreate() {
+    lifecycleChannel.appIsInitializing();
+  }
+
   public void onStart() {
+    lifecycleChannel.appIsHidden();
     lifecycleChannel.appIsInactive();
   }
 
@@ -313,6 +318,7 @@ public void onPostResume() {
   }
 
   public void onStop() {
+    lifecycleChannel.appIsHidden();
     lifecycleChannel.appIsPaused();
   }