summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Fix NPE in setTransparentRegion.Craig Mautner2012-04-102-2/+4
| | | | | | | | Check for null Surface before using it. Fixes bug 6312835. Change-Id: Iaaac2a5d88e81b88e369815e09818c268085e4b7
* Merge "Animate from local list of WindowStateAnimators."Craig Mautner2012-04-067-134/+122
|\
| * Animate from local list of WindowStateAnimators.Craig Mautner2012-04-067-134/+122
| | | | | | | | | | | | | | | | | | | | | | | | | | Stop animate() from using the mWindows maintained by WindowManagerService. Animating WindowStateAnimators are now drawn from a HashSet maintained by WindowAnimator and containing just those WindowStateAnimators that have Surfaces. When starting a move animation do not place parameters directly into the WindowStateAnimator, instead pass them through the Handler. Also removed synchronization points from mWindows/mAppTokens add/remove.
* | Merge "INetworkStatsSession with lifecycle for caching."Jeff Sharkey2012-04-0610-68/+166
|\ \
| * | INetworkStatsSession with lifecycle for caching.Jeff Sharkey2012-04-0610-68/+166
| | | | | | | | | | | | | | | | | | | | | | | | | | | Users outside system_server now explicitly communicate their lifecycle, which keeps a strong-reference chain to any fully loaded NetworkStatsCollection histories. Bug: 6236498 Change-Id: I8e22739b6e89a626b676967a736d7117fd000778
* | | Merge "New JAVA API to support submitting encrypted buffers of input data."Andreas Huber2012-04-063-1/+186
|\ \ \
| * | | New JAVA API to support submitting encrypted buffers of input data.Andreas Huber2012-04-063-1/+186
| | | | | | | | | | | | | | | | | | | | Change-Id: Ib0df9a9427b4580946179860495b26f743558597 related-to-bug: 6275919
* | | | Merge "Fix dumb bug."Dianne Hackborn2012-04-061-1/+1
|\ \ \ \
| * | | | Fix dumb bug.Dianne Hackborn2012-04-061-1/+1
| | | | | | | | | | | | | | | | | | | | Change-Id: I5e0dfc0f03677888c22d938013299a8ec4597c69
* | | | | Merge "fix functor flag parsing, tweak process delay"Chris Craik2012-04-062-3/+3
|\ \ \ \ \ | |_|_|/ / |/| | | |
| * | | | fix functor flag parsing, tweak process delayChris Craik2012-04-052-3/+3
| | | | | | | | | | | | | | | | | | | | Change-Id: I0a679cc33f92ff6fd2e33db9ad58b52622def012
* | | | | Merge "Add Intents to notify when USB audio devices or accessories are attached"Mike Lockwood2012-04-063-0/+76
|\ \ \ \ \ | |_|/ / / |/| | | |
| * | | | Add Intents to notify when USB audio devices or accessories are attachedMike Lockwood2012-04-063-0/+76
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | In this change, only the USB audio accessory support is implemented. Change-Id: Id9b411319b07a96dc56649ca74cc5f3f89a55a7c Signed-off-by: Mike Lockwood <lockwood@google.com>
* | | | | Merge "Implement call log permission compatibility."Dianne Hackborn2012-04-062-3/+37
|\ \ \ \ \
| * | | | | Implement call log permission compatibility.Dianne Hackborn2012-04-052-3/+37
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | If a pre-JellyBean application requests read/write contacts, it will implicitly be given read/write call log. Change-Id: I029db4b09fda737bb8fba4e1611355ebdbbfd34f
* | | | | | am 34599640: am e6c56712: am 2b0267dc: docs: Deprecate the old UI guidelines ↵Scott Main2012-04-060-0/+0
|\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | about Activity/Task and Menus * commit '345996400b664b34541c68535ca2f31424dcbc56':
| * \ \ \ \ \ am e6c56712: am 2b0267dc: docs: Deprecate the old UI guidelines about ↵Scott Main2012-04-060-0/+0
| |\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Activity/Task and Menus * commit 'e6c567122b76ae4282aba706092af88be43e30af':
| | * \ \ \ \ \ am 2b0267dc: docs: Deprecate the old UI guidelines about Activity/Task and MenusScott Main2012-04-055-28/+68
| | |\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit '2b0267dc3671282a1498a92da7b38fd2ef5c018f': docs: Deprecate the old UI guidelines about Activity/Task and Menus
* | | \ \ \ \ \ \ am 00d44e5f: am 3d7c8404: am ad606697: Removed HTML artifact from index pageAlexander Lucas2012-04-060-0/+0
|\ \ \ \ \ \ \ \ \ | |/ / / / / / / / | | | | | | | | | | | | | | | | | | * commit '00d44e5fa2d067b342659b25ec203e089fc137fb':
| * | | | | | | | am 3d7c8404: am ad606697: Removed HTML artifact from index pageAlexander Lucas2012-04-060-0/+0
| |\ \ \ \ \ \ \ \ | | |/ / / / / / / | | | | | | | | | | | | | | | | | | * commit '3d7c8404da5ffa5a5e9cca2f7c16507df463e6f0':
| | * | | | | | | am ad606697: Removed HTML artifact from index pageAlexander Lucas2012-04-051-1/+0
| | |\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit 'ad6066970ae8f5979942178bcbbe90f72a348440': Removed HTML artifact from index page
* | | \ \ \ \ \ \ \ am 4317bfed: am 6ff75ab5: am 153f8fe4: docs: Android U: Displaying Bitmaps ↵Scott Main2012-04-060-0/+0
|\ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Efficiently * commit '4317bfedea82a3ebcb55c64168e781b2da92d71f':
| * | | | | | | | | am 6ff75ab5: am 153f8fe4: docs: Android U: Displaying Bitmaps EfficientlyScott Main2012-04-060-0/+0
| |\ \ \ \ \ \ \ \ \ | | |/ / / / / / / / | | | | | | | | | | | | | | | | | | | | * commit '6ff75ab5d7d0426bc3bbb73884b21a42af88d2df':
| | * | | | | | | | am 153f8fe4: docs: Android U: Displaying Bitmaps EfficientlyScott Main2012-04-047-0/+1244
| | |\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit '153f8fe420506a7e1b7a8f6b4d07db798867746e': docs: Android U: Displaying Bitmaps Efficiently
* | | \ \ \ \ \ \ \ \ am cbbdd734: am ac5ae52d: am e07b5850: Merge "Docs: Fixing typo in "Testing ↵Trevor Johns2012-04-060-0/+0
|\ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / | | | | | | | | | | / | |_|_|_|_|_|_|_|_|/ |/| | | | | | | | | | | | | | | | | | | from Other IDEs" article" into ics-mr1 * commit 'cbbdd7340cd530679a085db512f7bcc8b4761b7b':
| * | | | | | | | | am ac5ae52d: am e07b5850: Merge "Docs: Fixing typo in "Testing from Other ↵Trevor Johns2012-04-060-0/+0
| |\ \ \ \ \ \ \ \ \ | | |/ / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | IDEs" article" into ics-mr1 * commit 'ac5ae52d13ef6c603ca8971579e8a981c6749e94':
| | * | | | | | | | am e07b5850: Merge "Docs: Fixing typo in "Testing from Other IDEs" article" ↵Trevor Johns2012-04-041-1/+1
| | |\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | into ics-mr1 * commit 'e07b58506579085b62fde0771b74111b24aa27a0': Docs: Fixing typo in "Testing from Other IDEs" article
* | | \ \ \ \ \ \ \ \ Merge "Build /system/bin/asan/app_process."Stephen Hines2012-04-061-0/+26
|\ \ \ \ \ \ \ \ \ \ \ | |_|_|_|_|_|_|_|/ / / |/| | | | | | | | | |
| * | | | | | | | | | Build /system/bin/asan/app_process.Evgeniy Stepanov2012-04-041-0/+26
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Change-Id: Id3fa26a1bc0e0832bfde73dbd3acce15ecce823d
* | | | | | | | | | | am 74405274: am cde2feb2: am 2b0267dc: docs: Deprecate the old UI guidelines ↵Scott Main2012-04-060-0/+0
|\ \ \ \ \ \ \ \ \ \ \ | | |/ / / / / / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | about Activity/Task and Menus * commit '74405274a58dcb98b782b58e8a7d0129a3ea1f22':
| * | | | | | | | | | am cde2feb2: am 2b0267dc: docs: Deprecate the old UI guidelines about ↵Scott Main2012-04-065-28/+68
| |\ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Activity/Task and Menus * commit 'cde2feb2c3628b90cada1e6e552c40aabbad2baa': docs: Deprecate the old UI guidelines about Activity/Task and Menus
| | * \ \ \ \ \ \ \ \ \ am 2b0267dc: docs: Deprecate the old UI guidelines about Activity/Task and MenusScott Main2012-04-065-28/+68
| | |\ \ \ \ \ \ \ \ \ \ | | | | |_|_|_|_|/ / / / | | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit '2b0267dc3671282a1498a92da7b38fd2ef5c018f': docs: Deprecate the old UI guidelines about Activity/Task and Menus
* | | | | | | | | | | | am fccf7f55: am 5801ead9: am ad606697: Removed HTML artifact from index pageAlexander Lucas2012-04-060-0/+0
|\ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | * commit 'fccf7f55e514ae07522794982dc39f356a0c1274':
| * | | | | | | | | | | am 5801ead9: am ad606697: Removed HTML artifact from index pageAlexander Lucas2012-04-061-1/+0
| |\ \ \ \ \ \ \ \ \ \ \ | | |/ / / / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit '5801ead919d18f72a0538592c6c7d961e5767019': Removed HTML artifact from index page
| | * | | | | | | | | | am ad606697: Removed HTML artifact from index pageAlexander Lucas2012-04-061-1/+0
| | |\ \ \ \ \ \ \ \ \ \ | | | | |_|_|_|_|/ / / / | | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit 'ad6066970ae8f5979942178bcbbe90f72a348440': Removed HTML artifact from index page
* | | | | | | | | | | | am d579953f: am 5756da24: am 153f8fe4: docs: Android U: Displaying Bitmaps ↵Scott Main2012-04-060-0/+0
|\ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Efficiently * commit 'd579953f6530ab4dec87ccd60a31d99ab2006fc5':
| * | | | | | | | | | | am 5756da24: am 153f8fe4: docs: Android U: Displaying Bitmaps EfficientlyScott Main2012-04-067-0/+1244
| |\ \ \ \ \ \ \ \ \ \ \ | | |/ / / / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit '5756da24ad478383630e9aedc2b7b696bf844571': docs: Android U: Displaying Bitmaps Efficiently
| | * | | | | | | | | | am 153f8fe4: docs: Android U: Displaying Bitmaps EfficientlyScott Main2012-04-067-0/+1244
| | |\ \ \ \ \ \ \ \ \ \ | | | | |_|_|_|_|/ / / / | | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit '153f8fe420506a7e1b7a8f6b4d07db798867746e': docs: Android U: Displaying Bitmaps Efficiently
* | | | | | | | | | | | am fbff4f6b: am ae6323dd: am e07b5850: Merge "Docs: Fixing typo in "Testing ↵Trevor Johns2012-04-060-0/+0
|\ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | from Other IDEs" article" into ics-mr1 * commit 'fbff4f6b0ebf556ac825e34a587ba0f416b3db14':
| * | | | | | | | | | | am ae6323dd: am e07b5850: Merge "Docs: Fixing typo in "Testing from Other ↵Trevor Johns2012-04-061-1/+1
| |\ \ \ \ \ \ \ \ \ \ \ | | |/ / / / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | IDEs" article" into ics-mr1 * commit 'ae6323dd1ea0e06f987b8fc097378ee3bb060f47': Docs: Fixing typo in "Testing from Other IDEs" article
| | * | | | | | | | | | am e07b5850: Merge "Docs: Fixing typo in "Testing from Other IDEs" article" ↵Trevor Johns2012-04-061-1/+1
| | |\ \ \ \ \ \ \ \ \ \ | | | | |_|_|_|_|/ / / / | | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | into ics-mr1 * commit 'e07b58506579085b62fde0771b74111b24aa27a0': Docs: Fixing typo in "Testing from Other IDEs" article
* | | | | | | | | | | | am 6be4fe37: Merge branch \'ics-scoop-plus-aosp\' of ↵yoonsung.nam2012-04-060-0/+0
|\ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | ssh://android-git:29418/platform/frameworks/base into ics-scoop-plus-aosp * commit '6be4fe371a6c24916789c66bf39d73cada779079':
| * | | | | | | | | | | Merge branch 'ics-scoop-plus-aosp' of ↵yoonsung.nam2012-04-060-0/+0
| |\ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | ssh://android-git:29418/platform/frameworks/base into ics-scoop-plus-aosp
* | \ \ \ \ \ \ \ \ \ \ \ am 7b5f48f4: am 624e02d6: am f336b9fc: Merge "Updated sample app for Android ↵Fred Chung2012-04-060-0/+0
|\ \ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / / / | | | | | | | | | | | | / | |_|_|_|_|_|_|_|_|_|_|/ |/| | | | | | | | | | | | | | | | | | | | | | | Training class: Making Your App Location Aware." into ics-mr1 * commit '7b5f48f48aad69cb94af30cebdf062f7710a9125':
| * | | | | | | | | | | am 624e02d6: am f336b9fc: Merge "Updated sample app for Android Training ↵Fred Chung2012-04-041-0/+0
| |\ \ \ \ \ \ \ \ \ \ \ | | | |/ / / / / / / / / | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | class: Making Your App Location Aware." into ics-mr1 * commit '624e02d6fdff70ef72653330cb233b2bf8c87fa6': Updated sample app for Android Training class: Making Your App Location Aware.
| | * | | | | | | | | | am f336b9fc: Merge "Updated sample app for Android Training class: Making ↵Fred Chung2012-04-041-0/+0
| | |\ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Your App Location Aware." into ics-mr1 * commit 'f336b9fce8b11c70b633bd71612544eaf2b9298b': Updated sample app for Android Training class: Making Your App Location Aware.
* | | \ \ \ \ \ \ \ \ \ \ Merge changes Iac9cc917,I8eed4b0dJamie Gennis2012-04-065-13/+123
|\ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * changes: TextureView: add setSurfaceTexture method SurfaceTexture: add GL context attach & detach
| * | | | | | | | | | | | | TextureView: add setSurfaceTexture methodJamie Gennis2012-04-053-5/+75
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This change adds support for transferring control of a TextureView's SurfaceTexture between the UI framework and the application. It makes the TextureView detach the SurfaceTexture from the UI framework's GLES context before calling the surfaceTextureDestroyed callback, allowing the app to use the SurfaceTexture in its own GLES context if it so chooses. This change also adds the TextureView#setSurfaceTexture method, allowing an app have the TextureView use a SurfaceTexture that already exists rather than creating a new one. Change-Id: Iac9cc917687e4239dd1c24eae553709aa37512da
| * | | | | | | | | | | | | SurfaceTexture: add GL context attach & detachJamie Gennis2012-04-052-8/+48
| | |_|_|_|_|_|_|_|_|_|/ / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This change adds Java API support for detaching a SurfaceTexture from one GLES context and then attaching it to a different one. Change-Id: I8eed4b0d0e339c11598cb0408d9f4f2d99b3aa06
* | | | | | | | | | | | | Merge "Fix boot on sw600dp devices."Daniel Sandler2012-04-061-2/+3
|\ \ \ \ \ \ \ \ \ \ \ \ \
generated by cgit v1.1 at 2025-02-04 09:00:31 +0000