Commit Graph

31643 Commits

Author SHA1 Message Date
Brad Fitzpatrick
201c38b39c Merge "Removing repetitive conditional; it simply does nothing except slowing down things." 2011-03-15 11:13:01 -07:00
Brad Fitzpatrick
9860849b8d Merge "Removing repetitive conditional; it simply does nothing except slowing down things." 2011-03-15 11:12:15 -07:00
Dianne Hackborn
780b0476c9 am cffde30f: am 44220a56: Merge "Add some debug code to try to track down issue 3183612" into gingerbread
* commit 'cffde30fc10ecdfca53877fbee61525028eb47ba':
  Add some debug code to try to track down issue 3183612
2011-03-15 11:03:42 -07:00
Brad Fitzpatrick
5a98e39e1c Merge "Fixing improper boxing to Integer instead of Long." 2011-03-15 11:03:29 -07:00
Brad Fitzpatrick
d42a9b74bc Merge "Using proper key for removing object from the map." 2011-03-15 11:00:51 -07:00
Brad Fitzpatrick
c53163a4a3 Merge changes I81fc2f90,I5e7fd759
* changes:
  Using proper key for removing from map.
  Removing wrong equals method in comparator.
2011-03-15 10:56:16 -07:00
Dianne Hackborn
152f8c41d0 am 44220a56: Merge "Add some debug code to try to track down issue 3183612" into gingerbread
* commit '44220a56026ead4583a9db96ced5f1113d4b4f07':
  Add some debug code to try to track down issue 3183612
2011-03-15 10:52:27 -07:00
Robert Greenwalt
08f43db273 am eea577e0: Remove redundant network types.
* commit 'eea577e0c41babadf4f07fd9d5e822bd7faa9385':
  Remove redundant network types.
2011-03-15 10:48:22 -07:00
Amith Yamasani
a64eb19581 Merge "Use more padding on the sides for SearchView" into honeycomb-mr1 2011-03-15 10:47:01 -07:00
Jamie Gennis
05f6941e51 am 41a894ad: am 75597105: Merge "SurfaceTextureClient: Add ISurfaceTexture getter." into honeycomb-mr1
* commit '41a894ad1379a046b0b7471a33d974c6241a91a9':
  SurfaceTextureClient: Add ISurfaceTexture getter.
2011-03-15 10:40:26 -07:00
Jamie Gennis
07294053e7 am 1b7dbf45: Merge branch \'honeycomb-LTE\' of ssh://android-git:29418/platform/frameworks/base into honeycomb-LTE
* commit '1b7dbf45f18bea3346a8296cbfd5c1a51cf3e01d':
2011-03-15 10:40:24 -07:00
Jamie Gennis
8d7cd7c633 am c8bff5d9: ANativeWindow: add query for the concrete type.
* commit 'c8bff5d9b72482487e6e62c72236bf14abed2aaf':
  ANativeWindow: add query for the concrete type.
2011-03-15 10:40:21 -07:00
Jamie Gennis
0a69ff8981 am 75597105: Merge "SurfaceTextureClient: Add ISurfaceTexture getter." into honeycomb-mr1
* commit '75597105e6e03f656bdc1e40acac44afb9a3b01b':
  SurfaceTextureClient: Add ISurfaceTexture getter.
2011-03-15 10:38:00 -07:00
Jamie Gennis
636452b7f4 Merge branch 'honeycomb-LTE' of ssh://android-git:29418/platform/frameworks/base into honeycomb-LTE 2011-03-15 10:37:59 -07:00
Jamie Gennis
5d8fcc583e ANativeWindow: add query for the concrete type.
This change adds a query to the ANativeWindow interface for getting the
concrete type of the ANativeWindow.

Bug: 4086509
Change-Id: I64aa86d72fbca3b52a98e1fc35608737781a3178
2011-03-15 10:37:57 -07:00
Jamie Gennis
5c0c93a8c4 SurfaceTexture: disallow unsupported uses.
This change makes the ANativeWindow_lock NDK function error out if it is
passed an ANativeWindow with a concrete type that is not Surface.  It
also makes eglCreateWindowSurface fail if it is passed a
SurfaceTextureClient as its 'window' argument.

Bug: 4087277
Change-Id: Ie68c50c52d88f72d8a387f6c094908044c83a88c
2011-03-15 10:37:37 -07:00
Jamie Gennis
efeeec2564 am 02805a40: Merge "ANativeWindow: add query for the concrete type." into honeycomb-mr1
* commit '02805a40d44fa038549e771ec9a15f52b5fa3538':
  ANativeWindow: add query for the concrete type.
2011-03-15 10:36:01 -07:00
Jamie Gennis
f9a20d77fa Merge "SurfaceTextureClient: Add ISurfaceTexture getter." into honeycomb-mr1 2011-03-15 10:34:35 -07:00
Jamie Gennis
3c742ef11b Merge "ANativeWindow: add query for the concrete type." into honeycomb-mr1 2011-03-15 10:33:35 -07:00
Dianne Hackborn
bebc96ba62 Merge "Add some debug code to try to track down issue 3183612" into gingerbread 2011-03-15 10:29:04 -07:00
Svetoslav Ganov
60b25c2c28 am e65711b2: Merge "Tapping on the week number sends the DatePicker to epoch start." into honeycomb-mr1
* commit 'e65711b21f1b351f28d4f04819e1e05a9ac8dfee':
  Tapping on the week number sends the DatePicker to epoch start.
2011-03-14 23:15:24 -07:00
Svetoslav Ganov
f15a7cdbfb Merge "Tapping on the week number sends the DatePicker to epoch start." into honeycomb-mr1 2011-03-14 23:13:49 -07:00
satok
3b2e2da8ab am b02b8369: Merge "Remove a workaround for the data inconsistency of SystemProperties" into honeycomb-mr1
* commit 'b02b8369c6549417561e2ae1467b615645b5d04c':
  Remove a workaround for the data inconsistency of SystemProperties
2011-03-14 22:47:11 -07:00
satok
6fbddcf3af Merge "Remove a workaround for the data inconsistency of SystemProperties" into honeycomb-mr1 2011-03-14 22:44:23 -07:00
Bart Sears
1f796e2351 am 0c6e9521: Merge "Update Droid Fonts" into honeycomb-mr1
* commit '0c6e9521f5a8b57910451a92c1bea142edd4b30d':
  Update Droid Fonts
2011-03-14 19:25:30 -07:00
Bart Sears
325daa7336 Merge "Update Droid Fonts" into honeycomb-mr1 2011-03-14 19:24:02 -07:00
Adam Powell
674de3fc7b am 57fccf12: Merge "Fix bug 4099023 - Phantom clicks on some websites" into honeycomb-mr1
* commit '57fccf12e1e71089aa01cbf9867314f82db4e6f9':
  Fix bug 4099023 - Phantom clicks on some websites
2011-03-14 18:33:56 -07:00
Adam Powell
5ec9119256 Merge "Fix bug 4099023 - Phantom clicks on some websites" into honeycomb-mr1 2011-03-14 18:32:45 -07:00
Justin Ho
a7cf08664b am f47a1683: Merge "Updated HTML5 media playback controls Bug: 4080127" into honeycomb-mr1
* commit 'f47a16837cc0516e23811850f69839bb2f7ac95b':
  Updated HTML5 media playback controls Bug: 4080127
2011-03-14 18:25:45 -07:00
Justin Ho
beb4a201a5 am cc886b93: Merge "Fixing naming for disabled paste assets Updated paste assets" into honeycomb-mr1
* commit 'cc886b93681b75a9b89331930435e0f527b2c3d7':
  Fixing naming for disabled paste assets Updated paste assets
2011-03-14 18:25:43 -07:00
Justin Ho
37e8286256 am 3e317542: Merge "Updated textfield search assets Bug: 3321263" into honeycomb-mr1
* commit '3e3175428c81501d72cda3c026b927ca6408243f':
  Updated textfield search assets Bug: 3321263
2011-03-14 18:25:40 -07:00
Ying Wang
37702cf67d am e422f7a2: am bf079216: Dist classes.jar with full class files inside
* commit 'e422f7a21aa094c10489d92d38c70bf688c3c5a8':
  Dist classes.jar with full class files inside
2011-03-14 18:25:01 -07:00
Mike Lockwood
0de9769133 am ccdac700: (-s ours) am 78b8e1be: Merge "DO NOT MERGE: backport recent USB accessory changes from honeycomb" into gingerbread
* commit 'ccdac700df7089a87e6bf284e45a30a7a6a62602':
  DO NOT MERGE: backport recent USB accessory changes from honeycomb
2011-03-14 18:24:58 -07:00
Simon Wilson
69d328abcd am 81e1ed7e: (-s ours) am ee3f6ef2: Merge "DO NOT MERGE Support WiMAX Settings & ticker message" into gingerbread
* commit '81e1ed7eb5e02edf714cd5f416d1f6ebeaeebae0':
  DO NOT MERGE Support WiMAX Settings & ticker message
2011-03-14 18:24:48 -07:00
Daniel Sandler
267a688f18 am 9bbaa156: (-s ours) am 45660662: Merge "Workaround unknown ERI indices." into gingerbread
* commit '9bbaa1564b81e97d3c26ad603a0d67789f275ed5':
  Workaround unknown ERI indices.
2011-03-14 18:24:42 -07:00
Justin Ho
0ff0466b2d Merge "Updated HTML5 media playback controls Bug: 4080127" into honeycomb-mr1 2011-03-14 18:24:13 -07:00
Justin Ho
83d83cb42a Merge "Fixing naming for disabled paste assets Updated paste assets" into honeycomb-mr1 2011-03-14 18:24:06 -07:00
Justin Ho
7ebaeaec62 Merge "Updated textfield search assets Bug: 3321263" into honeycomb-mr1 2011-03-14 18:23:18 -07:00
Romain Guy
230e05c01e am ee7ace06: Merge "Fix rendering artifact in edge fades. Bug #4092053" into honeycomb-mr1
* commit 'ee7ace065f77b53a57cb6273b9f2f5d85caba90c':
  Fix rendering artifact in edge fades. Bug #4092053
2011-03-14 18:18:03 -07:00
Romain Guy
b6549c81ee Merge "Fix rendering artifact in edge fades. Bug #4092053" into honeycomb-mr1 2011-03-14 18:16:39 -07:00
Dirk Dougherty
6964370320 am a5732aa2: am 2f1d2ce1: Merge "Doc change: updated home tab announce post-GDC" into honeycomb
* commit 'a5732aa275273edf9ae91340a440b3f2cd47c682':
  Doc change: updated home tab announce post-GDC
2011-03-14 17:52:31 -07:00
Dirk Dougherty
c090fb2f55 am 2f1d2ce1: Merge "Doc change: updated home tab announce post-GDC" into honeycomb
* commit '2f1d2ce1f2d58f959adaf8ce514d39970210331a':
  Doc change: updated home tab announce post-GDC
2011-03-14 17:50:06 -07:00
Jamie Gennis
dc580bdad7 am 1a0452b7: am 122dd099: Merge "SurfaceTexture: fix transform matrix computation." into honeycomb-mr1
* commit '1a0452b715727579a2a4408092f51f751c12f777':
  SurfaceTexture: fix transform matrix computation.
2011-03-14 17:49:15 -07:00
Mike Lockwood
1119053992 am 38bc9f07: am f4c9c140: Merge "Fix broadcast receiver leak in UsbConfirmActivity" into honeycomb-mr1
* commit '38bc9f0701150e089dd624bb30ac286637b5c2b9':
  Fix broadcast receiver leak in UsbConfirmActivity
2011-03-14 17:49:13 -07:00
Mike Lockwood
e006db9c95 am 5da789a6: Merge branch \'honeycomb-LTE\' of ssh://android-git:29418/platform/frameworks/base into honeycomb-LTE
* commit '5da789a6735a9e06e6cd6b72b09c7de9bf7715a8':
2011-03-14 17:49:02 -07:00
Mike Lockwood
019ce758bc am 8f455b2e: Add support for USB accessory serial numbers
* commit '8f455b2e265f95ba5ea5b14009a91148a5b072b4':
  Add support for USB accessory serial numbers
2011-03-14 17:48:57 -07:00
Jamie Gennis
bae774eb20 SurfaceTextureClient: Add ISurfaceTexture getter.
This change adds a getter method to SurfaceTextureClient to get the
ISurfaceTexture object with which the SurfaceTextureClient is
communicating.

Bug: 4086509
Change-Id: Ifec621e0fe5392a5be56b2348fdc54067cbebcdd
2011-03-14 17:47:11 -07:00
Jamie Gennis
391bbe2246 ANativeWindow: add query for the concrete type.
This change adds a query to the ANativeWindow interface for getting the
concrete type of the ANativeWindow.

Bug: 4086509
Change-Id: I64aa86d72fbca3b52a98e1fc35608737781a3178
2011-03-14 17:47:11 -07:00
Jamie Gennis
c6a4156f18 am 122dd099: Merge "SurfaceTexture: fix transform matrix computation." into honeycomb-mr1
* commit '122dd0999f09eedbe42e619b64276633bea60e6a':
  SurfaceTexture: fix transform matrix computation.
2011-03-14 17:45:38 -07:00
Mike Lockwood
a055776a3d am f4c9c140: Merge "Fix broadcast receiver leak in UsbConfirmActivity" into honeycomb-mr1
* commit 'f4c9c140a204c83c6185b9ada0e33e740ecf779b':
  Fix broadcast receiver leak in UsbConfirmActivity
2011-03-14 17:45:29 -07:00