33480 Commits

Author SHA1 Message Date
Mindy Pereira
dfe0870e72 Merge "DO NOT MERGE Only show edge glow effect on 1 side at a time." into gingerbread 2010-10-07 15:54:51 -07:00
Marco Nelissen
ef5afa073b Do not merge.
Don't crash when extra logging is enabled.

Change-Id: Iaf0900fe9d541967d2b2f11d8900c290c63a102e
2010-10-07 15:49:38 -07:00
Jeff Brown
f10929fb35 am a1bf0a06: Merge "Minor fix for InputReader support for non-touchscreen devices." into gingerbread
Merge commit 'a1bf0a06b26ecc039adfdb98eab6fb984d5d5571' into gingerbread-plus-aosp

* commit 'a1bf0a06b26ecc039adfdb98eab6fb984d5d5571':
  Minor fix for InputReader support for non-touchscreen devices.
2010-10-07 15:48:06 -07:00
Mindy Pereira
4f2c8cc86a am 36a18287: Merge "DO NOT MERGE Only show edge glow effect on 1 side at a time." into gingerbread
Merge commit '36a182870527f1d71f482e9a280bc818a4609cb6' into gingerbread-plus-aosp

* commit '36a182870527f1d71f482e9a280bc818a4609cb6':
  DO NOT MERGE Only show edge glow effect on 1 side at a time.
2010-10-07 15:47:44 -07:00
Xia Wang
d185494da6 am e1c8e388: Merge "Port mock ril controller and tests to GB. DO NOT MERGE" into gingerbread
Merge commit 'e1c8e38834dffbeaeacbbe0490a5eae45b54db8b' into gingerbread-plus-aosp

* commit 'e1c8e38834dffbeaeacbbe0490a5eae45b54db8b':
  Port mock ril controller and tests to GB. DO NOT MERGE
2010-10-07 15:47:27 -07:00
Gilles Debunne
c6faec80d2 am 4a962a06: Merge "Removing \'last\' of red cross asset." into gingerbread
Merge commit '4a962a06db88d7132448808aaae82b94728b69a6' into gingerbread-plus-aosp

* commit '4a962a06db88d7132448808aaae82b94728b69a6':
  Removing 'last' of red cross asset.
2010-10-07 15:47:23 -07:00
Jeff Brown
22cb4ef8ce am d577cfd7: Merge "Switch Looper back to using poll() instead of epoll()." into gingerbread
Merge commit 'd577cfd73a223279f9a5af698f55edd38a3fe4db' into gingerbread-plus-aosp

* commit 'd577cfd73a223279f9a5af698f55edd38a3fe4db':
  Switch Looper back to using poll() instead of epoll().
2010-10-07 15:46:57 -07:00
Robert Greenwalt
df255c2283 Stop using unauthorized dns
We were using somebody elses dns without permission - rude.  Switch to using
secondary google public dns.

bug:3045768
Change-Id: I042262bb96d3efed4c0265dc7ff6ac418e4d4f1e
2010-10-07 15:32:08 -07:00
Gloria Wang
9580b8ce65 resolved conflicts for merge of e6ad0e47 to gingerbread-plus-aosp
Change-Id: I63b00932b0f8b975da31aa9a010369db2d49fd76
2010-10-07 15:27:17 -07:00
Mindy Pereira
4de94de9c5 DO NOT MERGE Only show edge glow effect on 1 side at a time.
Pulling on a side should force the opposite side into "decay".
Fixes b/3061753  new list "bounce" shouldn't show on both ends
This fixes scroller and horizontalscroller.

Change-Id: I4d9820c7178378b793ed9a29b119943eb1f46587
2010-10-07 15:12:56 -07:00
Chung-yih Wang
4483232f57 Suppress harder for echo without affecting the volume of real voice.
Change-Id: Ia3ce98eedd487a9e879ff0a4907b8c15b5707429
2010-10-08 06:09:07 +08:00
Romain Guy
14830948d0 Add 3D transforms support to all gradients.
Change-Id: I61409edd00dab3a11684a3f5e4f7df0afc734758
2010-10-07 15:07:45 -07:00
Mathias Agopian
3e1a18ac6d Fix a null dereference
Change-Id: I3df446b90c1607782778749de7ba0f8c00698c33
2010-10-07 14:57:04 -07:00
Mike Lockwood
6458935331 MediaScanner: don't call pruneDeadThumbnailFiles unless the images table is empty
BUG: 3063257

Change-Id: I648ff8c4d4026e3d2a97853257865c9b5f712712
Signed-off-by: Mike Lockwood <lockwood@android.com>
2010-10-07 17:43:57 -04:00
Gloria Wang
e6ad0e477b Merge "Update of DRM framework." 2010-10-07 14:40:17 -07:00
Jeff Brown
a1bf0a06b2 Merge "Minor fix for InputReader support for non-touchscreen devices." into gingerbread 2010-10-07 14:35:38 -07:00
Mindy Pereira
36a1828705 Merge "DO NOT MERGE Only show edge glow effect on 1 side at a time." into gingerbread 2010-10-07 14:23:29 -07:00
Mindy Pereira
ca6eb210e6 DO NOT MERGE Only show edge glow effect on 1 side at a time.
Pulling on a side should force the opposite side into "decay".
Fixes b/3061753  new list "bounce" shouldn't show on both ends

Change-Id: I4742e8c212f8e13da29ed887ebdd712903b533f7
2010-10-07 14:14:10 -07:00
Gil Dobjanschi
2409cdb587 Merge "Remove MediaVideoItem and AudioTrack playback APIs." 2010-10-07 14:13:21 -07:00
Xia Wang
e1c8e38834 Merge "Port mock ril controller and tests to GB. DO NOT MERGE" into gingerbread 2010-10-07 14:04:12 -07:00
Andreas Huber
bb70837397 am 949f7d90: Merge "Work to support switching transport streams mid-stream and signalling discontinuities to the decoder." into gingerbread
Merge commit '949f7d9066e09768e570686a5695aaba4a1dafd0' into gingerbread-plus-aosp

* commit '949f7d9066e09768e570686a5695aaba4a1dafd0':
  Work to support switching transport streams mid-stream and signalling discontinuities to the decoder.
2010-10-07 14:02:26 -07:00
Justin Ho
51501aa870 am b74941e3: Merge "Fixed popup assets (background)" into gingerbread
Merge commit 'b74941e32e068ec03f90b9a53670328cd17ff4b4' into gingerbread-plus-aosp

* commit 'b74941e32e068ec03f90b9a53670328cd17ff4b4':
  Fixed popup assets (background)
2010-10-07 14:02:22 -07:00
Adam Powell
b361639566 am f15dfbec: Merge "Fix bug 3071869 - text anchors are now treated as application sub-panels." into gingerbread
Merge commit 'f15dfbec5df911f4cedd3e302864496d77ce295b' into gingerbread-plus-aosp

* commit 'f15dfbec5df911f4cedd3e302864496d77ce295b':
  Fix bug 3071869 - text anchors are now treated as application sub-panels.
2010-10-07 14:02:15 -07:00
Brad Fitzpatrick
6a15f0d7c7 am 6275dbbe: Merge "Quiet unnecessary debug logging." into gingerbread
Merge commit '6275dbbea8ad7bde984a362516654004e111dc67' into gingerbread-plus-aosp

* commit '6275dbbea8ad7bde984a362516654004e111dc67':
  Quiet unnecessary debug logging.
2010-10-07 14:02:10 -07:00
Andreas Huber
45bd1159fa am 02654f01: Merge "On this particular device the hardware video decoder spits out buffers that don\'t actually contain our video data, so we cannot use them to restore the video frame after suspend/resume." into gingerbread
Merge commit '02654f01bc6bd2e581b4a1d2409ecea217294fa2' into gingerbread-plus-aosp

* commit '02654f01bc6bd2e581b4a1d2409ecea217294fa2':
  On this particular device the hardware video decoder spits out buffers that don't actually contain our video data, so we cannot use them to restore the video frame after suspend/resume.
2010-10-07 14:02:01 -07:00
Kenny Root
c0c2076e9a am e0c5ae7b: Merge "Eliminate MCS_GIVE_UP state" into gingerbread
Merge commit 'e0c5ae7b55f1eb49b0aed94339bfb8e3cd8fefb9' into gingerbread-plus-aosp

* commit 'e0c5ae7b55f1eb49b0aed94339bfb8e3cd8fefb9':
  Eliminate MCS_GIVE_UP state
2010-10-07 14:01:55 -07:00
Gilles Debunne
5e3329b5fa am e86a6b2a: Merge "Removed unused and broken screen_progress" into gingerbread
Merge commit 'e86a6b2a4dc0c01717366c35fd0d6acd778988d4' into gingerbread-plus-aosp

* commit 'e86a6b2a4dc0c01717366c35fd0d6acd778988d4':
  Removed unused and broken screen_progress
2010-10-07 14:01:48 -07:00
Brad Fitzpatrick
b8d40d263b am 30f5c8fe: More DropBoxManager javadoc love.
Merge commit '30f5c8fede241e7560f4a33e48af3a4627fd5efc' into gingerbread-plus-aosp

* commit '30f5c8fede241e7560f4a33e48af3a4627fd5efc':
  More DropBoxManager javadoc love.
2010-10-07 14:01:40 -07:00
Brad Fitzpatrick
992a9e507f am fd124570: Merge "DropBox.Entry javadoc syntax fix" into gingerbread
Merge commit 'fd124570ce647b3adc5dc30ce782d6e017dab4a2' into gingerbread-plus-aosp

* commit 'fd124570ce647b3adc5dc30ce782d6e017dab4a2':
  DropBox.Entry javadoc syntax fix
2010-10-07 14:01:30 -07:00
Kenny Root
c296f22e71 am 0145e36c: Revert "Only allow 8 OBBs to be mounted by a UID"
Merge commit '0145e36cad1472acafb492b3f009ca6eba9593ea' into gingerbread-plus-aosp

* commit '0145e36cad1472acafb492b3f009ca6eba9593ea':
  Revert "Only allow 8 OBBs to be mounted by a UID"
2010-10-07 14:01:23 -07:00
John Wang
5df4b5a78b am 08fb5851: Merge "Add flag to skip restoring network seletion." into gingerbread
Merge commit '08fb5851bbaf11ecac0cac0de321942bfbf6a630' into gingerbread-plus-aosp

* commit '08fb5851bbaf11ecac0cac0de321942bfbf6a630':
  Add flag to skip restoring network seletion.
2010-10-07 14:00:53 -07:00
Gil Dobjanschi
b27f2d3126 Remove MediaVideoItem and AudioTrack playback APIs.
Change-Id: If3e5f341af7f581c90f04c91afb3681f9e8d5f82
2010-10-07 13:57:54 -07:00
Andreas Huber
d6e9d7695b Merge "Some instrumentation of OMXCodec for future investigation and a possibly temporary fix for the green tinge on video playback." 2010-10-07 13:57:08 -07:00
Gilles Debunne
4a962a06db Merge "Removing 'last' of red cross asset." into gingerbread 2010-10-07 13:53:16 -07:00
Andreas Huber
08478d17a3 Some instrumentation of OMXCodec for future investigation and a possibly temporary fix for the green tinge on video playback.
Change-Id: Iee9cd7b0c326bac96382007b4ea077d4368d7d01
related-to-bug: 3051572
2010-10-07 13:48:34 -07:00
Jeff Brown
8da727a1aa Minor fix for InputReader support for non-touchscreen devices.
Change-Id: I2256e37dd1c6f3836f82786aae14ee5d0c98f4c6
2010-10-07 13:44:51 -07:00
Jeff Brown
d577cfd73a Merge "Switch Looper back to using poll() instead of epoll()." into gingerbread 2010-10-07 13:29:56 -07:00
Jeff Brown
415d8c3819 Switch Looper back to using poll() instead of epoll().
Added a couple of micro-optimizations to avoid calling wake() unnecessarily
and reduce JNI overhead slightly.

Fixed a minor issue where we were not clearing the "next" field of Messages
returned by the MessageQueue so the Message would hold on to its successor
and potentially prevent the GC from collecting it if the message were leaked
somehow.

Change-Id: I488d29417ce0cdd7d0e447cda76ec978ef7f811c
2010-10-07 13:26:39 -07:00
Chet Haase
6a5fc4bc62 Merge "New TimeInterpolator interface for android.animation package." 2010-10-07 13:18:36 -07:00
Chet Haase
e0ee2e9f31 New TimeInterpolator interface for android.animation package.
The new animation package's reliance on the old Interpolator interface (in
android.view.animation) was an eyesore. Adding TimeInterpolator, and having the
old Interpolator interface extend it, allows the new Animator classes to break
the tie to the older animation package completely. However, developers can still
use the older Interpolator-based classes, such as AccelerateInterpolator,
because they all implicitly extend the new TimeInterpolator class.

Change-Id: I41132fa56167ba564f4839113289114d0ea31a92
2010-10-07 12:27:06 -07:00
Eric Laurent
786c57150c am ce2e2184: am 37947afe: Merge "Fixed AudioFlinger not always pausing tracks" into gingerbread
Merge commit 'ce2e2184bbc5530f4fac3220fdf3d1b3fc08a4c3'

* commit 'ce2e2184bbc5530f4fac3220fdf3d1b3fc08a4c3':
  Fixed AudioFlinger not always pausing tracks
2010-10-07 12:23:39 -07:00
Adam Powell
1b93c0ab55 am ee7e0efc: (-s ours) am 59c4cb9e: Merge "DO NOT MERGE Fix bug 3001751 and bug 3001584 - Gingerbread API review for over-scroll" into gingerbread
Merge commit 'ee7e0efcc1314b994ba70d91f6e8fa951044c916'

* commit 'ee7e0efcc1314b994ba70d91f6e8fa951044c916':
  DO NOT MERGE Fix bug 3001751 and bug 3001584 - Gingerbread API review for over-scroll
2010-10-07 12:23:20 -07:00
Adam Powell
cd1093c267 am 65e8b476: am 5a5fff71: Fix bug 3064143 - remove default bold on buttons
Merge commit '65e8b476245255a96faaa70872a4196763a95e10'

* commit '65e8b476245255a96faaa70872a4196763a95e10':
  Fix bug 3064143 - remove default bold on buttons
2010-10-07 12:22:47 -07:00
Dianne Hackborn
8c4e779a4c am e112b744: am 930d6c3c: Merge "Fix issue #3056500: Problem report for ASTRO" into gingerbread
Merge commit 'e112b744c08cd7dcffe142f3cd22c96870bad482'

* commit 'e112b744c08cd7dcffe142f3cd22c96870bad482':
  Fix issue #3056500: Problem report for ASTRO
2010-10-07 12:22:14 -07:00
Joe Onorato
2cddeb4b82 am 2c164747: am f7872780: Merge "PowerManagerService needs yet another flag..." into gingerbread
Merge commit '2c164747d364c3e51964d03ecefc5752c7c0c6ba'

* commit '2c164747d364c3e51964d03ecefc5752c7c0c6ba':
  PowerManagerService needs yet another flag...
2010-10-07 12:22:03 -07:00
Andreas Huber
a458719bb6 am 56ee1080: am 17bc4f65: Merge "Make sure to call AudioTrack::stop() instead of AudioTrack::pause() after submitting all samples to AudioTrack to make sure those remaining samples are actually played out." into gingerbread
Merge commit '56ee1080f004110bff622e5b60c243d9cabfe120'

* commit '56ee1080f004110bff622e5b60c243d9cabfe120':
  Make sure to call AudioTrack::stop() instead of AudioTrack::pause() after submitting all samples to AudioTrack to make sure those remaining samples are actually played out.
2010-10-07 12:21:33 -07:00
Kenny Root
c5610a4c13 am cfc80bd5: am 2c3360fe: Merge "Remove lingering system app native libs in /data" into gingerbread
Merge commit 'cfc80bd5c1e4f0207357b288b1b7b8374a31ba70'

* commit 'cfc80bd5c1e4f0207357b288b1b7b8374a31ba70':
  Remove lingering system app native libs in /data
2010-10-07 12:21:22 -07:00
Jeff Brown
928b5bfa7d am 56364bcd: am 78d15acf: Merge "Make secure views tolerate IME overlays." into gingerbread
Merge commit '56364bcd0d1a1b064db3e83fdb64f948ce5c2ad7'

* commit '56364bcd0d1a1b064db3e83fdb64f948ce5c2ad7':
  Make secure views tolerate IME overlays.
2010-10-07 12:20:45 -07:00
Kenny Root
13297fddcb am f2cc2e52: am 8735c4cd: Merge "Get correct native library path on reinstall" into gingerbread
Merge commit 'f2cc2e522177683145b2daa0de0ed898b865824d'

* commit 'f2cc2e522177683145b2daa0de0ed898b865824d':
  Get correct native library path on reinstall
2010-10-07 12:20:25 -07:00
Dianne Hackborn
ac3d43dd1c am 5d722580: (-s ours) am e02e41f4: Merge "DO NOT MERGE: Get rid of status bar\'s dim during night." into gingerbread
Merge commit '5d722580afbca277ebc760d5b2c0400f4bca1a8d'

* commit '5d722580afbca277ebc760d5b2c0400f4bca1a8d':
  DO NOT MERGE: Get rid of status bar's dim during night.
2010-10-07 12:20:09 -07:00