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
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
Daniel Sandler
9b19bfa1b5
am c78b2bf4: Merge change I905b03af into eclair
...
Merge commit 'c78b2bf474623eaa83ef517c4d648aa6595b8575' into eclair-plus-aosp
* commit 'c78b2bf474623eaa83ef517c4d648aa6595b8575':
New hdpi assets for framework.
2009-09-29 14:06:35 -07:00
Android (Google) Code Review
d35afcda67
Merge change Ib2c6429d into eclair
...
* changes:
border for the non-badge case
2009-09-29 17:06:23 -04:00
Android (Google) Code Review
c78b2bf474
Merge change I905b03af into eclair
...
* changes:
New hdpi assets for framework.
2009-09-29 17:01:38 -04:00
Daniel Sandler
5d94052e11
New hdpi assets for framework.
...
Drop dated 29-Sep-2009.
Change-Id: I905b03af2a55f188d0461dc809a7ec155c8bbddb
2009-09-29 17:00:45 -04:00
James Dong
b8bf70acee
am 4c232c5b: Merge change Idd16976f into eclair
...
Merge commit '4c232c5b3f7fcbea73cd3cec2d3befe06e85c068' into eclair-plus-aosp
* commit '4c232c5b3f7fcbea73cd3cec2d3befe06e85c068':
Fix some metadata retriever issues:
2009-09-29 13:32:28 -07:00
Robert Greenwalt
fa62a0478e
am ab18206e: Merge change Ifc9dd5c6 into eclair
...
Merge commit 'ab18206e209e1ef019c2837856ff53c635d3032f' into eclair-plus-aosp
* commit 'ab18206e209e1ef019c2837856ff53c635d3032f':
Fix the reporting of ActiveApnTypes on CDMA
2009-09-29 13:32:21 -07:00
Ray Chen
06e5b76667
am 0167263b: Merge change Ide90d0cc into eclair
...
Merge commit '0167263bf457164a17f612ec551313f1b9e42972' into eclair-plus-aosp
* commit '0167263bf457164a17f612ec551313f1b9e42972':
Unify Java NIO to read/write MiniThumbFile.
2009-09-29 13:32:14 -07:00
Cary Clark
dfab8b6870
am 4fbf81bc: check for null item in web history in saveState
...
Merge commit '4fbf81bc94f38a630de49445e3eb4880289c6a6e' into eclair-plus-aosp
* commit '4fbf81bc94f38a630de49445e3eb4880289c6a6e':
check for null item in web history in saveState
2009-09-29 13:32:08 -07:00
Android (Google) Code Review
4c232c5b3f
Merge change Idd16976f into eclair
...
* changes:
Fix some metadata retriever issues: 1. mRetriever was initialized twice: one in the constructor and the other in the setDataSource 2. cached the mode so that setMode can still be called before setDataSource. mRetriever won't be initialized until data source is set; thus we have to do this
2009-09-29 16:27:27 -04:00
Android (Google) Code Review
ab18206e20
Merge change Ifc9dd5c6 into eclair
...
* changes:
Fix the reporting of ActiveApnTypes on CDMA
2009-09-29 16:25:55 -04:00
Android (Google) Code Review
0167263bf4
Merge change Ide90d0cc into eclair
...
* changes:
Unify Java NIO to read/write MiniThumbFile.
2009-09-29 16:24:22 -04:00
Robert Greenwalt
c46c255f7f
Fix the reporting of ActiveApnTypes on CDMA
...
Previous fix limiting what was reported active was too strict, leading to
DISCONNECTED messages not being accepted (apn list was empty).
bug: 2151520
2009-09-29 13:23:45 -07:00
Romain Guy
75ef523465
am bd5b5722: absf() -> fabsf() instead of fabs()
...
Merge commit 'bd5b57227954e27ca05932721a6917c6edde17b3' into eclair-plus-aosp
* commit 'bd5b57227954e27ca05932721a6917c6edde17b3':
absf() -> fabsf() instead of fabs()
2009-09-29 13:22:09 -07:00
Mike Cleron
03ecab4252
am 7957eaa6: Merge change Iee9b30d3 into eclair
...
Merge commit '7957eaa69f069781d8067f8806062330572ff82c' into eclair-plus-aosp
* commit '7957eaa69f069781d8067f8806062330572ff82c':
New icons
2009-09-29 13:22:02 -07:00
Cary Clark
4fbf81bc94
check for null item in web history in saveState
...
fixes http://b/issue?id=215369
2009-09-29 16:21:25 -04:00
Romain Guy
bd5b572279
absf() -> fabsf() instead of fabs()
...
Change-Id: I5571a635757295aa1514aeaff72e80cc3dd8752c
2009-09-29 13:17:27 -07:00
Android (Google) Code Review
7957eaa69f
Merge change Iee9b30d3 into eclair
...
* changes:
New icons
2009-09-29 16:12:52 -04:00
Ray Chen
ecc97cc949
Unify Java NIO to read/write MiniThumbFile.
2009-09-29 13:11:20 -07:00
Mike Cleron
ee9b30d394
New icons
2009-09-29 13:01:09 -07:00