aboutsummaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
...
| | * | | | | am 4d095547: am 202c3a5f: Reconcile with jb-mr1-factory-release ↵The Android Open Source Project2012-11-060-0/+0
| | |\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | jb-mr1-release - do not merge * commit '4d09554794ace67b01a6674c36edd5495b32cc38':
| | | * | | | am 202c3a5f: Reconcile with jb-mr1-factory-release jb-mr1-release - do not mergeThe Android Open Source Project2012-11-060-0/+0
| | | |\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit '202c3a5f32e20939a3dff24b7e2f047e47b29e17': Import translations. DO NOT MERGE Import translations. DO NOT MERGE Build LatinIME with NDK r8
| | | | | \ \
| | | | | \ \
| | | | *-. \ \ Reconcile with jb-mr1-factory-release jb-mr1-release - do not mergeThe Android Open Source Project2012-11-060-0/+0
| | | | |\ \ \ \ | | | | | |_|/ / | | | | |/| | / | | | | | | |/ Change-Id: I355e91c06f0958f1baec5923324dcbcdf408d3f2
* | | | | | | Resolve merge conflictSatoshi Kataoka2012-11-061-32/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | Change-Id: I96c87f7a4e4d34357d3d4c772eb3782c171bb4c0
* | | | | | | Add missing res dirSatoshi Kataoka2012-11-061626-0/+66438
| | | | | | | | | | | | | | | | | | | | | | | | | | | | Change-Id: I50e79bbb1f2eab33c7e5a76086bbe41f7e757ada
* | | | | | | Merge remote-tracking branch 'goog/master' into mergescriptpackageSatoshi Kataoka2012-11-061033-2221395/+6806
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: java/res/values-ca/strings.xml java/res/values-cs/strings.xml java/res/values-de/strings.xml java/res/values-es/strings.xml java/res/values-hr/strings.xml java/res/values-hu/strings.xml java/res/values-it/strings.xml java/res/values-lv/strings.xml java/res/values-nb/strings.xml java/res/values-nl/strings.xml java/res/values-pl/strings.xml java/res/values-pt/strings.xml java/res/values-ro/strings.xml java/res/values-ru/strings.xml java/res/values-sv/strings.xml java/res/values-sw/strings.xml java/res/values-tr/strings.xml java/res/values-uk/strings.xml java/res/values-zh-rCN/strings.xml java/res/values-zh-rTW/strings.xml java/src/com/android/inputmethod/latin/RichInputConnection.java Change-Id: Iba00dd5b86cb16d72968bc7e40d75853845b6dcb
| * | | | | | Tidy up visibility of members of BinaryFormat.Ken Wakasa2012-11-051-26/+27
| | | | | | | | | | | | | | | | | | | | | | | | | | | | Change-Id: I38a00076b82de8e1a19209c67954fe01585f7943
| * | | | | | Adjust compiler warning options with the offdevice MakefileKen Wakasa2012-11-0513-38/+52
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Make use of AK_FORCE_INLINE for -Winline and better performance Change-Id: If0016e2ef61c1fe007c83bb1a5133a6b6bde568e
| * | | | | | Follow up to Ic6af0c596374d936d2b9b31e626fb62bd265ce64Ken Wakasa2012-11-035-140/+140
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Tidy up inline functions with AK_FORCE_INLINE. Moved back some inline methods to header files. Change-Id: Ibd37b595666ebddda198d9237f19f6712653a8e8
| * | | | | | Add more compiler warning flagsKen Wakasa2012-11-029-153/+177
| | | | | | | | | | | | | | | | | | | | | | | | | | | | Change-Id: Ic6af0c596374d936d2b9b31e626fb62bd265ce64
| * | | | | | A small code cleanup in geometry_utils.hKen Wakasa2012-11-022-20/+20
| | | | | | | | | | | | | | | | | | | | | | | | | | | | Change-Id: Ie9ff77c661693a1e21d0aa4cfc079bfbf3171f49
| * | | | | | Merge "Cleanup logging code"Tadashi G. Takaoka2012-11-011-40/+41
| |\ \ \ \ \ \
| | * | | | | | Cleanup logging codeTadashi G. Takaoka2012-11-011-40/+41
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Change-Id: Ia604a4fcebfc5179bdbeaa982e052f7d3882ac6e
| * | | | | | | Merge "Use sizeof() more safely."Ken Wakasa2012-11-015-18/+18
| |\ \ \ \ \ \ \
| | * | | | | | | Use sizeof() more safely.Ken Wakasa2012-11-015-18/+18
| | |/ / / / / / | | | | | | | | | | | | | | | | | | | | | | | | Change-Id: I7cffb4d8da847b483cf4bb482508e3c88c4903be
| * / / / / / / Make sure PointerTrackerQueue is non-nullTadashi G. Takaoka2012-11-012-44/+23
| |/ / / / / / | | | | | | | | | | | | | | | | | | | | | Change-Id: I2106cf64bed1472fb39d24e7e5bdee7238a30bfe
| * | | | | | Merge "Rename SuddenJumpingTouchEventHandler to TouchSCreenRegulator"Tadashi G. Takaoka2012-10-312-15/+15
| |\ \ \ \ \ \
| | * | | | | | Rename SuddenJumpingTouchEventHandler to TouchSCreenRegulatorTadashi G. Takaoka2012-11-012-15/+15
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Change-Id: Ia4fb5b3612ff78ed1b243c80a03294b829470f5c
| * | | | | | | Merge "Add a missing report, and fix a wrong report"Jean Chalard2012-10-311-7/+16
| |\ \ \ \ \ \ \ | | |/ / / / / / | |/| | | | | |
| | * | | | | | Add a missing report, and fix a wrong reportJean Chalard2012-11-011-7/+16
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Deleted words would be reported, but added words wouldn't Also, shortcuts would be reported as bigrams Change-Id: I017653f2afa65cf16924017a0be2ee2cbd6ca10d
| * | | | | | | Merge "Move isInvalidCordinates() method to Constants class"Tadashi G. Takaoka2012-10-313-14/+10
| |\ \ \ \ \ \ \
| | * | | | | | | Move isInvalidCordinates() method to Constants classTadashi G. Takaoka2012-11-013-14/+10
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Change-Id: Iad1464c299ad6055af1db1ff7978e5cd9a14750f
| * | | | | | | | Merge "Cosmetic source code formating change"Tadashi G. Takaoka2012-10-313-34/+51
| |\ \ \ \ \ \ \ \
| | * | | | | | | | Cosmetic source code formating changeTadashi G. Takaoka2012-11-013-34/+51
| | |/ / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | Change-Id: I3a53b49afab70dfb13f12027070635da6001eb79
| * | | | | | | | Merge "Straighten an if-else-if blocks into if-return blocks"Tadashi G. Takaoka2012-10-311-28/+28
| |\ \ \ \ \ \ \ \ | | |_|/ / / / / / | |/| | | | | | |
| | * | | | | | | Straighten an if-else-if blocks into if-return blocksTadashi G. Takaoka2012-11-011-28/+28
| | |/ / / / / / | | | | | | | | | | | | | | | | | | | | | | | | Change-Id: If3eede1257658f27384e3efc72586fabbed19f7b
| * | | | | | | Merge "Add a "no changes" message in the diff command"Jean Chalard2012-10-311-8/+30
| |\ \ \ \ \ \ \
| | * | | | | | | Add a "no changes" message in the diff commandJean Chalard2012-11-011-8/+30
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Also fix a bug where no locale would be interpreted as a different locale instead of the same. Change-Id: I296feef45e39a9e89509cb315e789676755141ab
| * | | | | | | | Merge "Cleaup non-distinct multitouch related stuff"Tadashi G. Takaoka2012-10-313-31/+17
| |\ \ \ \ \ \ \ \ | | |/ / / / / / / | |/| | | | | | |
| | * | | | | | | Cleaup non-distinct multitouch related stuffTadashi G. Takaoka2012-11-013-31/+17
| | |/ / / / / / | | | | | | | | | | | | | | | | | | | | | | | | Change-Id: I09072267217caad2513f83b61d7db1c6d74e18d1
| * / / / / / / Fix an NPE in recent codeJean Chalard2012-11-011-1/+3
| |/ / / / / / | | | | | | | | | | | | | | | | | | | | | Change-Id: I5c76edff5c3c250167d425a737b09b10e25f9f84
| * | | | | | Merge "Use 32-bit code points for suggestions output"Ken Wakasa2012-10-3120-363/+329
| |\ \ \ \ \ \
| | * | | | | | Use 32-bit code points for suggestions outputKen Wakasa2012-11-0120-363/+329
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This is a multi-project commit with Ic43dd666 bug: 6526418 Change-Id: I39c1acb4e91d04cd8a4ec5a943c8cf575da75ebc
| * | | | | | | am b2b10f9a: (-s ours) Reconcile with jb-mr1-factory-release jb-mr1-release ↵The Android Open Source Project2012-10-310-0/+0
| |\ \ \ \ \ \ \ | | |/ / / / / / | |/| / / / / / | | |/ / / / / | | | | | | | | | | | | | | - do not merge * commit 'b2b10f9ad814574a3559ff2d32cbe2d173d14aab':
| | | | | | |
| | | \ \ \ \
| | *-. \ \ \ \ Reconcile with jb-mr1-factory-release jb-mr1-release - do not mergeThe Android Open Source Project2012-10-310-0/+0
| | |\ \ \ \ \ \ | | | | |_|_|/ / | | | |/| | | / | | | | | |_|/ | | | | |/| | Change-Id: I4a04730079d76f1d050c1bcdeb701bd8bbb79511
| | | | * | | merge in jb-mr1-release history after reset to jb-mr1-devThe Android Automerger2012-10-260-0/+0
| | | | |\ \ \ | | | | | |_|/ | | | | |/| |
| | | | | * | merge in jb-mr1-release history after reset to jb-mr1-devThe Android Automerger2012-10-240-0/+0
| | | | | |\ \
| | | | | | * \ merge in jb-mr1-release history after reset to jb-mr1-devThe Android Automerger2012-10-230-0/+0
| | | | | | |\ \
| | | | | | | * \ merge in jb-mr1-release history after reset to jb-mr1-devThe Android Automerger2012-10-180-0/+0
| | | | | | | |\ \
| | | | | | | | * \ merge in jb-mr1-release history after reset to jb-mr1-devThe Android Automerger2012-10-170-0/+0
| | | | | | | | |\ \
| | | * | | | | | \ \ merge in jb-mr1-factory-release history after reset to jb-mr1-devThe Android Automerger2012-10-150-0/+0
| | | |\ \ \ \ \ \ \ \
| * | | \ \ \ \ \ \ \ \ Merge "Consolidate two helper methods (refactor step 3)"Tadashi G. Takaoka2012-10-311-25/+13
| |\ \ \ \ \ \ \ \ \ \ \
| | * | | | | | | | | | | Consolidate two helper methods (refactor step 3)Tadashi G. Takaoka2012-10-311-25/+13
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Change-Id: I8b8522d1e5342fc73346ba2748e75f0c1d5bf03c
| * | | | | | | | | | | | Merge "Flatten nested if-else blocks into plain if-else blocks (refactor ↵Tadashi G. Takaoka2012-10-311-36/+32
| |\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | step 2.5)"
| | * | | | | | | | | | | Flatten nested if-else blocks into plain if-else blocks (refactor step 2.5)Tadashi G. Takaoka2012-10-311-36/+32
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Change-Id: I42aad04658e14e8fd703e3828676719a333ec8f9
| * | | | | | | | | | | | Merge "Separate nested if-blocks into helper methods (refactor step 2)"Tadashi G. Takaoka2012-10-311-61/+77
| |\| | | | | | | | | | |
| | * | | | | | | | | | | Separate nested if-blocks into helper methods (refactor step 2)Tadashi G. Takaoka2012-10-311-61/+77
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Change-Id: Ic0ed243f8c1fbf62793565ee37175270b47f0801
| * | | | | | | | | | | | Move the emoji dictionaries source under AOSP.Jean Chalard2012-10-312-0/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Change-Id: Ie870a90d483d9f27aed96fb4b44126315c43922f
| * | | | | | | | | | | | Merge "Separate nested if-blocks into helper methods (refactor step 1)"Tadashi G. Takaoka2012-10-311-112/+127
| |\| | | | | | | | | | |
| | * | | | | | | | | | | Separate nested if-blocks into helper methods (refactor step 1)Tadashi G. Takaoka2012-10-311-112/+127
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Change-Id: I87ef8b174295fb12a91fec35acd3b0cc152ad8f0
generated by cgit v1.2.3-83-g751a (git 2.47.1) at 2025-07-23 12:09:06 +0000