summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* am bb8d314b: am 70c9ffbc: am 11a72482: Merge "docs: add links from widget ↵Scott Main2010-08-2123-6/+86
|\ | | | | | | | | | | | | | | | | classes to tutorials" into froyo Merge commit 'bb8d314b6c5ff9b51af29daa687d66dfd996914f' * commit 'bb8d314b6c5ff9b51af29daa687d66dfd996914f': docs: add links from widget classes to tutorials
| * am 70c9ffbc: am 11a72482: Merge "docs: add links from widget classes to ↵Scott Main2010-08-1923-6/+86
| |\ | | | | | | | | | | | | | | | | | | | | | | | | tutorials" into froyo Merge commit '70c9ffbc838271f0ea27a4780eb146287de53ef6' into gingerbread-plus-aosp * commit '70c9ffbc838271f0ea27a4780eb146287de53ef6': docs: add links from widget classes to tutorials
| | * am 11a72482: Merge "docs: add links from widget classes to tutorials" into froyoScott Main2010-08-1923-6/+86
| | |\ | | | | | | | | | | | | | | | | | | | | | | | | Merge commit '11a72482a0cdc45ceaf4ca83957e682381455aee' into gingerbread * commit '11a72482a0cdc45ceaf4ca83957e682381455aee': docs: add links from widget classes to tutorials
| | | * Merge "docs: add links from widget classes to tutorials" into froyoScott Main2010-08-1923-6/+86
| | | |\
| | | | * docs: add links from widget classes to tutorialsScott Main2010-08-1923-6/+86
| | | | | | | | | | | | | | | | | | | | Change-Id: I817e885524951853182b0458df4a32dea1614243
* | | | | am bbe5fb2b: am 189de282: Merge "Fix for a Resource system bug that ↵Gilles Debunne2010-08-211-3/+1
|\ \ \ \ \ | |/ / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | displayed the wrong name for missing asset." into gingerbread Merge commit 'bbe5fb2b73172a6b42b3406354a3556bd53916e1' * commit 'bbe5fb2b73172a6b42b3406354a3556bd53916e1': Fix for a Resource system bug that displayed the wrong name for missing asset.
| * | | | am 189de282: Merge "Fix for a Resource system bug that displayed the wrong ↵Gilles Debunne2010-08-191-3/+1
| |\ \ \ \ | | |/ / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | name for missing asset." into gingerbread Merge commit '189de2820932fd5dc98b9639fdc420a57cfa2316' into gingerbread-plus-aosp * commit '189de2820932fd5dc98b9639fdc420a57cfa2316': Fix for a Resource system bug that displayed the wrong name for missing asset.
| | * | | Merge "Fix for a Resource system bug that displayed the wrong name for ↵Gilles Debunne2010-08-191-3/+1
| | |\ \ \ | | | | | | | | | | | | | | | | | | missing asset." into gingerbread
| | | * | | Fix for a Resource system bug that displayed the wrong name for missing asset.Gilles Debunne2010-08-191-3/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | I didn't reproduce the bug and cannot ensure that this will fix it. The monkey with identical parameters stops with an ANR. Bug http://b/issue?id=2931528 Change-Id: I45f156c6a694f2d67fe514e0f0bb367aa017f08e
* | | | | | am 9a5c6e4f: (-s ours) am 18ef3725: DO NOT MERGE. Fix the build.Romain Guy2010-08-210-0/+0
|\ \ \ \ \ \ | |/ / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Merge commit '9a5c6e4f56e574e7591d8d3af1c2b64053df407f' * commit '9a5c6e4f56e574e7591d8d3af1c2b64053df407f': DO NOT MERGE. Fix the build.
| * | | | | am 18ef3725: DO NOT MERGE. Fix the build.Romain Guy2010-08-191-1/+2
| |\ \ \ \ \ | | |/ / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Merge commit '18ef37258d897928c68b89535a93b99d8a817d3c' into gingerbread-plus-aosp * commit '18ef37258d897928c68b89535a93b99d8a817d3c': DO NOT MERGE. Fix the build.
| | * | | | DO NOT MERGE. Fix the build.Romain Guy2010-08-191-1/+2
| | | | | | | | | | | | | | | | | | | | | | | | Change-Id: I3322faa948af015f7d8df31b9a4c281f5311f067
* | | | | | am d88e0680: (-s ours) am 288471d8: DO NOT MERGE. Load assets in place ↵Romain Guy2010-08-210-0/+0
|\ \ \ \ \ \ | |/ / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | instead of deferring until draw. Merge commit 'd88e0680edd88e10870d5f6f303633cea839d686' * commit 'd88e0680edd88e10870d5f6f303633cea839d686': DO NOT MERGE. Load assets in place instead of deferring until draw.
| * | | | | am 288471d8: DO NOT MERGE. Load assets in place instead of deferring until draw.Romain Guy2010-08-192-17/+13
| |\ \ \ \ \ | | |/ / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Merge commit '288471d8a57e1c318742cbfc28697877436fdb87' into gingerbread-plus-aosp * commit '288471d8a57e1c318742cbfc28697877436fdb87': DO NOT MERGE. Load assets in place instead of deferring until draw.
| | * | | | DO NOT MERGE. Load assets in place instead of deferring until draw.Romain Guy2010-08-192-17/+13
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Before this change, all framework assets would be decoded at drawing time outside of zygote. This was forcing all apps to re-decode the assets and zygote to keep an in-memory copy of each asset. This behavior is now opt-in by setting the inPurgeable flag on BitmapFactory.Options. Change-Id: Ief823139163d8071b8ee1267746622faf52eb8ec
* | | | | | am 36c051c7: am a695cbc9: am 0fe27cf5: make android_id random seed depend on ↵Doug Zongker2010-08-211-9/+4
|\ \ \ \ \ \ | |/ / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | time as well as ro.serialno Merge commit '36c051c717391afe12a1fe8163960286175f2f7e' * commit '36c051c717391afe12a1fe8163960286175f2f7e': make android_id random seed depend on time as well as ro.serialno
| * | | | | am a695cbc9: am 0fe27cf5: make android_id random seed depend on time as well ↵Doug Zongker2010-08-191-9/+4
| |\ \ \ \ \ | | |/ / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | as ro.serialno Merge commit 'a695cbc94355017d02a3a6c17d866776a8eee24c' into gingerbread-plus-aosp * commit 'a695cbc94355017d02a3a6c17d866776a8eee24c': make android_id random seed depend on time as well as ro.serialno
| | * | | | am 0fe27cf5: make android_id random seed depend on time as well as ro.serialnoDoug Zongker2010-08-191-9/+4
| | |\ \ \ \ | | | | |/ / | | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | Merge commit '0fe27cf5bd1407bc7b4eabefaa91ff535582badc' into gingerbread * commit '0fe27cf5bd1407bc7b4eabefaa91ff535582badc': make android_id random seed depend on time as well as ro.serialno
| | | * | | make android_id random seed depend on time as well as ro.serialnoDoug Zongker2010-08-191-9/+4
| | | | | | | | | | | | | | | | | | | | | | | | Change-Id: I0a48aacd8da30896d91fa05b7791335e6ed751e5
* | | | | | am c8d2fa70: am cbd038fe: Merge "Make MediaWriter stop and pause return ↵James Dong2010-08-218-43/+90
|\ \ \ \ \ \ | |/ / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | errors if necessary" into gingerbread Merge commit 'c8d2fa704abebdbf0bd8aac185216dc068950217' * commit 'c8d2fa704abebdbf0bd8aac185216dc068950217': Make MediaWriter stop and pause return errors if necessary
| * | | | | am cbd038fe: Merge "Make MediaWriter stop and pause return errors if ↵James Dong2010-08-198-43/+90
| |\ \ \ \ \ | | |/ / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | necessary" into gingerbread Merge commit 'cbd038fe207f183bc7e0a610973473f7c2e9d118' into gingerbread-plus-aosp * commit 'cbd038fe207f183bc7e0a610973473f7c2e9d118': Make MediaWriter stop and pause return errors if necessary
| | * | | | Merge "Make MediaWriter stop and pause return errors if necessary" into ↵James Dong2010-08-198-43/+90
| | |\ \ \ \ | | | | | | | | | | | | | | | | | | | | | gingerbread
| | | * | | | Make MediaWriter stop and pause return errors if necessaryJames Dong2010-08-198-43/+90
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | o Make the API consistent with SF framework, which the MediaSource provides a return status for stop o Also, helps to convey errors that occurred right when a premature stop() is called, leading to a potentially mal-formed output file. Change-Id: I52a932345f38570fdf8ea04d67d73dd94ccd30ef
* | | | | | | am a90a1e55: am 545eab8a: Merge "remove unused pixel format" into gingerbreadMathias Agopian2010-08-212-2/+0
|\ \ \ \ \ \ \ | |/ / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Merge commit 'a90a1e55c60604b930eecff03fe25429205ec7df' * commit 'a90a1e55c60604b930eecff03fe25429205ec7df': remove unused pixel format
| * | | | | | am 545eab8a: Merge "remove unused pixel format" into gingerbreadMathias Agopian2010-08-192-2/+0
| |\ \ \ \ \ \ | | |/ / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Merge commit '545eab8ae80b070177cc442931eadc8cd980de26' into gingerbread-plus-aosp * commit '545eab8ae80b070177cc442931eadc8cd980de26': remove unused pixel format
| | * | | | | Merge "remove unused pixel format" into gingerbreadMathias Agopian2010-08-192-2/+0
| | |\ \ \ \ \
| | | * | | | | remove unused pixel formatMathias Agopian2010-08-192-2/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Change-Id: I55bc3cc41385743c07f7e4de06335c922f746f73
* | | | | | | | am d7d58be0: am 00144745: Merge "Make the throttling more sensitive to ↵Jeff Brown2010-08-211-1/+2
|\ \ \ \ \ \ \ \ | |/ / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | end-to-end latency." into gingerbread Merge commit 'd7d58be0b8c1be69bfb774f38bf6d1410d87c4ce' * commit 'd7d58be0b8c1be69bfb774f38bf6d1410d87c4ce': Make the throttling more sensitive to end-to-end latency.
| * | | | | | | am 00144745: Merge "Make the throttling more sensitive to end-to-end ↵Jeff Brown2010-08-191-1/+2
| |\ \ \ \ \ \ \ | | |/ / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | latency." into gingerbread Merge commit '0014474569b8bb237f00fa692ab173678bff619e' into gingerbread-plus-aosp * commit '0014474569b8bb237f00fa692ab173678bff619e': Make the throttling more sensitive to end-to-end latency.
| | * | | | | | Merge "Make the throttling more sensitive to end-to-end latency." into ↵Jeff Brown2010-08-191-1/+2
| | |\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | gingerbread
| | | * | | | | | Make the throttling more sensitive to end-to-end latency.Jeff Brown2010-08-191-1/+2
| | | |/ / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The code now takes into account the time when the event was generated. So with a 60Hz throttling rate, it ensures that a motion event will not be delayed due to throttling by any more than 1/60th of second past the time it was generated. Change-Id: Iaea1d4f76e79036b4a18873485230731c3cd63c3
* | | | | | | | am b3aaf3ba: am bccfcd95: Merge "fix [2931718] glDrawArrays skips a triangle ↵Mathias Agopian2010-08-211-2/+2
|\ \ \ \ \ \ \ \ | |/ / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | when more than 70 vertices are used." into gingerbread Merge commit 'b3aaf3baa7fd811af19835bbc8837a88984c160a' * commit 'b3aaf3baa7fd811af19835bbc8837a88984c160a': fix [2931718] glDrawArrays skips a triangle when more than 70 vertices are used.
| * | | | | | | am bccfcd95: Merge "fix [2931718] glDrawArrays skips a triangle when more ↵Mathias Agopian2010-08-191-2/+2
| |\ \ \ \ \ \ \ | | |/ / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | than 70 vertices are used." into gingerbread Merge commit 'bccfcd95d3cc4029c1ed8514d31436a857283873' into gingerbread-plus-aosp * commit 'bccfcd95d3cc4029c1ed8514d31436a857283873': fix [2931718] glDrawArrays skips a triangle when more than 70 vertices are used.
| | * | | | | | Merge "fix [2931718] glDrawArrays skips a triangle when more than 70 ↵Mathias Agopian2010-08-191-2/+2
| | |\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | vertices are used." into gingerbread
| | | * | | | | | fix [2931718] glDrawArrays skips a triangle when more than 70 vertices are used.Mathias Agopian2010-08-181-2/+2
| | | |/ / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | a typo prevented the last 2 vertices of a batch to be copied to the front of the next batch. Instead, the 2 very first vertices were used. Change-Id: I3c344784dac1cef64df2fb6f6efb2f901cc788db
* | | | | | | | am 873ebfb8: am 223e4f73: Merge "Support for MP4V-ES packetization format ↵Andreas Huber2010-08-216-0/+417
|\ \ \ \ \ \ \ \ | |/ / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | according to RFC3016." into gingerbread Merge commit '873ebfb825cb498d9ff3012d1d31b02e31a79980' * commit '873ebfb825cb498d9ff3012d1d31b02e31a79980': Support for MP4V-ES packetization format according to RFC3016.
| * | | | | | | am 223e4f73: Merge "Support for MP4V-ES packetization format according to ↵Andreas Huber2010-08-196-0/+417
| |\ \ \ \ \ \ \ | | |/ / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | RFC3016." into gingerbread Merge commit '223e4f732a325e456ca6151f132f1d4c3c625631' into gingerbread-plus-aosp * commit '223e4f732a325e456ca6151f132f1d4c3c625631': Support for MP4V-ES packetization format according to RFC3016.
| | * | | | | | Merge "Support for MP4V-ES packetization format according to RFC3016." into ↵Andreas Huber2010-08-196-0/+417
| | |\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | gingerbread
| | | * | | | | | Support for MP4V-ES packetization format according to RFC3016.Andreas Huber2010-08-196-0/+417
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Change-Id: I5e182936c52f9eb80cdcf6132ead03705ee32d61
* | | | | | | | | am 6694c71d: (-s ours) am eba12749: Merge "Adding getSupportedPreviewSizes ↵Wu-cheng Li2010-08-210-0/+0
|\ \ \ \ \ \ \ \ \ | |/ / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | to CameraParameters.DO NOT MERGE" into gingerbread Merge commit '6694c71dd8507370262998ec1da8ff5e0ffcdf49' * commit '6694c71dd8507370262998ec1da8ff5e0ffcdf49': Adding getSupportedPreviewSizes to CameraParameters.DO NOT MERGE
| * | | | | | | | am eba12749: Merge "Adding getSupportedPreviewSizes to CameraParameters.DO ↵Wu-cheng Li2010-08-192-25/+37
| |\ \ \ \ \ \ \ \ | | |/ / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | NOT MERGE" into gingerbread Merge commit 'eba1274978911ea188eead128645299669d02f60' into gingerbread-plus-aosp * commit 'eba1274978911ea188eead128645299669d02f60': Adding getSupportedPreviewSizes to CameraParameters.DO NOT MERGE
| | * | | | | | | Merge "Adding getSupportedPreviewSizes to CameraParameters.DO NOT MERGE" ↵Wu-cheng Li2010-08-192-25/+37
| | |\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | into gingerbread
| | | * | | | | | | Adding getSupportedPreviewSizes to CameraParameters.DO NOT MERGENipun Kwatra2010-08-192-25/+37
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Moved functionality to parse string of sizes from getSupportedPictureSizes to parseSizesList. Added getSupportedPreviewSizes which returns a list of supported preview sizes. Change-Id: I41d4f62f9f1641e9e9258aa2ebaeda13ba846c02
* | | | | | | | | | am 9ba1ed6a: (-s ours) am ccb91596: Merge "Adding getSupportedPictureSizes ↵Wu-cheng Li2010-08-210-0/+0
|\ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | to CameraParameters.DO NOT MERGE" into gingerbread Merge commit '9ba1ed6a8fe9a79d147d50abb03f5e22d27766b9' * commit '9ba1ed6a8fe9a79d147d50abb03f5e22d27766b9': Adding getSupportedPictureSizes to CameraParameters.DO NOT MERGE
| * | | | | | | | | am ccb91596: Merge "Adding getSupportedPictureSizes to CameraParameters.DO ↵Wu-cheng Li2010-08-192-2/+47
| |\ \ \ \ \ \ \ \ \ | | |/ / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | NOT MERGE" into gingerbread Merge commit 'ccb915963e70c9b4e8fc47b5af97ab37b979195a' into gingerbread-plus-aosp * commit 'ccb915963e70c9b4e8fc47b5af97ab37b979195a': Adding getSupportedPictureSizes to CameraParameters.DO NOT MERGE
| | * | | | | | | | Merge "Adding getSupportedPictureSizes to CameraParameters.DO NOT MERGE" ↵Wu-cheng Li2010-08-192-2/+47
| | |\ \ \ \ \ \ \ \ | | | |/ / / / / / / | | | | / / / / / / | | | |/ / / / / / | | |/| | | | | | into gingerbread
| | | * | | | | | Adding getSupportedPictureSizes to CameraParameters.DO NOT MERGENipun Kwatra2010-08-192-2/+47
| | | | |_|_|/ / | | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Also added a struct 'Size' containing a width and a height field. Modified parse_size to optionally set an end pointer pointing to the character after the found size. Change-Id: I0c95ebf1ad4684721b32165f363db7d4d15a1b19
* | | | | | | | am b29ebd39: am f0ad5484: Merge "In the absence of width/height information ↵Andreas Huber2010-08-219-67/+157
|\ \ \ \ \ \ \ \ | |/ / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | in the sdp, extract the dimensions from the avc codec specific data." into gingerbread Merge commit 'b29ebd397e25a7176bcc1c81980f17b0190ebe7f' * commit 'b29ebd397e25a7176bcc1c81980f17b0190ebe7f': In the absence of width/height information in the sdp, extract the dimensions from the avc codec specific data.
| * | | | | | | am f0ad5484: Merge "In the absence of width/height information in the sdp, ↵Andreas Huber2010-08-199-67/+157
| |\ \ \ \ \ \ \ | | |/ / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | extract the dimensions from the avc codec specific data." into gingerbread Merge commit 'f0ad54846168f07fc1fd7f18cde93deea1559f86' into gingerbread-plus-aosp * commit 'f0ad54846168f07fc1fd7f18cde93deea1559f86': In the absence of width/height information in the sdp, extract the dimensions from the avc codec specific data.
| | * | | | | | Merge "In the absence of width/height information in the sdp, extract the ↵Andreas Huber2010-08-199-67/+157
| | |\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | dimensions from the avc codec specific data." into gingerbread
generated by cgit v1.1 at 2025-11-26 20:45:14 +0000