The Android Automerger
d50a32b62a
merge in nakasi-factoryrom-release history after reset to jb-dev
2012-05-22 13:25:57 -07:00
The Android Open Source Project
07163d3908
Reconcile with jb-release
...
Change-Id: Icde0484962a178e6e29ab17e487b76e9662bb94b
2012-05-22 13:06:58 -07:00
Kurt Partridge
8ccc875754
Merge "switch ResearchLogger output to json."
2012-05-22 10:32:23 -07:00
The Android Automerger
17dde6a5ae
merge in jb-release history after reset to jb-dev
2012-05-22 07:07:20 -07:00
Jean Chalard
906857430b
am 37105e86
: am 09c4909c
: Merge "Remove a high surrogate after a delete if any" into jb-dev
...
* commit '37105e8636fc84f9e903581443730a0bf6692996':
Remove a high surrogate after a delete if any
2012-05-22 03:38:05 -07:00
Jean Chalard
37105e8636
am 09c4909c
: Merge "Remove a high surrogate after a delete if any" into jb-dev
...
* commit '09c4909c7c7ec6eaf3de943547c43a341dc14fe7':
Remove a high surrogate after a delete if any
2012-05-22 03:33:42 -07:00
Jean Chalard
09c4909c7c
Merge "Remove a high surrogate after a delete if any" into jb-dev
2012-05-22 03:13:17 -07:00
Jean Chalard
978c96aa99
Remove a high surrogate after a delete if any
...
Bug: 6526328
Change-Id: Iae70cad7b3c114bc13af48ae0eadd52ab88e8471
2012-05-22 19:04:31 +09:00
Jean Chalard
37e9eb2b56
am e0f8476f
: am ab619812
: Merge "Fix some of the input logic tests" into jb-dev
...
* commit 'e0f8476f71be89e78530f739bee91dd78cdbbc44':
Fix some of the input logic tests
2012-05-22 02:40:08 -07:00
Jean Chalard
e0f8476f71
am ab619812
: Merge "Fix some of the input logic tests" into jb-dev
...
* commit 'ab619812a52e3d957156e37610392e2b03659891':
Fix some of the input logic tests
2012-05-22 02:37:55 -07:00
Jean Chalard
ab619812a5
Merge "Fix some of the input logic tests" into jb-dev
2012-05-22 02:35:33 -07:00
Jean Chalard
f83a6821bb
Fix some of the input logic tests
...
This behavior has been changed for bug#6105732
Bug: 6516976
Change-Id: Ief8225b26d831cd92a051ce25cc005270b6b1776
2012-05-22 18:28:05 +09:00
Jean Chalard
204f024818
am d818bdc6
: am cb53c63e
: Merge "Update AOSP dictionaries" into jb-dev
...
* commit 'd818bdc6bc5eefc04cb00e9c30ed3b35e7479043':
Update AOSP dictionaries
2012-05-22 00:34:46 -07:00
Jean Chalard
d818bdc6bc
am cb53c63e
: Merge "Update AOSP dictionaries" into jb-dev
...
* commit 'cb53c63eabf006283ec973f41f3f7d7fc4155f0d':
Update AOSP dictionaries
2012-05-22 00:32:15 -07:00
Tadashi G. Takaoka
229c72fa87
am 6e29b2a9
: am 8d9336d0
: Merge "Use splitActionBarWhenNarrow for Android Settings activity" into jb-dev
...
* commit '6e29b2a9c84cfef3761f04c497d36cf4e2564b83':
Use splitActionBarWhenNarrow for Android Settings activity
2012-05-22 00:30:31 -07:00
Jean Chalard
cb53c63eab
Merge "Update AOSP dictionaries" into jb-dev
2012-05-22 00:29:57 -07:00
Tadashi G. Takaoka
6e29b2a9c8
am 8d9336d0
: Merge "Use splitActionBarWhenNarrow for Android Settings activity" into jb-dev
...
* commit '8d9336d00f79fd4088ed753b2a60bd42a4b1c270':
Use splitActionBarWhenNarrow for Android Settings activity
2012-05-22 00:28:00 -07:00
Tadashi G. Takaoka
8d9336d00f
Merge "Use splitActionBarWhenNarrow for Android Settings activity" into jb-dev
2012-05-22 00:25:55 -07:00
Jean Chalard
80058c73cb
Update AOSP dictionaries
...
Change-Id: Ia6bb1f9d6df4a9f859f132affc9cb030f14effd9
2012-05-22 16:12:50 +09:00
Tadashi G. Takaoka
55e5bdc560
Use splitActionBarWhenNarrow for Android Settings activity
...
Bug: 6503074
Change-Id: I080a6d354888a5d1218be81ffb1f523981b93783
2012-05-22 16:10:11 +09:00
Jean Chalard
5e02f6205b
am 92787ad0
: am e1e3ab6f
: Merge "Update dictionaries." into jb-dev
...
* commit '92787ad04d1824e79603295a43fc87e1d3e034a7':
Update dictionaries.
2012-05-21 22:56:21 -07:00
Jean Chalard
92787ad04d
am e1e3ab6f
: Merge "Update dictionaries." into jb-dev
...
* commit 'e1e3ab6faec39fb1f503faa2d50c92243b8b41b1':
Update dictionaries.
2012-05-21 22:54:04 -07:00
Jean Chalard
e1e3ab6fae
Merge "Update dictionaries." into jb-dev
2012-05-21 22:51:47 -07:00
alanv
067689c57d
Always use AccessibilityUtils to send events.
...
Bug: 6532601
Change-Id: I3aba9066ccd8d401973abfe9100f4cab731b5e7d
2012-05-21 20:31:06 -07:00
Jean Chalard
624150b11b
Update dictionaries.
...
Bug: 6517432
Bug: 6525702
Change-Id: I47a8c4612bffb16971575b59e9e20fd0276a2f92
2012-05-22 11:29:33 +09:00
Kurt Partridge
07cd1e1731
switch ResearchLogger output to json.
...
use multiple logging files, clean up internal nested class structure.
multi-project commit with I1813b6710ef586d96cf8936662f58b870040d6e5
Bug: 6188932
Change-Id: I438790e28f74747c4c1a48a20c1942a0fd818b6c
2012-05-21 18:45:21 -07:00
Tom Ouyang
c6f4d16826
am b9c597a7
: am 2798c85c
: Fix cursor leak in ContactsBinaryDictionary
...
* commit 'b9c597a72d2e20a23351a832916cea7353f4fc41':
Fix cursor leak in ContactsBinaryDictionary
2012-05-21 17:15:28 -07:00
Tom Ouyang
b9c597a72d
am 2798c85c
: Fix cursor leak in ContactsBinaryDictionary
...
* commit '2798c85c0f77fdf4f12eccfe241f84ddec3de994':
Fix cursor leak in ContactsBinaryDictionary
2012-05-21 17:13:53 -07:00
Tom Ouyang
2798c85c0f
Fix cursor leak in ContactsBinaryDictionary
...
Bug: 6529131
Change-Id: I86493705fbf069ba7a6c43581cfbd1bcc27ff1ba
2012-05-21 16:50:26 -07:00
Tadashi G. Takaoka
d4577f738b
am 82ffc9fe
: am 16950d65
: Reset automatic upper case when chroding key is pressed
...
* commit '82ffc9fe5f7255c902e371bb5353bdef97205fd6':
Reset automatic upper case when chroding key is pressed
2012-05-21 14:29:59 -07:00
Tadashi G. Takaoka
1e18869be6
am 2eb4565b
: am fc0a0015
: Mark UserDictionary and ContactsDictionary as deprecated
...
* commit '2eb4565ba33d158520eba693abe3bb263853104e':
Mark UserDictionary and ContactsDictionary as deprecated
2012-05-21 14:29:49 -07:00
Tadashi G. Takaoka
4071470d69
am 168147fa
: am 65331d6e
: Merge "Add multi touch and shift chording unit tests" into jb-dev
...
* commit '168147fa11b275d4c21ba0ac909dd499f8252bfe':
Add multi touch and shift chording unit tests
2012-05-21 14:29:47 -07:00
Tadashi G. Takaoka
865df41ba8
am 647827cc
: am 78e3977e
: Get rid of unused CODE_HAPTIC_AND_AUDIO_FEEDBACK
...
* commit '647827cc0171f7dc5d425dea5754fca3df49d036':
Get rid of unused CODE_HAPTIC_AND_AUDIO_FEEDBACK
2012-05-21 14:29:25 -07:00
Ken Wakasa
1c8d9a33bb
am 1dbfbc60
: am fd08b439
: Tiny comment update to reflect what the class does more accurately.
...
* commit '1dbfbc60e7e385455f07ad4c11c34addda5c4902':
Tiny comment update to reflect what the class does more accurately.
2012-05-21 14:29:25 -07:00
Ken Wakasa
019fa8f23e
am fde327ed
: am aefa7f1a
: Add entires I forgot to add in Id1c89be1
...
* commit 'fde327edfd01614965e08bf547eaa3ea9a2dc3d2':
Add entires I forgot to add in Id1c89be1
2012-05-21 14:29:20 -07:00
alanv
2f33311f8e
am 6b965106
: am cc38306d
: Only speak key label after checking for password obscure flag.
...
* commit '6b9651068b8b8db3591a9c1067cc7dfe27890d7b':
Only speak key label after checking for password obscure flag.
2012-05-21 14:29:18 -07:00
alanv
80bf070790
am e9b13a26
: am 282adf73
: Pass IME accessibility events directly to the AccessibilityManager.
...
* commit 'e9b13a2685f91ba481a0cd4914078c51295cecea':
Pass IME accessibility events directly to the AccessibilityManager.
2012-05-21 14:29:17 -07:00
The Android Open Source Project
6e25331b53
am 974317e4
: Reconcile with jb-release nakasi-factoryrom-release
...
* commit '974317e469a71efc40741ff7565f7d4530d05b2e':
2012-05-21 14:29:08 -07:00
Tom Ouyang
cfec078d8b
am 4bdb2bf3
: am e1128687
: Merge "Change to a binary version of the expandable user dictionary." into jb-dev
...
* commit '4bdb2bf3b9cceb99736a736de42088fcf3bd1a0f':
Change to a binary version of the expandable user dictionary.
2012-05-21 14:10:54 -07:00
Ken Wakasa
f26b0d5621
am 6b11e604
: am 16e7d134
: Remove unnecessary entries in the English whitelist dictionary
...
* commit '6b11e6049dd862ffd0cf9672a084a98664f68b05':
Remove unnecessary entries in the English whitelist dictionary
2012-05-21 14:10:53 -07:00
Jean Chalard
48aa2d98df
am 97a7324c
: am 1fc0c71f
: Update French/English dictionaries to the latest version
...
* commit '97a7324c81c48f5cf3e879517860760b98e4537e':
Update French/English dictionaries to the latest version
2012-05-21 14:10:51 -07:00
Tadashi G. Takaoka
6fbb8c8fc3
am 628a5745
: am 75c60bf3
: Merge "Change auto caps mode argument to int type" into jb-dev
...
* commit '628a5745e19d227cdff2370704a4958e2791eb5a':
Change auto caps mode argument to int type
2012-05-21 14:10:50 -07:00
Tadashi G. Takaoka
8dc4386a74
am b710ca15
: am 0a57156c
: Don\'t use KeyDrawParams as argument of Key#selectTextSize
...
* commit 'b710ca158e9a3b2ee0e711e5d96fb350371f94bc':
Don't use KeyDrawParams as argument of Key#selectTextSize
2012-05-21 12:44:37 -07:00
Tadashi Takaoka
31c575d861
am 8906f915
: am aee147e2
: Revert "Make KeyDrawParams and KeyPreviewDrawParams to top level class"
...
* commit '8906f9155041ff7f9396c7bfd742682693ca105c':
Revert "Make KeyDrawParams and KeyPreviewDrawParams to top level class"
2012-05-21 12:44:37 -07:00
Tadashi G. Takaoka
0db6499d02
am 554e5a14
: am 4c9e6a15
: Make KeyDrawParams and KeyPreviewDrawParams to top level class
...
* commit '554e5a147ea769ee0ab6fa9ead913cfec2705cc3':
Make KeyDrawParams and KeyPreviewDrawParams to top level class
2012-05-21 12:44:36 -07:00
satok
ef04186ce8
am 9a06a1e9
: am 468ac358
: Merge "Add utils for forgetting curve" into jb-dev
...
* commit '9a06a1e9eab191838a623aa074c65fd77a2ac7d9':
Add utils for forgetting curve
2012-05-21 12:44:31 -07:00
Tadashi G. Takaoka
2738c762e4
am 3c83090b
: am d7b80c4e
: Merge "Use large label text size for action label" into jb-dev
...
* commit '3c83090bb00c14470252e0f5ab6735ec0b1b3131':
Use large label text size for action label
2012-05-21 12:44:25 -07:00
Jean Chalard
45befb946f
am 9ad774d1
: am 91492993
: Merge "Close batch edit" into jb-dev
...
* commit '9ad774d1f68bf3d2a4c38e5b4c3a2fa03e371eff':
Close batch edit
2012-05-21 12:44:10 -07:00
Svetoslav Ganov
7e948da1d1
am 29948e7a
: am a9d28030
: Merge "Fix NPE on HOVER_EXIT event when not touching a key." into jb-dev
...
* commit '29948e7a194f7aff786120542d2da7f042c86ea5':
Fix NPE on HOVER_EXIT event when not touching a key.
2012-05-21 12:44:06 -07:00
Tadashi G. Takaoka
18ba70145b
am 0c661dae
: am a26bda7c
: Increase CHAR LIMIT of some string resources
...
* commit '0c661dae4b8516623229cff0dd18663bfe18ab9a':
Increase CHAR LIMIT of some string resources
2012-05-21 12:44:05 -07:00