aboutsummaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* am 0a57156c: Don\'t use KeyDrawParams as argument of Key#selectTextSizeTadashi G. Takaoka2012-05-182-10/+12
|\ | | | | | | | | * commit '0a57156c07990b024b69100f1729997e61cb86c1': Don't use KeyDrawParams as argument of Key#selectTextSize
| * Don't use KeyDrawParams as argument of Key#selectTextSizeTadashi G. Takaoka2012-05-182-10/+12
| | | | | | | | | | | | | | This is a follow up of Ide48c361. Bug: 6509415 Change-Id: I59f6e47d06ebfbac6d354d36fca6788f092ed41d
* | am aee147e2: Revert "Make KeyDrawParams and KeyPreviewDrawParams to top ↵Tadashi Takaoka2012-05-185-245/+185
|\| | | | | | | | | | | | | level class" * commit 'aee147e2167b9d5147ec9fc315723bdf2a70eb2c': Revert "Make KeyDrawParams and KeyPreviewDrawParams to top level class"
| * Revert "Make KeyDrawParams and KeyPreviewDrawParams to top level class"Tadashi Takaoka2012-05-185-245/+185
| | | | | | This reverts commit 4c9e6a15d174f85dfd28fbf89341549fbb986acf
* | am 4c9e6a15: Make KeyDrawParams and KeyPreviewDrawParams to top level classTadashi G. Takaoka2012-05-185-185/+245
|\| | | | | | | | | * commit '4c9e6a15d174f85dfd28fbf89341549fbb986acf': Make KeyDrawParams and KeyPreviewDrawParams to top level class
| * Make KeyDrawParams and KeyPreviewDrawParams to top level classTadashi G. Takaoka2012-05-185-185/+245
| | | | | | | | | | | | | | This is a follow up of Ide48c361. Bug: 6509415 Change-Id: Ib45c476924bc4b6b2ca65e0cae91d719109a9cb1
* | am 468ac358: Merge "Add utils for forgetting curve" into jb-devsatok2012-05-172-0/+176
|\| | | | | | | | | * commit '468ac35822034caddc3ba98e70f914b7f88dfff4': Add utils for forgetting curve
| * Merge "Add utils for forgetting curve" into jb-devsatok2012-05-172-0/+176
| |\
| | * Add utils for forgetting curvesatok2012-05-182-0/+176
| | | | | | | | | | | | | | | Bug: 4192129 Change-Id: Iebb7ac355e1c1891da31c33754315bd76a61889b
* | | am d7b80c4e: Merge "Use large label text size for action label" into jb-devTadashi G. Takaoka2012-05-177-1/+23
|\| | | | | | | | | | | | | | * commit 'd7b80c4eee3eaf753f46beee5d68ed44d9742f3c': Use large label text size for action label
| * | Merge "Use large label text size for action label" into jb-devTadashi G. Takaoka2012-05-177-1/+23
| |\ \ | | |/ | |/|
| | * Use large label text size for action labelTadashi G. Takaoka2012-05-187-1/+23
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The large label text size is used for: * The enter key's action label on phone/number keyboard layout of phone device and 7-inch tablet * The enter key's action label on alphabet/symbols keyboard of 7-inch tablet. Bug: 6509415 Change-Id: I1c0dc511b3ac87cba00163b8d29c687ad1e86ce8
* | | am 91492993: Merge "Close batch edit" into jb-devJean Chalard2012-05-171-3/+7
|\| | | | | | | | | | | | | | * commit '914929939a492f8e3605e599e0fa40ab5c7e93e0': Close batch edit
| * | Merge "Close batch edit" into jb-devJean Chalard2012-05-171-3/+7
| |\ \
| | * | Close batch editJean Chalard2012-05-181-3/+7
| | |/ | | | | | | | | | | | | | | | | | | This does the same thing as Ie30e1aff but differently Bug: 6512086 Change-Id: I47ae990510d3f657abd45ad5f0e325d93dec83c0
* | | am a9d28030: Merge "Fix NPE on HOVER_EXIT event when not touching a key." ↵Svetoslav Ganov2012-05-171-1/+1
|\| | | | | | | | | | | | | | | | | | | | into jb-dev * commit 'a9d28030964c4c99e7292d7dcfc73e1453750bf9': Fix NPE on HOVER_EXIT event when not touching a key.
| * | Merge "Fix NPE on HOVER_EXIT event when not touching a key." into jb-devSvetoslav Ganov2012-05-171-1/+1
| |\ \
| | * | Fix NPE on HOVER_EXIT event when not touching a key.alanv2012-05-171-1/+1
| | |/ | | | | | | | | | | | | Bug: 6513368 Change-Id: Ia6d4d01f51a620230b4d19f813fb3aff6881ec03
* | | am a26bda7c: Increase CHAR LIMIT of some string resourcesTadashi G. Takaoka2012-05-171-7/+7
|\| | | | | | | | | | | | | | * commit 'a26bda7c2f487074ac9ac8c64d98b4df615ea429': Increase CHAR LIMIT of some string resources
| * | Increase CHAR LIMIT of some string resourcesTadashi G. Takaoka2012-05-181-7/+7
| |/ | | | | | | | | Bug: 6513954 Change-Id: If4aa1032bc7e615c77e3a64c6e8f8dbb0a020d8d
* | am 817a66e7: Merge "Support large label text ratio in KeyboardView" into jb-devTadashi G. Takaoka2012-05-173-12/+24
|\| | | | | | | | | * commit '817a66e7e6bc9eb0bc74bacf0431308f40185cb1': Support large label text ratio in KeyboardView
| * Merge "Support large label text ratio in KeyboardView" into jb-devTadashi G. Takaoka2012-05-173-12/+24
| |\
| | * Support large label text ratio in KeyboardViewTadashi G. Takaoka2012-05-173-12/+24
| | | | | | | | | | | | | | | Bug: 6509415 Change-Id: Ide48c36126c23d91612c322a1027257c9b967e6b
* | | am 8ec3a42d: Merge "Check duplicated entry of "custom input style"" into jb-devTadashi G. Takaoka2012-05-174-25/+88
|\| | | | | | | | | | | | | | * commit '8ec3a42d2bb93fc6b06236411a9876215792412d': Check duplicated entry of "custom input style"
| * | Merge "Check duplicated entry of "custom input style"" into jb-devTadashi G. Takaoka2012-05-174-25/+88
| |\ \ | | |/ | |/|
| | * Check duplicated entry of "custom input style"Tadashi G. Takaoka2012-05-174-25/+88
| | | | | | | | | | | | | | | Bug: 6495488 Change-Id: Ia6c2421cb0e7c1793d4dfe18acd07fd6f8c5d797
* | | am 6139016b: Merge "Fix a bug where the previous word would not be read ↵Jean Chalard2012-05-171-1/+2
|\| | | | | | | | | | | | | | | | | | | | correctly" into jb-dev * commit '6139016b2b51ccfbd31079064804c1a61a6ff87e': Fix a bug where the previous word would not be read correctly
| * | Merge "Fix a bug where the previous word would not be read correctly" into ↵Jean Chalard2012-05-171-1/+2
| |\ \ | | | | | | | | | | | | jb-dev
| | * | Fix a bug where the previous word would not be read correctlyJean Chalard2012-05-171-1/+2
| | |/ | | | | | | | | | | | | Bug: 6510002 Change-Id: Id30f67e0ca6f7a6fbbbd07922ae19e416c5ef55e
* | | am d7515a0b: Merge "Add open-source-able word lists to AOSP." into jb-devJean Chalard2012-05-1715-0/+1861889
|\| | | | | | | | | | | | | | * commit 'd7515a0bdf456b800b2094b2ccd863a15c8343f8': Add open-source-able word lists to AOSP.
| * | Merge "Add open-source-able word lists to AOSP." into jb-devJean Chalard2012-05-1715-0/+1861889
| |\ \
| | * | Add open-source-able word lists to AOSP.Jean Chalard2012-05-1715-0/+1861889
| | | | | | | | | | | | | | | | | | | | Bug: 6458744 Change-Id: If28aeb7360ee7ec7408f55934ca2a684f032e338
* | | | am bc77adef: Merge "Return the bigram frequency if available." into jb-devJean Chalard2012-05-173-13/+28
|\| | | | | | | | | | | | | | | | | | | * commit 'bc77adefbb0305c5ec0e41ab01e3a085c47c21eb': Return the bigram frequency if available.
| * | | Merge "Return the bigram frequency if available." into jb-devJean Chalard2012-05-173-13/+28
| |\ \ \
| | * | | Return the bigram frequency if available.Jean Chalard2012-05-163-13/+28
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This concludes the work on bug#6313806. Don't submit it before the dictionaries are suitably amended. Bug: 6313806 Change-Id: Icfea45bd52bb9d8cc68ba2266f80640e3942bb7f
* | | | | am 5748a7ce: Merge "Split Portuguese subtype into pt_BR and pt_PT" into jb-devTadashi G. Takaoka2012-05-171-2/+9
|\| | | | | | | | | | | | | | | | | | | | | | | | * commit '5748a7ce86631eaff417828984d25eec7dd63c08': Split Portuguese subtype into pt_BR and pt_PT
| * | | | Merge "Split Portuguese subtype into pt_BR and pt_PT" into jb-devTadashi G. Takaoka2012-05-171-2/+9
| |\ \ \ \
| | * | | | Split Portuguese subtype into pt_BR and pt_PTTadashi G. Takaoka2012-05-171-2/+9
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Bug: 6510103 Change-Id: I91e13e7ecdf4fc9a2f3e3d647b70fb4b672321f5
* | | | | | am 892c000b: Merge "Add a whitelisted word" into jb-devJean Chalard2012-05-171-0/+4
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit '892c000b6dd1e34115e7cb0a3b7d9dc3ea5bc29c': Add a whitelisted word
| * | | | | Merge "Add a whitelisted word" into jb-devJean Chalard2012-05-171-0/+4
| |\ \ \ \ \
| | * | | | | Add a whitelisted wordJean Chalard2012-05-171-0/+4
| | | |_|_|/ | | |/| | | | | | | | | | | | | | | Change-Id: Id776b63dfadeba815f619ed0536bb14febc3aee7
* | | | | | am a8b1563d: Merge "Fix stale key drawing" into jb-devTadashi G. Takaoka2012-05-172-0/+17
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit 'a8b1563d08f76156469cb6359ea90d0a2750f713': Fix stale key drawing
| * | | | | Merge "Fix stale key drawing" into jb-devTadashi G. Takaoka2012-05-172-0/+17
| |\ \ \ \ \
| | * | | | | Fix stale key drawingTadashi G. Takaoka2012-05-172-0/+17
| | | |/ / / | | |/| | | | | | | | | | | | | | | | | | | | | Bug: 6509479 Change-Id: I49988ac951f6b37b14192ef1113a0d668a84f1a2
* | | | | | am 71b047e3: Merge "Don\'t deactivate the LastComposedWord on shift" into jb-devJean Chalard2012-05-171-2/+3
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit '71b047e3018555690ec3e4a639b395f1f79e1e67': Don't deactivate the LastComposedWord on shift
| * | | | | Merge "Don't deactivate the LastComposedWord on shift" into jb-devJean Chalard2012-05-171-2/+3
| |\ \ \ \ \
| | * | | | | Don't deactivate the LastComposedWord on shiftJean Chalard2012-05-171-2/+3
| | | |/ / / | | |/| | | | | | | | | | | | | | | | | | | | | Bug: 6495116 Change-Id: Ib86de02a1216146082bf58a033982ac37fefffe1
* | | | | | am a1500959: Merge "Tidy up number password layout" into jb-devTadashi G. Takaoka2012-05-172-19/+39
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit 'a1500959b657f3100914e2cf34f4aeb5d2e68c82': Tidy up number password layout
| * | | | | Merge "Tidy up number password layout" into jb-devTadashi G. Takaoka2012-05-172-19/+39
| |\ \ \ \ \ | | |_|/ / / | |/| | | |
| | * | | | Tidy up number password layoutTadashi G. Takaoka2012-05-172-19/+39
| | |/ / / | | | | | | | | | | | | | | | | | | | | Bug: 6462191 Change-Id: Idd156e2fd651b80a6b5ebb2b10d88e107febbddb