drgreen/android_frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
47,178 Commits 1 Branch 0 Tags
Commit Graph

47178 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Romain Guy
b0204d0a27 am c2b91a61: Merge "Modify the GL renderer\'s functor to pass the clip to WebView" into honeycomb-mr1 
* commit 'c2b91a6113c30d3b994ef081fbd5b941200d55a4':
  Modify the GL renderer's functor to pass the clip to WebView
 2011-03-16 17:26:41 -07:00
Romain Guy
c2b91a6113 Merge "Modify the GL renderer's functor to pass the clip to WebView" into honeycomb-mr1 2011-03-16 17:24:32 -07:00
Eric Fischer
c657fcce45 am 20ccaf6c: Import revised translations. DO NOT MERGE 
* commit '20ccaf6cc1a79a3f7973e5875c66e2bce2ebee7c':
  Import revised translations.  DO NOT MERGE
 2011-03-16 17:10:09 -07:00
Eric Fischer
20ccaf6cc1 Import revised translations. DO NOT MERGE 
Change-Id: I59b21268d693f0fac87e787fceb4f41b3f3e6acd
 2011-03-16 16:48:09 -07:00
Yu Shan Emily Lau
797f5b0c00 am fd5c1f7c: Merge "Suppress the 1 hour video editor export test case which exceed the 5 mins large test limit. Add the media test util for capturing the memory usage. Bug# 4108259 Change-Id: I751a622ff5dfbb1d563f63a2cbc9db71d194a0f6" into honeycomb-mr1 
* commit 'fd5c1f7c575451cf3566d1a8290b0b001bddfa39':
  Suppress the 1 hour video editor export test case which exceed the 5 mins large test limit. Add the media test util for capturing the memory usage. Bug# 4108259 Change-Id: I751a622ff5dfbb1d563f63a2cbc9db71d194a0f6
 2011-03-16 16:43:04 -07:00
Yu Shan Emily Lau
fd5c1f7c57 Merge "Suppress the 1 hour video editor export test case which exceed the 5 mins large test limit. Add the media test util for capturing the memory usage. Bug# 4108259 Change-Id: I751a622ff5dfbb1d563f63a2cbc9db71d194a0f6" into honeycomb-mr1 2011-03-16 16:40:46 -07:00
Yu Shan Emily Lau
9dab784705 Suppress the 1 hour video editor export test case which exceed the 5 mins large test limit. 
Add the media test util for capturing the memory usage.
Bug# 4108259
Change-Id: I751a622ff5dfbb1d563f63a2cbc9db71d194a0f6
 2011-03-16 16:36:17 -07:00
Rajneesh Chowdury
69d0549034 am 0edefea8: Merge "Fix for 4087846 Crash reported by monkey report (Java/Jni)" into honeycomb-mr1 
* commit '0edefea88e975613bca9f0227614de91434ade11':
  Fix for 4087846 Crash reported by monkey report (Java/Jni)
 2011-03-16 16:05:54 -07:00
Rajneesh Chowdury
0edefea88e Merge "Fix for 4087846 Crash reported by monkey report (Java/Jni)" into honeycomb-mr1 2011-03-16 16:03:15 -07:00
Mathias Agopian
a05a8ac5ee 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
af831a7bd5 Merge "fix [4107131] nvidia driver call takes a very long time" into honeycomb-mr1 2011-03-16 15:57:57 -07:00
Romain Guy
80911b8517 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
28fc2037bf 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
fc59176241 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
Shimeng (Simon) Wang
f2532d16a4 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
3d69bea1f6 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
James Dong
6ec0ca9e8e Add the default camera id to mCameraIds for emulator and those devices without media_profiles.xml configuration file. 
bug - 4109530

Change-Id: Ib83be7a7f767a4b20ac338734ada1581e7a4c5bf
 2011-03-16 14:11:32 -07:00
Shimeng (Simon) Wang
464b690ada Pass firstLayout info to native webview when setting baseLayer. 
issue: 4094300
Change-Id: I4fdbc0cee73230a731b1356f44372cd86a5c4ad1
 2011-03-16 13:56:37 -07:00
Michael Kolb
b0a07f0ce5 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
7532ae7f79 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
6bb2020e6e Merge "add comment to deprecated tag" into honeycomb-mr1 2011-03-16 13:10:48 -07:00
Andreas Huber
46956b0691 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
Michael Kolb
24e53b00b0 add comment to deprecated tag 
Change-Id: Id0c30c43abfeb9005f9b69e0a565644c7c956295
 2011-03-16 12:56:39 -07:00
Mike Lockwood
1d8b5a5e86 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
Andreas Huber
5bd3bb46b1 DO NOT MERGE: Fix a race condition when playing an audio-only stream and seeking before starting. 
Change-Id: I70dfdfb7c27e3c713079c359ef89a570eb600dc7
related-to-bug: 4039068
 2011-03-16 12:04:56 -07:00
Mike Lockwood
75d62cee30 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
Michael Kolb
9a0df3c5c7 am 95fd065e: Merge "deprecate getVisibleTitleHeight" into honeycomb-mr1 
* commit '95fd065e3cef0bef723a2e624191b08bb00ce6f8':
  deprecate getVisibleTitleHeight
 2011-03-16 11:35:45 -07:00
Michael Kolb
95fd065e3c Merge "deprecate getVisibleTitleHeight" into honeycomb-mr1 2011-03-16 11:33:13 -07:00
Mike Lockwood
b893916fb8 USB System UI: Improve message for the "no app for USB accessory" dialog. 
Change-Id: I72bdc3afa152ed7a0e30b1a0e8d9cb2e53ca3f29
Signed-off-by: Mike Lockwood <lockwood@android.com>
 2011-03-16 14:10:03 -04:00
Eric Fischer
d5eb3bbbf2 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
cc571e9643 Merge "Import revised translations. DO NOT MERGE" into honeycomb-mr1 2011-03-16 10:23:02 -07:00
Eric Fischer
326c1c7247 Import revised translations. DO NOT MERGE 
Change-Id: I654f633a58cb935a3388e5b558101912dae7fde7
 2011-03-16 10:11:58 -07:00
Michael Kolb
e54f66524e deprecate getVisibleTitleHeight 
Bug: 4104535

Change-Id: I8a6ef21d38a25848efa28e2c06cf2da0ff7af9c4
 2011-03-16 09:25:23 -07:00
Mike Lockwood
2b2aaf2be9 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
ff51d29a0b Merge "USB System UI: Fix string localization problems" into honeycomb-mr1 2011-03-16 04:31:15 -07:00
Eric Laurent
a6c3ace327 am 3913c131: Merge "Improvement for issue 3489986: BT SCO volume" into honeycomb-mr1 
* commit '3913c131c61288c5b4eedb063d9eb6b6204d2a1f':
  Improvement for issue 3489986: BT SCO volume
 2011-03-15 23:44:43 -07:00
Romain Guy
0f7d2ec37f am 46fc2517: Merge "Fix performance issue in Launcher Bug #3515248" into honeycomb-mr1 
* commit '46fc25171af8bbaf4594946ce406a667ce2ec27a':
  Fix performance issue in Launcher Bug #3515248
 2011-03-15 23:44:30 -07:00
Justin Ho
6ad9cc9afd am 6764ecf8: Merge "Integrating new ADB USB debugging asset Bug: #6699FF" into honeycomb-mr1 
* commit '6764ecf8630af4c6260007e688cea0056ecf4ec7':
  Integrating new ADB USB debugging asset Bug: #6699FF
 2011-03-15 23:44:12 -07:00
Justin Ho
750a4a2623 am 141505a9: Merge "Fix expander list group indicator Bug: #6699FF" into honeycomb-mr1 
* commit '141505a9769099ac38eacb62409a75ff891860a1':
  Fix expander list group indicator Bug: #6699FF
 2011-03-15 23:44:08 -07:00
Stephen Hines
e01675cdbe am 2d5cbc92: Merge "2X2 matrix needs 4 float elements." into honeycomb-mr1 
* commit '2d5cbc92add5065a62acdd38cd254eebb1ee2f94':
  2X2 matrix needs 4 float elements.
 2011-03-15 23:43:55 -07:00
Eric Fischer
a78327da45 am acca1600: Merge "Import revised translations. DO NOT MERGE" into honeycomb-mr1 
* commit 'acca16004fd58c2b8c489f031281b58551551dc8':
  Import revised translations.  DO NOT MERGE
 2011-03-15 23:29:10 -07:00
Kenny Root
29d30cdc64 Merge "Add byte limit in addition to ratio for installs DO NOT MERGE" into honeycomb-mr1 2011-03-15 23:09:13 -07:00
Justin Ho
a1e4b659eb am 9b183a72: Merge "Updated notification asset for DND mode" into honeycomb-mr1 
* commit '9b183a72bcaab75897d1571d55ecbaf228ed4abd':
  Updated notification asset for DND mode
 2011-03-15 21:37:27 -07:00
Mike Lockwood
3359001b41 USB System UI: Fix string localization problems 
Bug: 4108271
Bug: 4089121

Change-Id: Icd83ba20dc8dc8a71c17cf759138047b53c70fda
Signed-off-by: Mike Lockwood <lockwood@android.com>
 2011-03-15 22:26:28 -04:00
Eric Laurent
3913c131c6 Merge "Improvement for issue 3489986: BT SCO volume" into honeycomb-mr1 2011-03-15 19:17:53 -07:00
Romain Guy
46fc25171a Merge "Fix performance issue in Launcher Bug #3515248" into honeycomb-mr1 2011-03-15 18:23:48 -07:00
Justin Ho
6764ecf863 Merge "Integrating new ADB USB debugging asset Bug: #6699FF" into honeycomb-mr1 2011-03-15 16:52:07 -07:00
Justin Ho
141505a976 Merge "Fix expander list group indicator Bug: #6699FF" into honeycomb-mr1 2011-03-15 16:47:27 -07:00
Justin Ho
75fe135e62 Integrating new ADB USB debugging asset 
Bug: #6699FF

Change-Id: Iab8debef59178d56ea78883a5737b7614649f948
 2011-03-15 16:40:36 -07:00
Justin Ho
a5c064e0d9 Fix expander list group indicator 
Bug: #6699FF

Change-Id: I48f2ecb2246ad5d5e11d7e9122b6ef90c764b571
 2011-03-15 16:38:58 -07:00