aboutsummaryrefslogtreecommitdiffstats
path: root/java (follow)
Commit message (Expand)AuthorAgeFilesLines
* Merge "Import translations. DO NOT MERGE" into jb-ub-latinimegoogleGeoff Mendal2014-10-071-1/+1
|\
| * Import translations. DO NOT MERGE•••Change-Id: Ibefa923c7bde1ea14e8b6e1532151617c119e968 Auto-generated-cl: translation import Geoff Mendal2014-10-061-1/+1
* | Merge "Import translations. DO NOT MERGE" into jb-ub-latinimegoogleGeoff Mendal2014-10-071-7/+7
|\ \
| * | Import translations. DO NOT MERGE•••Change-Id: I0caa2761ffb0fd36df9c561571379012f769b41b Auto-generated-cl: translation import Geoff Mendal2014-10-061-7/+7
| |/
* | am 639837f8: Merge "Postponing memory deallocation after onFinishInputView"•••* commit '639837f85d648443359ac1883aa6f9c11e287c33': Postponing memory deallocation after onFinishInputView Adrian Velicu2014-10-061-9/+31
|\ \
| * \ Merge "Postponing memory deallocation after onFinishInputView"Adrian Velicu2014-10-061-9/+31
| |\ \
| | * | Postponing memory deallocation after onFinishInputView•••Bug: 17559789 Change-Id: I1d4b1524028164d27ec4eadd3960b567148f2b84 Adrian Velicu2014-10-061-9/+31
* | | | am 7a2e38ad: Merge "Update dictionaries"•••* commit '7a2e38ad403fdc9a1c5450862db6256e8108d007': Update dictionaries Adrian Velicu2014-10-061-0/+0
|\| | |
| * | | Merge "Update dictionaries"Adrian Velicu2014-10-061-0/+0
| |\ \ \
| | * | | Update dictionaries•••>>> java/res/raw/main_ru.dict Header : codePointTable : null <=> оаиенрстлвкмпудыгяйзбьчхюшжцфщёКэСМАБГПВДЛТРНХФ-ОИШЭУъЗЧЕЯЖЦЮЙЩЁЫѓ date : 1412325424 <=> 1412592602 version : 52 <=> 53 Body : No differences Change-Id: I5db813c4e671797c71de8609aa0e4d26404b425e Adrian Velicu2014-10-061-0/+0
| | |/ /
* | | / am f849d21a: Fix currency symbol size•••* commit 'f849d21a5d3e245eb2082b6cdbf515bf24b6d699': Fix currency symbol size Tadashi G. Takaoka2014-10-061-1/+2
|\| | | | |_|/ |/| |
| * | Fix currency symbol size•••Bug: 17877107 Change-Id: I0723fc86792ec5a20ac54a1d3c965293ba1f0bd2 Tadashi G. Takaoka2014-10-071-1/+2
* | | am 6fb586a5: Fix missing prediction words on contextual strip•••* commit '6fb586a527e7ffe5da187c8b345cdf897b8481c7': Fix missing prediction words on contextual strip Tadashi G. Takaoka2014-10-069-24/+34
|\| |
| * | Fix missing prediction words on contextual strip•••Bug: 17874801 Change-Id: Iaba935a6b2548376f10a0ecd80f07ea7ada6c60a Tadashi G. Takaoka2014-10-079-24/+34
* | | am db6c3277: Merge "Add a utility method to SuggestionSpanUtils"•••* commit 'db6c32778e80acc156a118f13ff2788a9277da30': Add a utility method to SuggestionSpanUtils Yohei Yukawa2014-10-061-0/+28
|\| |
| * | Merge "Add a utility method to SuggestionSpanUtils"Yohei Yukawa2014-10-061-0/+28
| |\ \
| | * | Add a utility method to SuggestionSpanUtils•••This is a ground work for subsequent CLs. BUG: 16995261 Change-Id: Icbb708a35412a635a0d625b520069840c0bb0904 Yohei Yukawa2014-10-061-0/+28
* | | | am 96d97ee2: Merge "Remove preliminary subtypes from E-MR1 release"•••* commit '96d97ee23cc325f7045eb3cf3097d614cf35a5ff': Remove preliminary subtypes from E-MR1 release Tadashi G. Takaoka2014-10-061-0/+14
|\| | |
| * | | Remove preliminary subtypes from E-MR1 release•••Note that unit test for Sinhala (Sri Lanka) and Tamil (Sri Lanka) have been unexpectedly @suppressed. Bug: 17743363 Change-Id: I4076a61adbf2d4aee58417d0c354b8ef4a938668 Tadashi G. Takaoka2014-10-061-0/+14
* | | | am fcc4cbf6: Merge "[ML14] Forward the locale list to relevant places, again"•••* commit 'fcc4cbf6f18cd71409b6bc5a277e4514a75dad73': [ML14] Forward the locale list to relevant places, again Jean Chalard2014-10-0611-90/+126
|\| | |
| * | | Merge "[ML14] Forward the locale list to relevant places, again"Jean Chalard2014-10-0611-90/+126
| |\ \ \
| | * | | [ML14] Forward the locale list to relevant places, again•••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 Jean Chalard2014-10-0611-90/+126
* | | | | am 8784b436: Merge "Revert "Remove preliminary subtypes from E-MR1 release""•••* commit '8784b4366e1e4915522d0f0fe80cbdcb5c8832fa': Revert "Remove preliminary subtypes from E-MR1 release" Ken Wakasa2014-10-061-14/+0
|\| | | |
| * | | | Merge "Revert "Remove preliminary subtypes from E-MR1 release""Ken Wakasa2014-10-061-14/+0
| |\ \ \ \ | | |_|_|/ | |/| | |
| | * | | Revert "Remove preliminary subtypes from E-MR1 release"•••This reverts commit 704db5f003eabaee8dcd80838e563865083b73a9. Bug: 17743363 Reverting due to unit test breakage.. Change-Id: Ie7c1e86e50af2a05b4b7877092122dc4f026aa54 Ken Wakasa2014-10-061-14/+0
* | | | | am 4f04fd95: Merge "Remove ENABLE_CURSOR_ANCHOR_INFO_CALLBACK"•••* commit '4f04fd95f40377e94a35c0385352aa0f16b4695f': Remove ENABLE_CURSOR_ANCHOR_INFO_CALLBACK Yohei Yukawa2014-10-062-12/+8
|\| | | |
| * | | | Merge "Remove ENABLE_CURSOR_ANCHOR_INFO_CALLBACK"Yohei Yukawa2014-10-062-12/+8
| |\ \ \ \ | | |/ / / | |/| | |
| | * | | Remove ENABLE_CURSOR_ANCHOR_INFO_CALLBACK•••We can now start relying on L APIs even in unbundled release. This means ENABLE_CURSOR_ANCHOR_INFO_CALLBACK can be always true. Hence we simply remove it. Change-Id: I0353e992e97e252059f83accea100504594bf171 Yohei Yukawa2014-10-062-12/+8
* | | | | am 3215338f: Merge "Remove preliminary subtypes from E-MR1 release"•••* commit '3215338fa0dc23ae86766015a848508e994d85a3': Remove preliminary subtypes from E-MR1 release Tadashi G. Takaoka2014-10-061-0/+14
|\| | | |
| * | | | Remove preliminary subtypes from E-MR1 release•••Note that unit test for Sinhala (Sri Lanka) and Tamil (Sri Lanka) have been unexpectedly @suppressed. Bug: 17743363 Change-Id: I5f4b6fd8cbb8fa4e31df9ac602847c681655fd02Tadashi G. Takaoka2014-10-061-0/+14
* | | | | am dbeed7e4: Update setup wizard image•••* commit 'dbeed7e4d811e54256209791f54367aaafa17c58': Update setup wizard image Tadashi G. Takaoka2014-10-061-0/+0
|\| | | |
| * | | | Update setup wizard image•••Bug: 17769384 Change-Id: Ie1a294c9f317e61fee30b316b65a4663c5ebef8b Tadashi G. Takaoka2014-10-061-0/+0
* | | | | am a697c62b: Merge "Stop using splitActionBar"•••* commit 'a697c62b7d1e6d13c6e48f23af07e3b64f55dc3b': Stop using splitActionBar Tadashi G. Takaoka2014-10-061-2/+1
|\| | | |
| * | | | Merge "Stop using splitActionBar"Tadashi G. Takaoka2014-10-061-2/+1
| |\ \ \ \
| | * | | | Stop using splitActionBar•••Bug: 16830067 Change-Id: I05514ca03438f577bb8a17a59705897440907bf7 Tadashi G. Takaoka2014-10-061-2/+1
* | | | | | am 4bde90bf: Merge "Update setup wizard video and image of AOSP"•••* commit '4bde90bf77a52dca1f99eebd3cfb890d741ccd83': Update setup wizard video and image of AOSP Tadashi G. Takaoka2014-10-064-4/+5
|\| | | | |
| * | | | | Merge "Update setup wizard video and image of AOSP"Tadashi G. Takaoka2014-10-064-4/+5
| |\ \ \ \ \ | | |_|/ / / | |/| | | |
| | * | | | Update setup wizard video and image of AOSP•••Bug: 17769384 Change-Id: I23748bce17566aad1693ff56e8c04f493f957f84 Tadashi G. Takaoka2014-10-064-4/+5
| | |/ / /
* | | | | am 8b24e7ab: Merge "Refactor custom input style settings"•••* commit '8b24e7abde6702f3af557fc411d18edc34528496': Refactor custom input style settings Tadashi G. Takaoka2014-10-061-31/+23
|\| | | |
| * | | | Merge "Refactor custom input style settings"Tadashi G. Takaoka2014-10-061-31/+23
| |\ \ \ \ | | |_|_|/ | |/| | |
| | * | | Refactor custom input style settings•••This CL removes references of Pair class. Change-Id: I7cda0ac438ac1d5026599cb52ac2ea8845339da9 Tadashi G. Takaoka2014-10-061-31/+23
| | |/ /
* | | | am a48ff4e2: Merge "Add unittest for SuggestionSpanUtils"•••* commit 'a48ff4e294121cd7d4b25283c104bf7a38d7ad21': Add unittest for SuggestionSpanUtils Yohei Yukawa2014-10-061-1/+6
|\| | |
| * | | Merge "Add unittest for SuggestionSpanUtils"Yohei Yukawa2014-10-061-1/+6
| |\ \ \
| | * | | Add unittest for SuggestionSpanUtils•••This adds unittest for SuggestionSpanUtils for subsequent CLs. No behavior change is intended in this CL. BUG: 16995261 Change-Id: I90d1591cab893a1421ca633963b7c8f00a5fe4b4 Yohei Yukawa2014-10-061-1/+6
| | | |/ | | |/|
* | | | am 1616d6d4: Merge "Make UserHistoryDictionary use updateEntriesForWordWithNg...•••* commit '1616d6d44098ce9fd8c65383af21c88799927b17': Make UserHistoryDictionary use updateEntriesForWordWithNgramContext() Keisuke Kuroyanagi2014-10-064-49/+52
|\| | |
| * | | Merge "Make UserHistoryDictionary use updateEntriesForWordWithNgramContext()"Keisuke Kuroyanagi2014-10-064-49/+52
| |\ \ \ | | |_|/ | |/| |
| | * | Make UserHistoryDictionary use updateEntriesForWordWithNgramContext()•••Bug: 14425059 Change-Id: I409ebf90f68f4a0f1638128ac5ee6af859323d30 Keisuke Kuroyanagi2014-10-064-49/+52
* | | | am add93b11: Merge "Update dictionaries"•••* commit 'add93b1190eef80e495a518da20d4470b0bf07f4': Update dictionaries Adrian Velicu2014-10-061-0/+0
|\| | |
| * | | Merge "Update dictionaries"Adrian Velicu2014-10-061-0/+0
| |\ \ \ | | |/ / | |/| |
| | * | Update dictionaries•••>>> dictionaries/de_wordlist.combined.gz Header : date : 1412325412 <=> 1412572955 Body : Added: überzeugen 50 >>> java/res/raw/main_de.dict Header : date : 1412325412 <=> 1412572955 Body : Added: überzeugen 50 Change-Id: Ief0a0bbe1a280cdba59a74158cd6a4f5bd1b5287 Adrian Velicu2014-10-061-0/+0