135873 Commits

Author SHA1 Message Date
RoboErik
23a42810e3 Merge "Add getMediaSession to RCC" 2014-05-20 21:02:18 +00:00
RoboErik
5f31737c68 Add getMediaSession to RCC
This is to make integration with Media notifications easier.

Change-Id: I783ae5c2620ff0e11bf5584604b9c9623850e2f0
2014-05-20 14:00:53 -07:00
Jeff Brown
b86b1027a3 am 9777fdb7: am b0a7f84b: am 63bf04d8: Merge "Fix NullException in QwertyKeyListener.KeyDown"
* commit '9777fdb7af696ca15906d03ad8aa7a3d8d51e4b3':
  Fix NullException in QwertyKeyListener.KeyDown
2014-05-20 20:47:29 +00:00
Jeff Brown
9777fdb7af am b0a7f84b: am 63bf04d8: Merge "Fix NullException in QwertyKeyListener.KeyDown"
* commit 'b0a7f84b6de20edc6337163a4a07e3c524991ddb':
  Fix NullException in QwertyKeyListener.KeyDown
2014-05-20 20:44:21 +00:00
Jeff Brown
b0a7f84b6d am 63bf04d8: Merge "Fix NullException in QwertyKeyListener.KeyDown"
* commit '63bf04d88bcc00876c30c9f2848da8c44b42185b':
  Fix NullException in QwertyKeyListener.KeyDown
2014-05-20 20:40:20 +00:00
Winson Chung
15f3e28819 Merge "Should not be closing system dialogs when Recents is hidden. (Bug 15109551)" 2014-05-20 20:37:58 +00:00
Jeff Brown
63bf04d88b Merge "Fix NullException in QwertyKeyListener.KeyDown" 2014-05-20 20:37:44 +00:00
Dianne Hackborn
3bf2723193 Merge "Delay the dispatching of non-wakeup alarms." 2014-05-20 20:25:08 +00:00
Dianne Hackborn
d4e6d467cd Delay the dispatching of non-wakeup alarms.
When the screen is off, there are no guarantees about when
non-wakeup alarms will be dispatched.  Historically they are
dispatched any time the device wakes up.  With this change,
we will delay the dispatch until sometime later.

The amount of delay is determined by how long the screen has
been off.  Currently there are three possible delays: up to
2 minutes if the screen has been off for less than 5 minutes;
up to 15 minutes if it has been off for less than 30 minutes;
and otherwise up to an hour.

When the screen is turned on or a wakeup alarm is dispatched,
all delayed alarms will also be dispatched.

Note that one of the things this delays is TIME_TICK, which
means the in many cases we won't deliver TIME_TICK until the
screen is in the process of waking up.  The current
implementation causes this to be delayed until the SCREEN_ON
broadcast is sent; we probably want to improve this to have
the power manager tell the alarm manager about the screen
turning on before it sends that broadcast, to help make sure
things like the lock screen can update their current time
before the screen is actually turned on.

In addition, switch all of the alarm stats to use the new
PendingIntent "tag" identifier for its operations, instead
of the old code to try to construct a pseudo-identifier
by retrieving the raw Intent.

Also add a new package manager command to immediately write
packages.xml.

Change-Id: Id4b14757cccff9cb2c6b36de994de38163abf615
2014-05-20 13:24:25 -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
Winson Chung
1bba1c8c1a Should not be closing system dialogs when Recents is hidden. (Bug 15109551)
Change-Id: Ia73753074ce620ede136cd4b156d6bfeadb900cf
2014-05-20 13:12:12 -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
Vinit Deshpande
3fff22173c Merge "Fix a runtime break caused by merge conflict" 2014-05-20 19:06:45 +00:00
Robert Greenwalt
eeb11cde21 Merge "Add NetworkFactory names and unregistration." 2014-05-20 19:03:45 +00:00
Mike Lockwood
304ebe60b2 Merge "USB: Fix race condition in acquiring global reference in UsbRequest JNI code" 2014-05-20 18:59:05 +00:00
Mike Lockwood
5633e37ec1 Merge "USB: Minor cleanup from API council review" 2014-05-20 18:58:35 +00:00
Vinit Deshpande
e715e8cc00 Fix a runtime break caused by merge conflict
Kwd changed the name of WifiHotspotService to PasspointService; and
the reference to the name was moved in master. Merge ended up picking
up incorrect name WifiPasspointService. This change fixes that.

Bug: 15106138
Change-Id: Ib6d8aee53db39314a9d98abcbd8e0863210de1bb
2014-05-20 11:50:17 -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
Mike Lockwood
b2a4658a63 USB: Fix race condition in acquiring global reference in UsbRequest JNI code
Fixes bug https://code.google.com/p/android/issues/detail?id=59467

Change-Id: I8365e1be4eb0f1f2da49b658af677b590a80e382
2014-05-20 11:33:35 -07:00
Mike Lockwood
fa2b3fc6cd USB: Minor cleanup from API council review
Bug: 15089961
Change-Id: I8a22fad94d2a52d2270c89240b2a47bd1cef17b5
2014-05-20 11:14:58 -07:00
Ben Murdoch
f564c7fe86 resolved conflicts for merge of ecf09321 to master
Change-Id: I7a440204dfc79f3b82bd95d3d1276158bf3d44a2
2014-05-20 19:13:39 +01:00
Alan Viverette
d41b911680 Revert "Various API council fixes to drawables"
This reverts commit a2146b713c3b2f3bf215cfd42b012cf31f2f6e8a.

Change-Id: I80d5e3e0d0bfa5eb18021e2783fa92a6f12d7bf8
2014-05-20 10:51:38 -07:00
Alan Viverette
f31512eb17 Merge "Various API council fixes to drawables" 2014-05-20 17:45:52 +00:00
Alan Viverette
e5b082d6eb Various API council fixes to drawables
BUG: 15089957
Change-Id: Ieaf468bbff092e68f6313d8a5ecccda8b753806d
2014-05-20 10:45:22 -07:00
Andy Hung
b5eb843e4b Merge "Fix 64 bit long pointer size for media scanning" 2014-05-20 17:36:11 +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
Robert Greenwalt
a67be03f9e Add NetworkFactory names and unregistration.
Some Factories come and go (Telephony) and so they need to be able to unregister.
Also, debugging is tough when the factories are anonymous, so add names for logging.

Lastly, only send single set of NetworkRequests to a newly registered NetworkFactory
and only send the requests.

Change-Id: I717d63363f25c446f8ecf38d933b1a35d744af6e
2014-05-20 09:03:57 -07:00
Christoph Studer
05ad48206a Add ZEN and speedbump to NotificationListenerService
Change-Id: I39fae5d77863e0d10cf236a096cc589167d146d3
2014-05-20 17:03:22 +02:00
George Mount
646b1db458 Merge "Add to activity transition API as requested by consumers." 2014-05-20 14:52:50 +00:00
George Mount
41fc656b38 Merge "API Review: split out BidirectionalTypeConverter." 2014-05-20 14:51:39 +00:00
John Reck
1fcc3b1896 Merge "Baby steps" 2014-05-20 14:10:53 +00:00
Adrian Roos
2566bc82cc Merge "Fix typo causing immersive mode transition flickering." 2014-05-20 14:10:07 +00:00
George Mount
800d72b0e0 Add to activity transition API as requested by consumers.
Change-Id: Iae01d7560770bab0ff9a1728d6552b98b17108ce
2014-05-20 07:07:30 -07:00
Jason Monk
87be9ba1ea Merge "Fix reference to ProxyInfo extra" 2014-05-20 12:59:52 +00:00
Selim Cinek
37dd822089 Merge "Fixed measuring and layouting of the more card and expandableviews." 2014-05-20 12:48:22 +00:00
Selim Cinek
24d7cfa4d6 Fixed measuring and layouting of the more card and expandableviews.
Change-Id: I2848b39c6498ce9ad197ed7bad8423c74b372419
2014-05-20 14:38:08 +02:00
Adrian Roos
cffd1e42d3 Fix typo causing immersive mode transition flickering.
Bug: 15095056
Change-Id: Ibc75bb4f61070f4cf00756ab1a216255e38932af
2014-05-20 13:48:37 +02:00
Guang Zhu
47c6514eaa am cd98ecc6: am 6071e45a: Merge "add a command to list all bonded devices" into klp-modular-dev
* commit 'cd98ecc66b968c5d5d0d12522c4c8c9b848bf181':
  add a command to list all bonded devices
2014-05-20 09:58:35 +00:00
Wei Wang
05ee041453 Remove a hide tag link.
Change-Id: I6781dcfcaf89c6b00e0641549f946b90e4543218
2014-05-20 02:43:02 -07:00
Ben Murdoch
ecf09321c5 am e0d6a6b0: Merge "Add PackagManager flag for WebView system feature." into klp-modular-dev
* commit 'e0d6a6b05b0861a5aa6dd8189de61a4da8d39dae':
  Add PackagManager flag for WebView system feature.
2014-05-20 09:39:05 +00:00
Ben Murdoch
e0d6a6b05b Merge "Add PackagManager flag for WebView system feature." into klp-modular-dev 2014-05-20 09:32:43 +00:00
Michael Wright
b3ce4b1b78 am 889814ce: resolved conflicts for merge of 32912e0a to stage-aosp-master
* commit '889814cee0ebcf70069d04d3ae77c97c09efb5a1':
  wallpaper: limit wallpaper width to sys.max_texture_size
2014-05-20 09:28:40 +00:00
Guang Zhu
cd98ecc66b am 6071e45a: Merge "add a command to list all bonded devices" into klp-modular-dev
* commit '6071e45a64ab764eb86603f2f4496cfd5c8de708':
  add a command to list all bonded devices
2014-05-20 09:26:18 +00:00
Wei Wang
adf6aff5b0 Revert "Revert "APIs for BLE scan, scan filter, batch scan, onFound/onLost and multiple advertising.""
This reverts commit b1d9fbc0f8dea0c77ed810190b325bfdaaf21789.

Change-Id: Ic8dec9385a7c763170ebeb1bcddd221c72f46e88
2014-05-19 23:52:45 -07:00
Youngsang Cho
48bb35b965 Merge "Make mSessionCallback null in TvView.unbindTvInput" 2014-05-20 05:55:21 +00:00
Michael Wright
889814cee0 resolved conflicts for merge of 32912e0a to stage-aosp-master
Change-Id: I140e2024bd0e6e81ab550718103d45220d8bde26
2014-05-19 22:42:58 -07:00
Youngsang Cho
285ff430fa Make mSessionCallback null in TvView.unbindTvInput
Bug: 15096705
Change-Id: I5a13f9ad648bafc76667cbda39bcb138cfbc5de2
2014-05-20 14:37:01 +09:00