aboutsummaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
...
| | * | | | | | | | | | Merge "Remove useless backslashes from the whitelist dictionary" into jb-mr1-devJean Chalard2012-08-131-41/+41
| | |\ \ \ \ \ \ \ \ \ \ | | | |_|/ / / / / / / / | | |/| | | | | | | | |
| | | * | | | | | | | | Remove useless backslashes from the whitelist dictionaryJean Chalard2012-08-131-41/+41
| | | | |/ / / / / / / | | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | For some reason, these are necessary for resources, but XML standard does not require them. Change-Id: I7cdaecb6815aa4020e0d453e33be38ff2968df50
* | | | | | | | | | | am 6b5f5bb2: am 708cc94a: Remove gesture detection hacking codeTadashi G. Takaoka2012-08-122-22/+4
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit '6b5f5bb22710e15ecfd4d3ecbc955b7a8236c85d': Remove gesture detection hacking code
| * | | | | | | | | | am 708cc94a: Remove gesture detection hacking codeTadashi G. Takaoka2012-08-122-22/+4
| |\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit '708cc94a354ad96294126a6ba954bf8be5bd5a06': Remove gesture detection hacking code
| | * | | | | | | | | Remove gesture detection hacking codeTadashi G. Takaoka2012-08-132-22/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Change-Id: Idaec3753592ca0a5c5545eb5ab65254a3e32e662
* | | | | | | | | | | am 8e1f9153: am 507113a1: Fix typo in include guard macro, and some cleanups.Ken Wakasa2012-08-121-26/+24
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit '8e1f91538537e5a23806c163d4fa01aed7423ee8': Fix typo in include guard macro, and some cleanups.
| * | | | | | | | | | am 507113a1: Fix typo in include guard macro, and some cleanups.Ken Wakasa2012-08-121-26/+24
| |\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit '507113a1bb0d9b7ac333512a69da12c4d5d57182': Fix typo in include guard macro, and some cleanups.
| | * | | | | | | | | Fix typo in include guard macro, and some cleanups.Ken Wakasa2012-08-131-26/+24
| | | |/ / / / / / / | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | Change-Id: I455f6a52667b1c6ae5eb9f58b3494dd87eb2c3f5
* | | | | | | | | | am 7b4531a1: am bcec82de: Clean up constructorsKen Wakasa2012-08-1223-190/+114
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit '7b4531a16f0d7f237822e94f3e962257ee9d0c16': Clean up constructors
| * | | | | | | | | am bcec82de: Clean up constructorsKen Wakasa2012-08-1223-190/+114
| |\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit 'bcec82de66f52655593dc233346f11468f5077a0': Clean up constructors
| | * | | | | | | | Clean up constructorsKen Wakasa2012-08-1323-190/+114
| | |/ / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | And, use C++ style casts and use float math functions rather than double ones to save memory space. Also, stop using FloatMath and NativeUtils as standard Math methods are faster now. See http://code.google.com/p/android/issues/detail?id=36199 and https://android-review.googlesource.com/40700 multi-project commit with I4259fb5ab8a15ac5760a7f04fc8f4c860529f04a Change-Id: I0b81cff8c91769f7559a59b9528c75a5aabb4211
* | | | | | | | | am f9b2841f: am 81451030: Merge "Fix JNI" into jb-mr1-devsatok2012-08-124-9/+16
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit 'f9b2841fb592778ad34b5181e1c0bcbf551e3632': Fix JNI
| * | | | | | | | am 81451030: Merge "Fix JNI" into jb-mr1-devsatok2012-08-124-9/+16
| |\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit '814510305c21b3081414e75e040dec4b73f6cdf3': Fix JNI
| | * | | | | | | Merge "Fix JNI" into jb-mr1-devsatok2012-08-124-9/+16
| | |\ \ \ \ \ \ \
| | | * | | | | | | Fix JNIsatok2012-08-114-9/+16
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Change-Id: If134baf52e78fbe18b78611a23870f5d10c80955
* | | | | | | | | | am cf185305: (-s ours) am 9b6b2798: Import translations. DO NOT MERGEBaligh Uddin2012-08-100-0/+0
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit 'cf185305bf30a39c2369d13eb746c10790498961': Import translations. DO NOT MERGE
| * | | | | | | | | am 9b6b2798: Import translations. DO NOT MERGEBaligh Uddin2012-08-101-2/+2
| |\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit '9b6b2798078d0b179af35a2cde894e19dbd11a05': Import translations. DO NOT MERGE
| | * | | | | | | | Import translations. DO NOT MERGEBaligh Uddin2012-08-101-2/+2
| | |/ / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Change-Id: I22eacc83a5aaa0f4e50e02e84ebf2b176dd08fe6 Auto-generated-cl: translation import
* | | | | | | | | Merge "Import translations. DO NOT MERGE"Baligh Uddin2012-08-101-2/+2
|\ \ \ \ \ \ \ \ \
| * | | | | | | | | Import translations. DO NOT MERGEBaligh Uddin2012-08-101-2/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Change-Id: Ieadaecf909a0f3902ab07711f4bc9fd645719417 Auto-generated-cl: translation import
* | | | | | | | | | am af109108: (-s ours) Reconcile with jb-mr1-release - do not mergeThe Android Open Source Project2012-08-100-0/+0
|\ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / |/| / / / / / / / / | |/ / / / / / / / * commit 'af109108641f2169df77533892f651ed31d32a4e':
| * | | | | | | | Reconcile with jb-mr1-release - do not mergeThe Android Open Source Project2012-08-100-0/+0
| |\ \ \ \ \ \ \ \ | | | |_|/ / / / / | | |/| | | | | | | | | | | | | | | Change-Id: I2d5f51a53ca7d84e5de661ce92fd9a83814b7eae
| | * | | | | | | merge in jb-mr1-release history after reset to jb-mr1-devThe Android Automerger2012-08-090-0/+0
| | |\ \ \ \ \ \ \
* | | | | | | | | | am ec1e373a: am 063c3e21: Fix memset() bugsKen Wakasa2012-08-102-6/+6
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit 'ec1e373a20e961d18dfd68db6b58c97c4da4176b': Fix memset() bugs
| * | | | | | | | | am 063c3e21: Fix memset() bugsKen Wakasa2012-08-102-6/+6
| |\ \ \ \ \ \ \ \ \ | | | |_|/ / / / / / | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | * commit '063c3e2171e546957d8c40575740c29f234e307c': Fix memset() bugs
| | * | | | | | | | Fix memset() bugsKen Wakasa2012-08-102-6/+6
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Change-Id: Icf4341c0a62e782cf8c2a863408591df4e6f07cb
* | | | | | | | | | am caa197d7: am f3850e55: Use JNI Region calls also in getSuggestions()Ken Wakasa2012-08-103-52/+73
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit 'caa197d76f8eb27dbb4fa400bace4db625b930bd': Use JNI Region calls also in getSuggestions()
| * | | | | | | | | am f3850e55: Use JNI Region calls also in getSuggestions()Ken Wakasa2012-08-103-52/+73
| |\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit 'f3850e554389dc3012584f9d81a4f2d3d4c89e44': Use JNI Region calls also in getSuggestions()
| | * | | | | | | | Use JNI Region calls also in getSuggestions()Ken Wakasa2012-08-103-52/+73
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Change-Id: I9cc0208397c202aeb6f7b5bb5ad59e00c5afbd80
* | | | | | | | | | am f85ec408: am f6c22008: Workaround to stop init dict traverse sessionSatoshi Kataoka2012-08-102-5/+8
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit 'f85ec4082f60d4b7a06d907505938d91b3dfcee5': Workaround to stop init dict traverse session
| * | | | | | | | | am f6c22008: Workaround to stop init dict traverse sessionSatoshi Kataoka2012-08-102-5/+8
| |\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit 'f6c2200890012708709964fb1a8933ed1c3e7dd8': Workaround to stop init dict traverse session
| | * | | | | | | | Workaround to stop init dict traverse sessionSatoshi Kataoka2012-08-102-5/+8
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Change-Id: I3d46c54a96a9fc0359ef75b9d2f8590b44164a8b
* | | | | | | | | | am 5d9d69d2: am 0f4de30e: Fix a bug on jni of DicTraverseSessionSatoshi Kataoka2012-08-101-1/+1
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit '5d9d69d2f1e3a81d020cc782dcb02cb7ec994dd0': Fix a bug on jni of DicTraverseSession
| * | | | | | | | | am 0f4de30e: Fix a bug on jni of DicTraverseSessionSatoshi Kataoka2012-08-101-1/+1
| |\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit '0f4de30e589deba221b92b3bde341c54fd9d1b9d': Fix a bug on jni of DicTraverseSession
| | * | | | | | | | Fix a bug on jni of DicTraverseSessionSatoshi Kataoka2012-08-101-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Change-Id: Ieeac36cbad9a99d15911f2e6e2e841cae38ecb9b
* | | | | | | | | | am 117f022f: am 82bd0c1e: Merge "step 23-A remove unused method" into jb-mr1-devSatoshi Kataoka2012-08-103-15/+0
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit '117f022f96f84c39c99cbf0821a220052026ddc4': step 23-A remove unused method
| * | | | | | | | | am 82bd0c1e: Merge "step 23-A remove unused method" into jb-mr1-devSatoshi Kataoka2012-08-103-15/+0
| |\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit '82bd0c1e9da5b4872379ffd2875f4ef6e14dc66c': step 23-A remove unused method
| | * | | | | | | | Merge "step 23-A remove unused method" into jb-mr1-devSatoshi Kataoka2012-08-103-15/+0
| | |\ \ \ \ \ \ \ \
| | | * | | | | | | | step 23-A remove unused methodSatoshi Kataoka2012-08-103-15/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Change-Id: I382c654fd30aca1a3277a186ee25fc946449c639
* | | | | | | | | | | am 407d23ad: am a5e57d67: Merge "Accept whitelisted entries from any ↵Jean Chalard2012-08-101-3/+12
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | source." into jb-mr1-dev * commit '407d23ad246cb55e8e6a0138ca39d4d105c5b0a0': Accept whitelisted entries from any source.
| * | | | | | | | | | am a5e57d67: Merge "Accept whitelisted entries from any source." into jb-mr1-devJean Chalard2012-08-101-3/+12
| |\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit 'a5e57d6755c41d8161bd2de3b76cca6922d61202': Accept whitelisted entries from any source.
| | * | | | | | | | | Merge "Accept whitelisted entries from any source." into jb-mr1-devJean Chalard2012-08-101-3/+12
| | |\ \ \ \ \ \ \ \ \
| | | * | | | | | | | | Accept whitelisted entries from any source.Jean Chalard2012-08-101-3/+12
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | ...not only the WhitelistDictionary. Bug: 6906525 Change-Id: I7f181eb6936ec17bbccdc4e736fd09292af24e9c
* | | | | | | | | | | | am b5cb4447: am 58040e7d: Merge "Optimization & Simplification" into jb-mr1-devJean Chalard2012-08-102-17/+12
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit 'b5cb4447cfbc7d397f4da7d3753431bc97ee445e': Optimization & Simplification
| * | | | | | | | | | | am 58040e7d: Merge "Optimization & Simplification" into jb-mr1-devJean Chalard2012-08-102-17/+12
| |\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit '58040e7df9bd22274f9b41c9d8435140be83d586': Optimization & Simplification
| | * | | | | | | | | | Merge "Optimization & Simplification" into jb-mr1-devJean Chalard2012-08-102-17/+12
| | |\| | | | | | | | | | | | |/ / / / / / / / | | |/| | | | | | | |
| | | * | | | | | | | Optimization & SimplificationJean Chalard2012-08-102-17/+12
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | It's useless to do the whitelist lookup twice. Also, putting this test out of this method will allow whitelist entries to come from other sources. Bug: 6906525 Change-Id: I4afe678cae6556d16642d155ce770fbf4e61ad49
* | | | | | | | | | | am d7001b42: am c14d55a2: Merge "Step 22-A implement session" into jb-mr1-devSatoshi Kataoka2012-08-103-0/+183
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit 'd7001b4220bde3bc3a75a46aec470e897ad1c754': Step 22-A implement session
| * | | | | | | | | | am c14d55a2: Merge "Step 22-A implement session" into jb-mr1-devSatoshi Kataoka2012-08-103-0/+183
| |\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit 'c14d55a28915383aa82339f423e45bef057bcadf': Step 22-A implement session
| | * | | | | | | | | Merge "Step 22-A implement session" into jb-mr1-devSatoshi Kataoka2012-08-103-0/+183
| | |\ \ \ \ \ \ \ \ \ | | | |/ / / / / / / / | | |/| | | | | | | |