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
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
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
bdfcb664f4
Fix proguard flag file dependency.
...
Change-Id: I26a639aea0e0b11ba65d621696c42e861847498e
2010-09-29 15:21:28 -07:00
b8fa10080d
Check recorrection on focusing into a text field that has text already.
...
Bug: 3004827
Change-Id: I00e9d925fcf17fa9f7a9aefe6572a648e023be11
2010-09-29 11:37:43 -07:00
ab1348e852
am 179ada95: Refactor CandidateView touch event handling
...
Merge commit '179ada958b0bb46c6b9c8eb8b220d84dd3db855a' into gingerbread-plus-aosp
* commit '179ada958b0bb46c6b9c8eb8b220d84dd3db855a':
Refactor CandidateView touch event handling
2010-09-29 03:52:13 -07:00
179ada958b
Refactor CandidateView touch event handling
...
This change also fixes tha the touch slop value is applyed only for
initial movement of scrolling suggestion bar.
Bug: 3004920
Change-Id: I62afdedc210156e41e8c84c48cade442f9d5a1aa
2010-09-29 19:45:03 +09:00
e3da18803d
am fcd5f2b9: am c2c9cd82: Merge "Mini keyboard works even while shift is being pressed" into gingerbread
...
Merge commit 'fcd5f2b9b4229c00a6589aad1fda9b727759d343'
* commit 'fcd5f2b9b4229c00a6589aad1fda9b727759d343':
Mini keyboard works even while shift is being pressed
2010-09-28 21:55:19 -07:00
f48637a5b2
resolved conflicts for merge of 0325360d to master
...
Change-Id: I5926c8d75dbffda20001fa9487fae2e5f723c755
2010-09-29 13:51:06 +09:00
fcd5f2b9b4
am c2c9cd82: Merge "Mini keyboard works even while shift is being pressed" into gingerbread
...
Merge commit 'c2c9cd82da81f87aeb81675bbae6b76bac3b83ca' into gingerbread-plus-aosp
* commit 'c2c9cd82da81f87aeb81675bbae6b76bac3b83ca':
Mini keyboard works even while shift is being pressed
2010-09-28 21:03:10 -07:00
c2c9cd82da
Merge "Mini keyboard works even while shift is being pressed" into gingerbread
2010-09-28 21:01:46 -07:00
afb3532779
Mini keyboard works even while shift is being pressed
...
Bug: 3038861
Change-Id: I94011ca80710ff6eb24e940104f7d9d3bb86840a
2010-09-29 12:36:13 +09:00
0325360d32
am 46941882: Tune mini keyboard vertical correction to match with key height
...
Merge commit '46941882b2c3f7467ce3d77be6948cfa7aafe548' into gingerbread-plus-aosp
* commit '46941882b2c3f7467ce3d77be6948cfa7aafe548':
Tune mini keyboard vertical correction to match with key height
2010-09-28 20:33:53 -07:00
46941882b2
Tune mini keyboard vertical correction to match with key height
...
Bug: 3040529
Change-Id: I8e3cc635737224537a019e66c38e1e2ea7a8bb8b
2010-09-29 12:23:57 +09:00
819e05f5fe
am 0ea7e504: am 6e5a3986: Fixed key code and key coordinates when move debounce has been in action
...
Merge commit '0ea7e504887702bace7b2e765704d08e737ab1b5'
* commit '0ea7e504887702bace7b2e765704d08e737ab1b5':
Fixed key code and key coordinates when move debounce has been in action
2010-09-28 13:19:45 -07:00
ed85235bee
am ad090ac3: am 008e9b3e: Fix Null pointer exception on closing and update assets
...
Merge commit 'ad090ac3f4cee327adf74e8b35bbc446a8d64070'
* commit 'ad090ac3f4cee327adf74e8b35bbc446a8d64070':
Fix Null pointer exception on closing and update assets
2010-09-28 12:48:46 -07:00
0ea7e50488
am 6e5a3986: Fixed key code and key coordinates when move debounce has been in action
...
Merge commit '6e5a3986854549a45c95770b5a88ae5577e93299' into gingerbread-plus-aosp
* commit '6e5a3986854549a45c95770b5a88ae5577e93299':
Fixed key code and key coordinates when move debounce has been in action
2010-09-28 08:44:48 -07:00
6e5a398685
Fixed key code and key coordinates when move debounce has been in action
...
This change refactors a key index and pointer position variables into
a separate static inner class KeyState . This change also disables
time debouncing.
Bug: 3033737
Change-Id: Ie4fc37316c260330d8f0861e0771ea903a99cfce
2010-09-28 20:57:30 +09:00
ad090ac3f4
am 008e9b3e: Fix Null pointer exception on closing and update assets
...
Merge commit '008e9b3e1a8c037e0275b19f284a7d2e76c9e140' into gingerbread-plus-aosp
* commit '008e9b3e1a8c037e0275b19f284a7d2e76c9e140':
Fix Null pointer exception on closing and update assets
2010-09-28 03:29:30 -07:00
008e9b3e1a
Fix Null pointer exception on closing and update assets
...
Change-Id: I30fdac74685beae06b5c61140452b26b29ae4c39
2010-09-28 16:52:54 +09:00
2b4cc0db61
Fix xlarge min-keyboard layout
...
Change-Id: Ia4d6cffa0c6cf710da577b75f6337836352959a0
2010-09-28 16:12:51 +09:00
b514d3f1f8
Fix wrong keyEdgeFlags in xlarge keyboard layouts
...
Bug: 3040988
Change-Id: Ibcac874a96ed0bf35350b50a5dd862a8d03c8354
2010-09-28 15:14:47 +09:00
8bfcac4d84
Fix NPE in LatinKeyboard when it represent phone keyboard
...
Bug: 3041532
Change-Id: I1d846e9175bd033f056a8715287a936be2fe8f74
2010-09-28 10:15:55 +09:00
1571a660d8
Merge "Fix the non-working period key in the tablet layout."
2010-09-27 15:15:02 -07:00
71ed85bce8
Fix the non-working period key in the tablet layout.
...
One of the edge flags was wrong.
2010-09-27 15:12:01 -07:00
e07fcf9734
am 5f1aecb2: (-s ours) am e07bc39a: Merge "Trim unwanted whitespace from translations. DO NOT MERGE" into gingerbread
...
Merge commit '5f1aecb27d008803def36efeba9d2503035c1ac4'
* commit '5f1aecb27d008803def36efeba9d2503035c1ac4':
Trim unwanted whitespace from translations. DO NOT MERGE
2010-09-27 14:39:50 -07:00
5f1aecb27d
am e07bc39a: Merge "Trim unwanted whitespace from translations. DO NOT MERGE" into gingerbread
...
Merge commit 'e07bc39a3b3e15b35ff4f3abe37143d93b27f264' into gingerbread-plus-aosp
* commit 'e07bc39a3b3e15b35ff4f3abe37143d93b27f264':
Trim unwanted whitespace from translations. DO NOT MERGE
2010-09-27 12:33:37 -07:00
e07bc39a3b
Merge "Trim unwanted whitespace from translations. DO NOT MERGE" into gingerbread
2010-09-27 12:27:43 -07:00
2245c3a5a9
Trim unwanted whitespace from translations. DO NOT MERGE
...
Change-Id: Ie380334bc725aa55beb8ec084d1ade881a50812c
2010-09-27 12:22:28 -07:00
0517bffc06
am 7f2a6a05: am 0b4ae1f5: Capitalize the displayed text in the suggestion bar when all of the user typed chars are upper case
...
Merge commit '7f2a6a056b67efa2a1fb623ca4cf73f7fb6c7d8c'
* commit '7f2a6a056b67efa2a1fb623ca4cf73f7fb6c7d8c':
Capitalize the displayed text in the suggestion bar when all of the user typed chars are upper case
2010-09-27 09:30:28 -07:00
7f2a6a056b
am 0b4ae1f5: Capitalize the displayed text in the suggestion bar when all of the user typed chars are upper case
...
Merge commit '0b4ae1f578e768eec4ada90aeb81d11acb10eb2e' into gingerbread-plus-aosp
* commit '0b4ae1f578e768eec4ada90aeb81d11acb10eb2e':
Capitalize the displayed text in the suggestion bar when all of the user typed chars are upper case
2010-09-27 09:26:39 -07:00
0b4ae1f578
Capitalize the displayed text in the suggestion bar when all of the user typed chars are upper case
...
bug:3014227
Change-Id: Ic453e2fde57ce51be00f3a506e1c9328103ca99a
2010-09-28 01:15:11 +09:00
dc7097b4e7
Merge "Add xlarge keyboard layouts (tentative)"
2010-09-27 08:39:12 -07:00
b1fcbec730
Add xlarge keyboard layouts (tentative)
...
This keyboard layout is tentative for UX study.
This change added xlarge keyboard layouts only for "regular text",
"symbol/number mode" and "symbol/number mode shifted".
TODO other text mode variants should have dedicated layout.
Change-Id: I36077efcec4b57c3b5cada0a851e1409a289eeb9
2010-09-28 00:17:53 +09:00
a48d298d10
resolved conflicts for merge of b9c0ed59 to master
...
Change-Id: Ib42164a5889eb9792b5e94de1e0ffd4c1924e29d
2010-09-27 15:33:24 +09:00
b9c0ed59d0
am 3a2b9035: Merge "Add Debug Settings Activity" into gingerbread
...
Merge commit '3a2b90357ce056765d5c9d6dec0335c308e21717' into gingerbread-plus-aosp
* commit '3a2b90357ce056765d5c9d6dec0335c308e21717':
Add Debug Settings Activity
2010-09-26 22:26:26 -07:00
3a2b90357c
Merge "Add Debug Settings Activity" into gingerbread
2010-09-26 22:15:57 -07:00
bf96661d33
Add Debug Settings Activity
...
Bug:3033472
Change-Id: I311c66ac3c612a30d7da3be8ee35a352f49016ac
2010-09-27 14:07:10 +09:00
Tadashi G. Takaoka
Ying Wang
Amith Yamasani
satok
Eric Fischer
Ken Wakasa