c8c6585f21
Add a forgotten constant
...
This fixes the build.
A constant was used before it was declared in another file.
Change-Id: I72dfca2f76f0c3b7dd64072d062cd48c9bfcbd56
2011-12-27 12:58:49 +09:00
edd1018bae
am 0236c892: Merge "Fix a bug where attributes would have the wrong freq (B0)"
...
* commit '0236c892e6e2a1c313f26380b5d23269600d0c2f':
Fix a bug where attributes would have the wrong freq (B0)
2011-12-26 19:57:03 -08:00
0236c892e6
Merge "Fix a bug where attributes would have the wrong freq (B0)"
2011-12-26 19:55:41 -08:00
f2a12e5ad3
am e85b5bed: Merge "Skip shortcut targets if any. (A1)"
...
* commit 'e85b5bed57f4086f45bce53f27f959277afe3f0c':
Skip shortcut targets if any. (A1)
2011-12-26 19:51:11 -08:00
e85b5bed57
Merge "Skip shortcut targets if any. (A1)"
2011-12-26 19:49:37 -08:00
d8120ff72e
Fix a bug where attributes would have the wrong freq (B0)
...
The reading code is accepting 0..15 and this outputs
0..31.
Change-Id: Ia638950dc2ce0b8743cbb6a71fbad866e9208786
2011-12-27 12:28:13 +09:00
e0e339699a
Skip shortcut targets if any. (A1)
...
Change-Id: I1e83bba2b36bdc0429debb22425ce75001e61c81
2011-12-27 12:22:20 +09:00
066886eb7e
merge in ics-release history after reset to master
2011-12-26 07:00:46 -08:00
841ccf4a5a
am 0fe45eac: Merge "Optimize KeybaordView.invalidateAllKeys a bit"
...
* commit '0fe45eac184ca1165867fd0763258d1b5cacb106':
Optimize KeybaordView.invalidateAllKeys a bit
2011-12-26 06:52:24 -08:00
0fe45eac18
Merge "Optimize KeybaordView.invalidateAllKeys a bit"
2011-12-26 06:50:31 -08:00
33f4ea7ee6
am 07145a37: Fix automatic temporary upper case mode shift key graphics
...
* commit '07145a3706d7692806b9c53548795fa2dbf8f4f0':
Fix automatic temporary upper case mode shift key graphics
2011-12-26 06:44:34 -08:00
9f6485a448
Optimize KeybaordView.invalidateAllKeys a bit
...
Change-Id: I118c792219f649b7297477c78fa725c678650159
2011-12-26 23:43:53 +09:00
07145a3706
Fix automatic temporary upper case mode shift key graphics
...
Bug: 5802387
Change-Id: I4f59fb2f971c543748ed32b37af528767a0549e4
2011-12-26 21:05:33 +09:00
07105e667c
am 77e7532d: Merge "Make Estonian keyboard Scandinavian variant"
...
* commit '77e7532dabd390e96a13f6ce7ad56b3a56697bcb':
Make Estonian keyboard Scandinavian variant
2011-12-25 21:11:11 -08:00
77e7532dab
Merge "Make Estonian keyboard Scandinavian variant"
2011-12-25 21:09:49 -08:00
2168795ea6
DO NOT MERGE. Fix more keys for fr_CA and fr_CH. Also tidy up more keys for de_ZZ as well.
...
This is a cherry pick of http://android-git.corp.google.com/g/156427 from master.
bug: 5800592
Change-Id: Ifb249e8b6d432bbd1a5faf1a8731deea02962d39
2011-12-26 12:55:32 +09:00
6aa7fc0984
Make Estonian keyboard Scandinavian variant
...
This change also fixes Scandinavian keyboard layout around "a" key.
Bug: 5627326
Change-Id: I65da7a56a28d90eabcffcd616164d8e8c1111c96
2011-12-26 12:51:20 +09:00
c8335c740e
am 10862aa4: Fix more keys for fr_CA and fr_CH. Also tidy up more keys for de_ZZ as well.
...
* commit '10862aa4d030f103b74d033589fa64f10624bc16':
Fix more keys for fr_CA and fr_CH. Also tidy up more keys for de_ZZ as well.
2011-12-25 17:48:47 -08:00
10862aa4d0
Fix more keys for fr_CA and fr_CH. Also tidy up more keys for de_ZZ as well.
...
bug: 5800592
Change-Id: I0c9abc807ab0100b3839fc7f0f40c6c1a66e0a6e
2011-12-24 17:29:02 +09:00
cad28335eb
merge in ics-release history after reset to master
2011-12-21 07:00:45 -08:00
a3da688ce7
am 0d0f01da: Fix a typo. A follow up to I68dd6b8d
...
* commit '0d0f01da674e89e294d14061837711996dc5a693':
Fix a typo. A follow up to I68dd6b8d
2011-12-21 05:38:13 -08:00
0d0f01da67
Fix a typo. A follow up to I68dd6b8d
...
Change-Id: I16fa4099c75faac35344b0e4d3c2b866ddac896a
2011-12-21 22:34:08 +09:00
9fcb35698a
am 0fd625bc: Fix a bug with wrong auto-correct cancellation
...
* commit '0fd625bcfdfac1c10e7bd7f9088bf425fec08989':
Fix a bug with wrong auto-correct cancellation
2011-12-21 02:31:18 -08:00
0fd625bcfd
Fix a bug with wrong auto-correct cancellation
...
Auto-correct cancellation would sometimes kick in at
wrong times, causing crashes.
Bug: 5784542
Change-Id: I68dd6b8d9237ce9b66af2dc63e77ba6dd5fd69dd
2011-12-21 19:28:02 +09:00
0360193e82
merge in ics-release history after reset to master
2011-12-20 07:00:32 -08:00
fd54ee23c3
am 752d8cc4: Fix a bug with TYPE_TEXT_CLASS
...
* commit '752d8cc4fc8550e5ec4eee921f5d611c49f57497':
Fix a bug with TYPE_TEXT_CLASS
2011-12-19 23:03:01 -08:00
752d8cc4fc
Fix a bug with TYPE_TEXT_CLASS
...
This was introduced by a badly-rebased commit. The culprit was
I103d6851. There was also another bug lurking there introduced
by a previous commit that this fixes.
Bug: 5775347
Change-Id: I133b54a5159e19714f4bcae8ffbb4824cff9f466
2011-12-20 15:31:55 +09:00
bcb09bfcb2
merge in ics-release history after reset to master
2011-12-19 07:01:20 -08:00
cb5be466a3
am 715a2035: Merge "Reorganize the auto-correction memory"
...
* commit '715a203501f748bfa797e5a4232aa884bd372d44':
Reorganize the auto-correction memory
2011-12-19 02:24:27 -08:00
715a203501
Merge "Reorganize the auto-correction memory"
2011-12-19 02:22:49 -08:00
ad87655fa5
am 96ea1720: Merge "Prepare for proximity + two word correction No2"
...
* commit '96ea1720fdf0b03177f62f9b65d47e4667378fa6':
Prepare for proximity + two word correction No2
2011-12-19 01:21:28 -08:00
96ea1720fd
Merge "Prepare for proximity + two word correction No2"
2011-12-19 01:20:21 -08:00
192e5b15a9
am 4f7d278a: Follow-up fix for I68c667b0
...
* commit '4f7d278af62a89ef3f45cc9ebbfb076a5a352c76':
Follow-up fix for I68c667b0
2011-12-19 01:06:34 -08:00
4f7d278af6
Follow-up fix for I68c667b0
...
Should have preserved the logic of LatinKeyboard.getNearestKeys().
Change-Id: I97b05aa24006402be03088a215fa07abda9477df
2011-12-19 17:58:36 +09:00
9e8761c440
Reorganize the auto-correction memory
...
Change-Id: I31cce9db471dcd4a7b3477bcb037a8ff482b7696
2011-12-19 17:33:15 +09:00
1a6da631ab
Prepare for proximity + two word correction No2
...
Change-Id: Idfa1413e853299f1db459ef07da3efa932047981
2011-12-19 17:12:20 +09:00
5d399a6803
am 42fcb2de: Get rid of public reference to KeyboardIconsSet.ICON_* constants
...
* commit '42fcb2de641c4cd5d57f34889c8752401e35dcc8':
Get rid of public reference to KeyboardIconsSet.ICON_* constants
2011-12-18 08:22:04 -08:00
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
d6ba10120c
am 4e1dab8c: Move KeyboardBuilder and KeyboardParams classes into Keyboard class
...
* commit '4e1dab8cfaad891fe041ed8d71893186c05cef71':
Move KeyboardBuilder and KeyboardParams classes into Keyboard class
2011-12-18 03:50:20 -08:00
4e1dab8cfa
Move KeyboardBuilder and KeyboardParams classes into Keyboard class
...
This change also moves XmlParseUtils to com.android.inputmethod.latin package.
Bug: 5778201
Change-Id: I7d9faa344460753ce178ad4048e0fadb65c75614
2011-12-18 20:19:16 +09:00
694e94a270
am 3708787f: Remove LatinKeyboard class
...
* commit '3708787fe91227083d2a1874fa41493d3bc9fe10':
Remove LatinKeyboard class
2011-12-18 02:31:52 -08:00
e75db3fe68
am 4112dc05: Move spacebar drawing code from LatinKeyboard to LatinKeyboardView
...
* commit '4112dc05002d7a880e558418639cf25c4bd02a5a':
Move spacebar drawing code from LatinKeyboard to LatinKeyboardView
2011-12-18 02:10:44 -08:00
3708787fe9
Remove LatinKeyboard class
...
Change-Id: I68c667b00dadf2ed9f1c62fb7da37d2cf499cd81
2011-12-18 19:10:42 +09:00
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
4afc668929
am 7bd714c0: Add extra key icons to KeyboardIconsSet
...
* commit '7bd714c086a78e2058543b0971ac92f5a30b2362':
Add extra key icons to KeyboardIconsSet
2011-12-18 01:44:30 -08:00
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
cc10b1bbb6
am 1ebedd7a: Remove LatinKeyboard.adjustLabelCase override
...
* commit '1ebedd7a15a8fd94e68fb43eb089ed87c4c5a480':
Remove LatinKeyboard.adjustLabelCase override
2011-12-18 00:15:37 -08:00
dbd811789f
am 5afc3ae2: Add LatinKeyboardView style
...
* commit '5afc3ae2d9df0c2c93f2c66af13b128889ac3b5d':
Add LatinKeyboardView style
2011-12-18 00:04:48 -08:00
1ebedd7a15
Remove LatinKeyboard.adjustLabelCase override
...
Change-Id: If032605c1cd6bb8e913d465e20dec70798c4b8fb
2011-12-18 16:46:44 +09:00
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
Jean Chalard
The Android Automerger
Tadashi G. Takaoka
Ken Wakasa
satok