Kurt Partridge
5062442fd5
am 14dd52b8
: Merge "Adjust settings for development-only versions"
...
* commit '14dd52b8c058b27adb17777536ff11c4b69616fc':
Adjust settings for development-only versions
2013-06-12 09:52:54 -07:00
Kurt Partridge
14dd52b8c0
Merge "Adjust settings for development-only versions"
2013-06-12 16:50:55 +00:00
Kurt Partridge
3cdea37c6d
am eac0eb89
: Merge "Fix ResearchLogger feedback bug"
...
* commit 'eac0eb89f23a9962ece6eb884ce41610e0b85ea0':
Fix ResearchLogger feedback bug
2013-06-12 08:41:11 -07:00
Kurt Partridge
eac0eb89f2
Merge "Fix ResearchLogger feedback bug"
2013-06-12 15:38:45 +00:00
Kurt Partridge
2a1a463e2e
Adjust settings for development-only versions
...
Change-Id: I4f08632d97f182d312edc82bda3c3897a71099ad
2013-06-12 02:01:45 -07:00
Tadashi G. Takaoka
e18732ef52
am dfd96be0
: Retun an empty Path instead of null
...
* commit 'dfd96be03aba78f4bdb3b64d1b5d3f55429a0c03':
Retun an empty Path instead of null
2013-06-12 01:39:36 -07:00
Tadashi G. Takaoka
dfd96be03a
Retun an empty Path instead of null
...
Bug: 9374496
Change-Id: If74306104e9d25288e1b216a328304da376c1bdb
2013-06-12 17:35:02 +09:00
Kurt Partridge
19ba5e67af
Fix ResearchLogger feedback bug
...
If the logger feedback screen is up and the user hits the home button or the
keyboard otherwise closes, the system won't let the user enter feedback again,
because it is waiting for the user to finish the first one.
With this change, the state associated with the feedback screen is
cleared when the user closes the keyboard.
b/9398772
Change-Id: I832a82793ad42e31b6b3fdb04fabcea75facde7d
2013-06-12 00:37:46 -07:00
Baligh Uddin
1b2e6fbff4
am 2933f9e8
: (-s ours) Merge "Import translations. DO NOT MERGE"
...
* commit '2933f9e8b3300e4fd22e177a09a95bac9cd4a897':
Import translations. DO NOT MERGE
2013-06-11 09:28:10 -07:00
Baligh Uddin
2933f9e8b3
Merge "Import translations. DO NOT MERGE"
2013-06-11 16:26:45 +00:00
Ken Wakasa
2c895d4d3a
am f473f4b1
: Remove unused macros in defines.h
...
* commit 'f473f4b1ebfd30756b520f1d1233c3391e1d35b8':
Remove unused macros in defines.h
2013-06-11 04:20:30 -07:00
Ken Wakasa
f473f4b1eb
Remove unused macros in defines.h
...
bug: 8550444
Change-Id: I77ae6bd607032def05044e3045aa7cc3746b0a5b
2013-06-11 20:09:07 +09:00
Keisuke Kuroynagi
61e9de73e0
am 0b7cd6a0
: Fix: Android.mk for autocorrection_threshold_utils.
...
* commit '0b7cd6a0b27a3ad9c22f5fdf7f36fb8628384e17':
Fix: Android.mk for autocorrection_threshold_utils.
2013-06-11 02:08:53 -07:00
Keisuke Kuroynagi
0b7cd6a0b2
Fix: Android.mk for autocorrection_threshold_utils.
...
Change-Id: I3ea0811ca7c2c1a88351ee2ba5cc13d7096865ba
2013-06-11 18:05:04 +09:00
Keisuke Kuroynagi
675507766a
am 527c1283
: Remove unused methods.
...
* commit '527c128309da708d0fdaf7928da833320d1754e9':
Remove unused methods.
2013-06-11 01:57:02 -07:00
Keisuke Kuroynagi
527c128309
Remove unused methods.
...
Bug: 8550444
Change-Id: Ie627084143846407ca36df82c2a7f904a0e6f49c
2013-06-11 17:04:40 +09:00
Jean Chalard
35b514bdb1
am cd4edc15
: Merge "Cache three main keyboards to improve average switch time"
...
* commit 'cd4edc15a57bf475d0004a427872f9a87391aff8':
Cache three main keyboards to improve average switch time
2013-06-10 20:23:24 -07:00
Keisuke Kuroynagi
1784d92e6f
am e3338420
: Merge "Introduce BinaryDictionaryHeader to access binary dictionary header."
...
* commit 'e3338420f6a0c0491d55af0536123f71959d9f80':
Introduce BinaryDictionaryHeader to access binary dictionary header.
2013-06-10 20:20:13 -07:00
Jean Chalard
cd4edc15a5
Merge "Cache three main keyboards to improve average switch time"
2013-06-11 03:19:38 +00:00
Keisuke Kuroynagi
e3338420f6
Merge "Introduce BinaryDictionaryHeader to access binary dictionary header."
2013-06-11 03:18:04 +00:00
Jean Chalard
4d8f9f1cab
Cache three main keyboards to improve average switch time
...
This typically improves the average loading time by about
35%, after the first time.
Bug: 8689779
Change-Id: I7b0ab6b942af1d3250b9dcbf875f27f9f64692f3
2013-06-11 12:01:56 +09:00
Keisuke Kuroynagi
bd0d1afdb2
Introduce BinaryDictionaryHeader to access binary dictionary header.
...
BinaryDictionaryHeader abstracts header structure and access header information via only its instance.
Bug: 6669677
Change-Id: Ib5ab0e8fef12265ddabc1d0165548b69953bba6a
2013-06-11 12:01:49 +09:00
Baligh Uddin
1f140aff16
Import translations. DO NOT MERGE
...
Change-Id: I211045009e5013d31e4f97ce41c96159d5c5a601
Auto-generated-cl: translation import
2013-06-10 13:26:13 -07:00
The Android Open Source Project
f0bdb131ab
am 96c46273
: (-s ours) am 2f387da0
: (-s ours) Reconcile with jb-mr2-release jb-mr2-zeroday-release - do not merge
...
* commit '96c46273575a096de04c10efe91dbca3ac1214a3':
Add HTC One special edition (DO NOT MERGE)
2013-06-10 11:15:23 -07:00
The Android Open Source Project
96c4627357
am 2f387da0
: (-s ours) Reconcile with jb-mr2-release jb-mr2-zeroday-release - do not merge
...
* commit '2f387da0ac1495f80ca5bc4c928e2b9c1e3fb040':
Add HTC One special edition (DO NOT MERGE)
2013-06-10 11:11:58 -07:00
The Android Open Source Project
2f387da0ac
Reconcile with jb-mr2-release jb-mr2-zeroday-release - do not merge
...
Change-Id: I974082d633cb4b996ec0fb718be4f487f42bf0fc
2013-06-10 08:14:13 -07:00
The Android Automerger
a063ccb00e
merge in jb-mr2-zeroday-release history after reset to jb-mr2-dev
2013-06-09 05:55:55 -07:00
Baligh Uddin
64d0fa4071
am 8ea77542
: (-s ours) Merge "Import translations. DO NOT MERGE"
...
* commit '8ea77542f9b0b1191abf868156dd1fd863935910':
Import translations. DO NOT MERGE
2013-06-07 10:12:43 -07:00
Baligh Uddin
8ea77542f9
Merge "Import translations. DO NOT MERGE"
2013-06-07 17:10:49 +00:00
Satoshi Kataoka
28c7e63426
am fe95e7b1
: Merge "Fix possible NPE"
...
* commit 'fe95e7b1bf06c26f71d3e2899fcdf63647d9f670':
Fix possible NPE
2013-06-07 04:11:29 -07:00
Satoshi Kataoka
fe95e7b1bf
Merge "Fix possible NPE"
2013-06-07 11:09:52 +00:00
Tadashi G. Takaoka
c68632af62
am 77f63c8a
: Don\'t use RichInputMethodManager in setup wizard
...
* commit '77f63c8ac64c46de36002fd62c71f1eeebcaf2ac':
Don't use RichInputMethodManager in setup wizard
2013-06-07 03:14:13 -07:00
Tadashi G. Takaoka
77f63c8ac6
Don't use RichInputMethodManager in setup wizard
...
In setup wizard, InputMethodManager may not be able to be aware that
this IME is installed, especially just after the IME is installed via
GooglePlay app and hit the open button on the app to launch the setup
wizard.
Bug: 9299618
Change-Id: I00c8544178b41074253d49ae9481996ec56593d2
2013-06-07 19:09:44 +09:00
Satoshi Kataoka
6c8136d157
Fix possible NPE
...
Bug: 9314901
Change-Id: Id80f59df38ae72766b097fd1c23326fedd302439
2013-06-07 19:08:58 +09:00
Tadashi G. Takaoka
60261af55f
am b0e0c5a8
: Merge "Defer getting no language subtype"
...
* commit 'b0e0c5a8445afc814ed8865c4f4b9f61ada909a9':
Defer getting no language subtype
2013-06-07 03:01:41 -07:00
Tadashi G. Takaoka
b0e0c5a844
Merge "Defer getting no language subtype"
2013-06-07 10:00:19 +00:00
Jean Chalard
f637bb3343
am d3c283d5
: Merge "Fix an illegal argument exception"
...
* commit 'd3c283d5db9259df17674bbe8c8eede9093d1da9':
Fix an illegal argument exception
2013-06-07 02:39:52 -07:00
Jean Chalard
d3c283d5db
Merge "Fix an illegal argument exception"
2013-06-07 09:38:17 +00:00
Jean Chalard
0ad1489625
Fix an illegal argument exception
...
This is a bit of a shot in the dark, as I really don't see how this
can happen, but this should fix it in the correct way no matter
how it's actually happening.
Bug: 9301836
Change-Id: I472865b7a78883942c9fd46773238c23788674f8
2013-06-07 18:23:00 +09:00
Tadashi G. Takaoka
254b484e75
Defer getting no language subtype
...
Bug: 9318351
Change-Id: I55338c001070655a3f90df3dbe1351bd4180d520
2013-06-07 18:20:31 +09:00
Tadashi G. Takaoka
c597da45ba
Add HTC One special edition (DO NOT MERGE)
...
This change also fixes a cosmetic regexp bug in Galaxy SIII.
Bug: 9109493
Change-Id: Ie93ae38d1ca1817d4019bb1483ab7f3740564b96
2013-06-06 15:22:13 -07:00
Tadashi G. Takaoka
bd21edc977
am 1665cc27
: (-s ours) am 05ee43dc
: (-s ours) am a009d2c9
: Add HTC One special edition (DO NOT MERGE)
...
* commit '1665cc27f2a2f2e1c9b5a80c622aceed85a25283':
Add HTC One special edition (DO NOT MERGE)
2013-06-06 12:50:24 -07:00
Tadashi G. Takaoka
1665cc27f2
am 05ee43dc
: (-s ours) am a009d2c9
: Add HTC One special edition (DO NOT MERGE)
...
* commit '05ee43dc288553d418d906e3681b25dc55a2144d':
Add HTC One special edition (DO NOT MERGE)
2013-06-06 12:48:02 -07:00
Tadashi G. Takaoka
05ee43dc28
am a009d2c9
: Add HTC One special edition (DO NOT MERGE)
...
* commit 'a009d2c98da9749bf6ae4d92ef5fb3d3e945530f':
Add HTC One special edition (DO NOT MERGE)
2013-06-06 12:45:47 -07:00
Tadashi G. Takaoka
48f20fb892
am 091a4532
: Merge "Add HTC One special edition"
...
* commit '091a4532925ba9d35e83b60b834dcc88b1a4d2ea':
Add HTC One special edition
2013-06-06 01:41:21 -07:00
Tadashi G. Takaoka
091a453292
Merge "Add HTC One special edition"
2013-06-06 08:39:10 +00:00
Tadashi G. Takaoka
a009d2c98d
Add HTC One special edition (DO NOT MERGE)
...
This change also fixes a cosmetic regexp bug in Galaxy SIII.
Bug: 9109493
Change-Id: Ie93ae38d1ca1817d4019bb1483ab7f3740564b96
2013-06-06 17:33:42 +09:00
Tadashi G. Takaoka
eab37ec2e5
Add HTC One special edition
...
Bug: 9109493
Change-Id: I6eb060a93d7afbcc5aaa2aaece242044db255829
2013-06-06 17:33:23 +09:00
Jean Chalard
323dd492f0
am 69100329
: Merge "Use an iterator to remove stuff from an ArrayList."
...
* commit '6910032972524541314249fb2a6c2202ac813845':
Use an iterator to remove stuff from an ArrayList.
2013-06-06 01:24:35 -07:00
Jean Chalard
6910032972
Merge "Use an iterator to remove stuff from an ArrayList."
2013-06-06 08:19:41 +00:00