aboutsummaryrefslogtreecommitdiffstats
path: root/java (follow)
Commit message (Collapse)AuthorAgeFilesLines
* am da4d87ff: am 2dcb6337: Merge "Make SparseTable have multiple content tables."Ken Wakasa2013-10-093-57/+87
|\ | | | | | | | | * commit 'da4d87ff000b594ede7cdb7bcb10e9272484f467': Make SparseTable have multiple content tables.
| * am 2dcb6337: Merge "Make SparseTable have multiple content tables."Ken Wakasa2013-10-023-57/+87
| |\ | | | | | | | | | | | | * commit '2dcb63375d9f6dbdbcd1334571f6e80b4d487771': Make SparseTable have multiple content tables.
| | * Merge "Make SparseTable have multiple content tables."Ken Wakasa2013-10-023-57/+87
| | |\
| | | * Make SparseTable have multiple content tables.Yuichiro Hanada2013-10-023-57/+87
| | | | | | | | | | | | | | | | | | | | Bug: 10920165 Change-Id: Ie9008452ee292fb0b1fec66e2ffed228c4af6c3e
* | | | am 93c2fa8d: am cd7422f4: Merge "Fix a pernicious bug with caps."Jean Chalard2013-10-092-0/+3
|\| | | | | | | | | | | | | | | | | | | * commit '93c2fa8d3e65ab91898760e64636d5d10942ea17': Fix a pernicious bug with caps.
| * | | am cd7422f4: Merge "Fix a pernicious bug with caps."Jean Chalard2013-10-022-0/+3
| |\| | | | | | | | | | | | | | | | | | * commit 'cd7422f4dfe2bd5708acc6305a4f6dc83767685a': Fix a pernicious bug with caps.
| | * | Merge "Fix a pernicious bug with caps."Jean Chalard2013-10-022-0/+3
| | |\ \
| | | * | Fix a pernicious bug with caps.Jean Chalard2013-10-022-0/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | What's happening here is, setAlphabetKeyboard sets the keyboard to AUTOMATIC_SHIFTED and updates the keyboard, then restoring the keyboard old state sets it back to UNSHIFTED without updating it. When we finally know what the correct value is, we try to set it to UNSHIFTED, but since that's already the currently recorded state, it skips updating the keyboard forever. The solution is to avoid setting the shift state without updating the keyboard. Bug: 10948582 Change-Id: Ic8670401e378f8284e851281f91a9ad93eac8e90
* | | | | am 85eba056: am c5182c9a: Correspond to the security related API change for ↵Satoshi Kataoka2013-10-094-2/+30
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | PreferenceActivity * commit '85eba056f2326f5e3015e4153123d40b6f7cd98f': Correspond to the security related API change for PreferenceActivity
| * | | | am c5182c9a: Correspond to the security related API change for ↵Satoshi Kataoka2013-10-024-2/+30
| |\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | PreferenceActivity * commit 'c5182c9a4ae66e75df8c959bf625d08ef99f81d2': Correspond to the security related API change for PreferenceActivity
| | * | | Correspond to the security related API change for PreferenceActivitySatoshi Kataoka2013-10-024-2/+30
| | | |/ | | |/| | | | | | | | | | | | | Bug: 10118761 Change-Id: Ia7d1c6c526dae849f447c26387e96a4fb4d6042f
* | | | am 0874939e: am a8b838b4: Merge "Fix a test and crash with a better error ↵Jean Chalard2013-10-092-2/+4
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | message when reading" * commit '0874939e1086baceba9c1f94ca98a7a5837e7813': Fix a test and crash with a better error message when reading
| * | | am a8b838b4: Merge "Fix a test and crash with a better error message when ↵Jean Chalard2013-10-012-2/+4
| |\| | | | | | | | | | | | | | | | | | | | | | | | | | reading" * commit 'a8b838b473d4927e6f0483912c45fba929dfb402': Fix a test and crash with a better error message when reading
| | * | Merge "Fix a test and crash with a better error message when reading"Jean Chalard2013-10-022-2/+4
| | |\ \
| | | * | Fix a test and crash with a better error message when readingJean Chalard2013-10-022-2/+4
| | | |/ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | When there are too many bigrams, we stop reading the file, so the file pointer is in an inconsistent place. This means we have no idea what's going to happen next. It's better to crash right away. Change-Id: Id3b7b78cbe4fda3493b3c9c46758763e1ab5f6a3
* | | | am 319eb1c3: am 77144a64: Merge "Retain Emoji Keyboard after rotation"Satoshi Kataoka2013-10-092-4/+2
|\| | | | | | | | | | | | | | | | | | | * commit '319eb1c363a0d443cace14ee41c575a67ecfc93a': Retain Emoji Keyboard after rotation
| * | | am 77144a64: Merge "Retain Emoji Keyboard after rotation"Satoshi Kataoka2013-10-012-4/+2
| |\| | | | | | | | | | | | | | | | | | * commit '77144a645f693fd0d73fd2cbe378997c7a339006': Retain Emoji Keyboard after rotation
| | * | Retain Emoji Keyboard after rotationSatoshi Kataoka2013-10-012-4/+2
| | | | | | | | | | | | | | | | | | | | Bug: 10612450 Change-Id: Ie0ae953958d2b0a0a4da651584f1e28b0ba38ae3
* | | | am 615509cf: am 9d763910: Merge "Unfortunately, hide some broken "emoji"s"Satoshi Kataoka2013-10-093-26/+56
|\| | | | | | | | | | | | | | | | | | | * commit '615509cf27839e946280787cf27d8c091079b91b': Unfortunately, hide some broken "emoji"s
| * | | am 9d763910: Merge "Unfortunately, hide some broken "emoji"s"Satoshi Kataoka2013-10-013-26/+56
| |\| | | | | | | | | | | | | | | | | | * commit '9d763910580379d3e68b4559f91e655cf05f02a3': Unfortunately, hide some broken "emoji"s
| | * | Merge "Unfortunately, hide some broken "emoji"s"Satoshi Kataoka2013-10-013-26/+56
| | |\ \ | | | |/ | | |/|
| | | * Unfortunately, hide some broken "emoji"sSatoshi Kataoka2013-10-013-26/+56
| | | | | | | | | | | | | | | | | | | | Bug: 10923117 Change-Id: I27ba38e5f388cc15ae331fd05d63db4e4a41cbbf
* | | | am af75e48e: am 74577bed: Merge "Implement the heuristic for auto-commit."Jean Chalard2013-10-091-15/+4
|\| | | | | | | | | | | | | | | | | | | * commit 'af75e48efdc5be7d0b1c3d411017757454ed1799': Implement the heuristic for auto-commit.
| * | | am 74577bed: Merge "Implement the heuristic for auto-commit."Jean Chalard2013-10-011-15/+4
| |\| | | | | | | | | | | | | | | | | | * commit '74577bedb3bb0dabd0e661270f9da0c11c4b0f46': Implement the heuristic for auto-commit.
| | * | Merge "Implement the heuristic for auto-commit."Jean Chalard2013-10-011-15/+4
| | |\ \
| | | * | Implement the heuristic for auto-commit.Jean Chalard2013-10-011-15/+4
| | | | | | | | | | | | | | | | | | | | | | | | | Bug: 9059617 Change-Id: I066abf018df5aaeabf415425dd822ebe233e6008
* | | | | am 6f2830dc: am 2afa0e62: Merge "Fix a bug where gesture would delay update."Jean Chalard2013-10-091-2/+4
|\| | | | | | | | | | | | | | | | | | | | | | | | * commit '6f2830dcb91fd2d00088c7522c91a45e90a1f3e6': Fix a bug where gesture would delay update.
| * | | | am 2afa0e62: Merge "Fix a bug where gesture would delay update."Jean Chalard2013-10-011-2/+4
| |\| | | | | | | | | | | | | | | | | | | | | | | * commit '2afa0e621eab2ebd7e2bde344dd209308a75dcfc': Fix a bug where gesture would delay update.
| | * | | Merge "Fix a bug where gesture would delay update."Jean Chalard2013-10-011-2/+4
| | |\ \ \
| | | * | | Fix a bug where gesture would delay update.Jean Chalard2013-10-011-2/+4
| | | |/ / | | | | | | | | | | | | | | | Change-Id: I94c394f45f2717bc1a4b95692a5757c1e7179152
* | | | | am a9f5c55c: am 382094a7: Merge "Cleanup and remove redundant more keys on ↵Ken Wakasa2013-10-093-20/+107
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | phones" * commit 'a9f5c55ca2f075ed6923e0040fa66c07a5a37176': Cleanup and remove redundant more keys on phones
| * | | | am 382094a7: Merge "Cleanup and remove redundant more keys on phones"Ken Wakasa2013-10-013-20/+107
| |\| | | | | | | | | | | | | | | | | | | | | | | * commit '382094a784efb32ef9308542ef2f8d2c88ac96b2': Cleanup and remove redundant more keys on phones
| | * | | Merge "Cleanup and remove redundant more keys on phones"Ken Wakasa2013-10-013-20/+107
| | |\ \ \
| | | * | | Cleanup and remove redundant more keys on phonesKen Wakasa2013-10-013-20/+107
| | | | | | | | | | | | | | | | | | | | | | | | Change-Id: I419c3c119eb1e4d2e877c8c00564e46f40b6abc2
* | | | | | am 88c946af: am 194c6360: Merge "Swap keys: exclamation, question, period, ↵Ken Wakasa2013-10-093-20/+20
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | comma." * commit '88c946af0c8a8e07092be71a7b98957d021e499b': Swap keys: exclamation, question, period, comma.
| * | | | | am 194c6360: Merge "Swap keys: exclamation, question, period, comma."Ken Wakasa2013-10-013-20/+20
| |\| | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit '194c6360554f54d3dfa165427eadda2c7046a65e': Swap keys: exclamation, question, period, comma.
| | * | | | Merge "Swap keys: exclamation, question, period, comma."Ken Wakasa2013-10-013-20/+20
| | |\| | | | | | |/ / | | |/| |
| | | * | Swap keys: exclamation, question, period, comma.Ken Wakasa2013-10-013-20/+20
| | | | | | | | | | | | | | | | | | | | | | | | | bug: 11003945 Change-Id: If9ff0487ebbb1c25c8b13eaa55615255921c61c6
* | | | | am 1522e7be: am cc81a93b: Merge "Add skipPtNode to DictDecoders."Ken Wakasa2013-10-094-0/+50
|\| | | | | | | | | | | | | | | | | | | | | | | | * commit '1522e7be20ac53c3870d493e3a9fb7946edbbea4': Add skipPtNode to DictDecoders.
| * | | | am cc81a93b: Merge "Add skipPtNode to DictDecoders."Ken Wakasa2013-10-014-0/+50
| |\| | | | | | | | | | | | | | | | | | | | | | | * commit 'cc81a93b01cbcada13c3791fa5ba73a09ba7e092': Add skipPtNode to DictDecoders.
| | * | | Merge "Add skipPtNode to DictDecoders."Ken Wakasa2013-10-014-0/+50
| | |\ \ \ | | | |_|/ | | |/| |
| | | * | Add skipPtNode to DictDecoders.Yuichiro Hanada2013-10-014-0/+50
| | | | | | | | | | | | | | | | | | | | Change-Id: I042ff041b68572182c87dc87db6a6aa2bbbefc6c
* | | | | am 98da7cfc: am c2dda795: Tentatively revert inconsistent assetsSatoshi Kataoka2013-10-095-0/+1
|\| | | | | | | | | | | | | | | | | | | | | | | | * commit '98da7cfc0b9afc75db240d10c20f3360fe693320': Tentatively revert inconsistent assets
| * | | | am c2dda795: Tentatively revert inconsistent assetsSatoshi Kataoka2013-10-015-0/+1
| |\| | | | | | | | | | | | | | | | | | | | | | | * commit 'c2dda795af14f94db7b6cfc80cbc609c20406522': Tentatively revert inconsistent assets
| | * | | Tentatively revert inconsistent assetsSatoshi Kataoka2013-10-015-0/+1
| | | |/ | | |/| | | | | | | | | Change-Id: I90f0ffed57f0efa9f01adb969fd499e2dcd2a0dc
* | | | am db083a2b: am a4913994: Hide indication bar if only one pageSatoshi Kataoka2013-10-091-2/+3
|\| | | | | | | | | | | | | | | | | | | * commit 'db083a2b25d057f21a22333251ea0a78668e6326': Hide indication bar if only one page
| * | | am a4913994: Hide indication bar if only one pageSatoshi Kataoka2013-10-011-2/+3
| |\| | | | | | | | | | | | | | | | | | * commit 'a4913994c2904eefa861782966a288959b216713': Hide indication bar if only one page
| | * | Hide indication bar if only one pageSatoshi Kataoka2013-10-011-2/+3
| | | | | | | | | | | | | | | | | | | | Bug: 10923117 Change-Id: If81bf07ba2e7c4fff44a8832f98b4a393c15edc7
* | | | am d00e4865: am 126d758c: Merge "Quit blocking getSuggestion during GC."Keisuke Kuroyanagi2013-10-092-12/+21
|\| | | | | | | | | | | | | | | | | | | * commit 'd00e48656b02ff49fc834ed6762dc194d00b42ad': Quit blocking getSuggestion during GC.
| * | | am 126d758c: Merge "Quit blocking getSuggestion during GC."Keisuke Kuroyanagi2013-10-012-12/+21
| |\| | | | | | | | | | | | | | | | | | * commit '126d758c1e8db969ad1c9e5d801f3075e2061cc1': Quit blocking getSuggestion during GC.