From eacf793b35b766887571245c62f5551e4f82cc9c Mon Sep 17 00:00:00 2001
From: Chris Bracken <chris@bracken.jp>
Date: Wed, 3 May 2017 14:20:17 -0700
Subject: [PATCH] Use default FlutterActivity in non-plugin examples (#9770)

Brings hello_world and flutter_gallery Android code in line with the
corresponding iOS code.
---
 dev/devicelab/lib/tasks/perf_tests.dart          |  2 +-
 .../android/app/src/main/AndroidManifest.xml     |  2 +-
 .../flutter/examples/gallery/MainActivity.java   | 16 ----------------
 .../android/app/src/main/AndroidManifest.xml     |  2 +-
 .../examples/hello_world/MainActivity.java       | 16 ----------------
 5 files changed, 3 insertions(+), 35 deletions(-)
 delete mode 100644 examples/flutter_gallery/android/app/src/main/java/io/flutter/examples/gallery/MainActivity.java
 delete mode 100644 examples/hello_world/android/app/src/main/java/io/flutter/examples/hello_world/MainActivity.java

diff --git a/dev/devicelab/lib/tasks/perf_tests.dart b/dev/devicelab/lib/tasks/perf_tests.dart
index 40f02919eb3..21b8b2bc31d 100644
--- a/dev/devicelab/lib/tasks/perf_tests.dart
+++ b/dev/devicelab/lib/tasks/perf_tests.dart
@@ -65,7 +65,7 @@ TaskFunction createGalleryBackButtonMemoryTest() {
   return new AndroidBackButtonMemoryTest(
     '${flutterDirectory.path}/examples/flutter_gallery',
     'io.flutter.examples.gallery',
-    'io.flutter.examples.gallery.MainActivity',
+    'io.flutter.app.FlutterActivity',
   );
 }
 
diff --git a/examples/flutter_gallery/android/app/src/main/AndroidManifest.xml b/examples/flutter_gallery/android/app/src/main/AndroidManifest.xml
index c854b13ae92..8fd984318f5 100644
--- a/examples/flutter_gallery/android/app/src/main/AndroidManifest.xml
+++ b/examples/flutter_gallery/android/app/src/main/AndroidManifest.xml
@@ -22,7 +22,7 @@
          additional functionality it is fine to subclass or reimplement
          FlutterApplication and put your custom class here. -->
     <application android:name="io.flutter.app.FlutterApplication" android:label="Gallery" android:icon="@mipmap/ic_launcher">
-        <activity android:name=".MainActivity"
+        <activity android:name="io.flutter.app.FlutterActivity"
                   android:launchMode="singleTop"
                   android:theme="@android:style/Theme.Light.NoTitleBar"
                   android:configChanges="orientation|keyboardHidden|keyboard|screenSize|locale|layoutDirection"
diff --git a/examples/flutter_gallery/android/app/src/main/java/io/flutter/examples/gallery/MainActivity.java b/examples/flutter_gallery/android/app/src/main/java/io/flutter/examples/gallery/MainActivity.java
deleted file mode 100644
index 9ecbc3dbd69..00000000000
--- a/examples/flutter_gallery/android/app/src/main/java/io/flutter/examples/gallery/MainActivity.java
+++ /dev/null
@@ -1,16 +0,0 @@
-package io.flutter.examples.gallery;
-
-import android.os.Bundle;
-import io.flutter.app.FlutterActivity;
-import io.flutter.plugins.PluginRegistry;
-
-public class MainActivity extends FlutterActivity {
-    PluginRegistry pluginRegistry;
-
-    @Override
-    protected void onCreate(Bundle savedInstanceState) {
-        super.onCreate(savedInstanceState);
-        pluginRegistry = new PluginRegistry();
-        pluginRegistry.registerAll(this);
-    }
-}
diff --git a/examples/hello_world/android/app/src/main/AndroidManifest.xml b/examples/hello_world/android/app/src/main/AndroidManifest.xml
index 46ceb56d05f..05c902bfeb8 100644
--- a/examples/hello_world/android/app/src/main/AndroidManifest.xml
+++ b/examples/hello_world/android/app/src/main/AndroidManifest.xml
@@ -22,7 +22,7 @@
          additional functionality it is fine to subclass or reimplement
          FlutterApplication and put your custom class here. -->
     <application android:name="io.flutter.app.FlutterApplication" android:label="hello_world" android:icon="@mipmap/ic_launcher">
-        <activity android:name=".MainActivity"
+        <activity android:name="io.flutter.app.FlutterActivity"
                   android:launchMode="singleTop"
                   android:theme="@android:style/Theme.Black.NoTitleBar"
                   android:configChanges="orientation|keyboardHidden|keyboard|screenSize|locale|layoutDirection"
diff --git a/examples/hello_world/android/app/src/main/java/io/flutter/examples/hello_world/MainActivity.java b/examples/hello_world/android/app/src/main/java/io/flutter/examples/hello_world/MainActivity.java
deleted file mode 100644
index 6bb0df1c116..00000000000
--- a/examples/hello_world/android/app/src/main/java/io/flutter/examples/hello_world/MainActivity.java
+++ /dev/null
@@ -1,16 +0,0 @@
-package io.flutter.examples.hello_world;
-
-import android.os.Bundle;
-import io.flutter.app.FlutterActivity;
-import io.flutter.plugins.PluginRegistry;
-
-public class MainActivity extends FlutterActivity {
-    PluginRegistry pluginRegistry;
-
-    @Override
-    protected void onCreate(Bundle savedInstanceState) {
-        super.onCreate(savedInstanceState);
-        pluginRegistry = new PluginRegistry();
-        pluginRegistry.registerAll(this);
-    }
-}