aboutsummaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* am 61280c0b: Merge "Add CommandExecutor for dicttoolkit."Keisuke Kuroyanagi2014-11-0814-28/+399
|\ | | | | | | | | * commit '61280c0b7fc87cf901272f38b75d12c5193b33ff': Add CommandExecutor for dicttoolkit.
| * Merge "Add CommandExecutor for dicttoolkit."Keisuke Kuroyanagi2014-11-0814-28/+399
| |\
| | * Add CommandExecutor for dicttoolkit.Keisuke Kuroyanagi2014-11-0914-28/+399
| | | | | | | | | | | | | | | Bug: 10059681 Change-Id: I90334caaf37c84ce7d1b93d12efbfb5f244a9420
* | | am d2a47cce: Merge "Introduce CommandUtils for dicttoolkit"Keisuke Kuroyanagi2014-11-087-3/+165
|\| | | | | | | | | | | | | | * commit 'd2a47cceb290769e2c1c38ee3b77c9413ff0af3e': Introduce CommandUtils for dicttoolkit
| * | Merge "Introduce CommandUtils for dicttoolkit"Keisuke Kuroyanagi2014-11-087-3/+165
| |\|
| | * Introduce CommandUtils for dicttoolkitKeisuke Kuroyanagi2014-11-087-3/+165
| | | | | | | | | | | | | | | Bug: 10059681 Change-Id: Ic6947e76d77dc87bf88dc3a2b749e41fae7553b7
* | | am b050b458: am b8893c04: am d4662983: Fix restore from keyboard automerge: ↵Sandeep Siddhartha2014-11-070-0/+0
|\| | | | | | | | | | | | | | | | | | | | e551539 * commit 'b050b458dc1eac06412d116d6b57b849d3ccb06d': Fix restore from keyboard
| * | am b8893c04: am d4662983: Fix restore from keyboard automerge: e551539Sandeep Siddhartha2014-11-070-0/+0
| |\ \ | | | | | | | | | | | | | | | | * commit 'b8893c044df4e3cdcb8aeafe7ab4fc8b3a626049': Fix restore from keyboard
| | * \ am d4662983: Fix restore from keyboard automerge: e551539Sandeep Siddhartha2014-11-071-1/+0
| | |\ \ | | | | | | | | | | | | | | | | | | | | * commit 'd4662983d87d6d2ef2361e9053a29d6e5fb8d16e': Fix restore from keyboard
| | | * \ Fix restore from keyboardSandeep Siddhartha2014-11-071-1/+0
| | | |\ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | automerge: e551539 * commit 'e5515395f11ce3f6ba5ddebb1fc029c51f51b8b3': Fix restore from keyboard
| | | | * | Fix restore from keyboardSandeep Siddhartha2014-11-071-1/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The keyboard starts up before the restore process and the default shared preferences are cached and used even after the restore. Bug: 17837918 Change-Id: I2669e377b6e95813657fd6a80fbff4472330e3aa (cherry picked from commit e9d814674b9c94d61b474f58633a75afb7d2a616)
* | | | | | am 52a87a4c: Merge "Clean up KeyboardLayoutSet a bit"Tadashi G. Takaoka2014-11-071-28/+19
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit '52a87a4cc3b8ab1bda15b21cc1749d3a8addd45f': Clean up KeyboardLayoutSet a bit
| * | | | | Merge "Clean up KeyboardLayoutSet a bit"Tadashi G. Takaoka2014-11-071-28/+19
| |\ \ \ \ \
| | * | | | | Clean up KeyboardLayoutSet a bitTadashi G. Takaoka2014-11-061-28/+19
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This CL moves getScriptId() from KeyboardLayoutSet.Builder to KeyboardLayoutSet. Change-Id: I13588467e3d03abb92120acb367f021ee3490a50
* | | | | | | am ec0d6bb9: Merge "Move current subtype management code to ↵Tadashi G. Takaoka2014-11-076-47/+51
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | RichInputMethodManager" * commit 'ec0d6bb9b708070c71981021712dfad0352a4cfe': Move current subtype management code to RichInputMethodManager
| * | | | | | Merge "Move current subtype management code to RichInputMethodManager"Tadashi G. Takaoka2014-11-076-47/+51
| |\ \ \ \ \ \
| | * | | | | | Move current subtype management code to RichInputMethodManagerTadashi G. Takaoka2014-11-066-47/+51
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Change-Id: I82d5a17a5ec96f26047d29e79f3f28850fc5b3bb
* | | | | | | | am 96d558cc: (-s ours) Merge "Import translations. DO NOT MERGE"Baligh Uddin2014-11-070-0/+0
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit '96d558cc191fdad33ed85211dc84420d4746d75f': Import translations. DO NOT MERGE
| * | | | | | | Merge "Import translations. DO NOT MERGE"Baligh Uddin2014-11-0722-22/+22
| |\ \ \ \ \ \ \
| | * | | | | | | Import translations. DO NOT MERGEBaligh Uddin2014-11-0622-22/+22
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Change-Id: Ib227ef25b8d0eef2f1b83bddfadde5c1a6d93cd8 Auto-generated-cl: translation import
* | | | | | | | | am 73c80e67: (-s ours) Merge "Import translations. DO NOT MERGE"Baligh Uddin2014-11-070-0/+0
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit '73c80e678e13df5eb78e49d37c1c8084bddb9c2e': Import translations. DO NOT MERGE
| * | | | | | | | Merge "Import translations. DO NOT MERGE"Baligh Uddin2014-11-071-1/+1
| |\ \ \ \ \ \ \ \
| | * | | | | | | | Import translations. DO NOT MERGEBaligh Uddin2014-11-061-1/+1
| | |/ / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Change-Id: I4b38b31403db1ee5b5bab7a6328db1919d822d20 Auto-generated-cl: translation import
* | | | | | | | | Merge "Import translations. DO NOT MERGE" into jb-ub-latinimegoogleBaligh Uddin2014-11-071-1/+1
|\ \ \ \ \ \ \ \ \
| * | | | | | | | | Import translations. DO NOT MERGEBaligh Uddin2014-11-061-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Change-Id: I8b8e17a01b4080e4d18f5961364ef7e4e7ed8649 Auto-generated-cl: translation import
* | | | | | | | | | am 5c4f642d: Merge "Move util classes under common"Jean Chalard2014-11-0750-244/+56
|\ \ \ \ \ \ \ \ \ \ | | |/ / / / / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit '5c4f642df61b8672b1aa913992b981284f07eba7': Move util classes under common
| * | | | | | | | | Merge "Move util classes under common"Jean Chalard2014-11-0750-244/+56
| |\ \ \ \ \ \ \ \ \
| | * | | | | | | | | Move util classes under commonJean Chalard2014-11-0750-244/+56
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Also why did we have two copies of LocaleUtils >.> Bug: 18108776 Change-Id: I03b4403dfd51934e66b567f2f8b87da419cfb3ab
* | | | | | | | | | | am b2d263aa: Merge "Fix tests"Jean Chalard2014-11-071-1/+1
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit 'b2d263aae64d7c5221d9b026be279408f7135d9d': Fix tests
| * | | | | | | | | | Merge "Fix tests"Jean Chalard2014-11-071-1/+1
| |\ \ \ \ \ \ \ \ \ \
| | * | | | | | | | | | Fix testsJean Chalard2014-11-071-1/+1
| | |/ / / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Oops. Change-Id: Ib7c8c8284b55a6a6db5b5806ff40188fd06b57fb
* | | | | | | | | | | am e0c2e5b2: Merge "Remove a deprecated constructor to SuggestedWords"Jean Chalard2014-11-072-13/+7
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit 'e0c2e5b2f731d612df5005c770ddd8cf47180e19': Remove a deprecated constructor to SuggestedWords
| * | | | | | | | | | Merge "Remove a deprecated constructor to SuggestedWords"Jean Chalard2014-11-072-13/+7
| |\ \ \ \ \ \ \ \ \ \ | | |/ / / / / / / / / | |/| | | | | | | | |
| | * | | | | | | | | Remove a deprecated constructor to SuggestedWordsJean Chalard2014-11-072-13/+7
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Change-Id: If4d358b3a11fb25fc214c728269519d8c25f9adc
* | | | | | | | | | | am 72866677: Merge "Move shorcut IME related code from SubtypeSwitcher to ↵Tadashi G. Takaoka2014-11-076-133/+121
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | RichInputMethodManager" * commit '7286667754f516ae24e34e033f15e9f5b6fcd279': Move shorcut IME related code from SubtypeSwitcher to RichInputMethodManager
| * | | | | | | | | | Merge "Move shorcut IME related code from SubtypeSwitcher to ↵Tadashi G. Takaoka2014-11-076-133/+121
| |\ \ \ \ \ \ \ \ \ \ | | | |_|_|/ / / / / / | | |/| | | | | | | | | | | | | | | | | | | RichInputMethodManager"
| | * | | | | | | | | Move shorcut IME related code from SubtypeSwitcher to RichInputMethodManagerTadashi G. Takaoka2014-11-066-133/+121
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Change-Id: I0f95f603d80570c937e8c38ded88df341c11795e
* | | | | | | | | | | am 51d0b335: Merge "Remove a useless method."Jean Chalard2014-11-071-17/+0
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit '51d0b3351b2530173cdf73d1a9b364c916583999': Remove a useless method.
| * | | | | | | | | | Merge "Remove a useless method."Jean Chalard2014-11-071-17/+0
| |\ \ \ \ \ \ \ \ \ \
| | * | | | | | | | | | Remove a useless method.Jean Chalard2014-11-061-17/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Yay for cleanup Bug: 18108776 Change-Id: I13f4066cd54f294377fdcf375a69350c44d4a32a
* | | | | | | | | | | | am 536bf616: Merge "Remove dicttool dependency to NativeSuggestOptions"Jean Chalard2014-11-073-6/+10
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit '536bf61658fbd1f541824f6020493dc8816c8349': Remove dicttool dependency to NativeSuggestOptions
| * | | | | | | | | | | Merge "Remove dicttool dependency to NativeSuggestOptions"Jean Chalard2014-11-073-6/+10
| |\| | | | | | | | | | | | |_|/ / / / / / / / | |/| | | | | | | | |
| | * | | | | | | | | Remove dicttool dependency to NativeSuggestOptionsJean Chalard2014-11-063-6/+10
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Bug: 18108776 Change-Id: I0f57594617f8d5080aea9002b2356d18bfe97043
* | | | | | | | | | | am 6e61cd3b: Merge "Move some methods out from SubtypeSwitcher"Tadashi G. Takaoka2014-11-069-126/+174
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit '6e61cd3b3ba8853513b9d0167e76d670ae31a7f1': Move some methods out from SubtypeSwitcher
| * | | | | | | | | | Merge "Move some methods out from SubtypeSwitcher"Tadashi G. Takaoka2014-11-069-126/+174
| |\ \ \ \ \ \ \ \ \ \ | | | |/ / / / / / / / | | |/| | | | | | | |
| | * | | | | | | | | Move some methods out from SubtypeSwitcherTadashi G. Takaoka2014-11-069-126/+174
| | | |_|/ / / / / / | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | Change-Id: I89aaf87d7d0cc204b0ca0f61c2f64d15e2df848e
* | | | | | | | | | am 35bb12e0: Merge "Fix restore from keyboard"Sandeep Siddhartha2014-11-061-1/+0
|\| | | | | | | | | | |_|_|/ / / / / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | * commit '35bb12e010cee0496c5a08e8d7838575ba24f795': Fix restore from keyboard
| * | | | | | | | Merge "Fix restore from keyboard"Sandeep Siddhartha2014-11-061-1/+0
| |\ \ \ \ \ \ \ \ | | |/ / / / / / / | |/| | | | | | |
| | * | | | | | | Fix restore from keyboardSandeep Siddhartha2014-11-051-1/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The keyboard starts up before the restore process and the default shared preferences are cached and used even after the restore. Bug: 17837918 Change-Id: I2669e377b6e95813657fd6a80fbff4472330e3aa
* | | | | | | | | am e1652d75: Fix the build : move offdevice tests in an off device fileJean Chalard2014-11-062-62/+92
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit 'e1652d7570e0eac3415be49e071975370e1f89ae': Fix the build : move offdevice tests in an off device file