aboutsummaryrefslogtreecommitdiffstats
path: root/java (follow)
Commit message (Collapse)AuthorAgeFilesLines
...
* | | | | | | | am 5c057b32: Merge "Fix unit tests."Satoshi Kataoka2013-08-081-0/+4
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit '5c057b32414fab5f5d8267f8fc8b4230b54d4cca': Fix unit tests.
| * | | | | | | Merge "Fix unit tests."Satoshi Kataoka2013-08-081-0/+4
| |\ \ \ \ \ \ \ | | |/ / / / / / | |/| | | | | |
| | * | | | | | Fix unit tests.Yuichiro Hanada2013-08-081-0/+4
| | | |_|_|_|/ | | |/| | | | | | | | | | | | | | | | | | Change-Id: Ic0013089625e112aaccc888d462330640ef7cc6f
* | | | | | | am 96b444d4: Merge "Remove processMotionEvent from MoreKeysKeyboardView"Tadashi G. Takaoka2013-08-084-19/+8
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit '96b444d4292f0834c94b8d56ae124a6d6a947bd3': Remove processMotionEvent from MoreKeysKeyboardView
| * | | | | | Merge "Remove processMotionEvent from MoreKeysKeyboardView"Tadashi G. Takaoka2013-08-084-19/+8
| |\ \ \ \ \ \ | | |/ / / / / | |/| | | | |
| | * | | | | Remove processMotionEvent from MoreKeysKeyboardViewTadashi G. Takaoka2013-08-084-19/+8
| | | |/ / / | | |/| | | | | | | | | | | | | | | Change-Id: I5373df4a7c82f964f99acf70325bba8702111a75
* | | | | | am 1181c5ac: Merge "Fix to follow the field naming conventions."Satoshi Kataoka2013-08-081-3/+3
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit '1181c5acbc6bd8834551d8fadca55d41c886a6d8': Fix to follow the field naming conventions.
| * | | | | Merge "Fix to follow the field naming conventions."Satoshi Kataoka2013-08-081-3/+3
| |\ \ \ \ \ | | |_|_|_|/ | |/| | | |
| | * | | | Fix to follow the field naming conventions.Yuichiro Hanada2013-08-081-3/+3
| | | | | | | | | | | | | | | | | | | | | | | | Change-Id: I9b41b5f34e93a3f291a352cd85c5ac257beaa9ab
* | | | | | am d7b76727: Merge "Make user and contacts dict use ver3 format."Keisuke Kuroyanagi2013-08-081-3/+2
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit 'd7b76727b9411a003c66182af20617afd38edde5': Make user and contacts dict use ver3 format.
| * | | | | Merge "Make user and contacts dict use ver3 format."Keisuke Kuroyanagi2013-08-081-3/+2
| |\ \ \ \ \ | | |_|_|_|/ | |/| | | |
| | * | | | Make user and contacts dict use ver3 format.Keisuke Kuroyanagi2013-08-081-3/+2
| | | |/ / | | |/| | | | | | | | | | | | | | | | | Bug: 6669677 Change-Id: I6a20eed2c8afdd1c16ada5bf85067864c7cd2a7f
* | | | | am 769aefe0: Merge "Increase CHAR_LIMIT to 29 to accommodate German."Jean Chalard2013-08-071-1/+1
|\| | | | | | | | | | | | | | | | | | | | | | | | * commit '769aefe00eac18240c70ad37ffd5b6b4fde81390': Increase CHAR_LIMIT to 29 to accommodate German.
| * | | | Increase CHAR_LIMIT to 29 to accommodate German.Jean Chalard2013-08-081-1/+1
| |/ / / | | | | | | | | | | | | | | | | Bug: 10221961 Change-Id: Ib9967f7a258f499d24294da16a9191cc2dda4a32
* | | | am 4456d1a8: Merge "Have double-space-to-period cancel leave a single space"Jean Chalard2013-08-071-2/+4
|\| | | | | | | | | | | | | | | | | | | * commit '4456d1a8c18a4c674c8394570550f2977f5f117b': Have double-space-to-period cancel leave a single space
| * | | Merge "Have double-space-to-period cancel leave a single space"Jean Chalard2013-08-081-2/+4
| |\ \ \ | | |/ / | |/| |
| | * | Have double-space-to-period cancel leave a single spaceJean Chalard2013-08-081-2/+4
| | | | | | | | | | | | | | | | | | | | Bug: 8911898 Change-Id: Ifb4bb63c14dc960d0a53f1511908830093cca012
| * | | Merge "Import translations. DO NOT MERGE"Baligh Uddin2013-08-0751-103/+203
| |\ \ \ | | |_|/ | |/| |
| | * | Import translations. DO NOT MERGEBaligh Uddin2013-08-0651-103/+203
| | | | | | | | | | | | | | | | | | | | Change-Id: Idb528323e197ce6e2de7ec3fe5e764fffc72e53e Auto-generated-cl: translation import
* | | | Merge "Import translations. DO NOT MERGE" into jb-ub-latinimegoogleBaligh Uddin2013-08-0751-107/+205
|\ \ \ \
| * | | | Import translations. DO NOT MERGEBaligh Uddin2013-08-0651-107/+205
| | | | | | | | | | | | | | | | | | | | | | | | | Change-Id: I1a07b23ba76af93435bc8305c20edfd23c51114c Auto-generated-cl: translation import
* | | | | am 083a40b2: Merge "Move createKeyboardSetForSpellChecker to ↵Tadashi G. Takaoka2013-08-072-45/+22
|\ \ \ \ \ | | |/ / / | |/| | | | | | | | | | | | | | | | | | | | | | | AndroidSpellCheckService" * commit '083a40b291dbd4d63aabbcb4a1dc1ca27bb46863': Move createKeyboardSetForSpellChecker to AndroidSpellCheckService
| * | | | Merge "Move createKeyboardSetForSpellChecker to AndroidSpellCheckService"Tadashi G. Takaoka2013-08-072-45/+22
| |\ \ \ \
| | * | | | Move createKeyboardSetForSpellChecker to AndroidSpellCheckServiceTadashi G. Takaoka2013-08-072-45/+22
| | | | | | | | | | | | | | | | | | | | | | | | Change-Id: I4a9065e703e98ffed50f2a6d76ace938dfc26ddf
* | | | | | am 15b80c4e: Merge "Add ResouceUtils.getDefaultKeyboardHeight"Tadashi G. Takaoka2013-08-074-54/+46
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit '15b80c4ec264d8fcc457988bc695453093e6f577': Add ResouceUtils.getDefaultKeyboardHeight
| * | | | | Merge "Add ResouceUtils.getDefaultKeyboardHeight"Tadashi G. Takaoka2013-08-074-54/+46
| |\| | | |
| | * | | | Add ResouceUtils.getDefaultKeyboardHeightTadashi G. Takaoka2013-08-074-54/+46
| | | | | | | | | | | | | | | | | | | | | | | | Change-Id: I377f6a83ec86b0345b170e7ad995d4577220d0ad
* | | | | | am 2cb9a143: Merge "Make key label from supplementary code point"Tadashi G. Takaoka2013-08-071-2/+7
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit '2cb9a1434ea1d22a37f1396b20670c4b0589c120': Make key label from supplementary code point
| * | | | | Merge "Make key label from supplementary code point"Tadashi G. Takaoka2013-08-071-2/+7
| |\ \ \ \ \
| | * | | | | Make key label from supplementary code pointTadashi G. Takaoka2013-08-071-2/+7
| | | |_|_|/ | | |/| | | | | | | | | | | | | | | Change-Id: I0a7834b5c4908a2116a8772cf85985ab8bed7091
* | | | | | am c05b3b56: Merge "Add a session for the personalization dictionary"Satoshi Kataoka2013-08-076-29/+93
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit 'c05b3b56cc6af7ae33983792b8601c869d2ff4aa': Add a session for the personalization dictionary
| * | | | | Merge "Add a session for the personalization dictionary"Satoshi Kataoka2013-08-076-29/+93
| |\ \ \ \ \ | | |_|/ / / | |/| | | |
| | * | | | Add a session for the personalization dictionarySatoshi Kataoka2013-08-076-29/+93
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Bug: 9429906 Bug: 4192129 Change-Id: I361ab380edeee5a8a8b364df3f9f4ab202b79105
* | | | | | am 7de0331a: Merge "Remove orientation member from KeyboardId"Tadashi G. Takaoka2013-08-074-21/+9
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit '7de0331a19bbe07a2689d7b49ae9a798a9451c2c': Remove orientation member from KeyboardId
| * | | | | Remove orientation member from KeyboardIdTadashi G. Takaoka2013-08-074-21/+9
| | |/ / / | |/| | | | | | | | | | | | | Change-Id: I2c16134a24088dbc30b74ae7c5bc578a9d84a960
* | | | | am 0f47d516: Merge "Reword "No language""Jean Chalard2013-08-062-16/+79
|\| | | | | | | | | | | | | | | | | | | | | | | | * commit '0f47d5163dabb7b4205826dd2d829a55c8621577': Reword "No language"
| * | | | Merge "Reword "No language""Jean Chalard2013-08-062-16/+79
| |\ \ \ \
| | * | | | Reword "No language"Jean Chalard2013-08-052-16/+79
| | |/ / / | | | | | | | | | | | | | | | | | | | | Bug: 10064334 Change-Id: Ie4e6c333566eee9000fa5c8e59e9df8b9b56a5b3
* | | | | am 8ba87982: Merge "Consolidate forwardTouchEvent with dispatchTouchEvent"Tadashi G. Takaoka2013-08-061-14/+10
|\| | | | | | | | | | | | | | | | | | | | | | | | * commit '8ba8798290388ed740f0ca4f01e74b11847b6d44': Consolidate forwardTouchEvent with dispatchTouchEvent
| * | | | Merge "Consolidate forwardTouchEvent with dispatchTouchEvent"Tadashi G. Takaoka2013-08-061-14/+10
| |\ \ \ \
| | * | | | Consolidate forwardTouchEvent with dispatchTouchEventTadashi G. Takaoka2013-08-061-14/+10
| | | |_|/ | | |/| | | | | | | | | | | | Change-Id: Ib73962acff72be0a78a3565028572ad694fb8501
* | | | | am cc38bfb5: Merge "Add emoji icon and code as a groundwork"Tadashi G. Takaoka2013-08-0618-1/+29
|\| | | | | | | | | | | | | | | | | | | | | | | | * commit 'cc38bfb5d3bc48fae1a789d35441e96fd3d0d63c': Add emoji icon and code as a groundwork
| * | | | Merge "Add emoji icon and code as a groundwork"Tadashi G. Takaoka2013-08-0618-1/+29
| |\ \ \ \ | | |/ / / | |/| | |
| | * | | Add emoji icon and code as a groundworkTadashi G. Takaoka2013-08-0618-1/+29
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The emoji switching key icon asset should be updated. The icons in this change are just borrowed from Hangout. Bug: 10179862 Bug: 6370846 Change-Id: Icea26d2cf2ac6a6df9beb4c98f646dbe309bdcd9
* | | | | am daab5caf: Merge "Remove unnecessary suggestion strip container"Tadashi G. Takaoka2013-08-0611-57/+25
|\| | | | | |_|_|/ |/| | | | | | | | | | | * commit 'daab5cafd288da696e9e9776eb0da8bd0863dcf7': Remove unnecessary suggestion strip container
| * | | Remove unnecessary suggestion strip containerTadashi G. Takaoka2013-08-0611-57/+25
| |/ / | | | | | | | | | Change-Id: I3710e1fe1574c0f69f7f448619e939fb45e9b8d3
* | | am 20239759: Merge "Small optimization for readability"Tadashi G. Takaoka2013-08-051-31/+32
|\| | | | | | | | | | | | | | * commit '202397598856d924c02c8f963425f224a2d9547f': Small optimization for readability
| * | Merge "Small optimization for readability"Tadashi G. Takaoka2013-08-061-31/+32
| |\ \
| | * | Small optimization for readabilityTadashi G. Takaoka2013-08-051-31/+32
| | | | | | | | | | | | | | | | Change-Id: I8a24fc0981e58a7dc30f0577c4415a1d3bc5ed4d
* | | | am f8d162c3: Merge "Fix keyboard caching bug for testing"Tadashi G. Takaoka2013-08-051-1/+1
|\| | | | | | | | | | | | | | | | | | | * commit 'f8d162c315e90a2944f12255db43e55c2a22ad35': Fix keyboard caching bug for testing