Yohei Yukawa
302e76711f
am 89d7965e: Merge "Fix NoClassDefFoundError due to CursorAnchorInfo in K"
...
* commit '89d7965e76da6044d593cd6dacc45147033cfc23':
Fix NoClassDefFoundError due to CursorAnchorInfo in K
2014-10-07 10:34:20 +00:00
Yohei Yukawa
89d7965e76
Merge "Fix NoClassDefFoundError due to CursorAnchorInfo in K"
2014-10-07 10:30:36 +00:00
Yohei Yukawa
883bfd2c0b
Fix NoClassDefFoundError due to CursorAnchorInfo in K
...
Check API level before touching CursorAnchorInfo that is only
available in L and later.
BUG: 17891202
Change-Id: I6e8d2e3f071bd78bed8c1d24ba2b97207dea3044
2014-10-07 19:19:20 +09:00
Jean Chalard
f3339bb19f
am be4e1539: [ML17] Add a method to switch the most probable language
...
* commit 'be4e1539cb3be157a000a500598be8bd15a2477d':
[ML17] Add a method to switch the most probable language
2014-10-07 10:14:34 +00:00
Jean Chalard
be4e1539cb
[ML17] Add a method to switch the most probable language
...
Also directly hold a ref to it. It's simpler for now, though
we may want to remove it completely later to have a flat,
purely weight-based system with no preference.
Also split weights between gesturing and typing.
Bug: 11230254
Change-Id: Ica15964a193ae6e7f14c85a9a3ed806130fa7efb
2014-10-07 19:09:49 +09:00
Jean Chalard
d46950c056
am 38ec825e: [ML16] Remove DictionaryFacilitator.getLocale()
...
* commit '38ec825ef896db5f90025d86caded938df606194':
[ML16] Remove DictionaryFacilitator.getLocale()
2014-10-07 09:17:43 +00:00
Jean Chalard
38ec825ef8
[ML16] Remove DictionaryFacilitator.getLocale()
...
Bug: 11230254
Change-Id: Ife99df42bc145fbd2d5c3128330bc0f88b104de9
2014-10-07 16:44:26 +09:00
Jean Chalard
42666bda43
am ea077349: [ML15] First step in removing DictionaryFacilitator.getLocale
...
* commit 'ea077349563d704dc3fdecf31a6f9f7f95ce4ad4':
[ML15] First step in removing DictionaryFacilitator.getLocale
2014-10-07 07:24:21 +00:00
Jean Chalard
ea07734956
[ML15] First step in removing DictionaryFacilitator.getLocale
...
Bug: 11230254
Change-Id: Ied010ec6f1024080e8a499f682d2fc1780e82ef7
2014-10-07 16:06:35 +09:00
Keisuke Kuroyanagi
ff0b4b6644
am 3ead4d7f: Merge "Quit having obsolete options for ime-simulator."
...
* commit '3ead4d7f8a4b4f808e06bfc63ad917ef50b8c759':
Quit having obsolete options for ime-simulator.
2014-10-07 02:07:19 +00:00
Keisuke Kuroyanagi
3ead4d7f8a
Merge "Quit having obsolete options for ime-simulator."
2014-10-07 02:03:59 +00:00
Geoff Mendal
4d6dd4a5c1
Merge "Import translations. DO NOT MERGE"
2014-10-07 01:24:06 +00:00
Geoff Mendal
50200dac21
Merge "Import translations. DO NOT MERGE" into jb-ub-latinimegoogle
2014-10-07 01:23:25 +00:00
Geoff Mendal
8403f533c8
Import translations. DO NOT MERGE
...
Change-Id: Id46f6934d46a5d517194656a824fc9f921a1cc04
Auto-generated-cl: translation import
2014-10-06 18:23:25 -07:00
Geoff Mendal
5a6bdc40e8
Merge "Import translations. DO NOT MERGE"
2014-10-07 01:23:06 +00:00
Geoff Mendal
e88bb76a6a
Merge "Import translations. DO NOT MERGE" into jb-ub-latinimegoogle
2014-10-07 01:22:47 +00:00
Geoff Mendal
e0fa90674b
Import translations. DO NOT MERGE
...
Change-Id: Ibefa923c7bde1ea14e8b6e1532151617c119e968
Auto-generated-cl: translation import
2014-10-06 18:22:37 -07:00
Geoff Mendal
f876595332
Import translations. DO NOT MERGE
...
Change-Id: I4ff0dd2333f316363c72071f70694bbf43bb77e2
Auto-generated-cl: translation import
2014-10-06 18:19:53 -07:00
Geoff Mendal
e0713e1db7
Import translations. DO NOT MERGE
...
Change-Id: I0caa2761ffb0fd36df9c561571379012f769b41b
Auto-generated-cl: translation import
2014-10-06 18:13:47 -07:00
Geoff Mendal
b5c6900fad
Merge "Import translations. DO NOT MERGE"
2014-10-07 01:11:57 +00:00
Geoff Mendal
dc12363e18
Import translations. DO NOT MERGE
...
Change-Id: Ib46e14a36ff47c3fc39ad76d33d93611fb818ad2
Auto-generated-cl: translation import
2014-10-06 18:11:23 -07:00
Geoff Mendal
c540c01652
Merge "Import translations. DO NOT MERGE"
2014-10-07 01:11:03 +00:00
Geoff Mendal
fc291d43fa
Merge "Import translations. DO NOT MERGE"
2014-10-07 01:10:40 +00:00
Geoff Mendal
0403903725
Import translations. DO NOT MERGE
...
Change-Id: Ifed7ebdb7582223e9cca0c3330e0a3e385ba97c4
Auto-generated-cl: translation import
2014-10-06 18:09:30 -07:00
Geoff Mendal
1e2d282d88
Import translations. DO NOT MERGE
...
Change-Id: Idb955cc9c187dc0b3b38fdd3ee2ade9e28bac1d1
Auto-generated-cl: translation import
2014-10-06 18:07:53 -07:00
Adrian Velicu
dce0394e41
am 639837f8: Merge "Postponing memory deallocation after onFinishInputView"
...
* commit '639837f85d648443359ac1883aa6f9c11e287c33':
Postponing memory deallocation after onFinishInputView
2014-10-06 23:49:57 +00:00
Adrian Velicu
3890ea4192
am 7a2e38ad: Merge "Update dictionaries"
...
* commit '7a2e38ad403fdc9a1c5450862db6256e8108d007':
Update dictionaries
2014-10-06 23:49:55 +00:00
Adrian Velicu
639837f85d
Merge "Postponing memory deallocation after onFinishInputView"
2014-10-06 23:45:40 +00:00
Adrian Velicu
7a2e38ad40
Merge "Update dictionaries"
2014-10-06 23:45:23 +00:00
Tadashi G. Takaoka
8b609aef52
am f849d21a: Fix currency symbol size
...
* commit 'f849d21a5d3e245eb2082b6cdbf515bf24b6d699':
Fix currency symbol size
2014-10-06 16:00:03 +00:00
Tadashi G. Takaoka
f849d21a5d
Fix currency symbol size
...
Bug: 17877107
Change-Id: I0723fc86792ec5a20ac54a1d3c965293ba1f0bd2
2014-10-07 00:51:47 +09:00
Tadashi G. Takaoka
c6e4acb1d2
am 6fb586a5: Fix missing prediction words on contextual strip
...
* commit '6fb586a527e7ffe5da187c8b345cdf897b8481c7':
Fix missing prediction words on contextual strip
2014-10-06 15:23:07 +00:00
Yohei Yukawa
7ac63288b2
am db6c3277: Merge "Add a utility method to SuggestionSpanUtils"
...
* commit 'db6c32778e80acc156a118f13ff2788a9277da30':
Add a utility method to SuggestionSpanUtils
2014-10-06 15:07:50 +00:00
Tadashi G. Takaoka
6fb586a527
Fix missing prediction words on contextual strip
...
Bug: 17874801
Change-Id: Iaba935a6b2548376f10a0ecd80f07ea7ada6c60a
2014-10-07 00:06:53 +09:00
Yohei Yukawa
db6c32778e
Merge "Add a utility method to SuggestionSpanUtils"
2014-10-06 15:03:20 +00:00
Tadashi G. Takaoka
05357dcafc
am 96d97ee2: Merge "Remove preliminary subtypes from E-MR1 release"
...
* commit '96d97ee23cc325f7045eb3cf3097d614cf35a5ff':
Remove preliminary subtypes from E-MR1 release
2014-10-06 14:58:51 +00:00
Tadashi G. Takaoka
162ca68051
Remove preliminary subtypes from E-MR1 release
...
Note that unit test for Sinhala (Sri Lanka) and Tamil (Sri Lanka) have
been unexpectedly @suppressed.
Bug: 17743363
Change-Id: I4076a61adbf2d4aee58417d0c354b8ef4a938668
2014-10-06 23:42:14 +09:00
Adrian Velicu
7b8f317050
Postponing memory deallocation after onFinishInputView
...
Bug: 17559789
Change-Id: I1d4b1524028164d27ec4eadd3960b567148f2b84
2014-10-06 23:14:48 +09:00
Jean Chalard
c668e12c87
am fcc4cbf6: Merge "[ML14] Forward the locale list to relevant places, again"
...
* commit 'fcc4cbf6f18cd71409b6bc5a277e4514a75dad73':
[ML14] Forward the locale list to relevant places, again
2014-10-06 13:35:49 +00:00
Jean Chalard
fcc4cbf6f1
Merge "[ML14] Forward the locale list to relevant places, again"
2014-10-06 13:32:32 +00:00
Adrian Velicu
5664f64dff
Update dictionaries
...
>>> java/res/raw/main_ru.dict
Header :
codePointTable : null <=> оаиенрстлвкмпудыгяйзбьчхюшжцфщёКэСМАБГПВДЛТРНХФ-ОИШЭУъЗЧЕЯЖЦЮЙЩЁЫѓ
date : 1412325424 <=> 1412592602
version : 52 <=> 53
Body :
No differences
Change-Id: I5db813c4e671797c71de8609aa0e4d26404b425e
2014-10-06 22:10:57 +09:00
Keisuke Kuroyanagi
a84a8d38c0
Quit having obsolete options for ime-simulator.
...
Bug: 16547409
Change-Id: I43f5a15153cbd7072fde15764a664ad4d1c6417f
2014-10-06 22:03:39 +09:00
Ken Wakasa
462476b041
am 8784b436: Merge "Revert "Remove preliminary subtypes from E-MR1 release""
...
* commit '8784b4366e1e4915522d0f0fe80cbdcb5c8832fa':
Revert "Remove preliminary subtypes from E-MR1 release"
2014-10-06 12:58:08 +00:00
Ken Wakasa
8784b4366e
Merge "Revert "Remove preliminary subtypes from E-MR1 release""
2014-10-06 12:53:14 +00:00
Ken Wakasa
fe5132f783
Revert "Remove preliminary subtypes from E-MR1 release"
...
This reverts commit 704db5f003
.
Bug: 17743363
Reverting due to unit test breakage..
Change-Id: Ie7c1e86e50af2a05b4b7877092122dc4f026aa54
2014-10-06 12:52:45 +00:00
Jean Chalard
bc051a561f
[ML14] Forward the locale list to relevant places, again
...
Diff:
+++ b/java/src/com/android/inputmethod/keyboard/internal/KeyboardBuilder.java
@@ -735,7 +735,7 @@ public class KeyboardBuilder<KP extends KeyboardParams> {
private boolean matchLocaleCodes(TypedArray caseAttr, final Locale[] locales) {
// TODO: adujst this for multilingual input
- return matchString(caseAttr, R.styleable.Keyboard_Case_languageCode, locales[0].toString());
+ return matchString(caseAttr, R.styleable.Keyboard_Case_localeCode, locales[0].toString());
}
private boolean matchLanguageCodes(TypedArray caseAttr, Locale[] locales) {
Change-Id: Icefac18dd6d5fea97f591177cf8df1ba6de7f4f0
2014-10-06 21:27:32 +09:00
Yohei Yukawa
8d1060286d
am 4f04fd95: Merge "Remove ENABLE_CURSOR_ANCHOR_INFO_CALLBACK"
...
* commit '4f04fd95f40377e94a35c0385352aa0f16b4695f':
Remove ENABLE_CURSOR_ANCHOR_INFO_CALLBACK
2014-10-06 11:03:58 +00:00
Yohei Yukawa
4f04fd95f4
Merge "Remove ENABLE_CURSOR_ANCHOR_INFO_CALLBACK"
2014-10-06 11:02:24 +00:00
Tadashi G. Takaoka
72de08780f
am 3215338f: Merge "Remove preliminary subtypes from E-MR1 release"
...
* commit '3215338fa0dc23ae86766015a848508e994d85a3':
Remove preliminary subtypes from E-MR1 release
2014-10-06 10:49:07 +00:00
Tadashi G. Takaoka
704db5f003
Remove preliminary subtypes from E-MR1 release
...
Note that unit test for Sinhala (Sri Lanka) and Tamil (Sri Lanka) have
been unexpectedly @suppressed.
Bug: 17743363
Change-Id: I5f4b6fd8cbb8fa4e31df9ac602847c681655fd02
2014-10-06 10:44:59 +00:00