Commit graph

1072 commits

Author SHA1 Message Date
satok
9c383385d5 Merge remote branch 'goog/master' into merge
Conflicts:
	java/src/com/android/inputmethod/latin/Settings.java
	java/src/com/android/inputmethod/latin/SubtypeSwitcher.java
	java/src/com/android/inputmethod/voice/VoiceIMEConnector.java

Change-Id: If30410c4814c3224f87698c165312494c0efca23
2011-01-19 20:33:55 +09:00
Jean Chalard
89764ad4ac Simplify text correction settings in latin IME.
Conditionally remove the "Quick fixes", "Bigram suggestions" and
"Usability study mode" options, depending on configuration.
When disabled, have the quick fixes and bigram option become
false if autocorrect is off, and true otherwise.
Also reorder options to bring "Auto correction" above "Show
suggestions".

bug: 3282448

Change-Id: Ib7fd928be417a816ef9e21423a531773069b7468
2011-01-19 20:08:46 +09:00
Jean Chalard
ce9c417184 Change separator titles in settings screen.
Add a "General" category to enclose general settings, and rename
"Word suggestion settings" to "Text correction".

bug: 3282448

Change-Id: Ie695683af0646974da82e29e11d1c3a785ef46c7
2011-01-19 19:50:14 +09:00
satok
ce4b2d2dab Merge "Add a safety net for auto-correction." into honeycomb 2011-01-19 01:02:28 -08:00
satok
82411d47ba Add a safety net for auto-correction.
Bug: 3353956

Change-Id: I6a32632b2f986f0d9a07aa72f256a2c41cc09873
2011-01-19 17:54:22 +09:00
Ken Wakasa
86f189fd96 Fix NPE
bug: 3364217
Change-Id: If6a2514a8feac509d7b6716c8574521a0ec0fa3e
2011-01-19 17:44:51 +09:00
Tadashi G. Takaoka
08ca36d038 Merge "Pressing shift could turn off shift state while auto capitalize mode" into honeycomb 2011-01-18 19:18:01 -08:00
Jean Chalard
8b0febc6f0 Merge "Simplify latin IME settings page." into honeycomb 2011-01-18 19:08:15 -08:00
Tadashi G. Takaoka
d01ae897d3 Pressing shift could turn off shift state while auto capitalize mode
Bug: 3363137
Change-Id: I442c1fbb185ad9ea16ee9bab70649f2b9f89400c
2011-01-19 11:59:45 +09:00
Luca Zanolin
bbd651a008 Change the UI of Voice IME to be more like Voice Search.
There has been a bit of refactoring in RecognitionView in particular to fix the portrait layout.

The main issues found were:

- the size of the keyboard is specified in inches, and
(cm)(inches + inches) != ((cm) inches) + ((cm) inches))

- the height of keyboard background is high as the landscape keyboard, but it higher than
the portrait keyboard. This is not an issue on LatinKeyboard, as it overwrite the
onMeasure method. However, if I use the same image background in RelativeLayout
the Relative layout height is set to the height of the background, thus higher than the keyboard

- the change configuration was not propageted correctly

Change-Id: Id5dca425826997c573ccae7a085d5ddc9719733b
2011-01-18 15:49:17 +00:00
satok
da9eb5946c Merge "Disable auto-correct when previous suggestion candidates are shown" into honeycomb 2011-01-18 05:12:17 -08:00
Tadashi G. Takaoka
26df6b508a Merge "Load keyboard correctly when subtype has been changed to keyboard" into honeycomb 2011-01-18 05:11:31 -08:00
satok
cff6d09595 Disable auto-correct when previous suggestion candidates are shown
Change-Id: I16717f0c67950297a077a15b2b6492180c0bc54b
2011-01-18 22:07:58 +09:00
Tadashi G. Takaoka
3f652e2477 Merge "Clear composing text when the auto-corrected word is reverted" into honeycomb 2011-01-18 04:44:45 -08:00
Tadashi G. Takaoka
c1c4ee6b3a Load keyboard correctly when subtype has been changed to keyboard
Bug: 3299191
Change-Id: I5d75898aca5de25d9955efac52979097e529990b
2011-01-18 21:44:02 +09:00
Tadashi G. Takaoka
30be3f9845 Clear composing text when the auto-corrected word is reverted
Bug: 3363133

Change-Id: Ib7582ad354ba16eb8ebc9f0b4f51c8ec3790f578
2011-01-18 21:01:26 +09:00
Jean Chalard
fd7d814c81 Simplify latin IME settings page.
Do not show the recorrection option on xlarge terminals,
and make it true by default. Also, bring the Auto-capitalization
at the top of the settings page.

Issue: 3282448
Change-Id: I51a9ae6c7e496be2970107277f0a4ac65b12821e
2011-01-18 18:41:15 +09:00
Tadashi G. Takaoka
4e73674943 Merge "Add settings key to table keyboard" into honeycomb 2011-01-18 00:50:51 -08:00
Tadashi G. Takaoka
7ab9f601cc Add settings key to table keyboard
Bug: 3351762

Change-Id: Ibee1cf42af2f53017d83034f069b19be6657acbb
2011-01-18 16:27:40 +09:00
Jean Chalard
6c381b38cc Remove the keyboard popup option by default.
Add an option to mask the sound on keypress preference, and
make it false on xlarge terminals by default.

bug: 3282448

Change-Id: I747272d9edf854dc229aa620836cfa35a437d13f
2011-01-18 16:26:11 +09:00
satok
7766340cac Add debug log for subtypes.
Change-Id: I7941adeab3357db1ceb7bc0c9c01a01d6ac9cf98
2011-01-18 13:52:14 +09:00
Tadashi G. Takaoka
d5a6b910e8 Purge keyboard only when voice input will be invoked
This change also draws the language name in light gray on spacebar
without fading out even when the keyboard locale has not been changed.

Bug: 3362369
Bug: 3361915
Change-Id: I66538b03ce2e48c3441091319d0377176f8118ec
2011-01-18 11:41:12 +09:00
Tadashi G. Takaoka
9835307690 Merge "Preserve punctuation character after canceling auto correction" into honeycomb 2011-01-17 06:07:01 -08:00
Tadashi G. Takaoka
a0ff76638c Merge "Make sure that keyboard is not displayed when voice mode" into honeycomb 2011-01-17 05:49:00 -08:00
Tadashi G. Takaoka
04f815eca4 Make sure that keyboard is not displayed when voice mode
Bug: 3352347

Change-Id: I43cf5159f8bdcf2bc2c9a48662ea44a43ad4e25d
2011-01-17 22:41:05 +09:00
Tadashi G. Takaoka
504e8d5171 Preserve punctuation character after canceling auto correction
Bug: 3230708
Change-Id: I939ca19c9c08d9b79658261b1e654a66af5cc493
2011-01-17 22:37:36 +09:00
Tadashi G. Takaoka
8cc6e8e5c3 Merge "Fix voice key enable status has not been reflected to keyboard id" into honeycomb 2011-01-17 04:57:28 -08:00
Tadashi G. Takaoka
90a916170f Disable suggestion strip by default for tablet
Bug: 3352374
Change-Id: Ic2fed4ecd6d73f6c2d0ad81061ecd266f4704b10
2011-01-17 19:59:33 +09:00
Tadashi G. Takaoka
8bec4aa912 Fix voice key enable status has not been reflected to keyboard id
Bug: 3355428
Change-Id: Id4e572357a7b5603e9a609b7e80b81d8e2c500f6
2011-01-17 19:27:39 +09:00
Tadashi G. Takaoka
dc64b138b5 Revert I432be8f7 partially
This change reverts removing SubtypeSwitcher.onConfigurationChanged by careless in I432be8f7.
Bug: 3290290

Change-Id: I796ea01877d61eb750dabdeb3fdbf87666646c56
2011-01-17 17:52:15 +09:00
Tadashi G. Takaoka
9d446fc13f Merge "Place language name at center of spacebar if no space icon" into honeycomb 2011-01-17 00:39:01 -08:00
Tadashi G. Takaoka
66432cfc9b Place language name at center of spacebar if no space icon
This change also leaves the language name as light grayed after fading out.

Bug: 3290290

Change-Id: I71adf80c9a3b77d2fd34bca458845d85d55cbee7
2011-01-17 17:04:53 +09:00
Ken Wakasa
3ff0fb77ce Merge "Fixes in close() in BinaryDictionary." into honeycomb 2011-01-16 23:12:55 -08:00
Ken Wakasa
da50e1e98d Fixes in close() in BinaryDictionary.
Avoid using 'synchronized' in finalizer as well.

bug: 3340837
Change-Id: I9b28f54e4490ecb844ba33a379f71b625e4246a2
2011-01-17 15:58:07 +09:00
satok
f250c56a38 Allow implicitly enabled subtypes in subtype switcher.
Change-Id: I30cd9df85fd1927ee9c3bfbe0574167d4953a765
2011-01-17 14:46:25 +09:00
Tadashi G. Takaoka
67e08bb0fb Invoke voice recognition certainly onStartInputView
Bug: 3352347

Change-Id: I80763c0a48ebf1ecd23549d78269421ebb40d206
2011-01-15 06:13:34 +09:00
Tadashi G. Takaoka
93e2d77741 Merge "Fix froyo-ub-LatinImeGoogle compatibility" into honeycomb 2011-01-14 06:59:01 -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
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
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
1c835437a5 Merge "Do not triggerVoiceIME at changing subtype if IME is not shown." into honeycomb 2011-01-14 00:22:03 -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
e276d8ddaa Add SubtypeLocale class
Change-Id: Ic4c73c313f976ad6df1b4ddf48b914d05a08d283
2011-01-14 16:12:36 +09:00
Tadashi G. Takaoka
212368e877 Merge "Support "nm" (no mic) privateImeOptions" into honeycomb 2011-01-13 23:09:38 -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
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