Merge commit '164972b678b986aecdf96e239cd0bce838b2033d' into gingerbread-plus-aosp
* commit '164972b678b986aecdf96e239cd0bce838b2033d':
Import revised translations. DO NOT MERGE
Log which voice-based alternates were selected, and what
word in the recognition results were replaced.
Change-Id: I1527dc794902a18a226ca45e186ecf84841094c8
Conflicts:
java/src/com/android/inputmethod/latin/LatinIME.java
These three conditions assign true to the mAbortKey flag.
1. setKeyboard() sets the new keyboard layout.
2. long press shows the pop-up mini keyboard.
3. ACTION_CANCEL event is occurred.
In the case 1, in LatinIME so far, only "symbol key" and "language
switch" cause keyboard layout change. In both cases, the event is
occurred in onUpEvent(), so we do not need to worry about aborting
event.
In the case 2, long press is used only to pop-up mini-keyboard and at that
time mMiniKeyboardOnScreen could be used as a flag.
In the case 3, though I'm not sure when this case occurs, in
onCancelEvent() all the things that should be canceled are canceled
in onCancelEvent().
Bug: 2910379
Change-Id: I12377c5f3e808f1c017ce980e12b1513895047bc
Merge commit '36007521cef25259150127c83ccba5fe38eda14c'
* commit '36007521cef25259150127c83ccba5fe38eda14c':
Disable long-press on symbol keys on international locale keyboards.
Merge commit '82798ac066c8ffc497a68a313aee17cc4ad56bbd' into gingerbread-plus-aosp
* commit '82798ac066c8ffc497a68a313aee17cc4ad56bbd':
Disable long-press on symbol keys on international locale keyboards.
Merge commit '65333e712b638cea6b990944ff255c7b834975c4'
* commit '65333e712b638cea6b990944ff255c7b834975c4':
DO NOT MERGE. Remove a preference for bigram suggestion
Merge commit 'cb6221257a2f4025c91de4d65f5591e6563c54ce' into gingerbread-plus-aosp
* commit 'cb6221257a2f4025c91de4d65f5591e6563c54ce':
DO NOT MERGE. Remove a preference for bigram suggestion
Merge commit '6ad0d15ca28aa23a85c2480966bc58b2f2d4694c'
* commit '6ad0d15ca28aa23a85c2480966bc58b2f2d4694c':
Disable long-press on shift and symbol keys
Merge commit '6bd55470fd9378808ec3b7d3e6008b83d803267c'
* commit '6bd55470fd9378808ec3b7d3e6008b83d803267c':
Not to reset the ring buffer in LatinImeLogger
Merge commit '06123e56912b5dcd7aca3d0c18c7ceb1f1cde573' into gingerbread-plus-aosp
* commit '06123e56912b5dcd7aca3d0c18c7ceb1f1cde573':
Don't re-allocate KeyDebouncer when keyboard is switched.
This change will display the key board preview instantaneously when
the key is pressed. Dismissing the key preview will be delayed
slightly after the key is released, as we do now.
Because in multi touch mode, we should instantaneously change keyboard
layout when modifier key, such as shit and symbol, is pressed.
Change-Id: I49348d563ca0f40f5a0a236bdcd0bb07eedd599b
Merge commit '7986d78328e17bdbe7ec05558e93a2c6a25641c6' into gingerbread-plus-aosp
* commit '7986d78328e17bdbe7ec05558e93a2c6a25641c6':
Disable long-press on shift and symbol keys
Long-press on shift and symbol keys will conflict with press-and-hold
these keys and press normal key (a.k.a. multi touch support).
Bug: 2910379
Change-Id: I27007b55a30a3699bf63fd8f64d58c4b23d97d9f
Merge commit 'f17a50f5a5a6c185d3a223bea3a7475c8482a110' into gingerbread-plus-aosp
* commit 'f17a50f5a5a6c185d3a223bea3a7475c8482a110':
Not to reset the ring buffer in LatinImeLogger
Merge commit '830fd4af566cf2545df5f45cd2f53d97c481e254' into gingerbread-plus-aosp
* commit '830fd4af566cf2545df5f45cd2f53d97c481e254':
Refactor onModifiedTouchEvent into several methods.
This change eliminates the need of extra MotionEvent allocation. Also
this will lead to the easy way to handle multi touch events.
Bug: 2910379
Change-Id: Ibcfcba554b732c13105f91877b41b553ee6928ba
Eric Fischer
Maryam Garrett
Tadashi G. Takaoka
satok