Commit Graph

28216 Commits

Author SHA1 Message Date
Raphael
9b276819ac am 03245a8e: Merge "LayoutLib.Create: support Outer_Inner_Delegate renaming." into honeycomb
* commit '03245a8ec46acc7c2b24d3d680ea5b88bd89ce13':
  LayoutLib.Create: support Outer_Inner_Delegate renaming.
2011-01-31 14:32:56 -08:00
Justin Ho
e23acd963a am 53fe1045: Merge "Updated fallback sound for Honeycomb tablet" into honeycomb
* commit '53fe1045717163a227041643852a25dbcd4bc2b5':
  Updated fallback sound for Honeycomb tablet
2011-01-31 14:32:52 -08:00
Raphael
7e9b10c923 Merge "LayoutLib.Create: support Outer_Inner_Delegate renaming." into honeycomb 2011-01-31 14:30:28 -08:00
Justin Ho
f96f836ac6 Merge "Updated fallback sound for Honeycomb tablet" into honeycomb 2011-01-31 14:26:20 -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
Jamie Gennis
1aac40d853 Merge "Add SurfaceTexture docs for getTransformMatrix." into honeycomb 2011-01-31 14:11:26 -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
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
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
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
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
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
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
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
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
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
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
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
Dheeraj Sharma
7317a5676b am cd73d1ed: Merge "Fix for issue 3404671 Crash when exporting movie in JNI" into honeycomb
* commit 'cd73d1ed6d1149a2ae642e87ffe8d89100fbafec':
  Fix for issue 3404671 Crash when exporting movie in JNI
2011-01-30 18:14:40 -08:00
Dheeraj Sharma
efea8c43d9 Merge "Fix for issue 3404671 Crash when exporting movie in JNI" into honeycomb 2011-01-30 18:12:25 -08:00
Dianne Hackborn
18a4b5a05d am 260c3c77: Fix issue #3381489: IllegalStateException: attempt to re-open...
* commit '260c3c77d9b340164e055f87002c64d78da6e836':
  Fix issue #3381489: IllegalStateException: attempt to re-open...
2011-01-30 18:05:08 -08:00
Joe Onorato
650815bd1f am fba54f62: Merge "I declare settings panel icon VICTORY!" into honeycomb
* commit 'fba54f620ff155ede6de7d73f1b6a0003839b1c4':
  I declare settings panel icon VICTORY!
2011-01-30 17:58:47 -08:00
Joe Onorato
581a0f83b6 Merge "I declare settings panel icon VICTORY!" into honeycomb 2011-01-30 17:56:25 -08:00
John Reck
d7bbc5bcc2 am 13934c2d: Merge "Prevent SET_SCROLL_OFFSET spam from clogging tubes" into honeycomb
* commit '13934c2d71046cdd2e7ca33528b91cb83f82dc13':
  Prevent SET_SCROLL_OFFSET spam from clogging tubes
2011-01-30 17:12:29 -08:00
John Reck
50b556ea0e Merge "Prevent SET_SCROLL_OFFSET spam from clogging tubes" into honeycomb 2011-01-30 16:55:23 -08:00
Dharmaray Kundargi
357fe41a00 Merge branch 'honeycomb-plus-aosp' of ssh://android-git:29418/platform/frameworks/base into honeycomb-plus-aosp 2011-01-30 16:35:08 -08:00
Dharmaray Kundargi
b4fa0885f6 am ff843254: Merge "Merging the same files on top of tree." into honeycomb
* commit 'ff8432548eb96655190486ee0f0fa08de5451e66':
  Merging the same files on top of tree.
2011-01-30 16:35:03 -08:00
Jean-Baptiste Queru
0247275eb4 am e97cc7d0: am 8a2f3ecc: am 25503f1c: Merge from gingerbread
* commit 'e97cc7d0b266ac0cbb1be7cf41ff8bb61067025e':
2011-01-30 16:34:56 -08:00
Jean-Baptiste Queru
d45c61dfcf am 1314bdb2: am e88fa50b: Merge from open-source gingerbread
* commit '1314bdb2b22ae3613c3e08ae278dbc70f90b965c':
  fix failing thread object run
2011-01-30 16:32:44 -08:00
Dharmaray Kundargi
af0bb2a24b Merge "Merging the same files on top of tree." into honeycomb 2011-01-30 16:32:07 -08:00
Jean-Baptiste Queru
18f535fad2 am 8a2f3ecc: am 25503f1c: Merge from gingerbread
* commit '8a2f3ecc030512b6813ee2bb8c56b77280cad7c5':
2011-01-30 16:26:18 -08:00
Jean-Baptiste Queru
9bfc45e3c3 am e88fa50b: Merge from open-source gingerbread
* commit 'e88fa50be8d6709ef58b7aeb01c5efa059bcac2e':
  fix failing thread object run
2011-01-30 16:19:59 -08:00
Adam Powell
f10add6590 am c9cb3083: Merge "Fix bug 3405899 - android.view.WindowManager" into honeycomb
* commit 'c9cb30837116b138a91b251e5217a644231eebef':
  Fix bug 3405899 - android.view.WindowManager$BadTokenException
2011-01-30 16:14:54 -08:00