Merge changes I02362055,I8ab46fde

am: 6d9bf6a207

Change-Id: I2029534e1497de66ab94beb1c6683c59240c22e5
This commit is contained in:
Siarhei Vishniakou
2018-09-05 09:14:23 -07:00
committed by android-build-merger
3 changed files with 3 additions and 3 deletions

View File

@@ -540,7 +540,7 @@ key BUTTON_SELECT {
}
key BUTTON_MODE {
base: fallback MENU
base: fallback HOME
}
key BUTTON_1 {

View File

@@ -56,4 +56,4 @@ key 0x136 BUTTON_SELECT
key 0x137 BUTTON_START
# Xbox key
key 0x8b HOME
key 0x8b BUTTON_MODE

View File

@@ -35,7 +35,7 @@ key 0x121 BUTTON_THUMBL
key 0x122 BUTTON_THUMBR
# PS key
key 0x2d0 HOME
key 0x2d0 BUTTON_MODE
# Left Analog Stick
axis 0x00 X