summaryrefslogtreecommitdiff
path: root/libs/input/InputReader.cpp
diff options
context:
space:
mode:
author Michael Wright <michaelwr@google.com> 2013-10-18 15:26:48 -0700
committer Michael Wright <michaelwr@google.com> 2014-03-11 14:52:18 -0700
commited28fc89e3085a88c6bd8b4269988150f3eceb56 (patch)
tree75104173d5bcb047968215a419f4597a4c9bca44 /libs/input/InputReader.cpp
parent5f0c0498a1382ef955cccca95920ec878fe2a64c (diff)
Utilize new Android LED constants. DO NOT MERGE
Also, have EventHub manage game controllers' player LEDs Change-Id: Ic7dba19ad236a3c7d1aff5d3f938bd239b98d51d
Diffstat (limited to 'libs/input/InputReader.cpp')
-rw-r--r--libs/input/InputReader.cpp12
1 files changed, 6 insertions, 6 deletions
diff --git a/libs/input/InputReader.cpp b/libs/input/InputReader.cpp
index b1b7c7da4f99..d4e1a00952cb 100644
--- a/libs/input/InputReader.cpp
+++ b/libs/input/InputReader.cpp
@@ -2197,9 +2197,9 @@ int32_t KeyboardInputMapper::getMetaState() {
}
void KeyboardInputMapper::resetLedState() {
- initializeLedState(mCapsLockLedState, LED_CAPSL);
- initializeLedState(mNumLockLedState, LED_NUML);
- initializeLedState(mScrollLockLedState, LED_SCROLLL);
+ initializeLedState(mCapsLockLedState, ALED_CAPS_LOCK);
+ initializeLedState(mNumLockLedState, ALED_NUM_LOCK);
+ initializeLedState(mScrollLockLedState, ALED_SCROLL_LOCK);
updateLedState(true);
}
@@ -2210,11 +2210,11 @@ void KeyboardInputMapper::initializeLedState(LedState& ledState, int32_t led) {
}
void KeyboardInputMapper::updateLedState(bool reset) {
- updateLedStateForModifier(mCapsLockLedState, LED_CAPSL,
+ updateLedStateForModifier(mCapsLockLedState, ALED_CAPS_LOCK,
AMETA_CAPS_LOCK_ON, reset);
- updateLedStateForModifier(mNumLockLedState, LED_NUML,
+ updateLedStateForModifier(mNumLockLedState, ALED_NUM_LOCK,
AMETA_NUM_LOCK_ON, reset);
- updateLedStateForModifier(mScrollLockLedState, LED_SCROLLL,
+ updateLedStateForModifier(mScrollLockLedState, ALED_SCROLL_LOCK,
AMETA_SCROLL_LOCK_ON, reset);
}