Adam Powell
d2c48f88ce
am 12230eaa: Merge "Fix bug 4065021 - Adjust spacing of the "home" action bar item to be consistent with the "up" indicator" into honeycomb-mr1
...
* commit '12230eaa5f446cb22032d6645074a1aaca146df9':
Fix bug 4065021 - Adjust spacing of the "home" action bar item to be consistent with the "up" indicator
2011-03-09 00:25:10 -08:00
Adam Powell
eb4569e01f
Merge "Fix bug 4065021 - Adjust spacing of the "home" action bar item to be consistent with the "up" indicator" into honeycomb-mr1
2011-03-09 00:22:53 -08:00
Romain Guy
78b0379822
am 3391435a: am 812dba1f: Merge "Prevents NPE when a View was detached Bug #4068284 " into honeycomb-mr1
...
* commit '3391435afd7fa69e12cde17754e1d1f98f9d77e9':
Prevents NPE when a View was detached Bug #4068284
2011-03-08 23:56:26 -08:00
Adam Powell
cccaecddc2
am 4763777e: am 1250c94b: Merge "Bug 3509417 - Refine touch event serialization" into honeycomb-mr1
...
* commit '4763777ebfa9d0d40ea7d117a351eaf96c5ac816':
Bug 3509417 - Refine touch event serialization
2011-03-08 23:53:40 -08:00
Nicolas Roard
88737a7bd9
am acafb26d: am f986d496: Merge "Partial invalidation of the browser textures" into honeycomb-mr1
...
* commit 'acafb26d34963807fc8f4c1a46763c51821d194e':
Partial invalidation of the browser textures
2011-03-08 23:53:26 -08:00
Romain Guy
61e29d0951
am 812dba1f: Merge "Prevents NPE when a View was detached Bug #4068284 " into honeycomb-mr1
...
* commit '812dba1fcaa1a374124c2fe0694c1b4f21e3dea9':
Prevents NPE when a View was detached Bug #4068284
2011-03-08 23:53:06 -08:00
Scott Main
b0286de557
am ae850caf: am 57e42c37: am b0355410: docs: replace misc screenshots from Mac with shots from Windows bug: 3490831
...
* commit 'ae850caf9413db4b91a058f1d360e736140c7a9c':
docs: replace misc screenshots from Mac with shots from Windows bug: 3490831
2011-03-08 23:53:06 -08:00
Romain Guy
7dce7e09da
Merge "Prevents NPE when a View was detached Bug #4068284 " into honeycomb-mr1
2011-03-08 23:51:02 -08:00
Adam Powell
6ab86468be
am 1250c94b: Merge "Bug 3509417 - Refine touch event serialization" into honeycomb-mr1
...
* commit '1250c94b50a3322e44c8ded7ab15bd6da9cc82a7':
Bug 3509417 - Refine touch event serialization
2011-03-08 20:02:44 -08:00
Adam Powell
9b1a1eaa12
Merge "Bug 3509417 - Refine touch event serialization" into honeycomb-mr1
2011-03-08 20:00:25 -08:00
Carl Shapiro
109b57b1d8
Merge "Remove unused JNI global references."
2011-03-08 19:49:47 -08:00
Nicolas Roard
ba3af39374
am f986d496: Merge "Partial invalidation of the browser textures" into honeycomb-mr1
...
* commit 'f986d496c56fc8ae44b03f982e3e1ed437cdb996':
Partial invalidation of the browser textures
2011-03-08 19:06:17 -08:00
Nicolas Roard
e0c413fbe7
Merge "Partial invalidation of the browser textures" into honeycomb-mr1
2011-03-08 19:02:33 -08:00
Amith Yamasani
5bb5523e98
am f9b9bd53: am 1f111f11: Merge "Searchview layout cleanup. Some more tweaks required for Market." into honeycomb-mr1
...
* commit 'f9b9bd538d846d8931eb9cc4f05d51f4d19a318d':
Searchview layout cleanup. Some more tweaks required for Market.
2011-03-08 18:43:37 -08:00
Jim Miller
758870b647
am 88d2d039: am 3de6a9b6: Merge "Fix 4025684: Don\'t include wallpaper dimensions in bounds calculation" into honeycomb-mr1
...
* commit '88d2d0390d41eb37481936872f1a03db39b8526d':
Fix 4025684: Don't include wallpaper dimensions in bounds calculation
2011-03-08 18:42:18 -08:00
Dianne Hackborn
b1a7787ae0
am 0aa403c3: am 09a31662: Merge "Fix issue #3505861 : Need to decide large/xlarge screen size limits" into honeycomb-mr1
...
* commit '0aa403c3bddc1289537130a20f1b96b2863bbb7e':
Fix issue #3505861 : Need to decide large/xlarge screen size limits
2011-03-08 18:42:12 -08:00
Justin Ho
4a8c4548eb
am 6f761209: am 7b27dc12: Merge "Updated text cursor assets" into honeycomb-mr1
...
* commit '6f7612094a568b5ad477440bb865b6c673a476b2':
Updated text cursor assets
2011-03-08 18:42:04 -08:00
Xavier Ducrohet
fc5f9deb1a
am 0ab34279: am f596d697: Merge "LayoutLib: fix Capabilities and getDimensionPixelSize" into honeycomb-mr1
...
* commit '0ab34279a5e7d52843a3f7163ece4adc7da6bc46':
LayoutLib: fix Capabilities and getDimensionPixelSize
2011-03-08 18:41:56 -08:00
Adam Cohen
e083f59c1b
am d8bf8911: am f10615d8: Merge "Fixing inconsistency between invalidate region and draw region" into honeycomb-mr1
...
* commit 'd8bf89116b30a13ea48e3b057897ad83058095b1':
Fixing inconsistency between invalidate region and draw region
2011-03-08 18:41:29 -08:00
Andy Stadler
9b710f2b11
am bdec2e56: am c9e59899: Merge "Clarify rules about encryption of emulated storage." into honeycomb-mr1
...
* commit 'bdec2e565bd1f086d65a956db432bf54cdf78f6d':
Clarify rules about encryption of emulated storage.
2011-03-08 18:41:20 -08:00
Romain Guy
d93f21323e
am 1e415023: am 3d7796c1: Merge "Correctly handle opaque fading views Bug #3475554 " into honeycomb-mr1
...
* commit '1e415023ee4c8aef2bfcb51e4293e62eb32eb23f':
Correctly handle opaque fading views Bug #3475554
2011-03-08 18:41:15 -08:00
Jim Miller
9b7ff01567
am 979bd339: am ccdeb60c: Merge "Fix 4025690,4027061: Minor tweaks to recent applications layouts" into honeycomb-mr1
...
* commit '979bd339b56633803700ab98e77fc12b479c0fce':
Fix 4025690,4027061: Minor tweaks to recent applications layouts
2011-03-08 18:41:10 -08:00
Huahui Wu
3788b5c3f9
am f7a3169f: am 8496ddc5: Merge "b/3307761 Tuning two fingers pan." into honeycomb-mr1
...
* commit 'f7a3169fd85db08538809d17d802795ea4e62b0c':
b/3307761 Tuning two fingers pan.
2011-03-08 18:40:46 -08:00
Scott Main
6ddae8a7d9
am 57e42c37: am b0355410: docs: replace misc screenshots from Mac with shots from Windows bug: 3490831
...
* commit '57e42c372698e38195640ac2130c19206082fcb0':
docs: replace misc screenshots from Mac with shots from Windows bug: 3490831
2011-03-08 18:40:04 -08:00
Scott Main
db4edcd384
am b0355410: docs: replace misc screenshots from Mac with shots from Windows bug: 3490831
...
* commit 'b0355410bb161c5e61408e57dc2adc085d337be9':
docs: replace misc screenshots from Mac with shots from Windows bug: 3490831
2011-03-08 18:37:37 -08:00
David Li
b19482feee
Merge "Initial commit of libAgl2 using Pixelflinger2 in external/mesa3d"
2011-03-08 17:50:37 -08:00
David Li
aa1f54d78f
Initial commit of libAgl2 using Pixelflinger2 in external/mesa3d
...
Somewhat functional, refer to README for details.
Need to enable Android.mk to build.
It builds libGLES_android.so, which needs to replace
the one in system/lib/egl built by libagl.
Change-Id: Iec3aaa8f3963a4185d81955cd24019eb0c4a5850
Signed-off-by: David Li <davidxli@google.com>
2011-03-08 17:41:29 -08:00
Jamie Gennis
134f042286
ANativeWindow: add queues-to-window-composer check.
...
This change adds a new 'method' to the ANativeWindow interface to check
whether buffers queued to the window will be sent directly to the system
window compositor.
Change-Id: I4d4b199e328c110b68b250029aea650f03c8724d
Bug: 3495535
2011-03-08 16:49:51 -08:00
Amith Yamasani
9c2c09041b
am 1f111f11: Merge "Searchview layout cleanup. Some more tweaks required for Market." into honeycomb-mr1
...
* commit '1f111f11721d5d550f45135ba193c465e59a635b':
Searchview layout cleanup. Some more tweaks required for Market.
2011-03-08 16:36:47 -08:00
Amith Yamasani
e0c5644b51
Merge "Searchview layout cleanup. Some more tweaks required for Market." into honeycomb-mr1
2011-03-08 16:34:11 -08:00
Jim Miller
0f491a733f
am 3de6a9b6: Merge "Fix 4025684: Don\'t include wallpaper dimensions in bounds calculation" into honeycomb-mr1
...
* commit '3de6a9b692437d5ce14d672cad4eff4c7ed0ae23':
Fix 4025684: Don't include wallpaper dimensions in bounds calculation
2011-03-08 15:46:22 -08:00
Dianne Hackborn
45ecb79c00
am 09a31662: Merge "Fix issue #3505861 : Need to decide large/xlarge screen size limits" into honeycomb-mr1
...
* commit '09a31662055605e90d6e81e06437de0d92c7cf95':
Fix issue #3505861 : Need to decide large/xlarge screen size limits
2011-03-08 15:44:10 -08:00
Jim Miller
eb0f6cbfc7
Merge "Fix 4025684: Don't include wallpaper dimensions in bounds calculation" into honeycomb-mr1
2011-03-08 15:43:16 -08:00
Dianne Hackborn
7e388b2289
Merge "Fix issue #3505861 : Need to decide large/xlarge screen size limits" into honeycomb-mr1
2011-03-08 15:41:24 -08:00
Justin Ho
7509f93a4b
am 7b27dc12: Merge "Updated text cursor assets" into honeycomb-mr1
...
* commit '7b27dc1201b10e40bcd9fbc73482640ccc15a6bf':
Updated text cursor assets
2011-03-08 15:35:47 -08:00
Justin Ho
f7441b69eb
Merge "Updated text cursor assets" into honeycomb-mr1
2011-03-08 15:34:15 -08:00
Xavier Ducrohet
319ef02178
am f596d697: Merge "LayoutLib: fix Capabilities and getDimensionPixelSize" into honeycomb-mr1
...
* commit 'f596d697b69705daa7bc21485659bd704ec5d52e':
LayoutLib: fix Capabilities and getDimensionPixelSize
2011-03-08 15:27:25 -08:00
Xavier Ducrohet
37ea7b37c3
Merge "LayoutLib: fix Capabilities and getDimensionPixelSize" into honeycomb-mr1
2011-03-08 15:25:08 -08:00
Adam Cohen
6183339e01
am f10615d8: Merge "Fixing inconsistency between invalidate region and draw region" into honeycomb-mr1
...
* commit 'f10615d8d86f4324bf5f6b5a2eb2874cc2b5ef3d':
Fixing inconsistency between invalidate region and draw region
2011-03-08 15:02:34 -08:00
Adam Cohen
190ab8bdb7
Merge "Fixing inconsistency between invalidate region and draw region" into honeycomb-mr1
2011-03-08 14:59:51 -08:00
Andy Stadler
8d30d91cb4
am c9e59899: Merge "Clarify rules about encryption of emulated storage." into honeycomb-mr1
...
* commit 'c9e598995db68cf97dc3ed0fc527a35e2d966afd':
Clarify rules about encryption of emulated storage.
2011-03-08 14:53:06 -08:00
Romain Guy
c4aa42847a
am 3d7796c1: Merge "Correctly handle opaque fading views Bug #3475554 " into honeycomb-mr1
...
* commit '3d7796c17ffae7892d1987053c3b6698697cffa2':
Correctly handle opaque fading views Bug #3475554
2011-03-08 14:53:01 -08:00
Jim Miller
d9c23bfa12
am ccdeb60c: Merge "Fix 4025690,4027061: Minor tweaks to recent applications layouts" into honeycomb-mr1
...
* commit 'ccdeb60cb6bfe7fec77a787e03557927fb55080c':
Fix 4025690,4027061: Minor tweaks to recent applications layouts
2011-03-08 14:52:57 -08:00
Andy Stadler
37a29c7057
Merge "Clarify rules about encryption of emulated storage." into honeycomb-mr1
2011-03-08 14:50:32 -08:00
Romain Guy
a8cc6e231c
Merge "Correctly handle opaque fading views Bug #3475554 " into honeycomb-mr1
2011-03-08 14:49:54 -08:00
Jim Miller
96e8f6e7f1
Merge "Fix 4025690,4027061: Minor tweaks to recent applications layouts" into honeycomb-mr1
2011-03-08 14:49:47 -08:00
Huahui Wu
73ac75243e
am 8496ddc5: Merge "b/3307761 Tuning two fingers pan." into honeycomb-mr1
...
* commit '8496ddc536eb917c813b7928f174c828d2275ada':
b/3307761 Tuning two fingers pan.
2011-03-08 14:44:39 -08:00
Huahui Wu
594429b250
Merge "b/3307761 Tuning two fingers pan." into honeycomb-mr1
2011-03-08 14:40:50 -08:00
Wink Saville
b81dcf11c1
Merge "Add outputting "on" or "off" setRadioPower."
2011-03-08 13:46:18 -08:00
John Reck
b6f9cb2dbe
am c202df41: am 39184a08: Merge "In xlarge, use "tab" instead of "window"" into honeycomb-mr1
...
* commit 'c202df419fa1123bce25c645930f5915d2930d35':
In xlarge, use "tab" instead of "window"
2011-03-08 12:33:06 -08:00