aboutsummaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* am 12b35158: am 1919072c: Merge "[ZF1] Check profanity in Java rather than ↵Jean Chalard2013-05-154-10/+33
|\ | | | | | | | | | | | | in native" * commit '12b35158efe759c772454059b69615b6c6b6b854': [ZF1] Check profanity in Java rather than in native
| * am 1919072c: Merge "[ZF1] Check profanity in Java rather than in native"Jean Chalard2013-04-254-10/+33
| |\ | | | | | | | | | | | | * commit '1919072cfc88dfb6f8120fe6a646146eae6694c2': [ZF1] Check profanity in Java rather than in native
| | * Merge "[ZF1] Check profanity in Java rather than in native"Jean Chalard2013-04-254-10/+33
| | |\
| | | * [ZF1] Check profanity in Java rather than in nativeJean Chalard2013-04-254-10/+33
| | | | | | | | | | | | | | | | | | | | 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.
| * | | am fb34869f: Merge "[PB8] Add an animation upon status change."Jean Chalard2013-04-253-8/+42
| |\| | | | | | | | | | | | | | | | | | * commit 'fb34869f5ac29c76e0147ff3760ed92dcea9a187': [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
| * | | | am b1b03cfc: Merge "Fix missing initialization of PreviewPlacerView"Tadashi G. Takaoka2013-04-251-0/+1
| |\| | | | | | | | | | | | | | | | | | | | | | | * commit 'b1b03cfc2b1750b6eccc5130be7e571a23099001': 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 f2edc2a8: am 3261746f: Merge "Fix exact match checking for words with ↵Keisuke Kuroynagi2013-05-159-102/+115
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | digraph." * commit 'f2edc2a81d8d7d6e48ba236d0884173c0b0b701f': Fix exact match checking for words with digraph.
| * | | | am 3261746f: Merge "Fix exact match checking for words with digraph."Keisuke Kuroynagi2013-04-259-102/+115
| |\| | | | | | | | | | | | | | | | | | | | | | | * commit '3261746ff99dbf37d556b9c0e82192068437f99c': Fix exact match checking for words with digraph.
| | * | | Merge "Fix exact match checking for words with digraph."Keisuke Kuroynagi2013-04-259-102/+115
| | |\ \ \
| | | * | | Fix exact match checking for words with digraph.Keisuke Kuroynagi2013-04-259-102/+115
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Bug: 8624690 Change-Id: I8946d6618609c8e0cb638aa96992b51b435232c7
* | | | | | 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.
| * | | | | am 43590149: Work around a bug in older DownloadManager versions.Jean Chalard2013-04-254-5/+21
| |\| | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit '43590149a5c2073a9fc8e3ed6afbf21fb017193e': 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
| * | | | | am 4dc77dcf: Merge "[PB7] Export animation code out of the preference"Jean Chalard2013-04-253-24/+108
| |\| | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit '4dc77dcf4c1f704c2f6b32222a74d673afec8794': [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
| * | | | am a995bf40: Put temp files within app filesJean Chalard2013-04-252-1/+14
| |\| | | | | | | | | | | | | | | | | | | | | | | * commit 'a995bf4031dd19ff9c17dd4bf7969c713dc16dcf': 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
| * | | am 30f0f3a9: Merge "Implement a functionality to add an entry to the user ↵Satoshi Kataoka2013-04-2415-5/+1242
| |\| | | | | | | | | | | | | | | | | | | | | | | | | | dictionary" * commit '30f0f3a92a9244b8a0a0dbf03126955206958fff': 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
| * | | am 2cf450f4: [PB6] Encapsulate the buttons into a viewJean Chalard2013-04-243-36/+91
| |\| | | | | | | | | | | | | | | | | | * commit '2cf450f48283bcf1452cb717b7ae3a9f0c729105': [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
| * | | am e91387e2: Merge "[PB5] Store state in a more convenient manner"Jean Chalard2013-04-242-11/+47
| |\| | | | | | | | | | | | | | | | | | * commit 'e91387e281869cb93abb46720b7a80098946d80f': [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
* | | | | am 8b2dcbcb: am 348e062a: (-s ours) Import translations. DO NOT MERGEBaligh Uddin2013-05-150-0/+0
|\| | | | | | | | | | | | | | | | | | | | | | | | * commit '8b2dcbcbdcc6e4435ee1f31ad0355e5268413c57': Import translations. DO NOT MERGE
| * | | | am 348e062a: (-s ours) Import translations. DO NOT MERGEBaligh Uddin2013-04-240-0/+0
| |\| | | | | | | | | | | | | | | | | | | | | | | * commit '348e062a632e9e2b5a5a55afcd2cd20b5d487a94': Import translations. DO NOT MERGE
| | * | | Import translations. DO NOT MERGEBaligh Uddin2013-04-2453-294/+507
| | | | | | | | | | | | | | | | | | | | | | | | | Change-Id: Iefa9cf774c772bc113d481199a0a9c564a0aba27 Auto-generated-cl: translation import
* | | | | am 44ba9cc2: (-s ours) Import translations. DO NOT MERGEBaligh Uddin2013-05-150-0/+0
|\| | | | | | | | | | | | | | | | | | | | | | | | * commit '44ba9cc22321b9d211176249f81e925dfa73bc05': Import translations. DO NOT MERGE
| * | | | Import translations. DO NOT MERGEBaligh Uddin2013-04-2453-294/+507
| | | | | | | | | | | | | | | | | | | | | | | | | Change-Id: Id29ddedac05059e465f8af96bc6efb6d3aedab2b 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
| * | | | am e91c001d: Merge "[PB4] Make a memory non-static"Jean Chalard2013-04-243-9/+40
| |\| | | | | | | | | | | | | | | | | | | | | | | * commit 'e91c001da9ab9a0c1d9dc8bb12ceef8da0fbe365': [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
* | | | | am 77bcc98a: am 80790d78: Merge "[PB3] Simplify storage"Jean Chalard2013-05-151-23/+19
|\| | | | | | | | | | | | | | | | | | | | | | | | * commit '77bcc98ab2f1d3c9b62ee62c1eb4e3fa87f47967': [PB3] Simplify storage
| * | | | am 80790d78: Merge "[PB3] Simplify storage"Jean Chalard2013-04-241-23/+19
| |\| | | | | | | | | | | | | | | | | | | | | | | * commit '80790d78f64a3dbf907773e1302e8a8ca65d3766': [PB3] Simplify storage
| | * | | Merge "[PB3] Simplify storage"Jean Chalard2013-04-241-23/+19
| | |\| |
| | | * | [PB3] Simplify storageJean Chalard2013-04-241-23/+19
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | By looping through children, there is no need to remember the last index. Bug: 7600384 Change-Id: I8b42b0aa38874ee494c6c4ecc09194a1d3c16922