Commit graph

11807 commits

Author SHA1 Message Date
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
d84c7a871d am fdb1ca56: Merge "Separate caps mode related utils to CapsModeUtils"
# Via Android (Google) Code Review (1) and Tadashi G. Takaoka (1)
* commit 'fdb1ca560e426e67c60c7f7324bc52022b1b3f07':
  Separate caps mode related utils to CapsModeUtils
2013-02-12 01:28:14 -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
f6716e651f am 2c2942dd: Merge "Move parseCsvString to StringUtils"
# Via Android (Google) Code Review (1) and Tadashi G. Takaoka (1)
* commit '2c2942dd4bdea8581191866e2f06a0fa9dec18ed':
  Move parseCsvString to StringUtils
2013-02-11 23:59:49 -08: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
d16059f918 am e26f0d43: Merge "Cleanups"
# Via Android (Google) Code Review (1) and Jean Chalard (1)
* commit 'e26f0d4320b9f3ad49a5c6d3f5f2ee78bac74a48':
  Cleanups
2013-02-11 22:50:51 -08:00
Jean Chalard
e26f0d4320 Merge "Cleanups" 2013-02-12 06:49:41 +00:00
Tadashi G. Takaoka
a869080b04 am 4cbe84ad: Merge "Fix RTL language key code mapping"
# Via Android (Google) Code Review (1) and Tadashi G. Takaoka (1)
* commit '4cbe84ad08f38bf9c6f8852b406f5052e862a747':
  Fix RTL language key code mapping
2013-02-11 22:45:16 -08: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
08a2bbc738 am c6aaa48e: Merge "Some cleanups"
# Via Android (Google) Code Review (1) and Jean Chalard (1)
* commit 'c6aaa48ea7fa021112cc163730b5bce574c6877b':
  Some cleanups
2013-02-11 21:10:22 -08:00
Jean Chalard
c6aaa48ea7 Merge "Some cleanups" 2013-02-12 05:09:31 +00:00
Tadashi G. Takaoka
41d66bea35 am 0b491917: Add translatable="false" for dictionary-pack.xml
# Via Tadashi G. Takaoka
* commit '0b49191797071d6674cae46eea9f76a8947945da':
  Add translatable="false" for dictionary-pack.xml
2013-02-11 21:03:22 -08: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
c38a348f1b am 82441e60: Remove unnecessary whitespace
# Via Jean Chalard
* commit '82441e60e242681f2ea0d6e97105f819e3bd5071':
  Remove unnecessary whitespace
2013-02-11 13:36:08 -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
d8348eeabf am b2eac474: Don\'t try to issue delete() commands on missing provider
# Via Jean Chalard
* commit 'b2eac474ff82d0dad41991cd0f1ae80a58f01be2':
  Don't try to issue delete() commands on missing provider
2013-02-11 12:50:32 -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
a7cfa15dfe am a92a97d2: (-s ours) Merge "Import translations. DO NOT MERGE"
# Via Android (Google) Code Review (1) and Baligh Uddin (1)
* commit 'a92a97d2cd0657a36112f525c3e1e719415ad0b3':
  Import translations. DO NOT MERGE
2013-02-11 11:25:50 -08:00
Kurt Partridge
71bc485b09 am d3c9ec81: Merge "Close file properly"
# Via Android (Google) Code Review (1) and Kurt Partridge (1)
* commit 'd3c9ec8133ae203b10eafc8547cbda51d995a44e':
  Close file properly
2013-02-11 11:25:49 -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
Baligh Uddin
d4ca979165 Import translations. DO NOT MERGE
Change-Id: If167e26b62d1fa89e672da77fbcde015659e635f
Auto-generated-cl: translation import
2013-02-11 10:18:58 -08:00
Kurt Partridge
d3c9ec8133 Merge "Close file properly" 2013-02-11 16:55:43 +00:00
Ken Wakasa
1b2356e4e6 am 825abc00: Follow up to If933fcad56d81dcc956b6114727e01be9686ee9c
# Via Ken Wakasa
* commit '825abc00f472978b3e99392177cb860c336a1de3':
  Follow up to If933fcad56d81dcc956b6114727e01be9686ee9c
2013-02-10 06:36:25 -08:00
Ken Wakasa
825abc00f4 Follow up to If933fcad56d81dcc956b6114727e01be9686ee9c
Bug: 7405756
Change-Id: I415936db98296cd1d2fe6e4a590375061935ba8a
2013-02-10 00:31:40 +09:00
Tadashi G. Takaoka
856057e6f1 am 5f5862c9: Merge "Change targetSdkVersion to 17"
# Via Android (Google) Code Review (1) and Tadashi G. Takaoka (1)
* commit '5f5862c9b44b45527a78c85e63b381e770f1bce6':
  Change targetSdkVersion to 17
2013-02-08 19:46:48 -08: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
822bac6da3 am af01a65f: Merge "Add keyboard hypotenuse metric to ProximityInfo."
# Via Android (Google) Code Review (1) and Tom Ouyang (1)
* commit 'af01a65f985ca928022ec25172a2c1f4bcad3219':
  Add keyboard hypotenuse metric to ProximityInfo.
2013-02-08 18:38:39 -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
3d2b9ad1ee am 927c2d65: (-s ours) Merge "Import translations. DO NOT MERGE"
# Via Android (Google) Code Review (1) and Baligh Uddin (1)
* commit '927c2d65e8d4e2c419bfa45affca2502c859391e':
  Import translations. DO NOT MERGE
2013-02-08 12:21:00 -08:00
Baligh Uddin
927c2d65e8 Merge "Import translations. DO NOT MERGE" 2013-02-08 20:19:02 +00:00
Baligh Uddin
a4014e328e Merge "Import translations. DO NOT MERGE" into jb-ub-latinimegoogle 2013-02-08 20:18:46 +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
95328b44db am b0767dd4: Separate resource file for dictionary pack metadata
# Via Tadashi G. Takaoka
* commit 'b0767dd499264c8ab0dcb5ca833a66079524c4b3':
  Separate resource file for dictionary pack metadata
2013-02-08 12:15:38 -08:00
Baligh Uddin
13b5417703 Import translations. DO NOT MERGE
Change-Id: I517465f48844921772713e7205ddee9c6c4dcb19
Auto-generated-cl: translation import
2013-02-08 12:12:26 -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
a13f4942ad am 3623ad23: [B14] Implement sending the dictionary list.
# Via Jean Chalard
* commit '3623ad238c3fa76f36cb54de63bd31cf320befb4':
  [B14] Implement sending the dictionary list.
2013-02-07 09:29:40 -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
3e2d7f27cf am 73857910: Merge "[B11] Implement reset and passing of the URL to the dict pack"
# Via Android (Google) Code Review (1) and Jean Chalard (1)
* commit '738579103f112e2781848079235d79e98e65d6be':
  [B11] Implement reset and passing of the URL to the dict pack
2013-02-06 16:07:25 -08:00
Jean Chalard
f1a312a28b am 68ed7aa9: Fix a test
# Via Jean Chalard
* commit '68ed7aa990a73bbdd20ec539289d6b5351e41441':
  Fix a test
2013-02-06 16:07:24 -08:00