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

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

Merge changes I02362055,I8ab46fde am: 6d9bf6a2

am: 0d4d187d

Change-Id: I1e8e450b3dbd4baa0e85a9642053122cedb96a85
parents e5158a1c 0d4d187d
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