Commit graph

4140 commits

Author SHA1 Message Date
Jean Chalard
7ce1dc3313 am 0c3b8ce8: Merge "Move settings method from Utils to SettingsValues"
* commit '0c3b8ce842140aad2087b6ec391177999b87cbb4':
  Move settings method from Utils to SettingsValues
2011-12-09 11:00:44 -08:00
Tadashi G. Takaoka
7fa66d6b78 am 784181e2: Merge "Cleanup debug logging code"
* commit '784181e29fc857cd3a628efa102dc84cd629feb8':
  Cleanup debug logging code
2011-12-09 11:00:43 -08:00
Tadashi G. Takaoka
b0de19af06 am a7af03ba: Merge "Get rid of public KeyboardState.setShifted and setShiftLocked"
* commit 'a7af03baf4aa9cd0f3ac124143c109ddcce153e6':
  Get rid of public KeyboardState.setShifted and setShiftLocked
2011-12-09 11:00:43 -08:00
satok
882eef3af7 am 4bae9d56: Merge "Show usability study mode for research purposes"
* commit '4bae9d56d9b277464738633f1b55946d501e5cdb':
  Show usability study mode for research purposes
2011-12-09 11:00:42 -08:00
Tadashi G. Takaoka
d657c180bf am a76c62e9: Merge "Remove direct calls of setKeyboardXXX from KeyboardSwitcher"
* commit 'a76c62e92d76d876619e721633ce8f86dd1700c3':
  Remove direct calls of setKeyboardXXX from KeyboardSwitcher
2011-12-09 11:00:37 -08:00
Jean Chalard
49dc1bfe55 am 7a16a061: Extract Settings.Values to a new class
* commit '7a16a061e622539e54d7d649dcb8d4965aea575a':
  Extract Settings.Values to a new class
2011-12-09 11:00:35 -08:00
Jean Chalard
0c3b8ce842 Merge "Move settings method from Utils to SettingsValues" 2011-12-08 23:09:33 -08:00
Tadashi G. Takaoka
784181e29f Merge "Cleanup debug logging code" 2011-12-08 23:08:22 -08:00
Jean Chalard
ed43296217 Move settings method from Utils to SettingsValues
Change-Id: I633378a41f63cd492b8c9345d550e07254df5e5a
2011-12-09 16:03:10 +09:00
Tadashi G. Takaoka
a7af03baf4 Merge "Get rid of public KeyboardState.setShifted and setShiftLocked" 2011-12-08 23:02:47 -08:00
satok
4bae9d56d9 Merge "Show usability study mode for research purposes" 2011-12-08 22:40:58 -08:00
satok
e0dfc54c5b Show usability study mode for research purposes
Bug: 5722703

Change-Id: I27acc374c5d4b52707708b83689dea5d78a573d7
2011-12-09 15:31:06 +09:00
Tadashi G. Takaoka
930a55b846 Cleanup debug logging code
Change-Id: If806d61c5945d319c89d9cc127e09f98b7b10a4e
2011-12-09 15:14:05 +09:00
Tadashi G. Takaoka
805402e8fa Get rid of public KeyboardState.setShifted and setShiftLocked
Bug: 5708602
Change-Id: I98bcca7d3e9dd88f034d0faecada76902b2d0dff
2011-12-09 15:13:23 +09:00
Tadashi G. Takaoka
a76c62e92d Merge "Remove direct calls of setKeyboardXXX from KeyboardSwitcher" 2011-12-08 21:33:09 -08:00
Tadashi G. Takaoka
96c56cb577 Remove direct calls of setKeyboardXXX from KeyboardSwitcher
These calls, setAlphabetKeyboard, setSymbolsKeyboard, and
setSymbolsShiftedKeyboard have to be call backed from KeyboardState.

Bug: 5708602
Change-Id: Ibbe1a21bd10bf942e17886869c0ab0fa1735b87e
2011-12-09 13:26:11 +09:00
Jean Chalard
7a16a061e6 Extract Settings.Values to a new class
This is pretty much automatic refactoring. Thanks Eclipse!

Change-Id: I8ccd24d11878445c836347e9c487c91461eee9cd
2011-12-09 12:40:50 +09:00
Tadashi G. Takaoka
f0fcda0899 am d52e7605: Merge "Cleanup KeyboardSwitcher a bit"
* commit 'd52e76053031f282279112fbc6136bb9ccd643a6':
  Cleanup KeyboardSwitcher a bit
2011-12-08 05:56:28 -08:00
Tadashi G. Takaoka
d52e760530 Merge "Cleanup KeyboardSwitcher a bit" 2011-12-08 05:55:16 -08:00
Tadashi G. Takaoka
6ad9b012d9 Cleanup KeyboardSwitcher a bit
* Move caps lock state preserving code to KeyboardState.
* Merge KeyboardState.onLoadKeyboard and onRestoreKeyboardState.
* Merge private methods into toggleShift and toggleKeyboardMode.

Bug: 5708602
Change-Id: I793a934a0ba18d5750be011c52ebe20c1976eac6
2011-12-08 22:50:46 +09:00
Jean Chalard
599af94acd am 92e5756d: Merge "Cleanup"
* commit '92e5756dfb4c2d5f0ebd2da53ba1a8fd9f633721':
  Cleanup
2011-12-08 05:16:04 -08:00
Jean Chalard
92e5756dfb Merge "Cleanup" 2011-12-08 05:14:26 -08:00
Jean Chalard
e8a57d9812 am c1fdd966: Remove a useless method
* commit 'c1fdd966a73c2ddda73307d5f811935dbac5bf69':
  Remove a useless method
2011-12-08 05:05:13 -08:00
Jean Chalard
c1fdd966a7 Remove a useless method
Change-Id: Ib6a0ee21bfe2000231f9ba7bcad4b18ae57e4249
2011-12-08 21:47:26 +09:00
Jean Chalard
283b0c2b64 Cleanup
Here, shouldAutoCorrect implies mSettingsValues.mAutoCorrectEnabled

Change-Id: I9256718dd63b75252d1454e264db6814bbf18aa5
2011-12-08 21:37:15 +09:00
Jean Chalard
178470e7f3 am 3da7df8d: Merge "Add proximity for Russian."
* commit '3da7df8db7595de513ea3ab6a4e2f532f7de0166':
  Add proximity for Russian.
2011-12-08 02:24:24 -08:00
Jean Chalard
3da7df8db7 Merge "Add proximity for Russian." 2011-12-08 02:22:28 -08:00
Jean Chalard
1830cd1dc8 Add proximity for Russian.
This also tries to make the code as easy to extend as possible
for future developments.

Bug: 5701241
Change-Id: I1ed48e6a5cc7aab94c5d6e309930cc004247d7e7
2011-12-08 19:00:52 +09:00
Jean Chalard
3e9135d76d am 9e38f9a9: Merge "Use the system-wide interface to add a word."
* commit '9e38f9a9803b04d40c0956e5977a4fb6fce88759':
  Use the system-wide interface to add a word.
2011-12-08 00:54:57 -08:00
Jean Chalard
9e38f9a980 Merge "Use the system-wide interface to add a word." 2011-12-08 00:52:32 -08:00
Tadashi G. Takaoka
684371dd33 am cf58f53a: Move KeyboardLayoutState into KeyboardState
* commit 'cf58f53a1ab53b427a3d9784502b47ba1833b018':
  Move KeyboardLayoutState into KeyboardState
2011-12-08 00:04:11 -08:00
Tadashi G. Takaoka
cf58f53a1a Move KeyboardLayoutState into KeyboardState
Bug: 5708602
Change-Id: Ieb6b872d0f2cf3ad1fcb69409e2cf49f60427672
2011-12-08 17:00:56 +09:00
Tadashi G. Takaoka
9ba05f5689 am cce3f791: Merge "Move SWITCH_STATE related stuffs to KeyboardState"
* commit 'cce3f791af2cec8f9ab531c97ccabcc19c7b7cd0':
  Move SWITCH_STATE related stuffs to KeyboardState
2011-12-07 23:31:41 -08:00
Tadashi G. Takaoka
cce3f791af Merge "Move SWITCH_STATE related stuffs to KeyboardState" 2011-12-07 23:29:35 -08:00
Tadashi G. Takaoka
eef6238f94 Move SWITCH_STATE related stuffs to KeyboardState
Bug: 5708602
Change-Id: I904ec370e3761c47af17a680c0932ec98cfd3c27
2011-12-08 16:12:49 +09:00
The Android Open Source Project
9600a0b9f4 am dc1a57e6: Reconcile with ics-mr1-release
* commit 'dc1a57e6ba11de585a6fd19c1e680946ad9fe5a5':
2011-12-07 07:48:54 -08:00
The Android Open Source Project
dc1a57e6ba Reconcile with ics-mr1-release
Change-Id: Iae94eba1a1c5cc56745c612e1154e32f8906544c
2011-12-07 07:44:57 -08:00
Tadashi G. Takaoka
8982d240e4 am b300dbbd: Reset saved caps lock sate when new keyboard is loaded
* commit 'b300dbbd39b1aed738028fb538aa935a7fbd2e37':
  Reset saved caps lock sate when new keyboard is loaded
2011-12-07 05:50:18 -08:00
Tadashi G. Takaoka
b300dbbd39 Reset saved caps lock sate when new keyboard is loaded
Bug: 5722919
Change-Id: Id92632a0feffc3342d3c31e90c0da973c934f3c0
2011-12-07 22:48:04 +09:00
Tadashi G. Takaoka
658a1dffcb am 6b7100fe: Don\'t execute pending onStartInputView if EditorInfos are equivalent
* commit '6b7100fecaaaf0e8e42c4d2ccebac165e89e79bf':
  Don't execute pending onStartInputView if EditorInfos are equivalent
2011-12-07 05:43:32 -08:00
Tadashi G. Takaoka
6b7100feca Don't execute pending onStartInputView if EditorInfos are equivalent
Bug: 5722732
Bug: 5722867
Change-Id: I8347c258b286c3329f318d50adf205e78e49c722
2011-12-07 22:39:13 +09:00
Tadashi G. Takaoka
6f461a6a50 am 68d600a5: Merge "Remove internal toggleShift calls"
* commit '68d600a5f66d5ba6a33c248a3b8825d65add9b9f':
  Remove internal toggleShift calls
2011-12-07 02:38:10 -08:00
Tadashi G. Takaoka
68d600a5f6 Merge "Remove internal toggleShift calls" 2011-12-07 02:35:52 -08:00
Tadashi G. Takaoka
f47993ee34 Remove internal toggleShift calls
Bug: 5708602
Change-Id: Id1f76dbd40aaf9ed35d4598d902043675c3d74fc
2011-12-07 19:32:47 +09:00
Tadashi G. Takaoka
08ea7dfdd6 am 845d829d: Merge "Get rid of direct reference to KeyboardId from KeyboardLayoutState"
* commit '845d829d47aca3d03b6d7ac0f2d0ac97433cbabd':
  Get rid of direct reference to KeyboardId from KeyboardLayoutState
2011-12-07 01:42:13 -08:00
Tadashi G. Takaoka
845d829d47 Merge "Get rid of direct reference to KeyboardId from KeyboardLayoutState" 2011-12-07 01:41:05 -08:00
Tadashi G. Takaoka
b8185a7ec2 am bc56e044: Reset keyboard state when loading keyboard
* commit 'bc56e0442586ecfcbd18cbdd138996b17ea79b6b':
  Reset keyboard state when loading keyboard
2011-12-07 01:25:09 -08:00
Tadashi G. Takaoka
bc56e04425 Reset keyboard state when loading keyboard
Bug: 5627467
Change-Id: I709f97e47144d3270450adc7d8053038d0df57bc
2011-12-07 17:55:22 +09:00
Jean Chalard
361c42b746 Use the system-wide interface to add a word.
Bug: 5306641
Change-Id: Ic87e5bc3a5f1f03c57d48f2d92c28e0aba06847d
2011-12-07 16:19:05 +09:00
Tadashi G. Takaoka
2e263b70d5 Get rid of direct reference to KeyboardId from KeyboardLayoutState
KeyboardLayoutState.restore directly loads keyboard using private
methods such as setAlphabetKeyboard and setShifted etc. instaed of
calling public methods such as toggleCapsLock, onPressShift, and
onReleaseShift.

Bug: 5708602
Change-Id: I799f80f1d505ac7bdf17b92b189fc418994bfa2f
2011-12-07 13:02:58 +09:00