The Android Open Source Project
90561c60b6
am c1d6374a: (-s ours) am f33c3309: (-s ours) Reconcile with jb-mr1.1-release - do not merge
...
* commit 'c1d6374aed994ac68b010e5118f5256d645192c1':
2012-12-07 07:58:15 -08:00
The Android Open Source Project
c1d6374aed
am f33c3309: (-s ours) Reconcile with jb-mr1.1-release - do not merge
...
* commit 'f33c33097bafd263ec1c1fe1515c42f8569a6e1d':
2012-12-07 07:56:34 -08:00
The Android Open Source Project
f33c33097b
Reconcile with jb-mr1.1-release - do not merge
...
Change-Id: Ie7ab7739935e7d17b32028189469eb8eb4764c8b
2012-12-07 07:53:33 -08:00
Jean Chalard
98487fee9f
am fec83fe5: Merge "Update dictionaries"
...
* commit 'fec83fe557fdb8244ddd33388849bcd1092afa05':
Update dictionaries
2012-12-07 02:00:20 -08:00
Jean Chalard
fec83fe557
Merge "Update dictionaries"
2012-12-07 01:58:16 -08:00
Jean Chalard
bd793ed50d
Update dictionaries
...
>>> dictionaries/en_GB_wordlist.combined.gz
Header :
date : 1353500789 <=> 1354870724
Body :
Added: Dad 75
Added: Daddy 60
Added: Grandma 60
Added: Grandpa 55
Added: Mama 59
Added: Mom 77
Added: Papa 55
>>> dictionaries/en_US_wordlist.combined.gz
Header :
date : 1351675958 <=> 1354870736
version : 26 <=> 27
Body :
Deleted: Rod's 46
Added: Dad 75
Added: Daddy 60
Added: Grandma 60
Added: Grandpa 55
Added: Mama 59
Added: Mom 77
Added: Papa 55
>>> dictionaries/en_wordlist.combined.gz
Header :
date : 1353500998 <=> 1354870744
Body :
Deleted: Rod's 46
Added: Dad 75
Added: Daddy 60
Added: Grandma 60
Added: Grandpa 55
Added: Mama 59
Added: Mom 77
Added: Papa 55
>>> dictionaries/fr_wordlist.combined.gz
Header :
date : 1353500832 <=> 1354872988
Body :
Deleted: noël 71
Deleted: po 73
Deleted: ti 73
Added: Noël 71
Added: lose 1
Added: y'a 130
>>> dictionaries/ru_wordlist.combined.gz
Header :
date : 1353567943 <=> 1354870130
Body :
Demote all CAPS words by 80
Freq changed: модно 51 -> 20
>>> java/res/raw/main_en.dict
Header :
date : 1353500998 <=> 1354870744
Body :
Deleted: Rod's 46
Added: Dad 75
Added: Daddy 60
Added: Grandma 60
Added: Grandpa 55
Added: Mama 59
Added: Mom 77
Added: Papa 55
>>> java/res/raw/main_fr.dict
Header :
date : 1353500832 <=> 1354872988
Body :
Deleted: noël 71
Deleted: po 73
Deleted: ti 73
Added: Noël 71
Added: lose 1
Added: y'a 130
>>> java/res/raw/main_ru.dict
Header :
date : 1353567943 <=> 1354870130
Body :
Demote all CAPS words by 80
Freq changed: модно 51 -> 20
Change-Id: I6f2d1c359d716535923b22c33d7fa4c3b0a330e4
2012-12-07 18:52:21 +09:00
Jason Chen
99e25b080c
am cb1a839d: am 4b71e947: am 81b0a638: am 5cb40f8a: Fix IME settings icons
...
* commit 'cb1a839ded83626d5055216761ca0421da23a6d8':
Fix IME settings icons
2012-12-06 23:27:11 -08:00
Jason Chen
cb1a839ded
am 4b71e947: am 81b0a638: am 5cb40f8a: Fix IME settings icons
...
* commit '4b71e9479272892d1c83038574eeece0502aab83':
Fix IME settings icons
2012-12-06 23:23:04 -08:00
Tadashi G. Takaoka
8f3ace0972
am 51a95613: Merge "Cancel batch input when orientation has been changed"
...
* commit '51a95613365b4313dff89db73de76f1cd2de5612':
Cancel batch input when orientation has been changed
2012-12-06 21:03:56 -08:00
Tadashi G. Takaoka
51a9561336
Merge "Cancel batch input when orientation has been changed"
2012-12-06 21:01:24 -08:00
Jason Chen
4b71e94792
am 81b0a638: am 5cb40f8a: Fix IME settings icons
...
* commit '81b0a638520baeca52738ade215190d2caef6345':
Fix IME settings icons
2012-12-06 18:59:14 -08:00
Tadashi G. Takaoka
8e2b34cdb2
Cancel batch input when orientation has been changed
...
Bug: 7665231
Bug: 7662486
Change-Id: I7b6095026dbf1b9b2f6d3b29f2ab83c462ab374e
2012-12-06 14:24:05 -08:00
Baligh Uddin
41154ea41c
am 8fd5aa95: (-s ours) Merge "Import translations. DO NOT MERGE"
...
* commit '8fd5aa9583bbf0a63c10410e16952cea42b24dad':
Import translations. DO NOT MERGE
2012-12-06 13:44:03 -08:00
Baligh Uddin
8fd5aa9583
Merge "Import translations. DO NOT MERGE"
2012-12-06 13:42:52 -08:00
Baligh Uddin
6ffced67ef
Merge "Import translations. DO NOT MERGE" into jb-ub-latinimegoogle
2012-12-06 13:42:13 -08:00
Tadashi G. Takaoka
1e296da6d3
am b494b304: Merge "Fix off by one bug in gesture trail drawing"
...
* commit 'b494b30453f7b5f3c3c10d3e9c5b406f722025c4':
Fix off by one bug in gesture trail drawing
2012-12-06 12:03:31 -08:00
Baligh Uddin
ae25e2c408
Import translations. DO NOT MERGE
...
Change-Id: Iec4037b7d6e6d13dbc057f7d5fcd94785a63b542
Auto-generated-cl: translation import
2012-12-06 10:59:24 -08:00
Baligh Uddin
860ab5116a
Import translations. DO NOT MERGE
...
Change-Id: I9acdbc6cfa0138724b578a47e733d7ff9624fecb
Auto-generated-cl: translation import
2012-12-06 10:55:13 -08:00
The Android Automerger
729488366f
merge in jb-mr1.1-release history after reset to jb-mr1.1-dev
2012-12-06 10:39:40 -08:00
Tadashi G. Takaoka
b494b30453
Merge "Fix off by one bug in gesture trail drawing"
2012-12-06 09:57:24 -08:00
Ken Wakasa
4448cab5d8
Merge remote-tracking branch 'goog/master' into mergescriptpackage
2012-12-06 22:15:03 +09:00
Jean Chalard
d582c38ba8
Merge "Remove a couple Eclipse and Android Lint warnings"
2012-12-06 04:34:39 -08:00
Jean Chalard
2da8866518
Remove a couple Eclipse and Android Lint warnings
...
Change-Id: I0c29c5d2abcbf80759b996d34b534deb083cd7d3
2012-12-06 21:30:51 +09:00
Satoshi Kataoka
a21187188f
Rename function
...
Change-Id: Ia05d4b96158b17d4feef8f2d6ebd52e9dd69b25f
2012-12-06 19:08:45 +09:00
Satoshi Kataoka
0ed8c6ee29
turn off debug flags
...
Change-Id: I08710abe3e158ee48c954289fc6bb1269c4a7126
2012-12-06 15:12:50 +09:00
Ken Wakasa
12445fd8f6
Merge remote-tracking branch 'goog/master' into mergescriptpackage
2012-12-06 12:24:05 +09:00
Jason Chen
81b0a63852
am 5cb40f8a: Fix IME settings icons
...
* commit '5cb40f8a767c529af41836d33274ea3043e25011':
Fix IME settings icons
2012-12-05 16:33:33 -08:00
Jason Chen
5cb40f8a76
Fix IME settings icons
...
Imported assets were too small. Fixed by pulling in the correctly
sized assets.
Bug: 7556843
Change-Id: I182181d258f8797ec3fbf9b2cbe1380d71a8075a
2012-12-05 16:05:18 -08:00
Tadashi G. Takaoka
8c93e513ad
Fix off by one bug in gesture trail drawing
...
Bug: 7594165
Change-Id: Ia3f7dcee71db91e39c40022b19e7b07c5d4488c8
2012-12-05 14:56:31 -08:00
Baligh Uddin
6ec4423878
Import translations. DO NOT MERGE
...
Change-Id: I14e7f5010ca72fe9ea0ab2304ffd018a82525f6f
Auto-generated-cl: translation import
2012-12-05 14:02:25 -08:00
Baligh Uddin
a165552108
Import translations. DO NOT MERGE
...
Change-Id: Ieb2085fde4b3a898758a716556b7164ad59d46ec
Auto-generated-cl: translation import
2012-12-05 13:58:31 -08:00
Ken Wakasa
2b6a1fed76
Method/variable/resource names clean up for the double-space period
...
bug: 7664717
Change-Id: I914aa588b863c442c2d360221e3fa0f4c42640e7
2012-12-05 12:40:10 +09:00
Ken Wakasa
cb23fe658b
Merge remote-tracking branch 'goog/master' into mergescriptpackage
2012-12-05 12:16:27 +09:00
Baligh Uddin
88dcc967e7
Import translations. DO NOT MERGE
...
Change-Id: I0b3b03ce1974fba5f25fef74fa1937dce83b102f
Auto-generated-cl: translation import
2012-12-04 12:40:51 -08:00
Baligh Uddin
dc59cef1d1
Import translations. DO NOT MERGE
...
Change-Id: I790e811368b8c5aa403ed58c50628911be2af6b0
Auto-generated-cl: translation import
2012-12-04 11:38:40 -08:00
Ken Wakasa
3709da91a5
Merge remote-tracking branch 'goog/master' into mergescriptpackage
2012-12-04 18:29:25 +09:00
Jean Chalard
b4a9a6deba
Merge "Fix wrong misspelling reports of fully capitalized words"
2012-12-04 01:22:48 -08:00
Jean Chalard
95bfb8ac47
Fix wrong misspelling reports of fully capitalized words
...
Two flavors of words would be wrongly reported as misspelled
by the android spell checker when they are written in all
upper case letters:
- Words containing a quote or a dash or any other non-letter
- Words that need the first letter to be capitalized
Bug: 7659216
Change-Id: Ibc5d261945ffcbb8a858d4c73b7c62cef6671abf
2012-12-04 18:05:27 +09:00
Tadashi G. Takaoka
6e9e5635c3
Merge "Dismiss sliding key input preview when touch event is canceled"
2012-12-03 23:45:46 -08:00
Tadashi G. Takaoka
08d8a676c2
Dismiss sliding key input preview when touch event is canceled
...
This is a follow up of Id807af31.
Bug: 7662486
Change-Id: I13895140f1214592257d0023c1450875a4885ee9
2012-12-04 16:37:26 +09:00
Ken Wakasa
139bd83f0c
Add a new option for the double-space period functionality
...
bug: 6934756
Change-Id: I94b2d08cac6533e96031d8e97f347e9b5fd72859
2012-12-04 15:27:22 +09:00
Kurt Partridge
8918cb46f6
Merge "Fix crashes related to setSpan(-1 ... -1) errors"
2012-12-03 19:32:42 -08:00
Kurt Partridge
b10ec5319b
Fix crashes related to setSpan(-1 ... -1) errors
...
Fixes b/7652661
In some circumstnaces, when hiding the window, the logger tries to capture the TextView contents
and restore the cursor position based on the values stored in LatinIME. However, the IME may not
know the cursor position.
This fix does two things 1) doesn't try to reposition the cursor if the TextView contents are not
to be captured, and 2) if the cursor position is unknown (i.e., == -1), doesn't try to move it back.
Change-Id: I3976aaccf58c18f892c3a8530218ae52bcac9989
2012-12-03 16:39:58 -08:00
Baligh Uddin
a89f955d22
Import translations. DO NOT MERGE
...
Change-Id: I68e4fa66d5fa8b9160161a079263d89d01c037ee
Auto-generated-cl: translation import
2012-12-03 12:34:23 -08:00
Ken Wakasa
aa5a3e84ad
Clean up int types in the Dictionary class
...
Change-Id: I49821c00186ce2a282bb23f369eb140b47d6c455
2012-12-03 19:54:30 +09:00
Ken Wakasa
1d516fb1b0
Clean up int types
...
Change-Id: Ib6819b9d7f00208f47533d7ab3d2e02ca3730981
2012-12-03 19:45:52 +09:00
Tadashi G. Takaoka
f9898d05f7
Merge "Get rid of special keys from ProximityInfo"
2012-12-03 01:55:30 -08:00
Tadashi G. Takaoka
308aaff80c
Get rid of special keys from ProximityInfo
...
Bug: 7601672
Change-Id: I15faa4829b98f7b4dd07013fdd58bc2c527bcd6f
2012-12-03 18:50:58 +09:00
Ken Wakasa
02421af02a
Merge "remove invalid comparison"
2012-12-03 01:27:41 -08:00
Tadashi G. Takaoka
84f5816cf1
Merge "Groundwork for sliding key input preview"
2012-12-03 01:19:51 -08:00