Commit graph

6658 commits

Author SHA1 Message Date
Jean Chalard
816a8a0fd8 Fix a race condition that makes tests unstable
Change-Id: Ic19d380eb64855884bc6ded8547c200dd772ffe9
2012-02-07 19:22:37 +09:00
Tadashi G. Takaoka
97d6c71d85 am 4a3c0918: Merge "Fix KeyStyles to be able to override the value in style"
* commit '4a3c0918dc3049e3e680a899f9c10b95e579368c':
  Fix KeyStyles to be able to override the value in style
2012-02-07 02:05:40 -08:00
Tadashi G. Takaoka
4a3c0918dc Merge "Fix KeyStyles to be able to override the value in style" 2012-02-07 02:04:22 -08:00
Tadashi G. Takaoka
17f53103ee Fix KeyStyles to be able to override the value in style
Change-Id: Ib7476cdc0f81dfeb6292ef663e9dbab6d2b949ba
2012-02-07 18:51:51 +09:00
Jean Chalard
ac0498ca06 am 172a013a: Fix a bug with the auto-correct indicator
* commit '172a013ab5481dee22e0637bc997b8bcbc4436db':
  Fix a bug with the auto-correct indicator
2012-02-07 01:14:44 -08:00
Jean Chalard
172a013ab5 Fix a bug with the auto-correct indicator
Bug: 5969106
Change-Id: I02d4b9184bb2c3fc0d08ffd5db77a9f9d816631f
2012-02-07 17:20:23 +09:00
The Android Automerger
c449ab1769 merge in jb-release history after reset to master 2012-02-06 07:03:41 -08:00
Ken Wakasa
dbe99ddc86 am 4c5daa8a: Fix indent
* commit '4c5daa8a5574628204be602578794035ab8686f0':
  Fix indent
2012-02-06 04:56:11 -08:00
Ken Wakasa
4c5daa8a55 Fix indent
Change-Id: I77b4fb3a47faae7d4ad45d9903556e77a2fc7163
2012-02-06 21:51:31 +09:00
Jean Chalard
ddbaddb00d am a7f25000: Fix a bug with common objects.
* commit 'a7f2500001c53dc5a6de9c2525a75229cc7c6645':
  Fix a bug with common objects.
2012-02-06 01:47:13 -08:00
Jean Chalard
a7f2500001 Fix a bug with common objects.
Bug: 5961179
Change-Id: I452efc552c6ab390931f25557d7aee5a64bf054e
2012-02-06 18:41:00 +09:00
Tadashi G. Takaoka
ed348a4846 am a27cb623: Merge "Use C++ template for min/max"
* commit 'a27cb623901d79be1007b0803898086a12ce731b':
  Use C++ template for min/max
2012-02-05 17:40:00 -08:00
Tadashi G. Takaoka
a27cb62390 Merge "Use C++ template for min/max" 2012-02-05 17:38:30 -08:00
Tadashi G. Takaoka
09baa36f7d Use C++ template for min/max
To be more friendly for off-device regression test.

Change-Id: I7edf4c9de73915aad9c1760ace7df3177ed3c4e9
2012-02-06 09:41:41 +09:00
Eric Fischer
e725e08374 am 3f8fc4de: Import translations. DO NOT MERGE
* commit '3f8fc4de9ae8720a16458198d268dcf7423c1e51':
  Import translations. DO NOT MERGE
2012-02-03 14:06:25 -08:00
Eric Fischer
3f8fc4de9a Import translations. DO NOT MERGE
Change-Id: I9e403e4199935cbb8f356f78316671373324d452
2012-02-03 13:02:58 -08:00
Eric Fischer
897d1302f5 Import translations. DO NOT MERGE
Change-Id: If14fd8c2180e4c82cd9f01c730fbc140622c7486
2012-02-03 13:01:42 -08:00
Tadashi G. Takaoka
2cce593b60 am f6cf387e: Merge "Recursively resolve @string/resource reference in key key spec parsing"
* commit 'f6cf387edc5e70dd578790c2625c50ed00a5dbf0':
  Recursively resolve @string/resource reference in key key spec parsing
2012-02-03 03:29:19 -08:00
satok
88b31f3133 am a503def1: Merge "Support correction conversion from skip to additional proximity"
* commit 'a503def1c26818a1975647d0dc7e4f2492660214':
  Support correction conversion from skip to additional proximity
2012-02-03 03:29:19 -08:00
Tadashi G. Takaoka
f6cf387edc Merge "Recursively resolve @string/resource reference in key key spec parsing" 2012-02-03 03:20:37 -08:00
satok
a503def1c2 Merge "Support correction conversion from skip to additional proximity" 2012-02-03 03:19:26 -08:00
Tadashi G. Takaoka
aca8870128 Recursively resolve @string/resource reference in key key spec parsing
Change-Id: I9d172605e90e828e00f7c4c8d49548498aa3b50d
2012-02-03 20:03:23 +09:00
satok
1b9fa942b4 Support correction conversion from skip to additional proximity
Result:  I34bedff6149a6a4e01

Change-Id: I46d528f228a969a0a996299221622627f43c55ec
2012-02-03 20:00:15 +09:00
Jean Chalard
4d3e7ca57d am 9f17de5b: Merge "Stop inserting a space after a manually picked word."
* commit '9f17de5b4dbf1e6947cfde21e70550579ca2a30b':
  Stop inserting a space after a manually picked word.
2012-02-03 02:10:40 -08:00
Jean Chalard
9f17de5b4d Merge "Stop inserting a space after a manually picked word." 2012-02-03 02:09:05 -08:00
Tadashi G. Takaoka
303a0f3f15 am 9f491e34: Merge "Filter out empty entry from more keys CSV"
* commit '9f491e34ac2c96c3d18f30f9710b1a3ecab173e7':
  Filter out empty entry from more keys CSV
2012-02-03 01:56:42 -08:00
Tadashi G. Takaoka
9f491e34ac Merge "Filter out empty entry from more keys CSV" 2012-02-03 01:54:49 -08:00
Tadashi G. Takaoka
493f3cefe6 am 0de2fbd7: Fix KeySpecParserTests to read correct icon id
* commit '0de2fbd7b66d40d59bc1dd67d10ba10b40172885':
  Fix KeySpecParserTests to read correct icon id
2012-02-03 01:50:53 -08:00
Tadashi G. Takaoka
24cd2617f5 Filter out empty entry from more keys CSV
Change-Id: I9a26aaa58f0f502b3bfef9de422370d2b0add8d8
2012-02-03 18:48:01 +09:00
Jean Chalard
fb684cebe8 Stop inserting a space after a manually picked word.
Bug: 4994861
Change-Id: I6ae256a94dbaddea4304304779d17025620c5025
2012-02-03 18:45:44 +09:00
Tadashi G. Takaoka
0de2fbd7b6 Fix KeySpecParserTests to read correct icon id
Change-Id: Ic002e7fbe84a7001874ebd59e6af8ba695d173de
2012-02-03 18:40:38 +09:00
Tadashi G. Takaoka
5de61476a4 am 909b2940: Merge "Get rid of Key.setIcon(Drawable)"
* commit '909b2940db78adcc4c3b7fc22d032bfb106d7d39':
  Get rid of Key.setIcon(Drawable)
2012-02-02 21:53:25 -08:00
Tadashi G. Takaoka
909b2940db Merge "Get rid of Key.setIcon(Drawable)" 2012-02-02 21:51:51 -08:00
Tadashi G. Takaoka
a402c395ad am 98aa4761: Merge "Shift + smiley key become return key"
* commit '98aa47613149ad9c56f8e01ae1669bb9a34fdbd4':
  Shift + smiley key become return key
2012-02-02 21:48:39 -08:00
Tadashi G. Takaoka
98aa476131 Merge "Shift + smiley key become return key" 2012-02-02 21:46:50 -08:00
Tadashi G. Takaoka
e7948a8692 Get rid of Key.setIcon(Drawable)
Change-Id: If6ebbdefcbfd0cc14c72858f9bb44861e8abe079
2012-02-03 14:38:17 +09:00
Jean Chalard
7876326bf1 am 825e2bbd: Fix a bug when deleting the last char
* commit '825e2bbd910cce3055a4ca808d3744bc0b2cedda':
  Fix a bug when deleting the last char
2012-02-02 20:09:39 -08:00
Jean Chalard
825e2bbd91 Fix a bug when deleting the last char
And unit test

Change-Id: Ic4fc3626f8b86e10156d770d41cd6deab5d31f39
2012-02-03 13:03:54 +09:00
Tadashi G. Takaoka
56d1dc5a58 Shift + smiley key become return key
Bug: 2498607
Change-Id: Iec902d8f0035a81e4e793251006d905025bd81cf
2012-02-03 12:28:57 +09:00
Jean Chalard
0210a93acd am 71915a37: Merge "Fix string iterations in a couple places."
* commit '71915a372209616850e053bc5ac82eab26c170ba':
  Fix string iterations in a couple places.
2012-02-02 18:42:47 -08:00
Jean Chalard
71915a3722 Merge "Fix string iterations in a couple places." 2012-02-02 18:40:19 -08:00
Tadashi G. Takaoka
3deebdeda2 am ebfae7f5: Merge "Fix key repeat interval timeout"
* commit 'ebfae7f5e0a9003870a3e7dd55ba16fd6ce37df9':
  Fix key repeat interval timeout
2012-02-02 18:24:28 -08:00
Tadashi G. Takaoka
ebfae7f5e0 Merge "Fix key repeat interval timeout" 2012-02-02 18:22:24 -08:00
Jean Chalard
9242a2bcf8 Fix string iterations in a couple places.
Seems I didn't get how to iterate on a String correctly >.>
Talk about a big bug. Anyway, I think it's working now.

Bug: 5955228
Change-Id: I988c900cf2a16c44b9505cfd4f77c7cda7e592f0
2012-02-03 11:15:46 +09:00
Tadashi G. Takaoka
32c54c4dbe Fix key repeat interval timeout
Bug: 5960472
Change-Id: I27d4b81d393f2ace946740a0b0801cea8c63b5b8
2012-02-03 10:02:22 +09:00
Eric Fischer
004710fd81 am fbd83a87: Restore deleted string still referenced from code to fix the build.
* commit 'fbd83a87123494a9a02364fa6688734155728256':
  Restore deleted string still referenced from code to fix the build.
2012-02-02 14:00:33 -08:00
Eric Fischer
fbd83a8712 Restore deleted string still referenced from code to fix the build.
Change-Id: Ideb39da09730960f555f2b928d699819c986531b
2012-02-02 13:57:15 -08:00
Eric Fischer
dd7d24f776 am 8a0bb009: Import translations. DO NOT MERGE
* commit '8a0bb00989859cf2be31705f7d1a5a6e0039cb49':
  Import translations. DO NOT MERGE
2012-02-02 13:39:02 -08:00
Eric Fischer
8a0bb00989 Import translations. DO NOT MERGE
Change-Id: I5d9c89dfe2e5667ef004d1e8b9106279bd23f6f5
2012-02-02 13:10:41 -08:00
Eric Fischer
7f94a529b6 Import translations. DO NOT MERGE
Change-Id: Iddfa678726179e05580b137b392f336fde3985b2
2012-02-02 13:09:26 -08:00