Commit Graph

28234 Commits

Author SHA1 Message Date
Andreas Huber
f9e98289d9 am 537fa17f: Merge "Disconnect HTTP live sessions as soon as the request comes in." into honeycomb
* commit '537fa17f21390fcb4a8d4b24f1cc80ca147ccce0':
  Disconnect HTTP live sessions as soon as the request comes in.
2011-01-31 18:31:05 -08:00
Gilles Debunne
19057ef655 am 0ad4f096: Merge "Patches for the Paste window behavior." into honeycomb
* commit '0ad4f0963a47feafaaa92a756fb84caab5b6bddb':
  Patches for the Paste window behavior.
2011-01-31 18:30:42 -08:00
Dianne Hackborn
43144162f8 am b04ec6a8: (-s ours) am 7a7ed2b2: Merge "Do not check features in PackageManagerService DO NOT MERGE" into gingerbread
* commit 'b04ec6a8a7e6a684eb4b8d434c87b76bbac9c80c':
  Do not check features in PackageManagerService DO NOT MERGE
2011-01-31 17:58:08 -08:00
Dianne Hackborn
1737d98863 am 7a7ed2b2: Merge "Do not check features in PackageManagerService DO NOT MERGE" into gingerbread
* commit '7a7ed2b21233480d63a1f6b3830e3b0c1c6a3298':
  Do not check features in PackageManagerService DO NOT MERGE
2011-01-31 17:55:11 -08:00
Eric Fischer
bf12a80c49 am 3efb3153: (-s ours) am a019d15b: Merge "Import revised translations. DO NOT MERGE" into gingerbread
* commit '3efb3153137d310851346807fcc04e71144c5413':
  Import revised translations. DO NOT MERGE
2011-01-31 17:48:57 -08:00
Dianne Hackborn
1059827471 Merge "Do not check features in PackageManagerService DO NOT MERGE" into gingerbread 2011-01-31 17:41:54 -08:00
Andreas Huber
f54f42694c Merge "Disconnect HTTP live sessions as soon as the request comes in." into honeycomb 2011-01-31 16:23:27 -08:00
Gilles Debunne
3736bef0a8 Merge "Patches for the Paste window behavior." into honeycomb 2011-01-31 16:22:25 -08:00
Eric Fischer
fbe7ad7e1c am a019d15b: Merge "Import revised translations. DO NOT MERGE" into gingerbread
* commit 'a019d15b667a72d7cb29afc7f153d5c517abcb76':
  Import revised translations. DO NOT MERGE
2011-01-31 16:18:27 -08:00
Svetoslav Ganov
1fd086c588 am 1c91433f: Merge "Set time dialog display changes AM/PM at 1 instead of 12" into honeycomb
* commit '1c91433f7c61860319fa5d524b503c2631a7f2d3':
  Set time dialog display changes AM/PM at 1 instead of 12
2011-01-31 16:15:26 -08:00
Adam Powell
65586a8066 am 5f639d5a: Merge "Fix bug 3408834 - actionbar stays gone when leaving reader in lightsout mode" into honeycomb
* commit '5f639d5a5134b994ee77207ac931bdafe95c6d66':
  Fix bug 3408834 - actionbar stays gone when leaving reader in lightsout mode
2011-01-31 16:15:20 -08:00
Svetoslav Ganov
0428e5da83 Merge "Set time dialog display changes AM/PM at 1 instead of 12" into honeycomb 2011-01-31 16:11:59 -08:00
Adam Powell
0ab0c9b8b7 Merge "Fix bug 3408834 - actionbar stays gone when leaving reader in lightsout mode" into honeycomb 2011-01-31 16:11:51 -08:00
Eric Fischer
1e01e3de0b Merge "Import revised translations. DO NOT MERGE" into gingerbread 2011-01-31 16:08:52 -08:00
Gilles Debunne
97e0adc407 am 11f9647e: Merge "Hint text is visible when using center gravity." into honeycomb
* commit '11f9647e03d4e1141bc4312626c8dc9116f1f470':
  Hint text is visible when using center gravity.
2011-01-31 15:32:40 -08:00
Gilles Debunne
ae2c5a5959 Merge "Hint text is visible when using center gravity." into honeycomb 2011-01-31 15:29:56 -08:00
Dianne Hackborn
62577359b9 am 13684548: (-s ours) am e6c6b760: DO NOT MERGE Fix issue #3408542: "resizeable" attribute required to get out of compat mode
* commit '1368454815aaf793fe32ba32473fd11cf7b02e0d':
  DO NOT MERGE Fix issue #3408542: "resizeable" attribute required to get out of compat mode
2011-01-31 14:38:24 -08:00
Dianne Hackborn
5eb7128198 am e6c6b760: DO NOT MERGE Fix issue #3408542: "resizeable" attribute required to get out of compat mode
* commit 'e6c6b760eb0c1068fdfa656007ec27e482313b58':
  DO NOT MERGE Fix issue #3408542: "resizeable" attribute required to get out of compat mode
2011-01-31 14:36:02 -08:00
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