Andreas Huber
704f7e64ba
am c143ae7e: am ad98d383: Support for communicating if a buffer read from the _extractor_ is a sync sample or not.
...
Merge commit 'c143ae7eb74205eb2b71e63479988b9913956687'
* commit 'c143ae7eb74205eb2b71e63479988b9913956687':
Support for communicating if a buffer read from the _extractor_ is a sync sample or not.
2010-08-06 19:06:56 -07:00
Andreas Huber
2e0a33f8e6
am 4f25d033: am 261aaa16: Merge "Properly skip the \'skip\' chunk in mpeg4 files." into gingerbread
...
Merge commit '4f25d03382ca01a00c6f0e0967c5edf302f62b55'
* commit '4f25d03382ca01a00c6f0e0967c5edf302f62b55':
Properly skip the 'skip' chunk in mpeg4 files.
2010-08-06 19:06:52 -07:00
Steve Howard
4938d79160
am d49d4031: am 9fbf00cb: Merge "Slight improvement (hopefully) to orientation sensing." into gingerbread
...
Merge commit 'd49d4031d654398904d5af30c488a3b32b176122'
* commit 'd49d4031d654398904d5af30c488a3b32b176122':
Slight improvement (hopefully) to orientation sensing.
2010-08-06 19:06:48 -07:00
Konstantin Lopyrev
d07476aee5
am 443f9baf: am 3b0d3d51: Merge "Adding a way for Hierarchy Viewer to get the focused window." into gingerbread
...
Merge commit '443f9bafb02c6a5a7311c7069995e5a3bdd875f8'
* commit '443f9bafb02c6a5a7311c7069995e5a3bdd875f8':
Adding a way for Hierarchy Viewer to get the focused window.
2010-08-06 19:06:44 -07:00
Steve Howard
2b19611929
am f0857005: (-s ours) am db86c59e: New drawables for the update to the maps API (DO NOT MERGE)
...
Merge commit 'f0857005b25c59b0135977b5d869be16232a1e50'
* commit 'f0857005b25c59b0135977b5d869be16232a1e50':
New drawables for the update to the maps API (DO NOT MERGE)
2010-08-06 19:06:40 -07:00
Steve Howard
bd576042a5
am 974c993f: am 8e15afe7: Make downloads visible by default.
...
Merge commit '974c993fc3771169efa73e40981d18ac0969fac8'
* commit '974c993fc3771169efa73e40981d18ac0969fac8':
Make downloads visible by default.
2010-08-06 19:06:31 -07:00
Kenny Root
91fc6e8c89
am d7ce227b: am 818490ab: Fix String8::operator+
...
Merge commit 'd7ce227bcb854f048124bbc487eba844c6599142'
* commit 'd7ce227bcb854f048124bbc487eba844c6599142':
Fix String8::operator+
2010-08-06 19:04:09 -07:00
Dan Egnor
6f50a95680
am 799f2bb0: am b37bca9e: Merge "COMMENT ONLY change to fix some formatting glitches and (more importantly) clarify issues surrounding removed accounts." into froyo
...
Merge commit '799f2bb04102b4b692b52eed5c36aea9a8cde471' into gingerbread-plus-aosp
* commit '799f2bb04102b4b692b52eed5c36aea9a8cde471':
COMMENT ONLY change to fix some formatting glitches and
2010-08-06 18:59:49 -07:00
Dan Egnor
799f2bb041
am b37bca9e: Merge "COMMENT ONLY change to fix some formatting glitches and (more importantly) clarify issues surrounding removed accounts." into froyo
...
Merge commit 'b37bca9e79489a1abd848ce762bb7d87203b3414' into gingerbread
* commit 'b37bca9e79489a1abd848ce762bb7d87203b3414':
COMMENT ONLY change to fix some formatting glitches and
2010-08-06 18:55:05 -07:00
Andreas Huber
c143ae7eb7
am ad98d383: Support for communicating if a buffer read from the _extractor_ is a sync sample or not.
...
Merge commit 'ad98d383a04fce08a147b200e23b12f12b2681a3' into gingerbread-plus-aosp
* commit 'ad98d383a04fce08a147b200e23b12f12b2681a3':
Support for communicating if a buffer read from the _extractor_ is a sync sample or not.
2010-08-06 18:54:31 -07:00
Andreas Huber
4f25d03382
am 261aaa16: Merge "Properly skip the \'skip\' chunk in mpeg4 files." into gingerbread
...
Merge commit '261aaa16a2f469d7f3d3b56f1a45432460ee4dba' into gingerbread-plus-aosp
* commit '261aaa16a2f469d7f3d3b56f1a45432460ee4dba':
Properly skip the 'skip' chunk in mpeg4 files.
2010-08-06 18:54:26 -07:00
Steve Howard
d49d4031d6
am 9fbf00cb: Merge "Slight improvement (hopefully) to orientation sensing." into gingerbread
...
Merge commit '9fbf00cb041eeb22acad93deace9712c57b4c594' into gingerbread-plus-aosp
* commit '9fbf00cb041eeb22acad93deace9712c57b4c594':
Slight improvement (hopefully) to orientation sensing.
2010-08-06 18:54:22 -07:00
Konstantin Lopyrev
443f9bafb0
am 3b0d3d51: Merge "Adding a way for Hierarchy Viewer to get the focused window." into gingerbread
...
Merge commit '3b0d3d51412aa90ac3e334f1e0c4b7adb0e124f8' into gingerbread-plus-aosp
* commit '3b0d3d51412aa90ac3e334f1e0c4b7adb0e124f8':
Adding a way for Hierarchy Viewer to get the focused window.
2010-08-06 18:54:18 -07:00
Steve Howard
f0857005b2
am db86c59e: New drawables for the update to the maps API (DO NOT MERGE)
...
Merge commit 'db86c59e6280cb2ebeeda09ba8dee4a1440dea1d' into gingerbread-plus-aosp
* commit 'db86c59e6280cb2ebeeda09ba8dee4a1440dea1d':
New drawables for the update to the maps API (DO NOT MERGE)
2010-08-06 18:54:13 -07:00
Steve Howard
974c993fc3
am 8e15afe7: Make downloads visible by default.
...
Merge commit '8e15afe799bbe8d332640c1f2b57b5e0458a9625' into gingerbread-plus-aosp
* commit '8e15afe799bbe8d332640c1f2b57b5e0458a9625':
Make downloads visible by default.
2010-08-06 18:54:03 -07:00
Kenny Root
d7ce227bcb
am 818490ab: Fix String8::operator+
...
Merge commit '818490ab2abe36dfc6c13d01fea5220bd64cca8c' into gingerbread-plus-aosp
* commit '818490ab2abe36dfc6c13d01fea5220bd64cca8c':
Fix String8::operator+
2010-08-06 18:53:48 -07:00
Dan Egnor
b37bca9e79
Merge "COMMENT ONLY change to fix some formatting glitches and (more importantly) clarify issues surrounding removed accounts." into froyo
2010-08-06 16:39:02 -07:00
Jason Sams
072671f0ee
Merge "Fix debugging support for float vectors and add matrix debugging."
2010-08-06 16:24:15 -07:00
Jason Sams
d64188a4a4
Fix debugging support for float vectors and add matrix debugging.
...
Change-Id: Ie1ee3764a32889f3c39b923186f14af74ecb772f
2010-08-06 16:22:50 -07:00
Paul Eastham
2032d03645
Merge "Add support for playing a sound before/after dumpstate."
2010-08-06 16:12:55 -07:00
Andreas Huber
ad98d383a0
Support for communicating if a buffer read from the _extractor_ is a sync sample or not.
...
Change-Id: Ie71506224d937cfff1fa1273bfac31c47db8845f
related-to-bug: 2900534
2010-08-06 15:46:17 -07:00
Konstantin Lopyrev
c6dc45700b
Make sure profiling is done only for views that are actually measured, laid out and drawn.
...
Change-Id: I88c66e882be2781d079c51b6580a19c4e359c5b1
2010-08-06 15:41:33 -07:00
Andreas Huber
261aaa16a2
Merge "Properly skip the 'skip' chunk in mpeg4 files." into gingerbread
2010-08-06 15:21:47 -07:00
Alex Sakhartchouk
8e3e359e59
Merge "Added drop shadow renderer to the font class."
2010-08-06 15:05:40 -07:00
Andreas Huber
765b8aa8de
Properly skip the 'skip' chunk in mpeg4 files.
...
Change-Id: I6795347f91f24d5379e8dc80a24ae016a9629c9c
related-to-bug: 2901311
2010-08-06 15:02:54 -07:00
Paul Eastham
bfb071df71
Add support for playing a sound before/after dumpstate.
2010-08-06 14:58:34 -07:00
Alex Sakhartchouk
f18136cb3c
Added drop shadow renderer to the font class.
...
Change-Id: Id243abfbbb58e54f6a05f592a302984b5321e608
2010-08-06 14:49:04 -07:00
Steve Howard
9fbf00cb04
Merge "Slight improvement (hopefully) to orientation sensing." into gingerbread
2010-08-06 14:28:37 -07:00
Romain Guy
9e044aed21
Fix NPE in RoundRectShape.
...
Change-Id: I3cef1b2723e5ebf3583f91b1bfe8121c0f6d253d
2010-08-06 14:27:30 -07:00
Konstantin Lopyrev
3b0d3d5141
Merge "Adding a way for Hierarchy Viewer to get the focused window." into gingerbread
2010-08-06 14:10:29 -07:00
Konstantin Lopyrev
f962476471
Adding a way for Hierarchy Viewer to get the focused window.
...
Change-Id: I01e6ab4aa24d632fba586cb9e112d8d9df1a681a
2010-08-06 13:27:31 -07:00
Steve Howard
db86c59e62
New drawables for the update to the maps API (DO NOT MERGE)
...
Manual merge from master.
Change-Id: I97ad9daff6036e5c7b9e946b53191574c8b0b6ed
2010-08-06 13:10:25 -07:00
Jesse Wilson
145b0c8be7
Fixing current.xml to handle last minute JSON API changes
...
Change-Id: I8cc2a686c1da4cc01c2b4aba5b017a54f5252c16
2010-08-06 12:39:58 -07:00
Daniel Sandler
d09caeb151
Merge "Fix startup crash on phones."
2010-08-06 12:07:17 -07:00
Daniel Sandler
7bff7e6e84
Fix startup crash on phones.
...
Bug: 2899243
Change-Id: I344fdd4cd3acce64f78cb9b71848b888f59fadfa
2010-08-06 15:06:18 -04:00
Adam Powell
6dd73b45a4
Fix some lifecycle issues with populating the action bar's menu
...
Change-Id: I5f63df3260392b09fbb7120986702d01dac5906c
2010-08-06 11:30:35 -07:00
Romain Guy
22158e139a
Automatically cleanup textures that don't fit in the cache.
...
Change-Id: I4f29ed96ea11118b391fb957e1e4d1b8fcef1537
2010-08-06 11:18:34 -07:00
Steve Howard
8e15afe799
Make downloads visible by default.
...
Change-Id: I8f8b325658d8afc964bddd3f1c03ed20e6bd10aa
2010-08-06 11:06:49 -07:00
Derek Sollenberger
ff0f973442
Support complex characters in plugins.
...
Complex characters like chinese are sent via the onKeyMultiple()
callback. The WebView passes these characters to Webkit so that
non-text inputs (e.g. plugins) can process them.
Change-Id: I159c4a404c195b60cc7f63ef4bff0aa80db96c3f
http://b/2900114
2010-08-06 14:05:15 -04:00
Romain Guy
604b1e5068
Merge "Fix incorrect memory cleanup in SkiaShader."
2010-08-06 10:58:07 -07:00
Romain Guy
25ee037fee
Fix incorrect memory cleanup in SkiaShader.
...
Bug #2895037
Change-Id: Id233c2a8a5b709dc9f26ff60aad989e9583a2382
2010-08-06 10:57:58 -07:00
Jesse Wilson
76d7e20a75
A new streaming JSON API.
...
Change-Id: Iefa7ee44ddacbe22ea9ebca3165ac59030659bf2
2010-08-06 10:34:44 -07:00
Michael Kolb
fdde0003e6
Merge "added scroll control support to WebView"
2010-08-06 10:18:41 -07:00
John Huang
928245d16f
Merge "Add supporting MCC=450(Korea)"
2010-08-06 10:02:08 -07:00
Mike Lockwood
b83f9c3027
Merge "Set umask of system server to 0077"
2010-08-06 09:40:54 -07:00
Nipun Kwatra
f9263dd0ea
Merge "When using still camera for time lapse capture, don't set preview."
2010-08-06 09:02:11 -07:00
Kenny Root
818490ab2a
Fix String8::operator+
...
The LHS was ignored when using:
String8 + String8
String8 + (const char*)
Add unit tests for above.
Bug: 2898473
Change-Id: Ic8fe7be668b665c36aaaa3fc3c3ffdfff0fbba25
2010-08-06 09:00:10 -07:00
Maksymilian Osowski
f2cbc68d73
Merge "Added detection of missing EventSender functions."
2010-08-06 08:11:15 -07:00
Mike Lockwood
7503b96e8e
am 19be0bd0: am 5723dfe8: GPS: Don\'t set XTRA download pending flag at boot time.
...
Merge commit '19be0bd07e348fc405e1c46a698843695fc64e48'
* commit '19be0bd07e348fc405e1c46a698843695fc64e48':
GPS: Don't set XTRA download pending flag at boot time.
2010-08-06 07:44:28 -07:00
Mike Lockwood
19be0bd07e
am 5723dfe8: GPS: Don\'t set XTRA download pending flag at boot time.
...
Merge commit '5723dfe8c87d0887b8926f43637ed300466890d2' into gingerbread-plus-aosp
* commit '5723dfe8c87d0887b8926f43637ed300466890d2':
GPS: Don't set XTRA download pending flag at boot time.
2010-08-06 07:41:44 -07:00