Revert "Temporarily delete deprecated Android v1 embedding "

ci/licenses_golden/licenses_flutter

@@ -805,6 +805,13 @@ FILE: ../../../flutter/shell/platform/android/flutter_main.h
 FILE: ../../../flutter/shell/platform/android/flutter_shell_native_unittests.cc
 FILE: ../../../flutter/shell/platform/android/io/flutter/FlutterInjector.java
 FILE: ../../../flutter/shell/platform/android/io/flutter/Log.java
+FILE: ../../../flutter/shell/platform/android/io/flutter/app/FlutterActivity.java
+FILE: ../../../flutter/shell/platform/android/io/flutter/app/FlutterActivityDelegate.java
+FILE: ../../../flutter/shell/platform/android/io/flutter/app/FlutterActivityEvents.java
+FILE: ../../../flutter/shell/platform/android/io/flutter/app/FlutterApplication.java
+FILE: ../../../flutter/shell/platform/android/io/flutter/app/FlutterFragmentActivity.java
+FILE: ../../../flutter/shell/platform/android/io/flutter/app/FlutterPlayStoreSplitApplication.java
+FILE: ../../../flutter/shell/platform/android/io/flutter/app/FlutterPluginRegistry.java
 FILE: ../../../flutter/shell/platform/android/io/flutter/embedding/android/AndroidTouchProcessor.java
 FILE: ../../../flutter/shell/platform/android/io/flutter/embedding/android/DrawableSplashScreen.java
 FILE: ../../../flutter/shell/platform/android/io/flutter/embedding/android/ExclusiveAppComponent.java
@@ -862,6 +869,8 @@ FILE: ../../../flutter/shell/platform/android/io/flutter/embedding/engine/plugin
 FILE: ../../../flutter/shell/platform/android/io/flutter/embedding/engine/plugins/service/ServiceAware.java
 FILE: ../../../flutter/shell/platform/android/io/flutter/embedding/engine/plugins/service/ServiceControlSurface.java
 FILE: ../../../flutter/shell/platform/android/io/flutter/embedding/engine/plugins/service/ServicePluginBinding.java
+FILE: ../../../flutter/shell/platform/android/io/flutter/embedding/engine/plugins/shim/ShimPluginRegistry.java
+FILE: ../../../flutter/shell/platform/android/io/flutter/embedding/engine/plugins/shim/ShimRegistrar.java
 FILE: ../../../flutter/shell/platform/android/io/flutter/embedding/engine/plugins/util/GeneratedPluginRegister.java
 FILE: ../../../flutter/shell/platform/android/io/flutter/embedding/engine/renderer/FlutterRenderer.java
 FILE: ../../../flutter/shell/platform/android/io/flutter/embedding/engine/renderer/FlutterUiDisplayListener.java
@@ -923,7 +932,10 @@ FILE: ../../../flutter/shell/platform/android/io/flutter/util/ViewUtils.java
 FILE: ../../../flutter/shell/platform/android/io/flutter/view/AccessibilityBridge.java
 FILE: ../../../flutter/shell/platform/android/io/flutter/view/AccessibilityViewEmbedder.java
 FILE: ../../../flutter/shell/platform/android/io/flutter/view/FlutterCallbackInformation.java
+FILE: ../../../flutter/shell/platform/android/io/flutter/view/FlutterMain.java
+FILE: ../../../flutter/shell/platform/android/io/flutter/view/FlutterNativeView.java
 FILE: ../../../flutter/shell/platform/android/io/flutter/view/FlutterRunArguments.java
+FILE: ../../../flutter/shell/platform/android/io/flutter/view/FlutterView.java
 FILE: ../../../flutter/shell/platform/android/io/flutter/view/TextureRegistry.java
 FILE: ../../../flutter/shell/platform/android/io/flutter/view/VsyncWaiter.java
 FILE: ../../../flutter/shell/platform/android/jni/jni_mock.h

shell/platform/android/AndroidManifest.xml

@@ -3,9 +3,25 @@
      Use of this source code is governed by a BSD-style license that can be
      found in the LICENSE file.
  -->
-<manifest xmlns:android="http://schemas.android.com/apk/res/android" package="io.flutter.embedding" android:versionCode="1" android:versionName="0.0.1">
+<manifest xmlns:android="http://schemas.android.com/apk/res/android" package="io.flutter.app" android:versionCode="1" android:versionName="0.0.1">
+
     <uses-sdk android:minSdkVersion="16" android:targetSdkVersion="31" />
     <uses-permission android:name="android.permission.INTERNET" />
     <uses-permission android:name="android.permission.WRITE_EXTERNAL_STORAGE" />
     <uses-feature android:name="android.hardware.sensor.accelerometer" android:required="true" />
+
+    <application android:label="Flutter Shell" android:name="FlutterApplication" android:debuggable="true">
+        <activity android:configChanges="orientation|keyboardHidden|keyboard|screenSize|locale|layoutDirection|fontScale"
+                  android:hardwareAccelerated="true"
+                  android:launchMode="standard"
+                  android:name="FlutterActivity"
+                  android:theme="@android:style/Theme.Black.NoTitleBar"
+                  android:windowSoftInputMode="adjustResize"
+                  android:exported="true">
+            <intent-filter>
+                <action android:name="android.intent.action.MAIN" />
+                <category android:name="android.intent.category.LAUNCHER" />
+            </intent-filter>
+        </activity>
+    </application>
  </manifest>

shell/platform/android/BUILD.gn

@@ -149,6 +149,13 @@ embedding_source_jar_path = "$root_out_dir/$embedding_sources_jar_filename"
 android_java_sources = [
   "io/flutter/FlutterInjector.java",
   "io/flutter/Log.java",
+  "io/flutter/app/FlutterActivity.java",
+  "io/flutter/app/FlutterActivityDelegate.java",
+  "io/flutter/app/FlutterActivityEvents.java",
+  "io/flutter/app/FlutterApplication.java",
+  "io/flutter/app/FlutterFragmentActivity.java",
+  "io/flutter/app/FlutterPlayStoreSplitApplication.java",
+  "io/flutter/app/FlutterPluginRegistry.java",
   "io/flutter/embedding/android/AndroidTouchProcessor.java",
   "io/flutter/embedding/android/DrawableSplashScreen.java",
   "io/flutter/embedding/android/ExclusiveAppComponent.java",
@@ -206,6 +213,8 @@ android_java_sources = [
   "io/flutter/embedding/engine/plugins/service/ServiceAware.java",
   "io/flutter/embedding/engine/plugins/service/ServiceControlSurface.java",
   "io/flutter/embedding/engine/plugins/service/ServicePluginBinding.java",
+  "io/flutter/embedding/engine/plugins/shim/ShimPluginRegistry.java",
+  "io/flutter/embedding/engine/plugins/shim/ShimRegistrar.java",
   "io/flutter/embedding/engine/plugins/util/GeneratedPluginRegister.java",
   "io/flutter/embedding/engine/renderer/FlutterRenderer.java",
   "io/flutter/embedding/engine/renderer/FlutterUiDisplayListener.java",
@@ -267,7 +276,10 @@ android_java_sources = [
   "io/flutter/view/AccessibilityBridge.java",
   "io/flutter/view/AccessibilityViewEmbedder.java",
   "io/flutter/view/FlutterCallbackInformation.java",
+  "io/flutter/view/FlutterMain.java",
+  "io/flutter/view/FlutterNativeView.java",
   "io/flutter/view/FlutterRunArguments.java",
+  "io/flutter/view/FlutterView.java",
   "io/flutter/view/TextureRegistry.java",
   "io/flutter/view/VsyncWaiter.java",
 ]

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

@@ -0,0 +1,175 @@
+// 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.app;
+
+import android.app.Activity;
+import android.content.Context;
+import android.content.Intent;
+import android.content.res.Configuration;
+import android.os.Bundle;
+import androidx.annotation.NonNull;
+import io.flutter.app.FlutterActivityDelegate.ViewFactory;
+import io.flutter.plugin.common.PluginRegistry;
+import io.flutter.view.FlutterNativeView;
+import io.flutter.view.FlutterView;
+
+/**
+ * Deprecated base class for activities that use Flutter.
+ *
+ * @deprecated {@link io.flutter.embedding.android.FlutterActivity} is the new API that now replaces
+ *     this class. See https://flutter.dev/go/android-project-migration for more migration details.
+ */
+@Deprecated
+public class FlutterActivity extends Activity
+    implements FlutterView.Provider, PluginRegistry, ViewFactory {
+  private static final String TAG = "FlutterActivity";
+
+  private final FlutterActivityDelegate delegate = new FlutterActivityDelegate(this, this);
+
+  // These aliases ensure that the methods we forward to the delegate adhere
+  // to relevant interfaces versus just existing in FlutterActivityDelegate.
+  private final FlutterActivityEvents eventDelegate = delegate;
+  private final FlutterView.Provider viewProvider = delegate;
+  private final PluginRegistry pluginRegistry = delegate;
+
+  /**
+   * Returns the Flutter view used by this activity; will be null before {@link #onCreate(Bundle)}
+   * is called.
+   */
+  @Override
+  public FlutterView getFlutterView() {
+    return viewProvider.getFlutterView();
+  }
+
+  /**
+   * Hook for subclasses to customize the creation of the {@code FlutterView}.
+   *
+   * <p>The default implementation returns {@code null}, which will cause the activity to use a
+   * newly instantiated full-screen view.
+   */
+  @Override
+  public FlutterView createFlutterView(Context context) {
+    return null;
+  }
+
+  /**
+   * Hook for subclasses to customize the creation of the {@code FlutterNativeView}.
+   *
+   * <p>The default implementation returns {@code null}, which will cause the activity to use a
+   * newly instantiated native view object.
+   */
+  @Override
+  public FlutterNativeView createFlutterNativeView() {
+    return null;
+  }
+
+  @Override
+  public boolean retainFlutterNativeView() {
+    return false;
+  }
+
+  @Override
+  public final boolean hasPlugin(String key) {
+    return pluginRegistry.hasPlugin(key);
+  }
+
+  @Override
+  public final <T> T valuePublishedByPlugin(String pluginKey) {
+    return pluginRegistry.valuePublishedByPlugin(pluginKey);
+  }
+
+  @Override
+  public final Registrar registrarFor(String pluginKey) {
+    return pluginRegistry.registrarFor(pluginKey);
+  }
+
+  @Override
+  protected void onCreate(Bundle savedInstanceState) {
+    super.onCreate(savedInstanceState);
+    eventDelegate.onCreate(savedInstanceState);
+  }
+
+  @Override
+  protected void onStart() {
+    super.onStart();
+    eventDelegate.onStart();
+  }
+
+  @Override
+  protected void onResume() {
+    super.onResume();
+    eventDelegate.onResume();
+  }
+
+  @Override
+  protected void onDestroy() {
+    eventDelegate.onDestroy();
+    super.onDestroy();
+  }
+
+  @Override
+  public void onBackPressed() {
+    if (!eventDelegate.onBackPressed()) {
+      super.onBackPressed();
+    }
+  }
+
+  @Override
+  protected void onStop() {
+    eventDelegate.onStop();
+    super.onStop();
+  }
+
+  @Override
+  protected void onPause() {
+    super.onPause();
+    eventDelegate.onPause();
+  }
+
+  @Override
+  protected void onPostResume() {
+    super.onPostResume();
+    eventDelegate.onPostResume();
+  }
+
+  // @Override - added in API level 23
+  public void onRequestPermissionsResult(
+      int requestCode, @NonNull String[] permissions, @NonNull int[] grantResults) {
+    eventDelegate.onRequestPermissionsResult(requestCode, permissions, grantResults);
+  }
+
+  @Override
+  protected void onActivityResult(int requestCode, int resultCode, Intent data) {
+    if (!eventDelegate.onActivityResult(requestCode, resultCode, data)) {
+      super.onActivityResult(requestCode, resultCode, data);
+    }
+  }
+
+  @Override
+  protected void onNewIntent(Intent intent) {
+    eventDelegate.onNewIntent(intent);
+  }
+
+  @Override
+  public void onUserLeaveHint() {
+    eventDelegate.onUserLeaveHint();
+  }
+
+  @Override
+  public void onTrimMemory(int level) {
+    eventDelegate.onTrimMemory(level);
+  }
+
+  @Override
+  public void onLowMemory() {
+    eventDelegate.onLowMemory();
+  }
+
+  @Override
+  public void onConfigurationChanged(Configuration newConfig) {
+    super.onConfigurationChanged(newConfig);
+    eventDelegate.onConfigurationChanged(newConfig);
+  }
+}