Rename Inspector V2 --> Inspector

packages/devtools_app/lib/devtools_app.dart

@@ -24,11 +24,11 @@ export 'src/screens/deep_link_validation/deep_links_controller.dart';
 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/analytics/analytics_controller.dart';
 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';

packages/devtools_app/lib/src/app.dart

@@ -31,8 +31,8 @@ import 'screens/deep_link_validation/deep_links_controller.dart';
 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 @@ List<DevToolsScreen> defaultScreens({
     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(),

packages/devtools_app/lib/src/screens/inspector_v2/inspector_controller.dart → packages/devtools_app/lib/src/screens/inspector/inspector_controller.dart

@@ -26,7 +26,7 @@ import '../../service/service_extensions.dart' as extensions;
 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 @@ class InspectorController extends DisposableController
       ga.select(
         gac.inspector,
         gac.refreshEmptyTree,
-        screenMetricsProvider: () => InspectorScreenMetrics.v2(),
+        screenMetricsProvider: () => InspectorScreenMetrics(),
       );
       firstInspectorTreeLoadCompleted = true;
     }
@@ -776,7 +776,7 @@ class InspectorController extends DisposableController
       ga.select(
         gac.inspector,
         gac.onDeviceSelection,
-        screenMetricsProvider: () => InspectorScreenMetrics.v2(),
+        screenMetricsProvider: () => InspectorScreenMetrics(),
       );
     } catch (error, st) {
       if (selectionGroups.next == group) {

packages/devtools_app/lib/src/screens/inspector_v2/inspector_controls.dart → packages/devtools_app/lib/src/screens/inspector/inspector_controls.dart

@@ -10,7 +10,6 @@ import 'package:flutter/material.dart';
 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 @@ class InspectorControls extends StatelessWidget {
     final activeButtonColor = Theme.of(
       context,
     ).colorScheme.activeToggleButtonColor;
-    final isInspectorV2 =
-        controller != null && FeatureFlags.inspectorV2.isEnabled;
     return Row(
       crossAxisAlignment: CrossAxisAlignment.start,
       children: [
@@ -49,16 +46,13 @@ class InspectorControls extends StatelessWidget {
                     : 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(),

packages/devtools_app/lib/src/screens/inspector_v2/inspector_data_models.dart → 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;

packages/devtools_app/lib/src/screens/inspector_v2/inspector_screen_body.dart → packages/devtools_app/lib/src/screens/inspector/inspector_screen_body.dart

@@ -12,7 +12,7 @@ import 'package:flutter/material.dart';
 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 @@ class InspectorScreenBodyState extends State<InspectorScreenBody>
     ga.select(
       gac.inspector,
       gac.refresh,
-      screenMetricsProvider: () => InspectorScreenMetrics.v2(),
+      screenMetricsProvider: () => InspectorScreenMetrics(),
     );
     unawaited(
       blockWhileInProgress(() async {

packages/devtools_app/lib/src/screens/inspector_v2/inspector_tree_controller.dart → packages/devtools_app/lib/src/screens/inspector/inspector_tree_controller.dart

@@ -16,7 +16,7 @@ import 'package:logging/logging.dart';
 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 @@ class InspectorTreeController extends DisposableController
       gac.inspector,
       gac.inspectorTreeControllerInitialized,
       nonInteraction: true,
-      screenMetricsProvider: () => InspectorScreenMetrics.v2(
+      screenMetricsProvider: () => InspectorScreenMetrics(
         inspectorTreeControllerId: gaId,
         rootSetCount: _rootSetCount,
         rowCount: _rowsInTree.value.length,
@@ -181,7 +181,7 @@ class InspectorTreeController extends DisposableController
       gac.inspector,
       gac.inspectorTreeControllerRootChange,
       nonInteraction: true,
-      screenMetricsProvider: () => InspectorScreenMetrics.v2(
+      screenMetricsProvider: () => InspectorScreenMetrics(
         inspectorTreeControllerId: gaId,
         rootSetCount: ++_rootSetCount,
         rowCount: _rowsInTree.value.length,
@@ -567,7 +567,7 @@ class InspectorTreeController extends DisposableController
     ga.select(
       gac.inspector,
       gac.treeNodeSelection,
-      screenMetricsProvider: () => InspectorScreenMetrics.v2(),
+      screenMetricsProvider: () => InspectorScreenMetrics(),
     );
     final diagnostic = node?.diagnostic;
     if (diagnostic != null && diagnostic.groupIsHidden) {
@@ -1156,7 +1156,7 @@ class _InspectorTreeState extends State<InspectorTree>
               screenId,
               gac.pageReady,
               screenMetricsProvider: () =>
-                  InspectorScreenMetrics.v2(rowCount: rows.length),
+                  InspectorScreenMetrics(rowCount: rows.length),
             );
             unawaited(
               serviceConnection.sendDwdsEvent(
@@ -1467,7 +1467,6 @@ class InspectorRowContent extends StatelessWidget {
                           isSelected: row.isSelected,
                           searchValue: searchValue,
                           errorText: error?.errorMessage,
-                          emphasizeNodesFromLocalProject: true,
                           nodeDescriptionHighlightStyle:
                               searchValue.isEmpty || !row.isSearchMatch
                               ? DiagnosticsTextStyles.regular(

packages/devtools_app/lib/src/screens/inspector_v2/widget_details.dart → packages/devtools_app/lib/src/screens/inspector/widget_details.dart

@@ -6,7 +6,7 @@ import 'package:devtools_app_shared/ui.dart';
 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';

packages/devtools_app/lib/src/screens/logging/logging_controller.dart

@@ -27,7 +27,7 @@ import '../../shared/primitives/message_bus.dart';
 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';

packages/devtools_app/lib/src/shared/analytics/_analytics_web.dart

@@ -200,8 +200,12 @@ class DevToolsAnalyticsEvent {
           ? 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 @@ class DevToolsAnalyticsException {
           : null,
       // [InspectorScreenMetrics]
       isV2Inspector: screenMetrics is InspectorScreenMetrics
-          ? screenMetrics.isV2.toString()
+          ? true.toString()
           : null,
     );
   }

packages/devtools_app/lib/src/shared/analytics/constants.dart

@@ -134,8 +134,6 @@ const vmDeveloperMode = 'vmDeveloperMode';
 const wasm = 'wasm';
 const verboseLogging = 'verboseLogging';
 const inspectorHoverEvalMode = 'inspectorHoverEvalMode';
-const inspectorV2Enabled = 'inspectorV2Enabled';
-const inspectorV2Disabled = 'inspectorV2Disabled';
 const inspectorAutoRefreshEnabled = 'inspectorAutoRefreshEnabled';
 const clearLogs = 'clearLogs';
 const copyLogs = 'copyLogs';

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 ProfilerScreenMetrics extends ScreenAnalyticsMetrics {
 }
 
 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.

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 '../../primitives/utils.dart';
 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 @@ class DiagnosticsNodeDescription extends StatelessWidget {
     this.multiline = false,
     this.style,
     this.nodeDescriptionHighlightStyle,
-    this.emphasizeNodesFromLocalProject = false,
     this.actionLabel,
     this.actionCallback,
     this.customDescription,
@@ -57,10 +56,6 @@ class DiagnosticsNodeDescription extends StatelessWidget {
   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 @@ class DiagnosticsNodeDescription extends StatelessWidget {
         );
         // 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 @@ class DiagnosticsNodeDescription extends StatelessWidget {
         }
       }
 
-      // 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(

packages/devtools_app/lib/src/shared/diagnostics/diagnostics_node.dart

@@ -13,7 +13,7 @@ import 'package:flutter/material.dart';
 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';

packages/devtools_app/lib/src/shared/feature_flags.dart

@@ -69,14 +69,6 @@ extension FeatureFlags on Never {
     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 @@ extension FeatureFlags on Never {
     memorySaveLoad,
     devToolsExtensions,
     dapDebugging,
-    inspectorV2,
   };
 
   /// A set of all the Flutter channel feature flags for debugging purposes.

packages/devtools_app/lib/src/shared/managers/error_badge_manager.dart

@@ -11,7 +11,7 @@ import 'package:devtools_app_shared/utils.dart';
 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';

packages/devtools_app/lib/src/shared/preferences/preferences.dart

@@ -106,8 +106,6 @@ class PreferencesController extends DisposableController
   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();