Andreas Huber
a9b60ffc6d
am e3d89618: am 867bb7c3: Merge change 22773 into eclair
...
Merge commit 'e3d8961894484e45f871574bc7c7bca0db7a7ae4'
* commit 'e3d8961894484e45f871574bc7c7bca0db7a7ae4':
Keep up with latest changes to overlay handling on that unnamable platform.
2009-08-26 10:34:41 -07:00
Andreas Huber
e3d8961894
am 867bb7c3: Merge change 22773 into eclair
...
Merge commit '867bb7c3538cc66c378a695996cf8290a8774491' into eclair-plus-aosp
* commit '867bb7c3538cc66c378a695996cf8290a8774491':
Keep up with latest changes to overlay handling on that unnamable platform.
2009-08-26 10:32:47 -07:00
Android (Google) Code Review
867bb7c353
Merge change 22773 into eclair
...
* changes:
Keep up with latest changes to overlay handling on that unnamable platform.
2009-08-26 10:30:31 -07:00
Evan Millar
9e34784eb1
am 5df8c516: am ea839a72: Merge change 22766 into eclair
...
Merge commit '5df8c516123171f681bd335bf4d714154dfe9197'
* commit '5df8c516123171f681bd335bf4d714154dfe9197':
Add assets for fasttrack badges.
2009-08-26 10:23:57 -07:00
Evan Millar
5df8c51612
am ea839a72: Merge change 22766 into eclair
...
Merge commit 'ea839a72fd68e0b796e6dd2384de1447d06d9b62' into eclair-plus-aosp
* commit 'ea839a72fd68e0b796e6dd2384de1447d06d9b62':
Add assets for fasttrack badges.
2009-08-26 10:22:06 -07:00
Android (Google) Code Review
ea839a72fd
Merge change 22766 into eclair
...
* changes:
Add assets for fasttrack badges.
2009-08-26 10:20:30 -07:00
Andreas Huber
446f44f61a
Keep up with latest changes to overlay handling on that unnamable platform.
2009-08-26 09:11:13 -07:00
Evan Millar
22136fe1df
Add assets for fasttrack badges.
...
These may be incorporated into a fasttrack framework widget at some
point. For now we'll just make them private assets.
Change-Id: I6b8c1e5c4a5f8c38a95f23dfab9a67973862db95
2009-08-26 09:03:42 -07:00
Eric Laurent
3c7e9ccb72
am 26ca665d: am 6ee9952b: Fix issue 2076322: AudioService, too many stream volume steps.
...
Merge commit '26ca665d77b696059e333b1e658e3cd9b338cfee'
* commit '26ca665d77b696059e333b1e658e3cd9b338cfee':
Fix issue 2076322: AudioService, too many stream volume steps.
2009-08-26 08:54:37 -07:00
Eric Laurent
26ca665d77
am 6ee9952b: Fix issue 2076322: AudioService, too many stream volume steps.
...
Merge commit '6ee9952bc20be72b9419cb653c9e2e833889a3d3' into eclair-plus-aosp
* commit '6ee9952bc20be72b9419cb653c9e2e833889a3d3':
Fix issue 2076322: AudioService, too many stream volume steps.
2009-08-26 08:52:28 -07:00
Eric Laurent
6ee9952bc2
Fix issue 2076322: AudioService, too many stream volume steps.
...
MAX_STREAM_VOLUME[] now contains the maximum valid index instead of the number of indexes for all stream types.
2009-08-26 05:23:20 -07:00
Ben Murdoch
576c26dd91
am 4cbbca0d: am d497d876: Pass the estimated size of new HTML 5 databases to the ChromeClient so it can use that amount to figure an initial default quota.
...
Merge commit '4cbbca0dd3c95dc3875914171d839eac78452562'
* commit '4cbbca0dd3c95dc3875914171d839eac78452562':
Pass the estimated size of new HTML 5 databases to the ChromeClient so it can use that amount to figure an initial default quota.
2009-08-26 04:45:31 -07:00
Ben Murdoch
4cbbca0dd3
am d497d876: Pass the estimated size of new HTML 5 databases to the ChromeClient so it can use that amount to figure an initial default quota.
...
Merge commit 'd497d87650dd79f7d6a4751d79598d68ceb4b789' into eclair-plus-aosp
* commit 'd497d87650dd79f7d6a4751d79598d68ceb4b789':
Pass the estimated size of new HTML 5 databases to the ChromeClient so it can use that amount to figure an initial default quota.
2009-08-26 04:43:39 -07:00
Ben Murdoch
d497d87650
Pass the estimated size of new HTML 5 databases to the ChromeClient so it can use that amount to figure an initial default quota.
...
Change-Id:Ic9372b0c86472b42ba5d0b964aaff1e2bbfe3efa
2009-08-26 12:39:55 +01:00
Daisuke Miyakawa
69fd8c19c5
am 5d147264: am 97f87095: Merge change 22399 into eclair
...
Merge commit '5d147264c76db862d0782ea634a3e4a39a992619'
* commit '5d147264c76db862d0782ea634a3e4a39a992619':
Refactor VCard handling code, phase 2, 3, 4, 5
2009-08-25 22:13:07 -07:00
Daisuke Miyakawa
5d147264c7
am 97f87095: Merge change 22399 into eclair
...
Merge commit '97f870956a37d441f82e21135a5e68d3ecdd0bf5' into eclair-plus-aosp
* commit '97f870956a37d441f82e21135a5e68d3ecdd0bf5':
Refactor VCard handling code, phase 2, 3, 4, 5
2009-08-25 22:10:36 -07:00
Android (Google) Code Review
97f870956a
Merge change 22399 into eclair
...
* changes:
Refactor VCard handling code, phase 2, 3, 4, 5
2009-08-25 22:08:38 -07:00
Jeff Sharkey
d2b3a6fb89
am f1be6d0a: am ba176d6c: Don\'t reference hidden API from comments.
...
Merge commit 'f1be6d0acea4aad4396d76d1d3486783b3d0f4ae'
* commit 'f1be6d0acea4aad4396d76d1d3486783b3d0f4ae':
Don't reference hidden API from comments.
2009-08-25 19:10:14 -07:00
Jeff Sharkey
f1be6d0ace
am ba176d6c: Don\'t reference hidden API from comments.
...
Merge commit 'ba176d6c8ad581e65b46bd6835c0737e74ef453d' into eclair-plus-aosp
* commit 'ba176d6c8ad581e65b46bd6835c0737e74ef453d':
Don't reference hidden API from comments.
2009-08-25 19:08:00 -07:00
Jeff Sharkey
ba176d6c8a
Don't reference hidden API from comments.
2009-08-25 19:05:47 -07:00
Martin Storsjo
08d410bfe6
am 085e2c91: am 09f4c942: Merge change 22710 into eclair
...
Merge commit '085e2c912a8cc677e31da48250130d90c0af5c32'
* commit '085e2c912a8cc677e31da48250130d90c0af5c32':
Calculate specular lighting correctly
2009-08-25 18:39:30 -07:00
Martin Storsjo
aa8806f69a
am 899b6a07: am 22874300: Merge change 22709 into eclair
...
Merge commit '899b6a07d133640d0faf40e0af976eab3600c403'
* commit '899b6a07d133640d0faf40e0af976eab3600c403':
If FLAGS_2D_PROJECTION is set, the MVP matrices need updating when changing the viewport.
2009-08-25 18:39:26 -07:00
Martin Storsjo
085e2c912a
am 09f4c942: Merge change 22710 into eclair
...
Merge commit '09f4c94233502eeb19d4a4c8f05cd331e64c4992' into eclair-plus-aosp
* commit '09f4c94233502eeb19d4a4c8f05cd331e64c4992':
Calculate specular lighting correctly
2009-08-25 18:38:21 -07:00
Martin Storsjo
899b6a07d1
am 22874300: Merge change 22709 into eclair
...
Merge commit '228743001721e5b167d393523ad35d78ba965195' into eclair-plus-aosp
* commit '228743001721e5b167d393523ad35d78ba965195':
If FLAGS_2D_PROJECTION is set, the MVP matrices need updating when changing the viewport.
2009-08-25 18:38:17 -07:00
Android (Google) Code Review
09f4c94233
Merge change 22710 into eclair
...
* changes:
Calculate specular lighting correctly
2009-08-25 18:36:47 -07:00
Android (Google) Code Review
2287430017
Merge change 22709 into eclair
...
* changes:
If FLAGS_2D_PROJECTION is set, the MVP matrices need updating when changing the viewport.
2009-08-25 18:36:22 -07:00
Dmitri Plotnikov
fde0a6e124
am d30866fb: am 22e2aaaa: Merge change 22656 into eclair
...
Merge commit 'd30866fba31034bc72420506287390d4c347353e'
* commit 'd30866fba31034bc72420506287390d4c347353e':
Adding an aggregation mode: AGGREGATION_SUSPENDED
2009-08-25 18:36:02 -07:00
Martin Storsjo
c0dea96491
Calculate specular lighting correctly
...
Since the lighting calculations are done in object space, the vector
from the object to the viewer also needs to be transformed to object
space.
2009-08-25 18:35:54 -07:00
Martin Storsjo
4f31af9346
If FLAGS_2D_PROJECTION is set, the MVP matrices need updating when changing the viewport.
2009-08-25 18:35:03 -07:00
Dmitri Plotnikov
d30866fba3
am 22e2aaaa: Merge change 22656 into eclair
...
Merge commit '22e2aaaa5cb465679320e1027240d5150f574706' into eclair-plus-aosp
* commit '22e2aaaa5cb465679320e1027240d5150f574706':
Adding an aggregation mode: AGGREGATION_SUSPENDED
2009-08-25 18:34:53 -07:00
Android (Google) Code Review
22e2aaaa5c
Merge change 22656 into eclair
...
* changes:
Adding an aggregation mode: AGGREGATION_SUSPENDED
2009-08-25 18:33:13 -07:00
Fred Quintana
361ed21177
am 381bc383: am 16c758fb: Merge change 22702 into eclair
...
Merge commit '381bc38355ae05efee92d369076b3228969c0e1d'
* commit '381bc38355ae05efee92d369076b3228969c0e1d':
run the sync thread at background priority
2009-08-25 17:46:11 -07:00
Fred Quintana
381bc38355
am 16c758fb: Merge change 22702 into eclair
...
Merge commit '16c758fb156cc8184e9c3ace7aa4717af4bb05ea' into eclair-plus-aosp
* commit '16c758fb156cc8184e9c3ace7aa4717af4bb05ea':
run the sync thread at background priority
2009-08-25 17:44:08 -07:00
Android (Google) Code Review
16c758fb15
Merge change 22702 into eclair
...
* changes:
run the sync thread at background priority
2009-08-25 17:42:26 -07:00
Jeff Sharkey
a5cc0b7257
am 77a2bc56: am 534aa012: Mark all legacy contacts APIs as deprecated.
...
Merge commit '77a2bc56d09242b3e358308641d8f0bb1c184eb2'
* commit '77a2bc56d09242b3e358308641d8f0bb1c184eb2':
Mark all legacy contacts APIs as deprecated.
2009-08-25 17:33:45 -07:00
Jeff Sharkey
77a2bc56d0
am 534aa012: Mark all legacy contacts APIs as deprecated.
...
Merge commit '534aa012b5063abeaa36b9ade69851add8b7a48f' into eclair-plus-aosp
* commit '534aa012b5063abeaa36b9ade69851add8b7a48f':
Mark all legacy contacts APIs as deprecated.
2009-08-25 17:32:43 -07:00
Jeff Sharkey
534aa012b5
Mark all legacy contacts APIs as deprecated.
...
Now that we've merged ContactsContract and are relying on
compatibility mode, we're marking the previous public
contacts API as deprecated.
Fixes http://b/2076016
2009-08-25 17:27:15 -07:00
Eric Fischer
ec6004acf7
am 51dc135c: am 5439f4e3: Merge change 22665 into eclair
...
Merge commit '51dc135c10e458c1b24de1ca2275ce924a942d6d'
* commit '51dc135c10e458c1b24de1ca2275ce924a942d6d':
Decapitalize "Input method" in context menu.
2009-08-25 17:26:58 -07:00
Eric Fischer
51dc135c10
am 5439f4e3: Merge change 22665 into eclair
...
Merge commit '5439f4e30300084beb3f1ecbb19bcfd1bcac9e5d' into eclair-plus-aosp
* commit '5439f4e30300084beb3f1ecbb19bcfd1bcac9e5d':
Decapitalize "Input method" in context menu.
2009-08-25 17:26:00 -07:00
Android (Google) Code Review
5439f4e303
Merge change 22665 into eclair
...
* changes:
Decapitalize "Input method" in context menu.
2009-08-25 17:24:58 -07:00
Jason Sams
82a6f7ffea
am e4f855a0: am 1af7258c: Merge change 22695 into eclair
...
Merge commit 'e4f855a0aaef90a8febfe5c2eff588f7febc8fae'
* commit 'e4f855a0aaef90a8febfe5c2eff588f7febc8fae':
Remove bogus comments and logging.
2009-08-25 17:15:14 -07:00
Jason Sams
e4f855a0aa
am 1af7258c: Merge change 22695 into eclair
...
Merge commit '1af7258c907f5ad148226d5dcbd188fd75facbfb' into eclair-plus-aosp
* commit '1af7258c907f5ad148226d5dcbd188fd75facbfb':
Remove bogus comments and logging.
2009-08-25 17:13:16 -07:00
Android (Google) Code Review
1af7258c90
Merge change 22695 into eclair
...
* changes:
Remove bogus comments and logging.
2009-08-25 17:10:56 -07:00
Jason Sams
67c6844ea0
Remove bogus comments and logging.
2009-08-25 17:09:59 -07:00
johnwang
b58a644d39
am 7250f938: am cc907741: Merge change 22660 into eclair
...
Merge commit '7250f938accad16e878889c6f4d8be3b8520f510'
* commit '7250f938accad16e878889c6f4d8be3b8520f510':
Simplify data icons of CDMA in status bar.
2009-08-25 16:23:04 -07:00
johnwang
7250f938ac
am cc907741: Merge change 22660 into eclair
...
Merge commit 'cc907741b9b7344820ffbc8d68992567d74d0f4b' into eclair-plus-aosp
* commit 'cc907741b9b7344820ffbc8d68992567d74d0f4b':
Simplify data icons of CDMA in status bar.
2009-08-25 16:20:12 -07:00
Android (Google) Code Review
cc907741b9
Merge change 22660 into eclair
...
* changes:
Simplify data icons of CDMA in status bar.
2009-08-25 16:18:32 -07:00
Robert Greenwalt
777814327b
am 7b1820d9: am 8d61d005: Merge change 22638 into eclair
...
Merge commit '7b1820d9f126d967b395d99dd92c816b083d3adf'
* commit '7b1820d9f126d967b395d99dd92c816b083d3adf':
Fix the removal of dns entries.
2009-08-25 16:16:20 -07:00
Robert Greenwalt
7b1820d9f1
am 8d61d005: Merge change 22638 into eclair
...
Merge commit '8d61d005839b23a41034325d5f458f1344933b1b' into eclair-plus-aosp
* commit '8d61d005839b23a41034325d5f458f1344933b1b':
Fix the removal of dns entries.
2009-08-25 16:13:26 -07:00
johnwang
9f87cb2f8d
Simplify data icons of CDMA in status bar.
...
Use 3G icons when connect to EvDO, use 1x icons when connected to 1x, and remove dormant state display.
2009-08-25 16:12:39 -07:00
