Skip to content

Commit 7728e0b

Browse files
authored
[Samples] Migrate from using a checked-in Android manifest to using a patcher at build time (#1002)
* Migrate from using a checked-in manifest to using a patcher at build-time * Update AndroidManifestPatcher.cs
1 parent bdbea32 commit 7728e0b

File tree

8 files changed

+48
-36
lines changed

8 files changed

+48
-36
lines changed

UnityProjects/MRTKDevTemplate/Assets/Plugins/Android.meta

Lines changed: 0 additions & 8 deletions
This file was deleted.

UnityProjects/MRTKDevTemplate/Assets/Plugins/Android/AndroidManifest.xml

Lines changed: 0 additions & 18 deletions
This file was deleted.

UnityProjects/MRTKDevTemplate/Assets/Plugins/Android/AndroidManifest.xml.meta

Lines changed: 0 additions & 7 deletions
This file was deleted.

UnityProjects/MRTKDevTemplate/Assets/Plugins.meta renamed to UnityProjects/MRTKDevTemplate/Assets/Scripts/Editor.meta

Lines changed: 1 addition & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.
Lines changed: 34 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,34 @@
1+
// Copyright (c) Mixed Reality Toolkit Contributors
2+
// Licensed under the BSD 3-Clause
3+
4+
using System;
5+
using System.Collections.Generic;
6+
using Unity.XR.Management.AndroidManifest.Editor;
7+
using UnityEngine.XR.OpenXR;
8+
9+
/// <summary>
10+
/// Adds a required manifest entry to use the virtual keyboard on Quest.
11+
/// </summary>
12+
internal class AndroidManifestPatcher : IAndroidManifestRequirementProvider
13+
{
14+
/// <inheritdoc/>
15+
ManifestRequirement IAndroidManifestRequirementProvider.ProvideManifestRequirement() => new()
16+
{
17+
SupportedXRLoaders = new HashSet<Type>()
18+
{
19+
typeof(OpenXRLoader)
20+
},
21+
NewElements = new List<ManifestElement>()
22+
{
23+
new()
24+
{
25+
ElementPath = new List<string> { "manifest", "uses-feature" },
26+
Attributes = new Dictionary<string, string>
27+
{
28+
{ "name", "oculus.software.overlay_keyboard" },
29+
{ "required", "false" }
30+
}
31+
}
32+
},
33+
};
34+
}

UnityProjects/MRTKDevTemplate/Assets/Scripts/Editor/AndroidManifestPatcher.cs.meta

Lines changed: 11 additions & 0 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

UnityProjects/MRTKDevTemplate/Packages/manifest.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@
2222
"com.unity.xr.arcore": "5.0.5",
2323
"com.unity.xr.arfoundation": "5.0.5",
2424
"com.unity.xr.interaction.toolkit": "2.3.2",
25-
"com.unity.xr.management": "4.3.3",
25+
"com.unity.xr.management": "4.4.0",
2626
"com.unity.xr.openxr": "1.7.0",
2727
"org.mixedrealitytoolkit.accessibility": "file:../../../org.mixedrealitytoolkit.accessibility",
2828
"org.mixedrealitytoolkit.audio": "file:../../../org.mixedrealitytoolkit.audio",

UnityProjects/MRTKDevTemplate/Packages/packages-lock.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -285,7 +285,7 @@
285285
"url": "https://packages.unity.com"
286286
},
287287
"com.unity.xr.management": {
288-
"version": "4.3.3",
288+
"version": "4.4.0",
289289
"depth": 0,
290290
"source": "registry",
291291
"dependencies": {

0 commit comments

Comments
 (0)