aboutsummaryrefslogtreecommitdiffstats
path: root/java (follow)
Commit message (Collapse)AuthorAgeFilesLines
* am 84f6b2c0: am 5f8eba02: Merge "Revert inconsistent assets"Ken Wakasa2013-10-0312-0/+0
|\ | | | | | | | | * commit '84f6b2c0ee452414dc92117916d070c01db3b019': Revert inconsistent assets
| * am 5f8eba02: Merge "Revert inconsistent assets"Ken Wakasa2013-09-2612-0/+0
| |\ | | | | | | | | | | | | * commit '5f8eba02d0c42a8e6e3dbc272d2a6156c6a74d3b': Revert inconsistent assets
| | * Merge "Revert inconsistent assets"Ken Wakasa2013-09-2612-0/+0
| | |\
| | | * Revert inconsistent assetsSatoshi Kataoka2013-09-2612-0/+0
| | | | | | | | | | | | | | | | | | | | | | | | Bug: 10786040 Change-Id: Ic9ead001879d7b5ff0b85529dd0c9afdbe2f7478
* | | | am 6c0e48b1: am 4350a93a: Merge "Fix the offdevice regression test build"Ken Wakasa2013-10-033-91/+114
|\| | | | | | | | | | | | | | | | | | | * commit '6c0e48b1adffd3ad9d2ccbc2bb2044555ff5a510': Fix the offdevice regression test build
| * | | am 4350a93a: Merge "Fix the offdevice regression test build"Ken Wakasa2013-09-253-91/+114
| |\| | | | | | | | | | | | | | | | | | * commit '4350a93aa5447f92304bea3f8bbf00bbf6c35498': Fix the offdevice regression test build
| | * | Merge "Fix the offdevice regression test build"Ken Wakasa2013-09-253-91/+114
| | |\ \
| | | * | Fix the offdevice regression test buildKen Wakasa2013-09-253-91/+114
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Followup to If4e44eca3cdc5bb02cf2e0c8c44ecd4bf27fae57 bug: 10622489 Change-Id: If98b2c75725f8692f0c2b41c33e448086404479b
* | | | | am a2174bad: am 5fa96540: Merge "Clear traverse sessions when closing."Keisuke Kuroyanagi2013-10-031-11/+15
|\| | | | | | | | | | | | | | | | | | | | | | | | * commit 'a2174bad22c722f31f864ec1b673661061591fd6': Clear traverse sessions when closing.
| * | | | am 5fa96540: Merge "Clear traverse sessions when closing."Keisuke Kuroyanagi2013-09-251-11/+15
| |\| | | | | | | | | | | | | | | | | | | | | | | * commit '5fa96540456f172b6dbbefe45061738916915cbb': Clear traverse sessions when closing.
| | * | | Merge "Clear traverse sessions when closing."Keisuke Kuroyanagi2013-09-251-11/+15
| | |\ \ \
| | | * | | Clear traverse sessions when closing.Keisuke Kuroyanagi2013-09-251-11/+15
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Bug: 6669677 Change-Id: I859be934f0c60485e04cdc4cab288a18242fa04e
* | | | | | am c536d27c: am 6e41d9a4: Merge "Input delete onUpKey"Satoshi Kataoka2013-10-031-3/+8
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit 'c536d27c697d5851f27302c875654b0545b2696d': Input delete onUpKey
| * | | | | am 6e41d9a4: Merge "Input delete onUpKey"Satoshi Kataoka2013-09-251-3/+8
| |\| | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit '6e41d9a4795574ce33b944d953b517394697f2ff': Input delete onUpKey
| | * | | | Merge "Input delete onUpKey"Satoshi Kataoka2013-09-251-3/+8
| | |\ \ \ \ | | | |_|/ / | | |/| | / | | | | |/ | | | |/|
| | | * | Input delete onUpKeySatoshi Kataoka2013-09-251-3/+8
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | to avoid deletion when the user starts gesture from the delete key Bug: 7303982 Change-Id: If4b3e6287ceee1cf9f72a1d92f2a6789065da454
* | | | | am b2956ef5: am 399422f4: Merge "Make Ver4DictEncoder write an address table ↵Ken Wakasa2013-10-034-12/+49
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | of terminal nodes." * commit 'b2956ef5cfb752c8f758f682b216dbff021415b8': Make Ver4DictEncoder write an address table of terminal nodes.
| * | | | am 399422f4: Merge "Make Ver4DictEncoder write an address table of terminal ↵Ken Wakasa2013-09-254-12/+49
| |\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | nodes." * commit '399422f4b9f06c6692f18318c84f17c61ae83f9a': Make Ver4DictEncoder write an address table of terminal nodes.
| | * | | Merge "Make Ver4DictEncoder write an address table of terminal nodes."Ken Wakasa2013-09-254-12/+49
| | |\ \ \ | | | |/ / | | |/| |
| | | * | Make Ver4DictEncoder write an address table of terminal nodes.Yuichiro Hanada2013-09-254-12/+49
| | | | | | | | | | | | | | | | | | | | | | | | | Bug: 10920165 Change-Id: I86017456ea9fa5d6e12b57172c34f5ed4f88ef94
* | | | | am 5512b300: am 1e69f3e6: Fix emoji pageSatoshi Kataoka2013-10-031-1/+3
|\| | | | | | | | | | | | | | | | | | | | | | | | * commit '5512b300efabe65c7102ca2b10a265dfd9ade049': Fix emoji page
| * | | | am 1e69f3e6: Fix emoji pageSatoshi Kataoka2013-09-251-1/+3
| |\| | | | | | | | | | | | | | | | | | | | | | | * commit '1e69f3e637238407492aab536760644aca33f38d': Fix emoji page
| | * | | Fix emoji pageSatoshi Kataoka2013-09-251-1/+3
| | | | | | | | | | | | | | | | | | | | | | | | | Bug: 10538430 Change-Id: If4d5ebb26e7ead259e8f370462ccf4c9dbf734f8
* | | | | am 400ec7c5: am 0938fb69: Allow gesture from the delete keySatoshi Kataoka2013-10-031-2/+4
|\| | | | | | | | | | | | | | | | | | | | | | | | * commit '400ec7c5a6cc483fe4064bfb0d5462d2ad2c694e': Allow gesture from the delete key
| * | | | am 0938fb69: Allow gesture from the delete keySatoshi Kataoka2013-09-251-2/+4
| |\| | | | | | | | | | | | | | | | | | | | | | | * commit '0938fb6913c10d32f0a870210fc208c7bbfe282c': Allow gesture from the delete key
| | * | | Allow gesture from the delete keySatoshi Kataoka2013-09-251-2/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | And inputting unexpected word while repeating the gesture Bug: 7303982 Change-Id: I17bb6a689397500fa0e26706d6e07e427ea0b4d7
* | | | | am daa9eac9: am 9c3b2dbe: Fix emoji stateSatoshi Kataoka2013-10-031-3/+8
|\| | | | | | | | | | | | | | | | | | | | | | | | * commit 'daa9eac90d627e807e24f99e169f8ed011e4b4c3': Fix emoji state
| * | | | am 9c3b2dbe: Fix emoji stateSatoshi Kataoka2013-09-251-3/+8
| |\| | | | | | | | | | | | | | | | | | | | | | | * commit '9c3b2dbe3434fbe5117b66fa4911c8de0ea6bde6': Fix emoji state
| | * | | Fix emoji stateSatoshi Kataoka2013-09-251-3/+8
| | | | | | | | | | | | | | | | | | | | | | | | | Bug: 10919260 Change-Id: I85e897b2de10f147bba40dd2147e041e26f5b8ad
| * | | | Merge "Import translations. DO NOT MERGE" into jb-ub-latinimegoogleBaligh Uddin2013-09-255-0/+135
| |\ \ \ \
| | * | | | Import translations. DO NOT MERGEBaligh Uddin2013-09-245-0/+135
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Change-Id: Ia8d7ae751f258874103dc0e79ef46928d51ac026 Auto-generated-cl: translation import
* | | | | | am 0f75a055: am 431158c9: Turn off emoji palette on JB-MR2Satoshi Kataoka2013-10-031-1/+1
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit '0f75a055bcb2503e6efc4a5b3be1404e0a30ff1a': Turn off emoji palette on JB-MR2
| * | | | | am 431158c9: Turn off emoji palette on JB-MR2Satoshi Kataoka2013-09-241-1/+1
| |\ \ \ \ \ | | |/ / / / | |/| / / / | | |/ / / | | | | | * commit '431158c9395bfd2b527c049d05e6d4e9f9134cf9': Turn off emoji palette on JB-MR2
| | * / / Turn off emoji palette on JB-MR2Satoshi Kataoka2013-09-251-1/+1
| | |/ / | | | | | | | | | | | | | | | | | | | | Bug: 10919260 Change-Id: Ie5a0342386baae61285412786162e74746272538
| | * | Merge "Import translations. DO NOT MERGE"Baligh Uddin2013-09-241-2/+2
| | |\ \ | | | |/ | | |/|
| | | * Import translations. DO NOT MERGEBaligh Uddin2013-09-231-2/+2
| | | | | | | | | | | | | | | | | | | | Change-Id: I0a916b635f43f9327546bebbe9bcc6cbff0ece4b Auto-generated-cl: translation import
| * | | Merge "Import translations. DO NOT MERGE" into jb-ub-latinimegoogleBaligh Uddin2013-09-241-2/+2
| |\ \ \
| | * | | Import translations. DO NOT MERGEBaligh Uddin2013-09-231-2/+2
| | | | | | | | | | | | | | | | | | | | | | | | | Change-Id: I35fc87c4b21b589fae2d6e0c925a9695feb94abb Auto-generated-cl: translation import
* | | | | Fix PrioritizedSerialExecutor.Yuichiro Hanada2013-09-293-38/+42
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | It was possible that fetchNextTasks() would be called by multiple threads concurrently. If it happens, some tasks in the task queues might be ignored. cherrypick of Idc81c43c45e382da3850cc55b9a42c281548d2a8 bug: 10957075 Change-Id: I41bf90dda15306ee879350f96a791d940ea31da1
* | | | | Stop reading dictionary while regenerating. (DO NOT MERGE)Keisuke Kuroyanagi2013-09-281-62/+88
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Cherrypick of Iead7268a9371b48d729a5f65074ccbc05f3185db Bug: 10831272 Change-Id: Ib6f314ac68696616532ff9c05c7f35813137bf9f
* | | | | Merge "Import translations. DO NOT MERGE" into jb-ub-latinimegoogle-bayoBaligh Uddin2013-09-241-2/+2
|\ \ \ \ \ | |/ / / / |/| | | |
| * | | | Import translations. DO NOT MERGEBaligh Uddin2013-09-231-2/+2
| | | | | | | | | | | | | | | | | | | | | | | | | Change-Id: I64cebd2f1fb8233c354b267fdd074f8e3d30df89 Auto-generated-cl: translation import
| * | | | Import translations. DO NOT MERGEBaligh Uddin2013-09-192-5/+5
| | | | | | | | | | | | | | | | | | | | | | | | | Change-Id: Ife3521c9ef61f7e9dbc375e00fb2650cf394bd48 Auto-generated-cl: translation import
* | | | | am 2e58670d: Quit using ExpandableDictionary.Keisuke Kuroyanagi2013-09-243-42/+138
|\ \ \ \ \ | | |_|/ / | |/| | | | | | | | | | | | | * commit '2e58670da9687fd1fd28c322e03343957d11568c': Quit using ExpandableDictionary.
| * | | | Quit using ExpandableDictionary.Keisuke Kuroyanagi2013-09-243-42/+138
| | | | | | | | | | | | | | | | | | | | | | | | | Bug: 6669677 Change-Id: Ie90417fa9b726454fe729a665fcd549efabb9e94
* | | | | am d1ae0304: Fix OOBE in JB backwordSatoshi Kataoka2013-09-241-1/+8
|\| | | | | | | | | | | | | | | | | | | | | | | | * commit 'd1ae03046c1b502117129831286ed4ea0828740f': Fix OOBE in JB backword
| * | | | Fix OOBE in JB backwordSatoshi Kataoka2013-09-241-1/+8
| | | | | | | | | | | | | | | | | | | | | | | | | Bug: 10905948 Change-Id: I4e953296ce3067d05fc5759375f40513580484a6
* | | | | am f068c6e6: Merge "Low memory mode in UserHistory"Satoshi Kataoka2013-09-241-7/+24
|\| | | | | | | | | | | | | | | | | | | | | | | | * commit 'f068c6e656fae4516b6ac09b4e9cb8a7371a14c7': Low memory mode in UserHistory
| * | | | Merge "Low memory mode in UserHistory"Satoshi Kataoka2013-09-241-7/+24
| |\ \ \ \
| | * | | | Low memory mode in UserHistorySatoshi Kataoka2013-09-241-7/+24
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Bug: 8967766 Change-Id: Id40f54f4d9f43d1f796377983a5fc0ca3417e133