Tadashi G. Takaoka
46286874f3
Add guard to prevent possible IllegalStateException
...
Bug: 5227682
Change-Id: Iff93b425f52981b5e2c65e309b07bcfe4485eeb1
2011-08-29 18:38:04 +09:00
Jean Chalard
f019d505d7
Fix a bug with synchronicity of spell checking/user dict
...
This fixes a race condition that would end up with the spell
checker not finding some words in the user dictionary when it
just booted.
Bug: 5194627
Change-Id: I1ba911cc53e6ae3b111d54a6f91d1d5feef3f5de
2011-08-29 18:33:20 +09:00
Tadashi G. Takaoka
ed23cc7f0b
Merge "Make PopupPanel decoupled with LatinKeyboardView and Keyboard"
2011-08-29 01:27:07 -07:00
Tadashi G. Takaoka
f44a01b408
Make PopupPanel decoupled with LatinKeyboardView and Keyboard
...
Bug: 5023981
Change-Id: Ib4fd55d52718aa244178ca2313f5e8487378324f
2011-08-29 17:07:48 +09:00
Jean Chalard
940514989a
Merge "Move locale-related utility methods to LocaleUtils."
2011-08-28 20:34:02 -07:00
Jean Chalard
ef35cb631c
Move locale-related utility methods to LocaleUtils.
...
Change-Id: I7e9e6e5bc4486d8618d0213b112308c3d305c15e
2011-08-29 12:29:35 +09:00
Eric Fischer
1f89147493
Import revised translations.
...
Change-Id: I9f822bcc46c870e6c01053b36a497e36849be8d6
2011-08-26 15:02:22 -07:00
Tadashi G. Takaoka
85b4752270
Merge "Move debug information back to suggestions strip"
2011-08-26 04:07:00 -07:00
Tadashi G. Takaoka
013ba3e3e7
Move debug information back to suggestions strip
...
Change-Id: I8cfad5f780a481a251cc4f752bff3cda5ae3ffbe
2011-08-26 20:05:19 +09:00
satok
add3e05379
Do not put the suggestion span for obsolete suggestions.
...
Bug: 5219037
Change-Id: I0300fbc7e1cc97f0f8ba4d21e0e699d9fe66ed76
2011-08-26 19:12:18 +09:00
Tadashi G. Takaoka
7fe084a856
Merge "Fix "touch to save" colors"
2011-08-26 03:06:40 -07:00
Tadashi G. Takaoka
c04bbc1ae9
Fix "touch to save" colors
...
Bug: 5218662
Change-Id: I094b2ceb7438148eb5bdf620b188f598e8442a07
2011-08-26 18:55:36 +09:00
satok
5335535871
Add spell checker subtypes
...
Change-Id: Id0dadb881a74c654c1c4fa972ee82f4238d66d4e
2011-08-26 18:29:40 +09:00
Tadashi G. Takaoka
f3f3189adb
Wrap up popup mini keyboard
...
Bug: 5218641
Change-Id: I88b3e7efa1f7c009c8a8e4f5453a5c4df2f91cfc
2011-08-26 15:45:05 +09:00
Jean Chalard
de4e8dedcc
Allow sharing dictionaries between similar locales.
...
Bug: 5058488
Change-Id: Ib12013f58afad957a8205b439f87480cc12ea06f
2011-08-25 19:42:06 +09:00
Tadashi G. Takaoka
633bc88a0f
Add key preview icon of settings key
...
The new icon has been created just enlarging
sym_keyboard_settings_holo.png to the size of other feedback icon. The
icon should be designed properly by designer after.
Bug: 4948171
Change-Id: I00b018e82ca93190fe87443c8ad8911b36551002
2011-08-25 12:23:12 +09:00
Jean Chalard
a16621ada4
Add a debug variable
...
...that was missing
Change-Id: Ia3b17909f295e0a93dee633c8d67c0e03840023e
2011-08-24 21:36:18 +09:00
Jean Chalard
20973de72b
Avoid unnecessary output to the system log.
...
The message this removes gets printed under normal conditions.
Normally dictionary files are compressed then crypted, but not
compressed a second time; however LatinIME tries to open a
compressed-crypted-compressed file first, because it could not
do it afterwards and we want to support this case. So under
normal operations, the first method LatinIME tries is actually
expected to fail.
Also, if we decide to stop compressing or/and encrypting dicts
LatinIME supports it as a valid use case. It should not print
errors to the log.
If the file cannot be open at all, then it is an unexpected
case, and Latin IME still reports to the log.
Change-Id: Ic5228c51365a101af1d03e2c893484d3050b5a1c
2011-08-24 20:27:04 +09:00
Tadashi G. Takaoka
1d59e0dbdf
Merge "Fix suggestions strip press state to align vertically"
2011-08-24 03:35:57 -07:00
Tadashi G. Takaoka
580e1d7ac0
Fix suggestions strip press state to align vertically
...
This change also tweaks more_suggestions_hint drawables to eliminate
unnecessarily padding at the bottom.
Bug: 5204563
Change-Id: If5ec731c9a490da0116a020e8fd405c7d025d707
2011-08-24 18:15:19 +09:00
Tadashi G. Takaoka
1cdd7caef9
Merge "Remove tablet specific suggestions updating delay"
2011-08-24 01:37:50 -07:00
Tadashi G. Takaoka
d1bf701196
Remove tablet specific suggestions updating delay
...
Bug: 5100007
Change-Id: I3ab1bffbda4f8535489a2fcc41ffe33b43d1a96b
2011-08-24 17:36:18 +09:00
Jean Chalard
38d512c0b2
Call the decrypt/unzip routines upon copying a dictionary.
...
Bug: 5095140
Change-Id: I7000f752bc9b7fd6a7af4839b2f225c085300128
2011-08-24 17:12:12 +09:00
Jean Chalard
8b21eb2507
Merge "Refactoring: cut out a method for caching a word list"
2011-08-23 23:17:31 -07:00
Jean Chalard
7b1f74bb9d
Refactoring: cut out a method for caching a word list
...
This is preparation to have the decrypting/unzipping code
moved over to LatinIME.
Bug: 5095140
Change-Id: Ic3fdcc3de673b46cef2eb9ebe6a52cbdd614e50a
2011-08-24 15:09:57 +09:00
Tadashi G. Takaoka
fd47b5d09c
Merge "Move some static methods from SubtypeSwitcher to Utils"
2011-08-23 22:39:51 -07:00
Tadashi G. Takaoka
af52c0ea04
Implement "forceAscii" private IME option
...
This change also introduces "AsciiCapable" extra value for subtype
that indicates the subtype can input any ASCII code point from its
keyboard layout.
Only if the input field has "forceAscii" private IME option and the
current subtype doesn't have "AsciiCapable" extra value, the en_US
keyboard layout will be used for the input field.
Bug: 3384942
Change-Id: I25e2553e37ecb5002df1164e45f6273845fe463b
2011-08-24 13:19:56 +09:00
Tadashi G. Takaoka
57f05f4412
Move some static methods from SubtypeSwitcher to Utils
...
Change-Id: I3ea8ffcdefcefaa82ae76a31bb65977009d8a040
2011-08-24 12:54:53 +09:00
Jean Chalard
1616e2e96e
Merge "Fix an excessive fallback problem."
2011-08-23 02:12:17 -07:00
Tadashi G. Takaoka
c84bc3460d
Rename LatinKeyboardBaseView to LatinKeyboardView
...
Bug: 5182291
Change-Id: I5089a14902b9f4ff1ab4f34e3f7a42aca5040d3e
2011-08-23 17:57:02 +09:00
Jean Chalard
0ee3b69483
Fix an excessive fallback problem.
...
LatinIME has several fallbacks to ensure a dictionary is used.
However, it should now be possible to deactivate the main dictionary
through the dictionary pack settings. In this case, Latin IME should
not fallback to the built-in dictionary.
Change-Id: Ibd992ad89793169f04a968b40781fce819b87b6f
2011-08-23 17:55:46 +09:00
Tadashi G. Takaoka
32572948d7
Refactor and rename popup mini keyoard related classes
...
Change-Id: Ia92ec4612090b03829db9a87ce68d701db6e15bc
2011-08-23 17:51:57 +09:00
Tadashi G. Takaoka
2d306a225c
Merge "Extract sudden jumping touch event hack into separate class"
2011-08-23 01:49:38 -07:00
Tadashi G. Takaoka
c403a46f6d
Extract sudden jumping touch event hack into separate class
...
Bug: 5182291
Change-Id: I6a88ed4df3ec98e31ea4966d82da56f7fca342ac
2011-08-23 17:44:41 +09:00
Tadashi G. Takaoka
2b27f3e698
Merge "Remove password field special handling"
2011-08-23 01:29:11 -07:00
Tadashi G. Takaoka
f9da4c548f
Remove password field special handling
...
Change-Id: Iaf1b4bbb54be7a4cade856d1ba363e976774f442
2011-08-23 16:49:35 +09:00
Tadashi G. Takaoka
0940093c30
Merge "Remove screen orientation confirmation hack"
2011-08-23 00:39:19 -07:00
Jean Chalard
d6834c8125
Merge "Fix a bug with the string pool."
2011-08-22 23:05:51 -07:00
Tadashi G. Takaoka
f94df382fb
Remove screen orientation confirmation hack
...
Bug: 4311428
Change-Id: Ie7e094ded9c7c1fe811b7eb97bc33ffecb29a73c
2011-08-23 14:58:45 +09:00
Jean Chalard
a6e912cf98
Fix a bug with the string pool.
...
This also adds some optional debug code to detect more easily possible
future occurrences of the same problem.
Bug: 5195017
Change-Id: I2558b468e46f7090de868f1ec2dc9e24895d670f
2011-08-23 14:55:34 +09:00
Tadashi G. Takaoka
6dde878d51
Move some methods from LatinKeyboardView up into LatinKeyboardBaseView
...
Bug: 5182291
Change-Id: I699ecef6fb8ea492d96fca1939f51faf0aac7fa6
2011-08-23 12:22:24 +09:00
Eric Fischer
b041412cd7
Merge "Import revised translations."
2011-08-22 12:05:10 -07:00
Eric Fischer
80d6f6716e
Import revised translations.
...
Change-Id: If2817e3bd44c400cd290cba1c1977e38a68d73d0
2011-08-22 11:36:46 -07:00
Tadashi G. Takaoka
450f1c068d
Merge "Remove 7inch dedicated icons"
2011-08-22 03:35:03 -07:00
Tadashi G. Takaoka
9f31575045
Merge "Fix suggestions strip text colors"
2011-08-22 03:32:05 -07:00
Tadashi G. Takaoka
320346f001
Remove 7inch dedicated icons
...
This change also tweaks the size of letters and labels.
Change-Id: Id3f04015778ebca5e8f6833bc695e221fe7a8079
2011-08-22 19:30:59 +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
Jean Chalard
70a92a33f8
Merge "Remove duplicates from the spell checker suggestions."
2011-08-22 02:49:33 -07:00
Jean Chalard
6b166a1933
Remove duplicates from the spell checker suggestions.
...
Bug: 5175740
Change-Id: I592401b3b8c3074d70e06dc3a9919cc3cb47ba49
2011-08-22 18:44:04 +09:00
Tadashi G. Takaoka
b39f612d97
Remove hacks related to determine window width
...
Bug: 4311428
Change-Id: Ic93f264101d13963503fcd447a69bbffd06e69f3
2011-08-22 17:17:42 +09:00
Jean Chalard
5d4c5692f1
Fix case sensitivity for the spell checker.
...
The new behavior is as follows:
- If the word in the dictionary is not fully lower case, then the
exact case is required to match.
- If the word in the dictionary is fully lower case, then any of
the following patterns match:
- fully lower case
- only the first char capitalized
- all caps
Any other capitalization is rejected.
This is probably what people want. If you type a name in all lower
case, it should be marked as a typo, but if you type a word with a
capital for emphasis or just because it's the start of the sentence,
it should match a lower case word in the dictionary. If you have
a spurious capital letter in the middle of a word because of a typo,
it should be marked as such.
Accents are not affected, and should not be. An accented letter
is a different letter and a missing accent should be reported.
We should maybe consider again for some common transpositions
like the "ue" digraph for German, which is now considered a typo,
but will suggest the correct diacritics as the first suggestion.
Bug: 5145751
Change-Id: I651e24f13c90fb94700a1674ad380e95336e7dca
2011-08-22 14:02:57 +09:00
Ken Wakasa
cee174b8cc
Settings key visibility should always follow the system default value,
...
by ignoring its preference value, when the "show settings key option" in
the settings is disabled.
Change-Id: I934be2d9eb0bf6bf731e03f5d9b752de4a7a1c7c
2011-08-22 12:21:25 +09:00
Jean Chalard
6da8b74582
Move the dupes-removing method to the Utils class
...
This is preparation for bug: 5175740
Change-Id: I18b2042317f740cb1e021d3dfbf90ecfbb1a1d37
2011-08-19 19:49:59 +09:00
Jean Chalard
150bad6fd4
Have the spell checker use the User dictionary.
...
Bug: 5175868
Change-Id: I165eee4c865caa5ee1daf3e0b1acde8788b996ef
2011-08-19 17:19:49 +09:00
Jean Chalard
f0025a50ac
Remove "thisd" from the whitelist
...
Change-Id: Ie834cd87f4579f3df5935607a4b94648b7c145dd
2011-08-19 12:06:03 +09:00
Jean Chalard
1e841de2ce
Merge "Check the main dict id to be able to fallback."
2011-08-18 19:55:16 -07:00
Jean Chalard
a018c67914
Merge "Add "let's" to the whitelist"
2011-08-18 18:21:14 -07:00
Ken Wakasa
d621b73ebb
A follow up to Id6e50398
...
bug: 5151430
Change-Id: I2cc91cc3f426ba1b42a1421344e1183ce35c60e0
2011-08-18 22:23:47 +09:00
Ken Wakasa
e56e88beff
A follow up to I830de4d1
...
bug: 5130446
Change-Id: Ib1a4603590387c30be7555b8386f5e0607ea7249
2011-08-18 21:51:04 +09:00
Jean Chalard
ee7daefd97
Check the main dict id to be able to fallback.
...
Bug: 5095140
Change-Id: I02032923ca2a65bd8fbabc0abbe6a476f7542187
2011-08-18 20:09:35 +09:00
Jean Chalard
89fdb82753
Merge "Move the settings test to a more appropriate place."
2011-08-18 03:39:08 -07:00
Jean Chalard
83207fb482
Move the settings test to a more appropriate place.
...
This change refactors the dictionary selection code so that the
cached dictionary files list and the settings tests are more
cleanly separated.
This will also help with future refactorings that will test for
the presence of the main dictionary and insert the fall back if
it's not supplied by the dictionary pack.
Bug: 5095140
Change-Id: I8d7caad7c054031df71fe78b043801a774d50f65
2011-08-18 19:35:52 +09:00
Jean Chalard
4e01afc520
Make the string builder pool in Suggest a singleton.
...
This is internal refactoring, done as preliminary work to fix
Bug: 5175740
Change-Id: I21bd4c001c27e7b925ddb87a152105b4dcab320a
2011-08-18 18:41:57 +09:00
Jean Chalard
5ba5ff9b80
Merge "Exception refactoring"
2011-08-18 02:36:42 -07:00
Jean Chalard
03c3b64ee5
Merge "Refactor string removal to make it static"
2011-08-18 02:36:32 -07:00
Jean Chalard
3016863f86
Refactor string removal to make it static
...
The next step is to move this over to the Utils class.
The ultimate goal is to make use of the duplicate removal code
also in the spell checker as per
Bug: 5175740
Change-Id: Ica36691b843b0713b832c56ffc65e5b2ec427c4a
2011-08-18 15:16:59 +09:00
Jean Chalard
80e0bf0429
Exception refactoring
...
Now that the dictionary pack can return several files, it's better
to handle IO exceptions for each file rather than globally. This
also will help with next implementation steps.
Bug: 5095140
Change-Id: I5ed135ad2ad4f55f61f9b3f92c48a35d5c24bdb2
2011-08-18 15:11:19 +09:00
Jean Chalard
b1d2b12ce3
Add "let's" to the whitelist
...
As discussed by e-mail, this change implements the proposal of
including a "lets" -> "let's" entry to the whitelist.
Change-Id: Ia7b7737c34ebf85675af78501acd865ce399f38d
2011-08-18 13:37:14 +09:00
Jean Chalard
091bbf85d8
Merge "Factor dict pack settings reading into a static inner class"
2011-08-17 19:34:31 -07:00
Jean Chalard
c11c4fd61b
Factor dict pack settings reading into a static inner class
...
This is essentially refactoring to help next steps
Bug: 5095140
Change-Id: Ic97044d2ed354027bac4f84e6ce69d20ef6da092
2011-08-17 11:25:21 +09:00
Tadashi G. Takaoka
961453c3b3
Merge "Get rid of auto correction flash animation in the suggestion strip"
2011-08-16 18:49:36 -07:00
Ken Wakasa
e486175987
Merge "Fixed speaking keys when editing password fields"
2011-08-16 18:45:26 -07: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
Tadashi G. Takaoka
5cb10f78ed
Fix possible NPE
...
Bug: 5171442
Change-Id: I280f6a0ef5fb06f1e03e17c0065d078604e4747a
2011-08-16 17:36:13 -07:00
Jean Chalard
c160373b6a
Close dictionary pools when they are not used any more.
...
Bug: 5156851
Change-Id: Icaba54734eb790b40dc2012aac25df5b2af71dbb
2011-08-16 20:04:57 +09:00
Jean Chalard
29ea7b79c7
Merge "Have a pool of dictionaries to check spelling."
2011-08-16 03:05:50 -07:00
Yusuke Nojima
dbf4f2a552
Merge "Pass the touch event in the top padding of keyboard."
2011-08-16 03:04:30 -07:00
Yusuke Nojima
5ec13092a5
Pass the touch event in the top padding of keyboard.
...
Bug: 5139932
Change-Id: Id176f92f69160f76ae7e0d46cb3d639080779497
2011-08-16 18:33:40 +09:00
Jean Chalard
a562767a14
Have a pool of dictionaries to check spelling.
...
The dictionaries and proximities are not thread-safe. In order to
be able to check spelling in parallel, make a dictionary pool to
call upon when a spelling check is necessary.
Bug: 5156851
Change-Id: Ie3796164187dd7b7abf5ccd5d014073d43d74408
2011-08-16 18:13:12 +09:00
Ken Wakasa
f18bda60aa
Code cleanup
...
Change-Id: I7df8c813038adec750eda260740bcc8a4da41acf
2011-08-16 17:32:37 +09:00
Jean Chalard
70b9c5d991
Make the spell checker re-entrant.
...
Until the dictionary itself is re-entrant, unfortunately we have
to synchronize accesses to it.
Bug: 5156851
Change-Id: I1629a160d707e6fa1ad80cba828798abb24b68b1
2011-08-16 13:58:37 +09:00
Yusuke Nojima
8f7f406c5b
Merge "Add a margin between "123" and the mic icon."
2011-08-15 18:17:48 -07:00
Yusuke Nojima
35775197aa
Add a margin between "123" and the mic icon.
...
Bug: 5161711
Change-Id: I04c777c24b9aac4d82eb3adff8e077640a866f61
2011-08-16 10:07:34 +09:00
Eric Fischer
3fba65bbc2
Merge "Import revised translations."
2011-08-15 10:22:13 -07:00
Ken Wakasa
e8bbc54e74
Merge "Update shift state in onSizeChanged()"
2011-08-15 04:12:24 -07:00
Ken Wakasa
286a5bf1c6
Update shift state in onSizeChanged()
...
bug: 5130446
Change-Id: I830de4d184dffa2b263206c3f078de054e227b9e
2011-08-15 20:10:28 +09:00
Jean Chalard
7674f869dc
Remove the "Touch to correct words" option.
...
Bug: 5113009
Change-Id: Idc4a464e499a2530f517bf7fa449326779129371
2011-08-15 16:38:00 +09:00
Jean Chalard
ab791d0bbc
Revert "Remove the "Touch to correct words" option."
...
This reverts commit 8e69dd80d8
...since it breaks the build
2011-08-14 23:49:01 -07:00
Jean Chalard
8e69dd80d8
Remove the "Touch to correct words" option.
...
Bug: 5113009
Change-Id: Iae8a64e22cf618f4533f966feaf0b5a76725d551
2011-08-15 15:02:51 +09:00
Eric Fischer
790c77fdc5
Import revised translations.
...
Change-Id: I8a8e531887b11318de0af7e15eaff82ae4e51d85
2011-08-12 17:22:07 -07:00
Ken Wakasa
bb5504c47d
Merge "Get rid of auto correction flash animation in the suggestion strip"
2011-08-12 07:19:50 -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
Jean Chalard
b6b7d81f5d
Merge "Add a settings activity for the spell checker."
2011-08-12 03:11:33 -07:00
Jean Chalard
31fd54c53f
Add a settings activity for the spell checker.
...
Bug: 5156940
Change-Id: I762de1296f861abce2d0413404bca54571e0ea0a
2011-08-12 19:07:51 +09:00
Ken Wakasa
f84107cae7
Fix discrepancy in the "show settings key" option
...
bug: 5155640
Change-Id: I2f5f88edde18d6464a67adcfad5aa92b05c36821
2011-08-12 18:59:16 +09:00
Ken Wakasa
1d0807c42c
Merge "Tiny fix for access to cyrillic soft sign on Russian layouts"
2011-08-12 01:58:09 -07:00
Ken Wakasa
758011a118
Tiny fix for access to cyrillic soft sign on Russian layouts
...
bug: 5151430
Change-Id: Id6e50398d087f62a305fad734432135c00329316
2011-08-12 17:52:35 +09:00
Jean Chalard
86e517fe4a
Read shared prefs from the dictionary pack.
...
Bug: 5095140
Change-Id: I227fbd95d8a0330b6dede6de99fde3a5a715fe2d
2011-08-12 17:31:24 +09:00
Ken Wakasa
7fca6a5357
Merge "Key click sound volume fix"
2011-08-11 10:06:49 -07:00
Ken Wakasa
bf7dd47329
Key click sound volume fix
...
bug: 5145886
Change-Id: Ic599373ee17423ef9c61b3dd5177c3763aa31015
2011-08-12 02:02:03 +09:00
Jean Chalard
4ef448ac82
Externalize the dictionary pack's name and settings
...
Some changes downward the road need Latin IME to know the dictionary
pack by package name. This makes the name an external string.
Bug: 5095140
Change-Id: Ibebf5eb892af19681c18da38955e50dfb573330a
2011-08-11 21:48:59 +09:00
Jean Chalard
08868624ed
Use the dictionaries cached LatinIME-side
...
Dictionaries are now copied over from the dictionary pack to Latin IME.
This change enables Latin IME to use all dictionaries that have been
cached until now.
Bug: 5095140
Change-Id: Id9a2bacf9dc1c693189b0ac8aa3f75756dc1e3e6
2011-08-11 18:15:39 +09:00
Jean Chalard
2896673461
Rename a function and update a comment
...
Bug: 5095140
Change-Id: Idf66a04c6a1a05015f94187a8dbce3d443bbf38b
2011-08-11 17:07:28 +09:00
Jean Chalard
f102f6a3ac
Merge "Give the orders to delete the source files to the dict pack"
2011-08-10 21:54:27 -07:00
Jean Chalard
5774908bb3
Give the orders to delete the source files to the dict pack
...
Bug: 5095140
Change-Id: I64552861768ca30073ffe0d631b2e0c44dad4aa9
2011-08-10 21:55:15 +09:00
Luca Zanolin
c359d75ca7
Merge "Execute the switching to a different IME in a POOL_EXECUTOR."
2011-08-10 04:17:53 -07:00
Luca Zanolin
613073d01b
Execute the switching to a different IME in a POOL_EXECUTOR.
...
Using only a single thread may slow down the application, if there is already another thread running.
Bug: 5142142
Change-Id: I314480a58af20ea09458ff82e586304fc3c7c070
2011-08-10 10:29:06 +01:00
Jean Chalard
d4c08d9be3
Make sure the directory where to put files actually exists
...
Bug: 5095140
Change-Id: I764471e54ce0bf6aefe5d604cee97639d5ad0af9
2011-08-10 17:14:34 +09:00
Ken Wakasa
11b7febc0b
Ellipsis for "Space" key for triggering the IME switcher
...
bug:5136497
Change-Id: Iab7c68135500e9fed212521484090b52943550ca
2011-08-10 00:31:23 +09:00
Jean Chalard
f098fbbef3
Add proximity info for the spell checker.
...
Bug: 5119987
Change-Id: I35700fd8b0ffa6bced428cc6d46b3f64eb251281
2011-08-09 17:24:28 +09:00
Jean Chalard
3a22708e65
Have Latin IME copy files from the dictionary pack.
...
Also some minor cleanup: remove unused methods, minor refactoring into methods.
Bug: 5095140
Change-Id: I035537b37a31adfc8db3b933fb0cefcf703d6c7c
2011-08-09 16:02:14 +09:00
Jean Chalard
741c683d5e
Merge "Stop reloading contacts when not appropriate."
2011-08-08 23:44:24 -07: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
Jean Chalard
14051e2b53
Stop reloading contacts when not appropriate.
...
A recent change had the contacts reloaded every time a new field
is touched. This change not only fixes the problem, but also removes
reloading contacts when changing language, which should make language
switch within LatinIME lighter.
Bug: 5125034
Change-Id: Ia61c4f75a8617113cdce88a2e2c6fdf073146a2d
2011-08-09 12:49:19 +09:00
Eric Fischer
0484758b0e
Merge "Import revised translations."
2011-08-08 15:04:31 -07:00
Alan Viverette
58e3f1065e
Fixed speaking keys when editing password fields
...
Bug: 5042681
Change-Id: Ic4523ec38b0faa2b6a91d476ea7af7e69404861c
2011-08-08 11:05:04 -07:00
Ken Wakasa
44beeab4a4
Merge "Fix issues with long-press access to more suggestions"
2011-08-08 04:37:09 -07:00
Ken Wakasa
bbf25cf251
Fix issues with long-press access to more suggestions
...
Change-Id: If5a45dcae7f7e7881d305104e35a04c341719aec
2011-08-08 20:33:44 +09:00
Ken Wakasa
ad7ddca397
Merge "Correction mode should not rely on the existence of the main dic"
2011-08-08 04:24:05 -07:00
Ken Wakasa
c769ef4dd1
Correction mode should not rely on the existence of the main dic
...
bug: 5114094
Change-Id: I2088918ec2c9ad6f8db13b55e58d3e73e180aef8
2011-08-08 19:42:24 +09:00
satok
c2b6a35e65
Add the spell checker configuration xml
...
Change-Id: I05fe12dbdef49cb41919023fad6b9df13dc5bd82
2011-08-08 19:21:24 +09:00
Tadashi G. Takaoka
8f79ffcff5
Merge "Remove suggestion pane controller from strip"
2011-08-08 00:22:11 -07: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
dbb6d12661
Update keyboard and suggestions strip background drawables
...
Bug: 5131686
Change-Id: Ideb49c3c55464721f21aecf97e2a20b95e3e09a6
2011-08-07 22:04:20 -07:00
Ken Wakasa
20c4aec827
Partially revert I531a3257 as it mistakenly broke some logic -- textToTheLeft was required.
...
Change-Id: I24f55cec05fea68836d6b3413b69f1e1b9c68ba2
2011-08-06 22:37:45 +09:00
Tadashi G. Takaoka
6983cf4a19
Merge "Remove all key preview from placer when window gets hide"
2011-08-06 00:59:03 -07:00
Ken Wakasa
cadb2128f5
Fix issues with long-pressing the spacebar
...
bug: 5114433
Change-Id: I18f2147724a08965147bafe93e11fc86c7c59d33
2011-08-06 16:49:32 +09:00
Tadashi G. Takaoka
1149abd876
Remove all key preview from placer when window gets hide
...
Bug: 5130302
Change-Id: I70e3737c33bfbac99366ab36d3437b0801f5140a
2011-08-05 23:33:51 -07:00
Tadashi G. Takaoka
60a004f78e
Fixed count suggestions strip
...
Bug: 5023981
Change-Id: I434d23bdfb653989866d3822c978cd929a2b553c
2011-08-05 19:25:36 -07:00
Eric Fischer
bf8aa9d348
Import revised translations.
...
Change-Id: Ibbe7e9a4a5543ad2627e8d05fcdf8cfa4a14e27d
2011-08-05 17:25:10 -07:00
satok
5bcf8ee66c
Update the spell checker according to API cleanup
...
Change-Id: Ia95a63963c16265bc9bc7e1fcecf120e17bf8636
2011-08-05 19:57:47 +09:00
Tadashi G. Takaoka
fd047f61e4
Merge "Move suggestions layout code into parameter class"
2011-08-04 23:57:31 -07:00
Tadashi G. Takaoka
94ac3d760b
Fix NPE
...
Bug: 5120674
Change-Id: Iedfd7af33a96b68d83d9a844f61ac40b9523ecdb
2011-08-04 09:40:25 -07:00
Tadashi G. Takaoka
16713e5630
Move suggestions layout code into parameter class
...
Bug: 5023981
Change-Id: I30f45191524c38bfe550845b003e8972abd2ee49
2011-08-04 09:26:37 -07:00
Jean Chalard
3234123fba
Implement the spell checker.
...
Bug: 4176026
Change-Id: I297c47202e96ce0db74d703f30709777f26b93ac
2011-08-04 21:27:14 +09:00
Jean Chalard
ac21e0a349
Merge "Create a way to pass the proximity info to the dictionary"
2011-08-04 04:17:33 -07:00
Jean Chalard
043f784198
Create a way to pass the proximity info to the dictionary
...
This is a preparative change for inserting the spell checker.
Change-Id: Ie441879cac4f67078ec27a95f1fcbbf3ef373df7
2011-08-04 19:46:21 +09:00
Tadashi G. Takaoka
80ba224fff
Merge "Cleanup CandidateView class"
2011-08-04 01:19:55 -07:00
Tadashi G. Takaoka
d95a6365be
Cleanup CandidateView class
...
Bug: 5023981
Change-Id: Id79e31c60dfb41be546f5c5a3680e8651457151d
2011-08-04 01:14:55 -07:00
Ken Wakasa
3aacd1d7d8
Merge "Additional hack for bug:4311428, a follow up for Ieade33d7."
2011-08-03 23:34:12 -07:00
Ken Wakasa
de30f9f2d6
Additional hack for bug:4311428, a follow up for Ieade33d7.
...
Change-Id: If1799a6fa3b2f45c98c9f3aeb88845f1fb08f09b
2011-08-04 15:31:33 +09:00
Jean Chalard
8289dede0a
Merge "Remove newly unused code"
2011-08-03 22:47:27 -07:00
Jean Chalard
09e91ee072
Remove newly unused code
...
Bug: 5095140
Change-Id: Ie4322815f029f063dda2925697d6d8f63bfaf6d6
2011-08-04 13:53:24 +09:00
Ken Wakasa
3889462439
Handle non word separators correctly even for the initial letter of a word
...
bug: 5101114
Change-Id: I0d804c9a500ff000dc06cadad46a2c6c6b8088b2
2011-08-04 12:24:45 +09:00
Tadashi G. Takaoka
bb12dc455b
Merge "Fix saving keyboard state while rotating"
2011-08-03 15:15:59 -07:00
Tadashi G. Takaoka
99debd7519
Merge "Reset keyboard shift lock state when new keyboard is ready"
2011-08-03 15:08:28 -07:00
Tadashi G. Takaoka
38b5605fee
Fix saving keyboard state while rotating
...
This change also uses longer timeout for restoring keyboard state.
Bug: 4311428
Change-Id: Ieade33d7c69f1dee727b2b8c26f0112eca44b336
2011-08-03 09:41:04 -07:00
Tadashi G. Takaoka
73c02390d3
Reset keyboard shift lock state when new keyboard is ready
...
Bug: 5099761
Change-Id: I00ad796ea43a07ae13e71224b7a081ee2f160f1a
2011-08-03 09:24:13 -07:00
satok
e486290013
Merge "Temporary don't use "looks type" for comming rename cl."
2011-08-03 03:24:48 -07:00
satok
55d1c5efab
Temporary don't use "looks type" for comming rename cl.
...
Change-Id: If016a61f9e303b615c59c0035724256535aec817
2011-08-03 18:42:56 +09:00
Tadashi G. Takaoka
eedfef0308
Merge "Retain keyboard layout while orientation change"
2011-08-03 02:37:00 -07:00
Tadashi G. Takaoka
055054eef3
Retain keyboard layout while orientation change
...
This change also changes the timimng that the window width is
registered.
Bug: 4311428
Change-Id: Ied6b1b43bfa16a85f0e05cd308ce919d5d65677e
2011-08-03 02:20:27 -07:00
Tadashi G. Takaoka
a0ac590c8d
Merge "Support label with icon key"
2011-08-03 01:56:24 -07:00
Tadashi G. Takaoka
62d4a96497
Support label with icon key
...
Bug: 5108339
Change-Id: I7cd4258a95a7e25b8b1114b43ffcca5b77c5c1e3
2011-08-03 01:53:30 -07:00
Ken Wakasa
272dfe940d
Merge "Replace ALT/More with more meaningful key labels"
2011-08-03 01:13:32 -07:00
Ken Wakasa
09578c895d
Replace ALT/More with more meaningful key labels
...
bug: 5113471
Change-Id: I324d24ea28c0ff9246dde2494296dca1dddabb1b
2011-08-03 17:06:13 +09:00
Ken Wakasa
21fa416c43
Revive the missing Settings key on tablets
...
This is a follow up change to Ieb42fdfa.
bug: 5094401
Change-Id: If78c966ed02fbc9b8c6da726e00424a927349142
2011-08-03 17:00:14 +09:00
Ken Wakasa
627427b42a
Merge "Fix the popup char order for Arabic layout"
2011-08-02 21:58:32 -07:00
Jean Chalard
81f227de5a
Merge "Change the dictionary file passing schema to a list of ids"
2011-08-02 21:02:11 -07:00
Ken Wakasa
a1d2650a0e
Fix the popup char order for Arabic layout
...
Change-Id: Ic4d8df7a8aa0ec59fee40eb7fadd8a7e49db4198
2011-08-03 12:50:13 +09:00
Tadashi G. Takaoka
b320134f01
Merge "Cleanup Keyboard related code and rename some classes"
2011-08-02 17:21:46 -07:00
Tadashi G. Takaoka
1be29abab2
Cleanup Keyboard related code and rename some classes
...
This is a follow up change of I90ffbde0
Bug: 5023981
Change-Id: I3a6b862d05f5f907dee954cd6d6fee983b20ab5e
2011-08-02 17:12:02 -07:00
Eric Fischer
27f3c83ea8
Merge "Import revised translations."
2011-08-02 15:31:47 -07:00
Eric Fischer
df4db22449
Import revised translations.
...
Change-Id: Idd149b6bec4a78bc7c5f95096bdc2d8e5eaf64c5
2011-08-02 11:40:09 -07:00
Ken Wakasa
047f63f559
"?123" should be up for translation for Arabic layouts
...
bug: 5108339
Change-Id: Ie1abcf50abba569683f76a136718ab24f5089677
2011-08-03 00:28:46 +09:00
Ken Wakasa
0b08a4b7c2
Add char limit for several key label resources
...
Change-Id: I7a63dce1e85282055b847c43a6e9b9b90a10fa98
2011-08-02 19:58:54 +09:00
Jean Chalard
fae8d60ee9
Change the dictionary file passing schema to a list of ids
...
The dictionary filename used to be passed directly to Latin IME.
This change implements, on the part of Latin IME, the passing of
them as an id that should then be passed through
openAssetFileDescriptor.
Bug: 5095140
Change-Id: I7d1e9d57c19f0645045368f68681680f238189fc
2011-08-02 19:16:39 +09:00
Tadashi G. Takaoka
8da9a13760
Make Keyboard object immutable except shift state
...
This is the first step to implement suggestions pane as mini keyboard.
Bug: 5023981
Change-Id: I90ffbde0fda19b4be68add449310997b56bf6904
2011-08-01 22:04:48 -07:00
Tadashi G. Takaoka
8d7782bf3c
Merge "Use generic interface for filed type of Keyboard"
2011-08-01 18:12:58 -07:00
Tadashi G. Takaoka
04bc5a369c
Merge "Add KeyboardParams class"
2011-08-01 18:08:17 -07:00
Tadashi G. Takaoka
167e77f170
Use generic interface for filed type of Keyboard
...
This change also re-orders and renames some fields.
Bug: 5023981
Change-Id: I28c1ca7384bb70e3584398cd19ce2276ddfe8541
2011-08-01 17:58:02 -07:00
Tadashi G. Takaoka
4d8eb2e888
Make horigontalGap and verticalGap attributes of Row obsolete
...
Bug: 5023981
Change-Id: Ifb07b54a68cfdd32ff2ea79812188fb6158bd073
2011-08-01 17:45:16 -07:00
Tadashi G. Takaoka
1516d055df
Add KeyboardParams class
...
This object will hold all keyboard parameter while parsing XML file
and act like a Keyboard. After finishing reading XML file, this will be
passed as an argument for the Keyboard class constructor.
Bug: 5023981
Change-Id: I2737b30036b6e4d204e8ed9984a1272e195209be
2011-08-01 17:41:30 -07:00
Tadashi G. Takaoka
723dd753e9
Remove Keyboard reference from Key object
...
Bug: 5023981
Change-Id: Ib0b9debf2018a0a9e9efe9323738e85174589e71
2011-08-01 17:07:45 -07:00
Tadashi G. Takaoka
30479de9e5
Merge "Cleanup key label case adjustment"
2011-08-01 17:04:09 -07:00
Tadashi G. Takaoka
c499866948
Cleanup key label case adjustment
...
Bug: 5023981
Change-Id: Ida06fc6a588c4eb8543455d932e71ac2797d27e5
2011-08-01 16:43:14 -07:00
Tadashi G. Takaoka
b118d4cb58
Cleanup icon drawable related code
...
Bug: 5023981
Change-Id: I729354f32797eef354ec9af8e05f17839f0a361c
2011-08-01 16:37:13 -07:00
Jean Chalard
cb1cc0d0de
Merge "Try to compensate for a race condition."
2011-08-01 04:17:22 -07:00
Jean Chalard
f2f9715319
Try to compensate for a race condition.
...
This does not really fix the underlying bug, but it does fix
the apparent symptoms.
When the user presses space and a letter quick, the
onUpdateSelection handler may be called after the letter has been
actually committed. The keyboard then happily proceeds to clearing
the composition because it thinks space was pressed (or the user
moved the cursor, since it can't guess which happened).
This change removes this behavior when we are expecting an update
event from a keypress. This means the bug still exists if the user
presses space twice and a letter, and all events come after the
letter, but it is very very hard to reproduce this. There may be
other collateral damage when the user moves the cursor in the form
of race conditions, but likewise, they should be really hard to
reproduce.
Bug: 5100521
Change-Id: Ib05328c9b451bf6fe288ae00296fd283a9a4e863
2011-08-01 19:51:55 +09:00
Jean Chalard
20cb6e8078
Merge "Remove the systematic bias to the top."
2011-08-01 03:18:49 -07:00
Jean Chalard
d8eceb1231
Remove the systematic bias to the top.
...
The keyboard used to introduce a systematic bias to the top.
This may have been to compensate an old driver flaw, but it
seems that it is now in the way and causes a lot of mistyped
spaces and backspaces.
This change removes the systematic bias.
Change-Id: Ib65ffba99cbd053d1085d3e6eeaf10a815289fc0
2011-08-01 19:14:14 +09:00
Tadashi G. Takaoka
49e00258b9
Remove '(' from the label of "to symbol" on phone layout
...
Change-Id: I9261cbba9a04fc25b67dfd5ce4188b7e32f5d8e0
2011-08-01 02:47:03 -07:00
Tadashi G. Takaoka
271e55fe53
Merge "Filter non-ascii popup charcters from password keyboard"
2011-08-01 01:32:48 -07:00
Tadashi G. Takaoka
2fe68b9616
Filter non-ascii popup charcters from password keyboard
...
Change-Id: I10885efd317770f892165b6bb059313abf241436
2011-08-01 00:35:59 -07:00
Ken Wakasa
9351550dc6
Clean up revertLastWord()
...
The "deleteChar" argument of this method is acutally always true in the current code path.
Also, in this method, textToTheLeft virtually never has a punctuation letter as its initial
character. This change is one of preparatory changes for bug:4983945.
Change-Id: I531a32570a35634c21c1d74b2b461e40a1b7f660
2011-08-01 16:03:43 +09:00
Tadashi G. Takaoka
48dda9e028
Merge smiley key style into return key style for phone
...
Bug: 4340933
Change-Id: If2b586e5fade1610489e4a53cddafb89834bba07
2011-07-31 20:06:39 -07:00
Tadashi G. Takaoka
e00d44d0c8
Show settings and tab key accordingly
...
Instead of showing a tab key at the position of "period" key, this
change places a tab key on the left side of the space key or on the
mini popup keyboard of the mic/comma key accordingly.
Bug: 4340933
Change-Id: If3cbc6d0b36f74fbc9320d6f433c65c66051dc09
2011-07-31 20:00:00 -07:00
Tadashi G. Takaoka
35e675b196
Rename settingsPopupStyle to f1PopupStyle
...
Bug: 4340933
Change-Id: Ic026089123988940dca58a0aaac07f613ad45aff
2011-07-31 19:19:32 -07:00
Tadashi G. Takaoka
3712231600
Rename key label and alternates string resource names
...
Bug: 4340933
Change-Id: I7c80c0b6a8a9082c52b57a858e2b6740c05366ec
2011-07-31 19:00:19 -07:00
Tadashi G. Takaoka
c3afe2c244
Replace the notion of "voice" with "shortcut" as many as possible
...
Bug: 4340933
Change-Id: I98b4eca5167cc3767a0868fae8f6436164adbe4d
2011-07-31 18:46:44 -07:00
Tadashi G. Takaoka
6a07d7ddd9
Merge "Rename popupSettingsStyle to f2PopupStyle"
2011-07-31 18:43:28 -07:00
Tadashi G. Takaoka
83f6ca10d4
Merge "Fix exception message"
2011-07-31 18:43:22 -07:00
Tadashi G. Takaoka
2afc2adb01
Merge "Eliminate "..." from the key that has no popup mini keyboard automatically"
2011-07-31 18:43:17 -07:00
Tadashi G. Takaoka
09430720d5
Fix exception message
...
Bug: 4340933
Change-Id: I81e7b0c72116b5bb56b0fdcd02386288aebd73e7
2011-07-31 18:40:58 -07:00
Tadashi G. Takaoka
e50733d196
Rename popupSettingsStyle to f2PopupStyle
...
Bug: 4340933
Change-Id: I4fbd8f7a4175e0e3fde326f40fd1b84312d81b89
2011-07-31 18:37:25 -07:00
Tadashi G. Takaoka
0c6e57f2d1
Eliminate "..." from the key that has no popup mini keyboard automatically
...
Bug: 4340933
Change-Id: I08bbdee71f4bc2285fd0c1233d284150be61748e
2011-07-31 18:22:29 -07:00
Tadashi G. Takaoka
73e716f202
Be aware of "nm" and "noMicrophoneKey" private IME option
...
Bug: 4340933
Change-Id: I787108a73d4450963d644bc7070ae1672ebb4455
2011-07-31 18:20:20 -07:00
Ken Wakasa
2ba975afb9
Turn off the Settings key by default
...
bug:5094401
Change-Id: Ieb42fdfa79be2afcfa6634e7404c17737ef6927d
2011-07-31 07:26:24 +09:00
Tadashi G. Takaoka
97c35650ad
Dismiss key preview regardless of key preview settings
...
Bug: 5099213
Change-Id: Id6c5cb0ae4a07897b34153d4b350b1b45a06aa1a
2011-07-29 19:52:49 -07:00
Tadashi G. Takaoka
364f1fd1f8
Add WindowWidthCache
...
Bug: 4311428
Change-Id: I9f006525c0932d9d49bb8655caf58523135366d7
2011-07-29 18:43:50 -07:00
Tadashi G. Takaoka
0a054dd107
Cleanup KeyboardSwitcher internal a bit
...
Bug: 4311428
Change-Id: Ibe933d0351f750a3a41a08f09befd833d677961b
2011-07-29 17:00:09 -07:00
Ken Wakasa
f12aa77c4b
Merge "Simplifying accessibility code in keyboard's dispatchTouchEvent()"
2011-07-29 01:22:11 -07:00
Jean Chalard
4d94a99bab
Match the new name of the dictionary settings activity.
...
Bug: 5094660
Change-Id: I13c734791265ed25eac3c9b4861dd0cffdb12c52
2011-07-29 15:57:54 +09:00
satok
4e7d0663ba
Merge "Modified the test spell checker"
2011-07-28 18:09:51 -07:00
Tadashi G. Takaoka
259ce17f5d
Merge "Use isFullscreenMode to determine candidate container height"
2011-07-28 17:40:18 -07:00
Tadashi G. Takaoka
ecf43d4f9d
Merge "Remove dead area around separators in the suggestion strip"
2011-07-28 17:39:43 -07:00
Tadashi G. Takaoka
3782f2bf1e
Merge "Remove icon and negative button from dialogs"
2011-07-28 17:39:07 -07:00
Tadashi G. Takaoka
5b3c834a9c
Merge "Remove enableShiftLock attribute from KeyboardId"
2011-07-28 17:38:50 -07:00
Tadashi G. Takaoka
6d9bcd5e13
Remove enableShiftLock attribute from KeyboardId
...
This change is a follow up of Ia72de236.
Bug: 4311428
Change-Id: I0ad0f1fb93545ceb40df8dffe377240b020c2602
2011-07-28 17:25:44 -07:00
Tadashi G. Takaoka
34400204a5
Merge "Remove unused method"
2011-07-28 15:42:53 -07:00
Tadashi G. Takaoka
b9538bc447
Merge "Fix that long pressing shift on symbol keyboard registers caps lock code"
2011-07-28 15:27:40 -07:00
Tadashi G. Takaoka
d4b533774d
Remove unused method
...
Bug: 4521802
Change-Id: Iae649f8b77b3bb144ee7eedbb6545e237fa79a17
2011-07-28 15:24:46 -07:00
Tadashi G. Takaoka
4b1780fa95
Use isFullscreenMode to determine candidate container height
...
Bug: 5081182
Change-Id: I3783d3994e96f8bf466cbc47c9e0aecc2a6bed50
2011-07-28 15:06:15 -07:00
Tadashi G. Takaoka
a1aab83a24
Remove dead area around separators in the suggestion strip
...
If user touches the separator, the right hand side suggestion will be
selected.
Bug: 4431485
Change-Id: Ieaa79fe2ac7b15e312829dca847ddb1b25056c09
2011-07-28 14:15:24 -07:00
Tadashi G. Takaoka
e4b445f1ce
Remove icon and negative button from dialogs
...
Bug: 5092028
Change-Id: I25b86c6e74e380e6cee4998bfe494bdafb611f36
2011-07-28 13:49:57 -07:00
Tadashi G. Takaoka
851c3267d4
Fix that long pressing shift on symbol keyboard registers caps lock code
...
Bug: 5088376
Change-Id: I586a9fb685f3443aa22fd877df52b36247c4f858
2011-07-28 12:04:35 -07:00
Alan Viverette
65a898d9ef
Simplifying accessibility code in keyboard's dispatchTouchEvent()
...
Change-Id: Ie33cf93ee2d7eadad38ca170aa8ad988bb0ae9a9
2011-07-28 11:55:45 -07:00
Tadashi G. Takaoka
c3d175c01f
Fix wrong keyboard width when orientation has changed while IME is not shown
...
Bug: 5084021
Change-Id: Ie42da40b8249eaf9cf29707058906949278eff6a
2011-07-28 11:02:29 -07:00
satok
a90992e562
Modified the test spell checker
...
Change-Id: Ib64fac8672a4107638cd05a0232d46b49fc4aa8c
2011-07-28 20:55:00 +09:00
Tadashi G. Takaoka
0a5345c7b6
Fix NPE
...
Bug: 5086698
Change-Id: Iaa3082649344722bd643c49c9d151df754d6e337
2011-07-27 15:37:42 -07:00
Tadashi G. Takaoka
60ccbe16ee
Clean up keyboard loading and switching
...
Bug: 4311428
Change-Id: Ia72de23634f824d82b7b5f2267d439ce922a3b57
2011-07-27 13:34:16 -07:00
Jean Chalard
a48f8b3764
Merge "Load the binary dictionary asynchronously."
2011-07-26 23:34:52 -07:00
Jean Chalard
3af9f05f29
Load the binary dictionary asynchronously.
...
This should help with LatinIME opening performance.
It should not be merged before Ia9e4741f (if it is, there is a
race condition where the wrong dictionary is opened).
Bug: 5023141
Change-Id: I39c52de70a449929a622dddfdd92b38425ad9416
2011-07-27 15:18:49 +09:00
Jean Chalard
e576a0d537
Fix a NPE when sent buggy data by an application
...
Bug: 5072247
Change-Id: I7369877072f6bb94dff5b1bcf52c9f8dde4854b7
2011-07-27 13:27:37 +09:00
Tadashi G. Takaoka
9a388f2ef3
Merge "Update tab key icon image"
2011-07-26 15:25:48 -07:00
Tadashi G. Takaoka
df0696f8d2
Update tab key icon image
...
Bug: 4948171
Change-Id: Id7dcebc4f1174cabfe872bc36edbe294ddaf081d
2011-07-26 15:20:26 -07:00
Ken Wakasa
3ca85794a0
Merge "Fixed duplicate call to dispatchOnPopulateAccessibilityEvent()"
2011-07-26 15:15:34 -07:00
Tadashi G. Takaoka
411a5fd253
Merge "Tweak long press timeout of language switcher"
2011-07-26 15:07:29 -07:00
Tadashi G. Takaoka
4a5869ca18
Merge "Support multiple key preview"
2011-07-26 15:04:58 -07:00
Tadashi G. Takaoka
596600d4ac
Tweak long press timeout of language switcher
...
Previously 1200ms, down to 400ms that is the same value of system
default.
Change-Id: Ia94c6b729893d528ec3f2b961bf2ad22b47fdbb1
2011-07-26 15:02:47 -07:00
Tadashi G. Takaoka
4692af50da
Support multiple key preview
...
Bug: 4298393
Change-Id: Ibd3681f7255c85e3602e1af4ace8f8e7fce3fb06
2011-07-26 14:55:19 -07:00
Alan Viverette
586a15c3f0
Fixed duplicate call to dispatchOnPopulateAccessibilityEvent()
...
Bug: 5060194
Change-Id: I585ae52204a045fa3941e846b4f9bdd7d541bea6
2011-07-26 14:06:26 -07:00
Eric Fischer
c02a1617c8
Merge "Import revised translations."
2011-07-26 13:09:39 -07:00
Eric Fischer
a953a3c137
Import revised translations.
...
Change-Id: I6686b5c714afab6b4ca2534b1bbd24205005220a
2011-07-26 11:49:54 -07:00
Tadashi G. Takaoka
ff6ad279e6
Merge "Make PointerTracker aware of that popup panel is showing"
2011-07-26 11:33:35 -07:00
Tadashi G. Takaoka
9ec80d9d89
Make PointerTracker aware of that popup panel is showing
...
Bug: 5070598
Change-Id: I0604287b8c373e4763b4ccf88c0bd7235af907d5
2011-07-26 10:22:07 -07:00
Jean Chalard
d3da6e6311
Close a multiprocess file handle.
...
Bug: 5034192
Change-Id: I9c3d757cfae313e9b7510e167de797a74c74a351
2011-07-26 22:13:34 +09:00
Jean Chalard
f50aa19337
Purge quick fixes option.
...
This change removes everything related to the quick fixes
Latin IME option item.
Note that Autotext is still used if the current subtype language
is the same as the system language.
Bug: 4985058
Change-Id: I51728a2190543ffb9e004470674ef6257b14f6c2
2011-07-26 16:25:57 +09:00
Ken Wakasa
3d7c4eace8
Add the rtl attribute to Arabic/Hebrew keyboards
...
A follow up to I18b9962c
bug: 5047217
Change-Id: Iea72182a80e69b2a631f23b825430ebfbfc2f560
2011-07-26 09:52:09 +09:00
Ken Wakasa
e9d74adcc8
Merge "Take care of bidi-mirrored characters in suggestion strip as well"
2011-07-25 15:59:18 -07:00
Ken Wakasa
83ffff2a49
Take care of bidi-mirrored characters in suggestion strip as well
...
Follow up to I1b884848
bug: 5047217
Change-Id: I18b9962c4943363bae88009354fcc75ab60ad2ba
2011-07-26 07:55:12 +09:00
Tadashi G. Takaoka
71ffd74f05
Merge "Add Bidi-Mirrored letter list link as comment"
2011-07-25 15:25:51 -07:00
Tadashi G. Takaoka
34ce778802
Add Bidi-Mirrored letter list link as comment
...
Bug: 5047217
Change-Id: I29449892803c5150726aebfe97ecef6d481e1e97
2011-07-25 15:00:55 -07:00
Tadashi G. Takaoka
5800eb48d0
Merge "Fix voice key mode default back to "on main keyboard""
2011-07-25 14:52:10 -07:00
Tadashi G. Takaoka
f92bd4de20
Fix voice key mode default back to "on main keyboard"
...
Bug: 5074042
Change-Id: I0c4a09b286c7680306741d47a48d5d9783e4a890
2011-07-25 14:44:47 -07:00
satok
2c18ffb97f
Merge "[step3] Add spell checker service."
2011-07-25 13:48:47 -07:00
satok
022c1cc203
[step3] Add spell checker service.
...
Change-Id: Ib13b3a524e0f0b90de40a3e255040b3158d49258
2011-07-25 11:05:24 +09:00
Tadashi G. Takaoka
7139335dcd
Swap parenthesis-like character code on RTL keyboard
...
Bug: 5047217
Change-Id: I1b88484825f5c035401cf083522bf95bbee30edb
2011-07-24 18:40:46 -07:00
Tadashi G. Takaoka
bdf3789811
Merge "Merge key preview handling into key graphics handling"
2011-07-23 02:34:10 -07:00
Tadashi G. Takaoka
d3002aa8cd
Merge key preview handling into key graphics handling
...
Change-Id: I7b0ba38d833362817c607f6abffbaf0a07f52832
2011-07-23 02:23:24 -07:00
Ken Wakasa
8f98cdef0e
Tidy up the subtype names
...
Change-Id: I5dbdc6c006fab01fa389f0796b6c87aa2a90132e
2011-07-23 17:42:23 +09:00
Tadashi G. Takaoka
ebebaed713
Merge "Fix ALT key on symbols shifted keyboard"
2011-07-22 18:43:12 -07:00
Tadashi G. Takaoka
cce61aa045
Merge "Refactor Keyboard and KeyboardView resizing and drawing code"
2011-07-22 18:41:23 -07:00
Tadashi G. Takaoka
f2e3db7c72
Fix ALT key on symbols shifted keyboard
...
Bug: 5068615
Change-Id: I4c38befd14ae59390dfb23357fdb9e8388f0a6d8
2011-07-22 18:24:35 -07:00
Tadashi G. Takaoka
38f55b36c3
Refactor Keyboard and KeyboardView resizing and drawing code
...
Bug: 4311428
Change-Id: Ice4050f92c8f3cec1bec2074fe6a913d04f50524
2011-07-22 16:50:53 -07:00
Tadashi G. Takaoka
f640a97566
Fix NPE
...
Bug: 5067161
Change-Id: I466d40fc1bffa01efc1205a47b3330ae6f30bc66
2011-07-22 12:58:45 -07:00
Tadashi G. Takaoka
f3e7688361
Merge "Disable VoiceInputLogger inside LatinIME"
2011-07-22 02:41:31 -07:00
Tadashi G. Takaoka
255486a5d0
Disable VoiceInputLogger inside LatinIME
...
Bug: 4985273
Change-Id: I6c70e50a58be0973f78c6a1abc1fb4eac5449c0b
2011-07-22 02:37:56 -07:00
Tadashi G. Takaoka
60c8eba634
Merge "Check user dictionary is enabled before showing touch-to-save"
2011-07-22 02:35:16 -07:00
Tadashi G. Takaoka
ada26bb383
Check user dictionary is enabled before showing touch-to-save
...
Bug: 5024127
Change-Id: If4d691a4a59c43579d1f977e9a0545495f30bafb
2011-07-22 01:32:53 -07:00
Jean Chalard
6988d09ac2
Merge "Do not register null pointers as dictionaries"
2011-07-21 22:56:46 -07:00
Jean Chalard
f6f0e63d79
Do not register null pointers as dictionaries
...
Bug: 5062425
Change-Id: I025991424de40c2b31b90238f99ef160e7efd92e
2011-07-22 14:46:43 +09:00
Tadashi G. Takaoka
68ff3a0a8b
Merge "Fix missing right edge flag"
2011-07-21 14:59:50 -07:00
Tadashi G. Takaoka
419b90fe86
Fix missing right edge flag
...
Bug: 5062972
Change-Id: I2daffdd58802c6173696fe2417e6efcbef66d7bf
2011-07-21 14:32:16 -07:00
Ken Wakasa
035f0f5c94
Fix NPE
...
bug: 5054162
Change-Id: I69d308f0eeb32968515100dde98ad51a7c35020e
2011-07-22 06:14:22 +09:00
Ken Wakasa
8721398ec0
Merge "Fixed accessibility navigation gesture sound volume"
2011-07-21 13:21:11 -07:00
Ken Wakasa
f9051733b7
Merge "Updated check for touch exploration enabled state"
2011-07-21 13:13:18 -07:00
Alan Viverette
cc4b63ec4c
Updated check for touch exploration enabled state
...
Bug: 5061704
Change-Id: Id2c0cce953f7bdb2b4c18b68f9e318d95eabc1b8
2011-07-21 10:49:16 -07:00
Alan Viverette
356d6871f1
Fixed accessibility navigation gesture sound volume
...
Bug: 5061527
Change-Id: I88728f7368a55ae7e6ca2ce6cfed6af42ffa03df
2011-07-21 10:44:57 -07:00
Jean Chalard
a3dd3887c9
Merge "Set the locale for opening an asset"
2011-07-21 03:18:23 -07:00
Jean Chalard
e150ef9856
Set the locale for opening an asset
...
This is necessary because we don't know any more whether the
locale of the process is the expected one when the dictionary
is loaded asynchronously.
Bug: 5023141
Change-Id: Ia9e4741f3b4a04a9f085f5b65ec122471b0c2dff
2011-07-21 19:14:16 +09:00
Tadashi G. Takaoka
3be0039164
Fix potential NPE
...
Change-Id: I3679d24b6c89e081d24d59c91b136c139dcb3d5c
2011-07-21 02:27:27 -07:00
Tadashi G. Takaoka
d85bc7221c
Merge "Revert "Guard unused voice functions""
2011-07-21 02:25:34 -07:00
Tadashi G. Takaoka
055265684b
Revert "Guard unused voice functions"
...
This reverts commit 795a712ecf
.
Bug: 4985273
2011-07-21 02:18:35 -07:00
Tadashi G. Takaoka
22ed2d3c49
Fix popup mini keyboard of comma key on symbols layout
...
Bug: 5058762
Change-Id: Ic2d48358b0aceb1d55b3e12bb32b4423ff41ccf3
2011-07-21 00:56:51 -07:00
Tadashi G. Takaoka
b880731620
Merge "Revert "Add Right-To-Left delete icon""
2011-07-21 00:45:08 -07:00
satok
60cb1cc7b3
Merge "Guard unused voice functions"
2011-07-21 00:10:30 -07:00
Tadashi G. Takaoka
852f052737
Merge "Fix centering key icon when visual inset is specified"
2011-07-21 00:08:13 -07:00
satok
795a712ecf
Guard unused voice functions
...
Bug: 4985273
Change-Id: I9491b4af24e636cba6362cdde44568d14f7b2b85
2011-07-21 16:07:00 +09:00
Tadashi G. Takaoka
5cce2161fb
Revert "Add Right-To-Left delete icon"
...
This reverts commit 886246b19a
.
Bug: 5047500
Change-Id: Iefef20b7aeba0dbedfe8f81384a33f65e3907e9f
2011-07-21 00:05:22 -07:00
Jean Chalard
728ab86f8c
Merge "Fallback to the included dict if the passed one is invalid"
2011-07-20 19:50:54 -07:00
Tadashi G. Takaoka
6ffb827ad5
Fix centering key icon when visual inset is specified
...
Change-Id: Iae9cb87cc341a88fab269b629aa45c77adf232be
2011-07-20 19:05:27 -07:00
Tadashi G. Takaoka
8507589085
Merge "Remove Key edge flags from XML"
2011-07-20 17:00:33 -07:00
Tadashi G. Takaoka
426723a9cf
Remove Key edge flags from XML
...
The first key and the last of the row are automatically marked as left
and right edge key respectively. The existence of Spacer will prevent
those automatic marking.
Bug: 5038844
Change-Id: Ie34169ceaf76e24923b8d8125eda6ecb95cf1fee
2011-07-20 16:56:21 -07:00
Tadashi G. Takaoka
81ff3ba343
Update Keyboard background drawable
...
Bug: 4948171
Change-Id: I0f408ff67c7f2eef3830a43d2919b943dab74235
2011-07-20 14:20:33 -07:00
Jean Chalard
7e19a64c86
Fallback to the included dict if the passed one is invalid
...
If all dictionaries returned by the dictionary pack are invalid,
then fallback to the dictionary included in the resources for this
locale.
Bug: 5052486
Change-Id: Id875194ca56a74b2ed6f5b0b4fdd55475f6842c8
2011-07-20 19:53:47 +09:00
Ken Wakasa
856b582cfb
Vibrator.hasVibrator() takes no parameter.
...
bug: 5038842
Change-Id: I239a2f35488a1f18ecdb019abc50e72e3e9da297
2011-07-20 16:51:05 +09: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
1dc80048d7
Merge "Support select input method dialog on pre-HC platform"
2011-07-19 23:22:37 -07:00
Tadashi G. Takaoka
bf9d8348d8
Support select input method dialog on pre-HC platform
...
Bug: 4971680
Change-Id: I641b336da54813e13409bd7874aa22e51f790729
2011-07-19 22:22:47 -07:00
Tadashi G. Takaoka
597b115797
Merge "Add Arabic percent sign"
2011-07-19 21:28:34 -07:00
Tadashi G. Takaoka
d856b94a7b
Merge "Revert "Keep keyboard layout while orientation change""
2011-07-19 21:22:14 -07:00
Tadashi G. Takaoka
7c2b3a474f
Add Arabic percent sign
...
Bug: 5046333
Change-Id: I7be8c465ce6be2b78d9e8ece4dc4119941230d97
2011-07-19 18:28:54 -07:00
Tadashi G. Takaoka
89bb88f61c
Revert "Keep keyboard layout while orientation change"
...
This reverts commit 8ebbe03fed
.
Bug: 5037466
2011-07-19 18:13:22 -07:00
Tadashi G. Takaoka
5ab5807d91
Remove long-press-to-save feature from CandidateView
...
Bug: 5027059
Change-Id: I884a84e50e810c0c4a8255217b39ea24937c756b
2011-07-19 17:22:02 -07:00
Jean Chalard
40f7efc172
Fix an NPE related to absent InputConnection
...
Bug: 5035577
Change-Id: I1a11fc475d4a0f692636000d0b0f40bc35427867
2011-07-19 19:25:48 +09:00
Jean Chalard
44861474fb
Add a number of NULL pointer guards.
...
None of these are expected to actually be null, but those are
included for peace of mind and foolproofing against future
code changes.
Bug: 4580040
Change-Id: Ib112b3e5db5f177aaf61767164b7e78d711f90a0
2011-07-19 18:19:23 +09:00
Jean Chalard
494ab16396
Merge "Deactivate the user unigram dictionary."
2011-07-19 01:50:57 -07:00
Jean Chalard
52f20d6a43
Deactivate the user unigram dictionary.
...
Bug: 3459274
Change-Id: I41b7617623b5b2e48c2e460dc7f2d5ff410c8a4c
2011-07-19 17:30:52 +09:00
Jean Chalard
2b4eabed2b
Allow double-space-period after relevant punctuation signs.
...
This allows the user to enter a period via double-space after quotes,
currency symbols, brackets and other non-sentence-finishing
punctuation marks.
Bug: 3430389
Change-Id: Ibe40b3902861207eb918e7be6113e8be12216f53
2011-07-19 16:12:24 +09:00
Tadashi G. Takaoka
fa9f4d1bad
Merge "Trigger IME switcher by long-pressing space key"
2011-07-17 17:34:57 -07:00
Tadashi G. Takaoka
98b5c982b9
Trigger IME switcher by long-pressing space key
...
Long press time out for space key is set to 1000msec.
FYI: Time out for shift key is 1200ms and for mini popup keyboard is 400ms.
Bug: 4971680
Change-Id: Id05f519baa15ca2e54958997ddf7b6b3b7a2d078
2011-07-17 17:23:43 -07:00
Tadashi G. Takaoka
f0d6058b9e
Fix NPE
...
Bug: 5030817
Change-Id: I13133abb308d9f0c8169b6ea3fc0913ce5dda3d6
2011-07-17 16:37:01 -07:00
Tadashi G. Takaoka
60be1b6ae1
Merge "Honor EditorType's IME_FLAG_NO_EXTRACT_UI and IME_FLAG_NO_FULLSCREEN flags"
2011-07-15 17:15:00 -07:00
Tadashi G. Takaoka
4fc4a7f567
Merge "Bring "comma" key back to symbol layout"
2011-07-15 17:06:45 -07:00
Eric Fischer
303077bcb0
Import revised translations.
...
Change-Id: Id17475b42f5037de6c27d40e3c4ba57cbad64287
2011-07-15 16:52:04 -07:00
Tadashi G. Takaoka
2811841ab4
Honor EditorType's IME_FLAG_NO_EXTRACT_UI and IME_FLAG_NO_FULLSCREEN flags
...
Bug: 5030408
Change-Id: I1c5649725780cd063db7a437b8559b7f2573469c
2011-07-15 16:21:16 -07:00
Tadashi G. Takaoka
7c1660b4d7
Bring "comma" key back to symbol layout
...
Bug: 5035197
Change-Id: Ia931305b9dd2ee9eb51deef6b2477fbf351ac479
2011-07-15 15:36:32 -07:00
Tadashi G. Takaoka
5ba0577eb2
Merge "Add Arabic comma to phone keyboard"
2011-07-14 21:49:02 -07:00
Jean Chalard
faf913c1b2
Merge "Rename AutoDictionary to UserUnigramDictionary."
2011-07-14 20:45:48 -07:00
Jean Chalard
f422345211
Rename AutoDictionary to UserUnigramDictionary.
...
...and adjust internal functions, variables and constant names.
Bug: 3459274
Change-Id: I1b11c6adfee360ac0fc22d627955688b3dbdcffc
2011-07-15 12:14:47 +09:00
Tadashi G. Takaoka
e895d85a8e
Add Arabic comma to phone keyboard
...
Bug: 4161983
Change-Id: I2b1f2539cbe3b5686e77b9b0d46167394c3db64c
2011-07-14 13:52:54 -07:00
Tadashi G. Takaoka
b033828e2e
Merge "Import new drawables"
2011-07-14 01:26:23 -07:00
Tadashi G. Takaoka
0085d44220
Import new drawables
...
Bug: 4948171
Change-Id: I899063ea5ad4508fd4f5786dbb75bcd6909c331f
2011-07-14 01:09:43 -07:00
Tadashi G. Takaoka
6989e0b804
Update Arabic keyboard
...
Bug: 4161983
Change-Id: Ie163cd17c87773bf2ca37fff7cff79611fff644f
2011-07-14 01:04:12 -07:00
Tadashi G. Takaoka
1a55286738
Update Hebrew keyboard
...
Bug: 4170083
Change-Id: I977d7f6cce08e35fe9bed46fe5f4fdedd1f12e9c
2011-07-14 00:30:32 -07:00
Tadashi G. Takaoka
f7f2e82e8b
Merge "Make Russian layout for 7 inch table compatible with other locale"
2011-07-13 22:55:26 -07:00
Tadashi G. Takaoka
26afa553bd
Fix settings key icon
...
This is the followup change of Ife9a9333
Change-Id: I6ebf2444642fe9ced7d40074fcc2bf050bbca7e0
2011-07-13 22:49:38 -07:00
Tadashi G. Takaoka
41c1f48028
Fix IndexOutOfBound exception
...
Bug: 5011243
Change-Id: Iaaafa50b42e5155e3682132217d3e079a170ed89
2011-07-13 18:45:10 -07:00
Tadashi G. Takaoka
0ad80871df
Make Russian layout for 7 inch table compatible with other locale
...
Related to Bug: 5024014
Change-Id: I149624e351f5c75323771ff90960d2fe00ca412b
2011-07-13 14:56:06 -07:00
Tadashi G. Takaoka
5cbdb23621
Fix IOOB Exception
...
Bug: 5021745
Change-Id: I58815ca3f3c8b1bead895e8a94e2f89dbcc67436
2011-07-13 12:26:40 -07:00
Jean Chalard
18fa487202
Merge "Fix crash on adding a word in the user dictionary."
2011-07-13 02:06:14 -07:00
Jean Chalard
092826c8cd
Fix crash on adding a word in the user dictionary.
...
When the User dictionary service is off, LatinIME still allows to add
words to it and it crashed if the user tries to do so. This change
fixes the crash; it does not however fix the interface.
Bug: 5004408
Change-Id: I5bd2684ab3010963c1f737fc764e70e79aadbe8d
2011-07-13 17:52:34 +09:00
satok
ad2a3bd6dd
Merge "Show a suggestion strip by default"
2011-07-13 00:06:50 -07:00
satok
696ce577e6
Show a suggestion strip by default
...
Bug: 5024058
Change-Id: I5216e9a2e464c2bb3150b66779b6b1b5cd9027ff
2011-07-13 16:04:38 +09:00
Tadashi G. Takaoka
5c73ed628b
Move PointerTrackerQueue into PointerTracker
...
Bug: 4768084
Change-Id: I1be83b38c48147827c871c92e17d37da3aeb0f95
2011-07-12 23:35:23 -07:00
Tadashi G. Takaoka
e0d3922ba3
Merge "Fix mini keyboard behavior while chording input"
2011-07-12 21:53:48 -07:00
Tadashi G. Takaoka
5245401b57
Merge "Add Right-To-Left delete icon"
2011-07-12 21:53:05 -07:00
Tadashi G. Takaoka
63c233ab9f
Fix mini keyboard behavior while chording input
...
This change makes PopupMiniKeyboardView based on KeyboardView, so that
only LatinKeyboardBaseView can manage touch event and PointerTracker.
Bug: 4768084
Change-Id: Id30b132f1fae45da6e79ce822745cf0a653b8eb3
2011-07-12 21:52:49 -07:00
Ken Wakasa
4f365403c5
Fix build breakage
...
Change-Id: Id2c2d152f54d00842ef9e200ccdce1e13cc128cb
2011-07-13 13:49:13 +09:00
Tadashi G. Takaoka
886246b19a
Add Right-To-Left delete icon
...
Bug: 4161983
Bug: 4170083
Change-Id: Ife9a933353e97f3c7c3ede47623dc7528160f3c5
2011-07-12 20:59:20 -07:00
Ken Wakasa
84cb23a789
Small code cleanup
...
Change-Id: I7075d85f745c3b186e6d06086b9fcd54e7459feb
2011-07-13 12:15:22 +09:00
Ken Wakasa
656a35f9df
Merge "Code cleanup"
2011-07-12 00:57:33 -07:00
satok
8275fb0a1a
Merge "Create proximity info just after parsing keyboard layouts"
2011-07-12 00:57:06 -07:00
satok
0d5494c66a
Create proximity info just after parsing keyboard layouts
...
Bug: 4807069
Change-Id: Ic18b2fc526efec58510841884a949a1a0201e7f5
2011-07-12 16:52:02 +09:00
Ken Wakasa
8558cfb42a
Code cleanup
...
Change-Id: Ie43181721ba18e0c04048eaa9e3016dcea9f5a49
2011-07-12 16:47:08 +09:00
Ken Wakasa
9318d33b6e
Change variable names for readability
...
Change-Id: I9face4e90af4bcd6040eb7e303b596af7d643934
2011-07-12 12:08:58 +09:00
Tadashi G. Takaoka
1fa878339e
Merge "Fix event handling on non-distinct multi touch device"
2011-07-11 19:07:22 -07:00
Tadashi G. Takaoka
8ebbe03fed
Keep keyboard layout while orientation change
...
This change can retain symbols layout only, can't retain shift or
shift lock state of the keyboard.
Bug: 4311428
Change-Id: I6248ed9a6d762e1ca4b72e391fdca9bc9f55ac35
2011-07-11 18:16:14 -07:00
Tadashi G. Takaoka
04dec7f84d
Fix event handling on non-distinct multi touch device
...
This bug has been introduced by Idfbc9706.
Bug: 4768084
Change-Id: If9e2a2d3ed1f6b4e6209c883e6fcca52286ede3f
2011-07-11 17:03:12 -07:00
Tadashi G. Takaoka
08eea95650
Merge "Add KeyEventHandler interface"
2011-07-11 10:54:31 -07:00
Tadashi G. Takaoka
f426cdd5c6
Add KeyEventHandler interface
...
This change also revert KeyboardView to non-abstract class.
Bug: 4768084
Change-Id: I827defb58bfb28b345464f6a89aa4438e41cf1e2
2011-07-10 19:48:14 -07:00
satok
4a0c343dbd
Use InputMethodSettingsActivity
...
Bug: 4979539
Change-Id: Ib721814bfe80822ded7b0d801f6bc0c854588da4
2011-07-11 10:15:03 +09:00
Tadashi G. Takaoka
0efe174ea4
Pass KeyboardView to PointerTracker on down event
...
Bug: 4768084
Change-Id: I446b98daef8c9ec2408481e59cb2a88754ef9e01
2011-07-10 18:06:42 -07:00
Tadashi G. Takaoka
952266674a
Merge "Move processing MotionEvent out from PointerTracker"
2011-07-10 14:24:26 -07:00
Tadashi G. Takaoka
3fdae97417
Move processing MotionEvent out from PointerTracker
...
Bug: 4768084
Change-Id: Idfbc9706f9daeaa979edeee9064cb69326bd3bbc
2011-07-08 21:19:16 -07:00
satok
ba1390f999
Merge "Use InputMethodSettingsFragment"
2011-07-08 21:18:36 -07:00
Tadashi G. Takaoka
d719fe1f5c
Merge "Narrower key timer handler static inner class to TimerProxy interface"
2011-07-08 19:26:50 -07:00
satok
1a3bb54bb4
Use InputMethodSettingsFragment
...
Bug: 4979539
Change-Id: I4f2010f785eb29ccd42b488c402ef9957633e0c2
2011-07-09 11:25:54 +09:00
Tadashi G. Takaoka
2321caa1f9
Narrower key timer handler static inner class to TimerProxy interface
...
Bug: 4768084
Change-Id: I8fdff864d09321b44d56a6a32e10aec3f0f5a4d1
2011-07-08 19:15:16 -07:00
satok
6ec10e53a4
Merge "Internal cleanup before using InputMethodSettingsFragment (Part 2)"
2011-07-08 18:21:39 -07:00
satok
c3f4d55c59
Internal cleanup before using InputMethodSettingsFragment (Part 2)
...
Change-Id: I87751cf0e36b41e931b0712a09d114fd470f1001
2011-07-09 10:14:05 +09:00
satok
68d419d1f5
Merge "Internal cleanup before using InputMethodSettingsFragment"
2011-07-08 17:40:32 -07:00
satok
4598d12064
Internal cleanup before using InputMethodSettingsFragment
...
Change-Id: I7e3211feadf7b87b789040f6dcd6dda84a9d454a
2011-07-09 09:22:03 +09:00
Tadashi G. Takaoka
ab41391cb4
Merge "Merge PointerTrackerKeyState into PointerTracker"
2011-07-08 17:03:37 -07:00
Tadashi G. Takaoka
8a995157f3
Merge PointerTrackerKeyState into PointerTracker
...
Bug: 4768084
Change-Id: I0be0e07bff2542db6ba764dcb13505dfbff6994e
2011-07-08 16:26:11 -07:00
satok
41f1509334
Remove override which will be invalid.
...
Change-Id: I8b548e0167791c1f5e46971901d13ee1aadc45da
2011-07-09 08:15:36 +09:00
Tadashi G. Takaoka
a9f69513df
Merge "Remove swipe gesture"
2011-07-08 00:06:25 -07:00
Tadashi G. Takaoka
c71854a661
Remove swipe gesture
...
Bug: 4971680
Change-Id: Ifff27f3bd3dd26417bfcb7072aaba074025b1bb7
2011-07-08 00:00:14 -07:00
Tadashi G. Takaoka
5a7a696aff
Let KeyDetector hold Keyboard
...
Bug: 4768084
Change-Id: Ia28d6971fc59086dd4e6fedc9fd1b50f13b59854
2011-07-07 23:31:04 -07:00
Tadashi G. Takaoka
1c9817f0e6
Remove stale TODO comments
...
Change-Id: I800e25ca1ecfb11580decd1de147b3f3ae5defb0
2011-07-07 22:51:12 -07:00
Tadashi G. Takaoka
48f989dee5
Merge "Override onSizeChanged only on main keyboard view"
2011-07-07 22:33:44 -07:00
Tadashi G. Takaoka
0d8af4d790
Merge "Holding PointerTrackerQueue inside PointerTracker"
2011-07-07 22:33:35 -07:00
Tadashi G. Takaoka
bb4be5444b
Override onSizeChanged only on main keyboard view
...
Bug: 4768084
Change-Id: I555efbd1bf75691a3a2724e9d9c1a9055039aacc
2011-07-07 22:02:17 -07:00
Tadashi G. Takaoka
906f03121b
Holding PointerTrackerQueue inside PointerTracker
...
Bug: 4768084
Change-Id: Id5006e549c4018a656abd088f14a209415baafed
2011-07-07 17:16:35 -07:00
Eric Fischer
895fc0e1b3
Merge "Import revised translations."
2011-07-07 14:51:19 -07:00
Eric Fischer
ff53f0fd97
Import revised translations.
...
Change-Id: I6a63166506259331cd0481b41e97527d5133d52c
2011-07-07 11:50:08 -07:00
Ken Wakasa
1bd62a5621
Fix missing suggestions after "Touch again to save"
...
This is an amendment to If848320c
bug: 5000317
Change-Id: I7eed5759c6adc0538c51f540c84a597919e792fa
2011-07-07 17:59:19 +09:00
Tadashi G. Takaoka
c810b0d63a
Merge "Make sure that each view has its own dedicated background drawable"
2011-07-06 19:12:39 -07:00
Tadashi G. Takaoka
b9a21448e3
Merge "Clear CandidateView in onStartInputView"
2011-07-06 19:02:24 -07:00
Tadashi G. Takaoka
16add4c886
Fix improperly scaled drawable
...
Bug: 4993127
Change-Id: Id16039058777b50f223458e190b32c1bc3b1fd53
2011-07-06 18:12:39 -07:00
Tadashi G. Takaoka
88110d1799
Clear CandidateView in onStartInputView
...
Before starting input on new TextView, we must clear the CandidateView
because it may hold the suggestion of previous TextView or even worse
the suggestions pane has been expanded and keyboard has been hidden.
Bug: 4995414
Change-Id: If848320c1a510e7018d36ed8ac61291be2fc6ce5
2011-07-06 17:57:24 -07:00
Tadashi G. Takaoka
7c57e3bda1
Make sure that each view has its own dedicated background drawable
...
Bug: 4998490
Change-Id: I3527fc41f0f03bbb32e3d1880665c6995354aa57
2011-07-06 17:42:03 -07:00
Ken Wakasa
273e5d60f4
Use the new settings activity class name
...
Follow up to I96230f05
Change-Id: I0ee7ccb5461764490ae9c977658883b10fe3ed3d
2011-07-06 12:38:34 +09:00
Tadashi G. Takaoka
f60d09ac30
Narrower KeyboardView reference
...
This change also rename static inner class to more readable name and
get rid of unnecessary object reference from PointerTracker.
Bug: 4768084
Change-Id: Ie4e2b940d66b47d41efcae7eeac853cdae2e4d38
2011-07-04 22:42:48 +09:00
Tadashi G. Takaoka
bd02fa8495
Merge "Move key hysteresis distance parameter to KeyDetector class"
2011-07-04 06:38:41 -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
satok
e55996373f
Removed unused import
...
Change-Id: I87344f071e982dfc37b17553c5a7054e26009cc7
2011-07-04 22:26:05 +09:00
Tadashi G. Takaoka
5f6816fa8b
Move keyboard event handling code to separate LatinKeyboardBaseView class
...
To sort out the issue, main keyboard and mini keyboard have to share
the pointer trackers.
In order to prepare for that, KeyboardView needs to be refactored as
two separate classes. KeyboardView is responsible for drawing keyboard
visual. And LatinKeyboardBaseView is responsible for handling key
event and mini keyboard as well.
Bug: 4768084
Change-Id: I5643e333b9bdfde0c939a0693cea76bd22f38897
2011-07-04 18:53:50 +09:00
Tadashi G. Takaoka
386899a8b0
Merge "Disable auto-correction when application auto completion has set"
2011-07-04 02:20:05 -07:00
satok
67b5180e85
Merge "Add SettingsActivity"
2011-07-04 02:11:38 -07:00
satok
29387a8922
Merge "Fixed a visibility of a shortcut button"
2011-07-04 02:10:44 -07:00
satok
1be5028dcf
Add SettingsActivity
...
Change-Id: I26d9f90fe18bd7723f1c3c0c9fafbb659cb2f020
2011-07-04 18:08:26 +09:00
satok
1cda6eb176
Fixed a visibility of a shortcut button
...
Change-Id: I65e57f6742186b3434d6582ce7f2a1d5d91ce588
2011-07-04 17:49:30 +09:00
Tadashi G. Takaoka
5238df54ad
Disable auto-correction when application auto completion has set
...
Change-Id: I3f4ecfe7f2d96613dd37d41d9195d94864f82b48
2011-07-04 16:21:32 +09:00
Tadashi G. Takaoka
7d3821c2b3
Merge "Use Key background for suggestions strip control"
2011-07-04 00:10:39 -07:00
Tadashi G. Takaoka
e583371b13
Use Key background for suggestions strip control
...
Change-Id: I5e43c0919e89972283fd18eb29d69f96f1bd0290
2011-07-04 15:42:20 +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
c190da0e02
Merge "Remove top padding parameter from MiniKeyboardBuilder constructor"
2011-07-02 05:24:50 -07:00
Tadashi G. Takaoka
17dc839503
Merge "Set candidates pane control visibility gone when touch-to-save is activated"
2011-07-02 05:24:15 -07:00
Tadashi G. Takaoka
e5276b39c1
Remove top padding parameter from MiniKeyboardBuilder constructor
...
To keep unit test simple, instead of specifying top padding in
the constructor, make separate setter for it.
Change-Id: I8870622cc1bd97420637b8c465bdb6c9dd366062
2011-07-02 02:06:33 +09:00
Tadashi G. Takaoka
5a931efe1e
Set candidates pane control visibility gone when touch-to-save is activated
...
Bug: 4985540
Change-Id: I9ca9e9bd990d9cdae0da22625be88bbfa4c7ee62
2011-07-02 01:59:49 +09:00
Tadashi G. Takaoka
fe1556bae1
Merge "Add top padding to mini keyboard"
2011-07-01 07:04:29 -07:00
Tadashi G. Takaoka
17a1676e72
Add top padding to mini keyboard
...
Because Key only has bottom padding, to make mini keyboard vertically
symmetric and looks nicer, we should add mini keyboard top padding
that equals to Key bottom padding (a.k.a. vertical gap).
Change-Id: Icceb687d50edfa48e0f0830a60a1e230836c982f
2011-07-01 23:02:47 +09:00
Tadashi G. Takaoka
e984fb55b1
Slightly larger key for ICS and phone combination
...
Compatible with Gingerbreada theme.
Change-Id: Id05bb8992dac47a23e12af7ab62924b5bc25b7ca
2011-07-01 22:40:19 +09:00
Tadashi G. Takaoka
7f3e5979d7
Merge "Calculate text width more conservatively"
2011-07-01 06:35:10 -07:00
Tadashi G. Takaoka
fe9b65afa8
Calculate text width more conservatively
...
Change-Id: If937ca0d05d50def115f6d275ed4b727c71e7bf4
2011-07-01 22:26:24 +09:00
Tadashi G. Takaoka
4edc7d074b
Disable candidate pane controller just after suggestions are set
...
Change-Id: I62e24bc39e80e2b51d1a29d093a96a8480254da2
2011-07-01 21:19:31 +09:00
Tadashi G. Takaoka
f008ae9ece
Merge "Tweak ICS theme a bit"
2011-07-01 05:12:43 -07:00
Tadashi G. Takaoka
3118277dd4
Tweak ICS theme a bit
...
Change-Id: Ib8f1a712a1fc3fd6f08b336617b4b6a17af11376
2011-07-01 21:11:34 +09:00
satok
7821a1d4d1
Merge "Refactor settings"
2011-07-01 03:49:29 -07:00
satok
dec7703d9b
Refactor settings
...
Change-Id: I2e0108ba429b477a07cfd53dcc664c0e43ff16a7
2011-07-01 19:43:09 +09:00
Ken Wakasa
44f24b73fe
Merge "Added text navigation gestures for keyboard touch exploration."
2011-07-01 03:35:43 -07:00
Justin Ho
71fbdc1ae7
Updated keyboard assets
...
Bug: 4948171
Change-Id: If1e8e5f2f0eafe29b36a10d5f5e9e1fb26d67597
2011-06-30 17:21:27 -07:00
Alan Viverette
87d7929d14
Added text navigation gestures for keyboard touch exploration.
...
Bug: 4905427
Change-Id: I9b44d65e4503e46ce71322a3c325c55d188e34a0
2011-06-30 11:59:35 -07:00
Tadashi G. Takaoka
7e7244873a
Merge "Adaptive suggestions strip"
2011-06-30 08:52:04 -07:00
Tadashi G. Takaoka
74b6897a12
Adaptive suggestions strip
...
Bug: 4903845
Change-Id: I9e2e17a9eee72df5c92414dcd4796ed7fe1655e1
2011-07-01 00:46:34 +09:00
Ken Wakasa
9ae24750f4
Some clean up and fixes around auto-correction cancellation logic
...
Change-Id: I07f4c3cd98d14d9f0da2de54bfa76a3867389f6f
2011-06-30 18:35:17 +09:00
Tadashi G. Takaoka
a65d84ce81
Merge "Add key description for "fullwidth asterisk" used on phone/number layout"
2011-06-29 03:02:30 -07:00
Tadashi G. Takaoka
0464850e6c
Add key description for "fullwidth asterisk" used on phone/number layout
...
This change also removes non-ASCII comment from strings.xml to
suppress resource compiler warning.
Change-Id: I96d3e8e2c7072816f32a15564745f8cdc3f91ee9
2011-06-29 18:51:22 +09:00
Tadashi G. Takaoka
73d377a953
Merge "Cleanup key drawing code"
2011-06-29 02:40:33 -07: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
satok
8b0f34dbd3
Remove sliding explanation
...
Change-Id: Iae35385a3fadd7acc8a67b6a8f9beda9cab96cc9
2011-06-29 18:08:31 +09:00
satok
284c32900b
Merge "Show subtype settings preference for new design"
2011-06-28 22:10:20 -07:00
satok
b9e56cde8b
Show subtype settings preference for new design
...
Change-Id: I6164ab6ae3d97e2095778a4a6fd9f36c508af7b0
2011-06-28 21:33:17 +09:00
Tadashi G. Takaoka
98d2e4c840
Merge "Add visual debug mode"
2011-06-28 04:45:19 -07:00
Tadashi G. Takaoka
670e1c6b71
Add visual debug mode
...
Change-Id: Ife131a398c0753b5b0e6e8969fe7bbc2a3bdab96
2011-06-28 19:13:52 +09:00
satok
bdb4edf533
Merge "Add suppress ime swicher notification"
2011-06-28 01:56:58 -07:00
satok
1c23d771d1
Add suppress ime swicher notification
...
Change-Id: I2050df05483c0b97c14c99ee941607371c081176
2011-06-28 17:52:34 +09:00
Tadashi G. Takaoka
49c8567db2
Merge "Use left/right-edge popup preview background"
2011-06-28 00:32:19 -07: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
87089985b1
Render sliding spacebar language switch arrows by text
...
Change-Id: Ief1a4f12a3d4840c36aa7a082f44b5b1ff894dd1
2011-06-28 15:58:45 +09:00
Justin Ho
f41e9f79eb
Updated IME assets
...
Bug: 4948171
Change-Id: I70019a91a95166196aa8ae5142ea7a0f81d32349
2011-06-27 17:27:25 -07:00
Justin Ho
23ea680fba
Cleaning up IME drawables
...
Bug: 4948171
Change-Id: Ief1a69478eacb13b6be03ab3923750cdf6ba25b6
2011-06-27 17:20:01 -07:00
Tadashi G. Takaoka
cf9c6ccdc5
Remove unused and unnecessary drawables
...
Change-Id: I7db0ee5e2aa06bba9b9f340aa6f71412c5a22c9a
2011-06-28 02:39:43 +09:00
Tadashi G. Takaoka
d44160d253
Merge "Draw popup hint "..." by text rendering"
2011-06-27 09:53:25 -07: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
660d42fb36
Remove mInForeground flag from KeyboardView
...
Instead of that, added cancelAllMessages() and call it from
onFinishInputView().
Change-Id: I58f6f0931ed8d73441d80d9616ba3afbbbe38e05
2011-06-28 01:00:59 +09:00
Tadashi G. Takaoka
55303bc634
Re-create input view after voice IME finished
...
Change-Id: Ia389eb43ac7ffec229bfd8b0fe56ce8271cb1d39
2011-06-27 23:46:15 +09:00
Tadashi G. Takaoka
7e9615f218
Fix NPE
...
Change-Id: Ia2c7d9e9298330ae991956fca64b225adaeff898
2011-06-27 22:54:18 +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
281e180c33
Fix NPE
...
Change-Id: Ie4b8b657fc6cc5a819d4ea3a0ca4536e6fdf6825
2011-06-27 20:30:40 +09:00
Tadashi G. Takaoka
d8850ae1ab
Merge "Draw phone/number keyboard layout witout icon"
2011-06-27 04:17:51 -07:00
Tadashi G. Takaoka
b47319867e
Show long suggestion in condensed and ellipsized text
...
Bug: 4903845
Change-Id: I75d58fb55f81594ebb2628ea21d00c2eb59fa70e
2011-06-27 20:17:08 +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
717a8f50ae
Use dedicated layout for "touch to save word" feature
...
Change-Id: Ie8c948476740a645d8b2d9a9d821236941d27adf
2011-06-27 18:04:22 +09:00
Tadashi G. Takaoka
7fb04fe007
Fix ragged suggestion strip baseline
...
Change-Id: I5fa9e2ad0993602e24f436e1d8ad0999209e5180
2011-06-26 02:07:07 +09:00
Ken Wakasa
4f0d290c5d
Avoid memory leak by by non-static Handler inner classes
...
bug: 4901934
Change-Id: I870ab2e621ef3640a84468f09c074cdd726dc963
2011-06-26 00:14:40 +09:00
Ken Wakasa
c79aa482a8
Tiny string fix.
...
Change-Id: I56dd023b770ffbb85d7be1440301596b77c8d8c2
2011-06-25 00:16:55 +09:00
Tadashi G. Takaoka
87a32135ab
Merge "Remove spacebar preview and arrows"
2011-06-24 05:45:09 -07:00
Tadashi G. Takaoka
14daf66fc5
Remove spacebar preview and arrows
...
Change-Id: I07f1b7bbf222d90e95919304e82d7d054df2868d
2011-06-24 21:41:27 +09:00
satok
07a62cf3d6
Added very aggressive
...
Bug: 4905916
Change-Id: I7365dd417855c980a56ab3bc513e9bc824b3182e
2011-06-24 21:31:10 +09:00
Jean Chalard
bbda98dc3e
Merge "Add a link from Latin IME to the dictionary pack."
2011-06-24 04:27:12 -07:00
Jean Chalard
4f3d5d3733
Add a link from Latin IME to the dictionary pack.
...
The link only shows up if the dictionary pack is installed.
Bug: 1752028
Change-Id: I4af0a0a63324c155609710064a25df0deeb82b4d
2011-06-24 20:17:38 +09:00
Ken Wakasa
52344a0788
Fix NPE with the unit test
...
Change-Id: I0836f8b7191287bcff65cdc8a8ce0ff7484e9f65
2011-06-24 15:31:09 +09:00
Tadashi G. Takaoka
2442e77985
Display suggested word info in debug mode
...
Bug: 4686782
Change-Id: I0e5bef33aa39c3d6f75edda7818524965aa40b79
2011-06-24 14:19:59 +09:00
Tadashi G. Takaoka
703e7252ba
Fix popup key preview on 7/11 inch tablet
...
Change-Id: I42b4c0c7a554089baa778205da0627daaff667c6
2011-06-24 08:44:11 +09:00
Tadashi G. Takaoka
2b9eb15c0d
Fix extract mode visual
...
Bug: 4850051
Change-Id: Id30e15c6c1c341d3a7712165bd4fb0875d1ad8f1
2011-06-24 07:52:35 +09:00
Tadashi G. Takaoka
1bca5b6e83
Revert "Remove extra spacing from candidate strip to fix extract mode layout"
...
This reverts commit 177fc54d8c
.
Bug: 4904733
Change-Id: I7ab48ea559a9aafa58b1a2847f4398d24e9b1cfb
2011-06-24 07:51:49 +09:00
Adam Powell
177fc54d8c
Remove extra spacing from candidate strip to fix extract mode layout
...
Change-Id: Icb2b7d66196cd7d36bedb11eadad0d743f7c048e
2011-06-23 13:18:11 -07:00