aboutsummaryrefslogtreecommitdiffstats
path: root/java (follow)
Commit message (Collapse)AuthorAgeFilesLines
* am 001c186b: am ec44b04b: am 0c2dc410: Merge "Clean up Keyboard and ↵Tadashi G. Takaoka2014-08-077-47/+79
|\ | | | | | | | | | | | | KeyboardView theme" into lmp-dev * commit '001c186b2e5c7b190ccd558e66c91df7d48a1f32': Clean up Keyboard and KeyboardView theme
| * am ec44b04b: am 0c2dc410: Merge "Clean up Keyboard and KeyboardView theme" ↵Tadashi G. Takaoka2014-08-077-47/+79
| |\ | | | | | | | | | | | | | | | | | | into lmp-dev * commit 'ec44b04b04b2f0f944be57671dfadaddb3bd4c3e': Clean up Keyboard and KeyboardView theme
| | * Merge "Clean up Keyboard and KeyboardView theme" into lmp-devTadashi G. Takaoka2014-08-057-47/+79
| | |\
| | | * Clean up Keyboard and KeyboardView themeTadashi G. Takaoka2014-08-077-47/+79
| | | | | | | | | | | | | | | | Change-Id: I745ed21b88fbdb1f3a16a71ebf3461d909ae448e
| | * | (DO NOT MERGE) Remove preliminary keyboards from LTadashi G. Takaoka2014-08-071-0/+16
| | |/ | | | | | | | | | Change-Id: I9e1209b80b8919669b4496102b967220ab16146b
* | | am 85c29bd2: am bfcb3323: am e19c520b: Align space key icon to bottom of a keyTadashi G. Takaoka2014-08-074-3/+14
|\| | | | | | | | | | | | | | * commit '85c29bd2bb08ac3827bb4b87645bbe6319cfddd5': Align space key icon to bottom of a key
| * | am bfcb3323: am e19c520b: Align space key icon to bottom of a keyTadashi G. Takaoka2014-08-074-3/+14
| |\| | | | | | | | | | | | | * commit 'bfcb3323d2d7165984038f9eff3e49bc824a6d0f': Align space key icon to bottom of a key
| | * Align space key icon to bottom of a keyTadashi G. Takaoka2014-08-074-3/+14
| | | | | | | | | | | | | | | | | | | | | | | | | | | The Key.keyLabelFlags's flag "alignButtom" (misspelled) has been removed by Iae3cd66744. This CL re-introduce the same flag with "alignIconToBottom". Bug: 16803172 Change-Id: I412590f394c6ca9b36358d6acfe8675071403bdd
* | | am 95d2c4fb: am d5e4e367: am 3316dcd4: Merge "Revert "Introduce onEvent() to ↵Ken Wakasa2014-08-071-26/+17
|\| | | | | | | | | | | | | | | | | | | | improve testability"" into lmp-dev * commit '95d2c4fbedb0dd9139e12e8c427c957eeaa106b2': Revert "Introduce onEvent() to improve testability"
| * | am d5e4e367: am 3316dcd4: Merge "Revert "Introduce onEvent() to improve ↵Ken Wakasa2014-08-071-26/+17
| |\| | | | | | | | | | | | | | | | | | | testability"" into lmp-dev * commit 'd5e4e367f21407da7a5f62a18e601957b07b6f4d': Revert "Introduce onEvent() to improve testability"
| | * Merge "Revert "Introduce onEvent() to improve testability"" into lmp-devKen Wakasa2014-08-051-26/+17
| | |\
| | | * Revert "Introduce onEvent() to improve testability"Ken Wakasa2014-08-061-26/+17
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This reverts commit ef74e737f580f7ac0b3bd70d6255dde3c87d9078. Apparently, this CL broke several unit tests. Change-Id: I86cf5f1ffb0214707afe99ee97f92ba8c5157f3f
| * | | Merge "Import translations. DO NOT MERGE"Geoff Mendal2014-08-051-25/+25
| |\ \ \
| | * | | Import translations. DO NOT MERGEGeoff Mendal2014-08-061-25/+25
| | | | | | | | | | | | | | | | | | | | | | | | | Change-Id: I649fa8860a39804aff07aaf6c3c5cb09a282f7cf Auto-generated-cl: translation import
| * | | | Merge "Import translations. DO NOT MERGE"Geoff Mendal2014-08-061-8/+8
| |\ \ \ \
| | * | | | Import translations. DO NOT MERGEGeoff Mendal2014-08-061-8/+8
| | |/ / / | | | | | | | | | | | | | | | | | | | | Change-Id: I88c0d488ee62e184b44b81073a9fa5343ace2f77 Auto-generated-cl: translation import
* | | | | Merge "Import translations. DO NOT MERGE" into jb-ub-latinimegoogleGeoff Mendal2014-08-051-25/+25
|\ \ \ \ \
| * | | | | Import translations. DO NOT MERGEGeoff Mendal2014-08-061-25/+25
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Change-Id: Ib34f1de1993c3e31f1f64b7476a9517feb511bdd Auto-generated-cl: translation import
* | | | | | am 28b8f349: am 94a568a8: am 868395c6: Merge "Mark hind_compact layout as ↵Tadashi G. Takaoka2014-08-061-3/+1
|\ \ \ \ \ \ | | |/ / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | completed" into lmp-dev * commit '28b8f349dfce8aa41a5cefd0d51ed8c7e01f8774': Mark hind_compact layout as completed
| * | | | | am 94a568a8: am 868395c6: Merge "Mark hind_compact layout as completed" into ↵Tadashi G. Takaoka2014-08-061-3/+1
| |\ \ \ \ \ | | | |_|/ / | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | lmp-dev * commit '94a568a8635d6362398f059fdea662b9d9165267': Mark hind_compact layout as completed
| | * | | | Merge "Mark hind_compact layout as completed" into lmp-devTadashi G. Takaoka2014-08-041-3/+1
| | |\ \ \ \
| | | * | | | Mark hind_compact layout as completedTadashi G. Takaoka2014-08-061-3/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Bug: 13779052 Change-Id: If87ee2edbcfec4ad0444d13c7bd502df88cac89a
* | | | | | | am 78d9b7c4: am bc043c31: am 1f3d89c2: Revert "[HS1] Save some data in ↵Jean Chalard2014-08-061-29/+7
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | startInputView" * commit '78d9b7c4a03ecfcd72569b8304b9156119e9eb29': Revert "[HS1] Save some data in startInputView"
| * | | | | | am bc043c31: am 1f3d89c2: Revert "[HS1] Save some data in startInputView"Jean Chalard2014-08-061-29/+7
| |\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit 'bc043c31ded2dd48008b185503475e440f302aa0': Revert "[HS1] Save some data in startInputView"
| | * | | | | Revert "[HS1] Save some data in startInputView"Jean Chalard2014-08-061-29/+7
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This reverts commit f1accd4f04b13f764e1ffa7c7964e4b7c41ddf4b. Bug: 16830599 Change-Id: I4c9367f742b8ee8463920e91263b05c2195f8480
* | | | | | | am bd38799e: am fe807696: am 772a8019: Revert "[HS2] Move more stuff to ↵Jean Chalard2014-08-062-58/+51
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | onStartInput" * commit 'bd38799e27dd2c43444b84a47dcb1228b4932fb5': Revert "[HS2] Move more stuff to onStartInput"
| * | | | | | am fe807696: am 772a8019: Revert "[HS2] Move more stuff to onStartInput"Jean Chalard2014-08-062-58/+51
| |\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit 'fe807696566a5975b4d0932c72a05593a98f13d3': Revert "[HS2] Move more stuff to onStartInput"
| | * | | | | Revert "[HS2] Move more stuff to onStartInput"Jean Chalard2014-08-062-58/+51
| | |/ / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This reverts commit 93b00a314e307cb257abf1cab88cb24d57ff3885. Bug: 16830599 Change-Id: I955e7da77978c3a495660aa29247e010d489c36b
* | | | | | am c8b860e3: am 571320ad: am 5dee1fd6: Merge "Add dedicated background for ↵Tadashi G. Takaoka2014-08-066-67/+52
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | custom action label key" into lmp-dev * commit 'c8b860e3e106f714751143a1857408f1a2cb6259': Add dedicated background for custom action label key
| * | | | | am 571320ad: am 5dee1fd6: Merge "Add dedicated background for custom action ↵Tadashi G. Takaoka2014-08-066-67/+52
| |\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | label key" into lmp-dev * commit '571320ad90b2ac2bb9fa77cf6700feec3bc4030a': Add dedicated background for custom action label key
| | * | | | Merge "Add dedicated background for custom action label key" into lmp-devTadashi G. Takaoka2014-08-056-67/+52
| | |\ \ \ \ | | | |_|_|/ | | |/| | |
| | | * | | Add dedicated background for custom action label keyTadashi G. Takaoka2014-08-066-67/+52
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Bug: 15526978 Change-Id: Ia73d825c7e00097018822704e61272d0e448f39a
* | | | | | am 09ae6b91: am 922411a7: am ef74e737: Introduce onEvent() to improve ↵Jean Chalard2014-08-061-17/+26
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | testability * commit '09ae6b9119a5a86165738cba94ae40c059d9f600': Introduce onEvent() to improve testability
| * | | | | am 922411a7: am ef74e737: Introduce onEvent() to improve testabilityJean Chalard2014-08-061-17/+26
| |\| | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit '922411a70804921e69df0ef477f6b007e83d5692': Introduce onEvent() to improve testability
| | * | | | Introduce onEvent() to improve testabilityJean Chalard2014-08-061-17/+26
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | ...and prepare for the future Change-Id: Ieed96ab552993fd148e80b9c3355f1b569bd716f
* | | | | | am 43cf1ae7: am f66b0e5f: am c08c5064: Merge "Fix an NPE when running with ↵Jean Chalard2014-08-061-4/+4
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Keep." into lmp-dev * commit '43cf1ae7bb2e2e5c917b27ce9669ae12e547c15f': Fix an NPE when running with Keep.
| * | | | | am f66b0e5f: am c08c5064: Merge "Fix an NPE when running with Keep." into ↵Jean Chalard2014-08-061-4/+4
| |\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | lmp-dev * commit 'f66b0e5f71be61e496bd8b77f04384ea14b75da7': Fix an NPE when running with Keep.
| | * | | | Merge "Fix an NPE when running with Keep." into lmp-devJean Chalard2014-08-051-4/+4
| | |\ \ \ \ | | | |/ / / | | |/| | |
| | | * | | Fix an NPE when running with Keep.Jean Chalard2014-08-061-4/+4
| | | | | | | | | | | | | | | | | | | | | | | | Change-Id: Ie703e14bff42d34608f11d0c2d7758950b84c88c
* | | | | | am 0bfcb89a: am e8668c2e: am aa3ff194: Merge "Use add icon for add custom ↵Tadashi G. Takaoka2014-08-066-4/+28
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | input style menu" into lmp-dev * commit '0bfcb89ac4202fb7d53f5c82ec27f8f87fa0cea1': Use add icon for add custom input style menu
| * | | | | am e8668c2e: am aa3ff194: Merge "Use add icon for add custom input style ↵Tadashi G. Takaoka2014-08-066-4/+28
| |\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | menu" into lmp-dev * commit 'e8668c2ee2dac5168e1af8484fb9ae2a0534b442': Use add icon for add custom input style menu
| | * | | | Merge "Use add icon for add custom input style menu" into lmp-devTadashi G. Takaoka2014-08-056-4/+28
| | |\ \ \ \ | | | |/ / / | | |/| | |
| | | * | | Use add icon for add custom input style menuTadashi G. Takaoka2014-08-066-4/+28
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Bug: 16805043 Change-Id: I9730a6aa5d761924457edaabcee25db930e20f02
* | | | | | am d393cf06: am 98e27483: am 9273f383: [HS3] Fix a bug on ICSJean Chalard2014-08-062-0/+23
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit 'd393cf065ab042cc78f7a51010161425080afd1d': [HS3] Fix a bug on ICS
| * | | | | am 98e27483: am 9273f383: [HS3] Fix a bug on ICSJean Chalard2014-08-062-0/+23
| |\| | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit '98e2748363355d2286215c798225d529f3a1cb34': [HS3] Fix a bug on ICS
| | * | | | [HS3] Fix a bug on ICSJean Chalard2014-08-062-0/+23
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | There is a bug in ICS where the input connection won't take any writing commands after rotation until the cursor moves. This fixes it by wiggling the cursor position once before trying to do anything. Bug: 16810766 Change-Id: Ib14c70bd0550420cecfa86dea501d13a1a91e296
* | | | | | am cf66902f: am 0978aa71: am 50c12c83: Merge "[HS2] Move more stuff to ↵Jean Chalard2014-08-062-51/+62
|\| | | | | | |_|_|/ / |/| | | | | | | | | | | | | | | | | | | | | | | | onStartInput" into lmp-dev * commit 'cf66902f69911cc80da5b3a9e39634b0bc9ca343': [HS2] Move more stuff to onStartInput
| * | | | am 0978aa71: am 50c12c83: Merge "[HS2] Move more stuff to onStartInput" into ↵Jean Chalard2014-08-062-51/+62
| |\| | | | | |_|/ | |/| | | | | | | | | | | | | | | | | | lmp-dev * commit '0978aa71ea91583c0b8d7e2588549fbb56953e7e': [HS2] Move more stuff to onStartInput
| | * | [HS2] Move more stuff to onStartInputJean Chalard2014-08-062-51/+62
| | |/ | | | | | | | | | | | | Bug: 8152758 Change-Id: Ida05df7d151ceb582886e2ad06c5bdf0b59978ee
* | | am a58d78ec: am 9cca3c83: am a262144d: Add ViewCompatUtils.setElevationTadashi G. Takaoka2014-08-051-0/+10
|\| | | | | | | | | | | | | | * commit 'a58d78ec896b0d8bb80e9ab028af8766defd0261': Add ViewCompatUtils.setElevation