Maxim Siniavine
5267bb247f
am 134b9146: am d66cbc0b: am 598a7aed: Merge "Fix BandwidthTest to report correct stats." into klp-dev
...
* commit '134b91469c2894477dda786c1572b80b596c62ac':
Fix BandwidthTest to report correct stats.
2013-11-07 21:30:31 -08:00
Jeff Brown
ae9bf8dd42
resolved conflicts for merge of 6a1a2f9b to master
...
Change-Id: Ie204a484b9b989a66423b756bb4743d7018c0884
2013-11-07 21:25:26 -08:00
Michael Wright
42ae5f3196
Merge "Disable unused parameter warning for jni code"
2013-11-08 02:39:39 +00:00
Michael Wright
1fc1834d66
Disable unused parameter warning for jni code
...
Change-Id: Iee2620186c8868d86ccb5f8d0fd6239079638e2d
2013-11-07 18:33:05 -08:00
Maxim Siniavine
134b91469c
am d66cbc0b: am 598a7aed: Merge "Fix BandwidthTest to report correct stats." into klp-dev
...
* commit 'd66cbc0bb28b016359f696da45939cab30c71906':
Fix BandwidthTest to report correct stats.
2013-11-07 18:03:22 -08:00
Maxim Siniavine
d66cbc0bb2
am 598a7aed: Merge "Fix BandwidthTest to report correct stats." into klp-dev
...
* commit '598a7aedfb6b77fc98bace9f420968a6f3ed637e':
Fix BandwidthTest to report correct stats.
2013-11-07 18:01:04 -08:00
Maxim Siniavine
598a7aedfb
Merge "Fix BandwidthTest to report correct stats." into klp-dev
2013-11-08 01:56:16 +00:00
Jeff Brown
7da5bbedc7
am c2b652fd: am 5182ea4b: am d40a4d74: Merge "Add media router service and integrate with remote displays." into klp-dev
...
* commit 'c2b652fd4d386b79dc99af249b6ad3844e53fdf1':
Add media router service and integrate with remote displays.
2013-11-07 17:47:25 -08:00
Jeff Brown
6c58d890f3
am 84d76025: am eb223425: am 1f7a8a06: Merge "Add a platform library for remote display providers." into klp-dev
...
* commit '84d760257f46232601e5f47411fb4e59f57f1872':
Add a platform library for remote display providers.
2013-11-07 17:47:21 -08:00
Jeff Brown
6a1a2f9b88
am 7938feef: am 52277428: Merge "Integrate remote display providers into Quick Settings." into klp-dev
...
* commit '7938feef5abd003bf54efa4f862f995856305e44':
Integrate remote display providers into Quick Settings.
2013-11-07 17:44:17 -08:00
Jeff Brown
c2b652fd4d
am 5182ea4b: am d40a4d74: Merge "Add media router service and integrate with remote displays." into klp-dev
...
* commit '5182ea4bb20ec8fbe9562d0eaae8135d433ea0b6':
Add media router service and integrate with remote displays.
2013-11-07 17:44:14 -08:00
Jeff Brown
84d760257f
am eb223425: am 1f7a8a06: Merge "Add a platform library for remote display providers." into klp-dev
...
* commit 'eb223425e38cd9a3da12cd38c8c41e696c6b7e96':
Add a platform library for remote display providers.
2013-11-07 17:44:10 -08:00
Jeff Brown
7938feef5a
am 52277428: Merge "Integrate remote display providers into Quick Settings." into klp-dev
...
* commit '52277428d54cc71f0cde3f1efa035f1e6742b900':
Integrate remote display providers into Quick Settings.
2013-11-07 17:41:48 -08:00
Jeff Brown
5182ea4bb2
am d40a4d74: Merge "Add media router service and integrate with remote displays." into klp-dev
...
* commit 'd40a4d74c623175c96a2e9d865a99826e56d1132':
Add media router service and integrate with remote displays.
2013-11-07 17:41:44 -08:00
Jeff Brown
eb223425e3
am 1f7a8a06: Merge "Add a platform library for remote display providers." into klp-dev
...
* commit '1f7a8a06256907e03405f89108f081289c23e97a':
Add a platform library for remote display providers.
2013-11-07 17:41:41 -08:00
Jeff Brown
52277428d5
Merge "Integrate remote display providers into Quick Settings." into klp-dev
2013-11-08 01:37:03 +00:00
Jeff Brown
d40a4d74c6
Merge "Add media router service and integrate with remote displays." into klp-dev
2013-11-08 01:36:55 +00:00
Jeff Brown
1f7a8a0625
Merge "Add a platform library for remote display providers." into klp-dev
2013-11-08 01:36:41 +00:00
John Spurlock
42bb698dbb
am 9f6e8e03: am 94cab389: am 1e45fd78: Merge "Fix improperly hidden status bar." into klp-dev
...
* commit '9f6e8e0361ce615644208dd11adcbeed3265edc7':
Fix improperly hidden status bar.
2013-11-07 16:54:08 -08:00
John Spurlock
9f6e8e0361
am 94cab389: am 1e45fd78: Merge "Fix improperly hidden status bar." into klp-dev
...
* commit '94cab389e4f81d454316789fb0a6fbe954080a08':
Fix improperly hidden status bar.
2013-11-07 16:51:19 -08:00
John Spurlock
94cab389e4
am 1e45fd78: Merge "Fix improperly hidden status bar." into klp-dev
...
* commit '1e45fd78090693c5eff346feb32bab90f31a5e30':
Fix improperly hidden status bar.
2013-11-07 16:49:35 -08:00
John Spurlock
1e45fd7809
Merge "Fix improperly hidden status bar." into klp-dev
2013-11-08 00:47:14 +00:00
Svetoslav
765c9dfd54
am ebd616e8: am 134631b9: am 90242fe5: Merge "Switch to the new Skia PDF generation APIs." into klp-dev
...
* commit 'ebd616e88dab185bbf5b309d29c92a9eea9817e0':
Switch to the new Skia PDF generation APIs.
2013-11-07 16:28:39 -08:00
Svetoslav
ebd616e88d
am 134631b9: am 90242fe5: Merge "Switch to the new Skia PDF generation APIs." into klp-dev
...
* commit '134631b9078df0b9277fb3b8319bf3b85f690727':
Switch to the new Skia PDF generation APIs.
2013-11-07 16:25:32 -08:00
Svetoslav
134631b907
am 90242fe5: Merge "Switch to the new Skia PDF generation APIs." into klp-dev
...
* commit '90242fe5581c8f665c09337a0971a7c3fc908f7c':
Switch to the new Skia PDF generation APIs.
2013-11-07 16:22:22 -08:00
Svetoslav
90242fe558
Merge "Switch to the new Skia PDF generation APIs." into klp-dev
2013-11-08 00:20:10 +00:00
Selim Gurun
e7dda40c91
am 1bd7918f: (-s ours) am 6bb9588d: am e81f9755: am 9dcac6f1: (-s ours) am 0fed1239: am de38b23d: DO NOT MERGE Add a delimiter between scheme and host
...
* commit '1bd7918fc26930935037d8c99be4c64332b9ef93':
DO NOT MERGE Add a delimiter between scheme and host
2013-11-07 16:13:19 -08:00
Jim Miller
55565a493f
am eaacc7c1: am bb78ae9e: am 8cba0d0b: Merge "Fix scrubbing behavior on keyguard music transport" into klp-dev
...
* commit 'eaacc7c1ba4ff00bac36f5fbfd7269b04eb77cae':
Fix scrubbing behavior on keyguard music transport
2013-11-07 16:13:13 -08:00
Jeff Brown
635e915296
Integrate remote display providers into Quick Settings.
...
This is a first pass at integrating new remote display functionality
into Quick Settings. The Wireless Display card which previously
only supported Wifi Display is reimplemented to use the media router
to enumerate available remote display routes. This ensures that the
user is presented with a consistent state regarding the currently
selected display route.
In this patch, the Wireless Display card still launches the old
Settings preference page for Wifi Display when clicked. This will be
addressed in future patches.
As part of this change, it was necessary to derive some new lifecycle
information regarding the visibility of the Quick Settings model.
When Quick Settings is shown, an onPrepare event is delivered to
give the model a chance to update its state. Likewise when Quick
Settings is hidden, an onUnprepare event is delivered.
These events allow the system to determine precisely when remote
display discovery is required to update the UI so as not to waste
power performing discovery in the background all of the time.
Bug: 11257292
Change-Id: Id802aa0983b625aeb972b5d123e4cc080dd6705f
2013-11-07 16:07:18 -08:00
Alan Viverette
fe2737282f
Merge "Add methods for removing children and actions from A11y nodes"
2013-11-07 23:34:08 +00:00
Selim Gurun
1bd7918fc2
am 6bb9588d: am e81f9755: am 9dcac6f1: (-s ours) am 0fed1239: am de38b23d: DO NOT MERGE Add a delimiter between scheme and host
...
* commit '6bb9588d767822a70823319170160ceb28c583f2':
DO NOT MERGE Add a delimiter between scheme and host
2013-11-07 15:22:23 -08:00
Selim Gurun
6bb9588d76
am e81f9755: am 9dcac6f1: (-s ours) am 0fed1239: am de38b23d: DO NOT MERGE Add a delimiter between scheme and host
...
* commit 'e81f9755d914b5b87f18e5ed201a4903dc09baa6':
DO NOT MERGE Add a delimiter between scheme and host
2013-11-07 15:20:12 -08:00
Selim Gurun
e81f9755d9
am 9dcac6f1: (-s ours) am 0fed1239: am de38b23d: DO NOT MERGE Add a delimiter between scheme and host
...
* commit '9dcac6f1a74b5d6a99b832818efb0a202a88dfe7':
DO NOT MERGE Add a delimiter between scheme and host
2013-11-07 15:17:26 -08:00
Selim Gurun
9dcac6f1a7
am 0fed1239: am de38b23d: DO NOT MERGE Add a delimiter between scheme and host
...
* commit '0fed12396a12fd69b22c1b4ee4e27a93517eb6e2':
DO NOT MERGE Add a delimiter between scheme and host
2013-11-07 15:14:33 -08:00
Craig Mautner
f0696d992f
am 25f6d3e6: am f7dea15b: am c9ffd746: Merge "Don\'t call setTask twice." into klp-dev
...
* commit '25f6d3e6e0d341239fc9ef56a6310e92bc5f21ce':
Don't call setTask twice.
2013-11-07 15:13:30 -08:00
Craig Mautner
211aa32fdb
am bf98c0cc: am c0eb7e7b: am 20409674: Merge "If home activity is not fullscreen keep drilling." into klp-dev
...
* commit 'bf98c0ccd9cab77ec06f7553c6bae317afcd6077':
If home activity is not fullscreen keep drilling.
2013-11-07 15:13:27 -08:00
Fabrice Di Meglio
131d2acb45
am 0be8fa71: am e43780c6: am ff49e2d9: Merge "Improve RTL support for Immersive mode" into klp-dev
...
* commit '0be8fa713f67a873fbc73635e8f62bd30c297110':
Improve RTL support for Immersive mode
2013-11-07 15:13:13 -08:00
Fabrice Di Meglio
8e0fb6e9c3
am 4833a6ce: am e34c4770: am 435c0ee1: Merge "Fix bug #11537133 Hideycling looks broken (KOT36), missing left padding" into klp-dev
...
* commit '4833a6ce44becf0d73e9727da64d8c7bd0f89549':
Fix bug #11537133 Hideycling looks broken (KOT36), missing left padding
2013-11-07 15:13:09 -08:00
Selim Gurun
0fed12396a
am de38b23d: DO NOT MERGE Add a delimiter between scheme and host
...
* commit 'de38b23d0f811bed29f462e580430fc3aa781049':
DO NOT MERGE Add a delimiter between scheme and host
2013-11-07 15:10:58 -08:00
Robert Greenwalt
d528d48e5d
resolved conflicts for merge of c3eef190 to master
...
Change-Id: I36fd3c7fcbb13e47e27ffc340484c03b5a553bb1
2013-11-07 15:05:26 -08:00
John Spurlock
f25706fc3e
Fix improperly hidden status bar.
...
An app lib exposed a possible timing problem, causing the bars
to remain hidden after screen rotation during immersive mode.
Bug:11440463
Change-Id: I5166bdce78a876bc08b18f8b9a340366fbbbb70a
2013-11-07 18:02:43 -05:00
Jim Miller
eaacc7c1ba
am bb78ae9e: am 8cba0d0b: Merge "Fix scrubbing behavior on keyguard music transport" into klp-dev
...
* commit 'bb78ae9eedce1136410be326274b5304e8e046dc':
Fix scrubbing behavior on keyguard music transport
2013-11-07 14:57:16 -08:00
Jim Miller
bb78ae9eed
am 8cba0d0b: Merge "Fix scrubbing behavior on keyguard music transport" into klp-dev
...
* commit '8cba0d0b21db0fc4f9006403d6706e5893582dc8':
Fix scrubbing behavior on keyguard music transport
2013-11-07 14:54:37 -08:00
Jim Miller
8cba0d0b21
Merge "Fix scrubbing behavior on keyguard music transport" into klp-dev
2013-11-07 22:52:57 +00:00
Svetoslav
35aacf2eb3
Switch to the new Skia PDF generation APIs.
...
The new Skia PDF generation APIs are a small extension to
the code that converts drawing commands to PDF (SkPDFDevice)
and this new functionality is exposed via new APIs. This
change switches to using these new APIs allowing us to
capitalize on the new perspective support for PDF
generation.
bug:11561776
Change-Id: Ief61f7ff6a5a22c27d3acbe99a48910cb679f594
2013-11-07 14:15:19 -08:00
Ashish Sharma
a5043fb463
Merge "Fix the race condition for b/11458382"
2013-11-07 21:00:20 +00:00
Craig Mautner
25f6d3e6e0
am f7dea15b: am c9ffd746: Merge "Don\'t call setTask twice." into klp-dev
...
* commit 'f7dea15b8275dd012b1b00b9d781711eff82105a':
Don't call setTask twice.
2013-11-07 12:58:20 -08:00
Craig Mautner
f7dea15b82
am c9ffd746: Merge "Don\'t call setTask twice." into klp-dev
...
* commit 'c9ffd74659fac6f30f3f4653586af2069b903899':
Don't call setTask twice.
2013-11-07 12:54:50 -08:00
Craig Mautner
bf98c0ccd9
am c0eb7e7b: am 20409674: Merge "If home activity is not fullscreen keep drilling." into klp-dev
...
* commit 'c0eb7e7b545822dfb3cd43175886f2c97069e122':
If home activity is not fullscreen keep drilling.
2013-11-07 12:53:37 -08:00
Craig Mautner
c9ffd74659
Merge "Don't call setTask twice." into klp-dev
2013-11-07 20:51:30 +00:00