diff options
| author | 2022-05-18 12:30:16 -0700 | |
|---|---|---|
| committer | 2022-08-23 01:26:04 +0000 | |
| commit | ef1a90de7aa6e77ce90b8015011628014ede9f2c (patch) | |
| tree | 35d3c3f632f0ed0f467ddb6e2188664de62716d4 /include/input/KeyLayoutMap.h | |
| parent | 0d4ac562fbf70ea385de91a3e56bd4183f00052e (diff) | |
Refactor input code for require_kernel_config parameter
As part of the next commit to allow kl files to specify a required
kernel config, some small refactorings were done. Move those here to a
separate CL to make it easier to review.
Bug: 228005926
Test: atest libinput_tests
Merged-In: Iab06bb6ef44807308ee2b3e6b8a0c780bb748f09
Change-Id: Iab06bb6ef44807308ee2b3e6b8a0c780bb748f09
(cherry picked from commit 5ed8eaab67ad7ec3ac1110d696f5d89596a5a887)
Diffstat (limited to 'include/input/KeyLayoutMap.h')
| -rw-r--r-- | include/input/KeyLayoutMap.h | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/include/input/KeyLayoutMap.h b/include/input/KeyLayoutMap.h index b2bd535cbf..d1925f4eee 100644 --- a/include/input/KeyLayoutMap.h +++ b/include/input/KeyLayoutMap.h @@ -21,7 +21,6 @@ #include <stdint.h> #include <utils/Errors.h> #include <utils/KeyedVector.h> -#include <utils/RefBase.h> #include <utils/Tokenizer.h> #include <input/InputDevice.h> @@ -66,7 +65,6 @@ struct AxisInfo { class KeyLayoutMap { public: static base::Result<std::shared_ptr<KeyLayoutMap>> load(const std::string& filename); - static base::Result<std::shared_ptr<KeyLayoutMap>> load(Tokenizer* tokenizer); static base::Result<std::shared_ptr<KeyLayoutMap>> loadContents(const std::string& filename, const char* contents); @@ -84,6 +82,8 @@ public: virtual ~KeyLayoutMap(); private: + static base::Result<std::shared_ptr<KeyLayoutMap>> load(Tokenizer* tokenizer); + struct Key { int32_t keyCode; uint32_t flags; |