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
satok
16379df633
Use priority queue for native string buffer
...
+1 2
-6 2
Performance
before
==== test finished, terminate logcat =====
(0) 100.34 (0.26%)
(1) 37149.26 (95.30%)
(2) 8.43 (0.02%)
(3) 11.18 (0.03%)
(4) 9.92 (0.03%)
(5) 1330.60 (3.41%)
(6) 250.46 (0.64%)
(20) 12.41 (0.03%)
Total 38982.50 (sum of others 38872.59)
after
==== test finished, terminate logcat =====
(0) 97.65 (0.26%)
(1) 35427.43 (95.32%)
(2) 10.30 (0.03%)
(3) 8.95 (0.02%)
(4) 11.01 (0.03%)
(5) 1224.67 (3.30%)
(6) 243.76 (0.66%)
(20) 40.91 (0.11%)
Total 37167.04 (sum of others 37064.68)
Change-Id: Id4d3b88a9cdef765affc52973aeac951ecc6a8ca
2011-12-13 16:32:52 +09:00
Jean Chalard
2939063947
Simplification
...
Both tests have the same meaning. They should be merged.
Also, if "deleteLast()" deletes more than one char (which
never happens in the current implementation, but it's not
guaranteed), the new code is more correct.
Change-Id: I216df7cd45f4a7d76d1d5d6aa7f8d7f9a6e35ea3
2011-12-13 16:06:00 +09: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
bced4cc2f2
am 34081186: Merge "Fix a bug where revert auto-correct would revert too much"
...
* commit '34081186f9bcfcb84fa991ccd940745dcff38cda':
Fix a bug where revert auto-correct would revert too much
2011-12-12 04:48:03 -08: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
cc88b8c406
am 4f41cbc5: Remove a useless function call
...
* commit '4f41cbc588916dce64eef644e9f7b69da1618d03':
Remove a useless function call
2011-12-12 04:29:21 -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
261ae7aa9d
am dcf8a6b2: Merge "Move a settings var to the settings class"
...
* commit 'dcf8a6b2c6bf746c2d633e5c7d3e9692c886df91':
Move a settings var to the settings class
2011-12-12 03:33:38 -08:00
Jean Chalard
dcf8a6b2c6
Merge "Move a settings var to the settings class"
2011-12-12 03:31:42 -08:00
Jean Chalard
1076745668
am 2a659b8a: Remove a useless variable
...
* commit '2a659b8aa642b0832fa0ac9a93e0640592fcc239':
Remove a useless variable
2011-12-12 03:26:42 -08:00
Jean Chalard
a8b8916fa1
am 7208af0e: Remove a messy and unused class.
...
* commit '7208af0ecdea9eb7de02e62926f0c57c83496f1e':
Remove a messy and unused class.
2011-12-12 03:24:35 -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
95120ac4ac
am f162ed7e: Merge "Remove side-effects from TextEntryState"
...
* commit 'f162ed7ec86be695fedd98e872d313f161fcdecd':
Remove side-effects from TextEntryState
2011-12-12 02:22:14 -08: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
7677399606
am 267cd015: Add special handling for "Phone number" layout.
...
* commit '267cd0151f038d4d1654b9cbea5066d1927dd032':
Add special handling for "Phone number" layout.
2011-12-12 01:52:53 -08: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
6c37c6539d
am aa59e24e: Merge "Add unit test of KeyboardState"
...
* commit 'aa59e24ebec5e09c62d564d97fe790c6763ffc54':
Add unit test of KeyboardState
2011-12-12 00:17:19 -08:00
Tadashi G. Takaoka
aa59e24ebe
Merge "Add unit test of KeyboardState"
2011-12-12 00:15:42 -08:00
Jean Chalard
8d987f75da
am c2a76a15: Remove a useless variable.
...
* commit 'c2a76a1529870b59bba133a7d76a800cbd20ecfa':
Remove a useless variable.
2011-12-12 00:01:21 -08:00
Jean Chalard
c2a76a1529
Remove a useless variable.
...
Change-Id: Iea5ce5cfc05bad8b1d9085438e90147bd54b7e9c
2011-12-12 16:49:32 +09:00
Jean Chalard
2648acb0de
am 205f9ca3: Merge "Straighten out logic for revert word paths"
...
* commit '205f9ca3101f36e5375beddd453b771c8a92c352':
Straighten out logic for revert word paths
2011-12-11 23:49:29 -08: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
cfc2b1c4f7
am 243e0347: Merge "Assign Key.mCode from the label only when outputText is not specified"
...
* commit '243e0347169c857e08662bdc4d245473b6ea8097':
Assign Key.mCode from the label only when outputText is not specified
2011-12-11 23:34:31 -08:00
Tadashi G. Takaoka
b73cd74e20
am 06b886f3: Merge "Move KeyDetector.printableCode to Keyboard"
...
* commit '06b886f372f893a07f5c72760970a71dc4ff309c':
Move KeyDetector.printableCode to Keyboard
2011-12-11 23:34:30 -08: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
3bd49d2c32
am 86344836: Merge "Remove a duplicated variable."
...
* commit '86344836ee34a683824689837cd5714e76e3f4a2':
Remove a duplicated variable.
2011-12-11 21:28:17 -08:00
Jean Chalard
86344836ee
Merge "Remove a duplicated variable."
2011-12-11 21:26:31 -08:00
Tadashi G. Takaoka
30fff401b7
am 2ba1bccc: Remove unused Keyboard.CODE_CANCEL
...
* commit '2ba1bcccddbd3be173e72bc49de074339d95b46a':
Remove unused Keyboard.CODE_CANCEL
2011-12-11 21:11:19 -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
9575617799
am 646a06ce: am 23c45bac: Reconcile with ics-mr1-release
...
* commit '646a06ce2569c3579770c7847567c62d47709f6f':
2011-12-09 15:03:57 -08: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
0a5a6e693a
am 92604224: Build God Mode keyboard with API level 14
...
* commit '9260422423819ed6942f11c03960d5764e97c262':
Build God Mode keyboard with API level 14
2011-12-09 11:01:20 -08:00
satok
0ddf0808e2
am 4af5e3c5: Fix isResearcherPackage
...
* commit '4af5e3c5f48b886c537f1627cdadbeb197962e55':
Fix isResearcherPackage
2011-12-09 11:01:01 -08:00
Ken Wakasa
1cb45ca4ca
am 2edd109f: Some tweaks for Researcher Mode
...
* commit '2edd109f84cb85091b7cf81ec5c6be92bde129cb':
Some tweaks for Researcher Mode
2011-12-09 11:00:58 -08:00
satok
d6e29af167
am 2a89e36d: Merge "Add a functionality to attach a log file to Gmail app Bug: 5722703"
...
* commit '2a89e36db07a1bd0943e543f5b5ee4ed16c5036c':
Add a functionality to attach a log file to Gmail app Bug: 5722703
2011-12-09 11:00:54 -08:00