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

47779 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Eric Fischer
0f3340cf99 Merge "Import revised translations." 2011-03-17 17:32:50 -07:00
Eric Fischer
c8c3729506 Import revised translations. 
Change-Id: I0e0b132f5f4678721fd07193605341b4b68885fe
 2011-03-17 16:51:07 -07:00
Xia Wang
38d5654a76 am 74f1b609: (-s ours) am 01a11148: (-s ours) am e12a1a09: Merge "Port wi-fi stress test into GB DO NOT MERGE" into gingerbread 
* commit '74f1b609510c942b2e56b045a6685f5a6d53ccce':
  Port wi-fi stress test into GB DO NOT MERGE
 2011-03-17 16:27:45 -07:00
Xavier Ducrohet
3d29a211ac am 68957a0d: (-s ours) am 3a90ec4e: (-s ours) am c7c8c599: Merge 67450db0 from honeycomb. Do not merge. 
* commit '68957a0d7516c82b8cb4050f15294c663bf08338':
  Merge 67450db0 from honeycomb. Do not merge.
 2011-03-17 16:27:42 -07:00
Mike Lockwood
cc4d56f9ee am f63113d1: am a5b68f39: am 5982bf66: GPS: Restore XTRA downloading at boot. 
* commit 'f63113d158b2afd98b41735ec02c8e800a73d23e':
  GPS: Restore XTRA downloading at boot.
 2011-03-17 16:27:39 -07:00
Simon Wilson
0bfe7f327c am 0620ebd7: (-s ours) am 3fa3721e: (-s ours) am 3f5995da: Merge "DO NOT MERGE Add images to ERI icon list" into gingerbread 
* commit '0620ebd7c47d79e95ed1048abd4317aa136bc0dd':
  DO NOT MERGE Add images to ERI icon list
 2011-03-17 16:27:36 -07:00
Mike Lockwood
4627a6e60a am f309453b: (-s ours) am af64e751: (-s ours) am 27d9fb57: DO NOT MERGE: Improve message for the "no app for USB accessory" dialog. 
* commit 'f309453bb85ec278f0206baef898461f5b0a8874':
  DO NOT MERGE:  Improve message for the "no app for USB accessory" dialog.
 2011-03-17 16:27:32 -07:00
Xia Wang
74f1b60951 am 01a11148: (-s ours) am e12a1a09: Merge "Port wi-fi stress test into GB DO NOT MERGE" into gingerbread 
* commit '01a111486d06c21ddb723195c177c8991d5db151':
  Port wi-fi stress test into GB DO NOT MERGE
 2011-03-17 16:25:09 -07:00
Xavier Ducrohet
68957a0d75 am 3a90ec4e: (-s ours) am c7c8c599: Merge 67450db0 from honeycomb. Do not merge. 
* commit '3a90ec4e6b4973f56dae825c967bbee69e6239cf':
  Merge 67450db0 from honeycomb. Do not merge.
 2011-03-17 16:25:07 -07:00
Mike Lockwood
f63113d158 am a5b68f39: am 5982bf66: GPS: Restore XTRA downloading at boot. 
* commit 'a5b68f39e2936a83eac0b995992724cd5de6905d':
  GPS: Restore XTRA downloading at boot.
 2011-03-17 16:25:01 -07:00
Simon Wilson
0620ebd7c4 am 3fa3721e: (-s ours) am 3f5995da: Merge "DO NOT MERGE Add images to ERI icon list" into gingerbread 
* commit '3fa3721e8f771a6edc8acdd21f567af93ddea7e1':
  DO NOT MERGE Add images to ERI icon list
 2011-03-17 16:24:58 -07:00
Mike Lockwood
f309453bb8 am af64e751: (-s ours) am 27d9fb57: DO NOT MERGE: Improve message for the "no app for USB accessory" dialog. 
* commit 'af64e751e2373790dd661be80b11a03332712e90':
  DO NOT MERGE:  Improve message for the "no app for USB accessory" dialog.
 2011-03-17 16:24:53 -07:00
Xia Wang
01a111486d am e12a1a09: Merge "Port wi-fi stress test into GB DO NOT MERGE" into gingerbread 
* commit 'e12a1a0949ceaff3e4d203ab6897501fb7bdfb98':
  Port wi-fi stress test into GB DO NOT MERGE
 2011-03-17 16:21:28 -07:00
Xavier Ducrohet
3a90ec4e6b am c7c8c599: Merge 67450db0 from honeycomb. Do not merge. 
* commit 'c7c8c599a636a105db0d2eac3b8b332532a7a40f':
  Merge 67450db0 from honeycomb. Do not merge.
 2011-03-17 16:21:20 -07:00
Mike Lockwood
a5b68f39e2 am 5982bf66: GPS: Restore XTRA downloading at boot. 
* commit '5982bf66d4fdea38105d91ff0f9d38660ac87581':
  GPS: Restore XTRA downloading at boot.
 2011-03-17 16:20:56 -07:00
Simon Wilson
3fa3721e8f am 3f5995da: Merge "DO NOT MERGE Add images to ERI icon list" into gingerbread 
* commit '3f5995da76541443b7c071bd3acad7590ba222ec':
  DO NOT MERGE Add images to ERI icon list
 2011-03-17 16:20:46 -07:00
Mike Lockwood
af64e751e2 am 27d9fb57: DO NOT MERGE: Improve message for the "no app for USB accessory" dialog. 
* commit '27d9fb57168da5b5c1385df5f0c493cf8339933f':
  DO NOT MERGE:  Improve message for the "no app for USB accessory" dialog.
 2011-03-17 16:20:32 -07:00
Eino-Ville Talvala
ce06ebfda4 Merge "Add support for timestamps into SurfaceTexture." 2011-03-17 15:52:34 -07:00
Alex Sakhartchouk
6764ba4482 Merge "Fixing a small bug in debug output Default font wasn't reset for debug output but used the last font instead." 2011-03-17 15:51:38 -07:00
Gloria Wang
038094f934 Merge "Fix for bug 4126103. mMessage in DrmInfoEvent is a reference to the message string, so the temporary message created in the plugin was going out of scope and being destructed while the message was being sent. Changed DrmInfoEvent's mMessage to be const String8 instead of const String8&" 2011-03-17 15:23:06 -07:00
Xia Wang
e12a1a0949 Merge "Port wi-fi stress test into GB DO NOT MERGE" into gingerbread 2011-03-17 15:06:40 -07:00
Gloria Wang
cfbe4369b3 Fix for bug 4126103. 
mMessage in DrmInfoEvent is a reference to the message string, so the
temporary message created in the plugin was going out of scope and
being destructed while the message was being sent. Changed DrmInfoEvent's
mMessage to be const String8 instead of const String8&

Change-Id: I174197ad24f3df997d3bc1f897658cfc53862636
 2011-03-17 15:02:34 -07:00
David Li
51c0c27005 Merge "GLES2Debugger: Make command exchange async to improve performance." 2011-03-17 14:38:37 -07:00
Teng-Hui Zhu
e92f2121a7 am 6b3c25c8: am 0318d6bf: am 73091273: Merge "Fix the aspect ratio for full screen playing" into honeycomb-mr1 
* commit '6b3c25c859ef72e7f65527c6aae68e77df580b94':
  Fix the aspect ratio for full screen playing
 2011-03-17 14:25:47 -07:00
Xavier Ducrohet
c7c8c599a6 Merge 67450db0 from honeycomb. Do not merge. 
Change-Id: I0ca140dd6d9279ff313f930739ad40fbbed4f335
LayoutLib: TypedArray.getDimensionPixelSize can actually return <0
 2011-03-17 14:24:50 -07:00
Teng-Hui Zhu
6b3c25c859 am 0318d6bf: am 73091273: Merge "Fix the aspect ratio for full screen playing" into honeycomb-mr1 
* commit '0318d6bfd3882b3f6fb82b03aca496e68c36d1f9':
  Fix the aspect ratio for full screen playing
 2011-03-17 14:23:38 -07:00
Teng-Hui Zhu
0318d6bfd3 am 73091273: Merge "Fix the aspect ratio for full screen playing" into honeycomb-mr1 
* commit '73091273bb5160567f2230e1e7fcde5b0218ad9d':
  Fix the aspect ratio for full screen playing
 2011-03-17 14:22:26 -07:00
Teng-Hui Zhu
73091273bb Merge "Fix the aspect ratio for full screen playing" into honeycomb-mr1 2011-03-17 14:20:39 -07:00
Xavier Ducrohet
f0da151e78 am 47b42991: am a0215953: am 026d6be2: Merge "LayoutLib: TypedArray.getDimensionPixelSize can actually return <0" into honeycomb-mr1 
* commit '47b42991203b7f8e337b1612d601ed120596ef71':
  LayoutLib: TypedArray.getDimensionPixelSize can actually return <0
 2011-03-17 14:20:38 -07:00
Xavier Ducrohet
47b4299120 am a0215953: am 026d6be2: Merge "LayoutLib: TypedArray.getDimensionPixelSize can actually return <0" into honeycomb-mr1 
* commit 'a0215953b0a6930b0ca3dcbdd598e1b9de2e9f02':
  LayoutLib: TypedArray.getDimensionPixelSize can actually return <0
 2011-03-17 14:18:48 -07:00
Xavier Ducrohet
a0215953b0 am 026d6be2: Merge "LayoutLib: TypedArray.getDimensionPixelSize can actually return <0" into honeycomb-mr1 
* commit '026d6be2dcc425f83d9d7ec8740068147497b305':
  LayoutLib: TypedArray.getDimensionPixelSize can actually return <0
 2011-03-17 14:15:38 -07:00
Xavier Ducrohet
026d6be2dc Merge "LayoutLib: TypedArray.getDimensionPixelSize can actually return <0" into honeycomb-mr1 2011-03-17 14:12:49 -07:00
Xavier Ducrohet
67450db03e LayoutLib: TypedArray.getDimensionPixelSize can actually return <0 
Change-Id: I17853dc242e28f0c59916cad1b2a57beed480a57
 2011-03-17 14:11:23 -07:00
Alex Sakhartchouk
20a9354e52 Fixing a small bug in debug output 
Default font wasn't reset for debug output but used the last font instead.

Change-Id: I8fd713336febb8258d364845799ade42633907ab
 2011-03-17 13:49:38 -07:00
Eric Fischer
8dc09ed5f1 am c3a785cb: (-s ours) am b05fea7d: am e6ef8d0b: Merge "Import revised translations. DO NOT MERGE" into honeycomb-mr1 
* commit 'c3a785cbc63e9947f5aec868fafe708e7a8b6731':
  Import revised translations.  DO NOT MERGE
 2011-03-17 13:39:07 -07:00
Eric Fischer
c3a785cbc6 am b05fea7d: am e6ef8d0b: Merge "Import revised translations. DO NOT MERGE" into honeycomb-mr1 
* commit 'b05fea7dc586173d5dcf7980e51966ac4ae761a0':
  Import revised translations.  DO NOT MERGE
 2011-03-17 13:36:38 -07:00
Teng-Hui Zhu
1ab0df7f5a Fix the aspect ratio for full screen playing 
bug:4116475

Change-Id: I0b04ef4a6db24a9bc5c8d0f0a987783695bc3489
 2011-03-17 13:36:33 -07:00
Eric Fischer
b05fea7dc5 am e6ef8d0b: Merge "Import revised translations. DO NOT MERGE" into honeycomb-mr1 
* commit 'e6ef8d0b75494e8d1e8f619b2a461c11fe8fb965':
  Import revised translations.  DO NOT MERGE
 2011-03-17 13:32:58 -07:00
Eric Fischer
e6ef8d0b75 Merge "Import revised translations. DO NOT MERGE" into honeycomb-mr1 2011-03-17 13:29:47 -07:00
Eric Fischer
00436f9bfb Import revised translations. DO NOT MERGE 
Change-Id: I774c6b4e13d3cb53b2364360f6f888e548110e7f
 2011-03-17 13:11:01 -07:00
Eino-Ville Talvala
c5f94d8a47 Add support for timestamps into SurfaceTexture. 
API addition: The timestamps are represented as nanoseconds from some
arbitrary time point. Like the SurfaceTexture transform matrix, the
timestamp retrieved by getTimestamp is for the last frame sent to the
GL texture using updateTexImage().

Camera HAL change: Expect vendors to set these timestamps using
native_window_set_buffers_timestamp().  For now, they are
autogenerated by SurfaceTextureClient if set_buffers_timestamp() is
never called, but such timing is likely not accurate enough to pass a
CTS test.

bug:3300707

Change-Id: Ife131a0c2a826ac27342e11b8a6c42ff49e1bea7
 2011-03-17 13:10:03 -07:00
James Dong
be3c82f25d am 782ffe91: am 9c0c5b56: am 2f1f2248: Fix missing AOSP copyright headers for a bunch of media framework files 
* commit '782ffe91da665c6b1fb9e297faa6e0dc6035f40c':
  Fix missing AOSP copyright headers for a bunch of media framework files
 2011-03-17 12:38:58 -07:00
Gloria Wang
454b2d1c34 am 2c3257b2: am 9940c8b6: am def35f7a: Merge "Fix for 4089881. - Add one more parameter in the interface of DrmEvent and its subclasses DrmInfoEvent and DrmErrorEvent - Send back DrmInfo in the response of async processDrmInfo calls" into honeycomb-mr1 
* commit '2c3257b21ddf2a3da843f11d1bb3b4fa8e912707':
  Fix for 4089881. - Add one more parameter in the interface of DrmEvent and its subclasses   DrmInfoEvent and DrmErrorEvent - Send back DrmInfo in the response of async processDrmInfo calls
 2011-03-17 12:38:40 -07:00
James Dong
782ffe91da am 9c0c5b56: am 2f1f2248: Fix missing AOSP copyright headers for a bunch of media framework files 
* commit '9c0c5b5638fd2810b68e033963026cc1830b9ade':
  Fix missing AOSP copyright headers for a bunch of media framework files
 2011-03-17 12:31:09 -07:00
Gloria Wang
2c3257b21d am 9940c8b6: am def35f7a: Merge "Fix for 4089881. - Add one more parameter in the interface of DrmEvent and its subclasses DrmInfoEvent and DrmErrorEvent - Send back DrmInfo in the response of async processDrmInfo calls" into honeycomb-mr1 
* commit '9940c8b6c8ab1711c9ee77cb9288888879b0b310':
  Fix for 4089881. - Add one more parameter in the interface of DrmEvent and its subclasses   DrmInfoEvent and DrmErrorEvent - Send back DrmInfo in the response of async processDrmInfo calls
 2011-03-17 12:30:52 -07:00
Romain Guy
08aa2cbd5e Send WebView the current transform and whether we're drawing a layer. 
Bug #3275491

These can be used by WebView to correctly apply alpha and geometric
transforms.

Change-Id: I2ecd4376d68df886dead3c9240317de33f56828f
 2011-03-17 12:04:04 -07:00
James Dong
9c0c5b5638 am 2f1f2248: Fix missing AOSP copyright headers for a bunch of media framework files 
* commit '2f1f2248c8439adbd686810e306c55f9e6a5abc3':
  Fix missing AOSP copyright headers for a bunch of media framework files
 2011-03-17 11:56:05 -07:00
James Dong
2f1f2248c8 Fix missing AOSP copyright headers for a bunch of media framework files 
bug - 4119349

Change-Id: If5924e16a5f596d5d73d9beb66eaf5ac9a6f0e50
 2011-03-17 11:10:40 -07:00
Mike Lockwood
5982bf66d4 GPS: Restore XTRA downloading at boot. 
Between Froyo and Gingerbread we disabled scheduling an XTRA data download
at boot because the Qualcomm engineers thought it should not be necessary.
However, some users noticed a GPS performance degradation after receiving
their Gingerbread update, and some reported forcing an XTRA download cleared
up the problem.  This change restores the Froyo behavior of downloading
XTRA data after boot.

Bug: 3509901

Change-Id: I5a52201a2b24ce4a5d3ddb1f86340e3d5387f603
Signed-off-by: Mike Lockwood <lockwood@android.com>
 2011-03-17 14:08:01 -04:00
Gloria Wang
9940c8b6c8 am def35f7a: Merge "Fix for 4089881. - Add one more parameter in the interface of DrmEvent and its subclasses DrmInfoEvent and DrmErrorEvent - Send back DrmInfo in the response of async processDrmInfo calls" into honeycomb-mr1 
* commit 'def35f7a47cde8bf66d4cba4570b289e0e9d625a':
  Fix for 4089881. - Add one more parameter in the interface of DrmEvent and its subclasses   DrmInfoEvent and DrmErrorEvent - Send back DrmInfo in the response of async processDrmInfo calls
 2011-03-17 10:54:00 -07:00