Rename Inspector V2 --> Inspector (#9796)
diff --git a/packages/devtools_app/lib/devtools_app.dart b/packages/devtools_app/lib/devtools_app.dart
index 58e62b5..5125d71 100644
--- a/packages/devtools_app/lib/devtools_app.dart
+++ b/packages/devtools_app/lib/devtools_app.dart
@@ -24,11 +24,11 @@
export 'src/screens/deep_link_validation/deep_links_screen.dart';
export 'src/screens/dtd/dtd_tools_controller.dart';
export 'src/screens/dtd/dtd_tools_screen.dart';
-export 'src/screens/inspector_v2/inspector_controller.dart';
-export 'src/screens/inspector_v2/inspector_screen.dart';
-export 'src/screens/inspector_v2/inspector_screen_body.dart';
-export 'src/screens/inspector_v2/inspector_screen_controller.dart';
-export 'src/screens/inspector_v2/inspector_tree_controller.dart';
+export 'src/screens/inspector/inspector_controller.dart';
+export 'src/screens/inspector/inspector_screen.dart';
+export 'src/screens/inspector/inspector_screen_body.dart';
+export 'src/screens/inspector/inspector_screen_controller.dart';
+export 'src/screens/inspector/inspector_tree_controller.dart';
export 'src/screens/logging/log_details_controller.dart';
export 'src/screens/logging/logging_controller.dart';
export 'src/screens/logging/logging_screen.dart';
@@ -76,7 +76,7 @@
export 'src/shared/charts/treemap.dart';
export 'src/shared/console/console_service.dart';
export 'src/shared/console/eval/eval_service.dart';
-export 'src/shared/console/eval/inspector_tree_v2.dart';
+export 'src/shared/console/eval/inspector_tree.dart';
export 'src/shared/console/primitives/simple_items.dart';
export 'src/shared/console/widgets/description.dart';
export 'src/shared/diagnostics/diagnostics_node.dart';
diff --git a/packages/devtools_app/lib/src/app.dart b/packages/devtools_app/lib/src/app.dart
index fdbd780..d266186 100644
--- a/packages/devtools_app/lib/src/app.dart
+++ b/packages/devtools_app/lib/src/app.dart
@@ -31,8 +31,8 @@
import 'screens/deep_link_validation/deep_links_screen.dart';
import 'screens/dtd/dtd_tools_controller.dart';
import 'screens/dtd/dtd_tools_screen.dart';
-import 'screens/inspector_v2/inspector_screen.dart';
-import 'screens/inspector_v2/inspector_screen_controller.dart';
+import 'screens/inspector/inspector_screen.dart';
+import 'screens/inspector/inspector_screen_controller.dart';
import 'screens/logging/logging_controller.dart';
import 'screens/logging/logging_screen.dart';
import 'screens/memory/framework/memory_controller.dart';
@@ -683,8 +683,6 @@
DevToolsScreen<DevToolsScreenController>(
HomeScreen(sampleData: sampleData),
),
- // TODO(https://github.com/flutter/devtools/issues/7860): Clean-up after
- // Inspector V2 has been released.
DevToolsScreen<InspectorScreenController>(
InspectorScreen(),
createController: (_) => InspectorScreenController(),
diff --git a/packages/devtools_app/lib/src/screens/inspector_v2/inspector_controller.dart b/packages/devtools_app/lib/src/screens/inspector/inspector_controller.dart
similarity index 99%
rename from packages/devtools_app/lib/src/screens/inspector_v2/inspector_controller.dart
rename to packages/devtools_app/lib/src/screens/inspector/inspector_controller.dart
index f8694bc..e1db0b5 100644
--- a/packages/devtools_app/lib/src/screens/inspector_v2/inspector_controller.dart
+++ b/packages/devtools_app/lib/src/screens/inspector/inspector_controller.dart
@@ -26,7 +26,7 @@
import '../../shared/analytics/analytics.dart' as ga;
import '../../shared/analytics/constants.dart' as gac;
import '../../shared/analytics/metrics.dart';
-import '../../shared/console/eval/inspector_tree_v2.dart';
+import '../../shared/console/eval/inspector_tree.dart';
import '../../shared/console/primitives/simple_items.dart';
import '../../shared/diagnostics/diagnostics_node.dart';
import '../../shared/diagnostics/inspector_service.dart';
@@ -397,7 +397,7 @@
ga.select(
gac.inspector,
gac.refreshEmptyTree,
- screenMetricsProvider: () => InspectorScreenMetrics.v2(),
+ screenMetricsProvider: () => InspectorScreenMetrics(),
);
firstInspectorTreeLoadCompleted = true;
}
@@ -776,7 +776,7 @@
ga.select(
gac.inspector,
gac.onDeviceSelection,
- screenMetricsProvider: () => InspectorScreenMetrics.v2(),
+ screenMetricsProvider: () => InspectorScreenMetrics(),
);
} catch (error, st) {
if (selectionGroups.next == group) {
diff --git a/packages/devtools_app/lib/src/screens/inspector_v2/inspector_controls.dart b/packages/devtools_app/lib/src/screens/inspector/inspector_controls.dart
similarity index 90%
rename from packages/devtools_app/lib/src/screens/inspector_v2/inspector_controls.dart
rename to packages/devtools_app/lib/src/screens/inspector/inspector_controls.dart
index 2f1e53b..cdb8cec 100644
--- a/packages/devtools_app/lib/src/screens/inspector_v2/inspector_controls.dart
+++ b/packages/devtools_app/lib/src/screens/inspector/inspector_controls.dart
@@ -10,7 +10,6 @@
import '../../service/service_extension_widgets.dart';
import '../../service/service_extensions.dart' as extensions;
import '../../shared/analytics/constants.dart' as gac;
-import '../../shared/feature_flags.dart';
import '../../shared/globals.dart';
import '../../shared/ui/common_widgets.dart';
import 'inspector_controller.dart';
@@ -30,8 +29,6 @@
final activeButtonColor = Theme.of(
context,
).colorScheme.activeToggleButtonColor;
- final isInspectorV2 =
- controller != null && FeatureFlags.inspectorV2.isEnabled;
return Row(
crossAxisAlignment: CrossAxisAlignment.start,
children: [
@@ -49,16 +46,13 @@
: extensions.toggleOnDeviceWidgetInspector,
],
minScreenWidthForText: minScreenWidthForText,
- minScreenWidthForTextBeforeTruncating: isInspectorV2
- ? minScreenWidthForTextBeforeTruncating
- : null,
+ minScreenWidthForTextBeforeTruncating:
+ minScreenWidthForTextBeforeTruncating,
);
},
),
- if (isInspectorV2) ...[
- const SizedBox(width: defaultSpacing),
- ShowImplementationWidgetsButton(controller: controller!),
- ],
+ const SizedBox(width: defaultSpacing),
+ ShowImplementationWidgetsButton(controller: controller!),
const Spacer(),
const SizedBox(width: defaultSpacing),
const InspectorServiceExtensionButtonGroup(),
diff --git a/packages/devtools_app/lib/src/screens/inspector_v2/inspector_data_models.dart b/packages/devtools_app/lib/src/screens/inspector/inspector_data_models.dart
similarity index 99%
rename from packages/devtools_app/lib/src/screens/inspector_v2/inspector_data_models.dart
rename to packages/devtools_app/lib/src/screens/inspector/inspector_data_models.dart
index 1d166ce..188dabd 100644
--- a/packages/devtools_app/lib/src/screens/inspector_v2/inspector_data_models.dart
+++ b/packages/devtools_app/lib/src/screens/inspector/inspector_data_models.dart
@@ -2,7 +2,7 @@
// Use of this source code is governed by a BSD-style license that can be
// found in the LICENSE file or at https://developers.google.com/open-source/licenses/bsd.
-/// @docImport '../inspector_v2/layout_explorer/ui/overflow_indicator_painter.dart';
+/// @docImport '../inspector/layout_explorer/ui/overflow_indicator_painter.dart';
library;
import 'dart:math' as math;
diff --git a/packages/devtools_app/lib/src/screens/inspector_v2/inspector_screen.dart b/packages/devtools_app/lib/src/screens/inspector/inspector_screen.dart
similarity index 100%
rename from packages/devtools_app/lib/src/screens/inspector_v2/inspector_screen.dart
rename to packages/devtools_app/lib/src/screens/inspector/inspector_screen.dart
diff --git a/packages/devtools_app/lib/src/screens/inspector_v2/inspector_screen_body.dart b/packages/devtools_app/lib/src/screens/inspector/inspector_screen_body.dart
similarity index 98%
rename from packages/devtools_app/lib/src/screens/inspector_v2/inspector_screen_body.dart
rename to packages/devtools_app/lib/src/screens/inspector/inspector_screen_body.dart
index b43e9ff..a112e94 100644
--- a/packages/devtools_app/lib/src/screens/inspector_v2/inspector_screen_body.dart
+++ b/packages/devtools_app/lib/src/screens/inspector/inspector_screen_body.dart
@@ -12,7 +12,7 @@
import '../../shared/analytics/analytics.dart' as ga;
import '../../shared/analytics/constants.dart' as gac;
import '../../shared/analytics/metrics.dart';
-import '../../shared/console/eval/inspector_tree_v2.dart';
+import '../../shared/console/eval/inspector_tree.dart';
import '../../shared/globals.dart';
import '../../shared/managers/error_badge_manager.dart';
import '../../shared/primitives/blocking_action_mixin.dart';
@@ -206,7 +206,7 @@
ga.select(
gac.inspector,
gac.refresh,
- screenMetricsProvider: () => InspectorScreenMetrics.v2(),
+ screenMetricsProvider: () => InspectorScreenMetrics(),
);
unawaited(
blockWhileInProgress(() async {
diff --git a/packages/devtools_app/lib/src/screens/inspector_v2/inspector_screen_controller.dart b/packages/devtools_app/lib/src/screens/inspector/inspector_screen_controller.dart
similarity index 100%
rename from packages/devtools_app/lib/src/screens/inspector_v2/inspector_screen_controller.dart
rename to packages/devtools_app/lib/src/screens/inspector/inspector_screen_controller.dart
diff --git a/packages/devtools_app/lib/src/screens/inspector_v2/inspector_settings_dialog.dart b/packages/devtools_app/lib/src/screens/inspector/inspector_settings_dialog.dart
similarity index 100%
rename from packages/devtools_app/lib/src/screens/inspector_v2/inspector_settings_dialog.dart
rename to packages/devtools_app/lib/src/screens/inspector/inspector_settings_dialog.dart
diff --git a/packages/devtools_app/lib/src/screens/inspector_v2/inspector_tree_controller.dart b/packages/devtools_app/lib/src/screens/inspector/inspector_tree_controller.dart
similarity index 98%
rename from packages/devtools_app/lib/src/screens/inspector_v2/inspector_tree_controller.dart
rename to packages/devtools_app/lib/src/screens/inspector/inspector_tree_controller.dart
index a29c12f..4e772e4 100644
--- a/packages/devtools_app/lib/src/screens/inspector_v2/inspector_tree_controller.dart
+++ b/packages/devtools_app/lib/src/screens/inspector/inspector_tree_controller.dart
@@ -16,7 +16,7 @@
import '../../shared/analytics/analytics.dart' as ga;
import '../../shared/analytics/constants.dart' as gac;
import '../../shared/analytics/metrics.dart';
-import '../../shared/console/eval/inspector_tree_v2.dart';
+import '../../shared/console/eval/inspector_tree.dart';
import '../../shared/console/widgets/description.dart';
import '../../shared/diagnostics/diagnostics_node.dart';
import '../../shared/globals.dart';
@@ -133,7 +133,7 @@
gac.inspector,
gac.inspectorTreeControllerInitialized,
nonInteraction: true,
- screenMetricsProvider: () => InspectorScreenMetrics.v2(
+ screenMetricsProvider: () => InspectorScreenMetrics(
inspectorTreeControllerId: gaId,
rootSetCount: _rootSetCount,
rowCount: _rowsInTree.value.length,
@@ -181,7 +181,7 @@
gac.inspector,
gac.inspectorTreeControllerRootChange,
nonInteraction: true,
- screenMetricsProvider: () => InspectorScreenMetrics.v2(
+ screenMetricsProvider: () => InspectorScreenMetrics(
inspectorTreeControllerId: gaId,
rootSetCount: ++_rootSetCount,
rowCount: _rowsInTree.value.length,
@@ -567,7 +567,7 @@
ga.select(
gac.inspector,
gac.treeNodeSelection,
- screenMetricsProvider: () => InspectorScreenMetrics.v2(),
+ screenMetricsProvider: () => InspectorScreenMetrics(),
);
final diagnostic = node?.diagnostic;
if (diagnostic != null && diagnostic.groupIsHidden) {
@@ -1156,7 +1156,7 @@
screenId,
gac.pageReady,
screenMetricsProvider: () =>
- InspectorScreenMetrics.v2(rowCount: rows.length),
+ InspectorScreenMetrics(rowCount: rows.length),
);
unawaited(
serviceConnection.sendDwdsEvent(
@@ -1467,7 +1467,6 @@
isSelected: row.isSelected,
searchValue: searchValue,
errorText: error?.errorMessage,
- emphasizeNodesFromLocalProject: true,
nodeDescriptionHighlightStyle:
searchValue.isEmpty || !row.isSearchMatch
? DiagnosticsTextStyles.regular(
diff --git a/packages/devtools_app/lib/src/screens/inspector_v2/layout_explorer/box/box.dart b/packages/devtools_app/lib/src/screens/inspector/layout_explorer/box/box.dart
similarity index 100%
rename from packages/devtools_app/lib/src/screens/inspector_v2/layout_explorer/box/box.dart
rename to packages/devtools_app/lib/src/screens/inspector/layout_explorer/box/box.dart
diff --git a/packages/devtools_app/lib/src/screens/inspector_v2/layout_explorer/flex/flex.dart b/packages/devtools_app/lib/src/screens/inspector/layout_explorer/flex/flex.dart
similarity index 100%
rename from packages/devtools_app/lib/src/screens/inspector_v2/layout_explorer/flex/flex.dart
rename to packages/devtools_app/lib/src/screens/inspector/layout_explorer/flex/flex.dart
diff --git a/packages/devtools_app/lib/src/screens/inspector_v2/layout_explorer/flex/utils.dart b/packages/devtools_app/lib/src/screens/inspector/layout_explorer/flex/utils.dart
similarity index 100%
rename from packages/devtools_app/lib/src/screens/inspector_v2/layout_explorer/flex/utils.dart
rename to packages/devtools_app/lib/src/screens/inspector/layout_explorer/flex/utils.dart
diff --git a/packages/devtools_app/lib/src/screens/inspector_v2/layout_explorer/ui/arrow.dart b/packages/devtools_app/lib/src/screens/inspector/layout_explorer/ui/arrow.dart
similarity index 100%
rename from packages/devtools_app/lib/src/screens/inspector_v2/layout_explorer/ui/arrow.dart
rename to packages/devtools_app/lib/src/screens/inspector/layout_explorer/ui/arrow.dart
diff --git a/packages/devtools_app/lib/src/screens/inspector_v2/layout_explorer/ui/dimension.dart b/packages/devtools_app/lib/src/screens/inspector/layout_explorer/ui/dimension.dart
similarity index 100%
rename from packages/devtools_app/lib/src/screens/inspector_v2/layout_explorer/ui/dimension.dart
rename to packages/devtools_app/lib/src/screens/inspector/layout_explorer/ui/dimension.dart
diff --git a/packages/devtools_app/lib/src/screens/inspector_v2/layout_explorer/ui/free_space.dart b/packages/devtools_app/lib/src/screens/inspector/layout_explorer/ui/free_space.dart
similarity index 100%
rename from packages/devtools_app/lib/src/screens/inspector_v2/layout_explorer/ui/free_space.dart
rename to packages/devtools_app/lib/src/screens/inspector/layout_explorer/ui/free_space.dart
diff --git a/packages/devtools_app/lib/src/screens/inspector_v2/layout_explorer/ui/layout_explorer_widget.dart b/packages/devtools_app/lib/src/screens/inspector/layout_explorer/ui/layout_explorer_widget.dart
similarity index 100%
rename from packages/devtools_app/lib/src/screens/inspector_v2/layout_explorer/ui/layout_explorer_widget.dart
rename to packages/devtools_app/lib/src/screens/inspector/layout_explorer/ui/layout_explorer_widget.dart
diff --git a/packages/devtools_app/lib/src/screens/inspector_v2/layout_explorer/ui/overflow_indicator_painter.dart b/packages/devtools_app/lib/src/screens/inspector/layout_explorer/ui/overflow_indicator_painter.dart
similarity index 100%
rename from packages/devtools_app/lib/src/screens/inspector_v2/layout_explorer/ui/overflow_indicator_painter.dart
rename to packages/devtools_app/lib/src/screens/inspector/layout_explorer/ui/overflow_indicator_painter.dart
diff --git a/packages/devtools_app/lib/src/screens/inspector_v2/layout_explorer/ui/theme.dart b/packages/devtools_app/lib/src/screens/inspector/layout_explorer/ui/theme.dart
similarity index 100%
rename from packages/devtools_app/lib/src/screens/inspector_v2/layout_explorer/ui/theme.dart
rename to packages/devtools_app/lib/src/screens/inspector/layout_explorer/ui/theme.dart
diff --git a/packages/devtools_app/lib/src/screens/inspector_v2/layout_explorer/ui/utils.dart b/packages/devtools_app/lib/src/screens/inspector/layout_explorer/ui/utils.dart
similarity index 100%
rename from packages/devtools_app/lib/src/screens/inspector_v2/layout_explorer/ui/utils.dart
rename to packages/devtools_app/lib/src/screens/inspector/layout_explorer/ui/utils.dart
diff --git a/packages/devtools_app/lib/src/screens/inspector_v2/layout_explorer/ui/widget_constraints.dart b/packages/devtools_app/lib/src/screens/inspector/layout_explorer/ui/widget_constraints.dart
similarity index 100%
rename from packages/devtools_app/lib/src/screens/inspector_v2/layout_explorer/ui/widget_constraints.dart
rename to packages/devtools_app/lib/src/screens/inspector/layout_explorer/ui/widget_constraints.dart
diff --git a/packages/devtools_app/lib/src/screens/inspector_v2/layout_explorer/ui/widgets_theme.dart b/packages/devtools_app/lib/src/screens/inspector/layout_explorer/ui/widgets_theme.dart
similarity index 100%
rename from packages/devtools_app/lib/src/screens/inspector_v2/layout_explorer/ui/widgets_theme.dart
rename to packages/devtools_app/lib/src/screens/inspector/layout_explorer/ui/widgets_theme.dart
diff --git a/packages/devtools_app/lib/src/screens/inspector_v2/widget_details.dart b/packages/devtools_app/lib/src/screens/inspector/widget_details.dart
similarity index 96%
rename from packages/devtools_app/lib/src/screens/inspector_v2/widget_details.dart
rename to packages/devtools_app/lib/src/screens/inspector/widget_details.dart
index cd8ed21..7f12ed5 100644
--- a/packages/devtools_app/lib/src/screens/inspector_v2/widget_details.dart
+++ b/packages/devtools_app/lib/src/screens/inspector/widget_details.dart
@@ -6,7 +6,7 @@
import 'package:devtools_app_shared/utils.dart';
import 'package:flutter/widgets.dart';
-import '../../shared/console/eval/inspector_tree_v2.dart';
+import '../../shared/console/eval/inspector_tree.dart';
import '../../shared/diagnostics/diagnostics_node.dart';
import 'inspector_controller.dart';
import 'layout_explorer/box/box.dart';
diff --git a/packages/devtools_app/lib/src/screens/inspector_v2/widget_properties/properties_view.dart b/packages/devtools_app/lib/src/screens/inspector/widget_properties/properties_view.dart
similarity index 100%
rename from packages/devtools_app/lib/src/screens/inspector_v2/widget_properties/properties_view.dart
rename to packages/devtools_app/lib/src/screens/inspector/widget_properties/properties_view.dart
diff --git a/packages/devtools_app/lib/src/screens/logging/logging_controller.dart b/packages/devtools_app/lib/src/screens/logging/logging_controller.dart
index 786ff86..da6f1ce 100644
--- a/packages/devtools_app/lib/src/screens/logging/logging_controller.dart
+++ b/packages/devtools_app/lib/src/screens/logging/logging_controller.dart
@@ -27,7 +27,7 @@
import '../../shared/primitives/utils.dart';
import '../../shared/ui/filter.dart';
import '../../shared/ui/search.dart';
-import '../inspector_v2/inspector_tree_controller.dart';
+import '../inspector/inspector_tree_controller.dart';
import 'log_details_controller.dart';
import 'logging_screen.dart';
import 'metadata.dart';
diff --git a/packages/devtools_app/lib/src/shared/analytics/_analytics_web.dart b/packages/devtools_app/lib/src/shared/analytics/_analytics_web.dart
index 635e5ce..aef066c 100644
--- a/packages/devtools_app/lib/src/shared/analytics/_analytics_web.dart
+++ b/packages/devtools_app/lib/src/shared/analytics/_analytics_web.dart
@@ -200,8 +200,12 @@
? screenMetrics.iosBundleId
: null,
// [InspectorScreenMetrics]
+ // TODO(https://github.com/flutter/devtools/issues/9563): Remove this
+ // dimension after dashboards have been updated to not include it. The
+ // legacy inspector will be removed in Flutter 3.47 (Aug 2026), leaving
+ // the V2 inspector the only inspector.
isV2Inspector: screenMetrics is InspectorScreenMetrics
- ? screenMetrics.isV2.toString()
+ ? true.toString()
: null,
);
}
@@ -371,7 +375,7 @@
: null,
// [InspectorScreenMetrics]
isV2Inspector: screenMetrics is InspectorScreenMetrics
- ? screenMetrics.isV2.toString()
+ ? true.toString()
: null,
);
}
diff --git a/packages/devtools_app/lib/src/shared/analytics/constants.dart b/packages/devtools_app/lib/src/shared/analytics/constants.dart
index aaf721b..3d29326 100644
--- a/packages/devtools_app/lib/src/shared/analytics/constants.dart
+++ b/packages/devtools_app/lib/src/shared/analytics/constants.dart
@@ -134,8 +134,6 @@
const wasm = 'wasm';
const verboseLogging = 'verboseLogging';
const inspectorHoverEvalMode = 'inspectorHoverEvalMode';
-const inspectorV2Enabled = 'inspectorV2Enabled';
-const inspectorV2Disabled = 'inspectorV2Disabled';
const inspectorAutoRefreshEnabled = 'inspectorAutoRefreshEnabled';
const clearLogs = 'clearLogs';
const copyLogs = 'copyLogs';
diff --git a/packages/devtools_app/lib/src/shared/analytics/metrics.dart b/packages/devtools_app/lib/src/shared/analytics/metrics.dart
index a1be45f..70a8465 100644
--- a/packages/devtools_app/lib/src/shared/analytics/metrics.dart
+++ b/packages/devtools_app/lib/src/shared/analytics/metrics.dart
@@ -2,7 +2,7 @@
// Use of this source code is governed by a BSD-style license that can be
// found in the LICENSE file or at https://developers.google.com/open-source/licenses/bsd.
-/// @docImport '../../screens/inspector_v2/inspector_tree_controller.dart';
+/// @docImport '../../screens/inspector/inspector_tree_controller.dart';
/// @docImport '../../screens/performance/panes/flutter_frames/flutter_frame_model.dart';
library;
@@ -67,18 +67,15 @@
}
class InspectorScreenMetrics extends ScreenAnalyticsMetrics {
- InspectorScreenMetrics.v2({
+ InspectorScreenMetrics({
this.rootSetCount,
this.rowCount,
this.inspectorTreeControllerId,
- }) : isV2 = true;
+ });
static const summaryTreeGaId = 0;
static const detailsTreeGaId = 1;
- /// Whether these metrics are for the V2 inspector.
- final bool isV2;
-
/// The number of times the root has been set, since the
/// [InspectorTreeController] with id [inspectorTreeControllerId], has been
/// initialized.
diff --git a/packages/devtools_app/lib/src/shared/console/eval/inspector_tree_v2.dart b/packages/devtools_app/lib/src/shared/console/eval/inspector_tree.dart
similarity index 100%
rename from packages/devtools_app/lib/src/shared/console/eval/inspector_tree_v2.dart
rename to packages/devtools_app/lib/src/shared/console/eval/inspector_tree.dart
diff --git a/packages/devtools_app/lib/src/shared/console/widgets/description.dart b/packages/devtools_app/lib/src/shared/console/widgets/description.dart
index f7006f9..1d914af 100644
--- a/packages/devtools_app/lib/src/shared/console/widgets/description.dart
+++ b/packages/devtools_app/lib/src/shared/console/widgets/description.dart
@@ -2,7 +2,7 @@
// Use of this source code is governed by a BSD-style license that can be
// found in the LICENSE file or at https://developers.google.com/open-source/licenses/bsd.
-/// @docImport '../../../screens/inspector_v2/inspector_tree_controller.dart';
+/// @docImport '../../../screens/inspector/inspector_tree_controller.dart';
library;
import 'package:devtools_app_shared/ui.dart';
@@ -17,7 +17,7 @@
import '../../ui/hover.dart';
import '../../ui/icons.dart';
import '../../ui/utils.dart';
-import '../eval/inspector_tree_v2.dart';
+import '../eval/inspector_tree.dart';
import 'expandable_variable.dart';
final _colorIconMaker = ColorIconMaker();
@@ -41,7 +41,6 @@
this.multiline = false,
this.style,
this.nodeDescriptionHighlightStyle,
- this.emphasizeNodesFromLocalProject = false,
this.actionLabel,
this.actionCallback,
this.customDescription,
@@ -57,10 +56,6 @@
final bool multiline;
final TextStyle? style;
final TextStyle? nodeDescriptionHighlightStyle;
- // TODO(https://github.com/flutter/devtools/issues/7860): Remove and default
- // to true when turning on inspector V2. This is currently true for the V2
- // inspector and false for the legacy inspector.
- final bool emphasizeNodesFromLocalProject;
final String? actionLabel;
final VoidCallback? actionCallback;
final String? customDescription;
@@ -307,7 +302,10 @@
);
// provide some contrast between the name and description if both are
// present.
- textStyle = textStyle.merge(theme.subtleTextStyle);
+ final fontSize = textStyle.fontSize;
+ textStyle = textStyle.merge(
+ theme.subtleTextStyle.copyWith(fontSize: fontSize),
+ );
}
if (diagnosticLocal.isCreatedByLocalProject) {
@@ -399,21 +397,14 @@
}
}
- // TODO(https://github.com/flutter/devtools/issues/7860): Remove this
- // if-block once the widget details tree is gone. This bolding is only
- // used there.
- if (!emphasizeNodesFromLocalProject &&
- !diagnosticLocal.isSummaryTree &&
- diagnosticLocal.isCreatedByLocalProject) {
- textStyle = textStyle.merge(DiagnosticsTextStyles.regularBold);
- }
-
// Grey out nodes that were not created by the local project to emphasize
// those that were:
- if (emphasizeNodesFromLocalProject &&
- !diagnosticLocal.isCreatedByLocalProject &&
+ if (!diagnosticLocal.isCreatedByLocalProject &&
diagnosticLocal.description != '[root]') {
- textStyle = textStyle.merge(theme.subtleTextStyle);
+ final fontSize = textStyle.fontSize;
+ textStyle = textStyle.merge(
+ theme.subtleTextStyle.copyWith(fontSize: fontSize),
+ );
}
var diagnosticDescription = buildDescription(
diff --git a/packages/devtools_app/lib/src/shared/diagnostics/diagnostics_node.dart b/packages/devtools_app/lib/src/shared/diagnostics/diagnostics_node.dart
index b149944..9f07dbb 100644
--- a/packages/devtools_app/lib/src/shared/diagnostics/diagnostics_node.dart
+++ b/packages/devtools_app/lib/src/shared/diagnostics/diagnostics_node.dart
@@ -13,7 +13,7 @@
import 'package:flutter/rendering.dart';
import 'package:vm_service/vm_service.dart';
-import '../../screens/inspector_v2/inspector_data_models.dart';
+import '../../screens/inspector/inspector_data_models.dart';
import '../primitives/utils.dart';
import '../ui/icons.dart';
import 'object_group_api.dart';
diff --git a/packages/devtools_app/lib/src/shared/feature_flags.dart b/packages/devtools_app/lib/src/shared/feature_flags.dart
index a5cef0c..0788278 100644
--- a/packages/devtools_app/lib/src/shared/feature_flags.dart
+++ b/packages/devtools_app/lib/src/shared/feature_flags.dart
@@ -69,14 +69,6 @@
enabled: enableExperiments,
);
- /// Flag to enable the new Inspector panel.
- ///
- /// https://github.com/flutter/devtools/issues/7854
- static final inspectorV2 = BooleanFeatureFlag(
- name: 'inspectorV2',
- enabled: true,
- );
-
/// A set of all the boolean feature flags for debugging purposes.
///
/// When adding a new boolean flag, you are responsible for adding it to this
@@ -85,7 +77,6 @@
memorySaveLoad,
devToolsExtensions,
dapDebugging,
- inspectorV2,
};
/// A set of all the Flutter channel feature flags for debugging purposes.
diff --git a/packages/devtools_app/lib/src/shared/managers/error_badge_manager.dart b/packages/devtools_app/lib/src/shared/managers/error_badge_manager.dart
index aadfe08..16950eb 100644
--- a/packages/devtools_app/lib/src/shared/managers/error_badge_manager.dart
+++ b/packages/devtools_app/lib/src/shared/managers/error_badge_manager.dart
@@ -11,7 +11,7 @@
import 'package:flutter/foundation.dart';
import 'package:vm_service/vm_service.dart';
-import '../../screens/inspector_v2/inspector_screen.dart';
+import '../../screens/inspector/inspector_screen.dart';
import '../../screens/logging/logging_screen.dart';
import '../../screens/network/network_screen.dart';
import '../../screens/performance/performance_screen.dart';
diff --git a/packages/devtools_app/lib/src/shared/preferences/preferences.dart b/packages/devtools_app/lib/src/shared/preferences/preferences.dart
index 06ee38c..a15d6d4 100644
--- a/packages/devtools_app/lib/src/shared/preferences/preferences.dart
+++ b/packages/devtools_app/lib/src/shared/preferences/preferences.dart
@@ -106,8 +106,6 @@
ExtensionsPreferencesController get devToolsExtensions => _extensions;
final _extensions = ExtensionsPreferencesController();
- // TODO(https://github.com/flutter/devtools/issues/7860): Clean-up after
- // Inspector V2 has been released.
InspectorPreferencesController get inspector => _inspector;
final _inspector = InspectorPreferencesController();
diff --git a/packages/devtools_app/lib/src/shared/ui/icons.dart b/packages/devtools_app/lib/src/shared/ui/icons.dart
index 979cf15..9feaa28 100644
--- a/packages/devtools_app/lib/src/shared/ui/icons.dart
+++ b/packages/devtools_app/lib/src/shared/ui/icons.dart
@@ -13,7 +13,7 @@
import 'package:devtools_app_shared/ui.dart';
import 'package:flutter/material.dart';
-import '../../screens/inspector_v2/layout_explorer/ui/widgets_theme.dart';
+import '../../screens/inspector/layout_explorer/ui/widgets_theme.dart';
import 'colors.dart';
class CustomIcon extends StatelessWidget {
diff --git a/packages/devtools_app/test/screens/inspector_v2/diagnostics_test.dart b/packages/devtools_app/test/screens/inspector/diagnostics_test.dart
similarity index 100%
rename from packages/devtools_app/test/screens/inspector_v2/diagnostics_test.dart
rename to packages/devtools_app/test/screens/inspector/diagnostics_test.dart
diff --git a/packages/devtools_app/test/screens/inspector_v2/inspector_error_navigator_test.dart b/packages/devtools_app/test/screens/inspector/inspector_error_navigator_test.dart
similarity index 100%
rename from packages/devtools_app/test/screens/inspector_v2/inspector_error_navigator_test.dart
rename to packages/devtools_app/test/screens/inspector/inspector_error_navigator_test.dart
diff --git a/packages/devtools_app/test/screens/inspector_v2/inspector_integration_test.dart b/packages/devtools_app/test/screens/inspector/inspector_integration_test.dart
similarity index 94%
rename from packages/devtools_app/test/screens/inspector_v2/inspector_integration_test.dart
rename to packages/devtools_app/test/screens/inspector/inspector_integration_test.dart
index 2e5a7fa..65ab143 100644
--- a/packages/devtools_app/test/screens/inspector_v2/inspector_integration_test.dart
+++ b/packages/devtools_app/test/screens/inspector/inspector_integration_test.dart
@@ -9,8 +9,9 @@
import 'package:collection/collection.dart';
import 'package:devtools_app/devtools_app.dart';
-import 'package:devtools_app/src/screens/inspector_v2/layout_explorer/ui/utils.dart';
-import 'package:devtools_app/src/screens/inspector_v2/widget_properties/properties_view.dart';
+import 'package:devtools_app/src/screens/inspector/layout_explorer/ui/utils.dart';
+import 'package:devtools_app/src/screens/inspector/widget_properties/properties_view.dart';
+import 'package:devtools_app/src/shared/ui/tab.dart';
import 'package:devtools_app_shared/ui.dart';
import 'package:devtools_app_shared/utils.dart';
import 'package:devtools_test/helpers.dart';
@@ -80,7 +81,7 @@
await expectLater(
find.byType(InspectorScreenBody),
matchesDevToolsGolden(
- '../../test_infra/goldens/integration_inspector_v2_initial_load.png',
+ '../../test_infra/goldens/integration_inspector_initial_load.png',
),
);
});
@@ -110,7 +111,7 @@
await expectLater(
find.byType(InspectorScreenBody),
matchesDevToolsGolden(
- '../../test_infra/goldens/integration_inspector_v2_after_hot_restart.png',
+ '../../test_infra/goldens/integration_inspector_after_hot_restart.png',
),
);
},
@@ -128,7 +129,7 @@
await expectLater(
find.byType(InspectorScreenBody),
matchesDevToolsGolden(
- '../../test_infra/goldens/integration_inspector_v2_select_center.png',
+ '../../test_infra/goldens/integration_inspector_select_center.png',
),
);
@@ -170,7 +171,7 @@
await expectLater(
find.byType(InspectorScreenBody),
matchesDevToolsGolden(
- '../../test_infra/goldens/integration_inspector_v2_implementation_widgets_expanded.png',
+ '../../test_infra/goldens/integration_inspector_implementation_widgets_expanded.png',
),
// Implementation widgets from Flutter framework are not guaranteed to
// be stable.
@@ -184,7 +185,7 @@
await expectLater(
find.byType(InspectorScreenBody),
matchesDevToolsGolden(
- '../../test_infra/goldens/integration_inspector_v2_hideable_widget_selected.png',
+ '../../test_infra/goldens/integration_inspector_hideable_widget_selected.png',
),
// Implementation widgets from Flutter framework are not guaranteed to
// be stable.
@@ -202,7 +203,7 @@
await expectLater(
find.byType(InspectorScreenBody),
matchesDevToolsGolden(
- '../../test_infra/goldens/integration_inspector_v2_implementation_widgets_collapsed.png',
+ '../../test_infra/goldens/integration_inspector_implementation_widgets_collapsed.png',
),
);
},
@@ -238,7 +239,7 @@
await expectLater(
find.byType(InspectorScreenBody),
matchesDevToolsGolden(
- '../../test_infra/goldens/integration_inspector_v2_hideable_widget_selected_from_search.png',
+ '../../test_infra/goldens/integration_inspector_hideable_widget_selected_from_search.png',
),
// Implementation widgets from Flutter framework are not guaranteed to
// be stable.
@@ -267,7 +268,7 @@
await expectLater(
find.byType(InspectorScreenBody),
matchesDevToolsGolden(
- '../../test_infra/goldens/integration_inspector_v2_implementation_widgets_hidden.png',
+ '../../test_infra/goldens/integration_inspector_implementation_widgets_hidden.png',
),
);
@@ -525,7 +526,7 @@
await expectLater(
find.byType(InspectorScreenBody),
matchesDevToolsGolden(
- '../../test_infra/goldens/integration_inspector_v2_errors_1_initial_load.png',
+ '../../test_infra/goldens/integration_inspector_errors_1_initial_load.png',
),
);
@@ -534,10 +535,18 @@
await tester.tap(find.byIcon(Icons.keyboard_arrow_down));
await tester.pumpAndSettle(inspectorChangeSettleTime);
}
+
+ final flexExplorerTab = find.descendant(
+ of: find.byType(DevToolsTab),
+ matching: find.text('Flex explorer'),
+ );
+ await tester.tap(flexExplorerTab);
+ await tester.pumpAndSettle(inspectorChangeSettleTime);
+
await expectLater(
find.byType(InspectorScreenBody),
matchesDevToolsGolden(
- '../../test_infra/goldens/integration_inspector_v2_errors_2_error_selected.png',
+ '../../test_infra/goldens/integration_inspector_errors_2_error_selected.png',
),
);
});
diff --git a/packages/devtools_app/test/screens/inspector_v2/inspector_screen_test.dart b/packages/devtools_app/test/screens/inspector/inspector_screen_test.dart
similarity index 97%
rename from packages/devtools_app/test/screens/inspector_v2/inspector_screen_test.dart
rename to packages/devtools_app/test/screens/inspector/inspector_screen_test.dart
index 2886318..32cebaa 100644
--- a/packages/devtools_app/test/screens/inspector_v2/inspector_screen_test.dart
+++ b/packages/devtools_app/test/screens/inspector/inspector_screen_test.dart
@@ -8,9 +8,9 @@
import 'dart:convert';
import 'package:devtools_app/devtools_app.dart';
-import 'package:devtools_app/src/screens/inspector_v2/inspector_settings_dialog.dart';
-import 'package:devtools_app/src/screens/inspector_v2/layout_explorer/flex/flex.dart';
-import 'package:devtools_app/src/screens/inspector_v2/widget_details.dart';
+import 'package:devtools_app/src/screens/inspector/inspector_settings_dialog.dart';
+import 'package:devtools_app/src/screens/inspector/layout_explorer/flex/flex.dart';
+import 'package:devtools_app/src/screens/inspector/widget_details.dart';
import 'package:devtools_app/src/service/service_extensions.dart' as extensions;
import 'package:devtools_app/src/shared/feature_flags.dart';
import 'package:devtools_app/src/shared/ui/tab.dart';
diff --git a/packages/devtools_app/test/screens/inspector_v2/inspector_tree_test.dart b/packages/devtools_app/test/screens/inspector/inspector_tree_test.dart
similarity index 100%
rename from packages/devtools_app/test/screens/inspector_v2/inspector_tree_test.dart
rename to packages/devtools_app/test/screens/inspector/inspector_tree_test.dart
diff --git a/packages/devtools_app/test/screens/inspector_v2/layout_explorer/flex/arrow_test.dart b/packages/devtools_app/test/screens/inspector/layout_explorer/flex/arrow_test.dart
similarity index 95%
rename from packages/devtools_app/test/screens/inspector_v2/layout_explorer/flex/arrow_test.dart
rename to packages/devtools_app/test/screens/inspector/layout_explorer/flex/arrow_test.dart
index 587958b..2b5bf8c 100644
--- a/packages/devtools_app/test/screens/inspector_v2/layout_explorer/flex/arrow_test.dart
+++ b/packages/devtools_app/test/screens/inspector/layout_explorer/flex/arrow_test.dart
@@ -2,7 +2,7 @@
// Use of this source code is governed by a BSD-style license that can be
// found in the LICENSE file or at https://developers.google.com/open-source/licenses/bsd.
-import 'package:devtools_app/src/screens/inspector_v2/layout_explorer/ui/arrow.dart';
+import 'package:devtools_app/src/screens/inspector/layout_explorer/ui/arrow.dart';
import 'package:flutter/foundation.dart';
import 'package:flutter/material.dart';
import 'package:flutter_test/flutter_test.dart';
@@ -11,7 +11,7 @@
void main() {
const relativeGoldenPath =
- '../../../../test_infra/goldens/inspector_v2/layout_explorer/flex';
+ '../../../../test_infra/goldens/inspector/layout_explorer/flex';
group('Arrow Golden Tests', () {
group('Unidirectional', () {
diff --git a/packages/devtools_app/test/screens/inspector_v2/layout_explorer/flex/flex_test.dart b/packages/devtools_app/test/screens/inspector/layout_explorer/flex/flex_test.dart
similarity index 98%
rename from packages/devtools_app/test/screens/inspector_v2/layout_explorer/flex/flex_test.dart
rename to packages/devtools_app/test/screens/inspector/layout_explorer/flex/flex_test.dart
index 9c64239..a8b5264 100644
--- a/packages/devtools_app/test/screens/inspector_v2/layout_explorer/flex/flex_test.dart
+++ b/packages/devtools_app/test/screens/inspector/layout_explorer/flex/flex_test.dart
@@ -4,8 +4,8 @@
import 'dart:convert';
-import 'package:devtools_app/src/screens/inspector_v2/layout_explorer/flex/flex.dart';
-import 'package:devtools_app/src/shared/console/eval/inspector_tree_v2.dart';
+import 'package:devtools_app/src/screens/inspector/layout_explorer/flex/flex.dart';
+import 'package:devtools_app/src/shared/console/eval/inspector_tree.dart';
import 'package:devtools_app/src/shared/diagnostics/diagnostics_node.dart';
import 'package:devtools_test/devtools_test.dart';
import 'package:devtools_test/helpers.dart';
@@ -19,7 +19,7 @@
void main() {
const windowSize = Size(1750, 1750);
const relativeGoldenPath =
- '../../../../test_infra/goldens/inspector_v2/layout_explorer/flex';
+ '../../../../test_infra/goldens/inspector/layout_explorer/flex';
Map<String, Object> buildDiagnosticsNodeJson(Axis axis) => jsonDecode('''
{
diff --git a/packages/devtools_app/test/screens/inspector_v2/layout_explorer/inspector_data_models_test.dart b/packages/devtools_app/test/screens/inspector/layout_explorer/inspector_data_models_test.dart
similarity index 98%
rename from packages/devtools_app/test/screens/inspector_v2/layout_explorer/inspector_data_models_test.dart
rename to packages/devtools_app/test/screens/inspector/layout_explorer/inspector_data_models_test.dart
index 6c8302d..a8e0cd0 100644
--- a/packages/devtools_app/test/screens/inspector_v2/layout_explorer/inspector_data_models_test.dart
+++ b/packages/devtools_app/test/screens/inspector/layout_explorer/inspector_data_models_test.dart
@@ -2,8 +2,8 @@
// Use of this source code is governed by a BSD-style license that can be
// found in the LICENSE file or at https://developers.google.com/open-source/licenses/bsd.
-import 'package:devtools_app/src/screens/inspector_v2/inspector_data_models.dart';
-import 'package:devtools_app/src/screens/inspector_v2/layout_explorer/ui/theme.dart';
+import 'package:devtools_app/src/screens/inspector/inspector_data_models.dart';
+import 'package:devtools_app/src/screens/inspector/layout_explorer/ui/theme.dart';
import 'package:devtools_app/src/shared/primitives/math_utils.dart';
import 'package:devtools_app_shared/ui.dart';
import 'package:devtools_app_shared/utils.dart';
diff --git a/packages/devtools_app/test/screens/inspector_v2/layout_explorer/layout_explorer_serialization_delegate.dart b/packages/devtools_app/test/screens/inspector/layout_explorer/layout_explorer_serialization_delegate.dart
similarity index 100%
rename from packages/devtools_app/test/screens/inspector_v2/layout_explorer/layout_explorer_serialization_delegate.dart
rename to packages/devtools_app/test/screens/inspector/layout_explorer/layout_explorer_serialization_delegate.dart
diff --git a/packages/devtools_app/test/screens/inspector_v2/layout_explorer/layout_explorer_test_utils.dart b/packages/devtools_app/test/screens/inspector/layout_explorer/layout_explorer_test_utils.dart
similarity index 100%
rename from packages/devtools_app/test/screens/inspector_v2/layout_explorer/layout_explorer_test_utils.dart
rename to packages/devtools_app/test/screens/inspector/layout_explorer/layout_explorer_test_utils.dart
diff --git a/packages/devtools_app/test/screens/inspector_v2/layout_explorer/widget_theme_test.dart b/packages/devtools_app/test/screens/inspector/layout_explorer/widget_theme_test.dart
similarity index 88%
rename from packages/devtools_app/test/screens/inspector_v2/layout_explorer/widget_theme_test.dart
rename to packages/devtools_app/test/screens/inspector/layout_explorer/widget_theme_test.dart
index 7e3bd1a..95beb1f 100644
--- a/packages/devtools_app/test/screens/inspector_v2/layout_explorer/widget_theme_test.dart
+++ b/packages/devtools_app/test/screens/inspector/layout_explorer/widget_theme_test.dart
@@ -2,7 +2,7 @@
// Use of this source code is governed by a BSD-style license that can be
// found in the LICENSE file or at https://developers.google.com/open-source/licenses/bsd.
-import 'package:devtools_app/src/screens/inspector_v2/layout_explorer/ui/widgets_theme.dart';
+import 'package:devtools_app/src/screens/inspector/layout_explorer/ui/widgets_theme.dart';
import 'package:flutter_test/flutter_test.dart';
void main() {
diff --git a/packages/devtools_app/test/screens/inspector_v2/utils/inspector_tree.dart b/packages/devtools_app/test/screens/inspector/utils/inspector_tree.dart
similarity index 100%
rename from packages/devtools_app/test/screens/inspector_v2/utils/inspector_tree.dart
rename to packages/devtools_app/test/screens/inspector/utils/inspector_tree.dart
diff --git a/packages/devtools_app/test/shared/managers/error_badge_manager_test.dart b/packages/devtools_app/test/shared/managers/error_badge_manager_test.dart
index 13ea519..e5f17d1 100644
--- a/packages/devtools_app/test/shared/managers/error_badge_manager_test.dart
+++ b/packages/devtools_app/test/shared/managers/error_badge_manager_test.dart
@@ -4,7 +4,7 @@
import 'package:devtools_app/src/screens/app_size/app_size_screen.dart';
import 'package:devtools_app/src/screens/debugger/debugger_screen.dart';
-import 'package:devtools_app/src/screens/inspector_v2/inspector_screen.dart';
+import 'package:devtools_app/src/screens/inspector/inspector_screen.dart';
import 'package:devtools_app/src/screens/logging/logging_screen.dart';
import 'package:devtools_app/src/screens/memory/framework/memory_screen.dart';
import 'package:devtools_app/src/screens/network/network_screen.dart';
diff --git a/packages/devtools_app/test/shared/primitives/feature_flags_test.dart b/packages/devtools_app/test/shared/primitives/feature_flags_test.dart
index f1d6665..959e78a 100644
--- a/packages/devtools_app/test/shared/primitives/feature_flags_test.dart
+++ b/packages/devtools_app/test/shared/primitives/feature_flags_test.dart
@@ -19,7 +19,6 @@
expect(FeatureFlags.memorySaveLoad.isEnabled, false);
expect(FeatureFlags.devToolsExtensions.isEnabled, isExternalBuild);
expect(FeatureFlags.dapDebugging.isEnabled, false);
- expect(FeatureFlags.inspectorV2.isEnabled, true);
});
group('FlutterChannelFeatureFlag', () {
diff --git a/packages/devtools_app/test/test_infra/goldens/integration_inspector_errors_1_initial_load.png b/packages/devtools_app/test/test_infra/goldens/integration_inspector_errors_1_initial_load.png
index 3c50814..600a105 100644
--- a/packages/devtools_app/test/test_infra/goldens/integration_inspector_errors_1_initial_load.png
+++ b/packages/devtools_app/test/test_infra/goldens/integration_inspector_errors_1_initial_load.png
Binary files differ
diff --git a/packages/devtools_app/test/test_infra/goldens/integration_inspector_errors_2_error_selected.png b/packages/devtools_app/test/test_infra/goldens/integration_inspector_errors_2_error_selected.png
index 80f0bf9..b99de91 100644
--- a/packages/devtools_app/test/test_infra/goldens/integration_inspector_errors_2_error_selected.png
+++ b/packages/devtools_app/test/test_infra/goldens/integration_inspector_errors_2_error_selected.png
Binary files differ
diff --git a/packages/devtools_app/test/test_infra/goldens/integration_inspector_v2_implementation_widgets_collapsed.png b/packages/devtools_app/test/test_infra/goldens/integration_inspector_implementation_widgets_collapsed.png
similarity index 100%
rename from packages/devtools_app/test/test_infra/goldens/integration_inspector_v2_implementation_widgets_collapsed.png
rename to packages/devtools_app/test/test_infra/goldens/integration_inspector_implementation_widgets_collapsed.png
Binary files differ
diff --git a/packages/devtools_app/test/test_infra/goldens/integration_inspector_v2_implementation_widgets_hidden.png b/packages/devtools_app/test/test_infra/goldens/integration_inspector_implementation_widgets_hidden.png
similarity index 99%
rename from packages/devtools_app/test/test_infra/goldens/integration_inspector_v2_implementation_widgets_hidden.png
rename to packages/devtools_app/test/test_infra/goldens/integration_inspector_implementation_widgets_hidden.png
index f1347bd..088c3c2 100644
--- a/packages/devtools_app/test/test_infra/goldens/integration_inspector_v2_implementation_widgets_hidden.png
+++ b/packages/devtools_app/test/test_infra/goldens/integration_inspector_implementation_widgets_hidden.png
Binary files differ
diff --git a/packages/devtools_app/test/test_infra/goldens/integration_inspector_initial_load.png b/packages/devtools_app/test/test_infra/goldens/integration_inspector_initial_load.png
index fc7ac52..e8c2b4b 100644
--- a/packages/devtools_app/test/test_infra/goldens/integration_inspector_initial_load.png
+++ b/packages/devtools_app/test/test_infra/goldens/integration_inspector_initial_load.png
Binary files differ
diff --git a/packages/devtools_app/test/test_infra/goldens/integration_inspector_select_center.png b/packages/devtools_app/test/test_infra/goldens/integration_inspector_select_center.png
index 18394b8..250bcee 100644
--- a/packages/devtools_app/test/test_infra/goldens/integration_inspector_select_center.png
+++ b/packages/devtools_app/test/test_infra/goldens/integration_inspector_select_center.png
Binary files differ
diff --git a/packages/devtools_app/test/test_infra/goldens/integration_inspector_v2_after_hot_restart.png b/packages/devtools_app/test/test_infra/goldens/integration_inspector_v2_after_hot_restart.png
deleted file mode 100644
index 0663126..0000000
--- a/packages/devtools_app/test/test_infra/goldens/integration_inspector_v2_after_hot_restart.png
+++ /dev/null
Binary files differ
diff --git a/packages/devtools_app/test/test_infra/goldens/integration_inspector_v2_animated_physical_model_selected.png b/packages/devtools_app/test/test_infra/goldens/integration_inspector_v2_animated_physical_model_selected.png
deleted file mode 100644
index 8eefb4f..0000000
--- a/packages/devtools_app/test/test_infra/goldens/integration_inspector_v2_animated_physical_model_selected.png
+++ /dev/null
Binary files differ
diff --git a/packages/devtools_app/test/test_infra/goldens/integration_inspector_v2_errors_1_initial_load.png b/packages/devtools_app/test/test_infra/goldens/integration_inspector_v2_errors_1_initial_load.png
deleted file mode 100644
index 5904b37..0000000
--- a/packages/devtools_app/test/test_infra/goldens/integration_inspector_v2_errors_1_initial_load.png
+++ /dev/null
Binary files differ
diff --git a/packages/devtools_app/test/test_infra/goldens/integration_inspector_v2_errors_2_error_selected.png b/packages/devtools_app/test/test_infra/goldens/integration_inspector_v2_errors_2_error_selected.png
deleted file mode 100644
index d64b611..0000000
--- a/packages/devtools_app/test/test_infra/goldens/integration_inspector_v2_errors_2_error_selected.png
+++ /dev/null
Binary files differ
diff --git a/packages/devtools_app/test/test_infra/goldens/integration_inspector_v2_hideable_widget_selected.png b/packages/devtools_app/test/test_infra/goldens/integration_inspector_v2_hideable_widget_selected.png
deleted file mode 100644
index 58b46a7..0000000
--- a/packages/devtools_app/test/test_infra/goldens/integration_inspector_v2_hideable_widget_selected.png
+++ /dev/null
Binary files differ
diff --git a/packages/devtools_app/test/test_infra/goldens/integration_inspector_v2_hideable_widget_selected_from_search.png b/packages/devtools_app/test/test_infra/goldens/integration_inspector_v2_hideable_widget_selected_from_search.png
deleted file mode 100644
index 58b46a7..0000000
--- a/packages/devtools_app/test/test_infra/goldens/integration_inspector_v2_hideable_widget_selected_from_search.png
+++ /dev/null
Binary files differ
diff --git a/packages/devtools_app/test/test_infra/goldens/integration_inspector_v2_implementation_widgets_expanded.png b/packages/devtools_app/test/test_infra/goldens/integration_inspector_v2_implementation_widgets_expanded.png
deleted file mode 100644
index 1bf9291..0000000
--- a/packages/devtools_app/test/test_infra/goldens/integration_inspector_v2_implementation_widgets_expanded.png
+++ /dev/null
Binary files differ
diff --git a/packages/devtools_app/test/test_infra/goldens/integration_inspector_v2_initial_load.png b/packages/devtools_app/test/test_infra/goldens/integration_inspector_v2_initial_load.png
deleted file mode 100644
index 26d0044..0000000
--- a/packages/devtools_app/test/test_infra/goldens/integration_inspector_v2_initial_load.png
+++ /dev/null
Binary files differ
diff --git a/packages/devtools_app/test/test_infra/goldens/integration_inspector_v2_revert_to_legacy.png b/packages/devtools_app/test/test_infra/goldens/integration_inspector_v2_revert_to_legacy.png
deleted file mode 100644
index 60a194d..0000000
--- a/packages/devtools_app/test/test_infra/goldens/integration_inspector_v2_revert_to_legacy.png
+++ /dev/null
Binary files differ
diff --git a/packages/devtools_app/test/test_infra/goldens/integration_inspector_v2_select_center.png b/packages/devtools_app/test/test_infra/goldens/integration_inspector_v2_select_center.png
deleted file mode 100644
index d2d00d9..0000000
--- a/packages/devtools_app/test/test_infra/goldens/integration_inspector_v2_select_center.png
+++ /dev/null
Binary files differ
diff --git a/tool/flutter_customer_tests/test.sh b/tool/flutter_customer_tests/test.sh
index 3ab2891..b8b1080 100755
--- a/tool/flutter_customer_tests/test.sh
+++ b/tool/flutter_customer_tests/test.sh
@@ -22,5 +22,4 @@
flutter pub get
flutter test --tags=include-for-flutter-customer-tests test/
flutter test --exclude-tags=skip-for-flutter-customer-tests test/screens/inspector/
-flutter test --exclude-tags=skip-for-flutter-customer-tests test/screens/inspector_v2/
flutter test --exclude-tags=skip-for-flutter-customer-tests test/shared/
