nyancrimew/LatinIME
1
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity
11807 commits 1 branch 0 tags 363 MiB
Commit graph

11807 commits

This branch
This branch
All branches
Author SHA1 Message Date
Satoshi Kataoka
ac2d54b56b am 0cc63149: am c1c3e03c: am 140b6705: Merge "Fix appname" 
* commit '0cc63149580a2cc567435173843f3aa653e57a3b':
 2013-03-27 21:46:53 -07:00
Tadashi G. Takaoka
bb0c999ba0 am dbb90d08: am bd7b4fcc: am ee91bde1: Clean up InflateException reference from KeyboardBuilder 
* commit 'dbb90d08b548bc59bec26d464757427cd07a4ef1':
 2013-03-27 21:46:51 -07:00
The Android Open Source Project
c4176236c2 am 210226c5: (-s ours) am 54f0ae27: am a6fae701: (-s ours) am 0849a4b9: (-s ours) Reconcile with jb-mr2-release - do not merge 
* commit '210226c5594249624421a2385ef5410b88de02e4':
 2013-03-27 21:46:50 -07:00
Alan Viverette
f1bcc1d7dc am 9ecac40d: am 4f11af0c: am 9da7fa0f: am 559616fb: Prevent keyboard A11y proxy from referencing a null keyboard view. 
* commit '9ecac40d8516d57480a0a91ccf1acdffd511266e':
 2013-03-27 21:46:49 -07:00
Alan Viverette
8f80758226 am e47ee181: am a7b4398c: Don\'t announce changes for A11y within the same keyboard mode. 
* commit 'e47ee18192554877cd202455cbc3c9e932b86728':
  Don't announce changes for A11y within the same keyboard mode.
 2013-03-27 21:45:08 -07:00
Satoshi Kataoka
189c1b0ee8 am 97ddbf22: am 19a70087: Merge "Fix appname" 
* commit '97ddbf22d5c6d4791b3115526fdc885a40009695':
  Fix appname
 2013-03-27 21:45:07 -07:00
Tadashi G. Takaoka
0992fd245b am 1e3c73de: am 3a8a63c3: Remove unused import 
* commit '1e3c73de06caeeba31cb43099f4555e1ed17dba4':
  Remove unused import
 2013-03-27 21:45:06 -07:00
Tadashi G. Takaoka
bb679a224f am 3d0fee4e: am c6452f25: Merge "Remove reference to string.english_ime_name" 
* commit '3d0fee4e09050676c71276cc1bbd0c8bdeaf14d1':
  Remove reference to string.english_ime_name
 2013-03-27 21:45:05 -07:00
Satoshi Kataoka
4bb504cedb am 45728330: am f4352c2c: Merge "Use correct appname resource" 
* commit '457283308a2bb929a473086040b402c673aca390':
  Use correct appname resource
 2013-03-27 21:45:03 -07:00
Baligh Uddin
4b66d0c483 am a01fb001: am a3e47f87: am 74089a09: am ba0e497a: Merge commit \'525bbec9eccbf5bd4581c2b9908e46f61c4431ad\' into jb-mr2-dev 
* commit 'a01fb001b4589eb51fdb5bbea8f8210730a57d79':
 2013-03-27 21:45:01 -07:00
Satoshi Kataoka
0cc6314958 am c1c3e03c: am 140b6705: Merge "Fix appname" 
* commit 'c1c3e03c12891dfd8a87f1254c8bc9d9ccc9333a':
  Fix appname
 2013-03-27 21:45:00 -07:00
Tadashi G. Takaoka
dbb90d08b5 am bd7b4fcc: am ee91bde1: Clean up InflateException reference from KeyboardBuilder 
* commit 'bd7b4fcce0ddf5bca612bcf275e073ddfd49b205':
  Clean up InflateException reference from KeyboardBuilder
 2013-03-27 21:44:59 -07:00
The Android Open Source Project
210226c559 am 54f0ae27: am a6fae701: (-s ours) am 0849a4b9: (-s ours) Reconcile with jb-mr2-release - do not merge 
* commit '54f0ae278b49eb1d1147cdabc3c391fb5c4f869b':
 2013-03-27 21:44:58 -07:00
Alan Viverette
9ecac40d85 am 4f11af0c: am 9da7fa0f: am 559616fb: Prevent keyboard A11y proxy from referencing a null keyboard view. 
* commit '4f11af0c783718f3b899d1ccb15f9ddfd9ba1070':
 2013-03-27 21:44:57 -07:00
Baligh Uddin
0cd02c2bd7 keep history after reset to jb-ub-latinimegoogle-azuki 2013-03-27 21:30:40 -07:00
Jean Chalard
a050834cdc am 11b600b9: (-s ours) am 2f73105a: (-s ours) am db5e07f7: Merge "[DO NOT MERGE] Increase string limits" into jb-mr2-dev 
* commit '11b600b9091bc4d00f861d46c2ff95f2c2aa07d2':
  [DO NOT MERGE] Increase string limits
 2013-03-27 21:12:25 -07:00
Jean Chalard
6e78878f7b am 844e5014: Merge "Increase string limits" 
* commit '844e5014fa789df85a8b02cab9665b6d867fa720':
  Increase string limits
 2013-03-27 21:09:12 -07:00
Jean Chalard
11b600b909 am 2f73105a: (-s ours) am db5e07f7: Merge "[DO NOT MERGE] Increase string limits" into jb-mr2-dev 
* commit '2f73105a862cf97148ecd5fdaa25da9f0b98f32a':
  [DO NOT MERGE] Increase string limits
 2013-03-27 21:08:33 -07:00
Jean Chalard
844e5014fa Merge "Increase string limits" 2013-03-28 04:07:24 +00:00
Jean Chalard
2f73105a86 am db5e07f7: Merge "[DO NOT MERGE] Increase string limits" into jb-mr2-dev 
* commit 'db5e07f75633ee89631bd6903378884b84bc1242':
  [DO NOT MERGE] Increase string limits
 2013-03-27 21:06:15 -07:00
Jean Chalard
db5e07f756 Merge "[DO NOT MERGE] Increase string limits" into jb-mr2-dev 2013-03-28 04:04:28 +00:00
Jean Chalard
eda69e5272 Increase string limits 
These have been requested by the translators. For some reason the limits
were shorter than the actual source strings. Both these messages are
meant to be displayed alone on the screen, and 50 chars should fit
comfortably.

Bug: 8442366
Bug: 8442144

Change-Id: I7062e533e5d4521d2866a6c5f947c8f25b790675
 2013-03-28 13:03:49 +09:00
Jean Chalard
830cd7b915 [DO NOT MERGE] Increase string limits 
These have been requested by the translators. For some reason the limits
were shorter than the actual source strings. Both these messages are
meant to be displayed alone on the screen, and 50 chars should fit
comfortably.

Bug: 8442366
Bug: 8442144
Change-Id: I7845f85ddee992313f658e0268d090eae73778b3
 2013-03-28 13:01:41 +09:00
Baligh Uddin
f980ec6c5b am fc801fe8: (-s ours) am c57cf2b7: (-s ours) am 841e6016: Import translations. DO NOT MERGE 
* commit 'fc801fe8f82128634b3e4a11dcb259592768ae6e':
  Import translations. DO NOT MERGE
 2013-03-27 14:54:42 -07:00
Baligh Uddin
6e0e8dd6d0 am 8ca085db: (-s ours) Import translations. DO NOT MERGE 
* commit '8ca085db421170930215bf0f66bccd6442f7e0f9':
  Import translations. DO NOT MERGE
 2013-03-27 14:51:29 -07:00
Baligh Uddin
fc801fe8f8 am c57cf2b7: (-s ours) am 841e6016: Import translations. DO NOT MERGE 
* commit 'c57cf2b776d5b03d55835e90db6aeaa6cd2e4a00':
  Import translations. DO NOT MERGE
 2013-03-27 14:50:22 -07:00
Baligh Uddin
c57cf2b776 am 841e6016: Import translations. DO NOT MERGE 
* commit '841e60163b6b1452f37d8731d98a30923c6099b7':
  Import translations. DO NOT MERGE
 2013-03-27 14:48:30 -07:00
Baligh Uddin
8ca085db42 Import translations. DO NOT MERGE 
Change-Id: Ic1a341b949098fc55c0e5f46c976547ba02f8eca
Auto-generated-cl: translation import
 2013-03-27 12:39:26 -07:00
Baligh Uddin
c08b8245d9 Import translations. DO NOT MERGE 
Change-Id: If21c77c39e8945f39c3ecb5186b80fd8229a7659
Auto-generated-cl: translation import
 2013-03-27 12:34:24 -07:00
Baligh Uddin
57b6820748 Import translations. DO NOT MERGE 
Change-Id: I6ee76d24c96c4b27eec8a23afa175a1673aa17f9
Auto-generated-cl: translation import
 2013-03-27 12:33:33 -07:00
Baligh Uddin
841e60163b Import translations. DO NOT MERGE 
Change-Id: I7ddec7dead61077b9972ca3a661571c096650bec
Auto-generated-cl: translation import
 2013-03-27 12:32:41 -07:00
Satoshi Kataoka
bb9a8e082a am f463b45d: Merge "Fix Possible NPE" 
* commit 'f463b45d8e0f6603446496b38aaf45db7e4bb5dd':
  Fix Possible NPE
 2013-03-26 21:53:29 -07:00
Satoshi Kataoka
f463b45d8e Merge "Fix Possible NPE" 2013-03-27 04:51:48 +00:00
Satoshi Kataoka
e42522f335 am 2cdf5351: Merge "Fix possible SIOOBE" 
* commit '2cdf5351aa11cc87494c5a86664b8bcd6f77d433':
  Fix possible SIOOBE
 2013-03-26 20:30:37 -07:00
Satoshi Kataoka
2cdf5351aa Merge "Fix possible SIOOBE" 2013-03-27 03:28:49 +00:00
Satoshi Kataoka
33306acfa4 Fix possible SIOOBE 
Bug: 8461021

Change-Id: I8b0385610b80b5a672ec380935c485a0e01ae984
 2013-03-27 12:25:02 +09:00
Kurt Partridge
189be5196a Split LogUnits differently. 
Previously an autocorrection caused a new LogUnit to be started,
splitting off the previous LogUnit right at the autocorrection method
time.  This change causes the split to happen before the MotionEvents
that led to the autocorrection being called.

Change-Id: I2504df8eb47ee77e5f46bac34a8450636c03fd9f
 2013-03-26 16:46:43 -07:00
Kurt Partridge
cb25e1fe37 Reorder ResearchLogger call 
Previously, ResearchLogger#onWordFinished() was called with an outdated parameter value for
isBatchMode, causing it to report false even for gestures.  This changes fixes this problem.

Change-Id: Ifcabee236ba5fe20376ad882155d3f3142cd7613
 2013-03-26 14:37:57 -07:00
Kurt Partridge
bf62dc036f am ef103e1f: Merge "Close ResearchLogger upon onFinishInputView" 
* commit 'ef103e1f2e0a94e9445dd9b55516dcf59b05ee2f':
  Close ResearchLogger upon onFinishInputView
 2013-03-26 12:24:26 -07:00
Kurt Partridge
ef103e1f2e Merge "Close ResearchLogger upon onFinishInputView" 2013-03-26 19:23:00 +00:00
The Android Open Source Project
577f08a3d7 am 22384b57: (-s ours) am 0ed901ff: (-s ours) Reconcile with jb-mr2-release - do not merge 
* commit '22384b57bdfee87368417ecc2eb7728fd6f4dd2e':
 2013-03-26 12:21:14 -07:00
The Android Open Source Project
22384b57bd am 0ed901ff: (-s ours) Reconcile with jb-mr2-release - do not merge 
* commit '0ed901ff17f583f37d0262e10d5590c80c23fc93':
 2013-03-26 12:17:49 -07:00
The Android Open Source Project
0ed901ff17 Reconcile with jb-mr2-release - do not merge 
Change-Id: I6f4f70c6f405f6f6703c2a063475714ad48462d7
 2013-03-26 10:49:49 -07:00
The Android Automerger
5c3d51e28c merge in jb-ub-latinimegoogle-azuki history after reset to jb-ub-latinimegoogle 2013-03-26 14:13:48 +00:00
The Android Automerger
1a334048ab merge in jb-mr2-release history after reset to jb-mr2-dev 2013-03-26 05:56:25 -07:00
Tadashi G. Takaoka
50cc14b549 am ef86bbce: Add const_cast to live with host\'s jni.h 
* commit 'ef86bbceaef53acbb4e56e2fa45a7dd0e3c2ccdb':
  Add const_cast to live with host's jni.h
 2013-03-26 03:30:10 -07:00
Tadashi G. Takaoka
ef86bbceae Add const_cast to live with host's jni.h 
Bug: 7970626
Change-Id: I2fd09e16dd9df36eebca2d737a0b7cc3ddd1c862
 2013-03-26 17:58:17 +09:00
Tadashi G. Takaoka
cc75c95041 am 73d00e68: Merge "Use XmlPullParser.getEventType()" 
* commit '73d00e68d8fcd64ce28fc5bed6881100a0fead9b':
  Use XmlPullParser.getEventType()
 2013-03-25 22:40:33 -07:00
Tadashi G. Takaoka
73d00e68d8 Merge "Use XmlPullParser.getEventType()" 2013-03-26 05:38:18 +00:00
Satoshi Kataoka
435cccb2c5 Fix Possible NPE 
Bug: 8448448
Change-Id: Ibe89c9abd24c4debb33a69c372eadf2afb09ea1c
 2013-03-26 13:02:23 +09:00