encounter/flutter
0
0
Fork 0
mirror of https://github.com/encounter/flutter.git synced 2026-03-30 11:10:35 -07:00
Code Issues Packages Projects Releases Wiki Activity

Revert "Migrate some more integration tests to Android embedding v2 (#48532)"

Browse Source 
This reverts commit 1613a62e85.
This commit is contained in:
Jonah Williams
2020-01-10 09:10:15 -08:00
committed by GitHub
parent db08afd07f
commit 52cd4d356b
6 changed files with 16 additions and 30 deletions
Download Patch File Download Diff File Expand all files Collapse all files
dev/integration_tests/image_loading/android/app/src/main/AndroidManifest.xml
-5
View File
@@ -28,10 +28,5 @@ found in the LICENSE file. -->
<category android:name="android.intent.category.LAUNCHER"/>
</intent-filter>
</activity>
<!-- Don't delete the meta-data below.
This is used by the Flutter tool to generate GeneratedPluginRegistrant.java -->
<meta-data
android:name="flutterEmbedding"
android:value="2" />
</application>
</manifest>
dev/integration_tests/image_loading/android/app/src/main/java/com/yourcompany/platforminteraction/MainActivity.java
+6 -5
View File
@@ -4,14 +4,15 @@
package com.yourcompany.platforminteraction;
import androidx.annotation.NonNull;
import io.flutter.embedding.android.FlutterActivity;
import io.flutter.embedding.engine.FlutterEngine;
import android.os.Bundle;
import io.flutter.app.FlutterActivity;
import io.flutter.plugins.GeneratedPluginRegistrant;
import io.flutter.view.FlutterView;
public class MainActivity extends FlutterActivity {
@Override
public void configureFlutterEngine(@NonNull FlutterEngine flutterEngine) {
GeneratedPluginRegistrant.registerWith(flutterEngine);
protected void onCreate(Bundle savedInstanceState) {
super.onCreate(savedInstanceState);
GeneratedPluginRegistrant.registerWith(this);
}
}
dev/integration_tests/release_smoke_test/android/app/src/main/AndroidManifest.xml
-5
View File
@@ -33,10 +33,5 @@ found in the LICENSE file. -->
<category android:name="android.intent.category.LAUNCHER"/>
</intent-filter>
</activity>
<!-- Don't delete the meta-data below.
This is used by the Flutter tool to generate GeneratedPluginRegistrant.java -->
<meta-data
android:name="flutterEmbedding"
android:value="2" />
</application>
</manifest>
dev/integration_tests/release_smoke_test/android/app/src/main/java/com/example/release_smoke_test/MainActivity.java
+5 -5
View File
@@ -4,14 +4,14 @@
package com.example.release_smoke_test;
import androidx.annotation.NonNull;
import io.flutter.embedding.android.FlutterActivity;
import io.flutter.embedding.engine.FlutterEngine;
import android.os.Bundle;
import io.flutter.app.FlutterActivity;
import io.flutter.plugins.GeneratedPluginRegistrant;
public class MainActivity extends FlutterActivity {
@Override
public void configureFlutterEngine(@NonNull FlutterEngine flutterEngine) {
GeneratedPluginRegistrant.registerWith(flutterEngine);
protected void onCreate(Bundle savedInstanceState) {
super.onCreate(savedInstanceState);
GeneratedPluginRegistrant.registerWith(this);
}
}
dev/integration_tests/ui/android/app/src/main/AndroidManifest.xml
-5
View File
@@ -28,10 +28,5 @@ found in the LICENSE file. -->
<category android:name="android.intent.category.LAUNCHER"/>
</intent-filter>
</activity>
<!-- Don't delete the meta-data below.
This is used by the Flutter tool to generate GeneratedPluginRegistrant.java -->
<meta-data
android:name="flutterEmbedding"
android:value="2" />
</application>
</manifest>
dev/integration_tests/ui/android/app/src/main/java/com/yourcompany/integration_ui/MainActivity.java
+5 -5
View File
@@ -4,14 +4,14 @@
package com.yourcompany.integration_ui;
import androidx.annotation.NonNull;
import io.flutter.embedding.android.FlutterActivity;
import io.flutter.embedding.engine.FlutterEngine;
import android.os.Bundle;
import io.flutter.app.FlutterActivity;
import io.flutter.plugins.GeneratedPluginRegistrant;
public class MainActivity extends FlutterActivity {
@Override
public void configureFlutterEngine(@NonNull FlutterEngine flutterEngine) {
GeneratedPluginRegistrant.registerWith(flutterEngine);
protected void onCreate(Bundle savedInstanceState) {
super.onCreate(savedInstanceState);
GeneratedPluginRegistrant.registerWith(this);
}
}