summaryrefslogtreecommitdiffstats
path: root/api
Commit message (Collapse)AuthorAgeFilesLines
* am 9906e784: am 17990395: Merge "Fix issue #6717667: expanded notification ↵Dianne Hackborn2012-06-252-2/+41
|\ | | | | | | | | | | | | actions don\'t work on the lock screen" into jb-dev * commit '9906e784faca2cc8388a04fdc544722ea93d51be': Fix issue #6717667: expanded notification actions don't work on the lock screen
| * am 17990395: Merge "Fix issue #6717667: expanded notification actions don\'t ↵Dianne Hackborn2012-06-252-2/+41
| |\ | | | | | | | | | | | | | | | | | | work on the lock screen" into jb-dev * commit '17990395bc62f8ce1bae4f1880899f231a8e613b': Fix issue #6717667: expanded notification actions don't work on the lock screen
| | * Fix issue #6717667: expanded notification actions don't work on the lock screenDianne Hackborn2012-06-252-2/+43
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | FLAG_ACTIVITY_CLOSE_SYSTEM_DIALOGS was a mistake. Instead, and the infrastructure for the status bar to take care of closing and hiding things itself when you press these buttons, just like it does for the main Intent of the notification. Bug: 6717667 Change-Id: I1b22186e0cedc05f46a1a3ec78053a72afaf61b1
* | | am c34188a9: resolved conflicts for merge of f8f76d52 to jb-dev-plus-aospJean-Baptiste Queru2012-06-231-0/+3
|\ \ \ | |/ / | | | | | | | | | * commit 'c34188a95405526416325604386af4f48ba20918': Add the possibility to modify the View focus rect
| * | resolved conflicts for merge of f8f76d52 to jb-dev-plus-aospJean-Baptiste Queru2012-06-231-0/+3
| |\ \ | | | | | | | | | | | | Change-Id: I83beeb45320de2c3fc3a00c2f5cd86a17ac1dc9f
| | * \ Merge "Add the possibility to modify the View focus rect"Jean-Baptiste Queru2012-06-231-0/+1
| | |\ \
| | | * | Add the possibility to modify the View focus rectTobias Dubois2012-06-051-0/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This change makes it possible for a view to supply a different rectangle than the drawing rect to be used by the FocusFinder when finding a new view to give focus to. This is useful if e.g. the total view area is larger than the interactive area of the view. The default implementation of getFocusRect() will return getDrawingRect(). The existing behaviour is only changed if getFocusRect() is overridden by a subclass of android.view.View Change-Id: I52dd95c6fa296b744e354217051dcec1bb3c8e92
* | | | | Merge "Deprecate DatabaseUtils.InsertHelper."Jeff Brown2012-06-222-3/+1
|\ \ \ \ \
| * | | | | Deprecate DatabaseUtils.InsertHelper.Jeff Brown2012-06-222-3/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This class does not offer any advantages over SQLiteStatement and just makes code more complex and error-prone. Documented that the class is not thread-safe. Removed a potential deadlock in insert() and replace() caused by the insertInternal() method being synchronized in the case where the class was being used concurrently (woe to you!). Thread A would start a transaction. Thread B would call insertInternal() and acquire the object monitor, but block because it could not obtain the db connection because thread A is holding onto it. Thread A would call insertInternal() and block because Thread B was holding the object monitor. Deadlock. Changed this code to use a transaction instead of a lock, which provides the necessary mutual exclusion guarantee without the potential for a deadlock. Even so, the class really isn't thread safe. Bug: 6625094 Change-Id: I51d9a15567a6f2bad6f25e550b48f8f6ffcab2a7
* | | | | | resolved conflicts for merge of 0a43f67e to masterChris Wren2012-06-211-0/+3
|\ \ \ \ \ \ | | |/ / / / | |/| | | | | | | | | | Change-Id: I072b756bc501c7669593eff012b120905a2fd962
| * | | | | am 790024bf: Merge "Unhide new methods on RemoteViews and Notification." ↵Daniel Sandler2012-06-211-0/+4
| |\ \ \ \ \ | | | |_|_|/ | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | into jb-dev * commit '790024bfe6dd2765dd5e552053797459aab72da1': Unhide new methods on RemoteViews and Notification.
| | * | | | Merge "Unhide new methods on RemoteViews and Notification." into jb-devDaniel Sandler2012-06-211-0/+4
| | |\ \ \ \
| | | * | | | Unhide new methods on RemoteViews and Notification.Daniel Sandler2012-06-211-0/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | | Change-Id: I0cbc270d9d7e9e728482c3b10650a32589636c9d
* | | | | | | am ed044cda: am 09829b71: Merge "Expand volume APIs for MediaRouter" into jb-devAdam Powell2012-06-201-0/+4
|\ \ \ \ \ \ \ | |/ / / / / / | | | | | | | | | | | | | | | | | | | | | * commit 'ed044cda8f6a7600923eecdec682c449f86e0429': Expand volume APIs for MediaRouter
| * | | | | | am 09829b71: Merge "Expand volume APIs for MediaRouter" into jb-devAdam Powell2012-06-201-0/+4
| |\ \ \ \ \ \ | | |/ / / / / | | | | | | | | | | | | | | | | | | | | | * commit '09829b71de3a84cb9d1bc0d8aad78dd16daadddf': Expand volume APIs for MediaRouter
| | * | | | | Expand volume APIs for MediaRouterAdam Powell2012-06-201-0/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Allow applications to set a requested volume level on RouteInfo objects. If requested for a user route, the app-supplied callback will be invoked to perform actual volume adjustment. Change-Id: I856990a0da7292492aa15e6562dbc3d055b848a0
* | | | | | | am e44440f4: am bd6b1820: Merge "Unhide new API in android.media.MediaRouter ↵Jean-Michel Trivi2012-06-201-0/+21
|\ \ \ \ \ \ \ | |/ / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | for remote playback" into jb-dev * commit 'e44440f40c6b005dce2eba1b37b3cabe97133152': Unhide new API in android.media.MediaRouter for remote playback
| * | | | | | am bd6b1820: Merge "Unhide new API in android.media.MediaRouter for remote ↵Jean-Michel Trivi2012-06-201-0/+21
| |\ \ \ \ \ \ | | |/ / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | playback" into jb-dev * commit 'bd6b1820d931ef11fc7fc5b8571a8265c1ed4994': Unhide new API in android.media.MediaRouter for remote playback
| | * | | | | Unhide new API in android.media.MediaRouter for remote playbackJean-Michel Trivi2012-06-201-0/+21
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Expose new functionality for handling remote volume in: android.media.MediaRouter.RouteInfo android.media.MediaRouter.UserRouteInfo android.media.MediaRouter.VolumeCallback Change-Id: I8fd9c92be606364599e65939f318e11c2860bab9
* | | | | | | Fix build; un-pin attribute destined for API 17 or later to preventAdam Powell2012-06-191-8/+8
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | further automerge antics. Change-Id: I547dc0abd8db09e8aefc89123e4fb7f73eea712b
* | | | | | | am da828803: am 2dde147b: Merge "Add an XML attribute for controlling which ↵Adam Powell2012-06-191-0/+1
|\ \ \ \ \ \ \ | |/ / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | route types a MediaRouteButton in a layout will alter." into jb-dev * commit 'da8288037cff76367c3088adaa174ddb27bf55c2': Add an XML attribute for controlling which route types a MediaRouteButton in a layout will alter.
| * | | | | | am 2dde147b: Merge "Add an XML attribute for controlling which route types a ↵Adam Powell2012-06-191-0/+1
| |\ \ \ \ \ \ | | |/ / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | MediaRouteButton in a layout will alter." into jb-dev * commit '2dde147b28684fc32f03ad748af8eb87d5408c7c': Add an XML attribute for controlling which route types a MediaRouteButton in a layout will alter.
| | * | | | | Add an XML attribute for controlling which route types aAdam Powell2012-06-191-0/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | MediaRouteButton in a layout will alter. Change-Id: I897a68188fa87e4c2dbc88794117a3ef87ffaab0
* | | | | | | Clean up PowerManager API.Jeff Brown2012-06-192-4/+4
| |_|_|/ / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Mostly just moved the code around and improved the docs. Fixed a minor inefficiency in WakeLock.setWorkSource() where we would tell the power manager that the work source was changed even when the old work source and new work source were both null. Fixed a bug in WakeLock.setWorkSource() where we would not notify the power manager that the work source was changed if there was no work source previously specified. Added synchronized to WakeLock.setReferenceCounted. Added a checked in WakeLock.acquireLocked() and WakeLock.release() to check whether the wake lock is actually not held / held before performing the corresponding operation. This change avoids making redundant calls into the power manager service in the case where the wake lock is not reference counted and acquire() or release() have been called multiple times. Made the PowerManager and WakeLock classes final. They are not directly instantiable by applications so this change does not break the API. Removed a little dead code (one private constructor and an unused constant). Change-Id: I4e10cf893506115938a35756136c101256dccf30
* | | | | | am 45c4a8df: am ec7c7ebf: Merge "API for finding accessibility focus in ↵Svetoslav Ganov2012-06-182-2/+0
|\ \ \ \ \ \ | |/ / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | virtual tree not needed." into jb-dev * commit '45c4a8df9487f53af37ded1f5a1ebe500e89b493': API for finding accessibility focus in virtual tree not needed.
| * | | | | am ec7c7ebf: Merge "API for finding accessibility focus in virtual tree not ↵Svetoslav Ganov2012-06-182-2/+0
| |\ \ \ \ \ | | |/ / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | needed." into jb-dev * commit 'ec7c7ebf01121d17f7a12e827bd77c024eab54e8': API for finding accessibility focus in virtual tree not needed.
| | * | | | Merge "API for finding accessibility focus in virtual tree not needed." into ↵Svetoslav Ganov2012-06-182-2/+0
| | |\ \ \ \ | | | |/ / / | | |/| | | | | | | | | jb-dev
| | | * | | API for finding accessibility focus in virtual tree not needed.Svetoslav Ganov2012-06-172-2/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 1. The function for finding where the accessibility focus in a virtual node tree presented by an AccessibilityNodeProvider is not needed API since the framework already keeps track of the accessibility focused virtual node in order to draw the focus rectangle. This API adds unnecessary complexity to developers of AccessibilityNodeProviders. bug:6675330 Change-Id: I84774686b06a995073a39e45b8ef22f2cd04b773
* | | | | | am c92aa2e7: am 1b4dc0fe: Merge "Volume control in MediaRouter dialogs" into ↵Adam Powell2012-06-181-0/+1
|\ \ \ \ \ \ | |/ / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | jb-dev * commit 'c92aa2e7c9112adafc5283921efe25574a95b7a4': Volume control in MediaRouter dialogs
| * | | | | am 1b4dc0fe: Merge "Volume control in MediaRouter dialogs" into jb-devAdam Powell2012-06-181-0/+1
| |\ \ \ \ \ | | |/ / / / | | | | | | | | | | | | | | | | | | * commit '1b4dc0fe00805f82fb4bb89a97b6b0501e117505': Volume control in MediaRouter dialogs
| | * | | | Volume control in MediaRouter dialogsAdam Powell2012-06-161-0/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | MediaRouter dialogs now intercept the volume keys for altering the current volume. The status icon indicates if the slider/buttons are currently controlling the local device volume or a remote device's volume. Group volume for user routes is handled by using the RemoteControlClient supplied by the first route in the group. Change-Id: I40a0d054847ed5acce7a4c3b669487841b4dca15
* | | | | | am 8f695c52: am 706a8699: Merge "Make MediaRouter UI more robust around ↵Adam Powell2012-06-181-0/+6
|\ \ \ \ \ \ | |/ / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | route count changes" into jb-dev * commit '8f695c525f5baa623a8b951bd3a1fd2b5efd1ceb': Make MediaRouter UI more robust around route count changes
| * | | | | am 706a8699: Merge "Make MediaRouter UI more robust around route count ↵Adam Powell2012-06-181-0/+6
| |\ \ \ \ \ | | |/ / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | changes" into jb-dev * commit '706a8699008ce416a7fbd9a4215726fdb00ee803': Make MediaRouter UI more robust around route count changes
| | * | | | Make MediaRouter UI more robust around route count changesAdam Powell2012-06-161-0/+6
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Improve the API around ActionProvider visibility overriding. Allow the application to notify whatever is hosting the ActionProvider that visibility has changed in a way that is friendly to alternate support library-style reimplementations of MenuItem. Allow MediaRouter.Callback implementations to add or remove themselves or other Callbacks during dispatch of callback events. Make MediaRouteActionProvider track the visibility of corresponding menu items more accurately. Change-Id: Ic7ddb6a87c3637904750d2661e4a9fa323b09ea0
* | | | | | am df6d3eeb: am c4637d3e: Merge "Allow restricting the scope of a ↵Makoto Onuki2012-06-182-2/+6
|\ \ \ \ \ \ | |/ / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | phone-filter search" into jb-dev * commit 'df6d3eebbaa8c0b3cb41aec44b9e212f2d4cdb1a': Allow restricting the scope of a phone-filter search
| * | | | | am c4637d3e: Merge "Allow restricting the scope of a phone-filter search" ↵Makoto Onuki2012-06-182-2/+6
| |\ \ \ \ \ | | |/ / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | into jb-dev * commit 'c4637d3efbbeb3e204691da96c357b5fea4ae2f1': Allow restricting the scope of a phone-filter search
| | * | | | Merge "Allow restricting the scope of a phone-filter search" into jb-devMakoto Onuki2012-06-162-2/+6
| | |\ \ \ \ | | | |/ / / | | |/| | |
| | | * | | Allow restricting the scope of a phone-filter searchDaniel Lehmann2012-06-152-2/+6
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This also includes a previous change to current.txt that hasn't been copied to 16.txt yet Bug:6662259 Change-Id: Iaab5c38ad56882a1270b5276ba7a399bbb8a49f3
* | | | | | am bb20575f: am 130b4572: ActionProvider API updateAdam Powell2012-06-181-0/+2
|\ \ \ \ \ \ | |/ / / / / | | | | | | | | | | | | | | | | | | * commit 'bb20575f85ada8ccdacefc53f0da7e00fdf12a16': ActionProvider API update
| * | | | | am 130b4572: ActionProvider API updateAdam Powell2012-06-181-0/+2
| |\ \ \ \ \ | | |/ / / / | | | | | | | | | | | | | | | | | | * commit '130b4572d1f3df702e5b296a655d15a41f6d4c66': ActionProvider API update
| | * | | | ActionProvider API updateAdam Powell2012-06-151-0/+2
| | |/ / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * Add ActionProvider#overridesItemVisibility and isVisible. These methods allow an ActionProvider to override the visibility of a MenuItem that it is bound to. If a MenuItem has been explicitly hidden by the application, it will not be visible. * Change MediaRouteActionProvider to not require a MediaRouter callback, to avoid extra lifecycle management headaches. Change-Id: I606fa98b3a6a3e60a953dd024274f9bf9c67acdd
* | | | | am 11832db4: am 531d5866: Merge "Accessibility focus search and setting it ↵Svetoslav Ganov2012-06-182-16/+0
|\ \ \ \ \ | |/ / / / | | | | | | | | | | | | | | | | | | | | | | | | | from hover are performed by the client." into jb-dev * commit '11832db437d04d71dec9a78382138b2dd6518e37': Accessibility focus search and setting it from hover are performed by the client.
| * | | | am 531d5866: Merge "Accessibility focus search and setting it from hover are ↵Svetoslav Ganov2012-06-182-16/+0
| |\ \ \ \ | | |/ / / | | | | | | | | | | | | | | | | | | | | | | | | | performed by the client." into jb-dev * commit '531d5866d8e2529e2ae1c6ef12202119753bec03': Accessibility focus search and setting it from hover are performed by the client.
| | * | | Merge "Accessibility focus search and setting it from hover are performed by ↵Svetoslav Ganov2012-06-152-16/+0
| | |\ \ \ | | | | | | | | | | | | | | | | | | the client." into jb-dev
| | | * | | Accessibility focus search and setting it from hover are performed by the ↵Svetoslav Ganov2012-06-152-16/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | client. 1. Currently we are providing accessibility focus search algorithm in the framework and we are also setting accessibility focus from hover. It appears that implementing a focus search strategy that works for all accessibility services is non trivial task if feasible. Based on feedback from the developers of two such services at Google - TalkBack and BarilleBack - the built in focus search does not quite match what they need and they would like to implement a custom strategy. Hence, having APIs for accessibility focus search in the framework does not make. Therefore, we are hiding this APIs and later will take out the focus search logic and allow the accessibility service to implement search. Also putting accessibility focus from hover is tightly integrated with the focus search since the set of views that get accessibility focus from hover should be the same as the set of views returned by the focus search routine. Therefore, we are letting the accessibility service decide where to put accessibility focus when it gets an accessibility hover event. bug:6675330 Change-Id: Ie152230990a6602f3fd1d82de2177d0b1444d654
* | | | | | am 15635728: am 27db797e: Merge "Update MediaRouteChooserDialog grouping UI" ↵Adam Powell2012-06-151-2/+2
|\ \ \ \ \ \ | |/ / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | into jb-dev * commit '15635728a4ff00da6cc3d6468c02d39e5631f124': Update MediaRouteChooserDialog grouping UI
| * | | | | am 27db797e: Merge "Update MediaRouteChooserDialog grouping UI" into jb-devAdam Powell2012-06-151-2/+2
| |\ \ \ \ \ | | |/ / / / | | | | | | | | | | | | | | | | | | * commit '27db797e37ea16ea5db6eb3f6a32e0f116c1b824': Update MediaRouteChooserDialog grouping UI
| | * | | | Update MediaRouteChooserDialog grouping UIAdam Powell2012-06-151-2/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Move UserRouteInfo tag support to RouteInfo Change-Id: Ia753924f8613462d5f74736be93a8d748689eef1
* | | | | | am 13b5c194: am 90b9f84c: Merge "API updates for MediaRouter" into jb-devAdam Powell2012-06-142-4/+25
|\ \ \ \ \ \ | |/ / / / / | | | | | | | | | | | | | | | | | | * commit '13b5c194e1ca2ed5ca9187e15ca0518b8bb052d2': API updates for MediaRouter
| * | | | | am 90b9f84c: Merge "API updates for MediaRouter" into jb-devAdam Powell2012-06-142-4/+25
| |\ \ \ \ \ | | |/ / / / | | | | | | | | | | | | | | | | | | * commit '90b9f84c43145c51180c7253cd3a3f59862c2611': API updates for MediaRouter