The Android Automerger
d4c3b68315
merge in nakasi-factoryrom-release history after reset to jb-dev
2012-05-18 10:50:18 -07:00
Tom Ouyang
e1128687b1
Merge "Change to a binary version of the expandable user dictionary." into jb-dev
2012-05-18 10:05:11 -07:00
Ken Wakasa
16e7d13475
Remove unnecessary entries in the English whitelist dictionary
...
bug: 6354484
Change-Id: Id1c89be171f23d2bf8c8289e61f573520b46de14
2012-05-18 20:52:23 +09:00
Jean Chalard
1fc0c71fad
Update French/English dictionaries to the latest version
...
Change-Id: I9c98280f900914d1af22b47019ebc0ad5ab175de
2012-05-18 18:54:37 +09:00
Tadashi G. Takaoka
75c60bf3a5
Merge "Change auto caps mode argument to int type" into jb-dev
2012-05-18 01:53:19 -07:00
Tadashi G. Takaoka
553e2f19c1
Change auto caps mode argument to int type
...
Bug: 6501446
Change-Id: I3f7bc0fc39edd29ebf96107c3d43b9ccc9b8022e
2012-05-18 17:46:05 +09:00
Tadashi G. Takaoka
b710ca158e
am 0a57156c: Don\'t use KeyDrawParams as argument of Key#selectTextSize
...
* commit '0a57156c07990b024b69100f1729997e61cb86c1':
Don't use KeyDrawParams as argument of Key#selectTextSize
2012-05-18 01:13:13 -07:00
Tadashi G. Takaoka
0a57156c07
Don't use KeyDrawParams as argument of Key#selectTextSize
...
This is a follow up of Ide48c361.
Bug: 6509415
Change-Id: I59f6e47d06ebfbac6d354d36fca6788f092ed41d
2012-05-18 17:09:02 +09:00
Tadashi Takaoka
8906f91550
am aee147e2: Revert "Make KeyDrawParams and KeyPreviewDrawParams to top level class"
...
* commit 'aee147e2167b9d5147ec9fc315723bdf2a70eb2c':
Revert "Make KeyDrawParams and KeyPreviewDrawParams to top level class"
2012-05-18 01:05:52 -07:00
Tadashi G. Takaoka
554e5a147e
am 4c9e6a15: Make KeyDrawParams and KeyPreviewDrawParams to top level class
...
* commit '4c9e6a15d174f85dfd28fbf89341549fbb986acf':
Make KeyDrawParams and KeyPreviewDrawParams to top level class
2012-05-18 01:03:35 -07:00
Tadashi Takaoka
aee147e216
Revert "Make KeyDrawParams and KeyPreviewDrawParams to top level class"
...
This reverts commit 4c9e6a15d1
2012-05-18 01:02:53 -07:00
Tadashi G. Takaoka
4c9e6a15d1
Make KeyDrawParams and KeyPreviewDrawParams to top level class
...
This is a follow up of Ide48c361.
Bug: 6509415
Change-Id: Ib45c476924bc4b6b2ca65e0cae91d719109a9cb1
2012-05-18 16:58:34 +09:00
satok
9a06a1e9ea
am 468ac358: Merge "Add utils for forgetting curve" into jb-dev
...
* commit '468ac35822034caddc3ba98e70f914b7f88dfff4':
Add utils for forgetting curve
2012-05-17 23:02:09 -07:00
satok
468ac35822
Merge "Add utils for forgetting curve" into jb-dev
2012-05-17 23:01:06 -07:00
satok
607a924486
Add utils for forgetting curve
...
Bug: 4192129
Change-Id: Iebb7ac355e1c1891da31c33754315bd76a61889b
2012-05-18 14:50:05 +09:00
Tadashi G. Takaoka
3c83090bb0
am d7b80c4e: Merge "Use large label text size for action label" into jb-dev
...
* commit 'd7b80c4eee3eaf753f46beee5d68ed44d9742f3c':
Use large label text size for action label
2012-05-17 21:32:46 -07:00
Tadashi G. Takaoka
d7b80c4eee
Merge "Use large label text size for action label" into jb-dev
2012-05-17 21:30:42 -07:00
Tadashi G. Takaoka
88d378bce9
Use large label text size for action label
...
The large label text size is used for:
* The enter key's action label on phone/number keyboard layout of
phone device and 7-inch tablet
* The enter key's action label on alphabet/symbols keyboard of 7-inch
tablet.
Bug: 6509415
Change-Id: I1c0dc511b3ac87cba00163b8d29c687ad1e86ce8
2012-05-18 13:06:37 +09:00
Jean Chalard
9ad774d1f6
am 91492993: Merge "Close batch edit" into jb-dev
...
* commit '914929939a492f8e3605e599e0fa40ab5c7e93e0':
Close batch edit
2012-05-17 20:28:10 -07:00
Jean Chalard
914929939a
Merge "Close batch edit" into jb-dev
2012-05-17 20:25:57 -07:00
Jean Chalard
d4cacb1e41
Close batch edit
...
This does the same thing as Ie30e1aff but differently
Bug: 6512086
Change-Id: I47ae990510d3f657abd45ad5f0e325d93dec83c0
2012-05-18 12:07:58 +09:00
Svetoslav Ganov
29948e7a19
am a9d28030: Merge "Fix NPE on HOVER_EXIT event when not touching a key." into jb-dev
...
* commit 'a9d28030964c4c99e7292d7dcfc73e1453750bf9':
Fix NPE on HOVER_EXIT event when not touching a key.
2012-05-17 20:01:47 -07:00
Svetoslav Ganov
a9d2803096
Merge "Fix NPE on HOVER_EXIT event when not touching a key." into jb-dev
2012-05-17 20:00:17 -07:00
alanv
d4f7a26f92
Fix NPE on HOVER_EXIT event when not touching a key.
...
Bug: 6513368
Change-Id: Ia6d4d01f51a620230b4d19f813fb3aff6881ec03
2012-05-17 19:53:51 -07:00
Tadashi G. Takaoka
0c661dae4b
am a26bda7c: Increase CHAR LIMIT of some string resources
...
* commit 'a26bda7c2f487074ac9ac8c64d98b4df615ea429':
Increase CHAR LIMIT of some string resources
2012-05-17 19:48:50 -07:00
Tadashi G. Takaoka
a26bda7c2f
Increase CHAR LIMIT of some string resources
...
Bug: 6513954
Change-Id: If4aa1032bc7e615c77e3a64c6e8f8dbb0a020d8d
2012-05-18 11:09:39 +09:00
Tadashi G. Takaoka
db8b3a1ecf
am 817a66e7: Merge "Support large label text ratio in KeyboardView" into jb-dev
...
* commit '817a66e7e6bc9eb0bc74bacf0431308f40185cb1':
Support large label text ratio in KeyboardView
2012-05-17 18:34:38 -07:00
Tadashi G. Takaoka
817a66e7e6
Merge "Support large label text ratio in KeyboardView" into jb-dev
2012-05-17 18:32:24 -07:00
Tom Ouyang
f6adff6227
Change to a binary version of the expandable user dictionary.
...
Bug: 6435677
Change-Id: If83409f699608d443796e64a3c65692ae81b98e6
2012-05-17 15:12:00 -07:00
The Android Automerger
710f2a2833
merge in jb-release history after reset to jb-dev
2012-05-17 07:05:42 -07:00
Tadashi G. Takaoka
da3ba3e254
am 8ec3a42d: Merge "Check duplicated entry of "custom input style"" into jb-dev
...
* commit '8ec3a42d2bb93fc6b06236411a9876215792412d':
Check duplicated entry of "custom input style"
2012-05-17 04:39:57 -07:00
Tadashi G. Takaoka
a08759f6b1
Support large label text ratio in KeyboardView
...
Bug: 6509415
Change-Id: Ide48c36126c23d91612c322a1027257c9b967e6b
2012-05-17 20:38:48 +09:00
Tadashi G. Takaoka
8ec3a42d2b
Merge "Check duplicated entry of "custom input style"" into jb-dev
2012-05-17 04:36:16 -07:00
Tadashi G. Takaoka
749b2a388e
Check duplicated entry of "custom input style"
...
Bug: 6495488
Change-Id: Ia6c2421cb0e7c1793d4dfe18acd07fd6f8c5d797
2012-05-17 20:20:41 +09:00
Jean Chalard
b7ee64844c
am 6139016b: Merge "Fix a bug where the previous word would not be read correctly" into jb-dev
...
* commit '6139016b2b51ccfbd31079064804c1a61a6ff87e':
Fix a bug where the previous word would not be read correctly
2012-05-17 04:09:17 -07:00
Jean Chalard
6139016b2b
Merge "Fix a bug where the previous word would not be read correctly" into jb-dev
2012-05-17 04:06:54 -07:00
Jean Chalard
6e5ca89050
Fix a bug where the previous word would not be read correctly
...
Bug: 6510002
Change-Id: Id30f67e0ca6f7a6fbbbd07922ae19e416c5ef55e
2012-05-17 20:03:39 +09:00
Jean Chalard
b4f0e7a7a0
am d7515a0b: Merge "Add open-source-able word lists to AOSP." into jb-dev
...
* commit 'd7515a0bdf456b800b2094b2ccd863a15c8343f8':
Add open-source-able word lists to AOSP.
2012-05-17 03:34:13 -07:00
Jean Chalard
d7515a0bdf
Merge "Add open-source-able word lists to AOSP." into jb-dev
2012-05-17 03:32:29 -07:00
Jean Chalard
7557d3c6f3
am bc77adef: Merge "Return the bigram frequency if available." into jb-dev
...
* commit 'bc77adefbb0305c5ec0e41ab01e3a085c47c21eb':
Return the bigram frequency if available.
2012-05-17 03:31:15 -07:00
Jean Chalard
8fec807800
Add open-source-able word lists to AOSP.
...
Bug: 6458744
Change-Id: If28aeb7360ee7ec7408f55934ca2a684f032e338
2012-05-17 19:20:04 +09:00
Jean Chalard
bc77adefbb
Merge "Return the bigram frequency if available." into jb-dev
2012-05-17 03:15:40 -07:00
Tadashi G. Takaoka
e7c7852cbf
am 5748a7ce: Merge "Split Portuguese subtype into pt_BR and pt_PT" into jb-dev
...
* commit '5748a7ce86631eaff417828984d25eec7dd63c08':
Split Portuguese subtype into pt_BR and pt_PT
2012-05-17 02:09:02 -07:00
Jean Chalard
c493cde8ad
am 892c000b: Merge "Add a whitelisted word" into jb-dev
...
* commit '892c000b6dd1e34115e7cb0a3b7d9dc3ea5bc29c':
Add a whitelisted word
2012-05-17 02:07:15 -07:00
Tadashi G. Takaoka
5748a7ce86
Merge "Split Portuguese subtype into pt_BR and pt_PT" into jb-dev
2012-05-17 02:07:13 -07:00
Tadashi G. Takaoka
bb80833f66
am a8b1563d: Merge "Fix stale key drawing" into jb-dev
...
* commit 'a8b1563d08f76156469cb6359ea90d0a2750f713':
Fix stale key drawing
2012-05-17 02:05:29 -07:00
Jean Chalard
892c000b6d
Merge "Add a whitelisted word" into jb-dev
2012-05-17 02:05:09 -07:00
Tadashi G. Takaoka
a8b1563d08
Merge "Fix stale key drawing" into jb-dev
2012-05-17 02:02:53 -07:00
Tadashi G. Takaoka
93a1ac2213
Split Portuguese subtype into pt_BR and pt_PT
...
Bug: 6510103
Change-Id: I91e13e7ecdf4fc9a2f3e3d647b70fb4b672321f5
2012-05-17 18:00:51 +09:00
Jean Chalard
fea28ab1ba
Add a whitelisted word
...
Change-Id: Id776b63dfadeba815f619ed0536bb14febc3aee7
2012-05-17 18:00:30 +09:00
