aboutsummaryrefslogtreecommitdiffstats
path: root/java (follow)
Commit message (Collapse)AuthorAgeFilesLines
...
| * | Merge "Update resources: Colors"Satoshi Kataoka2013-09-202-8/+13
| |\ \
| | * | Update resources: ColorsSatoshi Kataoka2013-09-202-8/+13
| | | | | | | | | | | | | | | | | | | | | | | | bug: 10786040 Change-Id: Idee67e73096e1e31126dbf24e9608d3e6dba2b47
* | | | am 280990bc: Merge "Address a couple more issues in Khmer layout"Ken Wakasa2013-09-202-2/+14
|\| | | | | | | | | | | | | | | | | | | * commit '280990bcb19dde8b5d8298fa0b8313e8167802b2': Address a couple more issues in Khmer layout
| * | | Merge "Address a couple more issues in Khmer layout"Ken Wakasa2013-09-202-2/+14
| |\ \ \
| | * | | Address a couple more issues in Khmer layoutKen Wakasa2013-09-202-2/+14
| | | | | | | | | | | | | | | | | | | | | | | | | bug: 6910993 Change-Id: If866629268040cf7696d9667dbca66fac6a60374
* | | | | am 1d1a3d52: Merge "Fix a bug where null would be converted to "null""Jean Chalard2013-09-201-2/+4
|\| | | | | | | | | | | | | | | | | | | | | | | | * commit '1d1a3d52b8f12766c7d2c1f2033217fce502f49a': Fix a bug where null would be converted to "null"
| * | | | Merge "Fix a bug where null would be converted to "null""Jean Chalard2013-09-201-2/+4
| |\ \ \ \ | | |_|/ / | |/| | |
| | * | | Fix a bug where null would be converted to "null"Jean Chalard2013-09-201-2/+4
| | |/ / | | | | | | | | | | | | | | | | | | | | | | | | | | | | It's unclear what the concrete effects of this are, but they are not very strong. This only happens in corner cases, when the input connection is not active - while rotating, for example. Change-Id: I1d22459a6e94a8ecccb53cfcbc2d301b1d502204
* | | | am baa31217: Update resourcesSatoshi Kataoka2013-09-19244-102/+102
|\| | | | | | | | | | | | | | | | | | | * commit 'baa3121704c4be8d883e58865fa643883a114b6b': Update resources
| * | | Update resourcesSatoshi Kataoka2013-09-20244-102/+102
| |/ / | | | | | | | | | Change-Id: Ia66f7181514ee1471e181e16d15622174cf72e79
* | | am 2e3c1106: Address a couple issues in Khmer layoutKen Wakasa2013-09-192-3/+5
|\| | | | | | | | | | | | | | * commit '2e3c1106f75338953ebef79866ee86eaaa652ab3': Address a couple issues in Khmer layout
| * | Address a couple issues in Khmer layoutKen Wakasa2013-09-202-3/+5
| | | | | | | | | | | | | | | bug: 6910993 Change-Id: I649b2d37a4eca75e2fc98e8c7f6a3dad20339864
| * | Merge "Import translations. DO NOT MERGE"Baligh Uddin2013-09-192-5/+5
| |\ \
| | * | Import translations. DO NOT MERGEBaligh Uddin2013-09-192-5/+5
| | | | | | | | | | | | | | | | | | | | Change-Id: I168cfa8bfa7c4762d50db3675f34282e3b61297b Auto-generated-cl: translation import
* | | | Merge "Import translations. DO NOT MERGE" into jb-ub-latinimegoogleBaligh Uddin2013-09-192-5/+5
|\ \ \ \
| * | | | Import translations. DO NOT MERGEBaligh Uddin2013-09-192-5/+5
| | | | | | | | | | | | | | | | | | | | | | | | | Change-Id: I6b6b1607837a2ac28c732697c6e9192a8ef68a63 Auto-generated-cl: translation import
* | | | | am be5e21ec: Add Khmer layoutKen Wakasa2013-09-1913-4/+877
|\ \ \ \ \ | | |/ / / | |/| | | | | | | | | | | | | * commit 'be5e21ecbbeec92e4773a068bb36b8432b12b2c9': Add Khmer layout
| * | | | Add Khmer layoutKen Wakasa2013-09-1913-4/+877
| | | | | | | | | | | | | | | | | | | | | | | | | bug: 6910993 Change-Id: Ie515acd625bc266494d9e63b0694e2c05a19b661
* | | | | am 72503243: Merge "Add showSuggestionStripWithTypedWord."Ken Wakasa2013-09-191-15/+49
|\| | | | | | | | | | | | | | | | | | | | | | | | * commit '72503243e46bd1259f74da7deab8f8352e3f8186': Add showSuggestionStripWithTypedWord.
| * | | | Merge "Add showSuggestionStripWithTypedWord."Ken Wakasa2013-09-191-15/+49
| |\ \ \ \
| | * | | | Add showSuggestionStripWithTypedWord.Yuichiro Hanada2013-09-191-15/+49
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Bug: 10814472 Change-Id: I3a150124baf7a9b7889b033089a859ff9c11e206
* | | | | | am 5fe31f23: Merge "Show Emoji category page id indicator"Satoshi Kataoka2013-09-196-10/+139
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit '5fe31f23920351a3d7a91caa5c70d549d73c6d48': Show Emoji category page id indicator
| * | | | | Merge "Show Emoji category page id indicator"Satoshi Kataoka2013-09-196-10/+139
| |\ \ \ \ \ | | |/ / / / | |/| | | |
| | * | | | Show Emoji category page id indicatorSatoshi Kataoka2013-09-196-10/+139
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Bug: 10538430 Change-Id: I767fa8d41c789125af266f2203b4bad7452bc0a5
* | | | | | am 80f934af: Add comKeyStyleSatoshi Kataoka2013-09-191-0/+7
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit '80f934af540178b1d1581306b401d8b1cbe9698f': Add comKeyStyle
| * | | | | Add comKeyStyleSatoshi Kataoka2013-09-191-0/+7
| |/ / / / | | | | | | | | | | | | | | | | | | | | Bug: 10822107 Change-Id: I411a2427e759e83366bbf7a525b9ab8a1ab3144d
* | | | | am 7ba78687: Merge "Add Ver4DictDecoder."Jean Chalard2013-09-198-193/+482
|\| | | | | | | | | | | | | | | | | | | | | | | | * commit '7ba78687635109e3689d8b86daeb9d9500559197': Add Ver4DictDecoder.
| * | | | Merge "Add Ver4DictDecoder."Jean Chalard2013-09-198-193/+482
| |\ \ \ \
| | * | | | Add Ver4DictDecoder.Yuichiro Hanada2013-09-198-193/+482
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Bug: 9618601 Change-Id: I43c5840505c6a847aaf4893a400392ccd45903c0
* | | | | | am 11ce0545: Merge "Fix hitbox of emoji key"Satoshi Kataoka2013-09-191-1/+1
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit '11ce0545ee27cca29d16a759bd70e8a2b89c50e0': Fix hitbox of emoji key
| * | | | | Merge "Fix hitbox of emoji key"Satoshi Kataoka2013-09-191-1/+1
| |\ \ \ \ \ | | |/ / / / | |/| | | |
| | * | | | Fix hitbox of emoji keySatoshi Kataoka2013-09-191-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Bug: 10780368 Change-Id: If10c18fdb0e7f0b0460a721d55001ab0fef28664
* | | | | | am ff493744: Merge "Quit skipping user history dictionary for gesture."Keisuke Kuroyanagi2013-09-182-14/+18
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit 'ff493744a3f3593f9a8c78e87d7ba813759e46b6': Quit skipping user history dictionary for gesture.
| * | | | | Merge "Quit skipping user history dictionary for gesture."Keisuke Kuroyanagi2013-09-192-14/+18
| |\ \ \ \ \
| | * | | | | Quit skipping user history dictionary for gesture.Keisuke Kuroyanagi2013-09-192-14/+18
| | | |_|/ / | | |/| | | | | | | | | | | | | | | | | | | | | Bug: 6669677 Change-Id: Id4344f2a30e9827f210055d6c65ee7776d3a63e3
* | | | | | am 6f68b736: Merge "Fix an off-by-one error."Jean Chalard2013-09-181-7/+5
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit '6f68b736f6cfa9f962facf5bccb620e732fcf518': Fix an off-by-one error.
| * | | | | Merge "Fix an off-by-one error."Jean Chalard2013-09-191-7/+5
| |\ \ \ \ \ | | |_|/ / / | |/| | | |
| | * | | | Fix an off-by-one error.Jean Chalard2013-09-191-7/+5
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | These variables were meant to represent the (x,y) coordinate of the last pixel of the grid, to avoid going one pixel too far. But the last pixel of the grid, of course, has coord (width - 1, height - 1). This bug only ever happens in a rare case because to reproduce, it needs the right (resp. bottom) coordinate of the rightmost (resp. bottommost) plus the threshold plus half the grid width (resp. height) to be exactly the number of pixels of the grid, which is pretty unlikely... unless there are more tiles in the grid than pixels on the screen, in which case the grid width is 1 and this becomes likely. This fixes the fencepost error and renames the variables to clarify their meaning. Bug: 10537485 Change-Id: Iecfe2c0f29ee17776ee2cceaa4b1db722276b1f3
* | | | | | am 284e73bd: Merge "Show emoji key on PC layout"Satoshi Kataoka2013-09-182-6/+6
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit '284e73bd419779608e6b8c91dd0edde151d75a4d': Show emoji key on PC layout
| * | | | | Merge "Show emoji key on PC layout"Satoshi Kataoka2013-09-192-6/+6
| |\ \ \ \ \
| | * | | | | Show emoji key on PC layoutSatoshi Kataoka2013-09-192-6/+6
| | | |/ / / | | |/| | | | | | | | | | | | | | | | | | | | | Bug: 10812167 Change-Id: Ie1e22a1651f8ec40e4078c01d161d6c113de582e
* | | | | | am 142d68cf: Disable Nepali layouts temporarily per product callKen Wakasa2013-09-181-2/+4
|\| | | | | | |_|_|/ / |/| | | | | | | | | | | | | | * commit '142d68cfd034d452c8119c014b55d199efdeae52': Disable Nepali layouts temporarily per product call
| * | | | Disable Nepali layouts temporarily per product callKen Wakasa2013-09-191-2/+4
| |/ / / | | | | | | | | | | | | | | | | | | | | bug: 6910787 bug: 9833890 Change-Id: Id58cdf117d145c03c96f8737a12bb1b11bd4e636
* | | | am 7635ada2: Merge "Fix test in SubtypeLocaleUtilsTests"Satoshi Kataoka2013-09-181-21/+21
|\| | | | | | | | | | | | | | | | | | | * commit '7635ada2463730ab9e356922bb21cf5cf2a2716e': Fix test in SubtypeLocaleUtilsTests
| * | | Merge "Fix test in SubtypeLocaleUtilsTests"Satoshi Kataoka2013-09-191-21/+21
| |\ \ \ | | |/ / | |/| |
| | * | Fix test in SubtypeLocaleUtilsTestsSatoshi Kataoka2013-09-191-21/+21
| | | | | | | | | | | | | | | | Change-Id: I4f7bf70ec7a0a67ad5d2129afed314b1b1a93a6c
* | | | am 86780628: Merge "Fix an NPE."Jean Chalard2013-09-181-1/+2
|\| | | | | | | | | | | | | | | | | | | * commit '8678062853291f46ea0b994375b251b6604c42a6': Fix an NPE.
| * | | Merge "Fix an NPE."Jean Chalard2013-09-181-1/+2
| |\ \ \
| | * | | Fix an NPE.Jean Chalard2013-09-181-1/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Apparently, it is possible that File#getPath() returns null. In this case, we'll have a null AssetFileAddress and an NPE later down the road. Bug: 9944824 Change-Id: Id6ceac1cb55439660f9811cf0fe3b574200d5a20
* | | | | am 08bc97f8: Merge "Allow double-space-to-period after a plus char"Jean Chalard2013-09-182-4/+3
|\| | | | | | | | | | | | | | | | | | | | | | | | * commit '08bc97f86fd82b51a59e1d0c6532b093c54dd3b5': Allow double-space-to-period after a plus char