Merge "Clear applied layout overlay if new layout overlay is null." (ee906aab) · Commits · e / os / platform_frameworks_native

include/input/KeyCharacterMap.h

+3 −0

Original line number	Diff line number	Diff line
		@@ -87,6 +87,9 @@ public:
		/* Combines this key character map with the provided overlay. */
		void combine(const KeyCharacterMap& overlay);

		/* Clears already applied layout overlay */
		void clearLayoutOverlay();

		/* Gets the keyboard type. */
		KeyboardType getKeyboardType() const;

+7 −0

Original line number	Diff line number	Diff line
		@@ -255,6 +255,13 @@ void KeyCharacterMap::combine(const KeyCharacterMap& overlay) {
		mLayoutOverlayApplied = true;
		}

		void KeyCharacterMap::clearLayoutOverlay() {
		if (mLayoutOverlayApplied) {
		reloadBaseFromFile();
		mLayoutOverlayApplied = false;
		}
		}

		KeyCharacterMap::KeyboardType KeyCharacterMap::getKeyboardType() const {
		return mType;
		}

+6 −1

Original line number	Diff line number	Diff line
		@@ -1416,12 +1416,17 @@ const std::shared_ptr<KeyCharacterMap> EventHub::getKeyCharacterMap(int32_t devi
		return nullptr;
		}

		// If provided map is null, it will reset key character map to default KCM.
		bool EventHub::setKeyboardLayoutOverlay(int32_t deviceId, std::shared_ptr<KeyCharacterMap> map) {
		std::scoped_lock _l(mLock);
		Device* device = getDeviceLocked(deviceId);
		if (device == nullptr \|\| map == nullptr \|\| device->keyMap.keyCharacterMap == nullptr) {
		if (device == nullptr \|\| device->keyMap.keyCharacterMap == nullptr) {
		return false;
		}
		if (map == nullptr) {
		device->keyMap.keyCharacterMap->clearLayoutOverlay();
		return true;
		}
		device->keyMap.keyCharacterMap->combine(*map);
		return true;
		}