Yohei Yukawa
8f1aba2e25
Merge "Check null before passing to Integer.parseInt"
2014-03-24 14:21:27 +00:00
The Android Automerger
c4db2a72b3
merge in master-release history after reset to master
2014-03-24 05:49:39 -07:00
Keisuke Kuroyanagi
683889298e
am cf88cf65
: Add a check for ForgettingCurveUtils::decodeProbability.
...
* commit 'cf88cf65936962373797d14694011b15d0f4c5f0':
Add a check for ForgettingCurveUtils::decodeProbability.
2014-03-24 05:29:06 -07:00
Jean Chalard
b2117af988
am a1719522
: Merge "[CB13] Remove an unused method."
...
* commit 'a17195224b132563055bef762fda0f0d6840adcf':
[CB13] Remove an unused method.
2014-03-24 05:29:03 -07:00
Keisuke Kuroyanagi
2923329b05
am 9695342f
: Merge "Add boundary check for SparseTable."
...
* commit '9695342ff663954570c8172ac2e427c96ed2958f':
Add boundary check for SparseTable.
2014-03-24 05:29:00 -07:00
Jean Chalard
8e73ea1aa5
am cbed462d
: [CB12] Reset the combining state when resetting the composer
...
* commit 'cbed462d192d0c5af9614f5f997b2768f3d0eb56':
[CB12] Reset the combining state when resetting the composer
2014-03-24 05:28:58 -07:00
Keisuke Kuroyanagi
750e3a4673
am 628a6484
: Merge "Fix: wrong size checking in SparseTable."
...
* commit '628a64847c3313e36e21e6d2a4960c7aace989c7':
Fix: wrong size checking in SparseTable.
2014-03-24 05:28:55 -07:00
Jean Chalard
12ee0d3a5a
am 7f0e5fa6
: Merge "[CB11] Get the result of the combination"
...
* commit '7f0e5fa66c7238b91999627dc8e75d234c1d9e75':
[CB11] Get the result of the combination
2014-03-24 05:28:52 -07:00
Yohei Yukawa
f1f5ed542d
Check null before passing to Integer.parseInt
...
Just after user data is cleared, user preference associated with
PREF_KEYBOARD_LAYOUT is always empty. In such case, we might
want to return the default value immediately, rather than
calling Integer.parseInt(null) and catching NumberFormatException
unnecessarily.
BUG: 13472379
Change-Id: I8dca9a22780d057013c032bd1f56e730dcada3ce
2014-03-24 20:54:03 +09:00
Keisuke Kuroyanagi
cf88cf6593
Add a check for ForgettingCurveUtils::decodeProbability.
...
Bug: 13607383
Change-Id: I1a56c52173d0e458864e65fb1c1f4603c0c81c6f
2014-03-24 11:11:07 +00:00
Jean Chalard
a17195224b
Merge "[CB13] Remove an unused method."
2014-03-24 10:22:19 +00:00
Keisuke Kuroyanagi
9695342ff6
Merge "Add boundary check for SparseTable."
2014-03-24 09:51:25 +00:00
Keisuke Kuroyanagi
ef665816d0
Add boundary check for SparseTable.
...
Bug: 13592288
Change-Id: I8bc4ff778c6073d22f86b6050a880b6fb69de31e
2014-03-24 09:17:53 +00:00
Jean Chalard
d36cbc44e4
[CB13] Remove an unused method.
...
Change-Id: If4d2fa9c6499ce9b2427cea424abd497ec4a966b
2014-03-24 17:44:36 +09:00
Jean Chalard
cbed462d19
[CB12] Reset the combining state when resetting the composer
...
Bug: 13406701
Change-Id: I490574b7ca4b953f67dd2c0ef97401297fade0a4
2014-03-24 17:44:31 +09:00
Keisuke Kuroyanagi
628a64847c
Merge "Fix: wrong size checking in SparseTable."
2014-03-24 06:55:14 +00:00
Jean Chalard
7f0e5fa66c
Merge "[CB11] Get the result of the combination"
2014-03-24 05:33:34 +00:00
Keisuke Kuroyanagi
4c93770430
Fix: wrong size checking in SparseTable.
...
Bug: 13592288
Change-Id: I52f03081c5abf25e3c160e2b8fff5e98f8448499
2014-03-24 14:28:36 +09:00
The Android Automerger
109c8ba154
merge in master-release history after reset to master
2014-03-22 05:52:40 -07:00
Ken Wakasa
8b921161ca
am 83b094a4
: Add a clean step for LatinIME native lib.
...
* commit '83b094a4c899818855c16122e6036e79be29d56f':
Add a clean step for LatinIME native lib.
2014-03-20 19:02:56 -07:00
Ken Wakasa
83b094a4c8
Add a clean step for LatinIME native lib.
...
This is corresponding to recent changes made for LatinIME native lib
builds, such as switching to libc++.
Change-Id: I8e0b35f08dbcb878bd33557dd3087ddfbc10b641
2014-03-21 10:46:24 +09:00
Jean Chalard
79213ea02c
am 1dda9107
: Merge "Rework the logic that tells if the cursor touches words"
...
* commit '1dda9107ca03fff08009eb865022ba707e174e15':
Rework the logic that tells if the cursor touches words
2014-03-20 07:42:57 -07:00
Jean Chalard
1dda9107ca
Merge "Rework the logic that tells if the cursor touches words"
2014-03-20 14:35:19 +00:00
Jean Chalard
835965a75e
[CB11] Get the result of the combination
...
Change-Id: I165ec4a24f5b1334d55c14948e4d942ec40eb33b
2014-03-20 23:33:12 +09:00
Jean Chalard
72b67f6541
Rework the logic that tells if the cursor touches words
...
Bug: 13312942
Change-Id: I6be6a558bbc6c88508150f9c25cadbd0240ff88e
2014-03-20 23:16:53 +09:00
The Android Automerger
a16f079f19
merge in master-release history after reset to master
2014-03-20 05:50:55 -07:00
Jean Chalard
75ba24d4b3
am 4df6bc08
: Merge "[CB10] Add an event for string input"
...
* commit '4df6bc0853fa5211416614130d1c027e6d0da210':
[CB10] Add an event for string input
2014-03-20 04:37:55 -07:00
Jean Chalard
4df6bc0853
Merge "[CB10] Add an event for string input"
2014-03-20 11:34:16 +00:00
Jean Chalard
058a38988b
[CB10] Add an event for string input
...
Change-Id: Ie5da6c73d4df4553067c58cd0dce9abb34534250
2014-03-20 19:47:01 +09:00
Tadashi G. Takaoka
97424f4d87
am b20dad6f
: Merge "Consolidate KeyboardTextsSet.setLocale and loadStringResoucres"
...
* commit 'b20dad6fab49f71b8eb4ee0ce49bd2643c92944c':
Consolidate KeyboardTextsSet.setLocale and loadStringResoucres
2014-03-20 03:03:41 -07:00
Tadashi G. Takaoka
b20dad6fab
Merge "Consolidate KeyboardTextsSet.setLocale and loadStringResoucres"
2014-03-20 09:59:11 +00:00
Keisuke Kuroyanagi
607ed07fa7
am 7c20f140
: Merge "Remove unused partial commit."
...
* commit '7c20f140e0ab3efa25dd0708e1373b231339f5e2':
Remove unused partial commit.
2014-03-20 02:56:08 -07:00
Tadashi G. Takaoka
600a730004
am 0c268b08
: Merge "Refactor KeyboardTextsSet class"
...
* commit '0c268b08b69e9f4f730dc145bb86522ca2964a52':
Refactor KeyboardTextsSet class
2014-03-20 02:56:05 -07:00
Tadashi G. Takaoka
df39eb6961
Consolidate KeyboardTextsSet.setLocale and loadStringResoucres
...
Change-Id: Idaf8f0d80fdeef4f1430f11d4083366e8ab7f6e0
2014-03-20 18:55:03 +09:00
Keisuke Kuroyanagi
7c20f140e0
Merge "Remove unused partial commit."
2014-03-20 09:54:15 +00:00
Tadashi G. Takaoka
0c268b08b6
Merge "Refactor KeyboardTextsSet class"
2014-03-20 09:52:02 +00:00
Keisuke Kuroyanagi
0d00e56b54
am d6517e7c
: Merge "Stop apply Completion for DicNodes without any proximity chars."
...
* commit 'd6517e7cf5bfa9d3f2c311924a3afb6e7f21b96f':
Stop apply Completion for DicNodes without any proximity chars.
2014-03-20 02:51:41 -07:00
Keisuke Kuroyanagi
d6517e7cf5
Merge "Stop apply Completion for DicNodes without any proximity chars."
2014-03-20 09:48:22 +00:00
Keisuke Kuroyanagi
5a0381f7d0
Remove unused partial commit.
...
Change-Id: Ia9341a5cb24947d93056810890d94c1f66481d8c
2014-03-20 18:47:45 +09:00
Tadashi G. Takaoka
c0d3878c8d
am 58b19655
: Merge "Add pcqwerty layout test"
...
* commit '58b19655d8f08673ee7296ee8c1cb15d1c815fbd':
Add pcqwerty layout test
2014-03-20 02:42:25 -07:00
Tadashi G. Takaoka
3f241c3386
am a13096db
: Merge "Fix PC Qwerty shift locked layout"
...
* commit 'a13096db38528289043892e574b319b5463872cd':
Fix PC Qwerty shift locked layout
2014-03-20 02:42:22 -07:00
Tadashi G. Takaoka
58b19655d8
Merge "Add pcqwerty layout test"
2014-03-20 09:40:47 +00:00
Tadashi G. Takaoka
a13096db38
Merge "Fix PC Qwerty shift locked layout"
2014-03-20 09:39:42 +00:00
Tadashi G. Takaoka
6007a1b7a9
Refactor KeyboardTextsSet class
...
Change-Id: Ibb59a9d4902db9ec0e00244304be9ab35b215a50
2014-03-20 18:38:59 +09:00
Jean Chalard
41ae99d5c7
am 437dbbcf
: Merge "[IL127] Move the double space countdown to InputLogic"
...
* commit '437dbbcfee175c873dcbaa90d49e10e584e3e30a':
[IL127] Move the double space countdown to InputLogic
2014-03-20 02:11:13 -07:00
Jean Chalard
437dbbcfee
Merge "[IL127] Move the double space countdown to InputLogic"
2014-03-20 09:07:49 +00:00
Keisuke Kuroyanagi
18ba146b72
Stop apply Completion for DicNodes without any proximity chars.
...
Bug: 13538127
Change-Id: Ifffc0cde1ea8a0ceb13e4e4e57c151b3ea33a522
2014-03-20 18:06:06 +09:00
Tadashi G. Takaoka
4afa3f7477
am aacfa31c
: Merge "Remove reference of KeyboardTextsSet from SpacingAndPunctuations"
...
* commit 'aacfa31c8e357e1595188a8d9dcf062fdfd3ee7d':
Remove reference of KeyboardTextsSet from SpacingAndPunctuations
2014-03-20 01:50:15 -07:00
Tadashi G. Takaoka
aacfa31c8e
Merge "Remove reference of KeyboardTextsSet from SpacingAndPunctuations"
2014-03-20 08:46:11 +00:00
Jean Chalard
b125f451c2
am 83372e75
: Merge "[CB09] Pass events through the combiner chain"
...
* commit '83372e75e4fc030e77de470e08cf7012436c759a':
[CB09] Pass events through the combiner chain
2014-03-20 01:40:07 -07:00