The Android Automerger
2d9642e33e
merge in master-release history after reset to master
2014-03-27 05:50:48 -07:00
Ken Wakasa
ff2456c800
Merge "Use Clang for dicttool"
2014-03-27 10:21:30 +00:00
Ken Wakasa
96092ebd78
Use Clang for dicttool
...
Fix the wrong shared lib name too.
Change-Id: Ib98c55dfd1aee4a762dc96b12df3a463bef2ac80
2014-03-27 19:14:37 +09:00
Keisuke Kuroyanagi
2426bc2943
Merge "Remove DicNodeUtils::appendTwoWords()."
2014-03-27 09:49:50 +00:00
Jean Chalard
080e0253ae
Merge "Revert "[CB15] Remove a redundant variable.""
2014-03-27 09:44:31 +00:00
Jean Chalard
f459ccf4f6
Merge "Revert "[CB16] Remove unused stuff""
2014-03-27 09:44:24 +00:00
Jean Chalard
75715f7d9f
Revert "[CB15] Remove a redundant variable."
...
This reverts commit 0de7a6d1a2
.
Change-Id: I327679b76a14cf9c3aec4b00b013b921408c32f9
2014-03-27 09:43:45 +00:00
Jean Chalard
26baa759d8
Revert "[CB16] Remove unused stuff"
...
This reverts commit 05c46f59fd
.
Change-Id: Ica0feea10fff1b2a9ef42bc55cb7c1892b3a3f58
2014-03-27 09:43:21 +00:00
Keisuke Kuroyanagi
a83b013eec
Remove DicNodeUtils::appendTwoWords().
...
Change-Id: I7402793b3f71ef5d786abea2f97bd4b624e4405f
2014-03-27 17:54:14 +09:00
Jean Chalard
5154c47cbe
Merge "[CB16] Remove unused stuff"
2014-03-27 08:52:11 +00:00
Ken Wakasa
e04a9798f6
Merge "Call setLayerType(LAYER_TYPE_HARDWARE) for EmojiPalettesView too."
2014-03-27 08:27:59 +00:00
Ken Wakasa
e289441f92
Call setLayerType(LAYER_TYPE_HARDWARE) for EmojiPalettesView too.
...
This CL probably does not addresses the bug, but still this should
be the right thing to do here.
bug: 12667742
Change-Id: I587652942fd66094779fb7942c734e0ff5f9d0b6
2014-03-27 17:26:22 +09:00
Keisuke Kuroyanagi
b4a983d400
Merge "Remove DicNode.isFirstWord()."
2014-03-27 08:17:05 +00:00
Jean Chalard
5feda45a6f
Merge "[CB15] Remove a redundant variable."
2014-03-27 08:05:23 +00:00
Jean Chalard
05c46f59fd
[CB16] Remove unused stuff
...
Bug: 13406701
Change-Id: Ib863c5181e1f5d74cfa4458060afc49d1ee8109e
2014-03-27 16:47:30 +09:00
Jean Chalard
0de7a6d1a2
[CB15] Remove a redundant variable.
...
This is a tiny bit slower, but probably unnoticeable.
Still, it gains some performance in other places,
saves memory, and more importantly makes for simpler
code, so it's certainly better.
Change-Id: Id1ab4f73f71acd73f5920bc729817abd22cf0d07
2014-03-27 16:47:27 +09:00
Keisuke Kuroyanagi
6008898b99
Merge "Move code only used for dicttool and tests under tests."
2014-03-27 06:37:10 +00:00
Keisuke Kuroyanagi
93cda5bb39
Move code only used for dicttool and tests under tests.
...
Bug: 13035567
Change-Id: I13c6df013ef2b67c9bf67455d9c32d283bf9ea2e
2014-03-27 15:30:32 +09:00
Keisuke Kuroyanagi
3c38e1f269
Merge "Fix: NPE in isValidWord after dictionaries are closed."
2014-03-27 03:12:07 +00:00
Keisuke Kuroyanagi
7b516d496d
Fix: NPE in isValidWord after dictionaries are closed.
...
Bug: 13650542
Change-Id: I1bdc838fca48d6ef12db5e70d40273d1236128d1
2014-03-27 12:03:58 +09:00
Tadashi G. Takaoka
94f111f881
Remove "sRGB IEC61966-2.1" profile to supress libpng warning
...
The above ICC profile causes the following libpng warnings while APK
packaging.
* libpng warning: iCCP: known incorrect sRGB profile
* libpng warning: iCCP: profile 'icc': 'RGB ': RGB color space not
permitted on grayscale PNG
Bug: 11869853
Change-Id: Ida296d9e3bbd2abaae7c7500d77c8dc54d8b2382
2014-03-27 11:37:52 +09:00
Ken Wakasa
a8cd7647fe
Merge "RegisterNatives() returns 0 on success."
2014-03-27 02:20:58 +00:00
Tadashi G. Takaoka
4cb152682d
Fix crash while entering emoticons
...
Bug: 13652919
Change-Id: Idd66240ac882fa890cfb28a477403ee09dc716ce
2014-03-27 11:08:11 +09:00
The Android Automerger
b40db6499b
merge in master-release history after reset to master
2014-03-26 05:50:51 -07:00
Ken Wakasa
63b48311b0
RegisterNatives() returns 0 on success.
...
cf. http://docs.oracle.com/javase/6/docs/technotes/guides/jni/spec/functions.html#wp5833
Change-Id: I2c599f2d8765a7475c7076e6b049f77ad79feb79
2014-03-26 20:47:14 +09:00
Tadashi G. Takaoka
317075e00d
Merge "Suppress warnings related to string resource"
2014-03-26 10:12:52 +00:00
Tadashi G. Takaoka
c4b558d375
Merge "Rename text resources consistently"
2014-03-26 10:06:34 +00:00
Tadashi G. Takaoka
a95e306d7f
Suppress warnings related to string resource
...
Change-Id: I03073981313ae4f10a12b32ed9f524d0d50c2aa7
2014-03-26 19:05:29 +09:00
Baligh Uddin
f6422f0695
Merge "Import translations. DO NOT MERGE"
2014-03-25 20:42:42 +00:00
The Android Automerger
11bc701d5c
merge in master-release history after reset to master
2014-03-25 05:50:32 -07:00
Jean Chalard
071b9c1a05
Merge "[CB14] Implement backspace in the combiner chain"
2014-03-25 10:46:32 +00:00
Keisuke Kuroyanagi
90f6411899
Remove DicNode.isFirstWord().
...
Change-Id: I825c0f7cf1fcf66c6309e0bab8e0fdd767170107
2014-03-25 18:07:14 +09:00
Keisuke Kuroyanagi
eddbb7ac88
Merge DicNodeStatePrevWord into DicNoteStateOutput.
...
Before:
(0) 2232.70 (0.86%)
(1) 255258.50 (98.89%)
(2) 585.73 (0.23%)
(66) 0.26 (0.00%)
Total 258126.46 (sum of others 258077.18)
After:
(0) 2249.23 (0.93%)
(1) 239883.63 (98.83%)
(2) 554.82 (0.23%)
(66) 0.35 (0.00%)
Total 242734.38 (sum of others 242688.04)
Change-Id: I9760cae5b98b3d1f4804b6b60317887eaa3ff71c
2014-03-25 18:07:09 +09:00
Jean Chalard
1079665c3c
[CB14] Implement backspace in the combiner chain
...
Bug: 13622107
Bug: 13406701
Change-Id: I0023b398c4451253f9f717e2bd990b8a054004bc
2014-03-25 17:57:03 +09:00
Keisuke Kuroyanagi
adfb262797
Remove logic related to dictionary loading from LatinIME.
...
Make mSuggest final and give DictionaryFacilitator the
responsibility to manage dictionary loading state.
This can simplify the logic to decide how to deal with
additional dictionaries when loading settings or language
switching.
Bug: 13273534
Change-Id: I9f3d328272f25addfa186fbeedaaf8417455ba99
2014-03-25 15:35:20 +09:00
Tadashi G. Takaoka
393efd94e5
Rename text resources consistently
...
- keylabel_<key>, the key label text of the <key>
- keyspec_<key>, the key specification of the <key>
- keyhintlabel_<key>, the hint label text of the <key>
- morekeys_<key>, the more keys specifications of the <key>
- additional_morekeys_<key>, the additional more keys specification of
the <key>
Change-Id: Ib2127f21fa33a2568e8a6eba65cfdb2cf78b480e
2014-03-25 13:02:09 +09:00
Tadashi G. Takaoka
37b9562fd7
Fix talk back of emoji key
...
Bug: 13629734
Change-Id: Ifff6f81c2ac99a32855cd333b3d9a01ad7155ffc
2014-03-25 11:58:59 +09:00
Baligh Uddin
ea091b31a1
Import translations. DO NOT MERGE
...
Change-Id: If1481b48b8c94b80932584893c29d9218f3c3ebd
Auto-generated-cl: translation import
2014-03-24 16:32:00 -07:00
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
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