Commit Graph

29480 Commits

Author SHA1 Message Date
Jamie Gennis
8446681ebe Merge "Clear all EGL errors when entering EGL funcs." 2011-01-31 15:40:06 -08:00
Jamie Gennis
30faa241e2 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
c63af67974 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
b240ecaf8a 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
e87f876e33 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
99a5eea568 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
f56edd1d1d 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
9a849ca6bc Merge "MTP: Use ro.product.manufacturer system property value for MTP manufacturer name" 2011-01-31 14:13:30 -08:00
Jamie Gennis
1aac40d853 Merge "Add SurfaceTexture docs for getTransformMatrix." into honeycomb 2011-01-31 14:11:26 -08:00
Jamie Gennis
f1cde8e0ed 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
afddd2a070 am 27badee3: (-s ours) am a6fb375c: am 056340ac: Merge "stubs"
* commit '27badee3f567015183ab584fae1cbd32a996e78d':
  stubs
2011-01-31 14:00:52 -08:00
Jamie Gennis
57b0d2cf06 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
88be8935cd 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
efe96dc568 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
88d0a44358 Merge "Fix a multithreading bug in libagl's EGL." into honeycomb 2011-01-31 13:38:27 -08:00
Dianne Hackborn
8cb595fa55 Merge "Fix issue #3408542: "resizeable" attribute required to get out of compat mode" into honeycomb 2011-01-31 13:37:50 -08:00
Jean-Baptiste Queru
9d09258217 am a6fb375c: am 056340ac: Merge "stubs"
* commit 'a6fb375cf727b6ded057110875fe49a9b3f230a3':
  stubs
2011-01-31 12:03:59 -08:00
Gilles Debunne
f925609153 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
c85d73119c am 056340ac: Merge "stubs"
* commit '056340ac95f233090990d77266d89aad3b60f913':
  stubs
2011-01-31 11:55:40 -08:00
Daniel Sandler
a2e8538a87 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
f6ce73f324 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
b729cd2692 Merge "Alignment in the title area of the notification panel." into honeycomb 2011-01-31 11:46:57 -08:00
Jean-Baptiste Queru
65881cf8b0 Merge "stubs" 2011-01-31 11:32:33 -08:00
Joe Onorato
3101c68220 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
930371dc08 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
1e08783fe8 Merge "Mask out the non public bits, not the public ones." into honeycomb 2011-01-31 11:25:06 -08:00
Gilles Debunne
21b4fb3efb 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
4c6b88dcbc 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
43ddfd8e35 Merge "Fxi initial error popup dialog in TextEdit and refreshed assets." into honeycomb 2011-01-31 11:10:53 -08:00
Jeff Hamilton
afc443efc0 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
34c2d7ef8f 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
0f2c4b92a9 Merge "Merge from gingerbread: Commit the final API for level 10. DO NOT MERGE" into honeycomb 2011-01-31 11:01:07 -08:00
Jeff Hamilton
e02f8d5e3a 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
5ae7831ea8 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
f12dfd3406 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
Daniel Sandler
e2811465c2 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
ee897ebe87 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
ff8d86bf1d Merge "Kill spurious animations when vetoing notifications." into honeycomb 2011-01-31 09:04:32 -08:00
Tadashi G. Takaoka
484ee82383 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
55d9717b36 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
ea8e520569 Merge "Fix hardware keyboard switch listener" into honeycomb 2011-01-31 08:47:12 -08:00
Leon Scroggins
43f31751e3 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
Leon Scroggins
45276faa14 am 22e883dd: For Textareas, do not use UI side layers.
* commit '22e883dd4a400122003506f47b228378000dd12f':
  For Textareas, do not use UI side layers.
2011-01-31 08:24:31 -08:00
Gil Dobjanschi
eb7743052e am 1aa865aa: am 2bb13573: Bug fix: 3405930 Crash editing overlay text
* commit '1aa865aae054de0f5f2cb6ee58a6b93ad4d0f673':
  Bug fix: 3405930 Crash editing overlay text
2011-01-31 04:16:16 -08:00
Gil Dobjanschi
120929518d am 2bb13573: Bug fix: 3405930 Crash editing overlay text
* commit '2bb13573d619e3371d06847d36db78a20b17dfab':
  Bug fix: 3405930 Crash editing overlay text
2011-01-31 04:13:06 -08:00
Wink Saville
096de13a9c am bac75416: am cde85d57: Merge "Add debug for tracking bug 3404006." into honeycomb
* commit 'bac75416d1cead62ca54e6e78206da64507146ba':
  Add debug for tracking bug 3404006.
2011-01-30 23:17:35 -08:00
Wink Saville
3e9e1286b5 am cde85d57: Merge "Add debug for tracking bug 3404006." into honeycomb
* commit 'cde85d573873adce9ebcf0d2c4c2c5c1b8d465cc':
  Add debug for tracking bug 3404006.
2011-01-30 23:14:39 -08:00
Wink Saville
836f90b2b5 Merge "Add debug for tracking bug 3404006." into honeycomb 2011-01-30 23:12:35 -08:00
Bart Sears
ebef2e24b5 am 5a773713: am e3004e78: New DroidSansFallback font file from Ascender
* commit '5a7737138ec2536faa931df8059509fd36e2e63f':
  New DroidSansFallback font file from Ascender
2011-01-30 20:11:06 -08:00
Bart Sears
8d05763190 am e3004e78: New DroidSansFallback font file from Ascender
* commit 'e3004e7867925e70bf4930384a265106f45f87d6':
  New DroidSansFallback font file from Ascender
2011-01-30 20:08:13 -08:00