Eric Fischer
3065eb1b72
Merge "Import revised translations."
2010-08-12 16:48:41 -07:00
Eric Fischer
3d173c3040
Import revised translations.
...
Change-Id: I0b89d1baf9ed02c492e8845f45fad1bee56e8d56
2010-08-12 16:44:07 -07:00
Andreas Huber
0e8e269d29
am 73af0a92: am 72ac1f26: Fix software avc encoder crash at EOS.
...
Merge commit '73af0a9211d0c4be663d287cefd9bf35746db1ba'
* commit '73af0a9211d0c4be663d287cefd9bf35746db1ba':
Fix software avc encoder crash at EOS.
2010-08-12 16:20:56 -07:00
Andreas Huber
73af0a9211
am 72ac1f26: Fix software avc encoder crash at EOS.
...
Merge commit '72ac1f26d73bd8e7645365d8d8374fac7a511263' into gingerbread-plus-aosp
* commit '72ac1f26d73bd8e7645365d8d8374fac7a511263':
Fix software avc encoder crash at EOS.
2010-08-12 16:18:19 -07:00
Andreas Huber
72ac1f26d7
Fix software avc encoder crash at EOS.
...
Change-Id: I738dc24556e41ce518b67babeff16cd934c2d1b1
2010-08-12 16:14:29 -07:00
Romain Guy
e0b8d3cbf7
Merge "Fix GC issue, fix local shader transformations."
2010-08-12 15:37:33 -07:00
Romain Guy
0ba681bce1
Fix GC issue, fix local shader transformations.
...
Change-Id: I208bdf89815dcd18dcadd43df932a77362918435
2010-08-12 15:37:00 -07:00
Mathias Agopian
6a3c9a96f8
am 1f432b19: am b7d1be01: Merge "Fix a couple issues with the new hwcomposer HAL" into gingerbread
...
Merge commit '1f432b19203b86a2b4da825943024c5b01eaeb60'
* commit '1f432b19203b86a2b4da825943024c5b01eaeb60':
Fix a couple issues with the new hwcomposer HAL
2010-08-12 15:13:13 -07:00
Mathias Agopian
1f432b1920
am b7d1be01: Merge "Fix a couple issues with the new hwcomposer HAL" into gingerbread
...
Merge commit 'b7d1be01ae44428b947823fc48c1c126dcaa9732' into gingerbread-plus-aosp
* commit 'b7d1be01ae44428b947823fc48c1c126dcaa9732':
Fix a couple issues with the new hwcomposer HAL
2010-08-12 15:09:30 -07:00
Adam Powell
62f2c1f5d3
Merge "Cleanup on CL 61012"
2010-08-12 15:08:29 -07:00
Mathias Agopian
b7d1be01ae
Merge "Fix a couple issues with the new hwcomposer HAL" into gingerbread
2010-08-12 15:07:29 -07:00
Mathias Agopian
f8e705dea4
Fix a couple issues with the new hwcomposer HAL
...
- we now clear the framebuffer upon request from the HAL
- the HAL list size could get out of sync with reality
- there was also an issue where sometime we could run past the list
Change-Id: Ic3a34314aed24181f2d8cc787096af83c046ef27
2010-08-12 15:03:26 -07:00
Trevor Johns
c3deee13a2
am 1ef758b8: am 404bffbe: am 4f3c5372: Merge "Fix subscribe links for Developer Forums doc." into froyo
...
Merge commit '1ef758b817ba225dbb9005b6def7d8d47ccdfe15'
* commit '1ef758b817ba225dbb9005b6def7d8d47ccdfe15':
Fix subscribe links for Developer Forums doc.
2010-08-12 14:36:35 -07:00
Romain Guy
6675f26c56
Merge "Better support for rotation and perspective matrices."
2010-08-12 14:35:24 -07:00
Romain Guy
af28b51496
Better support for rotation and perspective matrices.
...
Change-Id: I56b5ae3321735ba5ee42aafc9bc0eb399b9e75b5
2010-08-12 14:34:44 -07:00
Trevor Johns
1ef758b817
am 404bffbe: am 4f3c5372: Merge "Fix subscribe links for Developer Forums doc." into froyo
...
Merge commit '404bffbeabbfa8c3f95cd92856d015a4d36e8a60' into gingerbread-plus-aosp
* commit '404bffbeabbfa8c3f95cd92856d015a4d36e8a60':
Fix subscribe links for Developer Forums doc.
2010-08-12 14:33:33 -07:00
Trevor Johns
404bffbeab
am 4f3c5372: Merge "Fix subscribe links for Developer Forums doc." into froyo
...
Merge commit '4f3c5372a56ac47dac9c22c7f7ce97152128c795' into gingerbread
* commit '4f3c5372a56ac47dac9c22c7f7ce97152128c795':
Fix subscribe links for Developer Forums doc.
2010-08-12 14:30:11 -07:00
Trevor Johns
4f3c5372a5
Merge "Fix subscribe links for Developer Forums doc." into froyo
2010-08-12 14:27:33 -07:00
Ben Dodson
ff9ca9c2c5
Merge "Canonical representation of floating point constants"
2010-08-12 14:10:20 -07:00
Wu-cheng Li
fd83b2f92e
am 77a473fb: am ccaa0028: Merge "Improve camera documentation." into gingerbread
...
Merge commit '77a473fbcea0214832255af91e0a65d853757aae'
* commit '77a473fbcea0214832255af91e0a65d853757aae':
Improve camera documentation.
2010-08-12 14:07:59 -07:00
Wu-cheng Li
77a473fbce
am ccaa0028: Merge "Improve camera documentation." into gingerbread
...
Merge commit 'ccaa002848e9ef1ff232eee5babc9273599924af' into gingerbread-plus-aosp
* commit 'ccaa002848e9ef1ff232eee5babc9273599924af':
Improve camera documentation.
2010-08-12 14:05:56 -07:00
Wu-cheng Li
ccaa002848
Merge "Improve camera documentation." into gingerbread
2010-08-12 14:04:07 -07:00
Wu-cheng Li
699fe93979
Improve camera documentation.
...
Change-Id: I3c9e5e6de5ce64b8d7d892483930238fa9cc247c
2010-08-12 14:00:14 -07:00
James Dong
465206940a
am b408f549: am d790c648: Add lost preview surface detection in the JNI layer Throws an IOException if this happens rather than crashes
...
Merge commit 'b408f5490b8591a2799d6b1db91e29e4b203d2bf'
* commit 'b408f5490b8591a2799d6b1db91e29e4b203d2bf':
Add lost preview surface detection in the JNI layer
2010-08-12 13:30:57 -07:00
Andreas Huber
08c96ec7f5
am 3bf8c342: am ae3a1f45: Merge "Fix the h.263 assembler to properly subset a buffer\'s range if it already has a range applied." into gingerbread
...
Merge commit '3bf8c3427f4c728bb88e5e266b85c96e3e727203'
* commit '3bf8c3427f4c728bb88e5e266b85c96e3e727203':
Fix the h.263 assembler to properly subset a buffer's range if it already has a range applied.
2010-08-12 13:28:39 -07:00
Andreas Huber
53fb14ff8e
am 53895c6a: am 66aa0f3d: Merge "APacketSource is too verbose." into gingerbread
...
Merge commit '53895c6a0e8ecb4e835aab7eca7480779c224356'
* commit '53895c6a0e8ecb4e835aab7eca7480779c224356':
APacketSource is too verbose.
2010-08-12 13:28:34 -07:00
James Dong
9e9cd8865b
am 8473db02: am 708ec39c: Don\'t send late frames to software encoders for encoding
...
Merge commit '8473db025423632d1145d895fe74af0e976efac4'
* commit '8473db025423632d1145d895fe74af0e976efac4':
Don't send late frames to software encoders for encoding
2010-08-12 13:28:23 -07:00
James Dong
b408f5490b
am d790c648: Add lost preview surface detection in the JNI layer Throws an IOException if this happens rather than crashes
...
Merge commit 'd790c6485a388a3e8045dbd18b903b20a7dcf0d9' into gingerbread-plus-aosp
* commit 'd790c6485a388a3e8045dbd18b903b20a7dcf0d9':
Add lost preview surface detection in the JNI layer
2010-08-12 13:16:56 -07:00
Andreas Huber
3bf8c3427f
am ae3a1f45: Merge "Fix the h.263 assembler to properly subset a buffer\'s range if it already has a range applied." into gingerbread
...
Merge commit 'ae3a1f45951aeb716e1f6b9a99a09838eb55dab4' into gingerbread-plus-aosp
* commit 'ae3a1f45951aeb716e1f6b9a99a09838eb55dab4':
Fix the h.263 assembler to properly subset a buffer's range if it already has a range applied.
2010-08-12 13:14:37 -07:00
Andreas Huber
53895c6a0e
am 66aa0f3d: Merge "APacketSource is too verbose." into gingerbread
...
Merge commit '66aa0f3d950f7f842327b47592baa920e855925c' into gingerbread-plus-aosp
* commit '66aa0f3d950f7f842327b47592baa920e855925c':
APacketSource is too verbose.
2010-08-12 13:14:33 -07:00
James Dong
8473db0254
am 708ec39c: Don\'t send late frames to software encoders for encoding
...
Merge commit '708ec39c21568e0c2aa3d20c681f0e14ee6134ad' into gingerbread-plus-aosp
* commit '708ec39c21568e0c2aa3d20c681f0e14ee6134ad':
Don't send late frames to software encoders for encoding
2010-08-12 13:14:19 -07:00
Jason Sams
4199175ff3
Merge "Fix field packer bug for U32 data. Fix initial refcounts in allocations. Support null references in allocations."
2010-08-12 12:49:17 -07:00
Jason Sams
ee73498ddf
Fix field packer bug for U32 data.
...
Fix initial refcounts in allocations.
Support null references in allocations.
Change-Id: Ifba6406ba750e69737bd77fa7df5d7fb8e27a5b4
2010-08-12 12:47:04 -07:00
James Dong
d790c6485a
Add lost preview surface detection in the JNI layer
...
Throws an IOException if this happens rather than crashes
Change-Id: I32bb4c889ae596f992a0d05283c9130a99b2d0d5
2010-08-12 11:59:56 -07:00
Ben Dodson
144be61d41
Canonical representation of floating point constants
...
Change-Id: I3c26d412bea82e2bc07b40ccdd3cc291c68c554c
2010-08-12 11:52:50 -07:00
Leon Scroggins III
6f99270cbe
Hide the soft keyboard even if WebTextView is not in use.
...
Sometimes clearTextEntry is called when mWebTextView is not
being used. In those cases, we still want to hide the soft
keyboard, since the user is no longer attempting to type.
Bug: 2835685
Change-Id: I4e8d4bc60b23028e2840d6205caf13699bce6031
2010-08-12 14:45:38 -04:00
Andreas Huber
ae3a1f4595
Merge "Fix the h.263 assembler to properly subset a buffer's range if it already has a range applied." into gingerbread
2010-08-12 11:02:17 -07:00
Andreas Huber
66aa0f3d95
Merge "APacketSource is too verbose." into gingerbread
2010-08-12 11:02:06 -07:00
Andreas Huber
00237b79a0
Fix the h.263 assembler to properly subset a buffer's range if it already has a range applied.
...
Change-Id: I7cc468a3095537347d86803579001458b62fcadb
2010-08-12 10:58:24 -07:00
Adam Powell
b047208b3b
Cleanup on CL 61012
...
Change-Id: I394909c65a4978be26db063c9f69f1098ab028b3
2010-08-12 10:44:33 -07:00
James Dong
708ec39c21
Don't send late frames to software encoders for encoding
...
o Document on what frames will be rejected and what frames will be accepted
Change-Id: I5a5d489ad3d2b50dbb40a0f6e01529312ce81c54
2010-08-12 10:40:58 -07:00
John Huang
81a81f02d6
am edfe20c4: am c636b846: Merge "Enhance WspTypeDecoder to decode Content Type Parameters"
...
Merge commit 'edfe20c4bd04716420a47516959d7c0e3e0064f6'
* commit 'edfe20c4bd04716420a47516959d7c0e3e0064f6':
Enhance WspTypeDecoder to decode Content Type Parameters
2010-08-12 10:32:39 -07:00
John Huang
edfe20c4bd
am c636b846: Merge "Enhance WspTypeDecoder to decode Content Type Parameters"
...
Merge commit 'c636b846160482fbebd9a3792d52b9ff864228f2' into gingerbread-plus-aosp
* commit 'c636b846160482fbebd9a3792d52b9ff864228f2':
Enhance WspTypeDecoder to decode Content Type Parameters
2010-08-12 10:26:58 -07:00
James Dong
e63cccf006
am 8aa244ea: am 45cb3cfa: Merge "Handle large audio lost" into gingerbread
...
Merge commit '8aa244eab7ba834439cc919fd1f83d1e4ef49aff'
* commit '8aa244eab7ba834439cc919fd1f83d1e4ef49aff':
Handle large audio lost
2010-08-12 10:22:58 -07:00
James Dong
387c9ff704
am f4e26da1: am b6541f0a: Merge "Fix a crash due to unnecessary check on the codec config data for H263 video track" into gingerbread
...
Merge commit 'f4e26da1af90145564f6065d62cf8efcef0c6f04'
* commit 'f4e26da1af90145564f6065d62cf8efcef0c6f04':
Fix a crash due to unnecessary check on the codec config data for H263 video track
2010-08-12 10:22:48 -07:00
Alex Sakhartchouk
0de9444aa6
Preparing renderscript java code for use with phanton references.
...
Changing rs_quaternion to be float4
Change-Id: Ibf49f412be8979eaa04cb252b407467eacd9dbf0
2010-08-12 10:16:55 -07:00
James Dong
8aa244eab7
am 45cb3cfa: Merge "Handle large audio lost" into gingerbread
...
Merge commit '45cb3cfacf3b07ae3c5f15eba9bbbcd060cee261' into gingerbread-plus-aosp
* commit '45cb3cfacf3b07ae3c5f15eba9bbbcd060cee261':
Handle large audio lost
2010-08-12 10:12:28 -07:00
James Dong
f4e26da1af
am b6541f0a: Merge "Fix a crash due to unnecessary check on the codec config data for H263 video track" into gingerbread
...
Merge commit 'b6541f0af89b1fe85cb53e5dac461587eb040fb0' into gingerbread-plus-aosp
* commit 'b6541f0af89b1fe85cb53e5dac461587eb040fb0':
Fix a crash due to unnecessary check on the codec config data for H263 video track
2010-08-12 10:12:21 -07:00
James Dong
45cb3cfacf
Merge "Handle large audio lost" into gingerbread
2010-08-12 10:07:51 -07:00
James Dong
b6541f0af8
Merge "Fix a crash due to unnecessary check on the codec config data for H263 video track" into gingerbread
2010-08-12 10:07:38 -07:00