Introduce flutterfragmentactivity

ci/licenses_golden/licenses_flutter

@@ -567,9 +567,11 @@ FILE: ../../../flutter/shell/platform/android/io/flutter/embedding/android/Andro
 FILE: ../../../flutter/shell/platform/android/io/flutter/embedding/android/DrawableSplashScreen.java
 FILE: ../../../flutter/shell/platform/android/io/flutter/embedding/android/FlutterActivity.java
 FILE: ../../../flutter/shell/platform/android/io/flutter/embedding/android/FlutterActivityAndFragmentDelegate.java
+FILE: ../../../flutter/shell/platform/android/io/flutter/embedding/android/FlutterActivityLaunchConfigs.java
 FILE: ../../../flutter/shell/platform/android/io/flutter/embedding/android/FlutterEngineConfigurator.java
 FILE: ../../../flutter/shell/platform/android/io/flutter/embedding/android/FlutterEngineProvider.java
 FILE: ../../../flutter/shell/platform/android/io/flutter/embedding/android/FlutterFragment.java
+FILE: ../../../flutter/shell/platform/android/io/flutter/embedding/android/FlutterFragmentActivity.java
 FILE: ../../../flutter/shell/platform/android/io/flutter/embedding/android/FlutterSplashView.java
 FILE: ../../../flutter/shell/platform/android/io/flutter/embedding/android/FlutterSurfaceView.java
 FILE: ../../../flutter/shell/platform/android/io/flutter/embedding/android/FlutterTextureView.java

shell/platform/android/BUILD.gn

@@ -135,9 +135,11 @@ action("flutter_shell_java") {
     "io/flutter/embedding/android/DrawableSplashScreen.java",
     "io/flutter/embedding/android/FlutterActivity.java",
     "io/flutter/embedding/android/FlutterActivityAndFragmentDelegate.java",
+    "io/flutter/embedding/android/FlutterActivityLaunchConfigs.java",
     "io/flutter/embedding/android/FlutterEngineConfigurator.java",
     "io/flutter/embedding/android/FlutterEngineProvider.java",
     "io/flutter/embedding/android/FlutterFragment.java",
+    "io/flutter/embedding/android/FlutterFragmentActivity.java",
     "io/flutter/embedding/android/FlutterSplashView.java",
     "io/flutter/embedding/android/FlutterSurfaceView.java",
     "io/flutter/embedding/android/FlutterTextureView.java",

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

@@ -25,12 +25,25 @@
 import android.view.WindowManager;
 
 import io.flutter.Log;
+import io.flutter.embedding.android.FlutterActivityLaunchConfigs.BackgroundMode;
 import io.flutter.embedding.engine.FlutterEngine;
 import io.flutter.embedding.engine.FlutterShellArgs;
 import io.flutter.embedding.engine.plugins.activity.ActivityControlSurface;
 import io.flutter.plugin.platform.PlatformPlugin;
 import io.flutter.view.FlutterMain;
 
+import static io.flutter.embedding.android.FlutterActivityLaunchConfigs.DART_ENTRYPOINT_META_DATA_KEY;
+import static io.flutter.embedding.android.FlutterActivityLaunchConfigs.DEFAULT_BACKGROUND_MODE;
+import static io.flutter.embedding.android.FlutterActivityLaunchConfigs.DEFAULT_DART_ENTRYPOINT;
+import static io.flutter.embedding.android.FlutterActivityLaunchConfigs.DEFAULT_INITIAL_ROUTE;
+import static io.flutter.embedding.android.FlutterActivityLaunchConfigs.EXTRA_BACKGROUND_MODE;
+import static io.flutter.embedding.android.FlutterActivityLaunchConfigs.EXTRA_CACHED_ENGINE_ID;
+import static io.flutter.embedding.android.FlutterActivityLaunchConfigs.EXTRA_DESTROY_ENGINE_WITH_ACTIVITY;
+import static io.flutter.embedding.android.FlutterActivityLaunchConfigs.EXTRA_INITIAL_ROUTE;
+import static io.flutter.embedding.android.FlutterActivityLaunchConfigs.INITIAL_ROUTE_META_DATA_KEY;
+import static io.flutter.embedding.android.FlutterActivityLaunchConfigs.NORMAL_THEME_META_DATA_KEY;
+import static io.flutter.embedding.android.FlutterActivityLaunchConfigs.SPLASH_SCREEN_META_DATA_KEY;
+
 /**
  * {@code Activity} which displays a fullscreen Flutter UI.
  * <p>
@@ -45,7 +58,7 @@
  * <p>
  * The Flutter route that is initially loaded within this {@code Activity} is "/". The initial
  * route may be specified explicitly by passing the name of the route as a {@code String} in
- * {@link #EXTRA_INITIAL_ROUTE}, e.g., "my/deep/link".
+ * {@link FlutterActivityLaunchConfigs#EXTRA_INITIAL_ROUTE}, e.g., "my/deep/link".
  * <p>
  * The initial route can each be controlled using a {@link NewEngineIntentBuilder} via
  * {@link NewEngineIntentBuilder#initialRoute}.
@@ -180,23 +193,6 @@ public class FlutterActivity extends Activity
     LifecycleOwner {
   private static final String TAG = "FlutterActivity";
 
-  // Meta-data arguments, processed from manifest XML.
-  protected static final String DART_ENTRYPOINT_META_DATA_KEY = "io.flutter.Entrypoint";
-  protected static final String INITIAL_ROUTE_META_DATA_KEY = "io.flutter.InitialRoute";
-  protected static final String SPLASH_SCREEN_META_DATA_KEY = "io.flutter.embedding.android.SplashScreenDrawable";
-  protected static final String NORMAL_THEME_META_DATA_KEY = "io.flutter.embedding.android.NormalTheme";
-
-  // Intent extra arguments.
-  protected static final String EXTRA_INITIAL_ROUTE = "initial_route";
-  protected static final String EXTRA_BACKGROUND_MODE = "background_mode";
-  protected static final String EXTRA_CACHED_ENGINE_ID = "cached_engine_id";
-  protected static final String EXTRA_DESTROY_ENGINE_WITH_ACTIVITY = "destroy_engine_with_activity";
-
-  // Default configuration.
-  protected static final String DEFAULT_DART_ENTRYPOINT = "main";
-  protected static final String DEFAULT_INITIAL_ROUTE = "/";
-  protected static final String DEFAULT_BACKGROUND_MODE = BackgroundMode.opaque.name();
-
   /**
    * Creates an {@link Intent} that launches a {@code FlutterActivity}, which executes
    * a {@code main()} Dart entrypoint, and displays the "/" route as Flutter's initial route.
@@ -460,8 +456,8 @@ public SplashScreen provideSplashScreen() {
    * Returns a {@link Drawable} to be used as a splash screen as requested by meta-data in the
    * {@code AndroidManifest.xml} file, or null if no such splash screen is requested.
    * <p>
-   * See {@link #SPLASH_SCREEN_META_DATA_KEY} for the meta-data key to be used in a
-   * manifest file.
+   * See {@link FlutterActivityLaunchConfigs#SPLASH_SCREEN_META_DATA_KEY} for the meta-data key to
+   * be used in a manifest file.
    */
   @Nullable
   @SuppressWarnings("deprecation")
@@ -670,8 +666,8 @@ public boolean shouldDestroyEngineWithHost() {
    * The Dart entrypoint that will be executed as soon as the Dart snapshot is loaded.
    * <p>
    * This preference can be controlled by setting a {@code <meta-data>} called
-   * {@link #DART_ENTRYPOINT_META_DATA_KEY} within the Android manifest definition for this
-   * {@code FlutterActivity}.
+   * {@link FlutterActivityLaunchConfigs#DART_ENTRYPOINT_META_DATA_KEY} within the Android manifest
+   * definition for this {@code FlutterActivity}.
    * <p>
    * Subclasses may override this method to directly control the Dart entrypoint.
    */
@@ -695,9 +691,11 @@ public String getDartEntrypointFunctionName() {
    * <p>
    * This preference can be controlled with 2 methods:
    * <ol>
-   *   <li>Pass a boolean as {@link #EXTRA_INITIAL_ROUTE} with the launching {@code Intent}, or</li>
-   *   <li>Set a {@code <meta-data>} called {@link #INITIAL_ROUTE_META_DATA_KEY} for this
-   *    {@code Activity} in the Android manifest.</li>
+   *   <li>Pass a boolean as {@link FlutterActivityLaunchConfigs#EXTRA_INITIAL_ROUTE} with the
+   *     launching {@code Intent}, or</li>
+   *   <li>Set a {@code <meta-data>} called
+   *     {@link FlutterActivityLaunchConfigs#INITIAL_ROUTE_META_DATA_KEY} for this {@code Activity}
+   *     in the Android manifest.</li>
    * </ol>
    * If both preferences are set, the {@code Intent} preference takes priority.
    * <p>
@@ -899,13 +897,4 @@ public void onFlutterUiNoLongerDisplayed() {
     // no-op
   }
 
-  /**
-   * The mode of the background of a {@code FlutterActivity}, either opaque or transparent.
-   */
-  public enum BackgroundMode {
-    /** Indicates a FlutterActivity with an opaque background. This is the default. */
-    opaque,
-    /** Indicates a FlutterActivity with a transparent background. */
-    transparent
-  }
 }

shell/platform/android/io/flutter/embedding/android/FlutterActivityLaunchConfigs.java

@@ -0,0 +1,34 @@
+// Copyright 2013 The Flutter Authors. All rights reserved.
+// Use of this source code is governed by a BSD-style license that can be
+// found in the LICENSE file.
+
+package io.flutter.embedding.android;
+
+class FlutterActivityLaunchConfigs {
+  // Meta-data arguments, processed from manifest XML.
+  static final String DART_ENTRYPOINT_META_DATA_KEY = "io.flutter.Entrypoint";
+  static final String INITIAL_ROUTE_META_DATA_KEY = "io.flutter.InitialRoute";
+  static final String SPLASH_SCREEN_META_DATA_KEY = "io.flutter.embedding.android.SplashScreenDrawable";
+  static final String NORMAL_THEME_META_DATA_KEY = "io.flutter.embedding.android.NormalTheme";
+
+  // Intent extra arguments.
+  static final String EXTRA_INITIAL_ROUTE = "initial_route";
+  static final String EXTRA_BACKGROUND_MODE = "background_mode";
+  static final String EXTRA_CACHED_ENGINE_ID = "cached_engine_id";
+  static final String EXTRA_DESTROY_ENGINE_WITH_ACTIVITY = "destroy_engine_with_activity";
+
+  // Default configuration.
+  static final String DEFAULT_DART_ENTRYPOINT = "main";
+  static final String DEFAULT_INITIAL_ROUTE = "/";
+  static final String DEFAULT_BACKGROUND_MODE = BackgroundMode.opaque.name();
+
+  /**
+   * The mode of the background of a Flutter {@code Activity}, either opaque or transparent.
+   */
+  public enum BackgroundMode {
+    /** Indicates a FlutterActivity with an opaque background. This is the default. */
+    opaque,
+    /** Indicates a FlutterActivity with a transparent background. */
+    transparent
+  }
+}