29093 Commits

Author SHA1 Message Date
James Dong
349250f3b6 am c8d2fa70: am cbd038fe: Merge "Make MediaWriter stop and pause return errors if necessary" into gingerbread
Merge commit 'c8d2fa704abebdbf0bd8aac185216dc068950217'

* commit 'c8d2fa704abebdbf0bd8aac185216dc068950217':
  Make MediaWriter stop and pause return errors if necessary
2010-08-21 09:43:41 -07:00
Mathias Agopian
0b6d4aed03 am a90a1e55: am 545eab8a: Merge "remove unused pixel format" into gingerbread
Merge commit 'a90a1e55c60604b930eecff03fe25429205ec7df'

* commit 'a90a1e55c60604b930eecff03fe25429205ec7df':
  remove unused pixel format
2010-08-21 09:43:24 -07:00
Jeff Brown
302b93a47b 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
58f853b1cf 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
83b3e3515a 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
24b61ed7d6 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
749406bfc3 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
fc5d0cf564 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
08b352be43 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
e49564e0f7 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
a6a0fe436b 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
6b8daf480e 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
dfc8cde5c8 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
b43ac2610b 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
ce53603a4f 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
f885b29503 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
d78b868ce3 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
feb02e7695 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
37444f4239 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
2abd598f4c 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
39b6f999a4 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
Gilles Debunne
6563e24360 Added CHAR_LIMIT in strings.
Bug http://b/issue?id=2895327

Change-Id: I127ea2a6a33f342f2868de45c67da156db75fc1b
2010-08-20 19:23:16 -07:00
Romain Guy
582ac3fa1e Merge "Add support for textScaleX." 2010-08-20 18:42:54 -07:00
Romain Guy
a6937f7a11 Merge "Test setTextScaleX()" 2010-08-20 18:42:49 -07:00
Romain Guy
a80d32f7b6 Add support for textScaleX.
This will not look great because we render fonts using bitmaps, not
paths.

Change-Id: I01b87b81bfbdbfa28460a5d5309d38e2a65e77c4
2010-08-20 18:42:37 -07:00
Dianne Hackborn
727782053c Work on DialogFragment and docs.
- DialogFragment now has an option to not show a dialog, so you can
  use your UI somewhere else.
- Deprecated show() versions that were tied to activities.
- Added documentation to DialogFragment class.
- Added documentation to onSaveInstanceState() to explain how the
  time it is called is different than Activity's version.
- Fixed some java doc warnings.

Change-Id: If026744c368e2443030d2d9e0a9c808d820857df
2010-08-20 18:32:41 -07:00
Danica Chang
76dd2ce960 Merge "Wait for bluetooth to turn on before Bluetooth Tethering is enabled" 2010-08-20 17:42:28 -07:00
Romain Guy
29378192f7 Test setTextScaleX()
Change-Id: Iafa421def64a8f9a83b320b6cf3cc5286515c355
2010-08-20 15:49:27 -07:00
Adam Powell
f7b472fa96 Merge "Make ActionBar menus handle configuration changes gracefully." 2010-08-20 15:48:04 -07:00
Adam Powell
773b1b97fc Make ActionBar menus handle configuration changes gracefully.
Change-Id: I2c9ca846143b313ef9d2a01dff81385e0693518d
2010-08-20 15:45:27 -07:00
Jim Miller
015912e7f6 Merge "Make sure we have a native Surface in nContextSetSurface." 2010-08-20 15:14:56 -07:00
Danica Chang
8aac82a524 Wait for bluetooth to turn on before Bluetooth Tethering is enabled
Change-Id: I3fef94ea2cb102e1bb618f85e25d60c95cea1221
2010-08-20 15:12:22 -07:00
Adam Powell
a2af03f825 Fix SDK build - bad @link
Change-Id: Ic8831c94ae0c89d6ccc08a21f399cdd3ffba0bb2
2010-08-20 14:41:13 -07:00
Adam Powell
2b342f0a76 Allow ViewGroup to split MotionEvents to multiple targets during dispatch.
Use the layout xml attribute splitMotionEvents="true" or the ViewGroup
method setMotionEventSplittingEnabled(true) to enable motion event
splitting. Rules for splitting are as follows:

* Splitting is enabled per ViewGroup. When splitting is enabled any
  MotionEvent dispatched to that ViewGroup can potentially be split
  into several and dispatched to children independently.

* Each pointer is assigned a target child view when the ACTION_DOWN or
  ACTION_POINTER_DOWN event is received. That will be the pointer's
  target until it goes up, the target returns false from onTouchEvent,
  or the MotionEvents are intercepted.

* Multiple pointers may be assigned to the same target. All pointer
  data sent to a target are bundled into a single MotionEvent. Child
  views do not need to be aware that splitting has occurred.

Change-Id: I993f838e2f6b455da9812f4742a016dfcd1c4cc9
2010-08-20 13:39:28 -07:00
Dianne Hackborn
8a44bb23c1 Update aapt to find fragment references.
Add knowledge about <fragment class="..."> for layout files
and update to reflect the change of the header tag from Header.

Change-Id: I91e2a5f204a8e222367985383c1721030c7954d8
2010-08-20 12:56:42 -07:00
Gilles Debunne
ed23e3b879 Merge "New UI theme for EditText." 2010-08-20 12:35:31 -07:00
Gilles Debunne
ecf44e4d21 New UI theme for EditText.
Introduces new Theme.Holo and Theme.Light.Holo themes.

Change-Id: I208c0400d5e1713e24a7acb4dc3a3a6fbb4a94c3
2010-08-20 12:32:36 -07:00
Romain Guy
d7d4141713 Merge "GridView's pageScroll() would be offset by one item." 2010-08-20 11:40:42 -07:00
Nipun Kwatra
727f658e81 Merge "Added downsample()" 2010-08-20 11:35:38 -07:00
Nipun Kwatra
96624731c3 Added downsample()
Added a downsample function which downsamples the source image
starting at an offset and skipping every few pixels. Currently
no low pass filtering is done, but it should be added later.

Change-Id: Iec34092c536bfc661a15521e6a1ef2ef3f815c61
2010-08-20 10:54:59 -07:00
Romain Guy
64d50a67f4 GridView's pageScroll() would be offset by one item.
External issue #10580

Change-Id: Ie1b3ea8e1f7890b480d6ba8ff423024a5c4cd047
2010-08-20 10:50:49 -07:00
Nipun Kwatra
437e6c49f1 Merge "const correctness, validPixel test." 2010-08-20 10:41:08 -07:00
Daniel Sandler
0dc4d15cdc Merge "Notification.fullScreenIntent support." 2010-08-20 09:15:53 -07:00
Daniel Sandler
fb970e9204 Notification.fullScreenIntent support.
Bug: 2911617
Change-Id: I1b4cd6ff0f760bad721a3a8eed61209b44b64c02
2010-08-20 10:57:52 -04:00
Daniel Sandler
27e1a79bf7 On-device screenshot support.
This comes in the form of a command, `screenshot`, which
will read /dev/graphics/fb0 (in a manner very similar to
adb's framebuffer_service) and write to the specified PNG
file.

Additionally, dumpstate now accepts a -p flag (mnemonic:
"picture" or "png") that, when specified, will cause a
screenshot to be captured in the same directory as the
bugreport.

Future work: invoke `dumpstate -p` when the bugreport
keychord is pressed, giving users a convenient way to attach
screenshots to bug reports (or simply take screenshots at
all without developer tools).

Bug: 2216571 (and probably plenty of others)
Change-Id: I36afbc55a0308a7bc01112ef39c4c62777efb203
2010-08-20 09:42:49 -04:00
Daniel Sandler
d664df2d95 Merge "Fix incorrect usage text for am." 2010-08-20 06:31:24 -07:00
Brad Fitzpatrick
a3f641f22a 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
4bd3e95ce5 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
49eda50415 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
1d8b34ecbb Merge branch 'master' of ssh://android-git:29418/platform/frameworks/base 2010-08-20 06:27:27 -07:00