Commit Graph

3931 Commits

Author SHA1 Message Date
Fred Quintana
93277bff26 am 5fe00057: Merge change 22549 into eclair
Merge commit '5fe00057dd611fda30f44edb98771e38bf452ecd' into eclair-plus-aosp

* commit '5fe00057dd611fda30f44edb98771e38bf452ecd':
  - make it ok to modify the accounts before boot
2009-08-25 11:49:22 -07:00
Android (Google) Code Review
b7963dc029 Merge change 22549 into eclair
* changes:
  - make it ok to modify the accounts before boot - allow packages in the system image to access any authtokens they wish
2009-08-25 11:47:11 -07:00
Mike Reed
b83b9d7485 am dbade9d6: expose runtime changes to gamma
Merge commit 'dbade9d6a075b1d5b8ebe10ee8961a5de296c93b' into eclair-plus-aosp

* commit 'dbade9d6a075b1d5b8ebe10ee8961a5de296c93b':
  expose runtime changes to gamma
2009-08-25 10:58:07 -07:00
Yu Shan Emily Lau
0017620346 am 523018f1: am b56de747: Revert " modified: MediaFrameworkTest/src/com/android/mediaframeworktest/functional/MediaPlayerApiTest.java"
Merge commit '523018f1828884e96b1265f3e347410280577945' into eclair-plus-aosp

* commit '523018f1828884e96b1265f3e347410280577945':
  Revert "	modified:   MediaFrameworkTest/src/com/android/mediaframeworktest/functional/MediaPlayerApiTest.java"
2009-08-25 10:44:04 -07:00
Yu Shan Emily Lau
479a38ab8d am b56de747: Revert " modified: MediaFrameworkTest/src/com/android/mediaframeworktest/functional/MediaPlayerApiTest.java"
Merge commit 'b56de7474d93e634f77be58a794fbd1b0e68f6a8' into eclair

* commit 'b56de7474d93e634f77be58a794fbd1b0e68f6a8':
  Revert "	modified:   MediaFrameworkTest/src/com/android/mediaframeworktest/functional/MediaPlayerApiTest.java"
2009-08-25 10:42:02 -07:00
Amith Yamasani
4d26c12248 am 91ba1c3f: Merge change 22521 into eclair
Merge commit '91ba1c3f9d000928a4ba12d45d609b1c2e7066e7' into eclair-plus-aosp

* commit '91ba1c3f9d000928a4ba12d45d609b1c2e7066e7':
  Revert volume if it wasn't okayed by user.
2009-08-25 10:25:20 -07:00
Android (Google) Code Review
e99a269ec4 Merge change 22521 into eclair
* changes:
  Revert volume if it wasn't okayed by user.
2009-08-25 10:23:29 -07:00
Karl Rosaen
45536d95ff am 678771b8: New strings and utlity method tweaks associated with updated account unlock screen flow.
Merge commit '678771b8118c3289aff6814775cbb30fa8aada29' into eclair-plus-aosp

* commit '678771b8118c3289aff6814775cbb30fa8aada29':
  New strings and utlity method tweaks associated with updated account unlock screen flow.
2009-08-25 09:32:52 -07:00
Chih-Chung Chang
e4262e7fd1 am 4804c3e2: Merge change 22564 into eclair
Merge commit '4804c3e23b0bb8e77b690df177ebd4d6fb949aa8' into eclair-plus-aosp

* commit '4804c3e23b0bb8e77b690df177ebd4d6fb949aa8':
  Add an extra intent parameter for recording duration limit.
2009-08-24 23:58:32 -07:00
Android (Google) Code Review
8dd42efe9d Merge change 22564 into eclair
* changes:
  Add an extra intent parameter for recording duration limit.
2009-08-24 23:56:49 -07:00
Jeff Sharkey
bf567e2972 am f7eab4f7: Don\'t use deprecated API in contact header widget.
Merge commit 'f7eab4f78fe4bdb193a4f8caf2648d2cb3ef36ea' into eclair-plus-aosp

* commit 'f7eab4f78fe4bdb193a4f8caf2648d2cb3ef36ea':
  Don't use deprecated API in contact header widget.
2009-08-24 22:09:24 -07:00
Mathias Agopian
281f6da601 am d6bfef36: Merge change 22563 into eclair
Merge commit 'd6bfef3647162785bc3206c2d4e3e8ceba1dca45' into eclair-plus-aosp

* commit 'd6bfef3647162785bc3206c2d4e3e8ceba1dca45':
  fix a bug recently introduced where EGL couldn't be initialized again after it had been terminated once
2009-08-24 21:50:00 -07:00
Android (Google) Code Review
fa15ca09e2 Merge change 22563 into eclair
* changes:
  fix a bug recently introduced where EGL couldn't be initialized again after it had been terminated once
2009-08-24 21:48:07 -07:00
Mathias Agopian
a69e0ed4a3 fix a bug recently introduced where EGL couldn't be initialized again after it had been terminated once 2009-08-24 21:47:13 -07:00
Guang Zhu
c2715c249a am 45e38f84: Merge change 22559 into eclair
Merge commit '45e38f84612eee82d53bf8be2776be79c7d8c015' into eclair-plus-aosp

* commit '45e38f84612eee82d53bf8be2776be79c7d8c015':
  Filter out worker tests from layout suite because merely disabling worker in webview settings no longer works.
2009-08-24 21:04:18 -07:00
Android (Google) Code Review
7a94e61653 Merge change 22559 into eclair
* changes:
  Filter out worker tests from layout suite because merely disabling worker in webview settings no longer works.
2009-08-24 21:03:20 -07:00
Dianne Hackborn
5d2f089073 am 0d05be3f: Merge change 22544 into eclair
Merge commit '0d05be3f724740eb95ac5acd9819b4db0eccd694' into eclair-plus-aosp

* commit '0d05be3f724740eb95ac5acd9819b4db0eccd694':
  Fix bug that would leave old windows around.
2009-08-24 20:23:11 -07:00
Android (Google) Code Review
a6fe7831cd Merge change 22544 into eclair
* changes:
  Fix bug that would leave old windows around.
2009-08-24 20:20:51 -07:00
Jackson Fan
1612290279 am 094f44ba: Merge change 22545 into eclair
Merge commit '094f44ba6c8e70dc38a4f8d9ac5f20890e4477da' into eclair-plus-aosp

* commit '094f44ba6c8e70dc38a4f8d9ac5f20890e4477da':
  Use correct UUID to authorize AVRCP
2009-08-24 19:07:21 -07:00
Android (Google) Code Review
cd1ecc383c Merge change 22545 into eclair
* changes:
  Use correct UUID to authorize AVRCP
2009-08-24 19:05:06 -07:00
Dianne Hackborn
3e2209b1a1 am 07c82855: Merge change 22537 into eclair
Merge commit '07c8285599f99d5e512269fa68f0233ca8133073' into eclair-plus-aosp

* commit '07c8285599f99d5e512269fa68f0233ca8133073':
  Fix build.
2009-08-24 18:29:13 -07:00
Mathias Agopian
e75aa99a31 am 048d51b9: Merge change 22257 into eclair
Merge commit '048d51b9f51e646046b9a7ff5153723a27200138' into eclair-plus-aosp

* commit '048d51b9f51e646046b9a7ff5153723a27200138':
  first step for fixing [2066786] EGL object lifetime management doesn't respect the EGL spec
2009-08-24 18:29:10 -07:00
Android (Google) Code Review
95b1ee391a Merge change 22537 into eclair
* changes:
  Fix build.
2009-08-24 18:27:55 -07:00
Android (Google) Code Review
ab48633d60 Merge change 22257 into eclair
* changes:
  first step for fixing [2066786] EGL object lifetime management doesn't respect the EGL spec
2009-08-24 18:26:52 -07:00
Mike Lockwood
7b3f9724fa am 4358731c: Merge change 22534 into eclair
Merge commit '4358731c98929e2d5af70b0c4983a872386569bd' into eclair-plus-aosp

* commit '4358731c98929e2d5af70b0c4983a872386569bd':
  ContactsContract: Fix null pointer exception in openContactPhotoInputStream()
2009-08-24 18:22:44 -07:00
Android (Google) Code Review
75000f666f Merge change 22534 into eclair
* changes:
  ContactsContract: Fix null pointer exception in openContactPhotoInputStream()
2009-08-24 18:20:41 -07:00
Robert Greenwalt
951320c6fc am 0badd0b7: Note net availability even when apn not enabled
Merge commit '0badd0b700ed618dac421cb6cde4654b51acb3a4' into eclair-plus-aosp

* commit '0badd0b700ed618dac421cb6cde4654b51acb3a4':
  Note net availability even when apn not enabled
2009-08-24 17:47:01 -07:00
Dianne Hackborn
16627286d7 am 4a51c20c: I am getting tired of the java doc warnings, so fix them.
Merge commit '4a51c20ce607c74914f90fd897f04080121ac13b' into eclair-plus-aosp

* commit '4a51c20ce607c74914f90fd897f04080121ac13b':
  I am getting tired of the java doc warnings, so fix them.
2009-08-24 17:39:35 -07:00
Dianne Hackborn
43a9ebc343 am cf3a0830: Merge change 22400 into eclair
Merge commit 'cf3a08307d1599eaa91d7cc4e7c601e5fa13037f' into eclair-plus-aosp

* commit 'cf3a08307d1599eaa91d7cc4e7c601e5fa13037f':
  Add more control over a service's start state.
2009-08-24 17:04:01 -07:00
Android (Google) Code Review
6a595e4b30 Merge change 22400 into eclair
* changes:
  Add more control over a service's start state.
2009-08-24 17:01:50 -07:00
Robert Greenwalt
d2f3d6b34f am ec9fe467: Fix a race condition for data change notification
Merge commit 'ec9fe4672a46eb928ab710d8e3caf2ce046100d4' into eclair-plus-aosp

* commit 'ec9fe4672a46eb928ab710d8e3caf2ce046100d4':
  Fix a race condition for data change notification
2009-08-24 16:39:35 -07:00
Mike Lockwood
0de8cfb1eb am 2e951b55: Merge change 22493 into eclair
Merge commit '2e951b5511750ebfbba28263ee5384bfa7f45128' into eclair-plus-aosp

* commit '2e951b5511750ebfbba28263ee5384bfa7f45128':
  Add resources to specify display rotation when in keyboard open or docked state.
2009-08-24 15:43:29 -07:00
Android (Google) Code Review
7d22f78233 Merge change 22493 into eclair
* changes:
  Add resources to specify display rotation when in keyboard open or docked state.
2009-08-24 15:41:30 -07:00
Scott Main
f3819c4e41 am e120cfd4: am b385508d: Add more code samples to the online docs. Add build rules to include the development samples in the droiddoc build process. Add all the sample screenshots to a new samples/images/ directory Revise the samples homepage to include links to new
Merge commit 'e120cfd49fa27d04ed119e6922568eca2a9d6f9e' into eclair-plus-aosp

* commit 'e120cfd49fa27d04ed119e6922568eca2a9d6f9e':
  Add more code samples to the online docs.
2009-08-24 15:37:08 -07:00
Scott Main
d5729e31fc am b385508d: Add more code samples to the online docs. Add build rules to include the development samples in the droiddoc build process. Add all the sample screenshots to a new samples/images/ directory Revise the samples homepage to include links to new samples
Merge commit 'b385508d89747e4c383979f1cc6fa2814b1cedbd' into eclair

* commit 'b385508d89747e4c383979f1cc6fa2814b1cedbd':
  Add more code samples to the online docs.
2009-08-24 15:35:28 -07:00
Wei Huang
31d701929f am 5e6ad478: Merge change 22496 into eclair
Merge commit '5e6ad4786d599e17c1736cf52e5846a44e19d374' into eclair-plus-aosp

* commit '5e6ad4786d599e17c1736cf52e5846a44e19d374':
  fix typo
2009-08-24 15:07:01 -07:00
Android (Google) Code Review
73eff1bf36 Merge change 22496 into eclair
* changes:
  fix typo
2009-08-24 15:04:46 -07:00
Cynthia Wong
52cd39a900 am cb7d3838: Subscribe to subscribedfeeds whenever the accounts change, this is basically a giant hack to let the gsync server know about the subscriptions for accounts.
Merge commit 'cb7d38380cb2ca57e98cd39a96b32a1e804bf00b' into eclair-plus-aosp

* commit 'cb7d38380cb2ca57e98cd39a96b32a1e804bf00b':
  Subscribe to subscribedfeeds whenever the accounts change, this is basically a giant hack to let the gsync server know about the subscriptions for accounts.
2009-08-24 14:44:11 -07:00
Leon Scroggins
3e1865687b am 7bc08e9d: Merge change 21944 into eclair
Merge commit '7bc08e9d51d3142717a94098f897a776f7b7bd71' into eclair-plus-aosp

* commit '7bc08e9d51d3142717a94098f897a776f7b7bd71':
  Implement new title bar hiding/showing behavior.
2009-08-24 14:15:47 -07:00
Android (Google) Code Review
cce089bd4f Merge change 21944 into eclair
* changes:
  Implement new title bar hiding/showing behavior.
2009-08-24 14:13:05 -07:00
Mike Lockwood
95509769b1 am ac8ebcd1: Merge change 22478 into eclair
Merge commit 'ac8ebcd1071b433c1c5093e7a5bcb67224f5f620' into eclair-plus-aosp

* commit 'ac8ebcd1071b433c1c5093e7a5bcb67224f5f620':
  DockObserver: minor cleanup.
2009-08-24 14:01:21 -07:00
Android (Google) Code Review
32f8f6ae4c Merge change 22478 into eclair
* changes:
  DockObserver: minor cleanup.
2009-08-24 13:59:29 -07:00
Satish Roddom
ae943c8e21 am c0234a9d: Merge change 22474 into eclair
Merge commit 'c0234a9df9cffc0166c39eb0e8561d664a5438a3' into eclair-plus-aosp

* commit 'c0234a9df9cffc0166c39eb0e8561d664a5438a3':
  Compose Message "To" field allows adding sequence of characters as contact
2009-08-24 13:47:45 -07:00
Android (Google) Code Review
1a595a3572 Merge change 22474 into eclair
* changes:
  Compose Message "To" field allows adding sequence of characters as contact
2009-08-24 13:45:30 -07:00
Mike Lockwood
f69c5040be am 4df8dd8a: Merge change 22470 into eclair
Merge commit '4df8dd8aea518644a4f937eff5e7ac87f77ad9c2' into eclair-plus-aosp

* commit '4df8dd8aea518644a4f937eff5e7ac87f77ad9c2':
  Fix some Javadoc typos.
2009-08-24 13:17:23 -07:00
Romain Guy
b2b546eb84 am 40ed81ec: Merge change 22472 into eclair
Merge commit '40ed81ec98e4c221e90273a8b842b1d110d8258b' into eclair-plus-aosp

* commit '40ed81ec98e4c221e90273a8b842b1d110d8258b':
  Remove Galaxy Render Script, replaced by its wallpaper equivalent.
2009-08-24 13:16:01 -07:00
Android (Google) Code Review
7c7c861f54 Merge change 22470 into eclair
* changes:
  Fix some Javadoc typos.
2009-08-24 13:15:47 -07:00
Android (Google) Code Review
646b318ba3 Merge change 22472 into eclair
* changes:
  Remove Galaxy Render Script, replaced by its wallpaper equivalent.
2009-08-24 13:14:25 -07:00
Derek Sollenberger
aa8765c31d am df8a3f31: adding harness for plugin testing to be built upon
Merge commit 'df8a3f31d871db25e952972c2eb346a71186e9e3' into eclair-plus-aosp

* commit 'df8a3f31d871db25e952972c2eb346a71186e9e3':
  adding harness for plugin testing to be built upon
2009-08-24 12:19:20 -07:00
Cary Clark
949aeae147 am 840b856d: Merge change 22452 into eclair
Merge commit '840b856d2a7287e98526d3957715eba3677e872f' into eclair-plus-aosp

* commit '840b856d2a7287e98526d3957715eba3677e872f':
  don't center zoom on size change if zoom is in progress
2009-08-24 11:50:15 -07:00