aboutsummaryrefslogtreecommitdiffstats
path: root/java (follow)
Commit message (Collapse)AuthorAgeFilesLines
* am 42abed7f: am 9a98ef69: Merge "[ZF3] Add the option to block potentially ↵Jean Chalard2013-05-152-0/+11
|\ | | | | | | | | | | | | offensive words" * commit '42abed7ff30b4ad4c04407a81db8de86244b1d80': [ZF3] Add the option to block potentially offensive words
| * Merge "[ZF3] Add the option to block potentially offensive words"Jean Chalard2013-04-262-0/+11
| |\
| | * [ZF3] Add the option to block potentially offensive wordsJean Chalard2013-04-252-0/+11
| | | | | | | | | | | | | | | Bug: 7226877 Change-Id: I2171c946258468b0a39d6590c7af994ef25ba552
* | | am 330072b0: am c03aaa1b: Merge "[ZF2] Read settings for profanity filtering."Jean Chalard2013-05-154-3/+21
|\| | | | | | | | | | | | | | * commit '330072b0146ffe148417d43ee0842c1238b6923d': [ZF2] Read settings for profanity filtering.
| * | Merge "[ZF2] Read settings for profanity filtering."Jean Chalard2013-04-264-3/+21
| |\|
| | * [ZF2] Read settings for profanity filtering.Jean Chalard2013-04-254-3/+21
| | | | | | | | | | | | | | | Bug: 7226877 Change-Id: Ie0c713e1eba1529c0b288a1e5011023a79bedd6b
* | | am a9b0c4fb: am 1ff8b1ce: Merge "Update dictionaries"Jean Chalard2013-05-151-0/+0
|\| | | | | | | | | | | | | | * commit 'a9b0c4fb9d0247ccdc92984de2d972136a8d34bb': Update dictionaries
| * | Merge "Update dictionaries"Jean Chalard2013-04-261-0/+0
| |\ \
| | * | Update dictionariesJean Chalard2013-04-261-0/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Full diff too long: truncated Summary diff >>> dictionaries/ru_wordlist.combined.gz Header : date : 1366277083 <=> 1366957492 version : 31 <=> 32 Contents : - Reinstate 2- and 3- letter words that were demoted to avoid bad space insertion (343 entries) - Add missing words as per b/6341908 and b/5674314 (98 entries) This has zero effect on the regression tests Bug: 6341908 Bug: 5674314 Change-Id: Ifce268a7eab5edd264d963489187e975017f8b72
* | | | am 75a6a525: am adbafa1a: Merge "Support ICS on the user dictionary settings"Satoshi Kataoka2013-05-157-68/+148
|\| | | | | | | | | | | | | | | | | | | * commit '75a6a525e9a34befd931fe666ee761625e6ead99': Support ICS on the user dictionary settings
| * | | Merge "Support ICS on the user dictionary settings"Satoshi Kataoka2013-04-267-68/+148
| |\ \ \
| | * | | Support ICS on the user dictionary settingsSatoshi Kataoka2013-04-267-68/+148
| | | | | | | | | | | | | | | | | | | | | | | | | Bug: 8600958 Change-Id: I50e9228afc7b04147eb7c4734d3145abe8859a30
* | | | | am 7a2fbbb3: am 4bb312c7: Merge "Add strings-appname.xml to AOSP Android ↵Tadashi G. Takaoka2013-05-153-18/+43
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Keyboard project" * commit '7a2fbbb3e6c807340be95807fbd70042466a5426': Add strings-appname.xml to AOSP Android Keyboard project
| * | | | Merge "Add strings-appname.xml to AOSP Android Keyboard project"Tadashi G. Takaoka2013-04-263-18/+43
| |\ \ \ \
| | * | | | Add strings-appname.xml to AOSP Android Keyboard projectTadashi G. Takaoka2013-04-263-18/+43
| | | |/ / | | |/| | | | | | | | | | | | Change-Id: I8dea5393ad3b12c2398bbeb7f1040b66d82c9c35
* | | | | am 01f044b0: am dca46b50: Merge "Keep task stack when invoking settings from ↵Tadashi G. Takaoka2013-05-151-2/+1
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | setup wizard" * commit '01f044b07a7c90d2b87f5cc31b363326134dfc7c': Keep task stack when invoking settings from setup wizard
| * | | | Merge "Keep task stack when invoking settings from setup wizard"Tadashi G. Takaoka2013-04-261-2/+1
| |\ \ \ \
| | * | | | Keep task stack when invoking settings from setup wizardTadashi G. Takaoka2013-04-261-2/+1
| | |/ / / | | | | | | | | | | | | | | | | | | | | Bug: 8336068 Change-Id: If1df32595f72285b2dad16e28b4429b7b6059839
* | | | | am 3385fe8f: am 9fc82bdb: Merge "Remove graying animation of alt-code keys ↵Tadashi G. Takaoka2013-05-152-0/+7
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | while typing" * commit '3385fe8ff58cf42f1c1abac85d6d2ba2aa62ff32': Remove graying animation of alt-code keys while typing
| * | | | Remove graying animation of alt-code keys while typingTadashi G. Takaoka2013-04-262-0/+7
| |/ / / | | | | | | | | | | | | | | | | Bug: 8727807 Change-Id: Idcc76dade3ceba5649666d795b6e4f94a161d748
* | | | am ba4677fe: am df3ca042: Fix deleting a dictionaryJean Chalard2013-05-151-1/+1
|\| | | | | | | | | | | | | | | | | | | * commit 'ba4677fe0b47aa17ac2a5856d9e71c83eaa71c40': Fix deleting a dictionary
| * | | Fix deleting a dictionaryJean Chalard2013-04-251-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | When the user presses the "delete" button in the Add-on dictionary interface, we send an empty dictionary to Latin IME as a dummy for it to use instead of the pre-installed one. The old "empty" placeholder was rejected by initial verification. This one is still empty, but passes the check. Bug: 7980985 Change-Id: I751bbf67d8078dd5fbdce1dd2f0db72a8207816d
* | | | am 12b35158: am 1919072c: Merge "[ZF1] Check profanity in Java rather than ↵Jean Chalard2013-05-152-2/+18
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | in native" * commit '12b35158efe759c772454059b69615b6c6b6b854': [ZF1] Check profanity in Java rather than in native
| * | | Merge "[ZF1] Check profanity in Java rather than in native"Jean Chalard2013-04-252-2/+18
| |\ \ \ | | | |/ | | |/|
| | * | [ZF1] Check profanity in Java rather than in nativeJean Chalard2013-04-252-2/+18
| | | | | | | | | | | | | | | | | | | | Bug: 7226877 Change-Id: Ib6c32bfee9977c27dbf7e1e590b2b00d9ceb7301
* | | | am 9799b7dc: am fb34869f: Merge "[PB8] Add an animation upon status change."Jean Chalard2013-05-153-8/+42
|\| | | | | | | | | | | | | | | | | | | * commit '9799b7dc712f3b0d5c320856b172970a9221a18d': [PB8] Add an animation upon status change.
| * | | Merge "[PB8] Add an animation upon status change."Jean Chalard2013-04-253-8/+42
| |\ \ \
| | * | | [PB8] Add an animation upon status change.Jean Chalard2013-04-253-8/+42
| | | | | | | | | | | | | | | | | | | | | | | | | Bug: 7600384 Change-Id: If5efb9357075193d10255187008e870e2933bdb8
* | | | | am 4ecc0a29: am b1b03cfc: Merge "Fix missing initialization of ↵Tadashi G. Takaoka2013-05-151-0/+1
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | PreviewPlacerView" * commit '4ecc0a2972bb7747b797c498cc79e4135220bae0': Fix missing initialization of PreviewPlacerView
| * | | | Merge "Fix missing initialization of PreviewPlacerView"Tadashi G. Takaoka2013-04-251-0/+1
| |\ \ \ \ | | |_|/ / | |/| | |
| | * | | Fix missing initialization of PreviewPlacerViewTadashi G. Takaoka2013-04-251-0/+1
| | | | | | | | | | | | | | | | | | | | | | | | | Bug: 8716050 Change-Id: I234f1134274b9f72c8abbd729783f9ffe8f20f64
* | | | | am 47c5846d: am 43590149: Work around a bug in older DownloadManager versions.Jean Chalard2013-05-154-5/+21
|\| | | | | | | | | | | | | | | | | | | | | | | | * commit '47c5846dae1452e5e0e480cef91838ebe1d01a48': Work around a bug in older DownloadManager versions.
| * | | | Work around a bug in older DownloadManager versions.Jean Chalard2013-04-254-5/+21
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This adds a number to the extension. Note that for DownloadManager to keep this, the server needs to send it a mime type it does not recognize. Right now, it does not recognize application/json so it's okay, but we'd do well to remove the content/type header from the server to prevent problems. Bug: 8467516 Change-Id: Ic484f66ac3f67c36f59f2c0bcb8c7fdeb6e8590d
* | | | | am 13a2e1b2: am 4dc77dcf: Merge "[PB7] Export animation code out of the ↵Jean Chalard2013-05-153-24/+108
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | preference" * commit '13a2e1b245c56812fd91099b4fe91a6111a14c0f': [PB7] Export animation code out of the preference
| * | | | Merge "[PB7] Export animation code out of the preference"Jean Chalard2013-04-253-24/+108
| |\ \ \ \ | | | |/ / | | |/| |
| | * | | [PB7] Export animation code out of the preferenceJean Chalard2013-04-253-24/+108
| | | |/ | | |/| | | | | | | | | | | | | Bug: 7600384 Change-Id: I8009b31d96646acd667db410b94e969daea91d52
* | | | am c090b38c: am a995bf40: Put temp files within app filesJean Chalard2013-05-152-1/+14
|\| | | | | | | | | | | | | | | | | | | * commit 'c090b38c15cadf9655b2ba026639a42b76c2ea1f': Put temp files within app files
| * | | Put temp files within app filesJean Chalard2013-04-252-1/+14
| |/ / | | | | | | | | | | | | Bug: 8715614 Change-Id: I307d83923070994525cf0d27aad403e881a89314
* | | am 36de7a5e: am 30f0f3a9: Merge "Implement a functionality to add an entry ↵Satoshi Kataoka2013-05-1515-5/+1242
|\| | | | | | | | | | | | | | | | | | | | to the user dictionary" * commit '36de7a5ea32ef6738a2923581e0b14a00b8a6808': Implement a functionality to add an entry to the user dictionary
| * | Merge "Implement a functionality to add an entry to the user dictionary"Satoshi Kataoka2013-04-2515-5/+1242
| |\ \ | | |/ | |/|
| | * Implement a functionality to add an entry to the user dictionarySatoshi Kataoka2013-04-2515-5/+1242
| | | | | | | | | | | | | | | | | | Bug: 8600958 Change-Id: Ic472500406b9d54ec4052c490ee7cef62fc4e52a
* | | am 7e22f2e3: am 2cf450f4: [PB6] Encapsulate the buttons into a viewJean Chalard2013-05-153-36/+91
|\| | | | | | | | | | | | | | * commit '7e22f2e374425f5676fb9eac4bfb97e211d0d487': [PB6] Encapsulate the buttons into a view
| * | [PB6] Encapsulate the buttons into a viewJean Chalard2013-04-253-36/+91
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Handling buttons directly in the preference causes large problems of code readability and interface. It's better to have a class to manage the buttons and their animations separately. This is feature-equivalent, and mostly delegates stuff for now. Bug: 7600384 Change-Id: Ia8da0ec68ffac84fc1d65e1760539a87a73fa776
* | | am 7a9ec9dd: am e91387e2: Merge "[PB5] Store state in a more convenient manner"Jean Chalard2013-05-152-11/+47
|\| | | | | | | | | | | | | | * commit '7a9ec9dd5368c66bc4db8b52d217560339d7929f': [PB5] Store state in a more convenient manner
| * | Merge "[PB5] Store state in a more convenient manner"Jean Chalard2013-04-252-11/+47
| |\ \
| | * | [PB5] Store state in a more convenient mannerJean Chalard2013-04-242-11/+47
| | | | | | | | | | | | | | | | | | | | | | | | | | | | This is more readable and will help with animations going forward. Bug: 7600384 Change-Id: I255598d860d1e451fef106b00da63c282fe95f95
| * | | Import translations. DO NOT MERGEBaligh Uddin2013-04-2453-294/+507
| | | | | | | | | | | | | | | | | | | | Change-Id: Iefa9cf774c772bc113d481199a0a9c564a0aba27 Auto-generated-cl: translation import
* | | | am 6157a049: am e91c001d: Merge "[PB4] Make a memory non-static"Jean Chalard2013-05-153-9/+40
|\| | | | | | | | | | | | | | | | | | | * commit '6157a049268dc1c1e9640a2f49791c54b8bd944b': [PB4] Make a memory non-static
| * | | Merge "[PB4] Make a memory non-static"Jean Chalard2013-04-243-9/+40
| |\| |
| | * | [PB4] Make a memory non-staticJean Chalard2013-04-243-9/+40
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The life span of this object is actually the life span of the interface. It should not be static. Also, we'll have a few other things to store in there soon. Bug: 7600384 Change-Id: I708019e9ee53653e83a1e52c8e76326c3e39bcf3