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
Satoshi Kataoka
a17dccbfc6
Fix possible NPE
...
Bug: 8457109
Change-Id: I321fbef53e20a7c36ef4bd9f544b50abe6a52be9
2013-03-25 19:00:38 +09:00
Tadashi G. Takaoka
ec183b50ff
am fb658d6c
: Fix possible ArrayIndexOutOfBoundsException
...
* commit 'fb658d6c531de8cfd55e4d36bffc9ccabc401f94':
Fix possible ArrayIndexOutOfBoundsException
2013-03-24 22:54:39 -07:00
Tadashi G. Takaoka
fb658d6c53
Fix possible ArrayIndexOutOfBoundsException
...
Bug: 8461864
Change-Id: Icd8f4f51ec064461c08d00c1c58bedf5fbae2553
2013-03-25 12:37:04 +09:00
Baligh Uddin
2a01fc22d4
am 1e5add78
: (-s ours) am 7668deec
: (-s ours) am 21160c4e
: Import translations. DO NOT MERGE
...
* commit '1e5add78094c7716ce063748e839d223b5a115a5':
Import translations. DO NOT MERGE
2013-03-22 18:53:15 -07:00
Baligh Uddin
1e5add7809
am 7668deec
: (-s ours) am 21160c4e
: Import translations. DO NOT MERGE
...
* commit '7668deece811d5f11ee652d6b5e5d7611273b270':
Import translations. DO NOT MERGE
2013-03-23 01:50:08 +00:00
Baligh Uddin
8636ba03a7
am afe343c1
: (-s ours) Merge "Import translations. DO NOT MERGE"
...
* commit 'afe343c16fbb3c15ff8d6cf376b750737c675307':
Import translations. DO NOT MERGE
2013-03-22 18:49:52 -07:00
Baligh Uddin
afe343c16f
Merge "Import translations. DO NOT MERGE"
2013-03-23 01:48:28 +00:00
Baligh Uddin
7668deece8
am 21160c4e
: Import translations. DO NOT MERGE
...
* commit '21160c4eba74344a583cae423b1909483559c87f':
Import translations. DO NOT MERGE
2013-03-23 01:47:46 +00:00
Baligh Uddin
5709e859a5
Merge "Import translations. DO NOT MERGE" into jb-ub-latinimegoogle
2013-03-23 01:46:36 +00:00
Alan Viverette
e47ee18192
am a7b4398c
: Don\'t announce changes for A11y within the same keyboard mode.
...
* commit 'a7b4398c35eaf87fd00086f660af7710c071c369':
Don't announce changes for A11y within the same keyboard mode.
2013-03-22 17:49:59 -07:00
Baligh Uddin
56a2088e7d
Import translations. DO NOT MERGE
...
Change-Id: I84d0b4a11df3ac9a5706419e5c9f76eeb8c5cfd1
Auto-generated-cl: translation import
2013-03-22 13:39:40 -07:00
Baligh Uddin
2fd2d0b313
Import translations. DO NOT MERGE
...
Change-Id: Ib1a70c593647850ead05ecd9440b8db78c8139c7
Auto-generated-cl: translation import
2013-03-22 13:34:04 -07:00
Baligh Uddin
1af30bab94
Import translations. DO NOT MERGE
...
Change-Id: I31bcd942f18166658143b4dbd5695f66f4717a22
Auto-generated-cl: translation import
2013-03-22 13:32:54 -07:00
Baligh Uddin
21160c4eba
Import translations. DO NOT MERGE
...
Change-Id: I7531241854018cd052606f7f4a9b82fccd2e725c
Auto-generated-cl: translation import
2013-03-22 13:31:54 -07:00
Alan Viverette
a7b4398c35
Don't announce changes for A11y within the same keyboard mode.
...
Bug: 8439108
Change-Id: If9f14bb65625468dcd399df47ad0d2123be30be7
2013-03-22 11:53:12 -07:00
Satoshi Kataoka
97ddbf22d5
am 19a70087
: Merge "Fix appname"
...
* commit '19a7008728867aa639a2fac66459ce3fe0526cd8':
Fix appname
2013-03-22 00:25:19 -07:00
Satoshi Kataoka
19a7008728
Merge "Fix appname"
2013-03-22 07:23:08 +00:00
Satoshi Kataoka
3c8117c88f
Fix appname
...
Bug: 6789579
Change-Id: Ic4694e36e0846af95fa8dcdef919be251983b528
2013-03-22 16:19:44 +09:00
Tadashi G. Takaoka
1e3c73de06
am 3a8a63c3
: Remove unused import
...
* commit '3a8a63c3999c0ffccbaa08a860e807bb59c1643f':
Remove unused import
2013-03-21 23:25:36 -07:00
Tadashi G. Takaoka
3a8a63c399
Remove unused import
...
This is a follow up of I062c076f.
Change-Id: Ic3a83d95aed1f86121ed552a6f20f0d24f9d6d83
2013-03-22 15:23:06 +09:00
Tadashi G. Takaoka
3d0fee4e09
am c6452f25
: Merge "Remove reference to string.english_ime_name"
...
* commit 'c6452f2569448aee841ad70baaa27c660a753aff':
Remove reference to string.english_ime_name
2013-03-21 22:13:40 -07:00