Commit Graph

31963 Commits

Author SHA1 Message Date
Brad Fitzpatrick
47c8e50c57 Merge "Fixing self-assignment in copying code." 2011-03-15 11:18:18 -07:00
Brad Fitzpatrick
03af2d42a4 Merge "Fixing self-assignment in cloning code." 2011-03-15 11:15:19 -07:00
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
cd79bc5ba0 am f58f041b: am cffde30f: am 44220a56: Merge "Add some debug code to try to track down issue 3183612" into gingerbread
* commit 'f58f041beb8a00db201eb3c8eb801dc1b702253d':
  Add some debug code to try to track down issue 3183612
2011-03-15 11:06:14 -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
5fd73cd5d4 am 8d97f87d: am eea577e0: Remove redundant network types.
* commit '8d97f87d1fc7b67d57d5894915a4451629d98551':
  Remove redundant network types.
2011-03-15 10:51:23 -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
3f13cf1be5 am c570ee21: am 41a894ad: am 75597105: Merge "SurfaceTextureClient: Add ISurfaceTexture getter." into honeycomb-mr1
* commit 'c570ee21e2c2b9802c9d1f58dba024e884b225e6':
  SurfaceTextureClient: Add ISurfaceTexture getter.
2011-03-15 10:45:01 -07:00
Jamie Gennis
bc24786225 am b15ab10c: am 1b7dbf45: Merge branch \'honeycomb-LTE\' of ssh://android-git:29418/platform/frameworks/base into honeycomb-LTE
* commit 'b15ab10c33058a8a89410085e0b58fd793a0ca54':
2011-03-15 10:44:59 -07:00
Jamie Gennis
5c32e5fddd am 73d7036d: am c8bff5d9: ANativeWindow: add query for the concrete type.
* commit '73d7036da461505af01f2899792f609dc3cdadc9':
  ANativeWindow: add query for the concrete type.
2011-03-15 10:44:56 -07:00
Jamie Gennis
cefc876234 am ceb7cb14: am 02805a40: Merge "ANativeWindow: add query for the concrete type." into honeycomb-mr1
* commit 'ceb7cb1460484eda1a3cb9cd271d7caf3a3dcbd1':
  ANativeWindow: add query for the concrete type.
2011-03-15 10:42:06 -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
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
James Dong
4ec63136b9 Merge "Add memory leak tracking/debugging code to drm server" 2011-03-15 09:29:11 -07:00
Svetoslav Ganov
8017dbc8df am 6d4f318f: am e65711b2: Merge "Tapping on the week number sends the DatePicker to epoch start." into honeycomb-mr1
* commit '6d4f318f0c836c0c2eac3a1d99debedc6c03578a':
  Tapping on the week number sends the DatePicker to epoch start.
2011-03-14 23:17:58 -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
9b5d8fc3dd am f057524d: am b02b8369: Merge "Remove a workaround for the data inconsistency of SystemProperties" into honeycomb-mr1
* commit 'f057524db620c490e96fa886238f3b31bd973060':
  Remove a workaround for the data inconsistency of SystemProperties
2011-03-14 22:51:21 -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
b350616bc3 am faffbd80: am 0c6e9521: Merge "Update Droid Fonts" into honeycomb-mr1
* commit 'faffbd806e6d5b66dbd1bba46f050a055116be74':
  Update Droid Fonts
2011-03-14 19:29:33 -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
Ying Wang
3a648175cb Merge "Add screen layout size as one of the resource filtering axes." 2011-03-14 19:20:00 -07:00
Adam Powell
e1186f453b am 15c9ab33: am 57fccf12: Merge "Fix bug 4099023 - Phantom clicks on some websites" into honeycomb-mr1
* commit '15c9ab336eff66cafa365e9ea3a81f9f1b5c2635':
  Fix bug 4099023 - Phantom clicks on some websites
2011-03-14 18:37:18 -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
21ee90d612 am 71ee3ba0: am f47a1683: Merge "Updated HTML5 media playback controls Bug: 4080127" into honeycomb-mr1
* commit '71ee3ba0f08b4be70bf986ea2c7f9f5261bca8a2':
  Updated HTML5 media playback controls Bug: 4080127
2011-03-14 18:31:08 -07:00
Justin Ho
9f31bd73f8 am 1586c133: am cc886b93: Merge "Fixing naming for disabled paste assets Updated paste assets" into honeycomb-mr1
* commit '1586c133a3305045af277b69fec6f0f14bb234df':
  Fixing naming for disabled paste assets Updated paste assets
2011-03-14 18:31:06 -07:00
Justin Ho
8a97bb527f am 7bc341cf: am 3e317542: Merge "Updated textfield search assets Bug: 3321263" into honeycomb-mr1
* commit '7bc341cf80fb5d6b4a8a3304c672341ed9810825':
  Updated textfield search assets Bug: 3321263
2011-03-14 18:31:03 -07:00
Ying Wang
afd3fde989 am a7ec506e: am e422f7a2: am bf079216: Dist classes.jar with full class files inside
* commit 'a7ec506e4a91e2cb68123462d3c0d5276ae29c86':
  Dist classes.jar with full class files inside
2011-03-14 18:27:34 -07:00
Mike Lockwood
377f61f63b am 70882ca3: (-s ours) am ccdac700: (-s ours) am 78b8e1be: Merge "DO NOT MERGE: backport recent USB accessory changes from honeycomb" into gingerbread
* commit '70882ca39fd010abd93544ec6dd15a003601f24c':
  DO NOT MERGE: backport recent USB accessory changes from honeycomb
2011-03-14 18:27:30 -07:00
Simon Wilson
81a2768553 am 321e4c9c: (-s ours) am 81e1ed7e: (-s ours) am ee3f6ef2: Merge "DO NOT MERGE Support WiMAX Settings & ticker message" into gingerbread
* commit '321e4c9c8fa32b814d59e81fec2c7f07b4861928':
  DO NOT MERGE Support WiMAX Settings & ticker message
2011-03-14 18:27:28 -07:00
Daniel Sandler
e2bd5523a5 am 8fccbcfb: am 9bbaa156: (-s ours) am 45660662: Merge "Workaround unknown ERI indices." into gingerbread
* commit '8fccbcfb8ea2e13727367b46ea4bb562f69d0bca':
  Workaround unknown ERI indices.
2011-03-14 18:27:25 -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