summaryrefslogtreecommitdiffstats
path: root/api
Commit message (Collapse)AuthorAgeFilesLines
* am 48e07296: am bfb3dec2: Merge "More social integration." into ics-mr1Dianne Hackborn2011-12-011-0/+1
|\ | | | | | | | | * commit '48e07296800c49f8bc9b34cc57372593021f79a1': More social integration.
| * More social integration.Dianne Hackborn2011-12-011-0/+1
| | | | | | | | Change-Id: I9be09e08bda5db6c05f5beabc380708a11ead43b
* | am c339fe30: am be6ab576: Merge "Fix application launch shortcuts." into ics-mr1Jeff Brown2011-11-291-1/+14
|\ \ | |/ | | | | | | * commit 'c339fe302bc5083f0a110569eec06676be511088': Fix application launch shortcuts.
| * Fix application launch shortcuts.Jeff Brown2011-11-291-1/+14
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Improved quick launch bookmarks to support category-based shortcuts instead of hardcoding package and class names for all apps. Added a set of Intent categories for typical applications on the platform. Added support for some of the HID application launch usages to reduce reliance on quick launch for special purpose keys. Some keyboard vendors have hardcoded launch keys that synthesize "Search + X" type key combos. The goal is to encourage them to stop doing this by implementing more of HID. Bug: 5674723 Change-Id: I79f1147c65a208efc3f67228c9f0fa5cd050c593
* | am ea54d0dc: am 723218b4: Merge "Hide ManagedEGLContext until we are sure ↵Romain Guy2011-11-211-10/+3
|\ \ | |/ | | | | | | | | | | this is the correct API." into ics-mr1 * commit 'ea54d0dc0dfeef5560fea04667804413d522025f': Hide ManagedEGLContext until we are sure this is the correct API.
| * Hide ManagedEGLContext until we are sure this is the correct API.Romain Guy2011-11-211-10/+3
| | | | | | | | Change-Id: If54942d342ca8ea348e10231b2aed3e5d3bd701b
* | am 0272e600: am a37a78e2: Merge "GLES: add image external enums" into ics-mr1Jamie Gennis2011-11-181-0/+4
|\ \ | |/ | | | | | | * commit '0272e60060162d2c32aec02d9cd1414dbbe14782': GLES: add image external enums
| * Merge "GLES: add image external enums" into ics-mr1Jamie Gennis2011-11-171-0/+4
| |\
| | * GLES: add image external enumsJamie Gennis2011-11-151-0/+4
| | | | | | | | | | | | | | | | | | | | | | | | This change adds Java definitions for the enums of the GL_OES_EGL_image_external OpenGL ES extension. Bug: 3482193 Change-Id: Ib50326f8be9b9cc9021753855c3846ddcdc5eaa2
* | | am 60e345a9: am 9be49620: Merge "Unhide social stream permissions." into ics-mr1Dave Santoro2011-11-171-0/+2
|\ \ \ | |/ / | | | | | | | | | * commit '60e345a9a95a0f24804f729eeb5216012d1bcbac': Unhide social stream permissions.
| * | Merge "Unhide social stream permissions." into ics-mr1Dave Santoro2011-11-171-0/+2
| |\ \
| | * | Unhide social stream permissions.Dave Santoro2011-11-171-0/+2
| | | | | | | | | | | | | | | | | | | | | | | | Bug 5569021 Change-Id: I35ee70418be0e0286294fef54e194831b5fa3b2c
* | | | am 2c6afef8: am 1da3d656: Merge "Undeprecate LayoutAlgorithm" into ics-mr1John Reck2011-11-171-4/+4
|\ \ \ \ | |/ / / | | | | | | | | | | | | * commit '2c6afef8766371bf933f8675c80687802ce045e0': Undeprecate LayoutAlgorithm
| * | | Merge "Undeprecate LayoutAlgorithm" into ics-mr1John Reck2011-11-171-4/+4
| |\ \ \
| | * | | Undeprecate LayoutAlgorithmJohn Reck2011-11-161-4/+4
| | | |/ | | |/| | | | | | | | | | | | | | | | | | | | | | | | | Bug: 5533078 There is no alternative and this is still useful and used. It should not have been deprecated. Change-Id: I641026cf76ea87738909827b7c48a556d9021d11
* | | | am 9aa6bd1c: am 717a25dc: Add new ManagedEGLContext class to help apps ↵Dianne Hackborn2011-11-171-3/+10
|\ \ \ \ | |/ / / | | | | | | | | | | | | | | | | | | | | participate in memory trimming. * commit '9aa6bd1c34fe3583fe31f283a6415e84fec12567': Add new ManagedEGLContext class to help apps participate in memory trimming.
| * | | Add new ManagedEGLContext class to help apps participate in memory trimming.Dianne Hackborn2011-11-161-3/+10
| |/ / | | | | | | | | | | | | | | | | | | | | | | | | This class provides an API for an application to know when it is time to destroy its EGL context when memory is being trimmed. By having this in the framework, we can still detect whether it will be useful to destroy any EGL contexts (because we know if doing so will destroy all of them). Change-Id: I1eac8d640052778052926b875c7928008f752182
* | | am 9a176507: am b7a000a6: Merge "Unhide the key to retriever location ↵James Dong2011-11-111-0/+1
|\ \ \ | |/ / | | | | | | | | | | | | | | | information in 3gp/mp4 files" into ics-mr1 * commit '9a176507a96ceb3640a56a5449e96fc3e406a765': Unhide the key to retriever location information in 3gp/mp4 files
| * | Merge "Unhide the key to retriever location information in 3gp/mp4 files" ↵James Dong2011-11-111-0/+1
| |\ \ | | | | | | | | | | | | into ics-mr1
| | * | Unhide the key to retriever location information in 3gp/mp4 filesJames Dong2011-11-111-0/+1
| | | | | | | | | | | | | | | | | | | | Change-Id: I71c651b403955c0f6f8df096e995a5f5f4e39130 related-to-bug: 5560253
* | | | am 405fcc87: am 754c72ed: Notifiy callers when a speech synthesis error occurs.Narayan Kamath2011-11-111-1/+9
|\ \ \ \ | |/ / / | | | | | | | | | | | | * commit '405fcc87b247d91ce2b54623f351e91b740813c0': Notifiy callers when a speech synthesis error occurs.
| * | | Notifiy callers when a speech synthesis error occurs.Narayan Kamath2011-11-111-1/+9
| |/ / | | | | | | | | | | | | bug:5589877 Change-Id: Ideca8966ea1caa6789b3273e388dd1f25c1e2758
* | | am 0bbd151e: am faa81c82: Merge "Revert "Add new secure setting for ↵Tom Taylor2011-11-101-1/+0
|\ \ \ | |/ / | | | | | | | | | | | | | | | controlling Messaging notifications"" into ics-mr1 * commit '0bbd151e1dab043226725d23f0ca26f4d09ee76f': Revert "Add new secure setting for controlling Messaging notifications"
| * | Revert "Add new secure setting for controlling Messaging notifications"Tom Taylor2011-11-101-1/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This reverts commit 03da2f00aac04e6565a02cf5a9bf6bb1ec926930. Committer: Tom Taylor <tomtaylor@google.com> On branch revertsetting Changes to be committed: (use "git reset HEAD <file>..." to unstage) modified: api/current.txt modified: core/java/android/provider/Settings.java modified: core/java/android/provider/Telephony.java modified: packages/SettingsProvider/res/values/defaults.xml modified: packages/SettingsProvider/src/com/android/providers/settings/DatabaseHelper.java We've decided not to disable messaging notifications with a secure setting. Instead, all the work will be done within the messaging app itself. Change-Id: Icde6894e76da1007b6026c8ec7dc56e488453c06
* | | am 3869eac4: am 114c4d38: Merge "Introduce an API to cancel pending/running ↵satok2011-11-101-0/+1
|\ \ \ | |/ / | | | | | | | | | | | | | | | spell check tasks" into ics-mr1 * commit '3869eac42b3d6fc0ecef8f096fbb4b5ddafca6f7': Introduce an API to cancel pending/running spell check tasks
| * | Merge "Introduce an API to cancel pending/running spell check tasks" into ↵satok2011-11-091-0/+1
| |\ \ | | | | | | | | | | | | ics-mr1
| | * | Introduce an API to cancel pending/running spell check taskssatok2011-11-101-0/+1
| | |/ | | | | | | | | | | | | | | | Bug: 5554629 Change-Id: Ifd840ea13976813639a2ee259124a21d9bb56893
* | | am 698d3de6: am e7de36e6: Merge "Throw TransactionTooLargeException when ↵Jeff Brown2011-11-101-0/+5
|\ \ \ | |/ / | | | | | | | | | | | | | | | Binder transaction fails. Bug: 5578022" into ics-mr1 * commit '698d3de681bf85047675baa61f9b28961f3d6862': Throw TransactionTooLargeException when Binder transaction fails. Bug: 5578022
| * | Merge "Throw TransactionTooLargeException when Binder transaction fails. ↵Jeff Brown2011-11-091-0/+5
| |\ \ | | |/ | |/| | | | Bug: 5578022" into ics-mr1
| | * Throw TransactionTooLargeException when Binder transaction fails.Jeff Brown2011-11-081-0/+5
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Bug: 5578022 Previously, Binder transactions failed silently, which caused problems because apps would carry on assuming that the operation had succeeded. Often, the apps would crash soon due to a violated invariant, but sometimes they managed to do some damage first... Change-Id: Ia9cc98b3b761a8160e7c4e87507860b5912c0451
* | | am 7e6c75f5: am d211b488: Merge "SurfaceTexture: unhide ↵Jamie Gennis2011-11-091-0/+1
|\ \ \ | |/ / | | | | | | | | | | | | | | | setDefaultBufferSize" into ics-mr1 * commit '7e6c75f5a57b42edf22ce4e2cf144016252066c5': SurfaceTexture: unhide setDefaultBufferSize
| * | Merge "SurfaceTexture: unhide setDefaultBufferSize" into ics-mr1Jamie Gennis2011-11-081-0/+1
| |\ \
| | * | SurfaceTexture: unhide setDefaultBufferSizeJamie Gennis2011-11-041-0/+1
| | | | | | | | | | | | | | | | Change-Id: Ia4d3e1829339acaecaa7f10023945a432c581d72
* | | | am 8e2c5113: am b78ae752: Merge "Unhide social stream APIs for Contacts." ↵Dave Santoro2011-11-091-0/+58
|\ \ \ \ | |/ / / | | | | | | | | | | | | | | | | | | | | into ics-mr1 * commit '8e2c51137cdd1917d36c3a78ff6c1a42cc8ea402': Unhide social stream APIs for Contacts.
| * | | Merge "Unhide social stream APIs for Contacts." into ics-mr1Dave Santoro2011-11-081-0/+58
| |\ \ \ | | |_|/ | |/| |
| | * | Unhide social stream APIs for Contacts.Dave Santoro2011-11-071-0/+58
| | | | | | | | | | | | | | | | | | | | | | | | Bug 5569021 Change-Id: Iba6ad0fb8d1bd4eafd9fbb42c28a332679ade11c
* | | | am 3a6f9ded: am 48542eb3: Merge "Make public APIs of ACTION_UUID, ↵Matthew Xie2011-11-091-0/+4
|\ \ \ \ | |/ / / | | | | | | | | | | | | | | | | | | | | EXTRA_UUID, getUuids, and fetchUuidsWithSdp" into ics-mr1 * commit '3a6f9ded543db6cb7a2842540a2b67b0356b21ae': Make public APIs of ACTION_UUID, EXTRA_UUID, getUuids, and fetchUuidsWithSdp
| * | | Merge "Make public APIs of ACTION_UUID, EXTRA_UUID, getUuids, and ↵Matthew Xie2011-11-081-0/+4
| |\ \ \ | | | | | | | | | | | | | | | fetchUuidsWithSdp" into ics-mr1
| | * | | Make public APIs of ACTION_UUID, EXTRA_UUID, getUuids, and fetchUuidsWithSdpMatthew Xie2011-11-081-0/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Give APP a way to find out if a service is supported by a remote device bug 5487202 Change-Id: I5a2d050cf24d945e1c9875963c34177ed1ce773a
* | | | | am 068b7f02: am 75b20380: Merge "Making default widget padding public API" ↵Adam Cohen2011-11-091-0/+1
|\ \ \ \ \ | |/ / / / | | | | | | | | | | | | | | | | | | | | | | | | | into ics-mr1 * commit '068b7f02a35e969c1607f8a35c422c93ee72c8a3': Making default widget padding public API
| * | | | Merge "Making default widget padding public API" into ics-mr1Adam Cohen2011-11-081-0/+1
| |\ \ \ \ | | |/ / / | |/| | |
| | * | | Making default widget padding public APIAdam Cohen2011-11-071-0/+1
| | | | | | | | | | | | | | | | | | | | Change-Id: Ibf4f5dc1a36d84be1acc3ccdc4330276f82aa303
* | | | | am 1366c756: Merge "Add new secure setting for controlling Messaging ↵Tom Taylor2011-11-091-0/+1
|\ \ \ \ \ | |/ / / / | | | | | | | | | | | | | | | | | | | | | | | | | notifications" into ics-mr1 * commit '1366c756d28cdbb6c7c07959dfb4c93c81a9539d': Add new secure setting for controlling Messaging notifications
| * | | | Merge "Add new secure setting for controlling Messaging notifications" into ↵Tom Taylor2011-11-081-0/+1
| |\ \ \ \ | | | | | | | | | | | | | | | | | | ics-mr1
| | * | | | Add new secure setting for controlling Messaging notificationsTom Taylor2011-11-071-0/+1
| | | |/ / | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Bug 5552615 We're adding a new intent to allow 3rd party apps to disable the Messaging app's notification. We want any app to be able to query the setting of whether sms notifications are on or off, but only allow system apps, particularly the Messaging app, to change that setting. Other apps can change the setting by firing off an intent which brings up a dialog activity in the Messaging app that'll let them turn off Messaging notifications. Change-Id: I4d2721191b86010efb383a24c28d911496440657
* | | | | am 9d6a5162: Fix build break; Revert "Make public APIs of ACTION_UUID, ↵Ed Heyl2011-11-081-3/+0
|\ \ \ \ \ | |/ / / / | | | | | | | | | | | | | | | | | | | | | | | | | getUuids, and fetchUuidsWithSdp" * commit '9d6a51623fdabbe993d7b8848794607394ef7cc2': Fix build break; Revert "Make public APIs of ACTION_UUID, getUuids, and fetchUuidsWithSdp"
| * | | | Fix build break; Revert "Make public APIs of ACTION_UUID, getUuids, and ↵Ed Heyl2011-11-081-3/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | fetchUuidsWithSdp" This reverts commit ae5839dcad76625313e6736d69eeaf37af435a3f.
* | | | | am 67f1ceb6: Merge "Make public APIs of ACTION_UUID, getUuids, and ↵Matthew Xie2011-11-081-0/+3
|\ \ \ \ \ | |/ / / / | | | | | | | | | | | | | | | | | | | | | | | | | fetchUuidsWithSdp" into ics-mr1 * commit '67f1ceb616ced4ce9857ee24f43d3c9dd5b289a5': Make public APIs of ACTION_UUID, getUuids, and fetchUuidsWithSdp
| * | | | Merge "Make public APIs of ACTION_UUID, getUuids, and fetchUuidsWithSdp" ↵Matthew Xie2011-11-071-0/+3
| |\ \ \ \ | | |_|/ / | |/| | | | | | | | into ics-mr1
| | * | | Make public APIs of ACTION_UUID, getUuids, and fetchUuidsWithSdpMatthew Xie2011-10-271-0/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Give APP a way to find out if a service is supported by a remote device bug 5487202 Change-Id: Ie778b3227f29a24cdf61fa0365b82f9a45d439dc