Gil Dobjanschi
048449ebfa
Added ability to instantiate various implementations of the VideoEditor
...
Change-Id: I5b09afafff1c009bada4f49a5568286fe3cd9aef
2010-09-29 16:58:21 -07:00
Stephen Hines
01f0ad7c13
Fix clear() operation for rsScriptC.
...
- This removes a memory leak where some elements were not getting tracked
properly (and then triggering an assert when a context is destroyed).
- Convert ScriptCState to use a tracked object reference for mScript.
- Add a missing clear to FontState.
- Clean up synchronization in RSTest so that our graphics context outlives
any subtest context.
Change-Id: I0d5768c4d2f8810dd1ae2f68b1edd7e150f382fd
2010-09-29 16:58:17 -07:00
Robert Greenwalt
edf2971cd5
Change the 0_fully signal icon to the new style
...
bug:3047901
Change-Id: I1faceb69fa44714bf1d73db0da7bddaaa3bddf3b
2010-09-29 16:37:24 -07:00
Ying Wang
3caaa64e86
Merge "Fix proguard flag file dependency." into gingerbread
2010-09-29 16:13:21 -07:00
Alex Sakhartchouk
3ebb1ba50c
Merge "More robust attribute binding Adding attribute and uniform debug logging. Checking to see if aniso filtering is available."
2010-09-29 15:48:51 -07:00
Ying Wang
d252a52028
Fix proguard flag file dependency.
...
Change-Id: Ibc160fc98334ca83fa8059372d2384880069b9d2
2010-09-29 15:18:06 -07:00
Joe Onorato
9a042772c2
am 2a0b3c0d: Merge "AnimatedImageView: Stop the animation when we\'re not visible." into gingerbread
...
Merge commit '2a0b3c0d4cd98385ebfa60cc2014bdb2d7b5a7f5' into gingerbread-plus-aosp
* commit '2a0b3c0d4cd98385ebfa60cc2014bdb2d7b5a7f5':
AnimatedImageView: Stop the animation when we're not visible.
2010-09-29 14:28:03 -07:00
Joe Onorato
2a0b3c0d4c
Merge "AnimatedImageView: Stop the animation when we're not visible." into gingerbread
2010-09-29 14:25:15 -07:00
Joe Onorato
1e7277e204
AnimatedImageView: Stop the animation when we're not visible.
...
Change-Id: I5dedc4048806f1ea44ef4777ccf578a29e79869b
2010-09-29 14:21:06 -07:00
David Brown
5cf44f6907
am 87fbcc2b: Merge "Implement contacts lookup (caller-id) for incoming SIP calls." into gingerbread
...
Merge commit '87fbcc2b73b9b92d50c4520053bfc7bdff4cd91b' into gingerbread-plus-aosp
* commit '87fbcc2b73b9b92d50c4520053bfc7bdff4cd91b':
Implement contacts lookup (caller-id) for incoming SIP calls.
2010-09-29 14:10:37 -07:00
David Brown
87fbcc2b73
Merge "Implement contacts lookup (caller-id) for incoming SIP calls." into gingerbread
2010-09-29 14:08:31 -07:00
Doug Zongker
ab9f508292
am 981dec69: Merge "don\'t delete /cache/recovery/last_log on boot" into gingerbread
...
Merge commit '981dec695f83eb51935fcf480ecbd76ae3f7d6c4' into gingerbread-plus-aosp
* commit '981dec695f83eb51935fcf480ecbd76ae3f7d6c4':
don't delete /cache/recovery/last_log on boot
2010-09-29 13:43:28 -07:00
Doug Zongker
981dec695f
Merge "don't delete /cache/recovery/last_log on boot" into gingerbread
2010-09-29 13:41:00 -07:00
Romain Guy
e17c054d34
Merge "Add display lists caching."
2010-09-29 13:37:37 -07:00
Romain Guy
b051e895cc
Add display lists caching.
...
Change-Id: Iac3a248a81ed8cb076a83ef9d186b8ebba685b4c
2010-09-29 13:29:04 -07:00
Jaikumar Ganesh
c10207b6bf
am a5c742bf: Merge "Update local cache before sending intent." into gingerbread
...
Merge commit 'a5c742bfd08df55849418cd1c77065ac54d83502' into gingerbread-plus-aosp
* commit 'a5c742bfd08df55849418cd1c77065ac54d83502':
Update local cache before sending intent.
2010-09-29 13:27:38 -07:00
Jaikumar Ganesh
a5c742bfd0
Merge "Update local cache before sending intent." into gingerbread
2010-09-29 13:24:53 -07:00
Doug Zongker
d059055fb3
don't delete /cache/recovery/last_log on boot
...
Change-Id: I7739d7a61f4f0d0c2bc6324580404f61d435d716
2010-09-29 13:22:49 -07:00
Nick Pelly
4715bd91f5
resolved conflicts for merge of f4c3b7e9 to master
...
Change-Id: Idcdc521144f3072058b2bb6cb383e42c852e64f4
2010-09-29 12:20:51 -07:00
Gilles Debunne
ed1cf3dab5
am f0fa2674: Merge "New assets: wifi signal 1, no sim card." into gingerbread
...
Merge commit 'f0fa267492353a98562d32d4359f2099df0f2fcd' into gingerbread-plus-aosp
* commit 'f0fa267492353a98562d32d4359f2099df0f2fcd':
New assets: wifi signal 1, no sim card.
2010-09-29 12:20:31 -07:00
Eric Fischer
97708b19c5
am 5f0c8fe6: Merge "Split strings with SD card references into variations." into gingerbread
...
Merge commit '5f0c8fe6516ab2327f93f1c038d8854dbcbe7ce0' into gingerbread-plus-aosp
* commit '5f0c8fe6516ab2327f93f1c038d8854dbcbe7ce0':
Split strings with SD card references into variations.
2010-09-29 12:17:28 -07:00
Chia-chi Yeh
1c2eab2d86
am 955ab37c: Merge "RTP: Enable GSM-EFR codec." into gingerbread
...
Merge commit '955ab37cee3b2c61e67a2f8ceca895b47f6a182c' into gingerbread-plus-aosp
* commit '955ab37cee3b2c61e67a2f8ceca895b47f6a182c':
RTP: Enable GSM-EFR codec.
2010-09-29 12:17:24 -07:00
Gilles Debunne
f0fa267492
Merge "New assets: wifi signal 1, no sim card." into gingerbread
2010-09-29 12:15:51 -07:00
Eric Fischer
5f0c8fe651
Merge "Split strings with SD card references into variations." into gingerbread
2010-09-29 12:14:10 -07:00
Chia-chi Yeh
955ab37cee
Merge "RTP: Enable GSM-EFR codec." into gingerbread
2010-09-29 12:12:51 -07:00
Eric Fischer
d77782ed63
Split strings with SD card references into variations.
...
Change-Id: I39ead98a753f26c00c1e2ba6344338696263c49b
2010-09-29 12:09:04 -07:00
Chia-chi Yeh
f4ae94229d
RTP: Enable GSM-EFR codec.
...
Change-Id: I9d84009e4557a0a82c1f9d7d543922741be97c77
2010-09-30 03:07:57 +08:00
Chia-chi Yeh
1254b9c534
am cd386649: Merge "RTP: Revise the workaround of private addresses and fix bugs." into gingerbread
...
Merge commit 'cd38664916ca9e8c85c3269fec61e6a447ec7004' into gingerbread-plus-aosp
* commit 'cd38664916ca9e8c85c3269fec61e6a447ec7004':
RTP: Revise the workaround of private addresses and fix bugs.
2010-09-29 11:53:07 -07:00
Chia-chi Yeh
cd38664916
Merge "RTP: Revise the workaround of private addresses and fix bugs." into gingerbread
2010-09-29 11:50:16 -07:00
Chia-chi Yeh
fe5298992a
RTP: Revise the workaround of private addresses and fix bugs.
...
Change-Id: Ie654b569f47049aa452eca8d3e6d4a98ac18469c
2010-09-30 02:43:48 +08:00
Joe Onorato
198297b495
am f01a8730: Merge "Revert "Revert "Check for the DEVICE_POWER permission in userActivity.""" into gingerbread
...
Merge commit 'f01a873029641da2155ca1882f311d8f4e92675a' into gingerbread-plus-aosp
* commit 'f01a873029641da2155ca1882f311d8f4e92675a':
Revert "Revert "Check for the DEVICE_POWER permission in userActivity.""
2010-09-29 11:02:55 -07:00
Joe Onorato
f01a873029
Merge "Revert "Revert "Check for the DEVICE_POWER permission in userActivity.""" into gingerbread
2010-09-29 11:00:14 -07:00
Steve Block
856f2859e8
Fix some bugs in DumpRenderTree2 when forming HTML diffs
...
Change-Id: Id98c1b7dde1961c2dab4214a36ad43916baf8011
2010-09-29 18:51:42 +01:00
Steve Block
fd487ad1b8
Use the empty string when expected text results are missing in DumpRenderTree2
...
Change-Id: I204583ecc9c6a8017349124d5813c693c7f00dc9
2010-09-29 18:51:42 +01:00
Steve Block
f460dd4219
Fix a bug with the expected result path in DumpRenderTree2
...
If we fail to read from any of the possible expected result paths, we should
not record an expected result path.
Change-Id: Ica96b791c14a7755154be4ec9480be4d13f47a19
2010-09-29 18:51:42 +01:00
Steve Block
fdffee828c
Correctly implement EventSender mouse methods in DumpRenderTree2
...
This is taken from a similar change to DumpRenderTree in
https://android-git.corp.google.com/g/62449
Change-Id: I01418100ace1cf1ccfbb4fd28d72b99b54e0c140
2010-09-29 18:51:41 +01:00
Steve Block
c0f90a8f93
Trim empty lines when comparing text results in DumpRenderTree2
...
Change-Id: I94c9de8e6131f6b60456700e9d5a3b27c8c9d1c3
2010-09-29 18:51:41 +01:00
Steve Block
49aa65aa46
Reclassify failing multi-touch tests in DumpRenderTree ignore list
...
Change-Id: I95c94354a4d4f38583251a2d5d1a7ab4cb554e00
2010-09-29 18:51:41 +01:00
Steve Block
9d59429eaa
Merge "Update WebView useragent string for merge to WebKit r67908"
2010-09-29 10:42:30 -07:00
Roy West
b4a28f2426
am d146c233: Merge "Partial fix to bug 2992589: Edit dev admin strings." into gingerbread
...
Merge commit 'd146c233c570af3ee31d2e6ac44082571026d619' into gingerbread-plus-aosp
* commit 'd146c233c570af3ee31d2e6ac44082571026d619':
Partial fix to bug 2992589: Edit dev admin strings.
2010-09-29 10:40:06 -07:00
Roy West
d146c233c5
Merge "Partial fix to bug 2992589: Edit dev admin strings." into gingerbread
2010-09-29 10:37:11 -07:00
Jaikumar Ganesh
2dfe101149
Update local cache before sending intent.
...
Change-Id: I0e016cae3070b1811dd68958afb8a8501081097d
2010-09-29 10:31:02 -07:00
Roy West
7d3d88eec0
Partial fix to bug 2992589: Edit dev admin strings.
...
Change-Id: Ifa73e2961fa03b5ac707a73d6932e724931ddb2c
2010-09-29 10:28:56 -07:00
Joe Onorato
0c32c09cd3
Revert "Revert "Check for the DEVICE_POWER permission in userActivity.""
...
This reverts commit 4da4827504df019d4e64dd864f70526ff6d384a0.
2010-09-29 10:20:59 -07:00
Steve Block
f5c4e62af8
Update WebView useragent string for merge to WebKit r67908
...
Change-Id: If09628fcc8c8e408d3e280f57c534cf87bcc997f
2010-09-29 17:55:32 +01:00
Alex Sakhartchouk
4378f11755
More robust attribute binding
...
Adding attribute and uniform debug logging.
Checking to see if aniso filtering is available.
Change-Id: I2ed9d166ed7ff3df971d7af18b7a33f4e3ade928
2010-09-29 09:49:13 -07:00
Iain Merrick
5f421a5678
Update DumpRenderTree test expectations for fast/encoding
...
New layout tests added in https://android-git.corp.google.com/g/70926
Change-Id: I3c12f44d2c283e8b1da1c10975d6e4dd567889f8
2010-09-29 16:30:10 +01:00
Owen Lin
0ab9851308
Fix a initialization bug in BitmapRegionDecoder.
...
Change-Id: I6c1151fd34970a84d4de52d664d9a5dc464892c5
2010-09-29 23:12:44 +08:00
Kenny Root
8bd545ab4f
am 212d81a0: Merge "Move all the permissions check up for unmount" into gingerbread
...
Merge commit '212d81a004f50e51ed8f6d803b79f4b71546b351' into gingerbread-plus-aosp
* commit '212d81a004f50e51ed8f6d803b79f4b71546b351':
Move all the permissions check up for unmount
2010-09-29 07:53:06 -07:00
Kenny Root
212d81a004
Merge "Move all the permissions check up for unmount" into gingerbread
2010-09-29 07:40:32 -07:00