Commit Graph

5866 Commits

Author SHA1 Message Date
Android (Google) Code Review
0c7ea96327 Merge change I88614e93 into eclair
* changes:
  Fix for 2137900: Be more conservative about poking the wakelock.
2009-09-29 18:41:52 -04:00
Android (Google) Code Review
1e66abfe50 Merge change I499f8819 into donut
* changes:
  Add density support to layoutlib so that bitmap are scaled if needed.
2009-09-29 18:24:44 -04:00
Romain Guy
37c53d1bac am 8eb0f348: Merge change I67285c9a into eclair
Merge commit '8eb0f348931c9185ae6a8f49964c904c42b2bb57' into eclair-plus-aosp

* commit '8eb0f348931c9185ae6a8f49964c904c42b2bb57':
  Prevent NPE when doing a fillSpecific layout.
2009-09-29 15:24:12 -07:00
lknguyen
588ca77786 am de04cb81: Merge change Ie9f76062 into eclair
Merge commit 'de04cb810f47c679583767df78f8490d96d310d1' into eclair-plus-aosp

* commit 'de04cb810f47c679583767df78f8490d96d310d1':
  Add Gservices flag for Vending doctor download complete timeout.
2009-09-29 15:24:05 -07:00
Android (Google) Code Review
b16f03272d Merge change I67285c9a into eclair
* changes:
  Prevent NPE when doing a fillSpecific layout.
2009-09-29 18:19:05 -04:00
Eric Laurent
96dcf64638 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
b87846bd02 Merge change Ie9f76062 into eclair
* changes:
  Add Gservices flag for Vending doctor download complete timeout.
2009-09-29 18:16:52 -04:00
Android (Google) Code Review
db013ad6a7 Merge change I19f2928b into eclair
* changes:
  Fix issue 2141503: Keyclick sound doesn't honor volume settings.
2009-09-29 18:12:54 -04:00
Romain Guy
2ece05e85b 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
6ccec9ad4f Merge change Id16e0e13 into donut
* changes:
  Add density value to density enum.
2009-09-29 17:56:16 -04:00
Android (Google) Code Review
209876df1a Merge change Ia4e59dbb into donut
* changes:
  Add a new IResourceValue that knows about the density.
2009-09-29 17:55:27 -04:00
Android (Google) Code Review
55731c884f Merge change I24cf40af into eclair
* changes:
  New assets for the status and title bars.
2009-09-29 17:50:01 -04:00
Dianne Hackborn
adc9e8e80c 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
a196a35d2d 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
4c85c3a15c 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
f5ed83d20e 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
4ee64afa56 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
3b29b6d8a7 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
59917bebfa 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
1e6c4eec17 Merge change I9c45753b into eclair
* changes:
  Clean up vCard code.
2009-09-29 17:09:55 -04:00
Android (Google) Code Review
b84dca94c3 Merge change I1cd7d0e5 into eclair
* changes:
  Implement the checkin option in AccountManagerService.dump()
2009-09-29 17:06:57 -04:00
Daniel Sandler
bf123120c9 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
66841f22d8 Merge change Ib2c6429d into eclair
* changes:
  border for the non-badge case
2009-09-29 17:06:23 -04:00
Android (Google) Code Review
7a11364427 Merge change I905b03af into eclair
* changes:
  New hdpi assets for framework.
2009-09-29 17:01:38 -04:00
James Dong
311d4ee405 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
1faf4ec5af 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
d8f053442d 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
405e31fa85 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
edd941fabd 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
ddf4c211cf 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
1ad5c88d94 Merge change Ide90d0cc into eclair
* changes:
  Unify Java NIO to read/write MiniThumbFile.
2009-09-29 16:24:22 -04:00
Romain Guy
b759abffeb 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
3d6facd16f 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
Android (Google) Code Review
0ec07a11cf Merge change Iee9b30d3 into eclair
* changes:
  New icons
2009-09-29 16:12:52 -04:00
Cary Clark
a95a203def am eaa18dec: scroll text field with touch
Merge commit 'eaa18dec91b6dd0ce3191a9ab65cdc95ef68b935' into eclair-plus-aosp

* commit 'eaa18dec91b6dd0ce3191a9ab65cdc95ef68b935':
  scroll text field with touch
2009-09-29 12:51:19 -07:00
Jeff Hamilton
99b26279c8 am f993fefc: Merge change Icbd74742 into eclair
Merge commit 'f993fefc3b14ece3f0f3eac6bb3d241bffb3cdfb' into eclair-plus-aosp

* commit 'f993fefc3b14ece3f0f3eac6bb3d241bffb3cdfb':
  EventLog when a database file is deleted due to corruption.
2009-09-29 12:22:22 -07:00
Dianne Hackborn
916c8ed001 am 87937ae8: Merge change I66057b1f into eclair
Merge commit '87937ae89e77c804b1b3c8fcc3d4225fa99390b7' into eclair-plus-aosp

* commit '87937ae89e77c804b1b3c8fcc3d4225fa99390b7':
  Whoops, these shouldn't be public.
2009-09-29 12:22:14 -07:00
Android (Google) Code Review
89beed49e2 Merge change Icbd74742 into eclair
* changes:
  EventLog when a database file is deleted due to corruption.
2009-09-29 15:15:21 -04:00
Android (Google) Code Review
2012852361 Merge change I66057b1f into eclair
* changes:
  Whoops, these shouldn't be public.
2009-09-29 15:12:30 -04:00
Leon Scroggins
316bfbddc1 am d84e7d53: Allow scrolls to continue when getting a new content size.
Merge commit 'd84e7d53d379c9fdfe335f40e89e2dfd6144dfea' into eclair-plus-aosp

* commit 'd84e7d53d379c9fdfe335f40e89e2dfd6144dfea':
  Allow scrolls to continue when getting a new content size.
2009-09-29 12:09:01 -07:00
Dianne Hackborn
cbd405121c am fff0b4a6: Fix build.
Merge commit 'fff0b4a6c22c458b6a05bc1fd8840b4bc09be38e' into eclair-plus-aosp

* commit 'fff0b4a6c22c458b6a05bc1fd8840b4bc09be38e':
  Fix build.
2009-09-29 11:28:01 -07:00
Dianne Hackborn
fa314549c2 am b6eaaa2a: Clean up cacheColorHint to be better controlled by the theme.
Merge commit 'b6eaaa2ab2a43193b6fec3790a7e413b8e28733a' into eclair-plus-aosp

* commit 'b6eaaa2ab2a43193b6fec3790a7e413b8e28733a':
  Clean up cacheColorHint to be better controlled by the theme.
2009-09-29 11:08:54 -07:00
Dianne Hackborn
f678d89917 am 490d5222: Merge change I6cacaa0d into eclair
Merge commit '490d5222ae985f7e606cdf503d292062c80e7328' into eclair-plus-aosp

* commit '490d5222ae985f7e606cdf503d292062c80e7328':
  Hack to fix issue #2125365: Sports Trivia compatability with Eclair
2009-09-29 10:49:26 -07:00
Evan Millar
1968f9f12a am 22cbf51e: Merge change I49fbfc68 into eclair
Merge commit '22cbf51ef5f374cb32be3295d7de3f7be404e5be' into eclair-plus-aosp

* commit '22cbf51ef5f374cb32be3295d7de3f7be404e5be':
  Add PhoneNumberUtils.compare() method that uses a resource to determine strictness.
2009-09-29 10:49:19 -07:00
John Wang
c266faf72b am ac5bd144: Merge change Ib23e57cf into eclair
Merge commit 'ac5bd144f1add259d53f2e09dc0cef38f1f5bd3f' into eclair-plus-aosp

* commit 'ac5bd144f1add259d53f2e09dc0cef38f1f5bd3f':
  Set roaming based on both data and voice.
2009-09-29 10:49:12 -07:00
Android (Google) Code Review
c0c25099ef Merge change I6cacaa0d into eclair
* changes:
  Hack to fix issue #2125365: Sports Trivia compatability with Eclair
2009-09-29 13:44:47 -04:00
Android (Google) Code Review
3ca28c3cd3 Merge change I49fbfc68 into eclair
* changes:
  Add PhoneNumberUtils.compare() method that uses a resource to determine strictness.
2009-09-29 13:43:17 -04:00
Android (Google) Code Review
58e1cbe812 Merge change Ib23e57cf into eclair
* changes:
  Set roaming based on both data and voice.
2009-09-29 13:26:06 -04:00
Dirk Dougherty
c66769a2e0 am b0702880: am 50128088: Merge change I915efc49 into donut
Merge commit 'b0702880a35d0214bac20973e1459459c52a1e36' into eclair-plus-aosp

* commit 'b0702880a35d0214bac20973e1459459c52a1e36':
  Update docs for NDK.
2009-09-29 10:19:20 -07:00
Dirk Dougherty
9036d89025 am e34569fa: am bc0e07bf: Merge change I7b64ad2e into donut
Merge commit 'e34569fa54471214c3b58dd23ec17be900240a74' into eclair-plus-aosp

* commit 'e34569fa54471214c3b58dd23ec17be900240a74':
  doc change only. fix toc links on terms page.
2009-09-29 10:19:13 -07:00