Jean Chalard
fcdb85b37a
am f61999ca: Merge "Make it easy to open several dictionaries from tests"
...
* commit 'f61999caba1fa720c6817da8b6fc129d16b9a954':
Make it easy to open several dictionaries from tests
2013-05-31 04:23:33 -07:00
Jean Chalard
f61999caba
Merge "Make it easy to open several dictionaries from tests"
2013-05-31 11:21:37 +00:00
Tadashi G. Takaoka
8a7acf147d
am a0c3e02d: Refactor SuggestionStripLayoutHelper a bit
...
* commit 'a0c3e02d7168dd4cee4cad51491537dadb0362cc':
Refactor SuggestionStripLayoutHelper a bit
2013-05-31 02:36:56 -07:00
Tadashi G. Takaoka
a0c3e02d71
Refactor SuggestionStripLayoutHelper a bit
...
Bug: 9059710
Change-Id: Ief12029bad75d4dc78090ab97555aece01b873de
2013-05-31 18:14:47 +09:00
Tadashi G. Takaoka
0ef1e6234c
am 70c2dcff: am 6f7e39a6: am e7514a6a: Merge "Add vibration override values for Galaxy S4 and HTC One" into jb-mr2-dev
...
* commit '70c2dcffa3fdce8040d0779dd173d5634e434cba':
Add vibration override values for Galaxy S4 and HTC One
2013-05-30 23:50:37 -07:00
Baligh Uddin
1ba6866408
am 5989c9b8: (-s ours) am ea11a8ef: (-s ours) am dee9d17c: (-s ours) Import translations. DO NOT MERGE
...
* commit '5989c9b8100615fd77d9cb75a63ea707e411da8a':
Import translations. DO NOT MERGE
2013-05-30 23:50:35 -07:00
Tadashi G. Takaoka
70c2dcffa3
am 6f7e39a6: am e7514a6a: Merge "Add vibration override values for Galaxy S4 and HTC One" into jb-mr2-dev
...
* commit '6f7e39a6827598492ffbfeedf4c47445519f272e':
Add vibration override values for Galaxy S4 and HTC One
2013-05-30 23:49:07 -07:00
Baligh Uddin
5989c9b810
am ea11a8ef: (-s ours) am dee9d17c: (-s ours) Import translations. DO NOT MERGE
...
* commit 'ea11a8ef4f6c2753b01bb80423abe0263bb1b7d3':
Import translations. DO NOT MERGE
2013-05-30 23:49:06 -07:00
Tadashi G. Takaoka
6f7e39a682
am e7514a6a: Merge "Add vibration override values for Galaxy S4 and HTC One" into jb-mr2-dev
...
* commit 'e7514a6a8a9e59ea5cde9f2c3a198f35d111cdc2':
Add vibration override values for Galaxy S4 and HTC One
2013-05-30 23:47:01 -07:00
Baligh Uddin
ea11a8ef4f
am dee9d17c: (-s ours) Import translations. DO NOT MERGE
...
* commit 'dee9d17c6855b9d34a9cd0e7946c5890a83a583b':
Import translations. DO NOT MERGE
2013-05-30 23:47:01 -07:00
Tadashi G. Takaoka
e7514a6a8a
Merge "Add vibration override values for Galaxy S4 and HTC One" into jb-mr2-dev
2013-05-31 06:45:07 +00:00
Jean Chalard
1562fc91f0
Make it easy to open several dictionaries from tests
...
Bug: 9127175
Change-Id: I3f1840ee73b364df26dfddb5acb10001e0f2cb61
2013-05-31 15:36:05 +09:00
Tadashi G. Takaoka
015d542fa9
am 723391c9: Merge "Tidy up Utils class a bit"
...
* commit '723391c9451f906ed786ba3418611846dfe9f3f5':
Tidy up Utils class a bit
2013-05-30 23:30:48 -07:00
Tadashi G. Takaoka
723391c945
Merge "Tidy up Utils class a bit"
2013-05-31 06:29:24 +00:00
Keisuke Kuroyanagi
68d17aea65
am f88f9dbb: Move "#define LOG_TAG" before include defines.h.
...
* commit 'f88f9dbbdec309c01feda06edc142470ba13cb2f':
Move "#define LOG_TAG" before include defines.h.
2013-05-30 22:29:40 -07:00
Keisuke Kuroyanagi
f88f9dbbde
Move "#define LOG_TAG" before include defines.h.
...
Change-Id: Iacd2c2ea3878ad2cde5df36b15e1359d10244f60
2013-05-30 22:26:21 -07:00
Kurt Partridge
502ff08512
am e6125db9: Merge "Catch a permission exception"
...
* commit 'e6125db98d9e61841a4bde791ff0d9aed151f126':
Catch a permission exception
2013-05-30 17:31:37 -07:00
Kurt Partridge
e6125db98d
Merge "Catch a permission exception"
2013-05-31 00:30:14 +00:00
Ken Wakasa
e203961dd6
am a65c267b: Move some dictionary related implementations to the dictionary directory
...
* commit 'a65c267b1f1207e54c6f821148c600e3899b7f9c':
Move some dictionary related implementations to the dictionary directory
2013-05-30 16:16:35 -07:00
Kurt Partridge
d63f756013
Catch a permission exception
...
This change catches a SecurityException if the DictionaryProvider is
unavailable.
Change-Id: I4f2d87327c40765383d8847fd4e934b3cf799488
2013-05-30 13:40:40 -07:00
Tadashi G. Takaoka
cbb99c60be
Tidy up Utils class a bit
...
Change-Id: Idc2feb84a902a6cbb7265d1efe06c34e7d63c2c7
2013-05-31 00:32:57 +09:00
Ken Wakasa
a65c267b1f
Move some dictionary related implementations to the dictionary directory
...
Change-Id: I6fe71a540ad91ca46755be234abc8894242e2413
2013-05-31 00:02:57 +09:00
Tadashi G. Takaoka
15c671a3b6
am 7097aa2d: Merge "Cleanup unreadable variable names"
...
* commit '7097aa2d3d2fc4d314edebb43edc8a0552517630':
Cleanup unreadable variable names
2013-05-30 06:11:01 -07:00
Tadashi G. Takaoka
08870866cb
am d67db32b: Merge "Separate SuggestionStripLayoutHelper for readablity"
...
* commit 'd67db32b30a2d77e5e5733d62d6265c34c380947':
Separate SuggestionStripLayoutHelper for readablity
2013-05-30 06:10:59 -07:00
Tadashi G. Takaoka
7097aa2d3d
Merge "Cleanup unreadable variable names"
2013-05-30 13:09:27 +00:00
Tadashi G. Takaoka
d67db32b30
Merge "Separate SuggestionStripLayoutHelper for readablity"
2013-05-30 13:09:17 +00:00
The Android Automerger
d76cbb0e37
merge in jb-mr2-release history after reset to jb-mr2-dev
2013-05-30 05:56:10 -07:00
Ken Wakasa
4647c4c78e
am 424a173d: Merge "Move additional_proximity_chars to the layout directory"
...
* commit '424a173db8cd4dfd7b5a986310ec2d815a4eb171':
Move additional_proximity_chars to the layout directory
2013-05-30 05:21:55 -07:00
Ken Wakasa
424a173db8
Merge "Move additional_proximity_chars to the layout directory"
2013-05-30 12:18:10 +00:00
Jean Chalard
9a28541e05
am 1a50999e: Merge "Tell the text view we reset state on finish input"
...
* commit '1a50999ed9cfbffa03b8e034ec67f06a8e5c68ba':
Tell the text view we reset state on finish input
2013-05-30 04:55:31 -07:00
Jean Chalard
1a50999ed9
Merge "Tell the text view we reset state on finish input"
2013-05-30 11:53:50 +00:00
Jean Chalard
46b9bd068a
am faa7fbfa: Merge "Fix two strict mode warnings."
...
* commit 'faa7fbfaa27324608556699ab4c149d23e6a5f57':
Fix two strict mode warnings.
2013-05-30 04:23:59 -07:00
Jean Chalard
faa7fbfaa2
Merge "Fix two strict mode warnings."
2013-05-30 11:16:09 +00:00
Ken Wakasa
94da44e43e
Move additional_proximity_chars to the layout directory
...
Change-Id: Ie892ea9f3199a66e9d62a92a0e1ab2dff62826c3
2013-05-30 20:12:47 +09:00
Jean Chalard
e90d039e0c
Fix two strict mode warnings.
...
Bug: 9052555
Change-Id: I86e90488679a78a9f6e901b640025619293765a0
2013-05-30 20:12:05 +09:00
Ken Wakasa
f002debdfe
am 29432f84: Create a new directory for layout-related implementations
...
* commit '29432f843a8cd6ffb2be286104964592e80d77c9':
Create a new directory for layout-related implementations
2013-05-30 03:59:35 -07:00
Tadashi G. Takaoka
500a9752b1
Cleanup unreadable variable names
...
Change-Id: Ic97687c58e25e4b0c6833cc25d10854f5f513081
2013-05-30 19:49:51 +09:00
Tadashi G. Takaoka
653603b725
Separate SuggestionStripLayoutHelper for readablity
...
Change-Id: I82c749c6837c3af7ae290f4cd92f5426ca58b5c7
2013-05-30 19:49:20 +09:00
Ken Wakasa
29432f843a
Create a new directory for layout-related implementations
...
Change-Id: Ia227bb296f20dab0dfc03dfcde3a06c624eca76c
2013-05-30 19:45:53 +09:00
Jean Chalard
fd2f09aee8
am 8eb214d7: Merge "Fix dictionary pack preference order."
...
* commit '8eb214d7e198e25d48b56fa0a82b2861f817e23c':
Fix dictionary pack preference order.
2013-05-29 23:41:10 -07:00
Jean Chalard
8eb214d7e1
Merge "Fix dictionary pack preference order."
2013-05-30 06:38:27 +00:00
Baligh Uddin
73787ceaa2
Import translations. DO NOT MERGE
...
Change-Id: I4cd9c57839fe06e2555232074f84d21a45224baa
Auto-generated-cl: translation import
2013-05-29 23:03:48 -07:00
Jean Chalard
b3d150aa13
Fix dictionary pack preference order.
...
It turns out giving them in the right order is not enough, you
also have to actually give them a numeric priority.
Bug: 9165928
Change-Id: I2ecff38f65b70746feeeeb0ed2cc86a586a35363
2013-05-30 12:33:06 +09:00
Jean Chalard
b6822188fa
am ec9670ac: Merge "Rub some butter on dictionary list scrolling."
...
* commit 'ec9670ac3dfa74b81eff409fefa7460ce5175c4a':
Rub some butter on dictionary list scrolling.
2013-05-29 20:32:24 -07:00
Jean Chalard
ec9670ac3d
Merge "Rub some butter on dictionary list scrolling."
2013-05-30 03:31:05 +00:00
Keisuke Kuroyanagi
01d8810007
am 2ebe2009: Merge "Make DicTraverseSession having suggest options."
...
* commit '2ebe2009b393a6ff0aeeb4eeb8f39e7c19f016ba':
Make DicTraverseSession having suggest options.
2013-05-29 17:24:28 -07:00
Keisuke Kuroyanagi
2ebe2009b3
Merge "Make DicTraverseSession having suggest options."
2013-05-30 00:22:30 +00:00
Keisuke Kuroyanagi
338ef65077
Make DicTraverseSession having suggest options.
...
Change-Id: I2b802c06634e5226c763fd838f3fc0918fc4a161
2013-05-29 17:18:03 -07:00
Baligh Uddin
2d5e13ec31
am b4b72d43: (-s ours) Merge "Import translations. DO NOT MERGE"
...
* commit 'b4b72d438b76e10e7e609f0d2a493ccf09ebb9e4':
Import translations. DO NOT MERGE
2013-05-29 15:17:16 -07:00
Baligh Uddin
b4b72d438b
Merge "Import translations. DO NOT MERGE"
2013-05-29 21:52:43 +00:00