Commit graph

10921 commits

Author SHA1 Message Date
Kurt Partridge
8375f4f2c5 am 07050549: Merge "[TestPrep5] Parameterize MainLogBuffer"
* commit '07050549b1f91a787fadb553cc834f9833617041':
  [TestPrep5] Parameterize MainLogBuffer
2013-02-21 15:54:42 -08:00
Kurt Partridge
07050549b1 Merge "[TestPrep5] Parameterize MainLogBuffer" 2013-02-21 23:52:05 +00:00
Tom Ouyang
31f7ece470 Use common incremental decoder output scale.
Change-Id: Ib6bd7be45be9229a075b6a8feb46c67ec75a9b06
2013-02-21 15:42:44 -08:00
Kurt Partridge
8cda557824 am bf0d6af3: Merge "[TestPrep4] Add some finals"
* commit 'bf0d6af3d38c1637b40ed9e844fc05471274a2d7':
  [TestPrep4] Add some finals
2013-02-21 14:15:38 -08:00
Kurt Partridge
4d13c6667d am 7c996475: Merge "[TestPrep3] Add helper method to retrive dictionary"
* commit '7c996475d8531af413c09d4ece51423b96edd172':
  [TestPrep3] Add helper method to retrive dictionary
2013-02-21 14:15:37 -08:00
Kurt Partridge
14ff187c39 am c8a1ec6e: Merge "[TestPrep2] Rename a method"
* commit 'c8a1ec6e4128240a8f666120dbc3fb066a717f00':
  [TestPrep2] Rename a method
2013-02-21 14:15:35 -08:00
Kurt Partridge
be28c0c0b5 am 4e5a4ddb: Merge "[TestPrep1] Move MotionEvent.Action strings to LoggingUtils"
* commit '4e5a4ddbd06c3e98e931a789c13a9920fb3b4e16':
  [TestPrep1] Move MotionEvent.Action strings to LoggingUtils
2013-02-21 14:15:34 -08:00
Satoshi Kataoka
099d3825ba am 2b47513d: Merge "add defines"
* commit '2b47513de13ef0bb2a994b9506ce6e388eb7b68c':
  add defines
2013-02-21 14:15:33 -08:00
Tadashi G. Takaoka
0e713e96b0 am 07296cf7: Merge "Use WordComposer.addKeyInfo for testing"
* commit '07296cf7fffad7282aee24d9313636cf64ffb178':
  Use WordComposer.addKeyInfo for testing
2013-02-21 14:15:32 -08:00
Tadashi G. Takaoka
c1b8f5f56c am 46878544: Add preliminary setup wizard
* commit '46878544ec894fd3db368e183404a01c3e3ecc92':
  Add preliminary setup wizard
2013-02-21 14:15:31 -08:00
Kurt Partridge
bf0d6af3d3 Merge "[TestPrep4] Add some finals" 2013-02-21 22:13:05 +00:00
Kurt Partridge
7c996475d8 Merge "[TestPrep3] Add helper method to retrive dictionary" 2013-02-21 21:18:32 +00:00
Kurt Partridge
c8a1ec6e41 Merge "[TestPrep2] Rename a method" 2013-02-21 15:57:34 +00:00
Kurt Partridge
4e5a4ddbd0 Merge "[TestPrep1] Move MotionEvent.Action strings to LoggingUtils" 2013-02-21 14:54:46 +00:00
Satoshi Kataoka
2b47513de1 Merge "add defines" 2013-02-21 13:30:08 +00:00
Satoshi Kataoka
bc25b80525 add defines
Change-Id: I8bc009bf258cbdf01e15dc63a7a8afad47db5d96
2013-02-21 21:59:28 +09:00
Tadashi G. Takaoka
07296cf7ff Merge "Use WordComposer.addKeyInfo for testing" 2013-02-21 06:20:01 +00:00
Kurt Partridge
ab0bda1499 [TestPrep5] Parameterize MainLogBuffer
Change-Id: I6d84f490922cd1f40e44ca4f95c9d950fba38290
2013-02-20 19:37:12 -08:00
Kurt Partridge
22acdb540c [TestPrep4] Add some finals
Change-Id: Ib437a6ad7fd6a897e2bbc65afe881ae8a3b1cbb0
2013-02-20 19:37:12 -08:00
Kurt Partridge
19e05359e6 [TestPrep3] Add helper method to retrive dictionary
Change-Id: Id6e03c6f8a3e96979d589f0605ac056fcad7e1ff
2013-02-20 19:36:56 -08:00
Kurt Partridge
b6d05aeb7c [TestPrep2] Rename a method
Change-Id: Id9a72045afa3558b20b9d63c8720fb7443d34fd9
2013-02-20 17:13:00 -08:00
Kurt Partridge
8d429bf1a8 [TestPrep1] Move MotionEvent.Action strings to LoggingUtils
Change-Id: I7b9ed800552f2fd546ed21e9dc06ea1ff5798337
2013-02-20 17:12:56 -08:00
Tadashi G. Takaoka
46878544ec Add preliminary setup wizard
Bug: 8159728
Change-Id: I30d9cd637fb1d2e64588550e0aa4387bc1f7e6e5
2013-02-21 09:54:02 +09:00
Ed Heyl
1b460780a6 am 77391900: Merge remote-tracking branch \'goog/jb-mr2-release\'
* commit '7739190083f80152a9aa55eb8c76ed156fc277e3':
  Don't try to issue delete() commands on missing provider
2013-02-20 13:59:24 -08:00
Ed Heyl
7739190083 Merge remote-tracking branch 'goog/jb-mr2-release' 2013-02-20 13:47:33 -08:00
The Android Automerger
7c3ba9e7fe merge in jb-mr2-release history after reset to master 2013-02-20 05:56:17 -08:00
Tadashi G. Takaoka
5701a6647f Use WordComposer.addKeyInfo for testing
Change-Id: I500654e7a26717aa5547942357e56060afb72969
2013-02-20 17:09:25 +09:00
Satoshi Kataoka
1277809edf am c3c9539c: Merge "Add debug output"
* commit 'c3c9539c7d0cd8d5fc6edaa257d8038d875c8c26':
  Add debug output
2013-02-19 22:58:11 -08:00
Satoshi Kataoka
c3c9539c7d Merge "Add debug output" 2013-02-20 06:55:57 +00:00
Satoshi Kataoka
d1fff1adcc Add debug output
Change-Id: I45fd249a6536e438125782e6e7800760f8e8d426
2013-02-20 15:53:44 +09:00
The Android Automerger
361a766f81 merge in jb-mr2-release history after reset to master 2013-02-19 09:52:05 -08:00
Tadashi G. Takaoka
c4932d2616 am da348e11: Fix layout direction of Keyboard and Suggestions view
* commit 'da348e11ad43b5eaf70a6bad8551a86cd43a6512':
  Fix layout direction of Keyboard and Suggestions view
2013-02-18 00:26:15 -08:00
Tadashi G. Takaoka
da348e11ad Fix layout direction of Keyboard and Suggestions view
Bug: 8167348
Change-Id: I5e0432707fff1dd3032686b733ba28bef305173a
2013-02-18 16:32:34 +09:00
Jean Chalard
a2f89c525d am d4cbc4fd: Implement getting data files with protocol v2
* commit 'd4cbc4fd078cbb23be4eafe1cb82a8a470fca3a0':
  Implement getting data files with protocol v2
2013-02-15 19:41:27 -08:00
Jean Chalard
d4cbc4fd07 Implement getting data files with protocol v2
This also does it for deleting them
Bug: 8167342
Bug: 6789534
Change-Id: I1823f98508881f109a667146d3608003f87aa4cb
2013-02-15 11:09:16 -08:00
Jean Chalard
9cf5e32879 am 4beaab2a: Merge "Determine the protocol version of the dictionary pack"
# Via Android (Google) Code Review (1) and Jean Chalard (1)
* commit '4beaab2a88ce616bdc8ca35248d65c1b649943a9':
  Determine the protocol version of the dictionary pack
2013-02-14 12:23:53 -08:00
Jean Chalard
4beaab2a88 Merge "Determine the protocol version of the dictionary pack" 2013-02-14 20:22:09 +00:00
The Android Automerger
09f5eff4e9 merge in jb-mr2-release history after reset to master 2013-02-14 05:56:25 -08:00
Tadashi G. Takaoka
65bc373452 am 4c53e144: Merge "Add placeholder of keyboard setup wizard"
# Via Android (Google) Code Review (1) and Tadashi G. Takaoka (1)
* commit '4c53e144c184a7b084e9deecf5d1f1fe01ec1af9':
  Add placeholder of keyboard setup wizard
2013-02-14 01:05:37 -08:00
Tadashi G. Takaoka
4c53e144c1 Merge "Add placeholder of keyboard setup wizard" 2013-02-14 09:03:45 +00:00
Tadashi G. Takaoka
cb0beaf3f1 Add placeholder of keyboard setup wizard
Bug: 8159728
Change-Id: I5552e9d0ffa8f94d183e76378d55bba6f718adfe
2013-02-14 18:00:11 +09:00
Satoshi Kataoka
ba5d3dac56 am f9097056: Merge "clean up seach key vector"
# Via Android (Google) Code Review (1) and Satoshi Kataoka (1)
* commit 'f9097056f2ee5fd9044443963568c15649c7da37':
  clean up seach key vector
2013-02-14 00:49:46 -08:00
Satoshi Kataoka
f9097056f2 Merge "clean up seach key vector" 2013-02-14 08:47:53 +00:00
Satoshi Kataoka
e5cdd21102 clean up seach key vector
Bug: 8197301

Change-Id: I6a67d2914bd44b3ceca655adcd65c9c42796b026
2013-02-14 17:04:34 +09:00
Jean Chalard
b1f27a2e26 Determine the protocol version of the dictionary pack
...for query.

Bug: 8167342
Change-Id: Ieb8e5b31c4b62bf507593c4631e31799aad5f267
2013-02-13 20:45:36 -08:00
Ken Wakasa
18cd7011f7 am 2834f522: Merge "Prep for GCC 4.6 that will be used in unbundled branches"
# Via Android (Google) Code Review (1) and Ken Wakasa (1)
* commit '2834f522b78d57ee862c5444e389a3834ba6de63':
  Prep for GCC 4.6 that will be used in unbundled branches
2013-02-13 18:29:04 -08:00
Ken Wakasa
2834f522b7 Merge "Prep for GCC 4.6 that will be used in unbundled branches" 2013-02-14 02:25:06 +00:00
Kurt Partridge
d4d515f4bf am de3e5fbf: Merge "Cleanup in preparation for tests"
# Via Android (Google) Code Review (1) and Kurt Partridge (1)
* commit 'de3e5fbf9dfb2e4e34095e0c34e8aec8d8de02f5':
  Cleanup in preparation for tests
2013-02-13 15:35:50 -08:00
Kurt Partridge
de3e5fbf9d Merge "Cleanup in preparation for tests" 2013-02-13 23:34:07 +00:00
Jean Chalard
81d09321f8 am d1f80f72: Merge "Clean up dictionary pack presence test."
# Via Android (Google) Code Review (1) and Jean Chalard (1)
* commit 'd1f80f72e33f79ae8ed94a279a9969cc238a83a7':
  Clean up dictionary pack presence test.
2013-02-13 11:42:08 -08:00