aboutsummaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* am 1dae936f: Merge "Move char_utils to the dictionary directory"Ken Wakasa2013-05-3121-149/+158
|\ | | | | | | | | * commit '1dae936f23026d3eeec1f4511303104128d5da5f': Move char_utils to the dictionary directory
| * Merge "Move char_utils to the dictionary directory"Ken Wakasa2013-05-3121-149/+158
| |\
| | * Move char_utils to the dictionary directoryKen Wakasa2013-05-3121-149/+158
| | | | | | | | | | | | Change-Id: Id397485407fe63600c9bb5c80d223042942b4d8a
* | | am 26f48949: Fix the displayed status after downloadJean Chalard2013-05-312-16/+9
|\| | | | | | | | | | | | | | * commit '26f489493eb3a1ccb9cb0ab55627bee4c74a6fd2': Fix the displayed status after download
| * | Fix the displayed status after downloadJean Chalard2013-05-312-16/+9
| | | | | | | | | | | | | | | Bug: 9166225 Change-Id: I7490593d88a5854b9e675b9ead89d2ea9b49315c
* | | am f61999ca: Merge "Make it easy to open several dictionaries from tests"Jean Chalard2013-05-313-15/+17
|\| | | | | | | | | | | | | | * commit 'f61999caba1fa720c6817da8b6fc129d16b9a954': Make it easy to open several dictionaries from tests
| * | Merge "Make it easy to open several dictionaries from tests"Jean Chalard2013-05-313-15/+17
| |\ \
| | * | Make it easy to open several dictionaries from testsJean Chalard2013-05-313-15/+17
| | | | | | | | | | | | | | | | | | | | Bug: 9127175 Change-Id: I3f1840ee73b364df26dfddb5acb10001e0f2cb61
* | | | am a0c3e02d: Refactor SuggestionStripLayoutHelper a bitTadashi G. Takaoka2013-05-315-127/+134
|\| | | | | | | | | | | | | | | | | | | * commit 'a0c3e02d7168dd4cee4cad51491537dadb0362cc': Refactor SuggestionStripLayoutHelper a bit
| * | | Refactor SuggestionStripLayoutHelper a bitTadashi G. Takaoka2013-05-315-127/+134
| | |/ | |/| | | | | | | | | | Bug: 9059710 Change-Id: Ief12029bad75d4dc78090ab97555aece01b873de
* | | am 70c2dcff: am 6f7e39a6: am e7514a6a: Merge "Add vibration override values ↵Tadashi G. Takaoka2013-05-301-0/+9
|\| | | | | | | | | | | | | | | | | | | | for Galaxy S4 and HTC One" into jb-mr2-dev * commit '70c2dcffa3fdce8040d0779dd173d5634e434cba': Add vibration override values for Galaxy S4 and HTC One
| * | am 6f7e39a6: am e7514a6a: Merge "Add vibration override values for Galaxy S4 ↵Tadashi G. Takaoka2013-05-301-0/+9
| |\ \ | | | | | | | | | | | | | | | | | | | | | | | | and HTC One" into jb-mr2-dev * commit '6f7e39a6827598492ffbfeedf4c47445519f272e': Add vibration override values for Galaxy S4 and HTC One
| | * \ am e7514a6a: Merge "Add vibration override values for Galaxy S4 and HTC One" ↵Tadashi G. Takaoka2013-05-301-0/+9
| | |\ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | into jb-mr2-dev * commit 'e7514a6a8a9e59ea5cde9f2c3a198f35d111cdc2': Add vibration override values for Galaxy S4 and HTC One
| | | * \ Merge "Add vibration override values for Galaxy S4 and HTC One" into jb-mr2-devTadashi G. Takaoka2013-05-311-0/+9
| | | |\ \
| | | | * | Add vibration override values for Galaxy S4 and HTC OneTadashi G. Takaoka2013-05-231-0/+9
| | | | | | | | | | | | | | | | | | | | | | | | Bug: 9109493
* | | | | | am 5989c9b8: (-s ours) am ea11a8ef: (-s ours) am dee9d17c: (-s ours) Import ↵Baligh Uddin2013-05-300-0/+0
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | translations. DO NOT MERGE * commit '5989c9b8100615fd77d9cb75a63ea707e411da8a': Import translations. DO NOT MERGE
| * | | | | am ea11a8ef: (-s ours) am dee9d17c: (-s ours) Import translations. DO NOT MERGEBaligh Uddin2013-05-300-0/+0
| |\| | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit 'ea11a8ef4f6c2753b01bb80423abe0263bb1b7d3': Import translations. DO NOT MERGE
| | * | | | am dee9d17c: (-s ours) Import translations. DO NOT MERGEBaligh Uddin2013-05-300-0/+0
| | |\| | | | | | | | | | | | | | | | | | | | | | | | | | | * commit 'dee9d17c6855b9d34a9cd0e7946c5890a83a583b': Import translations. DO NOT MERGE
| | | * | | Import translations. DO NOT MERGEBaligh Uddin2013-05-271-0/+241
| | | |/ / | | | | | | | | | | | | | | | | | | | | Change-Id: Iccfbe700901fe89974beab377bea82d547a1478a Auto-generated-cl: translation import
* | | | | am 723391c9: Merge "Tidy up Utils class a bit"Tadashi G. Takaoka2013-05-301-53/+73
|\| | | | | | | | | | | | | | | | | | | | | | | | * commit '723391c9451f906ed786ba3418611846dfe9f3f5': Tidy up Utils class a bit
| * | | | Merge "Tidy up Utils class a bit"Tadashi G. Takaoka2013-05-311-53/+73
| |\ \ \ \
| | * | | | Tidy up Utils class a bitTadashi G. Takaoka2013-05-311-53/+73
| | | | | | | | | | | | | | | | | | | | | | | | Change-Id: Idc2feb84a902a6cbb7265d1efe06c34e7d63c2c7
* | | | | | am f88f9dbb: Move "#define LOG_TAG" before include defines.h.Keisuke Kuroyanagi2013-05-302-4/+4
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit 'f88f9dbbdec309c01feda06edc142470ba13cb2f': Move "#define LOG_TAG" before include defines.h.
| * | | | | Move "#define LOG_TAG" before include defines.h.Keisuke Kuroyanagi2013-05-302-4/+4
| | |_|_|/ | |/| | | | | | | | | | | | | Change-Id: Iacd2c2ea3878ad2cde5df36b15e1359d10244f60
* | | | | am e6125db9: Merge "Catch a permission exception"Kurt Partridge2013-05-301-1/+7
|\| | | | | | | | | | | | | | | | | | | | | | | | * commit 'e6125db98d9e61841a4bde791ff0d9aed151f126': Catch a permission exception
| * | | | Merge "Catch a permission exception"Kurt Partridge2013-05-311-1/+7
| |\ \ \ \
| | * | | | Catch a permission exceptionKurt Partridge2013-05-301-1/+7
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This change catches a SecurityException if the DictionaryProvider is unavailable. Change-Id: I4f2d87327c40765383d8847fd4e934b3cf799488
* | | | | | am a65c267b: Move some dictionary related implementations to the dictionary ↵Ken Wakasa2013-05-3029-53/+60
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | directory * commit 'a65c267b1f1207e54c6f821148c600e3899b7f9c': Move some dictionary related implementations to the dictionary directory
| * | | | | Move some dictionary related implementations to the dictionary directoryKen Wakasa2013-05-3129-53/+60
| | |/ / / | |/| | | | | | | | | | | | | Change-Id: I6fe71a540ad91ca46755be234abc8894242e2413
* | | | | am 7097aa2d: Merge "Cleanup unreadable variable names"Tadashi G. Takaoka2013-05-302-114/+118
|\| | | | | | | | | | | | | | | | | | | | | | | | * commit '7097aa2d3d2fc4d314edebb43edc8a0552517630': Cleanup unreadable variable names
| * | | | Merge "Cleanup unreadable variable names"Tadashi G. Takaoka2013-05-302-114/+118
| |\ \ \ \
| | * | | | Cleanup unreadable variable namesTadashi G. Takaoka2013-05-302-114/+118
| | | | | | | | | | | | | | | | | | | | | | | | Change-Id: Ic97687c58e25e4b0c6833cc25d10854f5f513081
* | | | | | am d67db32b: Merge "Separate SuggestionStripLayoutHelper for readablity"Tadashi G. Takaoka2013-05-302-541/+570
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit 'd67db32b30a2d77e5e5733d62d6265c34c380947': Separate SuggestionStripLayoutHelper for readablity
| * | | | | Merge "Separate SuggestionStripLayoutHelper for readablity"Tadashi G. Takaoka2013-05-302-541/+570
| |\| | | |
| | * | | | Separate SuggestionStripLayoutHelper for readablityTadashi G. Takaoka2013-05-302-541/+570
| | | | | | | | | | | | | | | | | | | | | | | | Change-Id: I82c749c6837c3af7ae290f4cd92f5426ca58b5c7
* | | | | | am 424a173d: Merge "Move additional_proximity_chars to the layout directory"Ken Wakasa2013-05-305-4/+4
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit '424a173db8cd4dfd7b5a986310ec2d815a4eb171': Move additional_proximity_chars to the layout directory
| * | | | | Merge "Move additional_proximity_chars to the layout directory"Ken Wakasa2013-05-305-4/+4
| |\ \ \ \ \
| | * | | | | Move additional_proximity_chars to the layout directoryKen Wakasa2013-05-305-4/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | | Change-Id: Ie892ea9f3199a66e9d62a92a0e1ab2dff62826c3
* | | | | | | am 1a50999e: Merge "Tell the text view we reset state on finish input"Jean Chalard2013-05-301-0/+1
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit '1a50999ed9cfbffa03b8e034ec67f06a8e5c68ba': Tell the text view we reset state on finish input
| * | | | | | Merge "Tell the text view we reset state on finish input"Jean Chalard2013-05-301-0/+1
| |\ \ \ \ \ \
| | * | | | | | Tell the text view we reset state on finish inputJean Chalard2013-05-291-0/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This should be done in onFinishInput rather than onFinishInputView but for an unknown reason onFinishInput never comes. Bug: 9113167 Change-Id: Iafb40846a3ed8fad78bfc160d17cd431f81fe891
* | | | | | | | am faa7fbfa: Merge "Fix two strict mode warnings."Jean Chalard2013-05-302-25/+42
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit 'faa7fbfaa27324608556699ab4c149d23e6a5f57': Fix two strict mode warnings.
| * | | | | | | Merge "Fix two strict mode warnings."Jean Chalard2013-05-302-25/+42
| |\ \ \ \ \ \ \ | | |_|/ / / / / | |/| | | | | |
| | * | | | | | Fix two strict mode warnings.Jean Chalard2013-05-302-25/+42
| | | |_|/ / / | | |/| | | | | | | | | | | | | | | | | | | | | | | | | Bug: 9052555 Change-Id: I86e90488679a78a9f6e901b640025619293765a0
* | | | | | | am 29432f84: Create a new directory for layout-related implementationsKen Wakasa2013-05-3023-122/+143
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit '29432f843a8cd6ffb2be286104964592e80d77c9': Create a new directory for layout-related implementations
| * | | | | | Create a new directory for layout-related implementationsKen Wakasa2013-05-3023-122/+143
| |/ / / / / | | | | | | | | | | | | | | | | | | Change-Id: Ia227bb296f20dab0dfc03dfcde3a06c624eca76c
* | | | | | am 8eb214d7: Merge "Fix dictionary pack preference order."Jean Chalard2013-05-291-0/+2
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit '8eb214d7e198e25d48b56fa0a82b2861f817e23c': Fix dictionary pack preference order.
| * | | | | Merge "Fix dictionary pack preference order."Jean Chalard2013-05-301-0/+2
| |\ \ \ \ \
| | * | | | | Fix dictionary pack preference order.Jean Chalard2013-05-301-0/+2
| | |/ / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | It turns out giving them in the right order is not enough, you also have to actually give them a numeric priority. Bug: 9165928 Change-Id: I2ecff38f65b70746feeeeb0ed2cc86a586a35363
* | | | | | am ec9670ac: Merge "Rub some butter on dictionary list scrolling."Jean Chalard2013-05-293-3/+39
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit 'ec9670ac3dfa74b81eff409fefa7460ce5175c4a': Rub some butter on dictionary list scrolling.