13631 Commits

Author SHA1 Message Date
Mathias Agopian
2a32cbed2c am c481990b: am b4488930: am 45dd12cb: Merge change I9f3020db into eclair
Merge commit 'c481990b630c7ff5bca155f4b1385f71097500d3'

* commit 'c481990b630c7ff5bca155f4b1385f71097500d3':
  fix [2243164] live wallpaper screen artifacts at end of boot
2009-11-06 17:34:54 -08:00
Mathias Agopian
c481990b63 am b4488930: am 45dd12cb: Merge change I9f3020db into eclair
Merge commit 'b448893039dc7f06ff5a76e8be6444808b4cf2ea' into eclair-mr2-plus-aosp

* commit 'b448893039dc7f06ff5a76e8be6444808b4cf2ea':
  fix [2243164] live wallpaper screen artifacts at end of boot
2009-11-06 17:25:31 -08:00
Mathias Agopian
b448893039 am 45dd12cb: Merge change I9f3020db into eclair
Merge commit '45dd12cb0834ea5d72872a6d5b3095f3af152434' into eclair-mr2

* commit '45dd12cb0834ea5d72872a6d5b3095f3af152434':
  fix [2243164] live wallpaper screen artifacts at end of boot
2009-11-06 17:15:45 -08:00
Android (Google) Code Review
45dd12cb08 Merge change I9f3020db into eclair
* changes:
  fix [2243164] live wallpaper screen artifacts at end of boot
2009-11-06 20:08:35 -05:00
Jack Palevich
6518c2bab4 am e54f267f: am a3a351e5: resolved conflicts for merge of 4e3fadd0 to eclair-mr2
Merge commit 'e54f267f06e86f9c1248742fc56967355721a4e7'

* commit 'e54f267f06e86f9c1248742fc56967355721a4e7':
  Fix stupid bug in GLThreadManager implementation.
2009-11-06 16:56:32 -08:00
Jack Palevich
e54f267f06 am a3a351e5: resolved conflicts for merge of 4e3fadd0 to eclair-mr2
Merge commit 'a3a351e5d164d0c8b461ae7af86edc0227654a76' into eclair-mr2-plus-aosp

* commit 'a3a351e5d164d0c8b461ae7af86edc0227654a76':
  Fix stupid bug in GLThreadManager implementation.
2009-11-06 16:45:58 -08:00
Jack Palevich
a3a351e5d1 resolved conflicts for merge of 4e3fadd0 to eclair-mr2 2009-11-06 16:35:19 -08:00
Mathias Agopian
9f3020db15 fix [2243164] live wallpaper screen artifacts at end of boot
make sure to glClear() the areas not touched by the animation
2009-11-06 16:30:18 -08:00
Eric Fischer
790c4294da am a3c90d93: (-s ours) am f6ff2be3: Merge change I72749815 into eclair-mr2
Merge commit 'a3c90d930ebabcfffd9d4d7715ad1329e1f8c2d8'

* commit 'a3c90d930ebabcfffd9d4d7715ad1329e1f8c2d8':
  Import revised translations.  DO NOT MERGE
2009-11-06 16:22:41 -08:00
Scott Main
95594cce49 am 022a38a0: am 3bde388a: am 1edbc1a1: am 0e08055a: Merge change I14a9acd3 into eclair-sdk
Merge commit '022a38a00a460dae1f45bb532780b519048e2dd8'

* commit '022a38a00a460dae1f45bb532780b519048e2dd8':
  docs: add new document for the win usb driver;
2009-11-06 16:22:30 -08:00
Eric Fischer
a3c90d930e am f6ff2be3: Merge change I72749815 into eclair-mr2
Merge commit 'f6ff2be323812b5525a0755d194b2fc751ba5968' into eclair-mr2-plus-aosp

* commit 'f6ff2be323812b5525a0755d194b2fc751ba5968':
  Import revised translations.  DO NOT MERGE
2009-11-06 16:10:30 -08:00
Scott Main
022a38a00a am 3bde388a: am 1edbc1a1: am 0e08055a: Merge change I14a9acd3 into eclair-sdk
Merge commit '3bde388ac2b80c9d86553552eaddf762fc9514a4' into eclair-mr2-plus-aosp

* commit '3bde388ac2b80c9d86553552eaddf762fc9514a4':
  docs: add new document for the win usb driver;
2009-11-06 16:10:19 -08:00
Android (Google) Code Review
4e3fadd0c9 Merge change Ia4424950 into eclair
* changes:
  Fix stupid bug in GLThreadManager implementation.
2009-11-06 19:00:54 -05:00
Android (Google) Code Review
f6ff2be323 Merge change I72749815 into eclair-mr2
* changes:
  Import revised translations.  DO NOT MERGE
2009-11-06 19:00:07 -05:00
Scott Main
3bde388ac2 am 1edbc1a1: am 0e08055a: Merge change I14a9acd3 into eclair-sdk
Merge commit '1edbc1a12c7ecff267e4b94b74222f980af9de6b' into eclair-mr2

* commit '1edbc1a12c7ecff267e4b94b74222f980af9de6b':
  docs: add new document for the win usb driver;
2009-11-06 15:50:03 -08:00
Jack Palevich
a44249500f Fix stupid bug in GLThreadManager implementation.
The code intended to copy the old value of a field, before the
field was updated. However, what the code was actually doing was
copying the new value of the field, after the field was updated.

The fix was to move the copy to before the update.

This is work towards fixing bug 2228262
2009-11-07 07:49:15 +08:00
Scott Main
1edbc1a12c am 0e08055a: Merge change I14a9acd3 into eclair-sdk
Merge commit '0e08055aa31c752732005fc48b09ee470a2c4822' into eclair

* commit '0e08055aa31c752732005fc48b09ee470a2c4822':
  docs: add new document for the win usb driver;
2009-11-06 15:41:28 -08:00
Eric Fischer
7274981597 Import revised translations. DO NOT MERGE 2009-11-06 15:25:20 -08:00
Dave Sparks
0c2fcf7230 am 61080e26: am 461af5c8: am 7ab900ed: Merge change Ic8093c11 into eclair
Merge commit '61080e26799a2236ee87ef5cb35d0f461a5c835f'

* commit '61080e26799a2236ee87ef5cb35d0f461a5c835f':
  Hold a lock while we access the preview heap.
2009-11-06 14:30:22 -08:00
Evan Millar
9f26c2d2b1 am 62ad899f: am 087c0603: am 2b3970a2: Merge change Idc1396c8 into eclair
Merge commit '62ad899fa6edb7311eb4f6e0dc2da7e354ce359f'

* commit '62ad899fa6edb7311eb4f6e0dc2da7e354ce359f':
  Only use FLAG_ACTIVITY_CLEAR_TOP on the search intent when from global search.
2009-11-06 14:30:10 -08:00
Dave Sparks
61080e2679 am 461af5c8: am 7ab900ed: Merge change Ic8093c11 into eclair
Merge commit '461af5c8db02ecbf81b0e57934f86a7ab6c4e8b6' into eclair-mr2-plus-aosp

* commit '461af5c8db02ecbf81b0e57934f86a7ab6c4e8b6':
  Hold a lock while we access the preview heap.
2009-11-06 14:21:35 -08:00
Evan Millar
62ad899fa6 am 087c0603: am 2b3970a2: Merge change Idc1396c8 into eclair
Merge commit '087c06039faeac54aa3063b643c5a6aafe51aa30' into eclair-mr2-plus-aosp

* commit '087c06039faeac54aa3063b643c5a6aafe51aa30':
  Only use FLAG_ACTIVITY_CLEAR_TOP on the search intent when from global search.
2009-11-06 14:21:24 -08:00
Dave Sparks
461af5c8db am 7ab900ed: Merge change Ic8093c11 into eclair
Merge commit '7ab900edd69324e5eeb2c6b01ef3ef5e836689a3' into eclair-mr2

* commit '7ab900edd69324e5eeb2c6b01ef3ef5e836689a3':
  Hold a lock while we access the preview heap.
2009-11-06 14:11:20 -08:00
Evan Millar
087c06039f am 2b3970a2: Merge change Idc1396c8 into eclair
Merge commit '2b3970a2956152a508254aa2675b68df363d46c1' into eclair-mr2

* commit '2b3970a2956152a508254aa2675b68df363d46c1':
  Only use FLAG_ACTIVITY_CLEAR_TOP on the search intent when from global search.
2009-11-06 14:04:18 -08:00
Android (Google) Code Review
7ab900edd6 Merge change Ic8093c11 into eclair
* changes:
  Hold a lock while we access the preview heap.
2009-11-06 17:03:52 -05:00
Android (Google) Code Review
0e08055aa3 Merge change I14a9acd3 into eclair-sdk
* changes:
  docs: add new document for the win usb driver; remove usb guide from the device document.
2009-11-06 16:57:12 -05:00
Android (Google) Code Review
2b3970a295 Merge change Idc1396c8 into eclair
* changes:
  Only use FLAG_ACTIVITY_CLEAR_TOP on the search intent when from global search.
2009-11-06 16:56:51 -05:00
Scott Main
ad68fdd702 docs: add new document for the win usb driver;
remove usb guide from the device document.
2009-11-06 13:48:21 -08:00
Michael Chan
56336c6109 am e4f5e840: am 811f6553: am 8d51f710: Merge change Icdd2864e into eclair
Merge commit 'e4f5e840a3a32764dc49396eb1d8de898f3ed7a5'

* commit 'e4f5e840a3a32764dc49396eb1d8de898f3ed7a5':
  b/2234854 Fixed Bluetooth API return codes for requesting permission to enable bluetooth
2009-11-06 13:47:16 -08:00
jsh
c184a41ecf am 36704bb8: am 91abf105: am b90a187d: Merge change Ie994c0e8 into eclair
Merge commit '36704bb8ffd433450994c0260c411bfa9424326d'

* commit '36704bb8ffd433450994c0260c411bfa9424326d':
  Update CdmaSmsTest unit test.
2009-11-06 13:43:02 -08:00
Mike Lockwood
e68beba1ae am 43355522: am dc2a3f60: am b8933665: Merge change I3f0ded49 into eclair
Merge commit '4335552259c893dc5e8ebfd8980a36ff8547ee5d'

* commit '4335552259c893dc5e8ebfd8980a36ff8547ee5d':
  Increase light sensor delay from one to two seconds.
2009-11-06 13:42:49 -08:00
Christopher Tate
b333cdb48f am f5f452fa: am 307fbbf2: am 49fa9e00: Merge change Ibf6e51b7 into eclair
Merge commit 'f5f452facab27a4c05361f9a61cee2098c2d5043'

* commit 'f5f452facab27a4c05361f9a61cee2098c2d5043':
  Set argv[0] from the main thread of an app, not a random binder thread
2009-11-06 13:42:37 -08:00
Dan Egnor
b6b1977107 am 77be730a: am 883be83e: Merge change I2effb21e into eclair-mr2
Merge commit '77be730ace28b9e6543da25f53305496402af295'

* commit '77be730ace28b9e6543da25f53305496402af295':
  Add UPDATE_ACTION to Gservices, used by the new checkin service.
2009-11-06 13:42:25 -08:00
Michael Chan
e4f5e840a3 am 811f6553: am 8d51f710: Merge change Icdd2864e into eclair
Merge commit '811f655366461d0f21f970bcac07dd2084fd54fa' into eclair-mr2-plus-aosp

* commit '811f655366461d0f21f970bcac07dd2084fd54fa':
  b/2234854 Fixed Bluetooth API return codes for requesting permission to enable bluetooth
2009-11-06 13:42:02 -08:00
jsh
36704bb8ff am 91abf105: am b90a187d: Merge change Ie994c0e8 into eclair
Merge commit '91abf105206f2ba19e886909456b3e3b7ed19362' into eclair-mr2-plus-aosp

* commit '91abf105206f2ba19e886909456b3e3b7ed19362':
  Update CdmaSmsTest unit test.
2009-11-06 13:35:20 -08:00
Mike Lockwood
4335552259 am dc2a3f60: am b8933665: Merge change I3f0ded49 into eclair
Merge commit 'dc2a3f60f2bed20ceb44d18ae03e75d360de4ca6' into eclair-mr2-plus-aosp

* commit 'dc2a3f60f2bed20ceb44d18ae03e75d360de4ca6':
  Increase light sensor delay from one to two seconds.
2009-11-06 13:35:09 -08:00
Christopher Tate
f5f452faca am 307fbbf2: am 49fa9e00: Merge change Ibf6e51b7 into eclair
Merge commit '307fbbf2b6dbdbc9249c492d5569e874207de5b1' into eclair-mr2-plus-aosp

* commit '307fbbf2b6dbdbc9249c492d5569e874207de5b1':
  Set argv[0] from the main thread of an app, not a random binder thread
2009-11-06 13:34:59 -08:00
Dan Egnor
77be730ace am 883be83e: Merge change I2effb21e into eclair-mr2
Merge commit '883be83eab608237652e013b26fe871c18fa8901' into eclair-mr2-plus-aosp

* commit '883be83eab608237652e013b26fe871c18fa8901':
  Add UPDATE_ACTION to Gservices, used by the new checkin service.
2009-11-06 13:34:48 -08:00
Michael Chan
811f655366 am 8d51f710: Merge change Icdd2864e into eclair
Merge commit '8d51f7101d2427953dbff9b4b8f8c9fdc0dc4a91' into eclair-mr2

* commit '8d51f7101d2427953dbff9b4b8f8c9fdc0dc4a91':
  b/2234854 Fixed Bluetooth API return codes for requesting permission to enable bluetooth
2009-11-06 13:33:06 -08:00
Android (Google) Code Review
8d51f7101d Merge change Icdd2864e into eclair
* changes:
  b/2234854 Fixed Bluetooth API return codes for requesting permission to enable bluetooth
2009-11-06 16:23:42 -05:00
jsh
91abf10520 am b90a187d: Merge change Ie994c0e8 into eclair
Merge commit 'b90a187d2cbbedcec87b479c9df7fd45804ad595' into eclair-mr2

* commit 'b90a187d2cbbedcec87b479c9df7fd45804ad595':
  Update CdmaSmsTest unit test.
2009-11-06 13:23:15 -08:00
Mike Lockwood
dc2a3f60f2 am b8933665: Merge change I3f0ded49 into eclair
Merge commit 'b8933665376905c91069eb29fa78c029aa790ce9' into eclair-mr2

* commit 'b8933665376905c91069eb29fa78c029aa790ce9':
  Increase light sensor delay from one to two seconds.
2009-11-06 13:23:05 -08:00
Christopher Tate
307fbbf2b6 am 49fa9e00: Merge change Ibf6e51b7 into eclair
Merge commit '49fa9e00986993f5cf05f1092c30479cb98eb254' into eclair-mr2

* commit '49fa9e00986993f5cf05f1092c30479cb98eb254':
  Set argv[0] from the main thread of an app, not a random binder thread
2009-11-06 13:22:54 -08:00
Android (Google) Code Review
883be83eab Merge change I2effb21e into eclair-mr2
* changes:
  Add UPDATE_ACTION to Gservices, used by the new checkin service.
2009-11-06 16:08:38 -05:00
Android (Google) Code Review
b90a187d2c Merge change Ie994c0e8 into eclair
* changes:
  Update CdmaSmsTest unit test.
2009-11-06 15:58:20 -05:00
Android (Google) Code Review
b893366537 Merge change I3f0ded49 into eclair
* changes:
  Increase light sensor delay from one to two seconds.
2009-11-06 15:55:52 -05:00
Mike Lockwood
9b813692f5 Increase light sensor delay from one to two seconds.
Change-Id: I3f0ded49cb447835133cf8d5d693260e8312aa89
Signed-off-by: Mike Lockwood <lockwood@android.com>
2009-11-06 15:53:59 -05:00
Evan Millar
6a9137661d am 3d43d816: am c11b225c: am 7e4a0047: Merge change I97b30e2f into eclair
Merge commit '3d43d816772d0c395f7a3335e6bde421b8539508'

* commit '3d43d816772d0c395f7a3335e6bde421b8539508':
  Revert jparks code from IPCThreadState.
2009-11-06 12:05:00 -08:00
Charles Mendis
08c2fd1ecc am 7e3873a0: am 6b07bf3d: am 3cba7288: Merge change I6ccd2ebc into eclair
Merge commit '7e3873a0d24453057850b408f17fa0e2e37ba0c7'

* commit '7e3873a0d24453057850b408f17fa0e2e37ba0c7':
  Expose PowerManager.isScreenOn in the public api.
2009-11-06 12:00:57 -08:00
Android (Google) Code Review
49fa9e0098 Merge change Ibf6e51b7 into eclair
* changes:
  Set argv[0] from the main thread of an app, not a random binder thread
2009-11-06 15:00:31 -05:00