Commit Graph

32285 Commits

Author SHA1 Message Date
Mathias Agopian
bbcff6af79 am af831a7b: Merge "fix [4107131] nvidia driver call takes a very long time" into honeycomb-mr1
* commit 'af831a7bd5f1a3ffd1129f5f15b862c5973d48b6':
  fix [4107131] nvidia driver call takes a very long time
2011-03-16 15:59:15 -07:00
Mathias Agopian
da155b248b Merge "fix [4107131] nvidia driver call takes a very long time" into honeycomb-mr1 2011-03-16 15:57:57 -07:00
James Dong
404b83f19d Merge "resolved conflicts for merge of 1cbf8493 to master" 2011-03-16 15:56:32 -07:00
James Dong
e4e5733bee resolved conflicts for merge of 1cbf8493 to master
Change-Id: Ifea2ba8b02ecf291fbd1612973647a95a70511c4
2011-03-16 15:53:03 -07:00
Jesse Wilson
7ec61f0d34 Merge "Don't leak JsonReaders in example code." 2011-03-16 15:48:07 -07:00
Romain Guy
a08152f43c Modify the GL renderer's functor to pass the clip to WebView
Change-Id: If5efe399ca58f3000b2883e24e9f3736a2025184
2011-03-16 15:31:33 -07:00
James Dong
63e29217a5 am 28fc2037: am fc591762: Merge "Add the default camera id to mCameraIds for emulator and those devices without media_profiles.xml configuration file." into honeycomb-mr1
* commit '28fc2037bffd1593b56fe1e1522de544a7d49120':
  Add the default camera id to mCameraIds for emulator and those devices without media_profiles.xml configuration file.
2011-03-16 15:12:58 -07:00
James Dong
ab375862e9 am fc591762: Merge "Add the default camera id to mCameraIds for emulator and those devices without media_profiles.xml configuration file." into honeycomb-mr1
* commit 'fc59176241f498ad4eeb4237800c2eb5edd9efcd':
  Add the default camera id to mCameraIds for emulator and those devices without media_profiles.xml configuration file.
2011-03-16 15:11:03 -07:00
James Dong
fa064b9933 Merge "Add the default camera id to mCameraIds for emulator and those devices without media_profiles.xml configuration file." into honeycomb-mr1 2011-03-16 15:09:21 -07:00
Jesse Wilson
dbd67458fd Merge "Fix a bogus comment on LruCache.hitCount()" 2011-03-16 15:05:10 -07:00
Shimeng (Simon) Wang
566de3a7eb am 0c4f09be: am f2532d16: am 464b690a: Pass firstLayout info to native webview when setting baseLayer.
* commit '0c4f09be5b73bd6bf19921d907fadc50d853deaf':
  Pass firstLayout info to native webview when setting baseLayer.
2011-03-16 14:51:21 -07:00
Shimeng (Simon) Wang
f391369214 am f2532d16: am 464b690a: Pass firstLayout info to native webview when setting baseLayer.
* commit 'f2532d16a4a2ca4dffe9bf9568fdd24475369cac':
  Pass firstLayout info to native webview when setting baseLayer.
2011-03-16 14:49:18 -07:00
Shimeng (Simon) Wang
acdd032f0f am 464b690a: Pass firstLayout info to native webview when setting baseLayer.
* commit '464b690ada24428f3dff4102659048db7128835f':
  Pass firstLayout info to native webview when setting baseLayer.
2011-03-16 14:47:32 -07:00
Mathias Agopian
36bdf14a75 fix [4107131] nvidia driver call takes a very long time
We were leaking all EGLSyncKHR objects, over time the list
would grow and become very slow to operate on.

Bug: 4107131
Change-Id: I6c82daf49fe3189d04550781d64d57c30c95f552
2011-03-16 14:19:03 -07:00
Michael Kolb
29f83cb6ea am 5b7a1bd7: am b0a07f0c: am 6bb2020e: Merge "add comment to deprecated tag" into honeycomb-mr1
* commit '5b7a1bd7906b24e92d61b967abe736cc3559bf08':
  add comment to deprecated tag
2011-03-16 13:43:30 -07:00
Andreas Huber
e660bd1b76 am 1a47fc35: (-s ours) am 7532ae7f: am 46956b06: Merge "DO NOT MERGE: Fix a race condition when playing an audio-only stream and seeking before starting." into honeycomb-mr1
* commit '1a47fc353157bf9798c8a7425f106681e14bf4a5':
  DO NOT MERGE: Fix a race condition when playing an audio-only stream and seeking before starting.
2011-03-16 13:41:28 -07:00
Michael Kolb
06d31833e5 am b0a07f0c: am 6bb2020e: Merge "add comment to deprecated tag" into honeycomb-mr1
* commit 'b0a07f0ce54ee812f9a00cc53f43919051d563c3':
  add comment to deprecated tag
2011-03-16 13:38:24 -07:00
Andreas Huber
5360b59d75 am 7532ae7f: am 46956b06: Merge "DO NOT MERGE: Fix a race condition when playing an audio-only stream and seeking before starting." into honeycomb-mr1
* commit '7532ae7f79d6d849faae1a9bee171c66bd534d97':
  DO NOT MERGE: Fix a race condition when playing an audio-only stream and seeking before starting.
2011-03-16 13:36:35 -07:00
Michael Kolb
a440dbdd11 am 6bb2020e: Merge "add comment to deprecated tag" into honeycomb-mr1
* commit '6bb2020e6e9914f6df3dc7d69dbd21782267fbd4':
  add comment to deprecated tag
2011-03-16 13:34:30 -07:00
Andreas Huber
db6b1d7dcf am 46956b06: Merge "DO NOT MERGE: Fix a race condition when playing an audio-only stream and seeking before starting." into honeycomb-mr1
* commit '46956b0691b2a228237d17536fe4ad33a760c0af':
  DO NOT MERGE: Fix a race condition when playing an audio-only stream and seeking before starting.
2011-03-16 13:18:42 -07:00
Michael Kolb
d52a4c4ac0 Merge "add comment to deprecated tag" into honeycomb-mr1 2011-03-16 13:10:48 -07:00
Andreas Huber
ecdbccea55 Merge "DO NOT MERGE: Fix a race condition when playing an audio-only stream and seeking before starting." into honeycomb-mr1 2011-03-16 13:06:52 -07:00
Mike Lockwood
102da92113 am 89de72d8: am 1d8b5a5e: am 75d62cee: Merge "USB System UI: Improve message for the "no app for USB accessory" dialog." into honeycomb-mr1
* commit '89de72d83a1593ceb268f9433cd10455c66fc3af':
  USB System UI:  Improve message for the "no app for USB accessory" dialog.
2011-03-16 12:35:55 -07:00
Michael Kolb
ae356689fb am d799caa9: am 9a0df3c5: am 95fd065e: Merge "deprecate getVisibleTitleHeight" into honeycomb-mr1
* commit 'd799caa9a6623de4af581bebc9759272c10b6588':
  deprecate getVisibleTitleHeight
2011-03-16 12:35:42 -07:00
Mike Lockwood
d6629f03e7 am 1d8b5a5e: am 75d62cee: Merge "USB System UI: Improve message for the "no app for USB accessory" dialog." into honeycomb-mr1
* commit '1d8b5a5e866f75d516dd6f03424f37b1de9a3d97':
  USB System UI:  Improve message for the "no app for USB accessory" dialog.
2011-03-16 12:09:27 -07:00
Mike Lockwood
e011307d8f am 75d62cee: Merge "USB System UI: Improve message for the "no app for USB accessory" dialog." into honeycomb-mr1
* commit '75d62cee30557145e48d792fdce4769235daa9ce':
  USB System UI:  Improve message for the "no app for USB accessory" dialog.
2011-03-16 12:06:58 -07:00
Mike Lockwood
b80cf4bdf6 Merge "USB System UI: Improve message for the "no app for USB accessory" dialog." into honeycomb-mr1 2011-03-16 12:03:39 -07:00
Jeff Brown
ebed6c3abb Merge "Add 3D mode key and others." 2011-03-16 11:46:00 -07:00
Michael Kolb
2dbd5c3856 am 9a0df3c5: am 95fd065e: Merge "deprecate getVisibleTitleHeight" into honeycomb-mr1
* commit '9a0df3c5c730ff12e050945f2bad0d86a37c5b2f':
  deprecate getVisibleTitleHeight
2011-03-16 11:37:23 -07:00
Michael Kolb
464e14e801 am 95fd065e: Merge "deprecate getVisibleTitleHeight" into honeycomb-mr1
* commit '95fd065e3cef0bef723a2e624191b08bb00ce6f8':
  deprecate getVisibleTitleHeight
2011-03-16 11:35:45 -07:00
Michael Kolb
5d05f431dd Merge "deprecate getVisibleTitleHeight" into honeycomb-mr1 2011-03-16 11:33:13 -07:00
Andreas Huber
b2511a025e Merge "Fix a race condition when playing an audio-only stream and seeking before starting." 2011-03-16 11:32:30 -07:00
Jeff Brown
5aaab9c6d8 Add 3D mode key and others.
Related to an AOSP change request.

Change-Id: I3f4f84b56a1af626a8783f5ecbb823eb12ba9fbe
2011-03-16 11:31:42 -07:00
Svetoslav Ganov
081b24a61a Merge "Pressed state not cleared if view is disabled in long click handler" 2011-03-16 11:13:41 -07:00
Eric Fischer
f75ad0db19 am d40e0efb: (-s ours) am d5eb3bbb: am cc571e96: Merge "Import revised translations. DO NOT MERGE" into honeycomb-mr1
* commit 'd40e0efb024ad2e276dbbd2eb81047dd2a1319f7':
  Import revised translations.  DO NOT MERGE
2011-03-16 11:00:33 -07:00
Eric Fischer
0c674c7848 am d5eb3bbb: am cc571e96: Merge "Import revised translations. DO NOT MERGE" into honeycomb-mr1
* commit 'd5eb3bbbf2959553005df173165b6b65231798a2':
  Import revised translations.  DO NOT MERGE
2011-03-16 10:54:33 -07:00
Eric Fischer
4459711aaf am cc571e96: Merge "Import revised translations. DO NOT MERGE" into honeycomb-mr1
* commit 'cc571e9643865edc3f25aa133c467ace46ce8e80':
  Import revised translations.  DO NOT MERGE
2011-03-16 10:51:56 -07:00
Eric Fischer
f5ff29ae49 Merge "Import revised translations. DO NOT MERGE" into honeycomb-mr1 2011-03-16 10:23:02 -07:00
Kenny Root
8faff5c663 Merge "Update WakeLock-related docs to mention permissions" 2011-03-16 10:05:23 -07:00
Wei Huang
950f11fe0d Merge "Add the field date_sent to keep track of the date a message was sent." 2011-03-16 08:36:14 -07:00
Mike Lockwood
8e4e4d1f08 am c132f45c: am 2b2aaf2b: am ff51d29a: Merge "USB System UI: Fix string localization problems" into honeycomb-mr1
* commit 'c132f45c5b47874746aad01156d7fb57b144e07f':
  USB System UI: Fix string localization problems
2011-03-16 04:37:05 -07:00
Mike Lockwood
065fd7ff62 am 2b2aaf2b: am ff51d29a: Merge "USB System UI: Fix string localization problems" into honeycomb-mr1
* commit '2b2aaf2be9fb77e445574ae6c761e10cca1310b0':
  USB System UI: Fix string localization problems
2011-03-16 04:35:23 -07:00
Mike Lockwood
4dd078cd35 am ff51d29a: Merge "USB System UI: Fix string localization problems" into honeycomb-mr1
* commit 'ff51d29a0bbf7006833ad67b1aa8a52a8a9a2514':
  USB System UI: Fix string localization problems
2011-03-16 04:33:29 -07:00
Mike Lockwood
923325fe00 Merge "USB System UI: Fix string localization problems" into honeycomb-mr1 2011-03-16 04:31:15 -07:00
Wu-cheng Li
38e3450375 Merge "Improve ACTION_IMAGE_CAPTURE and ACTION_VIDEO_CAPTURE javadoc." 2011-03-16 03:08:34 -07:00
Eric Laurent
471b9905b4 am 9bb250bf: am a6c3ace3: am 3913c131: Merge "Improvement for issue 3489986: BT SCO volume" into honeycomb-mr1
* commit '9bb250bfe735deb16e15dfdd6a35693558a2171e':
  Improvement for issue 3489986: BT SCO volume
2011-03-15 23:50:45 -07:00
Romain Guy
0ca1b0f594 am f8c4c128: am 0f7d2ec3: am 46fc2517: Merge "Fix performance issue in Launcher Bug #3515248" into honeycomb-mr1
* commit 'f8c4c12802b15da068d164fd44c9b9f12e7ed916':
  Fix performance issue in Launcher Bug #3515248
2011-03-15 23:50:43 -07:00
Justin Ho
6509fac8d7 am 30d7eb02: am 6ad9cc9a: am 6764ecf8: Merge "Integrating new ADB USB debugging asset Bug: #6699FF" into honeycomb-mr1
* commit '30d7eb02b5e9533efc41e1fc98eac5c5a6891903':
  Integrating new ADB USB debugging asset Bug: #6699FF
2011-03-15 23:50:40 -07:00
Justin Ho
463b75693e am 201bc41e: am 750a4a26: am 141505a9: Merge "Fix expander list group indicator Bug: #6699FF" into honeycomb-mr1
* commit '201bc41e0cbb07dba5365f33ba9885c02977ed6a':
  Fix expander list group indicator Bug: #6699FF
2011-03-15 23:50:37 -07:00
Stephen Hines
5cfbe30b36 am 89254a11: am e01675cd: am 2d5cbc92: Merge "2X2 matrix needs 4 float elements." into honeycomb-mr1
* commit '89254a114bac016bbc9974c392d40804da0eb174':
  2X2 matrix needs 4 float elements.
2011-03-15 23:50:34 -07:00