diff options
| author | 2023-10-06 05:34:14 +0000 | |
|---|---|---|
| committer | 2023-10-06 05:34:14 +0000 | |
| commit | 8b919d0eb0e816bdd67f11855e649ce3723930ee (patch) | |
| tree | b9785db180fb54b3a776f645cbb2a7ef480e0cb9 /services/inputflinger/InputCommonConverter.cpp | |
| parent | e4b64ebecf894e3047e46894a83ab8d37feabd3e (diff) | |
| parent | 1961b2f7b191744f3fc6bb4d32f0da0ce3ee0567 (diff) | |
Merge "Merge Android 14" into main
Diffstat (limited to 'services/inputflinger/InputCommonConverter.cpp')
| -rw-r--r-- | services/inputflinger/InputCommonConverter.cpp | 27 |
1 files changed, 14 insertions, 13 deletions
diff --git a/services/inputflinger/InputCommonConverter.cpp b/services/inputflinger/InputCommonConverter.cpp index 8aee39fd0b..2437d0fcfc 100644 --- a/services/inputflinger/InputCommonConverter.cpp +++ b/services/inputflinger/InputCommonConverter.cpp @@ -200,17 +200,12 @@ static common::Button getButtonState(int32_t buttonState) { return static_cast<common::Button>(buttonState); } -static common::ToolType getToolType(int32_t toolType) { - static_assert(static_cast<common::ToolType>(AMOTION_EVENT_TOOL_TYPE_UNKNOWN) == - common::ToolType::UNKNOWN); - static_assert(static_cast<common::ToolType>(AMOTION_EVENT_TOOL_TYPE_FINGER) == - common::ToolType::FINGER); - static_assert(static_cast<common::ToolType>(AMOTION_EVENT_TOOL_TYPE_STYLUS) == - common::ToolType::STYLUS); - static_assert(static_cast<common::ToolType>(AMOTION_EVENT_TOOL_TYPE_MOUSE) == - common::ToolType::MOUSE); - static_assert(static_cast<common::ToolType>(AMOTION_EVENT_TOOL_TYPE_ERASER) == - common::ToolType::ERASER); +static common::ToolType getToolType(ToolType toolType) { + static_assert(static_cast<common::ToolType>(ToolType::UNKNOWN) == common::ToolType::UNKNOWN); + static_assert(static_cast<common::ToolType>(ToolType::FINGER) == common::ToolType::FINGER); + static_assert(static_cast<common::ToolType>(ToolType::STYLUS) == common::ToolType::STYLUS); + static_assert(static_cast<common::ToolType>(ToolType::MOUSE) == common::ToolType::MOUSE); + static_assert(static_cast<common::ToolType>(ToolType::ERASER) == common::ToolType::ERASER); return static_cast<common::ToolType>(toolType); } @@ -263,6 +258,12 @@ static_assert(static_cast<common::Axis>(AMOTION_EVENT_AXIS_GENERIC_13) == common static_assert(static_cast<common::Axis>(AMOTION_EVENT_AXIS_GENERIC_14) == common::Axis::GENERIC_14); static_assert(static_cast<common::Axis>(AMOTION_EVENT_AXIS_GENERIC_15) == common::Axis::GENERIC_15); static_assert(static_cast<common::Axis>(AMOTION_EVENT_AXIS_GENERIC_16) == common::Axis::GENERIC_16); +// TODO(b/251196347): add GESTURE_{X,Y}_OFFSET, GESTURE_SCROLL_{X,Y}_DISTANCE, and +// GESTURE_PINCH_SCALE_FACTOR. +// If you added a new axis, consider whether this should also be exposed as a HAL axis. Update the +// static_assert below and add the new axis here, or leave a comment summarizing your decision. +static_assert(static_cast<common::Axis>(AMOTION_EVENT_MAXIMUM_VALID_AXIS_VALUE) == + static_cast<common::Axis>(AMOTION_EVENT_AXIS_GESTURE_PINCH_SCALE_FACTOR)); static common::VideoFrame getHalVideoFrame(const TouchVideoFrame& frame) { common::VideoFrame out; @@ -299,8 +300,8 @@ static void getHalPropertiesAndCoords(const NotifyMotionArgs& args, common::PointerCoords coords; // OK to copy bits because we have static_assert for pointerCoords axes coords.bits = args.pointerCoords[i].bits; - coords.values = std::vector<float>(args.pointerCoords[i].values, - args.pointerCoords[i].values + + coords.values = std::vector<float>(args.pointerCoords[i].values.cbegin(), + args.pointerCoords[i].values.cbegin() + BitSet64::count(args.pointerCoords[i].bits)); outPointerCoords.push_back(coords); } |