Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 0d4d187d authored by Siarhei Vishniakou's avatar Siarhei Vishniakou Committed by android-build-merger
Browse files

Merge changes I02362055,I8ab46fde

am: 6d9bf6a2

Change-Id: I2029534e1497de66ab94beb1c6683c59240c22e5
parents adb4a02e 6d9bf6a2
Loading
Loading
Loading
Loading
+1 −1
Original line number Diff line number Diff line
@@ -540,7 +540,7 @@ key BUTTON_SELECT {
}

key BUTTON_MODE {
    base:                               fallback MENU
    base:                               fallback HOME
}

key BUTTON_1 {
+1 −1
Original line number Diff line number Diff line
@@ -56,4 +56,4 @@ key 0x136 BUTTON_SELECT
key 0x137    BUTTON_START

# Xbox key
key 0x8b    HOME
 No newline at end of file
key 0x8b    BUTTON_MODE
 No newline at end of file
+1 −1
Original line number Diff line number Diff line
@@ -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