d663555c9f
Keyboard XML file supports include and merge tag
...
Keyboard XML file can include other keyboard XML file using directive
<include keyboardLayout="@xml/...">. The keyboard XML file which is
included must have <merge> tag as root element.
Change-Id: I06c35fe7b3db5232acdb33f73a79f38d31261b32
2010-10-07 23:51:38 +09:00
4d9add5482
am 2501d736: am 47383758: Fix bug 3063598, change "tap" to "touch" thrice.
...
Merge commit '2501d7363c3fec777956dd57a558c8bfe75e002c'
* commit '2501d7363c3fec777956dd57a558c8bfe75e002c':
Fix bug 3063598, change "tap" to "touch" thrice.
2010-10-06 17:09:06 -07:00
2501d7363c
am 47383758: Fix bug 3063598, change "tap" to "touch" thrice.
...
Merge commit '47383758fc3137a8e2b88ae596adf2685bd818bc' into gingerbread-plus-aosp
* commit '47383758fc3137a8e2b88ae596adf2685bd818bc':
Fix bug 3063598, change "tap" to "touch" thrice.
2010-10-05 07:00:25 -07:00
47383758fc
Fix bug 3063598, change "tap" to "touch" thrice.
...
Change-Id: Ia135eb926a5f2896a480cd478d40925d46041d42
2010-10-05 06:39:15 -07:00
66e306d01c
Add keyHintIcon attribute to BaseKeyboard.Key class
...
This keyHintIcon attribute is used to specify hint icon drawable at
top right corner of Key.
Change-Id: Icaa91e63c4473b2513396bd3fbeb8ed6fd73586c
2010-10-05 20:28:04 +09:00
b1abda8d62
Add an auto complete's threshold option.
...
Change-Id: I3a6821ced8642ab8f954e79a25e31766e4a18eb8
2010-10-05 14:44:00 +09:00
6614ac9f7b
Modify BaseKeyboard to be able to handle multiple shift keys
...
Change-Id: Ie840ae113ee6bd5b629a90959d7f955a5ceba95a
2010-10-02 21:37:34 +09:00
4fc510a789
Unbundle Keyboard.java to BaseKeyboard.java
...
Change-Id: I8b310c2c0cae1a151e53c22001c586697346982c
2010-10-02 00:02:00 +09:00
932a1b756d
am c0fc4bf9: am 8e1f1be0: Long press mic/comma key bring mini keyboard with settings
...
Merge commit 'c0fc4bf9932caf536af5d5d86bb61ec6d8a44a99'
* commit 'c0fc4bf9932caf536af5d5d86bb61ec6d8a44a99':
Long press mic/comma key bring mini keyboard with settings
2010-10-01 04:04:38 -07:00
c0fc4bf993
am 8e1f1be0: Long press mic/comma key bring mini keyboard with settings
...
Merge commit '8e1f1be0f3cfce4ed0623d3d137f53f034f5b718' into gingerbread-plus-aosp
* commit '8e1f1be0f3cfce4ed0623d3d137f53f034f5b718':
Long press mic/comma key bring mini keyboard with settings
2010-10-01 04:02:12 -07:00
8e1f1be0f3
Long press mic/comma key bring mini keyboard with settings
...
Bug: 3050703
Change-Id: I090b2bfebfb48e5ec461615d4c911024ea6d130a
2010-10-01 19:27:37 +09:00
d778ff20e7
am bd677880: am 88a04563: Make the background of keypopup transparent
...
Merge commit 'bd677880494f30d58913f1bac612a32410e6465b'
* commit 'bd677880494f30d58913f1bac612a32410e6465b':
Make the background of keypopup transparent
2010-10-01 02:29:58 -07:00
bd67788049
am 88a04563: Make the background of keypopup transparent
...
Merge commit '88a045637a8aa812ec09e2fa6ad0b75dd401e1f9' into gingerbread-plus-aosp
* commit '88a045637a8aa812ec09e2fa6ad0b75dd401e1f9':
Make the background of keypopup transparent
2010-10-01 02:19:37 -07:00
88a045637a
Make the background of keypopup transparent
...
Change-Id: I5240ffdd8e48bcb99c2edf878d8efaba2cafeb07
2010-10-01 18:08:38 +09:00
3750d56d73
am 8e6a9270: am 18d536f6: Merge "Dismiss orange highlight after suggestion has been selected" into gingerbread
...
Merge commit '8e6a92703d1bdf530d32c8cdf90deefc6bc3a878'
* commit '8e6a92703d1bdf530d32c8cdf90deefc6bc3a878':
Dismiss orange highlight after suggestion has been selected
2010-09-30 23:24:11 -07:00
8e6a92703d
am 18d536f6: Merge "Dismiss orange highlight after suggestion has been selected" into gingerbread
...
Merge commit '18d536f66b2a063a462b2d28410da80b7788e5da' into gingerbread-plus-aosp
* commit '18d536f66b2a063a462b2d28410da80b7788e5da':
Dismiss orange highlight after suggestion has been selected
2010-09-30 21:01:10 -07:00
18d536f66b
Merge "Dismiss orange highlight after suggestion has been selected" into gingerbread
2010-09-30 20:59:28 -07:00
4fa67efc79
Dismiss orange highlight after suggestion has been selected
...
Bug: 3051311
Change-Id: Ia32cd8748a0afade07a9896ad77400cf42aed0f5
2010-10-01 12:55:34 +09:00
3d9d2b1b3c
am 7ed6b88c: am a0a60b37: Revert changes to keyboard_popup.xml for now.
...
Merge commit '7ed6b88cf6f090512953e3665e4ff5072c98560b'
* commit '7ed6b88cf6f090512953e3665e4ff5072c98560b':
Revert changes to keyboard_popup.xml for now.
2010-09-30 19:48:16 -07:00
7ed6b88cf6
am a0a60b37: Revert changes to keyboard_popup.xml for now.
...
Merge commit 'a0a60b37b265988191083e1b5abbe616a67759b4' into gingerbread-plus-aosp
* commit 'a0a60b37b265988191083e1b5abbe616a67759b4':
Revert changes to keyboard_popup.xml for now.
2010-09-30 18:02:43 -07:00
a0a60b37b2
Revert changes to keyboard_popup.xml for now.
...
This unexpectedly bloated keys in mini popup keyboard.
bug: 3048638
Change-Id: I2b717c9007ce7717bac514f1d8bcae1280130cf4
2010-10-01 09:46:04 +09:00
c29d565428
am 105f7c36: am 3297ee80: Merge "Long pressing mic/comma key will show settings menue" into gingerbread
...
Merge commit '105f7c36b7fa1845b9edbf47ca55b4a6660303b6'
* commit '105f7c36b7fa1845b9edbf47ca55b4a6660303b6':
Long pressing mic/comma key will show settings menue
2010-09-30 13:37:40 -07:00
f06cab73ec
am 93176d86: am 77c9f2d3: Merge "Display feedback popup for saving word while the word is pressing." into gingerbread
...
Merge commit '93176d869a496051344d80ef03573bc6bb99035a'
* commit '93176d869a496051344d80ef03573bc6bb99035a':
Display feedback popup for saving word while the word is pressing.
2010-09-30 13:37:38 -07:00
41ffeb88ca
am b97d1777: am 36f97dd6: Fixed assets - Make the background of popup key a full transparent color - Updated the background mdpi asset of keyboard
...
Merge commit 'b97d17777ef2d8550770a48c84e51e4548820812'
* commit 'b97d17777ef2d8550770a48c84e51e4548820812':
Fixed assets
2010-09-30 13:37:35 -07:00
b050829609
am e6e45510: am 11a578f4: Disable suggestion bar before invoke Voice input
...
Merge commit 'e6e45510674b31d0c82fa5f8a7943668d7e8503a'
* commit 'e6e45510674b31d0c82fa5f8a7943668d7e8503a':
Disable suggestion bar before invoke Voice input
2010-09-30 13:37:30 -07:00
e909d4f12e
am 48ef72ac: am 8ff96805: Merge "Eliminate compiler warning" into gingerbread
...
Merge commit '48ef72acef92bb774bad84d647427eaab0acc83b'
* commit '48ef72acef92bb774bad84d647427eaab0acc83b':
Eliminate compiler warning
2010-09-30 13:37:27 -07:00
2e7ce8ec50
am 259778c3: am eebe37e8: Merge "Disable suggestion selection preview popup" into gingerbread
...
Merge commit '259778c3a18246b3117c2874b87f1adaf2d9fb81'
* commit '259778c3a18246b3117c2874b87f1adaf2d9fb81':
Disable suggestion selection preview popup
2010-09-30 13:37:23 -07:00
4852f1a72e
am 7d849f8a: am 2d6a0c68: Merge "Fix proguard flag file dependency." into gingerbread
...
Merge commit '7d849f8a2aeadb5b8a97b42fe5748dced3051126'
* commit '7d849f8a2aeadb5b8a97b42fe5748dced3051126':
Fix proguard flag file dependency.
2010-09-30 11:28:06 -07:00
d2a74e9f16
am 4d158dc2: am 15b840cd: Merge "Check recorrection on focusing into a text field that has text already." into gingerbread
...
Merge commit '4d158dc2779ffff8c92a41f32e6885bd0f155fc3'
* commit '4d158dc2779ffff8c92a41f32e6885bd0f155fc3':
Check recorrection on focusing into a text field that has text already.
2010-09-30 11:26:57 -07:00
105f7c36b7
am 3297ee80: Merge "Long pressing mic/comma key will show settings menue" into gingerbread
...
Merge commit '3297ee80f0b5b93128123d98d7f8b42257e36445' into gingerbread-plus-aosp
* commit '3297ee80f0b5b93128123d98d7f8b42257e36445':
Long pressing mic/comma key will show settings menue
2010-09-30 10:11:24 -07:00
93176d869a
am 77c9f2d3: Merge "Display feedback popup for saving word while the word is pressing." into gingerbread
...
Merge commit '77c9f2d314d9fbb5c4bd5b6918326d2e1f4e3a98' into gingerbread-plus-aosp
* commit '77c9f2d314d9fbb5c4bd5b6918326d2e1f4e3a98':
Display feedback popup for saving word while the word is pressing.
2010-09-30 10:11:12 -07:00
b97d17777e
am 36f97dd6: Fixed assets - Make the background of popup key a full transparent color - Updated the background mdpi asset of keyboard
...
Merge commit '36f97dd6897b17841c1e6aab4612f3905185a90c' into gingerbread-plus-aosp
* commit '36f97dd6897b17841c1e6aab4612f3905185a90c':
Fixed assets
2010-09-30 10:11:10 -07:00
e6e4551067
am 11a578f4: Disable suggestion bar before invoke Voice input
...
Merge commit '11a578f4f130ebae66fb1bd9953874f421c3c09c' into gingerbread-plus-aosp
* commit '11a578f4f130ebae66fb1bd9953874f421c3c09c':
Disable suggestion bar before invoke Voice input
2010-09-30 10:10:55 -07:00
48ef72acef
am 8ff96805: Merge "Eliminate compiler warning" into gingerbread
...
Merge commit '8ff9680522c096ef76fbe087e50f04d76c172173' into gingerbread-plus-aosp
* commit '8ff9680522c096ef76fbe087e50f04d76c172173':
Eliminate compiler warning
2010-09-30 10:10:26 -07:00
259778c3a1
am eebe37e8: Merge "Disable suggestion selection preview popup" into gingerbread
...
Merge commit 'eebe37e83695e2542cb71fd81b244e1949ca8522' into gingerbread-plus-aosp
* commit 'eebe37e83695e2542cb71fd81b244e1949ca8522':
Disable suggestion selection preview popup
2010-09-30 10:10:23 -07:00
7d849f8a2a
am 2d6a0c68: Merge "Fix proguard flag file dependency." into gingerbread
...
Merge commit '2d6a0c68c29c94b492a93d06d072568d767c1e72' into gingerbread-plus-aosp
* commit '2d6a0c68c29c94b492a93d06d072568d767c1e72':
Fix proguard flag file dependency.
2010-09-30 09:32:14 -07:00
3297ee80f0
Merge "Long pressing mic/comma key will show settings menue" into gingerbread
2010-09-30 04:57:40 -07:00
a1cc4f0a8d
Long pressing mic/comma key will show settings menue
...
Bug: 3050703
Change-Id: I62773c10f435d13174f6ff6574912cb99303e83c
2010-09-30 20:18:10 +09:00
77c9f2d314
Merge "Display feedback popup for saving word while the word is pressing." into gingerbread
2010-09-30 01:58:41 -07:00
36f97dd689
Fixed assets
...
- Make the background of popup key a full transparent color
- Updated the background mdpi asset of keyboard
Bug: 2975027
Bug: 3048638
Change-Id: I8709a1ca403e5c3f862a8be9be1668d30c7687f8
2010-09-30 17:54:21 +09:00
fcba53ef7c
Display feedback popup for saving word while the word is pressing.
...
Bug: 3004696
Change-Id: Icc5bdd6945f3bf79f7234a0227d8036d6f6d4c1d
2010-09-30 17:32:29 +09:00
11a578f4f1
Disable suggestion bar before invoke Voice input
...
Bug: 3002817
Change-Id: I099dd63e58d5159a609c1d934dbb6f5aab914305
2010-09-30 16:04:09 +09:00
8ff9680522
Merge "Eliminate compiler warning" into gingerbread
2010-09-29 20:51:34 -07:00
eebe37e836
Merge "Disable suggestion selection preview popup" into gingerbread
2010-09-29 20:46:21 -07:00
e7cfc8ab88
Eliminate compiler warning
...
Change-Id: Ib3effaa6f4e8cfc3951ab5d5d099335fd3856a2f
2010-09-30 12:43:43 +09:00
c9716b28ce
Disable suggestion selection preview popup
...
Bug: 3048642
Bug: 3004920
Change-Id: Ibfb495a246c9e2da6ebf3c03d10ed8acff00f54b
2010-09-30 12:41:03 +09:00
8bae0829d2
resolved conflicts for merge of ab1348e8 to master
...
Change-Id: Ica94a5f9ac4feae477297f14fc1bc21d02efb6a4
2010-09-30 09:01:04 +09:00
4d158dc277
am 15b840cd: Merge "Check recorrection on focusing into a text field that has text already." into gingerbread
...
Merge commit '15b840cd48184fc33b294c15eaaf28ac05393a43' into gingerbread-plus-aosp
* commit '15b840cd48184fc33b294c15eaaf28ac05393a43':
Check recorrection on focusing into a text field that has text already.
2010-09-29 16:15:28 -07:00
2d6a0c68c2
Merge "Fix proguard flag file dependency." into gingerbread
2010-09-29 16:12:41 -07:00
15b840cd48
Merge "Check recorrection on focusing into a text field that has text already." into gingerbread
2010-09-29 16:08:49 -07:00
Tadashi G. Takaoka
Roy West
Mitsuhiro Shimoda
satok
Ken Wakasa
Ying Wang
Amith Yamasani