Commit Graph

32009 Commits

Author SHA1 Message Date
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
f28961b1b1 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
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
Glenn Kasten
bb959f5b10 Bug 4016329 do full string comparisons
Use full string comparisons instead of partial for
  file extension and MIME type.
Do case-insensitive comparison of MIME type and file extensions.
Fix error in comment for String8::getPathExtension.
Remove dead code -- StringTokenizer is unused.

Change-Id: I322be6235abbdaab5f7eafa48926dbb2cf46dc29
2011-03-14 17:59:51 -07:00
Dirk Dougherty
f815e04434 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
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
Jamie Gennis
96e0873907 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
1743274339 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
f79a19014b 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
d70759d643 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
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
James Dong
3d4d153684 Merge "Add a release() method to MediaScanner" 2011-03-14 17:49:25 -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
Mike Lockwood
1d70f17b38 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
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
Mike Lockwood
0b73c16133 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
fb2a846013 Merge "Doc change: updated home tab announce post-GDC" into honeycomb 2011-03-14 17:44:28 -07:00
Jamie Gennis
827ebdbbff Merge "SurfaceTexture: fix transform matrix computation." into honeycomb-mr1 2011-03-14 17:42:48 -07:00
Mike Lockwood
e1092edebc Merge "Fix broadcast receiver leak in UsbConfirmActivity" into honeycomb-mr1 2011-03-14 17:42:04 -07:00
Shailendra Yadav
38696928db 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
c7e75e58ed 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
0b1a7c91d5 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
b773befa81 Merge "Add support for USB accessory serial numbers" into honeycomb-mr1 2011-03-14 17:39:43 -07:00
Shailendra Yadav
2ea0c765f9 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
8cbc72c1e2 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
de7426d7e2 Merge "Fix for Don't allow adding 64-bit files(4086708)" into honeycomb-mr1 2011-03-14 17:23:05 -07:00
Scott Main
c834e33444 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
c62ee380d7 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
848ddad0a3 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
8ab20ca84a 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
99dbf7920e 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
3875d79ef6 Merge "frameworks/base: remove LOCAL_PRELINK_MODULE" 2011-03-14 16:58:05 -07:00
Scott Main
02451ddf6c 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
1bc0a08a95 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
1a26fd48c8 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
531223a9f4 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
Neel Parekh
ddc89d2aaf am 4cef246c: am 5b3d18cf: Merge branch \'honeycomb-LTE\' of ssh://android-git:29418/platform/frameworks/base into honeycomb-LTE
* commit '4cef246c0b43a68d1154172d673852dad7a808e2':
2011-03-14 16:08:34 -07:00
Nicolas Roard
6c9c592fb2 am a2a72f01: am f146fd9c: Adding placeholders for the fullscreen button used by the browser for HTML5 video
* commit 'a2a72f01d97ccada0f6b02908066ffb0d3a19a61':
  Adding placeholders for the fullscreen button used by the browser for HTML5 video
2011-03-14 16:08:29 -07:00
Scott Main
1b87152752 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 2011-03-14 16:08:09 -07:00
Nicolas Roard
644cd4baf6 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 '65c282042dab1dfa75b10517190ba38834782c3b':
  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 15:39:37 -07:00
Xavier Ducrohet
4030041e1d am 7608181c: am 491ef0c6: Merge "LayoutLib: Fix Arc rendering." into honeycomb-mr1
* commit '7608181ca76eda1ab64661ddae13bbb92e185ae8':
  LayoutLib: Fix Arc rendering.
2011-03-14 15:29:13 -07:00