Skip to content

Commit bc1168f

Browse files
author
Gray Mackall
committed
Revert "Reverts "Delete engine v1 android embedding (flutter#51229)" (flutter#51996)"
This reverts commit 5dca50d.
1 parent d48c35d commit bc1168f

23 files changed

+8
-3579
lines changed

‎ci/licenses_golden/licenses_flutter

Lines changed: 0 additions & 24 deletions
Original file line numberDiff line numberDiff line change
@@ -44020,13 +44020,6 @@ ORIGIN: ../../../flutter/shell/platform/android/io/flutter/Build.java + ../../..
4402044020
ORIGIN: ../../../flutter/shell/platform/android/io/flutter/BuildConfig.java + ../../../flutter/LICENSE
4402144021
ORIGIN: ../../../flutter/shell/platform/android/io/flutter/FlutterInjector.java + ../../../flutter/LICENSE
4402244022
ORIGIN: ../../../flutter/shell/platform/android/io/flutter/Log.java + ../../../flutter/LICENSE
44023-
ORIGIN: ../../../flutter/shell/platform/android/io/flutter/app/FlutterActivity.java + ../../../flutter/LICENSE
44024-
ORIGIN: ../../../flutter/shell/platform/android/io/flutter/app/FlutterActivityDelegate.java + ../../../flutter/LICENSE
44025-
ORIGIN: ../../../flutter/shell/platform/android/io/flutter/app/FlutterActivityEvents.java + ../../../flutter/LICENSE
44026-
ORIGIN: ../../../flutter/shell/platform/android/io/flutter/app/FlutterApplication.java + ../../../flutter/LICENSE
44027-
ORIGIN: ../../../flutter/shell/platform/android/io/flutter/app/FlutterFragmentActivity.java + ../../../flutter/LICENSE
44028-
ORIGIN: ../../../flutter/shell/platform/android/io/flutter/app/FlutterPlayStoreSplitApplication.java + ../../../flutter/LICENSE
44029-
ORIGIN: ../../../flutter/shell/platform/android/io/flutter/app/FlutterPluginRegistry.java + ../../../flutter/LICENSE
4403044023
ORIGIN: ../../../flutter/shell/platform/android/io/flutter/embedding/android/ExclusiveAppComponent.java + ../../../flutter/LICENSE
4403144024
ORIGIN: ../../../flutter/shell/platform/android/io/flutter/embedding/android/FlutterActivity.java + ../../../flutter/LICENSE
4403244025
ORIGIN: ../../../flutter/shell/platform/android/io/flutter/embedding/android/FlutterActivityAndFragmentDelegate.java + ../../../flutter/LICENSE
@@ -44083,8 +44076,6 @@ ORIGIN: ../../../flutter/shell/platform/android/io/flutter/embedding/engine/plug
4408344076
ORIGIN: ../../../flutter/shell/platform/android/io/flutter/embedding/engine/plugins/service/ServiceAware.java + ../../../flutter/LICENSE
4408444077
ORIGIN: ../../../flutter/shell/platform/android/io/flutter/embedding/engine/plugins/service/ServiceControlSurface.java + ../../../flutter/LICENSE
4408544078
ORIGIN: ../../../flutter/shell/platform/android/io/flutter/embedding/engine/plugins/service/ServicePluginBinding.java + ../../../flutter/LICENSE
44086-
ORIGIN: ../../../flutter/shell/platform/android/io/flutter/embedding/engine/plugins/shim/ShimPluginRegistry.java + ../../../flutter/LICENSE
44087-
ORIGIN: ../../../flutter/shell/platform/android/io/flutter/embedding/engine/plugins/shim/ShimRegistrar.java + ../../../flutter/LICENSE
4408844079
ORIGIN: ../../../flutter/shell/platform/android/io/flutter/embedding/engine/plugins/util/GeneratedPluginRegister.java + ../../../flutter/LICENSE
4408944080
ORIGIN: ../../../flutter/shell/platform/android/io/flutter/embedding/engine/renderer/FlutterRenderer.java + ../../../flutter/LICENSE
4409044081
ORIGIN: ../../../flutter/shell/platform/android/io/flutter/embedding/engine/renderer/FlutterUiDisplayListener.java + ../../../flutter/LICENSE
@@ -44156,10 +44147,7 @@ ORIGIN: ../../../flutter/shell/platform/android/io/flutter/util/ViewUtils.java +
4415644147
ORIGIN: ../../../flutter/shell/platform/android/io/flutter/view/AccessibilityBridge.java + ../../../flutter/LICENSE
4415744148
ORIGIN: ../../../flutter/shell/platform/android/io/flutter/view/AccessibilityViewEmbedder.java + ../../../flutter/LICENSE
4415844149
ORIGIN: ../../../flutter/shell/platform/android/io/flutter/view/FlutterCallbackInformation.java + ../../../flutter/LICENSE
44159-
ORIGIN: ../../../flutter/shell/platform/android/io/flutter/view/FlutterMain.java + ../../../flutter/LICENSE
44160-
ORIGIN: ../../../flutter/shell/platform/android/io/flutter/view/FlutterNativeView.java + ../../../flutter/LICENSE
4416144150
ORIGIN: ../../../flutter/shell/platform/android/io/flutter/view/FlutterRunArguments.java + ../../../flutter/LICENSE
44162-
ORIGIN: ../../../flutter/shell/platform/android/io/flutter/view/FlutterView.java + ../../../flutter/LICENSE
4416344151
ORIGIN: ../../../flutter/shell/platform/android/io/flutter/view/TextureRegistry.java + ../../../flutter/LICENSE
4416444152
ORIGIN: ../../../flutter/shell/platform/android/io/flutter/view/VsyncWaiter.java + ../../../flutter/LICENSE
4416544153
ORIGIN: ../../../flutter/shell/platform/android/jni/jni_mock.h + ../../../flutter/LICENSE
@@ -46891,13 +46879,6 @@ FILE: ../../../flutter/shell/platform/android/io/flutter/Build.java
4689146879
FILE: ../../../flutter/shell/platform/android/io/flutter/BuildConfig.java
4689246880
FILE: ../../../flutter/shell/platform/android/io/flutter/FlutterInjector.java
4689346881
FILE: ../../../flutter/shell/platform/android/io/flutter/Log.java
46894-
FILE: ../../../flutter/shell/platform/android/io/flutter/app/FlutterActivity.java
46895-
FILE: ../../../flutter/shell/platform/android/io/flutter/app/FlutterActivityDelegate.java
46896-
FILE: ../../../flutter/shell/platform/android/io/flutter/app/FlutterActivityEvents.java
46897-
FILE: ../../../flutter/shell/platform/android/io/flutter/app/FlutterApplication.java
46898-
FILE: ../../../flutter/shell/platform/android/io/flutter/app/FlutterFragmentActivity.java
46899-
FILE: ../../../flutter/shell/platform/android/io/flutter/app/FlutterPlayStoreSplitApplication.java
46900-
FILE: ../../../flutter/shell/platform/android/io/flutter/app/FlutterPluginRegistry.java
4690146882
FILE: ../../../flutter/shell/platform/android/io/flutter/embedding/android/AndroidTouchProcessor.java
4690246883
FILE: ../../../flutter/shell/platform/android/io/flutter/embedding/android/ExclusiveAppComponent.java
4690346884
FILE: ../../../flutter/shell/platform/android/io/flutter/embedding/android/FlutterActivity.java
@@ -46957,8 +46938,6 @@ FILE: ../../../flutter/shell/platform/android/io/flutter/embedding/engine/plugin
4695746938
FILE: ../../../flutter/shell/platform/android/io/flutter/embedding/engine/plugins/service/ServiceAware.java
4695846939
FILE: ../../../flutter/shell/platform/android/io/flutter/embedding/engine/plugins/service/ServiceControlSurface.java
4695946940
FILE: ../../../flutter/shell/platform/android/io/flutter/embedding/engine/plugins/service/ServicePluginBinding.java
46960-
FILE: ../../../flutter/shell/platform/android/io/flutter/embedding/engine/plugins/shim/ShimPluginRegistry.java
46961-
FILE: ../../../flutter/shell/platform/android/io/flutter/embedding/engine/plugins/shim/ShimRegistrar.java
4696246941
FILE: ../../../flutter/shell/platform/android/io/flutter/embedding/engine/plugins/util/GeneratedPluginRegister.java
4696346942
FILE: ../../../flutter/shell/platform/android/io/flutter/embedding/engine/renderer/FlutterRenderer.java
4696446943
FILE: ../../../flutter/shell/platform/android/io/flutter/embedding/engine/renderer/FlutterUiDisplayListener.java
@@ -47038,10 +47017,7 @@ FILE: ../../../flutter/shell/platform/android/io/flutter/util/ViewUtils.java
4703847017
FILE: ../../../flutter/shell/platform/android/io/flutter/view/AccessibilityBridge.java
4703947018
FILE: ../../../flutter/shell/platform/android/io/flutter/view/AccessibilityViewEmbedder.java
4704047019
FILE: ../../../flutter/shell/platform/android/io/flutter/view/FlutterCallbackInformation.java
47041-
FILE: ../../../flutter/shell/platform/android/io/flutter/view/FlutterMain.java
47042-
FILE: ../../../flutter/shell/platform/android/io/flutter/view/FlutterNativeView.java
4704347020
FILE: ../../../flutter/shell/platform/android/io/flutter/view/FlutterRunArguments.java
47044-
FILE: ../../../flutter/shell/platform/android/io/flutter/view/FlutterView.java
4704547021
FILE: ../../../flutter/shell/platform/android/io/flutter/view/TextureRegistry.java
4704647022
FILE: ../../../flutter/shell/platform/android/io/flutter/view/VsyncWaiter.java
4704747023
FILE: ../../../flutter/shell/platform/android/jni/jni_mock.h

‎shell/platform/android/AndroidManifest.xml

Lines changed: 1 addition & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -3,28 +3,13 @@
33
Use of this source code is governed by a BSD-style license that can be
44
found in the LICENSE file.
55
-->
6-
<manifest xmlns:android="http://schemas.android.com/apk/res/android" package="io.flutter.app" android:versionCode="1" android:versionName="0.0.1">
6+
<manifest xmlns:android="http://schemas.android.com/apk/res/android" package="io.flutter.embedding" android:versionCode="1" android:versionName="0.0.1">
77

88
<uses-sdk android:minSdkVersion="21" android:targetSdkVersion="35" />
99
<uses-permission android:name="android.permission.INTERNET" />
1010
<uses-permission android:name="android.permission.WRITE_EXTERNAL_STORAGE" />
1111
<uses-feature android:name="android.hardware.sensor.accelerometer" android:required="true" />
1212

13-
<application android:label="Flutter Shell" android:name="FlutterApplication" android:debuggable="true">
14-
<activity android:configChanges="orientation|keyboardHidden|keyboard|screenSize|locale|layoutDirection|fontScale"
15-
android:hardwareAccelerated="true"
16-
android:launchMode="standard"
17-
android:name="FlutterActivity"
18-
android:theme="@android:style/Theme.Black.NoTitleBar"
19-
android:windowSoftInputMode="adjustResize"
20-
android:exported="true">
21-
<intent-filter>
22-
<action android:name="android.intent.action.MAIN" />
23-
<category android:name="android.intent.category.LAUNCHER" />
24-
</intent-filter>
25-
</activity>
26-
</application>
27-
2813
<!-- Required for io.flutter.plugin.text.ProcessTextPlugin to query activities that can process text. -->
2914
<queries>
3015
<intent>

‎shell/platform/android/BUILD.gn

Lines changed: 0 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -207,13 +207,6 @@ android_java_sources = [
207207
"io/flutter/Build.java",
208208
"io/flutter/FlutterInjector.java",
209209
"io/flutter/Log.java",
210-
"io/flutter/app/FlutterActivity.java",
211-
"io/flutter/app/FlutterActivityDelegate.java",
212-
"io/flutter/app/FlutterActivityEvents.java",
213-
"io/flutter/app/FlutterApplication.java",
214-
"io/flutter/app/FlutterFragmentActivity.java",
215-
"io/flutter/app/FlutterPlayStoreSplitApplication.java",
216-
"io/flutter/app/FlutterPluginRegistry.java",
217210
"io/flutter/embedding/android/AndroidTouchProcessor.java",
218211
"io/flutter/embedding/android/ExclusiveAppComponent.java",
219212
"io/flutter/embedding/android/FlutterActivity.java",
@@ -273,8 +266,6 @@ android_java_sources = [
273266
"io/flutter/embedding/engine/plugins/service/ServiceAware.java",
274267
"io/flutter/embedding/engine/plugins/service/ServiceControlSurface.java",
275268
"io/flutter/embedding/engine/plugins/service/ServicePluginBinding.java",
276-
"io/flutter/embedding/engine/plugins/shim/ShimPluginRegistry.java",
277-
"io/flutter/embedding/engine/plugins/shim/ShimRegistrar.java",
278269
"io/flutter/embedding/engine/plugins/util/GeneratedPluginRegister.java",
279270
"io/flutter/embedding/engine/renderer/FlutterRenderer.java",
280271
"io/flutter/embedding/engine/renderer/FlutterUiDisplayListener.java",
@@ -354,10 +345,7 @@ android_java_sources = [
354345
"io/flutter/view/AccessibilityBridge.java",
355346
"io/flutter/view/AccessibilityViewEmbedder.java",
356347
"io/flutter/view/FlutterCallbackInformation.java",
357-
"io/flutter/view/FlutterMain.java",
358-
"io/flutter/view/FlutterNativeView.java",
359348
"io/flutter/view/FlutterRunArguments.java",
360-
"io/flutter/view/FlutterView.java",
361349
"io/flutter/view/TextureRegistry.java",
362350
"io/flutter/view/VsyncWaiter.java",
363351
]

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

Lines changed: 0 additions & 181 deletions
This file was deleted.

0 commit comments

Comments
 (0)