Commit Graph

31419 Commits

Author SHA1 Message Date
David Li
c95e452508 Merge "Added screenshot after glDraw* option to GLES2 Debugger" 2011-03-09 10:05:38 -08:00
David Li
c7ec152b9d Merge "Initial commit of GLESv2 debugger server" 2011-03-09 10:04:46 -08:00
Wink Saville
c740f330c0 Merge "Telephony: Corrections to LTE and eHRPD constant values." 2011-03-09 09:48:05 -08:00
Irfan Sheriff
85f50a626a am 86587185: am 7ad85eb6: Merge "Persist wifi override in airplane mode" into honeycomb-mr1
* commit '865871850bcedd4b9da0536c8b41f3c1816e5f43':
  Persist wifi override in airplane mode
2011-03-09 09:36:40 -08:00
Irfan Sheriff
d99cd79768 am 7ad85eb6: Merge "Persist wifi override in airplane mode" into honeycomb-mr1
* commit '7ad85eb62f9f332cc8002ec996cd359333ba590e':
  Persist wifi override in airplane mode
2011-03-09 09:32:55 -08:00
Irfan Sheriff
1d24d7f7ce Merge "Persist wifi override in airplane mode" into honeycomb-mr1 2011-03-09 09:30:28 -08:00
Patrick Scott
8dda66214f am 5d534f28: am ea44c7c7: Merge "Pass the auto login header information to the app." into honeycomb-mr1
* commit '5d534f288d0c29337458e267fd207236bc23fec5':
  Pass the auto login header information to the app.
2011-03-09 05:10:34 -08:00
Patrick Scott
8ae27d926f am ea44c7c7: Merge "Pass the auto login header information to the app." into honeycomb-mr1
* commit 'ea44c7c71431adbce348cf9ef3f22d9561bb7fc1':
  Pass the auto login header information to the app.
2011-03-09 05:08:15 -08:00
Patrick Scott
95d38acf8b Merge "Pass the auto login header information to the app." into honeycomb-mr1 2011-03-09 05:05:21 -08:00
Bjorn Bringert
1d47d4fe25 Merge "Exception handling clean-up in TextToSpeech.java" 2011-03-09 04:38:08 -08:00
Kristian Monsen
bfb7c4ba79 am b4ca8b76: am 9e697ee9: Merge "Fix for bug 3469242 Turn of extra debugging before shipping" into honeycomb-mr1
* commit 'b4ca8b7696ea8559fced8bcdf36e11ed28785c7c':
  Fix for bug 3469242 Turn of extra debugging before shipping
2011-03-09 04:34:31 -08:00
Kristian Monsen
d706d1eff0 am 9e697ee9: Merge "Fix for bug 3469242 Turn of extra debugging before shipping" into honeycomb-mr1
* commit '9e697ee9fc9dcc21348d799e1e0bc83dd3abdb18':
  Fix for bug 3469242 Turn of extra debugging before shipping
2011-03-09 04:32:28 -08:00
Kristian Monsen
8e947862d5 Merge "Fix for bug 3469242 Turn of extra debugging before shipping" into honeycomb-mr1 2011-03-09 04:29:45 -08:00
Mike Lockwood
d1d5ac154c am 093cf07f: am 9e8e4ea0: Merge changes Ib517e5e4,I93be7695,I49bf22a4 into honeycomb-mr1
* commit '093cf07f3c58a6553c415d750edba1a75b269f05':
  Close USB dialogs if their corresponding accessory or device has disconnected
  USB: Add API and dialog for apps to request permissions for USB devices and accessories
  UsbService: Automatically use system apps by default if it is the only choice
2011-03-09 03:57:14 -08:00
Mike Lockwood
c92343ddde am 9e8e4ea0: Merge changes Ib517e5e4,I93be7695,I49bf22a4 into honeycomb-mr1
* commit '9e8e4ea0a839b561d329758cddbfd0f7ea23f593':
  Close USB dialogs if their corresponding accessory or device has disconnected
  USB: Add API and dialog for apps to request permissions for USB devices and accessories
  UsbService: Automatically use system apps by default if it is the only choice
2011-03-09 03:54:28 -08:00
Mike Lockwood
298ecf5fdf Merge changes Ib517e5e4,I93be7695,I49bf22a4 into honeycomb-mr1
* changes:
  Close USB dialogs if their corresponding accessory or device has disconnected
  USB: Add API and dialog for apps to request permissions for USB devices and accessories
  UsbService: Automatically use system apps by default if it is the only choice
2011-03-09 03:52:47 -08:00
Jeff Brown
859364c2ca 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
8b0512713b 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
9caa9da162 Merge "Eliminate some accidental log spam. (DO NOT MERGE)" into honeycomb-mr1 2011-03-09 02:45:59 -08:00
Adam Powell
c986abfe12 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
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
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