The Android Automerger
6227b5abff
merge in jb-mr2-release history after reset to master
2013-02-12 07:11:32 -08:00
Tadashi G. Takaoka
fdb1ca560e
Merge "Separate caps mode related utils to CapsModeUtils"
2013-02-12 09:26:16 +00:00
Tadashi G. Takaoka
ce6bcdd1a5
Separate caps mode related utils to CapsModeUtils
...
Change-Id: I32700c434b296bb3fd39e040c2dda1fe90667daf
2013-02-12 18:15:42 +09:00
Tadashi G. Takaoka
2c2942dd4b
Merge "Move parseCsvString to StringUtils"
2013-02-12 07:57:24 +00:00
Tadashi G. Takaoka
b3fd701181
Move parseCsvString to StringUtils
...
Change-Id: I602f33991ca57b6057ec2defe01573552b322857
2013-02-12 16:18:19 +09:00
Jean Chalard
e26f0d4320
Merge "Cleanups"
2013-02-12 06:49:41 +00:00
Tadashi G. Takaoka
4cbe84ad08
Merge "Fix RTL language key code mapping"
2013-02-12 06:43:40 +00:00
Tadashi G. Takaoka
9a2039d94e
Fix RTL language key code mapping
...
Bug: 8168899
Bug: 8169343
Change-Id: I23120704e97d89d5ddec2b2bdff2a98a6daac4d5
2013-02-12 14:51:54 +09:00
Jean Chalard
1c5b2a41ec
Cleanups
...
Follow-up to Idc6f419a
Change-Id: I4aae8f4e19f27a0a309879dc19af6e40906d58c5
2013-02-11 21:14:56 -08:00
Jean Chalard
c6aaa48ea7
Merge "Some cleanups"
2013-02-12 05:09:31 +00:00
Jean Chalard
8018051022
Some cleanups
...
Improve a slew of logging statements, and put commands that we don't
expect to need protecting against exceptions out of a try {} block.
This is a followup to Id3dc510a
Change-Id: Idc6f419ac095b5b0f2d6862d58926ef888cb34e6
2013-02-11 19:47:15 -08:00
Tadashi G. Takaoka
0b49191797
Add translatable="false" for dictionary-pack.xml
...
This is a follow up of I770335a2.
Change-Id: If0c021f4fb630bda7e8985591094488e11917e9b
2013-02-12 12:07:03 +09:00
Jean Chalard
29f5f9bc43
Don't try to issue delete() commands on missing provider
...
Bug: 8173622
Change-Id: Id3dc510ae3535169b5290e87075cb2f433a1f603
2013-02-11 16:22:42 -08:00
Jean Chalard
82441e60e2
Remove unnecessary whitespace
...
This is a cleanup followup to Id3dc510a
Change-Id: Ie64395eb4b6218fd8c73cacddeed2fba1df65d26
2013-02-11 13:31:47 -08:00
Jean Chalard
b2eac474ff
Don't try to issue delete() commands on missing provider
...
Bug: 8173622
Change-Id: Id3dc510ae3535169b5290e87075cb2f433a1f603
2013-02-11 12:38:24 -08:00
Baligh Uddin
a92a97d2cd
Merge "Import translations. DO NOT MERGE"
2013-02-11 18:34:47 +00:00
Baligh Uddin
d069d67038
Import translations. DO NOT MERGE
...
Change-Id: Ibd74870cf9822bce34f54504972e8f7d52c43036
Auto-generated-cl: translation import
2013-02-11 10:23:54 -08:00
Kurt Partridge
d3c9ec8133
Merge "Close file properly"
2013-02-11 16:55:43 +00:00
Ken Wakasa
825abc00f4
Follow up to If933fcad56d81dcc956b6114727e01be9686ee9c
...
Bug: 7405756
Change-Id: I415936db98296cd1d2fe6e4a590375061935ba8a
2013-02-10 00:31:40 +09:00
Tadashi G. Takaoka
5f5862c9b4
Merge "Change targetSdkVersion to 17"
2013-02-09 03:44:52 +00:00
Tadashi G. Takaoka
d90e12aefb
Change targetSdkVersion to 17
...
Bug: 7405756
Change-Id: If933fcad56d81dcc956b6114727e01be9686ee9c
2013-02-08 18:53:34 -08:00
Tom Ouyang
af01a65f98
Merge "Add keyboard hypotenuse metric to ProximityInfo."
2013-02-09 02:36:20 +00:00
Tom Ouyang
625778fd36
Add keyboard hypotenuse metric to ProximityInfo.
...
Change-Id: If4a23041b460326a579e8b8cab20b5c027441e23
2013-02-08 14:13:01 -08:00
Baligh Uddin
927c2d65e8
Merge "Import translations. DO NOT MERGE"
2013-02-08 20:19:02 +00:00
Baligh Uddin
1a1d4d98da
Import translations. DO NOT MERGE
...
Change-Id: I1f4b366714462f2aa084ead58c67f8c82618cff5
Auto-generated-cl: translation import
2013-02-08 12:16:47 -08:00
Tadashi G. Takaoka
b0767dd499
Separate resource file for dictionary pack metadata
...
Change-Id: I770335a25c3db12ec8440c4fcb208ca1d9c1fa32
2013-02-08 12:00:16 -08:00
Kurt Partridge
2cabb7aed0
Close file properly
...
Change-Id: Ied55b6a6f1e64bbca558316d8d3d207d7655cf91
2013-02-08 11:43:51 -08:00
Kurt Partridge
c52569ffcb
Add batchMode field to PickSuggestionManually
...
Change-Id: Iaaffc71378154240538bf90f0b85c3f17f3f78b3
2013-02-08 11:39:04 -08:00
Jean Chalard
3623ad238c
[B14] Implement sending the dictionary list.
...
Bug: 7005813
Change-Id: Ic3ef69510d2b385d0d403191b2f701b6527d0166
2013-02-06 19:19:30 -08:00
Jean Chalard
738579103f
Merge "[B11] Implement reset and passing of the URL to the dict pack"
2013-02-07 00:05:42 +00:00
Jean Chalard
68ed7aa990
Fix a test
...
The test is wrong - it checks a struct that contains a string
instead of checking the string itself.
Bug: 8149360
Change-Id: Ifb93d61f25a64a64e1c1e689de792f27994487b6
2013-02-06 15:27:21 -08:00
Jean Chalard
6ecb4c4dcc
[B11] Implement reset and passing of the URL to the dict pack
...
Bug: 7601410
Bug: 7595195
Change-Id: I78cf04dce7c1e64de6725d32317de288a83bd39d
2013-02-06 15:21:33 -08:00
Jean Chalard
afe889a83d
Merge "[B9] Pass the client id parameter for dict info requests"
2013-02-06 04:38:44 +00:00
Tadashi G. Takaoka
a1008f7c34
Merge "Remove android.test.runner from tests app"
2013-02-06 01:51:08 +00:00
Kurt Partridge
7165f926b4
Merge "Refactor LogStatement publishing method"
2013-02-06 01:30:33 +00:00
Tadashi G. Takaoka
53da9b1208
Remove android.test.runner from tests app
...
Bug: 8132168
Change-Id: I7ed84de27a4436539fca0ca4f0efb5e6448480cb
2013-02-05 16:07:31 -08:00
Kurt Partridge
b02a19c49d
Refactor LogStatement publishing method
...
The method in LogUnit for publishing a LogStatement to a JsonWriter doesn't
depend on anything in the LogUnit.
multi-project commit with Id1d6ff4851148bba0e6b5a1ec6eec2b842d9c707
Change-Id: I323cec239d6ea1cee602c2ecf9b13713791e9283
2013-02-05 15:18:20 -08:00
Kurt Partridge
97135c29c5
Merge "[Rlog79c] Cleanup of feedback strings and text entry"
2013-02-05 20:11:24 +00:00
Baligh Uddin
104d245b3f
Merge "Import translations. DO NOT MERGE"
2013-02-05 16:41:28 +00:00
Tadashi G. Takaoka
df1b8d5eec
Merge "Add unit tests tags"
2013-02-05 02:53:07 +00:00
Tadashi G. Takaoka
b4598f7d05
Add unit tests tags
...
Bug: 8131968
Change-Id: Ibca5a0d63a492134b8af401a62ca3a5748e003cf
2013-02-04 17:21:30 -08:00
Tadashi G. Takaoka
298b4240f8
Separate IntentUtils from CompatUtils
...
Change-Id: I373ae7ad26eee44cc8e9720314f6a53b811d0021
2013-02-04 16:06:38 -08:00
Kurt Partridge
6a4d218f69
[Rlog79c] Cleanup of feedback strings and text entry
...
Change-Id: I97457ea8033a011c37e5970eb91d1a3273b81e2a
2013-02-04 14:42:08 -08:00
Tadashi G. Takaoka
70c63049d3
Make CHAR LIMIT to 66 for some strings
...
Bug: 8112520
Change-Id: Ia7303e9bae651a3990b781341002fae950997dc1
2013-02-04 14:18:07 -08:00
Kurt Partridge
445d8e8bf6
Merge "[Rlog79b] Save channel name during internal use"
2013-02-04 19:16:33 +00:00
Baligh Uddin
c67b825bd0
Import translations. DO NOT MERGE
...
Change-Id: I7e498ee5f83a3d4611fc46f34b0a6f0e19c143e5
Auto-generated-cl: translation import
2013-02-04 11:02:27 -08:00
Kurt Partridge
5ca4afa543
Merge "[Rlog48c] Replay historical motion data"
2013-02-04 18:36:57 +00:00
Kurt Partridge
82b4374c75
Merge "[Rlog48b] Better visual indicator for logging state"
2013-02-04 18:06:41 +00:00
Kurt Partridge
7708bcf6fb
[Rlog48c] Replay historical motion data
...
Change-Id: Ib398ea61ff048b1a4ac3b7f7b4a772e173a7b294
2013-02-04 06:13:51 -08:00
Kurt Partridge
d34347bd4b
[Rlog79b] Save channel name during internal use
...
The feedback string is used as a channel name in internal builds. Add a flag
that lets it be saved between calls to make it easier to generate test data.
Change-Id: I5c6149b1e68239cd968b6852d03cc240ddde99ca
2013-02-04 06:09:45 -08:00
