Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
21,624 Commits 3 Branches 0 Tags
f0dc083ddb58117d0ac20bd51fd765359efef7a7
Commit Graph

21624 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Dianne Hackborn
f0dc083ddb am d49c455c: am 822a7e2d: am ce59fb8b: Fix issue #2578244: playing audio file downloaded by the browser... 2010-04-07 19:17:45 -07:00
Grace Kloba
390aca99f4 am 962ebd1f: am 520d6840: am 667543cd: Merge "Revert "Use the content width to calculate the zoom overview"" into froyo 2010-04-07 19:14:53 -07:00
Dianne Hackborn
d49c455cc9 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...
 2010-04-07 19:13:22 -07:00
Dianne Hackborn
822a7e2def 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...
 2010-04-07 19:07:54 -07:00
Grace Kloba
962ebd1fcc 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"
 2010-04-07 19:05:32 -07:00
Dianne Hackborn
ce59fb8b68 Fix issue #2578244: playing audio file downloaded by the browser... 
...shows an image downloaded by the browser

The downloads directory needs to be non-plural for backwards compatibility.

Change-Id: Ifb6ddf8ee980a57ad113a5fc8b51f5acd8df5955
 2010-04-07 19:02:13 -07:00
Grace Kloba
520d684093 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"
 2010-04-07 19:00:40 -07:00
Dianne Hackborn
9ed9c0e48b am d93df9ca: am b37abe38: am d3cc4967: Merge "Fix issue #2549955: Moving the application fails -Activity Manager Crash on launching the app" into froyo 2010-04-07 19:00:35 -07:00
Grace Kloba
667543cdb5 Merge "Revert "Use the content width to calculate the zoom overview"" into froyo 2010-04-07 18:57:52 -07:00
Dianne Hackborn
d93df9cac9 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
 2010-04-07 18:57:33 -07:00
Dianne Hackborn
b37abe3867 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
 2010-04-07 18:41:42 -07:00
Dianne Hackborn
2b973a6be7 am 90dd6462: am 48879933: am 390022b2: Merge "Fix issue #2528537: android.os.DeadObjectException" into froyo 2010-04-07 18:40:15 -07:00
Grace Kloba
188bf8deb4 Revert "Use the content width to calculate the zoom overview" 
This reverts commit 4a4f9886a7.

Fix http://b/issue?id=2577238
 2010-04-07 18:37:32 -07:00
Dianne Hackborn
90dd6462db 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
 2010-04-07 18:37:12 -07:00
Dianne Hackborn
d3cc496760 Merge "Fix issue #2549955: Moving the application fails -Activity Manager Crash on launching the app" into froyo 2010-04-07 18:37:04 -07:00
Dianne Hackborn
4887993381 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
 2010-04-07 18:33:23 -07:00
Dianne Hackborn
390022b23b Merge "Fix issue #2528537: android.os.DeadObjectException" into froyo 2010-04-07 18:31:06 -07:00
Grace Kloba
d001003870 am c020ec57: am edee621f: am faa2d970: Merge "Cherry-pick https://android-git.corp.google.com/g/#change,38305" into froyo 2010-04-07 18:28:43 -07:00
Grace Kloba
c020ec5723 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
 2010-04-07 18:26:38 -07:00
Grace Kloba
edee621f5c 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
 2010-04-07 18:23:25 -07:00
Dianne Hackborn
559a787531 Fix issue #2549955: Moving the application fails -Activity Manager Crash on launching the app 
mResources will be null if we failed loading them because the app
is on external storage that has been unmounted.

Change-Id: If0dbbdc0c3441fa10d0ab074568361524db1c8db
 2010-04-07 18:19:41 -07:00
Grace Kloba
faa2d97005 Merge "Cherry-pick https://android-git.corp.google.com/g/#change,38305" into froyo 2010-04-07 18:18:17 -07:00
John Wang
cdb601489c am 90f2a71e: am 7ecf08fa: am 815b8e4a: Merge "Add emergencyOnly indicator in ServiceState." into froyo 2010-04-07 18:02:56 -07:00
John Wang
90f2a71e1e am 7ecf08fa: am 815b8e4a: Merge "Add emergencyOnly indicator in ServiceState." into froyo 
Merge commit '7ecf08faa9da7d372dd319aac8b1e5760a116601' into kraken

* commit '7ecf08faa9da7d372dd319aac8b1e5760a116601':
  Add emergencyOnly indicator in ServiceState.
 2010-04-07 17:58:53 -07:00
John Wang
7ecf08faa9 am 815b8e4a: Merge "Add emergencyOnly indicator in ServiceState." into froyo 
Merge commit '815b8e4ac4ddb20e8c0539ecba50c9e7382d0656' into froyo-plus-aosp

* commit '815b8e4ac4ddb20e8c0539ecba50c9e7382d0656':
  Add emergencyOnly indicator in ServiceState.
 2010-04-07 17:54:27 -07:00
John Wang
815b8e4ac4 Merge "Add emergencyOnly indicator in ServiceState." into froyo 2010-04-07 17:51:41 -07:00
Dianne Hackborn
472ad8716e Fix issue #2528537: android.os.DeadObjectException 
Nice.

Change-Id: I6142b12b5770b508ff4a43361da6f5e52bed2de9
 2010-04-07 17:31:48 -07:00
Mike Reed
05b3720beb Cherry-pick https://android-git.corp.google.com/g/#change,38305 
disable high-quality filtering during scrolling, until I can cached the scaled images.

Change-Id: I58fa779a8d9a23a20a0fdd93ea06c251b6c6ca8d

Fix http://b/issue?id=2574172
 2010-04-07 17:09:55 -07:00
San Mehat
cf1a7a77f1 am 12ebde61: am 692329cf: am fd998a0c: Merge "NetworkManagementService: Remove \'maxkbs\' parameter from throttle API" into froyo 2010-04-07 16:40:49 -07:00
Suchi Amalapurapu
4cdd682c8b am 070e1ecf: am a137cf2a: am 4b18ced6: Merge "Fix 2578016." into froyo 2010-04-07 16:40:45 -07:00
San Mehat
12ebde61a5 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
 2010-04-07 16:36:07 -07:00
Suchi Amalapurapu
070e1ecfee am a137cf2a: am 4b18ced6: Merge "Fix 2578016." into froyo 
Merge commit 'a137cf2a1899b863913b4ab32a87835c2d47d8fe' into kraken

* commit 'a137cf2a1899b863913b4ab32a87835c2d47d8fe':
  Fix 2578016.
 2010-04-07 16:35:57 -07:00
San Mehat
692329cf3f 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
 2010-04-07 16:32:29 -07:00
Suchi Amalapurapu
a137cf2a18 am 4b18ced6: Merge "Fix 2578016." into froyo 
Merge commit '4b18ced6b5409bb9dd4013c06b9562b76a062939' into froyo-plus-aosp

* commit '4b18ced6b5409bb9dd4013c06b9562b76a062939':
  Fix 2578016.
 2010-04-07 16:32:26 -07:00
John Wang
56c2d2ff27 Add emergencyOnly indicator in ServiceState. 
For bug 2536842 to show signal strength in Emergency mode.

The STATE_EMERGENCY_ONLY of ServiceState is not in-use.

So add a hide interface to indicate Emergency mode.

Change-Id: I19398ac5e73a722dcaaf744347f961d1fa7513ac
 2010-04-07 16:06:13 -07:00
San Mehat
fd998a0caf Merge "NetworkManagementService: Remove 'maxkbs' parameter from throttle API" into froyo 2010-04-07 15:32:44 -07:00
Suchi Amalapurapu
4b18ced6b5 Merge "Fix 2578016." into froyo 2010-04-07 15:25:51 -07:00
San Mehat
f0db6e1853 NetworkManagementService: Remove 'maxkbs' parameter from throttle API 
Change-Id: I1cfbdac7d06478243931c6acec462da8e257f42f
Signed-off-by: San Mehat <san@google.com>
 2010-04-07 15:22:10 -07:00
Christopher Tate
5247bbd560 am 3b045eb0: am 560607ca: am 98e26575: Merge "Add Backup/Restore sample to the SDK docs" into froyo 2010-04-07 14:28:28 -07:00
Christopher Tate
3b045eb035 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
 2010-04-07 14:24:48 -07:00
Christopher Tate
560607ca53 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
 2010-04-07 14:22:23 -07:00
Christopher Tate
98e2657537 Merge "Add Backup/Restore sample to the SDK docs" into froyo 2010-04-07 14:19:44 -07:00
Marco Nelissen
9243130029 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 2010-04-07 13:40:38 -07:00
Marco Nelissen
724f30083d 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,
 2010-04-07 13:37:21 -07:00
Christopher Tate
e779bdc9b4 Add Backup/Restore sample to the SDK docs 
Part of bug #2545514

Change-Id: I235d33b839924d4bc574fd1e6762d169902e1c8b
 2010-04-07 13:37:00 -07:00
Marco Nelissen
ca9a083bcf 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,
 2010-04-07 13:33:11 -07:00
Marco Nelissen
e43e563e73 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 2010-04-07 13:28:51 -07:00
Ray Chen
e4b62c23be am 84d12f3f: am dbad286c: am 25c2dd60: Merge "Per requested by API council, rename MediaScannerConneciton.ScanResultListener to .OnScanCompletedListener http://2553871" into froyo 2010-04-07 12:17:57 -07:00
Ray Chen
84d12f3fe7 am dbad286c: am 25c2dd60: Merge "Per requested by API council, rename MediaScannerConneciton.ScanResultListener to .OnScanCompletedListener http://2553871" into froyo 
Merge commit 'dbad286c4640ab7d2244695c5b175ebd1b6fcbab' into kraken

* commit 'dbad286c4640ab7d2244695c5b175ebd1b6fcbab':
  Per requested by API council, rename MediaScannerConneciton.ScanResultListener to .OnScanCompletedListener
 2010-04-07 12:14:49 -07:00
Ray Chen
dbad286c46 am 25c2dd60: Merge "Per requested by API council, rename MediaScannerConneciton.ScanResultListener to .OnScanCompletedListener http://2553871" into froyo 
Merge commit '25c2dd60d43298c18b9459abd6ff33046d675fe6' into froyo-plus-aosp

* commit '25c2dd60d43298c18b9459abd6ff33046d675fe6':
  Per requested by API council, rename MediaScannerConneciton.ScanResultListener to .OnScanCompletedListener
 2010-04-07 12:09:42 -07:00