Konstantin Lopyrev
1a30f14387
Merge "Fix 2571872: Showing an error message on wrong password/pin entered."
2010-06-01 17:14:13 -07:00
Jason Sams
70570f35a3
Merge "Remove RS_KIND from vertex arrays types. Legacy vertex programs now bind by name just like the user programs. This removes the need for two different ways of declairing the same information."
2010-06-01 16:58:25 -07:00
Jason Sams
45ac54d9b8
Merge "types update."
2010-06-01 16:58:15 -07:00
Mathias Agopian
7704f5da75
am 7258fd92: am 5be7de5f: Merge "fix a bug where fading in/out of opaque 32-bits windows wasn\'t working" into kraken
2010-06-01 16:11:31 -07:00
Dirk Dougherty
a006a59d53
am 27d1e656: am 1b9dcb7b: am 8799cdfb: am de56c27d: Merge "Doc change: rename slide decks for sorting by year then quarter." into froyo
2010-06-01 16:11:12 -07:00
Dan Egnor
2a9a7a891e
am b8dd6b19: am 1e1e292e: am 1f5e8473: am a80331c4: Merge "Comment-only change to add documentation for FileObserver" into froyo
2010-06-01 16:10:49 -07:00
Andreas Huber
5ea13b0ac8
am 7bd9a6a5: am eaeae4ab: A debugging DataSource artifically limiting the available bandwidth.
2010-06-01 16:10:29 -07:00
Dirk Dougherty
7f911f63d8
am d64263b7: am 7fad207e: am bce5edaf: am 862ad0e5: Merge "Doc change: updated dashboards stats." into froyo
2010-06-01 16:10:01 -07:00
Wu-cheng Li
0da0384c70
am c3cfd10a: am 00e21f8e: Add javadoc for camera scene modes.
2010-06-01 16:09:32 -07:00
Mathias Agopian
d13f23fca6
am 5220af87: am 770492cb: more clean-up in preparation of bigger changes
2010-06-01 16:08:48 -07:00
Mathias Agopian
daa717000f
am 4f0a9114: am cdfd5fe2: Fix a typo in Singleton<>
2010-06-01 16:08:16 -07:00
Mathias Agopian
0841cfb457
am 5be7de5f: Merge "fix a bug where fading in/out of opaque 32-bits windows wasn\'t working" into kraken
2010-06-01 16:01:29 -07:00
Mathias Agopian
6d2f3973f6
Merge "fix a bug where fading in/out of opaque 32-bits windows wasn't working" into kraken
2010-06-01 16:00:07 -07:00
Mathias Agopian
49753266d2
fix a bug where fading in/out of opaque 32-bits windows wasn't working
...
opaque 32-bits windows are now allocated as RGBX_8888 buffers and
SurfaceFlinger always uses GL_MODULATE instead of trying to
optimize to GL_REPLACE when possible (makes no sense on
h/w accelerated GL).
we still have a small hack for devices that don't support
RGBX_8888 in their gralloc implementation where we revert to
RGBA_8888.
2010-06-01 15:57:44 -07:00
Dirk Dougherty
e3225b0f69
am 1b9dcb7b: am 8799cdfb: am de56c27d: Merge "Doc change: rename slide decks for sorting by year then quarter." into froyo
2010-06-01 15:48:52 -07:00
Dirk Dougherty
f1ad0d9c74
am 8799cdfb: am de56c27d: Merge "Doc change: rename slide decks for sorting by year then quarter." into froyo
...
Merge commit '8799cdfb012935501e47f15f28d6a8ed90bd464d' into kraken
* commit '8799cdfb012935501e47f15f28d6a8ed90bd464d':
Doc change: rename slide decks for sorting by year then quarter.
2010-06-01 15:46:53 -07:00
Dirk Dougherty
7c7eadeb4f
am de56c27d: Merge "Doc change: rename slide decks for sorting by year then quarter." into froyo
...
Merge commit 'de56c27dab020bf85187c8bcfc6842cb31006c59' into froyo-plus-aosp
* commit 'de56c27dab020bf85187c8bcfc6842cb31006c59':
Doc change: rename slide decks for sorting by year then quarter.
2010-06-01 15:45:24 -07:00
Dirk Dougherty
4005afd071
Merge "Doc change: rename slide decks for sorting by year then quarter." into froyo
2010-06-01 15:44:02 -07:00
Dan Egnor
314e4d4d31
am 1e1e292e: am 1f5e8473: am a80331c4: Merge "Comment-only change to add documentation for FileObserver" into froyo
2010-06-01 15:31:26 -07:00
Evan Millar
6da7a38c05
Merge "Bring ServiceTestCase in line with current Service APIs and remove unnecessary asserts."
2010-06-01 15:10:20 -07:00
Dan Egnor
5220f48338
am 1f5e8473: am a80331c4: Merge "Comment-only change to add documentation for FileObserver" into froyo
...
Merge commit '1f5e847350ef1aece046666e20e7692a1651d9dc' into kraken
* commit '1f5e847350ef1aece046666e20e7692a1651d9dc':
Comment-only change to add documentation for FileObserver
2010-06-01 14:44:35 -07:00
Andreas Huber
7a1dd66435
am eaeae4ab: A debugging DataSource artifically limiting the available bandwidth.
2010-06-01 14:42:25 -07:00
Dan Egnor
d691a841f6
am a80331c4: Merge "Comment-only change to add documentation for FileObserver" into froyo
...
Merge commit 'a80331c4d75cb8a7122e31315bc1e2950131659c' into froyo-plus-aosp
* commit 'a80331c4d75cb8a7122e31315bc1e2950131659c':
Comment-only change to add documentation for FileObserver
2010-06-01 14:28:46 -07:00
Dan Egnor
f192ba713b
Merge "Comment-only change to add documentation for FileObserver" into froyo
2010-06-01 14:09: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
Dirk Dougherty
ef92cfd7a2
am 7fad207e: am bce5edaf: am 862ad0e5: Merge "Doc change: updated dashboards stats." into froyo
2010-06-01 11:18:09 -07:00
Dirk Dougherty
9ec89bbbf8
am bce5edaf: am 862ad0e5: Merge "Doc change: updated dashboards stats." into froyo
...
Merge commit 'bce5edaf46e2abbfb07f3a292b1b967fab7d9ffe' into kraken
* commit 'bce5edaf46e2abbfb07f3a292b1b967fab7d9ffe':
Doc change: updated dashboards stats.
2010-06-01 11:13:29 -07:00
Dirk Dougherty
88e4f7fb39
am 862ad0e5: Merge "Doc change: updated dashboards stats." into froyo
...
Merge commit '862ad0e5242ae6ec43e8570c52e81b0953e6e76c' into froyo-plus-aosp
* commit '862ad0e5242ae6ec43e8570c52e81b0953e6e76c':
Doc change: updated dashboards stats.
2010-06-01 11:07:56 -07:00
Dirk Dougherty
2a053dc08d
Merge "Doc change: updated dashboards stats." into froyo
2010-06-01 11:04:20 -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
Wu-cheng Li
8e767f6d4d
am 00e21f8e: Add javadoc for camera scene modes.
2010-05-31 01:44:48 -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
Mathias Agopian
04c573269e
am 770492cb: more clean-up in preparation of bigger changes
2010-05-28 17:22:53 -07:00
Mathias Agopian
7e27f05739
more clean-up in preparation of bigger changes
...
the most important change here is the renaming of
ISurfaceFlingerClient to ISurfaceComposerClient
Change-Id: I94e18b0417f50e06f21377446639c61f65f959b3
2010-05-28 17:19:16 -07:00
Mathias Agopian
3ea7965f68
am cdfd5fe2: Fix a typo in Singleton<>
2010-05-28 15:18:00 -07:00
Mathias Agopian
b8510b98b5
Fix a typo in Singleton<>
...
it could cause the sLock field to be emitted several times
in different compilation unit. it also prevented to
have 2 Singleton<> in the same file.
2010-05-28 15:13:30 -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