Commit Graph

113 Commits (ed0d1156f7c95666b22e10284d8f985a5e83f283)

Author SHA1 Message Date
Tadashi G. Takaoka 42fcb2de64 Get rid of public reference to KeyboardIconsSet.ICON_* constants
As a consequence,
  * Add Key.iconDisabledKey has been introduced and Key.getIcon honors
    the enabled state of the key.
  * The attribute id of disabled icon for shortcut key,
    Keyboard_iconShortcutKeyDisabled, is renamed to
    Keyboard_iconDisbledShortcutKey
  * KeyboardIconsSet has getIconByIconId and getIconByAttrId methods
    instead of getIcon.

Bug: 5778201
Change-Id: Ica93b073b9a04acd18ead7a33b60e3c6d813e7a1
2011-12-19 01:11:09 +09:00
Tadashi G. Takaoka 4112dc0500 Move spacebar drawing code from LatinKeyboard to LatinKeyboardView
Also this change moves LatinKeyboard attributes,
autoCorrectionSpacebarLedEnabled, autoCorrectionSpacebarLedIcon,
spacebarTextRatio, spacebarTextColor, and spacebarTextShadowColor to
LatinKeyboardView.

Change-Id: I7cc27ce1fc550e9f620a9ed0fbe4b8172902d5a1
2011-12-18 19:07:12 +09:00
Tadashi G. Takaoka 7bd714c086 Add extra key icons to KeyboardIconsSet
* Get rid of Key.keyIconShifted attribute.
    Add Keyboard.iconShiftKeyShifted to KeyboardIconsSet.
  * Get rid of LatinKeyboardView.disabledShortcutIcon attribute.
    Add Keyboard.iconShortcurKeyDisabled to KeyboardIconsSet.
  * Add Keyboard.iconSpaceKeyForNumber to KeyboardIconsSet.
  * Fix misplaced autoCorrectionSpacebarLedIcon resources.

Change-Id: I381bff3789254977ab3cb18f58f95b3c433b1e1a
2011-12-18 18:25:29 +09:00
Tadashi G. Takaoka 5afc3ae2d9 Add LatinKeyboardView style
As a result, this change moves shortcut related update code to
LatinKeyboardView from LatinKeyboard.

Change-Id: I1882672577f61e73c90d6c018b7dbb61f3fe21e4
2011-12-18 16:42:23 +09:00
Tadashi G. Takaoka 7cc2595b6f Add LatinKeyboard.spacebarTextRatio attribute
Bug: 5776979
Change-Id: Ia568d1170ed33a000eb3bb02ecdf611e4b5ff2d5
2011-12-18 01:00:06 +09:00
Tadashi G. Takaoka a44685ab32 Add colorValidTypedWord and alphaValidTypedWord
This change fixes Gingerbread theme.

Change-Id: I142437ac0173df48ab36390f47ed67c6cea24a65
2011-12-16 12:26:19 +09:00
Tadashi G. Takaoka 23d27fefcb Fix auto correction spacebar LED
Change-Id: I4894d188d5612380cc9f8eec7cb72544e37fb2b0
2011-12-15 17:34:14 +09:00
Tadashi G. Takaoka a0e4f40994 Special handling of one key mini-keyboard to mitigate visual flicker
Use pre-computed width and height of mini keyboard if
 * Popup key preview is enabled
 * The mini keyboard has only one key
 * Pre-computed width and height are specified

Bug: 5248783
Change-Id: I53475698e87d5bd67d36e63323c25a9e9f18fbb1
2011-10-14 17:49:48 +09:00
Tadashi G. Takaoka 5c26922ab2 Move themeId and touch correction data to Keyboard style
Change-Id: I13b9997e013b704734b6fa94131b1f7fec7a152d
2011-09-30 22:59:53 +09:00
Tadashi G. Takaoka 287f4f83e9 Add horizontal edges paddings to phone/number layout
Bug: 4948171
Change-Id: I8a06a25ffcbd141c9418e77e982233166a347914
2011-09-26 17:11:01 +09:00
Tadashi G. Takaoka 0967ef4036 Draw more suggestions hint using text font
Bug: 5287964
Change-Id: I692b5303268c7b5115853177c956e147312c582d
2011-09-16 16:47:58 +09:00
Tadashi G. Takaoka 697bf585f8 Update suggestions strip text color
Bug: 5287964
Change-Id: Ic40bb656873f41bb6d65427f02399464e831aab2
2011-09-13 12:54:59 +09:00
Ken Wakasa 6b97d2b9c2 Tweak bottom padding for the "..." popup hint
Follow up to I45bd6edf

bug: 5255103

Change-Id: I6d5368dadbaf6c7dffadd783d8a8756fea9dbff7
2011-09-07 21:58:30 +09:00
Tadashi G. Takaoka ea0c567f86 Tune mini keyboard visual
This change only gets rid of the surrounding paddings of the mini keyboard.

Bug: 5248783
Change-Id: Idb95ac1467085c230fd60e4bc0f466fef5700bfb
2011-09-05 20:36:19 +09:00
Tadashi G. Takaoka 9676038b6e Introduce maxMoreSuggestionsRow and minMoreSuggetionsWidth attributes to SuggestionsView
Bug: 5257594
Change-Id: Id52c841b72e38eb9034a1a7f26bcf3d4d81ad216
2011-09-05 18:59:37 +09:00
Tadashi G. Takaoka 0e2fa66144 Rename suggestionsPaneViewStyle to moreSuggestionsViewStyle
Change-Id: I30873ad870c728e28a044baf9946b4461ab03575
2011-09-05 16:48:56 +09:00
Tadashi G. Takaoka 913e2aeef2 Rename CandidateView to SuggestionsView
Change-Id: I6480cdf025f065130e1969899b259a243e7a11be
2011-09-01 15:41:34 +09:00
Tadashi G. Takaoka 29e7b7ed6e Implement popup suggestions pane
Bug: 5023981
Change-Id: Ie1d69131dbf884a3f6a2beb3ac3427e5437c1486
2011-08-31 21:21:22 +09:00
Tadashi G. Takaoka 9d5601e901 Rename PopupCharactersParser to MoreKeySpecParser
Also renames PopupPanel to MoreKeysPanel

Change-Id: I37209a5a8fe7dbba1eef03e3be88ba5253653926
2011-08-31 18:34:35 +09:00
Tadashi G. Takaoka 9237a72634 Rename PopupMiniKeyboardView to MiniKeyboardView
Change-Id: Ic83cd1200cfb8f8c0b0cfbcad449031b8e8a29e0
2011-08-31 15:30:54 +09:00
Tadashi G. Takaoka c04bbc1ae9 Fix "touch to save" colors
Bug: 5218662
Change-Id: I094b2ceb7438148eb5bdf620b188f598e8442a07
2011-08-26 18:55:36 +09:00
Tadashi G. Takaoka d47a955610 Fix suggestions strip text colors
This change also shows the valid typed word in bold face.

Bug: 5161713
Change-Id: I15355a11888fc8ef90ecc8b64a52eb08c1a2b367
2011-08-22 18:56:54 +09:00
Tadashi G. Takaoka bea6b72106 Get rid of auto correction flash animation in the suggestion strip
This change also reverts I1350ad3d.

Bug: 5156762
Change-Id: I047e75699e8eea02204ad95e12dcc0aefe49ac34
2011-08-16 17:47:23 -07:00
Ken Wakasa 59f5cc8572 Get rid of auto correction flash animation in the suggestion strip
bug: 5156762
Change-Id: I1350ad3d7125f8ecdfc699233ed05e253cc3f010
2011-08-12 23:14:34 +09:00
Ken Wakasa 39d2a4c005 Revert Idedaabd1 partially until we have the new auto-correction indicator in TextView
Change-Id: I492f1282590b3aa23682be24dea0bc5a00bd7749
2011-08-09 13:06:49 +09:00
Tadashi G. Takaoka ae5c736e37 Remove suggestion pane controller from strip
This change also removes speacebar LED to represent auto correction.

Bug: 5023981
Change-Id: Idedaabd147ed608df35cb51769388578a05174a1
2011-08-08 00:15:49 -07:00
Tadashi G. Takaoka 60a004f78e Fixed count suggestions strip
Bug: 5023981
Change-Id: I434d23bdfb653989866d3822c978cd929a2b553c
2011-08-05 19:25:36 -07:00
Tadashi G. Takaoka ef5dfc480c Remove sliding spacebar language switcher
Bug: 4971680
Change-Id: Ia3485ddcf8051bf7b7ba7f7a37fa75c3bc8a4798
2011-07-19 23:24:49 -07:00
Tadashi G. Takaoka a19b84dcf6 Move key hysteresis distance parameter to KeyDetector class
Bug: 4768084
Change-Id: Ib8771afd7363a4a5590b2b4a586e3014c026be34
2011-07-04 22:32:21 +09:00
Tadashi G. Takaoka 9812fb0fe9 Specify Key gaps by percentage
Change-Id: I4721bf831b5edbea1dd4309c6ce907544b098d62
2011-07-04 15:11:17 +09:00
Tadashi G. Takaoka 3118277dd4 Tweak ICS theme a bit
Change-Id: Ib8f1a712a1fc3fd6f08b336617b4b6a17af11376
2011-07-01 21:11:34 +09:00
Tadashi G. Takaoka 74b6897a12 Adaptive suggestions strip
Bug: 4903845
Change-Id: I9e2e17a9eee72df5c92414dcd4796ed7fe1655e1
2011-07-01 00:46:34 +09:00
Tadashi G. Takaoka d773bf38a3 Cleanup key drawing code
This change also modifies 9-patch drawables to fix the following
issues.  In order to draw key background drawable just on the
coordinates we want, we have to know where an actual "visible" part is
in the drawable.  The only clue we can use is "padding" of the
drawable.  To achieve this, the 9-patch drawable must have its
"visible" part marked as "content".  Please refer the Bug: 4948171 for
more detailed explanation.

This change also reverts the following "black" drawables back from
Gingerbread because recent change broke these (I70019a91).
  * drawable-hdpi/sym_bkeyboard_*.png
  * drawable-hdpi/btn_keyboard_key_*_stone.9.png

Bug: 4948171
Change-Id: I6e4d03b3144caa95c793aac97af22df34c5f454f
2011-06-29 18:34:57 +09:00
Tadashi G. Takaoka d87f28f145 Use left/right-edge popup preview background
Bug: 4902361
Change-Id: Iafbadd0e44c0db2fb6a0875c964304bec6ac8cb0
2011-06-28 16:00:23 +09:00
Tadashi G. Takaoka 3040c8bcdd Draw popup hint "..." by text rendering
Bug: 4959808
Change-Id: I30456b91852904c6801cbdd6476406fd60e84551
2011-06-28 01:50:26 +09:00
Tadashi G. Takaoka 8aee759262 Remove reference to system theme
This change also introduces
 * Background for space key preview
 * Tune stone theme

Change-Id: I84fca0baf2392582da870d2ff77b3e99c28faf7b
2011-06-27 22:36:04 +09:00
Tadashi G. Takaoka 520a297ad1 Draw phone/number keyboard layout witout icon
This change introduces:

* New KeyboardView attribute
  * keyLargeLetterRatio to specify large letter text size.
  * keyHintLabelRatio to specify hint label text size.
  * keyHintLabelColor to specify hint label text color.
  * keyPreviewTextRatio to specify key preview text size.
* New Key.keyLabelOption flags
  * alignLeftOfCenter, align the key label slightly left of the key center.
  * largeLetter, use keyLargeLetterRatio to draw key letter.
  * hasHintLabel, draw keyHintLabel at the right of key letter.
  * followKeyHintLabelRatio, draw the key label following keyHintLabelRatio size.
* Renames
  * Key.keyHintLetter to keyHintLabel.
  * Key.keylLabelOption fontFixedWidth to fontMonoSpace.
  * Key.keylLabelOption popupHint to hasPopupHint.
* Removes
  * number icon releted attributes and declarations.

Change-Id: I2f456737e3a46209e5f48b5155951b2b21a33859
2011-06-27 20:04:34 +09:00
Tadashi G. Takaoka 9116bf18f9 New IceCreamSandwich assets and theme
This change instroduces new IceCreamSandwich assets and renames
Honeycomb theme to IceCreamSandwich.  Though checked only on
hdpi-phone and mdpi-10"-tablet.

File another bug (Bug: 4852048) to fine tune keyboard layout for all
possible combination of devices and themes.

Bug: 4436327
Change-Id: I4f8dc1dd6b798a39204702bbcbebf17a199dc82f
2011-06-23 21:06:17 +09:00
Tadashi G. Takaoka a93d27d6b8 Remove colorScheme attribute from KeyboardView
Change-Id: I9de118e8be60b9a6fe1aecc00332ba08872db918
2011-06-22 22:45:03 +09:00
Tadashi G. Takaoka ada37cb4d3 Make auto correction candidate displayed in bold font
Bug: 4724868
Change-Id: I0a77893f7894c4edb226f97c0acea24142c35949
2011-06-18 13:40:49 +09:00
Tadashi G. Takaoka 237af54df5 Tune up 7 inch keyboard layout
Bug: 4479212
Change-Id: I25c48ef474f6198dde9b670b23509c087acae149
2011-06-17 16:27:51 +09:00
Tadashi G. Takaoka 9d9522abdc Add Key.keyHintLabel and remove Key.keyHintIcon
This change also removes manualTemporaryUpperCaseCode and
manualTemporaryUpperCaseHintIcon.  Instead of these keyLabelOption now
has hasUppercaseLetter flag value.

Bug: 4436327
Change-Id: I88fdac1e888a7123735296f5ef45f5fdd565cd2e
2011-06-16 21:24:19 +09:00
Tadashi G. Takaoka a61967330e Make LatinKeyboard aware of theme
Bug: 4436327
Change-Id: Idecdd470cbb0720b96958039eb11f6978d39629e
2011-06-16 20:10:49 +09:00
Tadashi G. Takaoka 08a6f2aea7 Make CandidateView aware of theme
This change is needed to introduce new theme easily.

Bug: 4436327
Change-Id: Idc368b66d892d9c888ba7a26bfa3527c21678292
2011-06-15 20:02:45 +09:00
Tadashi G. Takaoka b7758d6f91 Make Keyboard aware of theme
This change is needed to introduce new theme easily. As a starter this
change introduces Keyboard.popupHintIcon attribute and
Key.keyLabelOption.popupHint flag to show popup hint icon that is
previously specified by Key.keyHintIcon attribute.

Bug: 4436327
Change-Id: I6b1c5c1b88eece541141b2d2cedd164ee02e5c2a
2011-06-15 19:51:30 +09:00
Tadashi G. Takaoka 13a7419994 Use custom theme for Keyboard theme switch
This change reduces the number of layout files and make these
theme-generic.  This might be very helpful to re-design suggestion
strip.

Bug: 4175031
Change-Id: Idca10a4aa0bf7ac496eedd1879311e59780a423b
2011-05-25 18:59:00 +09:00
Tadashi G. Takaoka d157834345 Auto text sizing using fraction of key height
Bug: 4411676
Change-Id: I8f289dcebe577d277fe2ad6a8331d59f735cbada
2011-05-13 18:44:57 +09:00
Tadashi G. Takaoka ff082d081f Refactor KeyboardView and create MiniKeyboardView
Change-Id: I8d68b944762ccde05020978f20b3742eb6ab945b
2011-05-09 19:17:39 +09:00
Tadashi G. Takaoka 7a3d3ae17f Fast key preview
Previously the key preview was implemented by PopupWindow.  The key
preview popup window would be dismissed and shown each time the key
was released and pressed.  It turned out that it was taking several
milliseconds.

This change implements the key preview by a simple TextView which will
be layout-ed at absolute coordinates within the screen FrameLayout.
And dismissing and showing the key preview is implemented by the
TextView's visibility.

This implementation needs careful coordination of candidates.xml
layout and LatinIME.onComputeInsets to control suggestion strip
visibility.

Bug: 4179964
Change-Id: Id6347cb35b91eb14ab20dd2f312e58b54b6625a7
2011-04-13 18:59:33 +09:00
Tadashi G. Takaoka 5a309f5715 Move some inner static class to top class in new package
This change introduces new package com.android.inputmethod.keyboard
which hosts keyboard related classes.

Also adds missing @Override and @SuppressWarning("unused") annotation

Change-Id: I0317f5cfa317e13f3c77815f48ffc69b5d1ade05
2010-12-02 20:06:01 +09:00
Tadashi G. Takaoka 5d04042663 Tweak tablet keyboard design
This change introduces,
- center align "More" key label
- remove drop shadow from key label
- darker key label color when manual temporary upper case
- narrower pop up mini keyboard
- remove unnecessary key background from pop up mini keyboard
- smaller key label in portrait

Bug: 3216592
Change-Id: I77e0733f467a88aa32e09fcbace56fe08f755229
2010-12-01 18:51:38 +09:00
Tadashi G. Takaoka 59c9930ca9 Support colorScheme <case/> condition in Keyboard XML
Change-Id: Ibbfb99e0e2b15df301f83af6739b7bca01ebf490
2010-11-23 18:07:27 -08:00
Tadashi Takaoka 68864723cf Rename LatinKeyboardBaseView class to KeyboardBaseView
Change-Id: I496ecbfa7d398583d01f821398f49f75d17311d8
2010-11-05 18:36:19 +09:00
Tadashi G. Takaoka 2b4cc0db61 Fix xlarge min-keyboard layout
Change-Id: Ia4d6cffa0c6cf710da577b75f6337836352959a0
2010-09-28 16:12:51 +09:00
Tadashi G. Takaoka 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
Tadashi G. Takaoka 0ae817c9ae Add enter/exit animation style to prevew and mini keyboard
TODO This animation style API of PopupWindow can be called only in
Gingrebread or later.  We should refactor this using reflection to be
able to be compatible with Froyo.

Bug: 3004787
Bug: 2973989
Change-Id: I2abfcc853b1a0af2bccee7bdf5fbd723456b7d34
2010-09-24 20:51:13 +09:00
Tadashi G. Takaoka 7763b36d6d Align key preview and mini-keyboard positions
Bug: 3004793
Change-Id: I1839e6ff3c8c66a576bfb3db9391c146ed225451
2010-09-18 02:19:03 +09:00
Tadashi G. Takaoka eb68036798 Add keyHysteresisDistance xml attribute
This change also introduces MiniKeyboardKeyDetector and
mini_keyboad_slide_allowance parameter to tune the key detection
behavior.

Bug: 2993769
Change-Id: I1932b0a382e172cb77b9e098ae182049c834dfe0
2010-09-14 16:26:45 +09:00
satok 395d501252 Rename keyboard_popup_keyboard.xml keyboard_key_preview.xml
Change-Id: I7c98a91c77f5ef46ee0b15783242024c0bd10503
2010-09-13 23:06:49 +09:00
satok c931021da0 Fix the gap of popup
Change-Id: I8b727fce857c1f943bd6f1eff6fa5d9b3c158a60
2010-09-13 18:59:48 +09:00
Ken Wakasa aed0122734 Fix a bug in y-axis offset for sliding finger key detection for mini popup keyboard.
Also, tentatively added key detection allowance for below of the keys in mini popup keyboard.

bug: 2979407
Change-Id: I84794969facd929c84df23e0120d46dff71c6efb
2010-09-12 19:17:08 +09:00
Ken Wakasa 83c6069b98 Decrease LatinKeyboardBaseView_keyPreviewOffset. Popup will be displayed closer to each key typed.
Change-Id: I863ade61cb4688214d90b24240743ee7fe16e491
2010-09-02 18:07:50 +09:00
satok 979f869096 DO NOT MERGE. Backport LatinIME from master to Gingerbread
TODO: Cleanup will follow.

Change-Id: I4a68ba9f2f55760aa24187f1f13fdfa8a0b70963
2010-08-20 14:37:03 +09:00