Merge "Add wrapper for incremental decoder." (0b24e422) · Commits · e / os / android_packages_inputmethods_LatinIME

native/jni/Android.mk

+2 −1

Original line number	Diff line number	Diff line
		@@ -49,7 +49,8 @@ LATIN_IME_CORE_SRC_FILES := \
		proximity_info.cpp \
		proximity_info_state.cpp \
		unigram_dictionary.cpp \
		gesture/gesture_decoder_wrapper.cpp
		gesture/gesture_decoder_wrapper.cpp \
		gesture/incremental_decoder_wrapper.cpp

		LOCAL_SRC_FILES := \
		$(LATIN_IME_JNI_SRC_FILES) \

native/jni/src/gesture/incremental_decoder_wrapper.cpp

0 → 100644

+22 −0

Original line number	Diff line number	Diff line
		/*
		* Copyright (C) 2012 The Android Open Source Project
		*
		* Licensed under the Apache License, Version 2.0 (the "License");
		* you may not use this file except in compliance with the License.
		* You may obtain a copy of the License at
		*
		* http://www.apache.org/licenses/LICENSE-2.0
		*
		* Unless required by applicable law or agreed to in writing, software
		* distributed under the License is distributed on an "AS IS" BASIS,
		* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
		* See the License for the specific language governing permissions and
		* limitations under the License.
		*/

		#include "incremental_decoder_wrapper.h"

		namespace latinime {
		IncrementalDecoderInterface *
		(*IncrementalDecoderWrapper::sIncrementalDecoderFactoryMethod)(int, int) = 0;
		} // namespace latinime

native/jni/src/gesture/incremental_decoder_wrapper.h

0 → 100644

+92 −0

Original line number	Diff line number	Diff line
		/*
		* Copyright (C) 2012 The Android Open Source Project
		*
		* Licensed under the Apache License, Version 2.0 (the "License");
		* you may not use this file except in compliance with the License.
		* You may obtain a copy of the License at
		*
		* http://www.apache.org/licenses/LICENSE-2.0
		*
		* Unless required by applicable law or agreed to in writing, software
		* distributed under the License is distributed on an "AS IS" BASIS,
		* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
		* See the License for the specific language governing permissions and
		* limitations under the License.
		*/

		#ifndef LATINIME_INCREMENTAL_DECODER_WRAPPER_H
		#define LATINIME_INCREMENTAL_DECODER_WRAPPER_H

		#include <stdint.h>
		#include "defines.h"
		#include "incremental_decoder_interface.h"

		namespace latinime {

		class UnigramDictionary;
		class BigramDictionary;
		class ProximityInfo;

		class IncrementalDecoderWrapper : public IncrementalDecoderInterface {
		public:
		IncrementalDecoderWrapper(const int maxWordLength, const int maxWords) {
		mIncrementalDecoderInterface = getIncrementalDecoderInstance(maxWordLength, maxWords);
		}

		virtual ~IncrementalDecoderWrapper() {
		delete mIncrementalDecoderInterface;
		}

		int getSuggestions(ProximityInfo pInfo, int inputXs, int inputYs, int times,
		int pointerIds, int codes, int inputSize, int commitPoint,
		unsigned short outWords, int frequencies, int outputIndices, int outputTypes) {
		if (!mIncrementalDecoderInterface) {
		return 0;
		}
		return mIncrementalDecoderInterface->getSuggestions(
		pInfo, inputXs, inputYs, times, pointerIds, codes, inputSize, commitPoint,
		outWords, frequencies, outputIndices, outputTypes);
		}

		void reset() {
		if (!mIncrementalDecoderInterface) {
		return;
		}
		mIncrementalDecoderInterface->reset();
		}

		void setDict(const UnigramDictionary dict, const BigramDictionary bigram,
		const uint8_t *dictRoot, int rootPos) {
		if (!mIncrementalDecoderInterface) {
		return;
		}
		mIncrementalDecoderInterface->setDict(dict, bigram, dictRoot, rootPos);
		}

		void setPrevWord(const int32_t *prevWord, int prevWordLength) {
		if (!mIncrementalDecoderInterface) {
		return;
		}
		mIncrementalDecoderInterface->setPrevWord(prevWord, prevWordLength);
		}

		static void setIncrementalDecoderFactoryMethod(
		IncrementalDecoderInterface (factoryMethod)(int, int)) {
		sIncrementalDecoderFactoryMethod = factoryMethod;
		}

		private:
		DISALLOW_COPY_AND_ASSIGN(IncrementalDecoderWrapper);
		static IncrementalDecoderInterface *getIncrementalDecoderInstance(int maxWordLength,
		int maxWords) {
		if (sIncrementalDecoderFactoryMethod) {
		return sIncrementalDecoderFactoryMethod(maxWordLength, maxWords);
		}
		return 0;
		}

		static IncrementalDecoderInterface (sIncrementalDecoderFactoryMethod)(int, int);
		IncrementalDecoderInterface *mIncrementalDecoderInterface;
		};
		} // namespace latinime
		#endif // LATINIME_INCREMENTAL_DECODER_WRAPPER_H