Ken Wakasa
a5628933ff
am 6032dcf9
: (-s ours) am a79431b4
: am d8ba6abf
: Merge "[DO NOT MERGE] Fix a bug where autoshift would be ignored coming from emoji" into klp-dev
...
* commit '6032dcf9505f8c72abda465c7cc72cfa2a011372':
[DO NOT MERGE] Fix a bug where autoshift would be ignored coming from emoji
2013-10-17 09:43:24 -07:00
Ken Wakasa
6032dcf950
am a79431b4
: am d8ba6abf
: Merge "[DO NOT MERGE] Fix a bug where autoshift would be ignored coming from emoji" into klp-dev
...
* commit 'a79431b42b9ef67fc1e68507b5c09f3597fa2121':
[DO NOT MERGE] Fix a bug where autoshift would be ignored coming from emoji
2013-10-17 09:30:34 -07:00
Ken Wakasa
a79431b42b
am d8ba6abf
: Merge "[DO NOT MERGE] Fix a bug where autoshift would be ignored coming from emoji" into klp-dev
...
* commit 'd8ba6abfeef1bce43af3e0ac517e20172c9e8cc5':
[DO NOT MERGE] Fix a bug where autoshift would be ignored coming from emoji
2013-10-17 09:28:49 -07:00
Ken Wakasa
d8ba6abfee
Merge "[DO NOT MERGE] Fix a bug where autoshift would be ignored coming from emoji" into klp-dev
2013-10-17 16:26:42 +00:00
Baligh Uddin
ee3e5ffb5b
am e328f6d0
: (-s ours) am 1e779e05
: (-s ours) am 62bea4d6
: (-s ours) am 8d757c20
: (-s ours) Merge "Import translations. DO NOT MERGE" into klp-dev
...
* commit 'e328f6d0d852e840436791cca327ca3f869c7373':
Import translations. DO NOT MERGE
2013-10-17 08:53:44 -07:00
Baligh Uddin
e328f6d0d8
am 1e779e05
: (-s ours) am 62bea4d6
: (-s ours) am 8d757c20
: (-s ours) Merge "Import translations. DO NOT MERGE" into klp-dev
...
* commit '1e779e05153a6617a2ecba408824a17aa4926ec5':
Import translations. DO NOT MERGE
2013-10-17 08:52:19 -07:00
Baligh Uddin
1e779e0515
am 62bea4d6
: (-s ours) am 8d757c20
: (-s ours) Merge "Import translations. DO NOT MERGE" into klp-dev
...
* commit '62bea4d6e0a0c2cc91ef621c583ab2bf3db6c6c8':
Import translations. DO NOT MERGE
2013-10-17 08:50:47 -07:00
Baligh Uddin
801d654717
am 765c40cd
: (-s ours) Merge "Import translations. DO NOT MERGE"
...
* commit '765c40cd767448db213359f7ab3ea3140f018841':
Import translations. DO NOT MERGE
2013-10-17 08:50:22 -07:00
Baligh Uddin
62bea4d6e0
am 8d757c20
: (-s ours) Merge "Import translations. DO NOT MERGE" into klp-dev
...
* commit '8d757c205293bb2670d6f29a00bd5c369e538da3':
Import translations. DO NOT MERGE
2013-10-17 08:48:11 -07:00
Baligh Uddin
765c40cd76
Merge "Import translations. DO NOT MERGE"
2013-10-17 15:47:22 +00:00
Baligh Uddin
38a2099808
Import translations. DO NOT MERGE
...
Change-Id: Ibf795b67b9198d7357815db183d939ff703d064f
Auto-generated-cl: translation import
2013-10-17 08:46:20 -07:00
Baligh Uddin
8d757c2052
Merge "Import translations. DO NOT MERGE" into klp-dev
2013-10-17 15:45:30 +00:00
Baligh Uddin
9fa7efb0c5
Import translations. DO NOT MERGE
...
Change-Id: Ia2590927c02e8e64506e746650d318c1d84ae7c2
Auto-generated-cl: translation import
2013-10-17 08:40:51 -07:00
Baligh Uddin
66214ef51a
Merge "Import translations. DO NOT MERGE" into jb-ub-latinimegoogle
2013-10-17 15:36:37 +00:00
Baligh Uddin
193502fdba
Import translations. DO NOT MERGE
...
Change-Id: I7993fcabb8d74fae3b08992d6323ca46d30db3b6
Auto-generated-cl: translation import
2013-10-17 08:29:25 -07:00
Jean Chalard
a605db24a6
am 0f45e1bf
: Fix a bug where autoshift would be ignored coming from emoji
...
* commit '0f45e1bfbca5c972b46acc1277d5f2fcad4fbf15':
Fix a bug where autoshift would be ignored coming from emoji
2013-10-17 07:18:02 -07:00
Jean Chalard
a3c285e876
[DO NOT MERGE] Fix a bug where autoshift would be ignored coming from emoji
...
Bug: 11123691
Change-Id: I36474e12e34af95051129840865015f85595411b
2013-10-17 23:15:09 +09:00
Jean Chalard
0f45e1bfbc
Fix a bug where autoshift would be ignored coming from emoji
...
Bug: 11123691
Change-Id: I36474e12e34af95051129840865015f85595411b
2013-10-17 22:58:34 +09:00
Keisuke Kuroyanagi
54d8e410c7
am 585c6711
: Merge "Add ver4 dictionary structure policy file."
...
* commit '585c67118a475416e495fc2e7fcbf6116c65f8fd':
Add ver4 dictionary structure policy file.
2013-10-17 05:05:58 -07:00
Keisuke Kuroyanagi
cc811d9104
am afa3f11b
: Merge "Moving files for dictionary structure policies."
...
* commit 'afa3f11b3d27fff55745c74d846bbe725037b1a0':
Moving files for dictionary structure policies.
2013-10-17 05:02:32 -07:00
Keisuke Kuroyanagi
585c67118a
Merge "Add ver4 dictionary structure policy file."
2013-10-17 12:02:01 +00:00
Keisuke Kuroyanagi
afa3f11b3d
Merge "Moving files for dictionary structure policies."
2013-10-17 11:59:35 +00:00
Satoshi Kataoka
dc929dec4d
am 0f5256e5
: Merge "Don\'t show long-pressing emoji key on tablet"
...
* commit '0f5256e500089fc25df174b7c349a5667c496621':
Don't show long-pressing emoji key on tablet
2013-10-17 04:40:20 -07:00
Satoshi Kataoka
329fd2d832
Do not merge. Don't show long-pressing emoji key on tablet
...
Bug: 11264603
Change-Id: Ic46086e9f1b223e26586e0611d14a7d14b561100
2013-10-17 20:38:33 +09:00
Satoshi Kataoka
0f5256e500
Merge "Don't show long-pressing emoji key on tablet"
2013-10-17 11:37:58 +00:00
Satoshi Kataoka
b2f5e0639f
Don't show long-pressing emoji key on tablet
...
Bug: 11264603
Change-Id: I85e8dfa795bbaad26f38bcdb8a958c26e031a4cd
2013-10-17 17:53:33 +09:00
Satoshi Kataoka
28af0d5a1a
am 0d43ce28
: Merge "Fix keyboard layout"
...
* commit '0d43ce28c7ccf50ea8b8739409e357f4ec1e6020':
Fix keyboard layout
2013-10-17 01:41:00 -07:00
Keisuke Kuroyanagi
1b8af7593b
am be5e8f18
: Merge "Make "node"s clear by renaming to PtNode or DicNode."
...
* commit 'be5e8f18e9de369f7c2d154e0df62787c8bd3724':
Make "node"s clear by renaming to PtNode or DicNode.
2013-10-17 01:40:57 -07:00
Satoshi Kataoka
0d43ce28c7
Merge "Fix keyboard layout"
2013-10-17 08:33:56 +00:00
Satoshi Kataoka
8ff1e71f8a
Do not merge. Fix keyboard layout
...
- Show "..." on enter key if it has long-pressing emoji key
- Show enter key on symbols shift keyboard
Bug: 11262889
Bug: 11263464
Change-Id: I3797fe2ef8c1e4cbba3298475f01f90c98e3335f
2013-10-17 17:29:45 +09:00
Keisuke Kuroyanagi
be5e8f18e9
Merge "Make "node"s clear by renaming to PtNode or DicNode."
2013-10-17 08:23:02 +00:00
Satoshi Kataoka
e2d531c0fd
Fix keyboard layout
...
- Show "..." on enter key if it has long-pressing emoji key
- Show enter key on symbols shift keyboard
Bug: 11262889
Bug: 11263464
Change-Id: If84d0cc621b12e1bf3a3102b1f09cbaedf92f007
2013-10-17 16:37:26 +09:00
Jean Chalard
3038bd9ce6
am 578e9b91
: Merge "Remove useless code."
...
* commit '578e9b91c13a8ca780440f536ee8b9ebd9c962f1':
Remove useless code.
2013-10-16 23:58:02 -07:00
Jean Chalard
2be7c8c86f
am 8447409c
: Merge "Remove mIsExpectingUpdateSelection."
...
* commit '8447409c770fb6af5ca6f9cdc8396c0b9bd96127':
Remove mIsExpectingUpdateSelection.
2013-10-16 23:57:59 -07:00
Jean Chalard
578e9b91c1
Merge "Remove useless code."
2013-10-17 06:56:12 +00:00
Jean Chalard
8447409c77
Merge "Remove mIsExpectingUpdateSelection."
2013-10-17 06:55:54 +00:00
Yuichiro Hanada
d5be00da7a
am 9c13d52d
: [Refactor] Add BinaryDictUtils.
...
* commit '9c13d52d2372b872876c9926e366075fdf35a606':
[Refactor] Add BinaryDictUtils.
2013-10-16 23:53:39 -07:00
Yuichiro Hanada
9c13d52d23
[Refactor] Add BinaryDictUtils.
...
Change-Id: I95c5fb58e2cab3a2c523d2bc3c6fbad06692ac59
2013-10-17 15:45:46 +09:00
Yuichiro Hanada
8ef2da5c1a
am ad5b9bce
: Add readVer4PtNodeInfo to Ver4DictDecoder.
...
* commit 'ad5b9bcec249c672385c61de2e3231687401e588':
Add readVer4PtNodeInfo to Ver4DictDecoder.
2013-10-16 23:39:46 -07:00
Yuichiro Hanada
ad5b9bcec2
Add readVer4PtNodeInfo to Ver4DictDecoder.
...
Change-Id: Ibffaf64a9bda1fb0779a9b53558ca56ed31660d3
2013-10-17 14:37:04 +09:00
Yuichiro Hanada
104ed74b6e
am 36dd126a
: Add ShortcutContentReader.
...
* commit '36dd126ab41ad9d95ce6844be89a8e430b5f51ff':
Add ShortcutContentReader.
2013-10-16 19:16:37 -07:00
Yuichiro Hanada
36dd126ab4
Add ShortcutContentReader.
...
Change-Id: I7c2d0d86d85775065a9bcb2b4a8463bb4969579e
2013-10-17 11:11:29 +09:00
Ed Heyl
6bde9f3336
am aaabce8d
: am 46742367
: am 09ecfc06
: am cf0a94fa
: merge in klp-release (no-op)
...
* commit 'aaabce8d30fd0eb6e217359c839a846037f8e091':
Do not merge. Revert emoji key position to JB-mr2
Fix: Native crash when an empty attribute is written. DO NOT MERGE
Use reentrant lock for main dictionaries. DO NOT MERGE
Stop reading dictionary while regenerating. (DO NOT MERGE)
2013-10-16 18:05:21 -07:00
Ed Heyl
aaabce8d30
am 46742367
: am 09ecfc06
: am cf0a94fa
: merge in klp-release (no-op)
...
* commit '46742367fbc484de6e0433eb9f5b5862c3f7d9cc':
Do not merge. Revert emoji key position to JB-mr2
Fix: Native crash when an empty attribute is written. DO NOT MERGE
Use reentrant lock for main dictionaries. DO NOT MERGE
Stop reading dictionary while regenerating. (DO NOT MERGE)
2013-10-16 18:01:56 -07:00
Ed Heyl
46742367fb
am 09ecfc06
: am cf0a94fa
: merge in klp-release (no-op)
...
* commit '09ecfc062b756e4a452e04f55df49023b5f0eae9':
Do not merge. Revert emoji key position to JB-mr2
Fix: Native crash when an empty attribute is written. DO NOT MERGE
Use reentrant lock for main dictionaries. DO NOT MERGE
Stop reading dictionary while regenerating. (DO NOT MERGE)
2013-10-16 17:56:27 -07:00
Ed Heyl
09ecfc062b
am cf0a94fa
: merge in klp-release (no-op)
...
* commit 'cf0a94fa9a7c8a5b259507cab616239f79349444':
Do not merge. Revert emoji key position to JB-mr2
Fix: Native crash when an empty attribute is written. DO NOT MERGE
Use reentrant lock for main dictionaries. DO NOT MERGE
Stop reading dictionary while regenerating. (DO NOT MERGE)
2013-10-16 17:51:49 -07:00
Ed Heyl
cf0a94fa9a
merge in klp-release (no-op)
2013-10-16 17:46:48 -07:00
Satoshi Kataoka
3937f4ead7
am 1d80262b
: (-s ours) am fb8346cb
: (-s ours) am bfef552e
: am ea3db813
: Merge "Do not merge. Remove Azerbaijani subtype" into klp-dev
...
* commit '1d80262b6014b29d170e378d99a5ea0780530326':
Do not merge. Remove Azerbaijani subtype
2013-10-16 14:31:06 -07:00
Satoshi Kataoka
1d80262b60
am fb8346cb
: (-s ours) am bfef552e
: am ea3db813
: Merge "Do not merge. Remove Azerbaijani subtype" into klp-dev
...
* commit 'fb8346cbd99a27b119f669d857ee6f996df8d1aa':
Do not merge. Remove Azerbaijani subtype
2013-10-16 14:28:03 -07:00
Satoshi Kataoka
fb8346cbd9
am bfef552e
: am ea3db813
: Merge "Do not merge. Remove Azerbaijani subtype" into klp-dev
...
* commit 'bfef552e623b2005afa0c53041183c787cd44bb2':
Do not merge. Remove Azerbaijani subtype
2013-10-16 14:26:01 -07:00