Commit graph

12091 commits

Author SHA1 Message Date
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
39cb0334d9 Avoid NPE
Initialize FeedbackLog earlier to avoid NPE

Change-Id: I646944c68a7d092345def16060b2a4edd8c7dbef
2013-03-26 16:46:43 -07: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
Satoshi Kataoka
bc586fb1ff am 0b327101: Merge "Fix possible NPE"
* commit '0b3271010fe6e438d57a5d4504e021e001bb9f5e':
  Fix possible NPE
2013-03-25 20:50:48 -07:00
Satoshi Kataoka
0b3271010f Merge "Fix possible NPE" 2013-03-26 03:49:06 +00:00
Tadashi G. Takaoka
f892f7751e am d17b69ec: Clean up XmlParserUtils
* commit 'd17b69ec000adc02f057fa69055411fd5438885f':
  Clean up XmlParserUtils
2013-03-25 20:43:11 -07:00
Tadashi G. Takaoka
52f4b04768 Use XmlPullParser.getEventType()
Change-Id: Ie423d3416639f81409cc920658c8088b7519b045
2013-03-26 12:13:56 +09:00
Tadashi G. Takaoka
d17b69ec00 Clean up XmlParserUtils
Change-Id: I636e8f359d47f39e61a7f77e3e686f2721779b6f
2013-03-26 12:03:07 +09:00
Kurt Partridge
6d71d238e2 [FileEncap18] Clean up uploading scheduling
- Move scheduling logic from ResearchLogger.java to
  UploaderService.java
- Switch to a one-shot timer.  Previously the uploader was scheduled
  on an inexact repeating schedule.  It's better to reschedule the
  next upload after the current one is finished to reduce the chances
  of multiple uploads happening at the same time.
- Avoid double-execution
    - Previously a scheduled upload might run right after an explicit
      one if they occured at the same time.  This change reduces the
      chances of this.
- Some method extraction and naming

Change-Id: I9efda11be77d334c7f61bd40a36d65f0421ebde4
2013-03-25 17:50:26 -07:00
Kurt Partridge
87bc3a4a62 Close ResearchLogger upon onFinishInputView
Previously, ResearchLogger#stop() was called both in
LatinIME#onFinishInputView() and in LatinIME#onWindowHidden().  This
resulted in multiple logs being written.

Since onFinishInputView is the more reliable of the two (it is called
in InputMethodService#onDestroy; onWindowHidden is not), the code now
uses onFinishInputView as a stopping signal.

Change-Id: Iae4b8c3bdab226027624eeab19b3737367e4a108
2013-03-25 17:31:25 -07:00
Baligh Uddin
6537280fd5 am 5f976d1c: (-s ours) am ff41125b: (-s ours) am fba54597: Import translations. DO NOT MERGE
* commit '5f976d1cef0eeec5cf9e4202560d927abded5426':
  Import translations. DO NOT MERGE
2013-03-25 15:56:56 -07:00
Baligh Uddin
5f976d1cef am ff41125b: (-s ours) am fba54597: Import translations. DO NOT MERGE
* commit 'ff41125b74053ff3ad006f5dfd824e2351a47ee4':
  Import translations. DO NOT MERGE
2013-03-25 22:55:05 +00:00
Baligh Uddin
24daa2a17c am 6616188e: (-s ours) Import translations. DO NOT MERGE
* commit '6616188ea6f127f2f1bb821d2a99972d5384626e':
  Import translations. DO NOT MERGE
2013-03-25 15:53:45 -07:00
Baligh Uddin
ff41125b74 am fba54597: Import translations. DO NOT MERGE
* commit 'fba545975020525c0017bde8424db28dd21d5186':
  Import translations. DO NOT MERGE
2013-03-25 22:52:36 +00:00
Baligh Uddin
6616188ea6 Import translations. DO NOT MERGE
Change-Id: I8468f1e69374a5ada2ea03e427895b771b8dc048
Auto-generated-cl: translation import
2013-03-25 15:45:33 -07:00
Baligh Uddin
724d24dd66 Import translations. DO NOT MERGE
Change-Id: I2bb04e50403eebc62bcb05a63228405fb80b2e41
Auto-generated-cl: translation import
2013-03-25 15:40:13 -07:00
Baligh Uddin
2898aac8f2 Import translations. DO NOT MERGE
Change-Id: I7457efe556011fc20d44ea5d58dba92d31feb566
Auto-generated-cl: translation import
2013-03-25 15:39:12 -07:00
Baligh Uddin
fba5459750 Import translations. DO NOT MERGE
Change-Id: I502c6b5a38d4495774179eb587775e713d5c98c9
Auto-generated-cl: translation import
2013-03-25 15:38:08 -07:00
The Android Automerger
eaded6bdd8 merge in jb-mr2-release history after reset to jb-mr2-dev 2013-03-25 05:56:44 -07:00