Jeff Brown
29c6c81584
am 1baae5c9: (-s ours) am 36b077d5: Merge "Eliminate some accidental log spam. (DO NOT MERGE)" into honeycomb-mr1
...
* commit '1baae5c9b635f8672a8f0b8d83f23d5b9ec72297':
Eliminate some accidental log spam. (DO NOT MERGE)
2011-03-09 02:51:45 -08:00
Jeff Brown
1baae5c9b6
am 36b077d5: Merge "Eliminate some accidental log spam. (DO NOT MERGE)" into honeycomb-mr1
...
* commit '36b077d558727ead246434b08de0ce7b955508e1':
Eliminate some accidental log spam. (DO NOT MERGE)
2011-03-09 02:48:18 -08:00
Jeff Brown
36b077d558
Merge "Eliminate some accidental log spam. (DO NOT MERGE)" into honeycomb-mr1
2011-03-09 02:45:59 -08:00
Adam Powell
27230862b1
am 529eb76b: 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 '529eb76b8add903c67ecf0178b6b4603edd64ebb':
Fix bug 4065021 - Adjust spacing of the "home" action bar item to be consistent with the "up" indicator
2011-03-09 00:28:29 -08:00
Adam Powell
529eb76b8a
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
12230eaa5f
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
Adam Powell
2b0952b197
Fix bug 4065021 - Adjust spacing of the "home" action bar item to be
...
consistent with the "up" indicator
Make sure that the "home" affordance in the action bar always occupies
the same amount of space regardless of whether or not the "up"
indicator is visible. This means centering the application icon/logo
in the remaining space after the "up" indicator has been added.
Change-Id: I3c81cfe8255546d4dd676af913895713baba4f13
2011-03-09 00:17:42 -08:00
Romain Guy
3d2b75ac0f
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
4fdda70026
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
f610c421ea
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
3391435afd
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
48dbbb2c8b
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
812dba1fca
Merge "Prevents NPE when a View was detached Bug #4068284 " into honeycomb-mr1
2011-03-08 23:51:02 -08:00
Adam Powell
4763777ebf
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
1250c94b50
Merge "Bug 3509417 - Refine touch event serialization" into honeycomb-mr1
2011-03-08 20:00:25 -08:00
Carl Shapiro
9b8c5f6143
Merge "Remove unused JNI global references."
2011-03-08 19:49:47 -08:00
Nicolas Roard
acafb26d34
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
f986d496c5
Merge "Partial invalidation of the browser textures" into honeycomb-mr1
2011-03-08 19:02:33 -08:00
Amith Yamasani
ad8479ddcc
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
3e95ab97a2
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
2bf0410bd2
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
1464d1d98a
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
6f1cd44c2f
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
00b9ea7daf
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
a90ad2ced2
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
cf0f9a0b62
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
9b33ab8f45
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
388b0768e1
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
ae850caf94
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
57e42c3726
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
Scott Main
b0355410bb
docs: replace misc screenshots from Mac with shots from Windows
...
bug: 3490831
Change-Id: Id99d397551d87817cd2625ee7f43a1671dfc7828
2011-03-08 18:02:58 -08:00
David Li
4813cd72e6
Merge "Initial commit of libAgl2 using Pixelflinger2 in external/mesa3d"
2011-03-08 17:50:37 -08:00
David Li
af94ceb5df
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
Romain Guy
e294d41593
Prevents NPE when a View was detached
...
Bug #4068284
Change-Id: Ied1c9b8d32a3e9957c6b165642ba40bbdaf35d53
2011-03-08 17:35:10 -08:00
Amith Yamasani
f9b9bd538d
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
Jeff Brown
b23bdf518b
Eliminate some accidental log spam. (DO NOT MERGE)
...
Used #ifdef where I should have used #if.
Change-Id: Ie3a083d601c89f4fc4d83244bb5060a202574dc2
2011-03-08 16:35:07 -08:00
Amith Yamasani
1f111f1172
Merge "Searchview layout cleanup. Some more tweaks required for Market." into honeycomb-mr1
2011-03-08 16:34:11 -08:00
Amith Yamasani
79f7430bf9
Searchview layout cleanup. Some more tweaks required for Market.
...
Bug: 3321263
Submit area should be visible when the field has focus, irrespective of text content.
Make sure that the fields get highlighted when focused.
Also fix an issue with hint not being applied from the SearchableInfo.
Bug: 3470348
Change-Id: If399d9551f89312c19485e249043f5823a862499
2011-03-08 16:08:49 -08:00
Adam Powell
ae9d2640f3
Bug 3509417 - Refine touch event serialization
...
Fix an issue with single-touch events handled by webkit.
Change-Id: Ief4e9ec91cda7dd3940241c684d0907cb8c9890f
2011-03-08 16:01:37 -08:00
Jim Miller
88d2d0390d
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
0aa403c3bd
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
3de6a9b692
Merge "Fix 4025684: Don't include wallpaper dimensions in bounds calculation" into honeycomb-mr1
2011-03-08 15:43:16 -08:00
Dianne Hackborn
09a3166205
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
6f7612094a
am 7b27dc12: Merge "Updated text cursor assets" into honeycomb-mr1
...
* commit '7b27dc1201b10e40bcd9fbc73482640ccc15a6bf':
Updated text cursor assets
2011-03-08 15:35:47 -08:00
Jim Miller
2aded18b0e
Fix 4025684: Don't include wallpaper dimensions in bounds calculation
...
This fixes a bug where we would capture the statusbar region in
thumbnails because the wallpaper was used in the bounds calculation.
Change-Id: I572221e83c4c363afe90e59bece9a291ce694a15
2011-03-08 15:34:20 -08:00
Justin Ho
7b27dc1201
Merge "Updated text cursor assets" into honeycomb-mr1
2011-03-08 15:34:15 -08:00
Xavier Ducrohet
0ab34279a5
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
f596d697b6
Merge "LayoutLib: fix Capabilities and getDimensionPixelSize" into honeycomb-mr1
2011-03-08 15:25:08 -08:00
Justin Ho
b0ac8e7986
Updated text cursor assets
...
Change-Id: Ib3f7fc4f835957c07b6c3b045cb5b3131034dde3
2011-03-08 15:24:58 -08:00
Adam Cohen
d8bf89116b
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