Jean Chalard
cf5cecccfe
Merge "Refactoring"
2011-12-12 23:39:00 -08:00
Jean Chalard
024ee9ff02
Merge changes I7888797c,I57b2232f
...
* changes:
Refactor + small bugfix
Refactoring
2011-12-12 23:38:17 -08:00
Jean Chalard
d2c69c7d12
Refactoring
...
If mHasUncommittedTypedChars is true, then
mWordSavedForAutoCorrectCancellation must always be null, and
spaceState must always be SPACE_STATE_NONE.
Hence, this change is supposed to be very no-op.
Change-Id: I2716f7372d996cc4dec40a4b7ac1ee7f5f4afe91
2011-12-13 16:04:11 +09:00
Jean Chalard
2245c3b5b3
Refactor + small bugfix
...
postUpdateShiftKeyState used to be called also when
mEnteredText is not null => this is a bugfix.
The rest does not change the logic, as posting a message can
be done anywhere within the function with no impact.
Change-Id: I7888797c0778702d64f96701e35b611a55a6a259
2011-12-13 15:59:36 +09:00
Jean Chalard
a2a85d45e0
Refactoring
...
Change-Id: I57b2232f7fde32df5f6e1925aad1df988def34f9
2011-12-13 15:38:49 +09:00
Tadashi G. Takaoka
dc52e7c646
Remove current keyboard id variable
...
Change-Id: Iec19af98209e1ea8ecd176d3be04d628d4b38950
2011-12-13 12:49:40 +09:00
Jean Chalard
34081186f9
Merge "Fix a bug where revert auto-correct would revert too much"
2011-12-12 04:46:27 -08:00
Jean Chalard
5c3ff4c9c8
Fix a bug where revert auto-correct would revert too much
...
If there are no uncommitted chars, we shouldn't enter any of
the tests that follow. We didn't use to, but a change today
made it possible - it should not happen.
There is no point in doing the rest of the tests, they are
sure to fail.
Change-Id: I580dd104aff3585de72a93b38989bfd9713f615b
2011-12-12 21:27:16 +09:00
Jean Chalard
4f41cbc588
Remove a useless function call
...
Change-Id: I1a775cbf90dca301e1e6b596ddac64fdbc023199
2011-12-12 20:51:43 +09:00
Jean Chalard
dcf8a6b2c6
Merge "Move a settings var to the settings class"
2011-12-12 03:31:42 -08:00
Jean Chalard
2a659b8aa6
Remove a useless variable
...
This can be just read when it's needed.
Change-Id: I00753fe55645c244db5d4a96e7fdb8f5325475d9
2011-12-12 20:22:39 +09:00
Jean Chalard
d567b230b0
Move a settings var to the settings class
...
Change-Id: I1331ad6dec3a9d64a77e314f8a1f4c29282df31b
2011-12-12 19:52:17 +09:00
Jean Chalard
7208af0ecd
Remove a messy and unused class.
...
Today is a happy day
Change-Id: I3ef484bd258d5a59815bfcb0bd35ea3606b32430
2011-12-12 19:31:29 +09:00
Jean Chalard
f162ed7ec8
Merge "Remove side-effects from TextEntryState"
2011-12-12 02:20:49 -08:00
Jean Chalard
406d192a9e
Remove side-effects from TextEntryState
...
Change-Id: Ib98eea9e791e426435cfdfd0c9ab3ed9061664aa
2011-12-12 19:19:39 +09:00
Tadashi G. Takaoka
267cd0151f
Add special handling for "Phone number" layout.
...
Bug: 5743584
Change-Id: I821b837a2078afb64b460191c98b28f7733cf2c1
2011-12-12 18:19:29 +09:00
Tadashi G. Takaoka
aa59e24ebe
Merge "Add unit test of KeyboardState"
2011-12-12 00:15:42 -08:00
Jean Chalard
c2a76a1529
Remove a useless variable.
...
Change-Id: Iea5ce5cfc05bad8b1d9085438e90147bd54b7e9c
2011-12-12 16:49:32 +09:00
Jean Chalard
205f9ca310
Merge "Straighten out logic for revert word paths"
2011-12-11 23:48:06 -08:00
Jean Chalard
890d13189d
Straighten out logic for revert word paths
...
This also includes a new memorized string with simpler
logic that will allow to remove other members
Change-Id: I0b97243084902e68fcb835b6163c86fef8190ebc
2011-12-12 16:41:49 +09:00
Tadashi G. Takaoka
dfbe254de6
Add unit test of KeyboardState
...
Bug: 5708602
Change-Id: I1a8a9f4320948bb500a96df8773b0bfa1a1d4167
2011-12-12 16:34:11 +09:00
Tadashi G. Takaoka
243e034716
Merge "Assign Key.mCode from the label only when outputText is not specified"
2011-12-11 23:32:32 -08:00
Tadashi G. Takaoka
06b886f372
Merge "Move KeyDetector.printableCode to Keyboard"
2011-12-11 23:32:25 -08:00
Tadashi G. Takaoka
7dfd5a3e83
Move KeyDetector.printableCode to Keyboard
...
Change-Id: I9cde21fbb45c1e5f1a568bb97b1b1a76524f4bf2
2011-12-12 16:17:45 +09:00
Tadashi G. Takaoka
de66f3af8a
Assign Key.mCode from the label only when outputText is not specified
...
Bug: 5742827
Change-Id: I72b55ce246b14a2d8f4fd16211b71dc716db30b2
2011-12-12 16:15:18 +09:00
Jean Chalard
86344836ee
Merge "Remove a duplicated variable."
2011-12-11 21:26:31 -08:00
Tadashi G. Takaoka
2ba1bcccdd
Remove unused Keyboard.CODE_CANCEL
...
Change-Id: Ic2eab17e525901a1cf7096ebe7d24ae78624ed2e
2011-12-12 12:56:30 +09:00
Jean Chalard
3651220327
Remove a duplicated variable.
...
This is awesome cleanup.
Change-Id: I35ce8940a13f3084630dc26d6e7e397acfdaac36
2011-12-12 12:06:41 +09:00
The Android Open Source Project
646a06ce25
am 23c45bac: Reconcile with ics-mr1-release
...
* commit '23c45bac209c18dd8fd6260e338e566df946c968':
2011-12-09 14:57:55 -08:00
Ken Wakasa
9260422423
Build God Mode keyboard with API level 14
...
Change-Id: I29ab9e9041c9faac91dc303175625221bfdb3af8
2011-12-10 03:45:40 +09:00
satok
4af5e3c5f4
Fix isResearcherPackage
...
Change-Id: I286450fe89a37d75cb398f17d300ddc6f5857ffd
2011-12-10 01:16:16 +09:00
Ken Wakasa
2edd109f84
Some tweaks for Researcher Mode
...
Change-Id: I6b16dd2fe6d7356c747ba0ee2da5976738003ded
2011-12-10 00:35:50 +09:00
satok
2a89e36db0
Merge "Add a functionality to attach a log file to Gmail app Bug: 5722703"
2011-12-09 05:59:36 -08:00
satok
a8b6292cee
Add a functionality to attach a log file to Gmail app
...
Bug: 5722703
Change-Id: I089f944bdbf2cbb036eb59dd9b5b414370c770f1
2011-12-09 22:38:15 +09:00
Tadashi G. Takaoka
963abf4bcc
Merge "Remove unused public methods from KeyboardState and KeyboardSwitcher"
2011-12-09 04:38:14 -08:00
Jean Chalard
74671cf6c5
Resolve TODOs: add members to hold preferences
...
Change-Id: I34f6c76bf9318e1fbe8eb5ffab6772a98ff824e0
2011-12-09 21:24:13 +09:00
Tadashi G. Takaoka
df9deffba2
Remove unused public methods from KeyboardState and KeyboardSwitcher
...
Bug: 5708602
Change-Id: I3dbc3cd00aa9ddf611e2078ff2cfea8945fa09bf
2011-12-09 21:14:13 +09:00
Jean Chalard
0fe3611bee
Resolve TODOs: add some members to store prefs
...
Change-Id: Idf09cb5d801e8008eb63cbb5138058faeb7db136
2011-12-09 20:16:57 +09:00
Jean Chalard
85b063f97e
Resolve TODOs: add members to store raw settings
...
Change-Id: I481eadb6a73faf239e24d05b7e220fcb01194fa4
2011-12-09 19:03:55 +09:00
Jean Chalard
12f10e1585
Read options in the declaration order
...
Change-Id: I1a7c4d0bcaedad6d4045c36c79280c23234db5b3
2011-12-09 18:58:24 +09:00
Jean Chalard
c40b807ca4
Straighten out prefs reading code
...
Change-Id: Ibf9113a8ef07ac720100ee32d2e5ef321e8ddd98
2011-12-09 18:54:07 +09:00
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