Jean Chalard
fac678e13d
Merge "Create the path for specifying combining rules in the subtype"
2014-05-12 09:33:27 +00:00
Keisuke Kuroyanagi
ddacfdeb09
Improve multi-word suggestion handling for user history.
...
Bug: 12902664
Change-Id: I03deed16047f0beaba8932d87c6129ec8061ba9c
2014-05-12 18:04:43 +09:00
Tadashi G. Takaoka
116be29a89
am 4fb490ff: Merge "Fix javadoc comment of keyboard layout tests"
...
* commit '4fb490ff90423b17181e5402d7f2056d508f3f0a':
Fix javadoc comment of keyboard layout tests
2014-05-12 08:44:51 +00:00
Tadashi G. Takaoka
931a392aa8
am 722f5c79: Remove voice key from keyboard layout
...
* commit '722f5c79668369a69d1b519b8fe8dbd17d7ca6a6':
Remove voice key from keyboard layout
2014-05-12 08:44:50 +00:00
Tadashi G. Takaoka
4fb490ff90
Merge "Fix javadoc comment of keyboard layout tests"
2014-05-12 08:23:04 +00:00
Tadashi G. Takaoka
e6f467c0fe
Fix javadoc comment of keyboard layout tests
...
Change-Id: I22592486ab306a57c4f6ca5a94e0ff69b68a58d6
2014-05-12 17:09:33 +09:00
Tadashi G. Takaoka
722f5c7966
Remove voice key from keyboard layout
...
Bug: 14419121
Change-Id: I71031f1ed9735a5a05dc584299b56512fb0b6866
2014-05-12 17:07:01 +09:00
Tadashi G. Takaoka
345ce61481
am de3afcfd: Fix import and javadoc comments of unit tests
...
* commit 'de3afcfdcc438ae92464247276da57acc6321357':
Fix import and javadoc comments of unit tests
2014-05-12 07:29:15 +00:00
Tadashi G. Takaoka
de3afcfdcc
Fix import and javadoc comments of unit tests
...
Change-Id: Ic3f249bf9e3a5ec7ffd07abd4bc38d343bb14d39
2014-05-12 16:25:49 +09:00
Tadashi G. Takaoka
d0d4a5d532
am 139773d0: Enable voice and language switch keys for keyboard layout tests
...
* commit '139773d0167a2cf09c4b6c2c47aa7d980dc413bd':
Enable voice and language switch keys for keyboard layout tests
2014-05-12 07:17:29 +00:00
Tadashi G. Takaoka
139773d016
Enable voice and language switch keys for keyboard layout tests
...
Change-Id: I19ee05e30d09eb13753b737961882e345591c1df
2014-05-12 16:09:53 +09:00
Jean Chalard
be99616afa
Create the path for specifying combining rules in the subtype
...
Also add the skeleton of the combining rules for Myanmar
reordering as a pilot.
Bug: 13945569
Change-Id: Iabeb6838f45f1efff482143595ce5b48543e0c43
2014-05-12 15:58:51 +09:00
Tadashi G. Takaoka
20b91c3314
am c41d261b: Add voice key to suggestions strip
...
* commit 'c41d261b7e1e626aaa4e333c9c4cc73ec13cb68a':
Add voice key to suggestions strip
2014-05-12 06:19:46 +00:00
Tadashi G. Takaoka
c41d261b7e
Add voice key to suggestions strip
...
Bug: 14419121
Change-Id: I3b2bdc3c07bb7e49ea7be53649bd6dd134fea27c
2014-05-12 15:08:14 +09:00
Tadashi G. Takaoka
27ca7b071b
am 40f6ea72: Merge "Activate pseudo LMP theme"
...
* commit '40f6ea720ec5958fc0706541341cad2762accaa9':
Activate pseudo LMP theme
2014-05-12 05:21:23 +00:00
Tadashi G. Takaoka
40f6ea720e
Merge "Activate pseudo LMP theme"
2014-05-12 05:17:09 +00:00
Tadashi G. Takaoka
fe536b2728
Activate pseudo LMP theme
...
Bug: 14419121
Change-Id: I00265315c204de2279250d9ae20f630c2ee5dec6
2014-05-12 14:11:59 +09:00
Keisuke Kuroyanagi
a197d8773a
am 4eb22026: Remove ContextualDictionary.haveContentsChanged().
...
* commit '4eb220269b2fffa36a98ecf0deb44ac8a5d6b100':
Remove ContextualDictionary.haveContentsChanged().
2014-05-12 05:03:52 +00:00
Keisuke Kuroyanagi
4eb220269b
Remove ContextualDictionary.haveContentsChanged().
...
Change-Id: I7023ba4d9515dcad90e0a226f70936550c5241f4
2014-05-12 13:50:08 +09:00
Keisuke Kuroyanagi
924f8ac6a1
am 47c76f0a: Merge "Add contextual dictionary to the dictionary facilitator."
...
* commit '47c76f0a4574e808456a84b89986ca34d1498a81':
Add contextual dictionary to the dictionary facilitator.
2014-05-12 04:48:51 +00:00
Keisuke Kuroyanagi
47c76f0a45
Merge "Add contextual dictionary to the dictionary facilitator."
2014-05-12 04:42:33 +00:00
Tadashi G. Takaoka
96fca77fbb
am 43e371e5: Merge "Add pseudo LMP theme"
...
* commit '43e371e5130ff2776e365bc1a515cb0bdfda501d':
Add pseudo LMP theme
2014-05-12 03:33:45 +00:00
Jean Chalard
6dcbe306de
am 2b95bc9b: Cleanup : remove a useless member
...
* commit '2b95bc9b642a05727e3295524745faa71a67c85f':
Cleanup : remove a useless member
2014-05-12 03:33:44 +00:00
Tadashi G. Takaoka
43e371e513
Merge "Add pseudo LMP theme"
2014-05-12 03:29:30 +00:00
Jean Chalard
2b95bc9b64
Cleanup : remove a useless member
...
Change-Id: I7871c3243c82b5a19acf266033187795a2ea1767
2014-05-12 11:52:45 +09:00
Tadashi G. Takaoka
d5e3f02586
Add pseudo LMP theme
...
This CL introduce pseudo LMP theme. This keyboard theme is a
placeholder and not final. The drawables and colors that this CL
introduces should be replaced with the final assets.
Bug: 14419121
Change-Id: I7a37c884e4ee0cac09ad21ff729996c2b9c1b4af
2014-05-12 11:52:41 +09:00
Tadashi G. Takaoka
069e2396c8
am 59c3ef1f: Refactor KeyboardTheme
...
* commit '59c3ef1ff8df23e3c3e3f549c0289c479553c666':
Refactor KeyboardTheme
2014-05-12 02:44:56 +00:00
Tadashi G. Takaoka
59c3ef1ff8
Refactor KeyboardTheme
...
This CL introduces two preference keys in addition to the existing one.
- pref_keyboard_theme: The new preference key that is used only in the
preference settings.
- pref_keyboard_layout_20110916: The previous preference key that
holds keyboard color scheme settings. This is superseded by the next
key.
- pref_keyboard_theme_20140509: The new preference key that holds
keyboard theme settings. This value is forcibly reset to LMP theme
on a LMP device. On a KitKat and previous device, the settings of
the pref_keyboard_layout_20110916 is carried on into this
preference.
This CL must be checked in together with Id7b3ddd8aa.
Change-Id: I2d55602d026e30b38d8f822d2124f5c5e4a9a812
2014-05-12 10:59:10 +09:00
The Android Automerger
14d0f2dc22
merge in master-release history after reset to 6b74f516dc
2014-05-11 05:50:04 -07:00
The Android Automerger
950c2f6645
merge in master-release history after reset to 6b74f516dc
2014-05-10 05:51:11 -07:00
Keisuke Kuroyanagi
b319e1580b
am 6b74f516: Merge "Refactoring: Use UnigramProperty to add/update unigram."
...
* commit '6b74f516dcfb7b6c8008054490db117341e5332b':
Refactoring: Use UnigramProperty to add/update unigram.
2014-05-09 11:41:37 +00:00
Keisuke Kuroyanagi
6b74f516dc
Merge "Refactoring: Use UnigramProperty to add/update unigram."
2014-05-09 11:39:17 +00:00
Ken Wakasa
c9bf942ad1
am 4f5ea4df: Merge "Revert "Refactor KeyboardTheme""
...
* commit '4f5ea4dfc25226bbfe81f83ecc86ba22b82bcb24':
Revert "Refactor KeyboardTheme"
2014-05-09 11:32:50 +00:00
Ken Wakasa
4f5ea4dfc2
Merge "Revert "Refactor KeyboardTheme""
2014-05-09 11:28:51 +00:00
Ken Wakasa
d47dca429e
Revert "Refactor KeyboardTheme"
...
This reverts commit 19688b584b
.
Build breakage.
Change-Id: I95d4be1578824eaee5a2fb08ec277250727ac668
2014-05-09 11:28:19 +00:00
Ken Wakasa
a03391168b
am d9b8eaa2: Merge "Revert "Add pseudo LMP theme""
...
* commit 'd9b8eaa229c5255f1d0b9ffccd858f31ba96da97':
Revert "Add pseudo LMP theme"
2014-05-09 10:49:56 +00:00
Ken Wakasa
d9b8eaa229
Merge "Revert "Add pseudo LMP theme""
2014-05-09 10:45:08 +00:00
Ken Wakasa
159071fd19
Revert "Add pseudo LMP theme"
...
This reverts commit dd9ed45c63
.
Unit test breakage.
https://sponge.corp.google.com/target?id=f7fd85a6-8e3b-4fda-8c84-d4e1b342e839&target=com.google.android.inputmethod.latin.tests&searchFor=&show=FAILED&sortBy=STATUS
Change-Id: Ia971834b368890c344a06602473a56887709bbca
2014-05-09 10:44:33 +00:00
Keisuke Kuroyanagi
9e9b019042
am b7f71cdf: Merge "Avoid copying bigram list if possible."
...
* commit 'b7f71cdf8ce4b7e308a85eefdc6827ef3065a2f8':
Avoid copying bigram list if possible.
2014-05-09 10:13:01 +00:00
Keisuke Kuroyanagi
b7f71cdf8c
Merge "Avoid copying bigram list if possible."
2014-05-09 10:09:54 +00:00
Tadashi G. Takaoka
63699dac8f
am 418df4a6: Merge "Add pseudo LMP theme"
...
* commit '418df4a62e506da58158afb689a31168e8a2bb17':
Add pseudo LMP theme
2014-05-09 08:57:13 +00:00
Tadashi G. Takaoka
418df4a62e
Merge "Add pseudo LMP theme"
2014-05-09 08:53:28 +00:00
Tadashi G. Takaoka
dd9ed45c63
Add pseudo LMP theme
...
This CL introduce pseudo LMP theme. This keyboard theme is a
placeholder and not final. The drawables and colors that this CL
introduces should be replaced with the final assets.
Bug: 14419121
Change-Id: Iba4751c525775fc12763c0a55309410e0d82ce9b
2014-05-09 17:48:25 +09:00
Tadashi G. Takaoka
c0c0d9ae70
am c2a49f30: Merge "Refactor KeyboardTheme"
...
* commit 'c2a49f300676e0b688669b9d80015e8731bc2bad':
Refactor KeyboardTheme
2014-05-09 08:45:18 +00:00
Tadashi G. Takaoka
c2a49f3006
Merge "Refactor KeyboardTheme"
2014-05-09 08:26:05 +00:00
Keisuke Kuroyanagi
b636e25e95
Refactoring: Use UnigramProperty to add/update unigram.
...
Bug: 13406708
Change-Id: I26fd541fb465d3543faa5f155becc455ddbb6c9c
2014-05-09 17:22:17 +09:00
Tadashi G. Takaoka
19688b584b
Refactor KeyboardTheme
...
This CL introduces two preference keys in addition to the existing one.
- pref_keyboard_theme: The new preference key that is used only in the
preference settings.
- pref_keyboard_layout_20110916: The previous preference key that
holds keyboard color scheme settings. This is superseded by the next
key.
- pref_keyboard_theme_20140509: The new preference key that holds
keyboard theme settings. This value is forcibly reset to LMP theme
on a LMP device. On a KitKat and previous device, the settings of
the pref_keyboard_layout_20110916 is carried on into this
preference.
This CL must be checked in together with Ifcedeabbec.
Change-Id: Ibe75146e2c1c7eebf964ca86550baf244fedb79a
2014-05-09 16:21:02 +09:00
Keisuke Kuroyanagi
c7073b2172
am eaa347bc: Merge "Add VERSION4_TEST for testing."
...
* commit 'eaa347bc1a166ee6cfbf6cc49399c43085422581':
Add VERSION4_TEST for testing.
2014-05-09 07:10:23 +00:00
Keisuke Kuroyanagi
eaa347bc1a
Merge "Add VERSION4_TEST for testing."
2014-05-09 07:06:06 +00:00
Keisuke Kuroyanagi
455dc84cf2
Add VERSION4_TEST for testing.
...
Bug: 13406708
Change-Id: I0b434717ea3edbb131650af634c53cfbfe113c3e
2014-05-09 15:17:01 +09:00