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

Commit 2d59f90f authored by Nishith  Khanna's avatar Nishith Khanna
Browse files

Merge remote-tracking branch 'origin/lineage-21.0' into v1-u

parents 00520af7 3e39d48f
Loading
Loading
Loading
Loading
+8 −8
Original line number Diff line number Diff line
@@ -19,14 +19,14 @@

# Mapping according to https://developer.android.com/training/game-controllers/controller-input.html

# Button labeled as "B" but should really produce keycode "A"
key 0x130    BUTTON_A
# Button labeled as "A" but should really produce keycode "B"
key 0x131    BUTTON_B
# Button labeled as "X" but should really product keycode "Y"
key 0x133    BUTTON_Y
# Button labeled as "Y" but should really produce keycode "X"
key 0x134    BUTTON_X
# Button labeled as "B"
key 0x130    BUTTON_B
# Button labeled as "A"
key 0x131    BUTTON_A
# Button labeled as "X"
key 0x133    BUTTON_X
# Button labeled as "Y"
key 0x134    BUTTON_Y

# Button labeled as "L"
key 0x136    BUTTON_L1
+10 −1
Original line number Diff line number Diff line
@@ -408,7 +408,16 @@ public class LightsService extends SystemService {
            try {
                if (mVintfLights != null) {
                    HwLightState lightState = new HwLightState();
                    if (mBrightnessLevel > 0 && mBrightnessLevel <= 0xFF) {
                        int colorAlpha = color >>> 24;
                        if (colorAlpha == 0x00) {
                            colorAlpha = 0xFF;
                        }
                        colorAlpha = (colorAlpha * mBrightnessLevel) / 0xFF;
                        lightState.color = (colorAlpha << 24) + (color & 0x00FFFFFF);
                    } else {
                        lightState.color = color;
                    }
                    lightState.flashMode = (byte) mode;
                    lightState.flashOnMs = onMS;
                    lightState.flashOffMs = offMS;