Commit graph

2008 commits

Author SHA1 Message Date
Eric Fischer
d5fb0913a9 am c8ec9be9: (-s ours) am 10ac7392: (-s ours) am b43200c1: Import revised translations. DO NOT MERGE
* commit 'c8ec9be92a10a57379ecf1c6cf14a4271cc7a717':
  Import revised translations. DO NOT MERGE
2011-01-31 18:15:39 -08:00
Eric Fischer
c8ec9be92a am 10ac7392: (-s ours) am b43200c1: Import revised translations. DO NOT MERGE
* commit '10ac73923ab0d67fa863ddcc83389a772299d2f1':
  Import revised translations. DO NOT MERGE
2011-01-31 17:50:08 -08:00
Eric Fischer
10ac73923a am b43200c1: Import revised translations. DO NOT MERGE
* commit 'b43200c105e730a089798f4e51261c5381dd6536':
  Import revised translations. DO NOT MERGE
2011-01-31 16:35:26 -08:00
Eric Fischer
fc16caf56a Import revised translations. DO NOT MERGE. Bug 3394542
Change-Id: I6de9aa765cdfeb34fba0ae5fae8d7f92102125de
2011-01-31 12:49:13 -08:00
Eric Fischer
b43200c105 Import revised translations. DO NOT MERGE
Change-Id: I19645baeeb40b0bc10cf656581ff7f6b7be851d4
2011-01-31 12:26:32 -08:00
Ken Wakasa
eaa091da78 Merge "Fix subtype settings activity string" 2011-01-31 08:24:53 -08:00
Ken Wakasa
435bd31db3 Fix subtype settings activity string
original (abandoned) change: I78463bbb

Change-Id: I1ef4df882fb09dd31a77e8f12d30d03460ecaada
2011-02-01 01:16:32 +09:00
Jean Chalard
7e85cebfcf am 7b6cdacf: am 72811549: Do not read the pop up setting if the config says not to.
* commit '7b6cdacf4d36fa7ab21a98a95b9d44882886c890':
  Do not read the pop up setting if the config says not to.
2011-01-30 23:02:06 -08:00
Jean Chalard
7b6cdacf4d am 72811549: Do not read the pop up setting if the config says not to.
* commit '728115493e14f84d5f02a4812c8086a378813364':
  Do not read the pop up setting if the config says not to.
2011-01-30 22:59:14 -08:00
Jean Chalard
728115493e Do not read the pop up setting if the config says not to.
If the configuration says the device should not display the "Pop up
on key press" setting, then do not read the preference and always
use the default setting.

bug: 3406181

Change-Id: Ice2989760cda1d40387ed88311144cbf2c114b93
2011-01-31 15:45:24 +09:00
Justin Ho
a702741374 am 20e3e036: am d6cac41d: Merge "Fixing colon key alignment Bug: 3362749 Bug: 3405016 Change-Id: Ie6f15a5a8f27d0df517b451e93a92cc693b9fcd6" into honeycomb
* commit '20e3e0362804e1ba9fa0db7a9514005480a0f33a':
  Fixing colon key alignment Bug: 3362749 Bug: 3405016 Change-Id: Ie6f15a5a8f27d0df517b451e93a92cc693b9fcd6
2011-01-30 20:15:03 -08:00
Justin Ho
20e3e03628 am d6cac41d: Merge "Fixing colon key alignment Bug: 3362749 Bug: 3405016 Change-Id: Ie6f15a5a8f27d0df517b451e93a92cc693b9fcd6" into honeycomb
* commit 'd6cac41dc7f9992c9c7ceaf9caec61d714be0742':
  Fixing colon key alignment Bug: 3362749 Bug: 3405016 Change-Id: Ie6f15a5a8f27d0df517b451e93a92cc693b9fcd6
2011-01-30 20:12:22 -08:00
Justin Ho
d6cac41dc7 Merge "Fixing colon key alignment Bug: 3362749 Bug: 3405016 Change-Id: Ie6f15a5a8f27d0df517b451e93a92cc693b9fcd6" into honeycomb 2011-01-30 20:09:24 -08:00
Justin Ho
9a3be5eab0 Fixing colon key alignment
Bug: 3362749
Bug: 3405016
Change-Id: Ie6f15a5a8f27d0df517b451e93a92cc693b9fcd6
2011-01-30 19:58:18 -08:00
The Android Open Source Project
84ad529683 am 4f5ddf03: Reconcile gingerbread-plus-aosp and honeycomb
* commit '4f5ddf036aac6dffba8194055a01957f35bc0285':
2011-01-30 12:56:18 -08:00
The Android Open Source Project
4f5ddf036a Reconcile gingerbread-plus-aosp and honeycomb
Change-Id: Ibeb0a92c87bd7fddb7f8242dc0a3d1875c29c251
2011-01-30 12:42:43 -08:00
The Android Open Source Project
c3e7ab2f7c Mass merge from gingerbread - do not merge
Change-Id: I283edea7175253ff92e8d8d66c4182606baf42bf
2011-01-30 12:42:43 -08:00
Eric Fischer
15e8605033 am 466e991c: (-s ours) Import revised translations. DO NOT MERGE
* commit '466e991caf463bb2affe4c520eee99d7838e83c1':
  Import revised translations.  DO NOT MERGE
2011-01-29 11:25:05 -08:00
Eric Fischer
cf5866be9d am 5d8633d2: (-s ours) Import revised translations. DO NOT MERGE
* commit '5d8633d229316762d95346867e8fda1fb34d0ec8':
  Import revised translations.  DO NOT MERGE
2011-01-29 10:47:12 -08:00
Eric Fischer
ef57cf0cca am ddc6eb10: (-s ours) am 8184a3d4: (-s ours) am 466e991c: Import revised translations. DO NOT MERGE
* commit 'ddc6eb103e569b3f110b98b2754bdf0dc1b8f72c':
  Import revised translations.  DO NOT MERGE
2011-01-29 09:18:28 -08:00
Eric Fischer
ddc6eb103e am 8184a3d4: (-s ours) am 466e991c: Import revised translations. DO NOT MERGE
* commit '8184a3d41603e920ec3ec086a16f39b37b04a9a4':
  Import revised translations.  DO NOT MERGE
2011-01-29 09:13:01 -08:00
Eric Fischer
c2c75d7342 am 969c014b: (-s ours) am 0d542b48: (-s ours) am 5d8633d2: Import revised translations. DO NOT MERGE
* commit '969c014b0768d3445ef4f4a1519908e29e41f182':
  Import revised translations.  DO NOT MERGE
2011-01-29 08:38:27 -08:00
Eric Fischer
969c014b07 am 0d542b48: (-s ours) am 5d8633d2: Import revised translations. DO NOT MERGE
* commit '0d542b48f5299990df9fb81c538bd22bdc64881b':
  Import revised translations.  DO NOT MERGE
2011-01-29 08:02:46 -08:00
Ken Wakasa
41fe2ee6ee am 7c355c69: am e80c070c: Merge "Updated + key" into honeycomb
* commit '7c355c698d3776cf8e14dc9e1a438a7b2c3dbfee':
  Updated + key
2011-01-29 00:11:58 -08:00
Ken Wakasa
7c355c698d am e80c070c: Merge "Updated + key" into honeycomb
* commit 'e80c070c7d10d2dde299dfe72c2dfbbc699a3e69':
  Updated + key
2011-01-29 00:10:29 -08:00
Ken Wakasa
e80c070c7d Merge "Updated + key" into honeycomb 2011-01-29 00:08:07 -08:00
Justin Ho
755661e598 Updated + key
Bug: 3401855
Change-Id: Ib5e67d0038b7e89ecdf3b652ac0719e96bf4ab2f
2011-01-28 22:53:09 -08:00
Eric Fischer
9c6307ba4e am d3017c71: (-s ours) am fe97647f: Import revised translations. DO NOT MERGE
* commit 'd3017c7120bcb7b16173bbb5dc68a74e6d5de13d':
  Import revised translations.  DO NOT MERGE
2011-01-28 15:18:29 -08:00
Eric Fischer
d3017c7120 am fe97647f: Import revised translations. DO NOT MERGE
* commit 'fe97647f1b1d96990ed8557b9dc7082bfd8f8d11':
  Import revised translations.  DO NOT MERGE
2011-01-28 15:14:10 -08:00
Eric Fischer
fe97647f1b Import revised translations. DO NOT MERGE
Change-Id: I87042810bd939cf3c83a97034c8f1fda99cdd534
2011-01-28 14:59:40 -08:00
Eric Fischer
8184a3d416 am 466e991c: Import revised translations. DO NOT MERGE
* commit '466e991caf463bb2affe4c520eee99d7838e83c1':
  Import revised translations.  DO NOT MERGE
2011-01-28 14:16:10 -08:00
Eric Fischer
466e991caf Import revised translations. DO NOT MERGE
Change-Id: Ia637306742c58cc5d38fa0fe28e31589fc6fb33a
2011-01-28 13:22:55 -08:00
Ken Wakasa
9fab90b16d am e820fdfe: am 063a98a7: Merge "Reuse keyboard view\'s drawing bitmap if possible" into honeycomb
* commit 'e820fdfeb045a7c61c971532578ed02144b5c3e6':
  Reuse keyboard view's drawing bitmap if possible
2011-01-27 23:47:31 -08:00
Ken Wakasa
e820fdfeb0 am 063a98a7: Merge "Reuse keyboard view\'s drawing bitmap if possible" into honeycomb
* commit '063a98a7b24f7777f0c4173f5bd09b8f2bceda8e':
  Reuse keyboard view's drawing bitmap if possible
2011-01-27 23:45:07 -08:00
Ken Wakasa
063a98a7b2 Merge "Reuse keyboard view's drawing bitmap if possible" into honeycomb 2011-01-27 23:43:02 -08:00
Tadashi G. Takaoka
69a15051a0 am 294d1c08: am 513f1b04: Merge "Add hack to translate sudden move to up/down events" into honeycomb
* commit '294d1c08f4ee87710237fffc6866a7ab11153aaf':
  Add hack to translate sudden move to up/down events
2011-01-27 23:42:28 -08:00
Tadashi G. Takaoka
294d1c08f4 am 513f1b04: Merge "Add hack to translate sudden move to up/down events" into honeycomb
* commit '513f1b0454f5ea774a0fd1daa200daa62085c114':
  Add hack to translate sudden move to up/down events
2011-01-27 23:41:03 -08:00
Tadashi G. Takaoka
513f1b0454 Merge "Add hack to translate sudden move to up/down events" into honeycomb 2011-01-27 23:37:49 -08:00
Tadashi G. Takaoka
878d0c11dc am 109c4e59: am 4d3b9d70: Import new icon for disabled mic key
* commit '109c4e59208c07107abebdec48ef3d9cbcbf3b2b':
  Import new icon for disabled mic key
2011-01-27 23:35:30 -08:00
Tadashi G. Takaoka
faf437b507 Add hack to translate sudden move to up/down events
This change also gets rid of unnecessary debug messages.

Bug: 3400735
Change-Id: I3f003b1c2b553a2f841d4880f348a012d2d9c8ad
2011-01-28 16:35:02 +09:00
Tadashi G. Takaoka
109c4e5920 am 4d3b9d70: Import new icon for disabled mic key
* commit '4d3b9d709c36a4c5ea0705ccc3d58c28fbf873d0':
  Import new icon for disabled mic key
2011-01-27 23:33:58 -08:00
Ken Wakasa
566630147d Reuse keyboard view's drawing bitmap if possible
bug: 3398660
Change-Id: I0c7f7c084904990563ac62b5d9cf829f86855661
2011-01-28 16:33:34 +09:00
Tadashi G. Takaoka
4d3b9d709c Import new icon for disabled mic key
This change also updates other hdpi assets.

Bug: 3345931
Change-Id: Ia91e449905677b025307bf9ea6e618d82090a389
2011-01-28 16:16:59 +09:00
Justin Ho
fe68d8418a am 68d96067: am c768bcf9: Merge "Updating keyboard settings asset" into honeycomb
* commit '68d960671eae99abc4c01ff4911a7e1cc203367c':
  Updating keyboard settings asset
2011-01-27 19:07:25 -08:00
Justin Ho
68d960671e am c768bcf9: Merge "Updating keyboard settings asset" into honeycomb
* commit 'c768bcf92f668822f44affe4181b84ec4f65aa2f':
  Updating keyboard settings asset
2011-01-27 19:05:11 -08:00
Justin Ho
c768bcf92f Merge "Updating keyboard settings asset" into honeycomb 2011-01-27 19:03:19 -08:00
Justin Ho
c9ead118c8 Updating keyboard settings asset
Bug: 3362749
Change-Id: If9f0dd25bc40a5dbc6613ce0660bd62237c27760
2011-01-27 18:56:26 -08:00
Ken Wakasa
38982adbdd am d39185d3: (-s ours) am 35e485fa: Small manual translation fix in es-rUS
* commit 'd39185d3bff60ac2c7b86d170e8df1151326737e':
  Small manual translation fix in es-rUS
2011-01-27 17:01:13 -08:00
Ken Wakasa
d39185d3bf am 35e485fa: Small manual translation fix in es-rUS
* commit '35e485fa239f5bba21c6031986a1146efaef3498':
  Small manual translation fix in es-rUS
2011-01-27 16:47:43 -08:00
Ken Wakasa
35e485fa23 Small manual translation fix in es-rUS
Change-Id: Ie4556432661d3408c6f58739d551fd2c01c8531a
2011-01-28 09:44:37 +09:00