Delete obsolete flags

Test: existing tests should pass
Bug: none
Change-Id: I81d396564d1c69a9df1f03acebeb0920036455fc

5 files changed, 6 insertions, 16 deletions

diff --git a/layout-inspector/src/com/android/tools/idea/layoutinspector/pipeline/appinspection/compose/ComposeParametersData.kt b/layout-inspector/src/com/android/tools/idea/layoutinspector/pipeline/appinspection/compose/ComposeParametersData.kt
index 503bd73bb60..bd303bfbc38 100644
--- a/layout-inspector/src/com/android/tools/idea/layoutinspector/pipeline/appinspection/compose/ComposeParametersData.kt
+++ b/layout-inspector/src/com/android/tools/idea/layoutinspector/pipeline/appinspection/compose/ComposeParametersData.kt
@@ -72,17 +72,13 @@ class ComposeParametersDataGenerator(
       it.toParameterItem(rootId, parameterGroup.composableId, PropertySection.PARAMETERS)
     }
 
-    val mergedSemantics = if (StudioFlags.DYNAMIC_LAYOUT_INSPECTOR_SHOW_SEMANTICS.get()) {
-      parameterGroup.mergedSemanticsList.map {
+    val mergedSemantics = parameterGroup.mergedSemanticsList.map {
         it.toParameterItem(rootId, parameterGroup.composableId, PropertySection.MERGED)
       }
-    } else emptyList()
 
-    val unmergedSemantics = if (StudioFlags.DYNAMIC_LAYOUT_INSPECTOR_SHOW_SEMANTICS.get()) {
-      parameterGroup.unmergedSemanticsList.map {
+    val unmergedSemantics = parameterGroup.unmergedSemanticsList.map {
         it.toParameterItem(rootId, parameterGroup.composableId, PropertySection.UNMERGED)
       }
-    } else emptyList()
 
     val all = parameterList.asSequence() + mergedSemantics.asSequence() + unmergedSemantics.asSequence()
     return ComposeParametersData(parameterList, mergedSemantics, unmergedSemantics, toPropertiesTable(all))
diff --git a/layout-inspector/src/com/android/tools/idea/layoutinspector/snapshots/LayoutInspectorFileEditor.kt b/layout-inspector/src/com/android/tools/idea/layoutinspector/snapshots/LayoutInspectorFileEditor.kt
index 29b27bb98b9..63b46dc6bf4 100644
--- a/layout-inspector/src/com/android/tools/idea/layoutinspector/snapshots/LayoutInspectorFileEditor.kt
+++ b/layout-inspector/src/com/android/tools/idea/layoutinspector/snapshots/LayoutInspectorFileEditor.kt
@@ -188,14 +188,11 @@ class LayoutInspectorFileEditor(val project: Project, private val path: Path) :
   }
 
   /**
-   * Factory for [LayoutInspectorFileEditor]s. Note that for now [StudioFlags.DYNAMIC_LAYOUT_INSPECTOR_ENABLE_SNAPSHOTS] needs to be on or
-   * else [com.android.tools.idea.profiling.capture.CaptureEditorProvider] will be used to create
-   * `com.android.tools.idea.editors.layoutInspector.LayoutInspectorEditor`s
+   * Factory for [LayoutInspectorFileEditor]s.
    */
   class Provider : FileEditorProvider, DumbAware {
     override fun accept(project: Project, file: VirtualFile): Boolean {
-      return FileTypeRegistry.getInstance().getFileTypeByExtension(file.extension ?: "") == LayoutInspectorFileType &&
-             StudioFlags.DYNAMIC_LAYOUT_INSPECTOR_ENABLE_SNAPSHOTS.get()
+      return FileTypeRegistry.getInstance().getFileTypeByExtension(file.extension ?: "") == LayoutInspectorFileType
     }
 
     override fun createEditor(project: Project, file: VirtualFile) = LayoutInspectorFileEditor(project, file.toNioPath())
diff --git a/layout-inspector/src/com/android/tools/idea/layoutinspector/tree/TreeSettings.kt b/layout-inspector/src/com/android/tools/idea/layoutinspector/tree/TreeSettings.kt
index c0e0a2c884b..cc481915dc2 100644
--- a/layout-inspector/src/com/android/tools/idea/layoutinspector/tree/TreeSettings.kt
+++ b/layout-inspector/src/com/android/tools/idea/layoutinspector/tree/TreeSettings.kt
@@ -64,7 +64,6 @@ class InspectorTreeSettings(private val activeClient: () -> InspectorClient) : T
     set(value) = set(KEY_COMPOSE_AS_CALLSTACK, value, DEFAULT_COMPOSE_AS_CALLSTACK)
 
   override var highlightSemantics = DEFAULT_HIGHLIGHT_SEMANTICS
-    get() = StudioFlags.DYNAMIC_LAYOUT_INSPECTOR_SHOW_SEMANTICS.get() && field
 
   override var supportLines: Boolean
     get() = get(KEY_SUPPORT_LINES, DEFAULT_SUPPORT_LINES)
diff --git a/layout-inspector/src/com/android/tools/idea/layoutinspector/tree/TreeSettingsActions.kt b/layout-inspector/src/com/android/tools/idea/layoutinspector/tree/TreeSettingsActions.kt
index 685bda2632d..82abe26d6c8 100644
--- a/layout-inspector/src/com/android/tools/idea/layoutinspector/tree/TreeSettingsActions.kt
+++ b/layout-inspector/src/com/android/tools/idea/layoutinspector/tree/TreeSettingsActions.kt
@@ -93,9 +93,7 @@ object HighlightSemanticsAction : ToggleAction("Highlight Semantics Layers") {
 
   override fun update(event: AnActionEvent) {
     super.update(event)
-    event.presentation.isVisible =
-      StudioFlags.DYNAMIC_LAYOUT_INSPECTOR_SHOW_SEMANTICS.get() &&
-      isActionVisible(event, Capability.SUPPORTS_SEMANTICS)
+    event.presentation.isVisible = isActionVisible(event, Capability.SUPPORTS_SEMANTICS)
   }
 }
 
diff --git a/layout-inspector/src/com/android/tools/idea/layoutinspector/ui/DeviceViewPanel.kt b/layout-inspector/src/com/android/tools/idea/layoutinspector/ui/DeviceViewPanel.kt
index 1f48ecd55b8..3b206579304 100644
--- a/layout-inspector/src/com/android/tools/idea/layoutinspector/ui/DeviceViewPanel.kt
+++ b/layout-inspector/src/com/android/tools/idea/layoutinspector/ui/DeviceViewPanel.kt
@@ -477,7 +477,7 @@ class DeviceViewPanel(
     leftGroup.add(Separator.getInstance())
     leftGroup.add(ViewMenuAction)
     leftGroup.add(ToggleOverlayAction)
-    if (StudioFlags.DYNAMIC_LAYOUT_INSPECTOR_ENABLE_SNAPSHOTS.get() && !layoutInspector.isSnapshot) {
+    if (!layoutInspector.isSnapshot) {
       leftGroup.add(CaptureSnapshotAction)
     }
     leftGroup.add(AlphaSliderAction)