The Android Open Source Project
1b77050339
Reconcile with jb-mr1.1-release - do not merge
...
Change-Id: I53296de92b1846263d7aa2dc588d13d3bd7ce930
2012-12-14 14:03:42 -08:00
The Android Automerger
a610aa2bc5
merge in jb-mr1.1-release history after reset to jb-mr1.1-dev
2012-12-14 13:56:23 -08:00
Jean Chalard
d48d6feedd
am db6f21c6: am 18d688c9: Use the amended user dictionary word for insertion
...
* commit 'db6f21c6792fe07a733572e1d4978f46b5462c35':
Use the amended user dictionary word for insertion
2012-12-14 11:01:56 -08:00
Jean Chalard
db6f21c679
am 18d688c9: Use the amended user dictionary word for insertion
...
* commit '18d688c94bb8e1e26de2d12445cb3096c6126f75':
Use the amended user dictionary word for insertion
2012-12-14 10:59:21 -08:00
Jean Chalard
18d688c94b
Use the amended user dictionary word for insertion
...
When the user edits a word before adding it to the user
dictionary, the keyboard should replace whatever was
committed before with the amended version.
Bug: 7725834
Change-Id: I1a417be6c5a86d6a96bc2c76aca314ad8f1202a9
2012-12-14 20:28:22 +09: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
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
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
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
The Android Open Source Project
faee53c088
Reconcile with jb-mr1.1-release - do not merge
...
Change-Id: Ifaf3eb3035bc9be846a9edd3e64cbf3bf6f95f64
2012-11-28 09:47:55 -08:00
The Android Automerger
3448b04e28
merge in jb-mr1.1-release history after reset to jb-mr1.1-dev
2012-11-27 15:35:06 -08:00
Jean Chalard
2cff609e0f
am bb0c18f7: am cb1077b8: Merge "Match RU dictionary header." into jb-mr1.1-dev
...
* commit 'bb0c18f73d448b6231d8aca9083d3798447e3baf':
Match RU dictionary header.
2012-11-27 11:34:04 -08:00
Jean Chalard
94f1925d5e
am fa98633e: am 240383fd: Merge "Update the dictionaries" into jb-mr1.1-dev
...
* commit 'fa98633ed45715b38fbd3c355bc4dc224ae09163':
Update the dictionaries
2012-11-27 11:34:02 -08:00
Tadashi G. Takaoka
7ba02315ab
am b172725c: am 7d045829: Request update shift state after shift-chording input
...
* commit 'b172725c8dc26bc96667135d1b17396f2a6257b4':
Request update shift state after shift-chording input
2012-11-27 11:34:00 -08:00
Jean Chalard
bb0c18f73d
am cb1077b8: Merge "Match RU dictionary header." into jb-mr1.1-dev
...
* commit 'cb1077b842e87d806eb2d7cd5cf3173bc3106366':
Match RU dictionary header.
2012-11-27 11:31:32 -08:00
Jean Chalard
fa98633ed4
am 240383fd: Merge "Update the dictionaries" into jb-mr1.1-dev
...
* commit '240383fd84282d07af730186a650e1c56b19312a':
Update the dictionaries
2012-11-27 11:31:28 -08:00
Tadashi G. Takaoka
b172725c8d
am 7d045829: Request update shift state after shift-chording input
...
* commit '7d045829b8cd613ab43cb88b4cf0d4f492827996':
Request update shift state after shift-chording input
2012-11-27 11:30:52 -08:00
Jean Chalard
cb1077b842
Merge "Match RU dictionary header." into jb-mr1.1-dev
2012-11-26 21:11:54 -08:00
Jean Chalard
240383fd84
Merge "Update the dictionaries" into jb-mr1.1-dev
2012-11-26 19:57:58 -08:00
The Android Automerger
ceb6d48062
merge in jb-mr1.1-release history after reset to jb-mr1.1-dev
2012-11-26 11:29:25 -08:00
Jean Chalard
4d645255cb
Match RU dictionary header.
...
This brings the changes of I837831b1 to MR1.1
>>> dictionaries/ru_wordlist.combined.gz
>>> java/res/raw/main_ru.dict
Header :
date : 1353500945 <=> 1353567943
MULTIPLE_WORDS_DEMOTION_RATE : null <=> 0
Body :
No differences
Bug: 7540132
Change-Id: I81f281fda881ad1252cdf6cf2d0947a12a2dac27
2012-11-26 12:42:34 +09:00
Jean Chalard
526371f2c4
Update the dictionaries
...
This brings the dictionaries to the same level as
master. The change in master reflected by this
change is I94fe7f8f.
- XML de dict :
Update header only.
- XML en dict :
Add the not_a_word flag to all whitelist entries.
Demote "il:92" and "shel:52" to freq 0.
- XML en_GB dict :
Add the not_a_word flag to all whitelist entries.
Add "milk:122" and "practice:143"
- XML fr dict :
Add missing words : "Nostradamus:40" "défendais:30"
"gmail:50" "générale:140" "hm:0" "hmm:0" "y'en:130"
"l'apocalypse:31" "m'épuise:30" "recontacter:80"
"t'annonce:30"
Set freq of non-word shortcuts for digraphs to 1 instead
of 0, allowing to gesture them.
- XML ru dict :
Remove a lot of two-character non-words.
- Binary de dict :
Remove the obsolete "options" header, and add the "dictionary"
header.
- Binary en dict :
Flag "hoe" "hoes" "il" "shel" as non-words.
Also drop freq of "il" and "shel" to 0
Add the "locale" header that was missing.
- Binary es dict :
Add the "dictionary" header.
- Binary fr dict :
Add the same words as above. Non-word shortcuts were already
set to 1.
- Binary it dict :
Add a "dictionary" header. Also change freq of
"Šarapova" from 50 to 37; not sure why it was 50.
- Binary pt_BR dict :
Add a "dictionary" header.
- Binary ru dict :
Add a "dictionary" header and remove the same words as above.
Bug: 7458565
Change-Id: I22dd176ed2df99b847047f2d1045f6d861ccb8b0
2012-11-22 15:32:45 +09:00
Tadashi G. Takaoka
7d045829b8
Request update shift state after shift-chording input
...
Bug: 7529860
Change-Id: Iec82459348722be358ae2ded15deafac21749dcd
2012-11-21 16:12:40 +09:00
Jean Chalard
82cc734925
am b9385ff9: am cdbf6fb5: Merge "Correctly add double quote to the space strippers" into jb-mr1.1-dev
...
* commit 'b9385ff9be484487a523c1eb6db4eba33ef2359d':
Correctly add double quote to the space strippers
2012-11-20 19:42:18 -08:00
Jean Chalard
b9385ff9be
am cdbf6fb5: Merge "Correctly add double quote to the space strippers" into jb-mr1.1-dev
...
* commit 'cdbf6fb541aac9d57f4d27630ad0ef73814be54f':
Correctly add double quote to the space strippers
2012-11-20 19:40:09 -08:00
Jean Chalard
b7e6bbaebc
am 3acd0c7a: am f732f4dd: Merge "Only add spaces automatically when appropriate." into jb-mr1.1-dev
...
* commit '3acd0c7a9f4a5f17897a4fe51b023d6f14ba7ef0':
Only add spaces automatically when appropriate.
2012-11-20 19:38:47 -08:00
Jean Chalard
37fbcb0ddf
am 6d471258: am c9349db1: Merge "Add a constant for S_INT_MIN" into jb-mr1.1-dev
...
* commit '6d471258b2eb15cb10b5eec04854a76881ebac5d':
Add a constant for S_INT_MIN
2012-11-20 19:38:46 -08:00
Jean Chalard
cdbf6fb541
Merge "Correctly add double quote to the space strippers" into jb-mr1.1-dev
2012-11-20 19:37:54 -08:00
Jean Chalard
3acd0c7a9f
am f732f4dd: Merge "Only add spaces automatically when appropriate." into jb-mr1.1-dev
...
* commit 'f732f4ddccb679369b2fd2e43582b3b15aecfa1d':
Only add spaces automatically when appropriate.
2012-11-20 19:37:40 -08:00
Jean Chalard
6d471258b2
am c9349db1: Merge "Add a constant for S_INT_MIN" into jb-mr1.1-dev
...
* commit 'c9349db1d2244a74c4d34025f7e0dd4922555706':
Add a constant for S_INT_MIN
2012-11-20 19:37:39 -08:00
Jean Chalard
f732f4ddcc
Merge "Only add spaces automatically when appropriate." into jb-mr1.1-dev
2012-11-20 19:36:50 -08:00
Jean Chalard
c9349db1d2
Merge "Add a constant for S_INT_MIN" into jb-mr1.1-dev
2012-11-20 19:36:25 -08:00
Tadashi G. Takaoka
e44ce053e7
am 8a5b176f: am fd1267e3: Add Spanish United States keyboard (DO NOT MERGE)
...
* commit '8a5b176f655a46f1c575886a7d3a3c1120c91b29':
Add Spanish United States keyboard (DO NOT MERGE)
2012-11-20 18:58:29 -08:00
Tadashi G. Takaoka
8a5b176f65
am fd1267e3: Add Spanish United States keyboard (DO NOT MERGE)
...
* commit 'fd1267e396d62694958569e35d0edfbc6b6ac7d3':
Add Spanish United States keyboard (DO NOT MERGE)
2012-11-20 18:56:48 -08:00
Jean Chalard
592f2b315f
Add a constant for S_INT_MIN
...
This is necessary for I807ae4bd
Bug: 7491364
Change-Id: I46ee92a76eb65e80b64538d0300b718eac6a3ddb
2012-11-20 21:25:46 +09:00
Jean Chalard
ec60d60078
Only add spaces automatically when appropriate.
...
Correctly check the variations to determine if we should
add automatic spaces (in manual picks and gestures) or not.
Bug: 7164981
Change-Id: I19e25af839b4062c217113cd804b1473912f22a5
2012-11-19 19:47:40 +09:00
Jean Chalard
c5653daf72
Correctly add double quote to the space strippers
...
...without removing space, this time.
Also add a test to make sure it is working.
Bug: 7531719
Change-Id: I3afcc433c6cdc2774e7deeb6d358356db5035d35
2012-11-19 17:48:19 +09:00
Tadashi G. Takaoka
fd1267e396
Add Spanish United States keyboard (DO NOT MERGE)
...
Bug: 7531804
Change-Id: Idd66ee30e5228260540308a97c930185b48e775f
2012-11-19 11:27:07 +09:00
Ken Wakasa
f5a194b6af
Revert "Correctly add double quote to the space strippers"
...
This reverts commit af7264abb7
2012-11-16 18:33:44 -08:00
Ken Wakasa
06993cb019
Revert "Only add spaces automatically when appropriate."
...
This reverts commit 6ce66d1c7d
2012-11-16 18:33:29 -08:00
Ken Wakasa
333881c434
am 1f256e94: am 66cee1f9: Merge "Revert "Correctly add double quote to the space strippers"" into jb-mr1.1-dev
...
* commit '1f256e941b746a3ccfbd0b60d5e6ccd09d3a3af1':
Revert "Correctly add double quote to the space strippers"
2012-11-16 18:25:57 -08:00
Ken Wakasa
1f256e941b
am 66cee1f9: Merge "Revert "Correctly add double quote to the space strippers"" into jb-mr1.1-dev
...
* commit '66cee1f92de0413756b8f306275d3508cd2b040f':
Revert "Correctly add double quote to the space strippers"
2012-11-16 18:23:53 -08:00
Ken Wakasa
66cee1f92d
Merge "Revert "Correctly add double quote to the space strippers"" into jb-mr1.1-dev
2012-11-16 18:20:49 -08:00
Ken Wakasa
86e554739f
Revert "Correctly add double quote to the space strippers"
...
This reverts commit af7264abb7
2012-11-16 18:17:10 -08:00
Ken Wakasa
4ad92578dd
am 7acd310d: am f9ff4fb5: Merge "Revert "Only add spaces automatically when appropriate."" into jb-mr1.1-dev
...
* commit '7acd310d02f060f3e3e29000db902dffb6b0df9c':
Revert "Only add spaces automatically when appropriate."
2012-11-16 18:05:42 -08:00
Ken Wakasa
7acd310d02
am f9ff4fb5: Merge "Revert "Only add spaces automatically when appropriate."" into jb-mr1.1-dev
...
* commit 'f9ff4fb5da5971bd02eec491a497006540e1438a':
Revert "Only add spaces automatically when appropriate."
2012-11-16 18:03:47 -08:00
Ken Wakasa
f9ff4fb5da
Merge "Revert "Only add spaces automatically when appropriate."" into jb-mr1.1-dev
2012-11-16 18:00:15 -08:00
Ken Wakasa
5986931fcb
Revert "Only add spaces automatically when appropriate."
...
This reverts commit 6ce66d1c7d
2012-11-16 17:49:22 -08:00
Jean Chalard
6f42cf1dee
am 3dd4548e: am 191d49ae: Merge "Only add spaces automatically when appropriate." into jb-mr1.1-dev
...
* commit '3dd4548ec6105ca774e84ab3223bdbcea1e4902e':
Only add spaces automatically when appropriate.
2012-11-15 19:14:00 -08:00
