Ken Wakasa
8037b971c2
am da4d87ff: am 2dcb6337: Merge "Make SparseTable have multiple content tables."
...
* commit 'da4d87ff000b594ede7cdb7bcb10e9272484f467':
Make SparseTable have multiple content tables.
2013-10-09 17:54:56 -07:00
Jean Chalard
d0b02b526a
am 93c2fa8d: am cd7422f4: Merge "Fix a pernicious bug with caps."
...
* commit '93c2fa8d3e65ab91898760e64636d5d10942ea17':
Fix a pernicious bug with caps.
2013-10-09 17:54:48 -07:00
Satoshi Kataoka
96fdbaa367
am 85eba056: am c5182c9a: Correspond to the security related API change for PreferenceActivity
...
* commit '85eba056f2326f5e3015e4153123d40b6f7cd98f':
Correspond to the security related API change for PreferenceActivity
2013-10-09 17:54:44 -07:00
Jean Chalard
4afd8ff474
am 0874939e: am a8b838b4: Merge "Fix a test and crash with a better error message when reading"
...
* commit '0874939e1086baceba9c1f94ca98a7a5837e7813':
Fix a test and crash with a better error message when reading
2013-10-09 17:54:40 -07:00
Satoshi Kataoka
3cc9602c57
am 319eb1c3: am 77144a64: Merge "Retain Emoji Keyboard after rotation"
...
* commit '319eb1c363a0d443cace14ee41c575a67ecfc93a':
Retain Emoji Keyboard after rotation
2013-10-09 17:54:37 -07:00
Satoshi Kataoka
2e7f74f00c
am 615509cf: am 9d763910: Merge "Unfortunately, hide some broken "emoji"s"
...
* commit '615509cf27839e946280787cf27d8c091079b91b':
Unfortunately, hide some broken "emoji"s
2013-10-09 17:54:01 -07:00
Jean Chalard
e398d09a50
am af75e48e: am 74577bed: Merge "Implement the heuristic for auto-commit."
...
* commit 'af75e48efdc5be7d0b1c3d411017757454ed1799':
Implement the heuristic for auto-commit.
2013-10-09 17:53:58 -07:00
Jean Chalard
805bae9575
am 6f2830dc: am 2afa0e62: Merge "Fix a bug where gesture would delay update."
...
* commit '6f2830dcb91fd2d00088c7522c91a45e90a1f3e6':
Fix a bug where gesture would delay update.
2013-10-09 17:53:52 -07:00
Ken Wakasa
3dd8185656
am a9f5c55c: am 382094a7: Merge "Cleanup and remove redundant more keys on phones"
...
* commit 'a9f5c55ca2f075ed6923e0040fa66c07a5a37176':
Cleanup and remove redundant more keys on phones
2013-10-09 17:53:49 -07:00
Ken Wakasa
272a8b79d8
am 88c946af: am 194c6360: Merge "Swap keys: exclamation, question, period, comma."
...
* commit '88c946af0c8a8e07092be71a7b98957d021e499b':
Swap keys: exclamation, question, period, comma.
2013-10-09 17:53:47 -07:00
Ken Wakasa
b04568b460
am 1522e7be: am cc81a93b: Merge "Add skipPtNode to DictDecoders."
...
* commit '1522e7be20ac53c3870d493e3a9fb7946edbbea4':
Add skipPtNode to DictDecoders.
2013-10-09 17:53:41 -07:00
Satoshi Kataoka
acdd67bb42
am 98da7cfc: am c2dda795: Tentatively revert inconsistent assets
...
* commit '98da7cfc0b9afc75db240d10c20f3360fe693320':
Tentatively revert inconsistent assets
2013-10-09 17:53:39 -07:00
Satoshi Kataoka
8498002afb
am db083a2b: am a4913994: Hide indication bar if only one page
...
* commit 'db083a2b25d057f21a22333251ea0a78668e6326':
Hide indication bar if only one page
2013-10-09 17:53:37 -07:00
Keisuke Kuroyanagi
07fe099765
am d00e4865: am 126d758c: Merge "Quit blocking getSuggestion during GC."
...
* commit 'd00e48656b02ff49fc834ed6762dc194d00b42ad':
Quit blocking getSuggestion during GC.
2013-10-09 17:53:34 -07:00
Jean Chalard
645d992786
am bff2d14d: am 74730a46: Merge "Create the wiring for auto-commit confidence computation."
...
* commit 'bff2d14d1caf4d70f8c1fdcbbf8e9b41209a3e94':
Create the wiring for auto-commit confidence computation.
2013-10-09 17:53:32 -07:00
Satoshi Kataoka
f4aa9a7bd7
Do not merge. Revert emoji key position to JB-mr2
...
Cherry pick of Ie2033b2f5253b2e2
Bug: 10954182
Change-Id: I9cc61e27a207055d5a43fe3da6fd1ec63bae49fd
2013-10-04 16:38:54 +09:00
Ken Wakasa
da4d87ff00
am 2dcb6337: Merge "Make SparseTable have multiple content tables."
...
* commit '2dcb63375d9f6dbdbcd1334571f6e80b4d487771':
Make SparseTable have multiple content tables.
2013-10-02 01:40:26 -07:00
Ken Wakasa
2dcb63375d
Merge "Make SparseTable have multiple content tables."
2013-10-02 08:32:55 +00:00
Jean Chalard
93c2fa8d3e
am cd7422f4: Merge "Fix a pernicious bug with caps."
...
* commit 'cd7422f4dfe2bd5708acc6305a4f6dc83767685a':
Fix a pernicious bug with caps.
2013-10-02 01:00:50 -07:00
Jean Chalard
cd7422f4df
Merge "Fix a pernicious bug with caps."
2013-10-02 07:59:08 +00:00
Jean Chalard
f735117d36
Fix a pernicious bug with caps.
...
What's happening here is, setAlphabetKeyboard sets the
keyboard to AUTOMATIC_SHIFTED and updates the keyboard, then
restoring the keyboard old state sets it back to UNSHIFTED without
updating it. When we finally know what the correct value is,
we try to set it to UNSHIFTED, but since that's already the currently
recorded state, it skips updating the keyboard forever.
The solution is to avoid setting the shift state without updating the
keyboard.
Bug: 10948582
Change-Id: Ic8670401e378f8284e851281f91a9ad93eac8e90
2013-10-02 16:57:36 +09:00
Satoshi Kataoka
85eba056f2
am c5182c9a: Correspond to the security related API change for PreferenceActivity
...
* commit 'c5182c9a4ae66e75df8c959bf625d08ef99f81d2':
Correspond to the security related API change for PreferenceActivity
2013-10-02 00:38:31 -07:00
Satoshi Kataoka
c5182c9a4a
Correspond to the security related API change for PreferenceActivity
...
Bug: 10118761
Change-Id: Ia7d1c6c526dae849f447c26387e96a4fb4d6042f
2013-10-02 16:25:07 +09:00
Yuichiro Hanada
4284e9aae7
Make SparseTable have multiple content tables.
...
Bug: 10920165
Change-Id: Ie9008452ee292fb0b1fec66e2ffed228c4af6c3e
2013-10-02 15:36:13 +09:00
Jean Chalard
0874939e10
am a8b838b4: Merge "Fix a test and crash with a better error message when reading"
...
* commit 'a8b838b473d4927e6f0483912c45fba929dfb402':
Fix a test and crash with a better error message when reading
2013-10-01 23:29:35 -07:00
Jean Chalard
a8b838b473
Merge "Fix a test and crash with a better error message when reading"
2013-10-02 06:28:06 +00:00
Satoshi Kataoka
319eb1c363
am 77144a64: Merge "Retain Emoji Keyboard after rotation"
...
* commit '77144a645f693fd0d73fd2cbe378997c7a339006':
Retain Emoji Keyboard after rotation
2013-10-01 23:16:44 -07:00
Jean Chalard
fa946d4a0f
Fix a test and crash with a better error message when reading
...
When there are too many bigrams, we stop reading the file,
so the file pointer is in an inconsistent place. This means we
have no idea what's going to happen next. It's better to crash
right away.
Change-Id: Id3b7b78cbe4fda3493b3c9c46758763e1ab5f6a3
2013-10-02 11:48:47 +09:00
Satoshi Kataoka
615509cf27
am 9d763910: Merge "Unfortunately, hide some broken "emoji"s"
...
* commit '9d763910580379d3e68b4559f91e655cf05f02a3':
Unfortunately, hide some broken "emoji"s
2013-10-01 09:52:17 -07:00
Jean Chalard
af75e48efd
am 74577bed: Merge "Implement the heuristic for auto-commit."
...
* commit '74577bedb3bb0dabd0e661270f9da0c11c4b0f46':
Implement the heuristic for auto-commit.
2013-10-01 09:52:15 -07:00
Jean Chalard
6f2830dcb9
am 2afa0e62: Merge "Fix a bug where gesture would delay update."
...
* commit '2afa0e621eab2ebd7e2bde344dd209308a75dcfc':
Fix a bug where gesture would delay update.
2013-10-01 09:52:11 -07:00
Ken Wakasa
a9f5c55ca2
am 382094a7: Merge "Cleanup and remove redundant more keys on phones"
...
* commit '382094a784efb32ef9308542ef2f8d2c88ac96b2':
Cleanup and remove redundant more keys on phones
2013-10-01 09:52:04 -07:00
Ken Wakasa
88c946af0c
am 194c6360: Merge "Swap keys: exclamation, question, period, comma."
...
* commit '194c6360554f54d3dfa165427eadda2c7046a65e':
Swap keys: exclamation, question, period, comma.
2013-10-01 09:51:57 -07:00
Ken Wakasa
1522e7be20
am cc81a93b: Merge "Add skipPtNode to DictDecoders."
...
* commit 'cc81a93b01cbcada13c3791fa5ba73a09ba7e092':
Add skipPtNode to DictDecoders.
2013-10-01 09:51:53 -07:00
Satoshi Kataoka
98da7cfc0b
am c2dda795: Tentatively revert inconsistent assets
...
* commit 'c2dda795af14f94db7b6cfc80cbc609c20406522':
Tentatively revert inconsistent assets
2013-10-01 09:51:51 -07:00
Satoshi Kataoka
db083a2b25
am a4913994: Hide indication bar if only one page
...
* commit 'a4913994c2904eefa861782966a288959b216713':
Hide indication bar if only one page
2013-10-01 09:51:50 -07:00
Keisuke Kuroyanagi
d00e48656b
am 126d758c: Merge "Quit blocking getSuggestion during GC."
...
* commit '126d758c1e8db969ad1c9e5d801f3075e2061cc1':
Quit blocking getSuggestion during GC.
2013-10-01 09:51:43 -07:00
Jean Chalard
bff2d14d1c
am 74730a46: Merge "Create the wiring for auto-commit confidence computation."
...
* commit '74730a4600620b5ccfcf3d16666ad0239aec18b6':
Create the wiring for auto-commit confidence computation.
2013-10-01 09:51:41 -07:00
Satoshi Kataoka
5ceae026e0
Retain Emoji Keyboard after rotation
...
Bug: 10612450
Change-Id: Ie0ae953958d2b0a0a4da651584f1e28b0ba38ae3
2013-10-01 22:59:02 +09:00
Satoshi Kataoka
9d76391058
Merge "Unfortunately, hide some broken "emoji"s"
2013-10-01 12:18:13 +00:00
Jean Chalard
74577bedb3
Merge "Implement the heuristic for auto-commit."
2013-10-01 12:10:57 +00:00
Satoshi Kataoka
c7e6f3dbc3
Unfortunately, hide some broken "emoji"s
...
Bug: 10923117
Change-Id: I27ba38e5f388cc15ae331fd05d63db4e4a41cbbf
2013-10-01 21:02:59 +09:00
Jean Chalard
459cd6f8ef
Implement the heuristic for auto-commit.
...
Bug: 9059617
Change-Id: I066abf018df5aaeabf415425dd822ebe233e6008
2013-10-01 21:00:40 +09:00
Jean Chalard
2afa0e621e
Merge "Fix a bug where gesture would delay update."
2013-10-01 11:21:59 +00:00
Jean Chalard
b1e6eeea57
Fix a bug where gesture would delay update.
...
Change-Id: I94c394f45f2717bc1a4b95692a5757c1e7179152
2013-10-01 20:06:36 +09:00
Ken Wakasa
382094a784
Merge "Cleanup and remove redundant more keys on phones"
2013-10-01 10:29:15 +00:00
Ken Wakasa
194c636055
Merge "Swap keys: exclamation, question, period, comma."
2013-10-01 10:03:08 +00:00
Ken Wakasa
e56c2f979f
Cleanup and remove redundant more keys on phones
...
Change-Id: I419c3c119eb1e4d2e877c8c00564e46f40b6abc2
2013-10-01 19:02:09 +09:00
Ken Wakasa
b23a67529b
Swap keys: exclamation, question, period, comma.
...
bug: 11003945
Change-Id: If9ff0487ebbb1c25c8b13eaa55615255921c61c6
2013-10-01 18:35:41 +09:00
Ken Wakasa
cc81a93b01
Merge "Add skipPtNode to DictDecoders."
2013-10-01 09:06:39 +00:00