aboutsummaryrefslogtreecommitdiffstats
path: root/java (follow)
Commit message (Collapse)AuthorAgeFilesLines
* Merge "[CB16] Remove unused stuff"Jean Chalard2014-03-272-37/+5
|\
| * [CB16] Remove unused stuffJean Chalard2014-03-272-37/+5
| | | | | | | | | | Bug: 13406701 Change-Id: Ib863c5181e1f5d74cfa4458060afc49d1ee8109e
* | Merge "Call setLayerType(LAYER_TYPE_HARDWARE) for EmojiPalettesView too."Ken Wakasa2014-03-271-1/+3
|\ \
| * | Call setLayerType(LAYER_TYPE_HARDWARE) for EmojiPalettesView too.Ken Wakasa2014-03-271-1/+3
| | | | | | | | | | | | | | | | | | | | | | | | This CL probably does not addresses the bug, but still this should be the right thing to do here. bug: 12667742 Change-Id: I587652942fd66094779fb7942c734e0ff5f9d0b6
* | | Merge "[CB15] Remove a redundant variable."Jean Chalard2014-03-273-37/+17
|\ \ \ | |/ / |/| / | |/
| * [CB15] Remove a redundant variable.Jean Chalard2014-03-273-37/+17
| | | | | | | | | | | | | | | | | | This is a tiny bit slower, but probably unnoticeable. Still, it gains some performance in other places, saves memory, and more importantly makes for simpler code, so it's certainly better. Change-Id: Id1ab4f73f71acd73f5920bc729817abd22cf0d07
* | Merge "Move code only used for dicttool and tests under tests."Keisuke Kuroyanagi2014-03-2717-3656/+0
|\ \ | |/ |/|
| * Move code only used for dicttool and tests under tests.Keisuke Kuroyanagi2014-03-2717-3656/+0
| | | | | | | | | | Bug: 13035567 Change-Id: I13c6df013ef2b67c9bf67455d9c32d283bf9ea2e
* | Merge "Fix: NPE in isValidWord after dictionaries are closed."Keisuke Kuroyanagi2014-03-271-0/+3
|\ \
| * | Fix: NPE in isValidWord after dictionaries are closed.Keisuke Kuroyanagi2014-03-271-0/+3
| | | | | | | | | | | | | | | Bug: 13650542 Change-Id: I1bdc838fca48d6ef12db5e70d40273d1236128d1
* | | Remove "sRGB IEC61966-2.1" profile to supress libpng warningTadashi G. Takaoka2014-03-2712-0/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The above ICC profile causes the following libpng warnings while APK packaging. * libpng warning: iCCP: known incorrect sRGB profile * libpng warning: iCCP: profile 'icc': 'RGB ': RGB color space not permitted on grayscale PNG Bug: 11869853 Change-Id: Ida296d9e3bbd2abaae7c7500d77c8dc54d8b2382
* | | Fix crash while entering emoticonsTadashi G. Takaoka2014-03-271-1/+1
| | | | | | | | | | | | | | | Bug: 13652919 Change-Id: Idd66240ac882fa890cfb28a477403ee09dc716ce
* | | Merge "Suppress warnings related to string resource"Tadashi G. Takaoka2014-03-2619-32/+24
|\ \ \
| * | | Suppress warnings related to string resourceTadashi G. Takaoka2014-03-2619-32/+24
| | | | | | | | | | | | | | | | Change-Id: I03073981313ae4f10a12b32ed9f524d0d50c2aa7
* | | | Merge "Rename text resources consistently"Tadashi G. Takaoka2014-03-2656-1410/+1394
|\ \ \ \ | |/ / / |/| | |
| * | | Rename text resources consistentlyTadashi G. Takaoka2014-03-2556-1410/+1394
| | |/ | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | - keylabel_<key>, the key label text of the <key> - keyspec_<key>, the key specification of the <key> - keyhintlabel_<key>, the hint label text of the <key> - morekeys_<key>, the more keys specifications of the <key> - additional_morekeys_<key>, the additional more keys specification of the <key> Change-Id: Ib2127f21fa33a2568e8a6eba65cfdb2cf78b480e
* | | Merge "Import translations. DO NOT MERGE"Baligh Uddin2014-03-252-10/+10
|\ \ \
| * | | Import translations. DO NOT MERGEBaligh Uddin2014-03-242-10/+10
| | | | | | | | | | | | | | | | | | | | Change-Id: If1481b48b8c94b80932584893c29d9218f3c3ebd Auto-generated-cl: translation import
* | | | Merge "[CB14] Implement backspace in the combiner chain"Jean Chalard2014-03-255-26/+30
|\ \ \ \ | |_|_|/ |/| | |
| * | | [CB14] Implement backspace in the combiner chainJean Chalard2014-03-255-26/+30
| | |/ | |/| | | | | | | | | | | | | Bug: 13622107 Bug: 13406701 Change-Id: I0023b398c4451253f9f717e2bd990b8a054004bc
* / | Remove logic related to dictionary loading from LatinIME.Keisuke Kuroyanagi2014-03-258-546/+468
|/ / | | | | | | | | | | | | | | | | | | | | Make mSuggest final and give DictionaryFacilitator the responsibility to manage dictionary loading state. This can simplify the logic to decide how to deal with additional dictionaries when loading settings or language switching. Bug: 13273534 Change-Id: I9f3d328272f25addfa186fbeedaaf8417455ba99
* / Fix talk back of emoji keyTadashi G. Takaoka2014-03-252-5/+3
|/ | | | | Bug: 13629734 Change-Id: Ifff6f81c2ac99a32855cd333b3d9a01ad7155ffc
* Check null before passing to Integer.parseIntYohei Yukawa2014-03-241-0/+3
| | | | | | | | | | | Just after user data is cleared, user preference associated with PREF_KEYBOARD_LAYOUT is always empty. In such case, we might want to return the default value immediately, rather than calling Integer.parseInt(null) and catching NumberFormatException unnecessarily. BUG: 13472379 Change-Id: I8dca9a22780d057013c032bd1f56e730dcada3ce
* [CB13] Remove an unused method.Jean Chalard2014-03-241-7/+0
| | | | Change-Id: If4d2fa9c6499ce9b2427cea424abd497ec4a966b
* [CB12] Reset the combining state when resetting the composerJean Chalard2014-03-244-0/+23
| | | | | Bug: 13406701 Change-Id: I490574b7ca4b953f67dd2c0ef97401297fade0a4
* Merge "[CB11] Get the result of the combination"Jean Chalard2014-03-245-5/+61
|\
| * [CB11] Get the result of the combinationJean Chalard2014-03-205-5/+61
| | | | | | | | Change-Id: I165ec4a24f5b1334d55c14948e4d942ec40eb33b
* | Merge "Rework the logic that tells if the cursor touches words"Jean Chalard2014-03-201-7/+17
|\ \ | |/ |/|
| * Rework the logic that tells if the cursor touches wordsJean Chalard2014-03-201-7/+17
| | | | | | | | | | Bug: 13312942 Change-Id: I6be6a558bbc6c88508150f9c25cadbd0240ff88e
* | Merge "[CB10] Add an event for string input"Jean Chalard2014-03-203-17/+37
|\ \
| * | [CB10] Add an event for string inputJean Chalard2014-03-203-17/+37
| | | | | | | | | | | | Change-Id: Ie5da6c73d4df4553067c58cd0dce9abb34534250
* | | Merge "Consolidate KeyboardTextsSet.setLocale and loadStringResoucres"Tadashi G. Takaoka2014-03-203-22/+16
|\ \ \
| * | | Consolidate KeyboardTextsSet.setLocale and loadStringResoucresTadashi G. Takaoka2014-03-203-22/+16
| | | | | | | | | | | | | | | | Change-Id: Idaf8f0d80fdeef4f1430f11d4083366e8ab7f6e0
* | | | Merge "Remove unused partial commit."Keisuke Kuroyanagi2014-03-201-4/+4
|\ \ \ \ | |/ / / |/| | |
| * | | Remove unused partial commit.Keisuke Kuroyanagi2014-03-201-4/+4
| | | | | | | | | | | | | | | | Change-Id: Ia9341a5cb24947d93056810890d94c1f66481d8c
* | | | Merge "Refactor KeyboardTextsSet class"Tadashi G. Takaoka2014-03-201-6/+8
|\ \ \ \
| * | | | Refactor KeyboardTextsSet classTadashi G. Takaoka2014-03-201-6/+8
| | | | | | | | | | | | | | | | | | | | Change-Id: Ibb59a9d4902db9ec0e00244304be9ab35b215a50
* | | | | Merge "Fix PC Qwerty shift locked layout"Tadashi G. Takaoka2014-03-2010-172/+172
|\ \ \ \ \
| * | | | | Fix PC Qwerty shift locked layoutTadashi G. Takaoka2014-03-1910-172/+172
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Bug: 13537661 Change-Id: I5b3645a64126118e22f44c262123076e85d7f83e
* | | | | | Merge "[IL127] Move the double space countdown to InputLogic"Jean Chalard2014-03-202-32/+26
|\ \ \ \ \ \
| * | | | | | [IL127] Move the double space countdown to InputLogicJean Chalard2014-03-192-32/+26
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Bug: 8636060 Change-Id: Ie193b747bd9d0b5ba6a986b9a3c746c2182742ed
* | | | | | | Merge "Remove reference of KeyboardTextsSet from SpacingAndPunctuations"Tadashi G. Takaoka2014-03-205-6/+53
|\ \ \ \ \ \ \ | | |_|/ / / / | |/| | | / / | |_|_|_|/ / |/| | | | |
| * | | | | Remove reference of KeyboardTextsSet from SpacingAndPunctuationsTadashi G. Takaoka2014-03-205-6/+53
| | | | | | | | | | | | | | | | | | | | | | | | Change-Id: I76a8fcbd2466bcaf9cd85501af270db5aa913999
* | | | | | Merge "[CB09] Pass events through the combiner chain"Jean Chalard2014-03-204-4/+31
|\ \ \ \ \ \ | |/ / / / / |/| | | | |
| * | | | | [CB09] Pass events through the combiner chainJean Chalard2014-03-204-4/+31
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Bug: 13406701 Change-Id: I4696f145478afdd132314b7d3c148c3a9ca11c9c
* | | | | | Merge "Utilize autoColumnOrder for punctuation more keys"Tadashi G. Takaoka2014-03-201-78/+73
|\ \ \ \ \ \
| * | | | | | Utilize autoColumnOrder for punctuation more keysTadashi G. Takaoka2014-03-201-78/+73
| | | | | | | | | | | | | | | | | | | | | | | | | | | | Change-Id: I1f8f5013f0bdf93cf590b8bd00d680b31e03d8b0
* | | | | | | Merge "[CB08] Create a combiner chain in the word composer."Jean Chalard2014-03-205-85/+59
|\ \ \ \ \ \ \ | |/ / / / / / |/| / / / / / | |/ / / / /
| * | | | | [CB08] Create a combiner chain in the word composer.Jean Chalard2014-03-205-85/+59
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Bug: 13406701 Change-Id: I3b9f75de9283f76366d1bef7e14a8f22f2186669
* | | | | | Merge "Fix Armenian punctuation order"Tadashi G. Takaoka2014-03-201-5/+7
|\ \ \ \ \ \ | |/ / / / / |/| | | | |