Commit graph

10250 commits

Author SHA1 Message Date
Ken Wakasa
8c15e91344 resolved conflicts for merge of d48d6fee to master
Change-Id: I21141956135debe737453dba87617671b1716d0a
2012-12-15 09:44:39 +09:00
The Android Open Source Project
1b77050339 Reconcile with jb-mr1.1-release - do not merge
Change-Id: I53296de92b1846263d7aa2dc588d13d3bd7ce930
2012-12-14 14:03:42 -08:00
The Android Automerger
a610aa2bc5 merge in jb-mr1.1-release history after reset to jb-mr1.1-dev 2012-12-14 13:56:23 -08:00
Jean Chalard
d48d6feedd am db6f21c6: am 18d688c9: Use the amended user dictionary word for insertion
* commit 'db6f21c6792fe07a733572e1d4978f46b5462c35':
  Use the amended user dictionary word for insertion
2012-12-14 11:01:56 -08:00
Jean Chalard
db6f21c679 am 18d688c9: Use the amended user dictionary word for insertion
* commit '18d688c94bb8e1e26de2d12445cb3096c6126f75':
  Use the amended user dictionary word for insertion
2012-12-14 10:59:21 -08:00
Kurt Partridge
e82902bc73 am 39b5396f: Merge "[Rlog1] Track time of log statements"
* commit '39b5396f8e70eaac73d4c5eaa2bfede32a3f1f49':
  [Rlog1] Track time of log statements
2012-12-14 06:10:18 -08:00
Kurt Partridge
39b5396f8e Merge "[Rlog1] Track time of log statements" 2012-12-14 06:08:20 -08:00
Jean Chalard
18d688c94b Use the amended user dictionary word for insertion
When the user edits a word before adding it to the user
dictionary, the keyboard should replace whatever was
committed before with the amended version.

Bug: 7725834
Change-Id: I1a417be6c5a86d6a96bc2c76aca314ad8f1202a9
2012-12-14 20:28:22 +09:00
Tadashi G. Takaoka
fcfe965538 am edbb65be: Reset composing state at onFinishInputView
* commit 'edbb65be3e5e391affbf47e134422ac1d1a4ae13':
  Reset composing state at onFinishInputView
2012-12-14 01:08:39 -08:00
Tadashi G. Takaoka
edbb65be3e Reset composing state at onFinishInputView
Bug: 7709817
Change-Id: Icac0b8cb28209d98d291d8f00be55e33af5bf696
2012-12-14 17:48:13 +09:00
Tom Ouyang
7f0e083bef am ac69ab40: Refactor more keys menu framework (part 3)
* commit 'ac69ab400d1ea4f90b4ca24486d62212decf1069':
  Refactor more keys menu framework (part 3)
2012-12-13 23:32:31 -08:00
Tom Ouyang
ac69ab400d Refactor more keys menu framework (part 3)
Make it possible to re-enter gesture input even after triggering the long-press
menu. This is useful for new users who may pause at the start of a word. Works
for both single and bi-manual gestures.

Bug: 7595193
Change-Id: Ieaecfd5385ed6c10ae9347b99c2e35a0de5e895d
2012-12-13 21:45:51 -08:00
Tom Ouyang
e75a48cdbb am be68b41c: Fix more suggestion window asymmetry bug in N7.
* commit 'be68b41ccb1a16201c3b91f1576a731f7715aaf6':
  Fix more suggestion window asymmetry bug in N7.
2012-12-13 21:14:01 -08:00
Tom Ouyang
be68b41ccb Fix more suggestion window asymmetry bug in N7.
Bug: 7711822
Change-Id: I63ba13b1c160cf55b8820a08e6e28fa666dd2580
2012-12-13 21:01:30 -08:00
Tom Ouyang
a818c69a4c am 1f4f404e: Merge "Refactor more keys menu framework (part 2)"
* commit '1f4f404e1f753db5cbe675e0088064e3c64e0953':
  Refactor more keys menu framework (part 2)
2012-12-13 18:52:56 -08:00
Tom Ouyang
1f4f404e1f Merge "Refactor more keys menu framework (part 2)" 2012-12-13 18:51:37 -08:00
Kurt Partridge
5e854e281a [Rlog1] Track time of log statements
Log statements are now recorded with a timestamp.  This is important for filtering out statements
not part of words that are sampled when spaces are inserted automatically.

multi-project commit with Change-Id: I68221a2528045d25632aef4bb716f92a4f4a56a4

Change-Id: I46ac9b3b1dcbb08425160d0109028cb64445139c
2012-12-13 18:44:10 -08:00
Tom Ouyang
35580bad6f Refactor more keys menu framework (part 2)
- Integrate pointer tracking between more keys menu, more suggestions menu, and main keyboard.
- Adds multi-touch support for more keys menus. Long press with one finger and select keys with another finger.

Bug: 7508007

Change-Id: I394f28cd79e342d6bcfea573af72aa33b9def00f
2012-12-13 13:17:28 -08:00
Baligh Uddin
e75666634d am e5a30683: (-s ours) Import translations. DO NOT MERGE
* commit 'e5a306831d9d8326fa4643540fdef9e839e2f4f1':
  Import translations. DO NOT MERGE
2012-12-13 12:59:53 -08:00
Baligh Uddin
e5a306831d Import translations. DO NOT MERGE
Change-Id: I79b5cd68250ee30f66803400420cd1bfa22642e7
Auto-generated-cl: translation import
2012-12-13 12:12:28 -08:00
Baligh Uddin
6106553cdb Import translations. DO NOT MERGE
Change-Id: I58479b3df35b63d9552ad2a4d0d7fa7e56d52435
Auto-generated-cl: translation import
2012-12-13 12:08:11 -08:00
Tadashi G. Takaoka
484a94ca11 am 8eaf75aa: Fix label of switch to symbols key when symbols has shortcut key
* commit '8eaf75aa7bfa471e17626b1741f63475353bf36b':
  Fix label of switch to symbols key when symbols has shortcut key
2012-12-13 02:01:40 -08:00
Tadashi G. Takaoka
4bfc89b5bd am ac3720ce: Fix layout switch keys\' label of no language subtype keyboard
* commit 'ac3720ce6d5d9a0084c9275d0e0f3e846c5b27c6':
  Fix layout switch keys' label of no language subtype keyboard
2012-12-13 01:49:49 -08:00
Tadashi G. Takaoka
8eaf75aa7b Fix label of switch to symbols key when symbols has shortcut key
This change fixes the labels of switch to symbols key and switch back
from more symbols key when symbols layout has shortcut key.

Change-Id: I3fbbef2d929486d0f0542f4d89cb086d9f5bad82
2012-12-13 17:44:40 +09:00
Tadashi G. Takaoka
ac3720ce6d Fix layout switch keys' label of no language subtype keyboard
This change moves the following string from resources to
KeyboardTextsSet.
- label_to_alpha_key
- label_to_symbols_key
- label_to_symbols_with_microphone_key

Bug: 7697799
Change-Id: Icf9b8848de4c70f792e336f2ae274dab12be79ee
2012-12-13 17:44:10 +09:00
Baligh Uddin
34117769aa am 0c2b8ad5: (-s ours) Import translations. DO NOT MERGE
* commit '0c2b8ad5982fec3d1db3ac9a6d1232eebc68161a':
  Import translations. DO NOT MERGE
2012-12-12 14:06:18 -08:00
Baligh Uddin
0c2b8ad598 Import translations. DO NOT MERGE
Change-Id: Ibf642f4e63ce4ecc97163c544ec6cb2b5a56eea7
Auto-generated-cl: translation import
2012-12-12 13:58:20 -08:00
Baligh Uddin
425486ae65 Import translations. DO NOT MERGE
Change-Id: Ie8bd0ecea2eab760a88ca676c4c0465b751a3531
Auto-generated-cl: translation import
2012-12-12 13:53:41 -08:00
Satoshi Kataoka
6687c96318 am e775073b: Merge "Fix typing incremental decoder"
* commit 'e775073b727e4348f9dd2d056a2e811d9dfeca73':
  Fix typing incremental decoder
2012-12-12 03:41:44 -08:00
Satoshi Kataoka
e775073b72 Merge "Fix typing incremental decoder" 2012-12-12 03:39:22 -08:00
Satoshi Kataoka
0519fdd18a Fix typing incremental decoder
Change-Id: Ia55d5c0200738c81f93530b3680bc3f37c0b2e28
2012-12-12 20:36:19 +09:00
Ken Wakasa
bda6214523 am 692cd00e: Small cleanups
* commit '692cd00ea3178cfe2c9f331150682ec78d8e6cd1':
  Small cleanups
2012-12-11 17:56:41 -08:00
Ken Wakasa
692cd00ea3 Small cleanups
Change-Id: I29b4dee15d66f8f1372035738658234395001d41
2012-12-11 23:52:22 +09:00
Jean Chalard
f73d94a8fd am dd8d2a89: Merge "Remove a useless member"
* commit 'dd8d2a89c55f099ddb66dff3daa36dce98ed9b32':
  Remove a useless member
2012-12-11 02:44:55 -08:00
Jean Chalard
dd8d2a89c5 Merge "Remove a useless member" 2012-12-11 02:42:54 -08:00
Jean Chalard
f1b464da31 Remove a useless member
Change-Id: Id13e0aeec6ec3655d6bb0edc7f8f7821e7dc5a36
2012-12-11 19:15:24 +09:00
Satoshi Kataoka
0be1651f95 am 7ead070d: Merge "Calculate isContinuationPossible for typing"
* commit '7ead070db5ed717daf7ea482cc4340f2a17ae556':
  Calculate isContinuationPossible for typing
2012-12-10 23:25:53 -08:00
Satoshi Kataoka
7ead070db5 Merge "Calculate isContinuationPossible for typing" 2012-12-10 23:24:37 -08:00
Baligh Uddin
29edfd48b8 am e5147c05: (-s ours) Import translations. DO NOT MERGE
* commit 'e5147c055b24dcbf0732c699d1d1608d812558b3':
  Import translations. DO NOT MERGE
2012-12-10 21:33:59 -08:00
Satoshi Kataoka
fe4f1ce26c Calculate isContinuationPossible for typing
Change-Id: I11edb1e5155e5048a6c95f84b36e2ef34572178c
2012-12-11 12:51:02 +09:00
Baligh Uddin
e5147c055b Import translations. DO NOT MERGE
Change-Id: Ib94a9091267b18039cf8e1ff66107fb773ce1fed
Auto-generated-cl: translation import
2012-12-10 11:27:04 -08:00
Baligh Uddin
c3ea701a92 Import translations. DO NOT MERGE
Change-Id: I000b6d4bee0812dfca6728150d0aa5355317c40d
Auto-generated-cl: translation import
2012-12-10 11:22:52 -08:00
Ken Wakasa
97e4b52380 am 082507e1: Header clean up
* commit '082507e1da56c6cefe575ec3d6a334e9b717e3fa':
  Header clean up
2012-12-10 06:46:12 -08:00
Ken Wakasa
082507e1da Header clean up
Change-Id: If9b2ea4ed8c1c4cf73463f0ac4bc63d4bb8cba42
2012-12-10 23:41:45 +09:00
Ken Wakasa
dcf3ac9179 am fc799ba0: Clean up sign conversions in binary_format.h (done by -Wsign-conversion)
* commit 'fc799ba03c53869a62a46544c3c2524a66cda328':
  Clean up sign conversions in binary_format.h (done by -Wsign-conversion)
2012-12-10 03:34:35 -08:00
Ken Wakasa
fc799ba03c Clean up sign conversions in binary_format.h (done by -Wsign-conversion)
Change-Id: I9ca88c22ee5bbb66d50640e1d96021fbe71fc8ab
2012-12-10 20:23:18 +09:00
Satoshi Kataoka
17b00c9531 am 203b2138: Fix build breakage.
* commit '203b2138136bc00219d371897237f6b0b1795b9c':
  Fix build breakage.
2012-12-10 02:17:04 -08:00
Satoshi Kataoka
203b213813 Fix build breakage.
Change-Id: I01b00827a3099097c1181a4ae91498a6cd14c3ca
2012-12-10 19:13:47 +09:00
Jean Chalard
d2d5e8f8e5 am d080986f: Update dictionaries
* commit 'd080986f939290cbe0687e6bf11c438d1f26b835':
  Update dictionaries
2012-12-09 22:03:15 -08:00
Jean Chalard
d080986f93 Update dictionaries
>>> dictionaries/en_GB_wordlist.combined.gz
Header :
  date : 1354870724 <=> 1355112440
  version : 27 <=> 28
Body :
Deleted: DoCoMo 65
Added: Docomo 65
Added: KDDI 25
Added: Softbank 25

>>> dictionaries/en_US_wordlist.combined.gz
Header :
  date : 1354870736 <=> 1355112451
  version : 27 <=> 28
Body :
Deleted: DoCoMo 65
Added: Docomo 65
Added: KDDI 25
Added: Softbank 25

>>> dictionaries/en_wordlist.combined.gz
Header :
  date : 1354870744 <=> 1355112460
  version : 27 <=> 28
Body :
Deleted: DoCoMo 65
Added: Docomo 65
Added: KDDI 25
Added: Softbank 25

>>> dictionaries/es_wordlist.combined.gz
Header :
  date : 1351676002 <=> 1355117676
  version : 26 <=> 28
Body :
Deleted: DoCoMo 40
Added: Docomo 40
Added: KDDI 25
Added: Softbank 25

>>> dictionaries/fi_wordlist.combined.gz
Header :
  date : 1351676054 <=> 1355117691
  version : 26 <=> 28
Body :
Deleted: DoCoMo 28
Added: Docomo 28
Added: KDDI 25
Added: Softbank 25

>>> dictionaries/fr_wordlist.combined.gz
Header :
  date : 1354872988 <=> 1355117708
  version : 27 <=> 28
Body :
Deleted: DoCoMo 52
Added: Docomo 52
Added: KDDI 25
Added: Softbank 25

>>> dictionaries/pt_PT_wordlist.combined.gz
Header :
  date : 1351676510 <=> 1355117723
  version : 26 <=> 28
Body :
Deleted: DoCoMo 48
Added: Docomo 48
Added: Softbank 25

>>> java/res/raw/main_en.dict
Header :
  date : 1354870744 <=> 1355112460
  version : 27 <=> 28
Body :
Deleted: DoCoMo 65
Added: Docomo 65
Added: KDDI 25
Added: Softbank 25

>>> java/res/raw/main_es.dict
Header :
  date : 1353500806 <=> 1355117676
  version : 27 <=> 28
Body :
Deleted: DoCoMo 40
Added: Docomo 40
Added: KDDI 25
Added: Softbank 25

>>> java/res/raw/main_fr.dict
Header :
  date : 1354872988 <=> 1355117708
  version : 27 <=> 28
Body :
Deleted: DoCoMo 52
Added: Docomo 52
Added: KDDI 25
Added: Softbank 25

Change-Id: I3801cbe4535407f55ede8db327674d493a92d1ae
2012-12-10 14:52:43 +09:00