nyancrimew/LatinIME
1
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity
1505 commits 1 branch 0 tags 363 MiB
Commit graph

429 commits

Author SHA1 Message Date
Tadashi G. Takaoka
fab243a183 Use normal font for functional key label instead of italic font 
This change also uses slightly larger font size for functional key
label according to the v4 keyboard design.

Bug: 3216592
Change-Id: I027f109b7748ade8564dc808487d9a6ce1da9761
 2010-11-23 00:38:09 -08:00
Tadashi G. Takaoka
cc359dddb3 Merge "Fix caps lock release in non-distinct multi touch device" 2010-11-22 22:54:34 -08:00
Tadashi G. Takaoka
0d0a46da03 Fix caps lock release in non-distinct multi touch device 
Bug: 3221869
Change-Id: I7c5d407c465f22945cba37e42683345913b43acc
 2010-11-22 22:41:17 -08:00
Tadashi G. Takaoka
0b60f83192 Support <key-style/> and keyStyle attribute for Keyboard XML 
Change-Id: Ie052e989d0180eecfc8c244ba6c60594a46103d1
 2010-11-22 18:33:47 -08:00
satok
4092205833 Refactor to move voice functionarities in LatinIME to VoiceIMEConnector 
Change-Id: I593a8187d48338c9c0e7d75c73c2dbfc32400335
 2010-11-23 10:32:12 +09:00
Tadashi G. Takaoka
04448c2978 Make F1 and Symbol keys static in XML file 
Change-Id: If869f5ad4fe8f192f89a8679a4abde99a25e02e6
 2010-11-21 03:00:53 -08:00
Tadashi G. Takaoka
cd39f2adee Add keyLabelAlign attribute to Keyboard XML 
Bug: 3216592
Change-Id: I88f8055199f2cd0525faf9374114fbebba53b951
 2010-11-20 18:48:55 -08:00
Tadashi G. Takaoka
45911256fd Perform editor action IME_ACTION_NEXT/PREVIOUS by tab key 
Bug: 3122995
Change-Id: I44280fe1c6cc27f429b311edec71e1027178222d
 2010-11-19 21:36:37 -08:00
Tadashi G. Takaoka
07f903afba Merge "Fix automatic temporary upper case mode behaviour" 2010-11-19 17:21:55 -08:00
Tadashi G. Takaoka
6769c67987 Fix automatic temporary upper case mode behaviour 
This change is a followup of I948ef26f

Automatic Temporary Upper Case mode acts like Normal mode until shift
key is pressed. However, after shift key is pressed, it acts like
Manual Temporary Upper Case mode.

Bug: 3193390
Change-Id: Id3d7a38a1f5905322cd46ded36b1db26576d49af
 2010-11-19 16:51:50 -08:00
Tadashi G. Takaoka
1d8196cd41 Use "flag" feature of attr.xml to represent keyboard mode 
Change-Id: Ibc317ada5167a119477fe8ea2994df6c6462afd0
 2010-11-19 14:57:24 -08:00
Tadashi G. Takaoka
75fde64890 Cleanup drawable-xlarge resources into drawable-mdpi 
Change-Id: I2db335a601ddb0062a637a71289e14cf1d375a1e
 2010-11-19 01:37:38 -08:00
Tadashi G. Takaoka
f27364600c Implement both automatic and manual temporary upper cases 
With this change,
- Shift and Shift lock state of keyboard is maintained by
  LatinKeyboard.ShiftState.
- Shift key state is maintained by ShiftKeyState object in
  KeyboardSwitcher.
- LatinIME informs KeyboardSwitcher that shift key press, release and
  long press and KeyboardSwitcher determines which state LatinKeyboard
  and ShiftLeyState should be.

Bug: 3193390
Change-Id: I948ef26fda512eb1cb0ebddc89d322c4f4f4d670
 2010-11-18 19:32:59 -08:00
satok
1d2d3228a3 Merge "Add a functionarity to handle Subtype" 2010-11-18 18:10:25 -08:00
satok
4ab730dbd3 Add a functionarity to handle Subtype 
Change-Id: Ic6055ba218b64f4276e3db99a435f546c3990ee5
 2010-11-19 08:30:02 +09:00
Ken Wakasa
95a5daa3e3 Merge "Avoid disk writes on UI thread." 2010-11-18 12:46:58 -08:00
Ken Wakasa
11eb13e04f Avoid disk writes on UI thread. 
bug: 3207554
Change-Id: I285691f9e94d989823fcb5c21615ca50cecddff6
 2010-11-19 05:38:18 +09:00
satok
279da1da91 Hide space bar preview when space bar switcher is disabled. 
Change-Id: I469197a4b3f55335eaee104177f0970cc904bb34
 2010-11-18 20:50:37 +09:00
satok
3b776b7892 Move functions in LatinKeyboard related to LanguageSwitcher to SubtypeSwitcher 
Change-Id: I777db896bd0287931ce7c810b080ccee1121d34e
 2010-11-18 08:35:26 +09:00
satok
0ed7191b4d Move functions related to LanguageSwitcher to LatinIMESubtypeSwitcher 
Change-Id: I5fa306cf311063ff96b6d45faaca2ffe84cddbf9
 2010-11-18 06:58:49 +09:00
Ken Wakasa
378a1b516d Stop highlighting in suggestion strip after auto-completion cancellation 
Follow up change to I2185fcf6

bug: 2847211
Change-Id: I7874bc8400e5a7613bfbae83b790ea6192d287b3
 2010-11-17 16:40:48 +09:00
Tadashi G. Takaoka
b643dab73a Refactor KeyboardSwitcher and LatinIME 
Bug: 3193390
Change-Id: Id894c9bc574a53966d9efc419ab398bae89c34c1
 2010-11-16 23:06:37 -08:00
Tadashi G. Takaoka
10227a71a0 Implement temporary upper case hint icon 
This change partially implements the requested feature. The following
are not supported yet.
- Non-letter key handling on automatic temporary upper case layout.
- Non-letter key handling on shift chording in caps lock layout.
- Hint icons for manual temporary upper case layout are not final ones.

Bug: 3193390

Change-Id: I636da99d1be05b1337935d87c6f4d140661e1cc8
 2010-11-16 13:45:49 -08:00
Ken Wakasa
c1e2e827b5 Canceled auto-completion shouldn't be re-auto-completed 
bug: 2847211
Change-Id: I2185fcf6b798a41135c329485914bc035fad5119
 2010-11-16 19:18:05 +09:00
Tadashi G. Takaoka
889691eca1 Refactor shift key state into KeyboardSwitcher 
Change-Id: If484d3d7e7a0794ee7fc88f0771229d6f90db466
 2010-11-16 01:47:39 -08:00
Tadashi G. Takaoka
d7641636db Refactor UI Handler of LatinIME 
Change-Id: Iabae338c32969997cb3c7f612c2e5a6999420e28
 2010-11-16 01:37:19 -08:00
Tadashi G. Takaoka
89cfd23f34 Merge "Refactor symbol key state into KeyboardSwitcher" 2010-11-16 01:17:26 -08:00
Tadashi G. Takaoka
6c92ee127d Refactor symbol key state into KeyboardSwitcher 
Change-Id: Idce4e9bf070b08b8a930fd8e800df9c4d8829f8f
 2010-11-16 01:15:16 -08:00
satok
af41759729 Add functions for usability logging 
Change-Id: I9b66bde1b5ae76742cb685bbc558ce9570dca50a
 2010-11-16 18:03:28 +09:00
satok
18e9a7c6fb Add a logging functionarity for usability study. 
Bug: 3193879

- Log char input

Change-Id: I5c1568f81012743b7068d423baa99b0f9d1653f8
 2010-11-16 17:15:37 +09:00
satok
7599cfea4a Add showing suggestion only on portrait mode and fixing the state of suggestion strip 
Change-Id: I7babd1400a3516c87506a3ea4bd46ddaf89e19b4
 2010-11-16 07:30:08 +09:00
Tadashi G. Takaoka
71c353aa87 Refactor Tutorial class 
Change-Id: Ib8dbcf8f36966988fb0d4efdc6bdb7e30b776a68
 2010-11-13 01:49:29 -08:00
Tadashi G. Takaoka
1679432d1c Get rid of the reference to LatinKeyboard from LatinIME 
Change-Id: I94286ecec0aa8dbfdfaa74d3a76b744c4a250370
 2010-11-13 01:45:12 -08:00
Ken Wakasa
3009310283 Partially revert I63ad561c 
This is required to make cancellations of auto-corrections/completions work.

Change-Id: I091fb9946d4642847fde39d86a6b3b09735e93a8
 2010-11-13 15:16:43 +09:00
Tadashi G. Takaoka
d98c20b036 Fix NPE that is caused by null EditorInfo 
Bug: 3192772
Change-Id: Ia057d29e070ccbb90ee60df1e141de14de95f820
 2010-11-12 15:26:54 -08:00
Tadashi G. Takaoka
b0465116bd Keyboard XML supports switch-case-default tags to select rows and keys 
Change-Id: I0d92e513757e765d9de98561205754af5a143650
 2010-11-12 14:30:25 -08:00
Tadashi G. Takaoka
8b00bc4f32 Rename KeyboardSwitcher.setKeyboardMode to loadKeyboard 
This change also eliminates KeyboardSwitcher.refreshKeyboardCache,
LatinIME.reloadKeyboards() and LanguageSwicther.getLocales().

Change-Id: I5fd4914660ea1c955ddfa0ca62b920f9bcd53e1b
 2010-11-11 15:44:50 -08:00
Ken Wakasa
4174655e23 Check the system vibrator availability for the "Vibrate on keypress" preference. 
bug: 3021001
Change-Id: I7843a3e4765333c720fd8f258c1fffdf6f090d3a
 2010-11-11 19:15:34 +09:00
satok
ca26f20fa4 Fix states for showing PunctuationList and correction 
- Fixed the visibility of the suggestion strip

Change-Id: I63ad561c71464657521661dbd25c72dd34841834
 2010-11-11 17:37:11 +09:00
Tadashi G. Takaoka
48bc6b158b Refactor KeyboardSwitch.KeyboardId class 
This change defers determining which keyboard should be loaded and
holds the information in KeyboardId object as much as possible.  At
keyboard loading time, the determination deferred will be made
depending on the information of KeyboardId.

Change-Id: Ice2455d9e5b21671a250c342c06c043e4baa5355
 2010-11-10 21:26:53 -08:00
Tadashi G. Takaoka
507495efd5 Refactor to remove KeyboardSwitcher.setVoiceMode 
This change also renames KeyboardSwitcher.makeKeyboards to
refreshKeyboardCache.

Change-Id: I76897562d5876a53364dc378e7800ab92fb2a37b
 2010-11-10 21:16:47 -08:00
Tadashi G. Takaoka
8aaab7c286 Should cancel both normal and shift long press timers 
Bug: 3132881

Change-Id: Ib89e2efa4e68e7d57ac1123df2ec6241f1b902d1
 2010-11-10 15:27:24 -08:00
Tadashi G. Takaoka
f8e30a9153 Refactor calling KeyboardSwitcher.setKeyboardMode 
This change also eliminates unnecessary recursive call in
KeyboardSwitcher.setKeyboardMode.

Change-Id: Iff25fe23b34227d526dee0bbe8710842545c2afa
 2010-11-08 23:50:27 -08:00
Tadashi G. Takaoka
59b7bd0730 Using distance to the edge of key as proximity detection 
Because there may be very long key, such as space bar on tablet, we
should not use the distance between the touch point and the center of
key as proximity detection.  Instead of that, this change uses the
distance between the point and the nearest edge of key as proximity
detection.

Also this change fixes the bug that space key (code 32) was not
counted in proximity detection.

Bug: 3164020
Bug: 3168138
Change-Id: I687f1ce94a8e944c3f6eea0fe00e18ed6e68e278
 2010-11-06 01:10:55 +09:00
Tadashi Takaoka
68864723cf Rename LatinKeyboardBaseView class to KeyboardBaseView 
Change-Id: I496ecbfa7d398583d01f821398f49f75d17311d8
 2010-11-05 18:36:19 +09:00
Leon Scroggins
47f795dc87 Treat the new web fields like their corresponding variations. 
Bug:2692655
Bug:2460543

Change-Id: I86e814902447ecd5c8b00e399a0143d3dc2ad2cf
 2010-11-04 11:27:55 -04:00
Ken Wakasa
17fcd719de Make sure there are no modes with settings key on tablet. 
Follow-up change to I73b8a502

bug: 3095814
Change-Id: I79bb05c61dc73b036331e17d02c791f08a0168fc
 2010-11-02 19:33:27 +09:00
Ken Wakasa
200ece7907 Capitalization for "Quick Fixes" words doesn't work 
bug: 3151706
Change-Id: I7770a1d26edb1ea72ee93396181953a724dcc4bf
 2010-11-01 20:25:07 +09:00
Ken Wakasa
2a952e9b7e am b5e8c779: am 69db35c4: Make the buttons work for edge pixels of the keyboard 
* commit 'b5e8c7799726a5975283fa138ad2870ab02d01a4':
  Make the buttons work for edge pixels of the keyboard
 2010-10-29 08:28:28 -07:00
Ken Wakasa
69db35c493 Make the buttons work for edge pixels of the keyboard 
Follow-up change to If7630b89

bug: 3142416
Change-Id: I2660e3d688eb0490363e460d5b4944c89b8ca35c
 2010-10-29 19:24:08 +09:00
satok
dd8c4c0068 Merge "Increased the size of GRID in Keyboard" 2010-10-29 03:01:32 -07:00
satok
74103ee1b9 Increased the size of GRID in Keyboard 
Bug: 3122894

- Changed width 10 -> 32
- Changed height 5 -> 16

Change-Id: I07354cf5c942974cc25a5e043f41e0f13a09351b
 2010-10-29 18:50:18 +09:00
Ken Wakasa
37a0f2d5de am e32a77c6: am 9dce586e: Bugfix: IME gives haptic feedback when button wasn\'t pressed 
* commit 'e32a77c691567bdb3031d877e80786508bd47e4a':
  Bugfix: IME gives haptic feedback when button wasn't pressed
 2010-10-28 11:38:38 -07:00
Ken Wakasa
9dce586eaa Bugfix: IME gives haptic feedback when button wasn't pressed 
bug: 3142416
Change-Id: If7630b89d6c2a8ec38e191c263c03f8f11d3c498
 2010-10-29 03:15:02 +09:00
Ken Wakasa
fd0bd57deb Change suggestion update delay from 100ms to 180ms to avoid flashy suggestion strip with quick multi-finger typing. 
bug: 3122641
Change-Id: I385f9eb2e392487d7b4c252553d1f8d7c21da2e4
 2010-10-27 18:05:27 +09:00
Ken Wakasa
8252de1a60 Remove auto capitalization by Shift+puncs 
bug: 3133312
Change-Id: I12a05d9028ab2fad07e1819407d63cf8ffd4d30c
 2010-10-27 14:10:36 +09:00
Ken Wakasa
276845c7a9 Follow-up change to revise Caps Lock sequence. 
bug: 3122877
Change-Id: I44c539d7c041443f3ad027de4b75a67adf6b2c87
 2010-10-26 20:00:21 +09:00
Ken Wakasa
eec7bb9386 Get rid of mCapsLock in LatinIME.java 
Change-Id: I9c6387ee387d53460d23a12225829da344674579
 2010-10-25 23:34:47 +09:00
Ken Wakasa
29ff343f77 Remove LatinKeyboardBaseView.isShifted() and setShifted() for refactoring 
Change-Id: I9a1106b679a9ffb3ae959d90377eef096e5af842
 2010-10-25 19:55:06 +09:00
Ken Wakasa
0ce98cbf98 Get rid of references to BaseKeyboard in Latin-specific classes 
Change-Id: I6871a24967b1410bdb14e902bdd311ef82fd4f0b
 2010-10-25 18:04:01 +09:00
Tadashi G. Takaoka
4189eb2308 Revise caps lock sequences 
This change also fixes that the popup preview of ALT on symbol
keyboard is not showing.

Bug: 3122877
Bug: 3127255
Change-Id: I978cb30a0d05298274d8ab6541b91323a0fef211
 2010-10-25 00:03:46 +09:00
Tadashi G. Takaoka
71cc4ef673 Merge "Tablet keyboard should always show "?123" as symbol key" 2010-10-22 10:53:44 -07:00
Tadashi G. Takaoka
36af0880c3 Tablet keyboard should always show "?123" as symbol key 
Bug: 3118554
Change-Id: Ib609799f28dee56a4ded2e8144ac4a0c0d113ad6
 2010-10-22 23:59:21 +09:00
Tadashi G. Takaoka
0b1cb2d039 Refactor BaseKeyboardParser as Recursive Descendent Parser 
Bug: 3082538
Change-Id: Ic0d72c6fe08cfc20db86aeffb10a27efe678095e
 2010-10-22 21:58:45 +09:00
Tadashi G. Takaoka
4f6060b8b7 Table keyboard should always show return icon on enter key 
Bug: 3122750
Change-Id: I75d2b5adff3a349d29d8a56e7b761c26b04683c0
 2010-10-22 18:27:59 +09:00
Tadashi G. Takaoka
503797ae0e Make "show settings key option" dependent to device configuration 
Bug: 3095814
Change-Id: I73b8a5023b398621a910c953eade252dc6412923
 2010-10-22 17:04:14 +09:00
Tadashi G. Takaoka
41338e6c32 Move BaseKeyboardParser to top-level class 
Bug: 3082538
Change-Id: If0ddf32bc3811e3c65a7a96503c61ed3351eeb66
 2010-10-21 19:38:31 +09:00
Tadashi G. Takaoka
bf77bb7678 Refactor BaseKeyboard parsing code 
Change-Id: I241125b5b15c9d6bbba456476f1f4fd3ef9db3f2
 2010-10-21 17:58:34 +09:00
Ken Wakasa
e354a85ef4 Manual merge of the following Gingerbread changes logically 
I8b38e280
Ia3929bb0
If925b546
I1062763d
I901e36aa

bug: 3100311
Change-Id: Ic7e01277ec816e77d34732599b2b9552668b81c2
 2010-10-20 22:51:33 +09:00
Tadashi G. Takaoka
58bfa35072 Update xlarge drawable of Keyboard 
Bug: 3109804
Change-Id: I316f9cfcec377a7d0ea1417e1e3cea55cbdb9e2b
 2010-10-19 21:59:17 +09:00
Tadashi G. Takaoka
28d8a488c0 Disable gesture detector on mini-keyboard 
Gesture detector, for closing keyboard by swiping down, must be
disabled not only when mini-keyboard is on the screen, but also in the
mini-keyboard itself.

Bug: 3105595
Change-Id: I548501f7117ca2310943cabb678c1e250e5012ce
 2010-10-19 02:20:03 +09:00
Ken Wakasa
b0a6f354ac DO NOT MERGE. Add '...' (hint) to period/smiley keys which triggers mini popup by long-press. 
bug: 3105185
Change-Id: I901e36aa12dad5968ba1a420fff6a2f2efb16da5
 2010-10-19 01:16:07 +09:00
Tadashi G. Takaoka
2348ca0e76 Cleanup LatinKeyboard and LatinKeyboard.LatinKey classes 
Change-Id: I4c5a37315dea1c7545b77a8a6c93b930927a5a82
 2010-10-18 16:06:05 +09:00
Tadashi G. Takaoka
4571fff019 Merge "Showing popup preview only when IME is in foreground" 2010-10-17 19:55:15 -07:00
Tadashi G. Takaoka
3740a26c21 Showing popup preview only when IME is in foreground 
Bug: 3100922
Change-Id: Icd59fc3978dc1fccb523a368b0a7d4549fc2db78
 2010-10-17 23:50:24 +09:00
Tadashi G. Takaoka
a2de8f0f83 Save default enter key attributes and restore these if needed 
Bug: 3103016
Change-Id: Id8128d5b685ac040afd2c248e1ad17e9aaf1fdf0
 2010-10-17 18:27:48 +09:00
Tadashi G. Takaoka
cd7b7d3e8f Specify keyboard metrics with physical unit "inch" 
Cherrypick I44f3b2eef8086d6e0b0db53d38f08487549060c6 from Gingerbread

This change also introduces the key background drawables which has no
fixed bottom padding.  Instead of relying on bottom padding in
drawable, this change also specifies Keyboard.verticalGap with
physical unit.  Other keyboard related length, distance and size are
also specified by physical unit.

Bug: 3066107
Change-Id: Ib38355ebfc2f8d5b1d26c4e90eba87196fbeddfa
 2010-10-17 18:19:42 +09:00
Ken Wakasa
86953d170d DO NOT MERGE. Revise the setting hint visual and its handling code. 
This is a follow up change to I8b38e280.

bug: 3084022
Change-Id: I1062763d87b4498e19598b4e7d99bb91c510c6d2
 2010-10-17 12:42:40 +09:00
Ken Wakasa
4e2feed325 am 4b6b11b5: am 8a26e853: Fix an issue of adding extra character. 
Merge commit '4b6b11b5064a3b8b604a6441e7a037b0443ec6ed'

* commit '4b6b11b5064a3b8b604a6441e7a037b0443ec6ed':
  Fix an issue of adding extra character.
 2010-10-16 09:13:17 -07:00
Ken Wakasa
1cbfc6c968 DO NOT MERGE. Follow up change to I8b38e280 
Add visual indicator that long press / or @ on F1 key will bring up Settings

bug: 3084022
Change-Id: If925b546829ca8e8806e1f8f89eaf72fc8c220da
 2010-10-16 02:54:54 +09:00
Ken Wakasa
8a26e85387 Fix an issue of adding extra character. 
LatinKeyboardBaseView should have removed "long pressed" pointer tracker from the multi-touch pointer queue.

bug: 3099130
Change-Id: I3d358a373b0de07558a204e9ff5a95e9ece38bcc
 2010-10-15 17:56:05 +09:00
Tadashi G. Takaoka
0661496ee0 Follow up change of I8b38e280 (DO NOT MERGE) 
This is follow up change of I8b38e2803eb32469653484701882af35108eb69a

This change fixes the following when "Voice input on symbols keyboard"
option is selected.
- LatinIME.onCreateInputView fails to show "123mic" icon.
- Email and URL variation keyboard fails to show "123mic" icon.

Bug: 3084022
Change-Id: Ia3929bb0cc5c5c8651af816718c21d1f20e8f016
 2010-10-15 10:00:06 +09:00
Maryam Garrett
93b3d50041 resolved conflicts for merge of 21c3e696 to master 
Change-Id: I35b6abc1569f3e16ddf2db523dc1326ff294962a
 2010-10-14 15:36:50 -04:00
Ken Wakasa
179fa2c03e DO NOT MERGE. Add visual indicator that long press , or mic key will bring up Settings 
bug:3084022
Change-Id: I8b38e2803eb32469653484701882af35108eb69a
 2010-10-14 19:52:46 +09:00
Tadashi G. Takaoka
3d20d99902 Specify keyboard metrics with physical unit "inch" (DO NOT MERGE) 
This change also introduces the key background drawables which has no
fixed bottom padding.  Instead of relying on bottom padding in
drawable, this change also specifies Keyboard.verticalGap with
physical unit.  Other keyboard related length, distance and size are
also specified by physical unit.

Bug: 3066107

Change-Id: I44f3b2eef8086d6e0b0db53d38f08487549060c6
 2010-10-14 13:40:31 +09:00
Tadashi G. Takaoka
323971b51e Merge "Follow up change of I4c6df819" 2010-10-12 08:03:11 -07:00
Tadashi G. Takaoka
ed3443ebd7 Follow up change of I4c6df819 
This change is follow up of I4c6df8197b734feb998da78478a4d9a41f6d92b2

Change-Id: I3b8a82dd71305f34afb2e8b6a705efabdc2bc0cf
 2010-10-13 00:02:28 +09:00
Tadashi G. Takaoka
adf24e2eb4 Follow up change of If9472a2a 
This change is follow up of If9472a2acb029e56790dc4d19ab62e608c970175

Change-Id: I0a474a130f49e2acccbb5a164bdf2984a5bd9042
 2010-10-13 00:00:59 +09:00
Tadashi G. Takaoka
50a61083d3 Add text variation keyboard layout 
Change-Id: I4c6df8197b734feb998da78478a4d9a41f6d92b2
 2010-10-12 14:01:28 +09:00
Maryam Garrett
a5a5ffc0dc Fix the over-calling of VoiceSearch Logging 
bug: 3035228 This change will reduce the number of times VoiceSearch app
is called to log IME events.  This is because it 1) only
flushes the logs when there is relevant logging information
available and 2) sets a flag in UserHappinessSignals so
that other apps (eg: gmail/sms) can know if there is
relevant logging information before sending the logging
intent to voice search.

Change-Id: I708fea5a38f854091f1101e4f6a3db46296f3e92
 2010-10-11 15:37:32 -04:00
Ken Wakasa
39004972b1 resolved conflicts for merge of fd64e47c to master 
Change-Id: I07434c251fafa5eee548a54dae30d91df3a24085
 2010-10-12 03:15:36 +09:00
Ken Wakasa
3de6ba6ab9 am 938c0a37: am 364da8c6: Fix - "Touch again to save" not working for manually picked suggestion when re-correction is enabled. 
Merge commit '938c0a3722a9c597931e6f75408dc7ab636d7052'

* commit '938c0a3722a9c597931e6f75408dc7ab636d7052':
  Fix - "Touch again to save" not working for manually picked suggestion when re-correction is enabled.
 2010-10-11 10:42:25 -07:00
Kenny Root
ef38215fa4 Merge "Fix merge that should have been manually merged" 2010-10-10 17:16:51 -07:00
Kenny Root
c4b93e8d90 Fix merge that should have been manually merged 
master was still using the deleted constants in different places and
Java 6 didn't like the imports.

Change-Id: If9472a2acb029e56790dc4d19ab62e608c970175
 2010-10-10 17:15:21 -07:00
Tadashi G. Takaoka
e56e2d85df am 02b8d91b: am 7e1f5a2d: Make sure to set symbol keyboard shifted 
Merge commit '02b8d91b2dbe4290d4b09d93a22efbc5552326db'

* commit '02b8d91b2dbe4290d4b09d93a22efbc5552326db':
  Make sure to set symbol keyboard shifted
 2010-10-10 17:14:19 -07:00
Kenny Root
6f6dd71862 resolved conflicts for merge of 23d50bfb to master 
Change-Id: Ia3fd85bd0c231f7b910b14caad38fa453a2336f6
 2010-10-10 15:19:53 -07:00
Ken Wakasa
c2d7ac79bd Tweak key width for 'o'-popup chars. 
We'll merge this to master for now, but we should have new attr (such as popupCharWidth) to handle this reasonably in the newly created BaseKeyboard class.

bug: 3082178
Change-Id: I024b946aafbbeb07b865a09f489dacb56f0478d0
 2010-10-11 04:32:54 +09:00
Ken Wakasa
364da8c618 Fix - "Touch again to save" not working for manually picked suggestion when re-correction is enabled. 
bug: 3082806
Change-Id: I64e652b0ad1d496e102a7cc2cf9a5615df423192
 2010-10-11 02:55:05 +09:00
Ken Wakasa
9c50d2ea36 am 018afe8c: am 6495bfc7: Follow-up to I36faf679 Cancel pending messages related to suggestion updates. 
Merge commit '018afe8c7e90b8dd0fde4f22873ecdf38086358e'

* commit '018afe8c7e90b8dd0fde4f22873ecdf38086358e':
  Follow-up to I36faf679  Cancel pending messages related to suggestion updates.
 2010-10-08 14:36:31 -07:00
Ken Wakasa
9870638da7 am 64444586: am 55b10796: Addressed bug: 3058217 "-" key not working at beginning of line 
Merge commit '644445868f1023b3263a149f2faf617b88341d20'

* commit '644445868f1023b3263a149f2faf617b88341d20':
  Addressed bug: 3058217  "-" key not working at beginning of line
 2010-10-08 13:17:45 -07:00