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

Commit 2456ebbb authored by TreeHugger Robot's avatar TreeHugger Robot Committed by Android (Google) Code Review
Browse files

Merge "Convert KeyCharacterMap to enum class"

parents fd206ff6 00190af7

core/jni/android_view_KeyCharacterMap.cpp

+1 −1
Original line number Diff line number Diff line
@@ -162,7 +162,7 @@ static jchar nativeGetDisplayLabel(JNIEnv *env, jobject clazz, jlong ptr, jint k 


static jint nativeGetKeyboardType(JNIEnv *env, jobject clazz, jlong ptr) {

    NativeKeyCharacterMap* map = reinterpret_cast<NativeKeyCharacterMap*>(ptr);

    return map->getMap()->getKeyboardType();

    return static_cast<jint>(map->getMap()->getKeyboardType());

}



static jobjectArray nativeGetEvents(JNIEnv *env, jobject clazz, jlong ptr,

services/core/jni/com_android_server_input_InputManagerService.cpp

+1 −1
Original line number Diff line number Diff line
@@ -650,7 +650,7 @@ std::shared_ptr<KeyCharacterMap> NativeInputManager::getKeyboardLayoutOverlay( 


        base::Result<std::shared_ptr<KeyCharacterMap>> ret =

                KeyCharacterMap::loadContents(filenameChars.c_str(), contentsChars.c_str(),

                                              KeyCharacterMap::FORMAT_OVERLAY);

                                              KeyCharacterMap::Format::OVERLAY);

        if (ret) {

            result = *ret;

        }

tools/validatekeymaps/Main.cpp

+2 −2
Original line number Diff line number Diff line
@@ -105,8 +105,8 @@ static bool validateFile(const char* filename) { 
    }



    case FILETYPE_KEYCHARACTERMAP: {

        base::Result<std::shared_ptr<KeyCharacterMap>> ret = KeyCharacterMap::load(filename,

                KeyCharacterMap::FORMAT_ANY);

        base::Result<std::shared_ptr<KeyCharacterMap>> ret =

                KeyCharacterMap::load(filename, KeyCharacterMap::Format::ANY);

        if (!ret) {

            error("Error %s parsing key character map file.\n\n", ret.error().message().c_str());

            return false;