Kurt Partridge
b5c39f4531
Rename a var to match semantics
...
The IS_INHIBITING_AUTO_UPLOAD flag is tested in isPossibleToUpload, so it inhibits all uploads, not
just automatic ones. Renaming to IS_INHIBITING_UPLOAD.
Change-Id: Iceed79260d4b062147f40c09f0c5bb06b2519b1b
2013-05-13 17:01:39 -07:00
Baligh Uddin
5ec5e0b6f8
am e69066d1
: (-s ours) Import translations. DO NOT MERGE
...
* commit 'e69066d11bde67d2370ed267d89ff8b421482cce':
Import translations. DO NOT MERGE
2013-05-13 11:37:54 -07:00
Baligh Uddin
e69066d11b
Import translations. DO NOT MERGE
...
Change-Id: I9b70a81c1f507e5e9a2bfdcb179dea1cc03e0517
Auto-generated-cl: translation import
2013-05-13 11:35:25 -07:00
Baligh Uddin
72f51299f9
Import translations. DO NOT MERGE
...
Change-Id: I5e6fa99ba1c520aeb92844c02dd5adb7eaf7227c
Auto-generated-cl: translation import
2013-05-13 11:30:22 -07:00
Baligh Uddin
298d823297
Import translations. DO NOT MERGE
...
Change-Id: I871e96e80b74f5c521d940c4b50fad24488c3c2e
Auto-generated-cl: translation import
2013-05-13 11:28:31 -07:00
The Android Automerger
1109ab9c65
merge in jb-mr2-release history after reset to jb-mr2-dev
2013-05-13 05:56:00 -07:00
Tadashi G. Takaoka
035c68a19a
am b121538e
: Tune maximum keypress duration to 100 milliseconds
...
* commit 'b121538e0c68e0cefded2075ff3b7fb0750e2b44':
Tune maximum keypress duration to 100 milliseconds
2013-05-13 04:09:58 -07:00
Tadashi G. Takaoka
b121538e0c
Tune maximum keypress duration to 100 milliseconds
...
Bug: 8556975
Change-Id: If7839c5764f7a269243a9570c0b7782b6f7ee73b
2013-05-13 20:04:59 +09:00
Tadashi G. Takaoka
94c54eca39
am e8336aa8
: Merge "Fix keypress vibration duration of HTC One X"
...
* commit 'e8336aa80cd9964ebd74dcb23d5cba00043563e5':
Fix keypress vibration duration of HTC One X
2013-05-13 03:55:27 -07:00
Tadashi G. Takaoka
a70da988d7
am 5f857a35
: Merge "Disable functional key while in sliding input mode"
...
* commit '5f857a359ae94298bbbcfe8848dfaafbf2fbcdc1':
Disable functional key while in sliding input mode
2013-05-13 03:52:14 -07:00
Tadashi G. Takaoka
e8336aa80c
Merge "Fix keypress vibration duration of HTC One X"
2013-05-13 10:52:09 +00:00
Tadashi G. Takaoka
5f857a359a
Merge "Disable functional key while in sliding input mode"
2013-05-13 10:50:32 +00:00
Tadashi G. Takaoka
567a759b7b
Fix keypress vibration duration of HTC One X
...
Bug: 8556975
Change-Id: I793dd90223f4da091a212ff54a02d19f03e49d6c
2013-05-13 19:49:47 +09:00
Tadashi G. Takaoka
e3b1bdc4f1
Disable functional key while in sliding input mode
...
This change registers the functional key when sliding input mode is
end at the functional key itself.
Bug: 8915171
Change-Id: I2031e2aa4ebf33684221fc44d4a808112489724f
2013-05-13 19:39:57 +09:00
Tadashi G. Takaoka
f6b5484dcb
am b5f67e7f
: Add device specific keypress vibration duration database
...
* commit 'b5f67e7faf498eac634be0cfd2b8d4ac7e9a3b76':
Add device specific keypress vibration duration database
2013-05-13 03:04:02 -07:00
Tadashi G. Takaoka
b5f67e7faf
Add device specific keypress vibration duration database
...
Bug: 8556975
Change-Id: I11260a64dc13c102bac7a9742dc66f2b05fd32de
2013-05-13 18:34:48 +09:00
Tadashi G. Takaoka
f17083941d
am 0efd8d1b
: Fix landscape override value expression
...
* commit '0efd8d1b692bb551f3283ecb6638656d4ab40752':
Fix landscape override value expression
2013-05-13 02:22:14 -07:00
Tadashi G. Takaoka
0efd8d1b69
Fix landscape override value expression
...
This is a follow up of I275c99db8a.
Bug: 8556975
Change-Id: Ia6c2ab878760523da767036ce0bfc6c8350e1a92
2013-05-13 18:19:20 +09:00
Tadashi G. Takaoka
813ba9f526
am 6b0bcfba
: Merge "Disable long press timer while sliding input mode"
...
* commit '6b0bcfba9b9a1f2079769aa331a7fc4daf071d9b':
Disable long press timer while sliding input mode
2013-05-13 01:59:18 -07:00
Tadashi G. Takaoka
6b0bcfba9b
Merge "Disable long press timer while sliding input mode"
2013-05-13 08:57:56 +00:00
Tadashi G. Takaoka
094447bd46
am ad662ade
: Disable delete key repeating while in slide input mode
...
* commit 'ad662adeef10c4b202f8f5f80037dd5b8fc9583d':
Disable delete key repeating while in slide input mode
2013-05-13 01:43:38 -07:00
Tadashi G. Takaoka
43ad100d8b
Disable long press timer while sliding input mode
...
Bug: 8915171
Change-Id: Id8685f90766c7de55b56476de83abf97150a186d
2013-05-13 17:40:26 +09:00
Tadashi G. Takaoka
ad662adeef
Disable delete key repeating while in slide input mode
...
Bug: 8915171
Change-Id: I04f84c29f10abc0207072d2165c75dd20f053f92
2013-05-13 17:23:08 +09:00
Tadashi G. Takaoka
6780e43d76
am 18184eac
: Support regular expression for condition pattern
...
* commit '18184eacb149f1b12b859ff8631340a9f73bf8ac':
Support regular expression for condition pattern
2013-05-13 00:29:27 -07:00
Tadashi G. Takaoka
18184eacb1
Support regular expression for condition pattern
...
Bug: 8556975
Change-Id: Iffc53d6a40dd77860434c5f7f4f59af5cd1ba92b
2013-05-13 16:25:03 +09:00
Tadashi G. Takaoka
6f6478422f
am ec83457d
: Merge "Support multiple condition for getDeviceOverrideValue"
...
* commit 'ec83457d726679e81d0b0ec12c9e7a284464133e':
Support multiple condition for getDeviceOverrideValue
2013-05-12 23:15:15 -07:00
Tadashi G. Takaoka
ec83457d72
Merge "Support multiple condition for getDeviceOverrideValue"
2013-05-13 06:13:20 +00:00
Ken Wakasa
01c133d72e
am cb3bba3c
: Rename GesturePreviewTrail.java -> GestureTrail.java
...
* commit 'cb3bba3c4ee4652e12c81185ab9a648db20bb0dd':
Rename GesturePreviewTrail.java -> GestureTrail.java
2013-05-12 22:55:25 -07:00
Tadashi G. Takaoka
d69fa0a09a
Support multiple condition for getDeviceOverrideValue
...
Bug: 8556975
Change-Id: I29d3a305b6ac3d8e3620c6d8592d85047d62bf48
2013-05-13 14:38:21 +09:00
Ken Wakasa
cb3bba3c4e
Rename GesturePreviewTrail.java -> GestureTrail.java
...
Try reducing some confusions between GesturePreviewTrail.java and GestureTrailsPreview.java
Change-Id: I5fe2ee740cf1b32210530188153f6f6937e34b68
2013-05-13 13:42:22 +09:00
Kurt Partridge
03a3214645
am 7d72ca0b
: Avoid JsonWriter multi-write error
...
* commit '7d72ca0b20334aba077e3a01d7b12f6f34618076':
Avoid JsonWriter multi-write error
2013-05-10 19:21:16 -07:00
Kurt Partridge
7d72ca0b20
Avoid JsonWriter multi-write error
...
JsonWriter requires that its clients pass it only a single top-level object.
The existing implementation tries to make code cleaner by having mJsonWriter
never be null, and instead use a global static "NULL_JSON_WRITER" that just
discards data. But because JsonWriter complains if more than one top-level
object is passed, making this a global object does not work. This change
instead copes with mJsonWriter being null.
Change-Id: Ia37ccfc8646e91f11a64713dd92d2846eb86ac54
2013-05-10 18:21:08 -07:00
Kurt Partridge
697f6abb5d
am 260df841
: Merge "Remove unused code"
...
* commit '260df8419739f92d4c64abfedec448a7f447b3a1':
Remove unused code
2013-05-10 15:14:11 -07:00
Kurt Partridge
260df84197
Merge "Remove unused code"
2013-05-10 22:12:11 +00:00
Kurt Partridge
026b2645c8
am bb17034f
: Merge "Remove ref to LatinImeLogger preference."
...
* commit 'bb17034f6403261681b63a2f789566a27c49af07':
Remove ref to LatinImeLogger preference.
2013-05-10 13:43:35 -07:00
Kurt Partridge
bb17034f64
Merge "Remove ref to LatinImeLogger preference."
2013-05-10 20:41:52 +00:00
Kurt Partridge
1f8b354c9e
am 4135c2db
: Merge "Avoid NPE by fixing ResearchLogger initialization"
...
* commit '4135c2db7b4c9722db8fd86dedde3319c51fd482':
Avoid NPE by fixing ResearchLogger initialization
2013-05-10 08:49:43 -07:00
Kurt Partridge
4135c2db7b
Merge "Avoid NPE by fixing ResearchLogger initialization"
2013-05-10 15:48:04 +00:00
Tadashi G. Takaoka
a01ab9ea35
am 565ced45
: Merge "Refactor StringUtils.findPrefixedString to findValueOfKey"
...
* commit '565ced4546420e9e17c7747f9e207ca6773598e3':
Refactor StringUtils.findPrefixedString to findValueOfKey
2013-05-10 02:50:12 -07:00
Tadashi G. Takaoka
565ced4546
Merge "Refactor StringUtils.findPrefixedString to findValueOfKey"
2013-05-10 09:49:07 +00:00
Tadashi G. Takaoka
6d3d2ae064
Refactor StringUtils.findPrefixedString to findValueOfKey
...
Bug: 8556975
Change-Id: I275c99db8a0d10594a5a8c0c27ebc1a87495c307
2013-05-10 18:44:04 +09:00
Tadashi G. Takaoka
afc40e74fe
am 4705c0fa
: Fix screen flash when launching settings activity
...
* commit '4705c0fa7ca9527f6a3d7cb47542de734a56337d':
Fix screen flash when launching settings activity
2013-05-10 01:00:11 -07:00
Tadashi G. Takaoka
4800280955
am 2b5c9726
: Introduce another activity to launch setup wizard
...
* commit '2b5c9726f4a7d24497fc1df17c6ce57188c99cab':
Introduce another activity to launch setup wizard
2013-05-10 01:00:09 -07:00
Tadashi G. Takaoka
4705c0fa7c
Fix screen flash when launching settings activity
...
Bug: 8336068
Change-Id: I90a0f259129a3f3319b158b060154cc43960c234
2013-05-10 15:36:24 +09:00
Tadashi G. Takaoka
2b5c9726f4
Introduce another activity to launch setup wizard
...
Bug: 8336068
Change-Id: I35b94dd87c5b01d3e927da8f918a5398dd565d33
2013-05-10 15:30:53 +09:00
Tadashi G. Takaoka
e7de0ce741
am 5ffa5bf3
: Merge "Keep SetupActivity alive to check re-launching from launcher"
...
* commit '5ffa5bf3ba7d169912d163790e461ab8d5aca30a':
Keep SetupActivity alive to check re-launching from launcher
2013-05-09 23:26:24 -07:00
Tadashi G. Takaoka
5ffa5bf3ba
Merge "Keep SetupActivity alive to check re-launching from launcher"
2013-05-10 06:24:52 +00:00
Tadashi G. Takaoka
9ed322b40f
Keep SetupActivity alive to check re-launching from launcher
...
Bug: 8336068
Change-Id: I183b8e3fd1b3898d5f8dbbb13a0c93c64341fc38
2013-05-10 15:15:53 +09:00
Jean Chalard
07905b6a0a
am 2564bd09
: Merge "Reuse old preferences if possible."
...
* commit '2564bd09375c24bbd7fef0fd30cb3ba8a606a274':
Reuse old preferences if possible.
2013-05-09 22:58:06 -07:00
Jean Chalard
2564bd0937
Merge "Reuse old preferences if possible."
2013-05-10 05:56:32 +00:00