OSDN Git Service
Jean-Baptiste Queru [Fri, 4 Sep 2009 14:54:30 +0000 (07:54 -0700)]
merge from open-source master
Eddie Ho [Fri, 4 Sep 2009 11:50:59 +0000 (04:50 -0700)]
am
71119048: Merge change 23949 into eclair
Merge commit '
7111904802934e1fa4cf68c445f13c34c30c9cdb' into eclair-plus-aosp
* commit '
7111904802934e1fa4cf68c445f13c34c30c9cdb':
GPS: Fix race condition reporting NMEA data.
Android (Google) Code Review [Fri, 4 Sep 2009 11:49:11 +0000 (04:49 -0700)]
Merge change 23949 into eclair
* changes:
GPS: Fix race condition reporting NMEA data.
Andrei Popescu [Fri, 4 Sep 2009 10:29:36 +0000 (03:29 -0700)]
am
34619494: Merge change 23804 into eclair
Merge commit '
34619494e009d998f5c073145c0481e38bbd2bcf' into eclair-plus-aosp
* commit '
34619494e009d998f5c073145c0481e38bbd2bcf':
Fix appcache layout test that was timing out due to race condition in WebView::addJavascriptInterface.
Android (Google) Code Review [Fri, 4 Sep 2009 10:27:47 +0000 (03:27 -0700)]
Merge change 23804 into eclair
* changes:
Fix appcache layout test that was timing out due to race condition in WebView::addJavascriptInterface.
Jesse Wilson [Fri, 4 Sep 2009 01:23:40 +0000 (18:23 -0700)]
am
f163f7f0: do not merge: fix API current.xml for Hashtable.
Merge commit '
f163f7f0f29f0898eb82f54cf657cb34668abade' into eclair-plus-aosp
* commit '
f163f7f0f29f0898eb82f54cf657cb34668abade':
do not merge: fix API current.xml for Hashtable.
Jesse Wilson [Fri, 4 Sep 2009 00:50:58 +0000 (17:50 -0700)]
am
6de753bf: do not merge: update API for Josh\'s optimizations for Eclair
Merge commit '
6de753bffe47e796942272692869992f62f8f0ab' into eclair-plus-aosp
* commit '
6de753bffe47e796942272692869992f62f8f0ab':
do not merge: update API for Josh's optimizations for Eclair
Dmitri Plotnikov [Thu, 3 Sep 2009 23:31:26 +0000 (16:31 -0700)]
am
1ab3ebad: Merge change 23906 into eclair
Merge commit '
1ab3ebad95e6b537719ee2f608c1fbc321e51f06' into eclair-plus-aosp
* commit '
1ab3ebad95e6b537719ee2f608c1fbc321e51f06':
Removing references to deprecated API and the deprecated API itself.
Android (Google) Code Review [Thu, 3 Sep 2009 23:29:44 +0000 (16:29 -0700)]
Merge change 23906 into eclair
* changes:
Removing references to deprecated API and the deprecated API itself.
Andreas Huber [Thu, 3 Sep 2009 23:25:48 +0000 (16:25 -0700)]
am
a19cb68b: Merge change 23908 into eclair
Merge commit '
a19cb68b2d010718467564733e6eaef2aaf4d0b8' into eclair-plus-aosp
* commit '
a19cb68b2d010718467564733e6eaef2aaf4d0b8':
Add another testcase for moto to reproduce bug #
2099685 to the stagefright commandline app.
Android (Google) Code Review [Thu, 3 Sep 2009 23:24:46 +0000 (16:24 -0700)]
Merge change 23908 into eclair
* changes:
Add another testcase for moto to reproduce bug #
2099685 to the stagefright commandline app.
Wink Saville [Thu, 3 Sep 2009 22:56:10 +0000 (15:56 -0700)]
am
ccc41a26: Merge change 23870 into eclair
Merge commit '
ccc41a26b8e1d702c1ccec1642758bde52e1b435' into eclair-plus-aosp
* commit '
ccc41a26b8e1d702c1ccec1642758bde52e1b435':
Allow hasIccCard to be useable by any processes.
Android (Google) Code Review [Thu, 3 Sep 2009 22:54:22 +0000 (15:54 -0700)]
Merge change 23870 into eclair
* changes:
Allow hasIccCard to be useable by any processes.
Jason Sams [Thu, 3 Sep 2009 22:50:02 +0000 (15:50 -0700)]
am
4879d0d0: Merge change 23890 into eclair
Merge commit '
4879d0d0a41c8f082facd6172221d0c36f21c6c2' into eclair-plus-aosp
* commit '
4879d0d0a41c8f082facd6172221d0c36f21c6c2':
Improve structure support using symbol lookup of named structures in scripts to allow them to appear as just pointers to structs.
Android (Google) Code Review [Thu, 3 Sep 2009 22:47:39 +0000 (15:47 -0700)]
Merge change 23890 into eclair
* changes:
Improve structure support using symbol lookup of named structures in scripts to allow them to appear as just pointers to structs.
Jean-Baptiste Queru [Thu, 3 Sep 2009 22:18:14 +0000 (15:18 -0700)]
merge from donut
Jaikumar Ganesh [Thu, 3 Sep 2009 21:46:03 +0000 (14:46 -0700)]
am
7c599e02: Merge change 21774 into eclair
Merge commit '
7c599e0288fb4ad9d393467458f59c45638d04ec' into eclair-plus-aosp
* commit '
7c599e0288fb4ad9d393467458f59c45638d04ec':
Implement USIM and add support for importing emails from USIM.
Android (Google) Code Review [Thu, 3 Sep 2009 21:45:00 +0000 (14:45 -0700)]
Merge change 21774 into eclair
* changes:
Implement USIM and add support for importing emails from USIM.
Dianne Hackborn [Thu, 3 Sep 2009 21:37:37 +0000 (14:37 -0700)]
am
ebf0bbaa: Merge change 23868 into eclair
Merge commit '
ebf0bbaaf03269eda9831e3c6b5ff82010b1de57' into eclair-plus-aosp
* commit '
ebf0bbaaf03269eda9831e3c6b5ff82010b1de57':
Add better service reporting.
Mike Lockwood [Thu, 3 Sep 2009 21:37:33 +0000 (14:37 -0700)]
am
e131b746: Merge change 23861 into eclair
Merge commit '
e131b7466c8b817896a618efe4b34eed5d3e51f9' into eclair-plus-aosp
* commit '
e131b7466c8b817896a618efe4b34eed5d3e51f9':
Replace the bugreport symlink with a tool that starts the new dumpstate service.
Android (Google) Code Review [Thu, 3 Sep 2009 21:36:28 +0000 (14:36 -0700)]
Merge change 23868 into eclair
* changes:
Add better service reporting.
Android (Google) Code Review [Thu, 3 Sep 2009 21:18:51 +0000 (14:18 -0700)]
Merge change 23861 into eclair
* changes:
Replace the bugreport symlink with a tool that starts the new dumpstate service.
Cynthia Wong [Thu, 3 Sep 2009 21:18:25 +0000 (14:18 -0700)]
am
7a260ba9: Merge change 23824 into eclair
Merge commit '
7a260ba96869ddae47afe773d3dae7a6a8c2b9c3' into eclair-plus-aosp
* commit '
7a260ba96869ddae47afe773d3dae7a6a8c2b9c3':
Override getAccounts to return an empty AccountSet in MockAccountManager. This used to throw an NPE instead since IAccountManagerService is set to NULL.
Android (Google) Code Review [Thu, 3 Sep 2009 21:16:57 +0000 (14:16 -0700)]
Merge change 23824 into eclair
* changes:
Override getAccounts to return an empty AccountSet in MockAccountManager. This used to throw an NPE instead since IAccountManagerService is set to NULL.
Xia Wang [Thu, 3 Sep 2009 20:37:05 +0000 (13:37 -0700)]
am
19d6f7ac: Merge change 23750 into eclair
Merge commit '
19d6f7ac27448b59c936878756bad49f623a6a99' into eclair-plus-aosp
* commit '
19d6f7ac27448b59c936878756bad49f623a6a99':
Add a test case to measure the power usage of loading a web page
Android (Google) Code Review [Thu, 3 Sep 2009 20:34:58 +0000 (13:34 -0700)]
Merge change 23750 into eclair
* changes:
Add a test case to measure the power usage of loading a web page
Robert Greenwalt [Thu, 3 Sep 2009 20:05:00 +0000 (13:05 -0700)]
am
1c1ffa0c: Promote MccTable to telephony and use it for both gsm/cdma
Merge commit '
1c1ffa0cab8b56274970736d7f3b8c00c01c3d2b' into eclair-plus-aosp
* commit '
1c1ffa0cab8b56274970736d7f3b8c00c01c3d2b':
Promote MccTable to telephony and use it for both gsm/cdma
Marco Nelissen [Thu, 3 Sep 2009 19:29:51 +0000 (12:29 -0700)]
am
e1da8be5: Merge change 23835 into eclair
Merge commit '
e1da8be501e953cdf50b0ba2edf8fe68af8cf2b9' into eclair-plus-aosp
* commit '
e1da8be501e953cdf50b0ba2edf8fe68af8cf2b9':
When encountering a .nomedia file, notify the MediaScannerClient,
Android (Google) Code Review [Thu, 3 Sep 2009 19:27:26 +0000 (12:27 -0700)]
Merge change 23835 into eclair
* changes:
When encountering a .nomedia file, notify the MediaScannerClient, so that it can erase the data column for entries that are in the folder containing the .nomedia file. This prevents us from deleting (via a delete trigger) files when somebody adds a .nomedia file after the fact.
Leon Scroggins [Thu, 3 Sep 2009 18:44:43 +0000 (11:44 -0700)]
am
b00fc735: Merge change 23760 into eclair
Merge commit '
b00fc7357f50ba0ebc1a5e48be2a1ee096bf1b67' into eclair-plus-aosp
* commit '
b00fc7357f50ba0ebc1a5e48be2a1ee096bf1b67':
Attach the title bar to the top of the page.
Android (Google) Code Review [Thu, 3 Sep 2009 18:43:06 +0000 (11:43 -0700)]
Merge change 23760 into eclair
* changes:
Attach the title bar to the top of the page.
Mike Lockwood [Thu, 3 Sep 2009 18:42:21 +0000 (11:42 -0700)]
am
fbd9b87f: Merge change 23807 into eclair
Merge commit '
fbd9b87feab649dc7410711ceaa589e5f058c753' into eclair-plus-aosp
* commit '
fbd9b87feab649dc7410711ceaa589e5f058c753':
Add support for running apps with uid/gid AID_LOG by specifying android.uid.log in the manifest
Android (Google) Code Review [Thu, 3 Sep 2009 18:40:42 +0000 (11:40 -0700)]
Merge change 23807 into eclair
* changes:
Add support for running apps with uid/gid AID_LOG by specifying android.uid.log in the manifest
Daniel Sandler [Thu, 3 Sep 2009 18:25:37 +0000 (11:25 -0700)]
am
704a488e: Merge change 23833 into eclair
Merge commit '
704a488ef5f5b50ed82332cbff8d6d982ac09118' into eclair-plus-aosp
* commit '
704a488ef5f5b50ed82332cbff8d6d982ac09118':
New, darker tab widgets for the platform.
Android (Google) Code Review [Thu, 3 Sep 2009 18:23:22 +0000 (11:23 -0700)]
Merge change 23833 into eclair
* changes:
New, darker tab widgets for the platform.
Mike Reed [Thu, 3 Sep 2009 17:48:29 +0000 (10:48 -0700)]
am
70fc6257: Merge change 23828 into eclair
Merge commit '
70fc625745b5c6303951113e6d17ea57870fe2f7' into eclair-plus-aosp
* commit '
70fc625745b5c6303951113e6d17ea57870fe2f7':
allow subclassing for drawing vertical scrollbar, so that clients (e.g. webview) can resize/position
Android (Google) Code Review [Thu, 3 Sep 2009 17:46:59 +0000 (10:46 -0700)]
Merge change 23828 into eclair
* changes:
allow subclassing for drawing vertical scrollbar, so that clients (e.g. webview) can resize/position
Andreas Huber [Thu, 3 Sep 2009 16:42:15 +0000 (09:42 -0700)]
am
f6190284: Merge change 23715 into eclair
Merge commit '
f619028470b63ba1c8e9d86fd2faab7bbece873b' into eclair-plus-aosp
* commit '
f619028470b63ba1c8e9d86fd2faab7bbece873b':
Setting the component role appears to be mandatory now for all mime types.
Andreas Huber [Thu, 3 Sep 2009 16:42:07 +0000 (09:42 -0700)]
am
8e65337d: Merge change 23714 into eclair
Merge commit '
8e65337d06a1cc4fe896d17a947d46ae5f7257a8' into eclair-plus-aosp
* commit '
8e65337d06a1cc4fe896d17a947d46ae5f7257a8':
Some work to make audio encoding work.
Android (Google) Code Review [Thu, 3 Sep 2009 16:40:17 +0000 (09:40 -0700)]
Merge change 23715 into eclair
* changes:
Setting the component role appears to be mandatory now for all mime types.
Android (Google) Code Review [Thu, 3 Sep 2009 16:40:08 +0000 (09:40 -0700)]
Merge change 23714 into eclair
* changes:
Some work to make audio encoding work.
Libin Tang [Thu, 3 Sep 2009 16:37:33 +0000 (09:37 -0700)]
am
a7d7a86b: Merge change 23818 into eclair
Merge commit '
a7d7a86b328ac3d506b02ad5d5abc5d8c27b41c5' into eclair-plus-aosp
* commit '
a7d7a86b328ac3d506b02ad5d5abc5d8c27b41c5':
Exit Emergency Callback Mode if phone process crashes/restarts
Jeff Hamilton [Thu, 3 Sep 2009 16:36:02 +0000 (09:36 -0700)]
am
505cbb44: Merge change 23811 into eclair
Merge commit '
505cbb446d46466230c23a09b2ceb201b8faae8f' into eclair-plus-aosp
* commit '
505cbb446d46466230c23a09b2ceb201b8faae8f':
Fix the registration of the package changes broadcast receiver.
Android (Google) Code Review [Thu, 3 Sep 2009 16:35:25 +0000 (09:35 -0700)]
Merge change 23818 into eclair
* changes:
Exit Emergency Callback Mode if phone process crashes/restarts
Android (Google) Code Review [Thu, 3 Sep 2009 16:33:44 +0000 (09:33 -0700)]
Merge change 23811 into eclair
* changes:
Fix the registration of the package changes broadcast receiver.
Steve Block [Thu, 3 Sep 2009 16:26:05 +0000 (09:26 -0700)]
am
b84138c7: Merge change 23806 into eclair
Merge commit '
b84138c72c94f189d4656451097b90f86d751731' into eclair-plus-aosp
* commit '
b84138c72c94f189d4656451097b90f86d751731':
Handle security exception when Geolocation registers with system location service in DumpRenderTree.
Android (Google) Code Review [Thu, 3 Sep 2009 16:24:15 +0000 (09:24 -0700)]
Merge change 23806 into eclair
* changes:
Handle security exception when Geolocation registers with system location service in DumpRenderTree.
Robert Greenwalt [Thu, 3 Sep 2009 16:11:10 +0000 (09:11 -0700)]
am
e8f605ff: Merge change 23761 into eclair
Merge commit '
e8f605ff44664d0ecc9a5a24886176ef447db2a9' into eclair-plus-aosp
* commit '
e8f605ff44664d0ecc9a5a24886176ef447db2a9':
Fix compilation of add-resource tag.
Android (Google) Code Review [Thu, 3 Sep 2009 16:08:24 +0000 (09:08 -0700)]
Merge change 23761 into eclair
* changes:
Fix compilation of add-resource tag.
Daniel Sandler [Thu, 3 Sep 2009 15:51:35 +0000 (08:51 -0700)]
am
47cec9fa: Merge change 23817 into eclair
Merge commit '
47cec9fafbef30b817ac0a8af510ac35e09ea966' into eclair-plus-aosp
* commit '
47cec9fafbef30b817ac0a8af510ac35e09ea966':
Fix http://b/issue?id=
2096107 (cosmetic issue for menus in WVGA)
Android (Google) Code Review [Thu, 3 Sep 2009 15:49:56 +0000 (08:49 -0700)]
Merge change 23817 into eclair
* changes:
Fix http://b/issue?id=
2096107 (cosmetic issue for menus in WVGA)
Eric Laurent [Thu, 3 Sep 2009 15:02:53 +0000 (08:02 -0700)]
am
1a3af62b: Merge change 23801 into eclair
Merge commit '
1a3af62bfb3583ac2fece18523927587b6b6a277' into eclair-plus-aosp
* commit '
1a3af62bfb3583ac2fece18523927587b6b6a277':
fix issue
2096657: Sholes: residue shutter sound heard ONCE while taking a picture AFTER the volume is turned off.
Eric Laurent [Thu, 3 Sep 2009 15:02:46 +0000 (08:02 -0700)]
am
cabd01f4: Merge change 23798 into eclair
Merge commit '
cabd01f42afd0661d6a29217c62353c2eae3149a' into eclair-plus-aosp
* commit '
cabd01f42afd0661d6a29217c62353c2eae3149a':
Fix issue
2097083: STREAM_SYSTEM should be at max volume.
Android (Google) Code Review [Thu, 3 Sep 2009 15:01:09 +0000 (08:01 -0700)]
Merge change 23801 into eclair
* changes:
fix issue
2096657: Sholes: residue shutter sound heard ONCE while taking a picture AFTER the volume is turned off.
Android (Google) Code Review [Thu, 3 Sep 2009 15:00:30 +0000 (08:00 -0700)]
Merge change 23798 into eclair
* changes:
Fix issue
2097083: STREAM_SYSTEM should be at max volume.
Eric Laurent [Thu, 3 Sep 2009 10:45:52 +0000 (03:45 -0700)]
fix issue
2096657: Sholes: residue shutter sound heard ONCE while taking a picture AFTER the volume is turned off.
Do not ramp volume if the first frame of a track is processed after the track was stopped.
In the case of very short sounds, the track stop request can be received by AudioFlinger just after the start request before the first frame is mixed by AudioMixer. In this case, the track is already in stopped state and initial volume is applied with a ramp for the first frame processed which should not be the case: initial volume change is always applied immediatelly.
Wei Huang [Thu, 3 Sep 2009 08:35:35 +0000 (01:35 -0700)]
am
558340f2: Merge change 23793 into eclair
Merge commit '
558340f2143b5efe4bc14b901ae1dc1b8cec7901' into eclair-plus-aosp
* commit '
558340f2143b5efe4bc14b901ae1dc1b8cec7901':
add conditional verbose logging for when sending a SMS message.
Android (Google) Code Review [Thu, 3 Sep 2009 08:33:44 +0000 (01:33 -0700)]
Merge change 23793 into eclair
* changes:
add conditional verbose logging for when sending a SMS message.
Dianne Hackborn [Thu, 3 Sep 2009 07:29:09 +0000 (00:29 -0700)]
am
85644d78: Really fix issue #:
2097189 can\'t set custom wallpaper
Merge commit '
85644d78894b66fa2903fb012b5122185767d1c5' into eclair-plus-aosp
* commit '
85644d78894b66fa2903fb012b5122185767d1c5':
Really fix issue #:
2097189 can't set custom wallpaper
Jeff Sharkey [Thu, 3 Sep 2009 06:20:48 +0000 (23:20 -0700)]
am
0c36a517: Add private API for data with presence.
Merge commit '
0c36a517cd01a7112460a96f9f0fa2badf8f7015' into eclair-plus-aosp
* commit '
0c36a517cd01a7112460a96f9f0fa2badf8f7015':
Add private API for data with presence.
Dianne Hackborn [Thu, 3 Sep 2009 06:19:07 +0000 (23:19 -0700)]
am
e3c393d3: Merge change 23787 into eclair
Merge commit '
e3c393d3d14dab5b1eab37d2c52b7283df253f7f' into eclair-plus-aosp
* commit '
e3c393d3d14dab5b1eab37d2c52b7283df253f7f':
Fix issue #
2097313: Latin IME crashes first use
Android (Google) Code Review [Thu, 3 Sep 2009 06:11:16 +0000 (23:11 -0700)]
Merge change 23787 into eclair
* changes:
Fix issue #
2097313: Latin IME crashes first use
Libin Tang [Thu, 3 Sep 2009 05:47:49 +0000 (22:47 -0700)]
am
e2c9187b: Merge change 23782 into eclair
Merge commit '
e2c9187b993a652fa8fdad516461ab66caa96cb4' into eclair-plus-aosp
* commit '
e2c9187b993a652fa8fdad516461ab66caa96cb4':
Fix the issue that dialing *86 during call, the dialing voicemail screen is not shown.
Dianne Hackborn [Thu, 3 Sep 2009 05:47:42 +0000 (22:47 -0700)]
am
3bb9c6d1: Merge change 23774 into eclair
Merge commit '
3bb9c6d1f5b252dc3ed7eb069ff5aeabd2b02548' into eclair-plus-aosp
* commit '
3bb9c6d1f5b252dc3ed7eb069ff5aeabd2b02548':
Fix issue #
2097189: can't set custom wallpaper
Dianne Hackborn [Thu, 3 Sep 2009 05:47:36 +0000 (22:47 -0700)]
am
bdd52b26: Fix issue #
2097060: Screen all messed up when setup wizard finished
Merge commit '
bdd52b264af8f562dd368d40b66771c88d45127f' into eclair-plus-aosp
* commit '
bdd52b264af8f562dd368d40b66771c88d45127f':
Fix issue #
2097060: Screen all messed up when setup wizard finished
Android (Google) Code Review [Thu, 3 Sep 2009 05:29:08 +0000 (22:29 -0700)]
Merge change 23782 into eclair
* changes:
Fix the issue that dialing *86 during call, the dialing voicemail screen is not shown.
Android (Google) Code Review [Thu, 3 Sep 2009 05:20:29 +0000 (22:20 -0700)]
Merge change 23774 into eclair
* changes:
Fix issue #
2097189: can't set custom wallpaper
Tammo Spalink [Thu, 3 Sep 2009 03:30:43 +0000 (20:30 -0700)]
am
fb16e5cc: Merge change 23607 into eclair
Merge commit '
fb16e5ccdb230a11cbbbfd17d323db7b88395c2f' into eclair-plus-aosp
* commit '
fb16e5ccdb230a11cbbbfd17d323db7b88395c2f':
Reject (NAK) CDMA SMS with unknown teleservice ids.
Android (Google) Code Review [Thu, 3 Sep 2009 03:29:09 +0000 (20:29 -0700)]
Merge change 23607 into eclair
* changes:
Reject (NAK) CDMA SMS with unknown teleservice ids.
Scott Main [Thu, 3 Sep 2009 03:24:09 +0000 (20:24 -0700)]
am
8f99b524: am
b6b25d63: Merge change 23126 into donut
Merge commit '
8f99b52484369a3a9221733c9817f6c09ba1ec85' into eclair-plus-aosp
* commit '
8f99b52484369a3a9221733c9817f6c09ba1ec85':
docs only.
Dmitri Plotnikov [Thu, 3 Sep 2009 03:24:04 +0000 (20:24 -0700)]
am
622da682: Merge change 23765 into eclair
Merge commit '
622da6829f11f0cacdbd6fe3b58f230d98115ed5' into eclair-plus-aosp
* commit '
622da6829f11f0cacdbd6fe3b58f230d98115ed5':
[Issue
2087123] Suppressing all exception when trying to load a photo for the in-call UI
Scott Main [Thu, 3 Sep 2009 03:21:42 +0000 (20:21 -0700)]
Android (Google) Code Review [Thu, 3 Sep 2009 03:19:39 +0000 (20:19 -0700)]
Merge change 23126 into donut
* changes:
docs only. add documentation about zipalign and new auto-signing procedures for Ant
Android (Google) Code Review [Thu, 3 Sep 2009 02:35:07 +0000 (19:35 -0700)]
Merge change 23765 into eclair
* changes:
[Issue
2087123] Suppressing all exception when trying to load a photo for the in-call UI
Dirk Dougherty [Thu, 3 Sep 2009 02:34:00 +0000 (19:34 -0700)]
am
5f7cee89: am
2a2058f5: Merge change 23762 into donut
Merge commit '
5f7cee89ca6670cefe91192e364037ee6ce39b19' into eclair-plus-aosp
* commit '
5f7cee89ca6670cefe91192e364037ee6ce39b19':
Add updated API diff based on 4.xml.
Dirk Dougherty [Thu, 3 Sep 2009 02:32:02 +0000 (19:32 -0700)]
am
2a2058f5: Merge change 23762 into donut
Merge commit '
2a2058f5a31e3bace3d0284fb1259a9ddcbec3a5' into eclair
* commit '
2a2058f5a31e3bace3d0284fb1259a9ddcbec3a5':
Add updated API diff based on 4.xml.
Android (Google) Code Review [Thu, 3 Sep 2009 02:29:45 +0000 (19:29 -0700)]
Merge change 23762 into donut
* changes:
Add updated API diff based on 4.xml.
Dirk Dougherty [Thu, 3 Sep 2009 02:16:26 +0000 (19:16 -0700)]
am
618ded26: am
a6602f1f: Add docs for SDK update. Add redirects for preview files. Manually integrate a few doc changes from cupcake.
Merge commit '
618ded26c61afbf907e72b4568a4f4f1c6c287a7' into eclair-plus-aosp
* commit '
618ded26c61afbf907e72b4568a4f4f1c6c287a7':
Add docs for SDK update.
Jason Sams [Thu, 3 Sep 2009 02:16:20 +0000 (19:16 -0700)]
am
e00d660a: Merge change 23584 into eclair
Merge commit '
e00d660aba91a7a682f83b2e0216296b0f3cca64' into eclair-plus-aosp
* commit '
e00d660aba91a7a682f83b2e0216296b0f3cca64':
Simple app to create a gl2 context and dump the strings.
Dirk Dougherty [Thu, 3 Sep 2009 02:14:24 +0000 (19:14 -0700)]
am
a6602f1f: Add docs for SDK update. Add redirects for preview files. Manually integrate a few doc changes from cupcake.
Merge commit '
a6602f1fe4590e48c760f21ce29a92629240c463' into eclair
* commit '
a6602f1fe4590e48c760f21ce29a92629240c463':
Add docs for SDK update.
Android (Google) Code Review [Thu, 3 Sep 2009 02:13:10 +0000 (19:13 -0700)]
Merge change 23584 into eclair
* changes:
Simple app to create a gl2 context and dump the strings.
Dianne Hackborn [Thu, 3 Sep 2009 01:20:52 +0000 (18:20 -0700)]
am
6e478d7a: Merge change 23751 into eclair
Merge commit '
6e478d7afb33eff4efe704a16b1a05435b431062' into eclair-plus-aosp
* commit '
6e478d7afb33eff4efe704a16b1a05435b431062':
Fix deadlock in wallpaper.
Android (Google) Code Review [Thu, 3 Sep 2009 01:18:59 +0000 (18:18 -0700)]
Merge change 23751 into eclair
* changes:
Fix deadlock in wallpaper.
Scott Main [Thu, 3 Sep 2009 01:00:28 +0000 (18:00 -0700)]
am
3e21bf47: am
96b7f921: Merge change 23565 into donut
Merge commit '
3e21bf473a89688918f4e59fac4ba2d4539e3775' into eclair-plus-aosp
* commit '
3e21bf473a89688918f4e59fac4ba2d4539e3775':
docs only.
Scott Main [Thu, 3 Sep 2009 00:58:12 +0000 (17:58 -0700)]
Dianne Hackborn [Thu, 3 Sep 2009 00:57:49 +0000 (17:57 -0700)]
am
78c951b2: Merge change 23704 into eclair
Merge commit '
78c951b286ad6fc5300e2d30a624b7e9963202e7' into eclair-plus-aosp
* commit '
78c951b286ad6fc5300e2d30a624b7e9963202e7':
Fiddle system boot ordering.
Android (Google) Code Review [Thu, 3 Sep 2009 00:55:35 +0000 (17:55 -0700)]
Merge change 23704 into eclair
* changes:
Fiddle system boot ordering.
Android (Google) Code Review [Thu, 3 Sep 2009 00:55:32 +0000 (17:55 -0700)]
Merge change 23565 into donut
* changes:
docs only. add new announcement for 1.6 sdk to homepage
Mike Lockwood [Thu, 3 Sep 2009 00:42:36 +0000 (17:42 -0700)]
am
1ff04118: Merge change 23693 into eclair
Merge commit '
1ff041180c66ef6f1020cf5314a665d319e9ac86' into eclair-plus-aosp
* commit '
1ff041180c66ef6f1020cf5314a665d319e9ac86':
dumpstate: Add option to output to socket, disable code that switched to nonroot
Christian Sonntag [Thu, 3 Sep 2009 00:40:51 +0000 (17:40 -0700)]
Android (Google) Code Review [Thu, 3 Sep 2009 00:40:20 +0000 (17:40 -0700)]
Merge change 23693 into eclair
* changes:
dumpstate: Add option to output to socket, disable code that switched to nonroot
Christian Sonntag [Thu, 3 Sep 2009 00:27:36 +0000 (17:27 -0700)]
am
75f1d43b: Merge change 23738 into eclair
Merge commit '
75f1d43b64cbf4b68ad62919a0c58907933ccd59' into eclair-plus-aosp
* commit '
75f1d43b64cbf4b68ad62919a0c58907933ccd59':
fix doc
Android (Google) Code Review [Thu, 3 Sep 2009 00:25:35 +0000 (17:25 -0700)]
Merge change 23738 into eclair
* changes:
fix doc
Dianne Hackborn [Thu, 3 Sep 2009 00:24:02 +0000 (17:24 -0700)]
am
6db4303d: Merge change 23568 into eclair
Merge commit '
6db4303d04d138cd2648b829306c4b1693ac12e8' into eclair-plus-aosp
* commit '
6db4303d04d138cd2648b829306c4b1693ac12e8':
Work on issue #
2079167: Flickering issue across multiple UI
Android (Google) Code Review [Thu, 3 Sep 2009 00:21:35 +0000 (17:21 -0700)]
Merge change 23568 into eclair
* changes:
Work on issue #
2079167: Flickering issue across multiple UI
Dianne Hackborn [Wed, 2 Sep 2009 02:01:50 +0000 (19:01 -0700)]
Work on issue #
2079167: Flickering issue across multiple UI
This addresses a few parts of the bug:
- There was a small issue in the window manager where we could show a window
too early before the transition animation starts, which was introduced
by the recent wallpaper work. This was the cause of the flicker when
starting the dialer for the first time.
- There was a much larger problem that has existing forever where moving
an application token to the front or back was not synchronized with the
application animation transaction. This was the cause of the flicker
when hanging up (now that the in-call screen moves to the back instead
of closing and we always have a wallpaper visible). The approach to
solving this is to have the window manager go ahead and move the app
tokens (it must in order to keep in sync with the activity manager), but
to delay the actual window movement: perform the movement to front when
the animation starts, and to back when it ends. Actually, when the
animation ends, we just go and completely rebuild the window list to
ensure it is correct, because there can be ways people can add windows
while in this intermediate state where they could end up at the wrong
place once we do the delayed movement to the front or back. And it is
simply reasuring to know that every time we finish a full app transition,
we re-evaluate the world and put everything in its proper place.
Also included in this change are a few little tweaks to the input system,
to perform better logging, and completely ignore input devices that do not
have any of our input classes. There is also a little cleanup of evaluating
configuration changes to not do more work than needed when an input
devices appears or disappears, and to only log a config change message when
the config is truly changing.
Change-Id: Ifb2db77f8867435121722a6abeb946ec7c3ea9d3
Rebecca Schultz Zavin [Thu, 3 Sep 2009 00:07:41 +0000 (17:07 -0700)]
am
458e9186: Merge change 23720 into eclair
Merge commit '
458e9186c175f87c420b7f82e91c0afa695c8ebb' into eclair-plus-aosp
* commit '
458e9186c175f87c420b7f82e91c0afa695c8ebb':
Add colorkey to gl clear operation
Fred Quintana [Thu, 3 Sep 2009 00:07:35 +0000 (17:07 -0700)]
am
14de0880: Merge change 23698 into eclair
Merge commit '
14de0880dd7b716f39b822917e874ca5e579ff37' into eclair-plus-aosp
* commit '
14de0880dd7b716f39b822917e874ca5e579ff37':
suppress syncs until boot is complete
Android (Google) Code Review [Thu, 3 Sep 2009 00:05:31 +0000 (17:05 -0700)]
Merge change 23720 into eclair
* changes:
Add colorkey to gl clear operation
Android (Google) Code Review [Wed, 2 Sep 2009 23:50:13 +0000 (16:50 -0700)]
Merge change 23698 into eclair
* changes:
suppress syncs until boot is complete