Jason Sams
4199175ff3
Merge "Fix field packer bug for U32 data. Fix initial refcounts in allocations. Support null references in allocations."
2010-08-12 12:49:17 -07:00
Jason Sams
ee73498ddf
Fix field packer bug for U32 data.
...
Fix initial refcounts in allocations.
Support null references in allocations.
Change-Id: Ifba6406ba750e69737bd77fa7df5d7fb8e27a5b4
2010-08-12 12:47:04 -07:00
Leon Scroggins III
6f99270cbe
Hide the soft keyboard even if WebTextView is not in use.
...
Sometimes clearTextEntry is called when mWebTextView is not
being used. In those cases, we still want to hide the soft
keyboard, since the user is no longer attempting to type.
Bug: 2835685
Change-Id: I4e8d4bc60b23028e2840d6205caf13699bce6031
2010-08-12 14:45:38 -04:00
John Huang
81a81f02d6
am edfe20c4: am c636b846: Merge "Enhance WspTypeDecoder to decode Content Type Parameters"
...
Merge commit 'edfe20c4bd04716420a47516959d7c0e3e0064f6'
* commit 'edfe20c4bd04716420a47516959d7c0e3e0064f6':
Enhance WspTypeDecoder to decode Content Type Parameters
2010-08-12 10:32:39 -07:00
John Huang
edfe20c4bd
am c636b846: Merge "Enhance WspTypeDecoder to decode Content Type Parameters"
...
Merge commit 'c636b846160482fbebd9a3792d52b9ff864228f2' into gingerbread-plus-aosp
* commit 'c636b846160482fbebd9a3792d52b9ff864228f2':
Enhance WspTypeDecoder to decode Content Type Parameters
2010-08-12 10:26:58 -07:00
James Dong
e63cccf006
am 8aa244ea: am 45cb3cfa: Merge "Handle large audio lost" into gingerbread
...
Merge commit '8aa244eab7ba834439cc919fd1f83d1e4ef49aff'
* commit '8aa244eab7ba834439cc919fd1f83d1e4ef49aff':
Handle large audio lost
2010-08-12 10:22:58 -07:00
James Dong
387c9ff704
am f4e26da1: am b6541f0a: Merge "Fix a crash due to unnecessary check on the codec config data for H263 video track" into gingerbread
...
Merge commit 'f4e26da1af90145564f6065d62cf8efcef0c6f04'
* commit 'f4e26da1af90145564f6065d62cf8efcef0c6f04':
Fix a crash due to unnecessary check on the codec config data for H263 video track
2010-08-12 10:22:48 -07:00
Alex Sakhartchouk
0de9444aa6
Preparing renderscript java code for use with phanton references.
...
Changing rs_quaternion to be float4
Change-Id: Ibf49f412be8979eaa04cb252b407467eacd9dbf0
2010-08-12 10:16:55 -07:00
James Dong
8aa244eab7
am 45cb3cfa: Merge "Handle large audio lost" into gingerbread
...
Merge commit '45cb3cfacf3b07ae3c5f15eba9bbbcd060cee261' into gingerbread-plus-aosp
* commit '45cb3cfacf3b07ae3c5f15eba9bbbcd060cee261':
Handle large audio lost
2010-08-12 10:12:28 -07:00
James Dong
f4e26da1af
am b6541f0a: Merge "Fix a crash due to unnecessary check on the codec config data for H263 video track" into gingerbread
...
Merge commit 'b6541f0af89b1fe85cb53e5dac461587eb040fb0' into gingerbread-plus-aosp
* commit 'b6541f0af89b1fe85cb53e5dac461587eb040fb0':
Fix a crash due to unnecessary check on the codec config data for H263 video track
2010-08-12 10:12:21 -07:00
James Dong
45cb3cfacf
Merge "Handle large audio lost" into gingerbread
2010-08-12 10:07:51 -07:00
James Dong
b6541f0af8
Merge "Fix a crash due to unnecessary check on the codec config data for H263 video track" into gingerbread
2010-08-12 10:07:38 -07:00
John Huang
c636b84616
Merge "Enhance WspTypeDecoder to decode Content Type Parameters"
2010-08-12 10:07:06 -07:00
James Dong
aa56ede879
am 0386d04b: am 581581fe: Merge "Fix all fd leaks in authoring engine" into gingerbread
...
Merge commit '0386d04b19619b03b6bce830010e11d31d3f8a5c'
* commit '0386d04b19619b03b6bce830010e11d31d3f8a5c':
Fix all fd leaks in authoring engine
2010-08-12 09:32:18 -07:00
James Dong
0386d04b19
am 581581fe: Merge "Fix all fd leaks in authoring engine" into gingerbread
...
Merge commit '581581fe1addfac8913c8d4d6c88eed6ded90de4' into gingerbread-plus-aosp
* commit '581581fe1addfac8913c8d4d6c88eed6ded90de4':
Fix all fd leaks in authoring engine
2010-08-12 09:22:17 -07:00
James Dong
581581fe1a
Merge "Fix all fd leaks in authoring engine" into gingerbread
2010-08-12 09:13:14 -07:00
Maksymilian Osowski
2c46b6d2b1
Merge "Added more info to the Summarizer."
2010-08-12 08:57:57 -07:00
Irfan Sheriff
c983960a92
Merge "Asynchronous API"
2010-08-12 07:58:46 -07:00
Irfan Sheriff
e04653cbd0
Asynchronous API
...
Add asynchronous API for simplified connect, save
and remove.
Add a SUPPLICANT_CONFIG_CHANGED_ACTION broadcast to
notifiy a supplicant configuration change.
Change-Id: I69ae116246094de4a469cb2af5baf37e5ad4d6dd
2010-08-12 07:57:36 -07:00
Shih-wei Liao
009e51e654
Merge "Fix anonymous struct."
2010-08-12 06:33:02 -07:00
Maksymilian Osowski
2e64bb7afd
Added more info to the Summarizer.
...
Bug: 2889572
Change-Id: If02dbdf90e8b8717370b5586cc72be235c93db79
2010-08-12 14:32:30 +01:00
Steve Block
d7bfb2dfb8
Merge "Update DeviceOrientationManager to be specific to a WebViewCore"
2010-08-12 06:30:31 -07:00
Daniel Sandler
c9faccccb4
Merge "System bar settings panel: first pass."
2010-08-12 04:58:40 -07:00
Shih-wei Liao
66bda36563
Fix anonymous struct.
...
Change-Id: Icdee2f05738a8712a309720d8d27dc2efc0dd749
2010-08-12 04:16:15 -07:00
Hung-ying Tyan
4ff4a1fa87
SIP: remove unused file.
...
Change-Id: If173fed70080de7d903bc176d91bd94338c4fdcb
2010-08-12 16:10:49 +08:00
Daniel Sandler
6425ef950c
System bar settings panel: first pass.
...
Implemented: Clock, brightness, silent toggle, airplane mode
(although this seems not to be working well yet on the
device).
Unimplemented: Orientation lock, battery, wifi signal, date.
Change-Id: Iec9cc833103a68aecccf46cd6eeffc2128d64eea
2010-08-12 02:29:57 -04:00
Dianne Hackborn
6fca3e68d3
Merge "Fix back popping the back stack too much."
2010-08-11 22:40:53 -07:00
Dianne Hackborn
2cceaaae34
Fix back popping the back stack too much.
...
Change-Id: I18a3d0f3546e51411771d49a68a97108e00b1cea
2010-08-11 22:32:15 -07:00
Dianne Hackborn
5caaf378d8
am 9185e26a: am fb86ce93: Add watermark support.
...
Merge commit '9185e26a8f06dd7013a528ffa2fe6b3f4aa58b7e'
* commit '9185e26a8f06dd7013a528ffa2fe6b3f4aa58b7e':
Add watermark support.
2010-08-11 22:10:07 -07:00
Adam Powell
65d79fbe55
Fix bug 2911396 - documentation fix
...
Change-Id: Ia2bbb25dfd6b165f044f5ef1cf291debfe79b1ca
2010-08-11 22:05:46 -07:00
Dianne Hackborn
9185e26a8f
am fb86ce93: Add watermark support.
...
Merge commit 'fb86ce93079db4465a61489275c65bcf8ce4669e' into gingerbread-plus-aosp
* commit 'fb86ce93079db4465a61489275c65bcf8ce4669e':
Add watermark support.
2010-08-11 22:04:27 -07:00
Adam Powell
7f933daea9
Merge "Fix bug 2911311 and bug 2911700"
2010-08-11 21:59:54 -07:00
Adam Powell
f6148c53f9
Fix bug 2911311 and bug 2911700
...
Integrate the action bar overflow menu better with the options menu lifecycle.
Change-Id: I1e3fdba04b01718c3ee3367f92e5dabe7bc84b5c
2010-08-11 21:56:27 -07:00
Romain Guy
831cffa572
Merge "Bunch of fixes."
2010-08-11 19:38:40 -07:00
Romain Guy
959c91f7f7
Bunch of fixes.
...
Fixes memory leak, fixes multiple context support, fix 3d transforms.
Change-Id: I7462cfbc57857dbd4de4e76b9d4cba58a1bce77b
2010-08-11 19:35:53 -07:00
Chet Haase
949dbf7629
Fix the build from two breaking changes (update to current.xml and ViewRoot import)
...
Change-Id: I987b12f7c5fdd4137faa55405fce99bd6f73fc71
2010-08-11 18:41:06 -07:00
Adam Powell
0df8bfed3c
Merge "Fix bug 2911529"
2010-08-11 18:24:47 -07:00
Dianne Hackborn
fb86ce9307
Add watermark support.
...
Use these system properties:
ro.watermark.text
ro.watermark.height
ro.watermark.x
ro.watermark.y
ro.watermark.color
ro.watermark.shadow.radius
ro.watermark.shadow.dx
ro.watermark.shadow.dy
ro.watermark.shadow.color
If ro.watermark.text is not set, no watermark will be shown. All others
have reasonable defaults if they are not set.
Change-Id: Ibe4a01e6f1c576494ae2462e2688cdfaa8c62cb8
2010-08-11 18:15:29 -07:00
Mathias Agopian
aa17f00405
am 70a7c92e: am 65f2490e: Merge "should fix sim build, hopefully" into gingerbread
...
Merge commit '70a7c92e161225f587af453e01d2b124dbf6303f'
* commit '70a7c92e161225f587af453e01d2b124dbf6303f':
should fix sim build, hopefully
2010-08-11 18:07:42 -07:00
Adam Powell
3d3da27ab3
Fix bug 2911529
...
Change-Id: I18d7f5d8a300bbc73ef721c5d4deb200d6a490b8
2010-08-11 18:07:31 -07:00
Jeff Brown
b8244f4705
Merge "resolved conflicts for merge of 4e14159a to master"
2010-08-11 18:05:04 -07:00
Jeff Brown
08965fc730
resolved conflicts for merge of 4e14159a to master
...
Change-Id: I42dc1efc2218af326a826aeb16daded71722b363
2010-08-11 18:00:34 -07:00
Chet Haase
811ed1065f
Make Fragments use the new animation APIs
...
Change-Id: I3e3c271234c737491b6ae37821f16434f4563b1d
2010-08-11 17:54:24 -07:00
Mathias Agopian
70a7c92e16
am 65f2490e: Merge "should fix sim build, hopefully" into gingerbread
...
Merge commit '65f2490e1baa6eac5905cbc638e69581ebcd8dee' into gingerbread-plus-aosp
* commit '65f2490e1baa6eac5905cbc638e69581ebcd8dee':
should fix sim build, hopefully
2010-08-11 17:35:58 -07:00
Mathias Agopian
65f2490e1b
Merge "should fix sim build, hopefully" into gingerbread
2010-08-11 17:32:25 -07:00
Mathias Agopian
b59beb5ca6
should fix sim build, hopefully
...
Change-Id: I5390bd34dcca36fef43b5169386fff1b04cc842b
2010-08-11 17:31:33 -07:00
Jeff Brown
4e14159a04
am bb65ae02: Merge "Fix ViewRoot bug attempting to finish synthetic KeyEvents." into gingerbread
...
Merge commit 'bb65ae020f802bae3e80dd8e05845fee5d6bc2cb' into gingerbread-plus-aosp
* commit 'bb65ae020f802bae3e80dd8e05845fee5d6bc2cb':
Fix ViewRoot bug attempting to finish synthetic KeyEvents.
2010-08-11 17:26:16 -07:00
Adam Powell
943fbb4f40
Merge "ActionBar overlay mode, height fetching, show/hide"
2010-08-11 17:26:10 -07:00
Jeff Brown
bb65ae020f
Merge "Fix ViewRoot bug attempting to finish synthetic KeyEvents." into gingerbread
2010-08-11 17:22:17 -07:00
James Dong
c6280bce51
Fix all fd leaks in authoring engine
...
Change-Id: I17798543f9dd41cc8bef6f6086e66932f9f97be8
2010-08-11 17:18:30 -07:00