aboutsummaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* merge in jb-mr1.1-release history after reset to jb-mr1.1-devThe Android Automerger2012-12-140-0/+0
|\
| * merge in jb-mr1.1-release history after reset to jb-mr1.1-devThe Android Automerger2012-12-060-0/+0
| |\
| | * merge in jb-mr1.1-release history after reset to jb-mr1.1-devThe Android Automerger2012-11-270-0/+0
| | |\
| | | * merge in jb-mr1.1-release history after reset to jb-mr1.1-devThe Android Automerger2012-11-260-0/+0
| | | |\
| | | | * Revert "Correctly add double quote to the space strippers"Ken Wakasa2012-11-162-2/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This reverts commit af7264abb7abfc0dab08d332b10b9ec8a6b48dc6 Change-Id: I5673103c4a0e9c48df563187d2188ca6e2f15877 bug: 7561815
| | | | * Revert "Only add spaces automatically when appropriate."Ken Wakasa2012-11-164-31/+10
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This reverts commit 6ce66d1c7d4a5be9c6ed33e4f881994283d5eee9 Change-Id: I90004a5fea0bc7999ecf8742f883ff4dac264d8a bug: 7565414
* | | | | Use the amended user dictionary word for insertionJean Chalard2012-12-145-4/+189
|/ / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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
* / / / Fix IME settings iconsJason Chen2012-12-054-0/+0
|/ / / | | | | | | | | | | | | | | | | | | | | | Imported assets were too small. Fixed by pulling in the correctly sized assets. Bug: 7556843 Change-Id: I182181d258f8797ec3fbf9b2cbe1380d71a8075a
* | | Merge "Match RU dictionary header." into jb-mr1.1-devJean Chalard2012-11-262-0/+0
|\ \ \
| * | | Match RU dictionary header.Jean Chalard2012-11-262-0/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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
* | | | Merge "Update the dictionaries" into jb-mr1.1-devJean Chalard2012-11-2611-0/+0
|\| | |
| * | | Update the dictionariesJean Chalard2012-11-2211-0/+0
| |/ / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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
* / / Request update shift state after shift-chording inputTadashi G. Takaoka2012-11-212-5/+26
|/ / | | | | | | | | Bug: 7529860 Change-Id: Iec82459348722be358ae2ded15deafac21749dcd
* | Merge "Correctly add double quote to the space strippers" into jb-mr1.1-devJean Chalard2012-11-203-4/+22
|\ \
| * | Correctly add double quote to the space strippersJean Chalard2012-11-193-4/+22
| | | | | | | | | | | | | | | | | | | | | | | | ...without removing space, this time. Also add a test to make sure it is working. Bug: 7531719 Change-Id: I3afcc433c6cdc2774e7deeb6d358356db5035d35
* | | Merge "Only add spaces automatically when appropriate." into jb-mr1.1-devJean Chalard2012-11-204-10/+36
|\ \ \
| * | | Only add spaces automatically when appropriate.Jean Chalard2012-11-194-10/+36
| |/ / | | | | | | | | | | | | | | | | | | | | | Correctly check the variations to determine if we should add automatic spaces (in manual picks and gestures) or not. Bug: 7164981 Change-Id: I19e25af839b4062c217113cd804b1473912f22a5
* | | Merge "Add a constant for S_INT_MIN" into jb-mr1.1-devJean Chalard2012-11-201-0/+6
|\ \ \
| * | | Add a constant for S_INT_MINJean Chalard2012-11-201-0/+6
| |/ / | | | | | | | | | | | | | | | | | | This is necessary for I807ae4bd Bug: 7491364 Change-Id: I46ee92a76eb65e80b64538d0300b718eac6a3ddb
* / / Add Spanish United States keyboard (DO NOT MERGE)Tadashi G. Takaoka2012-11-192-0/+16
|/ / | | | | | | | | Bug: 7531804 Change-Id: Idd66ee30e5228260540308a97c930185b48e775f
* | Merge "Revert "Correctly add double quote to the space strippers"" into ↵Ken Wakasa2012-11-162-2/+2
|\ \ | | | | | | | | | jb-mr1.1-dev
| * | Revert "Correctly add double quote to the space strippers"Ken Wakasa2012-11-162-2/+2
| | | | | | | | | | | | | | | | | | | | | This reverts commit af7264abb7abfc0dab08d332b10b9ec8a6b48dc6 Change-Id: I5673103c4a0e9c48df563187d2188ca6e2f15877 bug: 7561815
* | | Merge "Revert "Only add spaces automatically when appropriate."" into ↵Ken Wakasa2012-11-164-31/+10
|\ \ \ | |_|/ |/| | | | | jb-mr1.1-dev
| * | Revert "Only add spaces automatically when appropriate."Ken Wakasa2012-11-164-31/+10
| | | | | | | | | | | | | | | | | | | | | This reverts commit 6ce66d1c7d4a5be9c6ed33e4f881994283d5eee9 Change-Id: I90004a5fea0bc7999ecf8742f883ff4dac264d8a bug: 7565414
* | | Merge "Only add spaces automatically when appropriate." into jb-mr1.1-devJean Chalard2012-11-154-10/+31
|\| |
| * | Only add spaces automatically when appropriate.Jean Chalard2012-11-154-10/+31
| | | | | | | | | | | | | | | Bug: 7164981 Change-Id: Id672104a0fda99c52923913fb0e40c3a1ead4787
* | | Merge "Fix a bug with some text fields" into jb-mr1.1-devJean Chalard2012-11-141-1/+2
|\ \ \
| * | | Fix a bug with some text fieldsJean Chalard2012-11-141-1/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Not sure when this happens exactly, but it is possible that InputConnection#getTextBeforeCursor returns null. This happens for example upon rotating the screen with the composing field empty in Gmail. In this case, StringBuilder#append will convert the null pointer into the string "null", which is sure better than a crash, but can have a number of bad side-effects, like auto-caps not working. Bug: 7533034 Change-Id: Ia1cfab432c13a12ff1c2f013c59bac05a587f553
* | | | Merge "Correctly add double quote to the space strippers" into jb-mr1.1-devJean Chalard2012-11-142-2/+2
|\ \ \ \ | | |_|/ | |/| |
| * | | Correctly add double quote to the space strippersJean Chalard2012-11-142-2/+2
| |/ / | | | | | | | | | | | | | | | | | | This is a format error >.> Bug: 7531719 Change-Id: I34b4c496192a32862c1ecb85bb6f6f38a06d6c61
* | | Merge "[DO NOT MERGE] Correct a wrong base character in Russian" into ↵Jean Chalard2012-11-141-2/+2
|\ \ \ | | | | | | | | | | | | jb-mr1.1-dev
| * | | [DO NOT MERGE] Correct a wrong base character in RussianJean Chalard2012-11-141-2/+2
| | | | | | | | | | | | | | | | | | | | Bug: 7516306 Change-Id: I80cee4b2b11e5bfa68c12923049cb612abd0bc7e
* | | | Merge "Update shift state only when input field is restarted" into jb-mr1.1-devTadashi G. Takaoka2012-11-141-10/+5
|\ \ \ \
| * | | | Update shift state only when input field is restartedTadashi G. Takaoka2012-11-141-10/+5
| |/ / / | | | | | | | | | | | | | | | | Bug: 7482766 Change-Id: Ifdfa110c44b95acfbcd3e0aa34f675c70b7d7285
* | | | Merge "Fix language switch key behavior (DO NOT MERGE)" into jb-mr1.1-devTadashi G. Takaoka2012-11-142-16/+39
|\ \ \ \
| * | | | Fix language switch key behavior (DO NOT MERGE)Tadashi G. Takaoka2012-11-142-16/+39
| |/ / / | | | | | | | | | | | | | | | | Bug: 7075923 Change-Id: If139411db4aa65eed64337bf2a79387cfcd04496
* / / / DO NOT MERGE - Fix an error in the base char table for LETTER L WITH STROKEKen Wakasa2012-11-151-1/+1
|/ / / | | | | | | | | | | | | | | | | | | Cherrypick of I67a431d8 bug: 7539944 Change-Id: I0d1f9649f30c36b8e464944a5b881c2cb9c05ccf
* | | Merge "Make sure all FDs are correctly closed." into jb-mr1.1-devJean Chalard2012-11-131-11/+19
|\ \ \ | |/ / |/| |
| * | Make sure all FDs are correctly closed.Jean Chalard2012-11-131-11/+19
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | In this kind of series of calls, it's possible that an outer call to a constructor fails, but the inner succeeded. Example: try { is = new A(new B()); } finally { if (null != is) is.close(); } In this case, if new B() succeeds but new A() throws an exception, is stays null and the intermediate object is never closed. This is what was happening in this instance. Bug: 7377336 Change-Id: I3fae9fec1135244982fcf5098c76d93f3e0f2add
* | | Merge "Don't restrict reset composing state to non-identical setText" into ↵Jean Chalard2012-11-121-14/+10
|\ \ \ | |_|/ |/| | | | | jb-mr1.1-dev
| * | Don't restrict reset composing state to non-identical setTextJean Chalard2012-11-121-14/+10
| |/ | | | | | | | | Bug: 7497063 Change-Id: Ifbd5c37408131867458fd921bdef46ef90d81478
* / Refactor all phantom-space-inserted spaces in one placeJean Chalard2012-11-131-5/+10
|/ | | | | Bug: 7164981 Change-Id: If1635c212b2d5d9cf51f5fb074f3b20dd7ec7b2a
* Reconcile with jb-mr1-release - do not mergeThe Android Open Source Project2012-11-070-0/+0
|\ | | | | | | Change-Id: I105d8e6a795dd5b38d42051196581896e7ea4f30
| * merge in jb-mr1-release history after reset to jb-mr1-devThe Android Automerger2012-11-060-0/+0
| |\
* | | am 5d2556b9: Reset the IME if requested by the app.Ken Wakasa2012-11-063-0/+35
|\| | | | | | | | | | | | | | * commit '5d2556b93286f5f1d7d829b586b84a8b7ae55743': Reset the IME if requested by the app.
| * | Reset the IME if requested by the app.Ken Wakasa2012-11-073-0/+35
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Specifically, reset the KeyboardState to the main Alphabet layout in LatinIME.onStartInputViewInternal() if a keyboard layout set doesn't get reloaded in the method. Please note TextView.setText() calls up resetInput(), then the IME should reset with it. bug: 7482086 Note that bug: 6851364 needs to be revisited. Change-Id: I5d448c10963d3dd952dd13cb587085ec7b014e69
| | |
| \ \
*-. \ \ Reconcile with jb-mr1-factory-release jb-mr1-release - do not mergeThe Android Open Source Project2012-11-060-0/+0
|\ \ \ \ | |_|/ / |/| | / | | |/ Change-Id: I355e91c06f0958f1baec5923324dcbcdf408d3f2
| | * merge in jb-mr1-release history after reset to jb-mr1-devThe Android Automerger2012-10-260-0/+0
| |/| |/| |
| | * merge in jb-mr1-release history after reset to jb-mr1-devThe Android Automerger2012-10-240-0/+0
| | |\
| | | * merge in jb-mr1-release history after reset to jb-mr1-devThe Android Automerger2012-10-230-0/+0
| | | |\
generated by cgit v1.2.3-83-g751a (git 2.47.1) at 2025-06-03 23:16:51 +0000