Skip to content

Commit aa594aa

Browse files
kenzieschmollkenzieschmoll
authored
Remove obsolete feature flags (flutter#9052)
1 parent 55fafd2 commit aa594aa

File tree

14 files changed

+100
-165
lines changed

14 files changed

+100
-165
lines changed

‎packages/devtools_app/lib/src/app.dart‎

Lines changed: 4 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -716,11 +716,10 @@ List<DevToolsScreen> defaultScreens({
716716
AppSizeScreen(),
717717
createController: (_) => AppSizeController(),
718718
),
719-
if (FeatureFlags.deepLinkValidation)
720-
DevToolsScreen<DeepLinksController>(
721-
DeepLinksScreen(),
722-
createController: (_) => DeepLinksController(),
723-
),
719+
DevToolsScreen<DeepLinksController>(
720+
DeepLinksScreen(),
721+
createController: (_) => DeepLinksController(),
722+
),
724723
DevToolsScreen<VMDeveloperToolsController>(
725724
VMDeveloperToolsScreen(),
726725
createController: (_) => VMDeveloperToolsController(),

‎packages/devtools_app/lib/src/screens/deep_link_validation/deep_link_list_view.dart‎

Lines changed: 21 additions & 23 deletions
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,6 @@ import 'package:devtools_app_shared/ui.dart';
66
import 'package:flutter/foundation.dart';
77
import 'package:flutter/material.dart';
88

9-
import '../../shared/feature_flags.dart';
109
import '../../shared/globals.dart';
1110
import '../../shared/primitives/utils.dart';
1211
import '../../shared/table/table.dart';
@@ -264,28 +263,27 @@ class _DeepLinkListViewTopPanel extends StatelessWidget {
264263
configurations: controller.selectedProject.value!.androidVariants,
265264
onChanged: controller.updateSelectedAndroidVariantIndex,
266265
),
267-
if (FeatureFlags.deepLinkIosCheck) ...[
268-
const SizedBox(width: denseSpacing),
269-
_ConfigurationDropdown(
270-
title: 'iOS Configuration:',
271-
valueListenable: controller.selectedIosConfigurationIndex,
272-
configurations:
273-
controller
274-
.selectedProject
275-
.value!
276-
.iosBuildOptions
277-
.configurations,
278-
onChanged: controller.updateSelectedIosConfigurationIndex,
279-
),
280-
const SizedBox(width: denseSpacing),
281-
_ConfigurationDropdown(
282-
title: 'iOS Target:',
283-
valueListenable: controller.selectedIosTargetIndex,
284-
configurations:
285-
controller.selectedProject.value!.iosBuildOptions.targets,
286-
onChanged: controller.updateSelectedIosTargetIndex,
287-
),
288-
],
266+
267+
const SizedBox(width: denseSpacing),
268+
_ConfigurationDropdown(
269+
title: 'iOS Configuration:',
270+
valueListenable: controller.selectedIosConfigurationIndex,
271+
configurations:
272+
controller
273+
.selectedProject
274+
.value!
275+
.iosBuildOptions
276+
.configurations,
277+
onChanged: controller.updateSelectedIosConfigurationIndex,
278+
),
279+
const SizedBox(width: denseSpacing),
280+
_ConfigurationDropdown(
281+
title: 'iOS Target:',
282+
valueListenable: controller.selectedIosTargetIndex,
283+
configurations:
284+
controller.selectedProject.value!.iosBuildOptions.targets,
285+
onChanged: controller.updateSelectedIosTargetIndex,
286+
),
289287
],
290288
),
291289
);

‎packages/devtools_app/lib/src/screens/deep_link_validation/deep_links_controller.dart‎

Lines changed: 13 additions & 22 deletions
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,6 @@ import 'package:flutter/material.dart';
1313
import '../../shared/analytics/analytics.dart' as ga;
1414
import '../../shared/analytics/constants.dart' as gac;
1515
import '../../shared/analytics/metrics.dart';
16-
import '../../shared/feature_flags.dart';
1716
import '../../shared/framework/screen.dart';
1817
import '../../shared/framework/screen_controllers.dart';
1918
import '../../shared/globals.dart';
@@ -281,16 +280,14 @@ class DeepLinksController extends DevToolsScreenController
281280
selectedProject.value!.androidVariants,
282281
containsString: 'release',
283282
);
284-
if (FeatureFlags.deepLinkIosCheck) {
285-
_selectedIosConfigurationIndex.value = _getDefaultConfigurationIndex(
286-
selectedProject.value!.iosBuildOptions.configurations,
287-
containsString: 'release',
288-
);
289-
_selectedIosTargetIndex.value = _getDefaultConfigurationIndex(
290-
selectedProject.value!.iosBuildOptions.configurations,
291-
containsString: 'runner',
292-
);
293-
}
283+
_selectedIosConfigurationIndex.value = _getDefaultConfigurationIndex(
284+
selectedProject.value!.iosBuildOptions.configurations,
285+
containsString: 'release',
286+
);
287+
_selectedIosTargetIndex.value = _getDefaultConfigurationIndex(
288+
selectedProject.value!.iosBuildOptions.configurations,
289+
containsString: 'runner',
290+
);
294291
await loadLinksAndValidate();
295292
}
296293

@@ -398,11 +395,9 @@ class DeepLinksController extends DevToolsScreenController
398395
if (pagePhase.value == PagePhase.validationErrorPage) {
399396
return;
400397
}
401-
if (FeatureFlags.deepLinkIosCheck) {
402-
await _loadIosLinks();
403-
if (pagePhase.value == PagePhase.validationErrorPage) {
404-
return;
405-
}
398+
await _loadIosLinks();
399+
if (pagePhase.value == PagePhase.validationErrorPage) {
400+
return;
406401
}
407402
await validateLinks();
408403
}
@@ -575,8 +570,7 @@ class DeepLinksController extends DevToolsScreenController
575570
googlePlayFingerprintsAvailability.value =
576571
androidResult.googlePlayFingerprintsAvailability;
577572
}
578-
if (FeatureFlags.deepLinkIosCheck &&
579-
currentUniversalLinkSettings != null) {
573+
if (currentUniversalLinkSettings != null) {
580574
ga.impression(
581575
gac.deeplink,
582576
gac.AnalyzeFlutterProject.iosValidateDomain.name,
@@ -683,10 +677,7 @@ class DeepLinksController extends DevToolsScreenController
683677
return;
684678
}
685679
pagePhase.value = PagePhase.linksValidating;
686-
List<LinkData> linkdata = [
687-
..._rawAndroidLinkDatas,
688-
if (FeatureFlags.deepLinkIosCheck) ..._rawIosLinkDatas,
689-
];
680+
List<LinkData> linkdata = [..._rawAndroidLinkDatas, ..._rawIosLinkDatas];
690681
if (linkdata.isEmpty) {
691682
ga.select(gac.deeplink, gac.AnalyzeFlutterProject.flutterNoAppLink.name);
692683
pagePhase.value = PagePhase.noLinks;

‎packages/devtools_app/lib/src/screens/deep_link_validation/project_root_selection/select_project_view.dart‎

Lines changed: 5 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,6 @@ import 'package:flutter/material.dart';
1010

1111
import '../../../shared/analytics/analytics.dart' as ga;
1212
import '../../../shared/analytics/constants.dart' as gac;
13-
import '../../../shared/feature_flags.dart';
1413
import '../../../shared/globals.dart';
1514
import '../../../shared/primitives/utils.dart';
1615
import '../../../shared/server/server.dart' as server;
@@ -122,14 +121,11 @@ class _SelectProjectViewState extends State<SelectProjectView> {
122121
return;
123122
}
124123
XcodeBuildOptions iosBuildOptions = XcodeBuildOptions.empty;
125-
if (FeatureFlags.deepLinkIosCheck) {
126-
iosBuildOptions = await _requestiOSBuildOptions(directory);
127-
ga.select(
128-
gac.deeplink,
129-
gac.AnalyzeFlutterProject.flutterProjectSelected.name,
130-
);
131-
}
132-
124+
iosBuildOptions = await _requestiOSBuildOptions(directory);
125+
ga.select(
126+
gac.deeplink,
127+
gac.AnalyzeFlutterProject.flutterProjectSelected.name,
128+
);
133129
if (androidVariants.isEmpty && iosBuildOptions.configurations.isEmpty) {
134130
ga.select(
135131
gac.deeplink,

‎packages/devtools_app/lib/src/screens/deep_link_validation/validation_details_view.dart‎

Lines changed: 2 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,6 @@ import 'dart:async';
77
import 'package:devtools_app_shared/ui.dart';
88
import 'package:flutter/material.dart';
99

10-
import '../../shared/feature_flags.dart';
1110
import '../../shared/ui/colors.dart';
1211
import '../../shared/ui/common_widgets.dart';
1312
import '../../shared/utils/utils.dart';
@@ -60,8 +59,7 @@ class ValidationDetailView extends StatelessWidget {
6059
if (viewType == TableViewType.pathView ||
6160
viewType == TableViewType.singleUrlView)
6261
_PathCheckTable(controller: controller),
63-
if (FeatureFlags.deepLinkIosCheck &&
64-
viewType == TableViewType.domainView)
62+
if (viewType == TableViewType.domainView)
6563
_CrossCheckTable(controller: controller),
6664
const SizedBox(height: extraLargeSpacing),
6765
Align(
@@ -167,8 +165,7 @@ class _DomainCheckTable extends StatelessWidget {
167165
],
168166
],
169167
),
170-
if (FeatureFlags.deepLinkIosCheck &&
171-
linkData.os.contains(PlatformOS.ios))
168+
if (linkData.os.contains(PlatformOS.ios))
172169
_CheckExpansionTile(
173170
os: PlatformOS.ios,
174171
checkName: 'Apple-App-Site-Association file',

‎packages/devtools_app/lib/src/screens/performance/panes/controls/more_debugging_options.dart‎

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,6 @@ import 'package:flutter/material.dart';
77

88
import '../../../../service/service_extension_widgets.dart';
99
import '../../../../service/service_extensions.dart' as extensions;
10-
import '../../../../shared/feature_flags.dart';
1110
import '../../../../shared/globals.dart';
1211
import 'performance_controls.dart';
1312

@@ -29,7 +28,7 @@ class MoreDebuggingOptionsButton extends StatelessWidget {
2928
extensions.disableClipLayers,
3029
extensions.disableOpacityLayers,
3130
extensions.disablePhysicalShapeLayers,
32-
if (FeatureFlags.widgetRebuildStats) extensions.countWidgetBuilds,
31+
extensions.countWidgetBuilds,
3332
],
3433
overlayDescription: Column(
3534
crossAxisAlignment: CrossAxisAlignment.start,

‎packages/devtools_app/lib/src/screens/performance/panes/frame_analysis/frame_analysis.dart‎

Lines changed: 42 additions & 45 deletions
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,6 @@ import 'package:flutter/material.dart';
99

1010
import '../../../../service/service_extension_widgets.dart';
1111
import '../../../../service/service_extensions.dart' as extensions;
12-
import '../../../../shared/feature_flags.dart';
1312
import '../../../../shared/globals.dart';
1413
import '../../../../shared/primitives/utils.dart';
1514
import '../controls/enhance_tracing/enhance_tracing_controller.dart';
@@ -90,52 +89,50 @@ class FlutterFrameAnalysisView extends StatelessWidget {
9089
const PaddedDivider.noPadding(),
9190
FrameTimeVisualizer(frameAnalysis: frameAnalysis),
9291
],
93-
if (FeatureFlags.widgetRebuildStats) ...[
94-
if (rebuilds.isNullOrEmpty) ...[
95-
const PaddedDivider.noPadding(),
96-
ValueListenableBuilder<ServiceExtensionState>(
97-
valueListenable: serviceConnection
98-
.serviceManager
99-
.serviceExtensionManager
100-
.getServiceExtensionState(
101-
extensions.countWidgetBuilds.extension,
102-
),
103-
builder: (context, extensionState, _) {
104-
if (!extensionState.enabled) {
105-
return Row(
106-
children: [
107-
const Text(
108-
'To see widget rebuilds for Flutter frames, enable',
109-
),
110-
Flexible(
111-
child: ServiceExtensionCheckbox(
112-
serviceExtension: extensions.countWidgetBuilds,
113-
showDescription: false,
114-
),
92+
if (rebuilds.isNullOrEmpty) ...[
93+
const PaddedDivider.noPadding(),
94+
ValueListenableBuilder<ServiceExtensionState>(
95+
valueListenable: serviceConnection
96+
.serviceManager
97+
.serviceExtensionManager
98+
.getServiceExtensionState(
99+
extensions.countWidgetBuilds.extension,
100+
),
101+
builder: (context, extensionState, _) {
102+
if (!extensionState.enabled) {
103+
return Row(
104+
children: [
105+
const Text(
106+
'To see widget rebuilds for Flutter frames, enable',
107+
),
108+
Flexible(
109+
child: ServiceExtensionCheckbox(
110+
serviceExtension: extensions.countWidgetBuilds,
111+
showDescription: false,
115112
),
116-
],
117-
);
118-
}
119-
return const SizedBox();
120-
},
121-
),
122-
],
123-
if (rebuilds == null)
124-
const Text('Rebuild information not available for this frame.')
125-
else if (rebuilds.isEmpty)
126-
const Text(
127-
'No widget rebuilds occurred for widgets that were directly '
128-
'created in your project.',
129-
)
130-
else ...[
131-
const SizedBox(height: defaultSpacing),
132-
Expanded(
133-
child: RebuildTable(
134-
metricNames: const ['Rebuild Count'],
135-
metrics: combineStats([rebuilds]),
136-
),
113+
),
114+
],
115+
);
116+
}
117+
return const SizedBox();
118+
},
119+
),
120+
],
121+
if (rebuilds == null)
122+
const Text('Rebuild information not available for this frame.')
123+
else if (rebuilds.isEmpty)
124+
const Text(
125+
'No widget rebuilds occurred for widgets that were directly '
126+
'created in your project.',
127+
)
128+
else ...[
129+
const SizedBox(height: defaultSpacing),
130+
Expanded(
131+
child: RebuildTable(
132+
metricNames: const ['Rebuild Count'],
133+
metrics: combineStats([rebuilds]),
137134
),
138-
],
135+
),
139136
],
140137
],
141138
),

‎packages/devtools_app/lib/src/screens/performance/performance_controller.dart‎

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -145,8 +145,7 @@ class PerformanceController extends DevToolsScreenController
145145
final frame = FlutterFrame.fromJson(event.extensionData!.data);
146146
enhanceTracingController.assignStateForFrame(frame);
147147
flutterFramesController.addFrame(frame);
148-
} else if (event.extensionKind == FlutterEvent.rebuiltWidgets &&
149-
FeatureFlags.widgetRebuildStats) {
148+
} else if (event.extensionKind == FlutterEvent.rebuiltWidgets) {
150149
if (_currentRebuildWidgetsIsolate != event.isolate) {
151150
rebuildCountModel.clearFromRestart();
152151
}

‎packages/devtools_app/lib/src/screens/performance/tabbed_performance_view.dart‎

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,6 @@ import 'package:devtools_app_shared/utils.dart';
99
import 'package:flutter/material.dart';
1010

1111
import '../../shared/analytics/constants.dart' as gac;
12-
import '../../shared/feature_flags.dart';
1312
import '../../shared/globals.dart';
1413
import '../../shared/ui/common_widgets.dart';
1514
import '../../shared/ui/tab.dart';
@@ -58,7 +57,7 @@ class _TabbedPerformanceViewState extends State<TabbedPerformanceView>
5857
serviceConnection.serviceManager.connectedApp!.isFlutterAppNow!;
5958

6059
var showFrameAnalysis = isFlutterApp;
61-
var showRebuildStats = FeatureFlags.widgetRebuildStats && isFlutterApp;
60+
var showRebuildStats = isFlutterApp;
6261
final offlineData = controller.offlinePerformanceData;
6362
if (isOffline) {
6463
final hasOfflineData = offlineData != null;

0 commit comments

Comments
 (0)