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
86497c88d2
am 16dc76af: am 89764ad4: Simplify text correction settings in latin IME.
...
* commit '16dc76af4d73838fd5a5148a91a0a47fe2c56906':
Simplify text correction settings in latin IME.
2011-01-19 03:14:53 -08:00
16dc76af4d
am 89764ad4: Simplify text correction settings in latin IME.
...
* commit '89764ad4ac5415fb9753c38671b1fa18b9cdd390':
Simplify text correction settings in latin IME.
2011-01-19 03:13:44 -08:00
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
19bca2a227
am aa4e054d: am ce9c4171: Change separator titles in settings screen.
...
* commit 'aa4e054dd69ffe597f9e06aa0d6eeb2c30585184':
Change separator titles in settings screen.
2011-01-19 03:00:43 -08:00
aa4e054dd6
am ce9c4171: Change separator titles in settings screen.
...
* commit 'ce9c4171842d37fccb2cc5fe0cbcba06998ddf32':
Change separator titles in settings screen.
2011-01-19 02:59:37 -08:00
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
029511cc04
am 1e6d3910: am ce4b2d2d: Merge "Add a safety net for auto-correction." into honeycomb
...
* commit '1e6d39104814083011d556376974f241e51a8bed':
Add a safety net for auto-correction.
2011-01-19 01:08:00 -08:00
1e6d391048
am ce4b2d2d: Merge "Add a safety net for auto-correction." into honeycomb
...
* commit 'ce4b2d2daba8005c2c07a995c8a145ee812f56ff':
Add a safety net for auto-correction.
2011-01-19 01:05:39 -08:00
ce4b2d2dab
Merge "Add a safety net for auto-correction." into honeycomb
2011-01-19 01:02:28 -08:00
82411d47ba
Add a safety net for auto-correction.
...
Bug: 3353956
Change-Id: I6a32632b2f986f0d9a07aa72f256a2c41cc09873
2011-01-19 17:54:22 +09:00
c11184638e
am 53746972: am 86f189fd: Fix NPE
...
* commit '53746972d0dda9cbbf3d49cfa71271eaeb5cfe5b':
Fix NPE
2011-01-19 00:51:48 -08:00
53746972d0
am 86f189fd: Fix NPE
...
* commit '86f189fd969de7259a0e0fcc1cf868ba667f3e3b':
Fix NPE
2011-01-19 00:50:18 -08:00
86f189fd96
Fix NPE
...
bug: 3364217
Change-Id: If6a2514a8feac509d7b6716c8574521a0ec0fa3e
2011-01-19 17:44:51 +09:00
35abc2d89a
am d2e931f7: am 08ca36d0: Merge "Pressing shift could turn off shift state while auto capitalize mode" into honeycomb
...
* commit 'd2e931f782f53d26bde25e5436030ae50e641a26':
Pressing shift could turn off shift state while auto capitalize mode
2011-01-18 22:02:52 -08:00
25952f8d96
am b66c0c2a: am 8b0febc6: Merge "Simplify latin IME settings page." into honeycomb
...
* commit 'b66c0c2a18874cd215408d1a5e872ee0db5f38b9':
Simplify latin IME settings page.
2011-01-18 22:02:50 -08:00
d2e931f782
am 08ca36d0: Merge "Pressing shift could turn off shift state while auto capitalize mode" into honeycomb
...
* commit '08ca36d0383a7d222d58709f55c497f3432dc229':
Pressing shift could turn off shift state while auto capitalize mode
2011-01-18 19:19:46 -08:00
08ca36d038
Merge "Pressing shift could turn off shift state while auto capitalize mode" into honeycomb
2011-01-18 19:18:01 -08:00
b66c0c2a18
am 8b0febc6: Merge "Simplify latin IME settings page." into honeycomb
...
* commit '8b0febc6f0b6c2bd2a7b135fe1e1b7ff296727c1':
Simplify latin IME settings page.
2011-01-18 19:10:46 -08:00
8b0febc6f0
Merge "Simplify latin IME settings page." into honeycomb
2011-01-18 19:08:15 -08:00
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
7c3a7616d2
am fb3183ef: am bbd651a0: Change the UI of Voice IME to be more like Voice Search.
...
* commit 'fb3183efe049798b7dbecdfcbb049009d44b5a66':
Change the UI of Voice IME to be more like Voice Search.
2011-01-18 08:49:57 -08:00
17e7849214
am 934e3e5f: am da9eb594: Merge "Disable auto-correct when previous suggestion candidates are shown" into honeycomb
...
* commit '934e3e5fbd31fa45a3e37a9a1b71dcf58b07d1e6':
Disable auto-correct when previous suggestion candidates are shown
2011-01-18 08:49:56 -08:00
ee18c00e83
am fa9e2595: am 26df6b50: Merge "Load keyboard correctly when subtype has been changed to keyboard" into honeycomb
...
* commit 'fa9e2595f5e173fb45af8431e7a339a1a00aceaa':
Load keyboard correctly when subtype has been changed to keyboard
2011-01-18 08:49:51 -08:00
9b76ac088f
am 5e51f2be: am 3f652e24: Merge "Clear composing text when the auto-corrected word is reverted" into honeycomb
...
* commit '5e51f2be32cf9f57355ac77e9952d6d03ef92175':
Clear composing text when the auto-corrected word is reverted
2011-01-18 08:49:48 -08:00
ef645b5606
am d8796c79: am 4e736749: Merge "Add settings key to table keyboard" into honeycomb
...
* commit 'd8796c7981010c8e71e5de920428fb8c4e93788a':
Add settings key to table keyboard
2011-01-18 08:49:44 -08:00
ec23ffdac8
am 626f8979: am 6c381b38: Remove the keyboard popup option by default.
...
* commit '626f897977f09b7fa458a63d907df20fa4c43043':
Remove the keyboard popup option by default.
2011-01-18 08:49:42 -08:00
5327e9a32c
am 09882fae: am 7766340c: Add debug log for subtypes.
...
* commit '09882fae81e10f783a491373b6cad4e7aac7279f':
Add debug log for subtypes.
2011-01-18 08:49:38 -08:00
886d800efd
am e02cf109: am d5a6b910: Purge keyboard only when voice input will be invoked
...
* commit 'e02cf109644ab5ed8d6e3503e1a3bba4657dc60e':
Purge keyboard only when voice input will be invoked
2011-01-18 08:49:34 -08:00
fb3183efe0
am bbd651a0: Change the UI of Voice IME to be more like Voice Search.
...
* commit 'bbd651a00898dabf6b2ae0e715d99953ea81063f':
Change the UI of Voice IME to be more like Voice Search.
2011-01-18 08:26:58 -08:00
934e3e5fbd
am da9eb594: Merge "Disable auto-correct when previous suggestion candidates are shown" into honeycomb
...
* commit 'da9eb5946c0b0a9050f63c5caf13cc50011c0caf':
Disable auto-correct when previous suggestion candidates are shown
2011-01-18 08:26:49 -08:00
fa9e2595f5
am 26df6b50: Merge "Load keyboard correctly when subtype has been changed to keyboard" into honeycomb
...
* commit '26df6b508a2c429a3f7833964ea4df5a77fedaa1':
Load keyboard correctly when subtype has been changed to keyboard
2011-01-18 08:26:47 -08:00
5e51f2be32
am 3f652e24: Merge "Clear composing text when the auto-corrected word is reverted" into honeycomb
...
* commit '3f652e24770bcdaa682e8596b5795f7a3d2fc608':
Clear composing text when the auto-corrected word is reverted
2011-01-18 08:26:43 -08:00
d8796c7981
am 4e736749: Merge "Add settings key to table keyboard" into honeycomb
...
* commit '4e736749430039b0b60792184927963b808d65be':
Add settings key to table keyboard
2011-01-18 08:25:56 -08:00
626f897977
am 6c381b38: Remove the keyboard popup option by default.
...
* commit '6c381b38cc19cc8174a7620e5726314a79ed7e43':
Remove the keyboard popup option by default.
2011-01-18 08:25:53 -08:00
09882fae81
am 7766340c: Add debug log for subtypes.
...
* commit '7766340cac9b79408c307e05460e30d7aca899e0':
Add debug log for subtypes.
2011-01-18 08:25:10 -08:00
e02cf10964
am d5a6b910: Purge keyboard only when voice input will be invoked
...
* commit 'd5a6b910e83de6dea3c5813cbf5e219abaccdf8a':
Purge keyboard only when voice input will be invoked
2011-01-18 08:24:45 -08:00
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
da9eb5946c
Merge "Disable auto-correct when previous suggestion candidates are shown" into honeycomb
2011-01-18 05:12:17 -08:00
26df6b508a
Merge "Load keyboard correctly when subtype has been changed to keyboard" into honeycomb
2011-01-18 05:11:31 -08:00
cff6d09595
Disable auto-correct when previous suggestion candidates are shown
...
Change-Id: I16717f0c67950297a077a15b2b6492180c0bc54b
2011-01-18 22:07:58 +09:00
3f652e2477
Merge "Clear composing text when the auto-corrected word is reverted" into honeycomb
2011-01-18 04:44:45 -08:00
c1c4ee6b3a
Load keyboard correctly when subtype has been changed to keyboard
...
Bug: 3299191
Change-Id: I5d75898aca5de25d9955efac52979097e529990b
2011-01-18 21:44:02 +09:00
30be3f9845
Clear composing text when the auto-corrected word is reverted
...
Bug: 3363133
Change-Id: Ib7582ad354ba16eb8ebc9f0b4f51c8ec3790f578
2011-01-18 21:01:26 +09:00
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
4e73674943
Merge "Add settings key to table keyboard" into honeycomb
2011-01-18 00:50:51 -08:00
7ab9f601cc
Add settings key to table keyboard
...
Bug: 3351762
Change-Id: Ibee1cf42af2f53017d83034f069b19be6657acbb
2011-01-18 16:27:40 +09:00
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
7766340cac
Add debug log for subtypes.
...
Change-Id: I7941adeab3357db1ceb7bc0c9c01a01d6ac9cf98
2011-01-18 13:52:14 +09:00
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
satok
Jean Chalard
Ken Wakasa
Tadashi G. Takaoka
Luca Zanolin