aboutsummaryrefslogtreecommitdiffstats
path: root/java (follow)
Commit message (Collapse)AuthorAgeFilesLines
...
| | * | | [ML18] Make WordComposer#getAutoCorrection a word infoJean Chalard2014-10-083-39/+28
| | | | | | | | | | | | | | | | | | | | | | | | | Bug: 11230254 Change-Id: I6ad2e7f89862fbfe7af5502961643320c782347f
* | | | | am 5b39af37: Fix unit test failureKen Wakasa2014-10-081-0/+2
|\| | | | | | | | | | | | | | | | | | | | | | | | * commit '5b39af37c00c6bb413d4b6311a22c5ba0aaaacf3': Fix unit test failure
| * | | | Fix unit test failureKen Wakasa2014-10-081-0/+2
| | |/ / | |/| | | | | | | | | | Change-Id: I5a28c6775385ba3b0b7d86c85064fd28f3cbb353
* | | | am 847735fd: Merge "Skeleton code for user dictionary sync"Jatin Matani2014-10-084-1/+69
|\| | | | | | | | | | | | | | | | | | | * commit '847735fdfacfda3fda0e3a1370a35896832cb8bb': Skeleton code for user dictionary sync
| * | | Merge "Skeleton code for user dictionary sync"Jatin Matani2014-10-084-1/+69
| |\ \ \ | | |/ / | |/| |
| | * | Skeleton code for user dictionary syncJatin Matani2014-10-074-1/+69
| | |/ | | | | | | | | | | | | Bug:17464069 Change-Id: If683b80e882c07fba576959346ae74cd445dd83e
* | | am 89d7965e: Merge "Fix NoClassDefFoundError due to CursorAnchorInfo in K"Yohei Yukawa2014-10-071-0/+5
|\| | | | | | | | | | | | | | * commit '89d7965e76da6044d593cd6dacc45147033cfc23': Fix NoClassDefFoundError due to CursorAnchorInfo in K
| * | Merge "Fix NoClassDefFoundError due to CursorAnchorInfo in K"Yohei Yukawa2014-10-071-0/+5
| |\ \
| | * | Fix NoClassDefFoundError due to CursorAnchorInfo in KYohei Yukawa2014-10-071-0/+5
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Check API level before touching CursorAnchorInfo that is only available in L and later. BUG: 17891202 Change-Id: I6e8d2e3f071bd78bed8c1d24ba2b97207dea3044
* | | | am be4e1539: [ML17] Add a method to switch the most probable languageJean Chalard2014-10-071-6/+33
|\| | | | | | | | | | | | | | | | | | | * commit 'be4e1539cb3be157a000a500598be8bd15a2477d': [ML17] Add a method to switch the most probable language
| * | | [ML17] Add a method to switch the most probable languageJean Chalard2014-10-071-6/+33
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Also directly hold a ref to it. It's simpler for now, though we may want to remove it completely later to have a flat, purely weight-based system with no preference. Also split weights between gesturing and typing. Bug: 11230254 Change-Id: Ica15964a193ae6e7f14c85a9a3ed806130fa7efb
* | | | am 38ec825e: [ML16] Remove DictionaryFacilitator.getLocale()Jean Chalard2014-10-073-16/+16
|\| | | | | | | | | | | | | | | | | | | * commit '38ec825ef896db5f90025d86caded938df606194': [ML16] Remove DictionaryFacilitator.getLocale()
| * | | [ML16] Remove DictionaryFacilitator.getLocale()Jean Chalard2014-10-073-16/+16
| | | | | | | | | | | | | | | | | | | | Bug: 11230254 Change-Id: Ife99df42bc145fbd2d5c3128330bc0f88b104de9
* | | | am ea077349: [ML15] First step in removing DictionaryFacilitator.getLocaleJean Chalard2014-10-073-22/+29
|\| | | | | | | | | | | | | | | | | | | * commit 'ea077349563d704dc3fdecf31a6f9f7f95ce4ad4': [ML15] First step in removing DictionaryFacilitator.getLocale
| * | | [ML15] First step in removing DictionaryFacilitator.getLocaleJean Chalard2014-10-073-22/+29
| |/ / | | | | | | | | | | | | Bug: 11230254 Change-Id: Ied010ec6f1024080e8a499f682d2fc1780e82ef7
* | | am 3ead4d7f: Merge "Quit having obsolete options for ime-simulator."Keisuke Kuroyanagi2014-10-071-4/+0
|\| | | | | | | | | | | | | | * commit '3ead4d7f8a4b4f808e06bfc63ad917ef50b8c759': Quit having obsolete options for ime-simulator.
| * | Merge "Quit having obsolete options for ime-simulator."Keisuke Kuroyanagi2014-10-071-4/+0
| |\ \
| | * | Quit having obsolete options for ime-simulator.Keisuke Kuroyanagi2014-10-061-4/+0
| | | | | | | | | | | | | | | | | | | | Bug: 16547409 Change-Id: I43f5a15153cbd7072fde15764a664ad4d1c6417f
| * | | Merge "Import translations. DO NOT MERGE"Geoff Mendal2014-10-072-2/+2
| |\ \ \
| | * | | Import translations. DO NOT MERGEGeoff Mendal2014-10-062-2/+2
| | | | | | | | | | | | | | | | | | | | | | | | | Change-Id: Id46f6934d46a5d517194656a824fc9f921a1cc04 Auto-generated-cl: translation import
| * | | | Merge "Import translations. DO NOT MERGE"Geoff Mendal2014-10-072-15/+15
| |\ \ \ \
| | * | | | Import translations. DO NOT MERGEGeoff Mendal2014-10-062-15/+15
| | |/ / / | | | | | | | | | | | | | | | | | | | | Change-Id: I4ff0dd2333f316363c72071f70694bbf43bb77e2 Auto-generated-cl: translation import
| * | | | Merge "Import translations. DO NOT MERGE"Geoff Mendal2014-10-071-1/+1
| |\ \ \ \
| | * | | | Import translations. DO NOT MERGEGeoff Mendal2014-10-061-1/+1
| | |/ / / | | | | | | | | | | | | | | | | | | | | Change-Id: Ib46e14a36ff47c3fc39ad76d33d93611fb818ad2 Auto-generated-cl: translation import
| * | | | Merge "Import translations. DO NOT MERGE"Geoff Mendal2014-10-072-38/+38
| |\ \ \ \
| | * | | | Import translations. DO NOT MERGEGeoff Mendal2014-10-062-38/+38
| | |/ / / | | | | | | | | | | | | | | | | | | | | Change-Id: Ifed7ebdb7582223e9cca0c3330e0a3e385ba97c4 Auto-generated-cl: translation import
| * | | | Merge "Import translations. DO NOT MERGE"Geoff Mendal2014-10-072-32/+32
| |\ \ \ \
| | * | | | Import translations. DO NOT MERGEGeoff Mendal2014-10-062-32/+32
| | |/ / / | | | | | | | | | | | | | | | | | | | | Change-Id: Idb955cc9c187dc0b3b38fdd3ee2ade9e28bac1d1 Auto-generated-cl: translation import
* | | | | Merge "Import translations. DO NOT MERGE" into jb-ub-latinimegoogleGeoff Mendal2014-10-071-1/+1
|\ \ \ \ \
| * | | | | Import translations. DO NOT MERGEGeoff Mendal2014-10-061-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Change-Id: Ibefa923c7bde1ea14e8b6e1532151617c119e968 Auto-generated-cl: translation import
* | | | | | Merge "Import translations. DO NOT MERGE" into jb-ub-latinimegoogleGeoff Mendal2014-10-071-7/+7
|\ \ \ \ \ \
| * | | | | | Import translations. DO NOT MERGEGeoff Mendal2014-10-061-7/+7
| |/ / / / / | | | | | | | | | | | | | | | | | | | | | | | | Change-Id: I0caa2761ffb0fd36df9c561571379012f769b41b Auto-generated-cl: translation import
* | | | | | am 639837f8: Merge "Postponing memory deallocation after onFinishInputView"Adrian Velicu2014-10-061-9/+31
|\ \ \ \ \ \ | | |/ / / / | |/| | | | | | | | | | | | | | | | * commit '639837f85d648443359ac1883aa6f9c11e287c33': Postponing memory deallocation after onFinishInputView
| * | | | | Merge "Postponing memory deallocation after onFinishInputView"Adrian Velicu2014-10-061-9/+31
| |\ \ \ \ \
| | * | | | | Postponing memory deallocation after onFinishInputViewAdrian Velicu2014-10-061-9/+31
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Bug: 17559789 Change-Id: I1d4b1524028164d27ec4eadd3960b567148f2b84
* | | | | | | am 7a2e38ad: Merge "Update dictionaries"Adrian Velicu2014-10-061-0/+0
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit '7a2e38ad403fdc9a1c5450862db6256e8108d007': Update dictionaries
| * | | | | | Merge "Update dictionaries"Adrian Velicu2014-10-061-0/+0
| |\ \ \ \ \ \
| | * | | | | | Update dictionariesAdrian Velicu2014-10-061-0/+0
| | |/ / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | >>> java/res/raw/main_ru.dict Header : codePointTable : null <=> оаиенрстлвкмпудыгяйзбьчхюшжцфщёКэСМАБГПВДЛТРНХФ-ОИШЭУъЗЧЕЯЖЦЮЙЩЁЫѓ date : 1412325424 <=> 1412592602 version : 52 <=> 53 Body : No differences Change-Id: I5db813c4e671797c71de8609aa0e4d26404b425e
* | | / / / / am f849d21a: Fix currency symbol sizeTadashi G. Takaoka2014-10-061-1/+2
|\| | | | | | | |_|/ / / / |/| | | | | | | | | | | | | | | | | * commit 'f849d21a5d3e245eb2082b6cdbf515bf24b6d699': Fix currency symbol size
| * | | | | Fix currency symbol sizeTadashi G. Takaoka2014-10-071-1/+2
| | |/ / / | |/| | | | | | | | | | | | | | | | | | Bug: 17877107 Change-Id: I0723fc86792ec5a20ac54a1d3c965293ba1f0bd2
* | | | | am 6fb586a5: Fix missing prediction words on contextual stripTadashi G. Takaoka2014-10-069-24/+34
|\| | | | | | | | | | | | | | | | | | | | | | | | * commit '6fb586a527e7ffe5da187c8b345cdf897b8481c7': Fix missing prediction words on contextual strip
| * | | | Fix missing prediction words on contextual stripTadashi G. Takaoka2014-10-079-24/+34
| | | | | | | | | | | | | | | | | | | | | | | | | Bug: 17874801 Change-Id: Iaba935a6b2548376f10a0ecd80f07ea7ada6c60a
* | | | | am db6c3277: Merge "Add a utility method to SuggestionSpanUtils"Yohei Yukawa2014-10-061-0/+28
|\| | | | | | | | | | | | | | | | | | | | | | | | * commit 'db6c32778e80acc156a118f13ff2788a9277da30': Add a utility method to SuggestionSpanUtils
| * | | | Merge "Add a utility method to SuggestionSpanUtils"Yohei Yukawa2014-10-061-0/+28
| |\ \ \ \
| | * | | | Add a utility method to SuggestionSpanUtilsYohei Yukawa2014-10-061-0/+28
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This is a ground work for subsequent CLs. BUG: 16995261 Change-Id: Icbb708a35412a635a0d625b520069840c0bb0904
* | | | | | am 96d97ee2: Merge "Remove preliminary subtypes from E-MR1 release"Tadashi G. Takaoka2014-10-061-0/+14
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit '96d97ee23cc325f7045eb3cf3097d614cf35a5ff': Remove preliminary subtypes from E-MR1 release
| * | | | | Remove preliminary subtypes from E-MR1 releaseTadashi G. Takaoka2014-10-061-0/+14
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Note that unit test for Sinhala (Sri Lanka) and Tamil (Sri Lanka) have been unexpectedly @suppressed. Bug: 17743363 Change-Id: I4076a61adbf2d4aee58417d0c354b8ef4a938668
* | | | | | am fcc4cbf6: Merge "[ML14] Forward the locale list to relevant places, again"Jean Chalard2014-10-0611-90/+126
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit 'fcc4cbf6f18cd71409b6bc5a277e4514a75dad73': [ML14] Forward the locale list to relevant places, again
| * | | | | Merge "[ML14] Forward the locale list to relevant places, again"Jean Chalard2014-10-0611-90/+126
| |\ \ \ \ \
| | * | | | | [ML14] Forward the locale list to relevant places, againJean Chalard2014-10-0611-90/+126
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Diff: +++ b/java/src/com/android/inputmethod/keyboard/internal/KeyboardBuilder.java @@ -735,7 +735,7 @@ public class KeyboardBuilder<KP extends KeyboardParams> { private boolean matchLocaleCodes(TypedArray caseAttr, final Locale[] locales) { // TODO: adujst this for multilingual input - return matchString(caseAttr, R.styleable.Keyboard_Case_languageCode, locales[0].toString()); + return matchString(caseAttr, R.styleable.Keyboard_Case_localeCode, locales[0].toString()); } private boolean matchLanguageCodes(TypedArray caseAttr, Locale[] locales) { Change-Id: Icefac18dd6d5fea97f591177cf8df1ba6de7f4f0