Commit Graph

7720 Commits

Author SHA1 Message Date
Grace Kloba
edcac52a4e am 642d1556: am 3f73549b: Merge "For performance reason, we choose to block the picture update during drag and fling. For sites like nytimes.com, there is a JavaScript constantly updating the content. If we don\'t block the live update during drag/fling, frame rate ca
Merge commit '642d1556f13ac13f07515309288214e532029c50' into kraken

* commit '642d1556f13ac13f07515309288214e532029c50':
  For performance reason, we choose to block the picture
2010-04-08 14:12:58 -07:00
Brad Fitzpatrick
9c3554e997 am 4183b514: am c62cdef4: Merge "Rename logtag for clarity." into froyo
Merge commit '4183b514bb72d96e8ed925c14266a23067c02fe5' into kraken

* commit '4183b514bb72d96e8ed925c14266a23067c02fe5':
  Rename logtag for clarity.
2010-04-08 14:08:56 -07:00
Grace Kloba
642d1556f1 am 3f73549b: Merge "For performance reason, we choose to block the picture update during drag and fling. For sites like nytimes.com, there is a JavaScript constantly updating the content. If we don\'t block the live update during drag/fling, frame rate can drop by 30%.
Merge commit '3f73549bc8a776a417bd185b72d3636e7f4ba7b6' into froyo-plus-aosp

* commit '3f73549bc8a776a417bd185b72d3636e7f4ba7b6':
  For performance reason, we choose to block the picture
2010-04-08 14:08:35 -07:00
Grace Kloba
3f73549bc8 Merge "For performance reason, we choose to block the picture update during drag and fling. For sites like nytimes.com, there is a JavaScript constantly updating the content. If we don't block the live update during drag/fling, frame rate can drop by 30%." into froyo 2010-04-08 14:05:05 -07:00
Brad Fitzpatrick
4183b514bb am c62cdef4: Merge "Rename logtag for clarity." into froyo
Merge commit 'c62cdef4ec4d22893b184776a21e42e8ff2a7c72' into froyo-plus-aosp

* commit 'c62cdef4ec4d22893b184776a21e42e8ff2a7c72':
  Rename logtag for clarity.
2010-04-08 14:04:43 -07:00
Brad Fitzpatrick
228629e920 Rename logtag for clarity.
BUG=2581935

Change-Id: I85f0b704435861acd5a406ce5ec084b60696580c
2010-04-08 13:25:46 -07:00
Robert Greenwalt
6646cf7af9 am 6f72a313: am 2b4b5738: Merge "Add service to monitor/control the flow of data." into froyo
Merge commit '6f72a313a042fdf0a5345f83eda74c5970b7db05' into kraken

* commit '6f72a313a042fdf0a5345f83eda74c5970b7db05':
  Add service to monitor/control the flow of data.
2010-04-08 12:49:38 -07:00
Robert Greenwalt
6f72a313a0 am 2b4b5738: Merge "Add service to monitor/control the flow of data." into froyo
Merge commit '2b4b5738011f5ccb118ad15721fd757c85448966' into froyo-plus-aosp

* commit '2b4b5738011f5ccb118ad15721fd757c85448966':
  Add service to monitor/control the flow of data.
2010-04-08 12:45:51 -07:00
Robert Greenwalt
2b4b573801 Merge "Add service to monitor/control the flow of data." into froyo 2010-04-08 12:42:09 -07:00
Robert Greenwalt
9e696c29f0 Add service to monitor/control the flow of data.
bug:2576057
Change-Id: Ib343c7ee1d619c6978910d9ee597db195d5aa3b6
2010-04-08 12:34:45 -07:00
The Android Open Source Project
892debc681 am 65369424: merge from open-source master
Merge commit '65369424cbfbf165b4324bdcb6f138435462a196' into kraken

* commit '65369424cbfbf165b4324bdcb6f138435462a196':
  Add keycodes PageUp and PageDown
2010-04-08 11:29:23 -07:00
The Android Open Source Project
65369424cb merge from open-source master
Change-Id: I975030d9572463bc69245bcffa25c47d7acb2b51
2010-04-08 11:27:55 -07:00
Jaikumar Ganesh
0dbec5f4b2 am 9e82d359: am d1a95f97: Merge "Don\'t allow connection to profiles in TURNING_OFF state." into froyo
Merge commit '9e82d359bcc22d1acd2eae5d7d183168cdfbf761' into kraken

* commit '9e82d359bcc22d1acd2eae5d7d183168cdfbf761':
  Don't allow connection to profiles in TURNING_OFF state.
2010-04-08 10:12:57 -07:00
Jaikumar Ganesh
9e82d359bc am d1a95f97: Merge "Don\'t allow connection to profiles in TURNING_OFF state." into froyo
Merge commit 'd1a95f975b03371a937da87735359c286a6de7f3' into froyo-plus-aosp

* commit 'd1a95f975b03371a937da87735359c286a6de7f3':
  Don't allow connection to profiles in TURNING_OFF state.
2010-04-08 10:08:25 -07:00
Jaikumar Ganesh
d1a95f975b Merge "Don't allow connection to profiles in TURNING_OFF state." into froyo 2010-04-08 10:01:50 -07:00
Andrei Popescu
ec472da766 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().
2010-04-08 09:12:43 -07:00
Andrei Popescu
1531d21124 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().
2010-04-08 09:10:09 -07:00
Andrei Popescu
31d2aa1e17 Avoid calling proxy.playbackEnded() again in onCustomViewHidden().
It is now always called via the MediaPlayer.onCompletion() callback.

Fix b: 2533272

Change-Id: If86cf6b2ab355ddcd976cd6a2ad92ce071a1af33
2010-04-08 15:19:22 +01:00
Wu-cheng Li
249c902ca6 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.
2010-04-07 22:01:54 -07:00
Wu-cheng Li
75a9cbaea4 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.
2010-04-07 21:58:21 -07:00
Suchi Amalapurapu
3e543abbc1 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
2010-04-07 21:32:30 -07:00
Wu-cheng Li
3f4639a661 Update API and javadoc according to API review.
bug:2553570
Change-Id: I0353938f513c119cec0e31eb980dc4569e17d7eb
2010-04-08 12:31:06 +08:00
Suchi Amalapurapu
a599469f90 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
2010-04-07 21:29:05 -07:00
Suchi Amalapurapu
c2461be627 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 2010-04-07 21:24:36 -07:00
Suchi Amalapurapu
40e472521a 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.

Change-Id: I80e97b3d24845adad7102f40dcbe238f00efa406
2010-04-07 20:43:54 -07:00
Grace Kloba
524aab57cd For performance reason, we choose to block the picture
update during drag and fling. For sites like nytimes.com,
there is a JavaScript constantly updating the content.
If we don't block the live update during drag/fling,
frame rate can drop by 30%.

This essentially reverted the CL for http://b/issue?id=2310295.
But as we honor preventDefault on touch move now,
the two sites mentioned in that bug do not have problem
even after this CL.

Fix http://b/issue?id=2574172
2010-04-07 20:32:01 -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
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
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
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
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
Jaikumar Ganesh
4aae54cf29 Don't allow connection to profiles in TURNING_OFF state.
A similar change will be made for other profiles.
Bug: 2577713

Dr No: jsh/eastham

Change-Id: Ifca0fbb108e705acefbaeabff07fad83c08f7baa
2010-04-07 17:28:08 -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
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
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
San Mehat
fd998a0caf Merge "NetworkManagementService: Remove 'maxkbs' parameter from throttle API" into froyo 2010-04-07 15:32:44 -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
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
Ray Chen
25c2dd60d4 Merge "Per requested by API council, rename MediaScannerConneciton.ScanResultListener to .OnScanCompletedListener http://2553871" into froyo 2010-04-07 12:05:58 -07:00
Dianne Hackborn
7aed1e14b5 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
2010-04-07 11:58:21 -07:00