From 0ab956a0c101e6a6a585559f2d66ed234d2c5f4c Mon Sep 17 00:00:00 2001
From: "Anthony J. Thibault" <tony@highfidelity.io>
Date: Mon, 23 Jan 2017 17:08:25 -0800
Subject: [PATCH] A and B buttons on oculus touch no longer trigger UI Nav
 events

---
 interface/resources/controllers/standard_navigation.json | 4 +---
 interface/resources/controllers/xbox.json                | 5 ++++-
 2 files changed, 5 insertions(+), 4 deletions(-)

diff --git a/interface/resources/controllers/standard_navigation.json b/interface/resources/controllers/standard_navigation.json
index 36cab8be8f..a557ba7b45 100644
--- a/interface/resources/controllers/standard_navigation.json
+++ b/interface/resources/controllers/standard_navigation.json
@@ -6,9 +6,7 @@
         { "from": "Standard.DL", "to": "Actions.UiNavLateral", "filters": "invert" },
         { "from": "Standard.DR", "to": "Actions.UiNavLateral" },
         { "from": "Standard.LB", "to": "Actions.UiNavGroup","filters": "invert" },
-        { "from": "Standard.RB", "to": "Actions.UiNavGroup" },
-        { "from": [ "Standard.A", "Standard.X" ], "to": "Actions.UiNavSelect" },
-        { "from": [ "Standard.B", "Standard.Y" ], "to": "Actions.UiNavBack" }
+        { "from": "Standard.RB", "to": "Actions.UiNavGroup" }
     ]
 }
 
diff --git a/interface/resources/controllers/xbox.json b/interface/resources/controllers/xbox.json
index 0b4a992fa7..08088f50d9 100644
--- a/interface/resources/controllers/xbox.json
+++ b/interface/resources/controllers/xbox.json
@@ -56,6 +56,9 @@
         { "from": "GamePad.A", "to": "Standard.A" },
         { "from": "GamePad.B", "to": "Standard.B" },
         { "from": "GamePad.X", "to": "Standard.X" },
-        { "from": "GamePad.Y", "to": "Standard.Y" }
+        { "from": "GamePad.Y", "to": "Standard.Y" },
+
+        { "from": [ "Standard.A", "Standard.X" ], "to": "Actions.UiNavSelect" },
+        { "from": [ "Standard.B", "Standard.Y" ], "to": "Actions.UiNavBack" }
     ]
 }