Jamie Gennis
f27bbc238c
Merge "Clear all EGL errors when entering EGL funcs."
2011-01-31 15:40:06 -08:00
Jamie Gennis
c999a4ca96
am 9abd7a33: am b799314e: Merge "Add SurfaceTexture docs for getTransformMatrix." into honeycomb
...
* commit '9abd7a33009567a5f0da090fbf96f9cde389a7b8':
Add SurfaceTexture docs for getTransformMatrix.
2011-01-31 15:02:46 -08:00
Jean-Baptiste Queru
74e5fe5909
am 5131763c: am 27badee3: (-s ours) am a6fb375c: am 056340ac: Merge "stubs"
...
* commit '5131763c58be3ac78a28532261cdc8fc3af010ef':
stubs
2011-01-31 15:01:25 -08:00
Jamie Gennis
4a702faf5b
am cf675303: am 8df2c424: Merge "Fix a multithreading bug in libagl\'s EGL." into honeycomb
...
* commit 'cf675303927d8008c5952759d534dcc6c0ca3d4a':
Fix a multithreading bug in libagl's EGL.
2011-01-31 15:01:21 -08:00
Dianne Hackborn
fe86a7f64c
am 723453a7: am e9da0c1d: Merge "Fix issue #3408542 : "resizeable" attribute required to get out of compat mode" into honeycomb
...
* commit '723453a7a77180b47720d3b5e8a9752349b77e2f':
Fix issue #3408542 : "resizeable" attribute required to get out of compat mode
2011-01-31 15:01:16 -08:00
Gilles Debunne
46844af4f2
am ed6f13c4: am c1eb127f: Merge "Tabs are resized to make sure they fit in their parent." into honeycomb
...
* commit 'ed6f13c4bd06dc4ef971cb720b8880ab1df3905a':
Tabs are resized to make sure they fit in their parent.
2011-01-31 15:01:01 -08:00
Jamie Gennis
9abd7a3300
am b799314e: Merge "Add SurfaceTexture docs for getTransformMatrix." into honeycomb
...
* commit 'b799314e64d5afe050aeee394f0c29d7728c1e22':
Add SurfaceTexture docs for getTransformMatrix.
2011-01-31 14:14:50 -08:00
Mike Lockwood
e62e890b68
Merge "MTP: Use ro.product.manufacturer system property value for MTP manufacturer name"
2011-01-31 14:13:30 -08:00
Jamie Gennis
b799314e64
Merge "Add SurfaceTexture docs for getTransformMatrix." into honeycomb
2011-01-31 14:11:26 -08:00
Mike Lockwood
4639532261
MTP: Use ro.product.manufacturer system property value for MTP manufacturer name
...
Previously it was hard coded to "Google, Inc."
BUG: 3405965
Change-Id: I5f962d474814c22e990c39b501c0f01da9e8dc6d
Signed-off-by: Mike Lockwood <lockwood@android.com >
2011-01-31 17:11:24 -05:00
Jamie Gennis
e3b179c732
Clear all EGL errors when entering EGL funcs.
...
This changes the clearError function in the EGL wrapper layer to simply
call eglGetError(). That should clear any pending errors from all the
underlying EGL implementations, which is needed to correctly report the
error for the most recently called EGL function.
Change-Id: Iad19c69f0c5305e873f3c2f96d353280d31f7b61
2011-01-31 14:08:23 -08:00
Jean-Baptiste Queru
5131763c58
am 27badee3: (-s ours) am a6fb375c: am 056340ac: Merge "stubs"
...
* commit '27badee3f567015183ab584fae1cbd32a996e78d':
stubs
2011-01-31 14:00:52 -08:00
Jamie Gennis
cf67530392
am 8df2c424: Merge "Fix a multithreading bug in libagl\'s EGL." into honeycomb
...
* commit '8df2c42413cfdde1c4290b4797a09c4bafb6c3bc':
Fix a multithreading bug in libagl's EGL.
2011-01-31 13:56:28 -08:00
Dianne Hackborn
723453a7a7
am e9da0c1d: Merge "Fix issue #3408542 : "resizeable" attribute required to get out of compat mode" into honeycomb
...
* commit 'e9da0c1de179e3cdb2d3709bde2b5cb6eb192230':
Fix issue #3408542 : "resizeable" attribute required to get out of compat mode
2011-01-31 13:56:24 -08:00
Gilles Debunne
ed6f13c4bd
am c1eb127f: Merge "Tabs are resized to make sure they fit in their parent." into honeycomb
...
* commit 'c1eb127f4e19c1f86e4b18c2c1daebe2404eeb93':
Tabs are resized to make sure they fit in their parent.
2011-01-31 13:56:21 -08:00
Jamie Gennis
8df2c42413
Merge "Fix a multithreading bug in libagl's EGL." into honeycomb
2011-01-31 13:38:27 -08:00
Dianne Hackborn
e9da0c1de1
Merge "Fix issue #3408542 : "resizeable" attribute required to get out of compat mode" into honeycomb
2011-01-31 13:37:50 -08:00
Alex Sakhartchouk
a3b5960f6f
Making sure we can build libRS on the host for serialization.
...
Change-Id: If0a5d77b20c0e1e2d124fa0737643a5dd1d4409a
2011-01-31 12:38:34 -08:00
Dianne Hackborn
2bfa2ea1ec
Fix issue #3408542 : "resizeable" attribute required to get out of compat mode
...
The "resizeable" attribute of supports-screens was never well documented,
so many apps don't set it. Assuming that if they are explicitly saying
they support large or xlarge screens then they are also implying that they
are resizeable.
Change-Id: Iaa1ad431c9868254af7581499477bff98ed109e5
2011-01-31 12:34:56 -08:00
Jamie Gennis
5f8b6653e0
Add SurfaceTexture docs for getTransformMatrix.
...
Change-Id: Ib08d00525c7932b23ba5066c07c7470f813b74f8
2011-01-31 12:31:53 -08:00
Jean-Baptiste Queru
27badee3f5
am a6fb375c: am 056340ac: Merge "stubs"
...
* commit 'a6fb375cf727b6ded057110875fe49a9b3f230a3':
stubs
2011-01-31 12:03:59 -08:00
Gilles Debunne
c1eb127f4e
Merge "Tabs are resized to make sure they fit in their parent." into honeycomb
2011-01-31 12:01:34 -08:00
Jean-Baptiste Queru
a6fb375cf7
am 056340ac: Merge "stubs"
...
* commit '056340ac95f233090990d77266d89aad3b60f913':
stubs
2011-01-31 11:55:40 -08:00
Daniel Sandler
bd07f8e864
am f4fc099c: am 4f63da64: Merge "Alignment in the title area of the notification panel." into honeycomb
...
* commit 'f4fc099c55ddd7d5c2e28a8b0a7d482b5082e27d':
Alignment in the title area of the notification panel.
2011-01-31 11:54:05 -08:00
Daniel Sandler
f4fc099c55
am 4f63da64: Merge "Alignment in the title area of the notification panel." into honeycomb
...
* commit '4f63da64d82131388ff02586e5fe19662fe641de':
Alignment in the title area of the notification panel.
2011-01-31 11:49:03 -08:00
Daniel Sandler
4f63da64d8
Merge "Alignment in the title area of the notification panel." into honeycomb
2011-01-31 11:46:57 -08:00
Jean-Baptiste Queru
056340ac95
Merge "stubs"
2011-01-31 11:32:33 -08:00
Joe Onorato
b4e28848e3
am 19a02219: am fe6fd242: Merge "Mask out the non public bits, not the public ones." into honeycomb
...
* commit '19a022194d0e049759112a743835af323f4b05a1':
Mask out the non public bits, not the public ones.
2011-01-31 11:28:35 -08:00
Joe Onorato
19a022194d
am fe6fd242: Merge "Mask out the non public bits, not the public ones." into honeycomb
...
* commit 'fe6fd242867022576a99fcd5fd6078fb7bab8451':
Mask out the non public bits, not the public ones.
2011-01-31 11:26:51 -08:00
Joe Onorato
fe6fd24286
Merge "Mask out the non public bits, not the public ones." into honeycomb
2011-01-31 11:25:06 -08:00
Joe Onorato
6ab77bd5b3
Mask out the non public bits, not the public ones.
...
Bug: 3406103
Change-Id: I44b16700567cb2bf76efe9e8c1f9c82d0eaa8f10
2011-01-31 11:21:10 -08:00
Gilles Debunne
6d54ec7e82
am 85ebed39: am ccfcd9e8: Merge "Fxi initial error popup dialog in TextEdit and refreshed assets." into honeycomb
...
* commit '85ebed39e4b7710b56e25d10038172dde12ef7b0':
Fxi initial error popup dialog in TextEdit and refreshed assets.
2011-01-31 11:16:16 -08:00
Gilles Debunne
85ebed39e4
am ccfcd9e8: Merge "Fxi initial error popup dialog in TextEdit and refreshed assets." into honeycomb
...
* commit 'ccfcd9e813d090ec9b4390b5217b32f73dd8263d':
Fxi initial error popup dialog in TextEdit and refreshed assets.
2011-01-31 11:13:24 -08:00
Gilles Debunne
ccfcd9e813
Merge "Fxi initial error popup dialog in TextEdit and refreshed assets." into honeycomb
2011-01-31 11:10:53 -08:00
Jeff Hamilton
88fc565e13
am 737fe548: (-s ours) am ddd11292: Merge "Merge from gingerbread: Commit the final API for level 10. DO NOT MERGE" into honeycomb
...
* commit '737fe5480f3e5029c298eb3b4c8efb870484cefd':
Merge from gingerbread: Commit the final API for level 10. DO NOT MERGE
2011-01-31 11:07:50 -08:00
Jeff Hamilton
737fe5480f
am ddd11292: Merge "Merge from gingerbread: Commit the final API for level 10. DO NOT MERGE" into honeycomb
...
* commit 'ddd11292d1be8d33989e3a67bf6398464ef2632c':
Merge from gingerbread: Commit the final API for level 10. DO NOT MERGE
2011-01-31 11:03:50 -08:00
Jeff Hamilton
ddd11292d1
Merge "Merge from gingerbread: Commit the final API for level 10. DO NOT MERGE" into honeycomb
2011-01-31 11:01:07 -08:00
Daniel Sandler
b0b68901f2
Alignment in the title area of the notification panel.
...
Clock size -> 78sp to match specs
Clock right pad -> 6dp to achieve 14dp escapement
Bug: 3400754
Change-Id: I04a56aa899ab55804ad034ed06d9c7aaad331bc0
2011-01-31 13:40:37 -05:00
Jeff Hamilton
7def415195
am 1d04981f: am f7176dfb: am 113834c5: Commit the final API for level 10.
...
* commit '1d04981fb2a484212ddb4ffb599e682ed2a9680d':
Commit the final API for level 10.
2011-01-31 10:14:28 -08:00
Jeff Hamilton
1d04981fb2
am f7176dfb: am 113834c5: Commit the final API for level 10.
...
* commit 'f7176dfbd284f7da49e5bccc2aa886b42039ba4a':
Commit the final API for level 10.
2011-01-31 10:11:46 -08:00
Jeff Hamilton
f7176dfbd2
am 113834c5: Commit the final API for level 10.
...
* commit '113834c5ab30bfc554202d0f3144a662d77f2484':
Commit the final API for level 10.
2011-01-31 10:05:13 -08:00
Jeff Hamilton
81c31c95c1
Merge from gingerbread: Commit the final API for level 10. DO NOT MERGE
...
Change-Id: If1d1ff69a6f3e80796d68ec5dbfa722adce23d40
2011-01-31 12:00:35 -06:00
Jeff Hamilton
113834c5ab
Commit the final API for level 10.
...
Change-Id: I56140f79ff599c1a9d03c0f53d700df402234bf1
2011-01-31 11:46:29 -06:00
Daniel Sandler
38d6e699c9
am c05ddc11: am cb9d4d28: Merge "Kill spurious animations when vetoing notifications." into honeycomb
...
* commit 'c05ddc111f619d3fa34dcd72ac33d68e6cba0eb8':
Kill spurious animations when vetoing notifications.
2011-01-31 09:11:03 -08:00
Daniel Sandler
c05ddc111f
am cb9d4d28: Merge "Kill spurious animations when vetoing notifications." into honeycomb
...
* commit 'cb9d4d28be41c72a8c6f254bf8fdaac5f41e0b6f':
Kill spurious animations when vetoing notifications.
2011-01-31 09:08:00 -08:00
Daniel Sandler
cb9d4d28be
Merge "Kill spurious animations when vetoing notifications." into honeycomb
2011-01-31 09:04:32 -08:00
Tadashi G. Takaoka
66622a3432
am ed670b8b: am 81f4b582: Merge "Fix hardware keyboard switch listener" into honeycomb
...
* commit 'ed670b8b25a6cca95d4cdbd01940bb65d8026586':
Fix hardware keyboard switch listener
2011-01-31 08:51:27 -08:00
Tadashi G. Takaoka
ed670b8b25
am 81f4b582: Merge "Fix hardware keyboard switch listener" into honeycomb
...
* commit '81f4b582d4f3547bcd432da6bcb21d4ef414723d':
Fix hardware keyboard switch listener
2011-01-31 08:49:30 -08:00
Tadashi G. Takaoka
81f4b582d4
Merge "Fix hardware keyboard switch listener" into honeycomb
2011-01-31 08:47:12 -08:00
Leon Scroggins
e7e8e976a1
am 5592f0b1: am 22e883dd: For Textareas, do not use UI side layers.
...
* commit '5592f0b16e44515a3e3686fd417cc1945b83c764':
For Textareas, do not use UI side layers.
2011-01-31 08:26:35 -08:00