Commit Graph

15350 Commits

Author SHA1 Message Date
Grace Kloba
04b287b9ff am 8f655cb6: Merge "Update the comment which supposed to be checked in in the last CL." into froyo
Merge commit '8f655cb6c836380778545fb13044d97ef57139d6' into froyo-plus-aosp

* commit '8f655cb6c836380778545fb13044d97ef57139d6':
  Update the comment which supposed to be checked in
2010-04-19 16:15:41 -07:00
Grace Kloba
b227d97442 Merge "Update the comment which supposed to be checked in in the last CL." into froyo 2010-04-19 16:11:21 -07:00
Adam Powell
fe141cb362 am 8dc38941: am 7f30f8ab: am 93d35f77: Merge "Fix bug 2587373 - awaken scrollbars when a scrolling view becomes visible." into froyo 2010-04-19 15:49:44 -07:00
Adam Powell
b8b2a1336f am 7f30f8ab: am 93d35f77: Merge "Fix bug 2587373 - awaken scrollbars when a scrolling view becomes visible." into froyo
Merge commit '7f30f8abe3161ae912c3475aa89ad14388f576d7' into kraken

* commit '7f30f8abe3161ae912c3475aa89ad14388f576d7':
  Fix bug 2587373 - awaken scrollbars when a scrolling view becomes visible.
2010-04-19 15:41:05 -07:00
Adam Powell
2ea10cdb80 am 93d35f77: Merge "Fix bug 2587373 - awaken scrollbars when a scrolling view becomes visible." into froyo
Merge commit '93d35f77439f54cc55ff63b6e274dec0ac6c3c47' into froyo-plus-aosp

* commit '93d35f77439f54cc55ff63b6e274dec0ac6c3c47':
  Fix bug 2587373 - awaken scrollbars when a scrolling view becomes visible.
2010-04-19 15:38:11 -07:00
Adam Powell
6138d6b2da Merge "Fix bug 2587373 - awaken scrollbars when a scrolling view becomes visible." into froyo 2010-04-19 15:33:08 -07:00
Raphael
dac0c275e4 Merge "Fix aapt to build in Windows SDK under Linux" 2010-04-19 14:53:36 -07:00
Daniel Lehmann
c85325b651 Merge "Ensure public methods exist to update the state of the UI, so that it can be set from outside" 2010-04-19 13:42:54 -07:00
Robert Greenwalt
5217c60771 am 3d27a2e6: am 2f8c9e68: am f06f2eb2: Merge "Misc fixes for throttling." into froyo 2010-04-19 13:39:01 -07:00
Robert Greenwalt
f50cb8ac5b am 2f8c9e68: am f06f2eb2: Merge "Misc fixes for throttling." into froyo
Merge commit '2f8c9e6825e31614f26f8d9f3c1de7be2f3e9f9e' into kraken

* commit '2f8c9e6825e31614f26f8d9f3c1de7be2f3e9f9e':
  Misc fixes for throttling.
2010-04-19 13:31:24 -07:00
Grace Kloba
1eeb164e92 am 4a77f9e9: am e3ce4c89: am 2dc78498: Merge "Remove fixed size restriction on the SurfaceView before setting it to the full screen content view." into froyo 2010-04-19 13:27:44 -07:00
Robert Greenwalt
7e06b042fb am f06f2eb2: Merge "Misc fixes for throttling." into froyo
Merge commit 'f06f2eb2d646789d723d4a08d0681cae5b40b768' into froyo-plus-aosp

* commit 'f06f2eb2d646789d723d4a08d0681cae5b40b768':
  Misc fixes for throttling.
2010-04-19 13:25:46 -07:00
Grace Kloba
344945f0ce am e3ce4c89: am 2dc78498: Merge "Remove fixed size restriction on the SurfaceView before setting it to the full screen content view." into froyo
Merge commit 'e3ce4c89cc54770f01294adc3c3f052c062098c7' into kraken

* commit 'e3ce4c89cc54770f01294adc3c3f052c062098c7':
  Remove fixed size restriction on the SurfaceView
2010-04-19 13:21:58 -07:00
Robert Greenwalt
464692bdcf Merge "Misc fixes for throttling." into froyo 2010-04-19 13:21:01 -07:00
Grace Kloba
9a459c80f0 am 2dc78498: Merge "Remove fixed size restriction on the SurfaceView before setting it to the full screen content view." into froyo
Merge commit '2dc784988aa1660d02b50ed4e7d7679ba14b25b4' into froyo-plus-aosp

* commit '2dc784988aa1660d02b50ed4e7d7679ba14b25b4':
  Remove fixed size restriction on the SurfaceView
2010-04-19 13:17:53 -07:00
Grace Kloba
2882ec3b0c Merge "Remove fixed size restriction on the SurfaceView before setting it to the full screen content view." into froyo 2010-04-19 13:14:21 -07:00
Scott Main
ec050293cf am 08e15982: am f57f147b: am 5ce309d3: Merge "add droiddoc flag to include since-tags for api level 8" into froyo 2010-04-19 12:44:31 -07:00
Scott Main
98afea3937 am f57f147b: am 5ce309d3: Merge "add droiddoc flag to include since-tags for api level 8" into froyo
Merge commit 'f57f147bfd5d6f7530a938d2e05fc7d68f7343c3' into kraken

* commit 'f57f147bfd5d6f7530a938d2e05fc7d68f7343c3':
  add droiddoc flag to include since-tags for api level 8
2010-04-19 12:36:17 -07:00
Brad Fitzpatrick
0086badace am eb828459: am bb9739c5: am 11bea2e2: Merge "Reduce lock contention, removing unnecessary synchronization." into froyo 2010-04-19 12:36:01 -07:00
Grace Kloba
264df4e15c am e5afb10c: am 66fa5cc7: am 99c5179f: Merge "Force redraw in touch_up if there is a move." into froyo 2010-04-19 12:35:57 -07:00
Scott Main
335a889deb am 5ce309d3: Merge "add droiddoc flag to include since-tags for api level 8" into froyo
Merge commit '5ce309d32e9aa28af4d2a6523ba2a4bc8e6d2f53' into froyo-plus-aosp

* commit '5ce309d32e9aa28af4d2a6523ba2a4bc8e6d2f53':
  add droiddoc flag to include since-tags for api level 8
2010-04-19 12:33:18 -07:00
Scott Main
4c52abfeeb Merge "add droiddoc flag to include since-tags for api level 8" into froyo 2010-04-19 12:28:15 -07:00
Brad Fitzpatrick
dc16573d7c am bb9739c5: am 11bea2e2: Merge "Reduce lock contention, removing unnecessary synchronization." into froyo
Merge commit 'bb9739c5d74404b9155565f2a08509079b719a22' into kraken

* commit 'bb9739c5d74404b9155565f2a08509079b719a22':
  Reduce lock contention, removing unnecessary synchronization.
2010-04-19 12:23:58 -07:00
Grace Kloba
73e0a4834f am 66fa5cc7: am 99c5179f: Merge "Force redraw in touch_up if there is a move." into froyo
Merge commit '66fa5cc73dd20e8656c478e95f07798d8e20b44a' into kraken

* commit '66fa5cc73dd20e8656c478e95f07798d8e20b44a':
  Force redraw in touch_up if there is a move.
2010-04-19 12:23:54 -07:00
Brad Fitzpatrick
57146fd99a am 11bea2e2: Merge "Reduce lock contention, removing unnecessary synchronization." into froyo
Merge commit '11bea2e216800c5612144f76d307da653d565be3' into froyo-plus-aosp

* commit '11bea2e216800c5612144f76d307da653d565be3':
  Reduce lock contention, removing unnecessary synchronization.
2010-04-19 12:22:07 -07:00
Grace Kloba
21218befb9 am 99c5179f: Merge "Force redraw in touch_up if there is a move." into froyo
Merge commit '99c5179fafcccff2bcc05b4c7fb04007bb438f67' into froyo-plus-aosp

* commit '99c5179fafcccff2bcc05b4c7fb04007bb438f67':
  Force redraw in touch_up if there is a move.
2010-04-19 12:18:22 -07:00
Brad Fitzpatrick
d2b61e9fb7 Merge "Reduce lock contention, removing unnecessary synchronization." into froyo 2010-04-19 12:17:48 -07:00
Grace Kloba
55f2967c88 Merge "Force redraw in touch_up if there is a move." into froyo 2010-04-19 12:14:41 -07:00
Dianne Hackborn
1e62479bec Merge "2604184 Expose hidden APIs for testing the AccessibilityManager separately from the backing AccessibilityManagerServcie" 2010-04-19 12:06:37 -07:00
Brad Fitzpatrick
4ba21ee143 am db5b7d01: am 9a9b09f6: am afbf9f8d: Merge "Ease contention on the mProcessStatsThread mutex in updateCpuStats." into froyo 2010-04-19 12:03:50 -07:00
Brad Fitzpatrick
4d11d18af8 am 9a9b09f6: am afbf9f8d: Merge "Ease contention on the mProcessStatsThread mutex in updateCpuStats." into froyo
Merge commit '9a9b09f6bd209f9f46370c63cb72ab3460216b3b' into kraken

* commit '9a9b09f6bd209f9f46370c63cb72ab3460216b3b':
  Ease contention on the mProcessStatsThread mutex in updateCpuStats.
2010-04-19 11:56:19 -07:00
Brad Fitzpatrick
092d5f9cba am afbf9f8d: Merge "Ease contention on the mProcessStatsThread mutex in updateCpuStats." into froyo
Merge commit 'afbf9f8d6d66a0c1ba8c44a87b120bcad89ad8b5' into froyo-plus-aosp

* commit 'afbf9f8d6d66a0c1ba8c44a87b120bcad89ad8b5':
  Ease contention on the mProcessStatsThread mutex in updateCpuStats.
2010-04-19 11:54:05 -07:00
Brad Fitzpatrick
1da2dbe9b9 Merge "Ease contention on the mProcessStatsThread mutex in updateCpuStats." into froyo 2010-04-19 11:50:53 -07:00
Irfan Sheriff
f52cc536cd am a0e308fb: am e77bba8f: am 18920136: Merge "Reset notification state on wifi enable" into froyo 2010-04-19 10:06:56 -07:00
Irfan Sheriff
483e6a2c7e am e77bba8f: am 18920136: Merge "Reset notification state on wifi enable" into froyo
Merge commit 'e77bba8f2b67508fc6d4aa7b0054829c2d49965a' into kraken

* commit 'e77bba8f2b67508fc6d4aa7b0054829c2d49965a':
  Reset notification state on wifi enable
2010-04-19 09:59:47 -07:00
Jean-Michel Trivi
fc2f840f64 am 98bccfdd: am 6aa2acca: am 04152f98: Merge "Fix bug 2599698 Music paused by itself The NotificationPlayer sets an OnCompletionListener on the MediaPlayer it\'s using to play the notification. NotificationPlayer relies on the completion event to abandon audio focus. 2010-04-19 09:57:37 -07:00
Irfan Sheriff
507affd3f5 am 18920136: Merge "Reset notification state on wifi enable" into froyo
Merge commit '1892013643537f5fc330f5b0a02a0e9cb08b1134' into froyo-plus-aosp

* commit '1892013643537f5fc330f5b0a02a0e9cb08b1134':
  Reset notification state on wifi enable
2010-04-19 09:55:44 -07:00
Irfan Sheriff
df609c06eb Merge "Reset notification state on wifi enable" into froyo 2010-04-19 09:50:37 -07:00
Jean-Michel Trivi
b41ca74efe am 6aa2acca: am 04152f98: Merge "Fix bug 2599698 Music paused by itself The NotificationPlayer sets an OnCompletionListener on the MediaPlayer it\'s using to play the notification. NotificationPlayer relies on the completion event to abandon audio focus. The player w
Merge commit '6aa2accae3f58e4139f890f51c699901ee3abb88' into kraken

* commit '6aa2accae3f58e4139f890f51c699901ee3abb88':
  Fix bug 2599698 Music paused by itself
2010-04-19 09:48:18 -07:00
Jean-Michel Trivi
0d3a670a3d am 04152f98: Merge "Fix bug 2599698 Music paused by itself The NotificationPlayer sets an OnCompletionListener on the MediaPlayer it\'s using to play the notification. NotificationPlayer relies on the completion event to abandon audio focus. The player was started bef
Merge commit '04152f98ffbd17f54a6b771636ff7f440f0edc78' into froyo-plus-aosp

* commit '04152f98ffbd17f54a6b771636ff7f440f0edc78':
  Fix bug 2599698 Music paused by itself
2010-04-19 09:45:41 -07:00
Jean-Michel Trivi
87ccfb3405 Merge "Fix bug 2599698 Music paused by itself The NotificationPlayer sets an OnCompletionListener on the MediaPlayer it's using to play the notification. NotificationPlayer relies on the completion event to abandon audio focus. The player was started before the listener was set. The theory about the bug is that the player finished playing before the listener was called. Therefore the audio focus was never abandonned, and the music didn't resume." into froyo 2010-04-19 09:41:19 -07:00
Mike Lockwood
27cbe932f8 am ea7c123f: am daa107c8: am 3110bf6d: Merge "Fix inconsistency in how we handle light sensor when battery is low." into froyo 2010-04-19 08:35:25 -07:00
Mike Lockwood
78341f74bf am daa107c8: am 3110bf6d: Merge "Fix inconsistency in how we handle light sensor when battery is low." into froyo
Merge commit 'daa107c81db31b7fbaaf4219b0552ff07d44a29e' into kraken

* commit 'daa107c81db31b7fbaaf4219b0552ff07d44a29e':
  Fix inconsistency in how we handle light sensor when battery is low.
2010-04-19 08:26:50 -07:00
Mike Lockwood
fe6e6cd7d5 am 3110bf6d: Merge "Fix inconsistency in how we handle light sensor when battery is low." into froyo
Merge commit '3110bf6df1cb6d548e678cdcbb8c7349b2ac0d8a' into froyo-plus-aosp

* commit '3110bf6df1cb6d548e678cdcbb8c7349b2ac0d8a':
  Fix inconsistency in how we handle light sensor when battery is low.
2010-04-19 08:22:39 -07:00
Mike Lockwood
dc5f45d2cd Merge "Fix inconsistency in how we handle light sensor when battery is low." into froyo 2010-04-19 08:18:58 -07:00
Robert Greenwalt
297777cd5d am 8987f110: am c2093636: am 7171ea81: Make ThrottleService more tamper resistant. 2010-04-18 12:43:11 -07:00
Robert Greenwalt
a6e0927d49 am c2093636: am 7171ea81: Make ThrottleService more tamper resistant.
Merge commit 'c2093636db6141426ca7fe88f07b30a284e36759' into kraken

* commit 'c2093636db6141426ca7fe88f07b30a284e36759':
  Make ThrottleService more tamper resistant.
2010-04-18 12:35:10 -07:00
Robert Greenwalt
c5d2fecba0 am 7171ea81: Make ThrottleService more tamper resistant.
Merge commit '7171ea8179e09270e4d6ab825a2320816eee39c5' into froyo-plus-aosp

* commit '7171ea8179e09270e4d6ab825a2320816eee39c5':
  Make ThrottleService more tamper resistant.
2010-04-18 12:27:03 -07:00
Irfan Sheriff
fffa14283f am c2477a92: am 2572b046: am 975d86df: Merge "Dont check on interface value on API" into froyo 2010-04-17 09:44:58 -07:00
Irfan Sheriff
9b72f05f2a am 2572b046: am 975d86df: Merge "Dont check on interface value on API" into froyo
Merge commit '2572b046d64a2d0b43d74870e1e899364f2bc721' into kraken

* commit '2572b046d64a2d0b43d74870e1e899364f2bc721':
  Dont check on interface value on API
2010-04-17 09:36:44 -07:00