aboutsummaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* am 53f4acf8: am 3f805418: Merge "Fix an OOB exception" into jb-mr1-devJean Chalard2012-08-031-2/+5
|\ | | | | | | | | * commit '53f4acf86f6d330146af72f3688ad71428cb8bb6': Fix an OOB exception
| * am 3f805418: Merge "Fix an OOB exception" into jb-mr1-devJean Chalard2012-08-031-2/+5
| |\ | | | | | | | | | | | | * commit '3f80541844672a7625eb298adc6141ecf14bb883': Fix an OOB exception
| | * Merge "Fix an OOB exception" into jb-mr1-devJean Chalard2012-08-031-2/+5
| | |\
| | | * Fix an OOB exceptionJean Chalard2012-08-031-2/+5
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Not sure exactly how this can happen, but at least this should prevent us from crashing. Bug: 6920884 Change-Id: I451864756b48c5cb5e98b06edee917d88766d77f
* | | | am 288caf33: am a777a86f: Merge "Simplification (A2)" into jb-mr1-devJean Chalard2012-08-031-17/+8
|\| | | | | | | | | | | | | | | | | | | * commit '288caf33cb7671f4038e218c8d65316763258afd': Simplification (A2)
| * | | am a777a86f: Merge "Simplification (A2)" into jb-mr1-devJean Chalard2012-08-031-17/+8
| |\| | | | | | | | | | | | | | | | | | * commit 'a777a86f4b311ccdf1443faf0d1759e445ef138e': Simplification (A2)
| | * | Merge "Simplification (A2)" into jb-mr1-devJean Chalard2012-08-031-17/+8
| | |\ \
| | | * | Simplification (A2)Jean Chalard2012-08-031-17/+8
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | A single command at a time and no arity gives opportunity to simplify the argument parsing code. Change-Id: Iff7bab78ede7448a662092f221c590a9eedae2a5
* | | | | am 36fe3241: am 68966c7e: Merge "Remove arity from dicttool commands (A1)" ↵Jean Chalard2012-08-033-40/+20
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | into jb-mr1-dev * commit '36fe3241842819b6bffb9309b0c7f4d48cd910bd': Remove arity from dicttool commands (A1)
| * | | | am 68966c7e: Merge "Remove arity from dicttool commands (A1)" into jb-mr1-devJean Chalard2012-08-033-40/+20
| |\| | | | | | | | | | | | | | | | | | | | | | | * commit '68966c7e0ec89ccb0d2e1f285917163ea9e7b5ee': Remove arity from dicttool commands (A1)
| | * | | Merge "Remove arity from dicttool commands (A1)" into jb-mr1-devJean Chalard2012-08-033-40/+20
| | |\| |
| | | * | Remove arity from dicttool commands (A1)Jean Chalard2012-08-033-40/+20
| | | |/ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This unnecessarily complicates and limits commands. It's simpler to just have one command by invocation. Groundwork for Bug: 6429606 Change-Id: I24cf267a9cbc937a5ba53942b29e28e7095d2fd2
* | | | am be7897a0: am 6242564c: Merge "Using hardware accelerated drawing" into ↵Tadashi G. Takaoka2012-08-033-27/+53
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | jb-mr1-dev * commit 'be7897a04ab38a91d1b4afcf54c9ac668abf2e44': Using hardware accelerated drawing
| * | | am 6242564c: Merge "Using hardware accelerated drawing" into jb-mr1-devTadashi G. Takaoka2012-08-033-27/+53
| |\| | | | | | | | | | | | | | | | | | * commit '6242564c91d47885075bf2bd1e1bb0760de76c10': Using hardware accelerated drawing
| | * | Merge "Using hardware accelerated drawing" into jb-mr1-devTadashi G. Takaoka2012-08-033-27/+53
| | |\ \
| | | * | Using hardware accelerated drawingTadashi G. Takaoka2012-08-033-27/+53
| | | |/ | | | | | | | | | | | | | | | | | | | | | | | | When Canvas has been hardware accelerated, don't use offscreen bitmap. Bug: 6872994 Change-Id: I1121f76377991692bc29ebeedbfbfa1b2a12dbb7
* | | | am b43a1713: am 1d8a246e: Header cleanupKen Wakasa2012-08-033-8/+7
|\| | | | | | | | | | | | | | | | | | | * commit 'b43a1713c563b84c1c811724c72c7e0b8a8b2385': Header cleanup
| * | | am 1d8a246e: Header cleanupKen Wakasa2012-08-033-8/+7
| |\| | | | | | | | | | | | | | | | | | * commit '1d8a246e392e0ab4b1e7c8a60e67c00fca05c93c': Header cleanup
| | * | Header cleanupKen Wakasa2012-08-033-8/+7
| | |/ | | | | | | | | | Change-Id: I1aa91708d0de01ca3e84e69ec8d3a3832c386ca8
* | | am 3666f42b: (-s ours) Reconcile with jb-mr1-release - do not mergeThe Android Open Source Project2012-08-020-0/+0
|\| | | | | | | | | | | * commit '3666f42b4574226d17566660ca0945ec30ee528a':
| * | Reconcile with jb-mr1-release - do not mergeThe Android Open Source Project2012-08-020-0/+0
| |\ \ | | | | | | | | | | | | Change-Id: Ia6cd9f9da1393801f6aeca58eafb6740bae275ca
| | * \ merge in jb-mr1-release history after reset to jb-mr1-devThe Android Automerger2012-08-020-0/+0
| | |\ \ | | | |/ | | |/|
* | | | am 6c465d9d: am 77e8e81a: Header cleanup. Moved a couple of functions from ↵Ken Wakasa2012-08-0212-61/+72
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | .h to .cpp. * commit '6c465d9d26c7389357dedd4b71c6a95ccb6f019c': Header cleanup. Moved a couple of functions from .h to .cpp.
| * | | am 77e8e81a: Header cleanup. Moved a couple of functions from .h to .cpp.Ken Wakasa2012-08-0212-61/+72
| |\| | | | | | | | | | | | | | | | | | * commit '77e8e81ad95cfc1eb8f8407fc872674b8d08bbe9': Header cleanup. Moved a couple of functions from .h to .cpp.
| | * | Header cleanup. Moved a couple of functions from .h to .cpp.Ken Wakasa2012-08-0212-61/+72
| | | | | | | | | | | | | | | | Change-Id: Ifd12a7632f75395bd0ef5e394d5c2abd6cbe28c6
* | | | am 2af1b124: am ffe36cdc: Merge "Small cleanup for keyboard drawing code" ↵Tadashi G. Takaoka2012-08-021-35/+46
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | into jb-mr1-dev * commit '2af1b1241b120e0e9df53edd415601e14fc54e0e': Small cleanup for keyboard drawing code
| * | | am ffe36cdc: Merge "Small cleanup for keyboard drawing code" into jb-mr1-devTadashi G. Takaoka2012-08-021-35/+46
| |\| | | | | | | | | | | | | | | | | | * commit 'ffe36cdc6d41d0ad1031e7d9f8acf6b6f1008970': Small cleanup for keyboard drawing code
| | * | Merge "Small cleanup for keyboard drawing code" into jb-mr1-devTadashi G. Takaoka2012-08-021-35/+46
| | |\ \
| | | * | Small cleanup for keyboard drawing codeTadashi G. Takaoka2012-08-021-35/+46
| | | | | | | | | | | | | | | | | | | | Change-Id: I8b562e03b30f82dddae311b49d316402e867cd31
* | | | | am ab4d177a: am 76c242a1: Merge "Fix multi-touch input in auto-caps field" ↵Tadashi G. Takaoka2012-08-022-4/+1
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | into jb-mr1-dev * commit 'ab4d177a0eacad55f66b1bfb7448ab39a636d819': Fix multi-touch input in auto-caps field
| * | | | am 76c242a1: Merge "Fix multi-touch input in auto-caps field" into jb-mr1-devTadashi G. Takaoka2012-08-012-4/+1
| |\| | | | | | | | | | | | | | | | | | | | | | | * commit '76c242a1f6ac2f4d50f23214dd8652e398194da9': Fix multi-touch input in auto-caps field
| | * | | Merge "Fix multi-touch input in auto-caps field" into jb-mr1-devTadashi G. Takaoka2012-08-012-4/+1
| | |\ \ \ | | | |/ / | | |/| |
| | | * | Fix multi-touch input in auto-caps fieldTadashi G. Takaoka2012-08-012-4/+1
| | | | | | | | | | | | | | | | | | | | | | | | | Bug: 6905194 Change-Id: I7f9f61f36b7f3aa2b40c126a68232a947976aad2
* | | | | am 90817001: am fb955693: Enable hardware accelerated drawing for ↵Ken Wakasa2012-08-022-0/+40
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | SoftInputWindow of LatinIME * commit '908170017208ee2cf84d5857cb33e13b0443c919': Enable hardware accelerated drawing for SoftInputWindow of LatinIME
| * | | | am fb955693: Enable hardware accelerated drawing for SoftInputWindow of LatinIMEKen Wakasa2012-08-012-0/+40
| |\| | | | | | | | | | | | | | | | | | | | | | | * commit 'fb955693d4bb0c8d39092250a4208e385b8a31a7': Enable hardware accelerated drawing for SoftInputWindow of LatinIME
| | * | | Enable hardware accelerated drawing for SoftInputWindow of LatinIMEKen Wakasa2012-08-022-0/+40
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Taking advantage of Ib6a8bda46223ce1153f32834daf02a820d16136e bug: 6872994 Change-Id: I799b25b6509980dd9f039bead9bc926b42cbb040
* | | | | Merge "ResearchLogger to track simple statistics"Kurt Partridge2012-08-012-1/+202
|\ \ \ \ \
| * | | | | ResearchLogger to track simple statisticsKurt Partridge2012-08-012-1/+202
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Bug: 6188932 Change-Id: I1ecb5e1fd08f17af998b87414771fa7d90ef5f81
* | | | | | Merge "ResearchLogger log RichInputConnection"Kurt Partridge2012-08-013-184/+189
|\| | | | |
| * | | | | ResearchLogger log RichInputConnectionKurt Partridge2012-08-013-184/+189
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Move many ResearchLogger data collection points to RichInputConnection. By collecting data here, developers do not have to remember to keep the ResearchLog consistent with calls to the RichInputConnection. In addition, some unnecessary log points were removed, and the ResearchLogger is now independent of LatinImeLogger. multi-project change with I67bbf5fe8fd821da967a50b69e467caafc7fd388 Bug: 6188932 Change-Id: I49ccee1dcffe8d41401b42a637dd0da8dd11d90d
* | | | | | am 1b562db5: (-s ours) am 2ca0f262: Import translations. DO NOT MERGEYing Wang2012-08-010-0/+0
|\ \ \ \ \ \ | | |/ / / / | |/| | | | | | | | | | | | | | | | * commit '1b562db5c93cafa3e96071ee2ba1de07b21de418': Import translations. DO NOT MERGE
| * | | | | am 2ca0f262: Import translations. DO NOT MERGEYing Wang2012-08-0144-266/+134
| |\ \ \ \ \ | | | |/ / / | | |/| | | | | | | | | | | | | | | * commit '2ca0f2623751cb12c6b9a94af1a73e6a04db0b08': Import translations. DO NOT MERGE
| | * | | | Import translations. DO NOT MERGEYing Wang2012-08-0144-266/+134
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Change-Id: Ifdbe0c41f5e01c4afc155ea68c05d50d483e5749 Auto-generated-cl: translation import
* | | | | | Merge "Import translations. DO NOT MERGE"Ying Wang2012-08-0144-266/+134
|\ \ \ \ \ \
| * | | | | | Import translations. DO NOT MERGEYing Wang2012-08-0144-266/+134
| | |_|/ / / | |/| | | | | | | | | | | | | | | | | | | | | | Change-Id: I4e27d3edd7beb65232912c51cf531d6989768540 Auto-generated-cl: translation import
* | | | | | am 2afdd4c4: (-s ours) Reconcile with jb-mr1-release - do not mergeThe Android Open Source Project2012-08-010-0/+0
|\ \ \ \ \ \ | |/ / / / / |/| / / / / | |/ / / / * commit '2afdd4c4273ba3c772da45478a79ee6b2fe1c9e0':
| * | | | Reconcile with jb-mr1-release - do not mergeThe Android Open Source Project2012-08-010-0/+0
| |\ \ \ \ | | | |_|/ | | |/| | | | | | | Change-Id: I916d5d2df8ba081a431b8eb5a999e3e07f789e96
| | * | | merge in jb-mr1-release history after reset to jb-mr1-devThe Android Automerger2012-08-010-0/+0
| | |\ \ \ | | | |_|/ | | |/| |
* | | | | am bc892446: am 74fb957e: Header cleanupKen Wakasa2012-08-014-15/+6
|\| | | | | | | | | | | | | | | | | | | | | | | | * commit 'bc8924467eae6cc5dc456cb1fbe4ec97b5b9cf9b': Header cleanup
| * | | | am 74fb957e: Header cleanupKen Wakasa2012-08-014-15/+6
| |\ \ \ \ | | | |_|/ | | |/| | | | | | | | | | | | * commit '74fb957e49e7d9ff5af47f35d062aa7c7f97a8fc': Header cleanup
generated by cgit v1.2.3-83-g751a (git 2.47.1) at 2025-08-01 21:55:28 +0000