[flutter_releases] Flutter stable 2.10.0 Framework Cherrypicks (#97553)
* [flutter_tools] remove dummy implementation from abstract class .isEnabled() (#96888)
* 'Update Engine revision to 776efd2034d50af73e2876d703213601df384e88 for stable release 2.10.0'
Co-authored-by: Christopher Fujino <christopherfujino@gmail.com>
diff --git a/bin/internal/engine.version b/bin/internal/engine.version
index 8fe8bb8..23a7a59 100644
--- a/bin/internal/engine.version
+++ b/bin/internal/engine.version
@@ -1 +1 @@
-5ac30ef0c70b76c5d5b5465b0ad4f08d5433684f
+776efd2034d50af73e2876d703213601df384e88
diff --git a/packages/flutter_tools/lib/src/features.dart b/packages/flutter_tools/lib/src/features.dart
index e338073..45bfb96 100644
--- a/packages/flutter_tools/lib/src/features.dart
+++ b/packages/flutter_tools/lib/src/features.dart
@@ -53,7 +53,7 @@
/// Whether a particular feature is enabled for the current channel.
///
/// Prefer using one of the specific getters above instead of this API.
- bool isEnabled(Feature feature) => false;
+ bool isEnabled(Feature feature);
}
/// All current Flutter feature flags.
@@ -138,18 +138,21 @@
name: 'beta-quality support for desktop on Windows',
configSetting: 'enable-windows-desktop',
environmentOverride: 'FLUTTER_WINDOWS',
- extraHelpText: 'Newer beta versions are available on the beta channel.',
master: FeatureChannelSetting(
available: true,
+ enabledByDefault: true,
),
dev: FeatureChannelSetting(
available: true,
+ enabledByDefault: true,
),
beta: FeatureChannelSetting(
available: true,
+ enabledByDefault: true,
),
stable: FeatureChannelSetting(
available: true,
+ enabledByDefault: true,
),
);
diff --git a/packages/flutter_tools/test/general.shard/features_test.dart b/packages/flutter_tools/test/general.shard/features_test.dart
index c0d0469..905ef90 100644
--- a/packages/flutter_tools/test/general.shard/features_test.dart
+++ b/packages/flutter_tools/test/general.shard/features_test.dart
@@ -107,8 +107,7 @@
testWithoutContext('Flutter Windows desktop help string', () {
expect(flutterWindowsDesktopFeature.generateHelpMessage(),
'Enable or disable beta-quality support for desktop on Windows. '
- 'This setting will take effect on the master, dev, beta, and stable channels. '
- 'Newer beta versions are available on the beta channel.');
+ 'This setting will take effect on the master, dev, beta, and stable channels.');
});
testWithoutContext('help string on multiple channels', () {
