b676d479e5
Merge remote branch 'goog/master' into merge
2011-01-14 14:29:00 +09:00
0b7fb06411
am dcd37c65: am 41f7fb51: Make input language selection settings work
...
* commit 'dcd37c65dd7b088fc3b490cf6a9fc2ea85784648':
Make input language selection settings work
2011-01-13 21:27:05 -08:00
dcd37c65dd
am 41f7fb51: Make input language selection settings work
...
* commit '41f7fb51b0966d76a70e8b927ab4f0f21b70107b':
Make input language selection settings work
2011-01-13 21:25:15 -08:00
41f7fb51b0
Make input language selection settings work
...
This change also tweaks the padding of candidate strip for phone.
Change-Id: Iefe4dfeb7015e11d5b2d1566121f719d60b1377e
2011-01-14 14:21:12 +09:00
e5585c1854
Merge remote branch 'goog/master' into merge
...
Conflicts:
java/src/com/android/inputmethod/latin/BinaryDictionary.java
java/src/com/android/inputmethod/latin/SubtypeSwitcher.java
Change-Id: Ib2b4acc9dd570d5f37b6aa455e2f07b0a884944a
2011-01-14 13:45:21 +09:00
543334cc21
Fix descriptions for strings.
...
Bug: 2876541
Bug: 2988169
Change-Id: I80130aa258e38f638b226448ba53a7efaeb6c3d7
2011-01-14 11:06:59 +09:00
0f901aab36
Support "nm" (no mic) privateImeOptions
...
Bug: 3331635
Change-Id: Ide160b9317c8f7d966f879dd460640fc4f894e9b
2011-01-14 10:02:26 +09:00
3481a5252d
am e2f682d5: (-s ours) am d650ab53: (-s ours) am 07a0fd0f: Reset old keyboard state before switching to new keyboard (DO NOT MERGE)
...
* commit 'e2f682d5fcdaba24f6bb4e730b2c12a449a07ea5':
Reset old keyboard state before switching to new keyboard (DO NOT MERGE)
2011-01-13 10:32:26 -08:00
e2f682d5fc
am d650ab53: (-s ours) am 07a0fd0f: Reset old keyboard state before switching to new keyboard (DO NOT MERGE)
...
* commit 'd650ab53036c6177502b6fb3c2ece776a22a882a':
Reset old keyboard state before switching to new keyboard (DO NOT MERGE)
2011-01-13 10:26:37 -08:00
255831206b
Do not triggerVoiceIME at changing subtype if IME is not shown.
...
Bug: 3325103
Change-Id: I5474553f0b55f286f573af80134e8ef1eeb39354
2011-01-13 21:05:29 +09:00
914ded10bc
am eead8c83: Add discription for keyboard/voice subtype string resources
...
* commit 'eead8c83119ac3941a759e02ec98f7bc56b7a19a':
Add discription for keyboard/voice subtype string resources
2011-01-13 01:16:42 -08:00
eead8c8311
Add discription for keyboard/voice subtype string resources
...
Bug: 3197096
Change-Id: I9dafcbf4d5775b3b928be54e546ac38042ece685
2011-01-13 11:52:15 +09:00
d650ab5303
am 07a0fd0f: Reset old keyboard state before switching to new keyboard (DO NOT MERGE)
...
* commit '07a0fd0f5100a0cee978ba07751d63595c9d27ac':
Reset old keyboard state before switching to new keyboard (DO NOT MERGE)
2011-01-12 17:46:36 -08:00
5c60220d8e
am a5627e4e: Merge "Reset old keyboard state before switching to new keyboard" into honeycomb
...
* commit 'a5627e4e1f7765b4b62a87fc8843179b5519cf18':
Reset old keyboard state before switching to new keyboard
2011-01-11 22:56:11 -08:00
a5627e4e1f
Merge "Reset old keyboard state before switching to new keyboard" into honeycomb
2011-01-11 22:54:26 -08:00
07a0fd0f51
Reset old keyboard state before switching to new keyboard (DO NOT MERGE)
...
Bug: 3322158
Change-Id: I8030202f9b1b491bd9b7acf5ce14b6d8f14db978
2011-01-12 14:13:39 +09:00
ee66e6fa90
Reset old keyboard state before switching to new keyboard
...
This change is ported version of I8030202f from Gingerbread.
Bug: 3322158
Change-Id: Idc1ef7f174b50b0478ba53b14427485275e97748
2011-01-12 14:13:32 +09:00
30bc656de1
am 5cc23550: (-s ours) am 4246861c: Merge "Import translations for additional languages." into gingerbread
...
* commit '5cc23550429ea12be7ecdb07fc7b9060c8465dc7':
Import translations for additional languages.
2011-01-11 14:56:13 -08:00
e332d45253
Merge "Fix text color of main key labels in shifted state" into honeycomb
2011-01-11 03:56:23 -08:00
5f35a89182
Merge "Remove stale suggestion divider drawable" into honeycomb
2011-01-11 03:51:34 -08:00
926a110fd0
Fix text color of main key labels in shifted state
...
Bug: 3322539
Change-Id: Ib9bc54da8d3725f64c86dbe6d9700e386f74de5e
2011-01-11 20:41:40 +09:00
7c6ffbc648
Remove stale suggestion divider drawable
...
Bug: 3329543
Change-Id: If96648bf88e1a69e01ebe00d31ddd46df1fca45c
2011-01-11 20:15:15 +09:00
aa5e92492e
Merge "Tweak keyboard icon" into honeycomb
2011-01-11 00:31:06 -08:00
e72a57deae
Tweak keyboard icon
...
Change-Id: I2c802c1c0c5f7e173285656ac47e3251ff97e44d
2011-01-11 17:28:27 +09:00
a776b7fc4a
Should update suggestion strip even if suggetion count is 1, in case typed word's length is 1
...
bug: 3320818
Change-Id: I98ac8e0649de5dfd8b886401d42f2e5bcc2a8a1a
2011-01-11 12:59:33 +09:00
2faf0a176c
Merge "Clean up: Update variable names to comply with spec of ApplicationInfo." into honeycomb
2011-01-10 09:05:34 -08:00
255c044b0e
Fix StringIndexOutOfBoundsException
...
bug: 3325065
Change-Id: Ic3d2dca5b2aa1681d472c7f96b31737e15f4952d
2011-01-09 18:44:28 +09:00
90d96615bc
Clean up: Update variable names to comply with spec of ApplicationInfo.
...
ApplicationInfo.sourceDir may or may not be apk file name. It can be a directory as well.
The spec just says it's "Full path to the location of this package".
Also, added error handling in loadDictionary().
Change-Id: I5e64d0aba4b1ec7634f4b3ac5537e7a774433ece
2011-01-09 16:53:33 +09:00
7a42a46069
Merge "Import some unabbreviated translations for large screens." into honeycomb
2011-01-07 12:58:09 -08:00
5cc2355042
am 4246861c: Merge "Import translations for additional languages." into gingerbread
...
* commit '4246861c60e6ea5a719991c8bc1c0c9461eb44d7':
Import translations for additional languages.
2011-01-07 10:48:42 -08:00
f73e76de00
Mark configuration strings untranslatable.
...
Change-Id: If8a35fe33e2091bcf95cc543e76df1184d52ce2b
2011-01-07 10:42:26 -08:00
4246861c60
Merge "Import translations for additional languages." into gingerbread
2011-01-07 10:33:01 -08:00
6d075dbda5
Merge "Get rid of the space bar symbol on the tablet." into honeycomb
2011-01-07 07:38:27 -08:00
715189fe6e
Get rid of the space bar symbol on the tablet.
...
bug: 3290290
Change-Id: I4c57151197989375e6e9f36f508e6e875f856654
2011-01-08 00:15:14 +09:00
e90b333017
Load main dic in native
...
Follow up to Id57dce51
bug: 3219819
Change-Id: I00e11ef21d0252ffa88c12dffb9c55b0f2e19a66
2011-01-07 19:51:45 +09:00
e494e4d13e
Import some unabbreviated translations for large screens.
...
Change-Id: Ifa1c25a7b2eb40fcaaddca06e3df1a66587cd3e3
2011-01-06 18:18:22 -08:00
0051d09d71
Import translations for additional languages.
...
Change-Id: I4a0df3d574fcb868d87120dc81a0ec0cf28be63c
2011-01-06 10:41:19 -08:00
f16028b92e
Remove digit popup characters from mini keyboard of tablet
...
Bug: 3321376
Change-Id: I38d963952d3c6d2cf1ad19a69b32f90191f17178
2011-01-07 01:12:15 +09:00
fd8f3a3aa0
Merge "Calculate mini keyboard key width from labels"
2011-01-06 06:18:27 -08:00
cc55d947ad
Calculate mini keyboard key width from labels
...
Change-Id: I4259753bd10fdf488fcffacb6b131e30511e780f
2011-01-06 22:40:20 +09:00
8f23d2c249
am 0b157cc6: (-s ours) am 7aedc8a0: Automaticaly snap back to the previous mode from sliding input (DO NOT MERGE)
...
* commit '0b157cc66f6ea9b7a638c425111dc5ae0f6d9709':
Automaticaly snap back to the previous mode from sliding input (DO NOT MERGE)
2011-01-05 23:02:27 -08:00
0b157cc66f
am 7aedc8a0: Automaticaly snap back to the previous mode from sliding input (DO NOT MERGE)
...
* commit '7aedc8a054aca41e6c80d8faf0ed2dd47f9815c4':
Automaticaly snap back to the previous mode from sliding input (DO NOT MERGE)
2011-01-05 23:00:54 -08:00
ca65332145
Merge "Remove Row object from MiniKeyboardBuilder"
2011-01-05 21:20:18 -08:00
f7425bb15b
Supress overflow at mulitplying demotion rate
...
Change-Id: I2003c5f88a5062b11e2f21522095bb94b1eb4efd
2011-01-05 16:43:17 +09:00
61e2f85e3f
Add profiler for native dictionary code
...
Change-Id: I2569756c9ef4fa677ae52f2ccfcb90d2115d129f
2011-01-05 15:47:29 +09:00
458249e703
Consolidate main dictionary files.
...
This change is a preparation for upcoming optimizations on dictionary file loading.
* We can consolidate dictionary files because we are no longer relying on Asset Manager.
* Stopping compressing dictionary files as planning to use mmap() on the region in the apk file.
* Probably we won't rely on Asset Manager. Instead we'll probably use offset and size obtained from AssetFileDescriptor.
Change-Id: Id57dce512fd3d2397a58628f8264bd824194da76
2011-01-05 11:31:58 +09:00
e89af1fa5f
Remove Row object from MiniKeyboardBuilder
...
Change-Id: I981278f29fdd23d80c3da21ecdbbda6d62a0dfde
2011-01-01 13:52:36 +09:00
a96574fdd5
Move NOT_A_TOUCH_COORDINATE constant to KeyboardActionListener
...
Change-Id: Iff3fde48682a7c56201fc9eb3640755e0090d0ee
2011-01-01 13:43:28 +09:00
7aedc8a054
Automaticaly snap back to the previous mode from sliding input (DO NOT MERGE)
...
This change is back porting of the following changes from Honeycomb.
- I48ea1346: Automaticaly snap back to the previous mode from sliding symbol input
- I9507a98c: Suppress haptic feedback while sliding key input
- Ia06e1abc: Cancel long press timer when sliding key input is not allowed
- I15127929: Fix checking of sliding off from key
- I2518dd1d: Fix potential keyboard layout change bug
- Iffaad1eb: Snap back to the previous keyboard when sliding input is canceled
- Id74bddef: Longer long-press timeout in sliding input
Bug: 3280151
Change-Id: If20b34e8773ebf081c2274d136be4f8ad07ca4fa
2011-01-01 01:24:04 +09:00
611044ab30
Merge "Snap back to the previous keyboard when sliding input is canceled"
2010-12-31 03:28:35 -08:00
satok
Tadashi G. Takaoka
Eric Fischer
Ken Wakasa