aboutsummaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
...
| * | | | | | | | | | | | | | | Merge "Save / restore the last used emoji category"Satoshi Kataoka2013-10-112-11/+25
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | |_|_|_|_|_|/ / / / / / / / / | |/| | | | | | | | | | | | | |
| | * | | | | | | | | | | | | | Save / restore the last used emoji categorySatoshi Kataoka2013-10-112-11/+25
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Bug: 11029983 Change-Id: I1bec2c3c6b547de68562a818a8d6c9fef83787b7
* | | | | | | | | | | | | | | | am 9514ed5c: Add the new format of bigram entries.Yuichiro Hanada2013-10-105-27/+105
|\| | | | | | | | | | | | | | | | |_|_|_|_|_|_|/ / / / / / / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit '9514ed5c2a49e645e2d468f7191d54d77d9f127f': Add the new format of bigram entries.
| * | | | | | | | | | | | | | Add the new format of bigram entries.Yuichiro Hanada2013-10-115-27/+105
| | |_|_|_|_|_|/ / / / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | In new format, each bigram entry has flags (1 byte), a terminal id (3 byte), a time-stamp (4 byte), a counter (1 byte) and a level (1 byte). Bug: 10920255 Bug: 10920165 Change-Id: I0f7fc125a6178e6d25a07e8462afc41a7f57e3e1
* | | | | | | | | | | | | | am 84994295: (-s ours) am 56e21a02: (-s ours) am 85dec741: am 6dac27ee: ↵Ken Wakasa2013-10-100-0/+0
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Merge "Tweak vertical gap of Emoji palette. DO NOT MERGE" into klp-dev * commit '849942950e50f5f53c5fd22a7a5641e9d496fdeb': Tweak vertical gap of Emoji palette. DO NOT MERGE
| * | | | | | | | | | | | | am 56e21a02: (-s ours) am 85dec741: am 6dac27ee: Merge "Tweak vertical gap ↵Ken Wakasa2013-10-100-0/+0
| |\ \ \ \ \ \ \ \ \ \ \ \ \ | | | |/ / / / / / / / / / / | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | of Emoji palette. DO NOT MERGE" into klp-dev * commit '56e21a02f071306704ec1ab9ac099fd3c2811461': Tweak vertical gap of Emoji palette. DO NOT MERGE
| | * | | | | | | | | | | | am 85dec741: am 6dac27ee: Merge "Tweak vertical gap of Emoji palette. DO NOT ↵Ken Wakasa2013-10-091-2/+2
| | |\ \ \ \ \ \ \ \ \ \ \ \ | | | | |/ / / / / / / / / / | | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | MERGE" into klp-dev * commit '85dec741a70bf455d9aae583982580dc79df0209': Tweak vertical gap of Emoji palette. DO NOT MERGE
| | | * | | | | | | | | | | am 6dac27ee: Merge "Tweak vertical gap of Emoji palette. DO NOT MERGE" into ↵Ken Wakasa2013-10-091-2/+2
| | | |\ \ \ \ \ \ \ \ \ \ \ | | | | | |/ / / / / / / / / | | | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | klp-dev * commit '6dac27eeb4cfc969a07e646f013a25a27760c773': Tweak vertical gap of Emoji palette. DO NOT MERGE
| | | | * | | | | | | | | | Merge "Tweak vertical gap of Emoji palette. DO NOT MERGE" into klp-devKen Wakasa2013-10-101-2/+2
| | | | |\ \ \ \ \ \ \ \ \ \
| | | | | * | | | | | | | | | Tweak vertical gap of Emoji palette. DO NOT MERGESatoshi Kataoka2013-10-101-2/+2
| | | | | | |/ / / / / / / / | | | | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | cherrypick of I8163568a9d7f9d321148001e161c672f78796c96 Bug: 11140087 Change-Id: Ifd28f3017a8cf568a8c4a1045811564a129d85b7
* | | | | | | | | | | | | | am 604f523e: (-s ours) am e38ed07c: (-s ours) am 07baf17c: am f9d7d17f: ↵Ken Wakasa2013-10-100-0/+0
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Merge "Retry to tweak punctuations. DO NOT MERGE" into klp-dev * commit '604f523ef20c4ef565386a203ccba15a699c5595': Retry to tweak punctuations. DO NOT MERGE
| * | | | | | | | | | | | | am e38ed07c: (-s ours) am 07baf17c: am f9d7d17f: Merge "Retry to tweak ↵Ken Wakasa2013-10-100-0/+0
| |\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | punctuations. DO NOT MERGE" into klp-dev * commit 'e38ed07cad8e5df8ef34e169bb689d559fd5f44b': Retry to tweak punctuations. DO NOT MERGE
| | * | | | | | | | | | | | am 07baf17c: am f9d7d17f: Merge "Retry to tweak punctuations. DO NOT MERGE" ↵Ken Wakasa2013-10-092-2/+2
| | |\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | into klp-dev * commit '07baf17c6f6fff0725c75f4ba778d5a26a6eea67': Retry to tweak punctuations. DO NOT MERGE
| | | * | | | | | | | | | | am f9d7d17f: Merge "Retry to tweak punctuations. DO NOT MERGE" into klp-devKen Wakasa2013-10-092-2/+2
| | | |\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit 'f9d7d17f8fe9aa30346a1e3c8d01163aac58098b': Retry to tweak punctuations. DO NOT MERGE
| | | | * | | | | | | | | | Merge "Retry to tweak punctuations. DO NOT MERGE" into klp-devKen Wakasa2013-10-102-2/+2
| | | | |\ \ \ \ \ \ \ \ \ \
| | | | | * | | | | | | | | | Retry to tweak punctuations. DO NOT MERGESatoshi Kataoka2013-10-102-2/+2
| | | | | |/ / / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | cherrypick of I9ffc457ca44bccfa3eb3bdb0c26535d795215b26 Bug: 11130808 Change-Id: I1a65fd8acc4efe9b4e4786a3dc959498ae63c2f8
* | | | | | | | | | | | | | am 295fda09: (-s ours) am 3bd1f24f: (-s ours) am 49d8b8ca: am c8e4ad07: ↵Satoshi Kataoka2013-10-100-0/+0
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Support sw540 (ultra Z). DO NOT MERGE * commit '295fda09ecc8a3f6de8300765662d86d7d7289f2': Support sw540 (ultra Z). DO NOT MERGE
| * | | | | | | | | | | | | am 3bd1f24f: (-s ours) am 49d8b8ca: am c8e4ad07: Support sw540 (ultra Z). DO ↵Satoshi Kataoka2013-10-100-0/+0
| |\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | NOT MERGE * commit '3bd1f24f28a32fb5a641cda67abe90a3452a3a2a': Support sw540 (ultra Z). DO NOT MERGE
| | * | | | | | | | | | | | am 49d8b8ca: am c8e4ad07: Support sw540 (ultra Z). DO NOT MERGESatoshi Kataoka2013-10-095-0/+0
| | |\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit '49d8b8cacd18cc0ca7c5c0faa531b3b41c7093e3': Support sw540 (ultra Z). DO NOT MERGE
| | | * | | | | | | | | | | am c8e4ad07: Support sw540 (ultra Z). DO NOT MERGESatoshi Kataoka2013-10-095-0/+0
| | | |\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit 'c8e4ad0748d38fa589fc2ffa4bcf13f08c67d74b': Support sw540 (ultra Z). DO NOT MERGE
| | | | * | | | | | | | | | Support sw540 (ultra Z). DO NOT MERGESatoshi Kataoka2013-10-105-0/+0
| | | | |/ / / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | cherrypick of Ib930ba810b25e28bcc36ea1647d46731816d9def Bug: 11125351 Change-Id: Ifc4ab2a0495e886259c34f78bbe8cbf8fb75203b
* | | | | | | | | | | | | am ae408df1: am 273ca4c3: am 2783fcec: am 2d74136e: keep history after reset ↵Baligh Uddin2013-10-100-0/+0
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | to jb-ub-latinimegoogle-bayo * commit 'ae408df19ccd6ec7113702fb4276a3be8e95c6f5':
| * | | | | | | | | | | | am 273ca4c3: am 2783fcec: am 2d74136e: keep history after reset to ↵Baligh Uddin2013-10-100-0/+0
| |\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | jb-ub-latinimegoogle-bayo * commit '273ca4c32024c384412fa47480d08b3256831e99':
| | * | | | | | | | | | | am 2783fcec: am 2d74136e: keep history after reset to jb-ub-latinimegoogle-bayoBaligh Uddin2013-10-090-0/+0
| | |\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit '2783fcec44750210fbc9d5eadbde44f8028166cd':
| | | * | | | | | | | | | am 2d74136e: keep history after reset to jb-ub-latinimegoogle-bayoBaligh Uddin2013-10-090-0/+0
| | | |\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit '2d74136e5793af65d231e07a0cb058a80491cd57':
| | | | * | | | | | | | | keep history after reset to jb-ub-latinimegoogle-bayoBaligh Uddin2013-10-090-0/+0
| | | | |\ \ \ \ \ \ \ \ \ | | | | | |_|_|/ / / / / / | | | | |/| | | | | | | |
* | | | | | | | | | | | | am c48143b9: am 6d0d4b85: am e75cd64a: am 8105ea2f: keep history after reset ↵Baligh Uddin2013-10-100-0/+0
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | to jb-ub-latinimegoogle-bayo * commit 'c48143b9220abd64d681f3a4ff81f2b2cbbcc531':
| * | | | | | | | | | | | am 6d0d4b85: am e75cd64a: am 8105ea2f: keep history after reset to ↵Baligh Uddin2013-10-100-0/+0
| |\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | jb-ub-latinimegoogle-bayo * commit '6d0d4b850a5d0f51f2c911318928fcd30d7d2602':
| | * | | | | | | | | | | am e75cd64a: am 8105ea2f: keep history after reset to jb-ub-latinimegoogle-bayoBaligh Uddin2013-10-090-0/+0
| | |\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit 'e75cd64a2beecb0a6951b6eddc5d00b34d85abbf':
| | | * | | | | | | | | | am 8105ea2f: keep history after reset to jb-ub-latinimegoogle-bayoBaligh Uddin2013-10-090-0/+0
| | | |\ \ \ \ \ \ \ \ \ \ | | | | | |/ / / / / / / / | | | | |/| | | | | | | | | | | | | | | | | | | | | * commit '8105ea2f1d38dc86f3652a8a67abc868d77909d0':
| | | | * | | | | | | | | keep history after reset to jb-ub-latinimegoogle-bayoBaligh Uddin2013-10-090-0/+0
| | | | |\ \ \ \ \ \ \ \ \ | | | | | |/ / / / / / / / | | | | |/| | | | | | | |
* | | | | | | | | | | | | am 4d7b1102: am ddb0f5a2: am 8e9ce07b: am a6a6abc8: Fix the security related ↵Satoshi Kataoka2013-10-100-0/+0
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | API change for PreferenceActivity * commit '4d7b11020a5249fd987400fa9dad195cf6917d4a': Fix the security related API change for PreferenceActivity
| * | | | | | | | | | | | am ddb0f5a2: am 8e9ce07b: am a6a6abc8: Fix the security related API change ↵Satoshi Kataoka2013-10-100-0/+0
| |\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | for PreferenceActivity * commit 'ddb0f5a22605ac8b7c8159c39539763ff1c23a2d': Fix the security related API change for PreferenceActivity
| | * | | | | | | | | | | am 8e9ce07b: am a6a6abc8: Fix the security related API change for ↵Satoshi Kataoka2013-10-096-4/+91
| | |\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | PreferenceActivity * commit '8e9ce07b7f93b0dcbe552346b3f040db936a036a': Fix the security related API change for PreferenceActivity
| | | * | | | | | | | | | am a6a6abc8: Fix the security related API change for PreferenceActivitySatoshi Kataoka2013-10-096-4/+91
| | | |\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit 'a6a6abc81611023a0159fa678b731367d80d0aa6': Fix the security related API change for PreferenceActivity
| | | | * | | | | | | | | Fix the security related API change for PreferenceActivitySatoshi Kataoka2013-10-096-4/+91
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Bug: 10118761 Change-Id: I63501d6c2b5f561d7ab8b7362498665d805d5e1e
* | | | | | | | | | | | | am 44df1394: am 22888291: am 6beb03df: am 6862b819: Fix crash in ↵Satoshi Kataoka2013-10-100-0/+0
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | AdditionalSubtypeUtils * commit '44df13949a069eb18e99ae6584ff5ac72f1d39aa': Fix crash in AdditionalSubtypeUtils
| * | | | | | | | | | | | am 22888291: am 6beb03df: am 6862b819: Fix crash in AdditionalSubtypeUtilsSatoshi Kataoka2013-10-100-0/+0
| |\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit '22888291df6d86b412bfbe8a9bfbf74a3a625b4f': Fix crash in AdditionalSubtypeUtils
| | * | | | | | | | | | | am 6beb03df: am 6862b819: Fix crash in AdditionalSubtypeUtilsSatoshi Kataoka2013-10-092-6/+68
| | |\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit '6beb03df089965d19fc55c2d4179c044db5ca0d6': Fix crash in AdditionalSubtypeUtils
| | | * | | | | | | | | | am 6862b819: Fix crash in AdditionalSubtypeUtilsSatoshi Kataoka2013-10-092-6/+68
| | | |\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit '6862b8192df0c979ebf3a1fd566ede1b0dbd8a82': Fix crash in AdditionalSubtypeUtils
| | | | * | | | | | | | | Fix crash in AdditionalSubtypeUtilsSatoshi Kataoka2013-10-092-6/+68
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Bug: 11136982 Change-Id: I9d022a178c47bad3566be4c0bd8ffbce0b14896d
* | | | | | | | | | | | | am 51764e83: am b7922678: am 3815e4d2: am 965eac66: merge in ↵The Android Automerger2013-10-100-0/+0
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | jb-ub-latinimegoogle-bayo history after reset to jb-ub-latinimegoogle * commit '51764e8347fcee99e4c23073e16252d01484239f': Import translations. DO NOT MERGE Import translations. DO NOT MERGE
| * | | | | | | | | | | | am b7922678: am 3815e4d2: am 965eac66: merge in jb-ub-latinimegoogle-bayo ↵The Android Automerger2013-10-100-0/+0
| |\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | history after reset to jb-ub-latinimegoogle * commit 'b79226788e5d18971099fc36076c873196b8d1f8': Import translations. DO NOT MERGE Import translations. DO NOT MERGE
| | * | | | | | | | | | | am 3815e4d2: am 965eac66: merge in jb-ub-latinimegoogle-bayo history after ↵The Android Automerger2013-10-090-0/+0
| | |\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | reset to jb-ub-latinimegoogle * commit '3815e4d2158ebf46115dc34e91d1377e011a4ffb': Import translations. DO NOT MERGE Import translations. DO NOT MERGE
| | | * | | | | | | | | | am 965eac66: merge in jb-ub-latinimegoogle-bayo history after reset to ↵The Android Automerger2013-10-090-0/+0
| | | |\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | jb-ub-latinimegoogle * commit '965eac663b26b1030074000b66e6980d6b310f5f': Import translations. DO NOT MERGE Import translations. DO NOT MERGE
| | | | * | | | | | | | | merge in jb-ub-latinimegoogle-bayo history after reset to jb-ub-latinimegoogleThe Android Automerger2013-10-080-0/+0
| | | | |\ \ \ \ \ \ \ \ \
| | | | | * | | | | | | | | Import translations. DO NOT MERGEBaligh Uddin2013-10-0420-24/+1643
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Change-Id: Icb238009beb72e5f4f70ad6e7e2333e26a7b24d5 Auto-generated-cl: translation import
| | | | | * | | | | | | | | Import translations. DO NOT MERGEBaligh Uddin2013-10-0249-196/+98
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Change-Id: If2f9b9384231a0d19a39bad13db8c5ce97411f33 Auto-generated-cl: translation import
* | | | | | | | | | | | | | am ab581457: am 1a5e6a74: am 6deea22c: am 31e152e3: am de65b7c0: Merge "Fix ↵Satoshi Kataoka2013-10-100-0/+0
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | the position of emoji palette" * commit 'ab581457ae46e43bbfcc4927cd48b2fc1262c983':
| * | | | | | | | | | | | | am 1a5e6a74: am 6deea22c: am 31e152e3: am de65b7c0: Merge "Fix the position ↵Satoshi Kataoka2013-10-100-0/+0
| |\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | of emoji palette" * commit '1a5e6a7446fdaa8f8913b151ed6d1f70f74c939b':