Commit graph

1199 commits

Author SHA1 Message Date
Tadashi G. Takaoka
17dae3057c Remove {max,min}keyboardHeight attribute from Keyboard
This change removes a DisplayMetrics reference from KeyboardBuilder.

Change-Id: I512694274e69e5281d5be47c3f938bcfd6571152
2013-01-29 18:32:04 +09:00
Tadashi G. Takaoka
8630cd9d17 Remove keyboard layout description on the spacebar
Bug: 8056376
Change-Id: I33f07e7a044c2b5fc20de40c7a9777dab493e41c
2013-01-28 11:49:44 +09:00
Tadashi G. Takaoka
ff961ddf8c Add preliminary graphics of sliding key input preview
Bug: 7548583
Change-Id: Idde6a62f9e64458055c99c893b71c02d1adc7b04
2013-01-24 18:14:20 +09:00
Tadashi G. Takaoka
ef43cc9d1c Fix dismissing gesture floating preview
Bug: 8063926
Change-Id: I3b5b29ea0d5e4833e10e830dbdb086c868cd4884
2013-01-24 12:07:01 +09:00
Tadashi G. Takaoka
9d514af466 Merge "Refactor SubtypeLocale to hold Resources" 2013-01-23 08:37:57 +00:00
Tadashi G. Takaoka
9dc85a673e Merge "Configurable key long press timeout" 2013-01-23 08:37:36 +00:00
Tadashi G. Takaoka
cc5e4a4445 Configurable key long press timeout
The default long presss timeout is 300msec (previous timeout was
400ms).

Bug: 7600340
Change-Id: Ia8b64784ac03588631cfcbad30e021d74f3fd0d8
2013-01-23 17:12:28 +09:00
Tadashi G. Takaoka
4b3cae9b0c Refactor SubtypeLocale to hold Resources
Change-Id: Ia667bc2d406d66c87215dd3b9569f36f4642cfe0
2013-01-23 16:23:11 +09:00
Tadashi G. Takaoka
f008a11cce Merge "Cache MoreKeysKeyboard instead of container view of it" 2013-01-22 08:45:52 +00:00
Tadashi G. Takaoka
a729377395 Cache MoreKeysKeyboard instead of container view of it
This change also cleans up MoreKeysPanel related stuff.

Bug: 8047165
Change-Id: I4f2211e00c7d08469a7413568db039c1c597fb3c
2013-01-22 17:34:36 +09:00
Ken Wakasa
6c22439bf8 Remove MAX_PROXIMITY_CHARS_SIZE_INTERNAL
Change-Id: I18a997503de4033b5341b564145bca862a872098
2013-01-22 13:18:49 +09:00
Tadashi G. Takaoka
fb523d7f5d Move AbstractDrawingPreview objects to MainKeyboardView
Change-Id: I0be72fba9a66f7c326028ec8e4670ca74a46053f
2013-01-21 23:25:18 +09:00
Tadashi G. Takaoka
2277733048 Merge "Add GestureTrailsPreview class" 2013-01-21 13:44:13 +00:00
Tadashi G. Takaoka
8673594830 Merge "Add SlidingKeyInputPreview class" 2013-01-21 13:43:41 +00:00
Tadashi G. Takaoka
470a5805e1 Add GestureTrailsPreview class
Change-Id: Ibf9dff6d834d34b4134dbe38a609fd983731eedc
2013-01-21 22:31:54 +09:00
Tadashi G. Takaoka
a237cd4a02 Add SlidingKeyInputPreview class
Change-Id: Ided47b3420b0b1e34063f30d5142a1858af2718e
2013-01-21 22:30:14 +09:00
Tadashi G. Takaoka
8aa9963a89 Fix Apache license comment
Change-Id: Ic56167f952a7f4449da366e1e81610e72c966086
2013-01-21 22:23:37 +09:00
Tadashi G. Takaoka
78292e45cb Fix missing super call in PreviewPlacerView.onDetachedFromWindow
Change-Id: Iea79c0081cb66f54f161c0cf02cb365fcf88a07c
2013-01-21 19:31:05 +09:00
Tadashi G. Takaoka
4987108f34 Add surrounding drawing view to AbstractDrawingPreview constructor
Change-Id: If57e59f25fc3e29c0e7f46e8218d04fb233c27c6
2013-01-21 18:48:06 +09:00
Tadashi G. Takaoka
ab334eb646 Add PointerTracker.isOldestPointerInQueue
Change-Id: Ic6f38253c94067ec7aa7b5add4452fa144fd9352
2013-01-21 18:26:46 +09:00
Tadashi G. Takaoka
db906a7c9a Merge "Rename AbstractDrawingPreview.onDraw to drawPreview" 2013-01-21 08:34:25 +00:00
Tadashi G. Takaoka
2ecbfe8e93 Rename AbstractDrawingPreview.onDraw to drawPreview
This is because the android lint warns calling a method onDraw(Canvas)
from View.onDraw(Canvas).

Change-Id: I4f54996da5454d9a8c4ef43fbbcaec37724fb20e
2013-01-21 17:00:47 +09:00
Tadashi G. Takaoka
f3c4cd45a5 Move dimming keyboard to MainKeyboardView
Change-Id: Id44d4b758c8b92d1120d3a8b06812dc1fc26390c
2013-01-21 16:54:08 +09:00
Tadashi G. Takaoka
9c968b62d1 Move gesture related XML attribute to MainKeyboardView
Change-Id: Ia12f73a3d7d26596ee14a0aff23244ef72753d68
2013-01-21 16:16:48 +09:00
Tadashi G. Takaoka
375982106b Move PointerTracker.DrawingProxy to MainKeyboardView (step 2)
Change-Id: If15d5ee683b8026d1871a3fe438dba498944faa7
2013-01-21 16:09:25 +09:00
Tadashi G. Takaoka
0e4f0da449 Move PointerTracker.DrawingProxy to MainKeyboardView (step 1)
Change-Id: I86014de147416453503b6412eb862a2d172426aa
2013-01-21 16:06:50 +09:00
Tadashi G. Takaoka
d9449ccf3c Move MoreKeysPanel.Controller implementation to MainKeyboardView
Change-Id: Iffa298d51ca21a7dcd1e77c633217532d96d2cf5
2013-01-21 15:28:17 +09:00
Tadashi G. Takaoka
b9f219c935 Remove unused Keyboard.purgeKeyboardAndClosing method
Change-Id: Ia09ac04b0edca2a22d64ba83e054b115fe8851a6
2013-01-21 14:26:33 +09:00
Tadashi G. Takaoka
5d894dcfaa Merge "Correct GesturePreviewTrail.getWidth() implementation" 2013-01-18 10:26:05 +00:00
Tadashi G. Takaoka
cc2636b4e1 Remove automatic switch back to alphabet feature
Change-Id: I4600c808f2ec31c18d3698a43afa7f4be9407e3e
2013-01-18 18:44:27 +09:00
Tadashi G. Takaoka
9e63ef89e3 Correct GesturePreviewTrail.getWidth() implementation
Bug: 7981153
Change-Id: I20785b7f82329ce6f19c883e77a9716772cda290
2013-01-18 17:55:24 +09:00
Jean Chalard
22959faad4 Merge "Stop relying on the soft keyboard to get the editor action." 2013-01-17 07:16:58 +00:00
Tadashi G. Takaoka
84ce64f2c0 Fix bounding rectangle of gesture preview trail
Bug: 7917443
Bug: 7987585
Change-Id: I99e6db1fe43d3a9b497e92330a6857e0454c428c
2013-01-16 19:51:01 +09:00
Jean Chalard
d818f1e3b6 Stop relying on the soft keyboard to get the editor action.
Bug: 7969231
Change-Id: I9848c63c4c51550b5dc53c981eafa74e7fa95197
2013-01-16 18:22:00 +09:00
Jean Chalard
dcfceaff1b Distinguish action-enter/shift-enter/enter
Bug: 7969231
Change-Id: I75d495ee1ea126da9be4e269ee990ee0a97793c1
2013-01-15 19:12:41 +09:00
Ken Wakasa
c995dbcf59 Merge "Remove MAX_WORD_LENGTH_INTERNAL" 2013-01-14 19:46:09 -08:00
Ken Wakasa
5db594abba Remove MAX_WORD_LENGTH_INTERNAL
Change-Id: Ie11ff000675601acff5fbb00e9e9f48eb32c5071
2013-01-15 12:39:08 +09:00
Tadashi G. Takaoka
722eeb144f Fix drawing Arabic diacritics
Bug: 8001868
Change-Id: I0e5aab266bbaad8c68e4a900b8d5572977a0379d
2013-01-15 11:03:15 +09:00
Ken Wakasa
4da2ed7a78 Fix too thick gesture trail width
Change-Id: If1b78183b24fa0029bc28e5f56a988372182903e
2013-01-10 22:18:23 +09:00
Jean Chalard
d9c7a6b9b3 Merge "Move a method to a utility class (C1)" 2013-01-10 00:04:11 -08:00
Tadashi G. Takaoka
50d902ac6f Show final suggested word when batch input is finished
This change moves dismiss timer of gesture floating preview text from
PreviewPlacerView to KeyboardView.

Bug: 7967461
Change-Id: I0ca5beddc93cb4bc4a405f914d217d37b997402b
2013-01-10 16:25:05 +09:00
Tadashi G. Takaoka
6512cd289d Merge "Cancel update batch input timer only when point is added" 2013-01-09 21:47:46 -08:00
Tadashi G. Takaoka
b2f5d15250 Cancel update batch input timer only when point is added
Bug: 7972004
Change-Id: Ie5db5910efba851976da2284cafc69be2910d354
2013-01-10 14:31:07 +09:00
Tadashi G. Takaoka
95e3008d25 Merge "Rename variables related to key preview popup" 2013-01-09 19:32:33 -08:00
Tadashi G. Takaoka
6ece8f718b Merge "Remove unused variable" 2013-01-09 19:32:18 -08:00
Tadashi G. Takaoka
3727a3fd61 Merge "Clean up public helper methods of SettingsValues" 2013-01-09 19:04:46 -08:00
Tadashi G. Takaoka
813692c956 Rename variables related to key preview popup
Change-Id: I0161e5844dd325af9afba80ac54a569b16c80660
2013-01-10 11:47:18 +09:00
Tadashi G. Takaoka
e0e0b04188 Remove unused variable
Change-Id: I7001d8b6200a5cefcf84630d663da8316422026f
2013-01-10 11:43:35 +09:00
Jean Chalard
8da9c337db Move a method to a utility class (C1)
This is a preparatory change to fix bug 7969231

Change-Id: I44604ae75192a17b4e75a01f3e3d679d4901299e
2013-01-09 21:59:06 +09:00
Tadashi G. Takaoka
e56686f43a Merge "Cancel update batch input timer whenever MotionEvent is received" 2013-01-09 01:12:59 -08:00
Tadashi G. Takaoka
915f348b35 Cancel update batch input timer whenever MotionEvent is received
Bug: 7911739
Change-Id: Id2cd98385371fd98435943ed66ec5381dfaa48e0
2013-01-09 17:55:42 +09:00
Tadashi G. Takaoka
8353e751ca Don't cancel gesture typing while more keys keyboard is shown
Bug: 7964225
Change-Id: I4c572527b6f399282bdd963e38c147c7e69815ac
2013-01-09 16:56:59 +09:00
Tadashi G. Takaoka
d3b0ecec22 Clean up public helper methods of SettingsValues
Change-Id: I6c6087580b67f497eaaf16900f8df7a4a895b8e3
2013-01-09 11:23:34 +09:00
Tadashi G. Takaoka
a5ff9f0c77 Clean up debug related preference keys
Change-Id: Ib7129692c673b3bce253120ee709e0253aeafa52
2013-01-08 18:26:47 +09:00
Tadashi G. Takaoka
b17b887425 Consolidate VibratorUtils with AudioAndHapticFeedbackManager
Change-Id: Ica4e3193f369330da62a259c718b779ddf9fbde5
2013-01-08 15:13:19 +09:00
Xiaojun Bi
28de7223e6 Merge "[mdfp] Refactoring Gesture Floating Preview Text Code" 2013-01-07 17:12:35 -08:00
Xiaojun Bi
d52730a2d7 [mdfp] Refactoring Gesture Floating Preview Text Code
This change moves gesture preview text code from PreviewPlacerView.java
to separate classes.

Change-Id: Id8d17eff38e714c3b06aafd0b24985a9bd2d2f52
2013-01-07 10:39:23 -08:00
Tadashi G. Takaoka
f90fc105ab Simplify singleton class initialization
Change-Id: I16a27f2ed6ea66184bfdc9903180372cd7ea2fd1
2013-01-07 19:05:31 +09:00
Ken Wakasa
b6ca354431 Small code cleanups
Multi-project commit with I249d5fbe

Change-Id: Ia28c4e970992aa1299a30e604eaa5d096655c3a5
2013-01-07 12:13:42 +09:00
Tadashi G. Takaoka
fa7f08b373 Set default audio and haptic feedback settings
- Default keypress volume is set to 0.2f in resource.
- Default keypress vibration duration is set to 10 msec in resource.

Bug: 7055329
Change-Id: I83bd6288d171d9787d52e2b02e4e5305f1435681
2012-12-28 19:24:32 +09:00
Tadashi G. Takaoka
92aee35222 Fix gesture trail width calculation
Change-Id: I41e0a95437aa9b8ec9a8eefb3bc5eb0452284b60
2012-12-27 11:43:35 +09:00
Tadashi G. Takaoka
7c1e853387 Call onCancelBatchInput only when onStartBatchInput has been called
This NPE issue (Bug: 7903331) has been introduced by Ie68c7698.

Bug: 7903331
Change-Id: I44884f5608fe47d9db7a2c93a752d17b9ae39a22
2012-12-21 14:31:03 +09:00
Tom Ouyang
ac69ab400d Refactor more keys menu framework (part 3)
Make it possible to re-enter gesture input even after triggering the long-press
menu. This is useful for new users who may pause at the start of a word. Works
for both single and bi-manual gestures.

Bug: 7595193
Change-Id: Ieaecfd5385ed6c10ae9347b99c2e35a0de5e895d
2012-12-13 21:45:51 -08:00
Tom Ouyang
be68b41ccb Fix more suggestion window asymmetry bug in N7.
Bug: 7711822
Change-Id: I63ba13b1c160cf55b8820a08e6e28fa666dd2580
2012-12-13 21:01:30 -08:00
Tom Ouyang
1f4f404e1f Merge "Refactor more keys menu framework (part 2)" 2012-12-13 18:51:37 -08:00
Tom Ouyang
35580bad6f Refactor more keys menu framework (part 2)
- Integrate pointer tracking between more keys menu, more suggestions menu, and main keyboard.
- Adds multi-touch support for more keys menus. Long press with one finger and select keys with another finger.

Bug: 7508007

Change-Id: I394f28cd79e342d6bcfea573af72aa33b9def00f
2012-12-13 13:17:28 -08:00
Tadashi G. Takaoka
8eaf75aa7b Fix label of switch to symbols key when symbols has shortcut key
This change fixes the labels of switch to symbols key and switch back
from more symbols key when symbols layout has shortcut key.

Change-Id: I3fbbef2d929486d0f0542f4d89cb086d9f5bad82
2012-12-13 17:44:40 +09:00
Tadashi G. Takaoka
ac3720ce6d Fix layout switch keys' label of no language subtype keyboard
This change moves the following string from resources to
KeyboardTextsSet.
- label_to_alpha_key
- label_to_symbols_key
- label_to_symbols_with_microphone_key

Bug: 7697799
Change-Id: Icf9b8848de4c70f792e336f2ae274dab12be79ee
2012-12-13 17:44:10 +09:00
Tom Ouyang
fa2d543785 Refactor more keys menu framework (part 1)
Eliminate use of slower popup window for rendering the more keys menu and more suggestions menu.
These menus are now drawn directly on the preview placer view.

Change-Id: I40638724a6ffde2be4b5d0341d2a5db7ff7be930
2012-12-07 16:34:25 -08:00
Tadashi G. Takaoka
8e2b34cdb2 Cancel batch input when orientation has been changed
Bug: 7665231
Bug: 7662486
Change-Id: I7b6095026dbf1b9b2f6d3b29f2ab83c462ab374e
2012-12-06 14:24:05 -08:00
Tadashi G. Takaoka
8c93e513ad Fix off by one bug in gesture trail drawing
Bug: 7594165
Change-Id: Ia3f7dcee71db91e39c40022b19e7b07c5d4488c8
2012-12-05 14:56:31 -08:00
Tadashi G. Takaoka
08d8a676c2 Dismiss sliding key input preview when touch event is canceled
This is a follow up of Id807af31.

Bug: 7662486
Change-Id: I13895140f1214592257d0023c1450875a4885ee9
2012-12-04 16:37:26 +09:00
Tadashi G. Takaoka
f9898d05f7 Merge "Get rid of special keys from ProximityInfo" 2012-12-03 01:55:30 -08:00
Tadashi G. Takaoka
308aaff80c Get rid of special keys from ProximityInfo
Bug: 7601672
Change-Id: I15faa4829b98f7b4dd07013fdd58bc2c527bcd6f
2012-12-03 18:50:58 +09:00
Tadashi G. Takaoka
84f5816cf1 Merge "Groundwork for sliding key input preview" 2012-12-03 01:19:51 -08:00
Tadashi G. Takaoka
547b638194 Groundwork for sliding key input preview
Bug: 7548583
Change-Id: Id807af31f581c08ff8074ed1f6766337bea9469f
2012-12-03 18:16:12 +09:00
Tadashi G. Takaoka
6f0a60d10d Cancel gesture preview update when gesture typing is canceled
Bug: 7594165
Change-Id: I2854a49b2a2e5d3e36cafc5196191359fd2bf003
2012-12-03 15:04:01 +09:00
Tadashi G. Takaoka
b5fc0e02d0 Cancel update batch input timer when gesture typing has been canceled
Bug: 7594165
Change-Id: I9dc42919bd196c249c79668570004d3f541cc9ec
2012-11-30 16:30:56 +09:00
Tadashi G. Takaoka
e14df775d4 Make RoundedLine member variables as method parameters (Step 5)
Change-Id: Ib2ade2bf51c293c65fc9206a9a16694e6d18da50
2012-11-29 16:50:52 +09:00
Tadashi G. Takaoka
f90475b5d4 Make RoundedLine as top level class (Step 4)
Change-Id: Id52baefb3d61eb46b3679e1ba3aa7ef7cd020efc
2012-11-29 16:28:12 +09:00
Tadashi G. Takaoka
1a6d56e31d Consolidate point calculating and path creating methods into one (Step 3)
Change-Id: Id49eee7c38595ea312dc9a63341a376825030035
2012-11-29 14:28:59 +09:00
Tadashi G. Takaoka
8cfd64eed9 Make rounde line algorithm as instance method (Step 2)
Change-Id: Ia6f41dc0ce7d3f3a1e4a8bbe838835cbdd94e6e9
2012-11-29 14:22:30 +09:00
Tadashi G. Takaoka
0d034b3169 Consolidate data and algorithm of calculating rounded line (Step 1)
Change-Id: Ic6d72b5a34ddfbc55317fa651f78af6f50c9a284
2012-11-29 14:14:49 +09:00
Tadashi G. Takaoka
359c35e0f6 Add CoordinateUtils class
Change-Id: I23784117f77da54ee2a0670e65d86e26d762a687
2012-11-28 19:03:28 +09:00
Tadashi G. Takaoka
2db9e1c447 Fix typo in method name
This is a follow up of I6f851248.

Change-Id: I3fe17f3c81ed35e7c38ac9701e73c6b2c1ca8d63
2012-11-28 14:35:37 +09:00
Tadashi G. Takaoka
0567d144a3 am 7ba02315: am b172725c: am 7d045829: Request update shift state after shift-chording input
* commit '7ba02315abf3f6fe2e40fcb248ccf1cab8dee179':
  Request update shift state after shift-chording input
2012-11-27 11:36:53 -08:00
Tadashi G. Takaoka
7ba02315ab am b172725c: am 7d045829: Request update shift state after shift-chording input
* commit 'b172725c8dc26bc96667135d1b17396f2a6257b4':
  Request update shift state after shift-chording input
2012-11-27 11:34:00 -08:00
Tadashi G. Takaoka
72fd0968e5 Provide gesture data even if the finger stays still
Bug: 7595187
Change-Id: I6f85124815f18706b2b2b5b5da2783dffd246e8c
2012-11-27 18:33:16 +09:00
Tadashi G. Takaoka
b3f789799a Cancel gesture typing by sliding out from keyboard
Bug: 7594165
Change-Id: I7849d763e49b57716e8418fb8b6f90eca3a5d2ec
2012-11-22 17:49:56 +09:00
Tadashi G. Takaoka
befc1a05c9 Fix keyboard theme initializing bug
Change-Id: If7037f3e0606ee34d1a6739cc39da23de18cc35c
2012-11-22 11:41:53 +09:00
Tadashi G. Takaoka
7d045829b8 Request update shift state after shift-chording input
Bug: 7529860
Change-Id: Iec82459348722be358ae2ded15deafac21749dcd
2012-11-21 16:12:40 +09:00
Tadashi G. Takaoka
c27e899dbe Reorganize currency keys
Add Rial(ar), Indian Rupee(hi), Tugrik(mn), Baht(th), Hryvnia(uk),
Dong(vi) currency sign keys to symbol layout.

Bug: 7455289
Change-Id: I0f819631ff05c4a31d3a6868dea5e18a1797f103
2012-11-20 18:04:55 +09:00
Tadashi G. Takaoka
76d4ffeebf Add Spanish United States keyboard
The subtype locale name on the spacebar will be suppressed when only
one subtype is enabled and
 - Subtype locale is equal to the system locale.
or
 - Subtype language is equal to the system language but the subtype is
   implicitly enabled.

Thus the "es_ES" system locale chooses "es" subtype keyboard
implicitly but the keyboard doesn't have the subtype name on its
spacebar.

This change also removes Spanish Latin America keyboard.

Bug: 7531804
Change-Id: Ib929e8235d643c0ba039eb010e18ab721a734e15
2012-11-19 15:39:44 +09:00
Ken Wakasa
fe9ec6bc7d Remove unused variables
Change-Id: Ia5079368a1bc86ccdf0052445dc6945041c0abca
2012-11-16 19:28:56 +09:00
Tadashi G. Takaoka
0d3eb7d963 Swap single and double quotation marks in Spanish tablet keyboard
Bug: 6672279
Change-Id: I120613e36ba6a690e54447fa6c9c90e131f2a155
2012-11-14 15:54:19 +09:00
Tadashi G. Takaoka
6fbbab3b84 Enhance ImfUtils to InputMethodManagerWrapper class
Change-Id: I6ff86ee819a446dd3ed5f9c3400d23564027b020
2012-11-12 15:23:43 +09:00
Ken Wakasa
43f579e9f6 am 4eef5101: am aa5d6fe0: am 9cc22c45: am 5d2556b9: Reset the IME if requested by the app.
* commit '4eef51016adc4e103fa65d944a0ab31527ddced8':
  Reset the IME if requested by the app.
2012-11-08 06:22:02 -08:00
Ken Wakasa
4eef51016a am aa5d6fe0: am 9cc22c45: am 5d2556b9: Reset the IME if requested by the app.
* commit 'aa5d6fe05ce45e36b732a3abc849508cd8279257':
  Reset the IME if requested by the app.
2012-11-08 06:12:57 -08:00
Ken Wakasa
5d2556b932 Reset the IME if requested by the app.
Specifically, reset the KeyboardState to the main Alphabet layout in
LatinIME.onStartInputViewInternal() if a keyboard layout set doesn't get
reloaded in the method.

Please note TextView.setText() calls up resetInput(), then the IME should
reset with it.

bug: 7482086

Note that bug: 6851364 needs to be revisited.

Change-Id: I5d448c10963d3dd952dd13cb587085ec7b014e69
2012-11-07 01:09:26 +09:00
Tadashi G. Takaoka
a47a777476 Merge "Cleanup logging code" 2012-11-01 02:15:24 -07:00