drgreen/android_frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
119,661 Commits 1 Branch 0 Tags
Commit Graph

119661 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Jim Miller
ed1cfc45b1 am c9fd186b: am 44ee0fb1: am c55edb26: Merge changes I74bfc0d5,I577f9d36 into klp-dev 
* commit 'c9fd186b4692e2da63698f15be59abcd360e321c':
  Delay tearing down external displays until keyguard finishes
  Show keyguard scrim on external displays while keyguard showing
 2013-11-08 11:38:12 -08:00
Jim Miller
c9fd186b46 am 44ee0fb1: am c55edb26: Merge changes I74bfc0d5,I577f9d36 into klp-dev 
* commit '44ee0fb144947206713e6527a5227fd44e2d4e1e':
  Delay tearing down external displays until keyguard finishes
  Show keyguard scrim on external displays while keyguard showing
 2013-11-08 11:35:18 -08:00
Jeff Brown
776eacc2b9 am eb544c33: am ca39478f: am f99b017e: Merge "Allow keyguard dialogs to show on secondary displays." into klp-dev 
* commit 'eb544c338c39f3e9435ad1098d559b618d287cf2':
  Allow keyguard dialogs to show on secondary displays.
 2013-11-08 11:19:51 -08:00
Ruben Brunk
5a78dc1cf5 am 913c0e38: am 70285910: am e73b41b2: camera2: Remove prior repeating request when setting. 
* commit '913c0e38a1316f4a653563ba401a0095c54b71d0':
  camera2: Remove prior repeating request when setting.
 2013-11-08 11:19:47 -08:00
Jeff Brown
eb544c338c am ca39478f: am f99b017e: Merge "Allow keyguard dialogs to show on secondary displays." into klp-dev 
* commit 'ca39478f33977ba6ba278fb9e3913144d7a5d0c2':
  Allow keyguard dialogs to show on secondary displays.
 2013-11-08 11:16:17 -08:00
Ruben Brunk
913c0e38a1 am 70285910: am e73b41b2: camera2: Remove prior repeating request when setting. 
* commit '70285910ab43edc27c86783e4c97a1a3c9d914c5':
  camera2: Remove prior repeating request when setting.
 2013-11-08 11:16:12 -08:00
Jim Miller
44ee0fb144 am c55edb26: Merge changes I74bfc0d5,I577f9d36 into klp-dev 
* commit 'c55edb266f96364277b4a3552295c94363d847fb':
  Delay tearing down external displays until keyguard finishes
  Show keyguard scrim on external displays while keyguard showing
 2013-11-08 11:01:57 -08:00
Jim Miller
c55edb266f Merge changes I74bfc0d5,I577f9d36 into klp-dev 
* changes:
  Delay tearing down external displays until keyguard finishes
  Show keyguard scrim on external displays while keyguard showing
 2013-11-08 18:58:05 +00:00
Jeff Brown
ca39478f33 am f99b017e: Merge "Allow keyguard dialogs to show on secondary displays." into klp-dev 
* commit 'f99b017e9c00be55c0063e9b7c1329b35ab564ed':
  Allow keyguard dialogs to show on secondary displays.
 2013-11-08 10:56:23 -08:00
Jeff Brown
f99b017e9c Merge "Allow keyguard dialogs to show on secondary displays." into klp-dev 2013-11-08 18:53:41 +00:00
Ruben Brunk
70285910ab am e73b41b2: camera2: Remove prior repeating request when setting. 
* commit 'e73b41b27f16b160cfe49bdcac3091dce94229ae':
  camera2: Remove prior repeating request when setting.
 2013-11-08 10:06:32 -08:00
Jeff Brown
4fd791735b Allow keyguard dialogs to show on secondary displays. 
When the keyguard or a dream is visible, we usually block content
from showing on secondary displays by mirroring the primary display
contents to them.  However, the keyguard may wish to show a
presentation on a secondary display in which case we should not
mirror.

This change adds an exemption for keyguard dialogs when the full
screen is obscured.  The keyguard can then create presentations with
the TYPE_KEYGUARD_DIALOG window type in order to show special
content on other displays selectively.

The old code used to cause all secondary displays to mirror, which
isn't quite what we want.

Bug: 11257292
Change-Id: I55429002b2233ae25fe80db149636d6f41f2a112
 2013-11-08 09:53:56 -08:00
Elliott Hughes
443e3a209c am 5c1aa4ef: am ede7f9d3: am 9e71310d: Merge "Remove incorrect (and unused) capget code." 
* commit '5c1aa4efa9568d38cd2e8756a274bb30ddd590ba':
  Remove incorrect (and unused) capget code.
 2013-11-07 23:08:13 -08:00
Elliott Hughes
5c1aa4efa9 am ede7f9d3: am 9e71310d: Merge "Remove incorrect (and unused) capget code." 
* commit 'ede7f9d3a39d87f12d58df495f28108784e9b588':
  Remove incorrect (and unused) capget code.
 2013-11-07 23:05:33 -08:00
Elliott Hughes
ede7f9d3a3 am 9e71310d: Merge "Remove incorrect (and unused) capget code." 
* commit '9e71310d15d9dfcbf5e1c94948e0260f3dc3e678':
  Remove incorrect (and unused) capget code.
 2013-11-07 23:03:43 -08:00
Elliott Hughes
9e71310d15 Merge "Remove incorrect (and unused) capget code." 2013-11-08 07:01:43 +00:00
Elliott Hughes
42a4bb5730 Remove incorrect (and unused) capget code. 
Note that if you revert this change, the code it removes is incorrect,
and doesn't handle the top 32 bits of capabilities, one of which we're
already using: CAP_BLOCK_SUSPEND.

Bug: 11508244
Change-Id: Ice1f51334bce4941c6d24d6016450a2ebcf92886
 2013-11-07 22:35:23 -08:00
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
Ruben Brunk
e73b41b27f camera2: Remove prior repeating request when setting. 
Bug: 11579778
Change-Id: Idb10662413ff5ee939adbdeab68a97cb34750fac
 2013-11-07 19:30:43 -08:00
Jim Miller
0b9d8accc5 Delay tearing down external displays until keyguard finishes 
This waits until the keyguard window is actually removed before turning
off external presentations to avoid flashing the user's password.

Fixes bug 11562369

Change-Id: I74bfc0d5e23dccc5a8628abfe02868c71c371f6e
 2013-11-07 19:15:49 -08:00
Jim Miller
3192148fb4 Show keyguard scrim on external displays while keyguard showing 
Fixes bug 11562369

Change-Id: I577f9d3683e62689954b4640601b3f360b78cb31
 2013-11-07 18:44:56 -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