Commit Graph

14443 Commits

Author SHA1 Message Date
Kurt Partridge
82d98e7a48 am 4efb5c3b: Merge "Remove uncommit on reverting batch input"
* commit '4efb5c3b65733f985081146e018f7d4a3740c728':
  Remove uncommit on reverting batch input
2013-06-02 19:55:10 -07:00
Kurt Partridge
4efb5c3b65 Merge "Remove uncommit on reverting batch input" 2013-06-03 02:54:33 +00:00
Ken Wakasa
fe712a295c am f497e1e5: Move suggest_options.h to suggest/core
* commit 'f497e1e5a0be0a6268bd5f27e6f61308c69c7b63':
  Move suggest_options.h to suggest/core
2013-06-02 19:49:56 -07:00
Ken Wakasa
f497e1e5a0 Move suggest_options.h to suggest/core
Change-Id: Ie95872a4c90ee3089183c1ebafb67243bd2688a4
2013-06-03 11:45:06 +09:00
Keisuke Kuroyanagi
8ff5c03bf0 am 712fefd8: Merge "Use BinaryDictonaryInfo instead of raw pointers."
* commit '712fefd85fa024259b81e50e98b18b749b9bde69':
  Use BinaryDictonaryInfo instead of raw pointers.
2013-06-02 17:55:55 -07:00
Keisuke Kuroyanagi
712fefd85f Merge "Use BinaryDictonaryInfo instead of raw pointers." 2013-06-03 00:51:44 +00:00
Keisuke Kuroyanagi
0ecfb94247 Use BinaryDictonaryInfo instead of raw pointers.
Bug: 6669677

Change-Id: I9792a872f1609de7c1ba0fc08d916047d6724c0b
2013-06-02 16:34:42 -07:00
Keisuke Kuroyanagi
12e2bd2575 am 88ad30f4: Move dictionary format independent probability calculation methods to ProbabilityUtils.
* commit '88ad30f40b05128d891fd412bb684bdbdc514446':
  Move dictionary format independent probability calculation methods to ProbabilityUtils.
2013-06-01 20:28:48 -07:00
Keisuke Kuroyanagi
88ad30f40b Move dictionary format independent probability calculation methods to ProbabilityUtils.
Bug: 6669677
Change-Id: Idc09a2fbb04e4d843e11313011178022177616aa
2013-06-01 14:08:20 -07:00
Kurt Partridge
4165ef031f Remove uncommit on reverting batch input
Currently when the user reverts a batch input, a LogUnit is uncommitted
from the LogBuffer.  It should not be, because the LogUnit containing the
batch input is never committed in the first place (it is only committed
to the LogBuffer when a key is pressed or a new batch input is entered).

Bug: 9088919

Change-Id: I323af453ce082437a663ccae977b21b775a964bc
2013-06-01 11:15:47 -07:00
Baligh Uddin
8c5fec2bd8 am d3ccd4bf: (-s ours) Merge "Import translations. DO NOT MERGE"
* commit 'd3ccd4bf22c01c02edbed1b6642569d6110167fb':
  Import translations. DO NOT MERGE
2013-06-01 08:21:16 -07:00
Baligh Uddin
d3ccd4bf22 Merge "Import translations. DO NOT MERGE" 2013-05-31 23:19:22 +00:00
Ken Wakasa
f80e2abb0c am 1dae936f: Merge "Move char_utils to the dictionary directory"
* commit '1dae936f23026d3eeec1f4511303104128d5da5f':
  Move char_utils to the dictionary directory
2013-05-31 04:43:34 -07:00
Ken Wakasa
1dae936f23 Merge "Move char_utils to the dictionary directory" 2013-05-31 11:41:33 +00:00
Ken Wakasa
464d3ba432 Move char_utils to the dictionary directory
Change-Id: Id397485407fe63600c9bb5c80d223042942b4d8a
2013-05-31 20:39:34 +09:00
Jean Chalard
f6a4670d1c am 26f48949: Fix the displayed status after download
* commit '26f489493eb3a1ccb9cb0ab55627bee4c74a6fd2':
  Fix the displayed status after download
2013-05-31 04:29:58 -07:00
Jean Chalard
26f489493e Fix the displayed status after download
Bug: 9166225
Change-Id: I7490593d88a5854b9e675b9ead89d2ea9b49315c
2013-05-31 20:28:15 +09:00
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
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