aboutsummaryrefslogtreecommitdiffstats
path: root/java (follow)
Commit message (Collapse)AuthorAgeFilesLines
...
| | * | | | | Add RichInputMethodSubtype.getKeyboardLayoutSetNameTadashi G. Takaoka2014-11-125-7/+8
| | |/ / / / | | | | | | | | | | | | | | | | | | Change-Id: I90cc74ee882e8aa2b243885d3b994223ca3b6f44
* | | | | | am 8b46c595: Merge "Clean SubtypeLocaleUtils a bit"Tadashi G. Takaoka2014-11-132-7/+3
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit '8b46c595dc54f3f858116428855592bc8b67018a': Clean SubtypeLocaleUtils a bit
| * | | | | Clean SubtypeLocaleUtils a bitTadashi G. Takaoka2014-11-122-7/+3
| |/ / / / | | | | | | | | | | | | | | | Change-Id: If8b981715983e3a12867c9b7c53bfa5effaddd39
| * | | | Merge "Import translations. DO NOT MERGE"Geoff Mendal2014-11-101-2/+1
| |\ \ \ \
| | * | | | Import translations. DO NOT MERGEGeoff Mendal2014-11-101-2/+1
| | |/ / / | | | | | | | | | | | | | | | | | | | | Change-Id: I11a66375af737c53e276c9f64bf2052331c4b3f9 Auto-generated-cl: translation import
| * | | | Merge "Import translations. DO NOT MERGE"Geoff Mendal2014-11-101-1/+1
| |\ \ \ \ | | |_|_|/ | |/| | |
| | * | | Import translations. DO NOT MERGEGeoff Mendal2014-11-101-1/+1
| | |/ / | | | | | | | | | | | | | | | | Change-Id: I224369092800032915f36e9bf4237d7d537fa712 Auto-generated-cl: translation import
* | | | Merge "Import translations. DO NOT MERGE" into jb-ub-latinimegoogleGeoff Mendal2014-11-101-2/+1
|\ \ \ \
| * | | | Import translations. DO NOT MERGEGeoff Mendal2014-11-101-2/+1
| | | | | | | | | | | | | | | | | | | | | | | | | Change-Id: I28f7aa63c0159557b764e9a9bae576429e83cf42 Auto-generated-cl: translation import
* | | | | am e895f5f9: Merge "Move logic to determine spacebar text to ↵Tadashi G. Takaoka2014-11-102-21/+30
|\ \ \ \ \ | | |/ / / | |/| | | | | | | | | | | | | | | | | | | | | | | LanguageOnSpacebarHelper" * commit 'e895f5f9140b8e9fc93a12bbc1b1c4eb18f75c54': Move logic to determine spacebar text to LanguageOnSpacebarHelper
| * | | | Merge "Move logic to determine spacebar text to LanguageOnSpacebarHelper"Tadashi G. Takaoka2014-11-102-21/+30
| |\ \ \ \
| | * | | | Move logic to determine spacebar text to LanguageOnSpacebarHelperTadashi G. Takaoka2014-11-082-21/+30
| | | |/ / | | |/| | | | | | | | | | | | Change-Id: Ib9dbbb4bd4e35c15fd752c364d3012e8a7da2410
* | | | | am d158c430: Just tiny cosmetic fixes in makefileKen Wakasa2014-11-101-1/+1
|\| | | | | |_|/ / |/| | | | | | | | | | | * commit 'd158c430708d1840796268770c5338aa79064e33': Just tiny cosmetic fixes in makefile
| * | | Just tiny cosmetic fixes in makefileKen Wakasa2014-11-111-1/+1
| |/ / | | | | | | | | | Change-Id: I470ba8a03d70aa520311c50f5d21979f476798b7
* | | 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-074-46/+49
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | RichInputMethodManager" * commit 'ec0d6bb9b708070c71981021712dfad0352a4cfe': Move current subtype management code to RichInputMethodManager
| * | | Merge "Move current subtype management code to RichInputMethodManager"Tadashi G. Takaoka2014-11-074-46/+49
| |\ \ \
| | * | | Move current subtype management code to RichInputMethodManagerTadashi G. Takaoka2014-11-064-46/+49
| | | | | | | | | | | | | | | | | | | | Change-Id: I82d5a17a5ec96f26047d29e79f3f28850fc5b3bb
| * | | | 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
| * | | | 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-0737-619/+34
|\ \ \ \ \ \ | | |/ / / / | |/| | | | | | | | | | | | | | | | * commit '5c4f642df61b8672b1aa913992b981284f07eba7': Move util classes under common
| * | | | | Merge "Move util classes under common"Jean Chalard2014-11-0737-619/+34
| |\ \ \ \ \
| | * | | | | Move util classes under commonJean Chalard2014-11-0737-619/+34
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Also why did we have two copies of LocaleUtils >.> Bug: 18108776 Change-Id: I03b4403dfd51934e66b567f2f8b87da419cfb3ab
* | | | | | | 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-072-75/+4
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit '536bf61658fbd1f541824f6020493dc8816c8349': Remove dicttool dependency to NativeSuggestOptions
| * | | | | | | Merge "Remove dicttool dependency to NativeSuggestOptions"Jean Chalard2014-11-072-75/+4
| |\| | | | | | | | |_|/ / / / | |/| | | | |
| | * | | | | Remove dicttool dependency to NativeSuggestOptionsJean Chalard2014-11-062-75/+4
| | | |_|/ / | | |/| | | | | | | | | | | | | | | | | | | | | 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 ab68143a: Fix a bug where LatinIME would recorrect with no input viewJean Chalard2014-11-051-4/+5
|\| | | | | | | | | | | | | | | | | | | * commit 'ab68143ad0fb784db38a3fd65612632fca90c789': Fix a bug where LatinIME would recorrect with no input view
| * | | Fix a bug where LatinIME would recorrect with no input viewJean Chalard2014-11-051-4/+5
| | | | | | | | | | | | | | | | | | | | Bug: 18071127 Change-Id: I634d1f63f7d5c5b7453ed7559f9b65fa0433dcd8
* | | | am b1439c28: Fix EmojiPageKeyboardView onPress bugTadashi G. Takaoka2014-11-041-1/+1
|\| | | | | | | | | | | | | | | | | | | * commit 'b1439c28723c86cd05c31d3651a897329a55a5de': Fix EmojiPageKeyboardView onPress bug