Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit ee906aab authored by Vaibhav Devmurari's avatar Vaibhav Devmurari Committed by Android (Google) Code Review
Browse files

Merge "Clear applied layout overlay if new layout overlay is null."

parents 7d3d8a3e 23e8ae9c

include/input/KeyCharacterMap.h

+3 −0
Original line number Original line Diff line number Diff line
@@ -87,6 +87,9 @@ public: 
    /* Combines this key character map with the provided overlay. */

    /* Combines this key character map with the provided overlay. */

    void combine(const KeyCharacterMap& overlay);

    void combine(const KeyCharacterMap& overlay);





    /* Clears already applied layout overlay */

    void clearLayoutOverlay();



    /* Gets the keyboard type. */

    /* Gets the keyboard type. */

    KeyboardType getKeyboardType() const;

    KeyboardType getKeyboardType() const;

libs/input/KeyCharacterMap.cpp

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

    mLayoutOverlayApplied = true;

}

}





void KeyCharacterMap::clearLayoutOverlay() {

    if (mLayoutOverlayApplied) {

        reloadBaseFromFile();

        mLayoutOverlayApplied = false;

    }

}



KeyCharacterMap::KeyboardType KeyCharacterMap::getKeyboardType() const {

KeyCharacterMap::KeyboardType KeyCharacterMap::getKeyboardType() const {

    return mType;

    return mType;

}

}

services/inputflinger/reader/EventHub.cpp

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

    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) {

bool EventHub::setKeyboardLayoutOverlay(int32_t deviceId, std::shared_ptr<KeyCharacterMap> map) {

    std::scoped_lock _l(mLock);

    std::scoped_lock _l(mLock);

    Device* device = getDeviceLocked(deviceId);

    Device* device = getDeviceLocked(deviceId);

    if (device == nullptr || map == nullptr || device->keyMap.keyCharacterMap == nullptr) {

    if (device == nullptr || device->keyMap.keyCharacterMap == nullptr) {

        return false;

        return false;

    }

    }

    if (map == nullptr) {

        device->keyMap.keyCharacterMap->clearLayoutOverlay();

        return true;

    }

    device->keyMap.keyCharacterMap->combine(*map);

    device->keyMap.keyCharacterMap->combine(*map);

    return true;

    return true;

}

}