Eric Laurent
f4a764bf08
am efc42d3a: am 7d987180: Merge change I19f2928b into eclair
...
Merge commit 'efc42d3a5bff6b58b3439b50f318f43c7c1ea1ad'
* commit 'efc42d3a5bff6b58b3439b50f318f43c7c1ea1ad':
Fix issue 2141503: Keyclick sound doesn't honor volume settings.
2009-10-01 11:39:08 -07:00
Romain Guy
1597cf3ece
am 0f320745: am b80fbd44: Merge change I24cf40af into eclair
...
Merge commit '0f3207455a05017057e94e3a19a81b685e6d32b3'
* commit '0f3207455a05017057e94e3a19a81b685e6d32b3':
New assets for the status and title bars.
2009-10-01 11:38:58 -07:00
Dianne Hackborn
d06b6c5e7c
am 356c58c5: am dc994dae: am 1d0086d9: Fix issue #2125720 Weather Forecast Widget - graphics do not scale
...
Merge commit '356c58c5b9044ddef83320bde5a78b988f42d2e8'
* commit '356c58c5b9044ddef83320bde5a78b988f42d2e8':
Fix issue #2125720 Weather Forecast Widget - graphics do not scale
2009-10-01 11:37:39 -07:00
Dianne Hackborn
e33ca71f38
am 0c5d2b81: am 57e31eff: am b91024c1: Fix #2101821 : Cut labels of menu items in "SnapTell" market app.
...
Merge commit '0c5d2b81e258d350a066fe07898d96feec977b9e'
* commit '0c5d2b81e258d350a066fe07898d96feec977b9e':
Fix #2101821 : Cut labels of menu items in "SnapTell" market app.
2009-10-01 11:37:29 -07:00
Daisuke Miyakawa
7aa7084bbc
am 9e2421a3: am a39f9188: Merge change I9c45753b into eclair
...
Merge commit '9e2421a3a3b22119a65665c7825de08ee5c5697b'
* commit '9e2421a3a3b22119a65665c7825de08ee5c5697b':
Clean up vCard code.
2009-10-01 11:36:59 -07:00
Jason Parks
094d8f4045
am bc82ea5d: am ac35dc47: Merge change I1cd7d0e5 into eclair
...
Merge commit 'bc82ea5d441fa37029c4260c74ee0ed4bd1402ac'
* commit 'bc82ea5d441fa37029c4260c74ee0ed4bd1402ac':
Implement the checkin option in AccountManagerService.dump()
2009-10-01 11:36:49 -07:00
Mark Wagner
fbccf1f41d
am 10662ae7: am d35afcda: Merge change Ib2c6429d into eclair
...
Merge commit '10662ae78f8900e28f13f6abdeee002c25b8c18d'
* commit '10662ae78f8900e28f13f6abdeee002c25b8c18d':
border for the non-badge case
2009-10-01 11:36:38 -07:00
Daniel Sandler
b9111246b2
am 9b19bfa1: am c78b2bf4: Merge change I905b03af into eclair
...
Merge commit '9b19bfa1b5061da19a73fb65c8c1afa0f1a9ede1'
* commit '9b19bfa1b5061da19a73fb65c8c1afa0f1a9ede1':
New hdpi assets for framework.
2009-10-01 11:36:16 -07:00
James Dong
e8b93da7f7
am b8bf70ac: am 4c232c5b: Merge change Idd16976f into eclair
...
Merge commit 'b8bf70acee9d8f9f48b8b68f33cbaeeb21195ef2'
* commit 'b8bf70acee9d8f9f48b8b68f33cbaeeb21195ef2':
Fix some metadata retriever issues:
2009-10-01 11:35:55 -07:00
Robert Greenwalt
95c9da3952
am fa62a047: am ab18206e: Merge change Ifc9dd5c6 into eclair
...
Merge commit 'fa62a0478e40c1730c04a417cf9ec4fa5d1991e5'
* commit 'fa62a0478e40c1730c04a417cf9ec4fa5d1991e5':
Fix the reporting of ActiveApnTypes on CDMA
2009-10-01 11:35:45 -07:00
Ray Chen
6dd52bbf2d
am 06e5b766: am 0167263b: Merge change Ide90d0cc into eclair
...
Merge commit '06e5b76667f02e4e45b2689d56d7d0596b4ef477'
* commit '06e5b76667f02e4e45b2689d56d7d0596b4ef477':
Unify Java NIO to read/write MiniThumbFile.
2009-10-01 11:35:35 -07:00
Cary Clark
5e56933a10
am dfab8b68: am 4fbf81bc: check for null item in web history in saveState
...
Merge commit 'dfab8b687039ef764249c22c00d0b030c55067da'
* commit 'dfab8b687039ef764249c22c00d0b030c55067da':
check for null item in web history in saveState
2009-10-01 11:35:23 -07:00
Romain Guy
01a6ac5d3a
am 75ef5234: am bd5b5722: absf() -> fabsf() instead of fabs()
...
Merge commit '75ef5234658a37b6e710bbc92c25e62b9a5cd4dd'
* commit '75ef5234658a37b6e710bbc92c25e62b9a5cd4dd':
absf() -> fabsf() instead of fabs()
2009-10-01 11:34:34 -07:00
Mike Cleron
a60a1ef869
am 03ecab42: am 7957eaa6: Merge change Iee9b30d3 into eclair
...
Merge commit '03ecab425235bdb5e3548900284e8089c3d72e5e'
* commit '03ecab425235bdb5e3548900284e8089c3d72e5e':
New icons
2009-10-01 11:34:19 -07:00
Cary Clark
05bcbd6280
am ed843820: am eaa18dec: scroll text field with touch
...
Merge commit 'ed843820f7aa93e0d3a2529956414a2ed940fa89'
* commit 'ed843820f7aa93e0d3a2529956414a2ed940fa89':
scroll text field with touch
2009-10-01 11:33:08 -07:00
Jeff Hamilton
2e2d8e92a0
am 11bb09c3: am f993fefc: Merge change Icbd74742 into eclair
...
Merge commit '11bb09c3829c6dc6874ed833bf9adcb1bc3195e3'
* commit '11bb09c3829c6dc6874ed833bf9adcb1bc3195e3':
EventLog when a database file is deleted due to corruption.
2009-10-01 11:19:08 -07:00
Dianne Hackborn
170e05589a
am 2ed31083: am 87937ae8: Merge change I66057b1f into eclair
...
Merge commit '2ed31083a29095deea09c8e974a4dee0b85b3a3f'
* commit '2ed31083a29095deea09c8e974a4dee0b85b3a3f':
Whoops, these shouldn't be public.
2009-10-01 11:18:57 -07:00
Leon Scroggins
d809c7dcd7
am a4f2ac7e: am d84e7d53: Allow scrolls to continue when getting a new content size.
...
Merge commit 'a4f2ac7e0e2cc4cfcf19c7ac536fe0dd0306354c'
* commit 'a4f2ac7e0e2cc4cfcf19c7ac536fe0dd0306354c':
Allow scrolls to continue when getting a new content size.
2009-10-01 11:18:05 -07:00
Dianne Hackborn
6b4bad55af
am 253f8362: am fff0b4a6: Fix build.
...
Merge commit '253f836277ccaaae16342ff4379ca59746216536'
* commit '253f836277ccaaae16342ff4379ca59746216536':
Fix build.
2009-10-01 11:17:18 -07:00
Dianne Hackborn
93869c19aa
am aed86520: am b6eaaa2a: Clean up cacheColorHint to be better controlled by the theme.
...
Merge commit 'aed865207f7425f6c4d0538decb04109c415410d'
* commit 'aed865207f7425f6c4d0538decb04109c415410d':
Clean up cacheColorHint to be better controlled by the theme.
2009-10-01 11:16:40 -07:00
Dianne Hackborn
a085d5e747
am 0b03fa8b: am 490d5222: Merge change I6cacaa0d into eclair
...
Merge commit '0b03fa8b6f1bda3dd3fa7544dd16f88441ea6fad'
* commit '0b03fa8b6f1bda3dd3fa7544dd16f88441ea6fad':
Hack to fix issue #2125365 : Sports Trivia compatability with Eclair
2009-10-01 11:16:09 -07:00
Evan Millar
3ab151e6d9
am c14b3285: am 22cbf51e: Merge change I49fbfc68 into eclair
...
Merge commit 'c14b32855b6e4338a4832872870f3373d7c2d691'
* commit 'c14b32855b6e4338a4832872870f3373d7c2d691':
Add PhoneNumberUtils.compare() method that uses a resource to determine strictness.
2009-10-01 11:15:57 -07:00
John Wang
43d536a6f4
am 8658eaba: am ac5bd144: Merge change Ib23e57cf into eclair
...
Merge commit '8658eaba1e4ab109b6dc9d854c57d80d74e9f61e'
* commit '8658eaba1e4ab109b6dc9d854c57d80d74e9f61e':
Set roaming based on both data and voice.
2009-10-01 11:15:47 -07:00
Dirk Dougherty
ee06b671b2
am 5f9be939: am b0702880: am 50128088: Merge change I915efc49 into donut
...
Merge commit '5f9be93958c2e8d5105064a6ce080265ce0b8bb1'
* commit '5f9be93958c2e8d5105064a6ce080265ce0b8bb1':
Update docs for NDK.
2009-10-01 11:15:10 -07:00
Dirk Dougherty
ae7d0d4455
am a6c2740d: am e34569fa: am bc0e07bf: Merge change I7b64ad2e into donut
...
Merge commit 'a6c2740d695cfb95cf1cd3989cb292d4c2fe1049'
* commit 'a6c2740d695cfb95cf1cd3989cb292d4c2fe1049':
doc change only. fix toc links on terms page.
2009-10-01 11:14:59 -07:00
Robert Greenwalt
d9b3d5ccd4
am 9274988e: am 9f9ce253: Merge change I59ceeae4 into eclair
...
Merge commit '9274988e444da3b8652912f1a3c0cf0847f19fe3'
* commit '9274988e444da3b8652912f1a3c0cf0847f19fe3':
Fix the reporting of ActiveApnTypes on CDMA
2009-10-01 11:13:12 -07:00
Grace Kloba
3af7c575bd
am 4435baa4: am 7745e035: Merge change I94c715d6 into eclair
...
Merge commit '4435baa48a64ed985e6f7fa8d132560341a78470'
* commit '4435baa48a64ed985e6f7fa8d132560341a78470':
Skip requestRectangleOnScreen for WebTextView during
2009-10-01 11:13:01 -07:00
Bjorn Bringert
bf1bc07b44
am c055f869: am 7db7e6a0: Merge change I17f45d35 into eclair
...
Merge commit 'c055f869867be98c9a4f2ca5e1532c007a8d1998'
* commit 'c055f869867be98c9a4f2ca5e1532c007a8d1998':
Unhide SearchManager.SUGGEST_PARAMETER_LIMIT
2009-10-01 11:11:55 -07:00
Chung-yih Wang
33768deaa7
am d0af7f90: am 31522ad0: Merge change I931ce71e into eclair
...
Merge commit 'd0af7f905fc39704c98cfd51961199722e551f9b'
* commit 'd0af7f905fc39704c98cfd51961199722e551f9b':
Add unit test for the new keystore.
2009-10-01 11:11:44 -07:00
Dianne Hackborn
dcb305f42e
am ce37120d: am 7eca687c: Fix bug where we would return null with disabled components.
...
Merge commit 'ce37120df3099a1bb544ff1ef1a016a20794dd51'
* commit 'ce37120df3099a1bb544ff1ef1a016a20794dd51':
Fix bug where we would return null with disabled components.
2009-10-01 11:11:30 -07:00
Dianne Hackborn
892a216105
am 4df43ab1: am ffc16544: Merge change Ib7c1701a into eclair
...
Merge commit '4df43ab1d834f839f3b1e535554836a936902d00'
* commit '4df43ab1d834f839f3b1e535554836a936902d00':
Fix issue #1930911 : Crash in system process
2009-10-01 11:10:25 -07:00
John Michelau
21d9b1bf21
am a2fbe447: am a2f5afe6: Merge change I27009b08 into eclair
...
Merge commit 'a2fbe44783d190236a42950e0a2585d8835d657f'
* commit 'a2fbe44783d190236a42950e0a2585d8835d657f':
Fix EVDO SNR signal bar calculation
2009-10-01 11:09:48 -07:00
Dianne Hackborn
d2b62efc60
am 72191950: am 6b1cb352: Fix issue #2149126 : unable to answer incoming call, various problems
...
Merge commit '7219195066f365ae4ada788dd416e5e87fc906f5'
* commit '7219195066f365ae4ada788dd416e5e87fc906f5':
Fix issue #2149126 : unable to answer incoming call, various problems
2009-10-01 11:07:16 -07:00
Jason Sams
eb9adbf045
am e88adf36: am ff966d5f: Merge change I5235cf3f into eclair
...
Merge commit 'e88adf369a2f078432b2e35a1656a004af643940'
* commit 'e88adf369a2f078432b2e35a1656a004af643940':
Fix but processing raster state pragma.
2009-10-01 11:06:17 -07:00
Mike Cleron
74516d0096
am e6566064: am 0368334d: Merge change Ie1072f12 into eclair
...
Merge commit 'e6566064a990fcfc21334df33eb9c771f22eb0d5'
* commit 'e6566064a990fcfc21334df33eb9c771f22eb0d5':
Finish off java API to allow fading scrollbars
2009-10-01 11:06:05 -07:00
Jack Palevich
62effc8b4f
am 019116ce: am 97702aac: Merge changes I82c78b83,I54f72d9d into eclair
...
Merge commit '019116ce202021e1b274516c9813aeff83b1b5ab'
* commit '019116ce202021e1b274516c9813aeff83b1b5ab':
Don't ask for pbuffer support, because we don't use any pbuffers.
Print out EGL configuration info for the config we've chosen.
2009-10-01 11:05:54 -07:00
Eric Laurent
efc42d3a5b
am 7d987180: Merge change I19f2928b into eclair
...
Merge commit '7d9871805beef4ea5e319f1a11ab32f610031845' into eclair-plus-aosp
* commit '7d9871805beef4ea5e319f1a11ab32f610031845':
Fix issue 2141503: Keyclick sound doesn't honor volume settings.
2009-09-29 15:18:10 -07:00
Android (Google) Code Review
7d9871805b
Merge change I19f2928b into eclair
...
* changes:
Fix issue 2141503: Keyclick sound doesn't honor volume settings.
2009-09-29 18:12:54 -04:00
Eric Laurent
a2ef57dba9
Fix issue 2141503: Keyclick sound doesn't honor volume settings.
...
Use music stream volume minus 3 dB for sound effects if volume is not explicitly requested by application.
2009-09-29 15:00:40 -07:00
Romain Guy
0f3207455a
am b80fbd44: Merge change I24cf40af into eclair
...
Merge commit 'b80fbd4479dccbd2f3ab9645b49e41ca4d10371f' into eclair-plus-aosp
* commit 'b80fbd4479dccbd2f3ab9645b49e41ca4d10371f':
New assets for the status and title bars.
2009-09-29 14:58:30 -07:00
Android (Google) Code Review
b80fbd4479
Merge change I24cf40af into eclair
...
* changes:
New assets for the status and title bars.
2009-09-29 17:50:01 -04:00
Romain Guy
6f767953ca
New assets for the status and title bars.
...
Change-Id: I24cf40afc7551fd8b1125fe2d386fa03674e1951
2009-09-29 14:48:46 -07:00
Dianne Hackborn
356c58c5b9
am dc994dae: am 1d0086d9: Fix issue #2125720 Weather Forecast Widget - graphics do not scale
...
Merge commit 'dc994daed2e2c9f5717ee1aaa5eea8159c6cf37f' into eclair-plus-aosp
* commit 'dc994daed2e2c9f5717ee1aaa5eea8159c6cf37f':
Fix issue #2125720 Weather Forecast Widget - graphics do not scale
2009-09-29 14:38:13 -07:00
Dianne Hackborn
0c5d2b81e2
am 57e31eff: am b91024c1: Fix #2101821 : Cut labels of menu items in "SnapTell" market app.
...
Merge commit '57e31effa81bbc84ed0dee0864c0f6d69ed71561' into eclair-plus-aosp
* commit '57e31effa81bbc84ed0dee0864c0f6d69ed71561':
Fix #2101821 : Cut labels of menu items in "SnapTell" market app.
2009-09-29 14:38:05 -07:00
Dianne Hackborn
dc994daed2
am 1d0086d9: Fix issue #2125720 Weather Forecast Widget - graphics do not scale
...
Merge commit '1d0086d999d56346b90538eb9b141a3744a1e79f' into eclair
* commit '1d0086d999d56346b90538eb9b141a3744a1e79f':
Fix issue #2125720 Weather Forecast Widget - graphics do not scale
2009-09-29 14:28:28 -07:00
Dianne Hackborn
57e31effa8
am b91024c1: Fix #2101821 : Cut labels of menu items in "SnapTell" market app.
...
Merge commit 'b91024c19c7c3182d926a199ad257b14513bb359' into eclair
* commit 'b91024c19c7c3182d926a199ad257b14513bb359':
Fix #2101821 : Cut labels of menu items in "SnapTell" market app.
2009-09-29 14:28:18 -07:00
Daisuke Miyakawa
9e2421a3a3
am a39f9188: Merge change I9c45753b into eclair
...
Merge commit 'a39f9188d6c1cdcacef2ab468fd78376171a3447' into eclair-plus-aosp
* commit 'a39f9188d6c1cdcacef2ab468fd78376171a3447':
Clean up vCard code.
2009-09-29 14:16:54 -07:00
Jason Parks
bc82ea5d44
am ac35dc47: Merge change I1cd7d0e5 into eclair
...
Merge commit 'ac35dc4716a448734493d939a1cb5af4d03cf41c' into eclair-plus-aosp
* commit 'ac35dc4716a448734493d939a1cb5af4d03cf41c':
Implement the checkin option in AccountManagerService.dump()
2009-09-29 14:13:53 -07:00
Mark Wagner
10662ae78f
am d35afcda: Merge change Ib2c6429d into eclair
...
Merge commit 'd35afcda674eaa0222f0adbf8d712bde3a388a39' into eclair-plus-aosp
* commit 'd35afcda674eaa0222f0adbf8d712bde3a388a39':
border for the non-badge case
2009-09-29 14:13:46 -07:00
Android (Google) Code Review
a39f9188d6
Merge change I9c45753b into eclair
...
* changes:
Clean up vCard code.
2009-09-29 17:09:55 -04:00