Commit Graph

19629 Commits

Author SHA1 Message Date
Jeff Brown
37661c15e7 am d7d58be0: am 00144745: Merge "Make the throttling more sensitive to end-to-end latency." into gingerbread
Merge commit 'd7d58be0b8c1be69bfb774f38bf6d1410d87c4ce'

* commit 'd7d58be0b8c1be69bfb774f38bf6d1410d87c4ce':
  Make the throttling more sensitive to end-to-end latency.
2010-08-21 09:43:11 -07:00
Mathias Agopian
d56f54b269 am b3aaf3ba: am bccfcd95: Merge "fix [2931718] glDrawArrays skips a triangle when more than 70 vertices are used." into gingerbread
Merge commit 'b3aaf3baa7fd811af19835bbc8837a88984c160a'

* commit 'b3aaf3baa7fd811af19835bbc8837a88984c160a':
  fix [2931718] glDrawArrays skips a triangle when more than 70 vertices are used.
2010-08-21 09:42:53 -07:00
Andreas Huber
e7013754ed am 873ebfb8: am 223e4f73: Merge "Support for MP4V-ES packetization format according to RFC3016." into gingerbread
Merge commit '873ebfb825cb498d9ff3012d1d31b02e31a79980'

* commit '873ebfb825cb498d9ff3012d1d31b02e31a79980':
  Support for MP4V-ES packetization format according to RFC3016.
2010-08-21 09:42:37 -07:00
Wu-cheng Li
eab1f45be7 am 6694c71d: (-s ours) am eba12749: Merge "Adding getSupportedPreviewSizes to CameraParameters.DO NOT MERGE" into gingerbread
Merge commit '6694c71dd8507370262998ec1da8ff5e0ffcdf49'

* commit '6694c71dd8507370262998ec1da8ff5e0ffcdf49':
  Adding getSupportedPreviewSizes to CameraParameters.DO NOT MERGE
2010-08-21 09:42:20 -07:00
Wu-cheng Li
204d48d350 am 9ba1ed6a: (-s ours) am ccb91596: Merge "Adding getSupportedPictureSizes to CameraParameters.DO NOT MERGE" into gingerbread
Merge commit '9ba1ed6a8fe9a79d147d50abb03f5e22d27766b9'

* commit '9ba1ed6a8fe9a79d147d50abb03f5e22d27766b9':
  Adding getSupportedPictureSizes to CameraParameters.DO NOT MERGE
2010-08-21 09:42:08 -07:00
Andreas Huber
73ad7b5040 am b29ebd39: am f0ad5484: Merge "In the absence of width/height information in the sdp, extract the dimensions from the avc codec specific data." into gingerbread
Merge commit 'b29ebd397e25a7176bcc1c81980f17b0190ebe7f'

* commit 'b29ebd397e25a7176bcc1c81980f17b0190ebe7f':
  In the absence of width/height information in the sdp, extract the dimensions from the avc codec specific data.
2010-08-21 09:41:54 -07:00
Eric Laurent
a93ff88e75 am 5aff90a6: am 1aaba885: Merge "Audio Effects: fixed "strength supported" parameter size." into gingerbread
Merge commit '5aff90a638da53e66fba90c92d412812760fe8e5'

* commit '5aff90a638da53e66fba90c92d412812760fe8e5':
  Audio Effects: fixed "strength supported" parameter size.
2010-08-21 09:41:26 -07:00
Kenny Root
24b2aee9ca am 821afa9a: am 54d41379: Merge "Add OBB flags to support overlays" into gingerbread
Merge commit '821afa9aec8d3a4ffd2e72ce797d8097eaf13973'

* commit '821afa9aec8d3a4ffd2e72ce797d8097eaf13973':
  Add OBB flags to support overlays
2010-08-21 09:41:12 -07:00
Andreas Huber
1f71297376 am 6bcffcd2: am 8c192fe9: Merge "Better support for rtsp streamed through VLC. Temporarily make the socket blocking to read all of the session description." into gingerbread
Merge commit '6bcffcd2dc410db780c152c70a01b22da6ca58be'

* commit '6bcffcd2dc410db780c152c70a01b22da6ca58be':
  Better support for rtsp streamed through VLC. Temporarily make the socket blocking to read all of the session description.
2010-08-21 09:40:57 -07:00
Eric Laurent
f64077c5f5 am 3a899b85: am 0b9a12bf: Merge "Fix issue 2929440" into gingerbread
Merge commit '3a899b85102f6d51585b3d46ced3038c8602f202'

* commit '3a899b85102f6d51585b3d46ced3038c8602f202':
  Fix issue 2929440
2010-08-21 09:40:43 -07:00
Steve Howard
9d908eaf46 am 1f442104: am e0c8582e: Merge "Improve orientation sensing when waking up while flat." into gingerbread
Merge commit '1f4421048206ca1745ddd6366588759c9c5c38f9'

* commit '1f4421048206ca1745ddd6366588759c9c5c38f9':
  Improve orientation sensing when waking up while flat.
2010-08-21 09:40:22 -07:00
Chia-chi Yeh
1d810691f9 am eb21c38a: am f49c1689: Merge "RTP: fix few leaks when fail to add streams into a group." into gingerbread
Merge commit 'eb21c38a5340c0e73cb8104217aa5bb01229d22c'

* commit 'eb21c38a5340c0e73cb8104217aa5bb01229d22c':
  RTP: fix few leaks when fail to add streams into a group.
2010-08-21 09:40:08 -07:00
Wei-Ta Chen
d6b802235d am 9f7257f0: am 8d124f70: Merge "Fix a bug, where one thread is using JNIEnv associated with another thread." into gingerbread
Merge commit '9f7257f0a14cd17d8b55bc3bd1584dac2f9dd1b2'

* commit '9f7257f0a14cd17d8b55bc3bd1584dac2f9dd1b2':
  Fix a bug, where one thread is using JNIEnv associated with another thread.
2010-08-21 09:39:51 -07:00
Chia-chi Yeh
0de3cf4e5a am e1879085: am ae93f52e: Merge "RTP: remove froyo-compatible code." into gingerbread
Merge commit 'e18790856bb0d4624428625f7c3a69b8c3305ab5'

* commit 'e18790856bb0d4624428625f7c3a69b8c3305ab5':
  RTP: remove froyo-compatible code.
2010-08-21 09:36:47 -07:00
Jeff Brown
8758b47218 am 36beeca4: am 3d8c9bdb: Raise motion event throttle to 60Hz from 35Hz.
Merge commit '36beeca4c34af2aed6a070e43b69993daff67661'

* commit '36beeca4c34af2aed6a070e43b69993daff67661':
  Raise motion event throttle to 60Hz from 35Hz.
2010-08-21 09:35:28 -07:00
Jeff Brown
e09c4c710e am d25f0aea: am 99401b29: Merge "Add support for throttling motion events." into gingerbread
Merge commit 'd25f0aea1cebe93aff55a75374e172f87115f1b3'

* commit 'd25f0aea1cebe93aff55a75374e172f87115f1b3':
  Add support for throttling motion events.
2010-08-21 09:35:13 -07:00
Dianne Hackborn
0c8a229641 am d172594e: am cf6d2a1d: Merge "Fix issue #2845673: android:exported="false" is not obeyed" into gingerbread
Merge commit 'd172594e3a1e25f1f2c190e99421cb7d4963389b'

* commit 'd172594e3a1e25f1f2c190e99421cb7d4963389b':
  Fix issue #2845673: android:exported="false" is not obeyed
2010-08-21 09:34:43 -07:00
Mathias Agopian
c3fb41b1db am 43647129: am 17da0663: Merge "fix [2931161] crash in labyritnth when completing a level" into gingerbread
Merge commit '43647129d676e8c802850ca493f2ebc6064a4a1a'

* commit '43647129d676e8c802850ca493f2ebc6064a4a1a':
  fix [2931161] crash in labyritnth when completing a level
2010-08-21 09:34:22 -07:00
Robert Greenwalt
8e24c43e23 am 46001391: (-s ours) am 6b2c56a2: Merge "DO NOT MERGE Do not kill sockets going default->hipri" into gingerbread
Merge commit '4600139173c80db4ebfb70e2417231e9678d37f9'

* commit '4600139173c80db4ebfb70e2417231e9678d37f9':
  DO NOT MERGE Do not kill sockets going default->hipri
2010-08-21 09:33:42 -07:00
Romain Guy
84f62aeb61 Merge "Add support for textScaleX." 2010-08-20 18:42:54 -07:00
Romain Guy
7557ff40d8 Merge "Test setTextScaleX()" 2010-08-20 18:42:49 -07:00
Danica Chang
07200e5a66 Merge "Wait for bluetooth to turn on before Bluetooth Tethering is enabled" 2010-08-20 17:42:28 -07:00
Adam Powell
b784b2b8d4 Merge "Make ActionBar menus handle configuration changes gracefully." 2010-08-20 15:48:04 -07:00
Jim Miller
044fac4d2f Merge "Make sure we have a native Surface in nContextSetSurface." 2010-08-20 15:14:56 -07:00
Gilles Debunne
76c043ad04 Merge "New UI theme for EditText." 2010-08-20 12:35:31 -07:00
Romain Guy
2342cbd06e Merge "GridView's pageScroll() would be offset by one item." 2010-08-20 11:40:42 -07:00
Nipun Kwatra
6e8dd16e67 Merge "Added downsample()" 2010-08-20 11:35:38 -07:00
Nipun Kwatra
c928f98559 Merge "const correctness, validPixel test." 2010-08-20 10:41:08 -07:00
Daniel Sandler
8f11bc9e28 Merge "Notification.fullScreenIntent support." 2010-08-20 09:15:53 -07:00
Daniel Sandler
0eb812b683 Merge "Fix incorrect usage text for am." 2010-08-20 06:31:24 -07:00
Brad Fitzpatrick
86a2e32d52 am cf2c68c9: am 11709ab0: Merge "Avoid unnecessary SharedPrefences disk writes." into gingerbread
Merge commit 'cf2c68c9c21b8af62e95374312355d22ed55e586'

* commit 'cf2c68c9c21b8af62e95374312355d22ed55e586':
  Avoid unnecessary SharedPrefences disk writes.
2010-08-20 06:28:08 -07:00
Jean-Baptiste Queru
b3635a449b am 6d5bb884: am aac6a748: Merge "Only monitor recognized uevent devices." into gingerbread
Merge commit '6d5bb88454db2fc798a07ec1085ef55572dbe670'

* commit '6d5bb88454db2fc798a07ec1085ef55572dbe670':
  Only monitor recognized uevent devices.
2010-08-20 06:27:55 -07:00
Mathias Agopian
18e4c5554d am 4195d097: am 8ad86fef: Merge "Improve documentation of getAltitude" into gingerbread
Merge commit '4195d097c535acf9e1c60b323134fcb5609c18b7'

* commit '4195d097c535acf9e1c60b323134fcb5609c18b7':
  Improve documentation of getAltitude
2010-08-20 06:27:37 -07:00
Mathias Agopian
f1aedc3197 Merge branch 'master' of ssh://android-git:29418/platform/frameworks/base 2010-08-20 06:27:27 -07:00
Mathias Agopian
569cf07b29 am 8e13ce52: (-s ours) am 26bcc7b4: Merge "revert hwcomposer HAL changes. DO NOT MERGE." into gingerbread
Merge commit '8e13ce52f3bb12bb53e37affde3eec9bdaabae5c'

* commit '8e13ce52f3bb12bb53e37affde3eec9bdaabae5c':
  revert hwcomposer HAL changes. DO NOT MERGE.
2010-08-20 06:27:15 -07:00
Chet Haase
26ab891f86 Merge "multiple-property animations" 2010-08-20 06:27:11 -07:00
Jean-Baptiste Queru
86d92827a6 resolved conflicts for merge of 34df5ccc to master
Change-Id: I55558b2ab9452b2a819a1fce5b3ee5af29688e98
2010-08-20 06:18:50 -07:00
Jeff Brown
297f493405 am 33992d41: am 72e0b2ab: Merge "Fix some input device mapping bugs with certain drivers." into gingerbread
Merge commit '33992d4195fe55f42ba6919f5a07707a51a12d5d'

* commit '33992d4195fe55f42ba6919f5a07707a51a12d5d':
  Fix some input device mapping bugs with certain drivers.
2010-08-19 23:43:19 -07:00
Irfan Sheriff
d2b8190687 Merge "clean up scanresults on exit from driver start state" 2010-08-19 16:40:49 -07:00
Dmitri Plotnikov
427e954bfe Merge "Fixing the SDK build" 2010-08-19 16:32:31 -07:00
Romain Guy
23e7646e62 Merge "Update FrameLayout documentation." 2010-08-19 15:16:32 -07:00
Romain Guy
ebcb809b09 Merge "Update OpenGLRenderer test to test opaque ARGB8888 bitmaps." 2010-08-19 14:46:45 -07:00
Romain Guy
8e34b6b0d1 Merge "Load assets in place instead of deferring until draw." 2010-08-19 14:44:52 -07:00
Jeff Brown
82b4a9edcc am 00144745: Merge "Make the throttling more sensitive to end-to-end latency." into gingerbread
Merge commit '0014474569b8bb237f00fa692ab173678bff619e' into gingerbread-plus-aosp

* commit '0014474569b8bb237f00fa692ab173678bff619e':
  Make the throttling more sensitive to end-to-end latency.
2010-08-19 13:30:08 -07:00
Jeff Brown
2008e3efde Merge "Make the throttling more sensitive to end-to-end latency." into gingerbread 2010-08-19 13:27:58 -07:00
Jeff Brown
869347fc62 Make the throttling more sensitive to end-to-end latency.
The code now takes into account the time when the event was generated.
So with a 60Hz throttling rate, it ensures that a motion event will not
be delayed due to throttling by any more than 1/60th of second past
the time it was generated.

Change-Id: Iaea1d4f76e79036b4a18873485230731c3cd63c3
2010-08-19 13:26:58 -07:00
Irfan Sheriff
93a61abc73 Merge "asynchronous driver commands" 2010-08-19 12:34:41 -07:00
Eric Fischer
549661a843 Merge "Import Romansh translations." 2010-08-19 12:00:34 -07:00
Mathias Agopian
8807ecb3c1 am bccfcd95: Merge "fix [2931718] glDrawArrays skips a triangle when more than 70 vertices are used." into gingerbread
Merge commit 'bccfcd95d3cc4029c1ed8514d31436a857283873' into gingerbread-plus-aosp

* commit 'bccfcd95d3cc4029c1ed8514d31436a857283873':
  fix [2931718] glDrawArrays skips a triangle when more than 70 vertices are used.
2010-08-19 11:46:43 -07:00
Mathias Agopian
d6a9447cbf Merge "fix [2931718] glDrawArrays skips a triangle when more than 70 vertices are used." into gingerbread 2010-08-19 11:44:50 -07:00