aboutsummaryrefslogtreecommitdiffstats
path: root/java (follow)
Commit message (Collapse)AuthorAgeFilesLines
* am f6c2a0fe: am afa56511: Merge "Update string comments for translation"Alan Viverette2013-10-091-3/+3
|\ | | | | | | | | * commit 'f6c2a0fe59444eb85a7e658ce36bf40edd8605da': Update string comments for translation
| * am afa56511: Merge "Update string comments for translation"Alan Viverette2013-10-031-3/+3
| |\ | | | | | | | | | | | | * commit 'afa565119cd3e8fd7f92ee22033932fc8e8d47d4': Update string comments for translation
| | * Merge "Update string comments for translation"Alan Viverette2013-10-031-3/+3
| | |\
| | | * Update string comments for translationAlan Viverette2013-10-021-3/+3
| | | | | | | | | | | | | | | | | | | | BUG: 11042719,11021829 Change-Id: I27c80d1a2489843a16bd2b055d2ae81797492d1c
* | | | am f28ca53b: am 864ee881: Merge "Fix UserHistoryDictionaryTests."Keisuke Kuroyanagi2013-10-092-6/+25
|\| | | | | | | | | | | | | | | | | | | * commit 'f28ca53b33098a87938fc9eafff5577e6c02a822': Fix UserHistoryDictionaryTests.
| * | | am 864ee881: Merge "Fix UserHistoryDictionaryTests."Keisuke Kuroyanagi2013-10-032-6/+25
| |\| | | | | | | | | | | | | | | | | | * commit '864ee881bd2f4a5dbde8f31c68e7f89522c67db6': Fix UserHistoryDictionaryTests.
| | * | Merge "Fix UserHistoryDictionaryTests."Keisuke Kuroyanagi2013-10-032-6/+25
| | |\ \
| | | * | Fix UserHistoryDictionaryTests.Keisuke Kuroyanagi2013-10-032-6/+25
| | | |/ | | | | | | | | | | | | | | | | | | | | | | | | Bug: 6669677 Bug: 10667710 Change-Id: I6cdc6a6c9cacc7f276fda3a26ec31e3eb928471c
* | | | am be7db63a: am 3dd77a6d: Add SparseTableContentWriter to Ver4DictEncoder.Yuichiro Hanada2013-10-093-52/+119
|\| | | | | | | | | | | | | | | | | | | * commit 'be7db63ad91f3f1a6e78d55993adcd5c055fddea': Add SparseTableContentWriter to Ver4DictEncoder.
| * | | am 3dd77a6d: Add SparseTableContentWriter to Ver4DictEncoder.Yuichiro Hanada2013-10-033-52/+119
| |\| | | | | | | | | | | | | | | | | | * commit '3dd77a6d6696bb426b200b27adeb8be7e887a667': Add SparseTableContentWriter to Ver4DictEncoder.
| | * | Add SparseTableContentWriter to Ver4DictEncoder.Yuichiro Hanada2013-10-033-52/+119
| | | | | | | | | | | | | | | | | | | | Bug: 10920165 Change-Id: I6372492e97297baad4c5aeeb3fb36dcccd7a944b
* | | | am 8e19d4a1: am d6e307a4: Add DictUpdater.Yuichiro Hanada2013-10-095-100/+176
|\| | | | | | | | | | | | | | | | | | | * commit '8e19d4a120bf57f6eebce99bac22a01941400d61': Add DictUpdater.
| * | | am d6e307a4: Add DictUpdater.Yuichiro Hanada2013-10-035-100/+176
| |\| | | | | | | | | | | | | | | | | | * commit 'd6e307a4b7933ad5efebc6b0d3b775c5ab5c0e6e': Add DictUpdater.
| | * | Add DictUpdater.Yuichiro Hanada2013-10-035-100/+176
| | | | | | | | | | | | | | | | Change-Id: Ic586e46e5a9f59de53d53e59886d635345940974
* | | | am 5fbd356a: am 85607c59: Merge "Fix the subtype id of the additional subtypes"Satoshi Kataoka2013-10-091-4/+25
|\| | | | | | | | | | | | | | | | | | | * commit '5fbd356a735ae02a671ca7db6dd57050e9fb0b17': Fix the subtype id of the additional subtypes
| * | | am 85607c59: Merge "Fix the subtype id of the additional subtypes"Satoshi Kataoka2013-10-031-4/+25
| |\| | | | | | | | | | | | | | | | | | * commit '85607c59651ed2341265253d5ab7cd9f5326e7f1': Fix the subtype id of the additional subtypes
| | * | Merge "Fix the subtype id of the additional subtypes"Satoshi Kataoka2013-10-031-4/+25
| | |\ \
| | | * | Fix the subtype id of the additional subtypesSatoshi Kataoka2013-10-031-4/+25
| | | | | | | | | | | | | | | | | | | | | | | | | Bug: 11032428 Change-Id: I5d422f1c15a582015770ef9a652348ca6eb8ab85
* | | | | am 3977cc97: am c7f8d54d: Merge "Prepare for changing text color for ↵Satoshi Kataoka2013-10-095-8/+77
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | functional keys" * commit '3977cc97528df0851d9b671578181d64c6b7a210': Prepare for changing text color for functional keys
| * | | | am c7f8d54d: Merge "Prepare for changing text color for functional keys"Satoshi Kataoka2013-10-035-8/+77
| |\| | | | | | | | | | | | | | | | | | | | | | | * commit 'c7f8d54d6eaa0a0ebfe156ebe426eeab080a82dc': Prepare for changing text color for functional keys
| | * | | Merge "Prepare for changing text color for functional keys"Satoshi Kataoka2013-10-035-8/+77
| | |\ \ \ | | | |/ / | | |/| |
| | | * | Prepare for changing text color for functional keysSatoshi Kataoka2013-10-035-8/+77
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Bug: 10786040 Change-Id: I0de7d4923ea13b44adcf1f4ea456796cd02ef27b
| | * | | Import translations. DO NOT MERGEBaligh Uddin2013-10-0255-220/+110
| | | |/ | | |/| | | | | | | | | | | | | Change-Id: I4fe48281caf9d3cf83effb19933d8f168967f950 Auto-generated-cl: translation import
| * | | Import translations. DO NOT MERGEBaligh Uddin2013-10-0249-196/+98
| | | | | | | | | | | | | | | | | | | | Change-Id: Ifee5f65e8da896db6bce982db0c8cdcbb3f49902 Auto-generated-cl: translation import
* | | | am ec5ad29a: am d25cd26f: Merge "Try decaying user history at hourly intervals."Keisuke Kuroyanagi2013-10-096-6/+96
|\| | | | | | | | | | | | | | | | | | | * commit 'ec5ad29a1f81b3d1a907c201f1d6fed01aea627b': Try decaying user history at hourly intervals.
| * | | am d25cd26f: Merge "Try decaying user history at hourly intervals."Keisuke Kuroyanagi2013-10-026-6/+96
| |\| | | | | | | | | | | | | | | | | | * commit 'd25cd26f1a18ebf385a9ce8aea1e9c7ba32bdfc7': Try decaying user history at hourly intervals.
| | * | Merge "Try decaying user history at hourly intervals."Keisuke Kuroyanagi2013-10-026-6/+96
| | |\ \
| | | * | Try decaying user history at hourly intervals.Keisuke Kuroyanagi2013-10-026-6/+96
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Bug: 6669677 Change-Id: Ib465fa7e1a7f289a07843535ba89d0dd5259e803
* | | | | am 72c870f5: am 596a565a: Merge "Remove some unused variables."Ken Wakasa2013-10-097-22/+10
|\| | | | | | | | | | | | | | | | | | | | | | | | * commit '72c870f5e67c0b332b8bf0b394796c28b53f61a7': Remove some unused variables.
| * | | | am 596a565a: Merge "Remove some unused variables."Ken Wakasa2013-10-027-22/+10
| |\| | | | | | | | | | | | | | | | | | | | | | | * commit '596a565ae7fe4e721503ad2da3e8a9990735ebf2': Remove some unused variables.
| | * | | Remove some unused variables.Yuichiro Hanada2013-10-027-22/+10
| | | | | | | | | | | | | | | | | | | | Change-Id: Iaf1556fec194d17cb4318f2bdcc837f8d79449ef
* | | | | 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