am c0837339: Merge "[CB08] Create a combiner chain in the word composer."
* commit 'c0837339721442ba43b1952ca64f7083bda7f377': [CB08] Create a combiner chain in the word composer.main
commit
28d02d3fdd
|
@ -0,0 +1,54 @@
|
|||
/*
|
||||
* Copyright (C) 2014 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.
|
||||
*/
|
||||
|
||||
package com.android.inputmethod.event;
|
||||
|
||||
import com.android.inputmethod.latin.utils.CollectionUtils;
|
||||
|
||||
import java.util.ArrayList;
|
||||
|
||||
/**
|
||||
* This class implements the logic chain between receiving events and generating code points.
|
||||
*
|
||||
* Event sources are multiple. It may be a hardware keyboard, a D-PAD, a software keyboard,
|
||||
* or any exotic input source.
|
||||
* This class will orchestrate the composing chain that starts with an event as its input. Each
|
||||
* composer will be given turns one after the other.
|
||||
* The output is composed of two sequences of code points: the first, representing the already
|
||||
* finished combining part, will be shown normally as the composing string, while the second is
|
||||
* feedback on the composing state and will typically be shown with different styling such as
|
||||
* a colored background.
|
||||
*/
|
||||
public class CombinerChain {
|
||||
// TODO: Create an object type to represent input material + visual feedback + decoding state
|
||||
|
||||
private final ArrayList<Combiner> mCombiners;
|
||||
|
||||
/**
|
||||
* Create an combiner chain.
|
||||
*
|
||||
* The combiner chain takes events as inputs and outputs code points and combining state.
|
||||
* For example, if the input language is Japanese, the combining chain will typically perform
|
||||
* kana conversion.
|
||||
*
|
||||
* @param combinerList A list of combiners to be applied in order.
|
||||
*/
|
||||
public CombinerChain(final Combiner... combinerList) {
|
||||
mCombiners = CollectionUtils.newArrayList();
|
||||
// The dead key combiner is always active, and always first
|
||||
mCombiners.add(new DeadKeyCombiner());
|
||||
}
|
||||
}
|
|
@ -1,26 +0,0 @@
|
|||
/*
|
||||
* 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.
|
||||
*/
|
||||
|
||||
package com.android.inputmethod.event;
|
||||
|
||||
/**
|
||||
* Class describing a decoder chain. This will depend on the language and the input medium (soft
|
||||
* or hard keyboard for example).
|
||||
*/
|
||||
public class EventDecoderSpec {
|
||||
public EventDecoderSpec() {
|
||||
}
|
||||
}
|
|
@ -1,58 +0,0 @@
|
|||
/*
|
||||
* 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.
|
||||
*/
|
||||
|
||||
package com.android.inputmethod.event;
|
||||
|
||||
import com.android.inputmethod.latin.utils.CollectionUtils;
|
||||
|
||||
import java.util.ArrayList;
|
||||
|
||||
/**
|
||||
* This class implements the logic between receiving events and generating code points.
|
||||
*
|
||||
* Event sources are multiple. It may be a hardware keyboard, a D-PAD, a software keyboard,
|
||||
* or any exotic input source.
|
||||
* This class will orchestrate the decoding chain that starts with an event and ends up with
|
||||
* a stream of code points + decoding state.
|
||||
*/
|
||||
public class EventInterpreter {
|
||||
// TODO: Implement an object pool for events, as we'll create a lot of them
|
||||
// TODO: Create a combiner
|
||||
// TODO: Create an object type to represent input material + visual feedback + decoding state
|
||||
|
||||
private final EventDecoderSpec mDecoderSpec;
|
||||
private final ArrayList<Combiner> mCombiners;
|
||||
|
||||
/**
|
||||
* Create an event interpreter according to a specification.
|
||||
*
|
||||
* The specification contains information about what to do with events. Typically, it will
|
||||
* contain information about the type of keyboards - for example, if hardware keyboard(s) is/are
|
||||
* attached, their type will be included here so that the decoder knows what to do with each
|
||||
* keypress (a 10-key keyboard is not handled like a qwerty-ish keyboard).
|
||||
* It also contains information for combining characters. For example, if the input language
|
||||
* is Japanese, the specification will typically request kana conversion.
|
||||
* Also note that the specification can be null. This means that we need to create a default
|
||||
* interpreter that does no specific combining, and assumes the most common cases.
|
||||
*
|
||||
* @param specification the specification for event interpretation. null for default.
|
||||
*/
|
||||
public EventInterpreter(final EventDecoderSpec specification) {
|
||||
mDecoderSpec = null != specification ? specification : new EventDecoderSpec();
|
||||
mCombiners = CollectionUtils.newArrayList();
|
||||
mCombiners.add(new DeadKeyCombiner());
|
||||
}
|
||||
}
|
|
@ -16,6 +16,7 @@
|
|||
|
||||
package com.android.inputmethod.latin;
|
||||
|
||||
import com.android.inputmethod.event.CombinerChain;
|
||||
import com.android.inputmethod.event.Event;
|
||||
import com.android.inputmethod.latin.utils.CollectionUtils;
|
||||
import com.android.inputmethod.latin.utils.CoordinateUtils;
|
||||
|
@ -40,6 +41,8 @@ public final class WordComposer {
|
|||
public static final int CAPS_MODE_AUTO_SHIFTED = 0x5;
|
||||
public static final int CAPS_MODE_AUTO_SHIFT_LOCKED = 0x7;
|
||||
|
||||
private CombinerChain mCombinerChain;
|
||||
|
||||
// An array of code points representing the characters typed so far.
|
||||
// The array is limited to MAX_WORD_LENGTH code points, but mTypedWord extends past that
|
||||
// and mCodePointSize can go past that. If mCodePointSize is greater than MAX_WORD_LENGTH,
|
||||
|
@ -87,6 +90,7 @@ public final class WordComposer {
|
|||
private boolean mIsFirstCharCapitalized;
|
||||
|
||||
public WordComposer() {
|
||||
mCombinerChain = new CombinerChain();
|
||||
mPrimaryKeyCodes = new int[MAX_WORD_LENGTH];
|
||||
mEvents = CollectionUtils.newArrayList();
|
||||
mTypedWord = new StringBuilder(MAX_WORD_LENGTH);
|
||||
|
@ -101,6 +105,7 @@ public final class WordComposer {
|
|||
}
|
||||
|
||||
public WordComposer(final WordComposer source) {
|
||||
mCombinerChain = source.mCombinerChain;
|
||||
mPrimaryKeyCodes = Arrays.copyOf(source.mPrimaryKeyCodes, source.mPrimaryKeyCodes.length);
|
||||
mEvents = new ArrayList<Event>(source.mEvents);
|
||||
mTypedWord = new StringBuilder(source.mTypedWord);
|
||||
|
|
|
@ -28,7 +28,6 @@ import android.view.inputmethod.EditorInfo;
|
|||
|
||||
import com.android.inputmethod.compat.SuggestionSpanUtils;
|
||||
import com.android.inputmethod.event.Event;
|
||||
import com.android.inputmethod.event.EventInterpreter;
|
||||
import com.android.inputmethod.event.InputTransaction;
|
||||
import com.android.inputmethod.keyboard.KeyboardSwitcher;
|
||||
import com.android.inputmethod.latin.Constants;
|
||||
|
|
|
@ -35,6 +35,9 @@ MAKEDICT_CORE_SOURCE_DIRECTORY := $(LATINIME_BASE_SOURCE_DIRECTORY)/latin/makedi
|
|||
# a significant part of the dependencies are mocked in the compat/ directory, with empty or
|
||||
# nearly-empty implementations, for parts that we don't use in Dicttool.
|
||||
LATINIME_SRCS_FOR_DICTTOOL := \
|
||||
event/Combiner.java \
|
||||
event/CombinerChain.java \
|
||||
event/DeadKeyCombiner.java \
|
||||
event/Event.java \
|
||||
latin/BinaryDictionary.java \
|
||||
latin/DicTraverseSession.java \
|
||||
|
|
Loading…
Reference in New Issue