Tadashi G. Takaoka
b3861a41b5
resolved conflicts for merge of f73d2386
to master
...
Change-Id: I3f7d3cf35e5df888e397e61acc9786972a1fda4c
2011-01-26 00:49:20 +09:00
Ken Wakasa
071bf799c7
am e16e692f: am 3b46ae53: Merge "Automatically layout mini keyboard" into honeycomb
...
* commit 'e16e692fa4cd1a52fe1e4f4ad07786fddefe7829':
Automatically layout mini keyboard
2011-01-25 07:37:54 -08:00
Ken Wakasa
f73d2386dc
am 6d0ff1d0: Merge "Revert "Implement callback to handle touch event outside SoftInputWindow"" into honeycomb
...
* commit '6d0ff1d070584cd30753b7425be39fc578f198c3':
Revert "Implement callback to handle touch event outside SoftInputWindow"
2011-01-25 07:28:20 -08:00
Ken Wakasa
e16e692fa4
am 3b46ae53: Merge "Automatically layout mini keyboard" into honeycomb
...
* commit '3b46ae535f673d3efd489c087281e02c2ff4e575':
Automatically layout mini keyboard
2011-01-25 07:27:58 -08:00
Ken Wakasa
6d0ff1d070
Merge "Revert "Implement callback to handle touch event outside SoftInputWindow"" into honeycomb
2011-01-25 05:42:22 -08:00
Ken Wakasa
3b46ae535f
Merge "Automatically layout mini keyboard" into honeycomb
2011-01-25 05:32:41 -08:00
Tadashi G. Takaoka
04c96ab966
Automatically layout mini keyboard
...
Bug: 2214959
Change-Id: I06370e1c9e0683666ad19454a2fb501008af95c0
2011-01-25 20:36:11 +09:00
Tadashi G. Takaoka
00eb365873
Revert "Implement callback to handle touch event outside SoftInputWindow"
...
This reverts commit de59a84029
(Ie8d4469b).
The requested feature has been implemented by I92d98bed.
Bug: 3238092
Change-Id: I9d53030b3d5c9a0f24883292a93576a3231813aa
2011-01-25 19:27:10 +09:00
satok
f9da196b0c
am 302e5b3c: am 099b4dc6: Merge "Avoid disk writes on UI thread." into honeycomb
...
* commit '302e5b3cfd2283dabcab68d34f3709e044f522e6':
Avoid disk writes on UI thread.
2011-01-25 02:11:20 -08:00
satok
302e5b3cfd
am 099b4dc6: Merge "Avoid disk writes on UI thread." into honeycomb
...
* commit '099b4dc6ec4cf727e88ebea2a3d88b1ecc0ae55a':
Avoid disk writes on UI thread.
2011-01-25 02:05:50 -08:00
satok
099b4dc6ec
Merge "Avoid disk writes on UI thread." into honeycomb
2011-01-25 01:58:09 -08:00
Jean Chalard
bde7e81eb2
am 33dd2620: am 15638aec: Show the value of the "Show suggestions" option in summary.
...
* commit '33dd262084d33e9b35f5f27b1841d393b043a78d':
Show the value of the "Show suggestions" option in summary.
2011-01-25 01:06:06 -08:00
Jean Chalard
33dd262084
am 15638aec: Show the value of the "Show suggestions" option in summary.
...
* commit '15638aec336139e05c2f91140da69fe6d7b4c307':
Show the value of the "Show suggestions" option in summary.
2011-01-25 01:04:33 -08:00
satok
9313bef894
Avoid disk writes on UI thread.
...
Change-Id: I0a498e47afb2c9a5241e2f329c39e266550135a5
2011-01-25 17:59:39 +09:00
Jean Chalard
15638aec33
Show the value of the "Show suggestions" option in summary.
...
Have the "Show correction suggestions" option display its value
in its description.
Bug: 3282448
Change-Id: Id76b5032ed5776d0567e1679d2a74ee758045919
2011-01-25 17:53:32 +09:00
Jean Chalard
788895d866
am 31569d62: am 2f4cc01e: Clarify a settings summary text.
...
* commit '31569d625278469cab965a023ecc0a331a46750d':
Clarify a settings summary text.
2011-01-25 00:40:16 -08:00
Jean Chalard
31569d6252
am 2f4cc01e: Clarify a settings summary text.
...
* commit '2f4cc01e61ec522f7db123096b69f08defba5b03':
Clarify a settings summary text.
2011-01-25 00:38:37 -08:00
Jean Chalard
2f4cc01e61
Clarify a settings summary text.
...
Change-Id: I98ee8bbe312a1515199b9c5c56c390010e8ef616
2011-01-25 17:31:34 +09:00
satok
28fc914d93
am e64e3a71: am f8ddd13b: Removed subtype icon for each country and added subtype icon for each mode
...
* commit 'e64e3a71ffe08f2d54ff4408945f3aacbc1a192c':
Removed subtype icon for each country and added subtype icon for each mode
2011-01-24 22:34:06 -08:00
satok
e64e3a71ff
am f8ddd13b: Removed subtype icon for each country and added subtype icon for each mode
...
* commit 'f8ddd13b40f7b104ccf0f4ec1106ed76c9084372':
Removed subtype icon for each country and added subtype icon for each mode
2011-01-24 22:15:49 -08:00
satok
f8ddd13b40
Removed subtype icon for each country and added subtype icon for each mode
...
Bug: 3286869
Change-Id: I43f151be00d2392c1816a43d37148169ff39a9f0
2011-01-25 14:43:23 +09:00
Tadashi G. Takaoka
03886cf96a
Add new Window.Callback.dispatchGenericMotionEvent to adapter class
...
Change-Id: I7571da1d00c22d96f2fb0f9b2e8a2c84a9344c81
2011-01-25 13:05:38 +09:00
Tadashi G. Takaoka
d13b49d1a4
am 62d09dc1: am ba72f353: Merge "Reuse language_selection_title string resource for option dialog" into honeycomb
...
* commit '62d09dc1e9dac778b4d6c412b2af74afd83f44c6':
Reuse language_selection_title string resource for option dialog
2011-01-24 19:16:33 -08:00
Tadashi G. Takaoka
62d09dc1e9
am ba72f353: Merge "Reuse language_selection_title string resource for option dialog" into honeycomb
...
* commit 'ba72f353238ba1759ecabeef8814437930aa2a46':
Reuse language_selection_title string resource for option dialog
2011-01-24 19:11:59 -08:00
Tadashi G. Takaoka
ba72f35323
Merge "Reuse language_selection_title string resource for option dialog" into honeycomb
2011-01-24 19:08:15 -08:00
Tadashi G. Takaoka
85996b472a
Reuse language_selection_title string resource for option dialog
...
Bug: 3385831
Change-Id: I23f587815f7fca3190bd0aa669bb6a2378d34ea8
2011-01-25 11:48:06 +09:00
Eric Fischer
a46b5e684c
am 69ee3c6e: (-s ours) am 85fa405a: Import revised translations. DO NOT MERGE
...
* commit '69ee3c6e8b09b92b93a7a9d099501c7eaa3f0828':
Import revised translations. DO NOT MERGE
2011-01-24 14:04:05 -08:00
Eric Fischer
69ee3c6e8b
am 85fa405a: Import revised translations. DO NOT MERGE
...
* commit '85fa405a588338bcded0db420f0650025a8e358e':
Import revised translations. DO NOT MERGE
2011-01-24 14:00:47 -08:00
Satoshi Kataoka
85f57c04a6
am 6f294c3d: am 17bc97c1: Merge "Fix resetting the status of VoiceIME when the user is switching from one VoiceIME to another Voice IME" into honeycomb
...
* commit '6f294c3de4e86b452ebde0259cb462d02503339a':
Fix resetting the status of VoiceIME when the user is switching from one VoiceIME to another Voice IME
2011-01-24 13:31:19 -08:00
satok
8c1ff8c23f
am b2433e4a: am bab08331: Add excludeFromLastInputMethod to voice subtype
...
* commit 'b2433e4aaacf0e7886e2973912a9904b0bdd90f1':
Add excludeFromLastInputMethod to voice subtype
2011-01-24 13:31:17 -08:00
satok
dccf39bc52
am e0b0e612: am bd0de0f1: Update shortcut IME when user changes the language of keyboard.
...
* commit 'e0b0e61256da6cd5536e65d61e7cc448c2b143fb':
Update shortcut IME when user changes the language of keyboard.
2011-01-24 13:29:50 -08:00
Satoshi Kataoka
20d7142f21
am d07ab27a: am 0dd0ea63: Merge "Always display the VoiceIME language in the Speak Now pop-up" into honeycomb
...
* commit 'd07ab27af1ef362b6d48275802cde97c97e858b3':
Always display the VoiceIME language in the Speak Now pop-up
2011-01-24 13:29:46 -08:00
satok
426eac51c6
am f83ae335: am 85a6175f: Merge "Set minimum height for RecognitionView in the case that there is no keyboard view loaded." into honeycomb
...
* commit 'f83ae3355c3da38f3a4e76e26fb450d2cc492301':
Set minimum height for RecognitionView in the case that there is no keyboard view loaded.
2011-01-24 13:29:44 -08:00
Tadashi G. Takaoka
b8d0931a18
am 8972b9ea: am 603e72ba: Merge "Implement callback to handle touch event outside SoftInputWindow" into honeycomb
...
* commit '8972b9ea1f08c4bb38b06e4c47332d102567a5b2':
Implement callback to handle touch event outside SoftInputWindow
2011-01-24 13:29:34 -08:00
satok
bf51f4e1c7
am 12a339dd: am 47e48215: Merge "Add log for voice IME" into honeycomb
...
* commit '12a339dd2e85c60313986ba44a7143fe62c134f4':
Add log for voice IME
2011-01-24 13:28:12 -08:00
Tadashi G. Takaoka
c19efa2b2b
am 7ef37c48: am 156493cf: Add description for auto correction threshold strings
...
* commit '7ef37c48f41c02c26917707462bab4a4e3a26da6':
Add description for auto correction threshold strings
2011-01-24 13:28:09 -08:00
satok
06eeb3106e
am 90e34c6e: am 251cb11f: Remove unused assets
...
* commit '90e34c6e2de67701c9f1ca5aaa382c67c77f98dc':
Remove unused assets
2011-01-24 13:28:05 -08:00
Tadashi G. Takaoka
057905a544
am c1604302: am 6ac5e2a2: New drawable assets
...
* commit 'c16043023efc7a7a4ab42698e5736f6c5e59eb60':
New drawable assets
2011-01-24 13:28:00 -08:00
Eric Fischer
85fa405a58
Import revised translations. DO NOT MERGE
...
Change-Id: I8a8786f484918749fd679adf0ce3e952d3f483f1
2011-01-24 12:40:17 -08:00
Satoshi Kataoka
6f294c3de4
am 17bc97c1: Merge "Fix resetting the status of VoiceIME when the user is switching from one VoiceIME to another Voice IME" into honeycomb
...
* commit '17bc97c134bd83f3511910a02bc5ea18c86cc50a':
Fix resetting the status of VoiceIME when the user is switching from one VoiceIME to another Voice IME
2011-01-24 11:15:31 -08:00
satok
b2433e4aaa
am bab08331: Add excludeFromLastInputMethod to voice subtype
...
* commit 'bab08331c07d537a6250897929866b08da57524b':
Add excludeFromLastInputMethod to voice subtype
2011-01-24 11:15:27 -08:00
Satoshi Kataoka
17bc97c134
Merge "Fix resetting the status of VoiceIME when the user is switching from one VoiceIME to another Voice IME" into honeycomb
2011-01-24 07:59:22 -08:00
Luca Zanolin
35f1c6a73c
Fix resetting the status of VoiceIME when the user is switching from one VoiceIME to another Voice IME
...
Change-Id: Ibbbe3ed6c4e2e7e3c1266daddf109742bd8d97b6
2011-01-24 15:45:20 +00:00
satok
bab08331c0
Add excludeFromLastInputMethod to voice subtype
...
Bug: 3382702
Change-Id: I0a0a85a509aee9586fafe8771b44892f6bc469bc
2011-01-25 00:34:11 +09:00
satok
e0b0e61256
am bd0de0f1: Update shortcut IME when user changes the language of keyboard.
...
* commit 'bd0de0f15108f5d08e2a734807255c30ea3030c7':
Update shortcut IME when user changes the language of keyboard.
2011-01-24 05:13:13 -08:00
satok
bd0de0f151
Update shortcut IME when user changes the language of keyboard.
...
Bug: 3329578
Change-Id: I59653ec7b1077e88be3767da9f4190d820fad4d1
2011-01-24 20:43:45 +09:00
Satoshi Kataoka
d07ab27af1
am 0dd0ea63: Merge "Always display the VoiceIME language in the Speak Now pop-up" into honeycomb
...
* commit '0dd0ea63aba4876e67242baf8bb508ded1d73871':
Always display the VoiceIME language in the Speak Now pop-up
2011-01-24 03:01:18 -08:00
satok
f83ae3355c
am 85a6175f: Merge "Set minimum height for RecognitionView in the case that there is no keyboard view loaded." into honeycomb
...
* commit '85a6175f4925381fd6be9285520d270d0b6f5cd4':
Set minimum height for RecognitionView in the case that there is no keyboard view loaded.
2011-01-24 02:59:25 -08:00
Satoshi Kataoka
0dd0ea63ab
Merge "Always display the VoiceIME language in the Speak Now pop-up" into honeycomb
2011-01-24 02:59:22 -08:00
satok
85a6175f49
Merge "Set minimum height for RecognitionView in the case that there is no keyboard view loaded." into honeycomb
2011-01-24 02:58:16 -08:00