summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* am 801b63d3: am 51e895f0: Merge "Need to give the AppWidgetHostView the new ↵Joe Onorato2010-06-234-15/+41
|\ | | | | | | | | | | | | | | | | info about the provider, in case the initialLayout changed." into gingerbread Merge commit '801b63d3b865054b3015e2cf315ca7c9386d1212' * commit '801b63d3b865054b3015e2cf315ca7c9386d1212': Need to give the AppWidgetHostView the new info about the provider, in case the initialLayout
| * am 51e895f0: Merge "Need to give the AppWidgetHostView the new info about ↵Joe Onorato2010-06-234-15/+41
| |\ | | | | | | | | | | | | | | | | | | | | | | | | the provider, in case the initialLayout changed." into gingerbread Merge commit '51e895f055f76ad0114a18e1b754a1475a62c524' into gingerbread-plus-aosp * commit '51e895f055f76ad0114a18e1b754a1475a62c524': Need to give the AppWidgetHostView the new info about the provider, in case the initialLayout
| | * Merge "Need to give the AppWidgetHostView the new info about the provider, ↵Joe Onorato2010-06-234-15/+41
| | |\ | | | | | | | | | | | | in case the initialLayout changed." into gingerbread
| | | * Need to give the AppWidgetHostView the new info about the provider, in case ↵Joe Onorato2010-06-234-15/+41
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | the initialLayout changed. Bug: 2772728 Change-Id: I9e230fbe42d01cfc953cdafb86dd0d616d96a3ea
* | | | Merge "Add support for transformations."Romain Guy2010-06-237-80/+254
|\ \ \ \
| * | | | Add support for transformations.Romain Guy2010-06-237-80/+254
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This change adds partial support for the following transforms: - scale() - translate() - rotate() - setMatrix() - getMatrix() The transform is stored in a snapshot and saved/restored as needed. The transform is currently not applied to the clip rect and is not mapped to the vertex shader. Change-Id: Id48993453311200804149917d0c126a4d0471226
* | | | | am bc0793e4: am 03791188: Merge "Remember to initialize timestamps in the ↵Christopher Tate2010-06-231-0/+1
|\ \ \ \ \ | | |/ / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | dispatch allocator" into gingerbread Merge commit 'bc0793e4b77f1f8ec30294a4edac67dfca81f31d' * commit 'bc0793e4b77f1f8ec30294a4edac67dfca81f31d': Remember to initialize timestamps in the dispatch allocator
| * | | | am 03791188: Merge "Remember to initialize timestamps in the dispatch ↵Christopher Tate2010-06-231-0/+1
| |\ \ \ \ | | | |/ / | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | allocator" into gingerbread Merge commit '0379118827ef7e81a70e88e5910f5c7536d8b945' into gingerbread-plus-aosp * commit '0379118827ef7e81a70e88e5910f5c7536d8b945': Remember to initialize timestamps in the dispatch allocator
| | * | | Merge "Remember to initialize timestamps in the dispatch allocator" into ↵Christopher Tate2010-06-231-0/+1
| | |\ \ \ | | | |_|/ | | |/| | | | | | | gingerbread
| | | * | Remember to initialize timestamps in the dispatch allocatorChristopher Tate2010-06-231-0/+1
| | | | | | | | | | | | | | | | | | | | Change-Id: I83a2d353c34ff84a7d130e602c6dedc6a5541944
* | | | | am 2d8e2498: am 4ca092c7: Merge "Fix bug 2772728 with the suggested fix. I ↵Joe Onorato2010-06-231-0/+1
|\ \ \ \ \ | |/ / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | wasn\'t able to reproduce it though." into gingerbread Merge commit '2d8e249854d134f87423646cc96d1cd9507a67b0' * commit '2d8e249854d134f87423646cc96d1cd9507a67b0': Fix bug 2772728 with the suggested fix. I wasn't able to reproduce it though.
| * | | | am 4ca092c7: Merge "Fix bug 2772728 with the suggested fix. I wasn\'t able ↵Joe Onorato2010-06-231-0/+1
| |\ \ \ \ | | |/ / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | to reproduce it though." into gingerbread Merge commit '4ca092c7f101cbd95833a9ed8936e9e0485585ad' into gingerbread-plus-aosp * commit '4ca092c7f101cbd95833a9ed8936e9e0485585ad': Fix bug 2772728 with the suggested fix. I wasn't able to reproduce it though.
| | * | | Merge "Fix bug 2772728 with the suggested fix. I wasn't able to reproduce ↵Joe Onorato2010-06-231-0/+1
| | |\ \ \ | | | | | | | | | | | | | | | | | | it though." into gingerbread
| | | * | | Fix bug 2772728 with the suggested fix. I wasn't able to reproduce it though.Joe Onorato2010-06-161-0/+1
| | | | | | | | | | | | | | | | | | | | | | | | Change-Id: Ic3e3a7c679a74b822a3567faeb353950af3cfbca
* | | | | | am 90ade3f2: am 9afc1b3e: Merge "Fixed some meta data issues in the recorded ↵James Dong2010-06-232-31/+69
|\ \ \ \ \ \ | |/ / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | mp4 file" into gingerbread Merge commit '90ade3f25d16afe8fd64ec1fcc5fede466256719' * commit '90ade3f25d16afe8fd64ec1fcc5fede466256719': Fixed some meta data issues in the recorded mp4 file
| * | | | | am 9afc1b3e: Merge "Fixed some meta data issues in the recorded mp4 file" ↵James Dong2010-06-232-31/+69
| |\ \ \ \ \ | | |/ / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | into gingerbread Merge commit '9afc1b3ed3eb8dbfb440600495d92def88934f54' into gingerbread-plus-aosp * commit '9afc1b3ed3eb8dbfb440600495d92def88934f54': Fixed some meta data issues in the recorded mp4 file
| | * | | | Merge "Fixed some meta data issues in the recorded mp4 file" into gingerbreadJames Dong2010-06-232-31/+69
| | |\ \ \ \
| | | * | | | Fixed some meta data issues in the recorded mp4 fileJames Dong2010-06-232-31/+69
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | - Mainly correcting the location of stbl box which should be a child of minf box. This resolved the issue where the mis-muxed encoded file could not be played by QT/VLC. - Enabled the the recorded tracks by setting the flags to 0x07 by default - Allows for encoding either 32-bit or 64-bit offsets. By default encoding 32-bit offsets to reduce the metadata overhead - Fixed a edts box issue where an empty elst box was used at the end Change-Id: I570621a26714a81dc9400271aa5d3a07b483172f
* | | | | | | am 98f7aed6: am 1e4b9f39: Remove InputConsumer, replacing with InputQueue.Dianne Hackborn2010-06-239-85/+74
|\ \ \ \ \ \ \ | |/ / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Merge commit '98f7aed66b54c365f816fe990de978f61155cde1' * commit '98f7aed66b54c365f816fe990de978f61155cde1': Remove InputConsumer, replacing with InputQueue.
| * | | | | | am 1e4b9f39: Remove InputConsumer, replacing with InputQueue.Dianne Hackborn2010-06-239-87/+74
| |\ \ \ \ \ \ | | |/ / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Merge commit '1e4b9f3936d6f357e89360293e05a0e16d5fa440' into gingerbread-plus-aosp * commit '1e4b9f3936d6f357e89360293e05a0e16d5fa440': Remove InputConsumer, replacing with InputQueue.
| | * | | | | Remove InputConsumer, replacing with InputQueue.Dianne Hackborn2010-06-239-87/+74
| | | |_|/ / | | |/| | | | | | | | | | | | | | | Change-Id: Ib06907278457aaee842b123adc072840ca3602d8
* | | | | | Merge "Tweak fix for setXSSAuditorEnabled in LayoutTestController."Shimeng (Simon) Wang2010-06-233-2/+3
|\ \ \ \ \ \
| * | | | | | Tweak fix for setXSSAuditorEnabled in LayoutTestController.Elliott Slaughter2010-06-233-2/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | Change-Id: Iba9b67da8628e3880e8f6b18d2dc51337b9c58fb
* | | | | | | am c82b4e80: am 69a4817e: Immersive activity API.Daniel Sandler2010-06-236-0/+170
|\ \ \ \ \ \ \ | |/ / / / / / |/| / / / / / | |/ / / / / | | | | | | | | | | | | | | | | | | Merge commit 'c82b4e80b8211851963929b33592bbc50358525b' * commit 'c82b4e80b8211851963929b33592bbc50358525b': Immersive activity API.
| * | | | | am 69a4817e: Immersive activity API.Daniel Sandler2010-06-236-0/+170
| |\ \ \ \ \ | | |/ / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Merge commit '69a4817e3e1e368e758ff8c238deb5ee26963c04' into gingerbread-plus-aosp * commit '69a4817e3e1e368e758ff8c238deb5ee26963c04': Immersive activity API.
| | * | | | Immersive activity API.Daniel Sandler2010-06-236-0/+170
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | An Activity can declare itself to be "immersive" either by setting android:immersive="true" in AndroidManifest or by calling setImmersive(true). Immersive activities "should" not be interrupted, for example by Notifications with an associated fullScreenIntent. (In the future we may even prevent any non-system application from successfully calling startActivity() if the foreground activity is immersive.) Notifications with FLAG_HIGH_PRIORITY set will be shown to the user in some less-obtrusive way if the frontmost activity is immersive. Change-Id: I8d0c25cc4e22371c27cbf2bb6372d2c95d57b2d7
* | | | | | am e4963260: am efbe2d78: Merge "andriod.location.Criteria: Simplify new ↵Mike Lockwood2010-06-232-187/+26
|\ \ \ \ \ \ | |/ / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | location criteria APIs a bit." into gingerbread Merge commit 'e496326083450e8623268ed794176d980f99eb0c' * commit 'e496326083450e8623268ed794176d980f99eb0c': andriod.location.Criteria: Simplify new location criteria APIs a bit.
| * | | | | am efbe2d78: Merge "andriod.location.Criteria: Simplify new location ↵Mike Lockwood2010-06-232-187/+26
| |\ \ \ \ \ | | |/ / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | criteria APIs a bit." into gingerbread Merge commit 'efbe2d78ee5e26b6606c8552a5c1ac70749a5013' into gingerbread-plus-aosp * commit 'efbe2d78ee5e26b6606c8552a5c1ac70749a5013': andriod.location.Criteria: Simplify new location criteria APIs a bit.
| | * | | | Merge "andriod.location.Criteria: Simplify new location criteria APIs a ↵Mike Lockwood2010-06-232-187/+26
| | |\ \ \ \ | | | | | | | | | | | | | | | | | | | | | bit." into gingerbread
| | | * | | | andriod.location.Criteria: Simplify new location criteria APIs a bit.Mike Lockwood2010-06-232-187/+26
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Remove ACCURACY_BEST and only use ACCURACY_MEDIUM for horizontal accuracy. Remove accuracy priority support, since it be difficult to implement in some cases. Change-Id: I785a781f8d8f3bf3be6693ad71d077b6eb280c31 Signed-off-by: Mike Lockwood <lockwood@android.com>
* | | | | | | am 03e90f7e: am 58e9402b: Merge "Properly assign LOG_TAGs in OMXMaster.cpp ↵Andreas Huber2010-06-232-0/+8
|\ \ \ \ \ \ \ | |/ / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | and MediaScanner.cpp" into gingerbread Merge commit '03e90f7eeb032c981fc2952aa33f6ba1fae20d97' * commit '03e90f7eeb032c981fc2952aa33f6ba1fae20d97': Properly assign LOG_TAGs in OMXMaster.cpp and MediaScanner.cpp
| * | | | | | am 58e9402b: Merge "Properly assign LOG_TAGs in OMXMaster.cpp and ↵Andreas Huber2010-06-232-0/+8
| |\ \ \ \ \ \ | | |/ / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | MediaScanner.cpp" into gingerbread Merge commit '58e9402b12218ca498ea3b932e16819612b1ea87' into gingerbread-plus-aosp * commit '58e9402b12218ca498ea3b932e16819612b1ea87': Properly assign LOG_TAGs in OMXMaster.cpp and MediaScanner.cpp
| | * | | | | Merge "Properly assign LOG_TAGs in OMXMaster.cpp and MediaScanner.cpp" into ↵Andreas Huber2010-06-232-0/+8
| | |\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | gingerbread
| | | * | | | | Properly assign LOG_TAGs in OMXMaster.cpp and MediaScanner.cppAndreas Huber2010-06-232-0/+8
| | | | |/ / / | | | |/| | | | | | | | | | | | | | | | | | | | | | | | Change-Id: I863651619f84b2b66e9a926ce1fef8ce6a53a42d related-to-bug: 2639116
* | | | | | | am 800af390: am b64af9a2: Fix a number of timestamp mismatches in the mp3 ↵Andreas Huber2010-06-233-30/+39
|\ \ \ \ \ \ \ | |/ / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | extractor and decoder that would lead to invalid reporting of the current playback time for mono and/or non-44100 kHz mp3s. Merge commit '800af39038dcded12b66eccb8932a761e20b1976' * commit '800af39038dcded12b66eccb8932a761e20b1976': Fix a number of timestamp mismatches in the mp3 extractor and decoder that would lead to invalid reporting of the current playback time for mono and/or non-44100 kHz mp3s.
| * | | | | | am b64af9a2: Fix a number of timestamp mismatches in the mp3 extractor and ↵Andreas Huber2010-06-233-30/+39
| |\ \ \ \ \ \ | | |/ / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | decoder that would lead to invalid reporting of the current playback time for mono and/or non-44100 kHz mp3s. Merge commit 'b64af9a221c1df4853ab7c7766d5f956c61b8765' into gingerbread-plus-aosp * commit 'b64af9a221c1df4853ab7c7766d5f956c61b8765': Fix a number of timestamp mismatches in the mp3 extractor and decoder that would lead to invalid reporting of the current playback time for mono and/or non-44100 kHz mp3s.
| | * | | | | Fix a number of timestamp mismatches in the mp3 extractor and decoder that ↵Andreas Huber2010-06-233-30/+39
| | |/ / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | would lead to invalid reporting of the current playback time for mono and/or non-44100 kHz mp3s. Change-Id: I11abc05b62a958ffbc99ca997cd184a2f2199352 related-to-bug: 2667479
* | | | | | Merge "Fix 2655246 file descriptor leak when accessing thumbnails ↵Marco Nelissen2010-06-231-20/+20
|\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | http://b/2655246"
| * | | | | | Fix 2655246 file descriptor leak when accessing thumbnailsRay Chen2010-06-231-20/+20
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | http://b/2655246 Moved from kraken to master (https://android-git.corp.google.com/g/#change,51691) Change-Id: I7d0cffd745311d073415d597eb141e26fe1edcce
* | | | | | | am bc337d2f: am 73ccafb5: Merge "Fix a bug where ↵Adam Powell2010-06-232-1/+10
|\ \ \ \ \ \ \ | | |/ / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | requestDisallowInterceptTouchEvent does not get called when scrolling is resumed after stopping a fling." into gingerbread Merge commit 'bc337d2f675e8417be5534439e1b4ed1bc45a9c7' * commit 'bc337d2f675e8417be5534439e1b4ed1bc45a9c7': Fix a bug where requestDisallowInterceptTouchEvent does not get called
| * | | | | | am 73ccafb5: Merge "Fix a bug where requestDisallowInterceptTouchEvent does ↵Adam Powell2010-06-232-1/+10
| |\ \ \ \ \ \ | | | |/ / / / | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | not get called when scrolling is resumed after stopping a fling." into gingerbread Merge commit '73ccafb5b843cdcf9c8f761fc72a69b4b7942aaf' into gingerbread-plus-aosp * commit '73ccafb5b843cdcf9c8f761fc72a69b4b7942aaf': Fix a bug where requestDisallowInterceptTouchEvent does not get called
| | * | | | | Merge "Fix a bug where requestDisallowInterceptTouchEvent does not get ↵Adam Powell2010-06-232-1/+10
| | |\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | called when scrolling is resumed after stopping a fling." into gingerbread
| | | * | | | | Fix a bug where requestDisallowInterceptTouchEvent does not get calledAdam Powell2010-06-222-1/+10
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | when scrolling is resumed after stopping a fling. Change-Id: I6796c5082cb81b3116de5baf1f27fe3addb40d00
* | | | | | | | am 0c837a2e: am 9fe2c4e2: am 753e5609: Merge "docs: update backup dev guide ↵Scott Main2010-06-231-21/+92
|\ \ \ \ \ \ \ \ | |/ / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | with Android Backup Service registration info" into froyo Merge commit '0c837a2e35ed0f6354cbfb3c0e20260b817fd1e9' * commit '0c837a2e35ed0f6354cbfb3c0e20260b817fd1e9': docs: update backup dev guide with Android Backup Service registration info
| * | | | | | | am 9fe2c4e2: am 753e5609: Merge "docs: update backup dev guide with Android ↵Scott Main2010-06-231-21/+92
| |\ \ \ \ \ \ \ | | |/ / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Backup Service registration info" into froyo Merge commit '9fe2c4e2b89cbe4e22fdbcb3d5ecae1a853b133e' into gingerbread-plus-aosp * commit '9fe2c4e2b89cbe4e22fdbcb3d5ecae1a853b133e': docs: update backup dev guide with Android Backup Service registration info
| | * | | | | | am 753e5609: Merge "docs: update backup dev guide with Android Backup ↵Scott Main2010-06-231-21/+92
| | |\ \ \ \ \ \ | | | |_|_|/ / / | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Service registration info" into froyo Merge commit '753e56090ed5acc0d2173a8e9ab1a9b96528720b' into gingerbread * commit '753e56090ed5acc0d2173a8e9ab1a9b96528720b': docs: update backup dev guide with Android Backup Service registration info
| | | * | | | | Merge "docs: update backup dev guide with Android Backup Service ↵Scott Main2010-06-231-21/+92
| | | |\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | registration info" into froyo
| | | | * | | | | docs: update backup dev guide with Android Backup Service registration infoScott Main2010-06-221-21/+92
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Change-Id: I16696abbd517a5a740ff641ca0b17ffafbcf4993
* | | | | | | | | am 845f5414: am 2c2ce8e5: Merge "Added support for audio sessions in ↵Eric Laurent2010-06-2311-38/+252
|\ \ \ \ \ \ \ \ \ | |/ / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | MediaPlayer and AudioTrack." into gingerbread Merge commit '845f541454d1fa9f328c0b0bf79acf2fba363177' * commit '845f541454d1fa9f328c0b0bf79acf2fba363177': Added support for audio sessions in MediaPlayer and AudioTrack.
| * | | | | | | | am 2c2ce8e5: Merge "Added support for audio sessions in MediaPlayer and ↵Eric Laurent2010-06-2211-38/+252
| |\ \ \ \ \ \ \ \ | | |/ / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | AudioTrack." into gingerbread Merge commit '2c2ce8e53f5eb94916a5d0f40b2877cc7551870d' into gingerbread-plus-aosp * commit '2c2ce8e53f5eb94916a5d0f40b2877cc7551870d': Added support for audio sessions in MediaPlayer and AudioTrack.
generated by cgit v1.1 at 2024-09-19 19:05:40 +0000