Commit graph

5579 commits

Author SHA1 Message Date
Jean Chalard
372f9da4f9 am 18ff5612: am f592270a: am 7648b37d: Merge "Make sure all FDs are correctly closed." into jb-mr1.1-dev
* commit '18ff56125345746e288118d177fcabf3c079ead3':
  Make sure all FDs are correctly closed.
2012-11-13 18:47:02 -08:00
Jean Chalard
18ff561253 am f592270a: am 7648b37d: Merge "Make sure all FDs are correctly closed." into jb-mr1.1-dev
* commit 'f592270a0f092c5ef52bbb0f24c8873f46e75503':
  Make sure all FDs are correctly closed.
2012-11-13 18:45:42 -08:00
Jean Chalard
7648b37d1e Merge "Make sure all FDs are correctly closed." into jb-mr1.1-dev 2012-11-13 18:42:35 -08:00
Jean Chalard
5c32b6da44 Make sure all FDs are correctly closed.
In this kind of series of calls, it's possible that an outer call to a
constructor fails, but the inner succeeded.
Example:
try {
    is = new A(new B());
} finally {
    if (null != is) is.close();
}
In this case, if new B() succeeds but new A() throws an
exception, is stays null and the intermediate object is never
closed. This is what was happening in this instance.

Bug: 7377336
Change-Id: I3fae9fec1135244982fcf5098c76d93f3e0f2add
2012-11-13 16:53:07 +09:00
Jean Chalard
80d7d32424 am d2116eb2: am 7d34763e: am fac619a3: Merge "Don\'t restrict reset composing state to non-identical setText" into jb-mr1.1-dev
* commit 'd2116eb2ea7d08e81b7efe5e342772ffcd8a7efc':
  Don't restrict reset composing state to non-identical setText
2012-11-12 23:48:20 -08:00
Jean Chalard
1b909c2846 Resolve conflicts for merge of 3a9ba17f to master"
Change-Id: I8a1a84a81745a708f63e4211267c4afc3a6b8e49
2012-11-13 16:34:23 +09:00
Jean Chalard
d2116eb2ea am 7d34763e: am fac619a3: Merge "Don\'t restrict reset composing state to non-identical setText" into jb-mr1.1-dev
* commit '7d34763e23cb49c8c96dbf9b4c613e17098dd919':
  Don't restrict reset composing state to non-identical setText
2012-11-12 23:04:39 -08:00
Jean Chalard
3a9ba17fd2 am a13a8a58: am 0e84041b: Refactor all phantom-space-inserted spaces in one place
* commit 'a13a8a58e05ecd3f9eccdc47ceca972a814d247e':
  Refactor all phantom-space-inserted spaces in one place
2012-11-12 23:04:37 -08:00
Jean Chalard
fac619a34c Merge "Don't restrict reset composing state to non-identical setText" into jb-mr1.1-dev 2012-11-12 23:00:12 -08:00
Tadashi G. Takaoka
72b5daf03d Use hexadecimal constants for subtypeId
Change-Id: I5ee7981f1d1d142c4d21d0257879e8e126860fa6
2012-11-13 15:18:28 +09:00
Jean Chalard
0e84041bf7 Refactor all phantom-space-inserted spaces in one place
Bug: 7164981
Change-Id: If1635c212b2d5d9cf51f5fb074f3b20dd7ec7b2a
2012-11-13 12:53:55 +09:00
Jean Chalard
61cc2a3391 Don't restrict reset composing state to non-identical setText
Bug: 7497063
Change-Id: Ifbd5c37408131867458fd921bdef46ef90d81478
2012-11-12 18:34:18 +09:00
Tadashi G. Takaoka
eaaee28647 Merge "Enhance ImfUtils to InputMethodManagerWrapper class" 2012-11-11 22:43:07 -08:00
Tadashi G. Takaoka
6fbbab3b84 Enhance ImfUtils to InputMethodManagerWrapper class
Change-Id: I6ff86ee819a446dd3ed5f9c3400d23564027b020
2012-11-12 15:23:43 +09:00
Satoshi Kataoka
5d51e8f997 Remove backup agent from AOSP Android Keyboard
Bug: 4590284
Change-Id: I22f0e42cb898d20dfc2c4506493bf48170ce7b04
2012-11-12 12:37:25 +09:00
Baligh Uddin
53bd25bf3a Import translations. DO NOT MERGE
Change-Id: Ibf5dc194560d09cc1945c5478197b9170c176492
Auto-generated-cl: translation import
2012-11-09 12:45:34 -08:00
Tadashi G. Takaoka
21177c1afe Remove gesture typing settings when disabled by configuration
Bug: 7506408
Change-Id: I4de53ace170d5ddc9779f42ac344c4190c80a019
2012-11-09 07:58:27 -08:00
Jean Chalard
01d47b8096 Fix a logic flaw.
This test is seriously wrong : although we do have a method that
does exactly the right thing, this looks at a very specific, unrelated
variable state in hope it happens to be set only in the relevant
cases by the play of logic.
I don't think this changes anything concretely, as the assumption
was probably true in the practice ; still, this code is very hard to
read and prone to unexpected breakage.

Change-Id: I77ab576f90762429fcc752df31ed30e1c81871dc
2012-11-09 19:16:37 +09:00
Ken Wakasa
710d06cea9 Suppress dictionary pack support when IS_EXPERIMENTAL is true
Change-Id: If8813cb989c1fa8744a3bf36e8514ced3c8f46a3
2012-11-09 15:03:31 +09:00
Tadashi G. Takaoka
c43ff6f66c Remove gesture typing settings when disabled by configuration
Bug: 7506408
Change-Id: I4de53ace170d5ddc9779f42ac344c4190c80a019
2012-11-09 12:44:40 +09:00
Ken Wakasa
43f579e9f6 am 4eef5101: am aa5d6fe0: am 9cc22c45: am 5d2556b9: Reset the IME if requested by the app.
* commit '4eef51016adc4e103fa65d944a0ab31527ddced8':
  Reset the IME if requested by the app.
2012-11-08 06:22:02 -08:00
Ken Wakasa
4eef51016a am aa5d6fe0: am 9cc22c45: am 5d2556b9: Reset the IME if requested by the app.
* commit 'aa5d6fe05ce45e36b732a3abc849508cd8279257':
  Reset the IME if requested by the app.
2012-11-08 06:12:57 -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
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
Tadashi G. Takaoka
a47a777476 Merge "Cleanup logging code" 2012-11-01 02:15:24 -07: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
081fedc422 Rename SuddenJumpingTouchEventHandler to TouchSCreenRegulator
Change-Id: Ia4fb5b3612ff78ed1b243c80a03294b829470f5c
2012-11-01 14:56:32 +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
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
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
Tadashi G. Takaoka
dd43dd61eb Merge "Separate nested if-blocks into helper methods (refactor step 1)" 2012-10-31 03:18:08 -07: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
Jean Chalard
0b900f5e64 Merge "Add a plumbing option to dicttool info." 2012-10-31 00:54:17 -07:00
Jean Chalard
51a0ef8c59 Add a plumbing option to dicttool info.
Also align the `porcelain' option to the diff command
that was used mistakenly.

Bug: 7388665
Change-Id: Ic0e1b98c62ce37b2e909384a0370af4458563703
2012-10-31 16:35:22 +09:00
Tadashi G. Takaoka
33aa6e3cf0 Escape "#" sign in XML file
Change-Id: Icd38abc4a0454ca949613d8c4bb528758cd990d8
2012-10-31 14:26:03 +09:00
Tadashi G. Takaoka
c7318bbc0b Fix possible NPE
Bug: 7398904
Change-Id: I6b7aba7a9bf52ca494cb4390b19525c98790bd49
2012-10-29 18:40:37 +09:00
Tadashi G. Takaoka
cfbfb1c50a Remove reference of android.util.Log in Constants class
This is a follow up of Iee01d4d2.

Change-Id: I0bcd349d317d9f7d40ef0574e72c640f9f990c5d
2012-10-29 17:25:13 +09:00
Tadashi G. Takaoka
7947eaf475 Merge "Move code point constants from Keyboard to Constants class" 2012-10-29 00:10:52 -07:00