mirror of
https://github.com/flutter/flutter
synced 2024-10-06 00:09:53 +00:00
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
This commit is contained in:
parent
b265a8f5e4
commit
211fefc217
|
@ -1 +1 @@
|
|||
cdb18a5356215c6ce73db73d2d6877ab6d3bd03c
|
||||
74c1b2e4d73ff9f4f7987f72f8a01a355fc47070
|
||||
|
|
|
@ -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"
|
||||
|
|
|
@ -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"
|
||||
|
|
|
@ -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" />
|
||||
|
|
|
@ -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" />
|
||||
|
|
|
@ -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"
|
||||
|
|
|
@ -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" />
|
||||
|
|
|
@ -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" />
|
||||
|
|
|
@ -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"
|
||||
|
|
|
@ -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')) {
|
||||
|
|
|
@ -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"
|
||||
|
|
|
@ -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'
|
||||
|
|
Loading…
Reference in a new issue