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

Commit 424a173d authored by Ken Wakasa's avatar Ken Wakasa Committed by Android (Google) Code Review
Browse files

Merge "Move additional_proximity_chars to the layout directory"

parents 1a50999e 94da44e4

native/jni/Android.mk

+1 −1
Original line number Diff line number Diff line
@@ -46,7 +46,6 @@ LATIN_IME_JNI_SRC_FILES := \ 
    jni_common.cpp



LATIN_IME_CORE_SRC_FILES := \

    additional_proximity_chars.cpp \

    bigram_dictionary.cpp \

    char_utils.cpp \

    correction.cpp \
@@ -61,6 +60,7 @@ LATIN_IME_CORE_SRC_FILES := \ 
        dic_node_utils.cpp \

        dic_nodes_cache.cpp) \

    $(addprefix suggest/core/layout/, \

        additional_proximity_chars.cpp \

        proximity_info.cpp \

        proximity_info_params.cpp \

        proximity_info_state.cpp \

native/jni/src/additional_proximity_chars.cpp→native/jni/src/suggest/core/layout/additional_proximity_chars.cpp

+1 −1
Original line number Diff line number Diff line
@@ -14,7 +14,7 @@ 
 * limitations under the License.

 */



#include "additional_proximity_chars.h"

#include "suggest/core/layout/additional_proximity_chars.h"



namespace latinime {

// TODO: Stop using hardcoded additional proximity characters.

native/jni/src/suggest/core/layout/proximity_info.cpp

+1 −1
Original line number Diff line number Diff line
@@ -21,10 +21,10 @@ 


#define LOG_TAG "LatinIME: proximity_info.cpp"



#include "additional_proximity_chars.h"

#include "char_utils.h"

#include "defines.h"

#include "jni.h"

#include "suggest/core/layout/additional_proximity_chars.h"

#include "suggest/core/layout/geometry_utils.h"

#include "suggest/core/layout/proximity_info_params.h"

native/jni/src/suggest/core/layout/proximity_info_utils.h

+1 −1
Original line number Diff line number Diff line
@@ -19,10 +19,10 @@ 


#include <cmath>



#include "additional_proximity_chars.h"

#include "char_utils.h"

#include "defines.h"

#include "hash_map_compat.h"

#include "suggest/core/layout/additional_proximity_chars.h"

#include "suggest/core/layout/geometry_utils.h"



namespace latinime {