| Commit message (Expand) | Author | Age | Files | Lines |
* | Merge remote-tracking branch 'goog/master' into mergescriptpackage |  Satoshi Kataoka | 2012-11-14 | 3 | -2/+8 |
|\ |
|
| * | Merge "Correct a wrong base character in Russian" |  Jean Chalard | 2012-11-14 | 1 | -2/+2 |
| |\ |
|
| | * | Correct a wrong base character in Russian•••This is the master counterpart of I80cee4b2
Bug: 7516306
Change-Id: I1db4362bf12a98542c5f6fca3ae8010f16bd61a9
|  Jean Chalard | 2012-11-14 | 1 | -2/+2 |
| * | | Merge "Swap single and double quotation marks in Spanish tablet keyboard" |  Tadashi G. Takaoka | 2012-11-13 | 2 | -0/+6 |
| |\ \ |
|
| | * | | Swap single and double quotation marks in Spanish tablet keyboard•••Bug: 6672279
Change-Id: I120613e36ba6a690e54447fa6c9c90e131f2a155
|  Tadashi G. Takaoka | 2012-11-14 | 2 | -0/+6 |
| | |/ |
|
* | | | Merge remote-tracking branch 'goog/master' into mergescriptpackage |  Satoshi Kataoka | 2012-11-14 | 1 | -0/+8 |
|\| | |
|
| * | | Hide statustics logging option•••Change-Id: I1ee258948a8335af7996f9e3afcc0508adbb1ac0
|  Satoshi Kataoka | 2012-11-14 | 1 | -0/+8 |
| |/ |
|
* | | Merge remote-tracking branch 'goog/master' into mergescriptpackage |  Ken Wakasa | 2012-11-14 | 1 | -11/+19 |
|\| |
|
| * | am 18ff5612: am f592270a: am 7648b37d: Merge "Make sure all FDs are correctly...•••* commit '18ff56125345746e288118d177fcabf3c079ead3':
Make sure all FDs are correctly closed.
|  Jean Chalard | 2012-11-13 | 1 | -11/+19 |
| |\ |
|
| | * | am f592270a: am 7648b37d: Merge "Make sure all FDs are correctly closed." int...•••* commit 'f592270a0f092c5ef52bbb0f24c8873f46e75503':
Make sure all FDs are correctly closed.
|  Jean Chalard | 2012-11-13 | 1 | -11/+19 |
| | |\ |
|
| | | * | am 7648b37d: Merge "Make sure all FDs are correctly closed." into jb-mr1.1-dev•••* commit '7648b37d1e4cf3799288f85cc9c5f67b515e24c4':
Make sure all FDs are correctly closed.
|  Jean Chalard | 2012-11-13 | 1 | -11/+19 |
| | | |\ |
|
| | | | * | Merge "Make sure all FDs are correctly closed." into jb-mr1.1-dev |  Jean Chalard | 2012-11-13 | 1 | -11/+19 |
| | | | |\ |
|
| | | | | * | 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
|  Jean Chalard | 2012-11-13 | 1 | -11/+19 |
* | | | | | | Merge remote-tracking branch 'goog/master' into mergescriptpackage |  Ken Wakasa | 2012-11-13 | 2 | -74/+75 |
|\| | | | | |
|
| * | | | | | am d2116eb2: am 7d34763e: am fac619a3: Merge "Don\'t restrict reset composing...•••* commit 'd2116eb2ea7d08e81b7efe5e342772ffcd8a7efc':
Don't restrict reset composing state to non-identical setText
|  Jean Chalard | 2012-11-12 | 1 | -14/+10 |
| |\| | | | |
|
| | * | | | | am 7d34763e: am fac619a3: Merge "Don\'t restrict reset composing state to non...•••* commit '7d34763e23cb49c8c96dbf9b4c613e17098dd919':
Don't restrict reset composing state to non-identical setText
|  Jean Chalard | 2012-11-12 | 1 | -14/+10 |
| | |\| | | |
|
| | | * | | | am fac619a3: Merge "Don\'t restrict reset composing state to non-identical se...•••* commit 'fac619a34c8101cac504db500d74114dc8768372':
Don't restrict reset composing state to non-identical setText
|  Jean Chalard | 2012-11-12 | 1 | -14/+10 |
| | | |\| | |
|
| | | | * | | Merge "Don't restrict reset composing state to non-identical setText" into jb... |  Jean Chalard | 2012-11-12 | 1 | -14/+10 |
| | | | |\ \ |
|
| | | | | * | | Don't restrict reset composing state to non-identical setText•••Bug: 7497063
Change-Id: Ifbd5c37408131867458fd921bdef46ef90d81478
|  Jean Chalard | 2012-11-12 | 1 | -14/+10 |
| | | | | |/ |
|
| * | | | | | Resolve conflicts for merge of 3a9ba17f to master"•••Change-Id: I8a1a84a81745a708f63e4211267c4afc3a6b8e49
|  Jean Chalard | 2012-11-13 | 1 | -5/+10 |
| |\| | | | |
|
| | * | | | | am a13a8a58: am 0e84041b: Refactor all phantom-space-inserted spaces in one p...•••* commit 'a13a8a58e05ecd3f9eccdc47ceca972a814d247e':
Refactor all phantom-space-inserted spaces in one place
|  Jean Chalard | 2012-11-12 | 1 | -5/+10 |
| | |\| | | |
|
| | | * | | | am 0e84041b: Refactor all phantom-space-inserted spaces in one place•••* commit '0e84041bf740590230198fa845d8c45acd4cb586':
Refactor all phantom-space-inserted spaces in one place
|  Jean Chalard | 2012-11-12 | 1 | -5/+10 |
| | | |\| | |
|
| | | | * | | Refactor all phantom-space-inserted spaces in one place•••Bug: 7164981
Change-Id: If1635c212b2d5d9cf51f5fb074f3b20dd7ec7b2a
|  Jean Chalard | 2012-11-13 | 1 | -5/+10 |
| | | | |/ |
|
| * | | | | Use hexadecimal constants for subtypeId•••Change-Id: I5ee7981f1d1d142c4d21d0257879e8e126860fa6
|  Tadashi G. Takaoka | 2012-11-13 | 1 | -55/+55 |
* | | | | | Merge remote-tracking branch 'goog/master' into mergescriptpackage |  Ken Wakasa | 2012-11-12 | 11 | -319/+313 |
|\| | | | |
|
| * | | | | Merge "Enhance ImfUtils to InputMethodManagerWrapper class" |  Tadashi G. Takaoka | 2012-11-11 | 10 | -318/+313 |
| |\ \ \ \ |
|
| | * | | | | Enhance ImfUtils to InputMethodManagerWrapper class•••Change-Id: I6ff86ee819a446dd3ed5f9c3400d23564027b020
|  Tadashi G. Takaoka | 2012-11-12 | 10 | -318/+313 |
| * | | | | | Remove backup agent from AOSP Android Keyboard•••Bug: 4590284
Change-Id: I22f0e42cb898d20dfc2c4506493bf48170ce7b04
|  Satoshi Kataoka | 2012-11-12 | 1 | -1/+0 |
* | | | | | | Merge remote-tracking branch 'goog/master' into mergescriptpackage |  Ken Wakasa | 2012-11-10 | 5 | -200/+181 |
|\| | | | | |
|
| * | | | | | Cleanup basechars.cpp•••Change-Id: I7b88876f60720182910fab97ef79f3d04fbd81f0
|  Ken Wakasa | 2012-11-10 | 3 | -195/+177 |
| * | | | | | Merge "Import translations. DO NOT MERGE" |  Baligh Uddin | 2012-11-09 | 1 | -3/+3 |
| |\ \ \ \ \ |
|
| | * | | | | | Import translations. DO NOT MERGE•••Change-Id: Ibf5dc194560d09cc1945c5478197b9170c176492
Auto-generated-cl: translation import
|  Baligh Uddin | 2012-11-09 | 1 | -3/+3 |
| * | | | | | | am 21177c1a: Remove gesture typing settings when disabled by configuration•••* commit '21177c1afed4c04f436acbd1116568051167c899':
Remove gesture typing settings when disabled by configuration
|  Tadashi G. Takaoka | 2012-11-09 | 0 | -0/+0 |
| |\ \ \ \ \ \
| | |/ / / / /
| |/| | / / /
| | | |/ / /
| | |/| | | |
|
| | * | | | | Remove gesture typing settings when disabled by configuration•••Bug: 7506408
Change-Id: I4de53ace170d5ddc9779f42ac344c4190c80a019
|  Tadashi G. Takaoka | 2012-11-09 | 1 | -10/+4 |
| * | | | | | 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
|  Jean Chalard | 2012-11-09 | 1 | -2/+1 |
* | | | | | | Merge remote-tracking branch 'goog/master' into mergescriptpackage |  Ken Wakasa | 2012-11-09 | 7 | -27/+74 |
|\| | | | | |
|
| * | | | | | Suppress dictionary pack support when IS_EXPERIMENTAL is true•••Change-Id: If8813cb989c1fa8744a3bf36e8514ced3c8f46a3
|  Ken Wakasa | 2012-11-09 | 3 | -14/+27 |
| * | | | | | Remove gesture typing settings when disabled by configuration•••Bug: 7506408
Change-Id: I4de53ace170d5ddc9779f42ac344c4190c80a019
|  Tadashi G. Takaoka | 2012-11-09 | 1 | -10/+4 |
| | |/ / /
| |/| | | |
|
| * | | | | am 9185a6c2: (-s ours) am a8ec322b: am bc43e3f2: Reconcile with jb-mr1-releas...•••* commit '9185a6c2c315a8db537edc5d1bf582199d157bb2':
|  The Android Open Source Project | 2012-11-08 | 0 | -0/+0 |
| |\| | | |
|
| | * | | | am a8ec322b: am bc43e3f2: Reconcile with jb-mr1-release - do not merge•••* commit 'a8ec322b1a24111aa3e7e533d00586536212ff7b':
|  The Android Open Source Project | 2012-11-08 | 0 | -0/+0 |
| | |\| | |
|
| | | * | | am bc43e3f2: Reconcile with jb-mr1-release - do not merge•••* commit 'bc43e3f29060252d2a08b4e976bdb2ca50438623':
|  The Android Open Source Project | 2012-11-07 | 0 | -0/+0 |
| | | |\| |
|
| | | | * | Reconcile with jb-mr1-release - do not merge•••Change-Id: I105d8e6a795dd5b38d42051196581896e7ea4f30
|  The Android Open Source Project | 2012-11-07 | 0 | -0/+0 |
| | | | |\ |
|
| | | | | * | merge in jb-mr1-release history after reset to jb-mr1-dev |  The Android Automerger | 2012-11-06 | 0 | -0/+0 |
| | | | | |\ |
|
| * | | | | | | am 4eef5101: am aa5d6fe0: am 9cc22c45: am 5d2556b9: Reset the IME if requeste...•••* commit '4eef51016adc4e103fa65d944a0ab31527ddced8':
Reset the IME if requested by the app.
|  Ken Wakasa | 2012-11-08 | 3 | -0/+35 |
| |\| | | | | |
|
| | * | | | | | am aa5d6fe0: am 9cc22c45: am 5d2556b9: Reset the IME if requested by the app.•••* commit 'aa5d6fe05ce45e36b732a3abc849508cd8279257':
Reset the IME if requested by the app.
|  Ken Wakasa | 2012-11-08 | 3 | -0/+35 |
| | |\| | | | |
|
| | | * | | | | am 9cc22c45: am 5d2556b9: Reset the IME if requested by the app.•••* commit '9cc22c45ec04f3b1772631e1ef18103dc55c2a0b':
Reset the IME if requested by the app.
|  Ken Wakasa | 2012-11-06 | 3 | -0/+35 |
| | | |\| | | |
|
| | | | * | | | am 5d2556b9: Reset the IME if requested by the app.•••* commit '5d2556b93286f5f1d7d829b586b84a8b7ae55743':
Reset the IME if requested by the app.
|  Ken Wakasa | 2012-11-06 | 3 | -0/+35 |
| | | | |\| | |
|
| | | | | * | | 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
|  Ken Wakasa | 2012-11-07 | 3 | -0/+35 |
| * | | | | | | Fix a bug in the diff tool•••Fix reporting of removed attributes multiple times instead
of just one in some cases. Also, report the frequency of
the removed bigram in the same cases.
Change-Id: I1455fa7553fcebc3005c222bf5aa9afcf1678c31
|  Jean Chalard | 2012-11-08 | 1 | -1/+6 |
| * | | | | | | Merge "Import translations. DO NOT MERGE" |  Baligh Uddin | 2012-11-07 | 1 | -2/+2 |
| |\ \ \ \ \ \ |
|