diff --git a/Packages/com.unity.inputsystem/CHANGELOG.md b/Packages/com.unity.inputsystem/CHANGELOG.md index 7690c8cde2..43d7ce5fdc 100644 --- a/Packages/com.unity.inputsystem/CHANGELOG.md +++ b/Packages/com.unity.inputsystem/CHANGELOG.md @@ -24,6 +24,7 @@ however, it has to be formatted properly to pass verification tests. ### Changed - Use `ProfilerMarker` instead of `Profiler.BeginSample` and `Profiler.EndSample` when appropriate to enable recording of profiling data. +- Renamed editor Resources directories to PackageResources to fix package validation warnings. ### Added - Added Hinge Angle sensor support for foldable devices. diff --git a/Packages/com.unity.inputsystem/InputSystem/Editor/AssetEditor/InputActionTreeView.cs b/Packages/com.unity.inputsystem/InputSystem/Editor/AssetEditor/InputActionTreeView.cs index 86eed1c6f3..67df6c7c98 100644 --- a/Packages/com.unity.inputsystem/InputSystem/Editor/AssetEditor/InputActionTreeView.cs +++ b/Packages/com.unity.inputsystem/InputSystem/Editor/AssetEditor/InputActionTreeView.cs @@ -1514,7 +1514,7 @@ private GUIContent plusIcon private static readonly GUIContent s_ExpandAllLabel = EditorGUIUtility.TrTextContent("Expand All"); private static readonly GUIContent s_CollapseAllLabel = EditorGUIUtility.TrTextContent("Collapse All"); - public static string SharedResourcesPath = "Packages/com.unity.inputsystem/InputSystem/Editor/AssetEditor/Resources/"; + public static string SharedResourcesPath = "Packages/com.unity.inputsystem/InputSystem/Editor/AssetEditor/PackageResources/"; public static string ResourcesPath { get diff --git a/Packages/com.unity.inputsystem/InputSystem/Editor/AssetEditor/Resources.meta b/Packages/com.unity.inputsystem/InputSystem/Editor/AssetEditor/PackageResources.meta similarity index 77% rename from Packages/com.unity.inputsystem/InputSystem/Editor/AssetEditor/Resources.meta rename to Packages/com.unity.inputsystem/InputSystem/Editor/AssetEditor/PackageResources.meta index 52d34bcdbd..019402910a 100644 --- a/Packages/com.unity.inputsystem/InputSystem/Editor/AssetEditor/Resources.meta +++ b/Packages/com.unity.inputsystem/InputSystem/Editor/AssetEditor/PackageResources.meta @@ -1,5 +1,5 @@ fileFormatVersion: 2 -guid: b6e438aea119e498787eb12dc4094e9c +guid: ad61ded360bb0784b9301188fc603d6d folderAsset: yes DefaultImporter: externalObjects: {} diff --git a/Packages/com.unity.inputsystem/InputSystem/Editor/AssetEditor/Resources/blue.png b/Packages/com.unity.inputsystem/InputSystem/Editor/AssetEditor/PackageResources/blue.png similarity index 100% rename from Packages/com.unity.inputsystem/InputSystem/Editor/AssetEditor/Resources/blue.png rename to Packages/com.unity.inputsystem/InputSystem/Editor/AssetEditor/PackageResources/blue.png diff --git a/Packages/com.unity.inputsystem/InputSystem/Editor/AssetEditor/Resources/blue.png.meta b/Packages/com.unity.inputsystem/InputSystem/Editor/AssetEditor/PackageResources/blue.png.meta similarity index 100% rename from Packages/com.unity.inputsystem/InputSystem/Editor/AssetEditor/Resources/blue.png.meta rename to Packages/com.unity.inputsystem/InputSystem/Editor/AssetEditor/PackageResources/blue.png.meta diff --git a/Packages/com.unity.inputsystem/InputSystem/Editor/AssetEditor/Resources/green.png b/Packages/com.unity.inputsystem/InputSystem/Editor/AssetEditor/PackageResources/green.png similarity index 100% rename from Packages/com.unity.inputsystem/InputSystem/Editor/AssetEditor/Resources/green.png rename to Packages/com.unity.inputsystem/InputSystem/Editor/AssetEditor/PackageResources/green.png diff --git a/Packages/com.unity.inputsystem/InputSystem/Editor/AssetEditor/Resources/green.png.meta b/Packages/com.unity.inputsystem/InputSystem/Editor/AssetEditor/PackageResources/green.png.meta similarity index 100% rename from Packages/com.unity.inputsystem/InputSystem/Editor/AssetEditor/Resources/green.png.meta rename to Packages/com.unity.inputsystem/InputSystem/Editor/AssetEditor/PackageResources/green.png.meta diff --git a/Packages/com.unity.inputsystem/InputSystem/Editor/AssetEditor/Resources/personal.meta b/Packages/com.unity.inputsystem/InputSystem/Editor/AssetEditor/PackageResources/personal.meta similarity index 100% rename from Packages/com.unity.inputsystem/InputSystem/Editor/AssetEditor/Resources/personal.meta rename to Packages/com.unity.inputsystem/InputSystem/Editor/AssetEditor/PackageResources/personal.meta diff --git a/Packages/com.unity.inputsystem/InputSystem/Editor/AssetEditor/Resources/personal/actionTreeBackground.png b/Packages/com.unity.inputsystem/InputSystem/Editor/AssetEditor/PackageResources/personal/actionTreeBackground.png similarity index 100% rename from Packages/com.unity.inputsystem/InputSystem/Editor/AssetEditor/Resources/personal/actionTreeBackground.png rename to Packages/com.unity.inputsystem/InputSystem/Editor/AssetEditor/PackageResources/personal/actionTreeBackground.png diff --git a/Packages/com.unity.inputsystem/InputSystem/Editor/AssetEditor/Resources/personal/actionTreeBackground.png.meta b/Packages/com.unity.inputsystem/InputSystem/Editor/AssetEditor/PackageResources/personal/actionTreeBackground.png.meta similarity index 100% rename from Packages/com.unity.inputsystem/InputSystem/Editor/AssetEditor/Resources/personal/actionTreeBackground.png.meta rename to Packages/com.unity.inputsystem/InputSystem/Editor/AssetEditor/PackageResources/personal/actionTreeBackground.png.meta diff --git a/Packages/com.unity.inputsystem/InputSystem/Editor/AssetEditor/Resources/personal/actionTreeBackgroundWithoutBorder.png b/Packages/com.unity.inputsystem/InputSystem/Editor/AssetEditor/PackageResources/personal/actionTreeBackgroundWithoutBorder.png similarity index 100% rename from Packages/com.unity.inputsystem/InputSystem/Editor/AssetEditor/Resources/personal/actionTreeBackgroundWithoutBorder.png rename to Packages/com.unity.inputsystem/InputSystem/Editor/AssetEditor/PackageResources/personal/actionTreeBackgroundWithoutBorder.png diff --git a/Packages/com.unity.inputsystem/InputSystem/Editor/AssetEditor/Resources/personal/actionTreeBackgroundWithoutBorder.png.meta b/Packages/com.unity.inputsystem/InputSystem/Editor/AssetEditor/PackageResources/personal/actionTreeBackgroundWithoutBorder.png.meta similarity index 100% rename from Packages/com.unity.inputsystem/InputSystem/Editor/AssetEditor/Resources/personal/actionTreeBackgroundWithoutBorder.png.meta rename to Packages/com.unity.inputsystem/InputSystem/Editor/AssetEditor/PackageResources/personal/actionTreeBackgroundWithoutBorder.png.meta diff --git a/Packages/com.unity.inputsystem/InputSystem/Editor/AssetEditor/Resources/personal/foldoutBackground.png b/Packages/com.unity.inputsystem/InputSystem/Editor/AssetEditor/PackageResources/personal/foldoutBackground.png similarity index 100% rename from Packages/com.unity.inputsystem/InputSystem/Editor/AssetEditor/Resources/personal/foldoutBackground.png rename to Packages/com.unity.inputsystem/InputSystem/Editor/AssetEditor/PackageResources/personal/foldoutBackground.png diff --git a/Packages/com.unity.inputsystem/InputSystem/Editor/AssetEditor/Resources/personal/foldoutBackground.png.meta b/Packages/com.unity.inputsystem/InputSystem/Editor/AssetEditor/PackageResources/personal/foldoutBackground.png.meta similarity index 100% rename from Packages/com.unity.inputsystem/InputSystem/Editor/AssetEditor/Resources/personal/foldoutBackground.png.meta rename to Packages/com.unity.inputsystem/InputSystem/Editor/AssetEditor/PackageResources/personal/foldoutBackground.png.meta diff --git a/Packages/com.unity.inputsystem/InputSystem/Editor/AssetEditor/Resources/personal/propertiesBackground.png b/Packages/com.unity.inputsystem/InputSystem/Editor/AssetEditor/PackageResources/personal/propertiesBackground.png similarity index 100% rename from Packages/com.unity.inputsystem/InputSystem/Editor/AssetEditor/Resources/personal/propertiesBackground.png rename to Packages/com.unity.inputsystem/InputSystem/Editor/AssetEditor/PackageResources/personal/propertiesBackground.png diff --git a/Packages/com.unity.inputsystem/InputSystem/Editor/AssetEditor/Resources/personal/propertiesBackground.png.meta b/Packages/com.unity.inputsystem/InputSystem/Editor/AssetEditor/PackageResources/personal/propertiesBackground.png.meta similarity index 100% rename from Packages/com.unity.inputsystem/InputSystem/Editor/AssetEditor/Resources/personal/propertiesBackground.png.meta rename to Packages/com.unity.inputsystem/InputSystem/Editor/AssetEditor/PackageResources/personal/propertiesBackground.png.meta diff --git a/Packages/com.unity.inputsystem/InputSystem/Editor/AssetEditor/Resources/pink.png b/Packages/com.unity.inputsystem/InputSystem/Editor/AssetEditor/PackageResources/pink.png similarity index 100% rename from Packages/com.unity.inputsystem/InputSystem/Editor/AssetEditor/Resources/pink.png rename to Packages/com.unity.inputsystem/InputSystem/Editor/AssetEditor/PackageResources/pink.png diff --git a/Packages/com.unity.inputsystem/InputSystem/Editor/AssetEditor/Resources/pink.png.meta b/Packages/com.unity.inputsystem/InputSystem/Editor/AssetEditor/PackageResources/pink.png.meta similarity index 100% rename from Packages/com.unity.inputsystem/InputSystem/Editor/AssetEditor/Resources/pink.png.meta rename to Packages/com.unity.inputsystem/InputSystem/Editor/AssetEditor/PackageResources/pink.png.meta diff --git a/Packages/com.unity.inputsystem/InputSystem/Editor/AssetEditor/Resources/pro.meta b/Packages/com.unity.inputsystem/InputSystem/Editor/AssetEditor/PackageResources/pro.meta similarity index 100% rename from Packages/com.unity.inputsystem/InputSystem/Editor/AssetEditor/Resources/pro.meta rename to Packages/com.unity.inputsystem/InputSystem/Editor/AssetEditor/PackageResources/pro.meta diff --git a/Packages/com.unity.inputsystem/InputSystem/Editor/AssetEditor/Resources/pro/actionTreeBackground.png b/Packages/com.unity.inputsystem/InputSystem/Editor/AssetEditor/PackageResources/pro/actionTreeBackground.png similarity index 100% rename from Packages/com.unity.inputsystem/InputSystem/Editor/AssetEditor/Resources/pro/actionTreeBackground.png rename to Packages/com.unity.inputsystem/InputSystem/Editor/AssetEditor/PackageResources/pro/actionTreeBackground.png diff --git a/Packages/com.unity.inputsystem/InputSystem/Editor/AssetEditor/Resources/pro/actionTreeBackground.png.meta b/Packages/com.unity.inputsystem/InputSystem/Editor/AssetEditor/PackageResources/pro/actionTreeBackground.png.meta similarity index 100% rename from Packages/com.unity.inputsystem/InputSystem/Editor/AssetEditor/Resources/pro/actionTreeBackground.png.meta rename to Packages/com.unity.inputsystem/InputSystem/Editor/AssetEditor/PackageResources/pro/actionTreeBackground.png.meta diff --git a/Packages/com.unity.inputsystem/InputSystem/Editor/AssetEditor/Resources/pro/actionTreeBackgroundWithoutBorder.png b/Packages/com.unity.inputsystem/InputSystem/Editor/AssetEditor/PackageResources/pro/actionTreeBackgroundWithoutBorder.png similarity index 100% rename from Packages/com.unity.inputsystem/InputSystem/Editor/AssetEditor/Resources/pro/actionTreeBackgroundWithoutBorder.png rename to Packages/com.unity.inputsystem/InputSystem/Editor/AssetEditor/PackageResources/pro/actionTreeBackgroundWithoutBorder.png diff --git a/Packages/com.unity.inputsystem/InputSystem/Editor/AssetEditor/Resources/pro/actionTreeBackgroundWithoutBorder.png.meta b/Packages/com.unity.inputsystem/InputSystem/Editor/AssetEditor/PackageResources/pro/actionTreeBackgroundWithoutBorder.png.meta similarity index 100% rename from Packages/com.unity.inputsystem/InputSystem/Editor/AssetEditor/Resources/pro/actionTreeBackgroundWithoutBorder.png.meta rename to Packages/com.unity.inputsystem/InputSystem/Editor/AssetEditor/PackageResources/pro/actionTreeBackgroundWithoutBorder.png.meta diff --git a/Packages/com.unity.inputsystem/InputSystem/Editor/AssetEditor/Resources/pro/foldoutBackground.png b/Packages/com.unity.inputsystem/InputSystem/Editor/AssetEditor/PackageResources/pro/foldoutBackground.png similarity index 100% rename from Packages/com.unity.inputsystem/InputSystem/Editor/AssetEditor/Resources/pro/foldoutBackground.png rename to Packages/com.unity.inputsystem/InputSystem/Editor/AssetEditor/PackageResources/pro/foldoutBackground.png diff --git a/Packages/com.unity.inputsystem/InputSystem/Editor/AssetEditor/Resources/pro/foldoutBackground.png.meta b/Packages/com.unity.inputsystem/InputSystem/Editor/AssetEditor/PackageResources/pro/foldoutBackground.png.meta similarity index 100% rename from Packages/com.unity.inputsystem/InputSystem/Editor/AssetEditor/Resources/pro/foldoutBackground.png.meta rename to Packages/com.unity.inputsystem/InputSystem/Editor/AssetEditor/PackageResources/pro/foldoutBackground.png.meta diff --git a/Packages/com.unity.inputsystem/InputSystem/Editor/AssetEditor/Resources/pro/propertiesBackground.png b/Packages/com.unity.inputsystem/InputSystem/Editor/AssetEditor/PackageResources/pro/propertiesBackground.png similarity index 100% rename from Packages/com.unity.inputsystem/InputSystem/Editor/AssetEditor/Resources/pro/propertiesBackground.png rename to Packages/com.unity.inputsystem/InputSystem/Editor/AssetEditor/PackageResources/pro/propertiesBackground.png diff --git a/Packages/com.unity.inputsystem/InputSystem/Editor/AssetEditor/Resources/pro/propertiesBackground.png.meta b/Packages/com.unity.inputsystem/InputSystem/Editor/AssetEditor/PackageResources/pro/propertiesBackground.png.meta similarity index 100% rename from Packages/com.unity.inputsystem/InputSystem/Editor/AssetEditor/Resources/pro/propertiesBackground.png.meta rename to Packages/com.unity.inputsystem/InputSystem/Editor/AssetEditor/PackageResources/pro/propertiesBackground.png.meta diff --git a/Packages/com.unity.inputsystem/InputSystem/Editor/AssetEditor/Resources/yellow.png b/Packages/com.unity.inputsystem/InputSystem/Editor/AssetEditor/PackageResources/yellow.png similarity index 100% rename from Packages/com.unity.inputsystem/InputSystem/Editor/AssetEditor/Resources/yellow.png rename to Packages/com.unity.inputsystem/InputSystem/Editor/AssetEditor/PackageResources/yellow.png diff --git a/Packages/com.unity.inputsystem/InputSystem/Editor/AssetEditor/Resources/yellow.png.meta b/Packages/com.unity.inputsystem/InputSystem/Editor/AssetEditor/PackageResources/yellow.png.meta similarity index 100% rename from Packages/com.unity.inputsystem/InputSystem/Editor/AssetEditor/Resources/yellow.png.meta rename to Packages/com.unity.inputsystem/InputSystem/Editor/AssetEditor/PackageResources/yellow.png.meta diff --git a/Packages/com.unity.inputsystem/InputSystem/Editor/UITKAssetEditor/InputActionsEditorConstants.cs b/Packages/com.unity.inputsystem/InputSystem/Editor/UITKAssetEditor/InputActionsEditorConstants.cs index 2e1e160ca6..c0c2c07c3b 100644 --- a/Packages/com.unity.inputsystem/InputSystem/Editor/UITKAssetEditor/InputActionsEditorConstants.cs +++ b/Packages/com.unity.inputsystem/InputSystem/Editor/UITKAssetEditor/InputActionsEditorConstants.cs @@ -6,7 +6,7 @@ internal static class InputActionsEditorConstants { // Paths public const string PackagePath = "Packages/com.unity.inputsystem"; - public const string ResourcesPath = "/InputSystem/Editor/UITKAssetEditor/Resources"; + public const string ResourcesPath = "/InputSystem/Editor/UITKAssetEditor/PackageResources"; /// Template names public const string ProjectSettingsUxml = "/InputActionsProjectSettings.uxml"; diff --git a/Packages/com.unity.inputsystem/InputSystem/Editor/UITKAssetEditor/Resources.meta b/Packages/com.unity.inputsystem/InputSystem/Editor/UITKAssetEditor/PackageResources.meta similarity index 77% rename from Packages/com.unity.inputsystem/InputSystem/Editor/UITKAssetEditor/Resources.meta rename to Packages/com.unity.inputsystem/InputSystem/Editor/UITKAssetEditor/PackageResources.meta index 35bd156db4..00b5624c5d 100644 --- a/Packages/com.unity.inputsystem/InputSystem/Editor/UITKAssetEditor/Resources.meta +++ b/Packages/com.unity.inputsystem/InputSystem/Editor/UITKAssetEditor/PackageResources.meta @@ -1,5 +1,5 @@ fileFormatVersion: 2 -guid: 3c708eeb274ccca49b340e1ce52a4851 +guid: 7894838fa258e3a4197077ddbda0eec5 folderAsset: yes DefaultImporter: externalObjects: {} diff --git a/Packages/com.unity.inputsystem/InputSystem/Editor/UITKAssetEditor/Resources/BindingPanelRowTemplate.uxml b/Packages/com.unity.inputsystem/InputSystem/Editor/UITKAssetEditor/PackageResources/BindingPanelRowTemplate.uxml similarity index 100% rename from Packages/com.unity.inputsystem/InputSystem/Editor/UITKAssetEditor/Resources/BindingPanelRowTemplate.uxml rename to Packages/com.unity.inputsystem/InputSystem/Editor/UITKAssetEditor/PackageResources/BindingPanelRowTemplate.uxml diff --git a/Packages/com.unity.inputsystem/InputSystem/Editor/UITKAssetEditor/Resources/BindingPanelRowTemplate.uxml.meta b/Packages/com.unity.inputsystem/InputSystem/Editor/UITKAssetEditor/PackageResources/BindingPanelRowTemplate.uxml.meta similarity index 100% rename from Packages/com.unity.inputsystem/InputSystem/Editor/UITKAssetEditor/Resources/BindingPanelRowTemplate.uxml.meta rename to Packages/com.unity.inputsystem/InputSystem/Editor/UITKAssetEditor/PackageResources/BindingPanelRowTemplate.uxml.meta diff --git a/Packages/com.unity.inputsystem/InputSystem/Editor/UITKAssetEditor/Resources/CompositeBindingPropertiesEditor.uxml b/Packages/com.unity.inputsystem/InputSystem/Editor/UITKAssetEditor/PackageResources/CompositeBindingPropertiesEditor.uxml similarity index 100% rename from Packages/com.unity.inputsystem/InputSystem/Editor/UITKAssetEditor/Resources/CompositeBindingPropertiesEditor.uxml rename to Packages/com.unity.inputsystem/InputSystem/Editor/UITKAssetEditor/PackageResources/CompositeBindingPropertiesEditor.uxml diff --git a/Packages/com.unity.inputsystem/InputSystem/Editor/UITKAssetEditor/Resources/CompositeBindingPropertiesEditor.uxml.meta b/Packages/com.unity.inputsystem/InputSystem/Editor/UITKAssetEditor/PackageResources/CompositeBindingPropertiesEditor.uxml.meta similarity index 100% rename from Packages/com.unity.inputsystem/InputSystem/Editor/UITKAssetEditor/Resources/CompositeBindingPropertiesEditor.uxml.meta rename to Packages/com.unity.inputsystem/InputSystem/Editor/UITKAssetEditor/PackageResources/CompositeBindingPropertiesEditor.uxml.meta diff --git a/Packages/com.unity.inputsystem/InputSystem/Editor/UITKAssetEditor/Resources/CompositePartBindingPropertiesEditor.uxml b/Packages/com.unity.inputsystem/InputSystem/Editor/UITKAssetEditor/PackageResources/CompositePartBindingPropertiesEditor.uxml similarity index 100% rename from Packages/com.unity.inputsystem/InputSystem/Editor/UITKAssetEditor/Resources/CompositePartBindingPropertiesEditor.uxml rename to Packages/com.unity.inputsystem/InputSystem/Editor/UITKAssetEditor/PackageResources/CompositePartBindingPropertiesEditor.uxml diff --git a/Packages/com.unity.inputsystem/InputSystem/Editor/UITKAssetEditor/Resources/CompositePartBindingPropertiesEditor.uxml.meta b/Packages/com.unity.inputsystem/InputSystem/Editor/UITKAssetEditor/PackageResources/CompositePartBindingPropertiesEditor.uxml.meta similarity index 100% rename from Packages/com.unity.inputsystem/InputSystem/Editor/UITKAssetEditor/Resources/CompositePartBindingPropertiesEditor.uxml.meta rename to Packages/com.unity.inputsystem/InputSystem/Editor/UITKAssetEditor/PackageResources/CompositePartBindingPropertiesEditor.uxml.meta diff --git a/Packages/com.unity.inputsystem/InputSystem/Editor/UITKAssetEditor/Resources/ControlSchemeEditor.uxml b/Packages/com.unity.inputsystem/InputSystem/Editor/UITKAssetEditor/PackageResources/ControlSchemeEditor.uxml similarity index 100% rename from Packages/com.unity.inputsystem/InputSystem/Editor/UITKAssetEditor/Resources/ControlSchemeEditor.uxml rename to Packages/com.unity.inputsystem/InputSystem/Editor/UITKAssetEditor/PackageResources/ControlSchemeEditor.uxml diff --git a/Packages/com.unity.inputsystem/InputSystem/Editor/UITKAssetEditor/Resources/ControlSchemeEditor.uxml.meta b/Packages/com.unity.inputsystem/InputSystem/Editor/UITKAssetEditor/PackageResources/ControlSchemeEditor.uxml.meta similarity index 100% rename from Packages/com.unity.inputsystem/InputSystem/Editor/UITKAssetEditor/Resources/ControlSchemeEditor.uxml.meta rename to Packages/com.unity.inputsystem/InputSystem/Editor/UITKAssetEditor/PackageResources/ControlSchemeEditor.uxml.meta diff --git a/Packages/com.unity.inputsystem/InputSystem/Editor/UITKAssetEditor/Resources/InputActionMapsTreeViewItem.uxml b/Packages/com.unity.inputsystem/InputSystem/Editor/UITKAssetEditor/PackageResources/InputActionMapsTreeViewItem.uxml similarity index 89% rename from Packages/com.unity.inputsystem/InputSystem/Editor/UITKAssetEditor/Resources/InputActionMapsTreeViewItem.uxml rename to Packages/com.unity.inputsystem/InputSystem/Editor/UITKAssetEditor/PackageResources/InputActionMapsTreeViewItem.uxml index 3fb727dc78..a26d706df2 100644 --- a/Packages/com.unity.inputsystem/InputSystem/Editor/UITKAssetEditor/Resources/InputActionMapsTreeViewItem.uxml +++ b/Packages/com.unity.inputsystem/InputSystem/Editor/UITKAssetEditor/PackageResources/InputActionMapsTreeViewItem.uxml @@ -1,5 +1,5 @@ -