Mike Lockwood
27a8e67797
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
0b8edc9582
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
4c8ef27c01
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
Mike Lockwood
70882ca39f
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
321e4c9c8f
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
8fccbcfb8e
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
Romain Guy
8329db39f2
am b245e31f: am ee7ace06: Merge "Fix rendering artifact in edge fades. Bug #4092053 " into honeycomb-mr1
...
* commit 'b245e31fa8dd1ad6a59ccf858154f3c7b92e0eb8':
Fix rendering artifact in edge fades. Bug #4092053
2011-03-14 18:21:21 -07:00
Romain Guy
b245e31fa8
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
ee7ace065f
Merge "Fix rendering artifact in edge fades. Bug #4092053 " into honeycomb-mr1
2011-03-14 18:16:39 -07:00
Romain Guy
7b5b6abf85
Fix rendering artifact in edge fades.
...
Bug #4092053
The problem always existed but was made visible by partial invalidation.
When saving a layer, the renderer would try to postpone glClear()
operations until the next drawing command. This however does not work
since the clip might have changed. The fix is rather simple and
simply gets rid of this "optimization" (that turned out to be
usless anyway given how View issues saveLayer() calls.)
This change also fixes an issue with gradients (color stops where
not properly computed when using a null stops array) and optimizes
display lists rendering (quickly rejects larger portions of the
tree to avoid executing unnecessary code.)
Change-Id: I0f5b5f6e1220d41a09cc2fa84c212b0b4afd9c46
2011-03-14 18:05:08 -07:00
Dirk Dougherty
29ef11f52e
am 8991851b: am a5732aa2: am 2f1d2ce1: Merge "Doc change: updated home tab announce post-GDC" into honeycomb
...
* commit '8991851b776ec3b16dd0918fa3a88332b7f30ba7':
Doc change: updated home tab announce post-GDC
2011-03-14 17:57:19 -07:00
Dirk Dougherty
8991851b77
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
Jamie Gennis
f0ac2649df
am adf565f0: am 1a0452b7: am 122dd099: Merge "SurfaceTexture: fix transform matrix computation." into honeycomb-mr1
...
* commit 'adf565f02676a8f41b572d23123695e732ffd321':
SurfaceTexture: fix transform matrix computation.
2011-03-14 17:51:48 -07:00
Mike Lockwood
862481c299
am 1c4e4fcc: am 38bc9f07: am f4c9c140: Merge "Fix broadcast receiver leak in UsbConfirmActivity" into honeycomb-mr1
...
* commit '1c4e4fcc473f47bda351cec3e48652f5392e6498':
Fix broadcast receiver leak in UsbConfirmActivity
2011-03-14 17:51:44 -07:00
Mike Lockwood
0affbcf8b0
am 01178a5c: am 5da789a6: Merge branch \'honeycomb-LTE\' of ssh://android-git:29418/platform/frameworks/base into honeycomb-LTE
...
* commit '01178a5c5f4d53c0a7f740eaa9c500734d075a0c':
2011-03-14 17:51:42 -07:00
Mike Lockwood
af0e97e57c
am dacdb6e5: am 8f455b2e: Add support for USB accessory serial numbers
...
* commit 'dacdb6e586beba067fe602850e59399f4887e69c':
Add support for USB accessory serial numbers
2011-03-14 17:51:39 -07:00
Dirk Dougherty
a5732aa275
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
James Dong
0660c7d048
Merge "Add a release() method to MediaScanner"
2011-03-14 17:49:25 -07:00
Jamie Gennis
adf565f026
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
1c4e4fcc47
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
01178a5c5f
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
dacdb6e586
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
Mike Lockwood
688d8412bd
am 0958fb10: am 221830b9: Merge "Add support for USB accessory serial numbers" into honeycomb-mr1
...
* commit '0958fb1068ee1b5e6c40eee16d943a664b1124b4':
Add support for USB accessory serial numbers
2011-03-14 17:47:49 -07:00
Jamie Gennis
1a0452b715
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
38bc9f0701
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
Mike Lockwood
5da789a673
Merge branch 'honeycomb-LTE' of ssh://android-git:29418/platform/frameworks/base into honeycomb-LTE
2011-03-14 17:45:28 -07:00
Dirk Dougherty
2f1d2ce1f2
Merge "Doc change: updated home tab announce post-GDC" into honeycomb
2011-03-14 17:44:28 -07:00
Mike Lockwood
8f455b2e26
Add support for USB accessory serial numbers
...
Change-Id: I47b79f091b300ced60bfc61eff2f771139663aae
Signed-off-by: Mike Lockwood <lockwood@android.com>
2011-03-14 17:43:37 -07:00
Jamie Gennis
122dd0999f
Merge "SurfaceTexture: fix transform matrix computation." into honeycomb-mr1
2011-03-14 17:42:48 -07:00
Mike Lockwood
f4c9c140a2
Merge "Fix broadcast receiver leak in UsbConfirmActivity" into honeycomb-mr1
2011-03-14 17:42:04 -07:00
Shailendra Yadav
6c256d125e
am e987cbaf: am 3fabad87: Merge "Fix for Don\'t allow adding 64-bit files(4086708)" into honeycomb-mr1
...
* commit 'e987cbafc2a6c19cae1ccf50658fb6320bda084a':
Fix for Don't allow adding 64-bit files(4086708)
2011-03-14 17:41:53 -07:00
Gloria Wang
5c4421f73f
am 67718e07: am 132bb659: Merge "For issue 4082089 Add more info and error events into the DRM framework" into honeycomb-mr1
...
* commit '67718e076422f8f28f4e30a39df9e462ef32d19b':
For issue 4082089 Add more info and error events into the DRM framework
2011-03-14 17:41:42 -07:00
Mike Lockwood
0958fb1068
am 221830b9: Merge "Add support for USB accessory serial numbers" into honeycomb-mr1
...
* commit '221830b93d6f35bcf20db2d34978392b43f44221':
Add support for USB accessory serial numbers
2011-03-14 17:41:22 -07:00
Mike Lockwood
221830b93d
Merge "Add support for USB accessory serial numbers" into honeycomb-mr1
2011-03-14 17:39:43 -07:00
Dirk Dougherty
5d5772f73b
Doc change: updated home tab announce post-GDC
...
Change-Id: I28d5d88431f5bf456d0b3461319f27e4d4ec1eac
2011-03-14 17:39:35 -07:00
Shailendra Yadav
e987cbafc2
am 3fabad87: Merge "Fix for Don\'t allow adding 64-bit files(4086708)" into honeycomb-mr1
...
* commit '3fabad87f6cade6ccf7dc6d716e8b91675982088':
Fix for Don't allow adding 64-bit files(4086708)
2011-03-14 17:36:56 -07:00
Gloria Wang
67718e0764
am 132bb659: Merge "For issue 4082089 Add more info and error events into the DRM framework" into honeycomb-mr1
...
* commit '132bb659b643348f29292810e42800441df41ceb':
For issue 4082089 Add more info and error events into the DRM framework
2011-03-14 17:36:42 -07:00
Shailendra Yadav
3fabad87f6
Merge "Fix for Don't allow adding 64-bit files(4086708)" into honeycomb-mr1
2011-03-14 17:23:05 -07:00
Mike Lockwood
8f6dce44e3
Fix broadcast receiver leak in UsbConfirmActivity
...
Change-Id: Ie1db70d9a57f16f192178583871994467f50a636
Signed-off-by: Mike Lockwood <lockwood@android.com>
2011-03-14 20:17:13 -04:00
Mike Lockwood
015b1ecaec
Add support for USB accessory serial numbers
...
Change-Id: I47b79f091b300ced60bfc61eff2f771139663aae
Signed-off-by: Mike Lockwood <lockwood@android.com>
2011-03-14 20:10:47 -04:00
Scott Main
5579bb7596
am 5355178a: am 9f3f36c9: am c2366c89: Merge "docs: update optimization guide with more info most importantly, information about using <compatible-screens> also add sample code to <compatible-screens> doc" into honeycomb
...
* commit '5355178a45bdc286d49f04f90059f1e5d0c41a82':
docs: update optimization guide with more info most importantly, information about using <compatible-screens> also add sample code to <compatible-screens> doc
2011-03-14 17:10:11 -07:00
Scott Main
66f9007dab
am c0f3e4f4: am 04e1af80: am 7b013bb5: docs: release notes for ADT 10.0.1
...
* commit 'c0f3e4f40e27db549a877777f8ef51522dd97a1d':
docs: release notes for ADT 10.0.1
2011-03-14 17:10:09 -07:00
Gloria Wang
132bb659b6
Merge "For issue 4082089 Add more info and error events into the DRM framework" into honeycomb-mr1
2011-03-14 17:02:58 -07:00
Scott Main
5355178a45
am 9f3f36c9: am c2366c89: Merge "docs: update optimization guide with more info most importantly, information about using <compatible-screens> also add sample code to <compatible-screens> doc" into honeycomb
...
* commit '9f3f36c95b87aab2c5f7cd6b6e18927f8ebfa9c4':
docs: update optimization guide with more info most importantly, information about using <compatible-screens> also add sample code to <compatible-screens> doc
2011-03-14 17:02:34 -07:00
Scott Main
c0f3e4f40e
am 04e1af80: am 7b013bb5: docs: release notes for ADT 10.0.1
...
* commit '04e1af802abfcecda2b86f1a3082a5c806026beb':
docs: release notes for ADT 10.0.1
2011-03-14 17:02:31 -07:00
Iliyan Malchev
60fdca229f
Merge "frameworks/base: remove LOCAL_PRELINK_MODULE"
2011-03-14 16:58:05 -07:00
Scott Main
9f3f36c95b
am c2366c89: Merge "docs: update optimization guide with more info most importantly, information about using <compatible-screens> also add sample code to <compatible-screens> doc" into honeycomb
...
* commit 'c2366c898abacb4b6e3723f6cad522615a2b304e':
docs: update optimization guide with more info most importantly, information about using <compatible-screens> also add sample code to <compatible-screens> doc
2011-03-14 16:42:28 -07:00
Scott Main
04e1af802a
am 7b013bb5: docs: release notes for ADT 10.0.1
...
* commit '7b013bb579a9bc372b30e2e520f6e200f6c2b1b9':
docs: release notes for ADT 10.0.1
2011-03-14 16:42:17 -07:00
Nicolas Roard
ac1aa45ed9
am 373ece1f: am 65c28204: Merge "Adding placeholders for the large play button used by the browser for HTML5 video (the button will appear surimposed to the video)" into honeycomb-mr1
...
* commit '373ece1fa158d72152712b36674a9c114a40b649':
Adding placeholders for the large play button used by the browser for HTML5 video (the button will appear surimposed to the video)
2011-03-14 16:36:50 -07:00
Xavier Ducrohet
67a2d2ba22
am c192ec26: am 7608181c: am 491ef0c6: Merge "LayoutLib: Fix Arc rendering." into honeycomb-mr1
...
* commit 'c192ec26c35c045cb2744193f17e2cf5dd809f5e':
LayoutLib: Fix Arc rendering.
2011-03-14 16:08:53 -07:00