81bbef3dac
am c5da4365: Merge "[Rlog2] ResearchLogging fix multi-space logging"
...
* commit 'c5da4365fbe6ff23a8db381ee7de6fa43fd7086b':
[Rlog2] ResearchLogging fix multi-space logging
2012-12-17 16:36:03 -08:00
c5da4365fb
Merge "[Rlog2] ResearchLogging fix multi-space logging"
2012-12-17 16:33:57 -08:00
3370dc8237
[Rlog2] ResearchLogging fix multi-space logging
...
multi-space logging should look like single-space logging, missing a few minor log statements
(SuggestionUpdates, SetComposingText)
multi-project commit with I2af842348c2f2b8f7271ac5b63def245e83df24d
Change-Id: Icd3187c0d0377255f82787afffea657c14345803
2012-12-17 09:53:43 -08:00
47622165f1
am e57e9fbd: Merge "Remove AudioManagerCompatWrapper.java"
...
* commit 'e57e9fbd18a572c6fb4c7ac385a12ec4ca984f74':
Remove AudioManagerCompatWrapper.java
2012-12-17 02:51:37 -08:00
e31cd2f453
am fbe83245: Clean up SuggestionSpanUtils for API level 14+
...
* commit 'fbe83245c9392aadbda6f47b514b047094e2182f':
Clean up SuggestionSpanUtils for API level 14+
2012-12-17 02:50:23 -08:00
e57e9fbd18
Merge "Remove AudioManagerCompatWrapper.java"
2012-12-17 02:50:18 -08:00
fbe83245c9
Clean up SuggestionSpanUtils for API level 14+
...
Change-Id: Iadc235524341b48e7618e9ce05907c786409e004
2012-12-17 19:41:44 +09:00
1e6edb3e57
Remove AudioManagerCompatWrapper.java
...
It is actually no longer needed for API 14+
Change-Id: I379809eae881351fdf210dd8eaa5e0b5662fb59f
2012-12-17 18:27:20 +09:00
5636930439
am 96b22200: Privatize a few constants in BinaryDictionary.java
...
* commit '96b22200beb98fd1a6288f4cf53e38611a09cdd0':
Privatize a few constants in BinaryDictionary.java
2012-12-17 00:52:39 -08:00
96b22200be
Privatize a few constants in BinaryDictionary.java
...
Change-Id: I7defaf1f577fd67e678cac83ff935e8181dd0a48
2012-12-17 17:46:57 +09:00
68fd58c3c1
am 4b39f000: Merge "Show last valid suggestions when gesture typing gets no suggestion"
...
* commit '4b39f0007502e696197521dcb0772c090d18b031':
Show last valid suggestions when gesture typing gets no suggestion
2012-12-16 23:43:54 -08:00
4b39f00075
Merge "Show last valid suggestions when gesture typing gets no suggestion"
2012-12-16 23:41:29 -08:00
f21a491ad8
Show last valid suggestions when gesture typing gets no suggestion
...
Bug: 7679566
Change-Id: Ie68c7698144c7576b5814ee35664309bcfdcbf0f
2012-12-17 16:19:10 +09:00
147bbc150c
am 609fb7d9: Merge "Show last valid suggestions when tap typing gets no suggestion"
...
* commit '609fb7d9400ecd88fefe9c6455e71c974e897488':
Show last valid suggestions when tap typing gets no suggestion
2012-12-16 22:55:11 -08:00
609fb7d940
Merge "Show last valid suggestions when tap typing gets no suggestion"
2012-12-16 22:53:13 -08:00
ac2f4c0191
am c3363e8e: Merge "Refactor most probable string"
...
* commit 'c3363e8e34301e6120ae13f34d14ac40149b7392':
Refactor most probable string
2012-12-16 22:38:19 -08:00
c3363e8e34
Merge "Refactor most probable string"
2012-12-16 22:36:12 -08:00
e0349619ac
Refactor most probable string
...
Change-Id: Ic14f1632f219f844c65a2e9c78d5ecf635e8234e
2012-12-17 15:24:08 +09:00
b808188b2f
Show last valid suggestions when tap typing gets no suggestion
...
Bug: 7872809
Change-Id: Ib5a255de7968aba214249c1b934327d248a15efd
2012-12-17 14:32:18 +09:00
3e6d4d0311
am d15e80d6: (-s ours) am 1b770503: (-s ours) Reconcile with jb-mr1.1-release - do not merge
...
* commit 'd15e80d6e2c32d4342e9e0b0d05305032f19c51a':
2012-12-14 16:53:03 -08:00
d15e80d6e2
am 1b770503: (-s ours) Reconcile with jb-mr1.1-release - do not merge
...
* commit '1b770503394da4968fdabf5c39190edf60031f59':
2012-12-14 16:48:52 -08:00
18bfb1be7c
am 8c15e913: resolved conflicts for merge of d48d6fee to master
...
* commit '8c15e91344a5e97ca069200070745c4384f40750':
Use the amended user dictionary word for insertion
2012-12-14 16:47:51 -08:00
8c15e91344
resolved conflicts for merge of d48d6fee to master
...
Change-Id: I21141956135debe737453dba87617671b1716d0a
2012-12-15 09:44:39 +09:00
1b77050339
Reconcile with jb-mr1.1-release - do not merge
...
Change-Id: I53296de92b1846263d7aa2dc588d13d3bd7ce930
2012-12-14 14:03:42 -08:00
a610aa2bc5
merge in jb-mr1.1-release history after reset to jb-mr1.1-dev
2012-12-14 13:56:23 -08:00
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
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
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
39b5396f8e
Merge "[Rlog1] Track time of log statements"
2012-12-14 06:08:20 -08:00
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
fcfe965538
am edbb65be: Reset composing state at onFinishInputView
...
* commit 'edbb65be3e5e391affbf47e134422ac1d1a4ae13':
Reset composing state at onFinishInputView
2012-12-14 01:08:39 -08:00
edbb65be3e
Reset composing state at onFinishInputView
...
Bug: 7709817
Change-Id: Icac0b8cb28209d98d291d8f00be55e33af5bf696
2012-12-14 17:48:13 +09:00
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
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
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
be68b41ccb
Fix more suggestion window asymmetry bug in N7.
...
Bug: 7711822
Change-Id: I63ba13b1c160cf55b8820a08e6e28fa666dd2580
2012-12-13 21:01:30 -08:00
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
1f4f404e1f
Merge "Refactor more keys menu framework (part 2)"
2012-12-13 18:51:37 -08:00
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
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
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
e5a306831d
Import translations. DO NOT MERGE
...
Change-Id: I79b5cd68250ee30f66803400420cd1bfa22642e7
Auto-generated-cl: translation import
2012-12-13 12:12:28 -08:00
6106553cdb
Import translations. DO NOT MERGE
...
Change-Id: I58479b3df35b63d9552ad2a4d0d7fa7e56d52435
Auto-generated-cl: translation import
2012-12-13 12:08:11 -08:00
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
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
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
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
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
0c2b8ad598
Import translations. DO NOT MERGE
...
Change-Id: Ibf642f4e63ce4ecc97163c544ec6cb2b5a56eea7
Auto-generated-cl: translation import
2012-12-12 13:58:20 -08:00
425486ae65
Import translations. DO NOT MERGE
...
Change-Id: Ie8bd0ecea2eab760a88ca676c4c0465b751a3531
Auto-generated-cl: translation import
2012-12-12 13:53:41 -08:00
Kurt Partridge
Ken Wakasa
Tadashi G. Takaoka
Satoshi Kataoka
The Android Open Source Project
The Android Automerger
Jean Chalard
Tom Ouyang
Baligh Uddin