Commit Graph

3817 Commits

Author SHA1 Message Date
Griff Hazen
69170a56c6 am be5898b1: am 6f72ac5d: Doc fixes for Notification.WearableExtender
* commit 'be5898b198a9eee2d21eeff345ed19573d37257a':
  Doc fixes for Notification.WearableExtender
2014-05-27 22:47:27 +00:00
Griff Hazen
be5898b198 am 6f72ac5d: Doc fixes for Notification.WearableExtender
* commit '6f72ac5d5f4b7bae34bb3dab7821f3dbcbf02bcd':
  Doc fixes for Notification.WearableExtender
2014-05-27 22:44:28 +00:00
Griff Hazen
6f72ac5d5f Doc fixes for Notification.WearableExtender
Change-Id: I22947e30d329e667079555ac4ac5f9b25d6bd3fa
2014-05-27 11:28:45 -07:00
Nicolas Prevot
e282c97e21 Merge "Rename code related to cross-profile intents." 2014-05-27 10:07:58 +00:00
Christopher Tate
8f64f80888 Run the task manager service at startup
Also moves most of it into android.app.task rather than android.content.

Bug 14993295
Bug 14997851

Change-Id: I9b5738d026ea2526cdfbc96d0239c74687c51611
2014-05-23 16:07:45 -07:00
Nicolas Prevot
8194899071 Rename code related to cross-profile intents.
For example, replace ForwardingIntentFilter by CrossProfileIntentFilter

Bug: 15023443

Change-Id: Iee8cdf578817ef9956bcdece803a49b0d07b67f7
2014-05-23 13:16:01 +01:00
Griff Hazen
6b7b34849a Merge commit 'e5b73ae2' into manualmerge
Conflicts:
	api/current.txt
	core/java/android/app/Notification.java

Change-Id: I3141ed6b456107b7e5aa8c0c9c98ffc1d77fdf75
2014-05-22 16:05:19 -07:00
Griff Hazen
e5b73ae234 am c3104157: Api updates for wearable extensions to notifications
* commit 'c3104157d8f12238b0ac8cf6c6f963dadb44167c':
  Api updates for wearable extensions to notifications
2014-05-22 22:44:35 +00:00
Griff Hazen
c3104157d8 Api updates for wearable extensions to notifications
1. Move Extender outside of Builder
2. Rename apply/applyTo to extend
3. Move Wearable extenders into Notification.java
4. Collapse Builder model into single classes
5. Use Bundle for storage: no new parcelable types.

Minor fix to RemoteInput to use flags int for boolean options.

Change-Id: I40012fd0458ec103eabf75ed4c91f636e02f4c8f
2014-05-22 14:38:36 -07:00
Winson Chung
f13cd857e0 Merge "Removing unnecessary public values. (Bug 14995844)" 2014-05-22 19:20:14 +00:00
Winson Chung
6784f1c623 Removing unnecessary public values. (Bug 14995844) 2014-05-22 11:22:41 -07:00
Julia Reynolds
1e95839823 Create deviceowner gated APIs for creating and removing users in devicepolicymanager.
This will allow DMAgent to manage users for EDU's cart model user case.
Bug: 15015887

Change-Id: I1eadf1701cb75fc4b50eb1a0df1525eff818286e
2014-05-22 12:02:23 -04:00
George Mount
b284e30b40 Merge "fixed mIsReturning initialized too late." 2014-05-22 14:04:33 +00:00
Lorenzo Colitti
521d8cdae0 Merge "Make the EthernetManager available." 2014-05-22 05:55:56 +00:00
Dan Sandler
842dd77bb9 Introducing Notification.MediaStyle.
Allows you to create a nice music player with all the
trimmings, including:

  * up to 5 actions in the bigContentView, styled as
    transport control buttons
  * up to 2 of those actions in the 1U (!)
  * a nice custom progress bar
  * a tinted background (taken from your Notification.color)
  * a special place to put your MediaSessionToken

Bug: 15147533
Change-Id: Ic20a2b369eb6c5fe4853987a44ffd9bace720c7f
2014-05-22 01:36:46 -04:00
Jose Lima
e9e3b3b919 Added Notification.EXTRA_BACKGROUND_IMAGE_URI
Added new EXTRA field to notification to be used to specify
an image that can be displayed to the user when the notification
is selected.

Change-Id: I3f79cf363d885fe2742e74a7d29d7e22ea1e6f60
2014-05-21 20:52:57 -07:00
Lorenzo Colitti
f9ff2c9ae5 Make the EthernetManager available.
Change-Id: I7a60e977d7a40a5d0367168f2f6633ccae591ac4
2014-05-21 16:41:24 -07:00
George Mount
37a3a136ea fixed mIsReturning initialized too late.
Change-Id: Ic77e44b0deaf67e118a0564205646891b4d1a07b
2014-05-21 15:07:04 -07:00
Dianne Hackborn
fb052926b8 Revert "Hide voice interaction APIs."
This reverts commit a677a9b9367bcf8c81c36dc59b53554cb347b438.
2014-05-21 14:16:46 -07:00
Christoph Studer
cee44ba418 Simplify NotificationListenerService API
Use ParceledListSlice to send the list of active notifications
from NoMan to NotificationListeners.

This allows us to simplify the API to what it was before
introducing the "String[] key" workaround for dealing with large
numbers of StatusBarNotifications.

While we're at it, rename Ranking.getIndexOfKey to something that
makes more sense.

Bug: 15126927
Change-Id: I02c2087978c6c4ec1198be496c6250a66143ecb3
2014-05-21 22:03:45 +02:00
George Mount
0a69ce6cf6 Merge "Fixed inverse of listener assignment." 2014-05-21 17:54:45 +00:00
Craig Mautner
4ee3580609 Merge "Change method name per API council request" 2014-05-21 16:35:27 +00:00
George Mount
d80154fba1 Fixed inverse of listener assignment.
Change-Id: Icaa68d54c3f4ca74009edd19ef5ab197b73eb66a
2014-05-21 08:40:03 -07:00
Emily Bernier
1dcfe9e780 Merge "Connect user audio restrictions to app ops." 2014-05-21 15:17:20 +00:00
George Mount
c84947db56 Merge changes I2da66b54,I8a65428d
* changes:
  Fix for quick "back" in Activity Transitions.
  Enter and exit transitions are inverted in calling Activity.
2014-05-21 13:51:44 +00:00
Sander Alewijnse
9853e2a8b3 Merge "Update comment of ACTION_PROFILE_PROVISIONING_COMPLETE." 2014-05-21 10:34:00 +00:00
Yuhao Zheng
26611efc2a Merge "Hotspot 2.0 framework - add implementation" 2014-05-21 04:21:23 +00:00
Griff Hazen
3d6eed9613 am 08a8c2ca: am ef6aae62: Merge "Fixes to WearableActionExtensions" into klp-modular-dev
* commit '08a8c2ca45dc859e79d54990d2ae0392d475aeda':
  Fixes to WearableActionExtensions
2014-05-21 02:48:24 +00:00
Griff Hazen
08a8c2ca45 am ef6aae62: Merge "Fixes to WearableActionExtensions" into klp-modular-dev
* commit 'ef6aae62f6c92bc9413db60c28cc4b3230f4d2fa':
  Fixes to WearableActionExtensions
2014-05-21 02:44:16 +00:00
Griff Hazen
4ae73202c3 Fixes to WearableActionExtensions
* Add missing parcelable creator.
* Review fixes.
* Minor doc fixes.
* Kill SIZE_FULLSCREEN

Change-Id: Iaf6458fdd3482202aa416ebaf2302f79cb48635e
2014-05-20 18:46:16 -07:00
Roger Chang
7fee7232ee Hotspot 2.0 framework - add implementation
Bug: 5485670
Change-Id: I4d0f728f4c20676232f2d61bbf49691f6e21a100
2014-05-20 18:25:56 -07:00
Griff Hazen
7e14285ff5 Merge "resolved conflicts for merge of cbe69ec1 to master" 2014-05-20 23:59:45 +00:00
Amith Yamasani
48f73ef141 Merge "Pass along the appOp param to broadcastIntent" 2014-05-20 23:58:45 +00:00
Amith Yamasani
0261b9b1cc Pass along the appOp param to broadcastIntent
Forgot to pass that along in the original CL

Change-Id: I3aaa7de9cf5c73ab5cbff367e5889429e9ac2301
2014-05-20 16:57:26 -07:00
Griff Hazen
d445fe7e54 resolved conflicts for merge of cbe69ec1 to master
Change-Id: I183f94c726c9acb3de7d9369e315cc4ae1ff92d6
2014-05-20 16:53:09 -07:00
Griff Hazen
cbe69ec18d am 7ea18e1c: Add wearable notification extensions to frameworks/base.
* commit '7ea18e1c92ab84d1a0d00087e6e3784646661fe8':
  Add wearable notification extensions to frameworks/base.
2014-05-20 23:21:01 +00:00
George Mount
8cab50afda Fix for quick "back" in Activity Transitions.
Bug 14990153

Stops two potential animators working against the background
drawable. Forces the entering views to become visible onResume.

Change-Id: I2da66b54a16c6c69533eebbeff6db7f5a7794a89
2014-05-20 15:36:31 -07:00
George Mount
a712e8cc2f Enter and exit transitions are inverted in calling Activity.
Bug 15115028

Also fixes NPE when there is shared element name mismatch.

Change-Id: I8a65428d4b215ada532e98a555649c2e046de5ef
2014-05-20 15:34:05 -07:00
Julia Reynolds
37f4e44ae6 Merge "Add Device/Profile Owner gated apis for setting/getting blocked packages." 2014-05-20 22:19:02 +00:00
Julia Reynolds
4d40452154 Merge "Allow device/profile owners to update settings." 2014-05-20 22:10:46 +00:00
Julia Reynolds
966881e895 Add Device/Profile Owner gated apis for setting/getting blocked packages.
DMAgent currently needs to live in /system/priv-app in order to
(among other things) set and get blocked packages. These APIs will
get us closer to being able to move DMAgent out of priv-app.
Bug: 14945334

Change-Id: I108e2013c67409dca554acf78e3a710745900706
2014-05-20 17:59:58 -04:00
Julia Reynolds
da55165321 Allow device/profile owners to update settings.
Device owners can update Settings.Secure and Settings.Global settings.
Profile owners can update Settings.Secure settings.

DMAgent currently needs to live in /system/priv-app in order to
(among other things) update global and secure settings. This change will
get us closer to being able to move DMAgent out of priv-app.
Bug: 14965414

Change-Id: If2cc3a56de91bffde33b838ab8ecea2c32412803
2014-05-20 17:49:45 -04:00
Griff Hazen
7ea18e1c92 Add wearable notification extensions to frameworks/base.
Change-Id: Ic312cec7dc11e637002ff2be3975940a93a6babf
2014-05-20 13:50:06 -07:00
Griff Hazen
51eb4e657c am 7ba69dd8: am 9e1379f1: Fix sdk docs build for framework from remote input api addition.
* commit '7ba69dd8bd428494c7a2848b5d3325d47cf4afbf':
  Fix sdk docs build for framework from remote input api addition.
2014-05-20 20:18:11 +00:00
Griff Hazen
b720abeee8 resolved conflicts for merge of 8f1e7ade to master
Change-Id: Icabc5d274502abf8d40116d373c9f9d0ac062386
2014-05-20 13:15:30 -07:00
Griff Hazen
7ba69dd8bd am 9e1379f1: Fix sdk docs build for framework from remote input api addition.
* commit '9e1379f1126c1101f69445572bd441b2211791fa':
  Fix sdk docs build for framework from remote input api addition.
2014-05-20 20:07:32 +00:00
Griff Hazen
9e1379f112 Fix sdk docs build for framework from remote input api addition.
Change-Id: I6a6f3df06d924fe72f67466d67d9feced8d8719f
2014-05-20 12:51:29 -07:00
Griff Hazen
8f1e7aded3 am 5cadc3b0: Add RemoteInput, Grouping, and Extender to Notification api.
* commit '5cadc3b00aa775a63518383046c902b130e09b4c':
  Add RemoteInput, Grouping, and Extender to Notification api.
2014-05-20 18:41:46 +00:00
Griff Hazen
5cadc3b00a Add RemoteInput, Grouping, and Extender to Notification api.
RemoteInputs annotate actions and content intents to request
input from the user as part of an intent being sent. Results
are sent along using ClipData to avoid unparcel of developer
provided bundle values. A helper method is expexted to be used
to extract results.

Grouping allows notifications to be bundled together, with an optional
summary notification for display on older platforms. SortKey is an
important part of grouping since child notifications will likely have
a prescribed ordering. It is also useful in top level notifications
for apps that want to provide an ordering all other fields being equal.

Also provide a fluid way to to extend Actions and Notifications
using Extenders, e.g.:

Notification n = new NotificationCompat.Builder(context)
    .setOption1()
    .apply(new SomeExtender()
        .setOption2())
    .build();

This helps extension libraries provide a nice API experience for devs.

Change-Id: Ib3438ef854772c2c34d21bf1eb4ed7c9e032106f
2014-05-20 09:55:39 -07:00
Michael Wright
e4ca30503c resolved conflicts for merge of b3ce4b1b to master
Change-Id: I7f9abc0eb75f7c7042037e73c8fdb67025a2ee2a
2014-05-20 09:35:36 -07:00