Commit Graph

2329 Commits

Author SHA1 Message Date
Chris Wren
790474ba3a am f11e0e71: Merge "Add missing docs to notification style rebuilder functions." into jb-dev
* commit 'f11e0e7176489f5213acaa7e36c677882854cb8d':
  Add missing docs to notification style rebuilder functions.
2012-08-01 13:04:02 -07:00
Chris Wren
0bd664dab4 Add missing docs to notification style rebuilder functions.
Bug: 6914726
Change-Id: I13efae036610523ec6f83696d3337054e79856aa
2012-08-01 15:06:56 -04:00
Nick Pelly
5dcbe638ee am 1af5ac1b: Merge "DO NOT MERGE. Add package-name-prefix blacklist for location updates." into jb-dev
* commit '1af5ac1b6801c4da2ef689449fd1fd2eba1ff48e':
  DO NOT MERGE. Add package-name-prefix blacklist for location updates.
2012-07-31 09:20:25 -07:00
Nick Pelly
48c5eb018b DO NOT MERGE. Add package-name-prefix blacklist for location updates.
The Settings.Secure value locationPackagePrefixBlacklist and
locationPackagePrefixWhitelist contains comma seperated package-name
prefixes.

Location & geo-fence updates are silently dropped if the receiving
package name has a prefix on the blacklist. Status updates are
not affected. All other API's work as before.

A content observer is used so run-time updates to the blacklist
apply immediately. There is both a blacklist and a whitelist.
The blacklist applies first, and then exemptions are allowed
from the whitelist. In other words, if your package name prefix
matches both the black AND white list, then it is allowed.

Change-Id: I4ea2ad56fa6bd75d32151bc250ac25c26a5777c4
2012-07-30 13:17:30 -07:00
Scott Main
7c00f81606 am 2f5b61a7: Merge "docs: fix a bunch of links from javadocs to api guides and add some attributes to Spinner and Switch" into jb-dev
* commit '2f5b61a750e36169e37788a645f422cc8a8f7091':
  docs: fix a bunch of links from javadocs to api guides and add some attributes to Spinner and Switch
2012-07-25 10:51:49 -07:00
Scott Main
4c359b76f9 docs: fix a bunch of links from javadocs to api guides
and add some attributes to Spinner and Switch

Change-Id: If015ad000c1a36e19904c132e98ebff1ceaf718b
2012-07-24 17:50:48 -07:00
Adam Powell
b0f356579e am 1ab2edbc: Merge "Fix bug in parsing attributes for MediaRouteButton" into jb-dev
* commit '1ab2edbcff94d53856a87010e35ffa50ce4c0502':
  Fix bug in parsing attributes for MediaRouteButton
2012-07-09 14:15:56 -07:00
Adam Powell
1ab2edbcff Merge "Fix bug in parsing attributes for MediaRouteButton" into jb-dev 2012-07-09 14:13:54 -07:00
Scott Main
480785dabb am fd516987: docs: misc bugs from external tracker
* commit 'fd516987de29a48425da5ee5aace5be40adcc674':
  docs: misc bugs from external tracker
2012-07-03 18:15:19 -07:00
Scott Main
fd516987de docs: misc bugs from external tracker
Change-Id: I02d0d82c220401ac3a1ca180e8331a0f6dcd9e50
2012-07-03 18:08:19 -07:00
Mike Cleron
9454e29896 am 98fd6405: Merge "Fix NPEs when using the APIs a little oddly." into jb-dev
* commit '98fd6405aec16c6062f562bf6e7c5f2d50da5d60':
  Fix NPEs when using the APIs a little oddly.
2012-06-28 14:21:28 -07:00
Mike Cleron
98fd6405ae Merge "Fix NPEs when using the APIs a little oddly." into jb-dev 2012-06-28 14:18:48 -07:00
Daniel Sandler
c08dea2aa4 Fix NPEs when using the APIs a little oddly.
This should help developers use some of the features of
Style via subclassing rather than duplicating functionality.

Bug: 6716608
Change-Id: I048e8221c8046e9779e08e6e262ac3fb37b01cb3
2012-06-28 08:35:24 -07:00
Adam Powell
74d762a3ee Fix bug in parsing attributes for MediaRouteButton
Change-Id: Ib61506f7b09b1e043f3f21d2fd46281fbced00f4
2012-06-27 16:19:45 -07:00
Dianne Hackborn
9906e784fa am 17990395: Merge "Fix issue #6717667: expanded notification actions don\'t work on the lock screen" into jb-dev
* commit '17990395bc62f8ce1bae4f1880899f231a8e613b':
  Fix issue #6717667: expanded notification actions don't work on the lock screen
2012-06-25 17:37:15 -07:00
Dianne Hackborn
1927ae8a56 Fix issue #6717667: expanded notification actions don't work on the lock screen
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
2012-06-25 14:28:48 -07:00
Adam Powell
3b939b7242 am fd3fd482: Merge "Update route count properly when MediaRouteButton detects grouped/ungrouped events" into jb-dev
* commit 'fd3fd482ab6ab67b687696f51fa67714bd36fa49':
  Update route count properly when MediaRouteButton detects grouped/ungrouped events
2012-06-23 05:36:54 -07:00
Adam Powell
f3b653a21c Update route count properly when MediaRouteButton detects
grouped/ungrouped events

Change-Id: I1b00678cc3b548f347c51c3fcbfce18ecc8fbabe
2012-06-22 19:22:38 -07:00
Scott Main
101a120c27 am 9be0105f: docs: fix several links
* commit '9be0105fbc56eb1b1813bb7c5fe258a144867a43':
  docs: fix several links
2012-06-22 13:33:30 -07:00
Scott Main
9be0105fbc docs: fix several links
Change-Id: I89d9fd64dc22c90680bb05415cc966c255165af9
2012-06-22 12:35:08 -07:00
Adam Powell
92a175ca6f am 3cd46244: Merge "Avoid memory leak by only registering callback while attached to window." into jb-dev
* commit '3cd4624448dcaddecc75461ef645da72e7e5c098':
  Avoid memory leak by only registering callback while attached to window.
2012-06-22 10:46:15 -07:00
Adam Powell
3cd4624448 Merge "Avoid memory leak by only registering callback while attached to window." into jb-dev 2012-06-22 10:44:27 -07:00
Jack Palevich
101c449152 Avoid memory leak by only registering callback while attached to window.
Bug: 6710307
Change-Id: Idf57251e6feb48ec3e75e797144ff800fa874cc8
2012-06-22 16:06:57 +08:00
Adam Powell
8e453a0341 am 95cf8c11: Merge "Allow ungrouping media routes when a group is the only alternate route" into jb-dev
* commit '95cf8c1121a95750358ee99169c96d8d4dfb4950':
  Allow ungrouping media routes when a group is the only alternate route
2012-06-21 15:52:28 -07:00
Adam Powell
f7e0a328c9 Allow ungrouping media routes when a group is the only alternate route
Fix a MediaRouteButton bug where group item counts weren't taken into
account when deciding whether to toggle between two available groups
or show the chooser dialog.

Change-Id: I6400ffd4cfe80c8072c5be360264b8ca91d71c41
2012-06-21 15:29:40 -07:00
Daniel Sandler
0a43f67ef3 am 790024bf: Merge "Unhide new methods on RemoteViews and Notification." into jb-dev
* commit '790024bfe6dd2765dd5e552053797459aab72da1':
  Unhide new methods on RemoteViews and Notification.
2012-06-21 11:52:34 -07:00
Daniel Sandler
790024bfe6 Merge "Unhide new methods on RemoteViews and Notification." into jb-dev 2012-06-21 06:04:43 -07:00
Daniel Sandler
064f9907c9 Unhide new methods on RemoteViews and Notification.
Change-Id: I0cbc270d9d7e9e728482c3b10650a32589636c9d
2012-06-21 00:15:01 -04:00
Dianne Hackborn
cb1c45ed80 am b6ce1f31: Merge "Fix issue #6675499: java.lang.RuntimeException: Unable to start..." into jb-dev
* commit 'b6ce1f311ce154af713ebc4f543fc2aaed446939':
  Fix issue #6675499: java.lang.RuntimeException: Unable to start...
2012-06-20 12:08:00 -07:00
Dianne Hackborn
b6ce1f311c Merge "Fix issue #6675499: java.lang.RuntimeException: Unable to start..." into jb-dev 2012-06-20 12:06:14 -07:00
Adam Powell
da8288037c am 2dde147b: Merge "Add an XML attribute for controlling which route types a 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.
2012-06-19 19:20:05 -07:00
Adam Powell
849df0b5a7 Add an XML attribute for controlling which route types a
MediaRouteButton in a layout will alter.

Change-Id: I897a68188fa87e4c2dbc88794117a3ef87ffaab0
2012-06-19 17:47:48 -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
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
Dianne Hackborn
acdfbcca6f Fix issue #6675499: java.lang.RuntimeException: Unable to start...
...activity ComponentInfo{com.google.android.gm/
com.google.android.gm.ui.MailActivityGmail}: java.lang.NullPointerException

There were a number of places in FragmentManagerImpl where we were
not dealing with mAdded being null.  In the original implementation,
mAdded would almost always be null if mActive is null.  As we have
added features, this has become a less strong guarantee (and it actually
was never completely guaranteed), but there are a lot of places where
we would check for mActive being non-null and assume this meant
mAdded is non-null.

Fix these to correctly check for mAdded.

Bug: 6675499
Change-Id: I2a6a801d8bc89550fc73e12c9c3f8bb0ad6c7fa4
2012-06-19 15:07:05 -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
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
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
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
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
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
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