aboutsummaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* merge in jb-mr1-release history after reset to jb-mr1-devThe Android Automerger2012-09-130-0/+0
|\
| * merge in jb-mr1-release history after reset to jb-mr1-devThe Android Automerger2012-09-120-0/+0
| |\
| | * merge in jb-mr1-release history after reset to jb-mr1-devThe Android Automerger2012-09-100-0/+0
| | |\
| | | * merge in jb-mr1-release history after reset to jb-mr1-devThe Android Automerger2012-09-090-0/+0
| | | |\
| | | | * merge in jb-mr1-release history after reset to jb-mr1-devThe Android Automerger2012-09-060-0/+0
| | | | |\
| | | | | * merge in jb-mr1-release history after reset to jb-mr1-devThe Android Automerger2012-09-050-0/+0
| | | | | |\
| | | | | | * merge in jb-mr1-release history after reset to jb-mr1-devThe Android Automerger2012-09-040-0/+0
| | | | | | |\
| | | | | | | * merge in jb-mr1-release history after reset to jb-mr1-devThe Android Automerger2012-09-030-0/+0
| | | | | | | |\
| | | | | | | | * merge in jb-mr1-release history after reset to jb-mr1-devThe Android Automerger2012-08-300-0/+0
| | | | | | | | |\
| | | | | | | | | * merge in jb-mr1-release history after reset to jb-mr1-devThe Android Automerger2012-08-290-0/+0
| | | | | | | | | |\
| | | | | | | | | | * merge in jb-mr1-release history after reset to jb-mr1-devThe Android Automerger2012-08-280-0/+0
| | | | | | | | | | |\
| | | | | | | | | | | * merge in jb-mr1-release history after reset to jb-mr1-devThe Android Automerger2012-08-270-0/+0
| | | | | | | | | | | |\
| | | | | | | | | | | | * merge in jb-mr1-release history after reset to jb-mr1-devThe Android Automerger2012-08-230-0/+0
| | | | | | | | | | | | |\
| | | | | | | | | | | | | * merge in jb-mr1-release history after reset to jb-mr1-devThe Android Automerger2012-08-220-0/+0
| | | | | | | | | | | | | |\
| | | | | | | | | | | | | | * merge in jb-mr1-release history after reset to jb-mr1-devThe Android Automerger2012-08-210-0/+0
| | | | | | | | | | | | | | |\
| | | | | | | | | | | | | | | * merge in jb-mr1-release history after reset to jb-mr1-devThe Android Automerger2012-08-200-0/+0
| | | | | | | | | | | | | | | |\
| | | | | | | | | | | | | | | | * merge in jb-mr1-release history after reset to jb-mr1-devThe Android Automerger2012-08-160-0/+0
| | | | | | | | | | | | | | | | |\
| | | | | | | | | | | | | | | | | * merge in jb-mr1-release history after reset to jb-mr1-devThe Android Automerger2012-08-150-0/+0
| | | | | | | | | | | | | | | | | |\
| | | | | | | | | | | | | | | | | | * merge in jb-mr1-release history after reset to jb-mr1-devThe Android Automerger2012-08-140-0/+0
| | | | | | | | | | | | | | | | | | |\
| | | | | | | | | | | | | | | | | | | * merge in jb-mr1-release history after reset to jb-mr1-devThe Android Automerger2012-08-130-0/+0
| | | | | | | | | | | | | | | | | | | |\
| | | | | | | | | | | | | | | | | | | | * merge in jb-mr1-release history after reset to jb-mr1-devThe Android Automerger2012-08-090-0/+0
| | | | | | | | | | | | | | | | | | | | |\
| | | | | | | | | | | | | | | | | | | | | * merge in jb-mr1-release history after reset to jb-mr1-devThe Android Automerger2012-08-080-0/+0
| | | | | | | | | | | | | | | | | | | | | |\
| | | | | | | | | | | | | | | | | | | | | | * merge in jb-mr1-release history after reset to jb-mr1-devThe Android Automerger2012-08-070-0/+0
| | | | | | | | | | | | | | | | | | | | | | |\
| | | | | | | | | | | | | | | | | | | | | | | * merge in jb-mr1-release history after reset to jb-mr1-devThe Android Automerger2012-08-060-0/+0
| | | | | | | | | | | | | | | | | | | | | | | |\
| | | | | | | | | | | | | | | | | | | | | | | | * merge in jb-mr1-release history after reset to jb-mr1-devThe Android Automerger2012-08-020-0/+0
| | | | | | | | | | | | | | | | | | | | | | | | |\
| | | | | | | | | | | | | | | | | | | | | | | | | * merge in jb-mr1-release history after reset to jb-mr1-devThe Android Automerger2012-08-010-0/+0
| | | | | | | | | | | | | | | | | | | | | | | | | |\
| | | | | | | | | | | | | | | | | | | | | | | | | | * merge in jb-mr1-release history after reset to jb-mr1-devThe Android Automerger2012-07-310-0/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | |\
| | | | | | | | | | | | | | | | | | | | | | | | | | | * merge in jb-mr1-release history after reset to jb-mr1-devThe Android Automerger2012-07-300-0/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | |\
| | | | | | | | | | | | | | | | | | | | | | | | | | | | * am 6b9677d8: Merge "Small fix to KeyboardView" into jb-mr1-devTadashi G. Takaoka2012-07-301-6/+11
| | | | | | | | | | | | | | | | | | | | | | | | | | | | |\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit '6b9677d84ba199780b0e8282bf89b04cb618f868': Small fix to KeyboardView
| | | | | | | | | | | | | | | | | | | | | | | | | | | | * \ am b9770cb7: Merge "Add device form factor to KeyboardId" into jb-mr1-devTadashi G. Takaoka2012-07-306-14/+42
| | | | | | | | | | | | | | | | | | | | | | | | | | | | |\ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit 'b9770cb7f7b6d51b651a60d753949208a9742974': Add device form factor to KeyboardId
| | | | | | | | | | | | | | | | | | | | | | | | | | | | * \ \ am f0211161: Merge "Misc cleanups" into jb-mr1-devKen Wakasa2012-07-3013-30/+17
| | | | | | | | | | | | | | | | | | | | | | | | | | | | |\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit 'f0211161ab256c7340c3718e0bb437737ab3b72f': Misc cleanups
| | | | | | | | | | | | | | | | | | | | | | | | | | | | * \ \ \ am 293f062c: Merge "Add advanced options to turn on/off the gesture trail ↵Tadashi G. Takaoka2012-07-308-42/+98
| | | | | | | | | | | | | | | | | | | | | | | | | | | | |\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | and text preview" into jb-mr1-dev * commit '293f062c264c1aff8b6ccaefe0c6fd8ff4608f0a': Add advanced options to turn on/off the gesture trail and text preview
| | | | | | | | | | | | | | | | | | | | | | | | | | | | * \ \ \ \ am 75fb3ce1: More readable Key.toString() and MoreKeySpec.toString()Tadashi G. Takaoka2012-07-302-4/+14
| | | | | | | | | | | | | | | | | | | | | | | | | | | | |\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit '75fb3ce1be3c879bb614097a2534f791c833dd7c': More readable Key.toString() and MoreKeySpec.toString()
| | | | | | | | | | | | | | | | | | | | | | | | | | | | * \ \ \ \ \ am efd8b838: Add MoreKeySpec.toString() method for debuggingTadashi G. Takaoka2012-07-291-0/+9
| | | | | | | | | | | | | | | | | | | | | | | | | | | | |\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit 'efd8b838ee9415ba4ed692ecf136a918cfa02c54': Add MoreKeySpec.toString() method for debugging
| | | | | | | | | | | | | | | | | | | | | | | | | | | | * \ \ \ \ \ \ am d157bb0d: Just a cosmetic cleanupKen Wakasa2012-07-281-3/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | |\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit 'd157bb0d557aff7982ae55f69753b58cca95bda1': Just a cosmetic cleanup
| | | | | | | | | | | | | | | | | | | | | | | | | | | | * \ \ \ \ \ \ \ am bb52fe6f: am 0f5411b2: Reconcile with jb-releaseThe Android Open Source Project2012-07-270-0/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | |\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit 'bb52fe6f06241529c3ae5917f4ef7bc56e100c43':
| | | | | | | | | | | | | | | | | | | | | | | | | | | | * | | | | | | | | Import translations. DO NOT MERGEYing Wang2012-07-2727-165/+84
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Change-Id: I90998ed5c6728b6fec52d6ef35c1a895ec9e8675 Auto-generated-cl: translation import
| | | | | | | | | | | | | | | | | | | | | | | | | | | | * | | | | | | | | am 79d4c70b: Merge "Don\'t auto-correct when there are digits." into jb-mr1-devJean Chalard2012-07-272-1/+14
| | | | | | | | | | | | | | | | | | | | | | | | | | | | |\ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit '79d4c70b93577c73f7570db94fd92b9ecc1ee5cb': Don't auto-correct when there are digits.
| | | | | | | | | | | | | | | | | | | | | | | | | | | | * \ \ \ \ \ \ \ \ \ am 78ee77ad: Merge "Fix a bug with autocaps" into jb-mr1-devJean Chalard2012-07-271-0/+7
| | | | | | | | | | | | | | | | | | | | | | | | | | | | |\ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit '78ee77ad08ca408b4a3e5abfd9b08bc108427605': Fix a bug with autocaps
| | | | | | | | | | | | | | | | | | | | | | | | | | | | * \ \ \ \ \ \ \ \ \ \ am d148c23a: Merge "Make PreviewPlacerView final" into jb-mr1-devTadashi G. Takaoka2012-07-271-22/+18
| | | | | | | | | | | | | | | | | | | | | | | | | | | | |\ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit 'd148c23a33905382d2fe2302821fe702aa1bdf74': Make PreviewPlacerView final
| | | | | | | | | | | | | | | | | | | | | | | | | | | | * \ \ \ \ \ \ \ \ \ \ \ am e3f26dd2: Fix native debug logKen Wakasa2012-07-272-12/+10
| | | | | | | | | | | | | | | | | | | | | | | | | | | | |\ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit 'e3f26dd21e16a7d8c23a95a5084947e54ba598e1': Fix native debug log
| | | | | | | | | | | | | | | | | | | | | | | | | | | | * \ \ \ \ \ \ \ \ \ \ \ \ am 42e7a1e5: Merge "Build LatinIME with NDK r8" into jb-mr1-devKen Wakasa2012-07-270-0/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | |\ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit '42e7a1e5c14c2ca0d171fb8f3266f4f6546332f7': Build LatinIME with NDK r8
| | | | | | | | | | | | | | | | | | | | | | | | | | | | * \ \ \ \ \ \ \ \ \ \ \ \ \ am 99906b3f: Move SuddenJumpingTouchEventHandler to internal packageTadashi G. Takaoka2012-07-272-1/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit '99906b3fc2dcb447aafdd43dda0c4551513b293e': Move SuddenJumpingTouchEventHandler to internal package
| | | | | | | | | | | | | | | | | | | | | | | | | | | | * \ \ \ \ \ \ \ \ \ \ \ \ \ \ Merge "Build LatinIME with NDK r8"Andrew Hsieh2012-07-261-12/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | * | | | | | | | | | | | | | | Build LatinIME with NDK r8Andrew Hsieh2012-07-261-12/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | To remove incorrect __exidx_start and __exidx_end references newer platform libc.so no longer exports. Related CL & issue: http://b/issue?id=6794540 https://googleplex-android-review.googlesource.com/#/c/209741 https://googleplex-android-review.googlesource.com/#/c/211459 Change-Id: I30f49a1277c1f89dcc15973db8851c0002db4b66
| | | | | | | | | | | | | | | | | | | | | | | | | | | | * | | | | | | | | | | | | | | | Import translations. DO NOT MERGEYing Wang2012-07-2649-0/+240
| | | | | | | | | | | | | | | | | | | | | | | | | | | | |/ / / / / / / / / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Change-Id: I08e6215e35e127bf5e85c303e065759a1af8b323 Auto-generated-cl: translation import
* | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Merge "Simplify a call, and add comments (A2)" into jb-mr1-devJean Chalard2012-09-132-18/+67
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Simplify a call, and add comments (A2)Jean Chalard2012-09-132-18/+67
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Since the function has to be modified heavily but does a lot of non-trivial work, add a wealth of comments explaining what it does and why so as to facilitate understanding the changes to come. Bug: 4967874 Change-Id: I6c21aea15f161d807035f279dfb7d1b98b3e9144
* | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Merge "Fix gesture floating preview on up event" into jb-mr1-devTadashi G. Takaoka2012-09-131-12/+12
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fix gesture floating preview on up eventTadashi G. Takaoka2012-09-131-12/+12
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This is a follow up of Iddb26ba1. Bug: 7119032 Change-Id: Ibbc94a1a4880ca31bd8aeece89893691b14acc4d