Satoshi Kataoka
776e81be37
am 7b470340: am 83994ad6: Merge "Fix the security related API change for PreferenceActivity"
...
* commit '7b4703402e2cc999a20fc3f40eb165a0c6cc2da9':
Fix the security related API change for PreferenceActivity
2013-12-12 17:51:09 -08:00
Jean Chalard
e027ac9f7f
am a8285a24: am dfaec345: Merge "Always call finishComposingText before recapitalization"
...
* commit 'a8285a2425865ec617ae6c3d0fd22208ffc5ef17':
Always call finishComposingText before recapitalization
2013-12-12 17:51:05 -08:00
Jean Chalard
416b5e83a5
am bfa0d8df: am e306d292: Merge "Remove a useless IPC call."
...
* commit 'bfa0d8df8d307a0348bb85b682167bce9077862e':
Remove a useless IPC call.
2013-12-12 17:51:01 -08:00
Satoshi Kataoka
faf999f8de
am a87070b6: am 50f9ca4a: Fix crash in AdditionalSubtypeUtils
...
* commit 'a87070b6c5cfaffa5b2ff58103e5ae2267292d83':
Fix crash in AdditionalSubtypeUtils
2013-12-12 17:50:57 -08:00
Baligh Uddin
5c47cee083
am 6a8a163d: (-s ours) am d823988b: (-s ours) Merge "Import translations. DO NOT MERGE"
...
* commit '6a8a163d88d5bf53216035ce30f63f5b6aff442b':
Import translations. DO NOT MERGE
2013-12-12 17:50:55 -08:00
Baligh Uddin
7139cc38af
am 549559e2: (-s ours) Merge "Import translations. DO NOT MERGE" into jb-ub-latinimegoogle
...
* commit '549559e28d82936e023272683601e2da8247c357':
Import translations. DO NOT MERGE
2013-12-12 17:50:50 -08:00
Baligh Uddin
e8bbcb1d74
am 96c86af0: (-s ours) Import translations. DO NOT MERGE
...
* commit '96c86af0b5d79cc3ebaf139b7877377c3dca32dd':
Import translations. DO NOT MERGE
2013-12-12 08:40:31 -08:00
Baligh Uddin
96c86af0b5
Import translations. DO NOT MERGE
...
Change-Id: Ib2de3eec303a80b4cae3599c61740db23370dd03
Auto-generated-cl: translation import
2013-12-12 04:40:19 -08:00
Satoshi Kataoka
ea6dcd69e0
am 5707b216: Show mic key option on sw540 device
...
* commit '5707b21647630dde1f5890804908582218e67f51':
Show mic key option on sw540 device
2013-11-18 09:10:10 -08:00
Satoshi Kataoka
5707b21647
Show mic key option on sw540 device
...
Bug: 11737760
Change-Id: Id50a7d393acf755cb04d3f8dc60327abeee5a671
2013-11-18 14:15:54 +09:00
Baligh Uddin
d5600b9b01
am d075a7af: (-s ours) Import translations. DO NOT MERGE
...
* commit 'd075a7af4103173186048c78522b99fcc30e99ec':
Import translations. DO NOT MERGE
2013-11-05 20:45:20 -08:00
Baligh Uddin
d075a7af41
Import translations. DO NOT MERGE
...
Change-Id: I103b96a481208d2d3525dd57df2387e9c61b84a3
Auto-generated-cl: translation import
2013-11-04 23:29:12 -08:00
Baligh Uddin
3597b08a4e
am ea596c4f: (-s ours) Import translations. DO NOT MERGE
...
* commit 'ea596c4f7c2136f1b9dc24057505e33043374888':
Import translations. DO NOT MERGE
2013-11-01 07:33:39 -07:00
Baligh Uddin
ea596c4f7c
Import translations. DO NOT MERGE
...
Change-Id: Ib8c870d0c974eb3b49ae29141aaa53e5f6a2cac9
Auto-generated-cl: translation import
2013-10-28 23:45:03 -07:00
Baligh Uddin
198235a94f
am c9dea6d6: (-s ours) Import translations. DO NOT MERGE
...
* commit 'c9dea6d6c23f6bb01b0d2baed302b03956253ec8':
Import translations. DO NOT MERGE
2013-10-25 20:38:58 -07:00
Baligh Uddin
c9dea6d6c2
Import translations. DO NOT MERGE
...
Change-Id: I9c4542106d4660da3b67907afa5696e91f537dd6
Auto-generated-cl: translation import
2013-10-25 14:39:08 -07:00
Jean Chalard
42de819ae8
am 1875860d: Stopgap solution for a crash.
...
* commit '1875860d2606eff269381ef0bb68db549ab4819d':
Stopgap solution for a crash.
2013-10-22 08:11:48 -07:00
Jean Chalard
1875860d26
Stopgap solution for a crash.
...
This returns the wrong string, but since it's used for getting the
previous word for bigrams, it only results in slightly worse
suggestions quality.
Cherry-pick of I6ce5de2f
Bug: 11273655
Change-Id: I17fb6d74f18fb31bd8f8518f80456d74ae30a2c3
2013-10-22 20:07:06 +09:00
Jean Chalard
d869e1fdbb
am f603fa1f: Merge "[DO NOT MERGE] Add a sequence number to SuggestedWords." into klp-dev
...
* commit 'f603fa1f0e8fc909bf2e1bc6e2d0c9b5a01c02c6':
[DO NOT MERGE] Add a sequence number to SuggestedWords.
2013-10-21 23:36:51 -07:00
Jean Chalard
238941991d
am f356a25f: [DO NOT MERGE] Fix a bug where autocaps would jam auto-commit
...
* commit 'f356a25f36952f59e9918daa35f7ff6e5235a37d':
[DO NOT MERGE] Fix a bug where autocaps would jam auto-commit
2013-10-21 23:36:49 -07:00
Jean Chalard
f603fa1f0e
Merge "[DO NOT MERGE] Add a sequence number to SuggestedWords." into klp-dev
2013-10-22 06:34:55 +00:00
Jean Chalard
6b8d2d31f9
[DO NOT MERGE] Add a sequence number to SuggestedWords.
...
This allows testing for suggestion freshness in an asynchronous
suggestions world.
Cherry-pick of Ic76cd175
Bug: 11301597
Change-Id: I45a84de0632062475eebe30234b3147f1c680359
2013-10-22 04:03:52 +00:00
Jean Chalard
f356a25f36
[DO NOT MERGE] Fix a bug where autocaps would jam auto-commit
...
Cherry-pick of I62955e36
Bug: 11311002
Change-Id: I5b11cb48e6dd0563fc29566fe0d27864be2beb0a
2013-10-22 04:03:17 +00:00
Ken Wakasa
1c5f5eca9d
am 47568d5e: Merge "Fix: Suggested words from user history are invalid. DO NOT MERGE." into klp-dev
...
* commit '47568d5e19ed907485f7cb435c3944ccc0cb4411':
Fix: Suggested words from user history are invalid. DO NOT MERGE.
2013-10-18 11:18:28 -07:00
Ken Wakasa
069d44c32c
am 146cf238: DO NOT MERGE: Update input method subtype locales.
...
* commit '146cf238792c4748aa726a440fb96a33b4260fa5':
DO NOT MERGE: Update input method subtype locales.
2013-10-18 11:18:26 -07:00
Ken Wakasa
47568d5e19
Merge "Fix: Suggested words from user history are invalid. DO NOT MERGE." into klp-dev
2013-10-18 17:43:00 +00:00
Keisuke Kuroyanagi
029d9eeb38
Fix: Suggested words from user history are invalid. DO NOT MERGE.
...
- Suggestions form user history can contain invalid words.
- isValidWord always returns false.
Bug: 11139426
Change-Id: I6075b275603332ddb00f4a9284afcaa82d824270
2013-10-18 20:13:40 +09:00
Ken Wakasa
146cf23879
DO NOT MERGE: Update input method subtype locales.
...
To match up with the removal of obsolete locales.
cherrypick of I27098bfa26b66631ef412f8f0f72e0273a0161bc
bug: 11244796
Change-Id: I6e93513978ac657c859391d0431f90143d855e5f
2013-10-18 17:09:24 +09:00
Satoshi Kataoka
b4b0a0507a
am 2e7f360a: Merge "Do not merge. Fix keyboard layout" into klp-dev
...
* commit '2e7f360a04f2a840fa083dde299d10e213de7bbb':
Do not merge. Fix keyboard layout
2013-10-17 17:44:47 -07:00
Satoshi Kataoka
dcc33ab0fc
am 141a0c33: Merge "Do not merge. Don\'t show long-pressing emoji key on tablet" into klp-dev
...
* commit '141a0c33802d44a0b8b240b6b8415d465e0aa794':
Do not merge. Don't show long-pressing emoji key on tablet
2013-10-17 17:44:45 -07:00
Satoshi Kataoka
2e7f360a04
Merge "Do not merge. Fix keyboard layout" into klp-dev
2013-10-18 00:41:53 +00:00
Satoshi Kataoka
141a0c3380
Merge "Do not merge. Don't show long-pressing emoji key on tablet" into klp-dev
2013-10-18 00:41:42 +00:00
Baligh Uddin
66bdabad80
am e47f7332: These files were in the obsoleted locale directories and are not processed by the translation pipeline. Moving them to their new locale directory.
...
* commit 'e47f7332f9bb94905015061dd9791f43763ccab8':
These files were in the obsoleted locale directories and are not processed by the translation pipeline. Moving them to their new locale directory.
2013-10-17 11:26:35 -07:00
Baligh Uddin
a7cebb8c5c
am 486c5896: Remove obsolete locale directories.
...
* commit '486c5896102cccfaa79d2109272ab7235dcacf38':
Remove obsolete locale directories.
2013-10-17 11:26:33 -07:00
Baligh Uddin
e47f7332f9
These files were in the obsoleted locale
...
directories and are not processed by the translation pipeline.
Moving them to their new locale directory.
Example: values-et/bools.xml moved to values-et-rEE/bools.xml
Bug: 11244796
2013-10-17 11:22:07 -07:00
Baligh Uddin
486c589610
Remove obsolete locale directories.
...
Bug: 11244796
2013-10-17 11:15:33 -07:00
Ken Wakasa
a79431b42b
am d8ba6abf: Merge "[DO NOT MERGE] Fix a bug where autoshift would be ignored coming from emoji" into klp-dev
...
* commit 'd8ba6abfeef1bce43af3e0ac517e20172c9e8cc5':
[DO NOT MERGE] Fix a bug where autoshift would be ignored coming from emoji
2013-10-17 09:28:49 -07:00
Ken Wakasa
d8ba6abfee
Merge "[DO NOT MERGE] Fix a bug where autoshift would be ignored coming from emoji" into klp-dev
2013-10-17 16:26:42 +00:00
Baligh Uddin
62bea4d6e0
am 8d757c20: (-s ours) Merge "Import translations. DO NOT MERGE" into klp-dev
...
* commit '8d757c205293bb2670d6f29a00bd5c369e538da3':
Import translations. DO NOT MERGE
2013-10-17 08:48:11 -07:00
Baligh Uddin
8d757c2052
Merge "Import translations. DO NOT MERGE" into klp-dev
2013-10-17 15:45:30 +00:00
Baligh Uddin
9fa7efb0c5
Import translations. DO NOT MERGE
...
Change-Id: Ia2590927c02e8e64506e746650d318c1d84ae7c2
Auto-generated-cl: translation import
2013-10-17 08:40:51 -07:00
Jean Chalard
a3c285e876
[DO NOT MERGE] Fix a bug where autoshift would be ignored coming from emoji
...
Bug: 11123691
Change-Id: I36474e12e34af95051129840865015f85595411b
2013-10-17 23:15:09 +09:00
Satoshi Kataoka
329fd2d832
Do not merge. Don't show long-pressing emoji key on tablet
...
Bug: 11264603
Change-Id: Ic46086e9f1b223e26586e0611d14a7d14b561100
2013-10-17 20:38:33 +09:00
Satoshi Kataoka
8ff1e71f8a
Do not merge. Fix keyboard layout
...
- Show "..." on enter key if it has long-pressing emoji key
- Show enter key on symbols shift keyboard
Bug: 11262889
Bug: 11263464
Change-Id: I3797fe2ef8c1e4cbba3298475f01f90c98e3335f
2013-10-17 17:29:45 +09:00
Ed Heyl
09ecfc062b
am cf0a94fa: merge in klp-release (no-op)
...
* commit 'cf0a94fa9a7c8a5b259507cab616239f79349444':
Do not merge. Revert emoji key position to JB-mr2
Fix: Native crash when an empty attribute is written. DO NOT MERGE
Use reentrant lock for main dictionaries. DO NOT MERGE
Stop reading dictionary while regenerating. (DO NOT MERGE)
2013-10-16 17:51:49 -07:00
Ed Heyl
cf0a94fa9a
merge in klp-release (no-op)
2013-10-16 17:46:48 -07:00
Satoshi Kataoka
bfef552e62
am ea3db813: Merge "Do not merge. Remove Azerbaijani subtype" into klp-dev
...
* commit 'ea3db813ccb0744129358b9db0b21b9d27b16dde':
Do not merge. Remove Azerbaijani subtype
2013-10-16 14:22:41 -07:00
Satoshi Kataoka
ea3db813cc
Merge "Do not merge. Remove Azerbaijani subtype" into klp-dev
2013-10-16 21:19:59 +00:00
Satoshi Kataoka
3dd33652e4
Do not merge. Remove Azerbaijani subtype
...
The corresponding change is I0d2a98dffe03ebd
Bug: 11244796
Change-Id: I0d2a98dffe03ebddf26fc3c2760061c39de4c57e
2013-10-16 18:39:59 +09:00
The Android Automerger
62cda376db
merge in klp-release history after reset to klp-dev
2013-10-15 06:01:21 -07:00