Mike Lockwood
3d11c77bae
Merge "Move CursorWindow class from core/jni to libbinder"
2010-05-28 10:24:29 -07:00
Wu-cheng Li
8618cde901
am 3ed1da35: am 198975bb: Merge "Add video frame parameter." into kraken
2010-05-28 09:35:20 -07:00
Mathias Agopian
ea4412c1df
am 6a9d88ff: am 64ff6ab4: Merge "more clean-up of Surfaceflinger\'s client management" into kraken
2010-05-28 09:35:08 -07:00
Mike Lockwood
244a7655ae
Move CursorWindow class from core/jni to libbinder
...
To allow use of the native CursorWindow class outside of the core framework jni
Change-Id: I72e8dcb91a2c691130c33cdfd9a25d343da1c592
Signed-off-by: Mike Lockwood <lockwood@android.com>
2010-05-28 10:08:21 -04:00
Wu-cheng Li
507cbb5012
am 198975bb: Merge "Add video frame parameter." into kraken
2010-05-28 04:36:29 -07:00
Wu-cheng Li
9bce74f474
Merge "Add video frame parameter." into kraken
2010-05-28 04:34:13 -07:00
Kenny Root
475bfc793c
am 50239de1: am ddbab4e1: am 6cc13745: am 94f1751c: Merge "Fix typo in EastAsianWidth javadoc" into froyo
2010-05-27 23:05:47 -07:00
Dirk Dougherty
f6a2c765bc
am 527c8b18: am 75ef3197: am 9eae9572: am 9f95c64e: Merge "Doc change: Add ADL 2Q10 slide decks to shareables directory. Remove latest_samples.zip from shareables." into froyo
2010-05-27 23:05:42 -07:00
Andreas Huber
8109ece319
am 2b4bc19e: am 1a35e612: Merge "Better sniffing of MPEG4 content by checking for a compatible sub-brand." into kraken
2010-05-27 23:05:21 -07:00
Mathias Agopian
9d17592c99
am 64ff6ab4: Merge "more clean-up of Surfaceflinger\'s client management" into kraken
2010-05-27 20:05:20 -07:00
Mathias Agopian
0208f2960c
Merge "more clean-up of Surfaceflinger's client management" into kraken
2010-05-27 20:04:05 -07:00
Mathias Agopian
d4784a3b90
more clean-up of Surfaceflinger's client management
...
SurfaceComposerClient now only exist on the WindowManager side,
the client side uses the new SurfaceClient class, which only
exposes what a client needs.
also instead of keeping mappings from IBinder to SurfaceComposerClients
we have a SurfaceClient per Surface (referring to the same IBinder), this
is made possible by the fact that SurfaceClient is very light.
Change-Id: I6a1f7015424f07871632a25ed6a502c55abfcfa6
2010-05-27 19:55:43 -07:00
Adam Powell
66660cde70
Merge "Recycle MotionEvents for ACTION_OUTSIDE in WindowManagerService"
2010-05-27 18:56:18 -07:00
Joe Malin
da9ece0879
Merge "DOC CHANGE: Clean up the concepts topic testing_android.jd"
2010-05-27 13:10:54 -07:00
Kenny Root
329ffd7613
am ddbab4e1: am 6cc13745: am 94f1751c: Merge "Fix typo in EastAsianWidth javadoc" into froyo
2010-05-27 12:39:20 -07:00
Dirk Dougherty
0956bb73f4
am 75ef3197: am 9eae9572: am 9f95c64e: Merge "Doc change: Add ADL 2Q10 slide decks to shareables directory. Remove latest_samples.zip from shareables." into froyo
2010-05-27 12:39:16 -07:00
Kenny Root
6ea5538527
am 6cc13745: am 94f1751c: Merge "Fix typo in EastAsianWidth javadoc" into froyo
...
Merge commit '6cc137459a21e67765d2490529a920ccfb14e362' into kraken
* commit '6cc137459a21e67765d2490529a920ccfb14e362':
Fix typo in EastAsianWidth javadoc
2010-05-27 12:37:28 -07:00
Dirk Dougherty
a76c33a393
am 9eae9572: am 9f95c64e: Merge "Doc change: Add ADL 2Q10 slide decks to shareables directory. Remove latest_samples.zip from shareables." into froyo
...
Merge commit '9eae957207c016db032819eadef261addf994a0d' into kraken
* commit '9eae957207c016db032819eadef261addf994a0d':
Doc change: Add ADL 2Q10 slide decks to shareables directory. Remove latest_samples.zip from shareables.
2010-05-27 12:37:22 -07:00
Kenny Root
085a308606
am 94f1751c: Merge "Fix typo in EastAsianWidth javadoc" into froyo
...
Merge commit '94f1751cb0c6ea4004ff86b3af89e06e00a66641' into froyo-plus-aosp
* commit '94f1751cb0c6ea4004ff86b3af89e06e00a66641':
Fix typo in EastAsianWidth javadoc
2010-05-27 12:35:25 -07:00
Dirk Dougherty
2c03020da7
am 9f95c64e: Merge "Doc change: Add ADL 2Q10 slide decks to shareables directory. Remove latest_samples.zip from shareables." into froyo
...
Merge commit '9f95c64e66df7481b1c624c6cf29569ca384a822' into froyo-plus-aosp
* commit '9f95c64e66df7481b1c624c6cf29569ca384a822':
Doc change: Add ADL 2Q10 slide decks to shareables directory. Remove latest_samples.zip from shareables.
2010-05-27 12:35:18 -07:00
Kenny Root
2baa0fbad3
Merge "Fix typo in EastAsianWidth javadoc" into froyo
2010-05-27 12:04:34 -07:00
Dirk Dougherty
f007f06d61
Merge "Doc change: Add ADL 2Q10 slide decks to shareables directory. Remove latest_samples.zip from shareables." into froyo
2010-05-27 11:46:26 -07:00
Amith Yamasani
d5e647bac7
Merge "Add a battery capacity value to the power profile."
2010-05-27 10:49:08 -07:00
Andreas Huber
d2077237c1
am 1a35e612: Merge "Better sniffing of MPEG4 content by checking for a compatible sub-brand." into kraken
2010-05-27 10:18:32 -07:00
Andreas Huber
7153f04882
Merge "Better sniffing of MPEG4 content by checking for a compatible sub-brand." into kraken
2010-05-27 10:16:54 -07:00
Jeff Hamilton
7c5d5cc1f0
am 635962e0: am c0046aab: am edf228ce: am dc46f6f6: Merge "Don\'t enforce broadcast timeouts for PRE_BOOT_COMPLETED broadcasts." into froyo
2010-05-27 09:44:49 -07:00
Jeff Hamilton
652a300ae3
am c0046aab: am edf228ce: am dc46f6f6: Merge "Don\'t enforce broadcast timeouts for PRE_BOOT_COMPLETED broadcasts." into froyo
2010-05-27 09:43:54 -07:00
Jeff Hamilton
3c27fda678
am edf228ce: am dc46f6f6: Merge "Don\'t enforce broadcast timeouts for PRE_BOOT_COMPLETED broadcasts." into froyo
...
Merge commit 'edf228ce1fc9aae9fe314229c19e80a434bb4393' into kraken
* commit 'edf228ce1fc9aae9fe314229c19e80a434bb4393':
Don't enforce broadcast timeouts for PRE_BOOT_COMPLETED broadcasts.
2010-05-27 09:42:44 -07:00
Jeff Hamilton
9994e682f1
am dc46f6f6: Merge "Don\'t enforce broadcast timeouts for PRE_BOOT_COMPLETED broadcasts." into froyo
...
Merge commit 'dc46f6f6cc44954c23229019270b54b8912be825' into froyo-plus-aosp
* commit 'dc46f6f6cc44954c23229019270b54b8912be825':
Don't enforce broadcast timeouts for PRE_BOOT_COMPLETED broadcasts.
2010-05-27 09:40:23 -07:00
Jeff Hamilton
5b4069e958
Merge "Don't enforce broadcast timeouts for PRE_BOOT_COMPLETED broadcasts." into froyo
2010-05-27 09:39:19 -07:00
Andreas Huber
99fc7a57d4
am 215aeda9: am 2cb138db: Merge "After failing to create an AudioTrack, only stop the source if we were the ones starting it." into kraken
2010-05-27 09:00:15 -07:00
Andreas Huber
12a99afda4
am 2cb138db: Merge "After failing to create an AudioTrack, only stop the source if we were the ones starting it." into kraken
2010-05-27 08:59:07 -07:00
Andreas Huber
f323def17b
Merge "After failing to create an AudioTrack, only stop the source if we were the ones starting it." into kraken
2010-05-27 08:57:23 -07:00
James Dong
7293e9b289
am cd9cdf8d: am 407f98bf: Remove the logic in CameraSource using CameraParameters class to find out the buffer size.
2010-05-27 08:02:44 -07:00
James Dong
7635a5c07c
am 407f98bf: Remove the logic in CameraSource using CameraParameters class to find out the buffer size.
2010-05-27 08:00:31 -07:00
Kristian Monsen
597232252d
Merge "Fixes an error when displaying the current layout test index."
2010-05-27 03:27:37 -07:00
Steve Block
1b853f5808
Merge "Merge WebKit at r60074: Update UA string"
2010-05-27 03:27:08 -07:00
Wu-cheng Li
150845d769
am 81192f85: am c109190b: Add support for gps altitude EXIF tags.
2010-05-27 01:05:16 -07:00
Wu-cheng Li
c1536b7de9
am c109190b: Add support for gps altitude EXIF tags.
2010-05-27 01:03:10 -07:00
Mathias Agopian
5d4f4eaf84
am ec272924: am df0364de: Merge "minor clean-up GLclampx -> GLclampf" into kraken
2010-05-26 22:52:06 -07:00
Mathias Agopian
2d42fcacd9
am df0364de: Merge "minor clean-up GLclampx -> GLclampf" into kraken
2010-05-26 22:50:00 -07:00
Mathias Agopian
9aaa3661ee
Merge "minor clean-up GLclampx -> GLclampf" into kraken
2010-05-26 22:49:03 -07:00
Eric Laurent
fef86205fe
Merge "Fix issue 2712130: Sholes: problem when playing audio while recording over bluetooth SCO."
2010-05-26 22:47:50 -07:00
Mathias Agopian
010fccb063
minor clean-up GLclampx -> GLclampf
2010-05-26 22:26:12 -07:00
Mathias Agopian
1d111ec85c
am ed34e950: am d908822d: Merge "clean-up dead-code" into kraken
2010-05-26 22:23:40 -07:00
Mathias Agopian
282d188d21
am d908822d: Merge "clean-up dead-code" into kraken
2010-05-26 22:21:47 -07:00
Mathias Agopian
a051357406
Merge "clean-up dead-code" into kraken
2010-05-26 22:20:39 -07:00
Mathias Agopian
dc7a80f07a
clean-up dead-code
2010-05-26 22:19:19 -07:00
Mathias Agopian
adb1550d38
am 521b8d5c: am a950aa84: Merge "Make sure to use filtering while in fixed-size mode" into kraken
2010-05-26 22:14:43 -07:00
Mathias Agopian
30643d5fbb
am a950aa84: Merge "Make sure to use filtering while in fixed-size mode" into kraken
2010-05-26 22:12:55 -07:00
