From 211fefc2178b8251fc9ee8cf393d58059b7a18cd Mon Sep 17 00:00:00 2001
From: Collin Jackson <jackson@google.com>
Date: Tue, 6 Dec 2016 16:03:32 -0800
Subject: [PATCH] rename Sky to Flutter and add clarifying comment to template
 (#7165)

* s/sky/flutter/ in Android templates

* update engine.version with a compatible engine version

* replace more SkyActivity references with FlutterActivity
---
 bin/internal/engine.version                              | 2 +-
 .../complex_layout/android/AndroidManifest.xml           | 4 ++--
 .../microbenchmarks/android/AndroidManifest.xml          | 4 ++--
 dev/manual_tests/android/AndroidManifest.xml             | 4 ++--
 examples/flutter_gallery/android/AndroidManifest.xml     | 4 ++--
 .../android/app/src/main/AndroidManifest.xml             | 2 +-
 examples/hello_world/android/AndroidManifest.xml         | 4 ++--
 examples/layers/android/AndroidManifest.xml              | 4 ++--
 examples/stocks/android/AndroidManifest.xml              | 4 ++--
 packages/flutter_tools/lib/src/application_package.dart  | 2 +-
 .../templates/create/android/AndroidManifest.xml.tmpl    | 9 +++++++--
 .../flutter_tools/test/application_package_test.dart     | 4 ++--
 12 files changed, 26 insertions(+), 21 deletions(-)

diff --git a/bin/internal/engine.version b/bin/internal/engine.version
index ecbbb4bd1d..0d45a7e943 100644
--- a/bin/internal/engine.version
+++ b/bin/internal/engine.version
@@ -1 +1 @@
-cdb18a5356215c6ce73db73d2d6877ab6d3bd03c
+74c1b2e4d73ff9f4f7987f72f8a01a355fc47070
diff --git a/dev/benchmarks/complex_layout/android/AndroidManifest.xml b/dev/benchmarks/complex_layout/android/AndroidManifest.xml
index 62938bc9d8..df92d8b27c 100644
--- a/dev/benchmarks/complex_layout/android/AndroidManifest.xml
+++ b/dev/benchmarks/complex_layout/android/AndroidManifest.xml
@@ -6,8 +6,8 @@
     <uses-sdk android:minSdkVersion="16" android:targetSdkVersion="21" />
     <uses-permission android:name="android.permission.INTERNET"/>
 
-    <application android:name="org.domokit.sky.shell.SkyApplication" android:label="complex_layout" android:icon="@mipmap/ic_launcher">
-        <activity android:name="org.domokit.sky.shell.SkyActivity"
+    <application android:name="io.flutter.app.FlutterApplication" android:label="complex_layout" android:icon="@mipmap/ic_launcher">
+        <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/dev/benchmarks/microbenchmarks/android/AndroidManifest.xml b/dev/benchmarks/microbenchmarks/android/AndroidManifest.xml
index 6aac56c5bb..446489e813 100644
--- a/dev/benchmarks/microbenchmarks/android/AndroidManifest.xml
+++ b/dev/benchmarks/microbenchmarks/android/AndroidManifest.xml
@@ -6,8 +6,8 @@
     <uses-sdk android:minSdkVersion="16" android:targetSdkVersion="21" />
     <uses-permission android:name="android.permission.INTERNET"/>
 
-    <application android:name="org.domokit.sky.shell.SkyApplication" android:label="microbenchmarks" android:icon="@mipmap/ic_launcher">
-        <activity android:name="org.domokit.sky.shell.SkyActivity"
+    <application android:name="io.flutter.app.FlutterApplication" android:label="microbenchmarks" android:icon="@mipmap/ic_launcher">
+        <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/dev/manual_tests/android/AndroidManifest.xml b/dev/manual_tests/android/AndroidManifest.xml
index 6dc8b6db9d..eb74cce53c 100644
--- a/dev/manual_tests/android/AndroidManifest.xml
+++ b/dev/manual_tests/android/AndroidManifest.xml
@@ -8,8 +8,8 @@
     <uses-sdk android:minSdkVersion="14" android:targetSdkVersion="21" />
     <uses-permission android:name="android.permission.INTERNET"/>
 
-    <application android:label="Flutter Manual Tests" android:name="org.domokit.sky.shell.SkyApplication">
-        <activity android:configChanges="orientation|keyboardHidden|keyboard|screenSize" android:hardwareAccelerated="true" android:launchMode="singleTop" android:name="org.domokit.sky.shell.SkyActivity" android:theme="@android:style/Theme.Black.NoTitleBar">
+    <application android:label="Flutter Manual Tests" android:name="io.flutter.app.FlutterApplication">
+        <activity android:configChanges="orientation|keyboardHidden|keyboard|screenSize" android:hardwareAccelerated="true" android:launchMode="singleTop" android:name="io.flutter.app.FlutterActivity" android:theme="@android:style/Theme.Black.NoTitleBar">
             <intent-filter>
                 <action android:name="android.intent.action.MAIN" />
                 <category android:name="android.intent.category.LAUNCHER" />
diff --git a/examples/flutter_gallery/android/AndroidManifest.xml b/examples/flutter_gallery/android/AndroidManifest.xml
index 2483920d16..63193c8d9d 100644
--- a/examples/flutter_gallery/android/AndroidManifest.xml
+++ b/examples/flutter_gallery/android/AndroidManifest.xml
@@ -8,8 +8,8 @@
     <uses-sdk android:minSdkVersion="14" android:targetSdkVersion="21" />
     <uses-permission android:name="android.permission.INTERNET"/>
 
-    <application android:icon="@mipmap/ic_launcher" android:label="Gallery" android:name="org.domokit.sky.shell.SkyApplication">
-        <activity android:configChanges="orientation|keyboardHidden|keyboard|screenSize" android:hardwareAccelerated="true" android:launchMode="singleTask" android:name="org.domokit.sky.shell.SkyActivity" android:theme="@android:style/Theme.Light.NoTitleBar" android:windowSoftInputMode="adjustResize">
+    <application android:icon="@mipmap/ic_launcher" android:label="Gallery" android:name="io.flutter.app.FlutterApplication">
+        <activity android:configChanges="orientation|keyboardHidden|keyboard|screenSize" android:hardwareAccelerated="true" android:launchMode="singleTask" android:name="io.flutter.app.FlutterActivity" android:theme="@android:style/Theme.Light.NoTitleBar" android:windowSoftInputMode="adjustResize">
             <intent-filter>
                 <action android:name="android.intent.action.MAIN" />
                 <category android:name="android.intent.category.LAUNCHER" />
diff --git a/examples/hello_services/android/app/src/main/AndroidManifest.xml b/examples/hello_services/android/app/src/main/AndroidManifest.xml
index 0b0d0d8cb6..772377e0e8 100644
--- a/examples/hello_services/android/app/src/main/AndroidManifest.xml
+++ b/examples/hello_services/android/app/src/main/AndroidManifest.xml
@@ -8,7 +8,7 @@
     <uses-permission android:name="android.permission.INTERNET"/>
     <uses-permission android:name="android.permission.ACCESS_FINE_LOCATION"/>
 
-    <application android:name="org.domokit.sky.shell.SkyApplication" android:label="@string/app_name" >
+    <application android:name="io.flutter.app.FlutterApplication" android:label="@string/app_name" >
         <activity
             android:name=".ExampleActivity"
             android:launchMode="singleTop"
diff --git a/examples/hello_world/android/AndroidManifest.xml b/examples/hello_world/android/AndroidManifest.xml
index 29f0ce463b..451b678c6f 100644
--- a/examples/hello_world/android/AndroidManifest.xml
+++ b/examples/hello_world/android/AndroidManifest.xml
@@ -8,8 +8,8 @@
     <uses-sdk android:minSdkVersion="16" android:targetSdkVersion="21" />
     <uses-permission android:name="android.permission.INTERNET"/>
 
-    <application android:label="Flutter Hello" android:name="org.domokit.sky.shell.SkyApplication">
-        <activity android:configChanges="orientation|keyboardHidden|keyboard|screenSize" android:hardwareAccelerated="true" android:launchMode="singleTop" android:name="org.domokit.sky.shell.SkyActivity" android:theme="@android:style/Theme.Black.NoTitleBar" android:windowSoftInputMode="adjustResize">
+    <application android:label="Flutter Hello" android:name="io.flutter.app.FlutterApplication">
+        <activity android:configChanges="orientation|keyboardHidden|keyboard|screenSize" android:hardwareAccelerated="true" android:launchMode="singleTop" android:name="io.flutter.app.FlutterActivity" android:theme="@android:style/Theme.Black.NoTitleBar" android:windowSoftInputMode="adjustResize">
             <intent-filter>
                 <action android:name="android.intent.action.MAIN" />
                 <category android:name="android.intent.category.LAUNCHER" />
diff --git a/examples/layers/android/AndroidManifest.xml b/examples/layers/android/AndroidManifest.xml
index af20b7a1d5..6cdd1a9854 100644
--- a/examples/layers/android/AndroidManifest.xml
+++ b/examples/layers/android/AndroidManifest.xml
@@ -8,8 +8,8 @@
     <uses-sdk android:minSdkVersion="14" android:targetSdkVersion="21" />
     <uses-permission android:name="android.permission.INTERNET"/>
 
-    <application android:label="Flutter Layers" android:name="org.domokit.sky.shell.SkyApplication">
-        <activity android:configChanges="orientation|keyboardHidden|keyboard|screenSize" android:hardwareAccelerated="true" android:launchMode="singleTop" android:name="org.domokit.sky.shell.SkyActivity" android:theme="@android:style/Theme.Black.NoTitleBar" android:windowSoftInputMode="adjustResize">
+    <application android:label="Flutter Layers" android:name="io.flutter.app.FlutterApplication">
+        <activity android:configChanges="orientation|keyboardHidden|keyboard|screenSize" android:hardwareAccelerated="true" android:launchMode="singleTop" android:name="io.flutter.app.FlutterActivity" android:theme="@android:style/Theme.Black.NoTitleBar" android:windowSoftInputMode="adjustResize">
             <intent-filter>
                 <action android:name="android.intent.action.MAIN" />
                 <category android:name="android.intent.category.LAUNCHER" />
diff --git a/examples/stocks/android/AndroidManifest.xml b/examples/stocks/android/AndroidManifest.xml
index f998c2dcc4..19be92310a 100644
--- a/examples/stocks/android/AndroidManifest.xml
+++ b/examples/stocks/android/AndroidManifest.xml
@@ -9,8 +9,8 @@
     <uses-sdk android:minSdkVersion="14" android:targetSdkVersion="21" />
     <uses-permission android:name="android.permission.INTERNET"/>
 
-    <application android:icon="@mipmap/ic_launcher" android:name="org.domokit.sky.shell.SkyApplication" android:label="Stocks">
-        <activity android:name="org.domokit.sky.shell.SkyActivity"
+    <application android:icon="@mipmap/ic_launcher" android:name="io.flutter.app.FlutterApplication" android:label="Stocks">
+        <activity android:name="io.flutter.app.FlutterActivity"
                   android:launchMode="singleTop"
                   android:theme="@android:style/Theme.Black.NoTitleBar"
                   android:configChanges="orientation|keyboardHidden|keyboard|screenSize"
diff --git a/packages/flutter_tools/lib/src/application_package.dart b/packages/flutter_tools/lib/src/application_package.dart
index 5ed83411c6..0a73e2806c 100644
--- a/packages/flutter_tools/lib/src/application_package.dart
+++ b/packages/flutter_tools/lib/src/application_package.dart
@@ -285,7 +285,7 @@ class ApkManifestData {
       return null;
 
     // package: name='io.flutter.gallery' versionCode='1' versionName='0.0.1' platformBuildVersionName='NMR1'
-    // launchable-activity: name='org.domokit.sky.shell.SkyActivity'  label='' icon=''
+    // launchable-activity: name='io.flutter.app.FlutterActivity'  label='' icon=''
     Map<String, Map<String, String>> map = <String, Map<String, String>>{};
 
     for (String line in data.split('\n')) {
diff --git a/packages/flutter_tools/templates/create/android/AndroidManifest.xml.tmpl b/packages/flutter_tools/templates/create/android/AndroidManifest.xml.tmpl
index 401c706a2e..e6c781992e 100644
--- a/packages/flutter_tools/templates/create/android/AndroidManifest.xml.tmpl
+++ b/packages/flutter_tools/templates/create/android/AndroidManifest.xml.tmpl
@@ -10,8 +10,13 @@
     -->
     <uses-permission android:name="android.permission.INTERNET"/>
 
-    <application android:name="org.domokit.sky.shell.SkyApplication" android:label="{{projectName}}" android:icon="@mipmap/ic_launcher">
-        <activity android:name="org.domokit.sky.shell.SkyActivity"
+    <!-- io.flutter.app.FlutterApplication is an android.app.Application that
+         calls FlutterMain.startInitialization(this); in its onCreate method.
+         In most cases you can leave this as-is, but you if you want to provide
+         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="{{projectName}}" android:icon="@mipmap/ic_launcher">
+        <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/packages/flutter_tools/test/application_package_test.dart b/packages/flutter_tools/test/application_package_test.dart
index 65987ba69c..3ad42a558e 100644
--- a/packages/flutter_tools/test/application_package_test.dart
+++ b/packages/flutter_tools/test/application_package_test.dart
@@ -13,7 +13,7 @@ void main() {
       ApkManifestData data = ApkManifestData.parseFromAaptBadging(_aaptData);
       expect(data, isNotNull);
       expect(data.packageName, 'io.flutter.gallery');
-      expect(data.launchableActivityName, 'org.domokit.sky.shell.SkyActivity');
+      expect(data.launchableActivityName, 'io.flutter.app.FlutterActivity');
     });
   });
 }
@@ -31,7 +31,7 @@ application-icon-480:'res/mipmap-xxhdpi-v4/ic_launcher.png'
 application-icon-640:'res/mipmap-xxxhdpi-v4/ic_launcher.png'
 application: label='Flutter Gallery' icon='res/mipmap-mdpi-v4/ic_launcher.png'
 application-debuggable
-launchable-activity: name='org.domokit.sky.shell.SkyActivity'  label='' icon=''
+launchable-activity: name='io.flutter.app.FlutterActivity'  label='' icon=''
 feature-group: label=''
   uses-feature: name='android.hardware.screen.portrait'
   uses-implied-feature: name='android.hardware.screen.portrait' reason='one or more activities have specified a portrait orientation'