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

Commit 61c08240 authored by Jeff Brown's avatar Jeff Brown
Browse files

Don't load keyboard layout overlay for virtual keyboard. 

Bug: 6110399
Change-Id: I07c85cf991790ed8766b097acc39295a8065a5ea
parent c3643b90

services/input/EventHub.cpp

+2 −0
Original line number Diff line number Diff line
@@ -1465,6 +1465,8 @@ void EventHub::dump(String8& dump) { 
                    device->keyMap.keyCharacterMapFile.string());

            dump.appendFormat(INDENT3 "ConfigurationFile: %s\n",

                    device->configurationFile.string());

            dump.appendFormat(INDENT3 "HaveKeyboardLayoutOverlay: %s\n",

                    toString(device->overlayKeyMap != NULL));

        }

    } // release lock

}

services/input/InputReader.cpp

+6 −4
Original line number Diff line number Diff line
@@ -963,12 +963,14 @@ void InputDevice::configure(nsecs_t when, const InputReaderConfiguration* config 
        }



        if (!changes || (changes & InputReaderConfiguration::CHANGE_KEYBOARD_LAYOUTS)) {

            if (!(mClasses & INPUT_DEVICE_CLASS_VIRTUAL)) {

                sp<KeyCharacterMap> keyboardLayout =

                        mContext->getPolicy()->getKeyboardLayoutOverlay(mIdentifier.descriptor);

                if (mContext->getEventHub()->setKeyboardLayoutOverlay(mId, keyboardLayout)) {

                    bumpGeneration();

                }

            }

        }



        size_t numMappers = mMappers.size();

        for (size_t i = 0; i < numMappers; i++) {