Evan Millar
6da7a38c05
Merge "Bring ServiceTestCase in line with current Service APIs and remove unnecessary asserts."
2010-06-01 15:10:20 -07:00
Derek Sollenberger
c32e646746
Merge "eoving Zoom animation logic from WebView into ZoomManager. This is pick bad5ede Revert "Refactor the on-screen zoom controls into a separate class.""
2010-06-01 13:52:17 -07:00
Vasu Nori
ec9981a8bd
Merge "set sqlite pagesize to the size, in bytes, of a block on "/data""
2010-06-01 13:12:01 -07:00
Grace Kloba
082f920102
Merge "merge two restore scale to one."
2010-06-01 10:19:59 -07:00
Shimeng (Simon) Wang
60677cdcae
Merge "Add English hyphenation dictionary into frameworks/base asset."
2010-06-01 10:05:47 -07:00
Christopher Tate
d5b0823815
am 0ec783da: am 009668bf: am 5c9d9949: am 6ee412d5: Also dump system process threads halfway through the watchdog interval
2010-05-30 21:20:43 -07:00
Jason Sams
22bbebed98
Merge "Rough implemetation of ForEach. Remove launchID from root graphics script."
2010-05-28 18:24:49 -07:00
Jason Sams
78c35230bc
Merge "Fountain update. Update field names to match legacy expectations. Cleanup java code."
2010-05-28 18:16:16 -07:00
Brian Carlstrom
d2dafd1dac
Merge "Merge remote branch 'goog/dalvik-dev' into dalvik-dev-to-master"
2010-05-28 14:32:43 -07:00
Christopher Tate
200a4856cd
am 009668bf: am 5c9d9949: am 6ee412d5: Also dump system process threads halfway through the watchdog interval
2010-05-28 12:54:58 -07:00
Christopher Tate
26acf3fa06
am 5c9d9949: am 6ee412d5: Also dump system process threads halfway through the watchdog interval
...
Merge commit '5c9d99496dab7a5cfe7cd37df749075ec9b4421b' into kraken
* commit '5c9d99496dab7a5cfe7cd37df749075ec9b4421b':
Also dump system process threads halfway through the watchdog interval
2010-05-28 12:52:43 -07:00
Christopher Tate
1647a676f3
am 6ee412d5: Also dump system process threads halfway through the watchdog interval
...
Merge commit '6ee412d51d8b601580cfb4b7be4f676b7ec76afd' into froyo-plus-aosp
* commit '6ee412d51d8b601580cfb4b7be4f676b7ec76afd':
Also dump system process threads halfway through the watchdog interval
2010-05-28 12:50:05 -07:00
James Dong
21dfd9927a
am 46e70361: am 46441198: Merge "Avoid copying for input recording frames in CameraSource" into kraken
2010-05-28 11:05:59 -07:00
James Dong
8ee529f0e4
am 46441198: Merge "Avoid copying for input recording frames in CameraSource" into kraken
2010-05-28 11:01:48 -07:00
James Dong
337eee57ba
Merge "Avoid copying for input recording frames in CameraSource" into kraken
2010-05-28 10:53:09 -07:00
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