Commit graph

9898 commits

Author SHA1 Message Date
The Android Automerger
be07aad4e9 merge in jb-mr1-release history after reset to jb-mr1-dev 2012-11-06 18:04:26 -08:00
Baligh Uddin
8df57deb05 Import translations. DO NOT MERGE
Change-Id: I97ceec5680a8ba9f27d5f62a7573555590268376
Auto-generated-cl: translation import
2012-11-06 16:54:45 -08:00
Ken Wakasa
f775bf3b6f Fix a build error in x86 builds
Change-Id: I64a7c35d01540eb63f09cacddaab03f95729ed02
2012-11-07 07:52:34 +09:00
Ken Wakasa
aa5d6fe05c am 9cc22c45: am 5d2556b9: Reset the IME if requested by the app.
* commit '9cc22c45ec04f3b1772631e1ef18103dc55c2a0b':
  Reset the IME if requested by the app.
2012-11-06 14:29:45 -08:00
Ken Wakasa
9cc22c45ec am 5d2556b9: Reset the IME if requested by the app.
* commit '5d2556b93286f5f1d7d829b586b84a8b7ae55743':
  Reset the IME if requested by the app.
2012-11-06 14:27:24 -08:00
The Android Open Source Project
796050d144 am ef51f33e: (-s ours) am 4d095547: am 202c3a5f: Reconcile with jb-mr1-factory-release jb-mr1-release - do not merge
* commit 'ef51f33e544577c8fbc802a5623bef87d97473b8':
2012-11-06 12:34:08 -08:00
The Android Open Source Project
ef51f33e54 am 4d095547: am 202c3a5f: Reconcile with jb-mr1-factory-release jb-mr1-release - do not merge
* commit '4d09554794ace67b01a6674c36edd5495b32cc38':
2012-11-06 12:30:07 -08:00
The Android Open Source Project
4d09554794 am 202c3a5f: Reconcile with jb-mr1-factory-release jb-mr1-release - do not merge
* commit '202c3a5f32e20939a3dff24b7e2f047e47b29e17':
  Import translations. DO NOT MERGE
  Import translations. DO NOT MERGE
  Build LatinIME with NDK r8
2012-11-06 12:24:06 -08:00
The Android Open Source Project
202c3a5f32 Reconcile with jb-mr1-factory-release jb-mr1-release - do not merge
Change-Id: I355e91c06f0958f1baec5923324dcbcdf408d3f2
2012-11-06 12:18:48 -08:00
Ken Wakasa
5d2556b932 Reset the IME if requested by the app.
Specifically, reset the KeyboardState to the main Alphabet layout in
LatinIME.onStartInputViewInternal() if a keyboard layout set doesn't get
reloaded in the method.

Please note TextView.setText() calls up resetInput(), then the IME should
reset with it.

bug: 7482086

Note that bug: 6851364 needs to be revisited.

Change-Id: I5d448c10963d3dd952dd13cb587085ec7b014e69
2012-11-07 01:09:26 +09:00
Ken Wakasa
5f2fa6b82c Tidy up visibility of members of BinaryFormat.
Change-Id: I38a00076b82de8e1a19209c67954fe01585f7943
2012-11-05 20:16:52 +09:00
Ken Wakasa
6e66349ed1 Adjust compiler warning options with the offdevice Makefile
Make use of AK_FORCE_INLINE for -Winline and better performance

Change-Id: If0016e2ef61c1fe007c83bb1a5133a6b6bde568e
2012-11-05 14:26:53 +09:00
Ken Wakasa
19d844c7a7 Follow up to Ic6af0c596374d936d2b9b31e626fb62bd265ce64
Tidy up inline functions with AK_FORCE_INLINE.  Moved back some inline methods to header files.

Change-Id: Ibd37b595666ebddda198d9237f19f6712653a8e8
2012-11-03 00:29:40 +09:00
Ken Wakasa
2c2f3a90d8 Add more compiler warning flags
Change-Id: Ic6af0c596374d936d2b9b31e626fb62bd265ce64
2012-11-02 18:29:26 +09:00
Ken Wakasa
a323fa6746 A small code cleanup in geometry_utils.h
Change-Id: Ie9ff77c661693a1e21d0aa4cfc079bfbf3171f49
2012-11-02 12:25:19 +09:00
Tadashi G. Takaoka
a47a777476 Merge "Cleanup logging code" 2012-11-01 02:15:24 -07:00
Ken Wakasa
d42af9da10 Merge "Use sizeof() more safely." 2012-11-01 01:55:03 -07:00
Ken Wakasa
44d9c1ebfc Use sizeof() more safely.
Change-Id: I7cffb4d8da847b483cf4bb482508e3c88c4903be
2012-11-01 17:29:50 +09:00
Tadashi G. Takaoka
fca71cfddb Cleanup logging code
Change-Id: Ia604a4fcebfc5179bdbeaa982e052f7d3882ac6e
2012-11-01 17:03:35 +09:00
Tadashi G. Takaoka
93b5c2ce63 Make sure PointerTrackerQueue is non-null
Change-Id: I2106cf64bed1472fb39d24e7e5bdee7238a30bfe
2012-11-01 15:26:06 +09:00
Tadashi G. Takaoka
2db1ea79e6 Merge "Rename SuddenJumpingTouchEventHandler to TouchSCreenRegulator" 2012-10-31 23:23:39 -07:00
Tadashi G. Takaoka
081fedc422 Rename SuddenJumpingTouchEventHandler to TouchSCreenRegulator
Change-Id: Ia4fb5b3612ff78ed1b243c80a03294b829470f5c
2012-11-01 14:56:32 +09:00
Jean Chalard
96f5b97e17 Merge "Add a missing report, and fix a wrong report" 2012-10-31 22:36:04 -07:00
Jean Chalard
271e731eb4 Add a missing report, and fix a wrong report
Deleted words would be reported, but added words wouldn't
Also, shortcuts would be reported as bigrams

Change-Id: I017653f2afa65cf16924017a0be2ee2cbd6ca10d
2012-11-01 14:25:53 +09:00
Tadashi G. Takaoka
ffb0c093d1 Merge "Move isInvalidCordinates() method to Constants class" 2012-10-31 21:24:01 -07:00
Tadashi G. Takaoka
d80286642a Merge "Cosmetic source code formating change" 2012-10-31 21:23:49 -07:00
Tadashi G. Takaoka
0c8a08c141 Merge "Straighten an if-else-if blocks into if-return blocks" 2012-10-31 21:23:35 -07:00
Jean Chalard
522a22c87b Merge "Add a "no changes" message in the diff command" 2012-10-31 21:19:47 -07:00
Jean Chalard
8c02f3005a Add a "no changes" message in the diff command
Also fix a bug where no locale would be interpreted as a
different locale instead of the same.

Change-Id: I296feef45e39a9e89509cb315e789676755141ab
2012-11-01 13:16:58 +09:00
Tadashi G. Takaoka
c770c252a6 Merge "Cleaup non-distinct multitouch related stuff" 2012-10-31 21:14:36 -07:00
Tadashi G. Takaoka
a232930d9c Straighten an if-else-if blocks into if-return blocks
Change-Id: If3eede1257658f27384e3efc72586fabbed19f7b
2012-11-01 13:14:19 +09:00
Tadashi G. Takaoka
24ab8055aa Move isInvalidCordinates() method to Constants class
Change-Id: Iad1464c299ad6055af1db1ff7978e5cd9a14750f
2012-11-01 13:12:58 +09:00
Tadashi G. Takaoka
20dd1bc090 Cosmetic source code formating change
Change-Id: I3a53b49afab70dfb13f12027070635da6001eb79
2012-11-01 13:10:44 +09:00
Tadashi G. Takaoka
13ae76d7a3 Cleaup non-distinct multitouch related stuff
Change-Id: I09072267217caad2513f83b61d7db1c6d74e18d1
2012-11-01 13:04:49 +09:00
Jean Chalard
acafc073b9 Fix an NPE in recent code
Change-Id: I5c76edff5c3c250167d425a737b09b10e25f9f84
2012-11-01 12:48:37 +09:00
Ken Wakasa
01f6a61e51 Merge "Use 32-bit code points for suggestions output" 2012-10-31 09:36:01 -07:00
The Android Open Source Project
c2cf819fe9 am b2b10f9a: (-s ours) Reconcile with jb-mr1-factory-release jb-mr1-release - do not merge
* commit 'b2b10f9ad814574a3559ff2d32cbe2d173d14aab':
2012-10-31 09:23:32 -07:00
The Android Open Source Project
b2b10f9ad8 Reconcile with jb-mr1-factory-release jb-mr1-release - do not merge
Change-Id: I4a04730079d76f1d050c1bcdeb701bd8bbb79511
2012-10-31 09:18:41 -07:00
Ken Wakasa
1e61493c50 Use 32-bit code points for suggestions output
This is a multi-project commit with Ic43dd666

bug: 6526418
Change-Id: I39c1acb4e91d04cd8a4ec5a943c8cf575da75ebc
2012-11-01 00:09:51 +09:00
Tadashi G. Takaoka
0ea2c80d8d Merge "Consolidate two helper methods (refactor step 3)" 2012-10-31 03:58:47 -07:00
Tadashi G. Takaoka
661bc810e5 Merge "Flatten nested if-else blocks into plain if-else blocks (refactor step 2.5)" 2012-10-31 03:46:05 -07:00
Tadashi G. Takaoka
831198a4e4 Consolidate two helper methods (refactor step 3)
Change-Id: I8b8522d1e5342fc73346ba2748e75f0c1d5bf03c
2012-10-31 19:45:29 +09:00
Tadashi G. Takaoka
2a3b15b267 Flatten nested if-else blocks into plain if-else blocks (refactor step 2.5)
Change-Id: I42aad04658e14e8fd703e3828676719a333ec8f9
2012-10-31 19:44:45 +09:00
Tadashi G. Takaoka
8ae9fbef77 Merge "Separate nested if-blocks into helper methods (refactor step 2)" 2012-10-31 03:43:27 -07:00
Tadashi G. Takaoka
3c6d3a4df8 Separate nested if-blocks into helper methods (refactor step 2)
Change-Id: Ic0ed243f8c1fbf62793565ee37175270b47f0801
2012-10-31 19:34:43 +09:00
Jean Chalard
f5adbb1e1b Move the emoji dictionaries source under AOSP.
Change-Id: Ie870a90d483d9f27aed96fb4b44126315c43922f
2012-10-31 19:22:42 +09:00
Tadashi G. Takaoka
dd43dd61eb Merge "Separate nested if-blocks into helper methods (refactor step 1)" 2012-10-31 03:18:08 -07:00
Jean Chalard
63b66b6f39 Merge "Switch the AOSP word lists to the combined format." 2012-10-31 02:57:26 -07:00
Jean Chalard
a424ff06ec Switch the AOSP word lists to the combined format.
This will help with managing the word lists.

Bug: 7388859
Change-Id: I89f049569b177d3027fe56d6c67eaca27d44dc7d
2012-10-31 18:52:00 +09:00
Tadashi G. Takaoka
8b449c6dda Separate nested if-blocks into helper methods (refactor step 1)
Change-Id: I87ef8b174295fb12a91fec35acd3b0cc152ad8f0
2012-10-31 18:40:28 +09:00