OSDN Git Service
Andrei Popescu [Thu, 8 Apr 2010 16:16:35 +0000 (09:16 -0700)]
am
ec472da7: am
1531d211: am
3fe36fe5: Merge "Avoid calling proxy.playbackEnded() again in onCustomViewHidden(). It is now always called via the MediaPlayer.onCompletion() callback." into froyo
Andrei Popescu [Thu, 8 Apr 2010 16:12:43 +0000 (09:12 -0700)]
am
1531d211: am
3fe36fe5: Merge "Avoid calling proxy.playbackEnded() again in onCustomViewHidden(). It is now always called via the MediaPlayer.onCompletion() callback." into froyo
Merge commit '
1531d211249783bdfc3ded9323397f22a5f1fc34' into kraken
* commit '
1531d211249783bdfc3ded9323397f22a5f1fc34':
Avoid calling proxy.playbackEnded() again in onCustomViewHidden().
Andrei Popescu [Thu, 8 Apr 2010 16:10:09 +0000 (09:10 -0700)]
am
3fe36fe5: Merge "Avoid calling proxy.playbackEnded() again in onCustomViewHidden(). It is now always called via the MediaPlayer.onCompletion() callback." into froyo
Merge commit '
3fe36fe589809b732db12054428166adb069f53b' into froyo-plus-aosp
* commit '
3fe36fe589809b732db12054428166adb069f53b':
Avoid calling proxy.playbackEnded() again in onCustomViewHidden().
Andrei Popescu [Thu, 8 Apr 2010 16:07:32 +0000 (09:07 -0700)]
Merge "Avoid calling proxy.playbackEnded() again in onCustomViewHidden(). It is now always called via the MediaPlayer.onCompletion() callback." into froyo
Andreas Huber [Thu, 8 Apr 2010 15:43:30 +0000 (08:43 -0700)]
am
c63c6e97: am
d06c435c: am
c6c8a1e9: Merge "Increase the size of the pages used in CachingDataSource (total amount of memory used remains the same) to compensate for reduced locality of audio/video data requests. Also fixes a mistaken trailing "\r\n" in the range he
Andreas Huber [Thu, 8 Apr 2010 15:35:53 +0000 (08:35 -0700)]
am
d06c435c: am
c6c8a1e9: Merge "Increase the size of the pages used in CachingDataSource (total amount of memory used remains the same) to compensate for reduced locality of audio/video data requests. Also fixes a mistaken trailing "\r\n" in the range header and bett
Merge commit '
d06c435c3f520ef2012fdd331dac76b1621a72e6' into kraken
* commit '
d06c435c3f520ef2012fdd331dac76b1621a72e6':
Increase the size of the pages used in CachingDataSource (total amount of memory used remains the same) to compensate for reduced locality of audio/video data requests. Also fixes a mistaken trailing "\r\n" in the range header and better error handling on http connection.
Andreas Huber [Thu, 8 Apr 2010 15:31:20 +0000 (08:31 -0700)]
am
c6c8a1e9: Merge "Increase the size of the pages used in CachingDataSource (total amount of memory used remains the same) to compensate for reduced locality of audio/video data requests. Also fixes a mistaken trailing "\r\n" in the range header and better error hand
Merge commit '
c6c8a1e96f2cccb7b2bf7aec5140a3eacb7a922a' into froyo-plus-aosp
* commit '
c6c8a1e96f2cccb7b2bf7aec5140a3eacb7a922a':
Increase the size of the pages used in CachingDataSource (total amount of memory used remains the same) to compensate for reduced locality of audio/video data requests. Also fixes a mistaken trailing "\r\n" in the range header and better error handling on http connection.
Andreas Huber [Thu, 8 Apr 2010 15:27:20 +0000 (08:27 -0700)]
Merge "Increase the size of the pages used in CachingDataSource (total amount of memory used remains the same) to compensate for reduced locality of audio/video data requests. Also fixes a mistaken trailing "\r\n" in the range header and better error handling on http connection." into froyo
Daniel Sandler [Thu, 8 Apr 2010 13:35:40 +0000 (06:35 -0700)]
am
715896be: am
6fec76a0: am
8d318958: Merge "Transparent alarm icons for lockscreen." into froyo
Daniel Sandler [Thu, 8 Apr 2010 13:35:34 +0000 (06:35 -0700)]
am
8c66936a: am
07023777: am
9f71025b: Merge "Add emergency call button to PUK\'d lockscreen." into froyo
Daniel Sandler [Thu, 8 Apr 2010 13:33:26 +0000 (06:33 -0700)]
am
6fec76a0: am
8d318958: Merge "Transparent alarm icons for lockscreen." into froyo
Merge commit '
6fec76a081fd5976c3d7d0aa9616d5680ccb237f' into kraken
* commit '
6fec76a081fd5976c3d7d0aa9616d5680ccb237f':
Transparent alarm icons for lockscreen.
Daniel Sandler [Thu, 8 Apr 2010 13:33:23 +0000 (06:33 -0700)]
am
07023777: am
9f71025b: Merge "Add emergency call button to PUK\'d lockscreen." into froyo
Merge commit '
070237771e89bbf027ed85302df7a91fae0fa5c2' into kraken
* commit '
070237771e89bbf027ed85302df7a91fae0fa5c2':
Add emergency call button to PUK'd lockscreen.
Daniel Sandler [Thu, 8 Apr 2010 13:10:12 +0000 (06:10 -0700)]
am
8d318958: Merge "Transparent alarm icons for lockscreen." into froyo
Merge commit '
8d318958a3eb3abac3696c436e27e51e0bc2c6f8' into froyo-plus-aosp
* commit '
8d318958a3eb3abac3696c436e27e51e0bc2c6f8':
Transparent alarm icons for lockscreen.
Daniel Sandler [Thu, 8 Apr 2010 13:10:09 +0000 (06:10 -0700)]
am
9f71025b: Merge "Add emergency call button to PUK\'d lockscreen." into froyo
Merge commit '
9f71025b376a0c43d49b5c9c3f3f83942fd2f9b7' into froyo-plus-aosp
* commit '
9f71025b376a0c43d49b5c9c3f3f83942fd2f9b7':
Add emergency call button to PUK'd lockscreen.
Daniel Sandler [Thu, 8 Apr 2010 13:07:57 +0000 (06:07 -0700)]
Merge "Transparent alarm icons for lockscreen." into froyo
Daniel Sandler [Thu, 8 Apr 2010 13:06:50 +0000 (06:06 -0700)]
Merge "Add emergency call button to PUK'd lockscreen." into froyo
Dianne Hackborn [Thu, 8 Apr 2010 05:44:56 +0000 (22:44 -0700)]
am
b921b37b: am
a327dbdd: am
ecb0e637: Fix issue #
2541849: System crash when an app with active notifications...
Dianne Hackborn [Thu, 8 Apr 2010 05:42:46 +0000 (22:42 -0700)]
am
a327dbdd: am
ecb0e637: Fix issue #
2541849: System crash when an app with active notifications...
Merge commit '
a327dbddccb002919b98bdfd7abd81619826a3b8' into kraken
* commit '
a327dbddccb002919b98bdfd7abd81619826a3b8':
Fix issue #
2541849: System crash when an app with active notifications...
Dianne Hackborn [Thu, 8 Apr 2010 05:39:18 +0000 (22:39 -0700)]
am
ecb0e637: Fix issue #
2541849: System crash when an app with active notifications...
Merge commit '
ecb0e637870553f9c12dc6b9178de0512563af9c' into froyo-plus-aosp
* commit '
ecb0e637870553f9c12dc6b9178de0512563af9c':
Fix issue #
2541849: System crash when an app with active notifications...
Wu-cheng Li [Thu, 8 Apr 2010 05:06:37 +0000 (22:06 -0700)]
am
249c902c: am
75a9cbae: am
3f4639a6: Update API and javadoc according to API review.
Wu-cheng Li [Thu, 8 Apr 2010 05:01:54 +0000 (22:01 -0700)]
am
75a9cbae: am
3f4639a6: Update API and javadoc according to API review.
Merge commit '
75a9cbaea42d1e28957dd3ff59899b4c75ffd8db' into kraken
* commit '
75a9cbaea42d1e28957dd3ff59899b4c75ffd8db':
Update API and javadoc according to API review.
Wu-cheng Li [Thu, 8 Apr 2010 04:58:21 +0000 (21:58 -0700)]
am
3f4639a6: Update API and javadoc according to API review.
Merge commit '
3f4639a6611222ae1ae5493de49213250d292139' into froyo-plus-aosp
* commit '
3f4639a6611222ae1ae5493de49213250d292139':
Update API and javadoc according to API review.
Suchi Amalapurapu [Thu, 8 Apr 2010 04:36:43 +0000 (21:36 -0700)]
am
3e543abb: am
a599469f: am
c2461be6: Merge "Fix
2579461 Move install location values to secure settings. Diable attribute for UI. Set default value to auto. Add command line interface to set install location via pm." into froyo
Suchi Amalapurapu [Thu, 8 Apr 2010 04:32:30 +0000 (21:32 -0700)]
am
a599469f: am
c2461be6: Merge "Fix
2579461 Move install location values to secure settings. Diable attribute for UI. Set default value to auto. Add command line interface to set install location via pm." into froyo
Merge commit '
a599469f9095532cac95a8e7600412f156b88f1c' into kraken
* commit '
a599469f9095532cac95a8e7600412f156b88f1c':
Fix
2579461
Suchi Amalapurapu [Thu, 8 Apr 2010 04:29:05 +0000 (21:29 -0700)]
am
c2461be6: Merge "Fix
2579461 Move install location values to secure settings. Diable attribute for UI. Set default value to auto. Add command line interface to set install location via pm." into froyo
Merge commit '
c2461be6279137f872becf695befeb7ba8770a64' into froyo-plus-aosp
* commit '
c2461be6279137f872becf695befeb7ba8770a64':
Fix
2579461
Suchi Amalapurapu [Thu, 8 Apr 2010 04:24:36 +0000 (21:24 -0700)]
Merge "Fix
2579461 Move install location values to secure settings. Diable attribute for UI. Set default value to auto. Add command line interface to set install location via pm." into froyo
Dianne Hackborn [Thu, 8 Apr 2010 02:17:45 +0000 (19:17 -0700)]
am
d49c455c: am
822a7e2d: am
ce59fb8b: Fix issue #
2578244: playing audio file downloaded by the browser...
Grace Kloba [Thu, 8 Apr 2010 02:14:53 +0000 (19:14 -0700)]
am
962ebd1f: am
520d6840: am
667543cd: Merge "Revert "Use the content width to calculate the zoom overview"" into froyo
Dianne Hackborn [Thu, 8 Apr 2010 02:13:22 +0000 (19:13 -0700)]
am
822a7e2d: am
ce59fb8b: Fix issue #
2578244: playing audio file downloaded by the browser...
Merge commit '
822a7e2defcfbd006a7840e1da19cf0827d46736' into kraken
* commit '
822a7e2defcfbd006a7840e1da19cf0827d46736':
Fix issue #
2578244: playing audio file downloaded by the browser...
Dianne Hackborn [Thu, 8 Apr 2010 02:07:54 +0000 (19:07 -0700)]
am
ce59fb8b: Fix issue #
2578244: playing audio file downloaded by the browser...
Merge commit '
ce59fb8b684357f2a10ab62368beeece34bc0e5d' into froyo-plus-aosp
* commit '
ce59fb8b684357f2a10ab62368beeece34bc0e5d':
Fix issue #
2578244: playing audio file downloaded by the browser...
Grace Kloba [Thu, 8 Apr 2010 02:05:32 +0000 (19:05 -0700)]
am
520d6840: am
667543cd: Merge "Revert "Use the content width to calculate the zoom overview"" into froyo
Merge commit '
520d684093b50c25d06aac652ad4bca42ff7e862' into kraken
* commit '
520d684093b50c25d06aac652ad4bca42ff7e862':
Revert "Use the content width to calculate the zoom overview"
Grace Kloba [Thu, 8 Apr 2010 02:00:40 +0000 (19:00 -0700)]
am
667543cd: Merge "Revert "Use the content width to calculate the zoom overview"" into froyo
Merge commit '
667543cdb5aad1dc7ef567d57d34f1ac975b02a7' into froyo-plus-aosp
* commit '
667543cdb5aad1dc7ef567d57d34f1ac975b02a7':
Revert "Use the content width to calculate the zoom overview"
Dianne Hackborn [Thu, 8 Apr 2010 02:00:35 +0000 (19:00 -0700)]
am
d93df9ca: am
b37abe38: am
d3cc4967: Merge "Fix issue #
2549955: Moving the application fails -Activity Manager Crash on launching the app" into froyo
Grace Kloba [Thu, 8 Apr 2010 01:57:51 +0000 (18:57 -0700)]
Merge "Revert "Use the content width to calculate the zoom overview"" into froyo
Dianne Hackborn [Thu, 8 Apr 2010 01:57:33 +0000 (18:57 -0700)]
am
b37abe38: am
d3cc4967: Merge "Fix issue #
2549955: Moving the application fails -Activity Manager Crash on launching the app" into froyo
Merge commit '
b37abe3867d582d68918d38f0684783f457543bb' into kraken
* commit '
b37abe3867d582d68918d38f0684783f457543bb':
Fix issue #
2549955: Moving the application fails -Activity Manager Crash on launching the app
Dianne Hackborn [Thu, 8 Apr 2010 01:41:42 +0000 (18:41 -0700)]
am
d3cc4967: Merge "Fix issue #
2549955: Moving the application fails -Activity Manager Crash on launching the app" into froyo
Merge commit '
d3cc4967605e6c6b243a447d569fbb5b988a30ed' into froyo-plus-aosp
* commit '
d3cc4967605e6c6b243a447d569fbb5b988a30ed':
Fix issue #
2549955: Moving the application fails -Activity Manager Crash on launching the app
Dianne Hackborn [Thu, 8 Apr 2010 01:40:15 +0000 (18:40 -0700)]
am
90dd6462: am
48879933: am
390022b2: Merge "Fix issue #
2528537: android.os.DeadObjectException" into froyo
Dianne Hackborn [Thu, 8 Apr 2010 01:37:12 +0000 (18:37 -0700)]
am
48879933: am
390022b2: Merge "Fix issue #
2528537: android.os.DeadObjectException" into froyo
Merge commit '
4887993381af1068cb0c68b4eca29ed83ebf47bd' into kraken
* commit '
4887993381af1068cb0c68b4eca29ed83ebf47bd':
Fix issue #
2528537: android.os.DeadObjectException
Dianne Hackborn [Thu, 8 Apr 2010 01:37:04 +0000 (18:37 -0700)]
Merge "Fix issue #
2549955: Moving the application fails -Activity Manager Crash on launching the app" into froyo
Dianne Hackborn [Thu, 8 Apr 2010 01:33:23 +0000 (18:33 -0700)]
am
390022b2: Merge "Fix issue #
2528537: android.os.DeadObjectException" into froyo
Merge commit '
390022b23b2c53119ff0bde4b14d14728bc48bb2' into froyo-plus-aosp
* commit '
390022b23b2c53119ff0bde4b14d14728bc48bb2':
Fix issue #
2528537: android.os.DeadObjectException
Dianne Hackborn [Thu, 8 Apr 2010 01:31:06 +0000 (18:31 -0700)]
Merge "Fix issue #
2528537: android.os.DeadObjectException" into froyo
Grace Kloba [Thu, 8 Apr 2010 01:28:43 +0000 (18:28 -0700)]
am
c020ec57: am
edee621f: am
faa2d970: Merge "Cherry-pick https://android-git.corp.google.com/g/#change,38305" into froyo
Grace Kloba [Thu, 8 Apr 2010 01:26:38 +0000 (18:26 -0700)]
am
edee621f: am
faa2d970: Merge "Cherry-pick https://android-git.corp.google.com/g/#change,38305" into froyo
Merge commit '
edee621f5cdfa72437aa16a804ffc872f8ddf293' into kraken
* commit '
edee621f5cdfa72437aa16a804ffc872f8ddf293':
Cherry-pick https://android-git.corp.google.com/g/#change,38305
Grace Kloba [Thu, 8 Apr 2010 01:23:25 +0000 (18:23 -0700)]
am
faa2d970: Merge "Cherry-pick https://android-git.corp.google.com/g/#change,38305" into froyo
Merge commit '
faa2d970058557fa31d06d168b402d592c368aaf' into froyo-plus-aosp
* commit '
faa2d970058557fa31d06d168b402d592c368aaf':
Cherry-pick https://android-git.corp.google.com/g/#change,38305
Grace Kloba [Thu, 8 Apr 2010 01:18:17 +0000 (18:18 -0700)]
Merge "Cherry-pick https://android-git.corp.google.com/g/#change,38305" into froyo
John Wang [Thu, 8 Apr 2010 01:02:56 +0000 (18:02 -0700)]
am
90f2a71e: am
7ecf08fa: am
815b8e4a: Merge "Add emergencyOnly indicator in ServiceState." into froyo
John Wang [Thu, 8 Apr 2010 00:58:53 +0000 (17:58 -0700)]
am
7ecf08fa: am
815b8e4a: Merge "Add emergencyOnly indicator in ServiceState." into froyo
Merge commit '
7ecf08faa9da7d372dd319aac8b1e5760a116601' into kraken
* commit '
7ecf08faa9da7d372dd319aac8b1e5760a116601':
Add emergencyOnly indicator in ServiceState.
John Wang [Thu, 8 Apr 2010 00:54:27 +0000 (17:54 -0700)]
am
815b8e4a: Merge "Add emergencyOnly indicator in ServiceState." into froyo
Merge commit '
815b8e4ac4ddb20e8c0539ecba50c9e7382d0656' into froyo-plus-aosp
* commit '
815b8e4ac4ddb20e8c0539ecba50c9e7382d0656':
Add emergencyOnly indicator in ServiceState.
John Wang [Thu, 8 Apr 2010 00:51:41 +0000 (17:51 -0700)]
Merge "Add emergencyOnly indicator in ServiceState." into froyo
San Mehat [Wed, 7 Apr 2010 23:40:49 +0000 (16:40 -0700)]
am
12ebde61: am
692329cf: am
fd998a0c: Merge "NetworkManagementService: Remove \'maxkbs\' parameter from throttle API" into froyo
Suchi Amalapurapu [Wed, 7 Apr 2010 23:40:45 +0000 (16:40 -0700)]
am
070e1ecf: am
a137cf2a: am
4b18ced6: Merge "Fix
2578016." into froyo
San Mehat [Wed, 7 Apr 2010 23:36:07 +0000 (16:36 -0700)]
am
692329cf: am
fd998a0c: Merge "NetworkManagementService: Remove \'maxkbs\' parameter from throttle API" into froyo
Merge commit '
692329cf3f1512b3f0475b619058f9a10d9950a8' into kraken
* commit '
692329cf3f1512b3f0475b619058f9a10d9950a8':
NetworkManagementService: Remove 'maxkbs' parameter from throttle API
Suchi Amalapurapu [Wed, 7 Apr 2010 23:35:57 +0000 (16:35 -0700)]
San Mehat [Wed, 7 Apr 2010 23:32:29 +0000 (16:32 -0700)]
am
fd998a0c: Merge "NetworkManagementService: Remove \'maxkbs\' parameter from throttle API" into froyo
Merge commit '
fd998a0caf8cfcd27d1fe73120fbb897ec74af85' into froyo-plus-aosp
* commit '
fd998a0caf8cfcd27d1fe73120fbb897ec74af85':
NetworkManagementService: Remove 'maxkbs' parameter from throttle API
Suchi Amalapurapu [Wed, 7 Apr 2010 23:32:26 +0000 (16:32 -0700)]
San Mehat [Wed, 7 Apr 2010 22:32:44 +0000 (15:32 -0700)]
Merge "NetworkManagementService: Remove 'maxkbs' parameter from throttle API" into froyo
Suchi Amalapurapu [Wed, 7 Apr 2010 22:25:51 +0000 (15:25 -0700)]
Merge "Fix
2578016." into froyo
Christopher Tate [Wed, 7 Apr 2010 21:28:28 +0000 (14:28 -0700)]
am
3b045eb0: am
560607ca: am
98e26575: Merge "Add Backup/Restore sample to the SDK docs" into froyo
Christopher Tate [Wed, 7 Apr 2010 21:24:48 +0000 (14:24 -0700)]
am
560607ca: am
98e26575: Merge "Add Backup/Restore sample to the SDK docs" into froyo
Merge commit '
560607ca530d88869ac87e5875de7efdcd0f7b85' into kraken
* commit '
560607ca530d88869ac87e5875de7efdcd0f7b85':
Add Backup/Restore sample to the SDK docs
Christopher Tate [Wed, 7 Apr 2010 21:22:23 +0000 (14:22 -0700)]
am
98e26575: Merge "Add Backup/Restore sample to the SDK docs" into froyo
Merge commit '
98e26575373461dc16c749d1f756403e46a909d4' into froyo-plus-aosp
* commit '
98e26575373461dc16c749d1f756403e46a909d4':
Add Backup/Restore sample to the SDK docs
Christopher Tate [Wed, 7 Apr 2010 21:19:44 +0000 (14:19 -0700)]
Merge "Add Backup/Restore sample to the SDK docs" into froyo
Marco Nelissen [Wed, 7 Apr 2010 20:40:38 +0000 (13:40 -0700)]
am
724f3008: am
ca9a083b: am
e43e563e: Merge "Don\'t check whether a specific named activity supports mp3 playback, just that there is at least one that does. Fixes bug
2534382. Change-Id: I00d9ac49bd91f161388d5c3de47b1b6abe9e8d9c" into froyo
Marco Nelissen [Wed, 7 Apr 2010 20:37:21 +0000 (13:37 -0700)]
am
ca9a083b: am
e43e563e: Merge "Don\'t check whether a specific named activity supports mp3 playback, just that there is at least one that does. Fixes bug
2534382. Change-Id: I00d9ac49bd91f161388d5c3de47b1b6abe9e8d9c" into froyo
Merge commit '
ca9a083bcf1ad753812e14f506c210a2104342c5' into kraken
* commit '
ca9a083bcf1ad753812e14f506c210a2104342c5':
Don't check whether a specific named activity supports mp3 playback,
Marco Nelissen [Wed, 7 Apr 2010 20:33:11 +0000 (13:33 -0700)]
am
e43e563e: Merge "Don\'t check whether a specific named activity supports mp3 playback, just that there is at least one that does. Fixes bug
2534382. Change-Id: I00d9ac49bd91f161388d5c3de47b1b6abe9e8d9c" into froyo
Merge commit '
e43e563e73ab6b1af2b3276a4917976b112f5cda' into froyo-plus-aosp
* commit '
e43e563e73ab6b1af2b3276a4917976b112f5cda':
Don't check whether a specific named activity supports mp3 playback,
Marco Nelissen [Wed, 7 Apr 2010 20:28:51 +0000 (13:28 -0700)]
Merge "Don't check whether a specific named activity supports mp3 playback, just that there is at least one that does. Fixes bug
2534382. Change-Id: I00d9ac49bd91f161388d5c3de47b1b6abe9e8d9c" into froyo
Ray Chen [Wed, 7 Apr 2010 19:17:57 +0000 (12:17 -0700)]
am
84d12f3f: am
dbad286c: am
25c2dd60: Merge "Per requested by API council, rename MediaScannerConneciton.ScanResultListener to .OnScanCompletedListener
2553871" into froyo
Ray Chen [Wed, 7 Apr 2010 19:14:49 +0000 (12:14 -0700)]
am
dbad286c: am
25c2dd60: Merge "Per requested by API council, rename MediaScannerConneciton.ScanResultListener to .OnScanCompletedListener
2553871" into froyo
Merge commit '
dbad286c4640ab7d2244695c5b175ebd1b6fcbab' into kraken
* commit '
dbad286c4640ab7d2244695c5b175ebd1b6fcbab':
Per requested by API council, rename MediaScannerConneciton.ScanResultListener to .OnScanCompletedListener
Ray Chen [Wed, 7 Apr 2010 19:09:42 +0000 (12:09 -0700)]
am
25c2dd60: Merge "Per requested by API council, rename MediaScannerConneciton.ScanResultListener to .OnScanCompletedListener
2553871" into froyo
Merge commit '
25c2dd60d43298c18b9459abd6ff33046d675fe6' into froyo-plus-aosp
* commit '
25c2dd60d43298c18b9459abd6ff33046d675fe6':
Per requested by API council, rename MediaScannerConneciton.ScanResultListener to .OnScanCompletedListener
Ray Chen [Wed, 7 Apr 2010 19:05:58 +0000 (12:05 -0700)]
Merge "Per requested by API council, rename MediaScannerConneciton.ScanResultListener to .OnScanCompletedListener
2553871" into froyo
Dianne Hackborn [Wed, 7 Apr 2010 19:03:05 +0000 (12:03 -0700)]
am
7aed1e14: am
d66e2b23: am
4e7cacd3: Merge "Maybe fix issue #
2568615: System server crashed in SyncStorageEngine" into froyo
Dianne Hackborn [Wed, 7 Apr 2010 19:03:00 +0000 (12:03 -0700)]
am
d00fb429: am
03e352a2: am
8258fda1: Fix issue #
2576268: There is no uiMode config change constant for the manifest
Dianne Hackborn [Wed, 7 Apr 2010 18:58:21 +0000 (11:58 -0700)]
am
d66e2b23: am
4e7cacd3: Merge "Maybe fix issue #
2568615: System server crashed in SyncStorageEngine" into froyo
Merge commit '
d66e2b23a5c6b4b2b6586015c1a6951b4d6d1bfa' into kraken
* commit '
d66e2b23a5c6b4b2b6586015c1a6951b4d6d1bfa':
Maybe fix issue #
2568615: System server crashed in SyncStorageEngine
Dianne Hackborn [Wed, 7 Apr 2010 18:58:17 +0000 (11:58 -0700)]
am
03e352a2: am
8258fda1: Fix issue #
2576268: There is no uiMode config change constant for the manifest
Merge commit '
03e352a2850d74cee11d3f0734938efb22cac351' into kraken
* commit '
03e352a2850d74cee11d3f0734938efb22cac351':
Fix issue #
2576268: There is no uiMode config change constant for the manifest
Dianne Hackborn [Wed, 7 Apr 2010 18:52:21 +0000 (11:52 -0700)]
am
4e7cacd3: Merge "Maybe fix issue #
2568615: System server crashed in SyncStorageEngine" into froyo
Merge commit '
4e7cacd3e44bd222a7892113336caff571a9983a' into froyo-plus-aosp
* commit '
4e7cacd3e44bd222a7892113336caff571a9983a':
Maybe fix issue #
2568615: System server crashed in SyncStorageEngine
Dianne Hackborn [Wed, 7 Apr 2010 18:52:17 +0000 (11:52 -0700)]
am
8258fda1: Fix issue #
2576268: There is no uiMode config change constant for the manifest
Merge commit '
8258fda17741b4969b93ffbe8796c76e427a9f27' into froyo-plus-aosp
* commit '
8258fda17741b4969b93ffbe8796c76e427a9f27':
Fix issue #
2576268: There is no uiMode config change constant for the manifest
Dianne Hackborn [Wed, 7 Apr 2010 18:49:37 +0000 (11:49 -0700)]
Merge "Maybe fix issue #
2568615: System server crashed in SyncStorageEngine" into froyo
Andreas Huber [Wed, 7 Apr 2010 18:10:09 +0000 (11:10 -0700)]
am
1e6edab6: am
01f78928: am
567b57b6: Merge "Report the requested seek time while seek is in progress." into froyo
Andreas Huber [Wed, 7 Apr 2010 18:05:56 +0000 (11:05 -0700)]
am
01f78928: am
567b57b6: Merge "Report the requested seek time while seek is in progress." into froyo
Merge commit '
01f78928228cd097bc6816ae03909a2b01d5c1d5' into kraken
* commit '
01f78928228cd097bc6816ae03909a2b01d5c1d5':
Report the requested seek time while seek is in progress.
Andreas Huber [Wed, 7 Apr 2010 18:02:11 +0000 (11:02 -0700)]
am
567b57b6: Merge "Report the requested seek time while seek is in progress." into froyo
Merge commit '
567b57b68884c68e3c95834589e5f7921f380a45' into froyo-plus-aosp
* commit '
567b57b68884c68e3c95834589e5f7921f380a45':
Report the requested seek time while seek is in progress.
Andreas Huber [Wed, 7 Apr 2010 17:58:05 +0000 (10:58 -0700)]
Merge "Report the requested seek time while seek is in progress." into froyo
Xia Wang [Wed, 7 Apr 2010 17:40:36 +0000 (10:40 -0700)]
am
3edc3c56: am
b151f48a: am
c93386ce: Merge " Fix bug2537659 When airplane mode is disabled, Mobile connection may be bring up before connecting to a known wifi." into froyo
Romain Guy [Wed, 7 Apr 2010 17:40:32 +0000 (10:40 -0700)]
am
388fe1b0: am
2a9ec986: am
7b70f658: Search for focusable views only after layout has happened when the window is first created. Bug #
2565564
Xia Wang [Wed, 7 Apr 2010 17:36:31 +0000 (10:36 -0700)]
am
b151f48a: am
c93386ce: Merge " Fix bug2537659 When airplane mode is disabled, Mobile connection may be bring up before connecting to a known wifi." into froyo
Merge commit '
b151f48a06d9473a8ec079d928d4203d13e2568b' into kraken
* commit '
b151f48a06d9473a8ec079d928d4203d13e2568b':
Fix bug2537659
Romain Guy [Wed, 7 Apr 2010 17:36:28 +0000 (10:36 -0700)]
am
2a9ec986: am
7b70f658: Search for focusable views only after layout has happened when the window is first created. Bug #
2565564
Merge commit '
2a9ec9869ee0fb8112426f85a85dffd966a2fa97' into kraken
* commit '
2a9ec9869ee0fb8112426f85a85dffd966a2fa97':
Search for focusable views only after layout has happened when the window is first created.
Xia Wang [Wed, 7 Apr 2010 17:32:38 +0000 (10:32 -0700)]
am
c93386ce: Merge " Fix bug2537659 When airplane mode is disabled, Mobile connection may be bring up before connecting to a known wifi." into froyo
Merge commit '
c93386cece18b8467c69004561e8f22b6b053d24' into froyo-plus-aosp
* commit '
c93386cece18b8467c69004561e8f22b6b053d24':
Fix bug2537659
Romain Guy [Wed, 7 Apr 2010 17:32:34 +0000 (10:32 -0700)]
am
7b70f658: Search for focusable views only after layout has happened when the window is first created. Bug #
2565564
Merge commit '
7b70f6589205dec10afdb358b7ddef7aa61b7dd8' into froyo-plus-aosp
* commit '
7b70f6589205dec10afdb358b7ddef7aa61b7dd8':
Search for focusable views only after layout has happened when the window is first created.
Xia Wang [Wed, 7 Apr 2010 17:30:19 +0000 (10:30 -0700)]
Merge " Fix bug2537659 When airplane mode is disabled, Mobile connection may be bring up before connecting to a known wifi." into froyo
Leon Scroggins [Wed, 7 Apr 2010 17:17:48 +0000 (10:17 -0700)]
am
84d2d10d: am
efaee761: am
083c715d: Merge "Show the microphone when the search box is opened from browser" into froyo
Leon Scroggins [Wed, 7 Apr 2010 17:13:28 +0000 (10:13 -0700)]
am
efaee761: am
083c715d: Merge "Show the microphone when the search box is opened from browser" into froyo
Merge commit '
efaee761022305d74e63237d87809582514bd5e2' into kraken
* commit '
efaee761022305d74e63237d87809582514bd5e2':
Show the microphone when the search box is opened from browser
Leon Scroggins [Wed, 7 Apr 2010 17:09:06 +0000 (10:09 -0700)]
am
083c715d: Merge "Show the microphone when the search box is opened from browser" into froyo
Merge commit '
083c715d06a99951429b38c62484f8c3caf43cd1' into froyo-plus-aosp
* commit '
083c715d06a99951429b38c62484f8c3caf43cd1':
Show the microphone when the search box is opened from browser
Leon Scroggins [Wed, 7 Apr 2010 17:04:50 +0000 (10:04 -0700)]
Merge "Show the microphone when the search box is opened from browser" into froyo
Adam Powell [Wed, 7 Apr 2010 16:58:54 +0000 (09:58 -0700)]
am
85a650fe: am
c696b0df: am
eb3d47e4: Merge "Fix bug
2574860 - fix AbsListView.trackMotionScroll edge detection" into froyo
Adam Powell [Wed, 7 Apr 2010 16:54:32 +0000 (09:54 -0700)]
am
c696b0df: am
eb3d47e4: Merge "Fix bug
2574860 - fix AbsListView.trackMotionScroll edge detection" into froyo
Merge commit '
c696b0df1e41f7cbd09c034e47570e6510d5a2e3' into kraken
* commit '
c696b0df1e41f7cbd09c034e47570e6510d5a2e3':
Fix bug
2574860 - fix AbsListView.trackMotionScroll edge detection
Adam Powell [Wed, 7 Apr 2010 16:51:48 +0000 (09:51 -0700)]
am
eb3d47e4: Merge "Fix bug
2574860 - fix AbsListView.trackMotionScroll edge detection" into froyo
Merge commit '
eb3d47e43ac971b7d965db9a53ca92db2ce47d77' into froyo-plus-aosp
* commit '
eb3d47e43ac971b7d965db9a53ca92db2ce47d77':
Fix bug
2574860 - fix AbsListView.trackMotionScroll edge detection
Adam Powell [Wed, 7 Apr 2010 16:48:48 +0000 (09:48 -0700)]
Merge "Fix bug
2574860 - fix AbsListView.trackMotionScroll edge detection" into froyo
Scott Main [Wed, 7 Apr 2010 16:26:46 +0000 (09:26 -0700)]
am
fae5961f: am
31a14585: am
f61eade2: Merge "docs: add a screenLayout and uiMode values for configChanges attribute add note that this should be avoided and point to dev guide" into froyo
Scott Main [Wed, 7 Apr 2010 16:23:24 +0000 (09:23 -0700)]
am
31a14585: am
f61eade2: Merge "docs: add a screenLayout and uiMode values for configChanges attribute add note that this should be avoided and point to dev guide" into froyo
Merge commit '
31a14585819ca2aacddb539dac0084f9d81172d2' into kraken
* commit '
31a14585819ca2aacddb539dac0084f9d81172d2':
docs: add a screenLayout and uiMode values for configChanges attribute
Scott Main [Wed, 7 Apr 2010 16:06:51 +0000 (09:06 -0700)]
am
f61eade2: Merge "docs: add a screenLayout and uiMode values for configChanges attribute add note that this should be avoided and point to dev guide" into froyo
Merge commit '
f61eade258d5274b8447c0ea936ee578b7dc063a' into froyo-plus-aosp
* commit '
f61eade258d5274b8447c0ea936ee578b7dc063a':
docs: add a screenLayout and uiMode values for configChanges attribute
Scott Main [Wed, 7 Apr 2010 16:02:59 +0000 (09:02 -0700)]
Merge "docs: add a screenLayout and uiMode values for configChanges attribute add note that this should be avoided and point to dev guide" into froyo
Daniel Sandler [Wed, 7 Apr 2010 13:50:34 +0000 (06:50 -0700)]
am
aea1443b: am
93720cad: am
c957ebef: Merge "Add more WindowManager flags to ViewDebug." into froyo
OSDN Git Service
