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
Craig Mautner
c0eb7e7b54
am 20409674: Merge "If home activity is not fullscreen keep drilling." into klp-dev
...
* commit '2040967478790f67e286b203d5397159ac34006e':
If home activity is not fullscreen keep drilling.
2013-11-07 12:51:21 -08:00
Craig Mautner
2040967478
Merge "If home activity is not fullscreen keep drilling." into klp-dev
2013-11-07 20:49:02 +00:00
Craig Mautner
f41bcd47ea
If home activity is not fullscreen keep drilling.
...
When the home activity launches a non-fullscreen activity as part of
its own task then ensureActivitiesVisibleLocked() must continue past
the launched activity when determining activities to show and hide.
Stopping at the non-fullscreen activity leaves the fullscreen home
activity hidden.
Fixes bug 11555762.
Change-Id: I9058d8cde3a41cb7f9b1f97e5c0cb32e9b0f5af7
2013-11-07 11:51:29 -08:00
Selim Gurun
de38b23d0f
DO NOT MERGE Add a delimiter between scheme and host
...
Bug: 6923539
Change-Id: Ia78e185f00184c53babe00df3c852114ffd721f0
2013-11-07 11:41:32 -08:00
Fabrice Di Meglio
0be8fa713f
am e43780c6: am ff49e2d9: Merge "Improve RTL support for Immersive mode" into klp-dev
...
* commit 'e43780c6b768ee5eb2469f8eefc86a4f2ecc9906':
Improve RTL support for Immersive mode
2013-11-07 11:23:32 -08:00
Fabrice Di Meglio
4833a6ce44
am e34c4770: am 435c0ee1: Merge "Fix bug #11537133 Hideycling looks broken (KOT36), missing left padding" into klp-dev
...
* commit 'e34c477060bf7e212177029598bea0b04adc6f80':
Fix bug #11537133 Hideycling looks broken (KOT36), missing left padding
2013-11-07 11:23:29 -08:00
Fabrice Di Meglio
e43780c6b7
am ff49e2d9: Merge "Improve RTL support for Immersive mode" into klp-dev
...
* commit 'ff49e2d9d811db916190f61cc3cc03d4359d4952':
Improve RTL support for Immersive mode
2013-11-07 11:21:06 -08:00
Fabrice Di Meglio
e34c477060
am 435c0ee1: Merge "Fix bug #11537133 Hideycling looks broken (KOT36), missing left padding" into klp-dev
...
* commit '435c0ee10af132937dc0a22c39380624e6efd5ab':
Fix bug #11537133 Hideycling looks broken (KOT36), missing left padding
2013-11-07 11:21:03 -08:00
Fabrice Di Meglio
ff49e2d9d8
Merge "Improve RTL support for Immersive mode" into klp-dev
2013-11-07 19:18:14 +00:00
Fabrice Di Meglio
435c0ee10a
Merge "Fix bug #11537133 Hideycling looks broken (KOT36), missing left padding" into klp-dev
2013-11-07 19:18:00 +00:00
Robert Greenwalt
c3eef19047
am f1612bcf: am e8c51298: Merge "Add BatteryStats for Wifi Batched Scanning." into klp-dev
...
* commit 'f1612bcfdd2cb517948f14369fd0977ceb55d19c':
Add BatteryStats for Wifi Batched Scanning.
2013-11-07 10:39:43 -08:00
Robert Greenwalt
f1612bcfdd
am e8c51298: Merge "Add BatteryStats for Wifi Batched Scanning." into klp-dev
...
* commit 'e8c51298a43f607fea7418ced7cc783e6065fe87':
Add BatteryStats for Wifi Batched Scanning.
2013-11-07 10:32:53 -08:00
Robert Greenwalt
e8c51298a4
Merge "Add BatteryStats for Wifi Batched Scanning." into klp-dev
2013-11-07 18:30:49 +00:00
Dianne Hackborn
c0b5351555
am 03be79b3: am fbf4888d: am 9882d388: Merge "Fix issue #11223338 : Not retaining service started state while restarting" into klp-dev
...
* commit '03be79b35ca7060f383075a43ff19c8a9d63a7c0':
Fix issue #11223338 : Not retaining service started state while restarting
2013-11-07 10:24:22 -08:00
Dianne Hackborn
03be79b35c
am fbf4888d: am 9882d388: Merge "Fix issue #11223338 : Not retaining service started state while restarting" into klp-dev
...
* commit 'fbf4888d19b0c68d8004f9ad2423a583dc01178e':
Fix issue #11223338 : Not retaining service started state while restarting
2013-11-07 10:21:34 -08:00
Dianne Hackborn
fbf4888d19
am 9882d388: Merge "Fix issue #11223338 : Not retaining service started state while restarting" into klp-dev
...
* commit '9882d3889957200c3db62f47142988dea99a7291':
Fix issue #11223338 : Not retaining service started state while restarting
2013-11-07 10:18:53 -08:00
Dianne Hackborn
9882d38899
Merge "Fix issue #11223338 : Not retaining service started state while restarting" into klp-dev
2013-11-07 18:16:10 +00:00
Dirk Dougherty
7c482b4fd9
am d17f5a54: am cbc0a6c3: am 347b6fc9: Doc change: remove a reference to RTL pseudolocale.
...
* commit 'd17f5a546bf8f610a4373bd8c74b9b74170887ac':
Doc change: remove a reference to RTL pseudolocale.
2013-11-07 09:34:14 -08:00
Dirk Dougherty
d17f5a546b
am cbc0a6c3: am 347b6fc9: Doc change: remove a reference to RTL pseudolocale.
...
* commit 'cbc0a6c37b26df492f22b09989672de1c7aa17f8':
Doc change: remove a reference to RTL pseudolocale.
2013-11-07 09:31:01 -08:00
Dirk Dougherty
cbc0a6c37b
am 347b6fc9: Doc change: remove a reference to RTL pseudolocale.
...
* commit '347b6fc9e3bbd15364a0d1be74bd6ed98a3a1bfe':
Doc change: remove a reference to RTL pseudolocale.
2013-11-07 17:28:16 +00:00
Dirk Dougherty
347b6fc9e3
Doc change: remove a reference to RTL pseudolocale.
...
Change-Id: If6174954008b6875a7cb0ffcc89d1e04dd702b02
2013-11-07 09:22:52 -08:00
Craig Mautner
329f4129a5
Don't call setTask twice.
...
The method ActivityRecord.setTask() removes the ActivityRecord from
its old task's mActivities ArrayList. In jb-mr2 it did not have this
side effect (there was no mActivities) so calling it twice was not a
problem. This fix causes setTask to only be called once for the target
activity.
Fixes bug 11557835.
Change-Id: If2b6d4b297e86130009713efe6891a24fad3dd15
2013-11-07 09:10:42 -08:00
Jeff Brown
69b07161be
Add media router service and integrate with remote displays.
...
This change adds a new media router service whose purpose is to track
global state information associated with media routes. This service
publishes routes to the media router instance in application processes
and handles requested state changes such as selecting or unselecting
global routes. The service also binds to remote display provider
services which can offer new remote display routes to the system.
Includes a test application for manually verifying certain aspects
of the operation of the media router service.
The remote display provider interface is essentially a stripped down
media route provider interface as defined in the support library
media router implementation. For now, it is designed to be used only
by first parties to publish remote display routes to the system so
it is not exposed as public API in the SDK. In the future, the remote
display provider interface will most likely be deprecated and replaced
with a more featureful media route provider interface for third
party integration, similar to what is in the support library today.
Further patch sets integrate these new capabilities into the System UI
and Settings for connecting remote displays.
Bug: 11257292
Change-Id: I31109f23f17b474d17534d0f5f4503e388b081c2
2013-11-07 03:25:37 -08:00
Jeff Brown
f3c99e883f
Add a platform library for remote display providers.
...
This interface allows applications to register services that offer
remote displays to the system. The system will then provide UI
to allow user to connect to these displays and enable mirroring.
Bug: 11257292
Change-Id: I34da5b9dfdaf71267bd3450c505bc1b7368d1b40
2013-11-07 01:58:15 -08:00
Scott Main
d797c877c2
am 17fb0853: am 88e25411: am b680f3c3: Merge "udpate gcore setup doc with info for android studio" into klp-docs
...
* commit '17fb0853b3f29f3c945843fef355c16d321d5e51':
udpate gcore setup doc with info for android studio
2013-11-06 21:28:34 -08:00
Scott Main
4eda8c8e8f
am 7895646a: am a8c3af81: am 334cc487: add maxSdkVersion attribute to uses-permission doc
...
* commit '7895646a3c4323645e381e7e3c4d27886cf81ddc':
add maxSdkVersion attribute to uses-permission doc
2013-11-06 21:28:30 -08:00
Adam Koch
25143dde09
am 19bc05c8: am 5ac65c54: am 57c9886d: Doc fix: add more detail to BitmapFactory.Options.inPurgeable flag. Bug: 6064760
...
* commit '19bc05c8f14f45ff1b98ad8e72328f5cc3c3a035':
Doc fix: add more detail to BitmapFactory.Options.inPurgeable flag. Bug: 6064760
2013-11-06 21:28:27 -08:00
Dirk Dougherty
229d3ddb9a
am 078ab218: am 8bd26cdb: am a5f542a3: Doc change: adjust wording for Force RTL layout developer option.
...
* commit '078ab2187ed369ba3bda38a48632f052022a3d95':
Doc change: adjust wording for Force RTL layout developer option.
2013-11-06 21:28:23 -08:00
Scott Main
a22bfcf151
am 0c3d6272: am 00177aa1: am d7abd97f: fix broken links
...
* commit '0c3d627276797c0f8425cdb3c3e5e359931289d7':
fix broken links
2013-11-06 21:28:20 -08:00
Dirk Dougherty
c9669b4386
am 1e6a2148: am 40111cde: am 9399d919: Doc change: Edits to graphics highlights.
...
* commit '1e6a214809818231436e93c4645875d4db5c847e':
Doc change: Edits to graphics highlights.
2013-11-06 21:28:18 -08:00