Skip to content

Commit 7959a20

Browse files
Josep del RíoAndroid (Google) Code Review
authored andcommitted
Merge "Add keyboard volume mute LED. (2/2) (cherry picked from https://partner-android-review.googlesource.com/q/commit:80f60ec95afc0c5995647aa19f87b5389f656c25)" into main
2 parents b3131e4 + ffe24cc commit 7959a20

4 files changed

Lines changed: 8 additions & 2 deletions

File tree

include/input/InputDevice.h

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -131,8 +131,9 @@ enum class InputDeviceLightType : int32_t {
131131
PLAYER_ID = 1,
132132
KEYBOARD_BACKLIGHT = 2,
133133
KEYBOARD_MIC_MUTE = 3,
134+
KEYBOARD_VOLUME_MUTE = 4,
134135

135-
ftl_last = KEYBOARD_MIC_MUTE
136+
ftl_last = KEYBOARD_VOLUME_MUTE
136137
};
137138

138139
enum class InputDeviceLightCapability : uint32_t {

services/inputflinger/reader/EventHub.cpp

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -129,7 +129,8 @@ static const std::unordered_map<std::string, InputLightClass> LIGHT_CLASSES =
129129
{"multi_intensity", InputLightClass::MULTI_INTENSITY},
130130
{"max_brightness", InputLightClass::MAX_BRIGHTNESS},
131131
{"kbd_backlight", InputLightClass::KEYBOARD_BACKLIGHT},
132-
{"mic_mute", InputLightClass::KEYBOARD_MIC_MUTE}};
132+
{"mic_mute", InputLightClass::KEYBOARD_MIC_MUTE},
133+
{"mute", InputLightClass::KEYBOARD_VOLUME_MUTE}};
133134

134135
// Mapping for input multicolor led class node names.
135136
// https://www.kernel.org/doc/html/latest/leds/leds-class-multicolor.html

services/inputflinger/reader/controller/PeripheralController.cpp

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -514,6 +514,8 @@ void PeripheralController::configureLights() {
514514
type = InputDeviceLightType::KEYBOARD_BACKLIGHT;
515515
} else if (rawInfo.flags.test(InputLightClass::KEYBOARD_MIC_MUTE)) {
516516
type = InputDeviceLightType::KEYBOARD_MIC_MUTE;
517+
} else if (rawInfo.flags.test(InputLightClass::KEYBOARD_VOLUME_MUTE)) {
518+
type = InputDeviceLightType::KEYBOARD_VOLUME_MUTE;
517519
} else {
518520
type = InputDeviceLightType::INPUT;
519521
}

services/inputflinger/reader/include/EventHub.h

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -179,6 +179,8 @@ enum class InputLightClass : uint32_t {
179179
KEYBOARD_BACKLIGHT = 0x00000100,
180180
/* The input light has mic_mute name */
181181
KEYBOARD_MIC_MUTE = 0x00000200,
182+
/* The input light has mute name */
183+
KEYBOARD_VOLUME_MUTE = 0x00000400,
182184
};
183185

184186
enum class InputBatteryClass : uint32_t {

0 commit comments

Comments
 (0)