Jean Chalard
bab1f045f4
Straighten out members extracted from resources.
...
Change-Id: I9b9602ec5b379b44b0f0663d4f065dbcf88fd352
2011-12-09 18:19:30 +09:00
Jean Chalard
92e85c87a3
Merge "Match constant names to option names"
2011-12-09 01:14:14 -08:00
Jean Chalard
f8a056c5c8
Merge "Reorder members in SettingsValues."
2011-12-09 01:14:02 -08:00
Jean Chalard
ba93dda8ce
Match constant names to option names
...
Change-Id: I7586fa342d7a39412d656890f7b525139c45ea4a
2011-12-09 17:58:51 +09:00
Jean Chalard
837b109f27
Reorder members in SettingsValues.
...
Reorder so that they match the order in the preference xml
file. Also add TODOs for missing raw variables.
Change-Id: I06332c131a624d6c359512d75c808f3f7313fa91
2011-12-09 17:56:31 +09:00
Tadashi G. Takaoka
1cc046775d
Merge "KeyboardState keeps track of isAlphabetMode and isSymbolShifted"
2011-12-09 00:43:18 -08:00
Jean Chalard
c207e0a7da
Move settings variables to the settings class
...
Change-Id: Ifa7033a84b08ea626eb44cf6d04ba8e28c250bea
2011-12-09 16:47:31 +09:00
Jean Chalard
284c8a0449
Merge "Stop a flag from escaping."
2011-12-08 23:14:15 -08:00
Jean Chalard
0c3b8ce842
Merge "Move settings method from Utils to SettingsValues"
2011-12-08 23:09:33 -08:00
Tadashi G. Takaoka
10dcc7eb67
KeyboardState keeps track of isAlphabetMode and isSymbolShifted
...
Bug: 5708602
Change-Id: I181cdeb90d24984ce6f6c993b278293aae7364eb
2011-12-09 16:09:16 +09:00
Jean Chalard
4606de117b
Stop a flag from escaping.
...
The ultimate intent is to close it up in the settings, as it does not
change while typing, only when the keyboard is open again.
Change-Id: I12ff56e7482c1584877fe5531473bf03e95a60f6
2011-12-09 16:09:04 +09: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
The Android Open Source Project
23c45bac20
Reconcile with ics-mr1-release
...
Change-Id: I3b94d0567dc97c60cfb89e5ab5686781dc05025a
2011-12-08 10:22:19 -08:00
The Android Automerger
9596b39b6f
merge in ics-release history after reset to master
2011-12-08 07:00:49 -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
92e5756dfb
Merge "Cleanup"
2011-12-08 05:14:26 -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
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
9e38f9a980
Merge "Use the system-wide interface to add a word."
2011-12-08 00:52:32 -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
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
dc1a57e6ba
Reconcile with ics-mr1-release
...
Change-Id: Iae94eba1a1c5cc56745c612e1154e32f8906544c
2011-12-07 07:44:57 -08:00
The Android Automerger
bf504e93f5
merge in ics-release history after reset to master
2011-12-07 07:01: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
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
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
845d829d47
Merge "Get rid of direct reference to KeyboardId from KeyboardLayoutState"
2011-12-07 01:41:05 -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
Alan Viverette
55c0198eee
am c960695f: Updated keyboard to use SPEAK_PASSWORD preference.
...
* commit 'c960695f38ae0564dff3a6897fd1843c8e74c604':
Updated keyboard to use SPEAK_PASSWORD preference.
2011-12-06 16:59:46 -08:00
The Android Automerger
79efbece7f
merge in ics-mr1-release history after reset to ics-mr1
2011-12-06 16:55:07 -08:00
Alan Viverette
c960695f38
Updated keyboard to use SPEAK_PASSWORD preference.
...
Bug: 5678383
Change-Id: Ie9bdc92f4b2c9014159d672b71e4438f8fa34f55
2011-12-06 14:06:57 -08:00
The Android Open Source Project
37b1f961b5
Reconcile with ics-mr1-release
...
Change-Id: I2d40f0b73dedef4517b76e22c25c5aa7dcd8c4e2
2011-12-06 09:03:19 -08:00
The Android Automerger
36c028f461
merge in ics-release history after reset to master
2011-12-06 07:00:42 -08:00
Tadashi G. Takaoka
e466583ddc
Fix caps lock key behavior
...
Fix the issue introduced by Idfe69978.
Bug: 5708602
Change-Id: I4265822b7d33417b87b3e7e3f49250ac5d2ecdda
2011-12-06 19:52:25 +09:00