aboutsummaryrefslogtreecommitdiffstats
path: root/java (follow)
Commit message (Collapse)AuthorAgeFilesLines
...
* | | | am 3b1eb886: Merge "Refactor the user history dictionary"Satoshi Kataoka2013-07-312-26/+35
|\| | | | | | | | | | | | | | | | | | | * commit '3b1eb886582a6bfab63cee24323f0b139d70087f': Refactor the user history dictionary
| * | | Merge "Refactor the user history dictionary"Satoshi Kataoka2013-07-312-26/+35
| |\ \ \ | | |/ / | |/| |
| | * | Refactor the user history dictionarySatoshi Kataoka2013-07-312-26/+35
| | |/ | | | | | | | | | | | | | | | | | | Bug: 9429906 Bug: 4192129 Change-Id: If53bc3220627802d82ab7c396d0aabdb658573fa
* | | am 2d7e9273: Fix inconsistencies with mSuggest.Jean Chalard2013-07-311-30/+29
|\| | | | | | | | | | | | | | * commit '2d7e92735478115330be21b4fe250eea6e2f71b8': Fix inconsistencies with mSuggest.
| * | Fix inconsistencies with mSuggest.Jean Chalard2013-07-311-30/+29
| |/ | | | | | | | | | | | | | | This should fix some NPEs, but they are so unlikely that we never see them. Bug: 10065412 Change-Id: I2aefea1f52024405cc3fda9106fea41a02aaf4d8
* | am acb3cc74: Merge "Refactor on the user history dictionary"Satoshi Kataoka2013-07-318-424/+419
|\| | | | | | | | | * commit 'acb3cc74736342be10b4cbc9339eda383bc34a01': Refactor on the user history dictionary
| * Merge "Refactor on the user history dictionary"Satoshi Kataoka2013-07-318-424/+419
| |\
| | * Refactor on the user history dictionarySatoshi Kataoka2013-07-318-424/+419
| | | | | | | | | | | | | | | | | | Bug: 9429906 Bug: 4192129 Change-Id: I1a2bfe96e18119d30a72290aa48746f77a021018
* | | am 310ea9ab: Remove sudden jump touch event hackTadashi G. Takaoka2013-07-313-196/+4
|\| | | | | | | | | | | | | | * commit '310ea9ab9058e922a562309cb0dc5d5e092000f1': Remove sudden jump touch event hack
| * | Remove sudden jump touch event hackTadashi G. Takaoka2013-07-313-196/+4
| | | | | | | | | | | | | | | | | | This hack was for Nexus One and Droid that can't run on ICS or later. Change-Id: I1f9cef2022b0bbb333235e6b7c311c9785a1d894
* | | am 3b5c05f1: Merge "Fix Catalan keyboard layout"Tadashi G. Takaoka2013-07-313-8/+33
|\| | | | | | | | | | | | | | * commit '3b5c05f18c3628a99b5e676af636b6f64e58f1c5': Fix Catalan keyboard layout
| * | Merge "Fix Catalan keyboard layout"Tadashi G. Takaoka2013-07-313-8/+33
| |\ \
| | * | Fix Catalan keyboard layoutTadashi G. Takaoka2013-07-313-8/+33
| | | | | | | | | | | | | | | | | | | | Bug: 10098472 Change-Id: I60e4aa6716f8166ca60ab5687b0faf2d84cd846b
* | | | am fea0862c: Merge "Fix missing Azerbaijani text resource"Tadashi G. Takaoka2013-07-311-1/+2
|\| | | | | | | | | | | | | | | | | | | * commit 'fea0862cf6eafb676238ea95a80a8ce47db12ce0': Fix missing Azerbaijani text resource
| * | | Merge "Fix missing Azerbaijani text resource"Tadashi G. Takaoka2013-07-311-1/+2
| |\| | | | |/ | |/|
| | * Fix missing Azerbaijani text resourceTadashi G. Takaoka2013-07-311-1/+2
| | | | | | | | | | | | | | | | | | Though Azerbaijani subtype is disabled temporary by Ib8a38f85f4. Change-Id: I887cf3508bd2945016c506eae1969778ba4582d3
* | | am 8d46ea91: Merge "Fix some warnings"Jean Chalard2013-07-3120-52/+36
|\| | | | | | | | | | | | | | * commit '8d46ea915645361856a0b3df3db1c83888cb39ff': Fix some warnings
| * | Merge "Fix some warnings"Jean Chalard2013-07-3120-52/+36
| |\ \
| | * | Fix some warningsJean Chalard2013-07-3120-52/+36
| | | | | | | | | | | | | | | | Change-Id: I7290cd1fb675a1b85b9b6ac2d464c932b5bca1dd
* | | | am 7d654d8c: Merge "Fix inconsistency with mutable settings."Jean Chalard2013-07-313-57/+69
|\| | | | | | | | | | | | | | | | | | | * commit '7d654d8cae47f50127021918c24201bb1f0e9a06': Fix inconsistency with mutable settings.
| * | | Merge "Fix inconsistency with mutable settings."Jean Chalard2013-07-313-57/+69
| |\ \ \ | | |_|/ | |/| |
| | * | Fix inconsistency with mutable settings.Jean Chalard2013-07-303-57/+69
| | | | | | | | | | | | | | | | Change-Id: I0550044199273cecb6f5713aa2e43ae16319cd47
* | | | am 21cabc98: Merge "Fix duplicated apostrophe on AZERTY/tablet"Tadashi G. Takaoka2013-07-313-4/+4
|\| | | | | | | | | | | | | | | | | | | * commit '21cabc98d58ef3b763ca2a56aec388310f5eb371': Fix duplicated apostrophe on AZERTY/tablet
| * | | Merge "Fix duplicated apostrophe on AZERTY/tablet"Tadashi G. Takaoka2013-07-313-4/+4
| |\ \ \
| | * | | Fix duplicated apostrophe on AZERTY/tabletTadashi G. Takaoka2013-07-313-4/+4
| | | | | | | | | | | | | | | | | | | | | | | | | Bug: 10099353 Change-Id: I2394a7a7900f42a2cf9e962293fae9bd68e58dee
* | | | | am 536e0c79: Merge "Clean up PointerTracker a bit"Tadashi G. Takaoka2013-07-314-55/+54
|\| | | | | | | | | | | | | | | | | | | | | | | | * commit '536e0c79cc6d34e03930e4298aa94112d2ec07aa': Clean up PointerTracker a bit
| * | | | Merge "Clean up PointerTracker a bit"Tadashi G. Takaoka2013-07-314-55/+54
| |\ \ \ \
| | * | | | Clean up PointerTracker a bitTadashi G. Takaoka2013-07-314-55/+54
| | | | | | | | | | | | | | | | | | | | | | | | Change-Id: If4ff87348fbc40f271c68dad255dbc42f9b26eb6
* | | | | | am 561c4474: Merge "Fix a problem where settings were not renewed correctly."Jean Chalard2013-07-311-2/+5
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit '561c4474046a665b5b4b06a2a09d31db92c39aab': Fix a problem where settings were not renewed correctly.
| * | | | | Merge "Fix a problem where settings were not renewed correctly."Jean Chalard2013-07-311-2/+5
| |\ \ \ \ \ | | | |_|/ / | | |/| | / | | |_|_|/ | |/| | |
| | * | | Fix a problem where settings were not renewed correctly.Jean Chalard2013-07-301-2/+5
| | | | | | | | | | | | | | | | | | | | | | | | | Bug: 10065412 Change-Id: Id05284f45466cd5b2697a695c3d1bdfbf3cc1f24
* | | | | am f8c1aefd: Merge "Clarify the expected cursor position in ↵Jean Chalard2013-07-301-26/+29
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | RichInputConnection." * commit 'f8c1aefd90fced4edec4eaa8d4a9ded0edc5ccf3': Clarify the expected cursor position in RichInputConnection.
| * | | | Merge "Clarify the expected cursor position in RichInputConnection."Jean Chalard2013-07-311-26/+29
| |\ \ \ \ | | |_|_|/ | |/| | |
| | * | | Clarify the expected cursor position in RichInputConnection.Jean Chalard2013-07-311-26/+29
| | | | | | | | | | | | | | | | | | | | Change-Id: I4d36a23567415c3a293a588b51b46006256c148f
| * | | | Merge "Import translations. DO NOT MERGE"Baligh Uddin2013-07-302-4/+2
| |\ \ \ \ | | |_|_|/ | |/| | |
| | * | | Import translations. DO NOT MERGEBaligh Uddin2013-07-292-4/+2
| | | |/ | | |/| | | | | | | | | | | | | Change-Id: Iac90270d4db88ffff492b36e15a424a50af8dddd Auto-generated-cl: translation import
* | | | am 323a7aae: Merge "Fix the title of the personal dictionary settings"Satoshi Kataoka2013-07-302-0/+7
|\| | | | | | | | | | | | | | | | | | | * commit '323a7aae6c23cbaf7a2827a6bad2234bc084f0ce': Fix the title of the personal dictionary settings
| * | | Merge "Fix the title of the personal dictionary settings"Satoshi Kataoka2013-07-302-0/+7
| |\ \ \ | | |_|/ | |/| |
| | * | Fix the title of the personal dictionary settingsSatoshi Kataoka2013-07-302-0/+7
| | | | | | | | | | | | | | | | | | | | Bug: 8976598 Change-Id: I9e07ff9e06449e2093b9ba8d6f28a030c69756bc
* | | | am ab2d2731: Merge "Fix the displayed name of the personal dictionary"Satoshi Kataoka2013-07-292-1/+45
|\| | | | | | | | | | | | | | | | | | | * commit 'ab2d273133a8fe2e1e0a66952d74127629394a4c': Fix the displayed name of the personal dictionary
| * | | Merge "Fix the displayed name of the personal dictionary"Satoshi Kataoka2013-07-302-1/+45
| |\| | | | |/ | |/|
| | * Fix the displayed name of the personal dictionarySatoshi Kataoka2013-07-302-1/+45
| | | | | | | | | | | | | | | Bug: 8976598 Change-Id: I11dd73c8c23b05288c5f417352dc4cc99d489b95
* | | am b60e65a0: Rename a variable for SettingsValuesKen Wakasa2013-07-291-12/+12
|\| | | | | | | | | | | | | | * commit 'b60e65a0cce9f20ee5e633921732785f99fffd2e': Rename a variable for SettingsValues
| * | Rename a variable for SettingsValuesKen Wakasa2013-07-291-12/+12
| | | | | | | | | | | | Change-Id: Icb4155532ea8724791c9194e8dc75ce32b6e8b16
* | | am d9f0c1e0: Merge "Fix an NPE"Jean Chalard2013-07-291-3/+16
|\| | | | | | | | | | | | | | * commit 'd9f0c1e02065d457dc004fc26054fa75432e6661': Fix an NPE
| * | Merge "Fix an NPE"Jean Chalard2013-07-291-3/+16
| |\ \ | | |/ | |/|
| | * Fix an NPEJean Chalard2013-07-291-3/+16
| | | | | | | | | | | | | | | | | | | | | Also make mSuggest private for more security. Bug: 10045657 Change-Id: I712505e4d2a2606efff5d09ba9b4c656f9e7c7a9
* | | am fb9f448b: Merge "Add personalization dictionary helper"Satoshi Kataoka2013-07-283-27/+58
|\| | | | | | | | | | | | | | * commit 'fb9f448b8d3ffc3b7d573e340772c38a77523ac4': Add personalization dictionary helper
| * | Merge "Add personalization dictionary helper"Satoshi Kataoka2013-07-293-27/+58
| |\ \ | | |/ | |/|
| | * Add personalization dictionary helperSatoshi Kataoka2013-07-293-27/+58
| | | | | | | | | | | | | | | | | | | | | Bug: 9429906 Bug: 4192129 Change-Id: Ic618b0b09a54ed46b20633bd4c1c570d4ac775af