Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
137,099 Commits 3 Branches 0 Tags
09daefbb9a6d09a62c8a2097a84bd79db1ddcebb
Commit Graph

3838 Commits

Author SHA1 Message Date
Adam Powell
88e719fd3e am 49a4961e: Merge "Toolbar factoring and ActionBar functionality integration" into lmp-preview-dev 
* commit '49a4961efde042f4921393f59cff86c2b7889c71':
  Toolbar factoring and ActionBar functionality integration
 2014-05-28 23:07:25 +00:00
Adam Powell
e021e6ed89 Toolbar factoring and ActionBar functionality integration 
Toolbars now can act in the role of ActionBar with the exception of
navigation modes. Expandable action views are now supported as well as
populating menu items from a host window.

Change-Id: If477db9c7ad9f95723f28cf73cbf03a07ce9d6ad
 2014-05-28 12:36:38 -07:00
Christopher Tate
560ce61c59 Merge "DO NOT MERGE - Run the task manager service at startup" into lmp-preview-dev 2014-05-28 19:03:03 +00:00
Griff Hazen
8c2a828849 am c15d315a: am a9cb1e66: Add full screen size preset to WearableExtender 
* commit 'c15d315aeb2c23895e940560784bd51f7962b702':
  Add full screen size preset to WearableExtender
 2014-05-28 17:44:11 +00:00
Griff Hazen
10f6de686e Merge "DO NOT MERGE Cherry-pick: Add full screen size preset to WearableExtender" into lmp-preview-dev 2014-05-28 15:59:14 +00:00
George Mount
854ed1c4e2 am 27d805ea: Merge "Use activity transitions when launched from fragments." into lmp-preview-dev 
* commit '27d805ea6fb5aa3dbe46d4f8af86c46bce523760':
  Use activity transitions when launched from fragments.
 2014-05-28 14:42:01 +00:00
George Mount
1cc3e2e7a0 Merge "Use activity transitions when launched from fragments." into lmp-preview-dev 2014-05-28 14:37:34 +00:00
George Mount
f0ebc5dc21 Merge "fixed mIsReturning initialized too late. DO NOT MERGE." into lmp-preview-dev 2014-05-28 14:37:19 +00:00
Matthew Williams
bc132a068b Merge "Implementation of TaskManager reschedule/cancel" 2014-05-28 02:52:00 +00:00
Matthew Williams
b61c506a50 Implementation of TaskManager reschedule/cancel 
Issues here:
"Reschedule" of an idle-mode task is not well-defined. In the
API I throw an error if you try to set a back-off policy on
an idle mode task.
Implementation-wise, i add a delay for a reschedule request of an
idle mode task. This means that if the phone's still in idle mode
after the delay they app will get a call back, but otherwise it'll
have to wait til the next one.

Implemented all API functions

Change-Id: I0264c2614cc52c28730abbcb1557f314f058f991
 2014-05-27 18:36:54 -07:00
Griff Hazen
d5f11f98d1 DO NOT MERGE Cherry-pick: Add full screen size preset to WearableExtender 
Bug: 14838838

Change-Id: Id038d994d61d3c89dba08232a424a5b1b934e5db
 2014-05-27 17:36:44 -07:00
Griff Hazen
14f5799ba9 DO NOT MERGE Cherry-pick: Doc fixes for Notification.WearableExtender 
Change-Id: I22947e30d329e667079555ac4ac5f9b25d6bd3fa
 2014-05-27 17:34:27 -07:00
Griff Hazen
e6fff6e088 Merge "DO NOT MERGE Cherry-pick: Api updates for wearable extensions to notifications" into lmp-preview-dev 2014-05-28 00:31:46 +00:00
Griff Hazen
c15d315aeb am a9cb1e66: Add full screen size preset to WearableExtender 
* commit 'a9cb1e66737f816d643bca03832af719cbdd0f20':
  Add full screen size preset to WearableExtender
 2014-05-28 00:18:03 +00:00
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
a9cb1e6673 Add full screen size preset to WearableExtender 
For custom display notifications.

Bug: 14838838
Change-Id: Id038d994d61d3c89dba08232a424a5b1b934e5db
 2014-05-27 15:40:09 -07:00
Griff Hazen
6f72ac5d5f Doc fixes for Notification.WearableExtender 
Change-Id: I22947e30d329e667079555ac4ac5f9b25d6bd3fa
 2014-05-27 11:28:45 -07:00
Winson Chung
2eb4f9c377 DO NOT MERGE 
Removing unnecessary public values. (Bug 14995844)
(cherry picked from commit aa327fc2ce428f939885e1172578ff1dc975214c)

Change-Id: I98672d0ed3120c15bf31ce7a21ab604cfe66273d
 2014-05-27 17:07:52 +00:00
Nicolas Prevot
e282c97e21 Merge "Rename code related to cross-profile intents." 2014-05-27 10:07:58 +00:00
Griff Hazen
61a9e8635f DO NOT MERGE Cherry-pick: Api updates for wearable extensions to notifications 
Change-Id: I40012fd0458ec103eabf75ed4c91f636e02f4c8f
 2014-05-25 19:37:32 -07:00
Christopher Tate
fa380e982e DO NOT MERGE - Run the task manager service at startup 
Also moves most of it into android.app.task rather than android.content.

(Cherrypick from master)

Change-Id: Ic07a664bf54bc3e40aa0b892946edba4bf37262a
 2014-05-23 16:41:09 -07: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
George Mount
c9b6df8fa4 fixed mIsReturning initialized too late. DO NOT MERGE. 
Change-Id: Ic77e44b0deaf67e118a0564205646891b4d1a07b
 2014-05-23 12:16:45 -07:00
George Mount
a8bd929438 Use activity transitions when launched from fragments. 
Bug 15118249

Change-Id: I4e6a5dc6c930828a54a855d7b580a1bbc591ece5
 2014-05-23 11:31:26 -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
Julia Reynolds
6cbbe9ec99 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
(cherry picked from commit be9f43b9618ec25121b151d247eb0285fb6554b3)
 2014-05-23 11:14:34 +00: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