Commit Graph

2379 Commits

Author SHA1 Message Date
Adam Powell
ec23ce5cb4 am f99e81a6: am 2a2b021a: Merge "Permit MediaRouteButton to select system routes in toggle mode." into jb-dev
* commit 'f99e81a6ff22b6b93dd057802e553f66c0a7b97b':
  Permit MediaRouteButton to select system routes in toggle mode.
2012-06-19 17:05:01 -07:00
Adam Powell
f99e81a6ff am 2a2b021a: Merge "Permit MediaRouteButton to select system routes in toggle mode." into jb-dev
* commit '2a2b021a2133b769e0b82fd6edc166ba98129680':
  Permit MediaRouteButton to select system routes in toggle mode.
2012-06-19 17:03:01 -07:00
Adam Powell
eba1b70d7a Permit MediaRouteButton to select system routes in toggle mode.
Bug 6694917

Change-Id: I82e68aee196c72f349e7638717b727ef3f23e9b5
2012-06-19 15:58:38 -07:00
Jim Miller
9ec426aba6 am 2b7df368: am cab997b2: Merge "Fix 6667238: allow market apps to support ACTION_ASSIST" into jb-dev
* commit '2b7df3686f24a5a653a6609556dd98210324f7bd':
  Fix 6667238: allow market apps to support ACTION_ASSIST
2012-06-19 15:26:54 -07:00
Jim Miller
2b7df3686f am cab997b2: Merge "Fix 6667238: allow market apps to support ACTION_ASSIST" into jb-dev
* commit 'cab997b2020ddb67158397dccadd28d91a7710d0':
  Fix 6667238: allow market apps to support ACTION_ASSIST
2012-06-19 15:24:45 -07:00
Jim Miller
45308b1b3b Fix 6667238: allow market apps to support ACTION_ASSIST
This change allows market apps and 3rd parties to supply an activity
that responds to ACTION_ASSIST (e.g. market apps).

It also adds a test app to respond to the ASSIST intent and force
the intent disambiguation dialog to appear.

Change-Id: I5a78863c6a9546d18c66275187d178f6a1c9ee17
2012-06-19 15:00:13 -07:00
Nicolas Falliere
4d2bef3f85 am 277c09f6: am 56bb344c: Merge "Added or fixed doctrings for required permissions." into jb-dev
* commit '277c09f6c16c4adfd50407e2fa4dbf61a0e06e55':
  Added or fixed doctrings for required permissions.
2012-06-18 17:45:40 -07:00
Nicolas Falliere
277c09f6c1 am 56bb344c: Merge "Added or fixed doctrings for required permissions." into jb-dev
* commit '56bb344ccfd3d261cea9987c98a17d0820279b17':
  Added or fixed doctrings for required permissions.
2012-06-18 17:42:57 -07:00
Nicolas Falliere
9530e3a22d Added or fixed doctrings for required permissions.
Bug: 6591338
Change-Id: Ia2092f9994854701b5fa1425c371817367ae07ec
2012-06-18 17:22:34 -07:00
Christopher Tate
f8fd7ef978 Merge "Fail immediately if bindService() is passed a null ServiceConnection" 2012-06-18 16:00:19 -07:00
Christopher Tate
79b3317b77 Fail immediately if bindService() is passed a null ServiceConnection
Or if unbindService() is passed one, naturally.

Change-Id: Ib7f1f0b5e12c04e3affbcc9008612801081819d5
2012-06-18 15:56:33 -07:00
Adam Powell
9471faf5dc am 8f695c52: am 706a8699: Merge "Make MediaRouter UI more robust around route count changes" into jb-dev
* commit '8f695c525f5baa623a8b951bd3a1fd2b5efd1ceb':
  Make MediaRouter UI more robust around route count changes
2012-06-18 10:49:53 -07:00
Adam Powell
7e8aac14c3 am bb20575f: am 130b4572: ActionProvider API update
* commit 'bb20575f85ada8ccdacefc53f0da7e00fdf12a16':
  ActionProvider API update
2012-06-18 10:49:41 -07:00
Adam Powell
8f695c525f am 706a8699: Merge "Make MediaRouter UI more robust around route count changes" into jb-dev
* commit '706a8699008ce416a7fbd9a4215726fdb00ee803':
  Make MediaRouter UI more robust around route count changes
2012-06-18 10:34:29 -07:00
Adam Powell
bb20575f85 am 130b4572: ActionProvider API update
* commit '130b4572d1f3df702e5b296a655d15a41f6d4c66':
  ActionProvider API update
2012-06-18 10:33:19 -07:00
Adam Powell
39d5c61725 Make MediaRouter UI more robust around route count changes
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
2012-06-16 14:49:13 -07:00
Adam Powell
130b4572d1 ActionProvider API update
* 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
2012-06-15 20:19:29 -07:00
Adam Powell
2f115bc007 am 13b5c194: am 90b9f84c: Merge "API updates for MediaRouter" into jb-dev
* commit '13b5c194e1ca2ed5ca9187e15ca0518b8bb052d2':
  API updates for MediaRouter
2012-06-14 18:30:55 -07:00
Adam Powell
13b5c194e1 am 90b9f84c: Merge "API updates for MediaRouter" into jb-dev
* commit '90b9f84c43145c51180c7253cd3a3f59862c2611':
  API updates for MediaRouter
2012-06-14 17:58:05 -07:00
Adam Powell
90b9f84c43 Merge "API updates for MediaRouter" into jb-dev 2012-06-14 17:51:27 -07:00
Jeff Brown
04ddf3c050 Allow applications to recover from IME related ANRs.
Timeout after 2.5 seconds.

Because communication with an IME occurs asynchronously
using oneway binder calls, it's possible for an input event
that was delegated to the IME to be dropped on the floor.
When this happens, the app (not the IME!) will get blamed
for the problem and will ANR forever.

Even if an event is not dropped on the floor, we should
eventually time out event dispatch to the IME if it's
being too slow.

This patch implements a timeout on all events delegated
to the IME.  When the timeout expires, the event is marked
as having not been handled by the IME and the application
gets a crack at it.  We also write a message to the log when
this occurs.

Ensure that we do not invoke the event finished callback
while holding the InputMethodManager's lock to avoid
potential deadlocks.

Fixed a minor bug where the InputMethodManager would not
remember the id of the current input method.  This caused
the log messages and dumpsys state to print "null" as the
current input method id.

Bug: 6662465
Change-Id: Ibb3ddeb087ee6998996b0b845134e16a18aa3057
2012-06-14 16:32:12 -07:00
Adam Powell
0d03c042f9 API updates for MediaRouter
* Accept a Context when fetching the names of routes and
  categories. This lets string resources resolve at time of access
  with the correct configuration. The older versions remain available
  that will use the static resources from the application. (There are
  enough cases where applications will populate this from external
  data that requiring it each time even when it was not initialized
  from a resource doesn't seem reasonable.)

* Remove the ability for apps to programmatically select non-user
  routes.

* Make MediaRouter.Callback an abstract class instead of an interface.
  This will make further extensions easier to keep compatible in the
  future.

Change-Id: If981c511dfbdfaf41ef0d1cfe4a377fc14bb5600
2012-06-14 16:16:31 -07:00
Jeff Brown
2c89d171fa am fc959a38: am 9e197141: Merge "Add new ASSIST key and map it to the global assist intent." into jb-dev
* commit 'fc959a389564f2ffef9c4ceba0b1ff119dd53933':
  Add new ASSIST key and map it to the global assist intent.
2012-06-14 11:40:10 -07:00
Jeff Brown
fc959a3895 am 9e197141: Merge "Add new ASSIST key and map it to the global assist intent." into jb-dev
* commit '9e197141f8249e36d3f19aeda332ae40dac7da05':
  Add new ASSIST key and map it to the global assist intent.
2012-06-14 11:33:31 -07:00
Jeff Brown
9e197141f8 Merge "Add new ASSIST key and map it to the global assist intent." into jb-dev 2012-06-14 11:28:52 -07:00
Daniel Sandler
185951004e am cb629f38: am 4365d066: Merge "Remove line3 in big notification unless there\'s text to show." into jb-dev
* commit 'cb629f38008ad4f48a956a8d74daa65eff351a75':
  Remove line3 in big notification unless there's text to show.
2012-06-14 10:33:30 -07:00
Adam Powell
cf815b56bf am 6c143590: am 4b4a947b: Merge "MediaRouter dialog" into jb-dev
* commit '6c14359074ff5a93695ed37083c9178a4ca2d1f1':
  MediaRouter dialog
2012-06-14 10:32:49 -07:00
Jeff Brown
de7a8ead24 Add new ASSIST key and map it to the global assist intent.
Moved some duplicate code from SearchPanelView and LockScreen
over to SearchManager to avoid creating yet another copy of it
in PhoneWindowManager.

Bug: 6594275
Change-Id: Ib4ebcd6817639d17548952ab2ce7cb876c05777c
2012-06-14 04:16:26 -07:00
Daniel Sandler
cb629f3800 am 4365d066: Merge "Remove line3 in big notification unless there\'s text to show." into jb-dev
* commit '4365d066e8beed17b61ba51c728d60a9baa499be':
  Remove line3 in big notification unless there's text to show.
2012-06-13 18:03:40 -07:00
Daniel Sandler
4365d066e8 Merge "Remove line3 in big notification unless there's text to show." into jb-dev 2012-06-13 18:00:56 -07:00
Adam Powell
6c14359074 am 4b4a947b: Merge "MediaRouter dialog" into jb-dev
* commit '4b4a947b5e4913d7f8b7df15d3a7cdf8f343471f':
  MediaRouter dialog
2012-06-13 14:05:24 -07:00
Adam Powell
70e11e50ee MediaRouter dialog
Add the dialog behavior for MediaRouteActionProvider/MediaRouteButton.

Still TODO:

* Switch audio icon based on source; speaker/bt/user

* Rig up volume slider

* Rig up item icons

* Rig up group button for groupable categories

* Make grouping work

Change-Id: I3f992516b184d5ae940ddb7bbb7f94ff58914589
2012-06-13 11:42:10 -07:00
Daniel Sandler
916ad91c38 Remove line3 in big notification unless there's text to show.
If you have no subText or summaryText in a big template, but
you *do* have a number, the overflow bar (below the big text
or inbox or whatever) would have shown; now it does not.

Bug: 6657006
Change-Id: Ib2af2712da3a98227bd8d697560893adbdc427e9
2012-06-13 12:17:07 -04:00
Daniel Sandler
eb859df3f9 am e63d952a: am 7d2e8960: Merge ""Two actions ought to be enough for anybody."" into jb-dev
* commit 'e63d952a9294c1257598edc13b3457b7a0d81e63':
  "Two actions ought to be enough for anybody."
2012-06-13 07:14:31 -07:00
Daniel Sandler
e63d952a92 am 7d2e8960: Merge ""Two actions ought to be enough for anybody."" into jb-dev
* commit '7d2e8960d0fcebf924c60dbd0f6934368ceb80e3':
  "Two actions ought to be enough for anybody."
2012-06-13 07:10:03 -07:00
Daniel Sandler
7d2e8960d0 Merge ""Two actions ought to be enough for anybody."" into jb-dev 2012-06-13 07:07:02 -07:00
Amith Yamasani
b8151ecd6e Add an icon to the user information.
Store the icon in the user folder under /data/system,
similar to how the wallpaper is stored.

Change-Id: Id8ccb55b9e2ba7b4c557505a7f69f04eca1518cf
2012-06-12 18:18:29 -07:00
Daniel Sandler
602ad1c978 "Two actions ought to be enough for anybody."
Bug: 6650170
Change-Id: I5ee6990a8e556f9ee1fbfb0989db33f75b07f4ea
2012-06-12 16:06:27 -04:00
Adam Powell
49a0b01bdc am 0d637d6f: am 579ec308: Merge "MediaRouter work" into jb-dev
* commit '0d637d6f888cdddba554174284fb96f8354a15e4':
  MediaRouter work
2012-06-12 13:01:30 -07:00
Dianne Hackborn
d4a0c49ffa am 007f2b40: am f9d80b6b: Merge "Rework media router to be per-context with global process state." into jb-dev
* commit '007f2b40f952eab8951c6b22302a59a955a20561':
  Rework media router to be per-context with global process state.
2012-06-12 13:00:47 -07:00
Adam Powell
ea99d9af2d am bee681a1: am fbce66cb: Merge "Further work on MediaRouter" into jb-dev
* commit 'bee681a1d54062dc0833cc9a45aac7b20725c1bb':
  Further work on MediaRouter
2012-06-12 13:00:33 -07:00
Adam Powell
0d637d6f88 am 579ec308: Merge "MediaRouter work" into jb-dev
* commit '579ec3086c9ce3616735bc3cf63246f052973a7f':
  MediaRouter work
2012-06-12 12:46:02 -07:00
Dianne Hackborn
007f2b40f9 am f9d80b6b: Merge "Rework media router to be per-context with global process state." into jb-dev
* commit 'f9d80b6b940540b5d7be22ae310e047fcd2472a8':
  Rework media router to be per-context with global process state.
2012-06-12 12:43:20 -07:00
Adam Powell
bee681a1d5 am fbce66cb: Merge "Further work on MediaRouter" into jb-dev
* commit 'fbce66cb259cb63b43fda654db68152b8b4a2c2f':
  Further work on MediaRouter
2012-06-12 12:42:48 -07:00
Adam Powell
b35c445f34 MediaRouter work
Fix a bug where MediaRouter would crash on creation

Add click listener for app-supplied extended settings on the route
selection dialog.

Change-Id: I2991db1720b5c574148e250526984592f4dc3c44
2012-06-12 11:26:39 -07:00
Dianne Hackborn
fdfe58126d am acfb11b7: am 2e479fef: am bb536096: Merge "Improved documentation (clarify on issue 8727)"
* commit 'acfb11b7c49cd0c3e653700f414c014fccc5aec3':
  Improved documentation (clarify on issue 8727)
2012-06-11 16:41:19 -07:00
Dianne Hackborn
23a947664f am 82b131f2: am f6e39b06: am a03696dc: Merge "ApplicationThread: Check interface before invoking scheduleLowMemory"
* commit '82b131f27418ecdd60d52638a72d01d4ad2b109f':
  ApplicationThread: Check interface before invoking scheduleLowMemory
2012-06-11 16:41:13 -07:00
Dianne Hackborn
acfb11b7c4 am 2e479fef: am bb536096: Merge "Improved documentation (clarify on issue 8727)"
* commit '2e479fefbfcb388d2aa62978307420357f322441':
  Improved documentation (clarify on issue 8727)
2012-06-11 16:36:49 -07:00
Dianne Hackborn
82b131f274 am f6e39b06: am a03696dc: Merge "ApplicationThread: Check interface before invoking scheduleLowMemory"
* commit 'f6e39b068d1d5491dc3d73d73f598790688a1c4e':
  ApplicationThread: Check interface before invoking scheduleLowMemory
2012-06-11 16:36:42 -07:00
Dianne Hackborn
2e479fefbf am bb536096: Merge "Improved documentation (clarify on issue 8727)"
* commit 'bb5360966668ca8e97c02363b0d87dc9c9ae2451':
  Improved documentation (clarify on issue 8727)
2012-06-11 16:32:26 -07:00