Tadashi G. Takaoka
0b971df9e3
am 93e2d777: Merge "Fix froyo-ub-LatinImeGoogle compatibility" into honeycomb
...
* commit '93e2d777418d5a4e547e60a379d8deb5658692ab':
Fix froyo-ub-LatinImeGoogle compatibility
2011-01-14 07:00:59 -08:00
Tadashi G. Takaoka
93e2d77741
Merge "Fix froyo-ub-LatinImeGoogle compatibility" into honeycomb
2011-01-14 06:59:01 -08:00
Tadashi G. Takaoka
fcfe64f4ed
am cb547f6d: am 5a88787e: Merge "Add SubtypeLocale class" into honeycomb
...
* commit 'cb547f6ddbc61126465a385799050d20cac8d8e0':
Add SubtypeLocale class
2011-01-14 05:28:39 -08:00
Tadashi G. Takaoka
ab074f0170
am 42b62c14: am c99c0ed9: Merge "Notify keyboard language on space bar when it has changed" into honeycomb
...
* commit '42b62c14401f443fcc717af777a12d52b7073fba':
Notify keyboard language on space bar when it has changed
2011-01-14 05:28:37 -08:00
Tadashi G. Takaoka
cb547f6ddb
am 5a88787e: Merge "Add SubtypeLocale class" into honeycomb
...
* commit '5a88787e674a2079f964f5ffaca7ae01cf979600':
Add SubtypeLocale class
2011-01-14 05:26:55 -08:00
Tadashi G. Takaoka
42b62c1440
am c99c0ed9: Merge "Notify keyboard language on space bar when it has changed" into honeycomb
...
* commit 'c99c0ed939bb441a4ee7b2c3eb643620f3dbce28':
Notify keyboard language on space bar when it has changed
2011-01-14 05:26:54 -08:00
Tadashi G. Takaoka
5a88787e67
Merge "Add SubtypeLocale class" into honeycomb
2011-01-14 05:25:47 -08:00
Tadashi G. Takaoka
c99c0ed939
Merge "Notify keyboard language on space bar when it has changed" into honeycomb
2011-01-14 05:25:35 -08:00
Tadashi G. Takaoka
34cee317d8
Fix froyo-ub-LatinImeGoogle compatibility
...
Change-Id: I46fca4735d08552dfb414b2b302b4ed97ae96ab0
2011-01-14 22:24:10 +09:00
Tadashi G. Takaoka
7a614e9439
Fix method.xml seetings activity name
...
Change-Id: Iba29f4168460e2f69200b8909f6726da726ac382
2011-01-14 22:22:17 +09:00
satok
16c9ad38b6
Fix build breakage
...
Change-Id: I027c0b4d7ed30b0ac69321e4a9f1ae9d03852f52
2011-01-14 21:45:43 +09:00
Tadashi G. Takaoka
de0c8874a4
Notify keyboard language on space bar when it has changed
...
This change also introduces the following.
* space bar language switcher is enabled for phone device.
* get rid of spcae key icon from number keyboard of tablet.
* slightly lower the position of language name on space bar of tablet.
Bug: 3290290
Change-Id: I432be8f757bcc84c257770112ff1f6fa7970c584
2011-01-14 20:11:52 +09:00
Tadashi G. Takaoka
e261ce9ac8
am 4bd63df9: am 297d6619: Add CHAR LIMIT to string resources
...
* commit '4bd63df9420e26084146f40bb92391ac0bb63912':
Add CHAR LIMIT to string resources
2011-01-14 02:17:37 -08:00
Tadashi G. Takaoka
4bd63df942
am 297d6619: Add CHAR LIMIT to string resources
...
* commit '297d6619b3fd450e6e300de6bda4b537068ff2fe':
Add CHAR LIMIT to string resources
2011-01-14 02:15:36 -08:00
satok
6014f1c92b
Merge remote branch 'goog/master' into merge
...
Conflicts:
java/src/com/android/inputmethod/latin/SubtypeSwitcher.java
Change-Id: I8a8c6d2c1f3bafb2f6e86a2381b88933b6ac3718
2011-01-14 19:14:36 +09:00
Tadashi G. Takaoka
297d6619b3
Add CHAR LIMIT to string resources
...
Bug: 2988183
Bug: 3276544
Change-Id: Ib5c2c86972b1ab32468cd0ab9370ec629255c54d
2011-01-14 18:29:35 +09:00
satok
e0df0fe957
am 44757e1e: am 1c835437: Merge "Do not triggerVoiceIME at changing subtype if IME is not shown." into honeycomb
...
* commit '44757e1e731af6f9f6aff0b3dff94a43a6c5c988':
Do not triggerVoiceIME at changing subtype if IME is not shown.
2011-01-14 00:25:36 -08:00
satok
44757e1e73
am 1c835437: Merge "Do not triggerVoiceIME at changing subtype if IME is not shown." into honeycomb
...
* commit '1c835437a54340ccd274f2a27373b1a8ec013105':
Do not triggerVoiceIME at changing subtype if IME is not shown.
2011-01-14 00:23:55 -08:00
satok
1c835437a5
Merge "Do not triggerVoiceIME at changing subtype if IME is not shown." into honeycomb
2011-01-14 00:22:03 -08:00
satok
a5d5a0ffbd
am b58d98fb: am 48f6ac68: Merge "Fix descriptions for strings. Bug: 2876541 Bug: 2988169" into honeycomb
...
* commit 'b58d98fb12190914ff7cb3c1d13da3c5b4f598ed':
Fix descriptions for strings. Bug: 2876541 Bug: 2988169
2011-01-13 23:35:53 -08:00
satok
b58d98fb12
am 48f6ac68: Merge "Fix descriptions for strings. Bug: 2876541 Bug: 2988169" into honeycomb
...
* commit '48f6ac68b795cf93674c8d41c074264f89ab83c3':
Fix descriptions for strings. Bug: 2876541 Bug: 2988169
2011-01-13 23:34:06 -08:00
satok
48f6ac68b7
Merge "Fix descriptions for strings. Bug: 2876541 Bug: 2988169" into honeycomb
2011-01-13 23:32:38 -08:00
Tadashi G. Takaoka
34d31b45e1
am c249c677: am 212368e8: Merge "Support "nm" (no mic) privateImeOptions" into honeycomb
...
* commit 'c249c6774d785c9870eef45c9073c56465015a3d':
Support "nm" (no mic) privateImeOptions
2011-01-13 23:13:29 -08:00
Tadashi G. Takaoka
e276d8ddaa
Add SubtypeLocale class
...
Change-Id: Ic4c73c313f976ad6df1b4ddf48b914d05a08d283
2011-01-14 16:12:36 +09:00
Tadashi G. Takaoka
c249c6774d
am 212368e8: Merge "Support "nm" (no mic) privateImeOptions" into honeycomb
...
* commit '212368e8771048ba6b60c6426eddc4192fd8b2e1':
Support "nm" (no mic) privateImeOptions
2011-01-13 23:11:40 -08:00
Tadashi G. Takaoka
212368e877
Merge "Support "nm" (no mic) privateImeOptions" into honeycomb
2011-01-13 23:09:38 -08:00
Tadashi G. Takaoka
5f0aaedc08
am bb4fc71b: am 96680f28: Use integer value instead of symbolic name for os version
...
* commit 'bb4fc71bb9b13511da2b863039441642f3208668':
Use integer value instead of symbolic name for os version
2011-01-13 21:54:17 -08:00
Tadashi G. Takaoka
bb4fc71bb9
am 96680f28: Use integer value instead of symbolic name for os version
...
* commit '96680f28e8e647307f0222500a59eb31ff463236':
Use integer value instead of symbolic name for os version
2011-01-13 21:52:27 -08:00
Tadashi G. Takaoka
96680f28e8
Use integer value instead of symbolic name for os version
...
Change-Id: I1574915ededf5d47d245a3f09692ebbbfe37e4c6
2011-01-14 14:48:23 +09:00
satok
b676d479e5
Merge remote branch 'goog/master' into merge
2011-01-14 14:29:00 +09:00
Tadashi G. Takaoka
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
Tadashi G. Takaoka
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
Tadashi G. Takaoka
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
satok
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
satok
543334cc21
Fix descriptions for strings.
...
Bug: 2876541
Bug: 2988169
Change-Id: I80130aa258e38f638b226448ba53a7efaeb6c3d7
2011-01-14 11:06:59 +09:00
Tadashi G. Takaoka
0f901aab36
Support "nm" (no mic) privateImeOptions
...
Bug: 3331635
Change-Id: Ide160b9317c8f7d966f879dd460640fc4f894e9b
2011-01-14 10:02:26 +09:00
Tadashi G. Takaoka
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
Tadashi G. Takaoka
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
satok
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
Tadashi G. Takaoka
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
Tadashi G. Takaoka
eead8c8311
Add discription for keyboard/voice subtype string resources
...
Bug: 3197096
Change-Id: I9dafcbf4d5775b3b928be54e546ac38042ece685
2011-01-13 11:52:15 +09:00
Tadashi G. Takaoka
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
Tadashi G. Takaoka
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
Tadashi G. Takaoka
a5627e4e1f
Merge "Reset old keyboard state before switching to new keyboard" into honeycomb
2011-01-11 22:54:26 -08:00
Tadashi G. Takaoka
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
Tadashi G. Takaoka
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
Eric Fischer
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
Tadashi G. Takaoka
e332d45253
Merge "Fix text color of main key labels in shifted state" into honeycomb
2011-01-11 03:56:23 -08:00
Tadashi G. Takaoka
5f35a89182
Merge "Remove stale suggestion divider drawable" into honeycomb
2011-01-11 03:51:34 -08:00
Tadashi G. Takaoka
926a110fd0
Fix text color of main key labels in shifted state
...
Bug: 3322539
Change-Id: Ib9bc54da8d3725f64c86dbe6d9700e386f74de5e
2011-01-11 20:41:40 +09:00
