Commit graph

11694 commits

Author SHA1 Message Date
Jean Chalard
7aa9ff144a am 8b4023c4: Merge "Tiny cleanup"
* commit '8b4023c4d631d7ac240d8a30702c212b33595e0b':
  Tiny cleanup
2013-02-23 00:09:56 -08:00
Jean Chalard
1b05ecb7ba Merge "Pass the client ID to the dictionary pack in settings" 2013-02-23 08:08:34 +00:00
Jean Chalard
8b4023c4d6 Merge "Tiny cleanup" 2013-02-23 08:07:27 +00:00
Jean Chalard
cd0f9aef05 am 2521edec: Fix a bug with the passed dictionary id
* commit '2521edec09373b2810093462c89221a2aca9e369':
  Fix a bug with the passed dictionary id
2013-02-22 23:12:35 -08:00
Jean Chalard
3c3b3c8690 Pass the client ID to the dictionary pack in settings
Bug: 6789534
Bug: 8256209
Change-Id: Ib63c18e7f18117ba888324febea13da47332b6c6
2013-02-22 21:24:15 -08:00
Jean Chalard
2521edec09 Fix a bug with the passed dictionary id
We used to make the dictionary that we passed to the
dictionary pack as an initial value based on the locale.
This is wrong - it should be read from the dictionary.
This change fixes that.

Bug: 7005813
Change-Id: Ib08ed31dd9c216f6f7b9c6c3174ca514bf96e06f
2013-02-22 20:49:48 -08:00
Jean Chalard
da0d771fe9 Tiny cleanup
Change-Id: I5d7150a4abb3a498e790f41af569093217cb8b43
2013-02-22 19:42:45 -08:00
Jean Chalard
df32362794 am 8f794c72: Merge "Fix how the Enter action is decided"
* commit '8f794c72db07786c866e357c7853c339882b45ef':
  Fix how the Enter action is decided
2013-02-22 16:16:01 -08:00
Jean Chalard
8f794c72db Merge "Fix how the Enter action is decided" 2013-02-23 00:13:27 +00:00
Jean Chalard
4e4f88127b Fix how the Enter action is decided
This unifies the software and hardware keyboard code
under a single decision process that works.

Bug: 8129303
Bug: 8152758
Change-Id: I7574c563d5f957d57bfe62fe5e3eec59a519d335
2013-02-22 16:01:37 -08:00
Baligh Uddin
a3e561dcb6 am 97a5246f: (-s ours) Merge "Import translations. DO NOT MERGE"
* commit '97a5246f7661be4d25e3dd905fd4de476e872bf0':
  Import translations. DO NOT MERGE
2013-02-22 15:51:50 -08:00
Baligh Uddin
97a5246f76 Merge "Import translations. DO NOT MERGE" 2013-02-22 23:49:17 +00:00
Baligh Uddin
76cf68d1a8 Merge "Import translations. DO NOT MERGE" into jb-ub-latinimegoogle 2013-02-22 23:47:27 +00:00
Kurt Partridge
b9825bf30e am b5c2033a: Merge "[TestPrep8] Narrow try/catch scope"
* commit 'b5c2033aa526b91b9ef3b71691a3ae11f657e135':
  [TestPrep8] Narrow try/catch scope
2013-02-22 11:39:44 -08:00
Kurt Partridge
b5c2033aa5 Merge "[TestPrep8] Narrow try/catch scope" 2013-02-22 19:36:32 +00:00
Baligh Uddin
beae302efe Import translations. DO NOT MERGE
Change-Id: I75753bfe196bf52c7ec5534ce1996e035ea0f956
Auto-generated-cl: translation import
2013-02-22 10:51:10 -08:00
Baligh Uddin
7a54c7a52d Import translations. DO NOT MERGE
Change-Id: I86cb41c3f86a29bac9a3f93b6692e3f787156fdd
Auto-generated-cl: translation import
2013-02-22 10:46:46 -08:00
Kurt Partridge
3e279243c1 am c3252cfa: Merge "[TestPrep7] Encapsulate JsonWriter creation"
* commit 'c3252cfaf750d706f7280d32d1259e4367670bd9':
  [TestPrep7] Encapsulate JsonWriter creation
2013-02-22 06:15:40 -08:00
Kurt Partridge
c3252cfaf7 Merge "[TestPrep7] Encapsulate JsonWriter creation" 2013-02-22 14:12:49 +00:00
Tom Ouyang
6ff234ba70 am c95d005c: Merge "Use common incremental decoder output scale."
* commit 'c95d005c8aae0f55135efdba5564c58f83219f62':
  Use common incremental decoder output scale.
2013-02-21 20:22:28 -08:00
Tom Ouyang
c95d005c8a Merge "Use common incremental decoder output scale." 2013-02-22 04:19:34 +00:00
Kurt Partridge
744b363ae8 [TestPrep8] Narrow try/catch scope
Change-Id: If15f250feb81c2ad55ce1bc7dc3dafa57de87aef
2013-02-21 17:01:08 -08:00
Kurt Partridge
78c1ad32e6 [TestPrep7] Encapsulate JsonWriter creation
Change-Id: I4e97fa28dd0bb1101edc0db03f024432fee6f6fe
2013-02-21 17:01:08 -08:00
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