Marc Blank
b44d5cd535
am cedcdc98: (-s ours) am d3ea7331: am 094bf51e: Use ' for apostrophe in HTML encoding DO NOT MERGE
...
* commit 'cedcdc984cf36d3b3aeca359b4866e5680427c51':
2012-02-23 07:28:54 -08:00
Marc Blank
2010e78310
am cdbf0efc: (-s ours) am 970c74ac: am 094bf51e: Use ' for apostrophe in HTML encoding DO NOT MERGE
...
* commit 'cdbf0efcdc42ea0ef7290c4d73da16f596c8e8be':
Use ' for apostrophe in HTML encoding DO NOT MERGE
2012-02-23 07:28:51 -08:00
Steve Block
27320f9fc5
Merge "Drop support for Android HTTP stack"
2012-02-23 04:29:30 -08:00
Daniel Lam
3330238841
Removed dependecies between BufferQueue and SurfaceTexture
...
Refactored SurfaceTexture and BufferQueue such that share
no protected members. Created an consumer facing interface
for BufferQueue in preparation of connecting SurfaceTexture
and BufferQueue through a binder.
Change-Id: Iff55e740e36a7f70c9f7a17ee7a5af38e3d21f0f
2012-02-22 20:12:27 -08:00
Gilles Debunne
a40414b3d3
Merge "Fixed comment for selectAllOnFocus"
2012-02-22 18:27:27 -08:00
George Mount
aaa41e625f
Merge "Characters sent directly to InputConnection treated as changes."
2012-02-22 17:33:03 -08:00
Svetoslav Ganov
b16f9de39e
Merge "Add check for no children in VIew hosting virtual view tree."
2012-02-22 16:49:36 -08:00
Scott Main
0130c4ec7c
am 2a24914c: am 68d97aa2: Merge "docs: fix broken link" into ics-mr1
...
* commit '2a24914caf7dd2906b0af3b82c40db5917b6e545':
2012-02-22 16:27:16 -08:00
Scott Main
2a980ecc12
am ce980d8e: am 68d97aa2: Merge "docs: fix broken link" into ics-mr1
...
* commit 'ce980d8ea0c4747ee23b05dfcc7c02655f595fde':
docs: fix broken link
2012-02-22 16:25:49 -08:00
Scott Main
3baead5c74
am 68d97aa2: Merge "docs: fix broken link" into ics-mr1
...
* commit '68d97aa2c1ff16f327491fed5afb8b318f034a01':
docs: fix broken link
2012-02-22 16:23:04 -08:00
Scott Main
b38c4a66f3
am 68d97aa2: Merge "docs: fix broken link" into ics-mr1
...
* commit '68d97aa2c1ff16f327491fed5afb8b318f034a01':
docs: fix broken link
2012-02-22 16:23:03 -08:00
Scott Main
271d668dfd
Merge "docs: fix broken link" into ics-mr1
2012-02-22 16:20:49 -08:00
George Mount
e7756b680b
Merge "Changes that don't map to keys sent as text changes."
2012-02-22 16:02:30 -08:00
Dima Zavin
20b05f9192
Merge "libui: add ability to force a framebuffer format for EGL's use"
2012-02-22 16:00:49 -08:00
Dima Zavin
c6cd27cbf3
libui: add ability to force a framebuffer format for EGL's use
...
This does not actually change the framebuffer format. It merely
fakes this format to surfaceflinger so that when it creates
framebuffer surfaces it will use this format. It's really a giant
HACK to allow interworking with buggy gralloc+GPU driver
implementations. You should *NEVER* need to set this for shipping
devices.
Change-Id: I03eeb5b4d72838ef219df386ecc489fc20ab9cc7
Signed-off-by: Dima Zavin <dima@android.com>
2012-02-22 15:44:46 -08:00
John Reck
0f2a25a75f
Merge "Fix drawing focus node rect in touch mode"
2012-02-22 15:39:23 -08:00
George Mount
d7150585fb
Merge "Add caret thumb following selection handle logic."
2012-02-22 15:17:00 -08:00
Andreas Huber
f40efaa3a7
Merge "Implementation of a java media codec interface and associated tools."
2012-02-22 15:13:44 -08:00
Romain Guy
635989b138
Merge "Reduce logs"
2012-02-22 14:36:28 -08:00
Gilles Debunne
bfdeee6129
Merge "EditText-specific data extracted from TextView"
2012-02-22 14:30:43 -08:00
Gilles Debunne
55442a49f4
Merge "Added bottom padding in textview's focused rectangle"
2012-02-22 14:18:17 -08:00
Alex Sakhartchouk
2ad542dd79
Merge "Simplifying programmatic creation."
2012-02-22 14:10:58 -08:00
Alex Sakhartchouk
9d8d4b9a7f
Merge "Properly pipe texture names through."
2012-02-22 14:10:45 -08:00
James Dong
06d8079325
Merge "Removed out-of-date TODO in video editor performance/stress test cases"
2012-02-22 14:00:38 -08:00
Glenn Kasten
ebeb824698
Merge "Avoid wp<>::unsafe_get() with a few exceptions"
2012-02-22 13:22:13 -08:00
Eric Fischer
f896943c6e
Merge "Import translations. DO NOT MERGE"
2012-02-22 13:17:22 -08:00
Glenn Kasten
0deac301bc
Merge "Fix build warning"
2012-02-22 13:14:50 -08:00
Daisuke Miyakawa
7824c4f86f
Merge "Remove the entire PIM directory."
2012-02-22 13:06:58 -08:00
Xavier Ducrohet
84001bdeac
am 1f46d79f: am 503247f2: Merge "Make sure resource references are resolved." into ics-mr1
...
* commit '1f46d79faf1b947b3d169c336e013cea89e8de11':
2012-02-22 12:54:50 -08:00
Svetoslav Ganov
0a4d72b966
Merge "Fixing the content build file to include the command on user builds."
2012-02-22 12:51:35 -08:00
Jean-Baptiste Queru
0fceb0db9e
am 1cd83102: am b92aee4e: am 69e9c30c: Merge "Add stubs for improved compatibility"
...
* commit '1cd83102d4950327a6bd76f27b5d320d77e4bf84':
Add stubs for improved compatibility
2012-02-22 12:39:13 -08:00
Jean-Baptiste Queru
e9df62ae5e
am b92aee4e: am 69e9c30c: Merge "Add stubs for improved compatibility"
...
* commit 'b92aee4e8c3d93235c9a57afa81711383538f54f':
Add stubs for improved compatibility
2012-02-22 12:36:35 -08:00
Jean-Baptiste Queru
1f3c23d7ee
am 69e9c30c: Merge "Add stubs for improved compatibility"
...
* commit '69e9c30c2641add74c9a3b02d0959c0ded9e66f7':
Add stubs for improved compatibility
2012-02-22 12:34:06 -08:00
Adam Powell
b8405f7ad5
Merge "Fix bug 6048643 - verify ListView layoutparams while tracking stable IDs"
2012-02-22 12:22:31 -08:00
Jean-Baptiste Queru
7cf89f1e78
Merge "Add stubs for improved compatibility"
2012-02-22 12:22:07 -08:00
James Dong
4dffaa8a1d
Merge "Allow to record time lapse videos without using setProfile()"
2012-02-22 11:47:07 -08:00
Xavier Ducrohet
f608afd97f
am 22701ec5: am 503247f2: Merge "Make sure resource references are resolved." into ics-mr1
...
* commit '22701ec5b11f6138e6298814fff5f09da82df144':
Make sure resource references are resolved.
2012-02-22 10:52:16 -08:00
Xavier Ducrohet
70eaeb38b8
am 503247f2: Merge "Make sure resource references are resolved." into ics-mr1
...
* commit '503247f213ef2894324a22e7608101e90a7fe8fb':
Make sure resource references are resolved.
2012-02-22 10:49:35 -08:00
Xavier Ducrohet
0e296c8425
am 503247f2: Merge "Make sure resource references are resolved." into ics-mr1
...
* commit '503247f213ef2894324a22e7608101e90a7fe8fb':
Make sure resource references are resolved.
2012-02-22 10:49:15 -08:00
Xavier Ducrohet
9bbfdcab00
Merge "Make sure resource references are resolved." into ics-mr1
2012-02-22 10:47:32 -08:00
Jean-Baptiste Queru
b297356a6f
am fc4215ee: am 2d03a93e: Merge "Xcode 4.3 compatibility checkin"
...
* commit 'fc4215eec9b947628c3ab5b3707711d16da19120':
Xcode 4.3 compatibility checkin
2012-02-22 10:23:09 -08:00
John Reck
62772e430e
Merge "Turn off the focus animation"
2012-02-22 10:18:43 -08:00
Jean-Baptiste Queru
3eeb21dc44
am 2d03a93e: Merge "Xcode 4.3 compatibility checkin"
...
* commit '2d03a93ecf00fb43272364293a21f88720884ce2':
Xcode 4.3 compatibility checkin
2012-02-22 10:17:24 -08:00
Jean-Baptiste Queru
7c2b7a5d41
am aff90790: am 4280891d: Merge "The bigger touch slop still has a problem"
...
* commit 'aff90790dff94eb9a4bed541eff4f106623afd09':
The bigger touch slop still has a problem
2012-02-22 10:01:01 -08:00
Jean-Baptiste Queru
080176c5ba
am 4280891d: Merge "The bigger touch slop still has a problem"
...
* commit '4280891dbc2cf60bdf51726e0aa9265ccb64ec88':
The bigger touch slop still has a problem
2012-02-22 09:56:27 -08:00
Jean-Baptiste Queru
7e7e13303d
Merge "Xcode 4.3 compatibility checkin"
2012-02-22 09:54:40 -08:00
John Reck
a4f800cdb6
Merge "Add null parent check to startActionMode"
2012-02-22 09:43:27 -08:00
Marco Nelissen
4f0baa32ef
Merge "Eliminate scanner file cache"
2012-02-22 09:42:54 -08:00
Eric Fischer
f4f6632cfd
Merge "Import translations. DO NOT MERGE"
2012-02-22 09:34:09 -08:00
Steve Block
79dbc6f082
Merge "Remove unused cache methods"
2012-02-22 09:23:04 -08:00