Keisuke Kuroyanagi
08b98fcea4
am bcc6b52b: am 7d48233e: am 6850ea0e: Merge "Add boundary check for ver2 bigram reading." into lmp-dev
...
* commit 'bcc6b52b7458ce5c473e24245fee26348d0fcb92':
Add boundary check for ver2 bigram reading.
2014-07-29 01:46:58 +00:00
Keisuke Kuroyanagi
bcc6b52b74
am 7d48233e: am 6850ea0e: Merge "Add boundary check for ver2 bigram reading." into lmp-dev
...
* commit '7d48233e72296bd7d7567f4e8ee90cb55d812371':
Add boundary check for ver2 bigram reading.
2014-07-29 01:42:53 +00:00
Keisuke Kuroyanagi
7d48233e72
am 6850ea0e: Merge "Add boundary check for ver2 bigram reading." into lmp-dev
...
* commit '6850ea0ee5da6c85907f2173b58a260e6c859101':
Add boundary check for ver2 bigram reading.
2014-07-29 01:39:11 +00:00
Jean Chalard
bfd40d2a93
am 37f701df: am b6a75d10: am 036b83f4: Merge "Wait for an event before actually realizing it" into lmp-dev
...
* commit '37f701dfa09f303f45c3c0494482c8ae9694b4e1':
Wait for an event before actually realizing it
2014-07-28 12:18:17 +00:00
Tadashi G. Takaoka
ed0d9a7fce
am 4c6e8e70: am 5fc43eb0: am 1e491d90: Merge "Use fragment for advanced preference screen" into lmp-dev
...
* commit '4c6e8e70fb68eb9ae47d3b612440e07755366fa2':
Use fragment for advanced preference screen
2014-07-28 12:18:16 +00:00
Keisuke Kuroyanagi
e1d781bbbf
am 4de1ca67: am 0bad998c: am fb15b768: Merge "Fix NPE when context.getFilesDir() returns null." into lmp-dev
...
* commit '4de1ca67d7340b3c2db1b7fc9262029886b3fd68':
Fix NPE when context.getFilesDir() returns null.
2014-07-28 12:18:14 +00:00
Tadashi G. Takaoka
93c58c7c61
am cd4799fd: am 1f5881b7: am 9ba85413: Merge "Refactor Debug settings to use SubScreenFragment" into lmp-dev
...
* commit 'cd4799fdf96335e32d122562789aee0bc127d49c':
Refactor Debug settings to use SubScreenFragment
2014-07-28 12:18:13 +00:00
Tadashi G. Takaoka
12769faeed
am a8765dae: am b1067103: am 633f1a5e: Merge "Use fragment for text correction preference screen" into lmp-dev
...
* commit 'a8765daeec64991afab0bccab5dea82c6296425d':
Use fragment for text correction preference screen
2014-07-28 12:18:12 +00:00
Tadashi G. Takaoka
4ed4d4fc46
am 2d64f7c0: am f63a044c: am a484dc84: Merge "Use fragment for gesture typing preference screen" into lmp-dev
...
* commit '2d64f7c097bb0246e8c1ac1a1f82c175c40c4e41':
Use fragment for gesture typing preference screen
2014-07-28 12:18:10 +00:00
Tadashi G. Takaoka
1f6cc6fb57
am a0a37bd3: am beffde59: am 1da43854: Merge "Use fragment for multi lingual preference screen" into lmp-dev
...
* commit 'a0a37bd368c2570f60106f30391d413e48d80f42':
Use fragment for multi lingual preference screen
2014-07-28 12:18:09 +00:00
Jean Chalard
275079c9ae
am d33f7e84: am ac82983f: am 6d7a0810: Merge "Fix a verifier error on ICS." into lmp-dev
...
* commit 'd33f7e84ab44bb27c82c300b431518bb48919883':
Fix a verifier error on ICS.
2014-07-28 12:18:08 +00:00
Tadashi G. Takaoka
18855ae268
am 081a4177: am c140938d: am bfcd98ed: Use fragment for input preference screen
...
* commit '081a4177e482727cc27e686607c02cf9f099a64d':
Use fragment for input preference screen
2014-07-28 12:18:06 +00:00
Tadashi G. Takaoka
ed65482cc7
am 4dba300e: am 26a29865: am ab661e3e: Make "Show correction suggestions" as a binary option
...
* commit '4dba300e50587f1bc9c1c5ca7bd98adc1781bdf5':
Make "Show correction suggestions" as a binary option
2014-07-28 12:18:04 +00:00
Jean Chalard
37f701dfa0
am b6a75d10: am 036b83f4: Merge "Wait for an event before actually realizing it" into lmp-dev
...
* commit 'b6a75d10de3ab43dcf318fde77e81918fc55e02b':
Wait for an event before actually realizing it
2014-07-28 12:14:29 +00:00
Tadashi G. Takaoka
4c6e8e70fb
am 5fc43eb0: am 1e491d90: Merge "Use fragment for advanced preference screen" into lmp-dev
...
* commit '5fc43eb04df9870fb6256d8d3918e7d399ca8a79':
Use fragment for advanced preference screen
2014-07-28 12:14:28 +00:00
Keisuke Kuroyanagi
4de1ca67d7
am 0bad998c: am fb15b768: Merge "Fix NPE when context.getFilesDir() returns null." into lmp-dev
...
* commit '0bad998c52cc0ed610e4fef745c438472f14a7e4':
Fix NPE when context.getFilesDir() returns null.
2014-07-28 12:14:26 +00:00
Tadashi G. Takaoka
cd4799fdf9
am 1f5881b7: am 9ba85413: Merge "Refactor Debug settings to use SubScreenFragment" into lmp-dev
...
* commit '1f5881b752b9b8e527b00e14150cfedd916513ce':
Refactor Debug settings to use SubScreenFragment
2014-07-28 12:14:25 +00:00
Tadashi G. Takaoka
a8765daeec
am b1067103: am 633f1a5e: Merge "Use fragment for text correction preference screen" into lmp-dev
...
* commit 'b1067103343c9b196e0a9276f3e9f7c20b6def86':
Use fragment for text correction preference screen
2014-07-28 12:14:24 +00:00
Tadashi G. Takaoka
2d64f7c097
am f63a044c: am a484dc84: Merge "Use fragment for gesture typing preference screen" into lmp-dev
...
* commit 'f63a044c6649f3cabc3b612ed5bd79b6601f52ae':
Use fragment for gesture typing preference screen
2014-07-28 12:14:23 +00:00
Tadashi G. Takaoka
a0a37bd368
am beffde59: am 1da43854: Merge "Use fragment for multi lingual preference screen" into lmp-dev
...
* commit 'beffde59c36515f77946b35c2b0279413a1df69f':
Use fragment for multi lingual preference screen
2014-07-28 12:14:21 +00:00
Jean Chalard
d33f7e84ab
am ac82983f: am 6d7a0810: Merge "Fix a verifier error on ICS." into lmp-dev
...
* commit 'ac82983f65626c1db3fd878ba059807166ffbe36':
Fix a verifier error on ICS.
2014-07-28 12:14:20 +00:00
Tadashi G. Takaoka
081a4177e4
am c140938d: am bfcd98ed: Use fragment for input preference screen
...
* commit 'c140938d99b2b34e95d7e45425396f280a486043':
Use fragment for input preference screen
2014-07-28 12:14:19 +00:00
Tadashi G. Takaoka
4dba300e50
am 26a29865: am ab661e3e: Make "Show correction suggestions" as a binary option
...
* commit '26a2986581410536a98e1c311214dc90d9934546':
Make "Show correction suggestions" as a binary option
2014-07-28 12:14:18 +00:00
Jean Chalard
b6a75d10de
am 036b83f4: Merge "Wait for an event before actually realizing it" into lmp-dev
...
* commit '036b83f4c44169703273b4e8192809fdadd7b8ad':
Wait for an event before actually realizing it
2014-07-28 12:09:16 +00:00
Tadashi G. Takaoka
5fc43eb04d
am 1e491d90: Merge "Use fragment for advanced preference screen" into lmp-dev
...
* commit '1e491d90f9b26430f55a9dfee031007acf3d727b':
Use fragment for advanced preference screen
2014-07-28 12:09:15 +00:00
Keisuke Kuroyanagi
0bad998c52
am fb15b768: Merge "Fix NPE when context.getFilesDir() returns null." into lmp-dev
...
* commit 'fb15b768dd21a7364a541e898886166177617c58':
Fix NPE when context.getFilesDir() returns null.
2014-07-28 12:09:09 +00:00
Tadashi G. Takaoka
1f5881b752
am 9ba85413: Merge "Refactor Debug settings to use SubScreenFragment" into lmp-dev
...
* commit '9ba854133cf06b28111980908373e173a8b26938':
Refactor Debug settings to use SubScreenFragment
2014-07-28 12:09:08 +00:00
Tadashi G. Takaoka
b106710334
am 633f1a5e: Merge "Use fragment for text correction preference screen" into lmp-dev
...
* commit '633f1a5e6ed6dee09b01449a23f7bab3953c99d3':
Use fragment for text correction preference screen
2014-07-28 12:09:07 +00:00
Tadashi G. Takaoka
f63a044c66
am a484dc84: Merge "Use fragment for gesture typing preference screen" into lmp-dev
...
* commit 'a484dc84d92839e821e7aa7de03c12495d566229':
Use fragment for gesture typing preference screen
2014-07-28 12:09:06 +00:00
Tadashi G. Takaoka
beffde59c3
am 1da43854: Merge "Use fragment for multi lingual preference screen" into lmp-dev
...
* commit '1da438549368e74d55017c36d666673ad608a5c4':
Use fragment for multi lingual preference screen
2014-07-28 12:09:05 +00:00
Jean Chalard
ac82983f65
am 6d7a0810: Merge "Fix a verifier error on ICS." into lmp-dev
...
* commit '6d7a08107cd62620a2a07d445686e76c2d660bcf':
Fix a verifier error on ICS.
2014-07-28 12:09:04 +00:00
Tadashi G. Takaoka
c140938d99
am bfcd98ed: Use fragment for input preference screen
...
* commit 'bfcd98edc7c5ac28fdc1e4b7a97b2912124e622a':
Use fragment for input preference screen
2014-07-28 12:09:03 +00:00
Tadashi G. Takaoka
26a2986581
am ab661e3e: Make "Show correction suggestions" as a binary option
...
* commit 'ab661e3ef886a36b02fe094864ae4be6a3260f71':
Make "Show correction suggestions" as a binary option
2014-07-28 12:09:02 +00:00
Tadashi G. Takaoka
bfcd98edc7
Use fragment for input preference screen
...
This CL introduces a common abstract class, SunScreenFragment, for
PreferenceFragment that implements a PreferenceScreen of the main
settings preference screen.
Bug: 16522808
Change-Id: I11fba71b5e9f96208b261e0c0314de8a41720d0f
2014-07-27 16:06:52 +09:00
Tadashi G. Takaoka
ab661e3ef8
Make "Show correction suggestions" as a binary option
...
Formerly "Show correction suggestions" had three options, "always
show", "show in portrait mode", and "always hide". The reason behind
"show in portrait mode" was that there may not be enough screen estate
in landscape mode to show suggestions. Because recent phone devices
have relatively large screen, we decide to remove "show in portrait
mode" option.
Bug: 15780939
Change-Id: I896d737452c3893d43ce20bd88127f10c1eb3d83
2014-07-27 14:47:07 +09:00
Baligh Uddin
f7828313ef
am 2dc3a510: (-s ours) Merge "Import translations. DO NOT MERGE"
...
* commit '2dc3a51001996a59ab6ea9556a3815159702c202':
Import translations. DO NOT MERGE
2014-07-25 16:37:10 +00:00
Jean Chalard
036b83f4c4
Merge "Wait for an event before actually realizing it" into lmp-dev
2014-07-25 11:19:20 +00:00
Jean Chalard
3d951c1eff
Wait for an event before actually realizing it
...
This would wrongly emit a 'timeout' log entry when switching
between two instances of the same language.
Change-Id: I56e5de121b87f3e762b58f0b2a77e9abc784036e
2014-07-28 19:33:49 +09:00
Keisuke Kuroyanagi
6c627db6b6
am 862fa431: am 370ffb42: am 825243bf: Merge "Add BufferWithExtendablebufferTest" into lmp-dev
...
* commit '862fa431df2174f2d45045353cdcf29e508dbd15':
Add BufferWithExtendablebufferTest
2014-07-25 02:03:59 +00:00
Keisuke Kuroyanagi
e127672661
am 917f8002: am 90ac50ee: am dfbe2a8c: Merge "Add BufferWithExtendableBuffer::extend()" into lmp-dev
...
* commit '917f8002c0eb310da517ec97b235fada60978996':
Add BufferWithExtendableBuffer::extend()
2014-07-25 02:03:58 +00:00
Keisuke Kuroyanagi
6bd15b8662
am e32cb6f8: am 16665da2: am f78eb27c: Merge "Refactoring checkAndPrepareWriting." into lmp-dev
...
* commit 'e32cb6f8f267ce044c2880106e5a5a309ec9dc33':
Refactoring checkAndPrepareWriting.
2014-07-25 02:03:56 +00:00
Keisuke Kuroyanagi
862fa431df
am 370ffb42: am 825243bf: Merge "Add BufferWithExtendablebufferTest" into lmp-dev
...
* commit '370ffb424f4d03143c7e5d8186206e58e6fb4021':
Add BufferWithExtendablebufferTest
2014-07-24 23:59:07 +00:00
Keisuke Kuroyanagi
917f8002c0
am 90ac50ee: am dfbe2a8c: Merge "Add BufferWithExtendableBuffer::extend()" into lmp-dev
...
* commit '90ac50ee433d7ecb1a89da242d0d99b882169d17':
Add BufferWithExtendableBuffer::extend()
2014-07-24 23:59:06 +00:00
Keisuke Kuroyanagi
e32cb6f8f2
am 16665da2: am f78eb27c: Merge "Refactoring checkAndPrepareWriting." into lmp-dev
...
* commit '16665da28091f977e92dd0382eb3adefc8478f36':
Refactoring checkAndPrepareWriting.
2014-07-24 23:59:05 +00:00
Keisuke Kuroyanagi
370ffb424f
am 825243bf: Merge "Add BufferWithExtendablebufferTest" into lmp-dev
...
* commit '825243bfdd6fb63c2ef8bf99024bb06e6f52e946':
Add BufferWithExtendablebufferTest
2014-07-24 23:37:03 +00:00
Keisuke Kuroyanagi
90ac50ee43
am dfbe2a8c: Merge "Add BufferWithExtendableBuffer::extend()" into lmp-dev
...
* commit 'dfbe2a8ca80ef73a0bc1364cf5964db2141a2a86':
Add BufferWithExtendableBuffer::extend()
2014-07-24 23:36:16 +00:00
Keisuke Kuroyanagi
16665da280
am f78eb27c: Merge "Refactoring checkAndPrepareWriting." into lmp-dev
...
* commit 'f78eb27c7e563d0bbe10239ec7d9941fd170e597':
Refactoring checkAndPrepareWriting.
2014-07-24 23:35:45 +00:00
Tim Murray
5d44dfe005
am ea3bc5ca: am da9cc773: resolved conflicts for merge of 159474f2
to lmp-dev-plus-aosp
...
* commit 'ea3bc5caac38ccfd59c4fba957b4102e049e8f9f':
Use default compiler flags for dicttool.
2014-07-24 21:27:56 +00:00
Tim Murray
ea3bc5caac
am da9cc773: resolved conflicts for merge of 159474f2
to lmp-dev-plus-aosp
...
* commit 'da9cc77339b18e3624efe99684a4d1511a02a8f9':
Use default compiler flags for dicttool.
2014-07-24 21:25:56 +00:00
Tim Murray
da9cc77339
resolved conflicts for merge of 159474f2
to lmp-dev-plus-aosp
...
Change-Id: Ie133ba3e80132d711796d0de6c5ae611f7e43365
2014-07-24 14:21:52 -07:00