Commit Graph

5830 Commits

Author SHA1 Message Date
Romain Guy
7ad43363f1 am 91c6bdd2: Merge change I2e069577 into eclair
Merge commit '91c6bdd20365a5c6d33986cb941aa085864d016e' into eclair-plus-aosp

* commit '91c6bdd20365a5c6d33986cb941aa085864d016e':
  Simplify the layout of all activities with a title and a progress bar.
2009-09-29 17:31:58 -07:00
Android (Google) Code Review
15f1da46c7 Merge change I2e069577 into eclair
* changes:
  Simplify the layout of all activities with a title and a progress bar.
2009-09-29 20:27:22 -04:00
Christopher Tate
f30b6868e0 am 072c9e74: Merge change I52e20bac into eclair
Merge commit '072c9e7473f4ff1a1b08ec08a906cc8308ed1c91' into eclair-plus-aosp

* commit '072c9e7473f4ff1a1b08ec08a906cc8308ed1c91':
  Add more useful-for-debug info to 'dumpsys backup'
2009-09-29 17:22:32 -07:00
Romain Guy
1b290bcff7 am 92f0370c: Merge change Id43181f2 into eclair
Merge commit '92f0370cf09ef835c72099864fe7c0e7b7389877' into eclair-plus-aosp

* commit '92f0370cf09ef835c72099864fe7c0e7b7389877':
  Fix disabled text color in choice dialogs.
2009-09-29 17:22:26 -07:00
Android (Google) Code Review
c80f410ff3 Merge change I52e20bac into eclair
* changes:
  Add more useful-for-debug info to 'dumpsys backup'
2009-09-29 20:18:44 -04:00
Android (Google) Code Review
a637521ac3 Merge change Id43181f2 into eclair
* changes:
  Fix disabled text color in choice dialogs.
2009-09-29 20:13:09 -04:00
Chih-Chung Chang
121b93a7d1 am 8bbba0e3: Merge change If5722b3f into eclair
Merge commit '8bbba0e35b0dd5191c94b2aa039aa4eae0aecad0' into eclair-plus-aosp

* commit '8bbba0e35b0dd5191c94b2aa039aa4eae0aecad0':
  Dont NPE if the thumbnail file cannot be opened.
2009-09-29 17:00:24 -07:00
Android (Google) Code Review
f4b84db760 Merge change If5722b3f into eclair
* changes:
  Dont NPE if the thumbnail file cannot be opened.
2009-09-29 19:52:23 -04:00
Guang Zhu
bc5e6a32e8 am 277a41a7: Merge change Ia0609a0d into eclair
Merge commit '277a41a771c56727ad7456dad23f964e9e3ed546' into eclair-plus-aosp

* commit '277a41a771c56727ad7456dad23f964e9e3ed546':
  rebase layout test result as the numbers reported are much more stable now
2009-09-29 16:34:42 -07:00
Android (Google) Code Review
dea9859094 Merge change Ia0609a0d into eclair
* changes:
  rebase layout test result as the numbers reported are much more stable now
2009-09-29 19:27:09 -04:00
Christopher Tate
f803913203 am 49de6949: Merge change Ia75da053 into eclair
Merge commit '49de69498f6814e93939a0a0a357ac56697ef4ff' into eclair-plus-aosp

* commit '49de69498f6814e93939a0a0a357ac56697ef4ff':
  Remove DEBUG-only logging in metadata backup agent
2009-09-29 16:19:15 -07:00
Android (Google) Code Review
7a07c4a940 Merge change Ia75da053 into eclair
* changes:
  Remove DEBUG-only logging in metadata backup agent
2009-09-29 19:11:49 -04:00
Evan Millar
96bfe6519a am c4e20e9e: Merge change Iae12c7f0 into eclair
Merge commit 'c4e20e9e1ab761a6ec0766ef7cb649acca4fdc5f' into eclair-plus-aosp

* commit 'c4e20e9e1ab761a6ec0766ef7cb649acca4fdc5f':
  Add REQUESTING_PACKAGE_PARAM_KEY.
2009-09-29 16:01:34 -07:00
Naveen Kalla
732ed570c8 am 6189fd98: Merge change I27d074e0 into eclair
Merge commit '6189fd98c063a0c7655066c0ae019051feb7d5aa' into eclair-plus-aosp

* commit '6189fd98c063a0c7655066c0ae019051feb7d5aa':
  Telephony: Add a failure cause for CDMA call failures and rename
2009-09-29 15:51:45 -07:00
Jim Miller
3079384361 am 98747715: Merge change I88614e93 into eclair
Merge commit '987477159fb003aaf70c7e3ef17c0830fa8fe39c' into eclair-plus-aosp

* commit '987477159fb003aaf70c7e3ef17c0830fa8fe39c':
  Fix for 2137900: Be more conservative about poking the wakelock.
2009-09-29 15:51:38 -07:00
Android (Google) Code Review
5330eca9a7 Merge change Iae12c7f0 into eclair
* changes:
  Add REQUESTING_PACKAGE_PARAM_KEY.
2009-09-29 18:51:10 -04:00
Android (Google) Code Review
3d4fe7a96b Merge change I27d074e0 into eclair
* changes:
  Telephony: Add a failure cause for CDMA call failures and rename RIL_REQUEST_CDMA_VALIDATE_AKEY to RIL_REQUEST_CDMA_VALIDATE_AND_WRITE_AKEY
2009-09-29 18:47:17 -04:00
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
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
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