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
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
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
da9cc77339
resolved conflicts for merge of 159474f2
to lmp-dev-plus-aosp
...
Change-Id: Ie133ba3e80132d711796d0de6c5ae611f7e43365
2014-07-24 14:21:52 -07:00
Tadashi G. Takaoka
1e491d90f9
Merge "Use fragment for advanced preference screen" into lmp-dev
2014-07-24 16:04:26 +00:00
Tadashi G. Takaoka
9bdcb13160
Use fragment for advanced preference screen
...
Bug: 16522808
Change-Id: If4a2ad7a7dfecc7019bf78ad37d93fa8f37cf21e
2014-07-28 19:24:41 +09:00
Keisuke Kuroyanagi
fb15b768dd
Merge "Fix NPE when context.getFilesDir() returns null." into lmp-dev
2014-07-24 16:04:26 +00:00
Keisuke Kuroyanagi
79ff803cb0
Fix NPE when context.getFilesDir() returns null.
...
Bug: 16416948
Change-Id: I0fac5ab26d6efbadbd688d033a79f6705e0161a5
2014-07-28 19:25:07 +09:00
Tadashi G. Takaoka
9ba854133c
Merge "Refactor Debug settings to use SubScreenFragment" into lmp-dev
2014-07-24 16:04:26 +00:00
Tadashi G. Takaoka
99295c8c5f
Refactor Debug settings to use SubScreenFragment
...
Bug: 16522808
Change-Id: I741e2fbc5f0a62c7d4ae00e603eef52cc2a6d086
2014-07-28 19:16:42 +09:00
Tadashi G. Takaoka
00b49cad9c
Use fragment for text correction preference screen
...
Bug: 16522808
Change-Id: Ia8ce83b0e69cc8157f7b8cefcfeb863eb85ee4b4
2014-07-28 17:48:49 +09:00
Tadashi G. Takaoka
3c8a075a58
Use fragment for gesture typing preference screen
...
Bug: 16522808
Change-Id: Ib8c2997466bb006c6b5d4e980344507b822d0023
2014-07-28 17:45:41 +09:00
Tadashi G. Takaoka
6b71530017
Use fragment for multi lingual preference screen
...
Bug: 16522808
Change-Id: I0bfac43513e1fb85b5d4c07f56dd4c5b82f75ed1
2014-07-28 17:20:16 +09:00
Tadashi G. Takaoka
633f1a5e6e
Merge "Use fragment for text correction preference screen" into lmp-dev
2014-07-24 16:04:26 +00:00
Tadashi G. Takaoka
a484dc84d9
Merge "Use fragment for gesture typing preference screen" into lmp-dev
2014-07-24 16:04:26 +00:00
Tadashi G. Takaoka
1da4385493
Merge "Use fragment for multi lingual preference screen" into lmp-dev
2014-07-24 16:04:26 +00:00
Jean Chalard
6d7a08107c
Merge "Fix a verifier error on ICS." into lmp-dev
2014-07-24 16:04:26 +00:00
Jean Chalard
da70b90aa7
Fix a verifier error on ICS.
...
Bug: 16530557
Change-Id: I271c5884995a1d5f8a1cb7aee6f52d17fabb9e72
2014-07-28 17:33:52 +09:00
Keisuke Kuroyanagi
825243bfdd
Merge "Add BufferWithExtendablebufferTest" into lmp-dev
2014-07-24 15:37:54 +00:00
Keisuke Kuroyanagi
d4c9d50ef0
Add BufferWithExtendablebufferTest
...
Bug: 13754552
Change-Id: Ib9c330dc85bdb5d4d3d5bc15cc3ce5f28faa0b12
2014-07-25 07:02:10 +09:00
Keisuke Kuroyanagi
ff6ca09905
Add BufferWithExtendableBuffer::extend()
...
Bug: 14425059
Change-Id: I13dd8412ba4d16a1325ac2210b3852d580e71ad3
2014-07-25 07:02:05 +09:00
Keisuke Kuroyanagi
dfbe2a8ca8
Merge "Add BufferWithExtendableBuffer::extend()" into lmp-dev
2014-07-24 15:35:58 +00:00
Keisuke Kuroyanagi
f78eb27c7e
Merge "Refactoring checkAndPrepareWriting." into lmp-dev
2014-07-24 15:35:58 +00:00
Stephen Hines
5a289ed293
Revert "Revert "Revert "Use mclinker"""
...
This reverts commit b48c93b3fc
.
MCLinker is not a valid option for clang 3.5.
2014-07-23 19:58:17 -07:00
Keisuke Kuroyanagi
6810e8df1e
Refactoring checkAndPrepareWriting.
...
Bug: 14425059
Change-Id: I98940f3841a6c61b0482440b4da21f415dc843f6
2014-07-24 10:24:42 +09:00
Tadashi G. Takaoka
a270ac4a61
Remove unnecessary DebugSettingsActivity, use fragment directly
...
This CL must be checked in together with I1db2e848ab.
Bug: 16522808
Change-Id: I08a1b0c300c504def609cbb53462d215d1ead15c
2014-07-23 17:09:46 -07:00
Tim Murray
159474f2ae
Merge "Use default compiler flags for dicttool."
2014-07-23 18:45:08 +00:00
Tim Murray
dd28478f5c
Use default compiler flags for dicttool.
...
Not using this causes the triple to not be passed to clang, breaking Darwin.
bug 16172793
Change-Id: If7484c5dbcccce7d925bec97bff0a3e4c30e9434
2014-07-23 21:44:25 -07:00
Yohei Yukawa
3f513f107e
Enable InputMethodService#onUpdateCursor behind the flag
...
With this CL, InputMethodService#onUpdateCursor and
InputMethodService#onUpdateCursorAnchorInfo can be enabled
on L when ENABLE_CURSOR_ANCHOR_INFO_CALLBACK and
ENABLE_CURSOR_RECT_CALLBACK are specified, respectively.
BUG: 16382260
Change-Id: I29924128f6bd2f08cbd91cc4e82c9c4a6ecce3ff
2014-07-20 20:56:52 +09:00
Yohei Yukawa
6b14bbf125
Fix build breakage in dicttool
...
This CL fixes the build breakage caused by I0dd103185dcf62fb1e2505
due to the lack of android.text.Spanned in host environment.
BUG: 16029304
Change-Id: Ic966d10e8abe2c2be8d62c09d1502574535aa8b8
2014-07-20 12:46:34 +09:00
Yohei Yukawa
91e7daaddf
Merge "Use CharSequence for spell checker to keep spans preserved" into lmp-dev
2014-07-17 17:59:02 +00:00
Baligh Uddin
8279b9d4a9
Remove deprecated locales - DO NOT MERGE
...
Change-Id: I8c1efe2343eea40faf7a690518c500af86c1c323
2014-07-20 02:27:29 +00:00
Yohei Yukawa
86f36003fd
Use CharSequence for spell checker to keep spans preserved
...
This is a ground work to take per word locale information into
consideration in the spell checker. This CL is supposed to change
no user visible behavior.
With this CL, the spell checker session is able to read span
information if necessary.
BUG: 16029304
Change-Id: Icb1e1ecdf40fe0445e14565b685b1b878b746210
2014-07-20 02:16:11 +00:00
Yohei Yukawa
22ba22f32d
Merge "Add two convenient utility methods for L new API" into lmp-dev
2014-07-18 18:24:25 +00:00
Tadashi G. Takaoka
34da749437
Merge "Update Hindi Compact keyboard layout" into lmp-dev
2014-07-19 22:40:06 +00:00
Tadashi G. Takaoka
254c5c1e4b
Update Hindi Compact keyboard layout
...
Bug: 13779052
Change-Id: I350e5521b41d2a0b1cc17b6d4a48e6a816db916c
2014-07-19 16:43:35 -07:00